From 66a4cdc74217b10188cbee4ff472e59290a7ce25 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 13 Jun 2021 15:46:36 +0200
Subject: [PATCH 0001/1504] cupsd: Allow major upgrades of gutenprint with
 cups-genppdupdate.

---
 nixos/modules/services/printing/cupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index d2b36d9e7541..5d6d2b899760 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -380,7 +380,7 @@ in
 
             ${optionalString (containsGutenprint cfg.drivers) ''
               if [ -d /var/lib/cups/ppd ]; then
-                ${getGutenprint cfg.drivers}/bin/cups-genppdupdate -p /var/lib/cups/ppd
+                ${getGutenprint cfg.drivers}/bin/cups-genppdupdate -x -p /var/lib/cups/ppd
               fi
             ''}
           '';

From 501faf79fac647947bcbca6d9b0ae55c232c70d8 Mon Sep 17 00:00:00 2001
From: Willow <willow.ch@protonmail.com>
Date: Fri, 15 Dec 2023 16:19:30 -0600
Subject: [PATCH 0002/1504] maintainers: add willow_ch

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d20aa7db61ad..fb9bcf8f0a3b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19719,6 +19719,15 @@
     githubId = 20464732;
     name = "Willi Butz";
   };
+  willow_ch = {
+    email = "nix@w.wolo.dev";
+    github = "spaghetus";
+    githubId = 28763739;
+    name = "Willow Carlson-Huber";
+    keys = [{
+      fingerprint = "FE21E0981CDFD50ADD086423C21A693BA4693A60";
+    }];
+  };
   willswats = {
     email = "williamstuwatson@gmail.com";
     github = "willswats";

From d40983ba34488f05bbb4194f574bc84c39925cf1 Mon Sep 17 00:00:00 2001
From: pinn3 <iam@lacking.education>
Date: Tue, 14 Nov 2023 15:54:21 +0100
Subject: [PATCH 0003/1504] dwm: add extraSessionCommands option

---
 nixos/modules/services/x11/window-managers/dwm.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix
index c81a834a0679..fde75c7c99c4 100644
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@@ -15,6 +15,13 @@ in
   options = {
     services.xserver.windowManager.dwm = {
       enable = mkEnableOption "dwm";
+      extraSessionCommands = mkOption {
+        default     = "";
+        type        = types.lines;
+        description = ''
+          Shell commands executed just before dwm is started.
+        '';
+      };
       package = mkPackageOption pkgs "dwm" {
         example = ''
           pkgs.dwm.overrideAttrs (oldAttrs: rec {
@@ -39,6 +46,8 @@ in
       { name = "dwm";
         start =
           ''
+            ${cfg.extraSessionCommands}
+
             export _JAVA_AWT_WM_NONREPARENTING=1
             dwm &
             waitPID=$!

From 385a87c5f8f0a99b318f4fe469fe7f8032776181 Mon Sep 17 00:00:00 2001
From: pinn3 <iam@lacking.education>
Date: Thu, 30 May 2024 13:40:49 +0200
Subject: [PATCH 0004/1504] dwm: format module with nixfmt

---
 .../services/x11/window-managers/dwm.nix      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix
index fde75c7c99c4..10ec7563d4af 100644
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@@ -6,9 +6,7 @@ let
 
   cfg = config.services.xserver.windowManager.dwm;
 
-in
-
-{
+in {
 
   ###### interface
 
@@ -16,8 +14,8 @@ in
     services.xserver.windowManager.dwm = {
       enable = mkEnableOption "dwm";
       extraSessionCommands = mkOption {
-        default     = "";
-        type        = types.lines;
+        default = "";
+        type = types.lines;
         description = ''
           Shell commands executed just before dwm is started.
         '';
@@ -37,22 +35,20 @@ in
     };
   };
 
-
   ###### implementation
 
   config = mkIf cfg.enable {
 
-    services.xserver.windowManager.session = singleton
-      { name = "dwm";
-        start =
-          ''
-            ${cfg.extraSessionCommands}
+    services.xserver.windowManager.session = singleton {
+      name = "dwm";
+      start = ''
+        ${cfg.extraSessionCommands}
 
-            export _JAVA_AWT_WM_NONREPARENTING=1
-            dwm &
-            waitPID=$!
-          '';
-      };
+        export _JAVA_AWT_WM_NONREPARENTING=1
+        dwm &
+        waitPID=$!
+      '';
+    };
 
     environment.systemPackages = [ cfg.package ];
 

From 3d9f7e0ca0accf52101ab3b48bab629f4dbc2e3f Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Mon, 3 Jun 2024 16:45:21 +0200
Subject: [PATCH 0005/1504] i3status-rust: add optional support for pipewire
 driver

i3status-rust has recently introduced a privacy block feature that can
optionally use PipeWire to indicate if the microphone or webcam is currently in
use. This functionality is enabled by setting a feature flag.
---
 pkgs/applications/window-managers/i3/status-rust.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index b9ced38b5fe4..672287d4aec1 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -11,7 +11,9 @@
 , lm_sensors
 , iw
 , iproute2
+, pipewire
 , withICUCalendar ? false
+, withPipewire ? true
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -27,15 +29,18 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-yeijJl94v+yKMVnU/Fjzapab/nExlvoznrx8Ydz/RvM=";
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
+  nativeBuildInputs = [ pkg-config makeWrapper ]
+    ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
 
-  buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ];
+  buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]
+    ++ (lib.optionals withPipewire [ pipewire ]);
 
   buildFeatures = [
     "notmuch"
     "maildir"
     "pulseaudio"
-  ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ]);
+  ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
+  ++ (lib.optionals withPipewire [ "pipewire" ]);
 
   prePatch = ''
     substituteInPlace src/util.rs \

From 4e5de4ef9598e9777aac542ee83bb4f34bc4d6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 25 Sep 2024 08:59:14 +0200
Subject: [PATCH 0006/1504] nixos/dwm-status: don't disable upower

Previously if the user enables this module but doesn't use the battery
feature, the user can't enable upower (at least without lib.mkForce).
---
 nixos/modules/services/misc/dwm-status.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix
index 927561270a79..0c37c3f5eb94 100644
--- a/nixos/modules/services/misc/dwm-status.nix
+++ b/nixos/modules/services/misc/dwm-status.nix
@@ -49,7 +49,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    services.upower.enable = lib.elem "battery" cfg.order;
+    services.upower.enable = lib.mkIf (lib.elem "battery" cfg.order) true;
 
     systemd.user.services.dwm-status = {
       description = "Highly performant and configurable DWM status service";

From e445971f487b50f9ed3f4bd77df8b77c64405990 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Thu, 3 Oct 2024 14:29:08 +0200
Subject: [PATCH 0007/1504] physfs: don't set CMAKE_SKIP_RPATH

---
 pkgs/development/libraries/physfs/default.nix    |  4 ++++
 .../physfs/dont-set-cmake-skip-rpath-2.1.1.patch | 16 ++++++++++++++++
 .../physfs/dont-set-cmake-skip-rpath-3.2.0.patch | 13 +++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch
 create mode 100644 pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch

diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index e00be9c841f9..efe5b4bc6a27 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -13,6 +13,10 @@ let
       inherit sha256;
     };
 
+    patches = [
+      ./dont-set-cmake-skip-rpath-${version}.patch
+    ];
+
     nativeBuildInputs = [ cmake doxygen ];
 
     buildInputs = [ zlib ]
diff --git a/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch
new file mode 100644
index 000000000000..fbd048499cf3
--- /dev/null
+++ b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b4ef61e..7b2f26c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,11 +29,6 @@ if(APPLE)
+     set(PHYSFS_M_SRCS src/physfs_platform_apple.m)
+ endif()
+ 
+-if(CMAKE_COMPILER_IS_GNUCC)
+-    # Don't use -rpath.
+-    set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
+-endif()
+-
+ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")
+     add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT)
+     add_definitions(-xldscope=hidden)
diff --git a/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch
new file mode 100644
index 000000000000..3811d1bd2e9d
--- /dev/null
+++ b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b3291cc..11e7ad1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,8 +32,6 @@ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+     add_compile_options(-Wall)
+-    # Don't use -rpath.
+-    set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
+ endif()
+ 
+ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")

From a4008da2d49de77e0da4391db1ae681a143233a3 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Wed, 9 Oct 2024 15:07:58 +0200
Subject: [PATCH 0008/1504] nixos/systemd-boot: Don't write to /etc/machine-id

This reverts commit 4daccf208feccb027731d3fc8dc2686ab9ef3428

The reverted commit claims that bootctl fails if machine-id is not set.
I can not reproduce this. I think this has since been fixed now that
bootctl has support for arbtirary entry-tokens and not just machine-id.

In the case of NixOS the entry-token is the string "nixos"
---
 .../boot/loader/systemd-boot/systemd-boot-builder.py      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index d2ba1e54e22e..421fde5b07af 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -159,7 +159,7 @@ def copy_from_file(file: str, dry_run: bool = False) -> str:
 
 
 def write_entry(profile: str | None, generation: int, specialisation: str | None,
-                machine_id: str, bootspec: BootSpec, current: bool) -> None:
+                machine_id: str | None, bootspec: BootSpec, current: bool) -> None:
     if specialisation:
         bootspec = bootspec.specialisations[specialisation]
     kernel = copy_from_file(bootspec.kernel)
@@ -281,11 +281,7 @@ def install_bootloader(args: argparse.Namespace) -> None:
     except IOError as e:
         if e.errno != errno.ENOENT:
             raise
-        # Since systemd version 232 a machine ID is required and it might not
-        # be there on newly installed systems, so let's generate one so that
-        # bootctl can find it and we can also pass it to write_entry() later.
-        cmd = [f"{SYSTEMD}/bin/systemd-machine-id-setup", "--print"]
-        machine_id = run(cmd, stdout=subprocess.PIPE).stdout.rstrip()
+        machine_id = None
 
     if os.getenv("NIXOS_INSTALL_GRUB") == "1":
         warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)

From 627221c26208d7ed3db88bb4b07cf4e40e4e7a7f Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Wed, 9 Oct 2024 15:09:24 +0200
Subject: [PATCH 0009/1504] nixos/make-disk-image: Remove hack that cleans up
 machine-id

machine-id is not written by the install bootloader step anymore
so this step is also not needed
---
 nixos/lib/make-disk-image.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index a943edb7b574..10e3b22f4cec 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -616,9 +616,6 @@ let format' = format; in let
         # __noChroot for example).
         export HOME=$TMPDIR
         NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot
-
-        # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images
-        rm -f $mountPoint/etc/machine-id
       ''}
 
       # Set the ownerships of the contents. The modes are set in preVM.

From 77650561723637cce4e1ae3eeb784825828792ab Mon Sep 17 00:00:00 2001
From: L-Trump <ltrump@163.com>
Date: Sat, 19 Oct 2024 00:31:12 +0800
Subject: [PATCH 0010/1504] playonlinux: add python dependency pyasyncore

---
 pkgs/applications/misc/playonlinux/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 92b29ee71736..747a6eb4fd2a 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -64,6 +64,7 @@ let
     wxpython
     setuptools
     natsort
+    pyasyncore
   ]);
 
 in stdenv.mkDerivation {

From 6896c88c1b6ae2b68d30e32b03d2c5c63b2d8a90 Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Mon, 21 Oct 2024 08:28:41 +0000
Subject: [PATCH 0011/1504] lib25519: add update script

Co-Authored-By: imad.nyc <me@imad.nyc>

lib25519: 20240321 -> 20241004

lib25519: add version test script
---
 pkgs/by-name/li/lib25519/package.nix | 24 +++++++++++++++++++++---
 pkgs/by-name/li/lib25519/update.sh   | 10 ++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100755 pkgs/by-name/li/lib25519/update.sh

diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix
index 68d35a796a03..515ef90967fa 100644
--- a/pkgs/by-name/li/lib25519/package.nix
+++ b/pkgs/by-name/li/lib25519/package.nix
@@ -3,16 +3,22 @@
   lib,
   python3,
   fetchzip,
+  testers,
+  valgrind,
   librandombytes,
   libcpucycles,
+  lib25519,
 }:
+let
+  version = "20241004";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lib25519";
-  version = "20240321";
+  inherit version;
 
   src = fetchzip {
     url = "https://lib25519.cr.yp.to/lib25519-${finalAttrs.version}.tar.gz";
-    hash = "sha256-R10Q803vCjIZCS4Z/uErsx547RaXfAELGQm9NuNhw+I=";
+    hash = "sha256-gKLMk+yZ/nDlwohZiCFurSZwHExX3Ge2W1O0JoGQf8M=";
   };
 
   patches = [ ./environment-variable-tools.patch ];
@@ -31,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  nativeBuildInputs = [ python3 ];
+  nativeBuildInputs = [
+    python3
+    valgrind
+  ];
   buildInputs = [
     librandombytes
     libcpucycles
@@ -52,6 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstallCheck
   '';
 
+  passthru = {
+    updateScript = ./update.sh;
+    tests.version = testers.testVersion {
+      package = lib25519;
+      command = "lib25519-test | head -n 2 | grep version";
+      version = "lib25519 version ${version}";
+    };
+  };
+
   meta = {
     homepage = "https://randombytes.cr.yp.to/";
     description = "A simple API for applications generating fresh randomness";
diff --git a/pkgs/by-name/li/lib25519/update.sh b/pkgs/by-name/li/lib25519/update.sh
new file mode 100755
index 000000000000..7d366810c762
--- /dev/null
+++ b/pkgs/by-name/li/lib25519/update.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl cacert nix common-updater-scripts --pure
+#shellcheck shell=bash
+
+set -eu -o pipefail
+
+# upstream doesn't use git, but has this file specifically for versioning
+version="$(curl https://lib25519.cr.yp.to/lib25519-latest-version.txt)"
+
+update-source-version lib25519 "$version"

From c258e18f67a5d39d4d2902f84201af4b6dac40b8 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 21 Oct 2024 19:00:20 +0000
Subject: [PATCH 0012/1504] nixos/auto-cpufreq: init vm test

Even though cpufreq cannot be adjusted within qemu this test is still
useful to ensure that the service is running and the auto-cpufreq cli is
able to interact with the auto-cpufreq service.
---
 nixos/tests/all-tests.nix    |  1 +
 nixos/tests/auto-cpufreq.nix | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 nixos/tests/auto-cpufreq.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8b674bfb7342..c9cab8bb41af 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -141,6 +141,7 @@ in {
   audiobookshelf = handleTest ./audiobookshelf.nix {};
   auth-mysql = handleTest ./auth-mysql.nix {};
   authelia = handleTest ./authelia.nix {};
+  auto-cpufreq = handleTest ./auto-cpufreq.nix {};
   avahi = handleTest ./avahi.nix {};
   avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };
   ayatana-indicators = runTest ./ayatana-indicators.nix;
diff --git a/nixos/tests/auto-cpufreq.nix b/nixos/tests/auto-cpufreq.nix
new file mode 100644
index 000000000000..79129cf1ffaf
--- /dev/null
+++ b/nixos/tests/auto-cpufreq.nix
@@ -0,0 +1,33 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+
+  {
+    name = "auto-cpufreq-server";
+
+    nodes = {
+      machine =
+        { pkgs, ... }:
+        {
+          # service will still start but since vm inside qemu cpufreq adjustments
+          # cannot be made. This will resource in the following error but the service
+          # remains up:
+          #   ERROR:
+          #   Couldn't find any of the necessary scaling governors.
+          services.auto-cpufreq = {
+            enable = true;
+            settings = {
+              charger = {
+                turbo = "auto";
+              };
+            };
+          };
+        };
+    };
+
+    testScript = ''
+      machine.start()
+      machine.wait_for_unit("auto-cpufreq.service")
+      machine.succeed("auto-cpufreq --force reset")
+    '';
+  }
+)

From c574adecc908290bbe53437e6c7f2ae19bb29548 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Tue, 29 Oct 2024 13:52:28 +0000
Subject: [PATCH 0013/1504] auto-cpufreq: add passthru.tests

---
 pkgs/by-name/au/auto-cpufreq/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index 15db7faa4089..512d2fc3c788 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -7,6 +7,7 @@
   wrapGAppsHook3,
   gtk3,
   getent,
+  nixosTests,
 }:
 python3Packages.buildPythonPackage rec {
   pname = "auto-cpufreq";
@@ -93,6 +94,10 @@ python3Packages.buildPythonPackage rec {
     cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions
   '';
 
+  passthru.tests = {
+    inherit (nixosTests) auto-cpufreq;
+  };
+
   meta = {
     mainProgram = "auto-cpufreq";
     homepage = "https://github.com/AdnanHodzic/auto-cpufreq";

From 4b6daa0e158c57d5489070568e28402310a52f13 Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Tue, 29 Oct 2024 19:48:18 +0100
Subject: [PATCH 0014/1504] megasync: 4.9.1.0 -> 5.5.0.0

---
 ...eimage-remove-obsolete-ffmpeg-macros.patch |  26 ++++
 ...sdk-fix-cmake-dependencies-detection.patch |  20 +++
 ...app-fix-cmake-dependencies-detection.patch |  16 ++
 ...40-megasync-fix-cmake-install-bindir.patch |  12 ++
 pkgs/applications/misc/megasync/default.nix   | 138 ++++++++----------
 .../misc/megasync/install-megasync.patch      |  21 ---
 .../megasync/noinstall-distro-version.patch   |  13 --
 7 files changed, 138 insertions(+), 108 deletions(-)
 create mode 100644 pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
 create mode 100644 pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch
 create mode 100644 pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch
 create mode 100644 pkgs/applications/misc/megasync/040-megasync-fix-cmake-install-bindir.patch
 delete mode 100644 pkgs/applications/misc/megasync/install-megasync.patch
 delete mode 100644 pkgs/applications/misc/megasync/noinstall-distro-version.patch

diff --git a/pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch b/pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
new file mode 100644
index 000000000000..19c96c78dc61
--- /dev/null
+++ b/pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
@@ -0,0 +1,26 @@
+--- a/src/MEGASync/mega/src/gfx/freeimage.cpp
++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp
+@@ -200,12 +200,6 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s
+ 
+ #ifdef HAVE_FFMPEG
+ 
+-#ifdef AV_CODEC_CAP_TRUNCATED
+-#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+-#else
+-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
+-#endif
+-
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()
+ {
+     return  ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3"
+@@ -321,10 +315,6 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    if (decoder->capabilities & CAP_TRUNCATED)
+-    {
+-        codecContext->flags |= CAP_TRUNCATED;
+-    }
+ 
+     AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
+     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
diff --git a/pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch b/pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch
new file mode 100644
index 000000000000..ce0d9d10b56c
--- /dev/null
+++ b/pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch
@@ -0,0 +1,20 @@
+--- a/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
++++ b/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
+@@ -95,7 +95,7 @@ macro(load_sdklib_libraries)
+ 
+         find_package(PkgConfig REQUIRED) # For libraries loaded using pkg-config
+ 
+-        pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcrypto++)
++        pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)
+         target_link_libraries(SDKlib PUBLIC PkgConfig::cryptopp) # TODO: Private for SDK core
+ 
+         pkg_check_modules(sodium REQUIRED IMPORTED_TARGET libsodium)
+@@ -139,7 +139,7 @@ macro(load_sdklib_libraries)
+         endif()
+ 
+         if(USE_PDFIUM)
+-            pkg_check_modules(pdfium REQUIRED IMPORTED_TARGET pdfium)
++            pkg_check_modules(pdfium REQUIRED IMPORTED_TARGET libpdfium)
+             target_link_libraries(SDKlib PRIVATE PkgConfig::pdfium)
+             set(HAVE_PDFIUM 1)
+         endif()
diff --git a/pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch b/pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch
new file mode 100644
index 000000000000..e8703d1ce0e0
--- /dev/null
+++ b/pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch
@@ -0,0 +1,16 @@
+--- a/src/MEGAUpdateGenerator/CMakeLists.txt
++++ b/src/MEGAUpdateGenerator/CMakeLists.txt
+@@ -15,10 +15,11 @@ target_sources(MEGAUpdateGenerator
+ )
+ 
+ # Load and link needed libraries for the CHATlib target
+-find_package(cryptopp CONFIG REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)
+ target_link_libraries(MEGAUpdateGenerator
+     PRIVATE
+-    cryptopp::cryptopp
++    PkgConfig::cryptopp
+     MEGA::SDKlib
+ )
+ 
diff --git a/pkgs/applications/misc/megasync/040-megasync-fix-cmake-install-bindir.patch b/pkgs/applications/misc/megasync/040-megasync-fix-cmake-install-bindir.patch
new file mode 100644
index 000000000000..8e15acf60e8f
--- /dev/null
+++ b/pkgs/applications/misc/megasync/040-megasync-fix-cmake-install-bindir.patch
@@ -0,0 +1,12 @@
+diff --git a/contrib/cmake/modules/desktopapp_configuration.cmake b/contrib/cmake/modules/desktopapp_configuration.cmake
+index 8e9f35cb2..b62f5a9b5 100644
+--- a/contrib/cmake/modules/desktopapp_configuration.cmake
++++ b/contrib/cmake/modules/desktopapp_configuration.cmake
+@@ -30,7 +30,6 @@ if(UNIX AND NOT APPLE)
+     #       Used for building packages: in which install dir is a path construction folder that will not be there in packages
+ 
+     set(CMAKE_INSTALL_LIBDIR "opt/megasync/lib") # override default "lib" from GNUInstallDirs
+-    set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs
+ 
+     # Override CMAKE_INSTALL_PREFIX
+     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index ef35db703087..b76650b4f2d7 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,51 +1,57 @@
-{ lib
-, stdenv
-, autoconf
-, automake
-, c-ares
-, cryptopp
-, curl
-, doxygen
-, fetchFromGitHub
-, ffmpeg
-, libmediainfo
-, libraw
-, libsodium
-, libtool
-, libuv
-, libzen
-, lsb-release
-, mkDerivation
-, pkg-config
-, qtbase
-, qttools
-, qtx11extras
-, sqlite
-, swig
-, unzip
-, wget
+
+{
+  lib,
+  stdenv,
+  c-ares,
+  cmake,
+  cryptopp,
+  curl,
+  fetchFromGitHub,
+  ffmpeg,
+  freeimage,
+  hicolor-icon-theme,
+  icu,
+  libmediainfo,
+  libsodium,
+  libtool,
+  libuv,
+  libxcb,
+  libzen,
+  mkDerivation,
+  openssl,
+  pkg-config,
+  qtbase,
+  qtdeclarative,
+  qtgraphicaleffects,
+  qttools,
+  qtquickcontrols,
+  qtquickcontrols2,
+  qtsvg,
+  qtx11extras,
+  readline,
+  sqlite,
+  unzip,
+  wget,
+  zlib,
+  qt5,
 }:
 mkDerivation rec {
   pname = "megasync";
-  version = "4.9.1.0";
+  version = "5.5.0.0";
 
   src = fetchFromGitHub {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    hash = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY=";
+    hash = "sha256-f+FZdMMdGZvYvJZ0xTUuO9zk0/VHFAISvM2cW0zwfaE=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    autoconf
-    automake
-    doxygen
+    cmake
     libtool
-    lsb-release
     pkg-config
     qttools
-    swig
     unzip
   ];
   buildInputs = [
@@ -53,23 +59,33 @@ mkDerivation rec {
     cryptopp
     curl
     ffmpeg
+    freeimage
+    hicolor-icon-theme
+    icu
     libmediainfo
-    libraw
     libsodium
     libuv
+    libxcb
     libzen
+    openssl
     qtbase
+    qtdeclarative
+    qtgraphicaleffects
+    qtquickcontrols
+    qtquickcontrols2
+    qtsvg
     qtx11extras
+    readline
     sqlite
     wget
+    zlib
   ];
 
   patches = [
-    # Distro and version targets attempt to use lsb_release which is broken
-    # (see issue: https://github.com/NixOS/nixpkgs/issues/22729)
-    ./noinstall-distro-version.patch
-    # megasync target is not part of the install rule thanks to a commented block
-    ./install-megasync.patch
+    ./010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
+    ./020-megasync-sdk-fix-cmake-dependencies-detection.patch
+    ./030-megasync-app-fix-cmake-dependencies-detection.patch #Thanks Arch Linux
+    ./040-megasync-fix-cmake-install-bindir.patch
   ];
 
   postPatch = ''
@@ -81,46 +97,20 @@ mkDerivation rec {
   dontUseQmakeConfigure = true;
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    cd src/MEGASync/mega
-    ./autogen.sh
-  '';
-
-  configureFlags = [
-    "--disable-examples"
-    "--disable-java"
-    "--disable-php"
-    "--enable-chat"
-    "--with-cares"
-    "--with-cryptopp"
-    "--with-curl"
-    "--with-ffmpeg"
-    "--without-freeimage"
-    "--without-readline"
-    "--without-termcap"
-    "--with-sodium"
-    "--with-sqlite"
-    "--with-zlib"
+  cmakeFlags = [
+    "-DCMAKE_MODULE_PATH:PATH=${src}/src/MEGASync/mega/contrib/cmake/modules/packages"
+    "-Wno-dev"
+    "-DUSE_PDFIUM=FALSE" # PDFIUM is not in nixpkgs
   ];
 
-  postConfigure = ''
-    cd ../..
-  '';
-
-  preBuild = ''
-    qmake CONFIG+="nofreeimage release" MEGA.pro
-    pushd MEGASync
-      lrelease MEGASync.pro
-      DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release"
-    popd
-  '';
-
   meta = with lib; {
-    description =
-      "Easy automated syncing between your computers and your MEGA Cloud Drive";
+    description = "Easy automated syncing between your computers and your MEGA Cloud Drive";
     homepage = "https://mega.nz/";
     license = licenses.unfree;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
     maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/megasync/install-megasync.patch b/pkgs/applications/misc/megasync/install-megasync.patch
deleted file mode 100644
index 7d8748528e7f..000000000000
--- a/pkgs/applications/misc/megasync/install-megasync.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: source/src/MEGASync/MEGASync.pro
-===================================================================
---- source.orig/src/MEGASync/MEGASync.pro
-+++ source/src/MEGASync/MEGASync.pro
-@@ -28,11 +28,11 @@ unix:!macx {
-     TARGET = megasync
- 
- #    Uncomment the following if "make install" doesn't copy megasync in /usr/bin directory
--#    isEmpty(PREFIX) {
--#        PREFIX = /usr
--#    }
--#    target.path = $$PREFIX/bin
--#    INSTALLS += target
-+    isEmpty(PREFIX) {
-+        PREFIX = /usr
-+    }
-+    target.path = $$PREFIX/bin
-+    INSTALLS += target
- }
- else {
-     TARGET = MEGAsync
diff --git a/pkgs/applications/misc/megasync/noinstall-distro-version.patch b/pkgs/applications/misc/megasync/noinstall-distro-version.patch
deleted file mode 100644
index bbf100737bc4..000000000000
--- a/pkgs/applications/misc/megasync/noinstall-distro-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: source/src/MEGASync/platform/platform.pri
-===================================================================
---- source.orig/src/MEGASync/platform/platform.pri
-+++ source/src/MEGASync/platform/platform.pri
-@@ -37,7 +37,7 @@ unix:!macx {
-     system(command -v lsb_release): version.commands = lsb_release -rs > $$version.target
- 	version.files = $$version.target
- 
--	INSTALLS += distro version
-+	# INSTALLS += distro version
- 
-     QT += dbus
-     SOURCES += $$PWD/linux/LinuxPlatform.cpp \

From 745f78a683e893579e19540b2571693c06799026 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 30 Sep 2024 21:37:08 +0100
Subject: [PATCH 0015/1504] nixos/komga: introduce 'settings' option

---
 nixos/modules/services/web-apps/komga.nix | 62 ++++++++++++++++++++---
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/web-apps/komga.nix b/nixos/modules/services/web-apps/komga.nix
index d7ab2a9e612e..5245552b2130 100644
--- a/nixos/modules/services/web-apps/komga.nix
+++ b/nixos/modules/services/web-apps/komga.nix
@@ -9,18 +9,31 @@ let
   cfg = config.services.komga;
   inherit (lib) mkOption mkEnableOption maintainers;
   inherit (lib.types) port str bool;
+
+  settingsFormat = pkgs.formats.yaml { };
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [
+        "services"
+        "komga"
+        "port"
+      ]
+      [
+        "services"
+        "komga"
+        "settings"
+        "server"
+        "port"
+      ]
+    )
+  ];
+
   options = {
     services.komga = {
       enable = mkEnableOption "Komga, a free and open source comics/mangas media server";
 
-      port = mkOption {
-        type = port;
-        default = 8080;
-        description = "The port that Komga will listen on.";
-      };
-
       user = mkOption {
         type = str;
         default = "komga";
@@ -39,10 +52,25 @@ in
         description = "State and configuration directory Komga will use.";
       };
 
+      settings = lib.mkOption {
+        inherit (settingsFormat) type;
+        default = { };
+        defaultText = lib.literalExpression ''
+          {
+            server.port = 8080;
+          }
+        '';
+        description = ''
+          Komga configuration.
+
+          See [documentation](https://komga.org/docs/installation/configuration).
+        '';
+      };
+
       openFirewall = mkOption {
         type = bool;
         default = false;
-        description = "Whether to open the firewall for the port in {option}`services.komga.port`.";
+        description = "Whether to open the firewall for the port in {option}`services.komga.settings.server.port`.";
       };
     };
   };
@@ -52,6 +80,16 @@ in
       inherit (lib) mkIf getExe;
     in
     mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = (cfg.settings.komga.config-dir or cfg.stateDir) == cfg.stateDir;
+          message = "You must use the `services.komga.stateDir` option to properly configure `komga.config-dir`.";
+        }
+      ];
+
+      services.komga.settings = {
+        server.port = lib.mkDefault 8080;
+      };
 
       networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
 
@@ -66,9 +104,17 @@ in
         };
       };
 
+      systemd.tmpfiles.settings."10-komga" = {
+        ${cfg.stateDir}.d = {
+          inherit (cfg) user group;
+        };
+        "${cfg.stateDir}/application.yml"."L+" = {
+          argument = builtins.toString (settingsFormat.generate "application.yml" cfg.settings);
+        };
+      };
+
       systemd.services.komga = {
         environment = {
-          SERVER_PORT = builtins.toString cfg.port;
           KOMGA_CONFIGDIR = cfg.stateDir;
         };
 

From 3f182f399fc9667a23aac32bc1108002f1ccbae2 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 30 Sep 2024 21:38:17 +0100
Subject: [PATCH 0016/1504] nixos/tests/komga: fix renamed 'port' option

---
 nixos/tests/komga.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/komga.nix b/nixos/tests/komga.nix
index d48d19bbbdd3..e5eee346350d 100644
--- a/nixos/tests/komga.nix
+++ b/nixos/tests/komga.nix
@@ -8,7 +8,7 @@ import ./make-test-python.nix ({ lib, ... }:
     { pkgs, ... }:
     { services.komga = {
         enable = true;
-        port = 1234;
+        settings.server.port = 1234;
       };
     };
 

From e380a8f3e0dc87b546a8bff1c41113220435ec7e Mon Sep 17 00:00:00 2001
From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com>
Date: Sat, 11 May 2024 23:17:51 +0200
Subject: [PATCH 0017/1504] nwjs: change license to MIT

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

diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 408584de712e..91cc9b7634d4 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -139,13 +139,13 @@ stdenv.mkDerivation {
       runHook postInstall
     '';
 
-  meta = with lib; {
+  meta = {
     description = "App runtime based on Chromium and node.js";
     homepage = "https://nwjs.io/";
     platforms = [ "i686-linux" "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = [ maintainers.mikaelfangel ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = [ lib.maintainers.mikaelfangel ];
     mainProgram = "nw";
-    license = licenses.bsd3;
+    license = lib.licenses.mit;
   };
 }

From 06d1364d1d2931d50b2143243859a34a92cd18d2 Mon Sep 17 00:00:00 2001
From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com>
Date: Sat, 11 May 2024 23:23:03 +0200
Subject: [PATCH 0018/1504] nwjs: simplify the bits variable assignment

Update pkgs/development/tools/nwjs/default.nix

Co-authored-by: Arne Keller <2012gdwu+github@posteo.de>
---
 pkgs/development/tools/nwjs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 91cc9b7634d4..5dfb16ded79e 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -37,7 +37,7 @@
 }:
 
 let
-  bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32";
+  bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
 
   nwEnv = buildEnv {
     name = "nwjs-env";

From 97eb707293a83aacf7a0d88b26c037e1baf0facb Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 9 Nov 2024 23:20:43 +0300
Subject: [PATCH 0019/1504] ceptre: format via nixfmt

---
 pkgs/by-name/ce/ceptre/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ce/ceptre/package.nix b/pkgs/by-name/ce/ceptre/package.nix
index f73631ff8d3b..2fc3619afb3d 100644
--- a/pkgs/by-name/ce/ceptre/package.nix
+++ b/pkgs/by-name/ce/ceptre/package.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, mlton }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  mlton,
+}:
 
 stdenv.mkDerivation {
   pname = "ceptre";

From 1bca079dcae044c505b121f26328ca78103c2b6c Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 9 Nov 2024 23:21:28 +0300
Subject: [PATCH 0020/1504] ceptre: bump to 0-unstable-2024-8-26

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

diff --git a/pkgs/by-name/ce/ceptre/package.nix b/pkgs/by-name/ce/ceptre/package.nix
index 2fc3619afb3d..54c190e2ca47 100644
--- a/pkgs/by-name/ce/ceptre/package.nix
+++ b/pkgs/by-name/ce/ceptre/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation {
   pname = "ceptre";
-  version = "unstable-2016-11-27";
+  version = "0-unstable-2024-8-26";
 
   src = fetchFromGitHub {
     owner = "chrisamaphone";
     repo = "interactive-lp";
-    rev = "e436fda2ccd44e9c9d226feced9d204311deacf5";
-    hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w=";
+    rev = "22df9ff622f3363824f345089a25016e2a897077";
+    hash = "sha256-MKA/289KWIYzHW0RbHC0Q2fMJT45WcABZrNsCWKZr4Y=";
     fetchSubmodules = true;
   };
 

From 43f4d40e99b8cce8ff454705b71f324903be89a3 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sat, 9 Nov 2024 23:22:45 +0300
Subject: [PATCH 0021/1504] ceptre: cleanup

Add myself as a maintainer so that I'm made aware of future updates, and get rid of nested `with lib`
---
 pkgs/by-name/ce/ceptre/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ce/ceptre/package.nix b/pkgs/by-name/ce/ceptre/package.nix
index 54c190e2ca47..a2623e73757e 100644
--- a/pkgs/by-name/ce/ceptre/package.nix
+++ b/pkgs/by-name/ce/ceptre/package.nix
@@ -20,15 +20,21 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ mlton ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin
     cp ceptre $out/bin
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linear logic programming language for modeling generative interactive systems";
     mainProgram = "ceptre";
     homepage = "https://github.com/chrisamaphone/interactive-lp";
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [
+      NotAShelf
+      pSub
+    ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.unfree;
   };
 }

From a141face92ff0b03c8d9613178399089b7483aed Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 11 Nov 2024 21:58:42 +0000
Subject: [PATCH 0022/1504] helmsman: nixfmt-rfc-style

---
 pkgs/by-name/he/helmsman/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index ad4fc5edaee0..d477fec2940b 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -1,4 +1,9 @@
-{ lib, buildGoModule, fetchFromGitHub, ... }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  ...
+}:
 
 buildGoModule rec {
   pname = "helmsman";

From 44604face4a01084f1bd17e3852e0accb2377fbe Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 12 Nov 2024 17:36:41 +1100
Subject: [PATCH 0023/1504] manta: fix build

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

diff --git a/pkgs/by-name/ma/manta/package.nix b/pkgs/by-name/ma/manta/package.nix
index 1f46e0141da3..c2b3b5ff542d 100644
--- a/pkgs/by-name/ma/manta/package.nix
+++ b/pkgs/by-name/ma/manta/package.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     PYTHONPATH=$out/lib/python/pyflow:$PYTHONPATH python -c 'import pyflowTaskWrapper; import pyflow'
   '';
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
+
   meta = with lib; {
     description = "Structural variant caller";
     license = licenses.gpl3;

From 19c58a0fa8e13fa72c6ccba1a8d446c2a7de68ba Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 11 Nov 2024 22:02:09 +0000
Subject: [PATCH 0024/1504] helmsman: only build helsman subPackage

helmsman drv would otherwise try to build the following subPackages:
https://github.com/Praqma/helmsman/tree/dadf5fa910fb25e48b617cb71f7f380d53970ea1/internal
---
 pkgs/by-name/he/helmsman/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index d477fec2940b..d78753c79ccd 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -16,6 +16,8 @@ buildGoModule rec {
     sha256 = "sha256-u/Fj3A81hH7i1yTg+kcqCPrwEkj0cyhZvNzRYURDoZU=";
   };
 
+  subPackages = [ "cmd/helmsman" ];
+
   vendorHash = "sha256-3eIMMKMvRzOSMvufETR9H1PnPDeEc+su8UuvbQJZ7kI=";
 
   doCheck = false;

From 5cc4399755f29a7ecb31810d77d02f4db2baa257 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 11 Nov 2024 22:05:59 +0000
Subject: [PATCH 0025/1504] helmsman: add sarcasticadmin as maintainer

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

diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix
index d78753c79ccd..f3f5136ab4de 100644
--- a/pkgs/by-name/he/helmsman/package.nix
+++ b/pkgs/by-name/he/helmsman/package.nix
@@ -27,6 +27,9 @@ buildGoModule rec {
     mainProgram = "helmsman";
     homepage = "https://github.com/Praqma/helmsman";
     license = licenses.mit;
-    maintainers = with maintainers; [ lynty ];
+    maintainers = with maintainers; [
+      lynty
+      sarcasticadmin
+    ];
   };
 }

From fad94949b18d7ee62a2f5c9127624176ce82670d Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Tue, 12 Nov 2024 23:11:10 +0100
Subject: [PATCH 0026/1504] megasync: remove freeimage

also use lib.cmakeBool
---
 ...eimage-remove-obsolete-ffmpeg-macros.patch | 26 -------------------
 pkgs/applications/misc/megasync/default.nix   |  7 ++---
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch

diff --git a/pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch b/pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
deleted file mode 100644
index 19c96c78dc61..000000000000
--- a/pkgs/applications/misc/megasync/010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/MEGASync/mega/src/gfx/freeimage.cpp
-+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp
-@@ -200,12 +200,6 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s
- 
- #ifdef HAVE_FFMPEG
- 
--#ifdef AV_CODEC_CAP_TRUNCATED
--#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
--#else
--#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
--#endif
--
- const char *GfxProviderFreeImage::supportedformatsFfmpeg()
- {
-     return  ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3"
-@@ -321,10 +315,6 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    if (decoder->capabilities & CAP_TRUNCATED)
--    {
--        codecContext->flags |= CAP_TRUNCATED;
--    }
- 
-     AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
-     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index b76650b4f2d7..56c4347b36b7 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -8,7 +8,6 @@
   curl,
   fetchFromGitHub,
   ffmpeg,
-  freeimage,
   hicolor-icon-theme,
   icu,
   libmediainfo,
@@ -59,7 +58,6 @@ mkDerivation rec {
     cryptopp
     curl
     ffmpeg
-    freeimage
     hicolor-icon-theme
     icu
     libmediainfo
@@ -82,7 +80,6 @@ mkDerivation rec {
   ];
 
   patches = [
-    ./010-megasync-freeimage-remove-obsolete-ffmpeg-macros.patch
     ./020-megasync-sdk-fix-cmake-dependencies-detection.patch
     ./030-megasync-app-fix-cmake-dependencies-detection.patch #Thanks Arch Linux
     ./040-megasync-fix-cmake-install-bindir.patch
@@ -99,8 +96,8 @@ mkDerivation rec {
 
   cmakeFlags = [
     "-DCMAKE_MODULE_PATH:PATH=${src}/src/MEGASync/mega/contrib/cmake/modules/packages"
-    "-Wno-dev"
-    "-DUSE_PDFIUM=FALSE" # PDFIUM is not in nixpkgs
+    (lib.cmakeBool "USE_PDFIUM" false) # PDFIUM is not in nixpkgs
+    (lib.cmakeBool "USE_FREEIMAGE" false) # freeimage is insecure
   ];
 
   meta = with lib; {

From 197e68c0d34ae1ae91e50dbf57918d13a681d7ed Mon Sep 17 00:00:00 2001
From: KSJ2000 <katsho123@outlook.com>
Date: Thu, 14 Nov 2024 11:06:11 +0200
Subject: [PATCH 0027/1504] dmg2img: 1.6.7 -> 1.6.7-unstable-2020-12-27

---
 pkgs/by-name/dm/dmg2img/package.nix | 59 +++++++++++++++++++----------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/dm/dmg2img/package.nix b/pkgs/by-name/dm/dmg2img/package.nix
index 8b1e997ff736..ff93db42d28e 100644
--- a/pkgs/by-name/dm/dmg2img/package.nix
+++ b/pkgs/by-name/dm/dmg2img/package.nix
@@ -1,33 +1,50 @@
-{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
+{
+  bzip2,
+  fetchFromGitHub,
+  lib,
+  openssl,
+  stdenv,
+  unstableGitUpdater,
+  zlib,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dmg2img";
-  version = "1.6.7";
+  version = "1.6.7-unstable-2020-12-27";
 
-  src = fetchurl {
-    url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz";
-    sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2";
+  src = fetchFromGitHub {
+    owner = "Lekensteyn";
+    repo = "dmg2img";
+    rev = "a3e413489ccdd05431401357bf21690536425012";
+    hash = "sha256-DewU5jz2lRjIRiT0ebjPRArsoye33xlEGfhzd4xnT4A=";
   };
 
-  buildInputs = [ zlib bzip2 openssl ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff";
-      sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx";
-    })
+  buildInputs = [
+    bzip2
+    openssl
+    zlib
   ];
 
-  patchFlags = [ "-p0" ];
-
-  installPhase = ''
-    install -D dmg2img $out/bin/dmg2img
-    install -D vfdecrypt $out/bin/vfdecrypt
+  preBuild = ''
+    sed -i "s/1.6.5/${finalAttrs.version}/" dmg2img.c
   '';
 
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 dmg2img vfdecrypt -t $out/bin
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
+    description = "Tool which allows converting Apple compressed dmg archives to standard (hfsplus) image disk files";
+    homepage = "https://github.com/Lekensteyn/dmg2img";
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    description = "Apple's compressed dmg to standard (hfsplus) image disk file convert tool";
-    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ KSJ2000 ];
+    mainProgram = "dmg2img";
   };
-}
+})

From 1714b4c1755f57b57299e7ead398b74d74e34206 Mon Sep 17 00:00:00 2001
From: Anna Aurora <anna@annaaurora.eu>
Date: Mon, 4 Nov 2024 19:07:07 +0100
Subject: [PATCH 0028/1504] kaufkauflist: 4.0.0 -> 4.0.2

---
 pkgs/by-name/ka/kaufkauflist/package.nix | 47 ++++++++++++++----------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix
index 895567ba659b..8fb3073405a4 100644
--- a/pkgs/by-name/ka/kaufkauflist/package.nix
+++ b/pkgs/by-name/ka/kaufkauflist/package.nix
@@ -1,37 +1,44 @@
-{ lib
-, buildPackages
-, fetchFromGitHub
-, buildNpmPackage
-, fetchFromGitea
-, nix-update-script
+{
+  lib,
+  buildPackages,
+  fetchFromGitHub,
+  buildNpmPackage,
+  fetchFromGitea,
+  nix-update-script,
 }:
 
 let
   esbuild' = buildPackages.esbuild.override {
-    buildGoModule = args: buildPackages.buildGoModule (args // rec {
-      version = "0.19.11";
-      src = fetchFromGitHub {
-        owner = "evanw";
-        repo = "esbuild";
-        rev = "v${version}";
-        hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU=";
-      };
-      vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
-    });
+    buildGoModule =
+      args:
+      buildPackages.buildGoModule (
+        args
+        // rec {
+          version = "0.21.5";
+          src = fetchFromGitHub {
+            owner = "evanw";
+            repo = "esbuild";
+            rev = "v${version}";
+            hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";
+          };
+          vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+        }
+      );
   };
-in buildNpmPackage rec {
+in
+buildNpmPackage rec {
   pname = "kaufkauflist";
-  version = "4.0.0";
+  version = "4.0.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "annaaurora";
     repo = "kaufkauflist";
     rev = "v${version}";
-    hash = "sha256-x30K2dYxawfebdq//9OmCCG48w0V04tDTXpvRW7lfJI=";
+    hash = "sha256-tvkicYFQewQdcz3e+ETLiCK/c3eNPlxxZNzt+OpIbN0=";
   };
 
-  npmDepsHash = "sha256-E3AXFwiRvrE2Swt7BfSfAoU5mQplSaSJ4q56pVfoEkQ=";
+  npmDepsHash = "sha256-HDv6sW6FmKZpUjymrUjz/WG9XrKgLmM6qHMAxP6gBtU=";
 
   ESBUILD_BINARY_PATH = lib.getExe esbuild';
 

From fe4fac1fe40a2939e6025347cc1776b5d7313f21 Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Mon, 18 Nov 2024 16:14:05 +0100
Subject: [PATCH 0029/1504] megasync: use fetchpatch

---
 ...sdk-fix-cmake-dependencies-detection.patch | 20 -------------------
 ...app-fix-cmake-dependencies-detection.patch | 16 ---------------
 pkgs/applications/misc/megasync/default.nix   | 16 +++++++++++----
 ...> megasync-fix-cmake-install-bindir.patch} |  0
 4 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch
 delete mode 100644 pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch
 rename pkgs/applications/misc/megasync/{040-megasync-fix-cmake-install-bindir.patch => megasync-fix-cmake-install-bindir.patch} (100%)

diff --git a/pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch b/pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch
deleted file mode 100644
index ce0d9d10b56c..000000000000
--- a/pkgs/applications/misc/megasync/020-megasync-sdk-fix-cmake-dependencies-detection.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
-+++ b/src/MEGASync/mega/contrib/cmake/modules/sdklib_libraries.cmake
-@@ -95,7 +95,7 @@ macro(load_sdklib_libraries)
- 
-         find_package(PkgConfig REQUIRED) # For libraries loaded using pkg-config
- 
--        pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcrypto++)
-+        pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)
-         target_link_libraries(SDKlib PUBLIC PkgConfig::cryptopp) # TODO: Private for SDK core
- 
-         pkg_check_modules(sodium REQUIRED IMPORTED_TARGET libsodium)
-@@ -139,7 +139,7 @@ macro(load_sdklib_libraries)
-         endif()
- 
-         if(USE_PDFIUM)
--            pkg_check_modules(pdfium REQUIRED IMPORTED_TARGET pdfium)
-+            pkg_check_modules(pdfium REQUIRED IMPORTED_TARGET libpdfium)
-             target_link_libraries(SDKlib PRIVATE PkgConfig::pdfium)
-             set(HAVE_PDFIUM 1)
-         endif()
diff --git a/pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch b/pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch
deleted file mode 100644
index e8703d1ce0e0..000000000000
--- a/pkgs/applications/misc/megasync/030-megasync-app-fix-cmake-dependencies-detection.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/MEGAUpdateGenerator/CMakeLists.txt
-+++ b/src/MEGAUpdateGenerator/CMakeLists.txt
-@@ -15,10 +15,11 @@ target_sources(MEGAUpdateGenerator
- )
- 
- # Load and link needed libraries for the CHATlib target
--find_package(cryptopp CONFIG REQUIRED)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)
- target_link_libraries(MEGAUpdateGenerator
-     PRIVATE
--    cryptopp::cryptopp
-+    PkgConfig::cryptopp
-     MEGA::SDKlib
- )
- 
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 56c4347b36b7..45192bb0d241 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,7 +1,7 @@
-
 {
   lib,
   stdenv,
+  fetchpatch,
   c-ares,
   cmake,
   cryptopp,
@@ -80,9 +80,17 @@ mkDerivation rec {
   ];
 
   patches = [
-    ./020-megasync-sdk-fix-cmake-dependencies-detection.patch
-    ./030-megasync-app-fix-cmake-dependencies-detection.patch #Thanks Arch Linux
-    ./040-megasync-fix-cmake-install-bindir.patch
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync";
+      hash = "sha256-y3WhLkawFzQRzzRBpioiyAT3F1NDQvYBOm2888g5V5c=";
+      extraPrefix = "src/MEGASync/mega/";
+      stripLen = true;
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync";
+      hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U=";
+    })
+    ./megasync-fix-cmake-install-bindir.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/misc/megasync/040-megasync-fix-cmake-install-bindir.patch b/pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch
similarity index 100%
rename from pkgs/applications/misc/megasync/040-megasync-fix-cmake-install-bindir.patch
rename to pkgs/applications/misc/megasync/megasync-fix-cmake-install-bindir.patch

From 55fdc8ea50647ffe51fa5a116fbed8b105aa9f25 Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Mon, 18 Nov 2024 16:20:14 +0100
Subject: [PATCH 0030/1504] megasync: version fetchpatch urls so they don't
 magically break

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

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 45192bb0d241..a66581fb334c 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -81,13 +81,13 @@ mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync&id=4b1eca5bc0d75709dee3a1260264d1b6386d3398";
       hash = "sha256-y3WhLkawFzQRzzRBpioiyAT3F1NDQvYBOm2888g5V5c=";
       extraPrefix = "src/MEGASync/mega/";
       stripLen = true;
     })
     (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync&id=4b1eca5bc0d75709dee3a1260264d1b6386d3398";
       hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U=";
     })
     ./megasync-fix-cmake-install-bindir.patch

From 55a2b3eb0c016c3a450dec784a9d1a70051d6df8 Mon Sep 17 00:00:00 2001
From: Pim Snel <post@pimsnel.com>
Date: Fri, 16 Aug 2024 16:39:15 +0200
Subject: [PATCH 0031/1504] sc-im: fix aligning selection of cells cause crash

Fixes #335130

For complete description of problem with video see
https://github.com/andmarti1424/sc-im/issues/884
---
 pkgs/by-name/sc/sc-im/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix
index c8d90823863f..978b858c6458 100644
--- a/pkgs/by-name/sc/sc-im/package.nix
+++ b/pkgs/by-name/sc/sc-im/package.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=${placeholder "out"}" ];
 
+  # https://github.com/andmarti1424/sc-im/issues/884
+  hardeningDisable = [ "fortify" ];
+
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
 
   postInstall = ''

From 5378b5f6f408a15ffe19d7e80a0275571f031eb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 10:33:05 +0000
Subject: [PATCH 0032/1504] python312Packages.mkdocs-material: 9.5.39 -> 9.5.45

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

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index 1d78557d796e..4eafbac1307e 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.5.39";
+  version = "9.5.45";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "squidfunk";
     repo = "mkdocs-material";
     rev = "refs/tags/${version}";
-    hash = "sha256-ArCd7NbqvPw3kHJd4MG62FplgXwW1gFTfdCHZqfxuqU=";
+    hash = "sha256-uhUatalHcObQbar1xbdR44FnQs/+qS4ad0sdB2jH/OU=";
   };
 
   nativeBuildInputs = [

From bee089e0e10f2d1c81f941c36d818cb6e870c800 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Nov 2024 19:30:04 +0000
Subject: [PATCH 0033/1504] python312Packages.langcodes: 3.4.1 -> 3.5.0

---
 .../development/python-modules/langcodes/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix
index 342459baea45..c69eaa54f189 100644
--- a/pkgs/development/python-modules/langcodes/default.nix
+++ b/pkgs/development/python-modules/langcodes/default.nix
@@ -12,22 +12,22 @@
 
 buildPythonPackage rec {
   pname = "langcodes";
-  version = "3.4.1";
-  format = "pyproject";
+  version = "3.5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-okh5/tI4ATrDryQkudESTji0o4sgRP0pfI/zjlkS5xg=";
+    hash = "sha256-Hu+BaNB+UeExokl//srUtmP2II58OuO43BXFFzSm+AE=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     language-data
     marisa-trie
     setuptools # pkg_resources import in language_data/util.py

From cbead292e4aafd2ff4a384cfead3fb824d3d0657 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Mon, 2 Sep 2024 17:04:28 +0200
Subject: [PATCH 0034/1504] ani-cli: only add the player to the PATH as a
 fallback, format

---
 pkgs/by-name/an/ani-cli/package.nix | 62 ++++++++++++++++-------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index b5d9fb11f5e0..21a4f6352c0e 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -1,23 +1,29 @@
-{ fetchFromGitHub
-, makeWrapper
-, stdenvNoCC
-, lib
-, gnugrep
-, gnused
-, curl
-, catt
-, syncplay
-, ffmpeg
-, fzf
-, aria2
-, withMpv ? true, mpv
-, withVlc ? false, vlc
-, withIina ? false, iina
-, chromecastSupport ? false
-, syncSupport ? false
+{
+  fetchFromGitHub,
+  makeWrapper,
+  stdenvNoCC,
+  lib,
+  gnugrep,
+  gnused,
+  curl,
+  catt,
+  syncplay,
+  ffmpeg,
+  fzf,
+  aria2,
+  mpv,
+  vlc,
+  iina,
+  withMpv ? true,
+  withVlc ? false,
+  withIina ? false,
+  chromecastSupport ? false,
+  syncSupport ? false,
 }:
 
-assert withMpv || withVlc || withIina;
+let
+  players = lib.optional withMpv mpv ++ lib.optional withVlc vlc ++ lib.optional withIina iina;
+in
 
 stdenvNoCC.mkDerivation rec {
   pname = "ani-cli";
@@ -31,15 +37,14 @@ stdenvNoCC.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  runtimeDependencies =
-    let player = []
-        ++ lib.optional withMpv mpv
-        ++ lib.optional withVlc vlc
-        ++ lib.optional withIina iina;
-    in [ gnugrep gnused curl fzf ffmpeg aria2 ]
-      ++ player
-      ++ lib.optional chromecastSupport catt
-      ++ lib.optional syncSupport syncplay;
+  runtimeDependencies = [
+    gnugrep
+    gnused
+    curl
+    fzf
+    ffmpeg
+    aria2
+  ] ++ lib.optional chromecastSupport catt ++ lib.optional syncSupport syncplay;
 
   installPhase = ''
     runHook preInstall
@@ -47,7 +52,8 @@ stdenvNoCC.mkDerivation rec {
     install -Dm755 ani-cli $out/bin/ani-cli
 
     wrapProgram $out/bin/ani-cli \
-      --prefix PATH : ${lib.makeBinPath runtimeDependencies}
+      --prefix PATH : ${lib.makeBinPath runtimeDependencies} \
+      ${lib.optionalString (builtins.length players > 0) "--suffix PATH : ${lib.makeBinPath players}"}
 
     runHook postInstall
   '';

From c3d2d3e3148d9fb50554799c379ece36238f7ba3 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 14 Sep 2024 21:13:17 +0200
Subject: [PATCH 0035/1504] ani-cli: add diniamo as a maintainer

---
 pkgs/by-name/an/ani-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 21a4f6352c0e..158cef30a400 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/pystardust/ani-cli";
     description = "Cli tool to browse and play anime";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ skykanin ];
+    maintainers = with maintainers; [ skykanin diniamo ];
     platforms = platforms.unix;
     mainProgram = "ani-cli";
   };

From 80ab465c94ee609d5629bb97a4043465f0d5661f Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 14 Sep 2024 21:26:07 +0200
Subject: [PATCH 0036/1504] ani-cli: avoid `with lib;`

---
 pkgs/by-name/an/ani-cli/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index 158cef30a400..a3d5fa98b2b5 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -58,12 +58,15 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/pystardust/ani-cli";
     description = "Cli tool to browse and play anime";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ skykanin diniamo ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      skykanin
+      diniamo
+    ];
+    platforms = lib.platforms.unix;
     mainProgram = "ani-cli";
   };
 }

From 0ac27f49bfd68f9fdcbb46d271b691bc7458543d Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 14 Sep 2024 21:26:22 +0200
Subject: [PATCH 0037/1504] ani-cli: avoid `rec`

---
 pkgs/by-name/an/ani-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix
index a3d5fa98b2b5..da34a48d55e0 100644
--- a/pkgs/by-name/an/ani-cli/package.nix
+++ b/pkgs/by-name/an/ani-cli/package.nix
@@ -25,19 +25,19 @@ let
   players = lib.optional withMpv mpv ++ lib.optional withVlc vlc ++ lib.optional withIina iina;
 in
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ani-cli";
   version = "4.9";
 
   src = fetchFromGitHub {
     owner = "pystardust";
     repo = "ani-cli";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  runtimeDependencies = [
+  runtimeInputs = [
     gnugrep
     gnused
     curl
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec {
     install -Dm755 ani-cli $out/bin/ani-cli
 
     wrapProgram $out/bin/ani-cli \
-      --prefix PATH : ${lib.makeBinPath runtimeDependencies} \
+      --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs} \
       ${lib.optionalString (builtins.length players > 0) "--suffix PATH : ${lib.makeBinPath players}"}
 
     runHook postInstall
@@ -69,4 +69,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "ani-cli";
   };
-}
+})

From 6982710bb21a84d9b37ea5760050245950a64d95 Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Sat, 23 Nov 2024 11:51:53 +0100
Subject: [PATCH 0038/1504] megasync: 5.5.0.0 -> 5.6.1.0

As stated, the DesignTokensImporter submodule cannot be fetched, so I only check
out the megasdk submodule.

The get_clang_format fails, so copy it from local
---
 pkgs/applications/misc/megasync/default.nix   | 27 ++++++++++++++-----
 .../megasync/dont-fetch-clang-format.patch    | 10 +++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/misc/megasync/dont-fetch-clang-format.patch

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index a66581fb334c..b0e80a4b5a41 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,12 +1,12 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   c-ares,
   cmake,
   cryptopp,
   curl,
   fetchFromGitHub,
+  fetchpatch,
   ffmpeg,
   hicolor-icon-theme,
   icu,
@@ -36,14 +36,28 @@
 }:
 mkDerivation rec {
   pname = "megasync";
-  version = "5.5.0.0";
+  version = "5.6.1.0";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitHub rec {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    hash = "sha256-f+FZdMMdGZvYvJZ0xTUuO9zk0/VHFAISvM2cW0zwfaE=";
-    fetchSubmodules = true;
+    hash = "sha256-EjXmx+beYH3J60RidkEbZHFS5ZAOpJKmNC+WCIM84RA=";
+    fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync
+    leaveDotGit = true;
+    postFetch = ''
+      cd $out
+
+      git remote add origin $url
+      git fetch origin
+      git clean -fdx
+      git checkout ${rev}
+      git submodule update --init src/MEGASync/mega
+
+      cp src/MEGASync/mega/.clang-format .clang-format
+
+      rm -rf .git
+    ''; # Why so complicated, I just want a single submodule
   };
 
   nativeBuildInputs = [
@@ -91,6 +105,7 @@ mkDerivation rec {
       hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U=";
     })
     ./megasync-fix-cmake-install-bindir.patch
+    ./dont-fetch-clang-format.patch
   ];
 
   postPatch = ''
@@ -103,9 +118,9 @@ mkDerivation rec {
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DCMAKE_MODULE_PATH:PATH=${src}/src/MEGASync/mega/contrib/cmake/modules/packages"
     (lib.cmakeBool "USE_PDFIUM" false) # PDFIUM is not in nixpkgs
     (lib.cmakeBool "USE_FREEIMAGE" false) # freeimage is insecure
+    (lib.cmakeBool "ENABLE_DESIGN_TOKENS_IMPORTER" false) # cannot be fetched
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch b/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch
new file mode 100644
index 000000000000..ae76fbdcf5e2
--- /dev/null
+++ b/pkgs/applications/misc/megasync/dont-fetch-clang-format.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b04f57067..0f6e7b163 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,5 +63,3 @@ include(desktopapp_configuration)
+ # Load the MEGA targets
+ add_subdirectory(src)
+ 
+-include(get_clang_format)
+-get_clang_format()

From 27f7066b00a532383b28a7090d185833eae3be12 Mon Sep 17 00:00:00 2001
From: Builditluc <git@builditluc.eu>
Date: Sat, 23 Nov 2024 13:48:56 +0100
Subject: [PATCH 0039/1504] codecrafters-cli: 34 -> 35

---
 pkgs/by-name/co/codecrafters-cli/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index ecbcf5440882..9f37ae28361b 100644
--- a/pkgs/by-name/co/codecrafters-cli/package.nix
+++ b/pkgs/by-name/co/codecrafters-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "codecrafters-cli";
-  version = "34";
+  version = "35";
 
   src = fetchFromGitHub {
     owner = "codecrafters-io";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-+daBduhjUt7lrjTdXgm1qpZN1oEHC3Nx+ZiOLoO5+s4=";
+    hash = "sha256-gCSlXI8DggQts7Em1onD4B5CxrfAlPuwovWRUgpsu/E=";
     # A shortened git commit hash is part of the version output, and is
     # needed at build time. Use the `.git` directory to retrieve the
     # commit SHA, and remove the directory afterwards since it is not needed
@@ -25,7 +25,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-TQcxzfiqKeCQZUKLHnPjBa/0WsYJhER3fmr4cRGFknw=";
+  vendorHash = "sha256-lRDHe/7kCy8T4paA/6FVfM/sjBpvcGWLeW7b+dOnFo0=";
 
   ldflags = [
     "-s"
@@ -38,7 +38,9 @@ buildGoModule rec {
     ldflags+=" -X github.com/codecrafters-io/cli/internal/utils.Commit=$(cat COMMIT)"
   '';
 
-  doCheck = true;
+  # We need to disable tests because the tests for respecting .gitignore
+  # include setting up a global gitignore which doesn't work.
+  doCheck = false;
 
   nativeBuildInputs = [ git ];
 

From 83149d48fd418792b7d3aeb9a3809fe49f83afae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 17:27:44 +0000
Subject: [PATCH 0040/1504] python312Packages.openturns: 1.23 -> 1.24

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

diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix
index 5d62a61c2e95..17b192621e26 100644
--- a/pkgs/by-name/op/openturns/package.nix
+++ b/pkgs/by-name/op/openturns/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openturns";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchFromGitHub {
     owner = "openturns";
     repo = "openturns";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-csl5cZvxU8fdLKvh04ZWKizClrHqF79c7tAMSejo2lk=";
+    hash = "sha256-88wxgifLuF/P/qeMLVP0S5Agutf022Dsysu38mh9+8w=";
   };
 
   nativeBuildInputs = [

From bfc5706cf4cb50255453ea2ef9bd476ce3e7ebcf Mon Sep 17 00:00:00 2001
From: Luka Leer <luka.leer@gmail.com>
Date: Tue, 26 Nov 2024 00:33:44 +0100
Subject: [PATCH 0041/1504] maintainers: add mahtaran

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af87adef0619..dd97fa9024ee 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13317,6 +13317,17 @@
     githubId = 24735185;
     name = "Mahmoud Ayman";
   };
+  mahtaran = {
+    email = "luka.leer@gmail.com";
+    github = "mahtaran";
+    githubId = 22727323;
+    name = "Luka Leer";
+    keys = [
+      {
+        fingerprint = "C7FF B72E 0527 423A D470  E132 AA82 C4EB CB16 82E0";
+      }
+    ];
+  };
   majesticmullet = {
     email = "hoccthomas@gmail.com.au";
     github = "MajesticMullet";

From c61fc34b47d71894d4514e1440de5e1929db4b75 Mon Sep 17 00:00:00 2001
From: Luka Leer <luka.leer@gmail.com>
Date: Tue, 26 Nov 2024 00:34:07 +0100
Subject: [PATCH 0042/1504] python3Packages.mkdocs-git-committers-plugin-2:
 init at 2.4.1

---
 .../default.nix                               | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix

diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix
new file mode 100644
index 000000000000..6ff5a1c51101
--- /dev/null
+++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix
@@ -0,0 +1,52 @@
+{
+  # Evaluation
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+
+  # Build
+  setuptools,
+
+  # Dependencies
+  gitpython,
+  mkdocs,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "mkdocs-git-committers-plugin-2";
+  version = "2.4.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "ojacques";
+    repo = "mkdocs-git-committers-plugin-2";
+    rev = "refs/tags/${version}";
+    hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    gitpython
+    mkdocs
+    requests
+  ];
+
+  # Upstream has no tests
+  doCheck = false;
+  pythonImportsCheck = [ "mkdocs_git_committers_plugin_2" ];
+
+  meta = {
+    description = "MkDocs plugin for displaying a list of contributors on each page";
+    homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2";
+    changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mahtaran ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eaa610cde265..b1825cae52c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8167,6 +8167,8 @@ self: super: with self; {
 
   mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { };
 
+  mkdocs-git-committers-plugin-2 = callPackage ../development/python-modules/mkdocs-git-committers-plugin-2 { };
+
   mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { };
 
   mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };

From a85eeff36e6280d019c1f7d31806eca2d0ac4298 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 08:31:47 +0000
Subject: [PATCH 0043/1504] typescript: 5.6.3 -> 5.7.2

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

diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index de15795895d2..e59274be900d 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -2,20 +2,20 @@
 
 buildNpmPackage rec {
   pname = "typescript";
-  version = "5.6.3";
+  version = "5.7.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "TypeScript";
     rev = "v${version}";
-    hash = "sha256-DsGTVqCbzifPmgCrca5M7qeUPiMThByq6esN+bMt4fU=";
+    hash = "sha256-T74n9lDC6Yt40hwL0BhRjo5q3M3gROY8tQJcuRWWoBQ=";
   };
 
   patches = [
     ./disable-dprint-dstBundler.patch
   ];
 
-  npmDepsHash = "sha256-w3Tm7BJ2usrjut6HrhjgXe7TIgq5PxYeHRenz4aybk4=";
+  npmDepsHash = "sha256-uaNRgXPZCNpPmZISAS6m4WLYPFTrsJ/w+YfQsQfxTVM=";
 
   passthru.tests = {
     version = testers.testVersion {

From 623d6fbbca58104cf5167ce9433812296e86f207 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 26 Nov 2024 13:32:27 +0100
Subject: [PATCH 0044/1504] netbox: 4.1.3 -> 4.1.7

---
 pkgs/by-name/ne/netbox_4_1/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ne/netbox_4_1/package.nix b/pkgs/by-name/ne/netbox_4_1/package.nix
index be5b53042793..2fd7eebaa1c7 100644
--- a/pkgs/by-name/ne/netbox_4_1/package.nix
+++ b/pkgs/by-name/ne/netbox_4_1/package.nix
@@ -15,7 +15,7 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "netbox";
-  version = "4.1.3";
+  version = "4.1.7";
 
   format = "other";
 
@@ -23,14 +23,17 @@ py.pkgs.buildPythonApplication rec {
     owner = "netbox-community";
     repo = "netbox";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SRzkmRkniVDu6vYGa9Kd9exob/LHpGBPd+lRA/pbCFo=";
+    hash = "sha256-0AyIXSiNsAHELM8Ry/bcm7sd7K+ApeoEguiEm8ecAU0=";
   };
 
   patches = [
     ./custom-static-root.patch
+
+    # Rebase of PR 17620 "Upgrade to Django 5.1"
+    # https://github.com/netbox-community/netbox/pull/17620
     (fetchpatch {
-      url = "https://github.com/netbox-community/netbox/pull/17620.patch";
-      hash = "sha256-zN2zke4qlNJUbxI8mSV+zGmEv0Qtd0zSCbCXWyE1L2k=";
+      url = "https://github.com/netbox-community/netbox/commit/cda9e0525dc850ddd82bf46762a64607bf97df83.patch";
+      hash = "sha256-iJiz5f926Np1k4c9DpfPe0HefJy1CH6c0wjwBIt1vWQ=";
     })
   ];
 

From 046286d6b95930b01a5118844169794cce52e33a Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Mon, 25 Nov 2024 20:57:39 +0100
Subject: [PATCH 0045/1504] diffoscope: add additional tools

---
 pkgs/tools/misc/diffoscope/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index b71bf958f32b..8b53e426a64c 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  aapt,
   abootimg,
   acl,
   apksigcopier,
@@ -54,6 +55,7 @@
   openssh,
   openssl,
   pdftk,
+  perl,
   pgpdump,
   poppler_utils,
   procyon,
@@ -63,6 +65,7 @@
   sng,
   sqlite,
   squashfsTools,
+  systemdUkify,
   tcpdump,
   ubootTools,
   unzip,
@@ -136,7 +139,6 @@ python.pkgs.buildPythonApplication rec {
   #
   # Still missing these tools:
   # Android-specific tools:
-  # aapt2
   # dexdump
   # Darwin-specific tools:
   # lipo
@@ -204,6 +206,7 @@ python.pkgs.buildPythonApplication rec {
     ])
     ++ lib.optionals enableBloat (
       [
+        aapt
         abootimg
         apksigcopier
         apksigner
@@ -228,10 +231,12 @@ python.pkgs.buildPythonApplication rec {
         odt2txt
         openssh
         pdftk
+        perl
         poppler_utils
         procyon
         qemu
         R
+        systemdUkify
         tcpdump
         ubootTools
         wabt
@@ -240,6 +245,7 @@ python.pkgs.buildPythonApplication rec {
       ]
       ++ (with python.pkgs; [
         androguard
+        black
         guestfs
         h5py
         pdfminer-six

From a0f0eafede8a035794f41dbd509937738e832e11 Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Fri, 29 Nov 2024 10:54:39 +0100
Subject: [PATCH 0046/1504] megasync: don't cp clang-format

---
 pkgs/applications/misc/megasync/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index b0e80a4b5a41..938795d001bb 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -54,8 +54,6 @@ mkDerivation rec {
       git checkout ${rev}
       git submodule update --init src/MEGASync/mega
 
-      cp src/MEGASync/mega/.clang-format .clang-format
-
       rm -rf .git
     ''; # Why so complicated, I just want a single submodule
   };

From 0941dc795a2f8f70e8682c9f74362bf9649b1669 Mon Sep 17 00:00:00 2001
From: jurraca <julienu@pm.me>
Date: Fri, 29 Nov 2024 12:16:22 +0000
Subject: [PATCH 0047/1504] nostr-rs-relay: 0.8.13-unstable -> 0.9.0

---
 pkgs/by-name/no/nostr-rs-relay/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index c63f4d2a057f..a1ddcc3b2725 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nostr-rs-relay";
-  version = "0.8.13-unstable-2024-08-14";
+  version = "0.9.0";
   src = fetchFromGitHub {
     owner = "scsibug";
     repo = "nostr-rs-relay";
-    rev = "5a2189062560709b641bb13bedaca2cd478b4403";
-    hash = "sha256-ZUndTcLGdAODgSsIqajlNdaEYbYWame0vFRBVmRFzKw=";
+    rev = version;
+    hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E=";
   };
 
-  cargoHash = "sha256-+agmlg6tAnEJ5o586fUY7V4fdNScDPKCbaZqt7R3gqg=";
+  cargoHash = "sha256-nKW3mnD/PgDU+WBBwO0SYfNmLYl5T2k4qwPo79DbJpk=";
 
   buildInputs = [ openssl.dev ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [

From f2b47bffd00ba103eea3bcc62b3926892d14805d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 20:32:32 +0100
Subject: [PATCH 0048/1504] ciscoPacketTracer8: nixfmt

---
 .../by-name/ci/ciscoPacketTracer8/package.nix | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index 8c29081bf79e..01ae0ae1f7f1 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -1,17 +1,18 @@
-{ stdenvNoCC
-, lib
-, alsa-lib
-, autoPatchelfHook
-, copyDesktopItems
-, dbus
-, dpkg
-, expat
-, fontconfig
-, glib
-, makeDesktopItem
-, makeWrapper
-, qt5
-, requireFile
+{
+  stdenvNoCC,
+  lib,
+  alsa-lib,
+  autoPatchelfHook,
+  copyDesktopItems,
+  dbus,
+  dpkg,
+  expat,
+  fontconfig,
+  glib,
+  makeDesktopItem,
+  makeWrapper,
+  qt5,
+  requireFile,
 }:
 
 let
@@ -91,7 +92,11 @@ stdenvNoCC.mkDerivation (args: {
       desktopName = "Cisco Packet Tracer 8";
       icon = "ciscoPacketTracer8";
       exec = "packettracer8 %f";
-      mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
+      mimeTypes = [
+        "application/x-pkt"
+        "application/x-pka"
+        "application/x-pkz"
+      ];
     })
   ];
 

From b5047459f9ccb75c513e2b06014711333f501dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 29 Nov 2024 19:44:21 +0100
Subject: [PATCH 0049/1504] ciscoPacketTracer8: remove `with lib;`, order
 `meta` attrs

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

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index 01ae0ae1f7f1..f6b81b6e69f6 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -106,13 +106,13 @@ stdenvNoCC.mkDerivation (args: {
     inherit hashes;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Network simulation tool from Cisco";
     homepage = "https://www.netacad.com/courses/packet-tracer";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ ];
-    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.unfree;
     mainProgram = "packettracer8";
+    maintainers = with lib.maintainers; [ ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From aeb72d953458ca682d8dacf93545bcad4343d0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 29 Nov 2024 19:45:49 +0100
Subject: [PATCH 0050/1504] ciscoPacketTracer8: add maintainer gepbird

---
 pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index f6b81b6e69f6..fef17198f253 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -111,7 +111,9 @@ stdenvNoCC.mkDerivation (args: {
     homepage = "https://www.netacad.com/courses/packet-tracer";
     license = lib.licenses.unfree;
     mainProgram = "packettracer8";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      gepbird
+    ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };

From 46041f4f37a762e533a70bb897c27f13c24edd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 23:03:02 +0100
Subject: [PATCH 0051/1504] ciscoPacketTracer8: add version parameter

---
 pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index fef17198f253..1c3f5f016a18 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -13,6 +13,7 @@
   makeWrapper,
   qt5,
   requireFile,
+  version ? "8.2.2",
 }:
 
 let
@@ -28,14 +29,14 @@ let
   };
 in
 
-stdenvNoCC.mkDerivation (args: {
+stdenvNoCC.mkDerivation {
   pname = "ciscoPacketTracer8";
 
-  version = "8.2.2";
+  inherit version;
 
   src = requireFile {
-    name = names.${args.version};
-    hash = hashes.${args.version};
+    name = names.${version};
+    hash = hashes.${version};
     url = "https://www.netacad.com";
   };
 
@@ -117,4 +118,4 @@ stdenvNoCC.mkDerivation (args: {
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
-})
+}

From f8e91e908e33ceb61418cc75e9bee24af93d4948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 15 Nov 2024 23:07:54 +0100
Subject: [PATCH 0052/1504] ciscoPacketTracer8: revert to fhsEnv

---
 .../by-name/ci/ciscoPacketTracer8/package.nix | 155 +++++++++++-------
 1 file changed, 99 insertions(+), 56 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index 1c3f5f016a18..f21558d9de36 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -1,18 +1,29 @@
 {
-  stdenvNoCC,
   lib,
-  alsa-lib,
+  stdenvNoCC,
+  requireFile,
   autoPatchelfHook,
-  copyDesktopItems,
+  makeWrapper,
+  alsa-lib,
   dbus,
-  dpkg,
   expat,
   fontconfig,
   glib,
+  libdrm,
+  libglvnd,
+  libpulseaudio,
+  libudev0-shim,
+  libxkbcommon,
+  libxml2,
+  libxslt,
+  nspr,
+  wayland,
+  nss,
+  xorg,
+  dpkg,
+  buildFHSEnv,
+  copyDesktopItems,
   makeDesktopItem,
-  makeWrapper,
-  qt5,
-  requireFile,
   version ? "8.2.2",
 }:
 
@@ -27,62 +38,100 @@ let
     "8.2.1" = "CiscoPacketTracer_821_Ubuntu_64bit.deb";
     "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb";
   };
+
+  unwrapped = stdenvNoCC.mkDerivation {
+    name = "ciscoPacketTracer8-unwrapped";
+    inherit version;
+
+    src = requireFile {
+      name = names.${version};
+      hash = hashes.${version};
+      url = "https://www.netacad.com";
+    };
+
+    buildInputs =
+      [
+        autoPatchelfHook
+        makeWrapper
+        alsa-lib
+        dbus
+        expat
+        fontconfig
+        glib
+        libdrm
+        libglvnd
+        libpulseaudio
+        libudev0-shim
+        libxkbcommon
+        libxml2
+        libxslt
+        nspr
+        nss
+        wayland
+      ]
+      ++ (with xorg; [
+        libICE
+        libSM
+        libX11
+        libXScrnSaver
+        libXcomposite
+        libXcursor
+        libXdamage
+        libXext
+        libXfixes
+        libXi
+        libXrandr
+        libXrender
+        libXtst
+        libxcb
+        xcbutilimage
+        xcbutilkeysyms
+        xcbutilrenderutil
+        xcbutilwm
+      ]);
+
+    unpackPhase = ''
+      runHook preUnpack
+
+      ${lib.getExe' dpkg "dpkg-deb"} -x $src $out
+      chmod 755 "$out"
+
+      runHook postUnpack
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \
+        --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
+
+      runHook postInstall
+    '';
+  };
+
+  fhs-env = buildFHSEnv {
+    name = "ciscoPacketTracer8-fhs-env";
+    runScript = lib.getExe' unwrapped "packettracer8";
+    targetPkgs = pkgs: [ libudev0-shim ];
+  };
 in
 
 stdenvNoCC.mkDerivation {
   pname = "ciscoPacketTracer8";
-
   inherit version;
 
-  src = requireFile {
-    name = names.${version};
-    hash = hashes.${version};
-    url = "https://www.netacad.com";
-  };
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    dpkg-deb -x $src $out
-    chmod 755 "$out"
-
-    runHook postUnpack
-  '';
+  dontUnpack = true;
 
   nativeBuildInputs = [
-    autoPatchelfHook
     copyDesktopItems
-    dpkg
-    makeWrapper
-    qt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    alsa-lib
-    dbus
-    expat
-    fontconfig
-    glib
-    qt5.qtbase
-    qt5.qtmultimedia
-    qt5.qtnetworkauth
-    qt5.qtscript
-    qt5.qtspeech
-    qt5.qtwebengine
-    qt5.qtwebsockets
   ];
 
   installPhase = ''
     runHook preInstall
 
-    makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \
-      "''${qtWrapperArgs[@]}" \
-      --set QT_QPA_PLATFORMTHEME "" \
-      --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
-
-    install -D $out/opt/pt/art/app.png $out/share/icons/hicolor/128x128/apps/ciscoPacketTracer8.png
-
-    rm $out/opt/pt/bin/libQt5* -f
+    mkdir -p $out/bin
+    ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer8
+    ln -s ${fhs-env}/usr $out/usr
 
     runHook postInstall
   '';
@@ -91,7 +140,7 @@ stdenvNoCC.mkDerivation {
     (makeDesktopItem {
       name = "cisco-pt8.desktop";
       desktopName = "Cisco Packet Tracer 8";
-      icon = "ciscoPacketTracer8";
+      icon = "${unwrapped}/opt/pt/art/app.png";
       exec = "packettracer8 %f";
       mimeTypes = [
         "application/x-pkt"
@@ -101,12 +150,6 @@ stdenvNoCC.mkDerivation {
     })
   ];
 
-  dontWrapQtApps = true;
-
-  passthru = {
-    inherit hashes;
-  };
-
   meta = {
     description = "Network simulation tool from Cisco";
     homepage = "https://www.netacad.com/courses/packet-tracer";

From a67194f905f0b41d072e0485a2574feb44df5ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 22 Nov 2024 22:06:49 +0100
Subject: [PATCH 0053/1504] ciscoPacketTracer8: allow overriding src

---
 pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index f21558d9de36..4f0801c984b5 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -25,6 +25,7 @@
   copyDesktopItems,
   makeDesktopItem,
   version ? "8.2.2",
+  packetTracerSource ? null,
 }:
 
 let
@@ -43,11 +44,15 @@ let
     name = "ciscoPacketTracer8-unwrapped";
     inherit version;
 
-    src = requireFile {
-      name = names.${version};
-      hash = hashes.${version};
-      url = "https://www.netacad.com";
-    };
+    src =
+      if (packetTracerSource != null) then
+        packetTracerSource
+      else
+        requireFile {
+          name = names.${version};
+          hash = hashes.${version};
+          url = "https://www.netacad.com";
+        };
 
     buildInputs =
       [

From e94e7536ead97e24fe6e36d9a1e5046e4af93334 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 02:58:28 +0000
Subject: [PATCH 0054/1504] python312Packages.peewee: 3.17.7 -> 3.17.8

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

diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 422f427c6ed6..9f1d47939b22 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "peewee";
-  version = "3.17.7";
+  version = "3.17.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = "peewee";
     rev = "refs/tags/${version}";
-    hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw=";
+    hash = "sha256-2mViwo39adzzhpFS056C1JU5fXr3zKorzkVyJrKKRhI=";
   };
 
   build-system = [ setuptools ];

From 516a2a3674201858f026325a18a0ab083cb11a76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 16:07:35 +0000
Subject: [PATCH 0055/1504] firewalld: 2.2.3 -> 2.3.0

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

diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 70fe4b26f600..b6d066942bf0 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "firewalld";
-  version = "2.2.3";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
     rev = "v${version}";
-    sha256 = "sha256-ugDleco/Ep+10ku+5xcW4zq/RrhruZCRlX0zKeXzLhg=";
+    sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU=";
   };
 
   patches = [

From 836ba536d1ed68d75fbe2bf8329982c4115705f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 16:23:22 +0000
Subject: [PATCH 0056/1504] firewalld-gui: 2.2.3 -> 2.3.0

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

diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix
index 70fe4b26f600..b6d066942bf0 100644
--- a/pkgs/by-name/fi/firewalld/package.nix
+++ b/pkgs/by-name/fi/firewalld/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "firewalld";
-  version = "2.2.3";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
     rev = "v${version}";
-    sha256 = "sha256-ugDleco/Ep+10ku+5xcW4zq/RrhruZCRlX0zKeXzLhg=";
+    sha256 = "sha256-ubE1zMIOcdg2+mgXsk6brCZxS1XkvJYwVY3E+UXIIiU=";
   };
 
   patches = [

From 0794fe0425b1e7dfb1a7d344e334d6f10748f4a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 19:15:55 +0000
Subject: [PATCH 0057/1504] python312Packages.etils: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index 6b853fd9d9bf..637bc2903ede 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "etils";
-  version = "1.10.0";
+  version = "1.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Tqqdckj9Tut15E1HyimHWlzOoETMFKF0NXlL+KwRagU=";
+    hash = "sha256-r/Mnijvn/d8wLf2AM16fkkJEZmxxI5zZHoNvPQVfHEo=";
   };
 
   nativeBuildInputs = [ flit-core ];

From bfa5fe24d7416e56e6e04132b805205bc76a248d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 11:19:33 +0000
Subject: [PATCH 0058/1504] python312Packages.viv-utils: 0.7.11 -> 0.7.13

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

diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index 7bb87b98bc56..f9435e61a32e 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "viv-utils";
-  version = "0.7.11";
+  version = "0.7.13";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "williballenthin";
     repo = "viv-utils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zYamhG5oeoYYVLEvv1EdZ1buFDByZatuCxbl0uRhk6Y=";
+    hash = "sha256-NiXLNsRQ/ah+fB2r91A1oqf/8Yt95Vdt2JQFJE73HXo=";
   };
 
   build-system = [ setuptools-scm ];

From 3f94adc343621f8c2913a38499e7813976229aba Mon Sep 17 00:00:00 2001
From: Joonas Rautiola <joonas@rautiola.co>
Date: Sun, 1 Dec 2024 15:03:03 +0200
Subject: [PATCH 0059/1504] youplot: 0.4.5 -> 0.4.6

---
 pkgs/by-name/yo/youplot/Gemfile.lock |  9 ++++++---
 pkgs/by-name/yo/youplot/gemset.nix   | 20 +++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/yo/youplot/Gemfile.lock b/pkgs/by-name/yo/youplot/Gemfile.lock
index 17b8b43dfa2e..b12bb2c00944 100644
--- a/pkgs/by-name/yo/youplot/Gemfile.lock
+++ b/pkgs/by-name/yo/youplot/Gemfile.lock
@@ -1,13 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    enumerable-statistics (2.0.7)
+    csv (3.3.0)
+    enumerable-statistics (2.0.8)
     unicode_plot (0.0.5)
       enumerable-statistics (>= 2.0.1)
-    youplot (0.4.5)
+    youplot (0.4.6)
+      csv
       unicode_plot (>= 0.0.5)
 
 PLATFORMS
+  x86_64-linux
   arm64-darwin-22
   ruby
 
@@ -15,4 +18,4 @@ DEPENDENCIES
   youplot
 
 BUNDLED WITH
-   2.5.3
+   2.5.16
diff --git a/pkgs/by-name/yo/youplot/gemset.nix b/pkgs/by-name/yo/youplot/gemset.nix
index ae8439540912..627338314559 100644
--- a/pkgs/by-name/yo/youplot/gemset.nix
+++ b/pkgs/by-name/yo/youplot/gemset.nix
@@ -1,13 +1,23 @@
 {
+  csv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
   enumerable-statistics = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dlnfncz0lbyczakgdlys44pksj6h447npj665xk41b36y0lbf7f";
+      sha256 = "1cqksgv0cf69cd30kxk2r0lq1y784wn5nvlyabfqilf1vvy6j38y";
       type = "gem";
     };
-    version = "2.0.7";
+    version = "2.0.8";
   };
   unicode_plot = {
     dependencies = ["enumerable-statistics"];
@@ -21,14 +31,14 @@
     version = "0.0.5";
   };
   youplot = {
-    dependencies = ["unicode_plot"];
+    dependencies = ["csv" "unicode_plot"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0imy65wjkgdkpqfympbz8lp2ih866538vk55fwz9a909ib9sbdri";
+      sha256 = "1p1vbb7p4h5a4r2rwl64gwv6cmf350grjn97zrpjhvrjih81y3yg";
       type = "gem";
     };
-    version = "0.4.5";
+    version = "0.4.6";
   };
 }

From 2995a17c25fe44cf04f0857b2eeee98950e317a5 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Sun, 1 Dec 2024 14:14:03 +0100
Subject: [PATCH 0060/1504] xsnow: 3.4.4 -> 3.7.9

---
 pkgs/by-name/xs/xsnow/package.nix | 42 +++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix
index ba9791cc6f1a..a94ad14e8364 100644
--- a/pkgs/by-name/xs/xsnow/package.nix
+++ b/pkgs/by-name/xs/xsnow/package.nix
@@ -1,16 +1,39 @@
-{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3-x11, libXt, libXpm }:
-
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libxml2,
+  wrapGAppsHook3,
+  gtk3-x11,
+  xorg,
+  libxkbcommon,
+  gsl,
+}:
 stdenv.mkDerivation rec {
   pname = "xsnow";
-  version = "3.4.4";
+  version = "3.7.9";
 
   src = fetchurl {
     url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz";
-    sha256 = "sha256-fPMy5AxKspFkcWphf/IjMc/ZQtayljThKxbcMtvOjRc=";
+    sha256 = "sha256-DEzQblUfm2kd0I21sUwO3EVUm/WHnOk7T6iMgo3+EAY=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk3-x11 libxml2 libXt libXpm ];
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    gtk3-x11
+    libxkbcommon
+    libxml2
+    gsl
+  ] ++ (with xorg; [
+    libX11
+    libXpm
+    libXt
+    libXtst
+  ]);
 
   makeFlags = [ "gamesdir=$(out)/bin" ];
 
@@ -20,8 +43,13 @@ stdenv.mkDerivation rec {
     description = "X-windows application that will let it snow on the root, in between and on windows";
     mainProgram = "xsnow";
     homepage = "https://ratrabbit.nl/ratrabbit/xsnow/";
+    changelog = "https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html";
+    downloadPage = "https://ratrabbit.nl/ratrabbit/xsnow/downloads/index.html";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ robberer ];
+    maintainers = with maintainers; [
+      robberer
+      griffi-gh
+    ];
     platforms = platforms.unix;
   };
 }

From c0fd43c6d156cb006c64db51cba989f0fcc03902 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Sun, 1 Dec 2024 18:10:23 +0100
Subject: [PATCH 0061/1504] ttysvr: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix
index a4537246c025..47a21d97cf98 100644
--- a/pkgs/by-name/tt/ttysvr/package.nix
+++ b/pkgs/by-name/tt/ttysvr/package.nix
@@ -15,15 +15,15 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "ttysvr";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "cxreiff";
     repo = "ttysvr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qUwnx+hwd3PRzz1TlQzPAppj6aTZZpTG2e5cBaA3zZI=";
+    hash = "sha256-W8IglZVvhFqn0TH1ZBGWERizCxCQ+C4SckYFLCzB3yc=";
   };
-  cargoHash = "sha256-kIE8+FUS3i8Ulkj35lO1iRmFx5x+r89THVuzNzAv6tE=";
+  cargoHash = "sha256-gHrsdlmA8QxahrWIy6+5knLydVcSbEfS7+02fF1sSsA=";
 
   nativeBuildInputs = [
     pkg-config

From 7a66174fcf4b5ff722b944f902a708ceeda31e64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 17:34:49 +0000
Subject: [PATCH 0062/1504] python312Packages.wheel-inspect: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix
index ed966cace713..45e1cd6db59b 100644
--- a/pkgs/development/python-modules/wheel-inspect/default.nix
+++ b/pkgs/development/python-modules/wheel-inspect/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "wheel-inspect";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "jwodder";
     repo = "wheel-inspect";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0=";
+    hash = "sha256-Mdw9IlY/2qDlb5FumNH+VHmg7vrUzo3vn+03QsUGgo8=";
   };
 
   pythonRelaxDeps = [

From 118327ee921198191db5681115aab67d35bf47fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 19:22:50 +0000
Subject: [PATCH 0063/1504] python312Packages.influxdb-client: 1.47.0 -> 1.48.0

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

diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 712be1f3410a..7c47b11985b4 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "influxdb-client";
-  version = "1.47.0";
+  version = "1.48.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "influxdata";
     repo = "influxdb-client-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1QWy+mdVttowdbIBmtW6gYwkJ4p9sL0D+DxsHk3xgvc=";
+    hash = "sha256-MKTfRsqizZDXPMqJAypUDQBm+a2s6FaEG3TM30wucrI=";
   };
 
   build-system = [ setuptools ];

From e77fad204986754611f5ce95e4f315d0f8a0d8c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 17:24:15 +0000
Subject: [PATCH 0064/1504] python312Packages.cheetah3: 3.3.3.post1 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 6c89ea73cdbf..0352fd8714d0 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "cheetah3";
-  version = "3.3.3.post1";
+  version = "3.4.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "CheetahTemplate3";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-0NVKie/6Fp8T1O1fvrVorycybLrEXMY1yXZBDyxjpbE=";
+    hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI=";
   };
 
   doCheck = false; # Circular dependency

From f3e7653291e02f35d42b4fe7fd9be15877ac6590 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 19:59:26 +0000
Subject: [PATCH 0065/1504] python312Packages.zope-testrunner: 6.4 -> 6.6

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

diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix
index cc9c00fd8d24..fbc82b59f7bd 100644
--- a/pkgs/development/python-modules/zope-testrunner/default.nix
+++ b/pkgs/development/python-modules/zope-testrunner/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "zope.testrunner";
-  version = "6.4";
+  version = "6.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-C4Wfx01vK2xd2K353uTsdAX3PykOyrJXCsY2+DYSKMg=";
+    hash = "sha256-sReX6XWocHseM7ZUTKz5A3KHiG7leA7P7UvxiZ1CFe8=";
   };
 
   propagatedBuildInputs = [

From e7d285032a4cd5a3fa7c9c2b497b1f60d97672e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 20:14:15 +0000
Subject: [PATCH 0066/1504] python312Packages.roombapy: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix
index e2196301166a..192880df1051 100644
--- a/pkgs/development/python-modules/roombapy/default.nix
+++ b/pkgs/development/python-modules/roombapy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "roombapy";
-  version = "1.8.1";
+  version = "1.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "pschmitt";
     repo = "roombapy";
     rev = "refs/tags/${version}";
-    hash = "sha256-1yfmaTzZ7cZW2+Yb3Zbo8+5TfD+H1sA0+SzC1c9MdsQ=";
+    hash = "sha256-plmdGVfrkdz7pyyAztzZKlDpUjKxBIRtDVeBXoqaB5s=";
   };
 
   nativeBuildInputs = [

From e3919fff86708bd0ac47f799c78c4b893b0aa413 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 20:28:29 +0000
Subject: [PATCH 0067/1504] latex2html: 2024 -> 2024.2

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

diff --git a/pkgs/by-name/la/latex2html/package.nix b/pkgs/by-name/la/latex2html/package.nix
index 9f0aed7fb424..0da520d78dd1 100644
--- a/pkgs/by-name/la/latex2html/package.nix
+++ b/pkgs/by-name/la/latex2html/package.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "latex2html";
-  version = "2024";
+  version = "2024.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-MF+S6x+k+lkutJQ60HCxFpdR96K3AFZcP/4guK9RvsA=";
+    sha256 = "sha256-4g6bX6aVPOzSHTOB9wsfIiqS0SWygFtfeUDHT13FutA=";
   };
 
   buildInputs = [ ghostscript netpbm perl ];

From 14584f5e68431b4c0c691bacad26a7df4dd3bcda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 23:27:32 +0000
Subject: [PATCH 0068/1504] python312Packages.glom: 23.5.0 -> 24.11.0

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

diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix
index 366f75e3bfed..04a8a1649f89 100644
--- a/pkgs/development/python-modules/glom/default.nix
+++ b/pkgs/development/python-modules/glom/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "glom";
-  version = "23.5.0";
+  version = "24.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Bq9eNIaqzFk4K6NOU+vqvXqTRdePfby+4m8DuqS4O6w=";
+    hash = "sha256-QyX5Z1mpEgRK97bGvQ26RK2MHrYDiqsFcylmHSAhuyc=";
   };
 
   postPatch = ''

From b67dd357d718b2ee7395990bff055bf052395fb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 00:19:51 +0000
Subject: [PATCH 0069/1504] python312Packages.python-sql: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
index a7d91fcb759a..f41e54f406aa 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "python-sql";
-  version = "1.5.1";
+  version = "1.5.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_sql";
     inherit version;
-    hash = "sha256-93RnHx0IT6a6Q4mJJM3r5O0NAHHfjWCAQKzU8cjYaqM=";
+    hash = "sha256-c19SNyGHy5VrGu6MoHADn3O6iRO7i33vlC78FNUGzTY=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From 92d110561b29131122be665248daba2bda5bf4e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 02:35:10 +0000
Subject: [PATCH 0070/1504] python312Packages.libusbsio: 2.1.12 -> 2.1.13

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

diff --git a/pkgs/development/python-modules/libusbsio/default.nix b/pkgs/development/python-modules/libusbsio/default.nix
index 4ebd50e349ec..ab099c119279 100644
--- a/pkgs/development/python-modules/libusbsio/default.nix
+++ b/pkgs/development/python-modules/libusbsio/default.nix
@@ -8,13 +8,13 @@
 buildPythonPackage rec {
   pname = "libusbsio";
   format = "setuptools";
-  version = "2.1.12";
+  version = "2.1.13";
   # If the versions come back into sync switch back to inheriting from c lib
   # inherit (libusbsio) version;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RdUhwilBOwg19ay3Po3zsxqlBV9FTy3btJDbO4YEKS8=";
+    hash = "sha256-3xudSyqfXq3wsFdOgBeGK1nSY0NZjx9UhmTqbQGXWyU=";
   };
 
   # The source includes both the python module directly and also prebuilt binaries

From 8f132b64862eb60f32d3237f930c97791aeb8f32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 08:02:40 +0000
Subject: [PATCH 0071/1504] python312Packages.osqp: 0.6.7.post1 -> 0.6.7.post3

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

diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index ef8db9f8b297..83fd6645cde7 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "0.6.7.post1";
+  version = "0.6.7.post3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VUqhDcqEgZeLTTNOKCAfJO0Y8pTFqENQziAiqLePTXI=";
+    hash = "sha256-sMXgpyHyHJckCXpP1QEIME0pZGjRJOFvNKxnBG9wIOE=";
   };
 
   postPatch = ''

From 5eee2fa2b081e5c39a0b0af8ba969d63e748aa0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 11:55:44 +0000
Subject: [PATCH 0072/1504] python312Packages.pyexcel: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
index 404f29068aff..bb1605b74c79 100644
--- a/pkgs/development/python-modules/pyexcel/default.nix
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyexcel";
-  version = "0.7.0";
+  version = "0.7.1";
   format = "setuptools";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+/Du5dk7ls728ZqfAHA/IsCmTxlyjZG5VCgAmlISlwk=";
+    hash = "sha256-yHWZHB3pAUBjRdE8fd5sSs/V8IsWr2xKiBpSxsPDqwY=";
   };
 
   propagatedBuildInputs = [

From 2553f4b738d63dede25a2a1abf14ed9f77988633 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 20:43:20 +0000
Subject: [PATCH 0073/1504] python312Packages.py-scrypt: 0.8.24 -> 0.8.27

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

diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix
index c0fe6b756b34..10b9ec015050 100644
--- a/pkgs/development/python-modules/py-scrypt/default.nix
+++ b/pkgs/development/python-modules/py-scrypt/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "py-scrypt";
-  version = "0.8.24";
+  version = "0.8.27";
 
   src = fetchPypi {
     pname = "scrypt";
     inherit version;
-    hash = "sha256-mP/eReSpVGHXPe1UunomhXZ5kg1Pj/Mg9vet5uKVMb0=";
+    hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc=";
   };
 
   buildInputs = [ openssl ];

From c45c6e5de3632f77cb94c2c9bcb7af88d06d7e2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 22:10:42 +0000
Subject: [PATCH 0074/1504] python312Packages.rcssmin: 1.1.2 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix
index 7f32b5075d50..21c9197e0673 100644
--- a/pkgs/development/python-modules/rcssmin/default.nix
+++ b/pkgs/development/python-modules/rcssmin/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "rcssmin";
-  version = "1.1.2";
+  version = "1.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vHXrdb1tNFwMUf2A/Eh93W+f1AndeGGz/pje6FAY4ek=";
+    hash = "sha256-9DaHJBLPpvBP/5kMYyIkaxOqOJ9gMjuWNYPtYQLXyEw=";
   };
 
   # The package does not ship tests, and the setup machinary confuses

From 8e5455e9a199d42453aec2e91ed382686323b2c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 23:47:32 +0000
Subject: [PATCH 0075/1504] python312Packages.rjsmin: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix
index b3984446c404..c48b87d54094 100644
--- a/pkgs/development/python-modules/rjsmin/default.nix
+++ b/pkgs/development/python-modules/rjsmin/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "rjsmin";
-  version = "1.2.2";
+  version = "1.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jBvNghFD/s8jJCAStV4TYQhAqDnNRns1jxY1kBDWLa4=";
+    hash = "sha256-E4i1JJOkwE+8lwotdXwwH6BaPDdkAxTCzp38jYpzDMY=";
   };
 
   # The package does not ship tests, and the setup machinary confuses

From 31c61b198472ab806447fd755fed04802a7672b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 04:25:52 +0000
Subject: [PATCH 0076/1504] python312Packages.mecab-python3: 1.0.9 -> 1.0.10

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

diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix
index 5eebd19f53cf..d25a2a7f34fa 100644
--- a/pkgs/development/python-modules/mecab-python3/default.nix
+++ b/pkgs/development/python-modules/mecab-python3/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "mecab-python3";
-  version = "1.0.9";
+  version = "1.0.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mecab_python3";
     inherit version;
-    hash = "sha256-LYkfSgEZ+3Zvp5bijYgaVXk6DDVE5EbP9k3JRq1yJ8w=";
+    hash = "sha256-Ic1EFgQ+mpk/z7mG3ek+Q2agdUPdlYSbXvLlDJqa/M4=";
   };
 
   nativeBuildInputs = [

From b393f7cd617dba07d547b4abf453a09d570c51d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 04:39:32 +0000
Subject: [PATCH 0077/1504] python312Packages.pymssql: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix
index 02e3f670f1c9..3f9214832cab 100644
--- a/pkgs/development/python-modules/pymssql/default.nix
+++ b/pkgs/development/python-modules/pymssql/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "pymssql";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3e4VxMGT4UyS/izXIMqb4duh4PQXgkA4C49fbwDaBMY=";
+    hash = "sha256-GAiWQbaHvh69D2Tw0f+XdHijl/+hrzcr3xDb7CnPbS4=";
   };
 
   build-system = [

From 48d275c3de4e2aece7d26179fd6e33a47daff39d Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 4 Dec 2024 07:46:01 +0200
Subject: [PATCH 0078/1504] colorls: 1.4.6 -> 1.5.0

---
 pkgs/tools/system/colorls/Gemfile.lock | 12 ++++++------
 pkgs/tools/system/colorls/gemset.nix   | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock
index 29f4e6bd87da..11e48b76430e 100644
--- a/pkgs/tools/system/colorls/Gemfile.lock
+++ b/pkgs/tools/system/colorls/Gemfile.lock
@@ -1,10 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     clocale (0.0.4)
-    colorls (1.4.6)
+    colorls (1.5.0)
       addressable (~> 2.7)
       clocale (~> 0)
       filesize (~> 0)
@@ -13,9 +13,9 @@ GEM
       unicode-display_width (>= 1.7, < 3.0)
     filesize (0.2.0)
     manpages (0.6.1)
-    public_suffix (4.0.7)
+    public_suffix (6.0.1)
     rainbow (3.1.1)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   ruby
@@ -24,4 +24,4 @@ DEPENDENCIES
   colorls
 
 BUNDLED WITH
-   2.3.9
+   2.5.22
diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix
index ca9db9cb250d..4cfbfaea796e 100644
--- a/pkgs/tools/system/colorls/gemset.nix
+++ b/pkgs/tools/system/colorls/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
       type = "gem";
     };
-    version = "2.8.0";
+    version = "2.8.7";
   };
   clocale = {
     groups = ["default"];
@@ -26,10 +26,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16r9c61lamjiig4rxfx1rs0bagqq8lbz88vf1250zkvq4fdk93p9";
+      sha256 = "1w7zxzvcbr0nmg1fxqiadfh44a7y687bb6jrq82ql21gr2l3z4xh";
       type = "gem";
     };
-    version = "1.4.6";
+    version = "1.5.0";
   };
   filesize = {
     groups = ["default"];
@@ -56,10 +56,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
+      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
       type = "gem";
     };
-    version = "4.0.7";
+    version = "6.0.1";
   };
   rainbow = {
     groups = ["default"];
@@ -76,9 +76,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
+      sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.6.0";
   };
 }

From 84d991d304360cc2e70a72b2a50eae1a898738ac Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 4 Dec 2024 07:27:21 +0100
Subject: [PATCH 0079/1504] python3Packages.prosemirror: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix
index 2457d8b60cf2..e556b8249b87 100644
--- a/pkgs/development/python-modules/prosemirror/default.nix
+++ b/pkgs/development/python-modules/prosemirror/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "prosemirror";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AwhPJHPDuuQW7NlUs7KL0SLTAH9F+E8RzRbsRnHraiI=";
+    hash = "sha256-COjCU//frJf2MNgaAz5aQizbjRsF3ypYFXS6aDjqrIU=";
   };
 
   build-system = [ setuptools-scm ];

From 3c999ebf694f3b5d7571b60efd2445a6f7cd900a Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 4 Dec 2024 07:27:29 +0100
Subject: [PATCH 0080/1504] python3Packages.prosemirror: add changelog

---
 pkgs/development/python-modules/prosemirror/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix
index e556b8249b87..c18ea1521b9b 100644
--- a/pkgs/development/python-modules/prosemirror/default.nix
+++ b/pkgs/development/python-modules/prosemirror/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of core ProseMirror modules for collaborative editing";
     homepage = "https://pypi.org/project/prosemirror";
+    changelog = "https://github.com/fellowapp/prosemirror-py/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ onny ];
   };

From 7d23946c14235d2ae91ceadcc32e1e258f0fc965 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 4 Dec 2024 07:27:49 +0100
Subject: [PATCH 0081/1504] python3Packages.prosemirror: nixfmt

---
 pkgs/development/python-modules/prosemirror/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix
index c18ea1521b9b..511ff68767c6 100644
--- a/pkgs/development/python-modules/prosemirror/default.nix
+++ b/pkgs/development/python-modules/prosemirror/default.nix
@@ -27,9 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "prosemirror" ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     description = "Python implementation of core ProseMirror modules for collaborative editing";

From 9a8e0740f1c89b4c65886e20eda6e025496a7a0b Mon Sep 17 00:00:00 2001
From: Jakuzure Nonon <shin@posteo.jp>
Date: Wed, 4 Dec 2024 08:52:19 +0100
Subject: [PATCH 0082/1504] net-news-wire: 6.1.4 -> 6.1.5

---
 pkgs/by-name/ne/net-news-wire/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix
index 95873d5da0c6..2cd7d7fcc492 100644
--- a/pkgs/by-name/ne/net-news-wire/package.nix
+++ b/pkgs/by-name/ne/net-news-wire/package.nix
@@ -2,22 +2,21 @@
 , stdenvNoCC
 , fetchurl
 , unzip
+, nix-update-script
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "net-news-wire";
-  version = "6.1.4";
+  version = "6.1.5";
 
   src = fetchurl {
     url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip";
-    hash = "sha256-dNdbniXGre8G2/Ac0GB3GHJ2k1dEiHmAlTX3dJOEC7s=";
+    hash = "sha256-92hsVSEpa661qhebeSd5lxt8MtIJRn7YZyKlMs0vle0=";
   };
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [
-    unzip
-  ];
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     runHook preInstall
@@ -26,6 +25,8 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "RSS reader for macOS and iOS";
     longDescription = ''

From d5a0ed5e016a142ec3e071d57595ac2c1e7ce4be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 08:17:10 +0000
Subject: [PATCH 0083/1504] python312Packages.sopel: 8.0.0 -> 8.0.1

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

diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index 45f0469ea0ff..744c4550d9eb 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "sopel";
-  version = "8.0.0";
+  version = "8.0.1";
   pyproject = true;
 
   disabled = isPyPy || pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-juLJp0Et5qMZwBZzw0e4tKg1cBYqAsH8KUzqNoIP70U=";
+    hash = "sha256-Z9Tcn2lb5a7c6aVbhPjuO6trrZQwSBA1iaMiDzpe+DA=";
   };
 
   build-system = [ setuptools ];

From 63b17a2c79f45c995ec934b69031afcc2aa542af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 08:20:14 +0000
Subject: [PATCH 0084/1504] python312Packages.pylibftdi: 0.22.0 -> 0.23.0

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

diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix
index f6c317cc924a..359af2a577d8 100644
--- a/pkgs/development/python-modules/pylibftdi/default.nix
+++ b/pkgs/development/python-modules/pylibftdi/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pylibftdi";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-haaqtDj3ZTQoQ6otWbso+7DTCEemIfuYAJhRhZkPAa8=";
+    hash = "sha256-v1tMa6c9eab234ScNFsAunY9AjIBvtm6Udh2pDl7Ftg=";
   };
 
   build-system = [ poetry-core ];

From 915fdc4ca710bce29aa6eea30a0466bf59232826 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 08:54:05 +0000
Subject: [PATCH 0085/1504] python312Packages.pyvcd: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix
index 3904923d53b4..e37c7989dc29 100644
--- a/pkgs/development/python-modules/pyvcd/default.nix
+++ b/pkgs/development/python-modules/pyvcd/default.nix
@@ -9,14 +9,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.1";
   format = "setuptools";
   pname = "pyvcd";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA=";
+    hash = "sha256-3GJ16Vp5SbgjYIarLm0Dr+3nNEEkPsUQnJ6okHfz1pY=";
   };
 
   buildInputs = [ setuptools-scm ];

From b1f0148854a4a9d67a9e155d902ade7d7d895e8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 09:26:11 +0000
Subject: [PATCH 0086/1504] python312Packages.types-dateutil: 2.9.0.20240906 ->
 2.9.0.20241003

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

diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix
index a4027dc808f7..fde52c82ab8f 100644
--- a/pkgs/development/python-modules/types-dateutil/default.nix
+++ b/pkgs/development/python-modules/types-dateutil/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-dateutil";
-  version = "2.9.0.20240906";
+  version = "2.9.0.20241003";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types-python-dateutil";
     inherit version;
-    hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24=";
+    hash = "sha256-WMuFRJsqVtZoTkGu77TEKAYxJGoNoacZvb5vP7AxdEY=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 5e8a956b37219c196f460ae3e1ecfbea0d3e292e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 10:23:18 +0000
Subject: [PATCH 0087/1504] python312Packages.sphinxawesome-theme: 5.2.0 ->
 5.3.2

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

diff --git a/pkgs/development/python-modules/sphinxawesome-theme/default.nix b/pkgs/development/python-modules/sphinxawesome-theme/default.nix
index 8d028f2c63e7..aff028d3ba89 100644
--- a/pkgs/development/python-modules/sphinxawesome-theme/default.nix
+++ b/pkgs/development/python-modules/sphinxawesome-theme/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "sphinxawesome-theme";
-  version = "5.2.0";
+  version = "5.3.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "sphinxawesome_theme";
-    hash = "sha256-wk8eXAueR1OA0W/F8fO/2ElVgX2gkF2V9+IICdfNPF0=";
+    hash = "sha256-BinTi4Cu/CebEYbFOnpvryHnIbWy7NoU9IjKEHTiYx8=";
   };
 
   build-system = [ poetry-core ];

From 85af71061185bd0b4570eec2ff2ab1772ecd9f52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 11:00:29 +0000
Subject: [PATCH 0088/1504] python312Packages.gnureadline: 8.2.10 -> 8.2.13

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

diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix
index f0db91f45cc0..0770f6264304 100644
--- a/pkgs/development/python-modules/gnureadline/default.nix
+++ b/pkgs/development/python-modules/gnureadline/default.nix
@@ -7,14 +7,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "8.2.10";
+  version = "8.2.13";
   format = "setuptools";
   pname = "gnureadline";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-p0a6mNTeN7B55C2Um3BMM8FoswvR+QcaHSXJ2ppEmZc=";
+    hash = "sha256-ybnh57qZqAu1DBICfWzmkldPd6Zb9XvJcEHPgcD0m9E=";
   };
 
   buildInputs = [ pkgs.ncurses ];

From bedca36b94bcd80b363049c67b6e67e656a8fc6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 11:11:26 +0000
Subject: [PATCH 0089/1504] python312Packages.manuel: 1.12.4 -> 1.13.0

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

diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix
index 89a7dc660532..52aede44e28c 100644
--- a/pkgs/development/python-modules/manuel/default.nix
+++ b/pkgs/development/python-modules/manuel/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "manuel";
-  version = "1.12.4";
+  version = "1.13.0";
   format = "setuptools";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q=";
+    hash = "sha256-XWMSDej6bZJ3gLaa4oqj6dFmmxCvPTJ4Xz+6EaW+iFo=";
   };
 
   patches = lib.optionals (lib.versionAtLeast python.version "3.11") [

From 38c44c5ffcb2460ddbd540eff819ae1e2a17489e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 11:31:25 +0000
Subject: [PATCH 0090/1504] python312Packages.fabio: 2024.4.0 -> 2024.9.0

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

diff --git a/pkgs/development/python-modules/fabio/default.nix b/pkgs/development/python-modules/fabio/default.nix
index 8692d8a3c3da..d9bfea658144 100644
--- a/pkgs/development/python-modules/fabio/default.nix
+++ b/pkgs/development/python-modules/fabio/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "fabio";
-  version = "2024.4.0";
+  version = "2024.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NPVxu4sZ7hIvrHrh1iRakraa5fj1cUnH259tTDByRNc=";
+    hash = "sha256-+HPfUfRoUxwRqufgzYihTyIfTvCUMfvFpspnse1HU1s=";
   };
 
   pythonImportsCheck = [ "fabio" ];

From 75b51039a3e97e22ec37839822ca00798f60c76f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 13:06:33 +0000
Subject: [PATCH 0091/1504] python312Packages.hg-evolve: 11.1.4 -> 11.1.6

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

diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
index 4ff230e62cd1..ddd303bcbea1 100644
--- a/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "hg-evolve";
-  version = "11.1.4";
+  version = "11.1.6";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Yph2g254fSnPVfgmkmeRSqlmsUfHgP+wqN0GHLIV/wc=";
+    hash = "sha256-Jun1gZYZXv8nuJBnberK1bcTPTLCDgGGd543OeOEVOs=";
   };
 
   nativeCheckInputs = [ mercurial ];

From 22f07059a53844e6e6f6767f05281d4a0612e29f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 13:22:28 +0000
Subject: [PATCH 0092/1504] python312Packages.virtualenvwrapper: 6.1.0 -> 6.1.1

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

diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix
index 37662921905a..6466e08496f6 100644
--- a/pkgs/development/python-modules/virtualenvwrapper/default.nix
+++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "virtualenvwrapper";
-  version = "6.1.0";
+  version = "6.1.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q=";
+    hash = "sha256-ES5+o0qaPOkKrqVBgvDTr+9NGpE+63XpiiY7SXjNc8Y=";
   };
 
   # pip depend on $HOME setting

From 8ff986142986ef85283839d59e5b2fb76733ad52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 14:44:14 +0000
Subject: [PATCH 0093/1504] python312Packages.tablib: 3.6.1 -> 3.7.0

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

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index bd1ed07849ed..58df9be707e8 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "tablib";
-  version = "3.6.1";
+  version = "3.7.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BAaF/eEekjdnX0Pphe25S2MlCl6SNvidVhzm+xRluDk=";
+    hash = "sha256-+duE7TmN9RCb1pwR1GYT0WzFcvua0yE/ENleK18SwY4=";
   };
 
   postPatch = ''

From 6eceecf590a2a896b0349b7503668bc946dcac49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 15:18:06 +0000
Subject: [PATCH 0094/1504] python312Packages.line-profiler: 4.1.3 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix
index dce3a93374e0..11d65dd7c148 100644
--- a/pkgs/development/python-modules/line-profiler/default.nix
+++ b/pkgs/development/python-modules/line-profiler/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "line-profiler";
-  version = "4.1.3";
+  version = "4.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6" || isPyPy;
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "line_profiler";
     inherit version;
-    hash = "sha256-5fESPDZywyGLoGPCO9ZKURWeRGSf7WeAuZPHgfte0xg=";
+    hash = "sha256-CeEPJfh2UUOAs/rubek/sMIoq7qFgguhpZHds+tFGpY=";
   };
 
   nativeBuildInputs = [

From 9b92e9d2afec93cb53ddc5f897a2fc6f6c636ac5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 18:05:31 +0000
Subject: [PATCH 0095/1504] python312Packages.torchdiffeq: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/python-modules/torchdiffeq/default.nix b/pkgs/development/python-modules/torchdiffeq/default.nix
index 455450a718c1..fed9c71ce546 100644
--- a/pkgs/development/python-modules/torchdiffeq/default.nix
+++ b/pkgs/development/python-modules/torchdiffeq/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "torchdiffeq";
-  version = "0.2.4";
+  version = "0.2.5";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wOV8PIif7dp/I6YBXb/Nba5QcqBt1u0Q6CAMIAmEQEM=";
+    hash = "sha256-tQ03YNE/0TjczqxlH0uAOW9E/vzr0DegM/7P6qnMEuc=";
   };
 
   propagatedBuildInputs = [

From 6c907c5e7daa44fce69d104837c467c24226db75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 21:09:56 +0000
Subject: [PATCH 0096/1504] python312Packages.dploot: 3.0.0 -> 3.0.3

---
 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 13ea26e68c2c..d7f86993b7f1 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 = "3.0.0";
+  version = "3.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-G39dzP5A6ZySo7AhDIZWXjhtk2zm15wSnrdknLqHHcY=";
+    hash = "sha256-MBuO9anCe8wDD+72pR/bFrV5pAmEIWY2pKSvPSTq0yQ=";
   };
 
   pythonRelaxDeps = [

From 0b6f4a29df29c083c41418f4809f14eea3fae9b7 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Tue, 3 Dec 2024 18:03:37 -0500
Subject: [PATCH 0097/1504] unifi-controller: patchelf unifi's sdnotify

Fixes the following in server.log:

<launcher> ERROR sdnotify - failed to load ubnt_sdnotify_jni

java.lang.UnsatisfiedLinkError:
/var/lib/unifi/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so:
libsystemd.so.0: cannot open shared object file: No such file or
directory
---
 pkgs/by-name/un/unifi/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index 6af57d380923..85c1ee1d7192 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -4,6 +4,7 @@
   dpkg,
   fetchurl,
   nixosTests,
+  systemd,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,6 +29,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postInstall =
+    if stdenv.hostPlatform.system == "x86_64-linux" then
+      ''
+        patchelf --add-needed "${systemd}/lib/libsystemd.so.0" "$out/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so"
+      ''
+    else if stdenv.hostPlatform.system == "aarch64-linux" then
+      ''
+        patchelf --add-needed "${systemd}/lib/libsystemd.so.0" "$out/lib/native/Linux/aarch64/libubnt_sdnotify_jni.so"
+      ''
+    else
+      null;
+
   passthru.tests = {
     unifi = nixosTests.unifi;
   };

From e5b5cf80c5d78dc7c4921dc4725cddb2c1c3b8b7 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Wed, 4 Dec 2024 00:29:49 -0500
Subject: [PATCH 0098/1504] nixos/unifi: enable sd_notify

Let's use unifi's sd_notify now that it's patched
---
 nixos/modules/services/networking/unifi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 8c5bc82ffcb1..5d302e9502b9 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -143,7 +143,7 @@ in
       restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ];
 
       serviceConfig = {
-        Type = "simple";
+        Type = "notify";
         ExecStart = "${cmd} start";
         ExecStop = "${cmd} stop";
         Restart = "on-failure";

From 5d10e2bedb74e11d69acafa5823538114c346a2e Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Wed, 4 Dec 2024 00:30:16 -0500
Subject: [PATCH 0099/1504] nixos/unifi: always restart service

This allows the controller to restart when restoring from a backup
---
 nixos/modules/services/networking/unifi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 5d302e9502b9..8570d0ee377d 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -146,7 +146,7 @@ in
         Type = "notify";
         ExecStart = "${cmd} start";
         ExecStop = "${cmd} stop";
-        Restart = "on-failure";
+        Restart = "always";
         TimeoutSec = "5min";
         User = "unifi";
         UMask = "0077";

From 7de8722dc3d9bde0fed3fb066967b66d58f398cb Mon Sep 17 00:00:00 2001
From: SpringerJack <springerjack@pm.me>
Date: Wed, 4 Dec 2024 22:51:17 +0100
Subject: [PATCH 0100/1504] ipe: optional support for qvoronoi

Ipe can optionally compiled with ipelets computing Voronoi diagrams. This
depends on qhull and is therefore needs to be enabled explicitly.
---
 pkgs/applications/graphics/ipe/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index aa12c5861f2e..ff49948bdb14 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -15,9 +15,11 @@
 , qtbase
 , qtsvg
 , texliveSmall
+, qhull
 , wrapQtAppsHook
 , zlib
 , withTeXLive ? true
+, withQVoronoi ? false
 , buildPackages
 }:
 
@@ -48,6 +50,8 @@ stdenv.mkDerivation rec {
     zlib
   ] ++ (lib.optionals withTeXLive [
     texliveSmall
+  ]) ++ (lib.optionals withQVoronoi [
+    qhull
   ]);
 
   makeFlags = [
@@ -56,7 +60,10 @@ stdenv.mkDerivation rec {
     "LUA_PACKAGE=lua"
     "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc"
     "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
-  ];
+  ] ++ (lib.optionals withQVoronoi [
+    "IPEQVORONOI=1"
+    "QHULL_CFLAGS=-I${qhull}/include/libqhull_r"
+  ]);
 
   qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texliveSmall ]}" ];
 

From 0bc6a534e8105ffa3a6e9762b711eeee3b20a5f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 05:39:34 +0000
Subject: [PATCH 0101/1504] python312Packages.consolekit: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix
index cd1a76e840a6..2d747f8919be 100644
--- a/pkgs/development/python-modules/consolekit/default.nix
+++ b/pkgs/development/python-modules/consolekit/default.nix
@@ -12,12 +12,12 @@
 }:
 buildPythonPackage rec {
   pname = "consolekit";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TU5sufqJ0znCD/QOidrT7jB1NCXJ1p8Z7FPFNPp97qg=";
+    hash = "sha256-3qa58lA2nquII99W+SGEQHHlb1BRrAWdihUOiQYmcns=";
   };
 
   build-system = [ flit-core ];

From e461d525e289493804cfb8a6edc61ccbb2e1f5a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 08:57:28 +0000
Subject: [PATCH 0102/1504] python312Packages.azure-servicebus: 7.12.3 ->
 7.13.0

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

diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix
index 997d52e12897..bac13da083f7 100644
--- a/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-servicebus";
-  version = "7.12.3";
+  version = "7.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_servicebus";
     inherit version;
-    hash = "sha256-PwdZcxrSIRxo60sh5byimCf31v8Ccr3H7vEDwcE/gyI=";
+    hash = "sha256-p16aYUNco606eX8di/T90Nhz66nl04OJSsh+9eGnDPA=";
   };
 
   build-system = [ setuptools ];

From 49f13ed21c39e56ecccc43cb05dedfc18c180972 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 09:16:52 +0000
Subject: [PATCH 0103/1504] python312Packages.pywebpush: 2.0.1 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix
index 71ba2f75af49..08487c7109c9 100644
--- a/pkgs/development/python-modules/pywebpush/default.nix
+++ b/pkgs/development/python-modules/pywebpush/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pywebpush";
-  version = "2.0.1";
+  version = "2.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cuNYauyJoGNzwFheb5fG/QuBUZ5B8yiWo2OZCez0XbA=";
+    hash = "sha256-WEh448JD6HOiLbiJVQXZVxW8eW73TMG4/pn1lhdBYeM=";
   };
 
   build-system = [ setuptools ];

From b3cdb788b9f68d7c888849485a90b947f2e77ebd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 09:35:29 +0000
Subject: [PATCH 0104/1504] xdg-terminal-exec: 0.10.1 -> 0.12.0

---
 pkgs/by-name/xd/xdg-terminal-exec/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix
index b1823d2fcf40..4aff0dafa0d1 100644
--- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix
+++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "xdg-terminal-exec";
-  version = "0.10.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "xdg-terminal-exec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bZsyHv4qbL3pdx5gW1sPG/vn6luKG1mvgR4ZmzYDDwE=";
+    hash = "sha256-4REOOCYiTccbGVKp/EOvcxLOjoPu4Eujazb7mEDIUSQ=";
   };
 
   nativeBuildInputs = [ scdoc ];

From 58d5f8eee7c054589b581912506da057f3f16166 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 12:14:29 +0000
Subject: [PATCH 0105/1504] python312Packages.pyinstaller: 6.11.0 -> 6.11.1

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

diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix
index b76b5bc2440a..6bafe0a9b46e 100644
--- a/pkgs/development/python-modules/pyinstaller/default.nix
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller";
-  version = "6.11.0";
+  version = "6.11.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8=";
+    hash = "sha256-SR37TZ1dHZZQ2VB9rsH/aClSeiVNjjlrrdYKCv/Lcu8=";
   };
 
   build-system = [ setuptools ];

From db6be866d53a65f0081792b05cb37c2a21e5ef89 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:48:18 +0100
Subject: [PATCH 0106/1504] gossip: supply correct libsdl2

Gossip previously emitted a warning about libsdl2 not working as expected. This is indeed the case. The library bundled with the Rust program seg-faults. So we'll just stick to supplying the correct one from the SDL2 package. This also makes the warning go away.
---
 pkgs/by-name/go/gossip/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 5540497e35c8..6cb81d28de5d 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -2,6 +2,7 @@
   cmake,
   darwin,
   fetchFromGitHub,
+  SDL2,
   ffmpeg_6,
   fontconfig,
   git,
@@ -65,6 +66,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [
+      SDL2
       ffmpeg_6
       fontconfig
       libGL
@@ -98,9 +100,13 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    # We don't want the bundled libraries.
+    rm -rf $out/lib
+
     patchelf $out/bin/gossip \
       --add-rpath ${
         lib.makeLibraryPath [
+          SDL2
           libGL
           libxkbcommon
           wayland

From b1b3d683d9b71d75994b9200c4b450c7304566f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 15:18:07 +0000
Subject: [PATCH 0107/1504] python312Packages.pyside2: 5.15.15 -> 5.15.16

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

diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index 41da67e108e2..81911928b169 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -11,11 +11,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "pyside2";
-  version = "5.15.15";
+  version = "5.15.16";
 
   src = fetchurl {
     url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
-    hash = "sha256-IdaBiwZINLCFARgOSIkOX9h98vs3afgMWBQ0V/VIxAg=";
+    hash = "sha256-bT7W/RcnXqdIKatW35wudkG/ymtbIBzyRJmPqBzwc2A=";
   };
 
   patches = [

From e34631a0695b7bb875a3748edd0cff7d7486d547 Mon Sep 17 00:00:00 2001
From: Dmitry Ivankov <boltzmannrain@gmail.com>
Date: Thu, 5 Dec 2024 21:50:58 +0100
Subject: [PATCH 0108/1504] bazel_7: cleanup dead files

There are some unused patch files and files related to tests that
aren't used, were likely copied from `bazel_6` but weren't make to work.

It is quite possible that https://github.com/bazelbuild/examples won't
be a good fit to test recent bazel versions so better cleanup
non-working code and remain open for any working way to add tests.
The deleted stuff still remains in git history and in bazel 6 and below
packages for reference if needed.
---
 .../bazel/bazel_7/MODULE.bazel.lock           | 9445 -----------------
 .../bazel/bazel_7/bazel-repository-cache.nix  |  178 -
 .../bazel/bazel_7/cpp-test-MODULE.bazel       |    7 -
 .../bazel/bazel_7/cpp-test-MODULE.bazel.lock  | 3221 ------
 .../build-managers/bazel/bazel_7/cpp-test.nix |   85 -
 .../build-managers/bazel/bazel_7/default.nix  |   12 +-
 .../bazel/bazel_7/java-test.nix               |   89 -
 .../bazel_7/protobuf-test.MODULE.bazel.lock   | 3224 ------
 .../bazel/bazel_7/protobuf-test.nix           |  166 -
 .../bazel/bazel_7/strict_proto_deps.patch     |   21 -
 .../build-managers/bazel/bazel_7/tests.nix    |  173 -
 .../trim-last-argument-to-gcc-if-empty.patch  |   17 -
 12 files changed, 2 insertions(+), 16636 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/bazel-repository-cache.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/strict_proto_deps.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/trim-last-argument-to-gcc-if-empty.patch

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock b/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock
deleted file mode 100644
index a1fd039a5f0d..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock
+++ /dev/null
@@ -1,9445 +0,0 @@
-{
-  "lockFileVersion": 6,
-  "moduleFileHash": "c07897f4cf2ea76f689df2779f50aed06ea638d666542078234ebb0efd3ea5a5",
-  "flags": {
-    "cmdRegistries": [
-      "https://bcr.bazel.build/"
-    ],
-    "cmdModuleOverrides": {},
-    "allowedYankedVersions": [],
-    "envVarAllowedYankedVersions": "",
-    "ignoreDevDependency": false,
-    "directDependenciesMode": "ERROR",
-    "compatibilityMode": "ERROR"
-  },
-  "localOverrideHashes": {
-    "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0",
-    "googleapis": "89bad67656f73e953cbf62f12165f56e97cf2cc17d56974c593de76200fa3471",
-    "remoteapis": "3862bfbe3d308e71852b8f025f4b33ea9c0dc8790829eda4a71425c5a2ca814e"
-  },
-  "moduleDepGraph": {
-    "<root>": {
-      "name": "bazel",
-      "version": "",
-      "key": "<root>",
-      "repoName": "io_bazel",
-      "executionPlatformsToRegister": [
-        "//:default_host_platform"
-      ],
-      "toolchainsToRegister": [
-        "@graalvm_toolchains//:gvm",
-        "@bazel_tools//tools/python:autodetecting_toolchain",
-        "@local_config_winsdk//:all",
-        "//src/main/res:empty_rc_toolchain",
-        "//:bazel_java_toolchain_definition"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 66,
-            "column": 22
-          },
-          "imports": {
-            "maven": "maven",
-            "unpinned_maven": "unpinned_maven",
-            "maven_android": "maven_android",
-            "unpinned_maven_android": "unpinned_maven_android"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "artifacts": [
-                  "com.beust:jcommander:1.82",
-                  "com.github.ben-manes.caffeine:caffeine:3.0.5",
-                  "com.github.kevinstern:software-and-algorithms:1.0",
-                  "com.github.stephenc.jcip:jcip-annotations:1.0-1",
-                  "com.google.api-client:google-api-client-gson:1.35.2",
-                  "com.google.api-client:google-api-client:1.35.2",
-                  "com.google.auth:google-auth-library-credentials:1.6.0",
-                  "com.google.auth:google-auth-library-oauth2-http:1.6.0",
-                  "com.google.auto.service:auto-service-annotations:1.0.1",
-                  "com.google.auto.service:auto-service:1.0",
-                  "com.google.auto.value:auto-value-annotations:1.9",
-                  "com.google.auto.value:auto-value:1.8.2",
-                  "com.google.auto:auto-common:1.2.1",
-                  "com.google.code.findbugs:jsr305:3.0.2",
-                  "com.google.code.gson:gson:2.9.0",
-                  "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
-                  "com.google.errorprone:error_prone_annotation:2.22.0",
-                  "com.google.errorprone:error_prone_annotations:2.22.0",
-                  "com.google.errorprone:error_prone_check_api:2.22.0",
-                  "com.google.errorprone:error_prone_core:2.22.0",
-                  "com.google.errorprone:error_prone_type_annotations:2.22.0",
-                  "com.google.flogger:flogger-system-backend:0.5.1",
-                  "com.google.flogger:flogger:0.5.1",
-                  "com.google.flogger:google-extensions:0.5.1",
-                  "com.google.guava:failureaccess:1.0.1",
-                  "com.google.guava:guava:31.1-jre",
-                  "com.google.http-client:google-http-client-gson:1.42.0",
-                  "com.google.http-client:google-http-client:1.42.0",
-                  "com.google.j2objc:j2objc-annotations:1.3",
-                  "com.google.turbine:turbine:0.4.0",
-                  "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1",
-                  "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1",
-                  "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1",
-                  "com.squareup:javapoet:1.12.0",
-                  "commons-collections:commons-collections:3.2.2",
-                  "commons-lang:commons-lang:2.6",
-                  "io.github.java-diff-utils:java-diff-utils:4.12",
-                  "io.grpc:grpc-api:1.48.1",
-                  "io.grpc:grpc-auth:1.48.1",
-                  "io.grpc:grpc-context:1.48.1",
-                  "io.grpc:grpc-core:1.48.1",
-                  "io.grpc:grpc-netty:1.48.1",
-                  "io.grpc:grpc-protobuf-lite:1.48.1",
-                  "io.grpc:grpc-protobuf:1.48.1",
-                  "io.grpc:grpc-stub:1.48.1",
-                  "io.netty:netty-buffer:4.1.93.Final",
-                  "io.netty:netty-codec-http2:4.1.93.Final",
-                  "io.netty:netty-codec-http:4.1.93.Final",
-                  "io.netty:netty-codec:4.1.93.Final",
-                  "io.netty:netty-common:4.1.93.Final",
-                  "io.netty:netty-handler-proxy:4.1.93.Final",
-                  "io.netty:netty-handler:4.1.93.Final",
-                  "io.netty:netty-resolver-dns:4.1.93.Final",
-                  "io.netty:netty-resolver:4.1.93.Final",
-                  "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64:2.0.56.Final",
-                  "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64:2.0.56.Final",
-                  "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64:2.0.56.Final",
-                  "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64:2.0.56.Final",
-                  "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64:2.0.56.Final",
-                  "io.netty:netty-tcnative-classes:2.0.56.Final",
-                  "io.netty:netty-transport-classes-epoll:4.1.93.Final",
-                  "io.netty:netty-transport-classes-kqueue:4.1.93.Final",
-                  "io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-unix-common:4.1.93.Final",
-                  "io.netty:netty-transport-native-unix-common:jar:linux-aarch_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-unix-common:jar:linux-x86_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-unix-common:jar:osx-aarch_64:4.1.93.Final",
-                  "io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final",
-                  "io.netty:netty-transport:4.1.93.Final",
-                  "io.reactivex.rxjava3:rxjava:3.1.2",
-                  "it.unimi.dsi:fastutil:7.2.1",
-                  "javax.activation:javax.activation-api:1.2.0",
-                  "javax.annotation:javax.annotation-api:1.3.2",
-                  "javax.inject:javax.inject:1",
-                  "net.bytebuddy:byte-buddy-agent:1.14.5",
-                  "net.bytebuddy:byte-buddy:1.14.5",
-                  "org.apache.commons:commons-compress:1.20",
-                  "org.apache.commons:commons-pool2:2.8.0",
-                  "org.apache.tomcat:tomcat-annotations-api:8.0.5",
-                  "org.apache.velocity:velocity:1.7",
-                  "org.checkerframework:checker-qual:3.19.0",
-                  "org.ow2.asm:asm-analysis:9.2",
-                  "org.ow2.asm:asm-commons:9.2",
-                  "org.ow2.asm:asm-tree:9.2",
-                  "org.ow2.asm:asm-util:9.2",
-                  "org.ow2.asm:asm:9.2",
-                  "org.pcollections:pcollections:3.1.4",
-                  "org.threeten:threeten-extra:1.5.0",
-                  "org.tukaani:xz:1.9",
-                  "org.yaml:snakeyaml:1.28",
-                  "tools.profiler:async-profiler:3.0",
-                  "junit:junit:4.13.2",
-                  "org.hamcrest:hamcrest-core:1.3"
-                ],
-                "excluded_artifacts": [
-                  "org.apache.httpcomponents:httpclient",
-                  "org.apache.httpcomponents:httpcore",
-                  "org.eclipse.jgit:org.eclipse.jgit",
-                  "com.google.protobuf:protobuf-java",
-                  "com.google.protobuf:protobuf-javalite"
-                ],
-                "fail_if_repin_required": true,
-                "lock_file": "//:maven_install.json",
-                "repositories": [
-                  "https://repo1.maven.org/maven2"
-                ],
-                "strict_visibility": true
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 67,
-                "column": 14
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "guava-testlib",
-                "group": "com.google.guava",
-                "version": "31.1-jre"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "jimfs",
-                "group": "com.google.jimfs",
-                "version": "1.2"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "compile-testing",
-                "group": "com.google.testing.compile",
-                "version": "0.18"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "test-parameter-injector",
-                "group": "com.google.testparameterinjector",
-                "version": "1.0"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "truth",
-                "group": "com.google.truth",
-                "version": "1.1.3"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "truth-java8-extension",
-                "group": "com.google.truth.extensions",
-                "version": "1.1.3"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "truth-liteproto-extension",
-                "group": "com.google.truth.extensions",
-                "version": "1.1.3"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "truth-proto-extension",
-                "group": "com.google.truth.extensions",
-                "version": "1.1.3"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "artifact",
-              "attributeValues": {
-                "testonly": true,
-                "artifact": "mockito-core",
-                "group": "org.mockito",
-                "version": "5.4.0"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 190,
-                "column": 19
-              }
-            },
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "maven_android",
-                "artifacts": [
-                  "androidx.databinding:databinding-compiler:3.4.0-alpha10",
-                  "com.android.tools.build:builder:7.1.3",
-                  "com.android.tools.build:manifest-merger:30.1.3",
-                  "com.android.tools:sdk-common:30.1.3",
-                  "com.android.tools:annotations:30.1.3",
-                  "com.android.tools.layoutlib:layoutlib-api:30.1.3",
-                  "com.android.tools:common:30.1.3",
-                  "com.android.tools:repository:30.1.3"
-                ],
-                "fail_if_repin_required": true,
-                "lock_file": "//src/tools/android:maven_android_install.json",
-                "repositories": [
-                  "https://dl.google.com/android/maven2",
-                  "https://repo1.maven.org/maven2"
-                ]
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 333,
-                "column": 22
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 211,
-            "column": 32
-          },
-          "imports": {
-            "local_jdk": "local_jdk",
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remotejdk11_linux": "remotejdk11_linux",
-            "remotejdk11_linux_aarch64": "remotejdk11_linux_aarch64",
-            "remotejdk11_linux_ppc64le": "remotejdk11_linux_ppc64le",
-            "remotejdk11_linux_s390x": "remotejdk11_linux_s390x",
-            "remotejdk11_macos": "remotejdk11_macos",
-            "remotejdk11_macos_aarch64": "remotejdk11_macos_aarch64",
-            "remotejdk11_win": "remotejdk11_win",
-            "remotejdk11_win_arm64": "remotejdk11_win_arm64",
-            "remotejdk17_linux": "remotejdk17_linux",
-            "remotejdk17_linux_s390x": "remotejdk17_linux_s390x",
-            "remotejdk17_macos": "remotejdk17_macos",
-            "remotejdk17_macos_aarch64": "remotejdk17_macos_aarch64",
-            "remotejdk17_win": "remotejdk17_win",
-            "remotejdk17_win_arm64": "remotejdk17_win_arm64",
-            "remotejdk21_linux": "remotejdk21_linux",
-            "remotejdk21_macos": "remotejdk21_macos",
-            "remotejdk21_macos_aarch64": "remotejdk21_macos_aarch64",
-            "remotejdk21_win": "remotejdk21_win"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_python//python/extensions:python.bzl",
-          "extensionName": "python",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 245,
-            "column": 23
-          },
-          "imports": {},
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "toolchain",
-              "attributeValues": {
-                "python_version": "3.8"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 246,
-                "column": 17
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_python//python/extensions:pip.bzl",
-          "extensionName": "pip",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 248,
-            "column": 20
-          },
-          "imports": {
-            "bazel_pip_dev_deps": "bazel_pip_dev_deps"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "parse",
-              "attributeValues": {
-                "hub_name": "bazel_pip_dev_deps",
-                "python_version": "3.8",
-                "requirements_lock": "//:requirements.txt"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 249,
-                "column": 10
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel//:extensions.bzl",
-          "extensionName": "bazel_build_deps",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 260,
-            "column": 33
-          },
-          "imports": {
-            "bazel_tools_repo_cache": "bazel_tools_repo_cache",
-            "bootstrap_repo_cache": "bootstrap_repo_cache",
-            "debian_bin_deps": "debian_bin_deps",
-            "debian_cc_deps": "debian_cc_deps",
-            "debian_java_deps": "debian_java_deps",
-            "debian_proto_deps": "debian_proto_deps",
-            "openjdk_linux_aarch64_vanilla": "openjdk_linux_aarch64_vanilla",
-            "openjdk_linux_ppc64le_vanilla": "openjdk_linux_ppc64le_vanilla",
-            "openjdk_linux_s390x_vanilla": "openjdk_linux_s390x_vanilla",
-            "openjdk_linux_vanilla": "openjdk_linux_vanilla",
-            "openjdk_macos_aarch64_vanilla": "openjdk_macos_aarch64_vanilla",
-            "openjdk_macos_x86_64_vanilla": "openjdk_macos_x86_64_vanilla",
-            "openjdk_win_arm64_vanilla": "openjdk_win_arm64_vanilla",
-            "openjdk_win_vanilla": "openjdk_win_vanilla",
-            "workspace_repo_cache": "workspace_repo_cache"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 281,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc": "local_config_cc"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel//:extensions.bzl",
-          "extensionName": "bazel_test_deps",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 288,
-            "column": 32
-          },
-          "imports": {
-            "bazelci_rules": "bazelci_rules",
-            "local_bazel_source_list": "local_bazel_source_list",
-            "local_config_winsdk": "local_config_winsdk"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel//:rbe_extension.bzl",
-          "extensionName": "bazel_rbe_deps",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 296,
-            "column": 31
-          },
-          "imports": {
-            "rbe_ubuntu2004_java11": "rbe_ubuntu2004_java11"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel//tools/test:extensions.bzl",
-          "extensionName": "remote_coverage_tools_extension",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 299,
-            "column": 48
-          },
-          "imports": {
-            "remote_coverage_tools": "remote_coverage_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_graalvm//:extensions.bzl",
-          "extensionName": "graalvm",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 302,
-            "column": 20
-          },
-          "imports": {
-            "graalvm_toolchains": "graalvm_toolchains"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "graalvm",
-              "attributeValues": {
-                "name": "graalvm",
-                "distribution": "ce",
-                "java_version": "20",
-                "version": "20.0.2"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "@@//:MODULE.bazel",
-                "line": 303,
-                "column": 12
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel//:extensions.bzl",
-          "extensionName": "bazel_android_deps",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 355,
-            "column": 35
-          },
-          "imports": {
-            "desugar_jdk_libs": "desugar_jdk_libs"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel//tools/android:android_extensions.bzl",
-          "extensionName": "remote_android_tools_extensions",
-          "usingModule": "<root>",
-          "location": {
-            "file": "@@//:MODULE.bazel",
-            "line": 358,
-            "column": 42
-          },
-          "imports": {
-            "android_gmaven_r8": "android_gmaven_r8",
-            "android_tools": "android_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "rules_license": "rules_license@0.0.7",
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "com_google_protobuf": "protobuf@21.7",
-        "com_github_grpc_grpc": "grpc@1.48.1.bcr.1",
-        "platforms": "platforms@0.0.8",
-        "rules_pkg": "rules_pkg@0.9.1",
-        "io_bazel_skydoc": "stardoc@0.5.3",
-        "zstd-jni": "zstd-jni@1.5.2-3.bcr.1",
-        "blake3": "blake3@1.3.3.bcr.1",
-        "zlib": "zlib@1.3",
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_graalvm": "rules_graalvm@0.10.3",
-        "rules_java": "rules_java@7.4.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_jvm_external": "rules_jvm_external@5.2",
-        "rules_python": "rules_python@0.26.0",
-        "rules_testing": "rules_testing@0.0.4",
-        "com_google_googletest": "googletest@1.14.0",
-        "remoteapis": "remoteapis@_",
-        "googleapis": "googleapis@_",
-        "apple_support": "apple_support@1.8.1",
-        "abseil-cpp": "abseil-cpp@20230125.1",
-        "c-ares": "c-ares@1.15.0",
-        "rules_go": "rules_go@0.39.1",
-        "upb": "upb@0.0.0-20220923-a547704",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "rules_license@0.0.7": {
-      "name": "rules_license",
-      "version": "0.0.7",
-      "key": "rules_license@0.0.7",
-      "repoName": "rules_license",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz"
-          ],
-          "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "bazel_skylib@1.5.0": {
-      "name": "bazel_skylib",
-      "version": "1.5.0",
-      "key": "bazel_skylib@1.5.0",
-      "repoName": "bazel_skylib",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "//toolchains/unittest:cmd_toolchain",
-        "//toolchains/unittest:bash_toolchain"
-      ],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.8",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"
-          ],
-          "integrity": "sha256-zVWgYudjuTSZIfD124w5MyiNyLpPdt2UFqrGis7jy5Q=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "protobuf@21.7": {
-      "name": "protobuf",
-      "version": "21.7",
-      "key": "protobuf@21.7",
-      "repoName": "protobuf",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "protobuf@21.7",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel",
-            "line": 22,
-            "column": 22
-          },
-          "imports": {
-            "maven": "maven"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "maven",
-                "artifacts": [
-                  "com.google.code.findbugs:jsr305:3.0.2",
-                  "com.google.code.gson:gson:2.8.9",
-                  "com.google.errorprone:error_prone_annotations:2.3.2",
-                  "com.google.j2objc:j2objc-annotations:1.3",
-                  "com.google.guava:guava:31.1-jre",
-                  "com.google.guava:guava-testlib:31.1-jre",
-                  "com.google.truth:truth:1.1.2",
-                  "junit:junit:4.13.2",
-                  "org.mockito:mockito-core:4.3.1"
-                ]
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel",
-                "line": 24,
-                "column": 14
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "rules_python": "rules_python@0.26.0",
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_java": "rules_java@7.4.0",
-        "rules_pkg": "rules_pkg@0.9.1",
-        "com_google_abseil": "abseil-cpp@20230125.1",
-        "zlib": "zlib@1.3",
-        "upb": "upb@0.0.0-20220923-a547704",
-        "rules_jvm_external": "rules_jvm_external@5.2",
-        "com_google_googletest": "googletest@1.14.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip"
-          ],
-          "integrity": "sha256-VJOiH17T/FAuZv7GuUScBqVRztYwAvpIkDxA36jeeko=",
-          "strip_prefix": "protobuf-21.7",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel.patch": "sha256-q3V2+eq0v2XF0z8z+V+QF4cynD6JvHI1y3kI/+rzl5s=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel_for_examples.patch": "sha256-O7YP6s3lo/1opUiO0jqXYORNHdZ/2q3hjz1QGy8QdIU=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/relative_repo_names.patch": "sha256-RK9RjW8T5UJNG7flIrnFiNE9vKwWB+8uWWtJqXYT0w4=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_missing_files.patch": "sha256-Hyne4DG2u5bXcWHNxNMirA2QFAe/2Cl8oMm1XJdkQIY="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "grpc@1.48.1.bcr.1": {
-      "name": "grpc",
-      "version": "1.48.1.bcr.1",
-      "key": "grpc@1.48.1.bcr.1",
-      "repoName": "com_github_grpc_grpc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@com_github_grpc_grpc//bazel:grpc_deps.bzl",
-          "extensionName": "grpc_repo_deps_ext",
-          "usingModule": "grpc@1.48.1.bcr.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/grpc/1.48.1.bcr.1/MODULE.bazel",
-            "line": 20,
-            "column": 35
-          },
-          "imports": {
-            "com_envoyproxy_protoc_gen_validate": "com_envoyproxy_protoc_gen_validate",
-            "com_google_googleapis": "com_google_googleapis",
-            "com_github_cncf_udpa": "com_github_cncf_udpa",
-            "envoy_api": "envoy_api"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl",
-          "extensionName": "grpc_extra_deps_ext",
-          "usingModule": "grpc@1.48.1.bcr.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/grpc/1.48.1.bcr.1/MODULE.bazel",
-            "line": 30,
-            "column": 36
-          },
-          "imports": {
-            "com_google_googleapis_imports": "com_google_googleapis_imports"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "boringssl": "boringssl@0.0.0-20211025-d4f1ab9",
-        "com_github_cares_cares": "c-ares@1.15.0",
-        "com_google_absl": "abseil-cpp@20230125.1",
-        "com_google_protobuf": "protobuf@21.7",
-        "com_googlesource_code_re2": "re2@2021-09-01",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "upb": "upb@0.0.0-20220923-a547704",
-        "zlib": "zlib@1.3",
-        "rules_java": "rules_java@7.4.0",
-        "io_bazel_rules_go": "rules_go@0.39.1",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/grpc/grpc/archive/refs/tags/v1.48.1.tar.gz"
-          ],
-          "integrity": "sha256-MgNmZl0ZAnzah7I2jAOTkAajfgOIv9EJHI0qlvvJO9g=",
-          "strip_prefix": "grpc-1.48.1",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/grpc/1.48.1.bcr.1/patches/adopt_bzlmod.patch": "sha256-iMrebRKNKLNqVtRX+4eRZ63QcBr2t8Zo/ZvBPjVnyw8="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "platforms@0.0.8": {
-      "name": "platforms",
-      "version": "0.0.8",
-      "key": "platforms@0.0.8",
-      "repoName": "platforms",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz"
-          ],
-          "integrity": "sha256-gVBAZgU4ns7LbaB8vLUJ1WN6OrmiS8abEQFTE2fYnXQ=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_pkg@0.9.1": {
-      "name": "rules_pkg",
-      "version": "0.9.1",
-      "key": "rules_pkg@0.9.1",
-      "repoName": "rules_pkg",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_license": "rules_license@0.0.7",
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "rules_python": "rules_python@0.26.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz"
-          ],
-          "integrity": "sha256-j57i3BDBrlFO5ZmotC7Zn6Jit1cFj2WtPDhCif9wxLg=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "stardoc@0.5.3": {
-      "name": "stardoc",
-      "version": "0.5.3",
-      "key": "stardoc@0.5.3",
-      "repoName": "stardoc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "rules_java": "rules_java@7.4.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz"
-          ],
-          "integrity": "sha256-P9j+xN3sPGcL2BCQTi4zFwvt/hL5Ct+UNQgYS+RYyLs=",
-          "strip_prefix": "",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/stardoc/0.5.3/patches/module_dot_bazel.patch": "sha256-Lgpy9OCr0zBWYuHoyM1rJJrgxn23X/bwgICEF7XiEug="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "zstd-jni@1.5.2-3.bcr.1": {
-      "name": "zstd-jni",
-      "version": "1.5.2-3.bcr.1",
-      "key": "zstd-jni@1.5.2-3.bcr.1",
-      "repoName": "zstd-jni",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip"
-          ],
-          "integrity": "sha256-NmAJpDz62jUBXkzECn78S38BfGuN9crD+H0keAJ7IFY=",
-          "strip_prefix": "zstd-jni-1.5.2-3",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/zstd-jni/1.5.2-3.bcr.1/patches/Native.java.patch": "sha256-HDzZr1BxNacyg+xWvojosR8VgfZdOQ2TDAPW2bCATDs=",
-            "https://bcr.bazel.build/modules/zstd-jni/1.5.2-3.bcr.1/patches/add_build_file.patch": "sha256-k67/p9wSUWEfSeeLVPabVleF+lH9YLxlog1auvezsts=",
-            "https://bcr.bazel.build/modules/zstd-jni/1.5.2-3.bcr.1/patches/module_dot_bazel.patch": "sha256-0KGh/q92+gB4AWBFco0+/UkrkRGsZf0QynxMdWvAgPo="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "blake3@1.3.3.bcr.1": {
-      "name": "blake3",
-      "version": "1.3.3.bcr.1",
-      "key": "blake3@1.3.3.bcr.1",
-      "repoName": "blake3",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.tar.gz"
-          ],
-          "integrity": "sha256-J9K8TuWUW6dUNIWVIQQslJRj7nUU/xeq7zKOI++D/sA=",
-          "strip_prefix": "BLAKE3-1.3.3",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/blake3/1.3.3.bcr.1/patches/add_build_file.patch": "sha256-lKVoznUHSqWywOo27+g4J0csjL8lH3FEXjAFRJN5+Kw=",
-            "https://bcr.bazel.build/modules/blake3/1.3.3.bcr.1/patches/module_dot_bazel.patch": "sha256-4M/MRHdDFjS8iyVaKqy6QIc5Qea9pblUz7oj6I5aHfg="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "zlib@1.3": {
-      "name": "zlib",
-      "version": "1.3",
-      "key": "zlib@1.3",
-      "repoName": "zlib",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.8",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
-          ],
-          "integrity": "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4=",
-          "strip_prefix": "zlib-1.3",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/zlib/1.3/patches/add_build_file.patch": "sha256-Ei+FYaaOo7A3jTKunMEodTI0Uw5NXQyZEcboMC8JskY=",
-            "https://bcr.bazel.build/modules/zlib/1.3/patches/module_dot_bazel.patch": "sha256-fPWLM+2xaF/kuy+kZc1YTfW6hNjrkG400Ho7gckuyJk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_cc@0.0.9": {
-      "name": "rules_cc",
-      "version": "0.0.9",
-      "key": "rules_cc@0.0.9",
-      "repoName": "rules_cc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_cc_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "rules_cc@0.0.9",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel",
-            "line": 9,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc_toolchains": "local_config_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.8",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"
-          ],
-          "integrity": "sha256-IDeHW5pEVtzkp50RKorohbvEqtlo5lh9ym5k86CQDN8=",
-          "strip_prefix": "rules_cc-0.0.9",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_cc/0.0.9/patches/module_dot_bazel_version.patch": "sha256-mM+qzOI0SgAdaJBlWOSMwMPKpaA9b7R37Hj/tp5bb4g="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_graalvm@0.10.3": {
-      "name": "rules_graalvm",
-      "version": "0.10.3",
-      "key": "rules_graalvm@0.10.3",
-      "repoName": "rules_graalvm",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.8",
-        "bazel_features": "bazel_features@1.1.0",
-        "rules_java": "rules_java@7.4.0",
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "build_bazel_apple_support": "apple_support@1.8.1",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/sgammon/rules_graalvm/releases/download/v0.10.3/rules_graalvm-0.10.3.zip"
-          ],
-          "integrity": "sha256-H0uZeedQMwQt9OlAWgqUmqXdlCfnLIqv2Ikdj2dOdeQ=",
-          "strip_prefix": "rules_graalvm-0.10.3",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_java@7.4.0": {
-      "name": "rules_java",
-      "version": "7.4.0",
-      "key": "rules_java@7.4.0",
-      "repoName": "rules_java",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "//toolchains:all",
-        "@local_jdk//:runtime_toolchain_definition",
-        "@local_jdk//:bootstrap_runtime_toolchain_definition",
-        "@remotejdk11_linux_toolchain_config_repo//:all",
-        "@remotejdk11_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk11_linux_ppc64le_toolchain_config_repo//:all",
-        "@remotejdk11_linux_s390x_toolchain_config_repo//:all",
-        "@remotejdk11_macos_toolchain_config_repo//:all",
-        "@remotejdk11_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk11_win_toolchain_config_repo//:all",
-        "@remotejdk11_win_arm64_toolchain_config_repo//:all",
-        "@remotejdk17_linux_toolchain_config_repo//:all",
-        "@remotejdk17_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk17_linux_ppc64le_toolchain_config_repo//:all",
-        "@remotejdk17_linux_s390x_toolchain_config_repo//:all",
-        "@remotejdk17_macos_toolchain_config_repo//:all",
-        "@remotejdk17_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk17_win_toolchain_config_repo//:all",
-        "@remotejdk17_win_arm64_toolchain_config_repo//:all",
-        "@remotejdk21_linux_toolchain_config_repo//:all",
-        "@remotejdk21_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk21_macos_toolchain_config_repo//:all",
-        "@remotejdk21_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk21_win_toolchain_config_repo//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "rules_java@7.4.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel",
-            "line": 19,
-            "column": 27
-          },
-          "imports": {
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64",
-            "local_jdk": "local_jdk",
-            "remotejdk11_linux_toolchain_config_repo": "remotejdk11_linux_toolchain_config_repo",
-            "remotejdk11_linux_aarch64_toolchain_config_repo": "remotejdk11_linux_aarch64_toolchain_config_repo",
-            "remotejdk11_linux_ppc64le_toolchain_config_repo": "remotejdk11_linux_ppc64le_toolchain_config_repo",
-            "remotejdk11_linux_s390x_toolchain_config_repo": "remotejdk11_linux_s390x_toolchain_config_repo",
-            "remotejdk11_macos_toolchain_config_repo": "remotejdk11_macos_toolchain_config_repo",
-            "remotejdk11_macos_aarch64_toolchain_config_repo": "remotejdk11_macos_aarch64_toolchain_config_repo",
-            "remotejdk11_win_toolchain_config_repo": "remotejdk11_win_toolchain_config_repo",
-            "remotejdk11_win_arm64_toolchain_config_repo": "remotejdk11_win_arm64_toolchain_config_repo",
-            "remotejdk17_linux_toolchain_config_repo": "remotejdk17_linux_toolchain_config_repo",
-            "remotejdk17_linux_aarch64_toolchain_config_repo": "remotejdk17_linux_aarch64_toolchain_config_repo",
-            "remotejdk17_linux_ppc64le_toolchain_config_repo": "remotejdk17_linux_ppc64le_toolchain_config_repo",
-            "remotejdk17_linux_s390x_toolchain_config_repo": "remotejdk17_linux_s390x_toolchain_config_repo",
-            "remotejdk17_macos_toolchain_config_repo": "remotejdk17_macos_toolchain_config_repo",
-            "remotejdk17_macos_aarch64_toolchain_config_repo": "remotejdk17_macos_aarch64_toolchain_config_repo",
-            "remotejdk17_win_toolchain_config_repo": "remotejdk17_win_toolchain_config_repo",
-            "remotejdk17_win_arm64_toolchain_config_repo": "remotejdk17_win_arm64_toolchain_config_repo",
-            "remotejdk21_linux_toolchain_config_repo": "remotejdk21_linux_toolchain_config_repo",
-            "remotejdk21_linux_aarch64_toolchain_config_repo": "remotejdk21_linux_aarch64_toolchain_config_repo",
-            "remotejdk21_macos_toolchain_config_repo": "remotejdk21_macos_toolchain_config_repo",
-            "remotejdk21_macos_aarch64_toolchain_config_repo": "remotejdk21_macos_aarch64_toolchain_config_repo",
-            "remotejdk21_win_toolchain_config_repo": "remotejdk21_win_toolchain_config_repo"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.8",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz"
-          ],
-          "integrity": "sha256-l27wi0nJKXQfIBeQ5Z44B8cq2B9CjIvJU82+/1/tFes=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_proto@5.3.0-21.7": {
-      "name": "rules_proto",
-      "version": "5.3.0-21.7",
-      "key": "rules_proto@5.3.0-21.7",
-      "repoName": "rules_proto",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "com_google_protobuf": "protobuf@21.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz"
-          ],
-          "integrity": "sha256-3D+yBqLLNEG0heseQjFlsjEjWh6psDG0Qzz3vB+kYN0=",
-          "strip_prefix": "rules_proto-5.3.0-21.7",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_jvm_external@5.2": {
-      "name": "rules_jvm_external",
-      "version": "5.2",
-      "key": "rules_jvm_external@5.2",
-      "repoName": "rules_jvm_external",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:non-module-deps.bzl",
-          "extensionName": "non_module_deps",
-          "usingModule": "rules_jvm_external@5.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel",
-            "line": 9,
-            "column": 32
-          },
-          "imports": {
-            "io_bazel_rules_kotlin": "io_bazel_rules_kotlin"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "rules_jvm_external@5.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel",
-            "line": 15,
-            "column": 22
-          },
-          "imports": {
-            "rules_jvm_external_deps": "rules_jvm_external_deps"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "rules_jvm_external_deps",
-                "artifacts": [
-                  "com.google.auth:google-auth-library-credentials:0.22.0",
-                  "com.google.auth:google-auth-library-oauth2-http:0.22.0",
-                  "com.google.cloud:google-cloud-core:1.93.10",
-                  "com.google.cloud:google-cloud-storage:1.113.4",
-                  "com.google.code.gson:gson:2.9.0",
-                  "com.google.googlejavaformat:google-java-format:1.15.0",
-                  "com.google.guava:guava:31.1-jre",
-                  "org.apache.maven:maven-artifact:3.8.6",
-                  "software.amazon.awssdk:s3:2.17.183"
-                ],
-                "lock_file": "@rules_jvm_external//:rules_jvm_external_deps_install.json"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel",
-                "line": 16,
-                "column": 14
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "io_bazel_stardoc": "stardoc@0.5.3",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.2/rules_jvm_external-5.2.tar.gz"
-          ],
-          "integrity": "sha256-+G/UKoCeGHHKCqvonbDUQEUSGcPORsWNokDH3NwAEl8=",
-          "strip_prefix": "rules_jvm_external-5.2",
-          "remote_patches": {},
-          "remote_patch_strip": 0,
-          "patches": [
-            "@@//third_party:rules_jvm_external_5.2.patch"
-          ],
-          "patch_cmds": [],
-          "patch_args": [
-            "-p1"
-          ]
-        }
-      }
-    },
-    "rules_python@0.26.0": {
-      "name": "rules_python",
-      "version": "0.26.0",
-      "key": "rules_python@0.26.0",
-      "repoName": "rules_python",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@pythons_hub//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_python//python/extensions/private:internal_deps.bzl",
-          "extensionName": "internal_deps",
-          "usingModule": "rules_python@0.26.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_python/0.26.0/MODULE.bazel",
-            "line": 15,
-            "column": 30
-          },
-          "imports": {
-            "rules_python_internal": "rules_python_internal",
-            "pypi__build": "pypi__build",
-            "pypi__click": "pypi__click",
-            "pypi__colorama": "pypi__colorama",
-            "pypi__importlib_metadata": "pypi__importlib_metadata",
-            "pypi__installer": "pypi__installer",
-            "pypi__more_itertools": "pypi__more_itertools",
-            "pypi__packaging": "pypi__packaging",
-            "pypi__pep517": "pypi__pep517",
-            "pypi__pip": "pypi__pip",
-            "pypi__pip_tools": "pypi__pip_tools",
-            "pypi__pyproject_hooks": "pypi__pyproject_hooks",
-            "pypi__setuptools": "pypi__setuptools",
-            "pypi__tomli": "pypi__tomli",
-            "pypi__wheel": "pypi__wheel",
-            "pypi__zipp": "pypi__zipp"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {},
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_python/0.26.0/MODULE.bazel",
-                "line": 16,
-                "column": 22
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_python//python/extensions:python.bzl",
-          "extensionName": "python",
-          "usingModule": "rules_python@0.26.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_python/0.26.0/MODULE.bazel",
-            "line": 41,
-            "column": 23
-          },
-          "imports": {
-            "pythons_hub": "pythons_hub"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "toolchain",
-              "attributeValues": {
-                "is_default": true,
-                "python_version": "3.11"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_python/0.26.0/MODULE.bazel",
-                "line": 47,
-                "column": 17
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_features": "bazel_features@1.1.0",
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "platforms": "platforms@0.0.8",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz"
-          ],
-          "integrity": "sha256-nQQEGskqCYXjRCNfXZRvcaxUPxsVZfLNvJoqruit9Vs=",
-          "strip_prefix": "rules_python-0.26.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_python/0.26.0/patches/module_dot_bazel_version.patch": "sha256-V3kwks4ppP5NERbfSY4505SXghM4mKLEBuhi4tpseZE="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "rules_testing@0.0.4": {
-      "name": "rules_testing",
-      "version": "0.0.4",
-      "key": "rules_testing@0.0.4",
-      "repoName": "rules_testing",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_testing/releases/download/v0.0.4/rules_testing-v0.0.4.tar.gz"
-          ],
-          "integrity": "sha256-TiH5qnmWlEzpFDHye8o3S/9W5oCs/klydgdNVrxdmvI=",
-          "strip_prefix": "rules_testing-0.0.4",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_testing/0.0.4/patches/module_dot_bazel_version.patch": "sha256-0bNxHP/dstK5Ftz0e6FMQ2tyV4BZwp6Bh2et7ZuD1kk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "googletest@1.14.0": {
-      "name": "googletest",
-      "version": "1.14.0",
-      "key": "googletest@1.14.0",
-      "repoName": "googletest",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "com_google_absl": "abseil-cpp@20230125.1",
-        "platforms": "platforms@0.0.8",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz"
-          ],
-          "integrity": "sha256-itWYxzrXluDYKAsILOvYKmMNc+c808cAV5OKZQG7pdc=",
-          "strip_prefix": "googletest-1.14.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/googletest/1.14.0/patches/module_dot_bazel.patch": "sha256-CSomzvti38LCuURDG5EEoa3O1tQF3cKKt/mknnP1qcc="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "remoteapis@_": {
-      "name": "remoteapis",
-      "version": "",
-      "key": "remoteapis@_",
-      "repoName": "remoteapis",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_java": "rules_java@7.4.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "googleapis": "googleapis@_",
-        "io_bazel": "<root>",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "googleapis@_": {
-      "name": "googleapis",
-      "version": "",
-      "key": "googleapis@_",
-      "repoName": "googleapis",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_license": "rules_license@0.0.7",
-        "rules_java": "rules_java@7.4.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "io_bazel": "<root>",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "apple_support@1.8.1": {
-      "name": "apple_support",
-      "version": "1.8.1",
-      "key": "apple_support@1.8.1",
-      "repoName": "build_bazel_apple_support",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_apple_cc_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@build_bazel_apple_support//crosstool:setup.bzl",
-          "extensionName": "apple_cc_configure_extension",
-          "usingModule": "apple_support@1.8.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/apple_support/1.8.1/MODULE.bazel",
-            "line": 14,
-            "column": 35
-          },
-          "imports": {
-            "local_config_apple_cc": "local_config_apple_cc",
-            "local_config_apple_cc_toolchains": "local_config_apple_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "platforms": "platforms@0.0.8",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/apple_support/releases/download/1.8.1/apple_support.1.8.1.tar.gz"
-          ],
-          "integrity": "sha256-Rda7rVMWycMAh4v3//xP/eE9YgSEyRhHCMkX4guLY/8=",
-          "strip_prefix": "",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/apple_support/1.8.1/patches/module_dot_bazel_version.patch": "sha256-KiC39AC9hYWZhC2sZwZcY46HVerfh2p9pzF9WXqcxAI="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "abseil-cpp@20230125.1": {
-      "name": "abseil-cpp",
-      "version": "20230125.1",
-      "key": "abseil-cpp@20230125.1",
-      "repoName": "abseil-cpp",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "platforms": "platforms@0.0.8",
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.1.tar.gz"
-          ],
-          "integrity": "sha256-gTEcF1mbNxIGne0gzKCaYqsL8qid+haZN4bIeCt+0UU=",
-          "strip_prefix": "abseil-cpp-20230125.1",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/patches/module_dot_bazel.patch": "sha256-L1wChhBmDOnRbPbD4MENVXHjOBT2KFrDxT6D+aoThxk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "c-ares@1.15.0": {
-      "name": "c-ares",
-      "version": "1.15.0",
-      "key": "c-ares@1.15.0",
-      "repoName": "c-ares",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "com_github_grpc_grpc": "grpc@1.48.1.bcr.1",
-        "platforms": "platforms@0.0.8",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/c-ares/c-ares/releases/download/cares-1_15_0/c-ares-1.15.0.tar.gz"
-          ],
-          "integrity": "sha256-bNuXhx8pMFMMl963z1yPpL5aCwLHzqbnx2Z2cqOdaFI=",
-          "strip_prefix": "c-ares-1.15.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/c-ares/1.15.0/patches/add_build_file.patch": "sha256-+SUCFxBIkR0GE9FRFPps/e6AnA9cQIGANBHK14UAKwQ=",
-            "https://bcr.bazel.build/modules/c-ares/1.15.0/patches/module_dot_bazel.patch": "sha256-SVQeSrnvd7IishMhmg8S3PK6/6bbt1IqwVEqKDfdYgk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_go@0.39.1": {
-      "name": "rules_go",
-      "version": "0.39.1",
-      "key": "rules_go@0.39.1",
-      "repoName": "io_bazel_rules_go",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@go_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@io_bazel_rules_go//go/private:extensions.bzl",
-          "extensionName": "non_module_dependencies",
-          "usingModule": "rules_go@0.39.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_go/0.39.1/MODULE.bazel",
-            "line": 13,
-            "column": 40
-          },
-          "imports": {
-            "go_googleapis": "go_googleapis",
-            "io_bazel_rules_nogo": "io_bazel_rules_nogo"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel_rules_go//go:extensions.bzl",
-          "extensionName": "go_sdk",
-          "usingModule": "rules_go@0.39.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_go/0.39.1/MODULE.bazel",
-            "line": 20,
-            "column": 23
-          },
-          "imports": {
-            "go_toolchains": "go_toolchains"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "download",
-              "attributeValues": {
-                "name": "go_default_sdk",
-                "version": "1.19.8"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_go/0.39.1/MODULE.bazel",
-                "line": 21,
-                "column": 16
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@gazelle//:extensions.bzl",
-          "extensionName": "go_deps",
-          "usingModule": "rules_go@0.39.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_go/0.39.1/MODULE.bazel",
-            "line": 31,
-            "column": 24
-          },
-          "imports": {
-            "com_github_gogo_protobuf": "com_github_gogo_protobuf",
-            "com_github_golang_mock": "com_github_golang_mock",
-            "com_github_golang_protobuf": "com_github_golang_protobuf",
-            "org_golang_google_genproto": "org_golang_google_genproto",
-            "org_golang_google_grpc": "org_golang_google_grpc",
-            "org_golang_google_protobuf": "org_golang_google_protobuf",
-            "org_golang_x_net": "org_golang_x_net"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "from_file",
-              "attributeValues": {
-                "go_mod": "//:go.mod"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_go/0.39.1/MODULE.bazel",
-                "line": 32,
-                "column": 18
-              }
-            },
-            {
-              "tagName": "module",
-              "attributeValues": {
-                "path": "github.com/gogo/protobuf",
-                "sum": "h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=",
-                "version": "v1.3.2"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_go/0.39.1/MODULE.bazel",
-                "line": 33,
-                "column": 15
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "platforms": "platforms@0.0.8",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "gazelle": "gazelle@0.30.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip"
-          ],
-          "integrity": "sha256-bcLaerTPXXv8fJSXdrG3xzPwXlbtxLzZAiuySdLiqZY=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "upb@0.0.0-20220923-a547704": {
-      "name": "upb",
-      "version": "0.0.0-20220923-a547704",
-      "key": "upb@0.0.0-20220923-a547704",
-      "repoName": "upb",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "com_google_absl": "abseil-cpp@20230125.1",
-        "platforms": "platforms@0.0.8",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz"
-          ],
-          "integrity": "sha256-z39x6v+QskwaKLSWRan/A6mmwecTQpHOcJActj5zZLU=",
-          "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/patches/module_dot_bazel.patch": "sha256-wH4mNS6ZYy+8uC0HoAft/c7SDsq2Kxf+J8dUakXhaB0="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "bazel_tools@_": {
-      "name": "bazel_tools",
-      "version": "",
-      "key": "bazel_tools@_",
-      "repoName": "bazel_tools",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_cc_toolchains//:all",
-        "@local_config_sh//:local_sh_toolchain"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 18,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc": "local_config_cc",
-            "local_config_cc_toolchains": "local_config_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/osx:xcode_configure.bzl",
-          "extensionName": "xcode_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 22,
-            "column": 32
-          },
-          "imports": {
-            "local_config_xcode": "local_config_xcode"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 25,
-            "column": 32
-          },
-          "imports": {
-            "local_jdk": "local_jdk",
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/sh:sh_configure.bzl",
-          "extensionName": "sh_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 36,
-            "column": 39
-          },
-          "imports": {
-            "local_config_sh": "local_config_sh"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/test:extensions.bzl",
-          "extensionName": "remote_coverage_tools_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 40,
-            "column": 48
-          },
-          "imports": {
-            "remote_coverage_tools": "remote_coverage_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/android:android_extensions.bzl",
-          "extensionName": "remote_android_tools_extensions",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 43,
-            "column": 42
-          },
-          "imports": {
-            "android_gmaven_r8": "android_gmaven_r8",
-            "android_tools": "android_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@buildozer//:buildozer_binary.bzl",
-          "extensionName": "buildozer_binary",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 47,
-            "column": 33
-          },
-          "imports": {
-            "buildozer_binary": "buildozer_binary"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_java": "rules_java@7.4.0",
-        "rules_license": "rules_license@0.0.7",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_python": "rules_python@0.26.0",
-        "buildozer": "buildozer@6.4.0.2",
-        "platforms": "platforms@0.0.8",
-        "com_google_protobuf": "protobuf@21.7",
-        "zlib": "zlib@1.3",
-        "build_bazel_apple_support": "apple_support@1.8.1",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "local_config_platform@_": {
-      "name": "local_config_platform",
-      "version": "",
-      "key": "local_config_platform@_",
-      "repoName": "local_config_platform",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.8",
-        "bazel_tools": "bazel_tools@_"
-      }
-    },
-    "boringssl@0.0.0-20211025-d4f1ab9": {
-      "name": "boringssl",
-      "version": "0.0.0-20211025-d4f1ab9",
-      "key": "boringssl@0.0.0-20211025-d4f1ab9",
-      "repoName": "boringssl",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/google/boringssl/archive/d4f1ab983065e4616319f59c723c7b9870021fae.tar.gz"
-          ],
-          "integrity": "sha256-M26QowTRWQe0pyMgTvDHwMabsdfxLqYP6MMwUWZjC/I=",
-          "strip_prefix": "boringssl-d4f1ab983065e4616319f59c723c7b9870021fae",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/boringssl/0.0.0-20211025-d4f1ab9/patches/module_dot_bazel.patch": "sha256-TJNetd16OGSjVWvmBAL4iZM/uatmXvjR0AsjHrPRGUA="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "re2@2021-09-01": {
-      "name": "re2",
-      "version": "2021-09-01",
-      "key": "re2@2021-09-01",
-      "repoName": "re2",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/google/re2/archive/refs/tags/2021-09-01.zip"
-          ],
-          "integrity": "sha256-739ELobFx96SqV7QdeOUNre0fFKk5+5jV1IU7slG/C8=",
-          "strip_prefix": "re2-2021-09-01",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/re2/2021-09-01/patches/module_dot_bazel.patch": "sha256-uLpoNV5fETcQxOqvD9PtPv4CHYhetfPSkPIJPXoLXcg="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "bazel_features@1.1.0": {
-      "name": "bazel_features",
-      "version": "1.1.0",
-      "key": "bazel_features@1.1.0",
-      "repoName": "bazel_features",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_features//private:extensions.bzl",
-          "extensionName": "version_extension",
-          "usingModule": "bazel_features@1.1.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/bazel_features/1.1.0/MODULE.bazel",
-            "line": 6,
-            "column": 24
-          },
-          "imports": {
-            "bazel_features_globals": "bazel_features_globals",
-            "bazel_features_version": "bazel_features_version"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazel-contrib/bazel_features/releases/download/v1.1.0/bazel_features-v1.1.0.tar.gz"
-          ],
-          "integrity": "sha256-4hD6q1dkP7Z1Lwt/DRIJdqKZ1dqe0g4gEp7hE0o8/Hw=",
-          "strip_prefix": "bazel_features-1.1.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/bazel_features/1.1.0/patches/module_dot_bazel_version.patch": "sha256-o16WYfVZruIX5FGE8sATXKb9PLRpH26dbAVdbKPKVRk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "gazelle@0.30.0": {
-      "name": "gazelle",
-      "version": "0.30.0",
-      "key": "gazelle@0.30.0",
-      "repoName": "bazel_gazelle",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@io_bazel_rules_go//go:extensions.bzl",
-          "extensionName": "go_sdk",
-          "usingModule": "gazelle@0.30.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/gazelle/0.30.0/MODULE.bazel",
-            "line": 12,
-            "column": 23
-          },
-          "imports": {
-            "go_default_sdk": "go_default_sdk"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_gazelle//internal/bzlmod:non_module_deps.bzl",
-          "extensionName": "non_module_deps",
-          "usingModule": "gazelle@0.30.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/gazelle/0.30.0/MODULE.bazel",
-            "line": 17,
-            "column": 32
-          },
-          "imports": {
-            "bazel_gazelle_go_repository_cache": "bazel_gazelle_go_repository_cache",
-            "bazel_gazelle_go_repository_tools": "bazel_gazelle_go_repository_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@io_bazel_rules_go//go/private:extensions.bzl",
-          "extensionName": "non_module_dependencies",
-          "usingModule": "gazelle@0.30.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/gazelle/0.30.0/MODULE.bazel",
-            "line": 24,
-            "column": 41
-          },
-          "imports": {
-            "go_googleapis": "go_googleapis"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_gazelle//:extensions.bzl",
-          "extensionName": "go_deps",
-          "usingModule": "gazelle@0.30.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/gazelle/0.30.0/MODULE.bazel",
-            "line": 30,
-            "column": 24
-          },
-          "imports": {
-            "com_github_bazelbuild_buildtools": "com_github_bazelbuild_buildtools",
-            "com_github_bmatcuk_doublestar_v4": "com_github_bmatcuk_doublestar_v4",
-            "com_github_fsnotify_fsnotify": "com_github_fsnotify_fsnotify",
-            "com_github_google_go_cmp": "com_github_google_go_cmp",
-            "com_github_pelletier_go_toml": "com_github_pelletier_go_toml",
-            "com_github_pmezard_go_difflib": "com_github_pmezard_go_difflib",
-            "org_golang_x_mod": "org_golang_x_mod",
-            "org_golang_x_sync": "org_golang_x_sync",
-            "org_golang_x_tools": "org_golang_x_tools",
-            "bazel_gazelle_go_repository_config": "bazel_gazelle_go_repository_config"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "from_file",
-              "attributeValues": {
-                "go_mod": "//:go.mod"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/gazelle/0.30.0/MODULE.bazel",
-                "line": 31,
-                "column": 18
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.5.0",
-        "com_google_protobuf": "protobuf@21.7",
-        "io_bazel_rules_go": "rules_go@0.39.1",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz"
-          ],
-          "integrity": "sha256-cn8+Tt2W6iDCnowsqejSr3JNjHd455I6hUssgJUrxAU=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "buildozer@6.4.0.2": {
-      "name": "buildozer",
-      "version": "6.4.0.2",
-      "key": "buildozer@6.4.0.2",
-      "repoName": "buildozer",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@buildozer//:buildozer_binary.bzl",
-          "extensionName": "buildozer_binary",
-          "usingModule": "buildozer@6.4.0.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel",
-            "line": 7,
-            "column": 33
-          },
-          "imports": {
-            "buildozer_binary": "buildozer_binary"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "buildozer",
-              "attributeValues": {
-                "sha256": {
-                  "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e",
-                  "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d",
-                  "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119",
-                  "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa",
-                  "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b"
-                },
-                "version": "6.4.0"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel",
-                "line": 8,
-                "column": 27
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/fmeum/buildozer/releases/download/v6.4.0.2/buildozer-v6.4.0.2.tar.gz"
-          ],
-          "integrity": "sha256-k7tFKQMR2AygxpmZfH0yEPnQmF3efFgD9rBPkj+Yz/8=",
-          "strip_prefix": "buildozer-6.4.0.2",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/buildozer/6.4.0.2/patches/module_dot_bazel_version.patch": "sha256-gKANF2HMilj7bWmuXs4lbBIAAansuWC4IhWGB/CerjU="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    }
-  },
-  "moduleExtensions": {
-    "//:extensions.bzl%bazel_android_deps": {
-      "general": {
-        "bzlTransitiveDigest": "KBarN1/r/5veMYz+cUHOlEzjGUdmUkxNYymHZwCJULg=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "desugar_jdk_libs": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "ef71be474fbb3b3b7bd70cda139f01232c63b9e1bbd08c058b00a8d538d4db17",
-              "strip_prefix": "desugar_jdk_libs-24dcd1dead0b64aae3d7c89ca9646b5dc4068009",
-              "url": "https://github.com/google/desugar_jdk_libs/archive/24dcd1dead0b64aae3d7c89ca9646b5dc4068009.zip"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "",
-            "abseil-cpp",
-            "abseil-cpp~"
-          ],
-          [
-            "",
-            "apple_support",
-            "apple_support~"
-          ],
-          [
-            "",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "",
-            "blake3",
-            "blake3~"
-          ],
-          [
-            "",
-            "c-ares",
-            "c-ares~"
-          ],
-          [
-            "",
-            "com_github_grpc_grpc",
-            "grpc~"
-          ],
-          [
-            "",
-            "com_google_protobuf",
-            "protobuf~"
-          ],
-          [
-            "",
-            "io_bazel_skydoc",
-            "stardoc~"
-          ],
-          [
-            "",
-            "platforms",
-            "platforms"
-          ],
-          [
-            "",
-            "rules_cc",
-            "rules_cc~"
-          ],
-          [
-            "",
-            "rules_go",
-            "rules_go~"
-          ],
-          [
-            "",
-            "rules_graalvm",
-            "rules_graalvm~"
-          ],
-          [
-            "",
-            "rules_java",
-            "rules_java~"
-          ],
-          [
-            "",
-            "rules_jvm_external",
-            "rules_jvm_external~"
-          ],
-          [
-            "",
-            "rules_license",
-            "rules_license~"
-          ],
-          [
-            "",
-            "rules_pkg",
-            "rules_pkg~"
-          ],
-          [
-            "",
-            "rules_proto",
-            "rules_proto~"
-          ],
-          [
-            "",
-            "rules_python",
-            "rules_python~"
-          ],
-          [
-            "",
-            "upb",
-            "upb~"
-          ],
-          [
-            "",
-            "zlib",
-            "zlib~"
-          ],
-          [
-            "",
-            "zstd-jni",
-            "zstd-jni~"
-          ],
-          [
-            "bazel_tools",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "//:extensions.bzl%bazel_build_deps": {
-      "general": {
-        "bzlTransitiveDigest": "KBarN1/r/5veMYz+cUHOlEzjGUdmUkxNYymHZwCJULg=",
-        "recordedFileInputs": {
-          "@@//MODULE.bazel": "c07897f4cf2ea76f689df2779f50aed06ea638d666542078234ebb0efd3ea5a5",
-          "@@//src/test/tools/bzlmod/MODULE.bazel.lock": "0cae3b3c6186baa47cd8a48fe55530f613f22016845926e7825dce52dd496540"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "openjdk_macos_aarch64_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2a7a99a3ea263dbd8d32a67d1e6e363ba8b25c645c826f5e167a02bbafaff1fa",
-              "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz",
-              "url": "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz"
-            }
-          },
-          "bazel_tools_repo_cache": {
-            "bzlFile": "@@//:distdir.bzl",
-            "ruleClassName": "repo_cache_tar",
-            "attributes": {
-              "repos": [
-                "rules_cc~",
-                "rules_java~",
-                "rules_license~",
-                "rules_proto~",
-                "rules_python~",
-                "buildozer~",
-                "platforms",
-                "protobuf~",
-                "zlib~",
-                "apple_support~",
-                "bazel_skylib~",
-                "rules_pkg~",
-                "abseil-cpp~",
-                "upb~",
-                "rules_jvm_external~",
-                "googletest~",
-                "stardoc~"
-              ],
-              "lockfile": "@@//src/test/tools/bzlmod:MODULE.bazel.lock"
-            }
-          },
-          "openjdk_linux_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0c0eadfbdc47a7ca64aeab51b9c061f71b6e4d25d2d87674512e9b6387e9e3a6",
-              "downloaded_file_path": "zulu-linux-vanilla.tar.gz",
-              "url": "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz"
-            }
-          },
-          "debian_cc_deps": {
-            "bzlFile": "@@//tools/distributions:system_repo.bzl",
-            "ruleClassName": "system_repo",
-            "attributes": {
-              "symlinks": {},
-              "build_file": "@@//tools/distributions/debian:debian_cc.BUILD"
-            }
-          },
-          "debian_java_deps": {
-            "bzlFile": "@@//tools/distributions:system_repo.bzl",
-            "ruleClassName": "system_repo",
-            "attributes": {
-              "symlinks": {
-                "java": "/usr/share/java"
-              },
-              "build_file": "@@//tools/distributions/debian:debian_java.BUILD"
-            }
-          },
-          "openjdk_linux_s390x_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f2512f9a8e9847dd5d3557c39b485a8e7a1ef37b601dcbcb748d22e49f44815c",
-              "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
-              "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_s390x_linux_hotspot_19.0.2_7.tar.gz"
-            }
-          },
-          "bootstrap_repo_cache": {
-            "bzlFile": "@@//:distdir.bzl",
-            "ruleClassName": "repo_cache_tar",
-            "attributes": {
-              "repos": [
-                "abseil-cpp~",
-                "apple_support~",
-                "bazel_skylib~",
-                "blake3~",
-                "c-ares~",
-                "grpc~",
-                "protobuf~",
-                "stardoc~",
-                "platforms",
-                "rules_cc~",
-                "rules_go~",
-                "rules_java~",
-                "rules_jvm_external~",
-                "rules_graalvm~",
-                "rules_license~",
-                "rules_pkg~",
-                "rules_proto~",
-                "rules_python~",
-                "upb~",
-                "zlib~",
-                "zstd-jni~",
-                "grpc~~grpc_repo_deps_ext~bazel_gazelle",
-                "grpc~~grpc_repo_deps_ext~bazel_skylib",
-                "grpc~~grpc_repo_deps_ext~com_envoyproxy_protoc_gen_validate",
-                "grpc~~grpc_repo_deps_ext~com_github_cncf_udpa",
-                "grpc~~grpc_repo_deps_ext~com_google_googleapis",
-                "grpc~~grpc_repo_deps_ext~envoy_api",
-                "grpc~~grpc_repo_deps_ext~rules_cc"
-              ],
-              "dirname": "derived/repository_cache"
-            }
-          },
-          "debian_bin_deps": {
-            "bzlFile": "@@//tools/distributions:system_repo.bzl",
-            "ruleClassName": "system_repo",
-            "attributes": {
-              "symlinks": {
-                "protoc": "/usr/bin/protoc",
-                "grpc_cpp_plugin": "/usr/bin/grpc_cpp_plugin",
-                "grpc_java_plugin": "/usr/bin/grpc_java_plugin"
-              },
-              "build_file": "@@//tools/distributions/debian:debian_bin.BUILD"
-            }
-          },
-          "openjdk_win_arm64_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "975603e684f2ec5a525b3b5336d6aa0b09b5b7d2d0d9e271bd6a9892ad550181",
-              "downloaded_file_path": "zulu-win-arm64.zip",
-              "url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-windows-aarch64.zip"
-            }
-          },
-          "openjdk_linux_ppc64le_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded",
-              "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
-              "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz"
-            }
-          },
-          "openjdk_macos_x86_64_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9639b87db586d0c89f7a9892ae47f421e442c64b97baebdff31788fbe23265bd",
-              "downloaded_file_path": "zulu-macos-vanilla.tar.gz",
-              "url": "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz"
-            }
-          },
-          "workspace_repo_cache": {
-            "bzlFile": "@@//:distdir.bzl",
-            "ruleClassName": "_distdir_tar",
-            "attributes": {
-              "archives": [
-                "rules_cc-0.0.9.tar.gz",
-                "rules_java-7.4.0.tar.gz",
-                "5.3.0-21.7.tar.gz",
-                "bazel-skylib-1.5.0.tar.gz",
-                "rules_license-0.0.7.tar.gz",
-                "rules_python-0.24.0.tar.gz",
-                "rules_pkg-0.9.1.tar.gz",
-                "rules_testing-v0.0.4.tar.gz",
-                "coverage_output_generator-v2.6.zip"
-              ],
-              "sha256": {
-                "rules_cc-0.0.9.tar.gz": "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
-                "rules_java-7.4.0.tar.gz": "976ef08b49c929741f201790e59e3807c72ad81f428c8bc953cdbeff5fed15eb",
-                "5.3.0-21.7.tar.gz": "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
-                "bazel-skylib-1.5.0.tar.gz": "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
-                "rules_license-0.0.7.tar.gz": "4531deccb913639c30e5c7512a054d5d875698daeb75d8cf90f284375fe7c360",
-                "rules_python-0.24.0.tar.gz": "0a8003b044294d7840ac7d9d73eef05d6ceb682d7516781a4ec62eeb34702578",
-                "rules_pkg-0.9.1.tar.gz": "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
-                "rules_testing-v0.0.4.tar.gz": "4e21f9aa7996944ce91431f27bca374bff56e680acfe497276074d56bc5d9af2",
-                "coverage_output_generator-v2.6.zip": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af"
-              },
-              "urls": {
-                "rules_cc-0.0.9.tar.gz": [
-                  "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"
-                ],
-                "rules_java-7.4.0.tar.gz": [
-                  "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz"
-                ],
-                "5.3.0-21.7.tar.gz": [
-                  "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz"
-                ],
-                "bazel-skylib-1.5.0.tar.gz": [
-                  "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"
-                ],
-                "rules_license-0.0.7.tar.gz": [
-                  "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz"
-                ],
-                "rules_python-0.24.0.tar.gz": [
-                  "https://github.com/bazelbuild/rules_python/releases/download/0.24.0/rules_python-0.24.0.tar.gz"
-                ],
-                "rules_pkg-0.9.1.tar.gz": [
-                  "https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz"
-                ],
-                "rules_testing-v0.0.4.tar.gz": [
-                  "https://github.com/bazelbuild/rules_testing/releases/download/v0.0.4/rules_testing-v0.0.4.tar.gz"
-                ],
-                "coverage_output_generator-v2.6.zip": [
-                  "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-                ]
-              }
-            }
-          },
-          "openjdk_win_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e9959d500a0d9a7694ac243baf657761479da132f0f94720cbffd092150bd802",
-              "downloaded_file_path": "zulu-win-vanilla.zip",
-              "url": "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip"
-            }
-          },
-          "openjdk_linux_aarch64_vanilla": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1fb64b8036c5d463d8ab59af06bf5b6b006811e6012e3b0eb6bccf57f1c55835",
-              "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
-              "url": "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz"
-            }
-          },
-          "debian_proto_deps": {
-            "bzlFile": "@@//tools/distributions:system_repo.bzl",
-            "ruleClassName": "system_repo",
-            "attributes": {
-              "symlinks": {
-                "google/protobuf": "/usr/include/google/protobuf"
-              },
-              "build_file": "@@//tools/distributions/debian:debian_proto.BUILD"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "",
-            "abseil-cpp",
-            "abseil-cpp~"
-          ],
-          [
-            "",
-            "apple_support",
-            "apple_support~"
-          ],
-          [
-            "",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "",
-            "blake3",
-            "blake3~"
-          ],
-          [
-            "",
-            "c-ares",
-            "c-ares~"
-          ],
-          [
-            "",
-            "com_github_grpc_grpc",
-            "grpc~"
-          ],
-          [
-            "",
-            "com_google_protobuf",
-            "protobuf~"
-          ],
-          [
-            "",
-            "io_bazel_skydoc",
-            "stardoc~"
-          ],
-          [
-            "",
-            "platforms",
-            "platforms"
-          ],
-          [
-            "",
-            "rules_cc",
-            "rules_cc~"
-          ],
-          [
-            "",
-            "rules_go",
-            "rules_go~"
-          ],
-          [
-            "",
-            "rules_graalvm",
-            "rules_graalvm~"
-          ],
-          [
-            "",
-            "rules_java",
-            "rules_java~"
-          ],
-          [
-            "",
-            "rules_jvm_external",
-            "rules_jvm_external~"
-          ],
-          [
-            "",
-            "rules_license",
-            "rules_license~"
-          ],
-          [
-            "",
-            "rules_pkg",
-            "rules_pkg~"
-          ],
-          [
-            "",
-            "rules_proto",
-            "rules_proto~"
-          ],
-          [
-            "",
-            "rules_python",
-            "rules_python~"
-          ],
-          [
-            "",
-            "upb",
-            "upb~"
-          ],
-          [
-            "",
-            "zlib",
-            "zlib~"
-          ],
-          [
-            "",
-            "zstd-jni",
-            "zstd-jni~"
-          ],
-          [
-            "bazel_tools",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "//:extensions.bzl%bazel_test_deps": {
-      "general": {
-        "bzlTransitiveDigest": "KBarN1/r/5veMYz+cUHOlEzjGUdmUkxNYymHZwCJULg=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_winsdk": {
-            "bzlFile": "@@//src/main/res:winsdk_configure.bzl",
-            "ruleClassName": "winsdk_configure",
-            "attributes": {}
-          },
-          "local_bazel_source_list": {
-            "bzlFile": "@@//src/test/shell/bazel:list_source_repository.bzl",
-            "ruleClassName": "list_source_repository",
-            "attributes": {}
-          },
-          "bazelci_rules": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
-              "strip_prefix": "bazelci_rules-1.0.0",
-              "url": "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "",
-            "abseil-cpp",
-            "abseil-cpp~"
-          ],
-          [
-            "",
-            "apple_support",
-            "apple_support~"
-          ],
-          [
-            "",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "",
-            "blake3",
-            "blake3~"
-          ],
-          [
-            "",
-            "c-ares",
-            "c-ares~"
-          ],
-          [
-            "",
-            "com_github_grpc_grpc",
-            "grpc~"
-          ],
-          [
-            "",
-            "com_google_protobuf",
-            "protobuf~"
-          ],
-          [
-            "",
-            "io_bazel_skydoc",
-            "stardoc~"
-          ],
-          [
-            "",
-            "platforms",
-            "platforms"
-          ],
-          [
-            "",
-            "rules_cc",
-            "rules_cc~"
-          ],
-          [
-            "",
-            "rules_go",
-            "rules_go~"
-          ],
-          [
-            "",
-            "rules_graalvm",
-            "rules_graalvm~"
-          ],
-          [
-            "",
-            "rules_java",
-            "rules_java~"
-          ],
-          [
-            "",
-            "rules_jvm_external",
-            "rules_jvm_external~"
-          ],
-          [
-            "",
-            "rules_license",
-            "rules_license~"
-          ],
-          [
-            "",
-            "rules_pkg",
-            "rules_pkg~"
-          ],
-          [
-            "",
-            "rules_proto",
-            "rules_proto~"
-          ],
-          [
-            "",
-            "rules_python",
-            "rules_python~"
-          ],
-          [
-            "",
-            "upb",
-            "upb~"
-          ],
-          [
-            "",
-            "zlib",
-            "zlib~"
-          ],
-          [
-            "",
-            "zstd-jni",
-            "zstd-jni~"
-          ],
-          [
-            "bazel_tools",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "//:rbe_extension.bzl%bazel_rbe_deps": {
-      "general": {
-        "bzlTransitiveDigest": "oNMQ9KtzGcqNHdpe8zMO3lRAVIKWWDmz8n5SMubtIIc=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "rbe_ubuntu2004_java11": {
-            "bzlFile": "@@_main~bazel_test_deps~bazelci_rules//:rbe_repo.bzl",
-            "ruleClassName": "rbe_preconfig",
-            "attributes": {
-              "toolchain": "ubuntu2004-bazel-java11"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "",
-            "bazelci_rules",
-            "_main~bazel_test_deps~bazelci_rules"
-          ]
-        ]
-      }
-    },
-    "//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
-      "general": {
-        "bzlTransitiveDigest": "S0n86BFe4SJ3lRaZiRA5D46oH52UO2hP1T50t/zldOw=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "android_tools": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2",
-              "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar"
-            }
-          },
-          "android_gmaven_r8": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_jar",
-            "attributes": {
-              "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
-              "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "//tools/test:extensions.bzl%remote_coverage_tools_extension": {
-      "general": {
-        "bzlTransitiveDigest": "l5mcjH2gWmbmIycx97bzI2stD0Q0M5gpDc0aLOHKIm8=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remote_coverage_tools": {
-            "bzlFile": "@@//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",
-              "urls": [
-                "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "JFciz9+xRmE31CdyrcEUeZSKFxwiLTQ+PNMg6Bcc6s8=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_apple_cc": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_apple_cc_toolchains": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "apple_support~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@bazel_features~//private:extensions.bzl%version_extension": {
-      "general": {
-        "bzlTransitiveDigest": "LKmXjK1avT44pRhO3x6Hplu1mU9qrNOaHP+/tJ0VFfE=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "bazel_features_version": {
-            "bzlFile": "@@bazel_features~//private:version_repo.bzl",
-            "ruleClassName": "version_repo",
-            "attributes": {}
-          },
-          "bazel_features_globals": {
-            "bzlFile": "@@bazel_features~//private:globals_repo.bzl",
-            "ruleClassName": "globals_repo",
-            "attributes": {
-              "globals": {
-                "RunEnvironmentInfo": "5.3.0",
-                "DefaultInfo": "0.0.1",
-                "__TestingOnly_NeverAvailable": "1000000000.0.0"
-              }
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
-      "general": {
-        "bzlTransitiveDigest": "S0n86BFe4SJ3lRaZiRA5D46oH52UO2hP1T50t/zldOw=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "android_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2",
-              "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar"
-            }
-          },
-          "android_gmaven_r8": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_jar",
-            "attributes": {
-              "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
-              "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "PHpT2yqMGms2U4L3E/aZ+WcQalmZWm+ILdP3yiLsDhA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_cc": {
-            "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl",
-            "ruleClassName": "cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_cc_toolchains": {
-            "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl",
-            "ruleClassName": "cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_tools",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_xcode": {
-            "bzlFile": "@@bazel_tools//tools/osx:xcode_configure.bzl",
-            "ruleClassName": "xcode_autoconf",
-            "attributes": {
-              "xcode_locator": "@bazel_tools//tools/osx:xcode_locator.m",
-              "remote_xcode": ""
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_sh": {
-            "bzlFile": "@@bazel_tools//tools/sh:sh_configure.bzl",
-            "ruleClassName": "sh_config",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": {
-      "general": {
-        "bzlTransitiveDigest": "l5mcjH2gWmbmIycx97bzI2stD0Q0M5gpDc0aLOHKIm8=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remote_coverage_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",
-              "urls": [
-                "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@buildozer~//:buildozer_binary.bzl%buildozer_binary": {
-      "general": {
-        "bzlTransitiveDigest": "EleDU/FQ1+e/RgkW3aIDmdaxZEthvoWQhsqFTxiSgMI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "buildozer_binary": {
-            "bzlFile": "@@buildozer~//private:buildozer_binary.bzl",
-            "ruleClassName": "_buildozer_binary_repo",
-            "attributes": {
-              "sha256": {
-                "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e",
-                "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d",
-                "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119",
-                "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa",
-                "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b"
-              },
-              "version": "6.4.0"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@gazelle~//:extensions.bzl%go_deps": {
-      "general": {
-        "bzlTransitiveDigest": "V0I2A6HQbPqRuhGhygxjQV47OuSSxVaAXG5m+/637Zw=",
-        "recordedFileInputs": {
-          "@@rules_go~//go.mod": "a7143f329c2a3e0b983ce74a96c0c25b0d0c59d236d75f7e1b069aadd988d55e",
-          "@@gazelle~//go.sum": "c9624aa41e5ffd61a8581d57a3c4046e62b46630dddc8b191e65017f34ff12a5",
-          "@@rules_go~//go.sum": "022d36c9ebcc7b5dee1e9b85b3da9c9f3a529ee6f979946d66e4955b8d54614a",
-          "@@gazelle~//go.mod": "5346019bf0673364b383d56ffbc9fced98b7b4ee921e865dfe905a1ebe82d326"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_github_fsnotify_fsnotify": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/fsnotify/fsnotify",
-              "sum": "h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=",
-              "replace": "",
-              "version": "v1.6.0",
-              "build_directives": []
-            }
-          },
-          "org_golang_x_text": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "golang.org/x/text",
-              "sum": "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=",
-              "replace": "",
-              "version": "v0.3.3",
-              "build_directives": []
-            }
-          },
-          "org_golang_google_protobuf": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "google.golang.org/protobuf",
-              "sum": "h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=",
-              "replace": "",
-              "version": "v1.28.0",
-              "build_directives": []
-            }
-          },
-          "com_github_bmatcuk_doublestar_v4": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/bmatcuk/doublestar/v4",
-              "sum": "h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc=",
-              "replace": "",
-              "version": "v4.6.0",
-              "build_directives": []
-            }
-          },
-          "com_github_pmezard_go_difflib": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/pmezard/go-difflib",
-              "sum": "h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=",
-              "replace": "",
-              "version": "v1.0.0",
-              "build_directives": []
-            }
-          },
-          "org_golang_x_mod": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "golang.org/x/mod",
-              "sum": "h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=",
-              "replace": "",
-              "version": "v0.9.0",
-              "build_directives": []
-            }
-          },
-          "org_golang_x_tools": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "golang.org/x/tools",
-              "sum": "h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=",
-              "replace": "",
-              "version": "v0.7.0",
-              "build_directives": []
-            }
-          },
-          "org_golang_x_net": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "golang.org/x/net",
-              "sum": "h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=",
-              "replace": "",
-              "version": "v0.0.0-20210405180319-a5a99cb37ef4",
-              "build_directives": []
-            }
-          },
-          "com_github_bazelbuild_buildtools": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/bazelbuild/buildtools",
-              "sum": "h1:XmPu4mXICgdGnC5dXGjUGbwUD/kUmS0l5Aop3LaevBM=",
-              "replace": "",
-              "version": "v0.0.0-20230317132445-9c3c1fc0106e",
-              "build_directives": []
-            }
-          },
-          "org_golang_google_genproto": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "google.golang.org/genproto",
-              "sum": "h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=",
-              "replace": "",
-              "version": "v0.0.0-20200526211855-cb27e3aa2013",
-              "build_directives": []
-            }
-          },
-          "com_github_gogo_protobuf": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/gogo/protobuf",
-              "sum": "h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=",
-              "replace": "",
-              "version": "v1.3.2",
-              "build_directives": [
-                "gazelle:proto disable"
-              ]
-            }
-          },
-          "com_github_pelletier_go_toml": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/pelletier/go-toml",
-              "sum": "h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=",
-              "replace": "",
-              "version": "v1.9.5",
-              "build_directives": []
-            }
-          },
-          "com_github_golang_protobuf": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/golang/protobuf",
-              "sum": "h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=",
-              "replace": "",
-              "version": "v1.5.2",
-              "build_directives": []
-            }
-          },
-          "com_github_golang_mock": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/golang/mock",
-              "sum": "h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=",
-              "replace": "",
-              "version": "v1.6.0",
-              "build_directives": []
-            }
-          },
-          "org_golang_x_sync": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "golang.org/x/sync",
-              "sum": "h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=",
-              "replace": "",
-              "version": "v0.1.0",
-              "build_directives": []
-            }
-          },
-          "bazel_gazelle_go_repository_config": {
-            "bzlFile": "@@gazelle~//internal/bzlmod:go_deps.bzl",
-            "ruleClassName": "_go_repository_config",
-            "attributes": {
-              "importpaths": {
-                "com_github_gogo_protobuf": "github.com/gogo/protobuf",
-                "com_github_golang_mock": "github.com/golang/mock",
-                "com_github_golang_protobuf": "github.com/golang/protobuf",
-                "org_golang_google_protobuf": "google.golang.org/protobuf",
-                "org_golang_x_net": "golang.org/x/net",
-                "org_golang_x_sys": "golang.org/x/sys",
-                "org_golang_x_text": "golang.org/x/text",
-                "org_golang_google_genproto": "google.golang.org/genproto",
-                "org_golang_google_grpc": "google.golang.org/grpc",
-                "com_github_bazelbuild_buildtools": "github.com/bazelbuild/buildtools",
-                "com_github_bmatcuk_doublestar_v4": "github.com/bmatcuk/doublestar/v4",
-                "com_github_fsnotify_fsnotify": "github.com/fsnotify/fsnotify",
-                "com_github_google_go_cmp": "github.com/google/go-cmp",
-                "com_github_pelletier_go_toml": "github.com/pelletier/go-toml",
-                "com_github_pmezard_go_difflib": "github.com/pmezard/go-difflib",
-                "org_golang_x_mod": "golang.org/x/mod",
-                "org_golang_x_sync": "golang.org/x/sync",
-                "org_golang_x_tools": "golang.org/x/tools"
-              },
-              "build_naming_conventions": {}
-            }
-          },
-          "org_golang_google_grpc": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "google.golang.org/grpc",
-              "sum": "h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=",
-              "replace": "",
-              "version": "v1.50.0",
-              "build_directives": [
-                "gazelle:proto disable"
-              ]
-            }
-          },
-          "org_golang_x_sys": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "golang.org/x/sys",
-              "sum": "h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=",
-              "replace": "",
-              "version": "v0.6.0",
-              "build_directives": []
-            }
-          },
-          "com_github_google_go_cmp": {
-            "bzlFile": "@@gazelle~//internal:go_repository.bzl",
-            "ruleClassName": "go_repository",
-            "attributes": {
-              "importpath": "github.com/google/go-cmp",
-              "sum": "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
-              "replace": "",
-              "version": "v0.5.9",
-              "build_directives": []
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "gazelle~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@gazelle~//internal/bzlmod:non_module_deps.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "30wev+wJfzc4s72MCfbP9U8W+3Js2b+Xbo5ofgZbHw8=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "bazel_gazelle_go_repository_tools": {
-            "bzlFile": "@@gazelle~//internal:go_repository_tools.bzl",
-            "ruleClassName": "go_repository_tools",
-            "attributes": {
-              "go_cache": "@@gazelle~~non_module_deps~bazel_gazelle_go_repository_cache//:go.env"
-            }
-          },
-          "bazel_gazelle_go_repository_cache": {
-            "bzlFile": "@@gazelle~//internal:go_repository_cache.bzl",
-            "ruleClassName": "go_repository_cache",
-            "attributes": {
-              "go_sdk_name": "go_default_sdk",
-              "go_env": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "gazelle~",
-            "bazel_gazelle_go_repository_cache",
-            "gazelle~~non_module_deps~bazel_gazelle_go_repository_cache"
-          ]
-        ]
-      }
-    },
-    "@@grpc~//bazel:grpc_deps.bzl%grpc_repo_deps_ext": {
-      "general": {
-        "bzlTransitiveDigest": "CQymQeM+xKJtqfP8mRUSq0+RY5mOsGzDgE0qRby0QbY=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "io_opencensus_cpp": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1",
-              "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz",
-                "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
-              ]
-            }
-          },
-          "com_github_libuv_libuv": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file": "@@grpc~//third_party:libuv.BUILD",
-              "sha256": "5ca4e9091f3231d8ad8801862dc4e851c23af89c69141d27723157776f7291e7",
-              "strip_prefix": "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz",
-                "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz"
-              ]
-            }
-          },
-          "com_google_googleapis": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0",
-              "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz",
-                "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"
-              ]
-            }
-          },
-          "upb": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "d0fe259d650bf9547e75896a1307bfc7034195e4ae89f5139814d295991ba681",
-              "strip_prefix": "upb-bef53686ec702607971bd3ea4d4fefd80c6cc6e8",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/bef53686ec702607971bd3ea4d4fefd80c6cc6e8.tar.gz",
-                "https://github.com/protocolbuffers/upb/archive/bef53686ec702607971bd3ea4d4fefd80c6cc6e8.tar.gz"
-              ]
-            }
-          },
-          "rules_cc": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "35f2fb4ea0b3e61ad64a369de284e4fbbdcdba71836a5555abb5e194cf119509",
-              "strip_prefix": "rules_cc-624b5d59dfb45672d4239422fa1e3de1822ee110",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_cc/archive/624b5d59dfb45672d4239422fa1e3de1822ee110.tar.gz",
-                "https://github.com/bazelbuild/rules_cc/archive/624b5d59dfb45672d4239422fa1e3de1822ee110.tar.gz"
-              ]
-            }
-          },
-          "boringssl": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40",
-              "strip_prefix": "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz",
-                "https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz"
-              ]
-            }
-          },
-          "bazel_gazelle": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
-              "urls": [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
-                "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz"
-              ]
-            }
-          },
-          "opencensus_proto": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0",
-              "strip_prefix": "opencensus-proto-0.3.0/src",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz",
-                "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz"
-              ],
-              "patches": [
-                "@@grpc~//third_party:opencensus-proto.patch"
-              ],
-              "patch_args": [
-                "-p2"
-              ]
-            }
-          },
-          "com_googlesource_code_re2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "319a58a58d8af295db97dfeecc4e250179c5966beaa2d842a82f0a013b6a239b",
-              "strip_prefix": "re2-8e08f47b11b413302749c0d8b17a1c94777495d5",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz",
-                "https://github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz"
-              ]
-            }
-          },
-          "bazel_skylib": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
-                "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz"
-              ],
-              "sha256": "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"
-            }
-          },
-          "com_github_cares_cares": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file": "@@grpc~//third_party:cares/cares.BUILD",
-              "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93",
-              "strip_prefix": "c-ares-6654436a307a5a686b008c1d4c93b0085da6e6d8",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",
-                "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz"
-              ]
-            }
-          },
-          "build_bazel_apple_support": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz",
-                "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz"
-              ]
-            }
-          },
-          "zlib": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file": "@@grpc~//third_party:zlib.BUILD",
-              "sha256": "ef47b0fbe646d69a2fc5ba012cb278de8e8946a8e9649f83a807cc05559f0eff",
-              "strip_prefix": "zlib-21767c654d31d2dccdde4330529775c6c5fd5389",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz",
-                "https://github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz"
-              ]
-            }
-          },
-          "com_google_googletest": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "c8de6c60e12ad014a28225c5247ee735861d85cf906df617f6a29954ca05f547",
-              "strip_prefix": "googletest-0e402173c97aea7a00749e825b194bfede4f2e45",
-              "urls": [
-                "https://github.com/google/googletest/archive/0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz"
-              ]
-            }
-          },
-          "envoy_api": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "c5807010b67033330915ca5a20483e30538ae5e689aa14b3631d6284beca4630",
-              "strip_prefix": "data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz",
-                "https://github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz"
-              ]
-            }
-          },
-          "build_bazel_rules_apple": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz",
-                "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz"
-              ]
-            }
-          },
-          "com_github_cncf_udpa": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc",
-              "strip_prefix": "xds-cb28da3451f158a947dfc45090fe92b07b243bc1",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz",
-                "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz"
-              ]
-            }
-          },
-          "com_github_google_benchmark": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "0b921a3bc39e35f4275c8dcc658af2391c150fb966102341287b0401ff2e6f21",
-              "strip_prefix": "benchmark-0baacde3618ca617da95375e0af13ce1baadea47",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz",
-                "https://github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz"
-              ]
-            }
-          },
-          "com_envoyproxy_protoc_gen_validate": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "strip_prefix": "protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69",
-              "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47",
-              "urls": [
-                "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz"
-              ],
-              "patches": [
-                "@@grpc~//third_party:protoc-gen-validate.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "com_google_absl": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602",
-              "strip_prefix": "abseil-cpp-20220623.0",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20220623.0.tar.gz",
-                "https://github.com/abseil/abseil-cpp/archive/20220623.0.tar.gz"
-              ]
-            }
-          },
-          "bazel_toolchains": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
-              "strip_prefix": "bazel-toolchains-4.1.0",
-              "urls": [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
-                "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz"
-              ]
-            }
-          },
-          "bazel_compdb": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4",
-              "strip_prefix": "bazel-compilation-database-0.4.5",
-              "urls": [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz",
-                "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "grpc~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "grpc~",
-            "com_github_grpc_grpc",
-            "grpc~"
-          ]
-        ]
-      }
-    },
-    "@@grpc~//bazel:grpc_extra_deps.bzl%grpc_extra_deps_ext": {
-      "general": {
-        "bzlTransitiveDigest": "APB5VWiSPsu/YjQruUlTuHP2OspkSapZzpofR9h3kOc=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_google_googleapis_imports": {
-            "bzlFile": "@@grpc~~grpc_repo_deps_ext~com_google_googleapis//:repository_rules.bzl",
-            "ruleClassName": "switched_rules",
-            "attributes": {
-              "rules": {
-                "proto_library_with_info": [
-                  "",
-                  ""
-                ],
-                "moved_proto_library": [
-                  "",
-                  ""
-                ],
-                "java_proto_library": [
-                  "",
-                  ""
-                ],
-                "java_grpc_library": [
-                  "",
-                  ""
-                ],
-                "java_gapic_library": [
-                  "",
-                  ""
-                ],
-                "java_gapic_test": [
-                  "",
-                  ""
-                ],
-                "java_gapic_assembly_gradle_pkg": [
-                  "",
-                  ""
-                ],
-                "py_proto_library": [
-                  "@com_github_grpc_grpc//bazel:python_rules.bzl",
-                  ""
-                ],
-                "py_grpc_library": [
-                  "@com_github_grpc_grpc//bazel:python_rules.bzl",
-                  ""
-                ],
-                "py_gapic_library": [
-                  "",
-                  ""
-                ],
-                "py_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "go_proto_library": [
-                  "",
-                  ""
-                ],
-                "go_library": [
-                  "",
-                  ""
-                ],
-                "go_test": [
-                  "",
-                  ""
-                ],
-                "go_gapic_library": [
-                  "",
-                  ""
-                ],
-                "go_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "cc_proto_library": [
-                  "native.cc_proto_library",
-                  ""
-                ],
-                "cc_grpc_library": [
-                  "@com_github_grpc_grpc//bazel:cc_grpc_library.bzl",
-                  ""
-                ],
-                "cc_gapic_library": [
-                  "",
-                  ""
-                ],
-                "php_proto_library": [
-                  "",
-                  "php_proto_library"
-                ],
-                "php_grpc_library": [
-                  "",
-                  "php_grpc_library"
-                ],
-                "php_gapic_library": [
-                  "",
-                  "php_gapic_library"
-                ],
-                "php_gapic_assembly_pkg": [
-                  "",
-                  "php_gapic_assembly_pkg"
-                ],
-                "nodejs_gapic_library": [
-                  "",
-                  "typescript_gapic_library"
-                ],
-                "nodejs_gapic_assembly_pkg": [
-                  "",
-                  "typescript_gapic_assembly_pkg"
-                ],
-                "ruby_proto_library": [
-                  "",
-                  ""
-                ],
-                "ruby_grpc_library": [
-                  "",
-                  ""
-                ],
-                "ruby_ads_gapic_library": [
-                  "",
-                  ""
-                ],
-                "ruby_cloud_gapic_library": [
-                  "",
-                  ""
-                ],
-                "ruby_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "csharp_proto_library": [
-                  "",
-                  ""
-                ],
-                "csharp_grpc_library": [
-                  "",
-                  ""
-                ],
-                "csharp_gapic_library": [
-                  "",
-                  ""
-                ],
-                "csharp_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ]
-              }
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "grpc~",
-            "com_envoyproxy_protoc_gen_validate",
-            "grpc~~grpc_repo_deps_ext~com_envoyproxy_protoc_gen_validate"
-          ],
-          [
-            "grpc~",
-            "com_google_googleapis",
-            "grpc~~grpc_repo_deps_ext~com_google_googleapis"
-          ],
-          [
-            "grpc~",
-            "com_google_protobuf",
-            "protobuf~"
-          ],
-          [
-            "grpc~",
-            "envoy_api",
-            "grpc~~grpc_repo_deps_ext~envoy_api"
-          ],
-          [
-            "grpc~",
-            "io_bazel_rules_go",
-            "rules_go~"
-          ],
-          [
-            "grpc~",
-            "upb",
-            "upb~"
-          ],
-          [
-            "grpc~~grpc_repo_deps_ext~bazel_gazelle",
-            "bazel_gazelle",
-            "grpc~~grpc_repo_deps_ext~bazel_gazelle"
-          ],
-          [
-            "grpc~~grpc_repo_deps_ext~bazel_gazelle",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "grpc~~grpc_repo_deps_ext~com_envoyproxy_protoc_gen_validate",
-            "bazel_gazelle",
-            "grpc~~grpc_repo_deps_ext~bazel_gazelle"
-          ],
-          [
-            "grpc~~grpc_repo_deps_ext~envoy_api",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "grpc~~grpc_repo_deps_ext~envoy_api",
-            "envoy_api",
-            "grpc~~grpc_repo_deps_ext~envoy_api"
-          ],
-          [
-            "protobuf~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_go~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "upb~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_go~//go:extensions.bzl%go_sdk": {
-      "general": {
-        "bzlTransitiveDigest": "k4MEsADgBfRC+sbMqB3lZL0JpdsCxlwSYO+z9zn9Y80=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "go_default_sdk": {
-            "bzlFile": "@@rules_go~//go/private:sdk.bzl",
-            "ruleClassName": "go_download_sdk_rule",
-            "attributes": {
-              "goos": "",
-              "goarch": "",
-              "sdks": {},
-              "urls": [
-                "https://dl.google.com/go/{}"
-              ],
-              "version": "1.19.8"
-            }
-          },
-          "go_toolchains": {
-            "bzlFile": "@@rules_go~//go/private:sdk.bzl",
-            "ruleClassName": "go_multiple_toolchains",
-            "attributes": {
-              "prefixes": [
-                "_0000_go_default_sdk_"
-              ],
-              "geese": [
-                ""
-              ],
-              "goarchs": [
-                ""
-              ],
-              "sdk_repos": [
-                "go_default_sdk"
-              ],
-              "sdk_types": [
-                "remote"
-              ],
-              "sdk_versions": [
-                "1.19.8"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_go~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_go~//go/private:extensions.bzl%non_module_dependencies": {
-      "general": {
-        "bzlTransitiveDigest": "n/KyfNdKeML6sHRHvHLrPCzPU5vSJfn9Z5b0n2xjRbQ=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "org_golang_x_xerrors": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/golang/xerrors/archive/04be3eba64a22a838cdb17b8dca15a52871c08b4.zip",
-                "https://github.com/golang/xerrors/archive/04be3eba64a22a838cdb17b8dca15a52871c08b4.zip"
-              ],
-              "sha256": "ffad2b06ef2e09d040da2ff08077865e99ab95d4d0451737fc8e33706bb01634",
-              "strip_prefix": "xerrors-04be3eba64a22a838cdb17b8dca15a52871c08b4",
-              "patches": [
-                "@@rules_go~//third_party:org_golang_x_xerrors-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "gogo_special_proto": {
-            "bzlFile": "@@rules_go~//proto:gogo.bzl",
-            "ruleClassName": "gogo_special_proto",
-            "attributes": {}
-          },
-          "org_golang_google_protobuf": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "cb1a05581c33b3705ede6c08edf9b9c1dbc579559ba30f532704c324e42bf801",
-              "urls": [
-                "https://mirror.bazel.build/github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.30.0.zip",
-                "https://github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.30.0.zip"
-              ],
-              "strip_prefix": "protobuf-go-1.30.0",
-              "patches": [
-                "@@rules_go~//third_party:org_golang_google_protobuf-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "com_github_mwitkow_go_proto_validators": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/mwitkow/go-proto-validators/archive/refs/tags/v0.3.2.zip",
-                "https://github.com/mwitkow/go-proto-validators/archive/refs/tags/v0.3.2.zip"
-              ],
-              "sha256": "d8697f05a2f0eaeb65261b480e1e6035301892d9fc07ed945622f41b12a68142",
-              "strip_prefix": "go-proto-validators-0.3.2"
-            }
-          },
-          "org_golang_x_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/golang/tools/archive/refs/tags/v0.7.0.zip",
-                "https://github.com/golang/tools/archive/refs/tags/v0.7.0.zip"
-              ],
-              "sha256": "9f20a20f29f4008d797a8be882ef82b69cf8f7f2b96dbdfe3814c57d8280fa4b",
-              "strip_prefix": "tools-0.7.0",
-              "patches": [
-                "@@rules_go~//third_party:org_golang_x_tools-deletegopls.patch",
-                "@@rules_go~//third_party:org_golang_x_tools-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "go_googleapis": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/83c3605afb5a39952bf0a0809875d41cf2a558ca.zip",
-                "https://github.com/googleapis/googleapis/archive/83c3605afb5a39952bf0a0809875d41cf2a558ca.zip"
-              ],
-              "sha256": "ba694861340e792fd31cb77274eacaf6e4ca8bda97707898f41d8bebfd8a4984",
-              "strip_prefix": "googleapis-83c3605afb5a39952bf0a0809875d41cf2a558ca",
-              "patches": [
-                "@@rules_go~//third_party:go_googleapis-deletebuild.patch",
-                "@@rules_go~//third_party:go_googleapis-directives.patch",
-                "@@rules_go~//third_party:go_googleapis-gazelle.patch"
-              ],
-              "patch_args": [
-                "-E",
-                "-p1"
-              ]
-            }
-          },
-          "org_golang_google_genproto": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/googleapis/go-genproto/archive/6ac7f18bb9d5eeeb13a9f1ae4f21e4374a1952f8.zip",
-                "https://github.com/googleapis/go-genproto/archive/6ac7f18bb9d5eeeb13a9f1ae4f21e4374a1952f8.zip"
-              ],
-              "sha256": "3470e7a89b24971b20c4bb8900a668df25279e4b741f72bc09418c1f22543215",
-              "strip_prefix": "go-genproto-6ac7f18bb9d5eeeb13a9f1ae4f21e4374a1952f8",
-              "patches": [
-                "@@rules_go~//third_party:org_golang_google_genproto-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "bazel_skylib": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
-                "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz"
-              ],
-              "sha256": "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
-              "strip_prefix": ""
-            }
-          },
-          "com_github_gogo_protobuf": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/gogo/protobuf/archive/refs/tags/v1.3.2.zip",
-                "https://github.com/gogo/protobuf/archive/refs/tags/v1.3.2.zip"
-              ],
-              "sha256": "f89f8241af909ce3226562d135c25b28e656ae173337b3e58ede917aa26e1e3c",
-              "strip_prefix": "protobuf-1.3.2",
-              "patches": [
-                "@@rules_go~//third_party:com_github_gogo_protobuf-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "com_github_golang_protobuf": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/golang/protobuf/archive/refs/tags/v1.5.3.zip",
-                "https://github.com/golang/protobuf/archive/refs/tags/v1.5.3.zip"
-              ],
-              "sha256": "2dced4544ae5372281e20f1e48ca76368355a01b31353724718c4d6e3dcbb430",
-              "strip_prefix": "protobuf-1.5.3",
-              "patches": [
-                "@@rules_go~//third_party:com_github_golang_protobuf-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          },
-          "io_bazel_rules_nogo": {
-            "bzlFile": "@@rules_go~//go/private:nogo.bzl",
-            "ruleClassName": "go_register_nogo",
-            "attributes": {
-              "nogo": "@io_bazel_rules_go//:default_nogo"
-            }
-          },
-          "com_github_golang_mock": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/golang/mock/archive/refs/tags/v1.7.0-rc.1.zip",
-                "https://github.com/golang/mock/archive/refs/tags/v1.7.0-rc.1.zip"
-              ],
-              "patches": [
-                "@@rules_go~//third_party:com_github_golang_mock-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ],
-              "sha256": "5359c78b0c1649cf7beb3b48ff8b1d1aaf0243b22ea4789aba94805280075d8e",
-              "strip_prefix": "mock-1.7.0-rc.1"
-            }
-          },
-          "org_golang_x_sys": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/golang/sys/archive/refs/tags/v0.6.0.zip",
-                "https://github.com/golang/sys/archive/refs/tags/v0.6.0.zip"
-              ],
-              "sha256": "7f2399398b2eb4f1f495cc754d6353566e0ad934ee0eb46505e55162e0def56d",
-              "strip_prefix": "sys-0.6.0",
-              "patches": [
-                "@@rules_go~//third_party:org_golang_x_sys-gazelle.patch"
-              ],
-              "patch_args": [
-                "-p1"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_go~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_graalvm~//:extensions.bzl%graalvm": {
-      "general": {
-        "bzlTransitiveDigest": "RNOMan/EiPbz5i2nh2YxhbeTAOvTd9ReDe7arDK0PeY=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "graalvm_toolchains": {
-            "bzlFile": "@@rules_graalvm~//internal:graalvm_bindist.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"graalvm_20\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"20\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"toolchain_gvm\",\n    actual = \"gvm\",\n    visibility = [\"//visibility:public\"],\n)\ntoolchain(\n    name = \"gvm\",\n    exec_compatible_with = [\n        \n    ],\n    target_compatible_with = [\n        \n    ],\n    toolchain = \"@graalvm//:gvm\",\n    toolchain_type = \"@rules_graalvm//graalvm/toolchain\",\n    visibility = [\"//visibility:public\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@graalvm//:jdk\",\n    visibility = [\"//visibility:public\"],\n)\n\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@graalvm//:jdk\",\n    visibility = [\"//visibility:public\"],\n)\n\n"
-            }
-          },
-          "graalvm": {
-            "bzlFile": "@@rules_graalvm~//internal:graalvm_bindist.bzl",
-            "ruleClassName": "_graalvm_bindist_repository",
-            "attributes": {
-              "version": "20.0.2",
-              "java_version": "20",
-              "distribution": "ce",
-              "components": [],
-              "setup_actions": [],
-              "enable_toolchain": true,
-              "toolchain_config": "graalvm_toolchains"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_graalvm~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ]
-        ]
-      }
-    },
-    "@@rules_java~//java:extensions.bzl%toolchains": {
-      "general": {
-        "bzlTransitiveDigest": "tJHbmWnq7m+9eUBnUdv7jZziQ26FmcGL9C5/hU3Q9UQ=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remotejdk21_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_s390x_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remote_java_tools_windows": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_windows-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk11_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk11_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_linux_s390x_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_win_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-              "strip_prefix": "jdk-11.0.13+8",
-              "urls": [
-                "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-              ]
-            }
-          },
-          "remotejdk17_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk11_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_ppc64le_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remote_java_tools_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_linux-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk21_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk21_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64",
-              "urls": [
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz",
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_s390x": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
-              "strip_prefix": "jdk-11.0.15+10",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",
-                "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_win_arm64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_ppc64le_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_win_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_aarch64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_aarch64.zip"
-              ]
-            }
-          },
-          "remote_java_tools_darwin_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_arm64-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk17_linux_ppc64le": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd",
-              "strip_prefix": "jdk-17.0.8.1+1",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz",
-                "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_win_arm64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n"
-            }
-          },
-          "local_jdk": {
-            "bzlFile": "@@rules_java~//toolchains:local_java_repository.bzl",
-            "ruleClassName": "_local_java_repository_rule",
-            "attributes": {
-              "java_home": "",
-              "version": "",
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = {RUNTIME_VERSION},\n)\n"
-            }
-          },
-          "remote_java_tools_darwin_x86_64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_x86_64-v13.4.zip"
-              ]
-            }
-          },
-          "remote_java_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk17_linux_s390x": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37",
-              "strip_prefix": "jdk-17.0.8.1+1",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.8.1_1.tar.gz",
-                "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.8.1_1.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_ppc64le": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
-              "strip_prefix": "jdk-11.0.15+10",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",
-                "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_win//:jdk\",\n)\n"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_java~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_java~",
-            "remote_java_tools",
-            "rules_java~~toolchains~remote_java_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_jvm_external~//:extensions.bzl%maven": {
-      "general": {
-        "bzlTransitiveDigest": "B6t/mRhE/mRDl5qa+DdAZxxx+S+k0GCqCtP1EHDa3sI=",
-        "recordedFileInputs": {
-          "@@//src/tools/android/maven_android_install.json": "09bff3e33d291336046f7c9201630fb5e014f0e60b78b6f09b84e4f5f73ed04f",
-          "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "3ab1f67b0de4815df110bc72ccd6c77882b3b21d3d1e0a84445847b6ce3235a3",
-          "@@//maven_install.json": "8330632656f46859ec2600c18fed75624e2a8f46b81c12db34c8afeba527e5be"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_google_api_gax_1_60_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "02f37d4ff1a7b8d71dff8064cf9568aa4f4b61bcc4485085d16130f32afa5a79",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar",
-                "https://maven.google.com/com/google/api/gax/1.60.0/gax-1.60.0.jar"
-              ],
-              "downloaded_file_path": "com/google/api/gax/1.60.0/gax-1.60.0.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_appengine_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f97b495fd97ac3a3d59099eb2b55025f4948230da15a076f189b9cff37c6b4d2",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar"
-              ],
-              "downloaded_file_path": "com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar"
-            }
-          },
-          "com_ryanharter_auto_value_auto_value_gson_factory_1_3_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5a76c3d401c984999d59868f08df05a15613d1428f7764fed80b722e2a277f6c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/ryanharter/auto/value/auto-value-gson-factory/1.3.1/auto-value-gson-factory-1.3.1.jar"
-              ],
-              "downloaded_file_path": "com/ryanharter/auto/value/auto-value-gson-factory/1.3.1/auto-value-gson-factory-1.3.1.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_oauth2_http_0_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1722d895c42dc42ea1d1f392ddbec1fbb28f7a979022c3a6c29acc39cc777ad1",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar",
-                "https://maven.google.com/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar"
-            }
-          },
-          "io_grpc_grpc_protobuf_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6ab68b0a3bb3834af44208df058be4631425b56ef95f9b9412aa21df3311e8d3",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-protobuf/1.48.1/grpc-protobuf-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-protobuf/1.48.1/grpc-protobuf-1.48.1.jar"
-            }
-          },
-          "com_google_jimfs_jimfs_1_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar",
-                "https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar"
-              ],
-              "downloaded_file_path": "com/google/jimfs/jimfs/1.1/jimfs-1.1.jar"
-            }
-          },
-          "com_googlecode_json_simple_json_simple_1_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar",
-                "https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar"
-              ],
-              "downloaded_file_path": "com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar"
-            }
-          },
-          "com_github_kevinstern_software_and_algorithms_1_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "61ab82439cef37343b14f53154c461619375373a56b9338e895709fb54e0864c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/github/kevinstern/software-and-algorithms/1.0/software-and-algorithms-1.0.jar"
-              ],
-              "downloaded_file_path": "com/github/kevinstern/software-and-algorithms/1.0/software-and-algorithms-1.0.jar"
-            }
-          },
-          "com_google_jimfs_jimfs_1_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "de16d5c8489729a8512f1a02fbd81f58f89249b72066987da4cc5c87ecb9f72d",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.2/jimfs-1.2.jar"
-              ],
-              "downloaded_file_path": "com/google/jimfs/jimfs/1.2/jimfs-1.2.jar"
-            }
-          },
-          "org_reactivestreams_reactive_streams_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar"
-              ],
-              "downloaded_file_path": "org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar"
-            }
-          },
-          "com_android_tools_annotations_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "630ab4c6f211fa1c0f5c884152cb6311360f1b796442196c287a658645a99645",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/annotations/30.1.3/annotations-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/annotations/30.1.3/annotations-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/annotations/30.1.3/annotations-30.1.3.jar"
-            }
-          },
-          "io_netty_netty_transport_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar"
-            }
-          },
-          "org_ow2_asm_asm_util_9_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "380e2ecd16f7cc0f1a76ba9ba049179b5760a57b282a87a4c653caeff2cd5bd6",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/ow2/asm/asm-util/9.1/asm-util-9.1.jar",
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.1/asm-util-9.1.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-util/9.1/asm-util-9.1.jar"
-            }
-          },
-          "org_ow2_asm_asm_util_9_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ff5b3cd331ae8a9a804768280da98f50f424fef23dd3c788bb320e08c94ee598",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-util/9.2/asm-util-9.2.jar"
-            }
-          },
-          "io_opencensus_opencensus_api_0_24_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar",
-                "https://maven.google.com/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar"
-              ],
-              "downloaded_file_path": "io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar"
-            }
-          },
-          "javax_activation_javax_activation_api_1_2_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393",
-              "urls": [
-                "https://repo1.maven.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar"
-              ],
-              "downloaded_file_path": "javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar"
-            }
-          },
-          "it_unimi_dsi_fastutil_8_4_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2ad2824a4a0a0eb836b52ee2fc84ba2134f44bce7bfa54015ae3f31c710a3071",
-              "urls": [
-                "https://dl.google.com/android/maven2/it/unimi/dsi/fastutil/8.4.0/fastutil-8.4.0.jar",
-                "https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/8.4.0/fastutil-8.4.0.jar"
-              ],
-              "downloaded_file_path": "it/unimi/dsi/fastutil/8.4.0/fastutil-8.4.0.jar"
-            }
-          },
-          "com_android_tools_build_manifest_merger_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fb04445bd588ccd27dacd5e139abed42246f55e6785eebf66659857233207fac",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/manifest-merger/30.1.3/manifest-merger-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/manifest-merger/30.1.3/manifest-merger-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/manifest-merger/30.1.3/manifest-merger-30.1.3.jar"
-            }
-          },
-          "org_glassfish_jaxb_jaxb_runtime_2_3_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e6e0a1e89fb6ff786279e6a0082d5cef52dc2ebe67053d041800737652b4fd1b",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar",
-                "https://repo1.maven.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar"
-              ],
-              "downloaded_file_path": "org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar"
-            }
-          },
-          "software_amazon_awssdk_netty_nio_client_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a6d356f364c56d7b90006b0b7e503b8630010993a5587ce42e74b10b8dca2238",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar"
-            }
-          },
-          "com_google_guava_guava_31_1_jre": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar",
-                "https://maven.google.com/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
-              ],
-              "downloaded_file_path": "com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6f8f1cc29b5a234eeee9439a63eb3f03a5994aa540ff555cb0b2c88cefaf6877",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar"
-            }
-          },
-          "io_grpc_grpc_context_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2fb9007e12f768e9c968f9db292be4ea9cba2ef40fb8d179f3f8746ebdc73c1b",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.48.1/grpc-context-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-context/1.48.1/grpc-context-1.48.1.jar"
-            }
-          },
-          "io_opencensus_opencensus_contrib_http_util_0_24_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7155273bbb1ed3d477ea33cf19d7bbc0b285ff395f43b29ae576722cf247000f",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar",
-                "https://maven.google.com/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar"
-              ],
-              "downloaded_file_path": "io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar"
-            }
-          },
-          "io_netty_netty_codec_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "990c378168dc6364c6ff569701f4f2f122fffe8998b3e189eba4c4d868ed1084",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.93.Final/netty-codec-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec/4.1.93.Final/netty-codec-4.1.93.Final.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_core_2_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "32a3df226a9a47f48dd895a9a89678d50ac404282c33400781c38757e8143f2c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_core/2.22.0/error_prone_core-2.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_core/2.22.0/error_prone_core-2.22.0.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpcore_4_4_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar",
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar"
-              ],
-              "downloaded_file_path": "org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar"
-            }
-          },
-          "com_android_tools_build_builder_model_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "232604983a99b8372eb1a93e5183d48fc8fc69239e5e6229170be0e3320df430",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/builder-model/7.1.3/builder-model-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/builder-model/7.1.3/builder-model-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/builder-model/7.1.3/builder-model-7.1.3.jar"
-            }
-          },
-          "com_android_zipflinger_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c6ed9458f3a85c847f168a7e3719bbd1e7484b97ec00096122ac8a9c4141665f",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/zipflinger/7.1.3/zipflinger-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/zipflinger/7.1.3/zipflinger-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/zipflinger/7.1.3/zipflinger-7.1.3.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpcore_4_4_13": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar",
-                "https://maven.google.com/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar"
-              ],
-              "downloaded_file_path": "org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar"
-            }
-          },
-          "com_google_turbine_turbine_0_4_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1947490c23263ae1c0a95acceb7cb419724f236d14cfbbe5a558101e79842b28",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.4.0/turbine-0.4.0.jar"
-              ],
-              "downloaded_file_path": "com/google/turbine/turbine/0.4.0/turbine-0.4.0.jar"
-            }
-          },
-          "io_netty_netty_handler_proxy_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2ac5f7fbefa0b73ef783889069344d5515505a14b2303be693c5002c486df2b4",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-handler-proxy/4.1.93.Final/netty-handler-proxy-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-handler-proxy/4.1.93.Final/netty-handler-proxy-4.1.93.Final.jar"
-            }
-          },
-          "io_netty_netty_common_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar"
-            }
-          },
-          "com_android_tools_build_builder_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4b33ed3941563ffc67f8aeedc480aafd958ec6cd1fe661f0b2b5b0d9c1423649",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/builder/7.1.3/builder-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/builder/7.1.3/builder-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/builder/7.1.3/builder-7.1.3.jar"
-            }
-          },
-          "com_sun_istack_istack_commons_runtime_3_0_8": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4ffabb06be454a05e4398e20c77fa2b6308d4b88dfbef7ca30a76b5b7d5505ef",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar",
-                "https://repo1.maven.org/maven2/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar"
-              ],
-              "downloaded_file_path": "com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_3_10_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar",
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar"
-              ],
-              "downloaded_file_path": "com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar"
-            }
-          },
-          "software_amazon_awssdk_utils_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7bd849bb5aa71bfdf6b849643736ecab3a7b3f204795804eefe5754104231ec6",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar"
-            }
-          },
-          "com_google_truth_extensions_truth_proto_extension_1_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "821993e4794e7034ae4a7b68105ef83f1913f0de6112f2fe4b5a7130f6a2bf49",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/truth/extensions/truth-proto-extension/1.1.3/truth-proto-extension-1.1.3.jar"
-              ],
-              "downloaded_file_path": "com/google/truth/extensions/truth-proto-extension/1.1.3/truth-proto-extension-1.1.3.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_type_annotations_2_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6618b1d28df562622b77187b5c6dfc9c4c97851af73bd64dc0300efe9a439b20",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_type_annotations/2.22.0/error_prone_type_annotations-2.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_type_annotations/2.22.0/error_prone_type_annotations-2.22.0.jar"
-            }
-          },
-          "io_netty_netty_transport_native_kqueue_jar_osx_aarch_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6e9f04b5a16ba95b7371a735d60851602a3f3c549981edb74eeaf90e1b8fecce",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/4.1.93.Final/netty-transport-native-kqueue-4.1.93.Final-osx-aarch_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-kqueue/4.1.93.Final/netty-transport-native-kqueue-4.1.93.Final-osx-aarch_64.jar"
-            }
-          },
-          "unpinned_maven": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava-testlib\", \"version\": \"31.1-jre\", \"testonly\": true }",
-                "{ \"group\": \"com.google.jimfs\", \"artifact\": \"jimfs\", \"version\": \"1.2\", \"testonly\": true }",
-                "{ \"group\": \"com.google.testing.compile\", \"artifact\": \"compile-testing\", \"version\": \"0.18\", \"testonly\": true }",
-                "{ \"group\": \"com.google.testparameterinjector\", \"artifact\": \"test-parameter-injector\", \"version\": \"1.0\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-java8-extension\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-liteproto-extension\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-proto-extension\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"5.4.0\", \"testonly\": true }",
-                "{ \"group\": \"com.beust\", \"artifact\": \"jcommander\", \"version\": \"1.82\" }",
-                "{ \"group\": \"com.github.ben-manes.caffeine\", \"artifact\": \"caffeine\", \"version\": \"3.0.5\" }",
-                "{ \"group\": \"com.github.kevinstern\", \"artifact\": \"software-and-algorithms\", \"version\": \"1.0\" }",
-                "{ \"group\": \"com.github.stephenc.jcip\", \"artifact\": \"jcip-annotations\", \"version\": \"1.0-1\" }",
-                "{ \"group\": \"com.google.api-client\", \"artifact\": \"google-api-client-gson\", \"version\": \"1.35.2\" }",
-                "{ \"group\": \"com.google.api-client\", \"artifact\": \"google-api-client\", \"version\": \"1.35.2\" }",
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-credentials\", \"version\": \"1.6.0\" }",
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-oauth2-http\", \"version\": \"1.6.0\" }",
-                "{ \"group\": \"com.google.auto.service\", \"artifact\": \"auto-service-annotations\", \"version\": \"1.0.1\" }",
-                "{ \"group\": \"com.google.auto.service\", \"artifact\": \"auto-service\", \"version\": \"1.0\" }",
-                "{ \"group\": \"com.google.auto.value\", \"artifact\": \"auto-value-annotations\", \"version\": \"1.9\" }",
-                "{ \"group\": \"com.google.auto.value\", \"artifact\": \"auto-value\", \"version\": \"1.8.2\" }",
-                "{ \"group\": \"com.google.auto\", \"artifact\": \"auto-common\", \"version\": \"1.2.1\" }",
-                "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }",
-                "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\" }",
-                "{ \"group\": \"com.google.code.java-allocation-instrumenter\", \"artifact\": \"java-allocation-instrumenter\", \"version\": \"3.3.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotation\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_check_api\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_core\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_type_annotations\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.flogger\", \"artifact\": \"flogger-system-backend\", \"version\": \"0.5.1\" }",
-                "{ \"group\": \"com.google.flogger\", \"artifact\": \"flogger\", \"version\": \"0.5.1\" }",
-                "{ \"group\": \"com.google.flogger\", \"artifact\": \"google-extensions\", \"version\": \"0.5.1\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"failureaccess\", \"version\": \"1.0.1\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }",
-                "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }",
-                "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }",
-                "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.4.0\" }",
-                "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }",
-                "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }",
-                "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }",
-                "{ \"group\": \"com.squareup\", \"artifact\": \"javapoet\", \"version\": \"1.12.0\" }",
-                "{ \"group\": \"commons-collections\", \"artifact\": \"commons-collections\", \"version\": \"3.2.2\" }",
-                "{ \"group\": \"commons-lang\", \"artifact\": \"commons-lang\", \"version\": \"2.6\" }",
-                "{ \"group\": \"io.github.java-diff-utils\", \"artifact\": \"java-diff-utils\", \"version\": \"4.12\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-api\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-auth\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-context\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-core\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-netty\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-protobuf-lite\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-protobuf\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-stub\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-buffer\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-codec-http2\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-codec-http\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-codec\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-common\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-handler-proxy\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-handler\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-resolver-dns\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-resolver\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"windows-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-classes\", \"version\": \"2.0.56.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-classes-epoll\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-classes-kqueue\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-epoll\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-epoll\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-kqueue\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-kqueue\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.reactivex.rxjava3\", \"artifact\": \"rxjava\", \"version\": \"3.1.2\" }",
-                "{ \"group\": \"it.unimi.dsi\", \"artifact\": \"fastutil\", \"version\": \"7.2.1\" }",
-                "{ \"group\": \"javax.activation\", \"artifact\": \"javax.activation-api\", \"version\": \"1.2.0\" }",
-                "{ \"group\": \"javax.annotation\", \"artifact\": \"javax.annotation-api\", \"version\": \"1.3.2\" }",
-                "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }",
-                "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy-agent\", \"version\": \"1.14.5\" }",
-                "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy\", \"version\": \"1.14.5\" }",
-                "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-compress\", \"version\": \"1.20\" }",
-                "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.8.0\" }",
-                "{ \"group\": \"org.apache.tomcat\", \"artifact\": \"tomcat-annotations-api\", \"version\": \"8.0.5\" }",
-                "{ \"group\": \"org.apache.velocity\", \"artifact\": \"velocity\", \"version\": \"1.7\" }",
-                "{ \"group\": \"org.checkerframework\", \"artifact\": \"checker-qual\", \"version\": \"3.19.0\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-analysis\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-commons\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-tree\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-util\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.pcollections\", \"artifact\": \"pcollections\", \"version\": \"3.1.4\" }",
-                "{ \"group\": \"org.threeten\", \"artifact\": \"threeten-extra\", \"version\": \"1.5.0\" }",
-                "{ \"group\": \"org.tukaani\", \"artifact\": \"xz\", \"version\": \"1.9\" }",
-                "{ \"group\": \"org.yaml\", \"artifact\": \"snakeyaml\", \"version\": \"1.28\" }",
-                "{ \"group\": \"tools.profiler\", \"artifact\": \"async-profiler\", \"version\": \"3.0\" }",
-                "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }",
-                "{ \"group\": \"org.hamcrest\", \"artifact\": \"hamcrest-core\", \"version\": \"1.3\" }",
-                "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }",
-                "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.8.9\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.3.2\" }",
-                "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava-testlib\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.2\" }",
-                "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }",
-                "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"4.3.1\" }"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": false,
-              "fetch_javadoc": false,
-              "excluded_artifacts": [
-                "{ \"group\": \"org.apache.httpcomponents\", \"artifact\": \"httpclient\" }",
-                "{ \"group\": \"org.apache.httpcomponents\", \"artifact\": \"httpcore\" }",
-                "{ \"group\": \"org.eclipse.jgit\", \"artifact\": \"org.eclipse.jgit\" }",
-                "{ \"group\": \"com.google.protobuf\", \"artifact\": \"protobuf-java\" }",
-                "{ \"group\": \"com.google.protobuf\", \"artifact\": \"protobuf-javalite\" }"
-              ],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": true,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "maven_install_json": "@@//:maven_install.json",
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "com_google_testing_compile_compile_testing_0_18": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "92cfbee5ad356a403d36688ab7bae74be65db9a117478ace34ac3ab4d1f9feb9",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/testing/compile/compile-testing/0.18/compile-testing-0.18.jar"
-              ],
-              "downloaded_file_path": "com/google/testing/compile/compile-testing/0.18/compile-testing-0.18.jar"
-            }
-          },
-          "io_netty_netty_transport_native_kqueue_jar_osx_x86_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "bf3a21e503d26a600e2469e98f5acaadb57c18f207a51e8a7073b875c5f50e03",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/4.1.93.Final/netty-transport-native-kqueue-4.1.93.Final-osx-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-kqueue/4.1.93.Final/netty-transport-native-kqueue-4.1.93.Final-osx-x86_64.jar"
-            }
-          },
-          "org_apache_tomcat_tomcat_annotations_api_8_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "748677bebb1651a313317dfd93e984ed8f8c9e345538fa8b0ab0cbb804631953",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/8.0.5/tomcat-annotations-api-8.0.5.jar"
-              ],
-              "downloaded_file_path": "org/apache/tomcat/tomcat-annotations-api/8.0.5/tomcat-annotations-api-8.0.5.jar"
-            }
-          },
-          "com_android_tools_analytics_library_protos_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6c7c2fc5ea590797db1532d7879b717cdd6328c8f74c0e32ddccdf392e94ffe6",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/analytics-library/protos/30.1.3/protos-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/analytics-library/protos/30.1.3/protos-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/analytics-library/protos/30.1.3/protos-30.1.3.jar"
-            }
-          },
-          "com_android_signflinger_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "899a4da318f83e6e8e64d3a51bf97add91b4c642a52f7162d3333c2f74ff4555",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/signflinger/7.1.3/signflinger-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/signflinger/7.1.3/signflinger-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/signflinger/7.1.3/signflinger-7.1.3.jar"
-            }
-          },
-          "org_checkerframework_checker_compat_qual_2_5_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar"
-              ],
-              "downloaded_file_path": "org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar"
-            }
-          },
-          "org_ow2_asm_asm_9_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm/9.2/asm-9.2.jar"
-            }
-          },
-          "com_android_tools_repository_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "11e2489f49f45b7709d080c2a82691ba42cfe8e13d3ac55487592fb550adb597",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/repository/30.1.3/repository-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/repository/30.1.3/repository-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/repository/30.1.3/repository-30.1.3.jar"
-            }
-          },
-          "org_checkerframework_checker_compat_qual_2_5_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar",
-                "https://maven.google.com/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar"
-              ],
-              "downloaded_file_path": "org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar"
-            }
-          },
-          "org_ow2_asm_asm_9_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cda4de455fab48ff0bcb7c48b4639447d4de859a7afc30a094a986f0936beba2",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/ow2/asm/asm/9.1/asm-9.1.jar",
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm/9.1/asm-9.1.jar"
-            }
-          },
-          "io_netty_netty_tcnative_boringssl_static_jar_linux_aarch_64_2_0_56_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8e5a30fc4a9514714367813f8027df4c9672746797b0699d83958d678e5cfeca",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar"
-            }
-          },
-          "com_google_googlejavaformat_google_java_format_1_15_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4f546cfe159547ac3b9547daa9649e728f6abc254979c975f1cb9971793692c3",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0.jar",
-                "https://maven.google.com/com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0.jar"
-              ],
-              "downloaded_file_path": "com/google/googlejavaformat/google-java-format/1.15.0/google-java-format-1.15.0.jar"
-            }
-          },
-          "com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-              ],
-              "downloaded_file_path": "com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-            }
-          },
-          "io_netty_netty_transport_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a5a78019bc1cd43dbc3c7b7cdd3801912ca26d1f498fb560514fee497864ba96",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.93.Final/netty-transport-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport/4.1.93.Final/netty-transport-4.1.93.Final.jar"
-            }
-          },
-          "com_google_oauth_client_google_oauth_client_1_34_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "193edf97aefa28b93c5892bdc598bac34fa4c396588030084f290b1440e8b98a",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.34.1/google-oauth-client-1.34.1.jar"
-              ],
-              "downloaded_file_path": "com/google/oauth-client/google-oauth-client/1.34.1/google-oauth-client-1.34.1.jar"
-            }
-          },
-          "org_bouncycastle_bcprov_jdk15on_1_56": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar",
-                "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar"
-              ],
-              "downloaded_file_path": "org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar"
-            }
-          },
-          "com_google_flogger_flogger_system_backend_0_5_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "685de33b53eb313049bbeee7f4b7a80dd09e8e754e96b048a3edab2cebb36442",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/flogger/flogger-system-backend/0.5.1/flogger-system-backend-0.5.1.jar"
-              ],
-              "downloaded_file_path": "com/google/flogger/flogger-system-backend/0.5.1/flogger-system-backend-0.5.1.jar"
-            }
-          },
-          "org_jetbrains_kotlin_kotlin_reflect_1_4_32": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dbf19e9cdaa9c3c170f3f6f6ce3922f38dfc1d7fa1cab5b7c23a19da8b5eec5b",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.jar"
-            }
-          },
-          "androidx_databinding_databinding_compiler_3_4_0_alpha10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2d741da6cc20a3f0136b6fdce6babf92d8b5115b37b05c61dd8ce6832499d629",
-              "urls": [
-                "https://dl.google.com/android/maven2/androidx/databinding/databinding-compiler/3.4.0-alpha10/databinding-compiler-3.4.0-alpha10.jar",
-                "https://repo1.maven.org/maven2/androidx/databinding/databinding-compiler/3.4.0-alpha10/databinding-compiler-3.4.0-alpha10.jar"
-              ],
-              "downloaded_file_path": "androidx/databinding/databinding-compiler/3.4.0-alpha10/databinding-compiler-3.4.0-alpha10.jar"
-            }
-          },
-          "net_sf_jopt_simple_jopt_simple_4_9": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5",
-              "urls": [
-                "https://dl.google.com/android/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar",
-                "https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar"
-              ],
-              "downloaded_file_path": "net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar"
-            }
-          },
-          "software_amazon_awssdk_auth_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8820c6636e5c14efc29399fb5565ce50212b0c1f4ed720a025a2c402d54e0978",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar"
-            }
-          },
-          "jakarta_activation_jakarta_activation_api_1_2_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8b0a0f52fa8b05c5431921a063ed866efaa41dadf2e3a7ee3e1961f2b0d9645b",
-              "urls": [
-                "https://dl.google.com/android/maven2/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar",
-                "https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar"
-              ],
-              "downloaded_file_path": "jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar"
-            }
-          },
-          "io_grpc_grpc_core_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6d472ee6d2b60ef3f3e6801e7cd4dbec5fbbef81e883a0de1fbc55e6defe1cb7",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-core/1.48.1/grpc-core-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-core/1.48.1/grpc-core-1.48.1.jar"
-            }
-          },
-          "io_netty_netty_codec_http_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dacf78ce78ab2d29570325db4cd2451ea589639807de95881a0fa7155a9e6b55",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.93.Final/netty-codec-http-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec-http/4.1.93.Final/netty-codec-http-4.1.93.Final.jar"
-            }
-          },
-          "com_android_tools_common_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "194ea15f8b182cca975544fb97d92bc1c6ceb6059f35250a5971ac3c306ebdcc",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/common/30.1.3/common-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/common/30.1.3/common-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/common/30.1.3/common-30.1.3.jar"
-            }
-          },
-          "io_netty_netty_codec_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar"
-            }
-          },
-          "io_grpc_grpc_auth_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ae63be5fe345ffdd5157284d90b783138eb31634e274182a8495242f9ad66a56",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-auth/1.48.1/grpc-auth-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-auth/1.48.1/grpc-auth-1.48.1.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpmime_4_5_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar",
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar"
-              ],
-              "downloaded_file_path": "org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar"
-            }
-          },
-          "io_netty_netty_resolver_dns_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2744ccc1bbd653c9f65f5764ab211f51cae56aa6c2e2288850a9add9c805be56",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-resolver-dns/4.1.93.Final/netty-resolver-dns-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-resolver-dns/4.1.93.Final/netty-resolver-dns-4.1.93.Final.jar"
-            }
-          },
-          "com_github_ben_manes_caffeine_caffeine_3_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8a9b54d3506a3b92ee46b217bcee79196b21ca6d52dc2967c686a205fb2f9c15",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/3.0.5/caffeine-3.0.5.jar"
-              ],
-              "downloaded_file_path": "com/github/ben-manes/caffeine/caffeine/3.0.5/caffeine-3.0.5.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpclient_4_5_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar",
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar"
-              ],
-              "downloaded_file_path": "org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar"
-            }
-          },
-          "io_netty_netty_tcnative_classes_2_0_46_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar",
-                "https://maven.google.com/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar"
-            }
-          },
-          "io_netty_netty_tcnative_boringssl_static_jar_osx_aarch_64_2_0_56_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "3b962ce1361b479ec7375f04e5d149e7b374a99ecf4f583c9aa0f0a92e5fa415",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_annotations_2_3_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar",
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar"
-            }
-          },
-          "com_google_api_api_common_1_10_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2a033f24bb620383eda440ad307cb8077cfec1c7eadc684d65216123a1b9613a",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar",
-                "https://maven.google.com/com/google/api/api-common/1.10.1/api-common-1.10.1.jar"
-              ],
-              "downloaded_file_path": "com/google/api/api-common/1.10.1/api-common-1.10.1.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_oauth2_http_1_6_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2220f02fcfc480e3798bab43b2618d158319f9fcb357c9eb04b4a68117699808",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/1.6.0/google-auth-library-oauth2-http-1.6.0.jar"
-              ],
-              "downloaded_file_path": "com/google/auth/google-auth-library-oauth2-http/1.6.0/google-auth-library-oauth2-http-1.6.0.jar"
-            }
-          },
-          "javax_annotation_javax_annotation_api_1_3_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b",
-              "urls": [
-                "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"
-              ],
-              "downloaded_file_path": "javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"
-            }
-          },
-          "io_netty_netty_common_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "443bb316599fb16e3baeba2fb58881814d7ff0b7af176fe76e38071a6e86f8c0",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.93.Final/netty-common-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-common/4.1.93.Final/netty-common-4.1.93.Final.jar"
-            }
-          },
-          "com_google_j2objc_j2objc_annotations_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
-                "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-              ],
-              "downloaded_file_path": "com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-            }
-          },
-          "io_netty_netty_resolver_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e59770b66e81822e5d111ac4e544d7eb0c543e0a285f52628e53941acd8ed759",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.93.Final/netty-resolver-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-resolver/4.1.93.Final/netty-resolver-4.1.93.Final.jar"
-            }
-          },
-          "com_google_flogger_flogger_0_5_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b5ecd1483e041197012786f749968a62063c1964d3ecfbf96ba92a95797bb8f5",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar"
-              ],
-              "downloaded_file_path": "com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar"
-            }
-          },
-          "io_netty_netty_tcnative_boringssl_static_jar_linux_x86_64_2_0_56_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "725c26b4dd58a1aa782020952ad949bdb607235dd20ee49e5a5875c15456ca86",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar"
-            }
-          },
-          "com_google_truth_extensions_truth_liteproto_extension_1_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "71cce6284554e546d1b5ba48e310ee4b4050676f09fb0eced136d779284ff78d",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/truth/extensions/truth-liteproto-extension/1.1.3/truth-liteproto-extension-1.1.3.jar"
-              ],
-              "downloaded_file_path": "com/google/truth/extensions/truth-liteproto-extension/1.1.3/truth-liteproto-extension-1.1.3.jar"
-            }
-          },
-          "com_ryanharter_auto_value_auto_value_gson_runtime_1_3_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "84ee23b7989d4bf19930b5bd3d03c0f2efb9e73bcee3a0208a9d1b2e1979c049",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/ryanharter/auto/value/auto-value-gson-runtime/1.3.1/auto-value-gson-runtime-1.3.1.jar"
-              ],
-              "downloaded_file_path": "com/ryanharter/auto/value/auto-value-gson-runtime/1.3.1/auto-value-gson-runtime-1.3.1.jar"
-            }
-          },
-          "org_apache_velocity_velocity_1_7": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ec92dae810034f4b46dbb16ef4364a4013b0efb24a8c5dd67435cae46a290d8e",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/velocity/velocity/1.7/velocity-1.7.jar"
-              ],
-              "downloaded_file_path": "org/apache/velocity/velocity/1.7/velocity-1.7.jar"
-            }
-          },
-          "org_ow2_asm_asm_tree_9_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar"
-            }
-          },
-          "io_netty_netty_transport_classes_epoll_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "23722fa366ba017137a68c5e92fc3ee27bbb341c681ac4790f61c6adb7289e26",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.93.Final/netty-transport-classes-epoll-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-classes-epoll/4.1.93.Final/netty-transport-classes-epoll-4.1.93.Final.jar"
-            }
-          },
-          "org_ow2_asm_asm_tree_9_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fd00afa49e9595d7646205b09cecb4a776a8ff0ba06f2d59b8f7bf9c704b4a73",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar",
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar"
-            }
-          },
-          "androidx_databinding_databinding_compiler_common_3_4_0_alpha10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7e1ffef1c21064f2b065b17a69bc217270e14b6723311cf795f4276a05b83750",
-              "urls": [
-                "https://dl.google.com/android/maven2/androidx/databinding/databinding-compiler-common/3.4.0-alpha10/databinding-compiler-common-3.4.0-alpha10.jar",
-                "https://repo1.maven.org/maven2/androidx/databinding/databinding-compiler-common/3.4.0-alpha10/databinding-compiler-common-3.4.0-alpha10.jar"
-              ],
-              "downloaded_file_path": "androidx/databinding/databinding-compiler-common/3.4.0-alpha10/databinding-compiler-common-3.4.0-alpha10.jar"
-            }
-          },
-          "io_netty_netty_codec_http2_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar"
-            }
-          },
-          "rules_jvm_external_deps": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "pinned_coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-credentials\", \"version\": \"0.22.0\" }",
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-oauth2-http\", \"version\": \"0.22.0\" }",
-                "{ \"group\": \"com.google.cloud\", \"artifact\": \"google-cloud-core\", \"version\": \"1.93.10\" }",
-                "{ \"group\": \"com.google.cloud\", \"artifact\": \"google-cloud-storage\", \"version\": \"1.113.4\" }",
-                "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\" }",
-                "{ \"group\": \"com.google.googlejavaformat\", \"artifact\": \"google-java-format\", \"version\": \"1.15.0\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"org.apache.maven\", \"artifact\": \"maven-artifact\", \"version\": \"3.8.6\" }",
-                "{ \"group\": \"software.amazon.awssdk\", \"artifact\": \"s3\", \"version\": \"2.17.183\" }"
-              ],
-              "fetch_sources": false,
-              "fetch_javadoc": false,
-              "generate_compat_repositories": false,
-              "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "additional_netrc_lines": [],
-              "fail_if_repin_required": false,
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "org_apache_commons_commons_compress_1_20": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar"
-              ],
-              "downloaded_file_path": "org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar"
-            }
-          },
-          "software_amazon_awssdk_http_client_spi_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fe7120f175df9e47ebcc5d946d7f40110faf2ba0a30364f3b935d5b8a5a6c3c6",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar"
-            }
-          },
-          "org_checkerframework_checker_qual_3_5_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar",
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar"
-              ],
-              "downloaded_file_path": "org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar"
-            }
-          },
-          "com_google_oauth_client_google_oauth_client_1_31_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4ed4e2948251dbda66ce251bd7f3b32cd8570055e5cdb165a3c7aea8f43da0ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar",
-                "https://maven.google.com/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar"
-              ],
-              "downloaded_file_path": "com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar"
-            }
-          },
-          "com_google_code_java_allocation_instrumenter_java_allocation_instrumenter_3_3_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1ef5535a8bd41cf3072469f381b9ee6ab28275311a7499f53d6e52adf976fef0",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.3.0/java-allocation-instrumenter-3.3.0.jar"
-              ],
-              "downloaded_file_path": "com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.3.0/java-allocation-instrumenter-3.3.0.jar"
-            }
-          },
-          "org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_4_32": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5f801e75ca27d8791c14b07943c608da27620d910a8093022af57f543d5d98b6",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.32/kotlin-stdlib-jdk7-1.4.32.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.32/kotlin-stdlib-jdk7-1.4.32.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.32/kotlin-stdlib-jdk7-1.4.32.jar"
-            }
-          },
-          "maven_android": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "pinned_coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://dl.google.com/android/maven2\" }",
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{ \"group\": \"androidx.databinding\", \"artifact\": \"databinding-compiler\", \"version\": \"3.4.0-alpha10\" }",
-                "{ \"group\": \"com.android.tools.build\", \"artifact\": \"builder\", \"version\": \"7.1.3\" }",
-                "{ \"group\": \"com.android.tools.build\", \"artifact\": \"manifest-merger\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"sdk-common\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"annotations\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools.layoutlib\", \"artifact\": \"layoutlib-api\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"common\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"repository\", \"version\": \"30.1.3\" }"
-              ],
-              "fetch_sources": false,
-              "fetch_javadoc": false,
-              "generate_compat_repositories": false,
-              "maven_install_json": "@@//src/tools/android:maven_android_install.json",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "additional_netrc_lines": [],
-              "fail_if_repin_required": true,
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "com_google_code_gson_gson_2_8_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c8fb4839054d280b3033f800d1f5a97de2f028eb8ba2eb458ad287e536f3f25f",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar",
-                "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar"
-              ],
-              "downloaded_file_path": "com/google/code/gson/gson/2.8.6/gson-2.8.6.jar"
-            }
-          },
-          "com_google_auto_service_auto_service_annotations_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c7bec54b7b5588b5967e870341091c5691181d954cf2039f1bf0a6eeb837473b",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/service/auto-service-annotations/1.0.1/auto-service-annotations-1.0.1.jar"
-              ],
-              "downloaded_file_path": "com/google/auto/service/auto-service-annotations/1.0.1/auto-service-annotations-1.0.1.jar"
-            }
-          },
-          "com_google_truth_extensions_truth_java8_extension_1_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2bbd32dd2fa9470d17f1bbda4f52b33b60bce4574052c1d46610a0aa371fc446",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/truth/extensions/truth-java8-extension/1.1.3/truth-java8-extension-1.1.3.jar"
-              ],
-              "downloaded_file_path": "com/google/truth/extensions/truth-java8-extension/1.1.3/truth-java8-extension-1.1.3.jar"
-            }
-          },
-          "software_amazon_awssdk_annotations_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8e4d72361ca805a0bd8bbd9017cd7ff77c8d170f2dd469c7d52d5653330bb3fd",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_jar_linux_aarch_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "29675f1d9a2f09e426c0016e5fb89328d38afad0403f1bd1b98f985253d96ad8",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-linux-aarch_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-linux-aarch_64.jar"
-            }
-          },
-          "org_jetbrains_kotlin_kotlin_stdlib_1_4_32": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "13e9fd3e69dc7230ce0fc873a92a4e5d521d179bcf1bef75a6705baac3bfecba",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.jar"
-            }
-          },
-          "com_google_auto_value_auto_value_annotations_1_7_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar",
-                "https://maven.google.com/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-              ],
-              "downloaded_file_path": "com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-            }
-          },
-          "com_android_tools_layoutlib_layoutlib_api_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "14d7ffdcedeea701c7316d6eba58ae32d329293de215c3b7218d14711ecfffaf",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.1.3/layoutlib-api-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/layoutlib/layoutlib-api/30.1.3/layoutlib-api-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/layoutlib/layoutlib-api/30.1.3/layoutlib-api-30.1.3.jar"
-            }
-          },
-          "io_netty_netty_transport_classes_kqueue_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "453fe595c3e12b9228b930b845140aaed93a9fb87d1a5d829c55b31d670def9f",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue/4.1.93.Final/netty-transport-classes-kqueue-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-classes-kqueue/4.1.93.Final/netty-transport-classes-kqueue-4.1.93.Final.jar"
-            }
-          },
-          "junit_junit_4_13_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3",
-              "urls": [
-                "https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar"
-              ],
-              "downloaded_file_path": "junit/junit/4.13.2/junit-4.13.2.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_credentials_0_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "42c76031276de5b520909e9faf88c5b3c9a722d69ee9cfdafedb1c52c355dfc5",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar",
-                "https://maven.google.com/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar"
-            }
-          },
-          "com_google_guava_guava_32_1_1_jre": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "91fbba37f1c8b251cf9ea9e7d3a369eb79eb1e6a5df1d4bbf483dd0380740281",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/guava/32.1.1-jre/guava-32.1.1-jre.jar"
-              ],
-              "downloaded_file_path": "com/google/guava/guava/32.1.1-jre/guava-32.1.1-jre.jar"
-            }
-          },
-          "com_android_tools_sdklib_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "edf456a67ada3154c9fd23f9829699e8b654dc7f33f2430b50839d6904760b48",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/sdklib/30.1.3/sdklib-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/sdklib/30.1.3/sdklib-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/sdklib/30.1.3/sdklib-30.1.3.jar"
-            }
-          },
-          "org_tukaani_xz_1_9": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "211b306cfc44f8f96df3a0a3ddaf75ba8c5289eed77d60d72f889bb855f535e5",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar"
-              ],
-              "downloaded_file_path": "org/tukaani/xz/1.9/xz-1.9.jar"
-            }
-          },
-          "com_google_guava_guava_testlib_31_1_jre": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar"
-              ],
-              "downloaded_file_path": "com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_1_42_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "82ca0e08171846d1768d5ac3f13244d6fe5a54102c14735ef40bf15d57d478e5",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.42.0/google-http-client-1.42.0.jar"
-              ],
-              "downloaded_file_path": "com/google/http-client/google-http-client/1.42.0/google-http-client-1.42.0.jar"
-            }
-          },
-          "com_android_tools_sdk_common_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6c44d6ffa3b1b34505fcb05422f08bd293391648dc974cc252ddc541fd9b27f5",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/sdk-common/30.1.3/sdk-common-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/sdk-common/30.1.3/sdk-common-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/sdk-common/30.1.3/sdk-common-30.1.3.jar"
-            }
-          },
-          "org_checkerframework_checker_qual_3_33_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar"
-              ],
-              "downloaded_file_path": "org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar"
-            }
-          },
-          "org_hamcrest_hamcrest_core_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
-              ],
-              "downloaded_file_path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_core_http_1_93_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "81ac67c14c7c4244d2b7db2607ad352416aca8d3bb2adf338964e8fea25b1b3c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar"
-              ],
-              "downloaded_file_path": "com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_jar_osx_aarch_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6c6ecf73016d360e09a1cac31acd953f508309612f1b97d73db2ed0813d8bf14",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-osx-aarch_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-osx-aarch_64.jar"
-            }
-          },
-          "io_sweers_autotransient_autotransient_1_0_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "914ce84508410ee1419514925f93b1855a9f7a7b5b5d02fc07f411d2a45f1bba",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/sweers/autotransient/autotransient/1.0.0/autotransient-1.0.0.jar"
-              ],
-              "downloaded_file_path": "io/sweers/autotransient/autotransient/1.0.0/autotransient-1.0.0.jar"
-            }
-          },
-          "unpinned_rules_jvm_external_deps": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-credentials\", \"version\": \"0.22.0\" }",
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-oauth2-http\", \"version\": \"0.22.0\" }",
-                "{ \"group\": \"com.google.cloud\", \"artifact\": \"google-cloud-core\", \"version\": \"1.93.10\" }",
-                "{ \"group\": \"com.google.cloud\", \"artifact\": \"google-cloud-storage\", \"version\": \"1.113.4\" }",
-                "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\" }",
-                "{ \"group\": \"com.google.googlejavaformat\", \"artifact\": \"google-java-format\", \"version\": \"1.15.0\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"org.apache.maven\", \"artifact\": \"maven-artifact\", \"version\": \"3.8.6\" }",
-                "{ \"group\": \"software.amazon.awssdk\", \"artifact\": \"s3\", \"version\": \"2.17.183\" }"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": false,
-              "fetch_javadoc": false,
-              "excluded_artifacts": [],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json",
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "com_google_auth_google_auth_library_credentials_1_6_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "153fa3cdc153ac3ee25649e8037aeda4438256153d35acf3c27e83e4ee6165a4",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/1.6.0/google-auth-library-credentials-1.6.0.jar"
-              ],
-              "downloaded_file_path": "com/google/auth/google-auth-library-credentials/1.6.0/google-auth-library-credentials-1.6.0.jar"
-            }
-          },
-          "io_netty_netty_tcnative_boringssl_static_jar_windows_x86_64_2_0_56_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b0d9505b09427ab655369506a802358966762edcb7cf08fc162dc2b368a2041c",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_query_protocol_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4dace03c76f80f3dec920cb3dedb2a95984c4366ef4fda728660cb90bed74848",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_check_api_2_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1717bbf65757b8e1a83f3b0aa78c5ac25a6493008bc730091d404cf798fc0639",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_check_api/2.22.0/error_prone_check_api-2.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_check_api/2.22.0/error_prone_check_api-2.22.0.jar"
-            }
-          },
-          "io_netty_netty_codec_http_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar"
-            }
-          },
-          "com_googlecode_juniversalchardet_juniversalchardet_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar",
-                "https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar"
-              ],
-              "downloaded_file_path": "com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar"
-            }
-          },
-          "io_opencensus_opencensus_contrib_http_util_0_31_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar"
-              ],
-              "downloaded_file_path": "io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar"
-            }
-          },
-          "com_google_flogger_google_extensions_0_5_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8b0862cad85b9549f355fe383c6c63816d2f19529634e033ae06d0107ab110b9",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/flogger/google-extensions/0.5.1/google-extensions-0.5.1.jar"
-              ],
-              "downloaded_file_path": "com/google/flogger/google-extensions/0.5.1/google-extensions-0.5.1.jar"
-            }
-          },
-          "com_sun_activation_javax_activation_1_2_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar",
-                "https://repo1.maven.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar"
-              ],
-              "downloaded_file_path": "com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar"
-            }
-          },
-          "com_ryanharter_auto_value_auto_value_gson_extension_1_3_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "261be84be30a56994e132d718a85efcd579197a2edb9426b84c5722c56955eca",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/ryanharter/auto/value/auto-value-gson-extension/1.3.1/auto-value-gson-extension-1.3.1.jar"
-              ],
-              "downloaded_file_path": "com/ryanharter/auto/value/auto-value-gson-extension/1.3.1/auto-value-gson-extension-1.3.1.jar"
-            }
-          },
-          "com_google_truth_truth_1_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fc0b67782289a2aabfddfdf99eff1dcd5edc890d49143fcd489214b107b8f4f3",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar"
-              ],
-              "downloaded_file_path": "com/google/truth/truth/1.1.3/truth-1.1.3.jar"
-            }
-          },
-          "com_google_guava_guava_30_1_jre": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e6dd072f9d3fe02a4600688380bd422bdac184caf6fe2418cfdd0934f09432aa",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar",
-                "https://repo1.maven.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar"
-              ],
-              "downloaded_file_path": "com/google/guava/guava/30.1-jre/guava-30.1-jre.jar"
-            }
-          },
-          "net_bytebuddy_byte_buddy_agent_1_14_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "55f19862b870f5d85890ba5386b1b45e9bbc88d5fe1f819abe0c788b4929fa6b",
-              "urls": [
-                "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.5/byte-buddy-agent-1.14.5.jar"
-              ],
-              "downloaded_file_path": "net/bytebuddy/byte-buddy-agent/1.14.5/byte-buddy-agent-1.14.5.jar"
-            }
-          },
-          "com_google_j2objc_j2objc_annotations_2_8": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar"
-              ],
-              "downloaded_file_path": "com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "411f4a42519b6b78bdc0fcfdf74c9edcef0ee97afa4a667abe04045a508d6302",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar"
-              ],
-              "downloaded_file_path": "com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar"
-            }
-          },
-          "net_java_dev_jna_jna_platform_5_6_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9ecea8bf2b1b39963939d18b70464eef60c508fed8820f9dcaba0c35518eabf7",
-              "urls": [
-                "https://dl.google.com/android/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar",
-                "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar"
-              ],
-              "downloaded_file_path": "net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar"
-            }
-          },
-          "com_android_tools_analytics_library_shared_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7c7d19727641e1fbbb61e8569712b3a0229e4e0352636b5745049d41e1a71e00",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/analytics-library/shared/30.1.3/shared-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/analytics-library/shared/30.1.3/shared-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/analytics-library/shared/30.1.3/shared-30.1.3.jar"
-            }
-          },
-          "com_google_code_findbugs_jsr305_3_0_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-              ],
-              "downloaded_file_path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_annotation_2_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "554c42449c9920ea1f6baec1d1b8aaac404a88be653f7cb441ee059316f8a1d1",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation/2.22.0/error_prone_annotation-2.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_annotation/2.22.0/error_prone_annotation-2.22.0.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_gson_1_42_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cb852272c1cb0c8449d8b1a70f3e0f2c1efb2063e543183faa43078fb446f540",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson/1.42.0/google-http-client-gson-1.42.0.jar"
-              ],
-              "downloaded_file_path": "com/google/http-client/google-http-client-gson/1.42.0/google-http-client-gson-1.42.0.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_util_3_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d9de66b8c9445905dfa7064f6d5213d47ce88a20d34e21d83c4a94a229e14e62",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar",
-                "https://maven.google.com/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar"
-              ],
-              "downloaded_file_path": "com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar"
-            }
-          },
-          "org_mockito_mockito_core_5_4_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b1689b06617ea01fd777bfaedbdde512faf083d639a049f79b388d5a4e96d2e5",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/mockito/mockito-core/5.4.0/mockito-core-5.4.0.jar"
-              ],
-              "downloaded_file_path": "org/mockito/mockito-core/5.4.0/mockito-core-5.4.0.jar"
-            }
-          },
-          "com_google_guava_failureaccess_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-              ],
-              "downloaded_file_path": "com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-            }
-          },
-          "io_opencensus_opencensus_api_0_31_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar"
-              ],
-              "downloaded_file_path": "io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar"
-            }
-          },
-          "io_grpc_grpc_context_1_33_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "99b8aea2b614fe0e61c3676e681259dc43c2de7f64620998e1a8435eb2976496",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar",
-                "https://maven.google.com/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_iam_v1_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "64cee7383a97e846da8d8e160e6c8fe30561e507260552c59e6ccfc81301fdc8",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar",
-                "https://maven.google.com/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar"
-              ],
-              "downloaded_file_path": "com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar"
-            }
-          },
-          "org_objenesis_objenesis_3_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.jar"
-              ],
-              "downloaded_file_path": "org/objenesis/objenesis/3.3/objenesis-3.3.jar"
-            }
-          },
-          "software_amazon_awssdk_metrics_spi_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "08a11dc8c4ba464beafbcc7ac05b8c724c1ccb93da99482e82a68540ac704e4a",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_jackson2_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e6504a82425fcc2168a4ca4175138ddcc085168daed8cdedb86d8f6fdc296e1e",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar"
-              ],
-              "downloaded_file_path": "com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar"
-            }
-          },
-          "com_android_tools_build_apksig_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "095885c56af3e52e9c7d2ac9b6cf07a8e3bf7fedfbab3914c75c39677d346ada",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/apksig/7.1.3/apksig-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/apksig/7.1.3/apksig-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/apksig/7.1.3/apksig-7.1.3.jar"
-            }
-          },
-          "com_beust_jcommander_1_82": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "deeac157c8de6822878d85d0c7bc8467a19cc8484d37788f7804f039dde280b1",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar"
-              ],
-              "downloaded_file_path": "com/beust/jcommander/1.82/jcommander-1.82.jar"
-            }
-          },
-          "it_unimi_dsi_fastutil_7_2_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d73dec5ec18f973f380869b6125d60f5cda77cf6e40e321bd06e0308ed0a40b7",
-              "urls": [
-                "https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.1/fastutil-7.2.1.jar"
-              ],
-              "downloaded_file_path": "it/unimi/dsi/fastutil/7.2.1/fastutil-7.2.1.jar"
-            }
-          },
-          "androidx_databinding_databinding_common_3_4_0_alpha10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1b2cfc3beaf6139e1851dd4a888cda8192ba0ad4be3de43450d5f30569845303",
-              "urls": [
-                "https://dl.google.com/android/maven2/androidx/databinding/databinding-common/3.4.0-alpha10/databinding-common-3.4.0-alpha10.jar",
-                "https://repo1.maven.org/maven2/androidx/databinding/databinding-common/3.4.0-alpha10/databinding-common-3.4.0-alpha10.jar"
-              ],
-              "downloaded_file_path": "androidx/databinding/databinding-common/3.4.0-alpha10/databinding-common-3.4.0-alpha10.jar"
-            }
-          },
-          "software_amazon_awssdk_third_party_jackson_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1bc27c9960993c20e1ab058012dd1ae04c875eec9f0f08f2b2ca41e578dee9a4",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar"
-            }
-          },
-          "tools_profiler_async_profiler_3_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8f798860049d01f4a2f853596d28c85d2983f0c098f165a32909b7da9c74209f",
-              "urls": [
-                "https://repo1.maven.org/maven2/tools/profiler/async-profiler/3.0/async-profiler-3.0.jar"
-              ],
-              "downloaded_file_path": "tools/profiler/async-profiler/3.0/async-profiler-3.0.jar"
-            }
-          },
-          "software_amazon_eventstream_eventstream_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar",
-                "https://maven.google.com/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar"
-              ],
-              "downloaded_file_path": "software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar"
-            }
-          },
-          "org_threeten_threeten_extra_1_5_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e7def554536188fbaf8aac1a0a2f956b039cbbb5696edc3b8336c442c56ae445",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/threeten/threeten-extra/1.5.0/threeten-extra-1.5.0.jar"
-              ],
-              "downloaded_file_path": "org/threeten/threeten-extra/1.5.0/threeten-extra-1.5.0.jar"
-            }
-          },
-          "io_netty_netty_codec_dns_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "10a278b19d6393d5637f745007cb26d47dd16d468898dcc4a43e26d39c6cdd29",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-dns/4.1.93.Final/netty-codec-dns-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec-dns/4.1.93.Final/netty-codec-dns-4.1.93.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_xml_protocol_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "566bba05d49256fa6994efd68fa625ae05a62ea45ee74bb9130d20ea20988363",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_jar_linux_x86_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8923a73ba8a373f7b994906f5902ba9f6bb59d181d4ad01576a6e0c5abb09b67",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar"
-            }
-          },
-          "io_netty_netty_handler_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4e5f563ae14ed713381816d582f5fcfd0615aefb29203486cdfb782d8a00a02b",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.93.Final/netty-handler-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-handler/4.1.93.Final/netty-handler-4.1.93.Final.jar"
-            }
-          },
-          "com_android_databinding_baseLibrary_3_4_0_alpha10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1aed4f3e46bf83c80a1722ce6cc64a8133c4554a668c483f6b3d0f2c06dd7461",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/databinding/baseLibrary/3.4.0-alpha10/baseLibrary-3.4.0-alpha10.jar",
-                "https://repo1.maven.org/maven2/com/android/databinding/baseLibrary/3.4.0-alpha10/baseLibrary-3.4.0-alpha10.jar"
-              ],
-              "downloaded_file_path": "com/android/databinding/baseLibrary/3.4.0-alpha10/baseLibrary-3.4.0-alpha10.jar"
-            }
-          },
-          "org_codehaus_mojo_animal_sniffer_annotations_1_21": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2f25841c937e24959a57b630e2c4b8525b3d0f536f2e511c9b2bed30b1651d54",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.21/animal-sniffer-annotations-1.21.jar"
-              ],
-              "downloaded_file_path": "org/codehaus/mojo/animal-sniffer-annotations/1.21/animal-sniffer-annotations-1.21.jar"
-            }
-          },
-          "com_fasterxml_jackson_core_jackson_core_2_11_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78cd0a6b936232e06dd3e38da8a0345348a09cd1ff9c4d844c6ee72c75cfc402",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar",
-                "https://maven.google.com/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar"
-              ],
-              "downloaded_file_path": "com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_core_1_93_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "832d74eca66f4601e162a8460d6f59f50d1d23f93c18b02654423b6b0d67c6ea",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar"
-              ],
-              "downloaded_file_path": "com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar"
-            }
-          },
-          "io_netty_netty_codec_http2_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d96cc09045a1341c6d47494352aa263b87b72fb1d2ea9eca161aa73820bfe8bb",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.93.Final/netty-codec-http2-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec-http2/4.1.93.Final/netty-codec-http2-4.1.93.Final.jar"
-            }
-          },
-          "io_netty_netty_buffer_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "007c7d9c378df02d390567d0d7ddf542ffddb021b7313dbf502392113ffabb08",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.93.Final/netty-buffer-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-buffer/4.1.93.Final/netty-buffer-4.1.93.Final.jar"
-            }
-          },
-          "commons_lang_commons_lang_2_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "50f11b09f877c294d56f24463f47d28f929cf5044f648661c0f0cfbae9a2f49c",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"
-              ],
-              "downloaded_file_path": "commons-lang/commons-lang/2.6/commons-lang-2.6.jar"
-            }
-          },
-          "org_antlr_antlr4_4_5_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar",
-                "https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar"
-              ],
-              "downloaded_file_path": "org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar"
-            }
-          },
-          "io_netty_netty_tcnative_classes_2_0_56_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "eede807f0dd5eb1ad74ea1ae1094430631da63fcde00d4dc20eb0cd048bb0ac3",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.56.Final/netty-tcnative-classes-2.0.56.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-classes/2.0.56.Final/netty-tcnative-classes-2.0.56.Final.jar"
-            }
-          },
-          "io_netty_netty_transport_classes_epoll_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e1528a9751c1285aa7beaf3a1eb0597151716426ce38598ac9bc0891209b9e68",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar"
-            }
-          },
-          "org_checkerframework_checker_qual_3_12_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
-                "https://maven.google.com/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
-              ],
-              "downloaded_file_path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
-            }
-          },
-          "software_amazon_awssdk_regions_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d3079395f3ffc07d04ffcce16fca29fb5968197f6e9ea3dbff6be297102b40a5",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_apache_v2_1_42_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1fc4964236b67cf3c5651d7ac1dff668f73b7810c7f1dc0862a0e5bc01608785",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2/1.42.0/google-http-client-apache-v2-1.42.0.jar"
-              ],
-              "downloaded_file_path": "com/google/http-client/google-http-client-apache-v2/1.42.0/google-http-client-apache-v2-1.42.0.jar"
-            }
-          },
-          "io_perfmark_perfmark_api_0_25_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2044542933fcdf40ad18441bec37646d150c491871157f288847e29cb81de4cb",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/perfmark/perfmark-api/0.25.0/perfmark-api-0.25.0.jar"
-              ],
-              "downloaded_file_path": "io/perfmark/perfmark-api/0.25.0/perfmark-api-0.25.0.jar"
-            }
-          },
-          "io_netty_netty_handler_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar"
-            }
-          },
-          "com_google_testparameterinjector_test_parameter_injector_1_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c3d4c8d7055b6fd7f1047ab37e3d476709c492510d485f1bfb204a3c16f0351c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/testparameterinjector/test-parameter-injector/1.0/test-parameter-injector-1.0.jar"
-              ],
-              "downloaded_file_path": "com/google/testparameterinjector/test-parameter-injector/1.0/test-parameter-injector-1.0.jar"
-            }
-          },
-          "io_grpc_grpc_api_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "aeb8d7a1361aa3d8f5a191580fa7f8cbc5ceb53137a4a698590f612f791e2c45",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-api/1.48.1/grpc-api-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-api/1.48.1/grpc-api-1.48.1.jar"
-            }
-          },
-          "org_ow2_asm_asm_analysis_9_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar"
-            }
-          },
-          "org_ow2_asm_asm_analysis_9_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "81a88041b1b8beda5a8a99646098046c48709538270c49def68abff25ac3be34",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar",
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar"
-            }
-          },
-          "com_squareup_javapoet_1_12_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2b70cdfa8c9e997b4007035a266c273c0df341f9c57c9d0b45a680ae3fd882db",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/squareup/javapoet/1.12.0/javapoet-1.12.0.jar"
-              ],
-              "downloaded_file_path": "com/squareup/javapoet/1.12.0/javapoet-1.12.0.jar"
-            }
-          },
-          "unpinned_maven_android": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://dl.google.com/android/maven2\" }",
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{ \"group\": \"androidx.databinding\", \"artifact\": \"databinding-compiler\", \"version\": \"3.4.0-alpha10\" }",
-                "{ \"group\": \"com.android.tools.build\", \"artifact\": \"builder\", \"version\": \"7.1.3\" }",
-                "{ \"group\": \"com.android.tools.build\", \"artifact\": \"manifest-merger\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"sdk-common\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"annotations\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools.layoutlib\", \"artifact\": \"layoutlib-api\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"common\", \"version\": \"30.1.3\" }",
-                "{ \"group\": \"com.android.tools\", \"artifact\": \"repository\", \"version\": \"30.1.3\" }"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": false,
-              "fetch_javadoc": false,
-              "excluded_artifacts": [],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "maven_install_json": "@@//src/tools/android:maven_android_install.json",
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "io_netty_netty_resolver_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_protocol_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "10e7c4faa1f05e2d73055d0390dbd0bb6450e2e6cb85beda051b1e4693c826ce",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar"
-            }
-          },
-          "com_squareup_javapoet_1_8_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8e108c92027bb428196f10fa11cffbe589f7648a6af2016d652279385fdfd789",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar",
-                "https://repo1.maven.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar"
-              ],
-              "downloaded_file_path": "com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar"
-            }
-          },
-          "io_grpc_grpc_protobuf_lite_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0a4c735bb80e342d418c0ef7d2add7793aaf72b91c449bde2769ea81f1869737",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-protobuf-lite/1.48.1/grpc-protobuf-lite-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-protobuf-lite/1.48.1/grpc-protobuf-lite-1.48.1.jar"
-            }
-          },
-          "software_amazon_awssdk_s3_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ab073b91107a9e4ed9f030314077d137fe627e055ad895fabb036980a050e360",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar"
-            }
-          },
-          "com_squareup_javawriter_2_5_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar",
-                "https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar"
-              ],
-              "downloaded_file_path": "com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpclient_4_5_13": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar",
-                "https://maven.google.com/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar"
-              ],
-              "downloaded_file_path": "org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar"
-            }
-          },
-          "net_sf_kxml_kxml2_2_3_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2",
-              "urls": [
-                "https://dl.google.com/android/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar",
-                "https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"
-              ],
-              "downloaded_file_path": "net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar"
-            }
-          },
-          "com_google_code_gson_gson_2_9_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
-              ],
-              "downloaded_file_path": "com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
-            }
-          },
-          "io_netty_netty_buffer_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar"
-            }
-          },
-          "jakarta_xml_bind_jakarta_xml_bind_api_2_3_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "69156304079bdeed9fc0ae3b39389f19b3cc4ba4443bc80508995394ead742ea",
-              "urls": [
-                "https://dl.google.com/android/maven2/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar",
-                "https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar"
-              ],
-              "downloaded_file_path": "jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar"
-            }
-          },
-          "org_pcollections_pcollections_3_1_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "34f579ba075c8da2c8a0fedd0f04e21eac2fb6c660d90d0fabb573e8b4dc6918",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/pcollections/pcollections/3.1.4/pcollections-3.1.4.jar"
-              ],
-              "downloaded_file_path": "org/pcollections/pcollections/3.1.4/pcollections-3.1.4.jar"
-            }
-          },
-          "xerces_xercesImpl_2_12_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0",
-              "urls": [
-                "https://dl.google.com/android/maven2/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar",
-                "https://repo1.maven.org/maven2/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar"
-              ],
-              "downloaded_file_path": "xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar"
-            }
-          },
-          "com_android_tools_analytics_library_tracker_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c30e3634f83d524680f3aba2861078fb14bd347e6f9f0e5c079fba6142eec7e9",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/analytics-library/tracker/30.1.3/tracker-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/analytics-library/tracker/30.1.3/tracker-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/analytics-library/tracker/30.1.3/tracker-30.1.3.jar"
-            }
-          },
-          "io_netty_netty_tcnative_boringssl_static_jar_osx_x86_64_2_0_56_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9a77e8910af04becbdb535592c6a1e1a9accecde522aa1bb925a023c2c59d6dc",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-tcnative-boringssl-static/2.0.56.Final/netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar"
-            }
-          },
-          "io_grpc_grpc_stub_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6436f19cef264fd949fb7a41e11424e373aa3b1096cad0b7e518f1c81aa60f23",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-stub/1.48.1/grpc-stub-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-stub/1.48.1/grpc-stub-1.48.1.jar"
-            }
-          },
-          "org_slf4j_slf4j_api_1_7_30": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar",
-                "https://maven.google.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
-              ],
-              "downloaded_file_path": "org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
-            }
-          },
-          "org_jetbrains_annotations_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/annotations/13.0/annotations-13.0.jar"
-            }
-          },
-          "org_jvnet_staxex_stax_ex_1_8_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "20522549056e9e50aa35ef0b445a2e47a53d06be0b0a9467d704e2483ffb049a",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar",
-                "https://repo1.maven.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar"
-              ],
-              "downloaded_file_path": "org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_common_protos_2_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar",
-                "https://maven.google.com/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar"
-              ],
-              "downloaded_file_path": "com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar"
-            }
-          },
-          "commons_logging_commons_logging_1_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636",
-              "urls": [
-                "https://dl.google.com/android/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar",
-                "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"
-              ],
-              "downloaded_file_path": "commons-logging/commons-logging/1.2/commons-logging-1.2.jar"
-            }
-          },
-          "com_google_api_client_google_api_client_gson_1_35_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "54e5be675e5c2ab0958647fcaa35c14bd8f7c08358c634f5ab786e4ed7268576",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api-client/google-api-client-gson/1.35.2/google-api-client-gson-1.35.2.jar"
-              ],
-              "downloaded_file_path": "com/google/api-client/google-api-client-gson/1.35.2/google-api-client-gson-1.35.2.jar"
-            }
-          },
-          "com_sun_xml_fastinfoset_FastInfoset_1_2_16": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "056f3a1e144409f21ed16afc26805f58e9a21f3fce1543c42d400719d250c511",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar",
-                "https://repo1.maven.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar"
-              ],
-              "downloaded_file_path": "com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_storage_1_113_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "796833e9bdab80c40bbc820e65087eb8f28c6bfbca194d2e3e00d98cb5bc55d6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar"
-              ],
-              "downloaded_file_path": "com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar"
-            }
-          },
-          "commons_io_commons_io_2_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581",
-              "urls": [
-                "https://dl.google.com/android/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar",
-                "https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar"
-              ],
-              "downloaded_file_path": "commons-io/commons-io/2.4/commons-io-2.4.jar"
-            }
-          },
-          "io_netty_netty_transport_native_epoll_jar_linux_x86_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f87a502f3d257bc41f80bd0b90c19e6b4a48d0600fb26e7b5d6c2c675680fa0e",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-epoll/4.1.93.Final/netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-epoll/4.1.93.Final/netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar"
-            }
-          },
-          "com_typesafe_netty_netty_reactive_streams_2_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f949849fc8ee75fde468ba3a35df2e04577fa31a2940b83b2a7dc9d14dac13d6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar",
-                "https://maven.google.com/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar"
-              ],
-              "downloaded_file_path": "com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar"
-            }
-          },
-          "com_github_stephenc_jcip_jcip_annotations_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4fccff8382aafc589962c4edb262f6aa595e34f1e11e61057d1c6a96e8fc7323",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar"
-              ],
-              "downloaded_file_path": "com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar"
-            }
-          },
-          "com_typesafe_netty_netty_reactive_streams_http_2_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b39224751ad936758176e9d994230380ade5e9079e7c8ad778e3995779bcf303",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar",
-                "https://maven.google.com/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar"
-              ],
-              "downloaded_file_path": "com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar"
-            }
-          },
-          "com_google_api_client_google_api_client_1_35_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f195cd6228d3f99fa7e30ff2dee60ad0f2c7923be31399a7dcdc1abd679aa22e",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.35.2/google-api-client-1.35.2.jar"
-              ],
-              "downloaded_file_path": "com/google/api-client/google-api-client/1.35.2/google-api-client-1.35.2.jar"
-            }
-          },
-          "org_ow2_asm_asm_commons_9_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar"
-            }
-          },
-          "org_ow2_asm_asm_commons_9_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "afcb26dc1fc12c0c4a99ada670908dd82e18dfc488caf5ee92546996b470c00c",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar",
-                "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar"
-              ],
-              "downloaded_file_path": "org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar"
-            }
-          },
-          "com_android_tools_dvlib_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "50886691517d30762c571f585a07f384e6a8cca5fcbea9d46660ba078b613bfa",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/dvlib/30.1.3/dvlib-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/dvlib/30.1.3/dvlib-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/dvlib/30.1.3/dvlib-30.1.3.jar"
-            }
-          },
-          "org_threeten_threetenbp_1_5_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dcf9c0f940739f2a825cd8626ff27113459a2f6eb18797c7152f93fff69c264f",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar",
-                "https://maven.google.com/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar"
-              ],
-              "downloaded_file_path": "org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar"
-            }
-          },
-          "io_reactivex_rxjava3_rxjava_3_1_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8d784075bec0b7c55042c109a4de8923b3b6d2ebd2e00912d518f07240f9c23a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/reactivex/rxjava3/rxjava/3.1.2/rxjava-3.1.2.jar"
-              ],
-              "downloaded_file_path": "io/reactivex/rxjava3/rxjava/3.1.2/rxjava-3.1.2.jar"
-            }
-          },
-          "com_android_tools_build_apkzlib_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5c10846c4a325b4313cdfcb236505ce1defa68f55d1a4259b503be115453c661",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/apkzlib/7.1.3/apkzlib-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/apkzlib/7.1.3/apkzlib-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/apkzlib/7.1.3/apkzlib-7.1.3.jar"
-            }
-          },
-          "io_github_java_diff_utils_java_diff_utils_4_12": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/github/java-diff-utils/java-diff-utils/4.12/java-diff-utils-4.12.jar"
-              ],
-              "downloaded_file_path": "io/github/java-diff-utils/java-diff-utils/4.12/java-diff-utils-4.12.jar"
-            }
-          },
-          "io_grpc_grpc_netty_1_48_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2a51593342a2ee4f8f1b946dc48d06b02d0721493238e4ae83d1ad66f8b0c9f4",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-netty/1.48.1/grpc-netty-1.48.1.jar"
-              ],
-              "downloaded_file_path": "io/grpc/grpc-netty/1.48.1/grpc-netty-1.48.1.jar"
-            }
-          },
-          "maven": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "pinned_coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava-testlib\", \"version\": \"31.1-jre\", \"testonly\": true }",
-                "{ \"group\": \"com.google.jimfs\", \"artifact\": \"jimfs\", \"version\": \"1.2\", \"testonly\": true }",
-                "{ \"group\": \"com.google.testing.compile\", \"artifact\": \"compile-testing\", \"version\": \"0.18\", \"testonly\": true }",
-                "{ \"group\": \"com.google.testparameterinjector\", \"artifact\": \"test-parameter-injector\", \"version\": \"1.0\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-java8-extension\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-liteproto-extension\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"com.google.truth.extensions\", \"artifact\": \"truth-proto-extension\", \"version\": \"1.1.3\", \"testonly\": true }",
-                "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"5.4.0\", \"testonly\": true }",
-                "{ \"group\": \"com.beust\", \"artifact\": \"jcommander\", \"version\": \"1.82\" }",
-                "{ \"group\": \"com.github.ben-manes.caffeine\", \"artifact\": \"caffeine\", \"version\": \"3.0.5\" }",
-                "{ \"group\": \"com.github.kevinstern\", \"artifact\": \"software-and-algorithms\", \"version\": \"1.0\" }",
-                "{ \"group\": \"com.github.stephenc.jcip\", \"artifact\": \"jcip-annotations\", \"version\": \"1.0-1\" }",
-                "{ \"group\": \"com.google.api-client\", \"artifact\": \"google-api-client-gson\", \"version\": \"1.35.2\" }",
-                "{ \"group\": \"com.google.api-client\", \"artifact\": \"google-api-client\", \"version\": \"1.35.2\" }",
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-credentials\", \"version\": \"1.6.0\" }",
-                "{ \"group\": \"com.google.auth\", \"artifact\": \"google-auth-library-oauth2-http\", \"version\": \"1.6.0\" }",
-                "{ \"group\": \"com.google.auto.service\", \"artifact\": \"auto-service-annotations\", \"version\": \"1.0.1\" }",
-                "{ \"group\": \"com.google.auto.service\", \"artifact\": \"auto-service\", \"version\": \"1.0\" }",
-                "{ \"group\": \"com.google.auto.value\", \"artifact\": \"auto-value-annotations\", \"version\": \"1.9\" }",
-                "{ \"group\": \"com.google.auto.value\", \"artifact\": \"auto-value\", \"version\": \"1.8.2\" }",
-                "{ \"group\": \"com.google.auto\", \"artifact\": \"auto-common\", \"version\": \"1.2.1\" }",
-                "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }",
-                "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.9.0\" }",
-                "{ \"group\": \"com.google.code.java-allocation-instrumenter\", \"artifact\": \"java-allocation-instrumenter\", \"version\": \"3.3.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotation\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_check_api\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_core\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_type_annotations\", \"version\": \"2.22.0\" }",
-                "{ \"group\": \"com.google.flogger\", \"artifact\": \"flogger-system-backend\", \"version\": \"0.5.1\" }",
-                "{ \"group\": \"com.google.flogger\", \"artifact\": \"flogger\", \"version\": \"0.5.1\" }",
-                "{ \"group\": \"com.google.flogger\", \"artifact\": \"google-extensions\", \"version\": \"0.5.1\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"failureaccess\", \"version\": \"1.0.1\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }",
-                "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }",
-                "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }",
-                "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.4.0\" }",
-                "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }",
-                "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }",
-                "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }",
-                "{ \"group\": \"com.squareup\", \"artifact\": \"javapoet\", \"version\": \"1.12.0\" }",
-                "{ \"group\": \"commons-collections\", \"artifact\": \"commons-collections\", \"version\": \"3.2.2\" }",
-                "{ \"group\": \"commons-lang\", \"artifact\": \"commons-lang\", \"version\": \"2.6\" }",
-                "{ \"group\": \"io.github.java-diff-utils\", \"artifact\": \"java-diff-utils\", \"version\": \"4.12\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-api\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-auth\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-context\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-core\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-netty\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-protobuf-lite\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-protobuf\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.grpc\", \"artifact\": \"grpc-stub\", \"version\": \"1.48.1\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-buffer\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-codec-http2\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-codec-http\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-codec\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-common\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-handler-proxy\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-handler\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-resolver-dns\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-resolver\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-boringssl-static\", \"version\": \"2.0.56.Final\", \"packaging\": \"jar\", \"classifier\": \"windows-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-tcnative-classes\", \"version\": \"2.0.56.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-classes-epoll\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-classes-kqueue\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-epoll\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-epoll\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-kqueue\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-kqueue\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"linux-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-aarch_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }",
-                "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport\", \"version\": \"4.1.93.Final\" }",
-                "{ \"group\": \"io.reactivex.rxjava3\", \"artifact\": \"rxjava\", \"version\": \"3.1.2\" }",
-                "{ \"group\": \"it.unimi.dsi\", \"artifact\": \"fastutil\", \"version\": \"7.2.1\" }",
-                "{ \"group\": \"javax.activation\", \"artifact\": \"javax.activation-api\", \"version\": \"1.2.0\" }",
-                "{ \"group\": \"javax.annotation\", \"artifact\": \"javax.annotation-api\", \"version\": \"1.3.2\" }",
-                "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }",
-                "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy-agent\", \"version\": \"1.14.5\" }",
-                "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy\", \"version\": \"1.14.5\" }",
-                "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-compress\", \"version\": \"1.20\" }",
-                "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.8.0\" }",
-                "{ \"group\": \"org.apache.tomcat\", \"artifact\": \"tomcat-annotations-api\", \"version\": \"8.0.5\" }",
-                "{ \"group\": \"org.apache.velocity\", \"artifact\": \"velocity\", \"version\": \"1.7\" }",
-                "{ \"group\": \"org.checkerframework\", \"artifact\": \"checker-qual\", \"version\": \"3.19.0\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-analysis\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-commons\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-tree\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm-util\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.ow2.asm\", \"artifact\": \"asm\", \"version\": \"9.2\" }",
-                "{ \"group\": \"org.pcollections\", \"artifact\": \"pcollections\", \"version\": \"3.1.4\" }",
-                "{ \"group\": \"org.threeten\", \"artifact\": \"threeten-extra\", \"version\": \"1.5.0\" }",
-                "{ \"group\": \"org.tukaani\", \"artifact\": \"xz\", \"version\": \"1.9\" }",
-                "{ \"group\": \"org.yaml\", \"artifact\": \"snakeyaml\", \"version\": \"1.28\" }",
-                "{ \"group\": \"tools.profiler\", \"artifact\": \"async-profiler\", \"version\": \"3.0\" }",
-                "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }",
-                "{ \"group\": \"org.hamcrest\", \"artifact\": \"hamcrest-core\", \"version\": \"1.3\" }",
-                "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }",
-                "{ \"group\": \"com.google.code.gson\", \"artifact\": \"gson\", \"version\": \"2.8.9\" }",
-                "{ \"group\": \"com.google.errorprone\", \"artifact\": \"error_prone_annotations\", \"version\": \"2.3.2\" }",
-                "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"com.google.guava\", \"artifact\": \"guava-testlib\", \"version\": \"31.1-jre\" }",
-                "{ \"group\": \"com.google.truth\", \"artifact\": \"truth\", \"version\": \"1.1.2\" }",
-                "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }",
-                "{ \"group\": \"org.mockito\", \"artifact\": \"mockito-core\", \"version\": \"4.3.1\" }"
-              ],
-              "fetch_sources": false,
-              "fetch_javadoc": false,
-              "generate_compat_repositories": false,
-              "maven_install_json": "@@//:maven_install.json",
-              "override_targets": {},
-              "strict_visibility": true,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "additional_netrc_lines": [],
-              "fail_if_repin_required": true,
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "com_google_auto_service_auto_service_1_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4ae44dd05b49a1109a463c0d2aaf920c24f76d1e996bb89f29481c4ff75ec526",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/service/auto-service/1.0/auto-service-1.0.jar"
-              ],
-              "downloaded_file_path": "com/google/auto/service/auto-service/1.0/auto-service-1.0.jar"
-            }
-          },
-          "aopalliance_aopalliance_1_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08",
-              "urls": [
-                "https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"
-              ],
-              "downloaded_file_path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar"
-            }
-          },
-          "org_bouncycastle_bcpkix_jdk15on_1_56": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar",
-                "https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar"
-              ],
-              "downloaded_file_path": "org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_jar_osx_x86_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "deded602209c23f624e9d91f3d4c27cbba9b303e35ea9b4693090d54ac245b6c",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-osx-x86_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-osx-x86_64.jar"
-            }
-          },
-          "com_android_tools_build_builder_test_api_7_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6259c32a8602d9a18fc9a5abb274b915dbba32837c5ce91ac07a2d229460078a",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/builder-test-api/7.1.3/builder-test-api-7.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/builder-test-api/7.1.3/builder-test-api-7.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/builder-test-api/7.1.3/builder-test-api-7.1.3.jar"
-            }
-          },
-          "commons_collections_commons_collections_3_2_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar"
-              ],
-              "downloaded_file_path": "commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar"
-            }
-          },
-          "software_amazon_awssdk_profiles_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78833b32fde3f1c5320373b9ea955c1bbc28f2c904010791c4784e610193ee56",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar"
-            }
-          },
-          "io_github_eisop_dataflow_errorprone_3_34_0_eisop1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "89b4f5d2bd5059f067c5982a0e5988b87dfc8a8234795d68c6f3178846de3319",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/github/eisop/dataflow-errorprone/3.34.0-eisop1/dataflow-errorprone-3.34.0-eisop1.jar"
-              ],
-              "downloaded_file_path": "io/github/eisop/dataflow-errorprone/3.34.0-eisop1/dataflow-errorprone-3.34.0-eisop1.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_common_protos_2_9_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0d830380ec66bd7e25eee63aa0a5a08578e46ad187fb72d99b44d9ba22827f91",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.9.0/proto-google-common-protos-2.9.0.jar"
-              ],
-              "downloaded_file_path": "com/google/api/grpc/proto-google-common-protos/2.9.0/proto-google-common-protos-2.9.0.jar"
-            }
-          },
-          "com_android_tools_ddms_ddmlib_30_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b88ba88a1a8f0156c9a056eb0c83a181321541bdbb78e834bf837fd1dd07e4f3",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/ddms/ddmlib/30.1.3/ddmlib-30.1.3.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/ddms/ddmlib/30.1.3/ddmlib-30.1.3.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/ddms/ddmlib/30.1.3/ddmlib-30.1.3.jar"
-            }
-          },
-          "org_apache_commons_commons_lang3_3_8_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar",
-                "https://maven.google.com/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar"
-              ],
-              "downloaded_file_path": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "bccbdbea689a665a702ff19828662d87fb7fe81529df13f02ef1e4c474ea9f93",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar"
-            }
-          },
-          "com_google_api_gax_httpjson_0_77_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fd4dae47fa016d3b26e8d90b67ddc6c23c4c06e8bcdf085c70310ab7ef324bd6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar",
-                "https://maven.google.com/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar"
-              ],
-              "downloaded_file_path": "com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar"
-            }
-          },
-          "org_apache_commons_commons_pool2_2_8_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5efa9fbb54a58b1a12205a5fac565f6982abfeb0ff45bdbc318748ef5fd3a3ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/commons/commons-pool2/2.8.0/commons-pool2-2.8.0.jar"
-              ],
-              "downloaded_file_path": "org/apache/commons/commons-pool2/2.8.0/commons-pool2-2.8.0.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_annotations_2_11_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar",
-                "https://maven.google.com/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar"
-            }
-          },
-          "com_google_inject_guice_5_1_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4130e50bfac48099c860f0d903b91860c81a249c90f38245f8fed58fc817bc26",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/inject/guice/5.1.0/guice-5.1.0.jar"
-              ],
-              "downloaded_file_path": "com/google/inject/guice/5.1.0/guice-5.1.0.jar"
-            }
-          },
-          "io_netty_netty_codec_socks_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0ea47b5ba23ca1da8eb9146c8fc755c1271414633b1e2be2ce1df764ba0fff2a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-socks/4.1.93.Final/netty-codec-socks-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-codec-socks/4.1.93.Final/netty-codec-socks-4.1.93.Final.jar"
-            }
-          },
-          "com_google_auto_value_auto_value_1_8_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2067b788d4c1c96fd621ad861053a5c4d8a801cfafc77fec20d49a6e9340a745",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/value/auto-value/1.8.2/auto-value-1.8.2.jar"
-              ],
-              "downloaded_file_path": "com/google/auto/value/auto-value/1.8.2/auto-value-1.8.2.jar"
-            }
-          },
-          "com_google_auto_auto_common_1_2_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f43f29fe2a6ebaf04b2598cdeec32a4e346d49a9404e990f5fc19c19f3a28d0e",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/auto-common/1.2.1/auto-common-1.2.1.jar"
-              ],
-              "downloaded_file_path": "com/google/auto/auto-common/1.2.1/auto-common-1.2.1.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "774165a1c4dbaacb17f9c1ad666b3569a6a59715ae828e7c3d47703f479a53e7",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final.jar"
-            }
-          },
-          "net_bytebuddy_byte_buddy_1_14_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e99761a526df0fefbbd3fe14436b0f953000cdfa5151dc63c0b18d37d9c46f1c",
-              "urls": [
-                "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.5/byte-buddy-1.14.5.jar"
-              ],
-              "downloaded_file_path": "net/bytebuddy/byte-buddy/1.14.5/byte-buddy-1.14.5.jar"
-            }
-          },
-          "com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "52d26a9d105f8d8a0850807285f307a76cea8f3e0cdb2be4d3b15b1adfa77351",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar",
-                "https://maven.google.com/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar"
-              ],
-              "downloaded_file_path": "com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar"
-            }
-          },
-          "com_google_api_client_google_api_client_1_30_11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ee6f97865cc7de6c7c80955c3f37372cf3887bd75e4fc06f1058a6b4cd9bf4da",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar",
-                "https://maven.google.com/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar"
-              ],
-              "downloaded_file_path": "com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar"
-            }
-          },
-          "org_apache_maven_maven_artifact_3_8_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar",
-                "https://maven.google.com/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar"
-              ],
-              "downloaded_file_path": "org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar"
-            }
-          },
-          "com_google_auto_value_auto_value_annotations_1_9": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fa5469f4c44ee598a2d8f033ab0a9dcbc6498a0c5e0c998dfa0c2adf51358044",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9.jar"
-              ],
-              "downloaded_file_path": "com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_annotations_2_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "82a027b86541f58d1f9ee020cdf6bebe82acc7a267d3c53a2ea5cd6335932bbd",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.22.0/error_prone_annotations-2.22.0.jar"
-              ],
-              "downloaded_file_path": "com/google/errorprone/error_prone_annotations/2.22.0/error_prone_annotations-2.22.0.jar"
-            }
-          },
-          "software_amazon_awssdk_apache_client_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78ceae502fce6a97bbe5ff8f6a010a52ab7ea3ae66cb1a4122e18185fce45022",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_arns_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "659a185e191d66c71de81209490e66abeaccae208ea7b2831a738670823447aa",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar"
-            }
-          },
-          "org_jetbrains_kotlin_kotlin_stdlib_common_1_4_32": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e1ff6f55ee9e7591dcc633f7757bac25a7edb1cc7f738b37ec652f10f66a4145",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.32/kotlin-stdlib-common-1.4.32.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.32/kotlin-stdlib-common-1.4.32.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.4.32/kotlin-stdlib-common-1.4.32.jar"
-            }
-          },
-          "org_jetbrains_intellij_deps_trove4j_1_0_20181211": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar"
-            }
-          },
-          "org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_4_32": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "adc43e54757b106e0cd7b3b7aa257dff471b61efdabe067fc02b2f57e2396262",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.32/kotlin-stdlib-jdk8-1.4.32.jar",
-                "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.32/kotlin-stdlib-jdk8-1.4.32.jar"
-              ],
-              "downloaded_file_path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.32/kotlin-stdlib-jdk8-1.4.32.jar"
-            }
-          },
-          "javax_inject_javax_inject_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar"
-              ],
-              "downloaded_file_path": "javax/inject/javax.inject/1/javax.inject-1.jar"
-            }
-          },
-          "commons_codec_commons_codec_1_11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar",
-                "https://maven.google.com/commons-codec/commons-codec/1.11/commons-codec-1.11.jar"
-              ],
-              "downloaded_file_path": "commons-codec/commons-codec/1.11/commons-codec-1.11.jar"
-            }
-          },
-          "commons_codec_commons_codec_1_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569",
-              "urls": [
-                "https://dl.google.com/android/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar",
-                "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"
-              ],
-              "downloaded_file_path": "commons-codec/commons-codec/1.10/commons-codec-1.10.jar"
-            }
-          },
-          "com_google_android_annotations_4_1_1_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.jar"
-              ],
-              "downloaded_file_path": "com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.jar"
-            }
-          },
-          "xml_apis_xml_apis_1_4_01": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad",
-              "urls": [
-                "https://dl.google.com/android/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar",
-                "https://repo1.maven.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"
-              ],
-              "downloaded_file_path": "xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"
-            }
-          },
-          "com_android_tools_build_jetifier_jetifier_core_1_0_0_beta02": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ef61f84302f8b41dce3858c1fc7e7a90ec74a263a0213b1f65e80c56145a4793",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.jar"
-            }
-          },
-          "software_amazon_awssdk_json_utils_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "51ab7f550adc06afcb49f5270cdf690f1bfaaee243abaa5d978095e2a1e4e1a5",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar"
-            }
-          },
-          "org_codehaus_plexus_plexus_utils_3_3_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar",
-                "https://maven.google.com/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar"
-              ],
-              "downloaded_file_path": "org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar"
-            }
-          },
-          "org_glassfish_jaxb_txw2_2_3_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4a6a9f483388d461b81aa9a28c685b8b74c0597993bf1884b04eddbca95f48fe",
-              "urls": [
-                "https://dl.google.com/android/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar",
-                "https://repo1.maven.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar"
-              ],
-              "downloaded_file_path": "org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar"
-            }
-          },
-          "org_yaml_snakeyaml_1_28": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "35446a1421435d45e4c6ac0de3b5378527d5cc2446c07183e24447730ce1fffa",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar"
-              ],
-              "downloaded_file_path": "org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar"
-            }
-          },
-          "io_netty_netty_transport_native_epoll_jar_linux_aarch_64_4_1_93_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cca126fd095563fa67288300b6ac2ef4a92e623600e9a3273382211de364695d",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-epoll/4.1.93.Final/netty-transport-native-epoll-4.1.93.Final-linux-aarch_64.jar"
-              ],
-              "downloaded_file_path": "io/netty/netty-transport-native-epoll/4.1.93.Final/netty-transport-native-epoll-4.1.93.Final-linux-aarch_64.jar"
-            }
-          },
-          "com_android_tools_build_aapt2_proto_7_0_0_beta04_7396180": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1ca4f1b0f550c6c25f63c1916da84f6e7a92c66b7ad38ab1d5d49a20552a5984",
-              "urls": [
-                "https://dl.google.com/android/maven2/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar",
-                "https://repo1.maven.org/maven2/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar"
-              ],
-              "downloaded_file_path": "com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_3_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "97d5b2758408690c0dc276238707492a0b6a4d71206311b6c442cdc26c5973ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar",
-                "https://maven.google.com/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar"
-              ],
-              "downloaded_file_path": "com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar"
-            }
-          },
-          "net_java_dev_jna_jna_5_6_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf",
-              "urls": [
-                "https://dl.google.com/android/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar",
-                "https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar"
-              ],
-              "downloaded_file_path": "net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar"
-            }
-          },
-          "software_amazon_awssdk_sdk_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "677e9cc90fdd82c1f40f97b99cb115b13ad6c3f58beeeab1c061af6954d64c77",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_jvm_external~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_jvm_external~",
-            "rules_jvm_external",
-            "rules_jvm_external~"
-          ]
-        ]
-      }
-    },
-    "@@rules_jvm_external~//:non-module-deps.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "DqBh3ObkOvjDFKv8VTy6J2qr7hXsJm9/sES7bha7ftA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "io_bazel_rules_kotlin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "946747acdbeae799b085d12b240ec346f775ac65236dfcf18aa0cd7300f6de78",
-              "urls": [
-                "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-2/rules_kotlin_release.tgz"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_jvm_external~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions:pip.bzl%pip": {
-      "os:osx,arch:aarch64": {
-        "bzlTransitiveDigest": "V/mJWEApn8zkI54PHr3DQqQTCCKVab6KCrve7FZ1Nj4=",
-        "recordedFileInputs": {
-          "@@//requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "bazel_pip_dev_deps": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "pip_hub_repository_bzlmod",
-            "attributes": {
-              "repo_name": "bazel_pip_dev_deps",
-              "whl_map": {
-                "bazel_runfiles": [
-                  "3.8.18"
-                ]
-              },
-              "default_version": "3.8.18"
-            }
-          },
-          "bazel_pip_dev_deps_38_bazel_runfiles": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "whl_library",
-            "attributes": {
-              "requirement": "bazel-runfiles==0.24.0",
-              "repo": "bazel_pip_dev_deps_38",
-              "repo_prefix": "bazel_pip_dev_deps_38_",
-              "python_interpreter": "",
-              "python_interpreter_target": "@@rules_python~~python~python_3_8_aarch64-apple-darwin//:bin/python3",
-              "quiet": true,
-              "timeout": 600,
-              "isolated": true,
-              "extra_pip_args": [],
-              "download_only": false,
-              "pip_data_exclude": [],
-              "enable_implicit_namespace_pkgs": false,
-              "environment": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_features~",
-            "bazel_features_globals",
-            "bazel_features~~version_extension~bazel_features_globals"
-          ],
-          [
-            "bazel_features~",
-            "bazel_features_version",
-            "bazel_features~~version_extension~bazel_features_version"
-          ],
-          [
-            "rules_python~",
-            "bazel_features",
-            "bazel_features~"
-          ],
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__build",
-            "rules_python~~internal_deps~pypi__build"
-          ],
-          [
-            "rules_python~",
-            "pypi__click",
-            "rules_python~~internal_deps~pypi__click"
-          ],
-          [
-            "rules_python~",
-            "pypi__colorama",
-            "rules_python~~internal_deps~pypi__colorama"
-          ],
-          [
-            "rules_python~",
-            "pypi__importlib_metadata",
-            "rules_python~~internal_deps~pypi__importlib_metadata"
-          ],
-          [
-            "rules_python~",
-            "pypi__installer",
-            "rules_python~~internal_deps~pypi__installer"
-          ],
-          [
-            "rules_python~",
-            "pypi__more_itertools",
-            "rules_python~~internal_deps~pypi__more_itertools"
-          ],
-          [
-            "rules_python~",
-            "pypi__packaging",
-            "rules_python~~internal_deps~pypi__packaging"
-          ],
-          [
-            "rules_python~",
-            "pypi__pep517",
-            "rules_python~~internal_deps~pypi__pep517"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip",
-            "rules_python~~internal_deps~pypi__pip"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip_tools",
-            "rules_python~~internal_deps~pypi__pip_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__pyproject_hooks",
-            "rules_python~~internal_deps~pypi__pyproject_hooks"
-          ],
-          [
-            "rules_python~",
-            "pypi__setuptools",
-            "rules_python~~internal_deps~pypi__setuptools"
-          ],
-          [
-            "rules_python~",
-            "pypi__tomli",
-            "rules_python~~internal_deps~pypi__tomli"
-          ],
-          [
-            "rules_python~",
-            "pypi__wheel",
-            "rules_python~~internal_deps~pypi__wheel"
-          ],
-          [
-            "rules_python~",
-            "pypi__zipp",
-            "rules_python~~internal_deps~pypi__zipp"
-          ],
-          [
-            "rules_python~",
-            "pythons_hub",
-            "rules_python~~python~pythons_hub"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_11_aarch64-apple-darwin",
-            "rules_python~~python~python_3_11_aarch64-apple-darwin"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_8_aarch64-apple-darwin",
-            "rules_python~~python~python_3_8_aarch64-apple-darwin"
-          ]
-        ]
-      },
-      "os:windows,arch:amd64": {
-        "bzlTransitiveDigest": "8m8gxEmSM3y/RtPAp1jOYs+V8swJ5KTtRw96l48hkic=",
-        "recordedFileInputs": {
-          "@@//requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "bazel_pip_dev_deps": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "pip_hub_repository_bzlmod",
-            "attributes": {
-              "repo_name": "bazel_pip_dev_deps",
-              "whl_map": {
-                "bazel_runfiles": [
-                  "3.8.18"
-                ]
-              },
-              "default_version": "3.8.18"
-            }
-          },
-          "bazel_pip_dev_deps_38_bazel_runfiles": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "whl_library",
-            "attributes": {
-              "requirement": "bazel-runfiles==0.24.0",
-              "repo": "bazel_pip_dev_deps_38",
-              "repo_prefix": "bazel_pip_dev_deps_38_",
-              "python_interpreter": "",
-              "python_interpreter_target": "@@rules_python~~python~python_3_8_x86_64-pc-windows-msvc//:python.exe",
-              "quiet": true,
-              "timeout": 600,
-              "isolated": true,
-              "extra_pip_args": [],
-              "download_only": false,
-              "pip_data_exclude": [],
-              "enable_implicit_namespace_pkgs": false,
-              "environment": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_features~",
-            "bazel_features_globals",
-            "bazel_features~~version_extension~bazel_features_globals"
-          ],
-          [
-            "bazel_features~",
-            "bazel_features_version",
-            "bazel_features~~version_extension~bazel_features_version"
-          ],
-          [
-            "rules_python~",
-            "bazel_features",
-            "bazel_features~"
-          ],
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__build",
-            "rules_python~~internal_deps~pypi__build"
-          ],
-          [
-            "rules_python~",
-            "pypi__click",
-            "rules_python~~internal_deps~pypi__click"
-          ],
-          [
-            "rules_python~",
-            "pypi__colorama",
-            "rules_python~~internal_deps~pypi__colorama"
-          ],
-          [
-            "rules_python~",
-            "pypi__importlib_metadata",
-            "rules_python~~internal_deps~pypi__importlib_metadata"
-          ],
-          [
-            "rules_python~",
-            "pypi__installer",
-            "rules_python~~internal_deps~pypi__installer"
-          ],
-          [
-            "rules_python~",
-            "pypi__more_itertools",
-            "rules_python~~internal_deps~pypi__more_itertools"
-          ],
-          [
-            "rules_python~",
-            "pypi__packaging",
-            "rules_python~~internal_deps~pypi__packaging"
-          ],
-          [
-            "rules_python~",
-            "pypi__pep517",
-            "rules_python~~internal_deps~pypi__pep517"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip",
-            "rules_python~~internal_deps~pypi__pip"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip_tools",
-            "rules_python~~internal_deps~pypi__pip_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__pyproject_hooks",
-            "rules_python~~internal_deps~pypi__pyproject_hooks"
-          ],
-          [
-            "rules_python~",
-            "pypi__setuptools",
-            "rules_python~~internal_deps~pypi__setuptools"
-          ],
-          [
-            "rules_python~",
-            "pypi__tomli",
-            "rules_python~~internal_deps~pypi__tomli"
-          ],
-          [
-            "rules_python~",
-            "pypi__wheel",
-            "rules_python~~internal_deps~pypi__wheel"
-          ],
-          [
-            "rules_python~",
-            "pypi__zipp",
-            "rules_python~~internal_deps~pypi__zipp"
-          ],
-          [
-            "rules_python~",
-            "pythons_hub",
-            "rules_python~~python~pythons_hub"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_11_x86_64-pc-windows-msvc",
-            "rules_python~~python~python_3_11_x86_64-pc-windows-msvc"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_8_x86_64-pc-windows-msvc",
-            "rules_python~~python~python_3_8_x86_64-pc-windows-msvc"
-          ]
-        ]
-      },
-      "os:linux,arch:amd64": {
-        "bzlTransitiveDigest": "sBI+YA5K6wPfH6tuVyLhRwgswRsEs79OpYRdbKNukwQ=",
-        "recordedFileInputs": {
-          "@@//requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "bazel_pip_dev_deps": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "pip_hub_repository_bzlmod",
-            "attributes": {
-              "repo_name": "bazel_pip_dev_deps",
-              "whl_map": {
-                "bazel_runfiles": [
-                  "3.8.18"
-                ]
-              },
-              "default_version": "3.8.18"
-            }
-          },
-          "bazel_pip_dev_deps_38_bazel_runfiles": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "whl_library",
-            "attributes": {
-              "requirement": "bazel-runfiles==0.24.0",
-              "repo": "bazel_pip_dev_deps_38",
-              "repo_prefix": "bazel_pip_dev_deps_38_",
-              "python_interpreter": "",
-              "python_interpreter_target": "@@rules_python~~python~python_3_8_x86_64-unknown-linux-gnu//:bin/python3",
-              "quiet": true,
-              "timeout": 600,
-              "isolated": true,
-              "extra_pip_args": [],
-              "download_only": false,
-              "pip_data_exclude": [],
-              "enable_implicit_namespace_pkgs": false,
-              "environment": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_features~",
-            "bazel_features_globals",
-            "bazel_features~~version_extension~bazel_features_globals"
-          ],
-          [
-            "bazel_features~",
-            "bazel_features_version",
-            "bazel_features~~version_extension~bazel_features_version"
-          ],
-          [
-            "rules_python~",
-            "bazel_features",
-            "bazel_features~"
-          ],
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__build",
-            "rules_python~~internal_deps~pypi__build"
-          ],
-          [
-            "rules_python~",
-            "pypi__click",
-            "rules_python~~internal_deps~pypi__click"
-          ],
-          [
-            "rules_python~",
-            "pypi__colorama",
-            "rules_python~~internal_deps~pypi__colorama"
-          ],
-          [
-            "rules_python~",
-            "pypi__importlib_metadata",
-            "rules_python~~internal_deps~pypi__importlib_metadata"
-          ],
-          [
-            "rules_python~",
-            "pypi__installer",
-            "rules_python~~internal_deps~pypi__installer"
-          ],
-          [
-            "rules_python~",
-            "pypi__more_itertools",
-            "rules_python~~internal_deps~pypi__more_itertools"
-          ],
-          [
-            "rules_python~",
-            "pypi__packaging",
-            "rules_python~~internal_deps~pypi__packaging"
-          ],
-          [
-            "rules_python~",
-            "pypi__pep517",
-            "rules_python~~internal_deps~pypi__pep517"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip",
-            "rules_python~~internal_deps~pypi__pip"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip_tools",
-            "rules_python~~internal_deps~pypi__pip_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__pyproject_hooks",
-            "rules_python~~internal_deps~pypi__pyproject_hooks"
-          ],
-          [
-            "rules_python~",
-            "pypi__setuptools",
-            "rules_python~~internal_deps~pypi__setuptools"
-          ],
-          [
-            "rules_python~",
-            "pypi__tomli",
-            "rules_python~~internal_deps~pypi__tomli"
-          ],
-          [
-            "rules_python~",
-            "pypi__wheel",
-            "rules_python~~internal_deps~pypi__wheel"
-          ],
-          [
-            "rules_python~",
-            "pypi__zipp",
-            "rules_python~~internal_deps~pypi__zipp"
-          ],
-          [
-            "rules_python~",
-            "pythons_hub",
-            "rules_python~~python~pythons_hub"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_11_x86_64-unknown-linux-gnu",
-            "rules_python~~python~python_3_11_x86_64-unknown-linux-gnu"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_8_x86_64-unknown-linux-gnu",
-            "rules_python~~python~python_3_8_x86_64-unknown-linux-gnu"
-          ]
-        ]
-      },
-      "os:osx,arch:x86_64": {
-        "bzlTransitiveDigest": "4qX9XayUU4+ssvkUImaig9sNH2WtD/3dpOpLKPS713E=",
-        "recordedFileInputs": {
-          "@@//requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "bazel_pip_dev_deps": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "pip_hub_repository_bzlmod",
-            "attributes": {
-              "repo_name": "bazel_pip_dev_deps",
-              "whl_map": {
-                "bazel_runfiles": [
-                  "3.8.18"
-                ]
-              },
-              "default_version": "3.8.18"
-            }
-          },
-          "bazel_pip_dev_deps_38_bazel_runfiles": {
-            "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl",
-            "ruleClassName": "whl_library",
-            "attributes": {
-              "requirement": "bazel-runfiles==0.24.0",
-              "repo": "bazel_pip_dev_deps_38",
-              "repo_prefix": "bazel_pip_dev_deps_38_",
-              "python_interpreter": "",
-              "python_interpreter_target": "@@rules_python~~python~python_3_8_x86_64-apple-darwin//:bin/python3",
-              "quiet": true,
-              "timeout": 600,
-              "isolated": true,
-              "extra_pip_args": [],
-              "download_only": false,
-              "pip_data_exclude": [],
-              "enable_implicit_namespace_pkgs": false,
-              "environment": {}
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_features~",
-            "bazel_features_globals",
-            "bazel_features~~version_extension~bazel_features_globals"
-          ],
-          [
-            "bazel_features~",
-            "bazel_features_version",
-            "bazel_features~~version_extension~bazel_features_version"
-          ],
-          [
-            "rules_python~",
-            "bazel_features",
-            "bazel_features~"
-          ],
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__build",
-            "rules_python~~internal_deps~pypi__build"
-          ],
-          [
-            "rules_python~",
-            "pypi__click",
-            "rules_python~~internal_deps~pypi__click"
-          ],
-          [
-            "rules_python~",
-            "pypi__colorama",
-            "rules_python~~internal_deps~pypi__colorama"
-          ],
-          [
-            "rules_python~",
-            "pypi__importlib_metadata",
-            "rules_python~~internal_deps~pypi__importlib_metadata"
-          ],
-          [
-            "rules_python~",
-            "pypi__installer",
-            "rules_python~~internal_deps~pypi__installer"
-          ],
-          [
-            "rules_python~",
-            "pypi__more_itertools",
-            "rules_python~~internal_deps~pypi__more_itertools"
-          ],
-          [
-            "rules_python~",
-            "pypi__packaging",
-            "rules_python~~internal_deps~pypi__packaging"
-          ],
-          [
-            "rules_python~",
-            "pypi__pep517",
-            "rules_python~~internal_deps~pypi__pep517"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip",
-            "rules_python~~internal_deps~pypi__pip"
-          ],
-          [
-            "rules_python~",
-            "pypi__pip_tools",
-            "rules_python~~internal_deps~pypi__pip_tools"
-          ],
-          [
-            "rules_python~",
-            "pypi__pyproject_hooks",
-            "rules_python~~internal_deps~pypi__pyproject_hooks"
-          ],
-          [
-            "rules_python~",
-            "pypi__setuptools",
-            "rules_python~~internal_deps~pypi__setuptools"
-          ],
-          [
-            "rules_python~",
-            "pypi__tomli",
-            "rules_python~~internal_deps~pypi__tomli"
-          ],
-          [
-            "rules_python~",
-            "pypi__wheel",
-            "rules_python~~internal_deps~pypi__wheel"
-          ],
-          [
-            "rules_python~",
-            "pypi__zipp",
-            "rules_python~~internal_deps~pypi__zipp"
-          ],
-          [
-            "rules_python~",
-            "pythons_hub",
-            "rules_python~~python~pythons_hub"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_11_x86_64-apple-darwin",
-            "rules_python~~python~python_3_11_x86_64-apple-darwin"
-          ],
-          [
-            "rules_python~~python~pythons_hub",
-            "python_3_8_x86_64-apple-darwin",
-            "rules_python~~python~python_3_8_x86_64-apple-darwin"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions:python.bzl%python": {
-      "general": {
-        "bzlTransitiveDigest": "CTlgB1kgpACRR86vMKUCvV1re9yIbHoFbQxl5Idc1zI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "python_3_11_s390x-unknown-linux-gnu": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "f9f19823dba3209cedc4647b00f46ed0177242917db20fb7fb539970e384531c",
-              "patches": [],
-              "platform": "s390x-unknown-linux-gnu",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-s390x-unknown-linux-gnu-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-s390x-unknown-linux-gnu-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_8_aarch64-apple-darwin": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "1825b1f7220bc93ff143f2e70b5c6a79c6469e0eeb40824e07a7277f59aabfda",
-              "patches": [],
-              "platform": "aarch64-apple-darwin",
-              "python_version": "3.8.18",
-              "release_filename": "20231002/cpython-3.8.18+20231002-aarch64-apple-darwin-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.8.18+20231002-aarch64-apple-darwin-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_11_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "3e26a672df17708c4dc928475a5974c3fb3a34a9b45c65fb4bd1e50504cc84ec",
-              "patches": [],
-              "platform": "aarch64-unknown-linux-gnu",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_11_aarch64-apple-darwin": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "916c35125b5d8323a21526d7a9154ca626453f63d0878e95b9f613a95006c990",
-              "patches": [],
-              "platform": "aarch64-apple-darwin",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-aarch64-apple-darwin-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "pythons_hub": {
-            "bzlFile": "@@rules_python~//python/extensions/private:pythons_hub.bzl",
-            "ruleClassName": "hub_repo",
-            "attributes": {
-              "default_python_version": "3.8",
-              "toolchain_prefixes": [
-                "_0000_python_3_11_",
-                "_0001_python_3_8_"
-              ],
-              "toolchain_python_versions": [
-                "3.11",
-                "3.8"
-              ],
-              "toolchain_set_python_version_constraints": [
-                "True",
-                "False"
-              ],
-              "toolchain_user_repository_names": [
-                "python_3_11",
-                "python_3_8"
-              ]
-            }
-          },
-          "python_3_8_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "236a300f386ead02ca98dbddbc026ff4ef4de6701a394106e291ff8b75445ee1",
-              "patches": [],
-              "platform": "aarch64-unknown-linux-gnu",
-              "python_version": "3.8.18",
-              "release_filename": "20231002/cpython-3.8.18+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.8.18+20231002-aarch64-unknown-linux-gnu-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_8": {
-            "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl",
-            "ruleClassName": "toolchain_aliases",
-            "attributes": {
-              "python_version": "3.8.18",
-              "user_repository_name": "python_3_8"
-            }
-          },
-          "python_3_11_x86_64-pc-windows-msvc": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "3933545e6d41462dd6a47e44133ea40995bc6efeed8c2e4cbdf1a699303e95ea",
-              "patches": [],
-              "platform": "x86_64-pc-windows-msvc",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-x86_64-pc-windows-msvc-shared-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-pc-windows-msvc-shared-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_8_x86_64-apple-darwin": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "fcf04532e644644213977242cd724fe5e84c0a5ac92ae038e07f1b01b474fca3",
-              "patches": [],
-              "platform": "x86_64-apple-darwin",
-              "python_version": "3.8.18",
-              "release_filename": "20231002/cpython-3.8.18+20231002-x86_64-apple-darwin-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.8.18+20231002-x86_64-apple-darwin-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_8_x86_64-pc-windows-msvc": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "a9d203e78caed94de368d154e841610cef6f6b484738573f4ae9059d37e898a5",
-              "patches": [],
-              "platform": "x86_64-pc-windows-msvc",
-              "python_version": "3.8.18",
-              "release_filename": "20231002/cpython-3.8.18+20231002-x86_64-pc-windows-msvc-shared-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.8.18+20231002-x86_64-pc-windows-msvc-shared-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_11": {
-            "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl",
-            "ruleClassName": "toolchain_aliases",
-            "attributes": {
-              "python_version": "3.11.6",
-              "user_repository_name": "python_3_11"
-            }
-          },
-          "python_3_11_ppc64le-unknown-linux-gnu": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "7937035f690a624dba4d014ffd20c342e843dd46f89b0b0a1e5726b85deb8eaf",
-              "patches": [],
-              "platform": "ppc64le-unknown-linux-gnu",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-ppc64le-unknown-linux-gnu-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-ppc64le-unknown-linux-gnu-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_11_x86_64-apple-darwin": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "178cb1716c2abc25cb56ae915096c1a083e60abeba57af001996e8bc6ce1a371",
-              "patches": [],
-              "platform": "x86_64-apple-darwin",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-x86_64-apple-darwin-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-apple-darwin-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_versions": {
-            "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl",
-            "ruleClassName": "multi_toolchain_aliases",
-            "attributes": {
-              "python_versions": {
-                "3.8": "python_3_8",
-                "3.11": "python_3_11"
-              }
-            }
-          },
-          "python_3_8_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "1e8a3babd1500111359b0f5675d770984bcbcb2cc8890b117394f0ed342fb9ec",
-              "patches": [],
-              "platform": "x86_64-unknown-linux-gnu",
-              "python_version": "3.8.18",
-              "release_filename": "20231002/cpython-3.8.18+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.8.18+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          },
-          "python_3_11_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@rules_python~//python:repositories.bzl",
-            "ruleClassName": "python_repository",
-            "attributes": {
-              "sha256": "ee37a7eae6e80148c7e3abc56e48a397c1664f044920463ad0df0fc706eacea8",
-              "patches": [],
-              "platform": "x86_64-unknown-linux-gnu",
-              "python_version": "3.11.6",
-              "release_filename": "20231002/cpython-3.11.6+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz",
-              "urls": [
-                "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.11.6+20231002-x86_64-unknown-linux-gnu-install_only.tar.gz"
-              ],
-              "distutils_content": "",
-              "strip_prefix": "python",
-              "coverage_tool": "",
-              "ignore_root_user_error": false
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions/private:internal_deps.bzl%internal_deps": {
-      "general": {
-        "bzlTransitiveDigest": "ne6idUaoP4SJ3e18pSCQ6R4ugdw8ElmkOXa9kpkE0M4=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pypi__wheel": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/b8/8b/31273bf66016be6ad22bb7345c37ff350276cfd46e389a0c2ac5da9d9073/wheel-0.41.2-py3-none-any.whl",
-              "sha256": "75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__click": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl",
-              "sha256": "ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__importlib_metadata": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/cc/37/db7ba97e676af155f5fcb1a35466f446eadc9104e25b83366e8088c9c926/importlib_metadata-6.8.0-py3-none-any.whl",
-              "sha256": "3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__pyproject_hooks": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/d5/ea/9ae603de7fbb3df820b23a70f6aff92bf8c7770043254ad8d2dc9d6bcba4/pyproject_hooks-1.0.0-py3-none-any.whl",
-              "sha256": "283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__pep517": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl",
-              "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__packaging": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/ab/c3/57f0601a2d4fe15de7a553c00adbc901425661bf048f2a22dfc500caf121/packaging-23.1-py3-none-any.whl",
-              "sha256": "994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__pip_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/e8/df/47e6267c6b5cdae867adbdd84b437393e6202ce4322de0a5e0b92960e1d6/pip_tools-7.3.0-py3-none-any.whl",
-              "sha256": "8717693288720a8c6ebd07149c93ab0be1fced0b5191df9e9decd3263e20d85e",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__setuptools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/4f/ab/0bcfebdfc3bfa8554b2b2c97a555569c4c1ebc74ea288741ea8326c51906/setuptools-68.1.2-py3-none-any.whl",
-              "sha256": "3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__zipp": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/8c/08/d3006317aefe25ea79d3b76c9650afabaf6d63d1c8443b236e7405447503/zipp-3.16.2-py3-none-any.whl",
-              "sha256": "679e51dd4403591b2d6838a48de3d283f3d188412a9782faadf845f298736ba0",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__colorama": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl",
-              "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__build": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/58/91/17b00d5fac63d3dca605f1b8269ba3c65e98059e1fd99d00283e42a454f0/build-0.10.0-py3-none-any.whl",
-              "sha256": "af266720050a66c893a6096a2f410989eeac74ff9a68ba194b3f6473e8e26171",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "rules_python_internal": {
-            "bzlFile": "@@rules_python~//python/private:internal_config_repo.bzl",
-            "ruleClassName": "internal_config_repo",
-            "attributes": {}
-          },
-          "pypi__pip": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/50/c2/e06851e8cc28dcad7c155f4753da8833ac06a5c704c109313b8d5a62968a/pip-23.2.1-py3-none-any.whl",
-              "sha256": "7ccf472345f20d35bdc9d1841ff5f313260c2c33fe417f48c30ac46cccabf5be",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__installer": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl",
-              "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__more_itertools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/5a/cb/6dce742ea14e47d6f565589e859ad225f2a5de576d7696e0623b784e226b/more_itertools-10.1.0-py3-none-any.whl",
-              "sha256": "64e0735fcfdc6f3464ea133afe8ea4483b1c5fe3a3d69852e6503b43a0b222e6",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__tomli": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl",
-              "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/*.pyc.*\",  # During pyc creation, temp files named *.pyc.NNN are created\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    }
-  }
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/bazel-repository-cache.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/bazel-repository-cache.nix
deleted file mode 100644
index 392737af0efe..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/bazel-repository-cache.nix
+++ /dev/null
@@ -1,178 +0,0 @@
-{ lib
-, rnix-hashes
-, runCommand
-, fetchurl
-  # The path to the right MODULE.bazel.lock
-, lockfile
-  # A predicate used to select only some dependencies based on their name
-, requiredDepNamePredicate ? _: true
-, canonicalIds ? true
-}:
-let
-  modules = builtins.fromJSON (builtins.readFile lockfile);
-  modulesVersion = modules.lockFileVersion;
-
-  # A foldl' for moduleDepGraph repoSpecs.
-  # We take any RepoSpec object under .moduleDepGraph.<moduleName>.repoSpec
-  foldlModuleDepGraph = op: acc: value:
-    if builtins.isAttrs value && value ? moduleDepGraph && builtins.isAttrs value.moduleDepGraph
-    then
-      lib.foldlAttrs
-        (_acc: moduleDepGraphName: module: (
-          if builtins.isAttrs module && module ? repoSpec
-          then op _acc { inherit moduleDepGraphName; } module.repoSpec
-          else _acc
-        ))
-        acc
-        value.moduleDepGraph
-    else acc;
-
-  # a foldl' for moduleExtensions generatedRepoSpecs
-  # We take any RepoSpec object under .moduleExtensions.<moduleExtensionName>.general.generatedRepoSpecs.<generatedRepoName>
-  foldlGeneratedRepoSpecs = op: acc: value:
-    if builtins.isAttrs value && value ? moduleExtensions
-    then
-      lib.foldlAttrs
-        (_acc: moduleExtensionName: moduleExtension: (
-          if builtins.isAttrs moduleExtension
-            && moduleExtension ? general
-            && builtins.isAttrs moduleExtension.general
-            && moduleExtension.general ? generatedRepoSpecs
-            && builtins.isAttrs moduleExtension.general.generatedRepoSpecs
-          then
-            lib.foldlAttrs
-              (__acc: moduleExtensionGeneratedRepoName: repoSpec: (
-                op __acc { inherit moduleExtensionName moduleExtensionGeneratedRepoName; } repoSpec
-              ))
-              _acc
-              moduleExtension.general.generatedRepoSpecs
-          else _acc
-        ))
-        acc
-        value.moduleExtensions
-    else acc;
-
-  # remove the "--" prefix, abusing undocumented negative substring length
-  sanitize = str:
-    if modulesVersion < 3
-    then builtins.substring 2 (-1) str
-    else str;
-
-  unmangleName = mangledName:
-    if mangledName ? moduleDepGraphName
-    then builtins.replaceStrings [ "@" ] [ "~" ] mangledName.moduleDepGraphName
-    else
-    # given moduleExtensionName = "@scope~//path/to:extension.bzl%extension"
-    # and moduleExtensionGeneratedRepoName = "repoName"
-    # return "scope~extension~repoName"
-      let
-        isMainModule = lib.strings.hasPrefix "//" mangledName.moduleExtensionName;
-        moduleExtensionParts = builtins.split "^@*([a-zA-Z0-9_~]*)//.*%(.*)$" mangledName.moduleExtensionName;
-        match = if (builtins.length moduleExtensionParts >= 2) then builtins.elemAt moduleExtensionParts 1 else [ "unknownPrefix" "unknownScope" "unknownExtension" ];
-        scope = if isMainModule then "_main" else builtins.elemAt match 0;
-        extension = builtins.elemAt match 1;
-      in
-      "${scope}~${extension}~${mangledName.moduleExtensionGeneratedRepoName}";
-
-  # We take any "attributes" object that has a "sha256" field. Every value
-  # under "attributes" is assumed to be an object, and all the "attributes"
-  # with a "sha256" field are assumed to have either a "urls" or "url" field.
-  #
-  # We add them to the `acc`umulator:
-  #
-  #    acc // {
-  #      "ffad2b06ef2e09d040...fc8e33706bb01634" = fetchurl {
-  #        name = "source";
-  #        sha256 = "ffad2b06ef2e09d040...fc8e33706bb01634";
-  #        urls = [
-  #          "https://mirror.bazel.build/github.com/golang/library.zip",
-  #          "https://github.com/golang/library.zip"
-  #        ];
-  #      };
-  #    }
-  #
-  # !REMINDER! This works on a best-effort basis, so try to keep it from
-  # failing loudly. Prefer warning traces.
-  extract_source = f: acc: mangledName: value:
-    let
-      attrs = value.attributes;
-      name = unmangleName mangledName;
-      entry = hash: urls: name: {
-        ${hash} = fetchurl {
-          name = "source"; # just like fetch*, to get some deduplication
-          inherit urls;
-          sha256 = hash;
-          passthru.sha256 = hash;
-          passthru.source_name = name;
-          passthru.urls = urls;
-        };
-      };
-      insert = acc: hash: urls:
-        let
-          validUrls = builtins.isList urls
-            && builtins.all (url: builtins.isString url && builtins.substring 0 4 url == "http") urls;
-          validHash = builtins.isString hash;
-          valid = validUrls && validHash;
-        in
-        if valid then acc // entry hash urls name
-        else acc;
-      withToplevelValue = acc: insert acc
-        (attrs.integrity or attrs.sha256)
-        (attrs.urls or [ attrs.url ]);
-      # for http_file patches
-      withRemotePatches = acc: lib.foldlAttrs
-        (acc: url: hash: insert acc hash [ url ])
-        acc
-        (attrs.remote_patches or { });
-      # for _distdir_tar
-      withArchives = acc: lib.foldl'
-        (acc: archive: insert acc attrs.sha256.${archive} attrs.urls.${archive})
-        acc
-        (attrs.archives or [ ]);
-      addSources = acc: withToplevelValue (withRemotePatches (withArchives acc));
-    in
-    if builtins.isAttrs value && value ? attributes
-      && value ? ruleClassName
-      && builtins.isAttrs attrs
-      && (attrs ? sha256 || attrs ? integrity)
-      && (attrs ? urls || attrs ? url)
-      && f name
-    then addSources acc
-    else acc;
-
-  requiredSourcePredicate = n: requiredDepNamePredicate (sanitize n);
-  requiredDeps = foldlModuleDepGraph (extract_source requiredSourcePredicate) { } modules // foldlGeneratedRepoSpecs (extract_source requiredSourcePredicate) { } modules;
-
-  command = ''
-    mkdir -p $out/content_addressable/sha256
-    cd $out
-  '' + lib.concatMapStrings
-    (drv: ''
-      filename=$(basename "${lib.head drv.urls}")
-      echo Bundling $filename ${lib.optionalString (drv?source_name) "from ${drv.source_name}"}
-
-      # 1. --repository_cache format:
-      # 1.a. A file under a content-hash directory
-      hash=$(${rnix-hashes}/bin/rnix-hashes --encoding BASE16 ${drv.sha256} | cut -f 2)
-      mkdir -p content_addressable/sha256/$hash
-      ln -sfn ${drv} content_addressable/sha256/$hash/file
-
-      # 1.b. a canonicalId marker based on the download urls
-      # Bazel uses these to avoid reusing a stale hash when the urls have changed.
-      canonicalId="${lib.concatStringsSep " " drv.urls}"
-      canonicalIdHash=$(echo -n "$canonicalId" | sha256sum | cut -d" " -f1)
-      echo -n "$canonicalId" > content_addressable/sha256/$hash/id-$canonicalIdHash
-
-      # 2. --distdir format:
-      # Just a file with the right basename
-      # Mostly to keep old tests happy, and because symlinks cost nothing.
-      # This is brittle because of expected file name conflicts
-      ln -sn ${drv} $filename || true
-    '')
-    (builtins.attrValues requiredDeps)
-  ;
-
-  repository_cache = runCommand "bazel-repository-cache" { } command;
-
-in
-repository_cache
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel
deleted file mode 100644
index 5356fb5d6710..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-###############################################################################
-# Bazel now uses Bzlmod by default to manage external dependencies.
-# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
-#
-# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
-###############################################################################
-
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock
deleted file mode 100644
index 5612a85bca99..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock
+++ /dev/null
@@ -1,3221 +0,0 @@
-{
-  "lockFileVersion": 6,
-  "moduleFileHash": "88511df1b260515dce141aec0a1990a64de221731dfb656746b7ae1395acf57f",
-  "flags": {
-    "cmdRegistries": [
-      "https://bcr.bazel.build/"
-    ],
-    "cmdModuleOverrides": {},
-    "allowedYankedVersions": [],
-    "envVarAllowedYankedVersions": "",
-    "ignoreDevDependency": false,
-    "directDependenciesMode": "WARNING",
-    "compatibilityMode": "ERROR"
-  },
-  "localOverrideHashes": {
-    "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0"
-  },
-  "moduleDepGraph": {
-    "<root>": {
-      "name": "",
-      "version": "",
-      "key": "<root>",
-      "repoName": "",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "bazel_tools@_": {
-      "name": "bazel_tools",
-      "version": "",
-      "key": "bazel_tools@_",
-      "repoName": "bazel_tools",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_cc_toolchains//:all",
-        "@local_config_sh//:local_sh_toolchain"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 18,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc": "local_config_cc",
-            "local_config_cc_toolchains": "local_config_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/osx:xcode_configure.bzl",
-          "extensionName": "xcode_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 22,
-            "column": 32
-          },
-          "imports": {
-            "local_config_xcode": "local_config_xcode"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 25,
-            "column": 32
-          },
-          "imports": {
-            "local_jdk": "local_jdk",
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/sh:sh_configure.bzl",
-          "extensionName": "sh_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 36,
-            "column": 39
-          },
-          "imports": {
-            "local_config_sh": "local_config_sh"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/test:extensions.bzl",
-          "extensionName": "remote_coverage_tools_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 40,
-            "column": 48
-          },
-          "imports": {
-            "remote_coverage_tools": "remote_coverage_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/android:android_extensions.bzl",
-          "extensionName": "remote_android_tools_extensions",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 43,
-            "column": 42
-          },
-          "imports": {
-            "android_gmaven_r8": "android_gmaven_r8",
-            "android_tools": "android_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@buildozer//:buildozer_binary.bzl",
-          "extensionName": "buildozer_binary",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 47,
-            "column": 33
-          },
-          "imports": {
-            "buildozer_binary": "buildozer_binary"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_java": "rules_java@7.4.0",
-        "rules_license": "rules_license@0.0.7",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_python": "rules_python@0.22.1",
-        "buildozer": "buildozer@6.4.0.2",
-        "platforms": "platforms@0.0.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "zlib": "zlib@1.3",
-        "build_bazel_apple_support": "apple_support@1.5.0",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "local_config_platform@_": {
-      "name": "local_config_platform",
-      "version": "",
-      "key": "local_config_platform@_",
-      "repoName": "local_config_platform",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_"
-      }
-    },
-    "rules_cc@0.0.9": {
-      "name": "rules_cc",
-      "version": "0.0.9",
-      "key": "rules_cc@0.0.9",
-      "repoName": "rules_cc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_cc_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "rules_cc@0.0.9",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel",
-            "line": 9,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc_toolchains": "local_config_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"
-          ],
-          "integrity": "sha256-IDeHW5pEVtzkp50RKorohbvEqtlo5lh9ym5k86CQDN8=",
-          "strip_prefix": "rules_cc-0.0.9",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_cc/0.0.9/patches/module_dot_bazel_version.patch": "sha256-mM+qzOI0SgAdaJBlWOSMwMPKpaA9b7R37Hj/tp5bb4g="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_java@7.4.0": {
-      "name": "rules_java",
-      "version": "7.4.0",
-      "key": "rules_java@7.4.0",
-      "repoName": "rules_java",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "//toolchains:all",
-        "@local_jdk//:runtime_toolchain_definition",
-        "@local_jdk//:bootstrap_runtime_toolchain_definition",
-        "@remotejdk11_linux_toolchain_config_repo//:all",
-        "@remotejdk11_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk11_linux_ppc64le_toolchain_config_repo//:all",
-        "@remotejdk11_linux_s390x_toolchain_config_repo//:all",
-        "@remotejdk11_macos_toolchain_config_repo//:all",
-        "@remotejdk11_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk11_win_toolchain_config_repo//:all",
-        "@remotejdk11_win_arm64_toolchain_config_repo//:all",
-        "@remotejdk17_linux_toolchain_config_repo//:all",
-        "@remotejdk17_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk17_linux_ppc64le_toolchain_config_repo//:all",
-        "@remotejdk17_linux_s390x_toolchain_config_repo//:all",
-        "@remotejdk17_macos_toolchain_config_repo//:all",
-        "@remotejdk17_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk17_win_toolchain_config_repo//:all",
-        "@remotejdk17_win_arm64_toolchain_config_repo//:all",
-        "@remotejdk21_linux_toolchain_config_repo//:all",
-        "@remotejdk21_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk21_macos_toolchain_config_repo//:all",
-        "@remotejdk21_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk21_win_toolchain_config_repo//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "rules_java@7.4.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel",
-            "line": 19,
-            "column": 27
-          },
-          "imports": {
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64",
-            "local_jdk": "local_jdk",
-            "remotejdk11_linux_toolchain_config_repo": "remotejdk11_linux_toolchain_config_repo",
-            "remotejdk11_linux_aarch64_toolchain_config_repo": "remotejdk11_linux_aarch64_toolchain_config_repo",
-            "remotejdk11_linux_ppc64le_toolchain_config_repo": "remotejdk11_linux_ppc64le_toolchain_config_repo",
-            "remotejdk11_linux_s390x_toolchain_config_repo": "remotejdk11_linux_s390x_toolchain_config_repo",
-            "remotejdk11_macos_toolchain_config_repo": "remotejdk11_macos_toolchain_config_repo",
-            "remotejdk11_macos_aarch64_toolchain_config_repo": "remotejdk11_macos_aarch64_toolchain_config_repo",
-            "remotejdk11_win_toolchain_config_repo": "remotejdk11_win_toolchain_config_repo",
-            "remotejdk11_win_arm64_toolchain_config_repo": "remotejdk11_win_arm64_toolchain_config_repo",
-            "remotejdk17_linux_toolchain_config_repo": "remotejdk17_linux_toolchain_config_repo",
-            "remotejdk17_linux_aarch64_toolchain_config_repo": "remotejdk17_linux_aarch64_toolchain_config_repo",
-            "remotejdk17_linux_ppc64le_toolchain_config_repo": "remotejdk17_linux_ppc64le_toolchain_config_repo",
-            "remotejdk17_linux_s390x_toolchain_config_repo": "remotejdk17_linux_s390x_toolchain_config_repo",
-            "remotejdk17_macos_toolchain_config_repo": "remotejdk17_macos_toolchain_config_repo",
-            "remotejdk17_macos_aarch64_toolchain_config_repo": "remotejdk17_macos_aarch64_toolchain_config_repo",
-            "remotejdk17_win_toolchain_config_repo": "remotejdk17_win_toolchain_config_repo",
-            "remotejdk17_win_arm64_toolchain_config_repo": "remotejdk17_win_arm64_toolchain_config_repo",
-            "remotejdk21_linux_toolchain_config_repo": "remotejdk21_linux_toolchain_config_repo",
-            "remotejdk21_linux_aarch64_toolchain_config_repo": "remotejdk21_linux_aarch64_toolchain_config_repo",
-            "remotejdk21_macos_toolchain_config_repo": "remotejdk21_macos_toolchain_config_repo",
-            "remotejdk21_macos_aarch64_toolchain_config_repo": "remotejdk21_macos_aarch64_toolchain_config_repo",
-            "remotejdk21_win_toolchain_config_repo": "remotejdk21_win_toolchain_config_repo"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz"
-          ],
-          "integrity": "sha256-l27wi0nJKXQfIBeQ5Z44B8cq2B9CjIvJU82+/1/tFes=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_license@0.0.7": {
-      "name": "rules_license",
-      "version": "0.0.7",
-      "key": "rules_license@0.0.7",
-      "repoName": "rules_license",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz"
-          ],
-          "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_proto@5.3.0-21.7": {
-      "name": "rules_proto",
-      "version": "5.3.0-21.7",
-      "key": "rules_proto@5.3.0-21.7",
-      "repoName": "rules_proto",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "com_google_protobuf": "protobuf@21.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz"
-          ],
-          "integrity": "sha256-3D+yBqLLNEG0heseQjFlsjEjWh6psDG0Qzz3vB+kYN0=",
-          "strip_prefix": "rules_proto-5.3.0-21.7",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_python@0.22.1": {
-      "name": "rules_python",
-      "version": "0.22.1",
-      "key": "rules_python@0.22.1",
-      "repoName": "rules_python",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@bazel_tools//tools/python:autodetecting_toolchain"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_python//python/extensions/private:internal_deps.bzl",
-          "extensionName": "internal_deps",
-          "usingModule": "rules_python@0.22.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel",
-            "line": 14,
-            "column": 30
-          },
-          "imports": {
-            "pypi__build": "pypi__build",
-            "pypi__click": "pypi__click",
-            "pypi__colorama": "pypi__colorama",
-            "pypi__importlib_metadata": "pypi__importlib_metadata",
-            "pypi__installer": "pypi__installer",
-            "pypi__more_itertools": "pypi__more_itertools",
-            "pypi__packaging": "pypi__packaging",
-            "pypi__pep517": "pypi__pep517",
-            "pypi__pip": "pypi__pip",
-            "pypi__pip_tools": "pypi__pip_tools",
-            "pypi__setuptools": "pypi__setuptools",
-            "pypi__tomli": "pypi__tomli",
-            "pypi__wheel": "pypi__wheel",
-            "pypi__zipp": "pypi__zipp",
-            "pypi__coverage_cp310_aarch64-apple-darwin": "pypi__coverage_cp310_aarch64-apple-darwin",
-            "pypi__coverage_cp310_aarch64-unknown-linux-gnu": "pypi__coverage_cp310_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp310_x86_64-apple-darwin": "pypi__coverage_cp310_x86_64-apple-darwin",
-            "pypi__coverage_cp310_x86_64-unknown-linux-gnu": "pypi__coverage_cp310_x86_64-unknown-linux-gnu",
-            "pypi__coverage_cp311_aarch64-unknown-linux-gnu": "pypi__coverage_cp311_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp311_x86_64-apple-darwin": "pypi__coverage_cp311_x86_64-apple-darwin",
-            "pypi__coverage_cp311_x86_64-unknown-linux-gnu": "pypi__coverage_cp311_x86_64-unknown-linux-gnu",
-            "pypi__coverage_cp38_aarch64-apple-darwin": "pypi__coverage_cp38_aarch64-apple-darwin",
-            "pypi__coverage_cp38_aarch64-unknown-linux-gnu": "pypi__coverage_cp38_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp38_x86_64-apple-darwin": "pypi__coverage_cp38_x86_64-apple-darwin",
-            "pypi__coverage_cp38_x86_64-unknown-linux-gnu": "pypi__coverage_cp38_x86_64-unknown-linux-gnu",
-            "pypi__coverage_cp39_aarch64-apple-darwin": "pypi__coverage_cp39_aarch64-apple-darwin",
-            "pypi__coverage_cp39_aarch64-unknown-linux-gnu": "pypi__coverage_cp39_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp39_x86_64-apple-darwin": "pypi__coverage_cp39_x86_64-apple-darwin",
-            "pypi__coverage_cp39_x86_64-unknown-linux-gnu": "pypi__coverage_cp39_x86_64-unknown-linux-gnu"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {},
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel",
-                "line": 15,
-                "column": 22
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_python//python/extensions:python.bzl",
-          "extensionName": "python",
-          "usingModule": "rules_python@0.22.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel",
-            "line": 50,
-            "column": 23
-          },
-          "imports": {
-            "pythons_hub": "pythons_hub"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_python/releases/download/0.22.1/rules_python-0.22.1.tar.gz"
-          ],
-          "integrity": "sha256-pWQP3dS+sD6MH95e1xYMC6a9R359BIZhwwwGk2om/WM=",
-          "strip_prefix": "rules_python-0.22.1",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_python/0.22.1/patches/module_dot_bazel_version.patch": "sha256-3+VLDH9gYDzNI4eOW7mABC/LKxh1xqF6NhacLbNTucs="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "buildozer@6.4.0.2": {
-      "name": "buildozer",
-      "version": "6.4.0.2",
-      "key": "buildozer@6.4.0.2",
-      "repoName": "buildozer",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@buildozer//:buildozer_binary.bzl",
-          "extensionName": "buildozer_binary",
-          "usingModule": "buildozer@6.4.0.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel",
-            "line": 7,
-            "column": 33
-          },
-          "imports": {
-            "buildozer_binary": "buildozer_binary"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "buildozer",
-              "attributeValues": {
-                "sha256": {
-                  "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e",
-                  "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d",
-                  "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119",
-                  "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa",
-                  "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b"
-                },
-                "version": "6.4.0"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel",
-                "line": 8,
-                "column": 27
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/fmeum/buildozer/releases/download/v6.4.0.2/buildozer-v6.4.0.2.tar.gz"
-          ],
-          "integrity": "sha256-k7tFKQMR2AygxpmZfH0yEPnQmF3efFgD9rBPkj+Yz/8=",
-          "strip_prefix": "buildozer-6.4.0.2",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/buildozer/6.4.0.2/patches/module_dot_bazel_version.patch": "sha256-gKANF2HMilj7bWmuXs4lbBIAAansuWC4IhWGB/CerjU="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "platforms@0.0.7": {
-      "name": "platforms",
-      "version": "0.0.7",
-      "key": "platforms@0.0.7",
-      "repoName": "platforms",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz"
-          ],
-          "integrity": "sha256-OlYcmee9vpFzqmU/1Xn+hJ8djWc5V4CrR3Cx84FDHVE=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "protobuf@21.7": {
-      "name": "protobuf",
-      "version": "21.7",
-      "key": "protobuf@21.7",
-      "repoName": "protobuf",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "protobuf@21.7",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel",
-            "line": 22,
-            "column": 22
-          },
-          "imports": {
-            "maven": "maven"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "maven",
-                "artifacts": [
-                  "com.google.code.findbugs:jsr305:3.0.2",
-                  "com.google.code.gson:gson:2.8.9",
-                  "com.google.errorprone:error_prone_annotations:2.3.2",
-                  "com.google.j2objc:j2objc-annotations:1.3",
-                  "com.google.guava:guava:31.1-jre",
-                  "com.google.guava:guava-testlib:31.1-jre",
-                  "com.google.truth:truth:1.1.2",
-                  "junit:junit:4.13.2",
-                  "org.mockito:mockito-core:4.3.1"
-                ]
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel",
-                "line": 24,
-                "column": 14
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_python": "rules_python@0.22.1",
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_java": "rules_java@7.4.0",
-        "rules_pkg": "rules_pkg@0.7.0",
-        "com_google_abseil": "abseil-cpp@20211102.0",
-        "zlib": "zlib@1.3",
-        "upb": "upb@0.0.0-20220923-a547704",
-        "rules_jvm_external": "rules_jvm_external@4.4.2",
-        "com_google_googletest": "googletest@1.11.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip"
-          ],
-          "integrity": "sha256-VJOiH17T/FAuZv7GuUScBqVRztYwAvpIkDxA36jeeko=",
-          "strip_prefix": "protobuf-21.7",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel.patch": "sha256-q3V2+eq0v2XF0z8z+V+QF4cynD6JvHI1y3kI/+rzl5s=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel_for_examples.patch": "sha256-O7YP6s3lo/1opUiO0jqXYORNHdZ/2q3hjz1QGy8QdIU=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/relative_repo_names.patch": "sha256-RK9RjW8T5UJNG7flIrnFiNE9vKwWB+8uWWtJqXYT0w4=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_missing_files.patch": "sha256-Hyne4DG2u5bXcWHNxNMirA2QFAe/2Cl8oMm1XJdkQIY="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "zlib@1.3": {
-      "name": "zlib",
-      "version": "1.3",
-      "key": "zlib@1.3",
-      "repoName": "zlib",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
-          ],
-          "integrity": "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4=",
-          "strip_prefix": "zlib-1.3",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/zlib/1.3/patches/add_build_file.patch": "sha256-Ei+FYaaOo7A3jTKunMEodTI0Uw5NXQyZEcboMC8JskY=",
-            "https://bcr.bazel.build/modules/zlib/1.3/patches/module_dot_bazel.patch": "sha256-fPWLM+2xaF/kuy+kZc1YTfW6hNjrkG400Ho7gckuyJk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "apple_support@1.5.0": {
-      "name": "apple_support",
-      "version": "1.5.0",
-      "key": "apple_support@1.5.0",
-      "repoName": "build_bazel_apple_support",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_apple_cc_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@build_bazel_apple_support//crosstool:setup.bzl",
-          "extensionName": "apple_cc_configure_extension",
-          "usingModule": "apple_support@1.5.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel",
-            "line": 17,
-            "column": 35
-          },
-          "imports": {
-            "local_config_apple_cc": "local_config_apple_cc",
-            "local_config_apple_cc_toolchains": "local_config_apple_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz"
-          ],
-          "integrity": "sha256-miM41vja0yRPgj8txghKA+TQ+7J8qJLclw5okNW0gYQ=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "bazel_skylib@1.3.0": {
-      "name": "bazel_skylib",
-      "version": "1.3.0",
-      "key": "bazel_skylib@1.3.0",
-      "repoName": "bazel_skylib",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "//toolchains/unittest:cmd_toolchain",
-        "//toolchains/unittest:bash_toolchain"
-      ],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz"
-          ],
-          "integrity": "sha256-dNVE2W9KW7Yw1GXKi7z+Ix41lOWq5X4e2/F6brPKJQY=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_pkg@0.7.0": {
-      "name": "rules_pkg",
-      "version": "0.7.0",
-      "key": "rules_pkg@0.7.0",
-      "repoName": "rules_pkg",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_python": "rules_python@0.22.1",
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz"
-          ],
-          "integrity": "sha256-iimOgydi7aGDBZfWT+fbWBeKqEzVkm121bdE1lWJQcI=",
-          "strip_prefix": "",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_pkg/0.7.0/patches/module_dot_bazel.patch": "sha256-4OaEPZwYF6iC71ZTDg6MJ7LLqX7ZA0/kK4mT+4xKqiE="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "abseil-cpp@20211102.0": {
-      "name": "abseil-cpp",
-      "version": "20211102.0",
-      "key": "abseil-cpp@20211102.0",
-      "repoName": "abseil-cpp",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
-          ],
-          "integrity": "sha256-3PcbnLqNwMqZQMSzFqDHlr6Pq0KwcLtrfKtitI8OZsQ=",
-          "strip_prefix": "abseil-cpp-20211102.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/patches/module_dot_bazel.patch": "sha256-4izqopgGCey4jVZzl/w3M2GVPNohjh2B5TmbThZNvPY="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "upb@0.0.0-20220923-a547704": {
-      "name": "upb",
-      "version": "0.0.0-20220923-a547704",
-      "key": "upb@0.0.0-20220923-a547704",
-      "repoName": "upb",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "com_google_absl": "abseil-cpp@20211102.0",
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz"
-          ],
-          "integrity": "sha256-z39x6v+QskwaKLSWRan/A6mmwecTQpHOcJActj5zZLU=",
-          "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/patches/module_dot_bazel.patch": "sha256-wH4mNS6ZYy+8uC0HoAft/c7SDsq2Kxf+J8dUakXhaB0="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_jvm_external@4.4.2": {
-      "name": "rules_jvm_external",
-      "version": "4.4.2",
-      "key": "rules_jvm_external@4.4.2",
-      "repoName": "rules_jvm_external",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:non-module-deps.bzl",
-          "extensionName": "non_module_deps",
-          "usingModule": "rules_jvm_external@4.4.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel",
-            "line": 9,
-            "column": 32
-          },
-          "imports": {
-            "io_bazel_rules_kotlin": "io_bazel_rules_kotlin"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "rules_jvm_external@4.4.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel",
-            "line": 16,
-            "column": 22
-          },
-          "imports": {
-            "rules_jvm_external_deps": "rules_jvm_external_deps"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "rules_jvm_external_deps",
-                "artifacts": [
-                  "com.google.cloud:google-cloud-core:1.93.10",
-                  "com.google.cloud:google-cloud-storage:1.113.4",
-                  "com.google.code.gson:gson:2.9.0",
-                  "org.apache.maven:maven-artifact:3.8.6",
-                  "software.amazon.awssdk:s3:2.17.183"
-                ],
-                "lock_file": "@rules_jvm_external//:rules_jvm_external_deps_install.json"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel",
-                "line": 18,
-                "column": 14
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "io_bazel_stardoc": "stardoc@0.5.1",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/refs/tags/4.4.2.zip"
-          ],
-          "integrity": "sha256-c1YC9QgT6y6pPKP15DsZWb2AshO4NqB6YqKddXZwt3s=",
-          "strip_prefix": "rules_jvm_external-4.4.2",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "googletest@1.11.0": {
-      "name": "googletest",
-      "version": "1.11.0",
-      "key": "googletest@1.11.0",
-      "repoName": "googletest",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "com_google_absl": "abseil-cpp@20211102.0",
-        "platforms": "platforms@0.0.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz"
-          ],
-          "integrity": "sha256-tIcL8SH/d5W6INILzdhie44Ijy0dqymaAxwQNO3ck9U=",
-          "strip_prefix": "googletest-release-1.11.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/googletest/1.11.0/patches/module_dot_bazel.patch": "sha256-HuahEdI/n8KCI071sN3CEziX+7qP/Ec77IWayYunLP0="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "stardoc@0.5.1": {
-      "name": "stardoc",
-      "version": "0.5.1",
-      "key": "stardoc@0.5.1",
-      "repoName": "stardoc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_java": "rules_java@7.4.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/stardoc/releases/download/0.5.1/stardoc-0.5.1.tar.gz"
-          ],
-          "integrity": "sha256-qoFNrgrEALurLoiB+ZFcb0fElmS/CHxAmhX5BDjSwj4=",
-          "strip_prefix": "",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/stardoc/0.5.1/patches/module_dot_bazel.patch": "sha256-UAULCuTpJE7SG0YrR9XLjMfxMRmbP+za3uW9ONZ5rjI="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    }
-  },
-  "moduleExtensions": {
-    "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "pMLFCYaRPkgXPQ8vtuNkMfiHfPmRBy6QJfnid4sWfv0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_apple_cc": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_apple_cc_toolchains": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "apple_support~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
-      "general": {
-        "bzlTransitiveDigest": "ZggrqnDIPRFCqT9XaCYOxLiJx1XuMtOZNG1jvKYZ5lA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "android_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2",
-              "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar"
-            }
-          },
-          "android_gmaven_r8": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_jar",
-            "attributes": {
-              "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
-              "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "PHpT2yqMGms2U4L3E/aZ+WcQalmZWm+ILdP3yiLsDhA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_cc": {
-            "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl",
-            "ruleClassName": "cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_cc_toolchains": {
-            "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl",
-            "ruleClassName": "cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_tools",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_xcode": {
-            "bzlFile": "@@bazel_tools//tools/osx:xcode_configure.bzl",
-            "ruleClassName": "xcode_autoconf",
-            "attributes": {
-              "xcode_locator": "@bazel_tools//tools/osx:xcode_locator.m",
-              "remote_xcode": ""
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_sh": {
-            "bzlFile": "@@bazel_tools//tools/sh:sh_configure.bzl",
-            "ruleClassName": "sh_config",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": {
-      "general": {
-        "bzlTransitiveDigest": "7n9r2sWPYvn/OzUdHUoiJN/1hgIqWKOFCEQFVwHZGU0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remote_coverage_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",
-              "urls": [
-                "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@buildozer~//:buildozer_binary.bzl%buildozer_binary": {
-      "general": {
-        "bzlTransitiveDigest": "EleDU/FQ1+e/RgkW3aIDmdaxZEthvoWQhsqFTxiSgMI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "buildozer_binary": {
-            "bzlFile": "@@buildozer~//private:buildozer_binary.bzl",
-            "ruleClassName": "_buildozer_binary_repo",
-            "attributes": {
-              "sha256": {
-                "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e",
-                "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d",
-                "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119",
-                "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa",
-                "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b"
-              },
-              "version": "6.4.0"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@rules_java~//java:extensions.bzl%toolchains": {
-      "general": {
-        "bzlTransitiveDigest": "0N5b5J9fUzo0sgvH4F3kIEaeXunz4Wy2/UtSFV/eXUY=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remotejdk21_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_s390x_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remote_java_tools_windows": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_windows-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk11_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk11_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_linux_s390x_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_win_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-              "strip_prefix": "jdk-11.0.13+8",
-              "urls": [
-                "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-              ]
-            }
-          },
-          "remotejdk17_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk11_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_ppc64le_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remote_java_tools_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_linux-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk21_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk21_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64",
-              "urls": [
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz",
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_s390x": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
-              "strip_prefix": "jdk-11.0.15+10",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",
-                "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_win_arm64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_ppc64le_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_win_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_aarch64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_aarch64.zip"
-              ]
-            }
-          },
-          "remote_java_tools_darwin_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_arm64-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk17_linux_ppc64le": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd",
-              "strip_prefix": "jdk-17.0.8.1+1",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz",
-                "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_win_arm64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n"
-            }
-          },
-          "local_jdk": {
-            "bzlFile": "@@rules_java~//toolchains:local_java_repository.bzl",
-            "ruleClassName": "_local_java_repository_rule",
-            "attributes": {
-              "java_home": "",
-              "version": "",
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = {RUNTIME_VERSION},\n)\n"
-            }
-          },
-          "remote_java_tools_darwin_x86_64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_x86_64-v13.4.zip"
-              ]
-            }
-          },
-          "remote_java_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk17_linux_s390x": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37",
-              "strip_prefix": "jdk-17.0.8.1+1",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.8.1_1.tar.gz",
-                "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.8.1_1.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_ppc64le": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
-              "strip_prefix": "jdk-11.0.15+10",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",
-                "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_win//:jdk\",\n)\n"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_java~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_java~",
-            "remote_java_tools",
-            "rules_java~~toolchains~remote_java_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_jvm_external~//:extensions.bzl%maven": {
-      "general": {
-        "bzlTransitiveDigest": "9ol/f6R1HONuabXvQTFIEvT1pWikli+mTIbvGRmDubk=",
-        "recordedFileInputs": {
-          "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "org_slf4j_slf4j_api_1_7_30": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar",
-                "https://maven.google.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_common_protos_2_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar",
-                "https://maven.google.com/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar"
-            }
-          },
-          "com_google_api_gax_1_60_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "02f37d4ff1a7b8d71dff8064cf9568aa4f4b61bcc4485085d16130f32afa5a79",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar",
-                "https://maven.google.com/com/google/api/gax/1.60.0/gax-1.60.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar"
-            }
-          },
-          "com_google_guava_failureaccess_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar",
-                "https://maven.google.com/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-            }
-          },
-          "commons_logging_commons_logging_1_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar",
-                "https://maven.google.com/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_appengine_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f97b495fd97ac3a3d59099eb2b55025f4948230da15a076f189b9cff37c6b4d2",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_storage_1_113_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "796833e9bdab80c40bbc820e65087eb8f28c6bfbca194d2e3e00d98cb5bc55d6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar"
-            }
-          },
-          "io_grpc_grpc_context_1_33_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "99b8aea2b614fe0e61c3676e681259dc43c2de7f64620998e1a8435eb2976496",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar",
-                "https://maven.google.com/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_iam_v1_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "64cee7383a97e846da8d8e160e6c8fe30561e507260552c59e6ccfc81301fdc8",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar",
-                "https://maven.google.com/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar"
-            }
-          },
-          "com_google_api_api_common_1_10_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2a033f24bb620383eda440ad307cb8077cfec1c7eadc684d65216123a1b9613a",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar",
-                "https://maven.google.com/com/google/api/api-common/1.10.1/api-common-1.10.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_oauth2_http_0_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1722d895c42dc42ea1d1f392ddbec1fbb28f7a979022c3a6c29acc39cc777ad1",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar",
-                "https://maven.google.com/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar"
-            }
-          },
-          "com_typesafe_netty_netty_reactive_streams_2_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f949849fc8ee75fde468ba3a35df2e04577fa31a2940b83b2a7dc9d14dac13d6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar",
-                "https://maven.google.com/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar"
-            }
-          },
-          "com_typesafe_netty_netty_reactive_streams_http_2_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b39224751ad936758176e9d994230380ade5e9079e7c8ad778e3995779bcf303",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar",
-                "https://maven.google.com/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar"
-            }
-          },
-          "javax_annotation_javax_annotation_api_1_3_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b",
-              "urls": [
-                "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar",
-                "https://maven.google.com/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"
-            }
-          },
-          "com_google_j2objc_j2objc_annotations_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
-                "https://maven.google.com/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-            }
-          },
-          "software_amazon_awssdk_metrics_spi_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "08a11dc8c4ba464beafbcc7ac05b8c724c1ccb93da99482e82a68540ac704e4a",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar"
-            }
-          },
-          "org_reactivestreams_reactive_streams_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar",
-                "https://maven.google.com/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_jackson2_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e6504a82425fcc2168a4ca4175138ddcc085168daed8cdedb86d8f6fdc296e1e",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar"
-            }
-          },
-          "io_netty_netty_transport_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar"
-            }
-          },
-          "io_netty_netty_codec_http2_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar"
-            }
-          },
-          "io_opencensus_opencensus_api_0_24_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar",
-                "https://maven.google.com/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar"
-            }
-          },
-          "rules_jvm_external_deps": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "pinned_coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{\"artifact\":\"google-cloud-core\",\"group\":\"com.google.cloud\",\"version\":\"1.93.10\"}",
-                "{\"artifact\":\"google-cloud-storage\",\"group\":\"com.google.cloud\",\"version\":\"1.113.4\"}",
-                "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.9.0\"}",
-                "{\"artifact\":\"maven-artifact\",\"group\":\"org.apache.maven\",\"version\":\"3.8.6\"}",
-                "{\"artifact\":\"s3\",\"group\":\"software.amazon.awssdk\",\"version\":\"2.17.183\"}"
-              ],
-              "fetch_sources": true,
-              "fetch_javadoc": false,
-              "generate_compat_repositories": false,
-              "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "additional_netrc_lines": [],
-              "fail_if_repin_required": false,
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "org_threeten_threetenbp_1_5_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dcf9c0f940739f2a825cd8626ff27113459a2f6eb18797c7152f93fff69c264f",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar",
-                "https://maven.google.com/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar"
-            }
-          },
-          "software_amazon_awssdk_http_client_spi_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fe7120f175df9e47ebcc5d946d7f40110faf2ba0a30364f3b935d5b8a5a6c3c6",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_third_party_jackson_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1bc27c9960993c20e1ab058012dd1ae04c875eec9f0f08f2b2ca41e578dee9a4",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar"
-            }
-          },
-          "software_amazon_eventstream_eventstream_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar",
-                "https://maven.google.com/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar"
-            }
-          },
-          "com_google_oauth_client_google_oauth_client_1_31_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4ed4e2948251dbda66ce251bd7f3b32cd8570055e5cdb165a3c7aea8f43da0ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar",
-                "https://maven.google.com/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar"
-            }
-          },
-          "maven": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{\"artifact\":\"jsr305\",\"group\":\"com.google.code.findbugs\",\"version\":\"3.0.2\"}",
-                "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.8.9\"}",
-                "{\"artifact\":\"error_prone_annotations\",\"group\":\"com.google.errorprone\",\"version\":\"2.3.2\"}",
-                "{\"artifact\":\"j2objc-annotations\",\"group\":\"com.google.j2objc\",\"version\":\"1.3\"}",
-                "{\"artifact\":\"guava\",\"group\":\"com.google.guava\",\"version\":\"31.1-jre\"}",
-                "{\"artifact\":\"guava-testlib\",\"group\":\"com.google.guava\",\"version\":\"31.1-jre\"}",
-                "{\"artifact\":\"truth\",\"group\":\"com.google.truth\",\"version\":\"1.1.2\"}",
-                "{\"artifact\":\"junit\",\"group\":\"junit\",\"version\":\"4.13.2\"}",
-                "{\"artifact\":\"mockito-core\",\"group\":\"org.mockito\",\"version\":\"4.3.1\"}"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": true,
-              "fetch_javadoc": false,
-              "use_unsafe_shared_cache": false,
-              "excluded_artifacts": [],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "software_amazon_awssdk_aws_xml_protocol_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "566bba05d49256fa6994efd68fa625ae05a62ea45ee74bb9130d20ea20988363",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_annotations_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8e4d72361ca805a0bd8bbd9017cd7ff77c8d170f2dd469c7d52d5653330bb3fd",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_netty_nio_client_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a6d356f364c56d7b90006b0b7e503b8630010993a5587ce42e74b10b8dca2238",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar"
-            }
-          },
-          "com_google_auto_value_auto_value_annotations_1_7_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar",
-                "https://maven.google.com/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6f8f1cc29b5a234eeee9439a63eb3f03a5994aa540ff555cb0b2c88cefaf6877",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar"
-            }
-          },
-          "io_opencensus_opencensus_contrib_http_util_0_24_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7155273bbb1ed3d477ea33cf19d7bbc0b285ff395f43b29ae576722cf247000f",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar",
-                "https://maven.google.com/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar"
-            }
-          },
-          "com_fasterxml_jackson_core_jackson_core_2_11_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78cd0a6b936232e06dd3e38da8a0345348a09cd1ff9c4d844c6ee72c75cfc402",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar",
-                "https://maven.google.com/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_core_1_93_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "832d74eca66f4601e162a8460d6f59f50d1d23f93c18b02654423b6b0d67c6ea",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_credentials_0_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "42c76031276de5b520909e9faf88c5b3c9a722d69ee9cfdafedb1c52c355dfc5",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar",
-                "https://maven.google.com/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar"
-            }
-          },
-          "com_google_guava_guava_30_0_android": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "3345c82c2cc70a0053e8db9031edc6d71625ef0dea6a2c8f5ebd6cb76d2bf843",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar",
-                "https://maven.google.com/com/google/guava/guava/30.0-android/guava-30.0-android.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar"
-            }
-          },
-          "software_amazon_awssdk_profiles_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78833b32fde3f1c5320373b9ea955c1bbc28f2c904010791c4784e610193ee56",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpcore_4_4_13": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar",
-                "https://maven.google.com/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar"
-            }
-          },
-          "io_netty_netty_common_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar"
-            }
-          },
-          "io_netty_netty_transport_classes_epoll_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e1528a9751c1285aa7beaf3a1eb0597151716426ce38598ac9bc0891209b9e68",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_core_http_1_93_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "81ac67c14c7c4244d2b7db2607ad352416aca8d3bb2adf338964e8fea25b1b3c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar"
-            }
-          },
-          "software_amazon_awssdk_utils_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7bd849bb5aa71bfdf6b849643736ecab3a7b3f204795804eefe5754104231ec6",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar"
-            }
-          },
-          "org_apache_commons_commons_lang3_3_8_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar",
-                "https://maven.google.com/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "bccbdbea689a665a702ff19828662d87fb7fe81529df13f02ef1e4c474ea9f93",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar"
-            }
-          },
-          "com_google_api_gax_httpjson_0_77_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fd4dae47fa016d3b26e8d90b67ddc6c23c4c06e8bcdf085c70310ab7ef324bd6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar",
-                "https://maven.google.com/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar"
-            }
-          },
-          "unpinned_rules_jvm_external_deps": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{\"artifact\":\"google-cloud-core\",\"group\":\"com.google.cloud\",\"version\":\"1.93.10\"}",
-                "{\"artifact\":\"google-cloud-storage\",\"group\":\"com.google.cloud\",\"version\":\"1.113.4\"}",
-                "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.9.0\"}",
-                "{\"artifact\":\"maven-artifact\",\"group\":\"org.apache.maven\",\"version\":\"3.8.6\"}",
-                "{\"artifact\":\"s3\",\"group\":\"software.amazon.awssdk\",\"version\":\"2.17.183\"}"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": true,
-              "fetch_javadoc": false,
-              "use_unsafe_shared_cache": false,
-              "excluded_artifacts": [],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json",
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "software_amazon_awssdk_regions_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d3079395f3ffc07d04ffcce16fca29fb5968197f6e9ea3dbff6be297102b40a5",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_annotations_2_4_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar",
-                "https://maven.google.com/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar"
-            }
-          },
-          "io_netty_netty_handler_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_query_protocol_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4dace03c76f80f3dec920cb3dedb2a95984c4366ef4fda728660cb90bed74848",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar"
-            }
-          },
-          "io_netty_netty_codec_http_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar"
-            }
-          },
-          "io_netty_netty_resolver_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_protocol_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "10e7c4faa1f05e2d73055d0390dbd0bb6450e2e6cb85beda051b1e4693c826ce",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar"
-            }
-          },
-          "org_checkerframework_checker_compat_qual_2_5_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar",
-                "https://maven.google.com/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar"
-            }
-          },
-          "com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "52d26a9d105f8d8a0850807285f307a76cea8f3e0cdb2be4d3b15b1adfa77351",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar",
-                "https://maven.google.com/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar"
-            }
-          },
-          "com_google_api_client_google_api_client_1_30_11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ee6f97865cc7de6c7c80955c3f37372cf3887bd75e4fc06f1058a6b4cd9bf4da",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar",
-                "https://maven.google.com/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar"
-            }
-          },
-          "software_amazon_awssdk_s3_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ab073b91107a9e4ed9f030314077d137fe627e055ad895fabb036980a050e360",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar"
-            }
-          },
-          "org_apache_maven_maven_artifact_3_8_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar",
-                "https://maven.google.com/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpclient_4_5_13": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar",
-                "https://maven.google.com/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar"
-            }
-          },
-          "com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
-                "https://maven.google.com/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "411f4a42519b6b78bdc0fcfdf74c9edcef0ee97afa4a667abe04045a508d6302",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar"
-            }
-          },
-          "software_amazon_awssdk_apache_client_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78ceae502fce6a97bbe5ff8f6a010a52ab7ea3ae66cb1a4122e18185fce45022",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_arns_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "659a185e191d66c71de81209490e66abeaccae208ea7b2831a738670823447aa",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar"
-            }
-          },
-          "com_google_code_gson_gson_2_9_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar",
-                "https://maven.google.com/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
-            }
-          },
-          "io_netty_netty_buffer_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar"
-            }
-          },
-          "com_google_code_findbugs_jsr305_3_0_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
-                "https://maven.google.com/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-            }
-          },
-          "commons_codec_commons_codec_1_11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar",
-                "https://maven.google.com/commons-codec/commons-codec/1.11/commons-codec-1.11.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar"
-            }
-          },
-          "software_amazon_awssdk_auth_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8820c6636e5c14efc29399fb5565ce50212b0c1f4ed720a025a2c402d54e0978",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_json_utils_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "51ab7f550adc06afcb49f5270cdf690f1bfaaee243abaa5d978095e2a1e4e1a5",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar"
-            }
-          },
-          "org_codehaus_plexus_plexus_utils_3_3_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar",
-                "https://maven.google.com/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_util_3_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d9de66b8c9445905dfa7064f6d5213d47ce88a20d34e21d83c4a94a229e14e62",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar",
-                "https://maven.google.com/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar"
-            }
-          },
-          "io_netty_netty_codec_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_3_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "97d5b2758408690c0dc276238707492a0b6a4d71206311b6c442cdc26c5973ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar",
-                "https://maven.google.com/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar"
-            }
-          },
-          "io_netty_netty_tcnative_classes_2_0_46_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar",
-                "https://maven.google.com/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_sdk_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "677e9cc90fdd82c1f40f97b99cb115b13ad6c3f58beeeab1c061af6954d64c77",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_jvm_external~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_jvm_external~",
-            "rules_jvm_external",
-            "rules_jvm_external~"
-          ]
-        ]
-      }
-    },
-    "@@rules_jvm_external~//:non-module-deps.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "Fq6CvJMzD0/LbttG5TUaCtEm/pFvTgO5X9tCUH87Fb0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "io_bazel_rules_kotlin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "946747acdbeae799b085d12b240ec346f775ac65236dfcf18aa0cd7300f6de78",
-              "urls": [
-                "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-2/rules_kotlin_release.tgz"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_jvm_external~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions:python.bzl%python": {
-      "general": {
-        "bzlTransitiveDigest": "2Az37kOCPyZmcfbxYv3bex98d5KhE/dEXOXLzid2XhA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pythons_hub": {
-            "bzlFile": "@@rules_python~//python/extensions/private:interpreter_hub.bzl",
-            "ruleClassName": "hub_repo",
-            "attributes": {
-              "toolchains": []
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "rules_python",
-            "rules_python~"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions/private:internal_deps.bzl%internal_deps": {
-      "general": {
-        "bzlTransitiveDigest": "6qzMi1W/Ln/TUQ7+HG3HnNFz+oFeaWSDOnjCcoByfhI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pypi__coverage_cp39_aarch64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/63/e9/f23e8664ec4032d7802a1cf920853196bcbdce7b56408e3efe1b2da08f3c/coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp38_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/40/3b/cd68cb278c4966df00158811ec1e357b9a7d132790c240fc65da57e10013/coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__pip_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/5e/e8/f6d7d1847c7351048da870417724ace5c4506e816b38db02f4d7c675c189/pip_tools-6.12.1-py3-none-any.whl",
-              "sha256": "f0c0c0ec57b58250afce458e2e6058b1f30a4263db895b7d72fd6311bf1dc6f7",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp310_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/3c/7d/d5211ea782b193ab8064b06dc0cc042cf1a4ca9c93a530071459172c550f/coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp311_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/50/cf/455930004231fa87efe8be06d13512f34e070ddfee8b8bf5a050cdc47ab3/coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp310_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/15/b0/3639d84ee8a900da0cf6450ab46e22517e4688b6cec0ba8ab6f8166103a2/coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp39_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/18/95/27f80dcd8273171b781a19d109aeaed7f13d78ef6d1e2f7134a5826fd1b4/coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp310_aarch64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/89/a2/cbf599e50bb4be416e0408c4cf523c354c51d7da39935461a9687e039481/coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl"
-              ]
-            }
-          },
-          "pypi__pip": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/09/bd/2410905c76ee14c62baf69e3f4aa780226c1bbfc9485731ad018e35b0cb5/pip-22.3.1-py3-none-any.whl",
-              "sha256": "908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp38_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/05/63/a789b462075395d34f8152229dccf92b25ca73eac05b3f6cd75fa5017095/coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp311_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/6a/63/8e82513b7e4a1b8d887b4e85c1c2b6c9b754a581b187c0b084f3330ac479/coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__tomli": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl",
-              "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp39_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/ea/52/c08080405329326a7ff16c0dfdb4feefaa8edd7446413df67386fe1bbfe0/coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__wheel": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/bd/7c/d38a0b30ce22fc26ed7dbc087c6d00851fb3395e9d0dac40bec1f905030c/wheel-0.38.4-py3-none-any.whl",
-              "sha256": "b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp311_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/36/f3/5cbd79cf4cd059c80b59104aca33b8d05af4ad5bf5b1547645ecee716378/coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__click": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/76/0a/b6c5f311e32aeb3b406e03c079ade51e905ea630fc19d1262a46249c1c86/click-8.0.1-py3-none-any.whl",
-              "sha256": "fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp39_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/6b/f2/919f0fdc93d3991ca074894402074d847be8ac1e1d78e7e9e1c371b69a6f/coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__importlib_metadata": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/d7/31/74dcb59a601b95fce3b0334e8fc9db758f78e43075f22aeb3677dfb19f4c/importlib_metadata-1.4.0-py2.py3-none-any.whl",
-              "sha256": "bdd9b7c397c273bcc9a11d6629a38487cd07154fa255a467bf704cd2c258e359",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__pep517": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl",
-              "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp38_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/bd/a0/e263b115808226fdb2658f1887808c06ac3f1b579ef5dda02309e0d54459/coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp38_aarch64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/07/82/79fa21ceca9a9b091eb3c67e27eb648dade27b2c9e1eb23af47232a2a365/coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl"
-              ]
-            }
-          },
-          "pypi__packaging": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl",
-              "sha256": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__setuptools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl",
-              "sha256": "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__zipp": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/f4/50/cc72c5bcd48f6e98219fc4a88a5227e9e28b81637a99c49feba1d51f4d50/zipp-1.0.0-py2.py3-none-any.whl",
-              "sha256": "8dda78f06bd1674bd8720df8a50bb47b6e1233c503a4eed8e7810686bde37656",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__colorama": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl",
-              "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__build": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/03/97/f58c723ff036a8d8b4d3115377c0a37ed05c1f68dd9a0d66dab5e82c5c1c/build-0.9.0-py3-none-any.whl",
-              "sha256": "38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp310_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/c4/8d/5ec7d08f4601d2d792563fe31db5e9322c306848fec1e65ec8885927f739/coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__installer": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl",
-              "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__more_itertools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/bd/3f/c4b3dbd315e248f84c388bd4a72b131a29f123ecacc37ffb2b3834546e42/more_itertools-8.13.0-py3-none-any.whl",
-              "sha256": "c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "rules_python",
-            "rules_python~"
-          ]
-        ]
-      }
-    }
-  }
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
deleted file mode 100644
index 7f98f512c519..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  bazel
-, bazel-examples
-, bazelTest
-, callPackage
-, cctools
-, darwin
-, distDir
-, extraBazelArgs ? ""
-, Foundation ? null
-, lib
-, runLocal
-, runtimeShell
-, stdenv
-, symlinkJoin
-, writeScript
-, writeText
-}:
-
-let
-
-  localDistDir = callPackage ./bazel-repository-cache.nix {
-    lockfile = ./cpp-test-MODULE.bazel.lock;
-
-    # Take all the rules_ deps, bazel_ deps and their transitive dependencies,
-    # but none of the platform-specific binaries, as they are large and useless.
-    requiredDepNamePredicate = name:
-      null == builtins.match ".*(macos|osx|linux|win|android|maven).*" name
-      && null != builtins.match "(platforms|com_google_|protobuf|rules_|bazel_|apple_support).*" name;
-  };
-
-  mergedDistDir = symlinkJoin {
-    name = "mergedDistDir";
-    paths = [ localDistDir distDir ];
-  };
-
-  toolsBazel = writeScript "bazel" ''
-    #! ${runtimeShell}
-
-    export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${cctools}/bin/ld'
-    export LIBTOOL='${cctools}/bin/libtool'
-    export CC='${stdenv.cc}/bin/clang'
-
-    # XXX: hack for macosX, this flags disable bazel usage of xcode
-    # See: https://github.com/bazelbuild/bazel/issues/4231
-    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
-
-    exec "$BAZEL_REAL" "$@"
-  '';
-
-  workspaceDir = runLocal "our_workspace" {} (''
-    cp -r ${bazel-examples}/cpp-tutorial/stage3 $out
-    find $out -type d -exec chmod 755 {} \;
-    cp ${./cpp-test-MODULE.bazel} $out/MODULE.bazel
-    cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock
-    echo > $out/WORSPACE
-  ''
-  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir $out/tools
-    cp ${toolsBazel} $out/tools/bazel
-  ''));
-
-  testBazel = bazelTest {
-    name = "bazel-test-cpp";
-    inherit workspaceDir;
-    bazelPkg = bazel;
-    bazelScript = ''
-      ${bazel}/bin/bazel build //... \
-        --enable_bzlmod \
-        --verbose_failures \
-        --repository_cache=${mergedDistDir} \
-        --curses=no \
-    '' + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-        --cxxopt=-x --cxxopt=c++ \
-        --host_cxxopt=-x --host_cxxopt=c++ \
-    '' + lib.optionalString (stdenv.hostPlatform.isDarwin && Foundation != null) ''
-        --linkopt=-Wl,-F${Foundation}/Library/Frameworks \
-        --linkopt=-L${darwin.libobjc}/lib \
-    '' + ''
-
-    '';
-  };
-
-in testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
index ba2a84127703..a37b28c88c17 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
@@ -718,16 +718,8 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   passthru = {
-    # Additional tests that check bazel’s functionality. Execute
-    #
-    #     nix-build . -A bazel_7.tests
-    #
-    # in the nixpkgs checkout root to exercise them locally.
-    # tests = callPackage ./tests.nix {
-    #   inherit Foundation bazel_self lockfile repoCache;
-    # };
-    # TODO tests have not been updated yet and will likely need a rewrite
-    # tests = callPackage ./tests.nix { inherit Foundation bazelDeps bazel_self; };
+    # TODO add some tests to cover basic functionality, and also tests for enableNixHacks=true (buildBazelPackage tests)
+    # tests = ...
 
     # For ease of debugging
     inherit bazelDeps bazelFhs bazelBootstrap;
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
deleted file mode 100644
index 752ddc444855..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ bazel
-, bazelTest
-, bazel-examples
-, stdenv
-, symlinkJoin
-, callPackage
-, cctools
-, extraBazelArgs ? ""
-, lib
-, openjdk8
-, jdk11_headless
-, runLocal
-, runtimeShell
-, writeScript
-, writeText
-, repoCache ? "unused"
-, distDir
-}:
-
-let
-
-  localDistDir = callPackage ./bazel-repository-cache.nix {
-    lockfile = ./cpp-test-MODULE.bazel.lock;
-
-    # Take all the rules_ deps, bazel_ deps and their transitive dependencies,
-    # but none of the platform-specific binaries, as they are large and useless.
-    requiredDepNamePredicate = name:
-      null == builtins.match ".*(macos|osx|linux|win|apple|android|maven).*" name
-      && null != builtins.match "(platforms|com_google_|protobuf|rules_|bazel_).*" name ;
-  };
-
-  mergedDistDir = symlinkJoin {
-    name = "mergedDistDir";
-    paths = [ localDistDir distDir ];
-  };
-
-  toolsBazel = writeScript "bazel" ''
-    #! ${runtimeShell}
-
-    export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${cctools}/bin/ld'
-    export LIBTOOL='${cctools}/bin/libtool'
-    export CC='${stdenv.cc}/bin/clang'
-
-    # XXX: hack for macosX, this flags disable bazel usage of xcode
-    # See: https://github.com/bazelbuild/bazel/issues/4231
-    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
-
-    exec "$BAZEL_REAL" "$@"
-  '';
-
-  workspaceDir = runLocal "our_workspace" {} (''
-    cp -r ${bazel-examples}/java-tutorial $out
-    find $out -type d -exec chmod 755 {} \;
-    cp ${./cpp-test-MODULE.bazel} $out/MODULE.bazel
-    cp ${./cpp-test-MODULE.bazel.lock} $out/MODULE.bazel.lock
-  ''
-  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir $out/tools
-    cp ${toolsBazel} $out/tools/bazel
-  ''));
-
-  testBazel = bazelTest {
-    name = "bazel-test-java";
-    inherit workspaceDir;
-    bazelPkg = bazel;
-    buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];
-    bazelScript = ''
-      ${bazel}/bin/bazel \
-        run \
-        --announce_rc \
-        ${lib.optionalString (lib.strings.versionOlder "5.0.0" bazel.version)
-          "--toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type'"
-        } \
-        --distdir=${mergedDistDir} \
-        --repository_cache=${mergedDistDir} \
-        --verbose_failures \
-        --curses=no \
-        --strict_java_deps=off \
-        //:ProjectRunner \
-    '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
-        --host_javabase='@local_jdk//:jdk' \
-        --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
-        --javabase='@local_jdk//:jdk' \
-    '' + extraBazelArgs;
-  };
-
-in testBazel
-
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock
deleted file mode 100644
index 8a59108bd55d..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock
+++ /dev/null
@@ -1,3224 +0,0 @@
-{
-  "lockFileVersion": 6,
-  "moduleFileHash": "80605390be5478a274618e3f8fd7c7a7e1ce3036e086e1e1593ceba1b132b7f2",
-  "flags": {
-    "cmdRegistries": [
-      "https://bcr.bazel.build/"
-    ],
-    "cmdModuleOverrides": {},
-    "allowedYankedVersions": [],
-    "envVarAllowedYankedVersions": "",
-    "ignoreDevDependency": false,
-    "directDependenciesMode": "WARNING",
-    "compatibilityMode": "ERROR"
-  },
-  "localOverrideHashes": {
-    "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0"
-  },
-  "moduleDepGraph": {
-    "<root>": {
-      "name": "",
-      "version": "",
-      "key": "<root>",
-      "repoName": "",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "protobuf": "protobuf@21.7",
-        "zlib": "zlib@1.3",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "rules_proto@5.3.0-21.7": {
-      "name": "rules_proto",
-      "version": "5.3.0-21.7",
-      "key": "rules_proto@5.3.0-21.7",
-      "repoName": "rules_proto",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "com_google_protobuf": "protobuf@21.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz"
-          ],
-          "integrity": "sha256-3D+yBqLLNEG0heseQjFlsjEjWh6psDG0Qzz3vB+kYN0=",
-          "strip_prefix": "rules_proto-5.3.0-21.7",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "protobuf@21.7": {
-      "name": "protobuf",
-      "version": "21.7",
-      "key": "protobuf@21.7",
-      "repoName": "protobuf",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "protobuf@21.7",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel",
-            "line": 22,
-            "column": 22
-          },
-          "imports": {
-            "maven": "maven"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "maven",
-                "artifacts": [
-                  "com.google.code.findbugs:jsr305:3.0.2",
-                  "com.google.code.gson:gson:2.8.9",
-                  "com.google.errorprone:error_prone_annotations:2.3.2",
-                  "com.google.j2objc:j2objc-annotations:1.3",
-                  "com.google.guava:guava:31.1-jre",
-                  "com.google.guava:guava-testlib:31.1-jre",
-                  "com.google.truth:truth:1.1.2",
-                  "junit:junit:4.13.2",
-                  "org.mockito:mockito-core:4.3.1"
-                ]
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel",
-                "line": 24,
-                "column": 14
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_python": "rules_python@0.22.1",
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_java": "rules_java@7.4.0",
-        "rules_pkg": "rules_pkg@0.7.0",
-        "com_google_abseil": "abseil-cpp@20211102.0",
-        "zlib": "zlib@1.3",
-        "upb": "upb@0.0.0-20220923-a547704",
-        "rules_jvm_external": "rules_jvm_external@4.4.2",
-        "com_google_googletest": "googletest@1.11.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip"
-          ],
-          "integrity": "sha256-VJOiH17T/FAuZv7GuUScBqVRztYwAvpIkDxA36jeeko=",
-          "strip_prefix": "protobuf-21.7",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel.patch": "sha256-q3V2+eq0v2XF0z8z+V+QF4cynD6JvHI1y3kI/+rzl5s=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel_for_examples.patch": "sha256-O7YP6s3lo/1opUiO0jqXYORNHdZ/2q3hjz1QGy8QdIU=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/relative_repo_names.patch": "sha256-RK9RjW8T5UJNG7flIrnFiNE9vKwWB+8uWWtJqXYT0w4=",
-            "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_missing_files.patch": "sha256-Hyne4DG2u5bXcWHNxNMirA2QFAe/2Cl8oMm1XJdkQIY="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "zlib@1.3": {
-      "name": "zlib",
-      "version": "1.3",
-      "key": "zlib@1.3",
-      "repoName": "zlib",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
-          ],
-          "integrity": "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4=",
-          "strip_prefix": "zlib-1.3",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/zlib/1.3/patches/add_build_file.patch": "sha256-Ei+FYaaOo7A3jTKunMEodTI0Uw5NXQyZEcboMC8JskY=",
-            "https://bcr.bazel.build/modules/zlib/1.3/patches/module_dot_bazel.patch": "sha256-fPWLM+2xaF/kuy+kZc1YTfW6hNjrkG400Ho7gckuyJk="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "bazel_tools@_": {
-      "name": "bazel_tools",
-      "version": "",
-      "key": "bazel_tools@_",
-      "repoName": "bazel_tools",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_cc_toolchains//:all",
-        "@local_config_sh//:local_sh_toolchain"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 18,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc": "local_config_cc",
-            "local_config_cc_toolchains": "local_config_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/osx:xcode_configure.bzl",
-          "extensionName": "xcode_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 22,
-            "column": 32
-          },
-          "imports": {
-            "local_config_xcode": "local_config_xcode"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 25,
-            "column": 32
-          },
-          "imports": {
-            "local_jdk": "local_jdk",
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/sh:sh_configure.bzl",
-          "extensionName": "sh_configure_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 36,
-            "column": 39
-          },
-          "imports": {
-            "local_config_sh": "local_config_sh"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/test:extensions.bzl",
-          "extensionName": "remote_coverage_tools_extension",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 40,
-            "column": 48
-          },
-          "imports": {
-            "remote_coverage_tools": "remote_coverage_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@bazel_tools//tools/android:android_extensions.bzl",
-          "extensionName": "remote_android_tools_extensions",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 43,
-            "column": 42
-          },
-          "imports": {
-            "android_gmaven_r8": "android_gmaven_r8",
-            "android_tools": "android_tools"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@buildozer//:buildozer_binary.bzl",
-          "extensionName": "buildozer_binary",
-          "usingModule": "bazel_tools@_",
-          "location": {
-            "file": "@@bazel_tools//:MODULE.bazel",
-            "line": 47,
-            "column": 33
-          },
-          "imports": {
-            "buildozer_binary": "buildozer_binary"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "rules_java": "rules_java@7.4.0",
-        "rules_license": "rules_license@0.0.7",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_python": "rules_python@0.22.1",
-        "buildozer": "buildozer@6.4.0.2",
-        "platforms": "platforms@0.0.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "zlib": "zlib@1.3",
-        "build_bazel_apple_support": "apple_support@1.5.0",
-        "local_config_platform": "local_config_platform@_"
-      }
-    },
-    "local_config_platform@_": {
-      "name": "local_config_platform",
-      "version": "",
-      "key": "local_config_platform@_",
-      "repoName": "local_config_platform",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_"
-      }
-    },
-    "bazel_skylib@1.3.0": {
-      "name": "bazel_skylib",
-      "version": "1.3.0",
-      "key": "bazel_skylib@1.3.0",
-      "repoName": "bazel_skylib",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "//toolchains/unittest:cmd_toolchain",
-        "//toolchains/unittest:bash_toolchain"
-      ],
-      "extensionUsages": [],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz"
-          ],
-          "integrity": "sha256-dNVE2W9KW7Yw1GXKi7z+Ix41lOWq5X4e2/F6brPKJQY=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_cc@0.0.9": {
-      "name": "rules_cc",
-      "version": "0.0.9",
-      "key": "rules_cc@0.0.9",
-      "repoName": "rules_cc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_cc_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@bazel_tools//tools/cpp:cc_configure.bzl",
-          "extensionName": "cc_configure_extension",
-          "usingModule": "rules_cc@0.0.9",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel",
-            "line": 9,
-            "column": 29
-          },
-          "imports": {
-            "local_config_cc_toolchains": "local_config_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"
-          ],
-          "integrity": "sha256-IDeHW5pEVtzkp50RKorohbvEqtlo5lh9ym5k86CQDN8=",
-          "strip_prefix": "rules_cc-0.0.9",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_cc/0.0.9/patches/module_dot_bazel_version.patch": "sha256-mM+qzOI0SgAdaJBlWOSMwMPKpaA9b7R37Hj/tp5bb4g="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_python@0.22.1": {
-      "name": "rules_python",
-      "version": "0.22.1",
-      "key": "rules_python@0.22.1",
-      "repoName": "rules_python",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@bazel_tools//tools/python:autodetecting_toolchain"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_python//python/extensions/private:internal_deps.bzl",
-          "extensionName": "internal_deps",
-          "usingModule": "rules_python@0.22.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel",
-            "line": 14,
-            "column": 30
-          },
-          "imports": {
-            "pypi__build": "pypi__build",
-            "pypi__click": "pypi__click",
-            "pypi__colorama": "pypi__colorama",
-            "pypi__importlib_metadata": "pypi__importlib_metadata",
-            "pypi__installer": "pypi__installer",
-            "pypi__more_itertools": "pypi__more_itertools",
-            "pypi__packaging": "pypi__packaging",
-            "pypi__pep517": "pypi__pep517",
-            "pypi__pip": "pypi__pip",
-            "pypi__pip_tools": "pypi__pip_tools",
-            "pypi__setuptools": "pypi__setuptools",
-            "pypi__tomli": "pypi__tomli",
-            "pypi__wheel": "pypi__wheel",
-            "pypi__zipp": "pypi__zipp",
-            "pypi__coverage_cp310_aarch64-apple-darwin": "pypi__coverage_cp310_aarch64-apple-darwin",
-            "pypi__coverage_cp310_aarch64-unknown-linux-gnu": "pypi__coverage_cp310_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp310_x86_64-apple-darwin": "pypi__coverage_cp310_x86_64-apple-darwin",
-            "pypi__coverage_cp310_x86_64-unknown-linux-gnu": "pypi__coverage_cp310_x86_64-unknown-linux-gnu",
-            "pypi__coverage_cp311_aarch64-unknown-linux-gnu": "pypi__coverage_cp311_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp311_x86_64-apple-darwin": "pypi__coverage_cp311_x86_64-apple-darwin",
-            "pypi__coverage_cp311_x86_64-unknown-linux-gnu": "pypi__coverage_cp311_x86_64-unknown-linux-gnu",
-            "pypi__coverage_cp38_aarch64-apple-darwin": "pypi__coverage_cp38_aarch64-apple-darwin",
-            "pypi__coverage_cp38_aarch64-unknown-linux-gnu": "pypi__coverage_cp38_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp38_x86_64-apple-darwin": "pypi__coverage_cp38_x86_64-apple-darwin",
-            "pypi__coverage_cp38_x86_64-unknown-linux-gnu": "pypi__coverage_cp38_x86_64-unknown-linux-gnu",
-            "pypi__coverage_cp39_aarch64-apple-darwin": "pypi__coverage_cp39_aarch64-apple-darwin",
-            "pypi__coverage_cp39_aarch64-unknown-linux-gnu": "pypi__coverage_cp39_aarch64-unknown-linux-gnu",
-            "pypi__coverage_cp39_x86_64-apple-darwin": "pypi__coverage_cp39_x86_64-apple-darwin",
-            "pypi__coverage_cp39_x86_64-unknown-linux-gnu": "pypi__coverage_cp39_x86_64-unknown-linux-gnu"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {},
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel",
-                "line": 15,
-                "column": 22
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_python//python/extensions:python.bzl",
-          "extensionName": "python",
-          "usingModule": "rules_python@0.22.1",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel",
-            "line": 50,
-            "column": 23
-          },
-          "imports": {
-            "pythons_hub": "pythons_hub"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_python/releases/download/0.22.1/rules_python-0.22.1.tar.gz"
-          ],
-          "integrity": "sha256-pWQP3dS+sD6MH95e1xYMC6a9R359BIZhwwwGk2om/WM=",
-          "strip_prefix": "rules_python-0.22.1",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_python/0.22.1/patches/module_dot_bazel_version.patch": "sha256-3+VLDH9gYDzNI4eOW7mABC/LKxh1xqF6NhacLbNTucs="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "rules_java@7.4.0": {
-      "name": "rules_java",
-      "version": "7.4.0",
-      "key": "rules_java@7.4.0",
-      "repoName": "rules_java",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "//toolchains:all",
-        "@local_jdk//:runtime_toolchain_definition",
-        "@local_jdk//:bootstrap_runtime_toolchain_definition",
-        "@remotejdk11_linux_toolchain_config_repo//:all",
-        "@remotejdk11_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk11_linux_ppc64le_toolchain_config_repo//:all",
-        "@remotejdk11_linux_s390x_toolchain_config_repo//:all",
-        "@remotejdk11_macos_toolchain_config_repo//:all",
-        "@remotejdk11_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk11_win_toolchain_config_repo//:all",
-        "@remotejdk11_win_arm64_toolchain_config_repo//:all",
-        "@remotejdk17_linux_toolchain_config_repo//:all",
-        "@remotejdk17_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk17_linux_ppc64le_toolchain_config_repo//:all",
-        "@remotejdk17_linux_s390x_toolchain_config_repo//:all",
-        "@remotejdk17_macos_toolchain_config_repo//:all",
-        "@remotejdk17_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk17_win_toolchain_config_repo//:all",
-        "@remotejdk17_win_arm64_toolchain_config_repo//:all",
-        "@remotejdk21_linux_toolchain_config_repo//:all",
-        "@remotejdk21_linux_aarch64_toolchain_config_repo//:all",
-        "@remotejdk21_macos_toolchain_config_repo//:all",
-        "@remotejdk21_macos_aarch64_toolchain_config_repo//:all",
-        "@remotejdk21_win_toolchain_config_repo//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_java//java:extensions.bzl",
-          "extensionName": "toolchains",
-          "usingModule": "rules_java@7.4.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel",
-            "line": 19,
-            "column": 27
-          },
-          "imports": {
-            "remote_java_tools": "remote_java_tools",
-            "remote_java_tools_linux": "remote_java_tools_linux",
-            "remote_java_tools_windows": "remote_java_tools_windows",
-            "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64",
-            "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64",
-            "local_jdk": "local_jdk",
-            "remotejdk11_linux_toolchain_config_repo": "remotejdk11_linux_toolchain_config_repo",
-            "remotejdk11_linux_aarch64_toolchain_config_repo": "remotejdk11_linux_aarch64_toolchain_config_repo",
-            "remotejdk11_linux_ppc64le_toolchain_config_repo": "remotejdk11_linux_ppc64le_toolchain_config_repo",
-            "remotejdk11_linux_s390x_toolchain_config_repo": "remotejdk11_linux_s390x_toolchain_config_repo",
-            "remotejdk11_macos_toolchain_config_repo": "remotejdk11_macos_toolchain_config_repo",
-            "remotejdk11_macos_aarch64_toolchain_config_repo": "remotejdk11_macos_aarch64_toolchain_config_repo",
-            "remotejdk11_win_toolchain_config_repo": "remotejdk11_win_toolchain_config_repo",
-            "remotejdk11_win_arm64_toolchain_config_repo": "remotejdk11_win_arm64_toolchain_config_repo",
-            "remotejdk17_linux_toolchain_config_repo": "remotejdk17_linux_toolchain_config_repo",
-            "remotejdk17_linux_aarch64_toolchain_config_repo": "remotejdk17_linux_aarch64_toolchain_config_repo",
-            "remotejdk17_linux_ppc64le_toolchain_config_repo": "remotejdk17_linux_ppc64le_toolchain_config_repo",
-            "remotejdk17_linux_s390x_toolchain_config_repo": "remotejdk17_linux_s390x_toolchain_config_repo",
-            "remotejdk17_macos_toolchain_config_repo": "remotejdk17_macos_toolchain_config_repo",
-            "remotejdk17_macos_aarch64_toolchain_config_repo": "remotejdk17_macos_aarch64_toolchain_config_repo",
-            "remotejdk17_win_toolchain_config_repo": "remotejdk17_win_toolchain_config_repo",
-            "remotejdk17_win_arm64_toolchain_config_repo": "remotejdk17_win_arm64_toolchain_config_repo",
-            "remotejdk21_linux_toolchain_config_repo": "remotejdk21_linux_toolchain_config_repo",
-            "remotejdk21_linux_aarch64_toolchain_config_repo": "remotejdk21_linux_aarch64_toolchain_config_repo",
-            "remotejdk21_macos_toolchain_config_repo": "remotejdk21_macos_toolchain_config_repo",
-            "remotejdk21_macos_aarch64_toolchain_config_repo": "remotejdk21_macos_aarch64_toolchain_config_repo",
-            "remotejdk21_win_toolchain_config_repo": "remotejdk21_win_toolchain_config_repo"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "platforms": "platforms@0.0.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz"
-          ],
-          "integrity": "sha256-l27wi0nJKXQfIBeQ5Z44B8cq2B9CjIvJU82+/1/tFes=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_pkg@0.7.0": {
-      "name": "rules_pkg",
-      "version": "0.7.0",
-      "key": "rules_pkg@0.7.0",
-      "repoName": "rules_pkg",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_python": "rules_python@0.22.1",
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz"
-          ],
-          "integrity": "sha256-iimOgydi7aGDBZfWT+fbWBeKqEzVkm121bdE1lWJQcI=",
-          "strip_prefix": "",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/rules_pkg/0.7.0/patches/module_dot_bazel.patch": "sha256-4OaEPZwYF6iC71ZTDg6MJ7LLqX7ZA0/kK4mT+4xKqiE="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "abseil-cpp@20211102.0": {
-      "name": "abseil-cpp",
-      "version": "20211102.0",
-      "key": "abseil-cpp@20211102.0",
-      "repoName": "abseil-cpp",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_cc": "rules_cc@0.0.9",
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
-          ],
-          "integrity": "sha256-3PcbnLqNwMqZQMSzFqDHlr6Pq0KwcLtrfKtitI8OZsQ=",
-          "strip_prefix": "abseil-cpp-20211102.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/patches/module_dot_bazel.patch": "sha256-4izqopgGCey4jVZzl/w3M2GVPNohjh2B5TmbThZNvPY="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "upb@0.0.0-20220923-a547704": {
-      "name": "upb",
-      "version": "0.0.0-20220923-a547704",
-      "key": "upb@0.0.0-20220923-a547704",
-      "repoName": "upb",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_proto": "rules_proto@5.3.0-21.7",
-        "com_google_protobuf": "protobuf@21.7",
-        "com_google_absl": "abseil-cpp@20211102.0",
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz"
-          ],
-          "integrity": "sha256-z39x6v+QskwaKLSWRan/A6mmwecTQpHOcJActj5zZLU=",
-          "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/patches/module_dot_bazel.patch": "sha256-wH4mNS6ZYy+8uC0HoAft/c7SDsq2Kxf+J8dUakXhaB0="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_jvm_external@4.4.2": {
-      "name": "rules_jvm_external",
-      "version": "4.4.2",
-      "key": "rules_jvm_external@4.4.2",
-      "repoName": "rules_jvm_external",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@rules_jvm_external//:non-module-deps.bzl",
-          "extensionName": "non_module_deps",
-          "usingModule": "rules_jvm_external@4.4.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel",
-            "line": 9,
-            "column": 32
-          },
-          "imports": {
-            "io_bazel_rules_kotlin": "io_bazel_rules_kotlin"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        },
-        {
-          "extensionBzlFile": "@rules_jvm_external//:extensions.bzl",
-          "extensionName": "maven",
-          "usingModule": "rules_jvm_external@4.4.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel",
-            "line": 16,
-            "column": 22
-          },
-          "imports": {
-            "rules_jvm_external_deps": "rules_jvm_external_deps"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "install",
-              "attributeValues": {
-                "name": "rules_jvm_external_deps",
-                "artifacts": [
-                  "com.google.cloud:google-cloud-core:1.93.10",
-                  "com.google.cloud:google-cloud-storage:1.113.4",
-                  "com.google.code.gson:gson:2.9.0",
-                  "org.apache.maven:maven-artifact:3.8.6",
-                  "software.amazon.awssdk:s3:2.17.183"
-                ],
-                "lock_file": "@rules_jvm_external//:rules_jvm_external_deps_install.json"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel",
-                "line": 18,
-                "column": 14
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "io_bazel_stardoc": "stardoc@0.5.1",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/refs/tags/4.4.2.zip"
-          ],
-          "integrity": "sha256-c1YC9QgT6y6pPKP15DsZWb2AshO4NqB6YqKddXZwt3s=",
-          "strip_prefix": "rules_jvm_external-4.4.2",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "googletest@1.11.0": {
-      "name": "googletest",
-      "version": "1.11.0",
-      "key": "googletest@1.11.0",
-      "repoName": "googletest",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "com_google_absl": "abseil-cpp@20211102.0",
-        "platforms": "platforms@0.0.7",
-        "rules_cc": "rules_cc@0.0.9",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz"
-          ],
-          "integrity": "sha256-tIcL8SH/d5W6INILzdhie44Ijy0dqymaAxwQNO3ck9U=",
-          "strip_prefix": "googletest-release-1.11.0",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/googletest/1.11.0/patches/module_dot_bazel.patch": "sha256-HuahEdI/n8KCI071sN3CEziX+7qP/Ec77IWayYunLP0="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "platforms@0.0.7": {
-      "name": "platforms",
-      "version": "0.0.7",
-      "key": "platforms@0.0.7",
-      "repoName": "platforms",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "rules_license": "rules_license@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz"
-          ],
-          "integrity": "sha256-OlYcmee9vpFzqmU/1Xn+hJ8djWc5V4CrR3Cx84FDHVE=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "rules_license@0.0.7": {
-      "name": "rules_license",
-      "version": "0.0.7",
-      "key": "rules_license@0.0.7",
-      "repoName": "rules_license",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz"
-          ],
-          "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "buildozer@6.4.0.2": {
-      "name": "buildozer",
-      "version": "6.4.0.2",
-      "key": "buildozer@6.4.0.2",
-      "repoName": "buildozer",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@buildozer//:buildozer_binary.bzl",
-          "extensionName": "buildozer_binary",
-          "usingModule": "buildozer@6.4.0.2",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel",
-            "line": 7,
-            "column": 33
-          },
-          "imports": {
-            "buildozer_binary": "buildozer_binary"
-          },
-          "devImports": [],
-          "tags": [
-            {
-              "tagName": "buildozer",
-              "attributeValues": {
-                "sha256": {
-                  "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e",
-                  "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d",
-                  "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119",
-                  "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa",
-                  "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b"
-                },
-                "version": "6.4.0"
-              },
-              "devDependency": false,
-              "location": {
-                "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel",
-                "line": 8,
-                "column": 27
-              }
-            }
-          ],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/fmeum/buildozer/releases/download/v6.4.0.2/buildozer-v6.4.0.2.tar.gz"
-          ],
-          "integrity": "sha256-k7tFKQMR2AygxpmZfH0yEPnQmF3efFgD9rBPkj+Yz/8=",
-          "strip_prefix": "buildozer-6.4.0.2",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/buildozer/6.4.0.2/patches/module_dot_bazel_version.patch": "sha256-gKANF2HMilj7bWmuXs4lbBIAAansuWC4IhWGB/CerjU="
-          },
-          "remote_patch_strip": 1
-        }
-      }
-    },
-    "apple_support@1.5.0": {
-      "name": "apple_support",
-      "version": "1.5.0",
-      "key": "apple_support@1.5.0",
-      "repoName": "build_bazel_apple_support",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [
-        "@local_config_apple_cc_toolchains//:all"
-      ],
-      "extensionUsages": [
-        {
-          "extensionBzlFile": "@build_bazel_apple_support//crosstool:setup.bzl",
-          "extensionName": "apple_cc_configure_extension",
-          "usingModule": "apple_support@1.5.0",
-          "location": {
-            "file": "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel",
-            "line": 17,
-            "column": 35
-          },
-          "imports": {
-            "local_config_apple_cc": "local_config_apple_cc",
-            "local_config_apple_cc_toolchains": "local_config_apple_cc_toolchains"
-          },
-          "devImports": [],
-          "tags": [],
-          "hasDevUseExtension": false,
-          "hasNonDevUseExtension": true
-        }
-      ],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "platforms": "platforms@0.0.7",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz"
-          ],
-          "integrity": "sha256-miM41vja0yRPgj8txghKA+TQ+7J8qJLclw5okNW0gYQ=",
-          "strip_prefix": "",
-          "remote_patches": {},
-          "remote_patch_strip": 0
-        }
-      }
-    },
-    "stardoc@0.5.1": {
-      "name": "stardoc",
-      "version": "0.5.1",
-      "key": "stardoc@0.5.1",
-      "repoName": "stardoc",
-      "executionPlatformsToRegister": [],
-      "toolchainsToRegister": [],
-      "extensionUsages": [],
-      "deps": {
-        "bazel_skylib": "bazel_skylib@1.3.0",
-        "rules_java": "rules_java@7.4.0",
-        "bazel_tools": "bazel_tools@_",
-        "local_config_platform": "local_config_platform@_"
-      },
-      "repoSpec": {
-        "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-        "ruleClassName": "http_archive",
-        "attributes": {
-          "urls": [
-            "https://github.com/bazelbuild/stardoc/releases/download/0.5.1/stardoc-0.5.1.tar.gz"
-          ],
-          "integrity": "sha256-qoFNrgrEALurLoiB+ZFcb0fElmS/CHxAmhX5BDjSwj4=",
-          "strip_prefix": "",
-          "remote_patches": {
-            "https://bcr.bazel.build/modules/stardoc/0.5.1/patches/module_dot_bazel.patch": "sha256-UAULCuTpJE7SG0YrR9XLjMfxMRmbP+za3uW9ONZ5rjI="
-          },
-          "remote_patch_strip": 0
-        }
-      }
-    }
-  },
-  "moduleExtensions": {
-    "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "pMLFCYaRPkgXPQ8vtuNkMfiHfPmRBy6QJfnid4sWfv0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_apple_cc": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_apple_cc_toolchains": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "apple_support~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
-      "general": {
-        "bzlTransitiveDigest": "ZggrqnDIPRFCqT9XaCYOxLiJx1XuMtOZNG1jvKYZ5lA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "android_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2",
-              "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar"
-            }
-          },
-          "android_gmaven_r8": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_jar",
-            "attributes": {
-              "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d",
-              "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "PHpT2yqMGms2U4L3E/aZ+WcQalmZWm+ILdP3yiLsDhA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_cc": {
-            "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl",
-            "ruleClassName": "cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_cc_toolchains": {
-            "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl",
-            "ruleClassName": "cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "bazel_tools",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_xcode": {
-            "bzlFile": "@@bazel_tools//tools/osx:xcode_configure.bzl",
-            "ruleClassName": "xcode_autoconf",
-            "attributes": {
-              "xcode_locator": "@bazel_tools//tools/osx:xcode_locator.m",
-              "remote_xcode": ""
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_sh": {
-            "bzlFile": "@@bazel_tools//tools/sh:sh_configure.bzl",
-            "ruleClassName": "sh_config",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": {
-      "general": {
-        "bzlTransitiveDigest": "7n9r2sWPYvn/OzUdHUoiJN/1hgIqWKOFCEQFVwHZGU0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remote_coverage_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",
-              "urls": [
-                "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@buildozer~//:buildozer_binary.bzl%buildozer_binary": {
-      "general": {
-        "bzlTransitiveDigest": "EleDU/FQ1+e/RgkW3aIDmdaxZEthvoWQhsqFTxiSgMI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "buildozer_binary": {
-            "bzlFile": "@@buildozer~//private:buildozer_binary.bzl",
-            "ruleClassName": "_buildozer_binary_repo",
-            "attributes": {
-              "sha256": {
-                "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e",
-                "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d",
-                "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119",
-                "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa",
-                "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b"
-              },
-              "version": "6.4.0"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    },
-    "@@rules_java~//java:extensions.bzl%toolchains": {
-      "general": {
-        "bzlTransitiveDigest": "0N5b5J9fUzo0sgvH4F3kIEaeXunz4Wy2/UtSFV/eXUY=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "remotejdk21_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_s390x_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remote_java_tools_windows": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_windows-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk11_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk11_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_linux_s390x_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_win_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
-              "strip_prefix": "jdk-11.0.13+8",
-              "urls": [
-                "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
-              ]
-            }
-          },
-          "remotejdk17_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_macos": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk11_macos_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_ppc64le_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk21_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remote_java_tools_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_linux-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk21_win": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip"
-              ]
-            }
-          },
-          "remotejdk21_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 21,\n)\n",
-              "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0",
-              "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64",
-              "urls": [
-                "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz",
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_s390x": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",
-              "strip_prefix": "jdk-11.0.15+10",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",
-                "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_linux_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_win_arm64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_x64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-linux_x64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_macos_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_macos//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_linux_ppc64le_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk17_win_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85",
-              "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_aarch64.zip",
-                "https://cdn.azul.com/zulu/bin/zulu17.44.53-ca-jdk17.0.8.1-win_aarch64.zip"
-              ]
-            }
-          },
-          "remote_java_tools_darwin_arm64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_arm64-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk17_linux_ppc64le": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd",
-              "strip_prefix": "jdk-17.0.8.1+1",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz",
-                "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.8.1_1.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_linux_aarch64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_win_arm64_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_11\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"11\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n"
-            }
-          },
-          "local_jdk": {
-            "bzlFile": "@@rules_java~//toolchains:local_java_repository.bzl",
-            "ruleClassName": "_local_java_repository_rule",
-            "attributes": {
-              "java_home": "",
-              "version": "",
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = {RUNTIME_VERSION},\n)\n"
-            }
-          },
-          "remote_java_tools_darwin_x86_64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_x86_64-v13.4.zip"
-              ]
-            }
-          },
-          "remote_java_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf",
-              "urls": [
-                "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip",
-                "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools-v13.4.zip"
-              ]
-            }
-          },
-          "remotejdk17_linux_s390x": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 17,\n)\n",
-              "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37",
-              "strip_prefix": "jdk-17.0.8.1+1",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.8.1_1.tar.gz",
-                "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.8.1_1.tar.gz"
-              ]
-            }
-          },
-          "remotejdk17_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_17\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"17\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk17_win//:jdk\",\n)\n"
-            }
-          },
-          "remotejdk11_linux_ppc64le": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",
-              "strip_prefix": "jdk-11.0.15+10",
-              "urls": [
-                "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",
-                "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"
-              ]
-            }
-          },
-          "remotejdk11_macos_aarch64": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n    name = \"jre\",\n    srcs = glob(\n        [\n            \"jre/bin/**\",\n            \"jre/lib/**\",\n        ],\n        allow_empty = True,\n        # In some configurations, Java browser plugin is considered harmful and\n        # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n        # so do not include it in JRE on Windows.\n        exclude = [\"jre/bin/plugin2/**\"],\n    ),\n)\n\nfilegroup(\n    name = \"jdk-bin\",\n    srcs = glob(\n        [\"bin/**\"],\n        # The JDK on Windows sometimes contains a directory called\n        # \"%systemroot%\", which is not a valid label.\n        exclude = [\"**/*%*/**\"],\n    ),\n)\n\n# This folder holds security policies.\nfilegroup(\n    name = \"jdk-conf\",\n    srcs = glob(\n        [\"conf/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-include\",\n    srcs = glob(\n        [\"include/**\"],\n        allow_empty = True,\n    ),\n)\n\nfilegroup(\n    name = \"jdk-lib\",\n    srcs = glob(\n        [\"lib/**\", \"release\"],\n        allow_empty = True,\n        exclude = [\n            \"lib/missioncontrol/**\",\n            \"lib/visualvm/**\",\n        ],\n    ),\n)\n\njava_runtime(\n    name = \"jdk\",\n    srcs = [\n        \":jdk-bin\",\n        \":jdk-conf\",\n        \":jdk-include\",\n        \":jdk-lib\",\n        \":jre\",\n    ],\n    # Provide the 'java` binary explicitly so that the correct path is used by\n    # Bazel even when the host platform differs from the execution platform.\n    # Exactly one of the two globs will be empty depending on the host platform.\n    # When --incompatible_disallow_empty_glob is enabled, each individual empty\n    # glob will fail without allow_empty = True, even if the overall result is\n    # non-empty.\n    java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n    version = 11,\n)\n",
-              "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885",
-              "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64",
-              "urls": [
-                "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_aarch64.tar.gz",
-                "https://cdn.azul.com/zulu/bin/zulu11.66.15-ca-jdk11.0.20-macosx_aarch64.tar.gz"
-              ]
-            }
-          },
-          "remotejdk21_win_toolchain_config_repo": {
-            "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl",
-            "ruleClassName": "_toolchain_config",
-            "attributes": {
-              "build_file": "\nconfig_setting(\n    name = \"prefix_version_setting\",\n    values = {\"java_runtime_version\": \"remotejdk_21\"},\n    visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n    name = \"version_setting\",\n    values = {\"java_runtime_version\": \"21\"},\n    visibility = [\"//visibility:private\"],\n)\nalias(\n    name = \"version_or_prefix_version_setting\",\n    actual = select({\n        \":version_setting\": \":version_setting\",\n        \"//conditions:default\": \":prefix_version_setting\",\n    }),\n    visibility = [\"//visibility:private\"],\n)\ntoolchain(\n    name = \"toolchain\",\n    target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n    name = \"bootstrap_runtime_toolchain\",\n    # These constraints are not required for correctness, but prevent fetches of remote JDK for\n    # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n    # the same configuration, this constraint will not result in toolchain resolution failures.\n    exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n    target_settings = [\":version_or_prefix_version_setting\"],\n    toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n    toolchain = \"@remotejdk21_win//:jdk\",\n)\n"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_java~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_java~",
-            "remote_java_tools",
-            "rules_java~~toolchains~remote_java_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_jvm_external~//:extensions.bzl%maven": {
-      "general": {
-        "bzlTransitiveDigest": "9ol/f6R1HONuabXvQTFIEvT1pWikli+mTIbvGRmDubk=",
-        "recordedFileInputs": {
-          "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "org_slf4j_slf4j_api_1_7_30": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar",
-                "https://maven.google.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_common_protos_2_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar",
-                "https://maven.google.com/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar"
-            }
-          },
-          "com_google_api_gax_1_60_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "02f37d4ff1a7b8d71dff8064cf9568aa4f4b61bcc4485085d16130f32afa5a79",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar",
-                "https://maven.google.com/com/google/api/gax/1.60.0/gax-1.60.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar"
-            }
-          },
-          "com_google_guava_failureaccess_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar",
-                "https://maven.google.com/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-            }
-          },
-          "commons_logging_commons_logging_1_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar",
-                "https://maven.google.com/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_appengine_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f97b495fd97ac3a3d59099eb2b55025f4948230da15a076f189b9cff37c6b4d2",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_storage_1_113_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "796833e9bdab80c40bbc820e65087eb8f28c6bfbca194d2e3e00d98cb5bc55d6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar"
-            }
-          },
-          "io_grpc_grpc_context_1_33_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "99b8aea2b614fe0e61c3676e681259dc43c2de7f64620998e1a8435eb2976496",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar",
-                "https://maven.google.com/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar"
-            }
-          },
-          "com_google_api_grpc_proto_google_iam_v1_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "64cee7383a97e846da8d8e160e6c8fe30561e507260552c59e6ccfc81301fdc8",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar",
-                "https://maven.google.com/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar"
-            }
-          },
-          "com_google_api_api_common_1_10_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "2a033f24bb620383eda440ad307cb8077cfec1c7eadc684d65216123a1b9613a",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar",
-                "https://maven.google.com/com/google/api/api-common/1.10.1/api-common-1.10.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_oauth2_http_0_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1722d895c42dc42ea1d1f392ddbec1fbb28f7a979022c3a6c29acc39cc777ad1",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar",
-                "https://maven.google.com/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar"
-            }
-          },
-          "com_typesafe_netty_netty_reactive_streams_2_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f949849fc8ee75fde468ba3a35df2e04577fa31a2940b83b2a7dc9d14dac13d6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar",
-                "https://maven.google.com/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar"
-            }
-          },
-          "com_typesafe_netty_netty_reactive_streams_http_2_0_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b39224751ad936758176e9d994230380ade5e9079e7c8ad778e3995779bcf303",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar",
-                "https://maven.google.com/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar"
-            }
-          },
-          "javax_annotation_javax_annotation_api_1_3_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b",
-              "urls": [
-                "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar",
-                "https://maven.google.com/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar"
-            }
-          },
-          "com_google_j2objc_j2objc_annotations_1_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
-                "https://maven.google.com/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-            }
-          },
-          "software_amazon_awssdk_metrics_spi_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "08a11dc8c4ba464beafbcc7ac05b8c724c1ccb93da99482e82a68540ac704e4a",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar"
-            }
-          },
-          "org_reactivestreams_reactive_streams_1_0_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar",
-                "https://maven.google.com/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_jackson2_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e6504a82425fcc2168a4ca4175138ddcc085168daed8cdedb86d8f6fdc296e1e",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar"
-            }
-          },
-          "io_netty_netty_transport_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar"
-            }
-          },
-          "io_netty_netty_codec_http2_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar"
-            }
-          },
-          "io_opencensus_opencensus_api_0_24_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar",
-                "https://maven.google.com/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar"
-            }
-          },
-          "rules_jvm_external_deps": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "pinned_coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{\"artifact\":\"google-cloud-core\",\"group\":\"com.google.cloud\",\"version\":\"1.93.10\"}",
-                "{\"artifact\":\"google-cloud-storage\",\"group\":\"com.google.cloud\",\"version\":\"1.113.4\"}",
-                "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.9.0\"}",
-                "{\"artifact\":\"maven-artifact\",\"group\":\"org.apache.maven\",\"version\":\"3.8.6\"}",
-                "{\"artifact\":\"s3\",\"group\":\"software.amazon.awssdk\",\"version\":\"2.17.183\"}"
-              ],
-              "fetch_sources": true,
-              "fetch_javadoc": false,
-              "generate_compat_repositories": false,
-              "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "additional_netrc_lines": [],
-              "fail_if_repin_required": false,
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "org_threeten_threetenbp_1_5_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dcf9c0f940739f2a825cd8626ff27113459a2f6eb18797c7152f93fff69c264f",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar",
-                "https://maven.google.com/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar"
-            }
-          },
-          "software_amazon_awssdk_http_client_spi_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fe7120f175df9e47ebcc5d946d7f40110faf2ba0a30364f3b935d5b8a5a6c3c6",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_third_party_jackson_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "1bc27c9960993c20e1ab058012dd1ae04c875eec9f0f08f2b2ca41e578dee9a4",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar"
-            }
-          },
-          "software_amazon_eventstream_eventstream_1_0_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar",
-                "https://maven.google.com/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar"
-            }
-          },
-          "com_google_oauth_client_google_oauth_client_1_31_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4ed4e2948251dbda66ce251bd7f3b32cd8570055e5cdb165a3c7aea8f43da0ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar",
-                "https://maven.google.com/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar"
-            }
-          },
-          "maven": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{\"artifact\":\"jsr305\",\"group\":\"com.google.code.findbugs\",\"version\":\"3.0.2\"}",
-                "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.8.9\"}",
-                "{\"artifact\":\"error_prone_annotations\",\"group\":\"com.google.errorprone\",\"version\":\"2.3.2\"}",
-                "{\"artifact\":\"j2objc-annotations\",\"group\":\"com.google.j2objc\",\"version\":\"1.3\"}",
-                "{\"artifact\":\"guava\",\"group\":\"com.google.guava\",\"version\":\"31.1-jre\"}",
-                "{\"artifact\":\"guava-testlib\",\"group\":\"com.google.guava\",\"version\":\"31.1-jre\"}",
-                "{\"artifact\":\"truth\",\"group\":\"com.google.truth\",\"version\":\"1.1.2\"}",
-                "{\"artifact\":\"junit\",\"group\":\"junit\",\"version\":\"4.13.2\"}",
-                "{\"artifact\":\"mockito-core\",\"group\":\"org.mockito\",\"version\":\"4.3.1\"}"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": true,
-              "fetch_javadoc": false,
-              "use_unsafe_shared_cache": false,
-              "excluded_artifacts": [],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "software_amazon_awssdk_aws_xml_protocol_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "566bba05d49256fa6994efd68fa625ae05a62ea45ee74bb9130d20ea20988363",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_annotations_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8e4d72361ca805a0bd8bbd9017cd7ff77c8d170f2dd469c7d52d5653330bb3fd",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_netty_nio_client_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "a6d356f364c56d7b90006b0b7e503b8630010993a5587ce42e74b10b8dca2238",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar"
-            }
-          },
-          "com_google_auto_value_auto_value_annotations_1_7_4": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar",
-                "https://maven.google.com/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-            }
-          },
-          "io_netty_netty_transport_native_unix_common_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6f8f1cc29b5a234eeee9439a63eb3f03a5994aa540ff555cb0b2c88cefaf6877",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar"
-            }
-          },
-          "io_opencensus_opencensus_contrib_http_util_0_24_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7155273bbb1ed3d477ea33cf19d7bbc0b285ff395f43b29ae576722cf247000f",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar",
-                "https://maven.google.com/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar"
-            }
-          },
-          "com_fasterxml_jackson_core_jackson_core_2_11_3": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78cd0a6b936232e06dd3e38da8a0345348a09cd1ff9c4d844c6ee72c75cfc402",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar",
-                "https://maven.google.com/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_core_1_93_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "832d74eca66f4601e162a8460d6f59f50d1d23f93c18b02654423b6b0d67c6ea",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar"
-            }
-          },
-          "com_google_auth_google_auth_library_credentials_0_22_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "42c76031276de5b520909e9faf88c5b3c9a722d69ee9cfdafedb1c52c355dfc5",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar",
-                "https://maven.google.com/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar"
-            }
-          },
-          "com_google_guava_guava_30_0_android": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "3345c82c2cc70a0053e8db9031edc6d71625ef0dea6a2c8f5ebd6cb76d2bf843",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar",
-                "https://maven.google.com/com/google/guava/guava/30.0-android/guava-30.0-android.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar"
-            }
-          },
-          "software_amazon_awssdk_profiles_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78833b32fde3f1c5320373b9ea955c1bbc28f2c904010791c4784e610193ee56",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpcore_4_4_13": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar",
-                "https://maven.google.com/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar"
-            }
-          },
-          "io_netty_netty_common_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar"
-            }
-          },
-          "io_netty_netty_transport_classes_epoll_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e1528a9751c1285aa7beaf3a1eb0597151716426ce38598ac9bc0891209b9e68",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar"
-            }
-          },
-          "com_google_cloud_google_cloud_core_http_1_93_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "81ac67c14c7c4244d2b7db2607ad352416aca8d3bb2adf338964e8fea25b1b3c",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar",
-                "https://maven.google.com/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar"
-            }
-          },
-          "software_amazon_awssdk_utils_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "7bd849bb5aa71bfdf6b849643736ecab3a7b3f204795804eefe5754104231ec6",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar"
-            }
-          },
-          "org_apache_commons_commons_lang3_3_8_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar",
-                "https://maven.google.com/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "bccbdbea689a665a702ff19828662d87fb7fe81529df13f02ef1e4c474ea9f93",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar"
-            }
-          },
-          "com_google_api_gax_httpjson_0_77_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fd4dae47fa016d3b26e8d90b67ddc6c23c4c06e8bcdf085c70310ab7ef324bd6",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar",
-                "https://maven.google.com/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar"
-            }
-          },
-          "unpinned_rules_jvm_external_deps": {
-            "bzlFile": "@@rules_jvm_external~//:coursier.bzl",
-            "ruleClassName": "coursier_fetch",
-            "attributes": {
-              "repositories": [
-                "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }"
-              ],
-              "artifacts": [
-                "{\"artifact\":\"google-cloud-core\",\"group\":\"com.google.cloud\",\"version\":\"1.93.10\"}",
-                "{\"artifact\":\"google-cloud-storage\",\"group\":\"com.google.cloud\",\"version\":\"1.113.4\"}",
-                "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.9.0\"}",
-                "{\"artifact\":\"maven-artifact\",\"group\":\"org.apache.maven\",\"version\":\"3.8.6\"}",
-                "{\"artifact\":\"s3\",\"group\":\"software.amazon.awssdk\",\"version\":\"2.17.183\"}"
-              ],
-              "fail_on_missing_checksum": true,
-              "fetch_sources": true,
-              "fetch_javadoc": false,
-              "use_unsafe_shared_cache": false,
-              "excluded_artifacts": [],
-              "generate_compat_repositories": false,
-              "version_conflict_policy": "default",
-              "override_targets": {},
-              "strict_visibility": false,
-              "strict_visibility_value": [
-                "@@//visibility:private"
-              ],
-              "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json",
-              "resolve_timeout": 600,
-              "jetify": false,
-              "jetify_include_list": [
-                "*"
-              ],
-              "use_starlark_android_rules": false,
-              "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl",
-              "duplicate_version_warning": "warn"
-            }
-          },
-          "software_amazon_awssdk_regions_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d3079395f3ffc07d04ffcce16fca29fb5968197f6e9ea3dbff6be297102b40a5",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar"
-            }
-          },
-          "com_google_errorprone_error_prone_annotations_2_4_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar",
-                "https://maven.google.com/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar"
-            }
-          },
-          "io_netty_netty_handler_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_aws_query_protocol_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4dace03c76f80f3dec920cb3dedb2a95984c4366ef4fda728660cb90bed74848",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar"
-            }
-          },
-          "io_netty_netty_codec_http_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar"
-            }
-          },
-          "io_netty_netty_resolver_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_protocol_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "10e7c4faa1f05e2d73055d0390dbd0bb6450e2e6cb85beda051b1e4693c826ce",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar"
-            }
-          },
-          "org_checkerframework_checker_compat_qual_2_5_5": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar",
-                "https://maven.google.com/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar"
-            }
-          },
-          "com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "52d26a9d105f8d8a0850807285f307a76cea8f3e0cdb2be4d3b15b1adfa77351",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar",
-                "https://maven.google.com/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar"
-            }
-          },
-          "com_google_api_client_google_api_client_1_30_11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ee6f97865cc7de6c7c80955c3f37372cf3887bd75e4fc06f1058a6b4cd9bf4da",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar",
-                "https://maven.google.com/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar"
-            }
-          },
-          "software_amazon_awssdk_s3_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "ab073b91107a9e4ed9f030314077d137fe627e055ad895fabb036980a050e360",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar"
-            }
-          },
-          "org_apache_maven_maven_artifact_3_8_6": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar",
-                "https://maven.google.com/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar"
-            }
-          },
-          "org_apache_httpcomponents_httpclient_4_5_13": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar",
-                "https://maven.google.com/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar"
-            }
-          },
-          "com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
-                "https://maven.google.com/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-            }
-          },
-          "com_google_http_client_google_http_client_1_38_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "411f4a42519b6b78bdc0fcfdf74c9edcef0ee97afa4a667abe04045a508d6302",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar",
-                "https://maven.google.com/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar"
-            }
-          },
-          "software_amazon_awssdk_apache_client_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "78ceae502fce6a97bbe5ff8f6a010a52ab7ea3ae66cb1a4122e18185fce45022",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_arns_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "659a185e191d66c71de81209490e66abeaccae208ea7b2831a738670823447aa",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar"
-            }
-          },
-          "com_google_code_gson_gson_2_9_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar",
-                "https://maven.google.com/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar"
-            }
-          },
-          "io_netty_netty_buffer_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar"
-            }
-          },
-          "com_google_code_findbugs_jsr305_3_0_2": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
-                "https://maven.google.com/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-            }
-          },
-          "commons_codec_commons_codec_1_11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d",
-              "urls": [
-                "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar",
-                "https://maven.google.com/commons-codec/commons-codec/1.11/commons-codec-1.11.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar"
-            }
-          },
-          "software_amazon_awssdk_auth_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "8820c6636e5c14efc29399fb5565ce50212b0c1f4ed720a025a2c402d54e0978",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar"
-            }
-          },
-          "software_amazon_awssdk_json_utils_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "51ab7f550adc06afcb49f5270cdf690f1bfaaee243abaa5d978095e2a1e4e1a5",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar"
-            }
-          },
-          "org_codehaus_plexus_plexus_utils_3_3_1": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a",
-              "urls": [
-                "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar",
-                "https://maven.google.com/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_util_3_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d9de66b8c9445905dfa7064f6d5213d47ce88a20d34e21d83c4a94a229e14e62",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar",
-                "https://maven.google.com/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar"
-            }
-          },
-          "io_netty_netty_codec_4_1_72_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar",
-                "https://maven.google.com/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar"
-            }
-          },
-          "com_google_protobuf_protobuf_java_3_13_0": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "97d5b2758408690c0dc276238707492a0b6a4d71206311b6c442cdc26c5973ff",
-              "urls": [
-                "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar",
-                "https://maven.google.com/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar"
-            }
-          },
-          "io_netty_netty_tcnative_classes_2_0_46_Final": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a",
-              "urls": [
-                "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar",
-                "https://maven.google.com/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar"
-            }
-          },
-          "software_amazon_awssdk_sdk_core_2_17_183": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_file",
-            "attributes": {
-              "sha256": "677e9cc90fdd82c1f40f97b99cb115b13ad6c3f58beeeab1c061af6954d64c77",
-              "urls": [
-                "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar",
-                "https://maven.google.com/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
-              ],
-              "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_jvm_external~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_jvm_external~",
-            "rules_jvm_external",
-            "rules_jvm_external~"
-          ]
-        ]
-      }
-    },
-    "@@rules_jvm_external~//:non-module-deps.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "Fq6CvJMzD0/LbttG5TUaCtEm/pFvTgO5X9tCUH87Fb0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "io_bazel_rules_kotlin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "946747acdbeae799b085d12b240ec346f775ac65236dfcf18aa0cd7300f6de78",
-              "urls": [
-                "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-2/rules_kotlin_release.tgz"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_jvm_external~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions:python.bzl%python": {
-      "general": {
-        "bzlTransitiveDigest": "2Az37kOCPyZmcfbxYv3bex98d5KhE/dEXOXLzid2XhA=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pythons_hub": {
-            "bzlFile": "@@rules_python~//python/extensions/private:interpreter_hub.bzl",
-            "ruleClassName": "hub_repo",
-            "attributes": {
-              "toolchains": []
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "rules_python",
-            "rules_python~"
-          ]
-        ]
-      }
-    },
-    "@@rules_python~//python/extensions/private:internal_deps.bzl%internal_deps": {
-      "general": {
-        "bzlTransitiveDigest": "6qzMi1W/Ln/TUQ7+HG3HnNFz+oFeaWSDOnjCcoByfhI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pypi__coverage_cp39_aarch64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/63/e9/f23e8664ec4032d7802a1cf920853196bcbdce7b56408e3efe1b2da08f3c/coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp38_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/40/3b/cd68cb278c4966df00158811ec1e357b9a7d132790c240fc65da57e10013/coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__pip_tools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/5e/e8/f6d7d1847c7351048da870417724ace5c4506e816b38db02f4d7c675c189/pip_tools-6.12.1-py3-none-any.whl",
-              "sha256": "f0c0c0ec57b58250afce458e2e6058b1f30a4263db895b7d72fd6311bf1dc6f7",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp310_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/3c/7d/d5211ea782b193ab8064b06dc0cc042cf1a4ca9c93a530071459172c550f/coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp311_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/50/cf/455930004231fa87efe8be06d13512f34e070ddfee8b8bf5a050cdc47ab3/coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp310_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/15/b0/3639d84ee8a900da0cf6450ab46e22517e4688b6cec0ba8ab6f8166103a2/coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp39_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/18/95/27f80dcd8273171b781a19d109aeaed7f13d78ef6d1e2f7134a5826fd1b4/coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp310_aarch64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/89/a2/cbf599e50bb4be416e0408c4cf523c354c51d7da39935461a9687e039481/coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl"
-              ]
-            }
-          },
-          "pypi__pip": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/09/bd/2410905c76ee14c62baf69e3f4aa780226c1bbfc9485731ad018e35b0cb5/pip-22.3.1-py3-none-any.whl",
-              "sha256": "908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp38_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/05/63/a789b462075395d34f8152229dccf92b25ca73eac05b3f6cd75fa5017095/coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp311_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/6a/63/8e82513b7e4a1b8d887b4e85c1c2b6c9b754a581b187c0b084f3330ac479/coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__tomli": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl",
-              "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp39_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/ea/52/c08080405329326a7ff16c0dfdb4feefaa8edd7446413df67386fe1bbfe0/coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__wheel": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/bd/7c/d38a0b30ce22fc26ed7dbc087c6d00851fb3395e9d0dac40bec1f905030c/wheel-0.38.4-py3-none-any.whl",
-              "sha256": "b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp311_aarch64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/36/f3/5cbd79cf4cd059c80b59104aca33b8d05af4ad5bf5b1547645ecee716378/coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
-              ]
-            }
-          },
-          "pypi__click": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/76/0a/b6c5f311e32aeb3b406e03c079ade51e905ea630fc19d1262a46249c1c86/click-8.0.1-py3-none-any.whl",
-              "sha256": "fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp39_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/6b/f2/919f0fdc93d3991ca074894402074d847be8ac1e1d78e7e9e1c371b69a6f/coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__importlib_metadata": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/d7/31/74dcb59a601b95fce3b0334e8fc9db758f78e43075f22aeb3677dfb19f4c/importlib_metadata-1.4.0-py2.py3-none-any.whl",
-              "sha256": "bdd9b7c397c273bcc9a11d6629a38487cd07154fa255a467bf704cd2c258e359",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__pep517": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl",
-              "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp38_x86_64-unknown-linux-gnu": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/bd/a0/e263b115808226fdb2658f1887808c06ac3f1b579ef5dda02309e0d54459/coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__coverage_cp38_aarch64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/07/82/79fa21ceca9a9b091eb3c67e27eb648dade27b2c9e1eb23af47232a2a365/coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl"
-              ]
-            }
-          },
-          "pypi__packaging": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl",
-              "sha256": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__setuptools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl",
-              "sha256": "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__zipp": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/f4/50/cc72c5bcd48f6e98219fc4a88a5227e9e28b81637a99c49feba1d51f4d50/zipp-1.0.0-py2.py3-none-any.whl",
-              "sha256": "8dda78f06bd1674bd8720df8a50bb47b6e1233c503a4eed8e7810686bde37656",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__colorama": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl",
-              "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__build": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/03/97/f58c723ff036a8d8b4d3115377c0a37ed05c1f68dd9a0d66dab5e82c5c1c/build-0.9.0-py3-none-any.whl",
-              "sha256": "38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__coverage_cp310_x86_64-apple-darwin": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file_content": "\nfilegroup(\n    name = \"coverage\",\n    srcs = [\"coverage/__main__.py\"],\n    data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n    visibility = [\"//visibility:public\"],\n)\n    ",
-              "patch_args": [
-                "-p1"
-              ],
-              "patches": [
-                "@@rules_python~//python/private:coverage.patch"
-              ],
-              "sha256": "ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53",
-              "type": "zip",
-              "urls": [
-                "https://files.pythonhosted.org/packages/c4/8d/5ec7d08f4601d2d792563fe31db5e9322c306848fec1e65ec8885927f739/coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl"
-              ]
-            }
-          },
-          "pypi__installer": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl",
-              "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          },
-          "pypi__more_itertools": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "url": "https://files.pythonhosted.org/packages/bd/3f/c4b3dbd315e248f84c388bd4a72b131a29f123ecacc37ffb2b3834546e42/more_itertools-8.13.0-py3-none-any.whl",
-              "sha256": "c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb",
-              "type": "zip",
-              "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n    name = \"lib\",\n    srcs = glob([\"**/*.py\"]),\n    data = glob([\"**/*\"], exclude=[\n        # These entries include those put into user-installed dependencies by\n        # data_exclude in /python/pip_install/tools/bazel.py\n        # to avoid non-determinism following pip install's behavior.\n        \"**/*.py\",\n        \"**/*.pyc\",\n        \"**/* *\",\n        \"**/*.dist-info/RECORD\",\n        \"BUILD\",\n        \"WORKSPACE\",\n    ]),\n    # This makes this directory a top-level in the python import\n    # search path for anything that depends on this.\n    imports = [\".\"],\n)\n"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_python~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "rules_python~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "rules_python~",
-            "rules_python",
-            "rules_python~"
-          ]
-        ]
-      }
-    }
-  }
-}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
deleted file mode 100644
index 309bae9b2387..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-{ bazel
-, Foundation
-, bazelTest
-, callPackage
-, cctools
-, darwin
-, distDir
-, extraBazelArgs ? ""
-, fetchurl
-, jdk11_headless
-, lib
-, libtool
-, lndir
-, openjdk8
-, repoCache
-, runLocal
-, runtimeShell
-, stdenv
-, symlinkJoin
-, tree
-, writeScript
-, writeText
-}:
-
-# This test uses bzlmod because I could not make it work without it.
-# This is good, because we have at least one test with bzlmod enabled.
-# However, we have to create our own lockfile, wich is quite a big file by
-# itself.
-
-let
-  # To update the lockfile, run
-  #    $ nix-shell -A bazel_7.tests.vanilla.protobuf
-  #    [nix-shell]$ genericBuild # (wait a bit for failure, or kill it)
-  #    [nix-shell]$ rm -f MODULE.bazel.lock
-  #    [nix-shell]$ bazel mod deps --lockfile_mode=update
-  #    [nix-shell]$ cp MODULE.bazel.lock $HERE/protobuf-test.MODULE.bazel.lock
-  lockfile = ./protobuf-test.MODULE.bazel.lock;
-
-  protobufRepoCache = callPackage ./bazel-repository-cache.nix {
-    # We are somewhat lucky that bazel's own lockfile works for our tests.
-    # Use extraDeps if the tests need things that are not in that lockfile.
-    # But most test dependencies are bazel's builtin deps, so that at least aligns.
-    inherit lockfile;
-
-    # Remove platform-specific binaries, as they are large and useless.
-    requiredDepNamePredicate = name:
-      null == builtins.match ".*(macos|osx|linux|win|android|maven).*" name;
-  };
-
-  mergedRepoCache = symlinkJoin {
-    name = "mergedDistDir";
-    paths = [ protobufRepoCache distDir ];
-  };
-
-  MODULE = writeText "MODULE.bazel" ''
-    bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
-    bazel_dep(name = "protobuf", version = "21.7")
-    bazel_dep(name = "zlib", version = "1.3")
-  '';
-
-  WORKSPACE = writeText "WORKSPACE" ''
-    # Empty, we use bzlmod instead
-  '';
-
-  personProto = writeText "person.proto" ''
-    syntax = "proto3";
-
-    package person;
-
-    message Person {
-      string name = 1;
-      int32 id = 2;
-      string email = 3;
-    }
-  '';
-
-  personBUILD = writeText "BUILD" ''
-    load("@rules_proto//proto:defs.bzl", "proto_library")
-
-    proto_library(
-        name = "person_proto",
-        srcs = ["person.proto"],
-        visibility = ["//visibility:public"],
-    )
-
-    java_proto_library(
-        name = "person_java_proto",
-        deps = [":person_proto"],
-    )
-
-    cc_proto_library(
-        name = "person_cc_proto",
-        deps = [":person_proto"],
-    )
-  '';
-
-  toolsBazel = writeScript "bazel" ''
-    #! ${runtimeShell}
-
-    export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${cctools}/bin/ld'
-    export LIBTOOL='${cctools}/bin/libtool'
-    export CC='${stdenv.cc}/bin/clang'
-
-    # XXX: hack for macosX, this flags disable bazel usage of xcode
-    # See: https://github.com/bazelbuild/bazel/issues/4231
-    export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
-
-    export HOMEBREW_RUBY_PATH="foo"
-
-    exec "$BAZEL_REAL" "$@"
-  '';
-
-  workspaceDir = runLocal "our_workspace" { } (''
-    mkdir $out
-    cp ${MODULE} $out/MODULE.bazel
-    cp ${./protobuf-test.MODULE.bazel.lock} $out/MODULE.bazel.lock
-    #cp ${WORKSPACE} $out/WORKSPACE
-    touch $out/WORKSPACE
-    touch $out/BUILD.bazel
-    mkdir $out/person
-    cp ${personProto} $out/person/person.proto
-    cp ${personBUILD} $out/person/BUILD.bazel
-  ''
-  + (lib.optionalString stdenv.hostPlatform.isDarwin ''
-    echo 'tools bazel created'
-    mkdir $out/tools
-    install ${toolsBazel} $out/tools/bazel
-  ''));
-
-  testBazel = bazelTest {
-    name = "bazel-test-protocol-buffers";
-    inherit workspaceDir;
-    bazelPkg = bazel;
-    buildInputs = [
-      (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)
-      tree
-      bazel
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Foundation
-      darwin.objc4
-    ];
-
-    bazelScript = ''
-      ${bazel}/bin/bazel \
-        build \
-        --repository_cache=${mergedRepoCache} \
-        ${extraBazelArgs} \
-        --enable_bzlmod \
-        --lockfile_mode=error \
-        --verbose_failures \
-        //... \
-    '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
-        --host_javabase='@local_jdk//:jdk' \
-        --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
-        --javabase='@local_jdk//:jdk' \
-    '' + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-        --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
-    '' + ''
-
-    '';
-  };
-
-in
-testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/strict_proto_deps.patch b/pkgs/development/tools/build-managers/bazel/bazel_7/strict_proto_deps.patch
deleted file mode 100644
index 009798c6f735..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/strict_proto_deps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-index e2118aabea..6a33f03472 100644
---- a/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-+++ b/src/main/starlark/builtins_bzl/common/java/proto/java_proto_library.bzl
-@@ -117,6 +117,7 @@ def java_compile_for_protos(ctx, output_jar_suffix, source_jar = None, deps = []
-             deps = deps,
-             exports = exports,
-             output_source_jar = source_jar,
-+            strict_deps = ctx.fragments.proto.strict_proto_deps(),
-             injecting_rule_kind = injecting_rule_kind,
-             javac_opts = java_toolchain.compatible_javacopts("proto"),
-             enable_jspecify = False,
-@@ -140,7 +141,7 @@ bazel_java_proto_aspect = aspect(
-     attr_aspects = ["deps", "exports"],
-     required_providers = [ProtoInfo],
-     provides = [JavaInfo, JavaProtoAspectInfo],
--    fragments = ["java"],
-+    fragments = ["java", "proto"],
- )
- 
- def bazel_java_proto_library_rule(ctx):
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
deleted file mode 100644
index 768804ecd555..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
+++ /dev/null
@@ -1,173 +0,0 @@
-{ lib
-  # tooling
-, callPackage
-, fetchFromGitHub
-, newScope
-, recurseIntoAttrs
-, runCommandCC
-, stdenv
-  # inputs
-, Foundation
-, bazel_self
-, lr
-, xe
-, lockfile
-, ...
-}:
-let
-  inherit (stdenv.hostPlatform) isDarwin;
-
-  testsDistDir = testsRepoCache;
-  testsRepoCache = callPackage ./bazel-repository-cache.nix {
-    # Bazel builtin tools versions are hard-coded in bazel. If the project
-    # lockfile has not been generated by the same bazel version as this one
-    # then it may be missing depeendencies for builtin tools. Export
-    # dependencies from baazel itself here, and let projects also import their
-    # own if need be. It's just a symlinkJoin after all. See ./cpp-test.nix
-    inherit lockfile;
-
-    # Take all the rules_ deps, bazel_ deps and their transitive dependencies,
-    # but none of the platform-specific binaries, as they are large and useless.
-    requiredDepNamePredicate = name:
-      name == "_main~bazel_build_deps~workspace_repo_cache"
-      || null == builtins.match ".*(macos|osx|linux|win|android|maven).*" name
-      && null != builtins.match "(platforms|com_google_|protobuf|rules_|.*bazel_|apple_support).*" name;
-  };
-
-  runLocal = name: attrs: script:
-    let
-      attrs' = removeAttrs attrs [ "buildInputs" ];
-      buildInputs = attrs.buildInputs or [ ];
-    in
-    runCommandCC name
-      ({
-        inherit buildInputs;
-        preferLocalBuild = true;
-        meta.platforms = bazel_self.meta.platforms;
-      } // attrs')
-      script;
-
-  # bazel wants to extract itself into $install_dir/install every time it runs,
-  # so let’s do that only once.
-  extracted = bazelPkg:
-    let
-      install_dir =
-        # `install_base` field printed by `bazel info`, minus the hash.
-        # yes, this path is kinda magic. Sorry.
-        "$HOME/.cache/bazel/_bazel_nixbld";
-    in
-    runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
-      export HOME=$(mktemp -d)
-      touch WORKSPACE # yeah, everything sucks
-      install_base="$(${bazelPkg}/bin/bazel info install_base)"
-      # assert it’s actually below install_dir
-      [[ "$install_base" =~ ${install_dir} ]] \
-        || (echo "oh no! $install_base but we are \
-      trying to copy ${install_dir} to $out instead!"; exit 1)
-      cp -R ${install_dir} $out
-    '';
-
-  bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [ ] }:
-    runLocal name
-      {
-        inherit buildInputs;
-        # Necessary for the tests to pass on Darwin with sandbox enabled.
-        __darwinAllowLocalNetworking = true;
-      }
-      ''
-        # Bazel needs a real home for self-extraction and internal cache
-        mkdir bazel_home
-        export HOME=$PWD/bazel_home
-
-        ${# Concurrent bazel invocations have the same workspace path.
-          # On darwin, for some reason, it means they access and corrupt the
-          # same outputRoot, outputUserRoot and outputBase
-          # Ensure they use build-local outputRoot by setting TEST_TMPDIR
-          lib.optionalString isDarwin ''
-            export TEST_TMPDIR=$HOME/.cache/bazel
-          ''
-        }
-        ${# Speed-up tests by caching bazel extraction.
-          # Except on Darwin, because nobody knows how Darwin works.
-          let bazelExtracted = extracted bazelPkg;
-          in lib.optionalString (!isDarwin) ''
-            mkdir -p ${bazelExtracted.install_dir}
-            cp -R ${bazelExtracted}/install ${bazelExtracted.install_dir}
-
-            # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
-            # Bazel checks whether the mtime of the install dir files
-            # is >9 years in the future, otherwise it extracts itself again.
-            # see PosixFileMTime::IsUntampered in src/main/cpp/util
-            # What the hell bazel.
-            ${lr}/bin/lr -0 -U ${bazelExtracted.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
-          ''
-        }
-        ${# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
-          # about why to create a subdir for the workspace.
-          ''cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd''
-        }
-        ${# run the actual test snippet
-          bazelScript
-        }
-        ${# Try to keep darwin clean of our garbage
-          lib.optionalString isDarwin ''
-            rm -rf $HOME || true
-          ''
-        }
-
-        touch $out
-      '';
-
-  bazel-examples = fetchFromGitHub {
-    owner = "bazelbuild";
-    repo = "examples";
-    rev = "93564e1f1e7a3c39d6a94acee12b8d7b74de3491";
-    hash = "sha256-DaPKp7Sn5uvfZRjdDx6grot3g3B7trqCyL0TRIdwg98=";
-  };
-
-  callBazelTests = bazel:
-    let
-      callBazelTest = newScope {
-        inherit runLocal bazelTest bazel-examples;
-        inherit Foundation;
-        inherit bazel;
-        distDir = testsDistDir;
-        extraBazelArgs = "--noenable_bzlmod";
-        repoCache = testsRepoCache;
-      };
-    in
-    recurseIntoAttrs (
-      (lib.optionalAttrs (!isDarwin) {
-        # `extracted` doesn’t work on darwin
-        shebang = callBazelTest ../shebang-test.nix {
-          inherit extracted;
-          extraBazelArgs = "--noenable_bzlmod";
-        };
-      }) // {
-        bashTools = callBazelTest ../bash-tools-test.nix { };
-        cpp = callBazelTest ./cpp-test.nix {
-          extraBazelArgs = "";
-        };
-        java = callBazelTest ./java-test.nix { };
-        pythonBinPath = callBazelTest ../python-bin-path-test.nix { };
-        protobuf = callBazelTest ./protobuf-test.nix { };
-      }
-    );
-
-  bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
-
-in
-recurseIntoAttrs {
-  distDir = testsDistDir;
-  testsRepoCache = testsRepoCache;
-
-  vanilla = callBazelTests bazel_self;
-  withNixHacks = callBazelTests bazelWithNixHacks;
-
-  # add some downstream packages using buildBazelPackage
-  downstream = recurseIntoAttrs ({
-    # TODO: fix bazel-watcher build with bazel 7, or find other packages
-    #inherit bazel-watcher;
-  });
-}
-
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/trim-last-argument-to-gcc-if-empty.patch b/pkgs/development/tools/build-managers/bazel/bazel_7/trim-last-argument-to-gcc-if-empty.patch
deleted file mode 100644
index c4a68218a0f8..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/trim-last-argument-to-gcc-if-empty.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tools/cpp/osx_cc_wrapper.sh.tpl b/tools/cpp/osx_cc_wrapper.sh.tpl
-index 8264090c29..b7b9e8537a 100644
---- a/tools/cpp/osx_cc_wrapper.sh.tpl
-+++ b/tools/cpp/osx_cc_wrapper.sh.tpl
-@@ -64,7 +64,11 @@ done
- %{env}
- 
- # Call the C++ compiler
--%{cc} "$@"
-+if [[ ${*: -1} = "" ]]; then
-+    %{cc} "${@:0:$#}"
-+else
-+    %{cc} "$@"
-+fi
- 
- function get_library_path() {
-     for libdir in ${LIB_DIRS}; do

From 3b413092b5b6d6f842e679f55384bd5770205487 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Thu, 5 Dec 2024 14:39:19 -0800
Subject: [PATCH 0109/1504] megacmd: format; better coding style (avoid rec;
 avoid with lib)

---
 pkgs/by-name/me/megacmd/package.nix | 63 +++++++++++++++++------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index 3e2625e9a7a8..c773fe5ccf1f 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -1,29 +1,33 @@
-{ lib
-, stdenv
-, autoreconfHook
-, c-ares
-, cryptopp
-, curl
-, fetchFromGitHub
+{
+  lib,
+  stdenv,
+  autoreconfHook,
+  c-ares,
+  cryptopp,
+  curl,
+  fetchFromGitHub,
   # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523.
   # to be re-enabled when patch available
-  # , ffmpeg
-, gcc-unwrapped
-, icu
-, libmediainfo
-, libraw
-, libsodium
-, libuv
-, libzen
-, pcre-cpp
-, pkg-config
-, readline
-, sqlite
+  # ffmpeg,
+  gcc-unwrapped,
+  icu,
+  libmediainfo,
+  libraw,
+  libsodium,
+  libuv,
+  libzen,
+  pcre-cpp,
+  pkg-config,
+  readline,
+  sqlite,
 }:
 
-stdenv.mkDerivation rec {
+let
   pname = "megacmd";
   version = "1.7.0";
+in
+stdenv.mkDerivation {
+  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "meganz";
@@ -34,7 +38,10 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
 
   buildInputs = [
     c-ares
@@ -71,11 +78,17 @@ stdenv.mkDerivation rec {
     "--with-termcap"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "MEGA Command Line Interactive and Scriptable Application";
     homepage = "https://mega.io/cmd";
-    license = with licenses; [ bsd2 gpl3Only ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with maintainers; [ lunik1 ];
+    license = with lib.licenses; [
+      bsd2
+      gpl3Only
+    ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
+    maintainers = with lib.maintainers; [ lunik1 ];
   };
 }

From 9e21c00cf1dfbe33371864b5d7d573088d1fada0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 02:35:46 +0000
Subject: [PATCH 0110/1504] duo-unix: 2.0.2 -> 2.0.4

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

diff --git a/pkgs/by-name/du/duo-unix/package.nix b/pkgs/by-name/du/duo-unix/package.nix
index 1d04cfef3544..8e60613ba5d3 100644
--- a/pkgs/by-name/du/duo-unix/package.nix
+++ b/pkgs/by-name/du/duo-unix/package.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "duo-unix";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchurl {
     url    = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "sha256-7huWd71SdnTe1ef8OoHgQKjYQKVpE8k/oNT7bA+OJR0=";
+    sha256 = "sha256-P7IVX4RyMER2BX99FJUgv2JZx7KddktiJ101rTJJwmQ=";
   };
 
   buildInputs = [ pam openssl zlib ];

From 4211063dc86534794842e8dfb88c597d774d4d62 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Thu, 5 Dec 2024 15:19:47 -0800
Subject: [PATCH 0111/1504] megacmd: fix build with ffmpeg; add option to build
 with freeimage

---
 pkgs/by-name/me/megacmd/fix-ffmpeg.patch | 29 ++++++++++++++++++++++++
 pkgs/by-name/me/megacmd/package.nix      | 22 +++++++++++-------
 2 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/me/megacmd/fix-ffmpeg.patch

diff --git a/pkgs/by-name/me/megacmd/fix-ffmpeg.patch b/pkgs/by-name/me/megacmd/fix-ffmpeg.patch
new file mode 100644
index 000000000000..45d6e85b373c
--- /dev/null
+++ b/pkgs/by-name/me/megacmd/fix-ffmpeg.patch
@@ -0,0 +1,29 @@
+--- a/sdk/src/gfx/freeimage.cpp
++++ b/sdk/src/gfx/freeimage.cpp
+@@ -216,11 +216,13 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s
+ 
+ #ifdef HAVE_FFMPEG
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 60
+ #ifdef AV_CODEC_CAP_TRUNCATED
+ #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+ #else
+ #define CAP_TRUNCATED CODEC_CAP_TRUNCATED
+ #endif
++#endif
+ 
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()
+ {
+@@ -323,10 +325,12 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
++#if LIBAVCODEC_VERSION_MAJOR < 60
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext->flags |= CAP_TRUNCATED;
+     }
++#endif
+ 
+     AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
+     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index c773fe5ccf1f..42ac1284fa7d 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -6,9 +6,8 @@
   cryptopp,
   curl,
   fetchFromGitHub,
-  # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523.
-  # to be re-enabled when patch available
-  # ffmpeg,
+  ffmpeg,
+  freeimage,
   gcc-unwrapped,
   icu,
   libmediainfo,
@@ -20,6 +19,7 @@
   pkg-config,
   readline,
   sqlite,
+  withFreeImage ? false, # default to false because freeimage is insecure
 }:
 
 let
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     c-ares
     cryptopp
     curl
-    # ffmpeg
+    ffmpeg
     icu
     gcc-unwrapped
     libmediainfo
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
     pcre-cpp
     readline
     sqlite
-  ];
+  ] ++ lib.optionals withFreeImage [ freeimage ];
 
   configureFlags = [
     "--disable-curl-checks"
@@ -66,8 +66,7 @@ stdenv.mkDerivation {
     "--with-cares"
     "--with-cryptopp"
     "--with-curl"
-    # "--with-ffmpeg"
-    "--without-freeimage" # disabled as freeimage is insecure
+    "--with-ffmpeg"
     "--with-icu"
     "--with-libmediainfo"
     "--with-libuv"
@@ -76,6 +75,10 @@ stdenv.mkDerivation {
     "--with-readline"
     "--with-sodium"
     "--with-termcap"
+  ] ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
+
+  patches = [
+    ./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085
   ];
 
   meta = {
@@ -89,6 +92,9 @@ stdenv.mkDerivation {
       "i686-linux"
       "x86_64-linux"
     ];
-    maintainers = with lib.maintainers; [ lunik1 ];
+    maintainers = with lib.maintainers; [
+      lunik1
+      ulysseszhan
+    ];
   };
 }

From 8f2613724084a3d843db76ebced1941946215f19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 09:29:52 +0000
Subject: [PATCH 0112/1504] python312Packages.reportlab: 4.2.4 -> 4.2.5

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 4a1991adefdf..9e35dff784b3 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -18,7 +18,7 @@ let
 in
 buildPythonPackage rec {
   pname = "reportlab";
-  version = "4.2.4";
+  version = "4.2.5";
   pyproject = true;
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oAtXKS4VanvahO3zHWDCVXgVMHbI+5YzHQxZ7d2gUsg=";
+    hash = "sha256-XPNbj9YJtoCArHu7CuHjdhBPfV97LTkUx63GPyWTlB8=";
   };
 
   postPatch = ''

From 1599f470b99a43cdb235bd5571f1e6df47b37e65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 10:20:56 +0000
Subject: [PATCH 0113/1504] python312Packages.pyperf: 2.7.0 -> 2.8.1

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

diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix
index 5c752a0834d1..bc1e12390431 100644
--- a/pkgs/development/python-modules/pyperf/default.nix
+++ b/pkgs/development/python-modules/pyperf/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyperf";
-  version = "2.7.0";
+  version = "2.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QgHGYBAy83TpyQDG0lRKL1iRq+3BqW7sDnsjOKYkdYk=";
+    hash = "sha256-7xA+IaTQSZkxUAMCai1lnEinz85eFEDwPW5yWRQAcTo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From ae11e32041c69ff01b248851f88479ed080225de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 11:50:45 +0000
Subject: [PATCH 0114/1504] python312Packages.apispec: 6.6.1 -> 6.8.0

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

diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index 9c487d1dd6f3..3d6f64302a36 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "apispec";
-  version = "6.6.1";
+  version = "6.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9cqkfO51/gO5xQtVlASLTAUu7KLCEuDawS27YXXZplk=";
+    hash = "sha256-hhzKgrvAZSyprOqJaSGyVJRFgDQv3oSfhvbawazGypY=";
   };
 
   nativeBuildInputs = [ flit-core ];

From ab20832614cb9332e92f8305309cdc4a80dfbed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 11:55:54 +0000
Subject: [PATCH 0115/1504] python312Packages.bottleneck: 1.4.0 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index f89ea81255e4..d85050c73961 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "bottleneck";
-  version = "1.4.0";
+  version = "1.4.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vrNt9Rm4cJ59NXwMljmwO4hcpjVbv15TdSxoXeUWBbg=";
+    hash = "sha256-+o6OF5nepUg85maUYmYPnZqVZJ9vmKgNMVuE7In0SfQ=";
   };
 
   propagatedBuildInputs = [ numpy ];

From 7f7f18a16a129e0c530bcdbe3269b2fa85fcc536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 15:09:12 +0000
Subject: [PATCH 0116/1504] python312Packages.pyipv8: 2.13.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix
index d4efef40e2d7..ad57f8ab09cd 100644
--- a/pkgs/development/python-modules/pyipv8/default.nix
+++ b/pkgs/development/python-modules/pyipv8/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "pyipv8";
-  version = "2.13.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Qp5vqMa7kfSp22C5KAUvut+4YbSXMEZRsHsLevB4QvE=";
+    hash = "sha256-e8HoKKA1s93LbmvHs7gJqmCcuZZ9REenBwxKJFR6wjM=";
   };
 
   propagatedBuildInputs = [

From c2681f24852a34c46d86082bbd0a9f5c08244fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9rence=20Chateign=C3=A9?=
 <terence.chateigne@theodo.com>
Date: Fri, 6 Dec 2024 12:34:00 +0100
Subject: [PATCH 0117/1504] aws-sso-util: init at 4.33.0

---
 pkgs/by-name/aw/aws-sso-util/package.nix      | 43 +++++++++++++++++++
 .../aws-error-utils/default.nix               | 38 ++++++++++++++++
 .../python-modules/aws-sso-lib/default.nix    | 40 +++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 4 files changed, 125 insertions(+)
 create mode 100644 pkgs/by-name/aw/aws-sso-util/package.nix
 create mode 100644 pkgs/development/python-modules/aws-error-utils/default.nix
 create mode 100644 pkgs/development/python-modules/aws-sso-lib/default.nix

diff --git a/pkgs/by-name/aw/aws-sso-util/package.nix b/pkgs/by-name/aw/aws-sso-util/package.nix
new file mode 100644
index 000000000000..c083f6254933
--- /dev/null
+++ b/pkgs/by-name/aw/aws-sso-util/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "aws-sso-util";
+  version = "4.33.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "aws_sso_util";
+    inherit version;
+    hash = "sha256-5I1/WRFENFDSjhrBYT+BuaoVursbIFW0Ux34fbQ6Cd8=";
+  };
+
+  build-system = [
+    python3Packages.poetry-core
+  ];
+
+  dependencies = with python3Packages; [
+    aws-error-utils
+    aws-sso-lib
+    boto3
+    click
+    jsonschema
+    python-dateutil
+    pyyaml
+    requests
+  ];
+
+  meta = {
+    description = "Utilities to make AWS SSO easier";
+    homepage = "https://pypi.org/project/aws-sso-util/";
+    downloadPage = "https://pypi.org/project/aws-sso-util/#files";
+    changelog = "https://github.com/benkehoe/aws-sso-util/releases";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cterence ];
+    mainProgram = "aws-sso-util";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/aws-error-utils/default.nix b/pkgs/development/python-modules/aws-error-utils/default.nix
new file mode 100644
index 000000000000..ed4de1388093
--- /dev/null
+++ b/pkgs/development/python-modules/aws-error-utils/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  botocore,
+}:
+
+buildPythonPackage rec {
+  pname = "aws-error-utils";
+  version = "2.7.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "aws_error_utils";
+    inherit version;
+    hash = "sha256-BxB68qLCZwbNlSW3/77UPy0HtQ0n45+ekVbBGy6ZPJc=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    botocore
+  ];
+
+  pythonImportsCheck = [
+    "aws_error_utils"
+  ];
+
+  meta = {
+    description = "Error-handling functions for boto3/botocore";
+    homepage = "https://pypi.org/project/aws-error-utils/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cterence ];
+  };
+}
diff --git a/pkgs/development/python-modules/aws-sso-lib/default.nix b/pkgs/development/python-modules/aws-sso-lib/default.nix
new file mode 100644
index 000000000000..21afcf8aab8f
--- /dev/null
+++ b/pkgs/development/python-modules/aws-sso-lib/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  aws-error-utils,
+  boto3,
+}:
+
+buildPythonPackage rec {
+  pname = "aws-sso-lib";
+  version = "1.14.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "aws_sso_lib";
+    inherit version;
+    hash = "sha256-sCA6ZMy2a6ePme89DrZpr/57wyP2q5yqyX81whoDzqU=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    aws-error-utils
+    boto3
+  ];
+
+  pythonImportsCheck = [
+    "aws_sso_lib"
+  ];
+
+  meta = {
+    description = "Library to make AWS SSO easier";
+    homepage = "https://pypi.org/project/aws-sso-lib/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cterence ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b493f35e4161..2c3975e969dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1105,6 +1105,8 @@ self: super: with self; {
 
   aws-encryption-sdk = callPackage ../development/python-modules/aws-encryption-sdk { };
 
+  aws-error-utils = callPackage ../development/python-modules/aws-error-utils { };
+
   aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { };
 
   aws-request-signer = callPackage ../development/python-modules/aws-request-signer { };
@@ -1113,6 +1115,8 @@ self: super: with self; {
 
   aws-secretsmanager-caching = callPackage ../development/python-modules/aws-secretsmanager-caching { };
 
+  aws-sso-lib = callPackage ../development/python-modules/aws-sso-lib { };
+
   aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };
 
   awscrt = callPackage ../development/python-modules/awscrt {

From 23aca92fa2d41cc3eca4ea010c1cbef970c2d1e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 19:54:35 +0000
Subject: [PATCH 0118/1504] bitwarden-menu: 0.4.3 -> 0.4.5

---
 pkgs/applications/misc/bitwarden-menu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix
index bfb1d646a919..2525e3f65b88 100644
--- a/pkgs/applications/misc/bitwarden-menu/default.nix
+++ b/pkgs/applications/misc/bitwarden-menu/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonApplication rec {
   pname = "bitwarden-menu";
-  version = "0.4.3";
+  version = "0.4.5";
   pyproject = true;
 
   src = fetchPypi {
     pname = "bitwarden_menu";
     inherit version;
-    hash = "sha256-tuIolWvQ/vKSJr6oUTL7ZLPgdkYsIZods5yQNNfWbWY=";
+    hash = "sha256-vUlNqSVdGhfN5WjDjf1ub32Y2WoBndIdFzfCNwo5+Vg=";
   };
 
   nativeBuildInputs = with python3Packages; [

From fbe948038821c9309c724b9a82da41e2d586bded Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 05:41:49 +0000
Subject: [PATCH 0119/1504] python312Packages.mkdocs-git-authors-plugin: 0.9.0
 -> 0.9.2

---
 .../python-modules/mkdocs-git-authors-plugin/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix
index 0c346aac1d0c..3d9997d25a20 100644
--- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-git-authors-plugin";
-  version = "0.9.0";
+  version = "0.9.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timvink";
     repo = "mkdocs-git-authors-plugin";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-UomcEXWNt5aVE9JxP9wskkHkFYXKN/+jXwr1SXCmeyE=";
+    tag = "v${version}";
+    hash = "sha256-2ITro34lZ+tz7ev7Yuh1wJjsSNik6VUTt3dupIajmLU=";
   };
 
   propagatedBuildInputs = [ mkdocs ];

From 0be5b527df50ddb32636b9281f0311ec6fdcce4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 12:15:13 +0000
Subject: [PATCH 0120/1504] python312Packages.cx-freeze: 7.2.2 -> 7.2.7

---
 .../python-modules/cx-freeze/default.nix      | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index ea2d9d1b0ca6..92713066e5ba 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   distutils,
   fetchPypi,
@@ -8,21 +9,24 @@
   packaging,
   setuptools,
   filelock,
-  wheel,
   patchelf,
+  tomli,
+  importlib-metadata,
+  typing-extensions,
+  dmgbuild,
 }:
 
 buildPythonPackage rec {
   pname = "cx-freeze";
-  version = "7.2.2";
+  version = "7.2.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "cx_freeze";
     inherit version;
-    hash = "sha256-6bLEvWjr9PuZtq8v8oHA5TewSa7pSIBcxKAo4XGKvGo=";
+    hash = "sha256-xNQ6TlNXNSrFqJID/aOoz63wM9Q2gvc6u+/ThgzlD7Q=";
   };
 
   postPatch = ''
@@ -34,18 +38,25 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    wheel
   ];
 
   buildInputs = [ ncurses ];
 
-  dependencies = [
-    distutils
-    filelock
-    packaging
-    setuptools
-    wheel
-  ];
+  dependencies =
+    [
+      distutils
+      packaging
+      setuptools
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [
+      tomli
+    ]
+    ++ lib.optionals (pythonOlder "3.10") [
+      importlib-metadata
+      typing-extensions
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux filelock
+    ++ lib.optional stdenv.hostPlatform.isDarwin dmgbuild;
 
   makeWrapperArgs = [
     "--prefix"

From 277733f91c36aac932685835a24f39bc838e44c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 07:46:40 +0000
Subject: [PATCH 0121/1504] python312Packages.pywebview: 5.2 -> 5.3.2

---
 pkgs/development/python-modules/pywebview/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index 6346c96c62fc..e6148c3a5b47 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pywebview";
-  version = "5.2";
+  version = "5.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "r0x0r";
     repo = "pywebview";
-    rev = "refs/tags/${version}";
-    hash = "sha256-PNnsqb+gyeFfQwMFj7cYaiv54cZ+H5IF9+DS9RN/qB4=";
+    tag = version;
+    hash = "sha256-/jKauq+G3Nz91n/keTZGNDTaW5EhdyCx4c2Nylxqc+0=";
   };
 
   nativeBuildInputs = [

From cb90cde22ba6db17630dd151b59b78ab9e58c7a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 09:52:28 +0000
Subject: [PATCH 0122/1504] python312Packages.pypiserver: 2.2.0 -> 2.3.2

---
 pkgs/development/python-modules/pypiserver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index 6202ae3156cf..c998ff590949 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pypiserver";
-  version = "2.2.0";
+  version = "2.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypiserver";
     repo = "pypiserver";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-5GJthS3kWOyWvYW+mYnIcNKD3fgSVexABZ+DpVh7qkE=";
+    tag = "v${version}";
+    hash = "sha256-ODwDYAEAqel31+kR/BE1yBfgOZOtPz3iaCLg/d6jbb4=";
   };
 
   build-system = [

From fb04c1e4b029560ec7233398cfc1df5d90cd9e4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 20:05:15 +0000
Subject: [PATCH 0123/1504] parsedmarc: 8.15.4 -> 8.16.0

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

diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index dc118008ef9b..8459bb02335f 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -42,14 +42,14 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "8.15.4";
+  version = "8.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lxW92jlSWgGVxOO+CwIZi5sKHqoZuR5VQCnDVORXmXU=";
+    hash = "sha256-yoDvEja9UIubfWfpfEE/LhPa085QM3B5TmiwOPRBDDA=";
   };
 
   nativeBuildInputs = [

From 687be0d94e92ed3a6eeeafa15963922d68c02a78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 03:15:56 +0000
Subject: [PATCH 0124/1504] python312Packages.awswrangler: 3.9.1 -> 3.10.1

---
 pkgs/development/python-modules/awswrangler/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index 5ef6e53e6743..ddbcc8213dfb 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "awswrangler";
-  version = "3.9.1";
+  version = "3.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,8 +33,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-pandas";
-    rev = "refs/tags/${version}";
-    hash = "sha256-k+jQj/EajjjvvXZJd8c/3vtaGrQJedbYSDIzel0Sp44=";
+    tag = version;
+    hash = "sha256-JR1gO24biFluwqZAIQMFGjjbn9VBxTlAS8i76N82onc=";
   };
 
   pythonRelaxDeps = [ "packaging" ];

From 20847c0e357524a3252865ab34acd3b0e0737252 Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Sun, 8 Dec 2024 16:56:51 +0100
Subject: [PATCH 0125/1504] Revert "jellyfin-media-player: 1.10.1 -> 1.11.1"

This reverts commit cd180e8ae912db00b09a915937a03b650c22f8b9.
---
 .../video/jellyfin-media-player/default.nix   | 16 ++++++++---
 .../jellyfin-media-player/fix-web-path.patch  | 28 +++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/video/jellyfin-media-player/fix-web-path.patch

diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index 6c25495b0341..f141ff0f3654 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -21,21 +21,24 @@
 , qtwebchannel
 , qtwebengine
 , qtx11extras
-, withDbus ? stdenv.hostPlatform.isLinux
+, jellyfin-web
+, withDbus ? stdenv.isLinux
 }:
 
 mkDerivation rec {
   pname = "jellyfin-media-player";
-  version = "1.11.1";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-media-player";
     rev = "v${version}";
-    sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU=";
+    sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE=";
   };
 
   patches = [
+    # fix the location of the jellyfin-web path
+    ./fix-web-path.patch
     # disable update notifications since the end user can't simply download the release artifacts to update
     ./disable-update-notifications.patch
   ];
@@ -74,7 +77,12 @@ mkDerivation rec {
     "-DLINUX_X11POWER=ON"
   ];
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  preConfigure = ''
+    # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
+    ln -s ${jellyfin-web}/share/jellyfin-web .
+  '';
+
+  postInstall = lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/bin $out/Applications
     mv "$out/Jellyfin Media Player.app" $out/Applications
     ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer
diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
new file mode 100644
index 000000000000..250a5c069545
--- /dev/null
+++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
@@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5abca9b..d09176b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -107,10 +107,8 @@ endif()
+ set(RESOURCE_ROOT .)
+ if(APPLE)
+   set(RESOURCE_ROOT Resources)
+-  if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
+-    add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
+-  endif()
+-  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
++  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
++  install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
+ endif()
+ 
+ if(NOT APPLE)
+@@ -123,9 +121,7 @@ if(NOT APPLE)
+       install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
+     endif()
+   endforeach()
+-  if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
+-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
+-  endif()
++  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
+   install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
+ endif()
+ 

From 61cc7a311a3fc5323e149b941bf08987818ad65f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 17:19:19 +0000
Subject: [PATCH 0126/1504] xml2rfc: 3.24.0 -> 3.25.0

---
 pkgs/development/python-modules/xml2rfc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index 1119a300b541..e191168c382e 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "3.24.0";
+  version = "3.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,8 +32,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ietf-tools";
     repo = "xml2rfc";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-cymClLsXPeuWsRMbFJHO55ASzEbau++XvYoBsquDv+Y=";
+    tag = "v${version}";
+    hash = "sha256-hBQ90OtqRWVgr9EHf2EWm1KSy7di1PcrOJ7O+5bLK6I=";
   };
 
   postPatch = ''

From 7f07e847b3d18327e386d0d9d6cf262a10825709 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 18:36:09 +0000
Subject: [PATCH 0127/1504] python312Packages.mkdocs-drawio-exporter: 0.9.1 ->
 0.10.1

---
 .../python-modules/mkdocs-drawio-exporter/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix
index 76807fa2df39..0609cf4019d8 100644
--- a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix
+++ b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-drawio-exporter";
-  version = "0.9.1";
+  version = "0.10.1";
   pyproject = true;
 
   disabled = !isPy3k;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mkdocs_drawio_exporter";
     inherit version;
-    hash = "sha256-x8X8hvN/tL8C6VhgMCEHDh2hILjBoyLgQfsFD1+qXgo=";
+    hash = "sha256-7DbJE5UHXRO3kQYM2HuzxQeEhWBKFE06WFSf5GTYGZ8=";
   };
 
   build-system = [ poetry-core ];

From 340016f92aae2012c9b2bae783702bce6ba7c8e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 20:00:11 +0000
Subject: [PATCH 0128/1504] python312Packages.rotary-embedding-torch: 0.8.5 ->
 0.8.6

---
 .../python-modules/rotary-embedding-torch/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
index aa8c563a5218..facd9e0b2363 100644
--- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix
+++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "rotary-embedding-torch";
-  version = "0.8.5";
+  version = "0.8.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "rotary-embedding-torch";
-    rev = "refs/tags/${version}";
-    hash = "sha256-sd2zi0dKXLo9HCFDQrLr4icaJnwWeMPoaeTV8qaoyhQ=";
+    tag = version;
+    hash = "sha256-4/vKf5RwWbiFYKCQo4kAQzXLM85L4CwaL/MR7/xTkH8=";
   };
 
   nativeBuildInputs = [

From d62793a21854df347652d086be7512addbb33da2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 20:11:46 +0000
Subject: [PATCH 0129/1504] python312Packages.meraki: 1.52.0 -> 1.53.0

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

diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix
index 14ff9dcf67e1..7c258307de3a 100644
--- a/pkgs/development/python-modules/meraki/default.nix
+++ b/pkgs/development/python-modules/meraki/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "meraki";
-  version = "1.52.0";
+  version = "1.53.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8fNrHRZZ58FW0UOBdbUUzI3y+Y6kAyue4uHnPoODdzw=";
+    hash = "sha256-GC07gpx0Yeajm8LPcHFtkz/Uuc4kO46TUQs58/IEzyg=";
   };
 
   propagatedBuildInputs = [

From d15991ac20a4a3c7b2b796a18f318efc954fd4a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 20:54:25 +0000
Subject: [PATCH 0130/1504] python312Packages.amqp: 5.3.0 -> 5.3.1

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

diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix
index 2882bd23bde7..2c9b4200c946 100644
--- a/pkgs/development/python-modules/amqp/default.nix
+++ b/pkgs/development/python-modules/amqp/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "amqp";
-  version = "5.3.0";
+  version = "5.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ET5mMQai+wEjyQMNQr85WbliSSg/8UI6sH9crQYtNvc=";
+    hash = "sha256-zdwAxyVElSICO62Un3D/97SPCxredNFwpvEKsERzlDI=";
   };
 
   propagatedBuildInputs = [ vine ];

From de9443a6ac753977cf69e87d253de424850275ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Dec 2024 06:25:22 +0000
Subject: [PATCH 0131/1504] python312Packages.logbook: 1.7.0.post0 -> 1.8.0

---
 pkgs/development/python-modules/logbook/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix
index 5750985977a3..bc2bf5460b1a 100644
--- a/pkgs/development/python-modules/logbook/default.nix
+++ b/pkgs/development/python-modules/logbook/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "logbook";
-  version = "1.7.0.post0";
+  version = "1.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getlogbook";
     repo = "logbook";
-    rev = "refs/tags/${version}";
-    hash = "sha256-bqfFSd7CPYII/3AJCMApqmAYrAWjecOb3JA17FPFMIc=";
+    tag = version;
+    hash = "sha256-SpM7LQVcQ9eJ88QDpq/3rq04jr0zrrrQuTeqtz9xsng=";
   };
 
   nativeBuildInputs = [

From fcea1379ec3e05f67e7d09da5a563b08aca0d667 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 9 Dec 2024 08:31:01 +0100
Subject: [PATCH 0132/1504] xapian: 1.4.26 -> 1.4.27

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/libraries/xapian/default.nix             | 2 +-
 pkgs/development/libraries/xapian/tools/omega/default.nix | 2 +-
 pkgs/development/python-modules/xapian/default.nix        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index c8a28166a7a4..502a9e5809c9 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -64,5 +64,5 @@ in {
   # Don't forget to change the hashes in xapian-omega and
   # python3Packages.xapian. They inherit the version from this package, and
   # should always be built with the equivalent xapian version.
-  xapian_1_4 = generic "1.4.26" "sha256-nmp5A4BpZtFs4iC0k3fJyPrWZ8jw/8sjo0QpRiaTY6c=";
+  xapian_1_4 = generic "1.4.27" "sha256-vLyZz78WCAEZwlcfwpZ5T1Ob1ULKOSbxfCmZYAgwq2E=";
 }
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index adde4f0c3420..dc77d08a1bb4 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
-    hash = "sha256-pbI4bhsE34TRFJqenFvPxeRyammmnaZBuGxo15ln2uQ=";
+    hash = "sha256-HRk7MoXsFQVXJXsEnuHYyUxAvN6QbOC6fxo4oamlpcE=";
   };
 
   buildInputs = [ xapian perl pcre2 zlib libmagic ];
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index fea907243d70..6f2a5020418d 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
-    hash = "sha256-VQhzVz7gQBGZ+DX+9R3ficp7wm97jRvcylnaZD+zyoE=";
+    hash = "sha256-ujteEICeV5rNEb0WV3nOP9KaiQTqN5aO9bV62Xw2GLo=";
   };
 
   configureFlags = [

From 43300fe72a15df8c6199b1c7c93ca7cdbea39daa Mon Sep 17 00:00:00 2001
From: Illia Ostapyshyn <illia@yshyn.com>
Date: Mon, 9 Dec 2024 16:44:16 +0100
Subject: [PATCH 0133/1504] nixos/qemu-vm: set permissions for tmpfs root

World-writable fs root breaks ssh key authentication (and likely other
programs).
---
 nixos/modules/virtualisation/qemu-vm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index be0f9afb0e5d..763ccb5cecaf 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -1267,6 +1267,7 @@ in
               {
                 device = "tmpfs";
                 fsType = "tmpfs";
+                options = [ "mode=755" ];
               }
             else
               {

From 7ca4fd4014f6fec2eef90dbb9ed5c7acca6ca02d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Dec 2024 19:36:43 +0000
Subject: [PATCH 0134/1504] kubernetes-helmPlugins.helm-unittest: 0.6.3 ->
 0.7.0

---
 .../networking/cluster/helm/plugins/helm-unittest.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index 91fca231275a..2bdd10248afd 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helm-unittest";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-OXl3Ax/sqCNcj2uDb0VctJ6Njrd5blkFuur6FT9HOl4=";
+    hash = "sha256-Ma/UcG+DkUR2FqRKFGMjPxMXDrbcbytZVi59zaK1W0k=";
   };
 
-  vendorHash = "sha256-i9H65843XynaaNQLIQkBcgDsjnft3nxz6eWdZM9Dn9U=";
+  vendorHash = "sha256-7LI08qFcNRyZEZXVWpu2PR2PwpRlcTLIcE05Y5YgABg=";
 
   # NOTE: Remove the install and upgrade hooks.
   postPatch = ''

From eb6ea54db50b5f381779c6edb806e251b1768aa6 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 10 Dec 2024 06:09:53 +0000
Subject: [PATCH 0135/1504] zsh-you-should-use: modernize

---
 pkgs/by-name/zs/zsh-you-should-use/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
index 0746754ecfef..b76c2ba06fb4 100644
--- a/pkgs/by-name/zs/zsh-you-should-use/package.nix
+++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenvNoCC, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-you-should-use";
   version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "MichaelAquilina";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-+3iAmWXSsc4OhFZqAMTwOL7AAHBp5ZtGGtvqCnEOYc0=";
+    repo = "zsh-you-should-use";
+    tag = finalAttrs.version;
+    hash = "sha256-+3iAmWXSsc4OhFZqAMTwOL7AAHBp5ZtGGtvqCnEOYc0=";
   };
 
   strictDeps = true;
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
     install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
     maintainers = [ ];
   };
-}
+})

From 842c83c040f3620854bc094e7b186965149f19cd Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 10 Dec 2024 06:11:04 +0000
Subject: [PATCH 0136/1504] zsh-you-should-use: adopt

---
 pkgs/by-name/zs/zsh-you-should-use/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
index b76c2ba06fb4..e39bd39e5275 100644
--- a/pkgs/by-name/zs/zsh-you-should-use/package.nix
+++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix
@@ -22,6 +22,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
     license = lib.licenses.gpl3;
     description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tomodachi94 ];
   };
 })

From da186a6585ca1d24abf1bf94daf8deb15686fb11 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 10 Dec 2024 06:18:45 +0000
Subject: [PATCH 0137/1504] zsh-you-should-use: add update script

---
 pkgs/by-name/zs/zsh-you-should-use/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
index e39bd39e5275..00694cd5713b 100644
--- a/pkgs/by-name/zs/zsh-you-should-use/package.nix
+++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{ lib, stdenvNoCC, fetchFromGitHub, gitUpdater }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-you-should-use";
@@ -18,6 +18,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
     license = lib.licenses.gpl3;

From 98738252fb9cbf19354bab16793c43b56a791cb8 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 10 Dec 2024 06:55:44 +0000
Subject: [PATCH 0138/1504] zsh-you-should-use: hardcode tput dependency

---
 pkgs/by-name/zs/zsh-you-should-use/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
index 00694cd5713b..03c184edaca3 100644
--- a/pkgs/by-name/zs/zsh-you-should-use/package.nix
+++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchFromGitHub, gitUpdater }:
+{ lib, stdenvNoCC, ncurses, fetchFromGitHub, gitUpdater }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-you-should-use";
@@ -14,6 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   strictDeps = true;
   dontBuild = true;
 
+  postPatch = ''
+    substituteInPlace you-should-use.plugin.zsh \
+      --replace-fail "tput" "${lib.getExe' ncurses "tput"}"
+  '';
+
   installPhase = ''
     install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
   '';

From 22b6ee8848bca70e6ceb81dd2c81e5db81c58aeb Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Mon, 9 Dec 2024 16:12:03 +0100
Subject: [PATCH 0139/1504] jellyfin-media-player: 1.10.1 -> 1.11.1

---
 .../video/jellyfin-media-player/default.nix   |  6 ++--
 .../jellyfin-media-player/fix-web-path.patch  | 28 +++++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index f141ff0f3654..e9ec8aa67275 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -22,18 +22,18 @@
 , qtwebengine
 , qtx11extras
 , jellyfin-web
-, withDbus ? stdenv.isLinux
+, withDbus ? stdenv.hostPlatform.isLinux
 }:
 
 mkDerivation rec {
   pname = "jellyfin-media-player";
-  version = "1.10.1";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-media-player";
     rev = "v${version}";
-    sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE=";
+    sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU=";
   };
 
   patches = [
diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
index 250a5c069545..3f182fd407ef 100644
--- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
+++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
@@ -1,28 +1,38 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5abca9b..d09176b 100644
+index 9df49da..be1c479 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -107,10 +107,8 @@ endif()
+@@ -106,7 +106,8 @@ endif()
  set(RESOURCE_ROOT .)
  if(APPLE)
    set(RESOURCE_ROOT Resources)
--  if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
--    add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
--  endif()
 -  add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
 +  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
 +  install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
  endif()
  
  if(NOT APPLE)
-@@ -123,9 +121,7 @@ if(NOT APPLE)
+@@ -119,6 +120,7 @@ if(NOT APPLE)
        install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
      endif()
    endforeach()
--  if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
--  endif()
 +  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
    install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
  endif()
  
+diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp
+index c398523..7023948 100644
+--- a/src/settings/SettingsComponent.cpp
++++ b/src/settings/SettingsComponent.cpp
+@@ -748,7 +748,7 @@ QString SettingsComponent::getWebClientUrl(bool desktop)
+ 
+   if (url == "bundled")
+   {
+-    auto path = Paths::webExtensionPath() + "find-webclient.html";
++    auto path = Paths::webClientPath("desktop");
+ 
+     url = "file:///" + path;
+   }
+-- 
+2.36.0
+

From afa059a15ba28b5524399861d114909c35490cfc Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Mon, 9 Dec 2024 16:47:09 +0100
Subject: [PATCH 0140/1504] jellyfin-media-player: added paumr as maintainer

---
 pkgs/applications/video/jellyfin-media-player/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index e9ec8aa67275..174cb55de29d 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -93,7 +93,7 @@ mkDerivation rec {
     description = "Jellyfin Desktop Client based on Plex Media Player";
     license = with licenses; [ gpl2Only mit ];
     platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
-    maintainers = with maintainers; [ jojosch kranzes ];
+    maintainers = with maintainers; [ jojosch kranzes paumr ];
     mainProgram = "jellyfinmediaplayer";
   };
 }

From f80685980500d9fa840cbf25a6e46e61845a808d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Tue, 10 Dec 2024 15:49:24 +0200
Subject: [PATCH 0141/1504] python3Packages.zephyr-python-api: modernize code

Update the python recipe to the new nixpkgs standard.
---
 .../python-modules/zephyr-python-api/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/zephyr-python-api/default.nix b/pkgs/development/python-modules/zephyr-python-api/default.nix
index 9c6b37486336..87c113d99245 100644
--- a/pkgs/development/python-modules/zephyr-python-api/default.nix
+++ b/pkgs/development/python-modules/zephyr-python-api/default.nix
@@ -9,7 +9,7 @@
 buildPythonPackage rec {
   pname = "zephyr-python-api";
   version = "0.1.0";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "zephyr_python_api";
@@ -17,9 +17,9 @@ buildPythonPackage rec {
     hash = "sha256-YupGiybfhwb+I4ofr6RNBzS6LQfx5BQD/SU5nYrnqFk=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ requests ];
+  dependencies = [ requests ];
 
   # No tests in archive
   doCheck = false;

From 640ef7805e2a18bac4dce853860659a8120518c3 Mon Sep 17 00:00:00 2001
From: Willow <willow.ch@protonmail.com>
Date: Fri, 15 Dec 2023 16:19:42 -0600
Subject: [PATCH 0142/1504] caper: init at 0.9

caper: apply recommended changes

Co-authored-by: Yohann Boniface <edhyjox@gmail.com>

caper: apply recommended changes

caper: apply nixfmt

caper: apply nixfmt rfc style
---
 maintainers/maintainer-list.nix   |  4 +-
 pkgs/by-name/ca/caper/package.nix | 64 +++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ca/caper/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fb9bcf8f0a3b..a3db4fff93a5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19724,9 +19724,7 @@
     github = "spaghetus";
     githubId = 28763739;
     name = "Willow Carlson-Huber";
-    keys = [{
-      fingerprint = "FE21E0981CDFD50ADD086423C21A693BA4693A60";
-    }];
+    keys = [ { fingerprint = "FE21E0981CDFD50ADD086423C21A693BA4693A60"; } ];
   };
   willswats = {
     email = "williamstuwatson@gmail.com";
diff --git a/pkgs/by-name/ca/caper/package.nix b/pkgs/by-name/ca/caper/package.nix
new file mode 100644
index 000000000000..f7dc73b829de
--- /dev/null
+++ b/pkgs/by-name/ca/caper/package.nix
@@ -0,0 +1,64 @@
+{
+  stdenv,
+  lib,
+  ocaml,
+  ocamlPackages,
+  gnum4,
+  fetchFromGitLab,
+}:
+stdenv.mkDerivation rec {
+  pname = "caper";
+  version = "0.9";
+
+  src = fetchFromGitLab {
+    owner = "niksu";
+    repo = "caper";
+    rev = "v${version}";
+    hash = "sha256-TSryjz0NrGdkc+6vmfBqsuVpV3N9FvteTFsVqpUcm0w=";
+  };
+
+  nativeBuildInputs = [
+    ocaml
+    ocamlPackages.ocamlbuild
+    ocamlPackages.findlib
+    ocamlPackages.menhir
+    gnum4
+  ];
+
+  buildInputs = [
+    ocamlPackages.angstrom
+  ];
+
+  strictDeps = true;
+
+  buildPhase = ''
+    runHook preBuild
+    CAPER_WITH_ENGLISH=yes bash build.sh caper.native
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp caper.native $out/bin/caper
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Tool for understanding and processing pcap (packet capture) expressions";
+    longDescription = ''
+      Caper is a tool for understanding and processing "pcap expressions" (also known as *tcpdump filters*) which are used for network packet analysis.
+      Caper can be used for:
+      * Expanding out pcap expressions "in full" to understand their implicit features.
+      * Reasoning about whether two expressions accept the same set of packets, or how their accepted packets differ.
+      * Converting pcap expressions into BPF programs.
+      * Converting between pcap expressions and English.
+
+      More info can be found in the Caper paper (https://www.nik.network/caper/pcap_semantics.pdf).
+    '';
+    homepage = "https://gitlab.com/niksu/caper";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ willow_ch ];
+    mainProgram = "caper";
+  };
+}

From f1bdc1213bf0b68e2e5349c02e5a2450093fc757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Thu, 21 Nov 2024 21:11:12 +0200
Subject: [PATCH 0143/1504] headscale: backport BaseDomain and ServerURL checks

Currently users upgrading from 24.05 to 24.11 may stumble across an
overly-restrictive BaseURL and ServerURL check in headscale[1].

A fix has been merged upstream[2], this is backport, so users can have
it easier upgrading from 24.05 to 24.11 or unstable.

The patch does not apply cleanly on v0.23.0, so putting it here instead.

Supersedes #357969, this will be backported to 24.11 with a tag.

[1]: https://github.com/juanfont/headscale/issues/2210
[2]: https://github.com/juanfont/headscale/pull/2248
---
 pkgs/servers/headscale/default.nix            |   3 +
 ...n-up-BaseDomain-and-ServerURL-checks.patch | 204 ++++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch

diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index 4d3b1921f9ae..1287d3668ea9 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -16,6 +16,9 @@ buildGoModule rec {
     hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=";
   };
 
+  # Merged post-v0.23.0, so should be removed with next release.
+  patches = [ ./patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch ];
+
   vendorHash = "sha256-+8dOxPG/Q+wuHgRwwWqdphHOuop0W9dVyClyQuh7aRc=";
 
   ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
diff --git a/pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch b/pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch
new file mode 100644
index 000000000000..d226bc99ceff
--- /dev/null
+++ b/pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch
@@ -0,0 +1,204 @@
+From 6ba8990b0b982b261b0b549080a2f7f780cc70d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
+Date: Thu, 21 Nov 2024 06:28:45 +0200
+Subject: [PATCH] config: loosen up BaseDomain and ServerURL checks
+
+Requirements [here][1]:
+
+> OK:
+> server_url: headscale.com, base: clients.headscale.com
+> server_url: headscale.com, base: headscale.net
+>
+> Not OK:
+> server_url: server.headscale.com, base: headscale.com
+>
+> Essentially we have to prevent the possibility where the headscale
+> server has a URL which can also be assigned to a node.
+>
+> So for the Not OK scenario:
+>
+> if the server is: server.headscale.com, and a node joins with the name
+> server, it will be assigned server.headscale.com and that will break
+> the connection for nodes which will now try to connect to that node
+> instead of the headscale server.
+
+Fixes #2210
+
+[1]: https://github.com/juanfont/headscale/issues/2210#issuecomment-2488165187
+---
+ hscontrol/types/config.go                     | 44 +++++++++++--
+ hscontrol/types/config_test.go                | 64 ++++++++++++++++++-
+ .../testdata/base-domain-in-server-url.yaml   |  2 +-
+ 3 files changed, 102 insertions(+), 8 deletions(-)
+
+diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go
+index 50ce2f075f4c..b10118aaeade 100644
+--- a/hscontrol/types/config.go
++++ b/hscontrol/types/config.go
+@@ -28,8 +28,9 @@ const (
+ 	maxDuration           time.Duration = 1<<63 - 1
+ )
+ 
+-var errOidcMutuallyExclusive = errors.New(
+-	"oidc_client_secret and oidc_client_secret_path are mutually exclusive",
++var (
++	errOidcMutuallyExclusive = errors.New("oidc_client_secret and oidc_client_secret_path are mutually exclusive")
++	errServerURLSuffix       = errors.New("server_url cannot be part of base_domain in a way that could make the DERP and headscale server unreachable")
+ )
+ 
+ type IPAllocationStrategy string
+@@ -814,10 +815,10 @@ func LoadServerConfig() (*Config, error) {
+ 	// - DERP run on their own domains
+ 	// - Control plane runs on login.tailscale.com/controlplane.tailscale.com
+ 	// - MagicDNS (BaseDomain) for users is on a *.ts.net domain per tailnet (e.g. tail-scale.ts.net)
+-	//
+-	// TODO(kradalby): remove dnsConfig.UserNameInMagicDNS check when removed.
+-	if !dnsConfig.UserNameInMagicDNS && dnsConfig.BaseDomain != "" && strings.Contains(serverURL, dnsConfig.BaseDomain) {
+-		return nil, errors.New("server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.")
++	if !dnsConfig.UserNameInMagicDNS && dnsConfig.BaseDomain != "" {
++		if err := isSafeServerURL(serverURL, dnsConfig.BaseDomain); err != nil {
++			return nil, err
++		}
+ 	}
+ 
+ 	return &Config{
+@@ -910,6 +911,37 @@ func LoadServerConfig() (*Config, error) {
+ 	}, nil
+ }
+ 
++// BaseDomain cannot be a suffix of the server URL.
++// This is because Tailscale takes over the domain in BaseDomain,
++// causing the headscale server and DERP to be unreachable.
++// For Tailscale upstream, the following is true:
++// - DERP run on their own domains.
++// - Control plane runs on login.tailscale.com/controlplane.tailscale.com.
++// - MagicDNS (BaseDomain) for users is on a *.ts.net domain per tailnet (e.g. tail-scale.ts.net).
++func isSafeServerURL(serverURL, baseDomain string) error {
++	server, err := url.Parse(serverURL)
++	if err != nil {
++		return err
++	}
++
++	serverDomainParts := strings.Split(server.Host, ".")
++	baseDomainParts := strings.Split(baseDomain, ".")
++
++	if len(serverDomainParts) <= len(baseDomainParts) {
++		return nil
++	}
++
++	s := len(serverDomainParts)
++	b := len(baseDomainParts)
++	for i := range len(baseDomainParts) {
++		if serverDomainParts[s-i-1] != baseDomainParts[b-i-1] {
++			return nil
++		}
++	}
++
++	return errServerURLSuffix
++}
++
+ type deprecator struct {
+ 	warns  set.Set[string]
+ 	fatals set.Set[string]
+diff --git a/hscontrol/types/config_test.go b/hscontrol/types/config_test.go
+index e6e8d6c2e0b1..68a13f6c0f40 100644
+--- a/hscontrol/types/config_test.go
++++ b/hscontrol/types/config_test.go
+@@ -1,6 +1,7 @@
+ package types
+ 
+ import (
++	"fmt"
+ 	"os"
+ 	"path/filepath"
+ 	"testing"
+@@ -141,7 +142,7 @@ func TestReadConfig(t *testing.T) {
+ 				return LoadServerConfig()
+ 			},
+ 			want:    nil,
+-			wantErr: "server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.",
++			wantErr: errServerURLSuffix.Error(),
+ 		},
+ 		{
+ 			name:       "base-domain-not-in-server-url",
+@@ -337,3 +338,64 @@ tls_letsencrypt_challenge_type: TLS-ALPN-01
+ 	err = LoadConfig(tmpDir, false)
+ 	assert.NoError(t, err)
+ }
++
++// OK
++// server_url: headscale.com, base: clients.headscale.com
++// server_url: headscale.com, base: headscale.net
++//
++// NOT OK
++// server_url: server.headscale.com, base: headscale.com.
++func TestSafeServerURL(t *testing.T) {
++	tests := []struct {
++		serverURL, baseDomain,
++		wantErr string
++	}{
++		{
++			serverURL:  "https://example.com",
++			baseDomain: "example.org",
++		},
++		{
++			serverURL:  "https://headscale.com",
++			baseDomain: "headscale.com",
++		},
++		{
++			serverURL:  "https://headscale.com",
++			baseDomain: "clients.headscale.com",
++		},
++		{
++			serverURL:  "https://headscale.com",
++			baseDomain: "clients.subdomain.headscale.com",
++		},
++		{
++			serverURL:  "https://headscale.kristoffer.com",
++			baseDomain: "mybase",
++		},
++		{
++			serverURL:  "https://server.headscale.com",
++			baseDomain: "headscale.com",
++			wantErr:    errServerURLSuffix.Error(),
++		},
++		{
++			serverURL:  "https://server.subdomain.headscale.com",
++			baseDomain: "headscale.com",
++			wantErr:    errServerURLSuffix.Error(),
++		},
++		{
++			serverURL: "http://foo\x00",
++			wantErr:   `parse "http://foo\x00": net/url: invalid control character in URL`,
++		},
++	}
++
++	for _, tt := range tests {
++		testName := fmt.Sprintf("server=%s domain=%s", tt.serverURL, tt.baseDomain)
++		t.Run(testName, func(t *testing.T) {
++			err := isSafeServerURL(tt.serverURL, tt.baseDomain)
++			if tt.wantErr != "" {
++				assert.EqualError(t, err, tt.wantErr)
++
++				return
++			}
++			assert.NoError(t, err)
++		})
++	}
++}
+diff --git a/hscontrol/types/testdata/base-domain-in-server-url.yaml b/hscontrol/types/testdata/base-domain-in-server-url.yaml
+index 683e021837c9..2d6a4694a09a 100644
+--- a/hscontrol/types/testdata/base-domain-in-server-url.yaml
++++ b/hscontrol/types/testdata/base-domain-in-server-url.yaml
+@@ -8,7 +8,7 @@ prefixes:
+ database:
+   type: sqlite3
+ 
+-server_url: "https://derp.no"
++server_url: "https://server.derp.no"
+ 
+ dns:
+   magic_dns: true
+-- 
+2.47.0
+

From e2ee66b98dfc32d846d2c9d5fe7d7bd0db156fea Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 10 Dec 2024 23:08:24 +0100
Subject: [PATCH 0144/1504] kicad: 8.0.6 -> 8.0.7

---
 .../science/electronics/kicad/versions.nix    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 6c6f11813cd2..a0a35a789d3f 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,23 +3,23 @@
 {
   "kicad" = {
     kicadVersion = {
-      version =			"8.0.6";
+      version =			"8.0.7";
       src = {
-        rev =			"16c59e4e71dab2a0ed2f9e61f990b69657b4bfe2";
-        sha256 =		"1vc9igk8id2c34shilg7lh361psvwiqxpsn2yq7cwnwgaq7v1swq";
+        rev =			"bfcc0ac495d7a5fcfc5546c07bf16049d346b795";
+        sha256 =		"0k3xn2pkn4lw9jqx1l5r1h91x2azkq4b9zzhrq15cr4jw8af1y8w";
       };
     };
     libVersion = {
-      version =			"8.0.6";
+      version =			"8.0.7";
       libSources = {
-        symbols.rev =		"5fab56fc44319fed1d159cd7fa48e4468b0a5dad";
-        symbols.sha256 =	"1ahzx14bmjgpvifsl2xm8c76zagkj2spc9cpb8ms4jlda92lp078";
-        templates.rev =		"2343281a4df1ffbd4e0c6fcb9856f81adbbc201e";
+        symbols.rev =		"42f411da32d930a1255a9e842859d6ff8f034b17";
+        symbols.sha256 =	"0fp56xs7jb1pmqjammq0wkr5cq1fz1a3y3jriavxs09mrb56nghl";
+        templates.rev =		"8402f4c99a45cfbb2ba5185a975f60fb6718d631";
         templates.sha256 =	"03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza";
-        footprints.rev =	"2e76906e448f352228a8f6bc06f77ae959a57975";
-        footprints.sha256 =	"1fv0liwbl2blwd2xy9whwinkczi98ah83rwi4v6bvm9d9318vbig";
-        packages3d.rev =	"005244f418b0d014e2907ca42df5ab85a1e29466";
-        packages3d.sha256 =	"1i6ypl7lw7hnifl943z3lwv4sy00mfwgqi001bj9qh547kf9rxd4";
+        footprints.rev =	"e40b11ba8b166956f1a654fa02613f65683ae20d";
+        footprints.sha256 =	"1ssrmx2bh6v4psg89q0l69d40jj10adz0506p2mq5yc1sgy0bag2";
+        packages3d.rev =	"27171b4df32b3e76e7b47098eae8e5ec61b136e5";
+        packages3d.sha256 =	"159dm48zm5n6301ck2w48alwgy5a2yl075hb94gy67bir4sc0ijb";
       };
     };
   };

From 3cc811b0ae6791341e50fe6154687ab155c7ea37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 07:39:50 +0000
Subject: [PATCH 0145/1504] python312Packages.confluent-kafka: 2.5.3 -> 2.6.1

---
 pkgs/development/python-modules/confluent-kafka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index ecdcd5759349..1a7d54470677 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "confluent-kafka";
-  version = "2.5.3";
+  version = "2.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = "confluent-kafka-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-b9RTz4wUtDzGkoeB0cp5vbZEBk8jSw2JiXEx6tUuPVw=";
+    tag = "v${version}";
+    hash = "sha256-SFmZ/KriysvLkGT5mvIS9SJcUHWmvZXrqFAY0lC6bGc=";
   };
 
   buildInputs = [ rdkafka ];

From c48576abb25aa008c68f783d2fdb4aa0ba25dcb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 04:00:20 +0000
Subject: [PATCH 0146/1504] python312Packages.numpy-stl: 3.1.2 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index bf7bac7f9950..8dd0c8e4b878 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "numpy-stl";
-  version = "3.1.2";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "numpy_stl";
     inherit version;
-    hash = "sha256-crRpUN+jZC3xx7hzz6eKVIUzckuQdHjFZ9tC/fV+49I=";
+    hash = "sha256-WiDD95zdqgq8akuZ9Uhqzu1PiBUvKbGaV6zIROGD/U0=";
   };
 
   build-system = [ setuptools ];

From 04998b35c7c1182d818f171bf67372895514a801 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 04:08:20 +0000
Subject: [PATCH 0147/1504] python312Packages.python-utils: 3.9.0 -> 3.9.1

---
 pkgs/development/python-modules/python-utils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index 8b86add14493..864177712984 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "python-utils";
-  version = "3.9.0";
+  version = "3.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "WoLpH";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-ZmCT41VMz8BkIqF8Od5PqteyXToA4xASs0qCPD0cNc8=";
+    tag = "v${version}";
+    hash = "sha256-lzLzYI5jShfIwQqvfA8UtPjGawXE80ww7jb/gPzpeDo=";
   };
 
   postPatch = ''

From aec3c5b26d18ce96a684077e7d22f2bc809899cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 08:38:49 +0000
Subject: [PATCH 0148/1504] python312Packages.aiosomecomfort: 0.0.26 -> 0.0.28

---
 pkgs/development/python-modules/aiosomecomfort/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix
index 756c1dd60b53..2067bcc937ff 100644
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiosomecomfort";
-  version = "0.0.26";
+  version = "0.0.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkmer";
     repo = "AIOSomecomfort";
-    rev = "refs/tags/${version}";
-    hash = "sha256-Vu49mJoS2FTXvlyJ/BFDJmh8uS/ZYM+Lb3IO8TTcZYg=";
+    tag = version;
+    hash = "sha256-AsYq5ElfHtUoEEI5TMIs0wf5yMK1ZKCteWYfTon+Wik=";
   };
 
   build-system = [

From 2b6ab4d819e8ecd13e64dcc2b3439297144b7fe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 09:26:33 +0000
Subject: [PATCH 0149/1504] mlflow-server: 2.18.0 -> 2.19.0

---
 pkgs/development/python-modules/mlflow/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index c52166ac7b72..754bcf8b4b4d 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -70,14 +70,14 @@
 
 buildPythonPackage rec {
   pname = "mlflow";
-  version = "2.18.0";
+  version = "2.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlflow";
     repo = "mlflow";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-etfgdSf3pbcKtCOk9MOgcR+Tzg4cmLbdadAOtQqN4PM=";
+    tag = "v${version}";
+    hash = "sha256-QUyoT6tl/kv/RAntKYZ83p/lvssX1dJb45VpklAVQT4=";
   };
 
   # Remove currently broken dependency `shap`, a model explainability package.

From fc202c4d1be3d85eeb28b552eb5ea09bc2bc3a61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 10:59:30 +0000
Subject: [PATCH 0150/1504] commitizen: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix
index 06a42d63887c..7dbe5f464b86 100644
--- a/pkgs/development/python-modules/commitizen/default.nix
+++ b/pkgs/development/python-modules/commitizen/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "commitizen";
-  version = "4.0.0";
+  version = "4.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "commitizen-tools";
     repo = "commitizen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-M6JoBVst2aJwxr/SyMpXXOnMKIl9gX0ltg3H0SpU7uQ=";
+    hash = "sha256-f3uusTNGMK6a3Plh6FHBeM8vEXDZW31o9E0i+sWsBgE=";
   };
 
   pythonRelaxDeps = [

From 39ab44a5666c67b06e9f42802cda6bc80dc77f51 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 12 Dec 2024 13:14:33 +0100
Subject: [PATCH 0151/1504] extra-container: 0.12 -> 0.13

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

diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix
index 84a5367b449a..f4298130399f 100644
--- a/pkgs/by-name/ex/extra-container/package.nix
+++ b/pkgs/by-name/ex/extra-container/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "extra-container";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "erikarvstedt";
     repo = pname;
     rev = version;
-    hash = "sha256-/5wPv962ZHvZoZMOr4nMz7qcvbzlExRYS2nrnay/PU8=";
+    hash = "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU=";
   };
 
   buildCommand = ''

From c5fccf85ab08a400ccec2bd8bd2848184bf64f6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 12:39:03 +0000
Subject: [PATCH 0152/1504] python312Packages.flask-limiter: 3.8.0 -> 3.9.2

---
 pkgs/development/python-modules/flask-limiter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index 6b0f52f6384b..7ee04476aafa 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "flask-limiter";
-  version = "3.8.0";
+  version = "3.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = "flask-limiter";
-    rev = "refs/tags/${version}";
-    hash = "sha256-RkeG5XdanSp2syKrQgYUZ4r8D28Zt33/MsW0UxWxaU0=";
+    tag = version;
+    hash = "sha256-JkO5DNGVTnqbMfkadQGdyJEsfDfMDZ+nfjEjRpoMOfk=";
   };
 
   postPatch = ''

From 70cf61d858ba1824e276914bfae0be8df8127d11 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Thu, 12 Dec 2024 21:41:33 +0800
Subject: [PATCH 0153/1504] waydroid: fix 1.4.3

---
 pkgs/by-name/wa/waydroid/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index d1703941a4e5..435412e25ec8 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -31,6 +31,14 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/waydroid/waydroid/commit/af296c90a788dde0b33813b12607cfab2fa65b98.patch";
+      hash = "sha256-1vkEKk00dbBLbbBxZIhcoOYUP976SJlaWyzYSWBy0nU=";
+      revert = true;
+    })
+  ];
+
   nativeBuildInputs = [
     gobject-introspection
     wrapGAppsHook3

From 7d4abac4b50fa60e8239365965723d418b16a63b Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Thu, 12 Dec 2024 10:35:08 -0500
Subject: [PATCH 0154/1504] vmware-guest: Don't use lib directly for
 maintainers

---
 nixos/modules/virtualisation/vmware-guest.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index 5b9f309f153a..74dc7d4156a8 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -8,6 +8,7 @@ let
   inherit (lib)
     getExe'
     literalExpression
+    maintainers
     mkEnableOption
     mkIf
     mkOption
@@ -25,7 +26,7 @@ in
   ];
 
   meta = {
-    maintainers = [ lib.maintainers.kjeremy ];
+    maintainers = [ maintainers.kjeremy ];
   };
 
   options.virtualisation.vmware.guest = {

From 178a1242f7f8966c4c1d47c3892fe4026c119415 Mon Sep 17 00:00:00 2001
From: Vladimir Timofeenko <id@vtimofeenko.com>
Date: Tue, 3 Dec 2024 10:21:27 -0800
Subject: [PATCH 0155/1504] snowflake-cli: 3.1.0 -> 3.2.1

---
 pkgs/by-name/sn/snowflake-cli/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix
index 370e535ecca6..82a02bd76e62 100644
--- a/pkgs/by-name/sn/snowflake-cli/package.nix
+++ b/pkgs/by-name/sn/snowflake-cli/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snowflake-cli";
-  version = "3.1.0";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snowflakedb";
     repo = "snowflake-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/n11GbrgFwjiAuwpFNJ3T96VDhdOy2x+hesgh4oPVbo=";
+    hash = "sha256-1AXp2bCBNuYwnyQMIQn3uLLKdWVznBRK6HcB/E7Yjo8=";
   };
 
   build-system = with python3Packages; [
@@ -65,6 +65,7 @@ python3Packages.buildPythonApplication rec {
     "test_snow_typer_help_sanitization" # Snapshot needs update?
     "test_help_message" # Snapshot needs update?
     "test_executing_command_sends_telemetry_usage_data" # Fails on mocked version
+    "test_generate_jwt_with_passphrase" # Fails, upstream PR https://github.com/snowflakedb/snowflake-cli/pull/1898
   ];
 
   pythonRelaxDeps = true;

From f7a62ae15a735fe09446e6b23d0d73dbf212e341 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 Dec 2024 20:02:52 +0000
Subject: [PATCH 0156/1504] mongoc: 1.29.0 -> 1.29.1

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

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 650dd9255189..50caf125fcd7 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mongoc";
-  version = "1.29.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-c-driver";
     rev = "refs/tags/${version}";
-    hash = "sha256-367qk0u81jnNA/9ruCo9wUWnCPrNjLhp9x62iEpCmE4=";
+    hash = "sha256-81UgJ5GboznaK9omhr3ZMOeOQbIru33Ic42tQAazSzw=";
   };
 
   nativeBuildInputs = [

From 2f453455b74c34a6d9391f733faf1576c79ec37d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Dec 2024 08:11:12 +0000
Subject: [PATCH 0157/1504] fluidd: 1.31.0 -> 1.31.2

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

diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix
index 407e0007b13a..05894dc685f7 100644
--- a/pkgs/by-name/fl/fluidd/package.nix
+++ b/pkgs/by-name/fl/fluidd/package.nix
@@ -2,12 +2,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "fluidd";
-  version = "1.31.0";
+  version = "1.31.2";
 
   src = fetchurl {
     name = "fluidd-v${version}.zip";
     url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip";
-    sha256 = "sha256-ym3ZVY4GzCjGSy11l3eWV9F/P75e2SJqZA+gse0QJlI=";
+    sha256 = "sha256-It/etwQGBok805FVTneOR+LU7QkHUHWXpUWtKLq6xe0=";
   };
 
   nativeBuildInputs = [ unzip ];

From 7484dc8f19d63fe931f919bca969b5b30b18e9d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Dec 2024 09:21:52 +0000
Subject: [PATCH 0158/1504] python312Packages.aiolimiter: 1.1.0 -> 1.2.1

---
 pkgs/development/python-modules/aiolimiter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix
index 928fb0123a73..1603d1009da3 100644
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aiolimiter";
-  version = "1.1.0";
+  version = "1.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjpieters";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-BpLh9utf2oJe+83rsIZeV5+MjbJ3aO5slMNVbUywQIo=";
+    tag = "v${version}";
+    hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From bf2f6de39ded3be2c9e929f1081503dc936730a6 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Fri, 13 Dec 2024 12:13:34 +0100
Subject: [PATCH 0159/1504] nixos/etc-activation: only assert for 6.6 kernel in
 switchable systems

The assertion is based on the availability of `move-mount-beneath`, which is only used in re-activation logic for switchable systems. Systems that have `system.switch.enable == false` should be allowed to user older kernels.
---
 nixos/modules/system/etc/etc-activation.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix
index aed58af780b7..47c65590e0c4 100644
--- a/nixos/modules/system/etc/etc-activation.nix
+++ b/nixos/modules/system/etc/etc-activation.nix
@@ -32,8 +32,10 @@
           message = "`!system.etc.overlay.mutable` requires `systemd.sysusers.enable` or `services.userborn.enable`";
         }
         {
-          assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6";
-          message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6";
+          assertion =
+            (config.system.switch.enable)
+            -> (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6");
+          message = "switchable systems with `system.etc.overlay.enable` require a newer kernel, at least version 6.6";
         }
       ];
 

From a1fde467e2f84bc6181f75eda866f51c6350507e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Dec 2024 13:01:41 +0000
Subject: [PATCH 0160/1504] gcsfuse: 2.5.1 -> 2.6.0

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

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 63f67ff34271..16de9a16ac92 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-4UzRg6fNKBrTSoimJ9jURW9oPRhUOAUDMG3JaM7f100=";
+    hash = "sha256-+dzArLWP6mZ0m/pS64AYPckpf4SDu0Rt84x00Q4QC7I=";
   };
 
-  vendorHash = "sha256-QrpILFzgUQwmrvjCdtrlgq1zSW7f82qMHsifI39WaB0=";
+  vendorHash = "sha256-FIPIEIa14oOIgHonXXYwQS9XkuCJjABgq6I8B7V1jQI=";
 
   subPackages = [
     "."

From d8e0f79b4942fc6e70370dc90c18265d9fc933a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Dec 2024 14:05:14 +0000
Subject: [PATCH 0161/1504] python312Packages.elasticsearchdsl: 8.16.0 ->
 8.17.0

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

diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 2dd22d8c6e33..9f47ded02fa5 100644
--- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "elasticsearch-dsl";
-  version = "8.16.0";
+  version = "8.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "elasticsearch_dsl";
     inherit version;
-    hash = "sha256-Bb1QUO730HBqRIfNIoZNPBWMjhy8omtT7xpHO97hNFk=";
+    hash = "sha256-wgQhgXVGLRCKhPuRM3HkXT9J6d1xHKJux+2Jq06PKH0=";
   };
 
   build-system = [ setuptools ];

From 7c87ea18820bfa3b65e9d883cc843206e2c53e60 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Thu, 5 Dec 2024 21:00:36 -0800
Subject: [PATCH 0162/1504] megacmd: add darwin support

---
 pkgs/by-name/me/megacmd/fix-darwin.patch | 49 ++++++++++++++++
 pkgs/by-name/me/megacmd/package.nix      | 72 +++++++++++++++---------
 2 files changed, 93 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/by-name/me/megacmd/fix-darwin.patch

diff --git a/pkgs/by-name/me/megacmd/fix-darwin.patch b/pkgs/by-name/me/megacmd/fix-darwin.patch
new file mode 100644
index 000000000000..7fa87b43163a
--- /dev/null
+++ b/pkgs/by-name/me/megacmd/fix-darwin.patch
@@ -0,0 +1,49 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,6 +25,11 @@ AM_CPPFLAGS = \
+ 
+ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/sdk/include
+ 
++if DARWIN
++AM_LIBTOOLFLAGS="--tag=CXX"
++AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -I$(top_srcdir)/sdk/include/mega/osx
++endif
++
+ if WIN32
+ AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/win32
+ else
+--- a/src/megacmdshell/megacmdshellcommunications.cpp
++++ b/src/megacmdshell/megacmdshellcommunications.cpp
+@@ -306,10 +306,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
+         #endif
+                     const char executable2[] = "./mega-cmd-server";
+     #else
+-        #ifdef __MACH__
+-                    const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd";
+-                    const char executable2[] = "./mega-cmd";
+-        #else
+                     const char executable[] = "mega-cmd-server";
+             #ifdef __linux__
+                     char executable2[PATH_MAX];
+@@ -317,7 +313,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
+             #else
+                     const char executable2[] = "./mega-cmd-server";
+             #endif
+-        #endif
+     #endif
+ 
+                     std::vector<char*> argsVector{
+--- a/sdk/Makefile.am
++++ b/sdk/Makefile.am
+@@ -27,6 +27,11 @@ AM_CPPFLAGS = \
+ 
+ include m4/aminclude.am
+ 
++if DARWIN
++AM_LIBTOOLFLAGS="--tag=CXX"
++AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx
++endif
++
+ if WIN32
+ AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/win32
+ else
diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index 42ac1284fa7d..ea68f8fa84ce 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -25,17 +25,29 @@
 let
   pname = "megacmd";
   version = "1.7.0";
+  srcOptions =
+    if stdenv.isLinux then
+      {
+        tag = "${version}_Linux";
+        hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
+      }
+    else
+      {
+        tag = "${version}_macOS";
+        hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
+      };
 in
 stdenv.mkDerivation {
   inherit pname version;
 
-  src = fetchFromGitHub {
-    owner = "meganz";
-    repo = "MEGAcmd";
-    rev = "${version}_Linux";
-    hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
-    fetchSubmodules = true;
-  };
+  src = fetchFromGitHub (
+    srcOptions
+    // {
+      owner = "meganz";
+      repo = "MEGAcmd";
+      fetchSubmodules = true;
+    }
+  );
 
   enableParallelBuilding = true;
   nativeBuildInputs = [
@@ -43,25 +55,26 @@ stdenv.mkDerivation {
     pkg-config
   ];
 
-  buildInputs = [
-    c-ares
-    cryptopp
-    curl
-    ffmpeg
-    icu
-    gcc-unwrapped
-    libmediainfo
-    libraw
-    libsodium
-    libuv
-    libzen
-    pcre-cpp
-    readline
-    sqlite
-  ] ++ lib.optionals withFreeImage [ freeimage ];
+  buildInputs =
+    lib.optionals stdenv.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a
+    ++ [
+      c-ares
+      cryptopp
+      curl
+      ffmpeg
+      icu
+      libmediainfo
+      libraw
+      libsodium
+      libuv
+      libzen
+      pcre-cpp
+      readline
+      sqlite
+    ]
+    ++ lib.optionals withFreeImage [ freeimage ];
 
   configureFlags = [
-    "--disable-curl-checks"
     "--disable-examples"
     "--with-cares"
     "--with-cryptopp"
@@ -77,8 +90,14 @@ stdenv.mkDerivation {
     "--with-termcap"
   ] ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
 
+  # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
+  postConfigure = ''
+    echo '#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0' >> sdk/include/mega/config.h
+  '';
+
   patches = [
     ./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085
+    ./fix-darwin.patch # fix: libtool tag not found; MacFileSystemAccess not declared; server cannot init
   ];
 
   meta = {
@@ -88,10 +107,7 @@ stdenv.mkDerivation {
       bsd2
       gpl3Only
     ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
       lunik1
       ulysseszhan

From 33d4a53bcbe432bdb4e9c160cf06af124a59ffbc Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:43:49 +0100
Subject: [PATCH 0163/1504] tsm-client: update support URLs

IBM changed their website URLs.

The previous link to "Hardware and Software Requirements"
(explaining optional dependencies like acl and lvm)
disappeared and I can't find a new public link.
As the information still seems correct
(e.g. libdevmapper still enables additional functionality,
as can be deduced from
https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=errors-resolving-linux-image-backup ),
I replaced the URL with a link to the web archive.

The download explanation is no longer necessary;
new versions can be found directly on the `downloadPage` now.
---
 pkgs/by-name/ts/tsm-client/package.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix
index 4faf16f63af3..be8a2c0f29a3 100644
--- a/pkgs/by-name/ts/tsm-client/package.nix
+++ b/pkgs/by-name/ts/tsm-client/package.nix
@@ -23,7 +23,7 @@
 
 # For an explanation of optional packages
 # (features provided by them, version limits), see
-# https://www.ibm.com/support/pages/node/660813#Version%208.1
+# https://web.archive.org/web/20240118051918/https://www.ibm.com/support/pages/node/660813#Version%208.1
 
 # IBM Tivoli Storage Manager Client uses a system-wide
 # client system-options file `dsm.sys` and expects it
@@ -46,24 +46,11 @@
 # depending on local configuration or usage; see:
 # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables
 
-# The newest version of TSM client should be discoverable by
-# going to the `downloadPage` (see `meta` below).
-# Find the "Backup-archive client" table on that page.
-# Look for "Download Documents" of the latest release.
-# Follow the "Download Information" link.
-# Look for the "Linux x86_64 ..." rows in the table at
-# the bottom of the page and follow their "HTTPS" links (one
-# link per row -- each link might point to the latest release).
-# In the directory listings to show up,
-# check the big `.tar` file.
-#
-# (as of 2023-07-01)
-
 let
 
   meta = {
     homepage = "https://www.ibm.com/products/storage-protect";
-    downloadPage = "https://www.ibm.com/support/pages/ibm-storage-protect-downloads-latest-fix-packs-and-interim-fixes";
+    downloadPage = "https://www.ibm.com/support/fixcentral/swg/selectFixes?product=ibm/StorageSoftware/IBM+Spectrum+Protect";
     platforms = [ "x86_64-linux" ];
     mainProgram = "dsmc";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From 2f85e9679c8c8974f85e4db9be9138134d539637 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:53:32 +0100
Subject: [PATCH 0164/1504] tsm-client: 8.1.24.0 -> 8.1.25.0

Readme: https://www.ibm.com/support/pages/node/597891#Readme_8125
(At the time of this writingn,
most URLs in there lead to a login portal.
This might change with time.)
---
 nixos/modules/programs/tsm-client.nix  | 2 +-
 nixos/modules/services/backup/tsm.nix  | 2 +-
 pkgs/by-name/ts/tsm-client/package.nix | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix
index 9e50e38acc92..abbcfa9055eb 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@@ -75,7 +75,7 @@ let
     {
       freeformType = attrsOf (either scalarType (listOf scalarType));
       # Client system-options file directives are explained here:
-      # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=commands-processing-options
+      # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=commands-processing-options
       options.servername = mkOption {
         type = servernameType;
         default = name;
diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix
index 8dd27ccd2342..697f798b7fcf 100644
--- a/nixos/modules/services/backup/tsm.nix
+++ b/nixos/modules/services/backup/tsm.nix
@@ -89,7 +89,7 @@ in
       environment.HOME = "/var/lib/tsm-backup";
       serviceConfig = {
         # for exit status description see
-        # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=clients-client-return-codes
+        # https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=clients-client-return-codes
         SuccessExitStatus = "4 8";
         # The `-se` option must come after the command.
         # The `-optfile` option suppresses a `dsm.opt`-not-found warning.
diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix
index be8a2c0f29a3..4a0c20b02e3d 100644
--- a/pkgs/by-name/ts/tsm-client/package.nix
+++ b/pkgs/by-name/ts/tsm-client/package.nix
@@ -44,7 +44,7 @@
 # point to this derivations `/dsmi_dir` directory symlink.
 # Other environment variables might be necessary,
 # depending on local configuration or usage; see:
-# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables
+# https://www.ibm.com/docs/en/storage-protect/8.1.25?topic=solaris-set-api-environment-variables
 
 let
 
@@ -91,10 +91,10 @@ let
 
   unwrapped = stdenv.mkDerivation (finalAttrs: {
     name = "tsm-client-${finalAttrs.version}-unwrapped";
-    version = "8.1.24.0";
+    version = "8.1.25.0";
     src = fetchurl {
       url = mkSrcUrl finalAttrs.version;
-      hash = "sha512-TqTDE2oJK/Wu/MNYUCqxmOE6asAqDLz4GtdcFZuKqvfT8pJUCYKz9yjRPIrM3u2XfLH0wDq+Q8ER4ui680mswA==";
+      hash = "sha512-OPNjSMnWJ/8Ogy9O0wG0H4cEbYiOwyCVzkWhpG00v/Vm0LDxLzPteMnMOyH8L1egIDhy7lmQYSzI/EC4WWUDDA==";
     };
     inherit meta passthru;
 

From b0a3a9a52f0ac9bef834a3e45d511776afe95aad Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Fri, 13 Dec 2024 21:51:49 -0800
Subject: [PATCH 0165/1504] nixos/lib/eval-config: Add warning when masking
 pkgs

---
 nixos/lib/eval-config.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 8bab3752073f..ad028013f65f 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -65,6 +65,14 @@ let
   withWarnings = x:
     lib.warnIf (evalConfigArgs?extraArgs) "The extraArgs argument to eval-config.nix is deprecated. Please set config._module.args instead."
     lib.warnIf (evalConfigArgs?check) "The check argument to eval-config.nix is deprecated. Please set config._module.check instead."
+    lib.warnIf (specialArgs?pkgs) ''
+      You have set specialArgs.pkgs, which means that options like nixpkgs.config
+      and nixpkgs.overlays will be ignored. If you wish to reuse an already created
+      pkgs, which you know is configured correctly for this NixOS configuration,
+      please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or
+      `(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`.
+      This properly disables the ignored options to prevent future surprises.
+    ''
     x;
 
   legacyModules =

From 7adae4d89df03d9ba9b644cc5f8fa8c94d3a573e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Dec 2024 09:02:16 +0000
Subject: [PATCH 0166/1504] python312Packages.py3status: 3.60 -> 3.61

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

diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index b75c71a7beeb..b256034f7f9a 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -27,12 +27,12 @@
 
 buildPythonPackage rec {
   pname = "py3status";
-  version = "3.60";
+  version = "3.61";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-l7qlw3imOXY1nsNiFRB28Z6+uw+YGJGOO4GM7ryr1Q4=";
+    hash = "sha256-CL7bD+w8F59aVHAC9k4yG0qaSqJZdkFdEDKkyKkCBTs=";
   };
 
   nativeBuildInputs = [

From 88a702963c3788ec12c6d714b86a5d561c0cca59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Dec 2024 11:32:10 +0000
Subject: [PATCH 0167/1504] python312Packages.pytapo: 3.3.32 -> 3.3.37

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

diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 7cec1417bfc8..7d6537386687 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.32";
+  version = "3.3.37";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE=";
+    hash = "sha256-InDbfWzRb+Q+E6feeatHIliq83g83oUfo3Yze/BAJdM=";
   };
 
   build-system = [ setuptools ];

From 1fdf59c3db6cf3fab7df2ec8bd3e37db351cd081 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Dec 2024 14:37:47 +0000
Subject: [PATCH 0168/1504] python312Packages.srsly: 2.4.8 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 5d40ccd3a06e..4576ff637508 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "2.4.8";
+  version = "2.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sk2VplAJwkR+C0nNoEOsU/7PTwnjWNh6V0RkWPkbipE=";
+    hash = "sha256-J3Z1LNsUJ1ygHpp7epwEfM8x2xfwB25zNDz8yajfbL0=";
   };
 
   nativeBuildInputs = [

From 47bdb26b653ed309251fb85a78c61174dc5f8dab Mon Sep 17 00:00:00 2001
From: Ngoc Nguyen <ngoc@kotozna.com>
Date: Sun, 15 Dec 2024 02:04:42 +0900
Subject: [PATCH 0169/1504] maintainers: add baongoc124

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1477878902a4..53b65c753d23 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2478,6 +2478,12 @@
     githubId = 66330398;
     name = "Victor Hang";
   };
+  baongoc124 = {
+    email = "baongoc124@gmail.com";
+    github = "baongoc124";
+    githubId = 766221;
+    name = "Ngoc Nguyen";
+  };
   barab-i = {
     email = "barab_i@outlook.com";
     github = "barab-i";

From 26e66c536c5b223c8489c24af19245f7a3b8aa1b Mon Sep 17 00:00:00 2001
From: Davis Schirmer <git@djds.dev>
Date: Sat, 14 Dec 2024 15:13:26 -0500
Subject: [PATCH 0170/1504] Remove with lib from minimal profile; group config

---
 nixos/modules/profiles/minimal.nix | 62 ++++++++++++++++--------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 4ca2b8cc207f..f4b0ea0668a6 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -1,40 +1,46 @@
 # This module defines a small NixOS configuration.  It does not
 # contain any graphical stuff.
 
-{ config, lib, ... }:
-
-with lib;
-
 {
-  documentation.enable = mkDefault false;
+  lib,
+  ...
+}:
+let
+  inherit (lib) mkDefault;
+in
+{
+  documentation = {
+    enable = mkDefault false;
+    doc.enable = mkDefault false;
+    info.enable = mkDefault false;
+    man.enable = mkDefault false;
+    nixos.enable = mkDefault false;
+  };
 
-  documentation.doc.enable = mkDefault false;
+  environment = {
+    # Perl is a default package.
+    defaultPackages = mkDefault [ ];
+    stub-ld.enable = mkDefault false;
+  };
 
-  documentation.info.enable = mkDefault false;
-
-  documentation.man.enable = mkDefault false;
-
-  documentation.nixos.enable = mkDefault false;
-
-  # Perl is a default package.
-  environment.defaultPackages = mkDefault [ ];
-
-  environment.stub-ld.enable = mkDefault false;
-
-  # The lessopen package pulls in Perl.
-  programs.less.lessopen = mkDefault null;
+  programs = {
+    # The lessopen package pulls in Perl.
+    less.lessopen = mkDefault null;
+    command-not-found.enable = mkDefault false;
+  };
 
   # This pulls in nixos-containers which depends on Perl.
   boot.enableContainers = mkDefault false;
 
-  programs.command-not-found.enable = mkDefault false;
+  services = {
+    logrotate.enable = mkDefault false;
+    udisks2.enable = mkDefault false;
+  };
 
-  services.logrotate.enable = mkDefault false;
-
-  services.udisks2.enable = mkDefault false;
-
-  xdg.autostart.enable = mkDefault false;
-  xdg.icons.enable = mkDefault false;
-  xdg.mime.enable = mkDefault false;
-  xdg.sounds.enable = mkDefault false;
+  xdg = {
+    autostart.enable = mkDefault false;
+    icons.enable = mkDefault false;
+    mime.enable = mkDefault false;
+    sounds.enable = mkDefault false;
+  };
 }

From a8f9a8d18febe4179defb145a7d426f4051e7694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 14 Dec 2024 12:28:50 -0800
Subject: [PATCH 0171/1504] python312Packages.netcdf4: 1.7.1.post2 -> 1.7.2

Diff: https://github.com/Unidata/netcdf4-python/compare/v1.7.1.post2...v1.7.2rel

Changelog: https://github.com/Unidata/netcdf4-python/raw/v1.7.2rel/Changelog
---
 .../python-modules/netcdf4/default.nix        | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 056949ef2f97..1ce4ac8c01f3 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -5,7 +5,7 @@
   cftime,
   curl,
   cython,
-  fetchPypi,
+  fetchFromGitHub,
   hdf5,
   isPyPy,
   libjpeg,
@@ -20,16 +20,23 @@
   zlib,
 }:
 
-buildPythonPackage rec {
+let
+  version = "1.7.2";
+  suffix = lib.optionalString (lib.match ''.*\.post[0-9]+'' version == null) "rel";
+  tag = "v${version}${suffix}";
+in
+buildPythonPackage {
   pname = "netcdf4";
-  version = "1.7.1.post2";
+  inherit version;
   pyproject = true;
 
   disabled = isPyPy || pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-N9VX42ZUiJ1wIBkr+1b51fk4lMsymX64N65YbFOP17Y=";
+  src = fetchFromGitHub {
+    owner = "Unidata";
+    repo = "netcdf4-python";
+    inherit tag;
+    hash = "sha256-orwCHKOSam+2eRY/yAduFYWREOkJlWIJGIZPZwQZ/RI=";
   };
 
   postPatch = ''
@@ -43,20 +50,27 @@ buildPythonPackage rec {
     wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     certifi
     cftime
+    numpy
+  ];
+
+  buildInputs = [
     curl
     hdf5
     libjpeg
     netcdf
-    numpy
     zlib
   ];
 
   checkPhase = ''
+    runHook preCheck
+
     pushd test/
     NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py
+
+    runHook postCheck
   '';
 
   env = {
@@ -73,7 +87,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Interface to netCDF library (versions 3 and 4)";
     homepage = "https://github.com/Unidata/netcdf4-python";
-    changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog";
+    changelog = "https://github.com/Unidata/netcdf4-python/raw/${tag}/Changelog";
     maintainers = [ ];
     license = licenses.mit;
   };

From 67605d59a035c573863b64184853ecd1a6bdea25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 02:06:12 +0000
Subject: [PATCH 0172/1504] python312Packages.datalad: 1.1.4 -> 1.1.5

---
 pkgs/development/python-modules/datalad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index f97007d13e52..7cba7a25e33f 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "datalad";
-  version = "1.1.4";
+  version = "1.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datalad";
-    rev = "refs/tags/${version}";
-    hash = "sha256-sIWHBaqTJuKQHvh+L10PUehsmjRFl/holXzp0SMqr+k=";
+    tag = version;
+    hash = "sha256-XwzYlSP2MbEb0U3tuVOq3NNqLTS08UzSfSFBidHbpAY=";
   };
 
   postPatch = ''

From bdbcc39e80562e850c0e59362d89f6f90ee95880 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 07:35:06 +0000
Subject: [PATCH 0173/1504] python312Packages.relatorio: 0.10.2 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index 1a45c719e061..325644a026e1 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "relatorio";
-  version = "0.10.2";
+  version = "0.11.1";
 
   disabled = pythonOlder "3.5";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q=";
+    hash = "sha256-e6CvclFrRfXR5fL2ZG1LZxTTsTRouLsDicCwvXtySGE=";
   };
 
   propagatedBuildInputs = [

From 7ba86f50b53a98f4795309f5e9189d7b726d902f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 12:16:04 +0100
Subject: [PATCH 0174/1504] sunvox: 2.1.2 -> 2.1.2b

Co-authored-by: OPNA2608 <opna2608@protonmail.com>
---
 pkgs/by-name/su/sunvox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index fe39aec2f995..6b274e489b49 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -27,15 +27,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sunvox";
-  version = "2.1.2";
+  version = "2.1.2b";
 
   src = fetchzip {
     urls = [
       "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
       # Upstream removes downloads of older versions, please save bumped versions to archive.org
-      "https://web.archive.org/web/20241121002213/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
+      "https://web.archive.org/web/20241215075639/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
     ];
-    hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
+    hash = "sha256-RmGqko1OLkQb0Oeydpfy4wxzp6iz2MpS7R22d4qjEaE=";
   };
 
   nativeBuildInputs =

From cc9658d1b5fc244e3b687fef9975ac560c1919c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 16:05:35 +0000
Subject: [PATCH 0175/1504] python312Packages.fake-useragent: 1.5.1 -> 2.0.3

---
 pkgs/development/python-modules/fake-useragent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix
index 3d15da8d064b..99f9a27e060e 100644
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "fake-useragent";
-  version = "1.5.1";
+  version = "2.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fake-useragent";
     repo = "fake-useragent";
-    rev = "refs/tags/${version}";
-    hash = "sha256-BDXJJeT29GWkN9DoVl8sxXFpV/eMqu3mqlvMr2lzJM8=";
+    tag = version;
+    hash = "sha256-FmGk3Cc1Y2j6+JQsc2JK6D78ktuNCLmfkfY6dNLmpQ4=";
   };
 
   postPatch = ''

From ad6ab5dc3151c8c05a042e0f89c575f0ec406219 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 20:10:43 +0000
Subject: [PATCH 0176/1504] python312Packages.branca: 0.8.0 -> 0.8.1

---
 pkgs/development/python-modules/branca/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index aca3fcd645d0..93ec028fb3e1 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "branca";
-  version = "0.8.0";
+  version = "0.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-visualization";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-9imrW4u2Ea1q7VKgk6Vs8y2OiSzAPr3W6471pi/gVm4=";
+    tag = "v${version}";
+    hash = "sha256-Gnr3ONqWpUNOGiOlyq77d9PxcDT8TjqTHYBGxH+V+xc=";
   };
 
   postPatch = ''

From 3fce2feebedd74aae04a40aa16b88b2ddac6643c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 20:17:33 +0000
Subject: [PATCH 0177/1504] python312Packages.superqt: 0.6.7 -> 0.7.0

---
 pkgs/development/python-modules/superqt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix
index 713f688a4c17..10526428a872 100644
--- a/pkgs/development/python-modules/superqt/default.nix
+++ b/pkgs/development/python-modules/superqt/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "superqt";
-  version = "0.6.7";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyapp-kit";
     repo = "superqt";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-/VR9Lc1x+7J/3zyo/eBFBvGkPXzpTfPpNAvNhSzWio8=";
+    tag = "v${version}";
+    hash = "sha256-1GtkT3GqEBu1I9zZb5u3wIm5ygYe/unhn2cXvhnPkQc=";
   };
 
   build-system = [

From 88e6208a0cc6e61e20db25a007c71fb407b25132 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Dec 2024 21:36:13 +0000
Subject: [PATCH 0178/1504] python312Packages.commoncode: 32.0.0 -> 32.1.0

---
 pkgs/development/python-modules/commoncode/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 3e8c1eb0182e..dcb222a9f530 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "commoncode";
-  version = "32.0.0";
+  version = "32.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "commoncode";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-yqvsBJHrxVkSqp3QnYmHDJr3sef/g4pkSlkSioYuOc4=";
+    tag = "v${version}";
+    hash = "sha256-TzQmAJlgcHaarUhicIH4EbOIn+3feu43QQlLq+Z5ERA=";
   };
 
   dontConfigure = true;

From 62c70656de9d776e093e2dbfdb7e39093ef96d8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 08:55:54 +0000
Subject: [PATCH 0179/1504] python312Packages.diff-cover: 9.2.0 -> 9.2.1

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

diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index 9a15282ef938..776c91f244a7 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "diff-cover";
-  version = "9.2.0";
+  version = "9.2.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "diff_cover";
     inherit version;
-    hash = "sha256-haCzU+u7Z4+eh+owP3W1Rb0LrKOPVjIZu3LyroYrujY=";
+    hash = "sha256-X6Wy1xzPXRbNIipxwsoGnZv1+j1lf2+sm02cIzeTI78=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 3303ee196ec0685315d125a54afdf467da39d7a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 08:57:26 +0000
Subject: [PATCH 0180/1504] python312Packages.universal-pathlib: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix
index 007aaab546ad..7878aa3b956b 100644
--- a/pkgs/development/python-modules/universal-pathlib/default.nix
+++ b/pkgs/development/python-modules/universal-pathlib/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "universal-pathlib";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "universal_pathlib";
     inherit version;
-    hash = "sha256-6l1PuBeMKrRpz0+kbQzrFsyzeNpG27woqLnB7r3MxlU=";
+    hash = "sha256-UIF6rqqfQWPLHnb1vfhCB/oFznKLI/13lHmzRi5UMKw=";
   };
 
   build-system = [

From 762bd5254795cc4a31a49e67ec1099dc85aa385d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 09:31:09 +0000
Subject: [PATCH 0181/1504] python312Packages.djangorestframework-stubs: 3.15.1
 -> 3.15.2

---
 .../python-modules/djangorestframework-stubs/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
index 826bb862248c..f59780e39368 100644
--- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "djangorestframework-stubs";
-  version = "3.15.1";
+  version = "3.15.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "typeddjango";
     repo = "djangorestframework-stubs";
-    rev = "refs/tags/${version}";
-    hash = "sha256-m9KxC3dGe+uRB3YIykV/SCOHeItRYNKopF9fqCd10Vk=";
+    tag = version;
+    hash = "sha256-ZpnPJZhuKZCy6tV8KBRC4Wjr3t0igQOkkUyVtmmVRMg=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 7a8261d47e8ed3dba12cdf20fd31167a0fb64e5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 09:58:56 +0000
Subject: [PATCH 0182/1504] python312Packages.pywikibot: 9.5.0 -> 9.6.1

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

diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix
index ab10a6e71eeb..c55ad44ff921 100644
--- a/pkgs/development/python-modules/pywikibot/default.nix
+++ b/pkgs/development/python-modules/pywikibot/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pywikibot";
-  version = "9.5.0";
+  version = "9.6.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZUOsiadQ2zekQDc+wc9MvNgLBXQkguvrDufpC8+1kLo=";
+    hash = "sha256-736LEUwW1LofS1105TxVWHMGFaEpQGwa+WGIk2OQxmA=";
   };
 
   propagatedBuildInputs = [

From d2d7c27ae8f777467f2da16fd70d7a2239b399ff Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Mon, 16 Dec 2024 11:29:04 +0100
Subject: [PATCH 0183/1504] maintainers: add hlad

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c8ea1cd54590..b0d393ec118d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9133,6 +9133,13 @@
     githubId = 287215;
     keys = [ { fingerprint = "D618 7A03 A40A 3D56 62F5  4B46 03EF BF83 9A5F DC15"; } ];
   };
+  hlad = {
+    email = "hlad+nix@hlad.org";
+    name = "Marek Hladky";
+    matrix = "@hlad:hlad.org";
+    github = "hlad";
+    githubId = 6285728;
+  };
   hleboulanger = {
     email = "hleboulanger@protonmail.com";
     name = "Harold Leboulanger";

From f831bafd7313465bbd85a32a8a140f88b070f799 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Tue, 3 Dec 2024 19:04:02 +0100
Subject: [PATCH 0184/1504] obs-studio-plugins.obs-color-monitor: init at 0.8.2

---
 .../video/obs-studio/plugins/default.nix      |  2 +
 .../obs-studio/plugins/obs-color-monitor.nix  | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 1ae2ddc9724f..2eca00244349 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -18,6 +18,8 @@
 
   obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
 
+  obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { };
+
   obs-command-source = callPackage ./obs-command-source.nix { };
 
   obs-composite-blur = callPackage ./obs-composite-blur.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
new file mode 100644
index 000000000000..10156ce3af6c
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  obs-studio,
+  qtbase,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "obs-color-monitor";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "norihiro";
+    repo = "obs-color-monitor";
+    tag = finalAttrs.version;
+    hash = "sha256-cVMpmkcw8GzNGyd80g1oKmyiEYGMcRtWtDj9MC7RYf8=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    obs-studio
+    qtbase
+  ];
+
+  postInstall = ''
+    mkdir $out/lib $out/share
+    mv $out/obs-plugins/64bit $out/lib/obs-plugins
+    mv $out/data $out/share/obs
+    rm -rf $out/obs-plugins
+  '';
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Color Monitor plugin for OBS Studio";
+    homepage = "https://github.com/norihiro/obs-color-monitor";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ hlad ];
+  };
+})

From bc49601256b5b07877ae4be1b26a5c2af53cbb26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 11:30:29 +0000
Subject: [PATCH 0185/1504] python312Packages.fpdf2: 2.8.1 -> 2.8.2

---
 pkgs/development/python-modules/fpdf2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix
index cc452a0ccb1c..f7b0f221e962 100644
--- a/pkgs/development/python-modules/fpdf2/default.nix
+++ b/pkgs/development/python-modules/fpdf2/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "fpdf2";
-  version = "2.8.1";
+  version = "2.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-pdf";
     repo = "fpdf2";
-    rev = "refs/tags/${version}";
-    hash = "sha256-MYurl/nEZhdhGxeNalwTWnZ8lr9SYJBR7hIjBZLOrJU=";
+    tag = version;
+    hash = "sha256-NfHMmyFT+ZpqfRc41DetbFXs/twr12XagOkk3nGhrYk=";
   };
 
   postPatch = ''

From f507643f36a391e5e713a1f00b35dda80188673a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 11:59:41 +0000
Subject: [PATCH 0186/1504] python312Packages.httpx-ws: 0.6.2 -> 0.7.0

---
 pkgs/development/python-modules/httpx-ws/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix
index 6150c2d09b54..d27b7ce22d00 100644
--- a/pkgs/development/python-modules/httpx-ws/default.nix
+++ b/pkgs/development/python-modules/httpx-ws/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "httpx-ws";
-  version = "0.6.2";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frankie567";
     repo = "httpx-ws";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-VsIYOGNEdX4rxjEa01M77arA3ddJS3cPFxXlf13QTuE=";
+    tag = "v${version}";
+    hash = "sha256-/xhj27uMPvbVsieAjnd8Z9q18BLxaXP/1ndrgewN4Og=";
   };
 
   # we don't need to use the hatch-regex-commit plugin

From 54f369fab9768dca493a6a61e49a8136b8794608 Mon Sep 17 00:00:00 2001
From: Dopplerian <dopplerian+git@proton.me>
Date: Mon, 16 Dec 2024 13:00:54 +0100
Subject: [PATCH 0187/1504] maintainers: add dopplerian

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fd6c5d4807f..82926fa6f0f1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5860,6 +5860,12 @@
     githubId = 57304299;
     keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E  5E4C 0DB5 361B EEE5 30AB"; } ];
   };
+  dopplerian = {
+    name = "Dopplerian";
+    github = "Dopplerian";
+    githubId = 53937537;
+    keys = [ { fingerprint = "BBC4 C071 516B A147 8D07  F9DC D2FD E6EC 2E8C 2BF4"; } ];
+  };
   doriath = {
     email = "tomasz.zurkowski@gmail.com";
     github = "doriath";

From 8758992d5e231709b4a9e54f24c68090172f7d40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 14:05:58 +0000
Subject: [PATCH 0188/1504] python312Packages.bitsandbytes: 0.44.1 -> 0.45.0

---
 pkgs/development/python-modules/bitsandbytes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 90dde389144e..ae462c019f07 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "bitsandbytes";
-  version = "0.44.1";
+  version = "0.45.0";
 
   inherit (torch) cudaPackages cudaSupport;
   inherit (cudaPackages) cudaVersion;
@@ -56,8 +56,8 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "TimDettmers";
     repo = "bitsandbytes";
-    rev = "refs/tags/${version}";
-    hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k=";
+    tag = version;
+    hash = "sha256-HoZNEDhCPgGwFgwT4NqkbUAy0bYqvki75FBZn5aLuKM=";
   };
 
   # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.

From 7eeb17d3eeeb135a6654f2d850ffb0a01ea90787 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 15:12:34 +0000
Subject: [PATCH 0189/1504] sympa: 6.2.72 -> 6.2.74

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

diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix
index bbab3ac4f5d6..83018f0c72e0 100644
--- a/pkgs/by-name/sy/sympa/package.nix
+++ b/pkgs/by-name/sy/sympa/package.nix
@@ -70,13 +70,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "sympa";
-  version = "6.2.72";
+  version = "6.2.74";
 
   src = fetchFromGitHub {
     owner = "sympa-community";
     repo = pname;
     rev = version;
-    sha256 = "sha256-8G6MxpqVa3E5J/68E7tljcXF4w7OmNkI0nJwsgxJE28=";
+    sha256 = "sha256-Z5V4LqogIobs8pT+ED6iZGjnC+J+GQBHq2opu1yv/7k=";
   };
 
   configureFlags = [

From 7c81e1d58761b599cf2e39fc59cff5c855d7b08e Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Mon, 16 Dec 2024 11:00:04 -0500
Subject: [PATCH 0190/1504] open-vm-tools: substituteInPlace use --replace-fail

---
 pkgs/by-name/op/open-vm-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index ac340b7a87c5..8a039edbfba6 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c
 
     substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
-     --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
-     --replace "/bin/mount" "${util-linux}/bin/mount"
+     --replace-fail "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
+     --replace-fail "/bin/mount" "${util-linux}/bin/mount"
   '';
 
   configureFlags = [
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
           which
         ]
       }"
-    substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh"
+    substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace-fail "/bin/sh" "${bash}/bin/sh"
   '';
 
   meta = with lib; {

From 23ddc7b6e5e19e785b5936d98e7a966d0707868e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 16:07:57 +0000
Subject: [PATCH 0191/1504] python312Packages.django-soft-delete: 1.0.14 ->
 1.0.16

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

diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix
index ef55f085d2be..ee3bd1b35746 100644
--- a/pkgs/development/python-modules/django-soft-delete/default.nix
+++ b/pkgs/development/python-modules/django-soft-delete/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "django-soft-delete";
-  version = "1.0.14";
+  version = "1.0.16";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Qo31bqT7sT9C1PdS8R8qUXqjGsPRtFDmt4xMXV2d/Ds=";
+    hash = "sha256-zEA5jM2GnHWm1rp/Um4WxK/isMCBHCE6MY2Wu0xYp4c=";
   };
 
   dependencies = [ django ];

From 463adcffd4d4047e1dc21e9cab2cbbf9a2fd183c Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Mon, 16 Dec 2024 16:57:52 +0000
Subject: [PATCH 0192/1504] nicotine-plus: 3.3.6 -> 3.3.7

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

diff --git a/pkgs/by-name/ni/nicotine-plus/package.nix b/pkgs/by-name/ni/nicotine-plus/package.nix
index df2e532fb44d..bbb0ee5ff3d8 100644
--- a/pkgs/by-name/ni/nicotine-plus/package.nix
+++ b/pkgs/by-name/ni/nicotine-plus/package.nix
@@ -12,13 +12,13 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "nicotine-plus";
-  version = "3.3.6";
+  version = "3.3.7";
   pyproject = true;
   src = fetchFromGitHub {
     owner = "nicotine-plus";
     repo = "nicotine-plus";
     rev = "refs/tags/${version}";
-    hash = "sha256-je3hyxbF9wKW2gvHoDp712EJxBxooS2z0pQM57WDdOk=";
+    hash = "sha256-Rj+dDkBXNV4l4A9LxjBApzBQ4c1edP5XjoPfpifkDoM=";
   };
 
   nativeBuildInputs = [

From e5988ce17bbaaa3886c380ceb6741ca9f7c381be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Dec 2024 18:55:15 +0000
Subject: [PATCH 0193/1504] python312Packages.magicgui: 0.9.1 -> 0.10.0

---
 pkgs/development/python-modules/magicgui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix
index a996573f3078..7ebf7e79280e 100644
--- a/pkgs/development/python-modules/magicgui/default.nix
+++ b/pkgs/development/python-modules/magicgui/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "magicgui";
-  version = "0.9.1";
+  version = "0.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyapp-kit";
     repo = "magicgui";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-6ye29HtGQ8iwYE2kQ1wWIBC+bzFsMZmJR4eTXWwu7+U=";
+    tag = "v${version}";
+    hash = "sha256-taPnP9uB1y9hNqG/3MF3ZTc0q94+8WUx4E6+TQsJnIU=";
   };
 
   build-system = [

From fb04895bee114cc25541e5b25b8aa4fd00953d6a Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Mon, 16 Dec 2024 14:24:31 -0500
Subject: [PATCH 0194/1504] open-vm-tools: remove with lib

---
 pkgs/by-name/op/open-vm-tools/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index 8a039edbfba6..8ce2bd828869 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -39,6 +39,15 @@
   xmlsec,
   withX ? true,
 }:
+let
+  inherit (lib)
+    licenses
+    maintainers
+    makeBinPath
+    optional
+    optionals
+    ;
+in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open-vm-tools";
@@ -83,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
       xercesc
       xmlsec
     ]
-    ++ lib.optionals withX [
+    ++ optionals withX [
       gdk-pixbuf-xlib
       gtk3
       gtkmm3
@@ -127,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-kernel-modules"
     "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d"
     "--with-fuse=fuse3"
-  ] ++ lib.optional (!withX) "--without-x";
+  ] ++ optional (!withX) "--without-x";
 
   enableParallelBuilding = true;
 
@@ -138,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
       --prefix PATH ':' "${
-        lib.makeBinPath [
+        makeBinPath [
           iproute2
           dbus
           systemd
@@ -148,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace-fail "/bin/sh" "${bash}/bin/sh"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/vmware/open-vm-tools";
     changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${finalAttrs.version}";
     description = "Set of tools for VMWare guests to improve host-guest interaction";

From fa24aa68b98c7d577ab2467b3090786b19c03c9d Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Mon, 16 Dec 2024 14:41:31 -0500
Subject: [PATCH 0195/1504] open-vm-tools: add missing license

---
 pkgs/by-name/op/open-vm-tools/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index 8ce2bd828869..aa5290520a8c 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -165,7 +165,10 @@ stdenv.mkDerivation (finalAttrs: {
       A set of services and modules that enable several features in VMware products for
       better management of, and seamless user interactions with, guests.
     '';
-    license = licenses.gpl2;
+    license = with licenses; [
+      gpl2
+      lgpl21Only
+    ];
     platforms = [
       "x86_64-linux"
       "i686-linux"

From f6bb4417aa9b86f4239666c3f16b02d16fb0c3a1 Mon Sep 17 00:00:00 2001
From: HackerNCoder <hackerncoder@encryptionin.space>
Date: Mon, 16 Dec 2024 21:45:27 +0100
Subject: [PATCH 0196/1504] megasync: Wrap xorg.xrdb

---
 pkgs/applications/misc/megasync/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 938795d001bb..6d9c23ce13da 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -31,6 +31,7 @@
   sqlite,
   unzip,
   wget,
+  xorg,
   zlib,
   qt5,
 }:
@@ -121,6 +122,10 @@ mkDerivation rec {
     (lib.cmakeBool "ENABLE_DESIGN_TOKENS_IMPORTER" false) # cannot be fetched
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/megasync --prefix PATH : ${lib.makeBinPath [ xorg.xrdb ]}
+  '';
+
   meta = with lib; {
     description = "Easy automated syncing between your computers and your MEGA Cloud Drive";
     homepage = "https://mega.nz/";

From ddde8c0f6887dd443945b250fe3a4e252ccf25fa Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:29:39 -0500
Subject: [PATCH 0197/1504] sm64ex: unstable-2022-12-19 ->
 0-unstable-2024-07-04

---
 pkgs/games/sm64ex/sm64ex.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix
index 89c2ca5821dd..8f86d46d71ea 100644
--- a/pkgs/games/sm64ex/sm64ex.nix
+++ b/pkgs/games/sm64ex/sm64ex.nix
@@ -2,13 +2,13 @@
 
 callPackage ./generic.nix {
   pname = "sm64ex";
-  version = "unstable-2022-12-19";
+  version = "0-unstable-2024-07-04";
 
   src = fetchFromGitHub {
     owner = "sm64pc";
     repo = "sm64ex";
-    rev = "afc7e8da695bdf1aea5400a0d5c8b188d16a2088";
-    sha256 = "sha256-TbA9yGPtP2uGsxN3eFaQwFeNjAjZ5hSk8Qmx1pRQxf8=";
+    rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3";
+    sha256 = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ=";
   };
 
   extraMeta = {

From 739cd63aa626dd9bce65fc76bc1974e317346621 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:34:54 -0500
Subject: [PATCH 0198/1504] sm64ex: enable 60fps patch by default

---
 pkgs/games/sm64ex/default.nix |  8 ++++++--
 pkgs/games/sm64ex/generic.nix |  3 +++
 pkgs/games/sm64ex/sm64ex.nix  | 18 ++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix
index 8068f522482f..def730c90f77 100644
--- a/pkgs/games/sm64ex/default.nix
+++ b/pkgs/games/sm64ex/default.nix
@@ -1,7 +1,11 @@
-{ callPackage, branch }:
+{
+  callPackage,
+  branch,
+  _60fps ? true,
+}:
 
 {
-  sm64ex = callPackage ./sm64ex.nix { };
+  sm64ex = callPackage ./sm64ex.nix { inherit _60fps; };
 
   sm64ex-coop = callPackage ./coop.nix { };
 }
diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix
index b7f38686fe20..c7f07cbabfea 100644
--- a/pkgs/games/sm64ex/generic.nix
+++ b/pkgs/games/sm64ex/generic.nix
@@ -4,6 +4,7 @@
   src,
   extraNativeBuildInputs ? [ ],
   extraBuildInputs ? [ ],
+  extraPatches ? [ ],
   extraMeta ? { },
   compileFlags ? [ ],
   postInstall ? "",
@@ -51,6 +52,8 @@ stdenv.mkDerivation rec {
     ]
     ++ compileFlags;
 
+  patches = extraPatches;
+
   preBuild = ''
     patchShebangs extract_assets.py
     ln -s ${baseRom} ./baserom.${region}.z64
diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix
index 8f86d46d71ea..c653b149724f 100644
--- a/pkgs/games/sm64ex/sm64ex.nix
+++ b/pkgs/games/sm64ex/sm64ex.nix
@@ -1,6 +1,12 @@
-{ callPackage, fetchFromGitHub }:
+{
+  callPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  lib,
+  _60fps,
+}:
 
-callPackage ./generic.nix {
+callPackage ./generic.nix rec {
   pname = "sm64ex";
   version = "0-unstable-2024-07-04";
 
@@ -11,6 +17,14 @@ callPackage ./generic.nix {
     sha256 = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ=";
   };
 
+  extraPatches = lib.optionals _60fps [
+    (fetchpatch {
+      name = "60fps_ex.patch";
+      url = "file://${src}/enhancements/60fps_ex.patch";
+      hash = "sha256-2V7WcZ8zG8Ef0bHmXVz2iaR48XRRDjTvynC4RPxMkcA=";
+    })
+  ];
+
   extraMeta = {
     homepage = "https://github.com/sm64pc/sm64ex";
     description = "Super Mario 64 port based off of decompilation";

From 41d526828f23ca7769e32d66d435bf6bd7a1b58f Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:42:14 -0500
Subject: [PATCH 0199/1504] sm64ex-coop: drop

---
 .../manual/release-notes/rl-2505.section.md   |  2 +
 pkgs/games/sm64ex/coop.nix                    | 38 -------------------
 pkgs/games/sm64ex/default.nix                 |  2 -
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 5 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/games/sm64ex/coop.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 595b6af0e339..0827016a372d 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -90,6 +90,8 @@
 
 - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years.
 
+- `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`.
+
 - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
   Like upstream's docker images, renovate now runs on NodeJS 22.
 
diff --git a/pkgs/games/sm64ex/coop.nix b/pkgs/games/sm64ex/coop.nix
deleted file mode 100644
index f1a01664f7dc..000000000000
--- a/pkgs/games/sm64ex/coop.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  callPackage,
-  fetchFromGitHub,
-  autoPatchelfHook,
-  zlib,
-  stdenvNoCC,
-}:
-
-callPackage ./generic.nix {
-  pname = "sm64ex-coop";
-  version = "unstable-2023-02-22";
-
-  src = fetchFromGitHub {
-    owner = "djoslin0";
-    repo = "sm64ex-coop";
-    rev = "8746a503086793c87860daadfaeaaf0a31b2d6cf";
-    sha256 = "sha256-iwJsq0FN9npxveIoMiB7zL5j1V72IExtEpzGj6lwLXQ=";
-  };
-
-  extraNativeBuildInputs = [ autoPatchelfHook ];
-
-  extraBuildInputs = [ zlib ];
-
-  postInstall =
-    let
-      sharedLib = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
-    in
-    ''
-      mkdir -p $out/lib
-      cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib
-      cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib
-    '';
-
-  extraMeta = {
-    homepage = "https://github.com/djoslin0/sm64ex-coop";
-    description = "Super Mario 64 online co-op mod, forked from sm64ex";
-  };
-}
diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix
index def730c90f77..4ba3f74c50b8 100644
--- a/pkgs/games/sm64ex/default.nix
+++ b/pkgs/games/sm64ex/default.nix
@@ -6,7 +6,5 @@
 
 {
   sm64ex = callPackage ./sm64ex.nix { inherit _60fps; };
-
-  sm64ex-coop = callPackage ./coop.nix { };
 }
 .${branch}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0090e579371e..22b280022522 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1173,6 +1173,7 @@ mapAliases {
   SkypeExport = skypeexport; # Added 2024-06-12
   slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
   slurm-llnl = slurm; # renamed July 2017
+  sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
   snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
   soldat-unstable = opensoldat; # Added 2022-07-02
   soundOfSorting = sound-of-sorting; # Added 2023-07-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a75f2b915919..002bd843d7bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16544,10 +16544,6 @@ with pkgs;
     branch = "sm64ex";
   };
 
-  sm64ex-coop = callPackage ../games/sm64ex {
-    branch = "sm64ex-coop";
-  };
-
   amoeba = callPackage ../games/amoeba { };
   amoeba-data = callPackage ../games/amoeba/data.nix { };
 

From 8248382fdd6a43d36f4ae75a0c8d0521cc9f818c Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 23 Nov 2024 12:52:53 -0500
Subject: [PATCH 0200/1504] sm64ex: migrate to pkgs/by-name

---
 pkgs/by-name/sm/sm64ex/package.nix | 86 +++++++++++++++++++++++++++++
 pkgs/games/sm64ex/default.nix      | 10 ----
 pkgs/games/sm64ex/generic.nix      | 87 ------------------------------
 pkgs/games/sm64ex/sm64ex.nix       | 32 -----------
 pkgs/top-level/all-packages.nix    |  4 --
 5 files changed, 86 insertions(+), 133 deletions(-)
 create mode 100644 pkgs/by-name/sm/sm64ex/package.nix
 delete mode 100644 pkgs/games/sm64ex/default.nix
 delete mode 100644 pkgs/games/sm64ex/generic.nix
 delete mode 100644 pkgs/games/sm64ex/sm64ex.nix

diff --git a/pkgs/by-name/sm/sm64ex/package.nix b/pkgs/by-name/sm/sm64ex/package.nix
new file mode 100644
index 000000000000..7a2ea046d59a
--- /dev/null
+++ b/pkgs/by-name/sm/sm64ex/package.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  python3,
+  pkg-config,
+  audiofile,
+  SDL2,
+  hexdump,
+  sm64baserom,
+  region ? "us",
+  _60fps ? true,
+}:
+let
+  baseRom = (sm64baserom.override { inherit region; }).romPath;
+in
+stdenv.mkDerivation (finalAttrs: {
+
+  pname = "sm64ex";
+  version = "0-unstable-2024-07-04";
+
+  src = fetchFromGitHub {
+    owner = "sm64pc";
+    repo = "sm64ex";
+    rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3";
+    hash = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ=";
+  };
+
+  patches = lib.optionals _60fps [
+    (fetchpatch {
+      name = "60fps_ex.patch";
+      url = "file://${finalAttrs.src}/enhancements/60fps_ex.patch";
+      hash = "sha256-2V7WcZ8zG8Ef0bHmXVz2iaR48XRRDjTvynC4RPxMkcA=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    python3
+    pkg-config
+    hexdump
+  ];
+
+  buildInputs = [
+    audiofile
+    SDL2
+  ];
+
+  enableParallelBuilding = true;
+
+  makeFlags =
+    [
+      "VERSION=${region}"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "OSX_BUILD=1"
+    ];
+
+  preBuild = ''
+    patchShebangs extract_assets.py
+    ln -s ${baseRom} ./baserom.${region}.z64
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/sm64pc/sm64ex";
+    description = "Super Mario 64 port based off of decompilation";
+    longDescription = ''
+      Note that you must supply a baserom yourself to extract assets from.
+      If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp".
+      If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute.
+    '';
+    mainProgram = "sm64ex";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ qubitnano ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix
deleted file mode 100644
index 4ba3f74c50b8..000000000000
--- a/pkgs/games/sm64ex/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  callPackage,
-  branch,
-  _60fps ? true,
-}:
-
-{
-  sm64ex = callPackage ./sm64ex.nix { inherit _60fps; };
-}
-.${branch}
diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix
deleted file mode 100644
index c7f07cbabfea..000000000000
--- a/pkgs/games/sm64ex/generic.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  pname,
-  version,
-  src,
-  extraNativeBuildInputs ? [ ],
-  extraBuildInputs ? [ ],
-  extraPatches ? [ ],
-  extraMeta ? { },
-  compileFlags ? [ ],
-  postInstall ? "",
-  region ? "us",
-
-  lib,
-  stdenv,
-  python3,
-  pkg-config,
-  audiofile,
-  SDL2,
-  hexdump,
-  sm64baserom,
-}:
-let
-  baseRom = (sm64baserom.override { inherit region; }).romPath;
-in
-stdenv.mkDerivation rec {
-  inherit
-    pname
-    version
-    src
-    postInstall
-    ;
-
-  nativeBuildInputs = [
-    python3
-    pkg-config
-    hexdump
-  ] ++ extraNativeBuildInputs;
-
-  buildInputs = [
-    audiofile
-    SDL2
-  ] ++ extraBuildInputs;
-
-  enableParallelBuilding = true;
-
-  makeFlags =
-    [
-      "VERSION=${region}"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "OSX_BUILD=1"
-    ]
-    ++ compileFlags;
-
-  patches = extraPatches;
-
-  preBuild = ''
-    patchShebangs extract_assets.py
-    ln -s ${baseRom} ./baserom.${region}.z64
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex
-
-    runHook postInstall
-  '';
-
-  meta =
-    with lib;
-    {
-      longDescription = ''
-        ${extraMeta.description or "Super Mario 64 port based off of decompilation"}
-
-        Note that you must supply a baserom yourself to extract assets from.
-        If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp".
-        If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute.
-      '';
-      mainProgram = "sm64ex";
-      license = licenses.unfree;
-      maintainers = [ ];
-      platforms = platforms.unix;
-    }
-    // extraMeta;
-}
diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix
deleted file mode 100644
index c653b149724f..000000000000
--- a/pkgs/games/sm64ex/sm64ex.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  callPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  lib,
-  _60fps,
-}:
-
-callPackage ./generic.nix rec {
-  pname = "sm64ex";
-  version = "0-unstable-2024-07-04";
-
-  src = fetchFromGitHub {
-    owner = "sm64pc";
-    repo = "sm64ex";
-    rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3";
-    sha256 = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ=";
-  };
-
-  extraPatches = lib.optionals _60fps [
-    (fetchpatch {
-      name = "60fps_ex.patch";
-      url = "file://${src}/enhancements/60fps_ex.patch";
-      hash = "sha256-2V7WcZ8zG8Ef0bHmXVz2iaR48XRRDjTvynC4RPxMkcA=";
-    })
-  ];
-
-  extraMeta = {
-    homepage = "https://github.com/sm64pc/sm64ex";
-    description = "Super Mario 64 port based off of decompilation";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 002bd843d7bc..0b92cd108dc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16540,10 +16540,6 @@ with pkgs;
 
   qgo = libsForQt5.callPackage ../games/qgo { };
 
-  sm64ex = callPackage ../games/sm64ex {
-    branch = "sm64ex";
-  };
-
   amoeba = callPackage ../games/amoeba { };
   amoeba-data = callPackage ../games/amoeba/data.nix { };
 

From 1ea74e68c8024ac8a316164e2991c0a1dd99cf5f Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Mon, 16 Dec 2024 23:21:42 -0500
Subject: [PATCH 0201/1504] tor-browser: fix desktop icon

---
 pkgs/by-name/to/tor-browser/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 8803c3a05704..fb77c43d3066 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -199,6 +199,7 @@ lib.warnIf (useHardenedMalloc != null)
             "x-scheme-handler/http"
             "x-scheme-handler/https"
           ];
+          startupWMClass = "Tor Browser";
         })
       ];
 

From f6f318bea594c8e814086c67078b33dc61dca9ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 07:32:45 +0000
Subject: [PATCH 0202/1504] python312Packages.google-cloud-dataproc: 5.12.0 ->
 5.16.0

---
 .../python-modules/google-cloud-dataproc/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 480bf6f76d87..039d89b18faa 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "5.12.0";
+  version = "5.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_dataproc";
     inherit version;
-    hash = "sha256-S1jXIPAgxONTeKKeqHzoKGr2Mes7w4LMvL/zncAZnik=";
+    hash = "sha256-I7LYrk9kjgG2b+0KvqEUtgDTNj2VW4VYx2Rak/KNbjw=";
   };
 
   build-system = [ setuptools ];

From ed5141d4972872bdc39509106173cd9a3e63b0d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 09:52:25 +0000
Subject: [PATCH 0203/1504] python312Packages.ansitable: 0.11.3 -> 0.11.4

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

diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix
index e722d504d61f..0080974e646d 100644
--- a/pkgs/development/python-modules/ansitable/default.nix
+++ b/pkgs/development/python-modules/ansitable/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "ansitable";
-  version = "0.11.3";
+  version = "0.11.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk=";
+    hash = "sha256-XUjXVs9/ETlbbtvYz8YJqCsP1BFajqQKQfSM+Rvm4O0=";
   };
 
   build-system = [ setuptools ];

From fda14c3dc025a18557d04feda75071dcae484795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 10:17:59 +0000
Subject: [PATCH 0204/1504] pstoedit: 4.01 -> 4.02

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

diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix
index b72b2650e9b6..af1916667b2d 100644
--- a/pkgs/by-name/ps/pstoedit/package.nix
+++ b/pkgs/by-name/ps/pstoedit/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pstoedit";
-  version = "4.01";
+  version = "4.02";
 
   src = fetchurl {
     url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz";
-    hash = "sha256-RZdlq3NssQ+VVKesAsXqfzVcbC6fz9IXYRx9UQKxB2s=";
+    hash = "sha256-VYi0MtLGsq2YKLRJFepYE/+aOjMSpB+g3kw43ayd9y8=";
   };
 
   outputs = [

From a01cab513a00540e688e97f887853f7af382222f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 11:23:06 +0000
Subject: [PATCH 0205/1504] liblo: 0.31 -> 0.32

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

diff --git a/pkgs/by-name/li/liblo/package.nix b/pkgs/by-name/li/liblo/package.nix
index 71483dc24d42..a983ace49fac 100644
--- a/pkgs/by-name/li/liblo/package.nix
+++ b/pkgs/by-name/li/liblo/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "liblo";
-  version = "0.31";
+  version = "0.32";
 
   src = fetchurl {
     url = "mirror://sourceforge/liblo/liblo/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb";
+    sha256 = "sha256-XfBfKgOV/FrJD2tTi4yCuyGUFAb9GnCnZcczakfXAgg=";
   };
 
   doCheck = false; # fails 1 out of 3 tests

From bbc3d88974b5afd99362c652fd2e58fb0d8949b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 13:21:54 +0000
Subject: [PATCH 0206/1504] last: 1592 -> 1607

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

diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix
index ea5d7125c7f3..cadef746e793 100644
--- a/pkgs/by-name/la/last/package.nix
+++ b/pkgs/by-name/la/last/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1592";
+  version = "1607";
 
   src = fetchFromGitLab {
     owner = "mcfrith";
     repo = "last";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZZdIOUKyA+TvWHOV5JU1LUnh3hSDBqXhJK9a/frVMF0=";
+    hash = "sha256-AHaKE9il4GZ5JhCqmScqG/rTHEOA8+A421pbdrDHZeY=";
   };
 
   nativeBuildInputs = [

From 11c826d556b9881adfce377b5c5b06e6a417743a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 13:29:17 +0000
Subject: [PATCH 0207/1504] python312Packages.google-cloud-dlp: 3.25.1 ->
 3.26.0

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

diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 5aad5fed6900..0b19ec7c7a37 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.25.1";
+  version = "3.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_dlp";
     inherit version;
-    hash = "sha256-6R4CSOyB+beTUPNtj8wQc7uQmMUxhyO8lebV0PDu1Lg=";
+    hash = "sha256-+kxjk9deiNQU+Vhjs53Xpgo/UZEtA2gDylr7WR1obzQ=";
   };
 
   build-system = [ setuptools ];

From 2b3bcc2bbae375a60b21220a1d6e9b6a444ca47a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 13:49:45 +0000
Subject: [PATCH 0208/1504] netmaker: 0.26.0 -> 0.30.0

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

diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 2cd846733640..4df72311568d 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -13,16 +13,16 @@
 
 buildGoModule rec {
   pname = "netmaker";
-  version = "0.26.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc=";
+    hash = "sha256-Z2omesoEB6lJFy8ph6CFTb6XWsdgsvEG+i49dXmaC0Y=";
   };
 
-  vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84=";
+  vendorHash = "sha256-PYkjJ17hS0E0ncsUdrGWRn+3dEwZxS1nD0UjSDQflQ8=";
 
   inherit subPackages;
 

From 16152c7848aaad2b316c377737d6abf098d14c77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 13:51:57 +0000
Subject: [PATCH 0209/1504] netmaker-full: 0.26.0 -> 0.30.0

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

diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 2cd846733640..4df72311568d 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -13,16 +13,16 @@
 
 buildGoModule rec {
   pname = "netmaker";
-  version = "0.26.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc=";
+    hash = "sha256-Z2omesoEB6lJFy8ph6CFTb6XWsdgsvEG+i49dXmaC0Y=";
   };
 
-  vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84=";
+  vendorHash = "sha256-PYkjJ17hS0E0ncsUdrGWRn+3dEwZxS1nD0UjSDQflQ8=";
 
   inherit subPackages;
 

From 53bcab7eb37febc5ac9cc1a442d1451104a5f1b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Dec 2024 18:44:32 +0000
Subject: [PATCH 0210/1504] python312Packages.pydata-sphinx-theme: 0.16.0 ->
 0.16.1

---
 .../python-modules/pydata-sphinx-theme/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
index 6bb1c8386bce..beacd7d79138 100644
--- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pydata-sphinx-theme";
-  version = "0.16.0";
+  version = "0.16.1";
 
   format = "wheel";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     dist = "py3";
     python = "py3";
     pname = "pydata_sphinx_theme";
-    hash = "sha256-GMgQ7k5n4FKB43HhVsH7W7D6HydHJARhsiUnL32NV9g=";
+    hash = "sha256-IlMx6KxLMmgsGPysWlem9xfE5jLOpd0OJHtVFV+uzN4=";
   };
 
   propagatedBuildInputs = [

From 15b41de20802563ec650a2010e5a36a8671de08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 17 Dec 2024 09:38:21 -0800
Subject: [PATCH 0211/1504] libdeltachat: 1.151.6 -> 1.152.0

Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.6...v1.152.0

Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.152.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 296ca86cd9e3..b3f37d404a1b 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.151.6";
+  version = "1.152.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
-    rev = "v${version}";
-    hash = "sha256-alt4RkZeKz5yqbie3ksu9fKXKapYR0hCaY7vOMicrk8=";
+    tag = "v${version}";
+    hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-++LG3MhmNVfHfMEuaSZrJYsf3NVbPWFD8KoDsiu9/Eg=";
+    hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs=";
   };
 
   nativeBuildInputs = [
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Delta Chat Rust Core library";
     homepage = "https://github.com/deltachat/deltachat-core-rust/";
-    changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mpl20;
     maintainers = with maintainers; [ dotlambda ];
     platforms = platforms.unix;

From 7898b22eb6f8aeb48b73a261e91ebfc751f64ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 17 Dec 2024 09:40:21 -0800
Subject: [PATCH 0212/1504] deltachat-desktop: 1.48.0 -> 1.50.0

Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.48.0...v1.50.0

Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.50.0/CHANGELOG.md
---
 pkgs/by-name/de/deltachat-desktop/package.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index 3ccaf9d89c0c..0bb503fc0af7 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -19,17 +19,17 @@
 
 let
   deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
-    version = "1.148.7";
+    version = "1.152.0";
     src = fetchFromGitHub {
       owner = "deltachat";
       repo = "deltachat-core-rust";
-      rev = "v${version}";
-      hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k=";
+      tag = "v${version}";
+      hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s=";
     };
     cargoDeps = rustPlatform.fetchCargoVendor {
       pname = "deltachat-core-rust";
       inherit version src;
-      hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
+      hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs=";
     };
   };
   electron = electron_32;
@@ -37,18 +37,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltachat-desktop";
-  version = "1.48.0";
+  version = "1.50.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-BgB12pHySJIMtBCph5UkBjioMhEYQq9i7htkrWQNlps=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0yVO9uIq70Oogt254+iHJv7p8mUeRpxVlJOcISJrKgo=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-YBfHVZB6TScIKbWQrN1KJYSUZytR81UwKZ87GaxGlZ8=";
+    hash = "sha256-07jvAKY5GBrZ6EKY9yHwWESezjQXSjjRzImaG+yUlGc=";
   };
 
   nativeBuildInputs = [
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-    VERSION_INFO_GIT_REF = finalAttrs.src.rev;
+    VERSION_INFO_GIT_REF = finalAttrs.src.tag;
   };
 
   buildPhase = ''
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Email-based instant messaging for Desktop";
     homepage = "https://github.com/deltachat/deltachat-desktop";
-    changelog = "https://github.com/deltachat/deltachat-desktop/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/deltachat/deltachat-desktop/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     mainProgram = "deltachat";
     maintainers = with lib.maintainers; [ dotlambda ];

From ab27e24a78b47fafa4ea8f5db3d4d76526bab2eb Mon Sep 17 00:00:00 2001
From: Melody Renata <me@lovingmelody.io>
Date: Tue, 17 Dec 2024 16:34:13 -0500
Subject: [PATCH 0213/1504] lug-helper: fix missing dependencies

* Added missing dependencies for winetricks

* Added libnotify for notifications
---
 pkgs/by-name/lu/lug-helper/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix
index 20726e8f7f9e..5514d18dd1e9 100644
--- a/pkgs/by-name/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@@ -7,6 +7,9 @@
   coreutils,
   findutils,
   zenity,
+  unzip,
+  cabextract,
+  libnotify,
   fetchFromGitHub,
   nix-update-script,
 }:
@@ -55,6 +58,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           coreutils
           findutils
           zenity
+          cabextract
+          unzip
+          libnotify
         ]
       }
 

From 40805f17b405c02d83135bf3de15e8336990c45c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 01:55:14 +0000
Subject: [PATCH 0214/1504] pdns: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix
index 87b4f65eb51b..d9bf21b24e46 100644
--- a/pkgs/by-name/pd/pdns/package.nix
+++ b/pkgs/by-name/pd/pdns/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns";
-  version = "4.9.2";
+  version = "4.9.3";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-9XBkBCcEH0xcVHDRbv+VGnA4w1PdxGGydQKQzpmy48I=";
+    hash = "sha256-suZwRqe5WCXDXdyRGe1uLoU1N6V20MTukIC7XwrT6NU=";
   };
   # redact configure flags from version output to reduce closure size
   patches = [ ./version.patch ];

From d05d12c3b1beba58e61e6ee96b4d97af9966ef7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 16:01:10 +0000
Subject: [PATCH 0215/1504] python312Packages.jianpu-ly: 1.801 -> 1.826

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

diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix
index 411f7df5ee45..2469f6569f35 100644
--- a/pkgs/development/python-modules/jianpu-ly/default.nix
+++ b/pkgs/development/python-modules/jianpu-ly/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "jianpu-ly";
-  version = "1.801";
+  version = "1.826";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "jianpu_ly";
-    hash = "sha256-piK9Ym94cKdaHGz/ogX7ylyAF1ww0jCdRXnHN6lu2MI=";
+    hash = "sha256-9vNCwXCOEHG2WNu8nDqCKJ3Z4vrsfX1lwKvkVGRrPPA=";
   };
 
   dependencies = [ lilypond ];

From bda27514741adacab583711c7f209ce1e479d1ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 05:16:36 +0000
Subject: [PATCH 0216/1504] python312Packages.types-s3transfer: 0.10.2 ->
 0.10.4

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

diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix
index bb2211a43dfb..e18bd2e288e7 100644
--- a/pkgs/development/python-modules/types-s3transfer/default.nix
+++ b/pkgs/development/python-modules/types-s3transfer/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-s3transfer";
-  version = "0.10.2";
+  version = "0.10.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_s3transfer";
     inherit version;
-    hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24=";
+    hash = "sha256-AxI0d+MGTIHv5xK/nTcsfHLyeQcRQx+bqlnPlupgcmc=";
   };
 
   build-system = [ setuptools ];

From 2a2527f59b6e3da964d7823c9ed40977a49fbe2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 07:48:48 +0000
Subject: [PATCH 0217/1504] python312Packages.cloudsmith-api: 2.0.13 -> 2.0.16

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

diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix
index 8fd6f490f042..57a790c3326c 100644
--- a/pkgs/development/python-modules/cloudsmith-api/default.nix
+++ b/pkgs/development/python-modules/cloudsmith-api/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "cloudsmith-api";
-  version = "2.0.13";
+  version = "2.0.16";
   format = "wheel";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cloudsmith_api";
     inherit format version;
-    hash = "sha256-xPPARaxclTRy7thJXtXaMK0F5/91q7o35LyzSmx1HPU=";
+    hash = "sha256-Hgg2mwBdUwW26h0mkgTIFLyigefAENDItQ0EvPGAOc0=";
   };
 
   propagatedBuildInputs = [

From 18df25f754e6f2484107ced9424cf9da130db778 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 13:52:37 +0000
Subject: [PATCH 0218/1504] python312Packages.yark: 1.2.10 -> 1.2.12

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

diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix
index c1a0a6cc900f..3474c86b2751 100644
--- a/pkgs/development/python-modules/yark/default.nix
+++ b/pkgs/development/python-modules/yark/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "yark";
-  version = "1.2.10";
+  version = "1.2.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Y1fWHpvrqGuBPyJ2dO2y0W2zhEgcTJABtkOAoZ7uyZU=";
+    hash = "sha256-K66LC/HhajAMCWU7PPfxkoaK84kLlAccYAH5FXoc+yE=";
   };
 
   pythonRelaxDeps = [

From 7512c886a1b67be48a427d5f8eeb5a08f2373b96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 15:35:24 +0000
Subject: [PATCH 0219/1504] xml-tooling-c: 3.2.4 -> 3.3.0

---
 pkgs/by-name/xm/xml-tooling-c/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix
index 709bfee14bb4..118b087dba8a 100644
--- a/pkgs/by-name/xm/xml-tooling-c/package.nix
+++ b/pkgs/by-name/xm/xml-tooling-c/package.nix
@@ -14,12 +14,12 @@
 
 stdenv.mkDerivation rec {
   pname = "xml-tooling-c";
-  version = "3.2.4";
+  version = "3.3.0";
 
   src = fetchgit {
     url = "https://git.shibboleth.net/git/cpp-xmltooling.git";
     rev = version;
-    hash = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU=";
+    hash = "sha256-czmBu7ThDwq+x7FahgZDMHqid8jeUNnTuKMI/Fj4IIw=";
   };
 
   buildInputs = [

From a288bb9c3e60c1d9cdaae530fd52fd826b414fe7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 16:01:08 +0000
Subject: [PATCH 0220/1504] python312Packages.bandit: 1.7.10 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix
index bb91d65287bf..686fb846b297 100644
--- a/pkgs/development/python-modules/bandit/default.nix
+++ b/pkgs/development/python-modules/bandit/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "bandit";
-  version = "1.7.10";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-We1cr12Stq2kv2W8ZDf+6kqdoQkzhERf7U1HKsxs/3s=";
+    hash = "sha256-tb/lWglavZ/iAJkXinxsBg+ES/1P5MdtKONeTFK50x4=";
   };
 
   nativeBuildInputs = [ pbr ];

From a8e93c7ed85ecea310832af1e4a11072bfbc7a8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 07:27:30 +0000
Subject: [PATCH 0221/1504] spicedb: 1.38.1 -> 1.39.1

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

diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index ccd3259c5ec5..2eed999ae2e5 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.38.1";
+  version = "1.39.1";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     rev = "v${version}";
-    hash = "sha256-axPf0HV+slTJ3aDuy8x/YZ/UKkTuRcKSMhkMPRrbm4M=";
+    hash = "sha256-+fU0JpaTAzEyI5+fzbOBarWUfdSz8XMSxN23LSIzcnA=";
   };
 
-  vendorHash = "sha256-8Y8Mg6zLR9FOrf/TfGBOOo7ud5/1pXTm7d/Kdtwx0Gc=";
+  vendorHash = "sha256-sbbuTZsdhsIrLRpy1w41jxJaZkCFJTBYRb+7KvFxo3U=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"

From 304aca53888f4d5a22de1c304f8210892657e929 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 09:14:28 +0000
Subject: [PATCH 0222/1504] python312Packages.linode-api: 5.22.0 -> 5.25.0

---
 pkgs/development/python-modules/linode-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index e98a78f9bc1d..86114e43b097 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "5.22.0";
+  version = "5.25.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "linode";
     repo = "python-linode-api";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-f9v9xhlOfSCKEWHmzi/tpoMIXccGwA6isoAAIZOf3r4=";
+    tag = "v${version}";
+    hash = "sha256-rEBMZft4o7R2e0N7x1ZEaCisRmhKggMbZWdtDvraoD0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 526e858b7221dad86780ee2b06b95b06cd3dd12f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 11:45:28 +0000
Subject: [PATCH 0223/1504] gridtracker: 1.24.0104 -> 1.24.0922

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

diff --git a/pkgs/by-name/gr/gridtracker/package.nix b/pkgs/by-name/gr/gridtracker/package.nix
index dff08d4d8767..16788295631c 100644
--- a/pkgs/by-name/gr/gridtracker/package.nix
+++ b/pkgs/by-name/gr/gridtracker/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gridtracker";
-  version = "1.24.0104";
+  version = "1.24.0922";
 
   src = fetchFromGitLab {
     owner = "gridtracker.org";
     repo = "gridtracker";
     rev = "v${version}";
-    hash = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU=";
+    hash = "sha256-6WgP13JVOzYnYtCDH3qCQXT70X9j4yqlUb18FFf1aSY=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ];

From e8cf4d17e628aab86a6f898850b3885182c845f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 12:45:24 +0000
Subject: [PATCH 0224/1504] lhapdf: 6.5.4 -> 6.5.5

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

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index bb2bc4e8a72e..fe9161ca1381 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lhapdf";
-  version = "6.5.4";
+  version = "6.5.5";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
-    sha256 = "sha256-JEOksyzDsFl8gki9biVwOs6ckaeiU8X2CxtUKO+chp4=";
+    sha256 = "sha256-ZB1eoJQreeREfhXlozSR/zxwMtcdYYEZk14UrSf146U=";
   };
 
   # The Apple SDK only exports locale_t from xlocale.h whereas glibc

From 712bb5b97575c83d084aaaaa251ff64c0629921f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 13:02:55 +0000
Subject: [PATCH 0225/1504] scite: 5.5.3 -> 5.5.4

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

diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix
index e8b2c0ba9b50..9ffccd8602b2 100644
--- a/pkgs/by-name/sc/scite/package.nix
+++ b/pkgs/by-name/sc/scite/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "scite";
-  version = "5.5.3";
+  version = "5.5.4";
 
   src = fetchurl {
     url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz";
-    hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY=";
+    hash = "sha256-Q50DPEUrswv3lS4wOQmRpqvQIqAx6OdLJXF/nkaukKg=";
   };
 
   nativeBuildInputs = [

From ac77cf7e6aae9215b902213d4da442efef4d89b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 13:23:17 +0000
Subject: [PATCH 0226/1504] kclvm_cli: 0.10.8 -> 0.11.0

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

diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix
index ca37fc6e71fb..239f0d829103 100644
--- a/pkgs/by-name/kc/kclvm_cli/package.nix
+++ b/pkgs/by-name/kc/kclvm_cli/package.nix
@@ -9,17 +9,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "kclvm_cli";
-  version = "0.10.8";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
     rev = "v${version}";
-    hash = "sha256-ls/Qe/nw3UIfZTjt7r7tzUwxlb5y4jBK2FQlOsMCttM=";
+    hash = "sha256-wRmLXR1r/FtZVfc6jifEj0jS0U0HIgJzBtuuzLQchjo=";
   };
 
   sourceRoot = "${src.name}/cli";
-  cargoHash = "sha256-elIo986ag7x+q17HwkcoqFnD9+1+Jq66XIHYZNaBB/w=";
+  cargoHash = "sha256-nZktEEp0BYusNJL7w9WhX6JK1LCmyi7dI659I9IR+Wo=";
   cargoPatches = [ ./cargo_lock.patch ];
 
   buildInputs =

From 63c1ea97a19f189387cc0056ef24b4c4e76a8002 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 13:34:47 +0000
Subject: [PATCH 0227/1504] ndpi: 4.10 -> 4.12

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

diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix
index 6bc064fafbfe..4d66df8dbffd 100644
--- a/pkgs/by-name/nd/ndpi/package.nix
+++ b/pkgs/by-name/nd/ndpi/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ndpi";
-  version = "4.10";
+  version = "4.12";
 
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "nDPI";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc=";
+    hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso=";
   };
 
   nativeBuildInputs = [

From d9434769daf66288f834042bcffbe6148d6c6dcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 14:11:22 +0000
Subject: [PATCH 0228/1504] pt2-clone: 1.71 -> 1.72

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

diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix
index e87977736bd6..99042320dd60 100644
--- a/pkgs/by-name/pt/pt2-clone/package.nix
+++ b/pkgs/by-name/pt/pt2-clone/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pt2-clone";
-  version = "1.71";
+  version = "1.72";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "pt2-clone";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-wyiY4qiWnisWKjBmkZSbmndJMMtogAQ+MWu4VLHROY0=";
+    sha256 = "sha256-Laq2C2bjLqeyT8eRH0DVjGmGg8R3TBfFL3XzwXTzKzo=";
   };
 
   nativeBuildInputs = [ cmake ];

From d9abdb3bb0e9cbce418bc1a70691d60901501050 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 15:12:49 +0000
Subject: [PATCH 0229/1504] sentry-native: 0.7.16 -> 0.7.17

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

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index f6c41a8bead5..6ea12337b4e3 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.7.16";
+  version = "0.7.17";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     rev = version;
-    hash = "sha256-CLJdr/hHP/yW6Pv3MR2qno6lU7Q0W+usrBfdKF5K1g0=";
+    hash = "sha256-bOtSFSBED5xXoONQVX+myBkoKyTCTuP6BZSX/XXwlZo=";
   };
 
   nativeBuildInputs = [

From a7bee5911ccdbf0bce2cf21296e43a3694642ff1 Mon Sep 17 00:00:00 2001
From: Daniel Coonce <1077480+coonce@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:31:24 -0600
Subject: [PATCH 0230/1504] jellyseerr: migrate to by-name

---
 pkgs/{servers => by-name/je}/jellyseerr/package.json            | 0
 .../default.nix => by-name/je/jellyseerr/package.nix}           | 0
 pkgs/{servers => by-name/je}/jellyseerr/update.sh               | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 2 deletions(-)
 rename pkgs/{servers => by-name/je}/jellyseerr/package.json (100%)
 rename pkgs/{servers/jellyseerr/default.nix => by-name/je/jellyseerr/package.nix} (100%)
 rename pkgs/{servers => by-name/je}/jellyseerr/update.sh (100%)

diff --git a/pkgs/servers/jellyseerr/package.json b/pkgs/by-name/je/jellyseerr/package.json
similarity index 100%
rename from pkgs/servers/jellyseerr/package.json
rename to pkgs/by-name/je/jellyseerr/package.json
diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/by-name/je/jellyseerr/package.nix
similarity index 100%
rename from pkgs/servers/jellyseerr/default.nix
rename to pkgs/by-name/je/jellyseerr/package.nix
diff --git a/pkgs/servers/jellyseerr/update.sh b/pkgs/by-name/je/jellyseerr/update.sh
similarity index 100%
rename from pkgs/servers/jellyseerr/update.sh
rename to pkgs/by-name/je/jellyseerr/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 579612e8d204..998ac748c8f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2444,8 +2444,6 @@ with pkgs;
 
   jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
 
-  jellyseerr = callPackage ../servers/jellyseerr { };
-
   juce = callPackage ../development/misc/juce {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };

From 17f32f37425f7bbe6719f3c8c36320c5483178fb Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 18 Dec 2024 10:02:06 -0800
Subject: [PATCH 0231/1504] pinentry-rofi: add rofi and coreutils to runtime
 PATH

This program wants to call `env rofi`, however when pinentry-rofi is
configured as the pinentry program for gpg-agent via a systemd service,
these dependencies might not be available in the service's PATH.
---
 pkgs/by-name/pi/pinentry-rofi/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pi/pinentry-rofi/package.nix b/pkgs/by-name/pi/pinentry-rofi/package.nix
index a67ab511a00c..b97c8548c129 100644
--- a/pkgs/by-name/pi/pinentry-rofi/package.nix
+++ b/pkgs/by-name/pi/pinentry-rofi/package.nix
@@ -7,7 +7,9 @@
   autoconf-archive,
   guile,
   texinfo,
+  makeWrapper,
   rofi,
+  coreutils,
 }:
 
 stdenv.mkDerivation rec {
@@ -26,11 +28,20 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkg-config
     texinfo
+    makeWrapper
   ];
 
   buildInputs = [ guile ];
 
-  propagatedBuildInputs = [ rofi ];
+  # pinentry-rofi wants to call `env rofi` (https://github.com/plattfot/pinentry-rofi/blob/fde8e32b8380512e2ba02961ccc99765575e2c89/pinentry-rofi.scm#L338)
+  postInstall = ''
+    wrapProgram $out/bin/pinentry-rofi --prefix PATH : ${
+      lib.makeBinPath [
+        rofi
+        coreutils
+      ]
+    }
+  '';
 
   meta = with lib; {
     description = "Rofi frontend to pinentry";

From 28765958d2d4aeb14a6687b60d2ffa735b816e6f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:14:50 -0300
Subject: [PATCH 0232/1504] nextcloudXXPackages.apps.recognize: use
 lib.{getExe,getDev},

fix typo
---
 .../nextcloud/packages/apps/recognize.nix     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index d72fb41600dd..86d648447959 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -3,6 +3,8 @@
   fetchurl,
   lib,
   nodejs,
+  node-pre-gyp,
+  node-gyp,
   python3,
   util-linux,
   ffmpeg,
@@ -36,7 +38,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  pname = "nextcloud-app-recognise";
+  pname = "nextcloud-app-recognize";
   version = currentVersionInfo.version;
 
   srcs =
@@ -80,11 +82,11 @@ stdenv.mkDerivation rec {
     # Replace all occurences of node (and check that we actually remved them all)
     test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -gt 0
     substituteInPlace recognize/lib/**/*.php \
-      --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${nodejs}/bin/node'" \
-      --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${nodejs}/bin/node'" \
-      --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${nodejs}/bin/node'" \
-      --replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${nodejs}/bin/node'" \
-      --replace-quiet "\$this->config->getAppValue('node_binary')" "'${nodejs}/bin/node'"
+      --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${lib.getExe nodejs}'" \
+      --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${lib.getExe nodejs}'" \
+      --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'" \
+      --replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${lib.getExe nodejs}'" \
+      --replace-quiet "\$this->config->getAppValue('node_binary')" "'${lib.getExe nodejs}'"
     test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0
 
 
@@ -92,13 +94,13 @@ stdenv.mkDerivation rec {
     # Skip trying to install it... (less warnings in the log)
     sed  -i '/public function run/areturn ; //skip' recognize/lib/Migration/InstallDeps.php
 
-    ln -s ${ffmpeg}/bin/ffmpeg recognize/node_modules/ffmpeg-static/ffmpeg
+    ln -s ${lib.getExe ffmpeg} recognize/node_modules/ffmpeg-static/ffmpeg
   '';
 
   nativeBuildInputs = lib.optionals useLibTensorflow [
     nodejs
-    nodejs.pkgs.node-pre-gyp
-    nodejs.pkgs.node-gyp
+    node-pre-gyp
+    node-gyp
     python3
     util-linux
   ];
@@ -107,7 +109,7 @@ stdenv.mkDerivation rec {
     cd recognize
 
     # Install tfjs dependency
-    export CPPFLAGS="-I${nodejs}/include/node -Ideps/include"
+    export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include"
     cd node_modules/@tensorflow/tfjs-node
     node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node
     cd -

From 361a9f0f94b592f9a764a92aa58c72c3db28599c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 18:29:00 +0000
Subject: [PATCH 0233/1504] cli11: 2.3.2 -> 2.4.2

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

diff --git a/pkgs/by-name/cl/cli11/package.nix b/pkgs/by-name/cl/cli11/package.nix
index 596178f81dc2..c47724390a69 100644
--- a/pkgs/by-name/cl/cli11/package.nix
+++ b/pkgs/by-name/cl/cli11/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cli11";
-  version = "2.3.2";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "CLIUtils";
     repo = "CLI11";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY=";
+    hash = "sha256-BLjGKN/UQIPVFlZaJ2VxTLFfY6otpJZ6HqfLtt5+r88=";
   };
 
   buildInputs = [ catch2 ];

From 802a0aca8d7fdec58710cf0cdc55d83ccc2707f6 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 18 Dec 2024 19:21:05 +0000
Subject: [PATCH 0234/1504] regripper: fix perl libs not in path

This prevented the program from working at all.
For perl libs to be loaded, they have to be in PERL5PATH.
---
 pkgs/by-name/re/regripper/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index ac5405d72fda..4f0b9e429fac 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -2,12 +2,17 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  makeWrapper,
   perl,
   perlPackages,
-  runtimeShell,
 }:
 
-stdenv.mkDerivation rec {
+let
+  perlDeps = [
+    perlPackages.ParseWin32Registry
+  ];
+in
+stdenv.mkDerivation {
   pname = "regripper";
   version = "0-unstable-2024-11-02";
 
@@ -18,26 +23,24 @@ stdenv.mkDerivation rec {
     hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   propagatedBuildInputs = [
     perl
-    perlPackages.ParseWin32Registry
-  ];
+  ] ++ perlDeps;
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/{bin,share}
 
-    rm -r *.md *.exe *.bat *.dll
+    rm -r *.md *.exe *.bat *.dll *.zip
 
     cp -aR . "$out/share/regripper/"
 
-    cat > "$out/bin/regripper" << EOF
-    #!${runtimeShell}
-    exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@"
-    EOF
-
-    chmod u+x  "$out/bin/regripper"
+    makeWrapper ${perl}/bin/perl $out/bin/regripper \
+      --add-flags "$out/share/regripper/rip.pl" \
+      --set PERL5LIB ${perlPackages.makeFullPerlPath perlDeps}
 
     runHook postInstall
   '';

From 5613d83ba6753d6a50a641dcb894b5b2d01f9dfa Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 18 Dec 2024 19:25:19 +0000
Subject: [PATCH 0235/1504] regripper: 0-unstable-2024-11-02 ->
 0-unstable-2024-12-12

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

diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix
index 4f0b9e429fac..82f615ea1dd6 100644
--- a/pkgs/by-name/re/regripper/package.nix
+++ b/pkgs/by-name/re/regripper/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "regripper";
-  version = "0-unstable-2024-11-02";
+  version = "0-unstable-2024-12-12";
 
   src = fetchFromGitHub {
     owner = "keydet89";
     repo = "RegRipper3.0";
-    rev = "89f3cac57e10bce1a79627e6038353e8e8a0c378";
-    hash = "sha256-dW3Gr4HQH484i47Bg+CEnBYoGQQRMBJr88+YeuU+iV4=";
+    rev = "bdf7ac2500a41319479846fe07202b7e8a61ca1f";
+    hash = "sha256-JEBwTpDck0w85l0q5WjF1d20NyU+GJ89yAzbkUVOsu0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0bcffe70b7d7b5662f8e8b748cfcafd054c2758f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 19:26:36 +0000
Subject: [PATCH 0236/1504] apk-tools: 2.14.5 -> 2.14.7

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

diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index f289ff36f7a0..1384f1ed9ace 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "apk-tools";
-  version = "2.14.5";
+  version = "2.14.7";
 
   src = fetchFromGitLab {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "apk-tools";
     rev = "v${version}";
-    sha256 = "sha256-GtWwLQoN0106uErEDjPrwlz8pmOKdV3OrtfisFhGqoY=";
+    sha256 = "sha256-4MA+wP8G1Qbv8mbzx1R0eFG7gbwUAfSAFJZ6ulrBHUY=";
   };
 
   nativeBuildInputs = [ pkg-config scdoc ]

From b9d800d46814e44db4d0a0104141aeb54e0c3c9a Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Thu, 28 Nov 2024 22:57:12 +0100
Subject: [PATCH 0237/1504] workflows/eval: Request reviews from changed
 package maintainers

Currently we need to rely on ofborg requesting reviews from package
maintainers, which takes a while with ofborg's eval queue. Since
recently we're doing faster evaluations with GitHub Actions, which contain all
necessary information to determine reviewers of changed packages the
same way ofborg does. This PR takes advantage of that.
---
 .github/workflows/codeowners-v2.yml |   2 +
 .github/workflows/eval.yml          |  26 +++++-
 ci/eval/compare/default.nix         |  22 ++++-
 ci/eval/compare/maintainers.nix     | 123 ++++++++++++++++++++++++++++
 ci/eval/compare/utils.nix           |  40 +++++----
 5 files changed, 189 insertions(+), 24 deletions(-)
 create mode 100644 ci/eval/compare/maintainers.nix

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 5cfeafa8489e..8c1782437a80 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -19,6 +19,8 @@ name: Codeowners v2
 #
 # This split is done because checking code owners requires handling untrusted PR input,
 # while requesting code owners requires PR write access, and those shouldn't be mixed.
+#
+# Note that the latter is also used for ./eval.yml requesting reviewers.
 
 on:
   pull_request_target:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index bac9394500ac..a0604bbc8fcd 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -132,6 +132,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
+          fetch-depth: 2
           path: nixpkgs
 
       - name: Install Nix
@@ -193,12 +194,18 @@ jobs:
       - name: Compare against the base branch
         if: steps.baseRunId.outputs.baseRunId
         run: |
-          nix-build nixpkgs/ci -A eval.compare \
+          git -C nixpkgs worktree add ../base ${{ needs.attrs.outputs.baseSha }}
+          git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.baseSha }} ${{ needs.attrs.outputs.mergedSha }} \
+            | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
+
+          # Use the base branch to get accurate maintainer info
+          nix-build base/ci -A eval.compare \
             --arg beforeResultDir ./baseResult \
             --arg afterResultDir ./prResult \
+            --arg touchedFilesJson ./touched-files.json \
             -o comparison
+
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
-          # TODO: Request reviews from maintainers for packages whose files are modified in the PR
 
       - name: Upload the combined results
         if: steps.baseRunId.outputs.baseRunId
@@ -217,6 +224,14 @@ jobs:
       pull-requests: write
       statuses: write
     steps:
+      # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
+      # Can't use the token received from permissions above, because it can't get enough permissions
+      - uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
+        id: app-token
+        with:
+          app-id: ${{ vars.OWNER_APP_ID }}
+          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+
       - name: Download process result
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
@@ -251,6 +266,13 @@ jobs:
               /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
               -f "labels[]=$toAdd"
           done < <(comm -13 before after)
+
+          # Request reviewers from maintainers of changed output paths
+          GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
+            --method POST \
+            /repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers \
+            --input <(jq '{ reviewers: keys }' comparison/maintainers.json)
+
         env:
           GH_TOKEN: ${{ github.token }}
           REPOSITORY: ${{ github.repository }}
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 4f3b943a5a13..712a656d11ad 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -5,7 +5,11 @@
   writeText,
   ...
 }:
-{ beforeResultDir, afterResultDir }:
+{
+  beforeResultDir,
+  afterResultDir,
+  touchedFilesJson,
+}:
 let
   /*
     Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
@@ -77,11 +81,11 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = diff beforeAttrs afterAttrs;
 
+  rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
+  rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
+
   changed-paths =
     let
-      rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
-      rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
-
       rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs;
       rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs;
       rebuildCountByKernel = lib.mapAttrs (
@@ -99,10 +103,17 @@ let
         labels = getLabels rebuildCountByKernel;
       }
     );
+
+  maintainers = import ./maintainers.nix {
+    changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs);
+    changedpathsjson = touchedFilesJson;
+  };
 in
 runCommand "compare"
   {
     nativeBuildInputs = [ jq ];
+    maintainers = builtins.toJSON maintainers;
+    passAsFile = [ "maintainers" ];
   }
   ''
     mkdir $out
@@ -110,5 +121,8 @@ runCommand "compare"
     cp ${changed-paths} $out/changed-paths.json
 
     jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md
+
+    cp "$maintainersPath" "$out/maintainers.json"
+
     # TODO: Compare eval stats
   ''
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
new file mode 100644
index 000000000000..0c08f85cec43
--- /dev/null
+++ b/ci/eval/compare/maintainers.nix
@@ -0,0 +1,123 @@
+# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
+{ changedattrs, changedpathsjson }:
+let
+  pkgs = import ../../.. {
+    system = "x86_64-linux";
+    config = { };
+    overlays = [ ];
+  };
+  inherit (pkgs) lib;
+
+  changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
+
+  anyMatchingFile =
+    filename:
+    let
+      matching = builtins.filter (changed: lib.strings.hasSuffix changed filename) changedpaths;
+    in
+    (builtins.length matching) > 0;
+
+  anyMatchingFiles = files: (builtins.length (builtins.filter anyMatchingFile files)) > 0;
+
+  enrichedAttrs = builtins.map (path: {
+    path = path;
+    name = builtins.concatStringsSep "." path;
+  }) changedattrs;
+
+  validPackageAttributes = builtins.filter (
+    pkg:
+    if (lib.attrsets.hasAttrByPath pkg.path pkgs) then
+      (
+        if (builtins.tryEval (lib.attrsets.attrByPath pkg.path null pkgs)).success then
+          true
+        else
+          builtins.trace "Failed to access ${pkg.name} even though it exists" false
+      )
+    else
+      builtins.trace "Failed to locate ${pkg.name}." false
+  ) enrichedAttrs;
+
+  attrsWithPackages = builtins.map (
+    pkg: pkg // { package = lib.attrsets.attrByPath pkg.path null pkgs; }
+  ) validPackageAttributes;
+
+  attrsWithMaintainers = builtins.map (
+    pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; }
+  ) attrsWithPackages;
+
+  attrsWeCanPing = builtins.filter (
+    pkg:
+    if (builtins.length pkg.maintainers) > 0 then
+      true
+    else
+      builtins.trace "Package has no maintainers: ${pkg.name}" false
+  ) attrsWithMaintainers;
+
+  relevantFilenames =
+    drv:
+    (lib.lists.unique (
+      builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) (
+        builtins.filter (x: x != null) [
+          (builtins.unsafeGetAttrPos "maintainers" (drv.meta or { }))
+          (builtins.unsafeGetAttrPos "src" drv)
+          # broken because name is always set by stdenv:
+          #    # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
+          #    # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
+          #    name = assert validity.handled; name + lib.optionalString
+          #(builtins.unsafeGetAttrPos "name" drv)
+          (builtins.unsafeGetAttrPos "pname" drv)
+          (builtins.unsafeGetAttrPos "version" drv)
+
+          # Use ".meta.position" for cases when most of the package is
+          # defined in a "common" section and the only place where
+          # reference to the file with a derivation the "pos"
+          # attribute.
+          #
+          # ".meta.position" has the following form:
+          #   "pkgs/tools/package-management/nix/default.nix:155"
+          # We transform it to the following:
+          #   { file = "pkgs/tools/package-management/nix/default.nix"; }
+          { file = lib.head (lib.splitString ":" (drv.meta.position or "")); }
+        ]
+      )
+    ));
+
+  attrsWithFilenames = builtins.map (
+    pkg: pkg // { filenames = relevantFilenames pkg.package; }
+  ) attrsWithMaintainers;
+
+  attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
+
+  listToPing = lib.lists.flatten (
+    builtins.map (
+      pkg:
+      builtins.map (maintainer: {
+        handle = lib.toLower maintainer.github;
+        packageName = pkg.name;
+        dueToFiles = pkg.filenames;
+      }) pkg.maintainers
+    ) attrsWithModifiedFiles
+  );
+
+  byMaintainer = lib.lists.foldr (
+    ping: collector:
+    collector
+    // {
+      "${ping.handle}" = [
+        { inherit (ping) packageName dueToFiles; }
+      ] ++ (collector."${ping.handle}" or [ ]);
+    }
+  ) { } listToPing;
+
+  textForPackages =
+    packages: lib.strings.concatStringsSep ", " (builtins.map (pkg: pkg.packageName) packages);
+
+  textPerMaintainer = lib.attrsets.mapAttrs (
+    maintainer: packages: "- @${maintainer} for ${textForPackages packages}"
+  ) byMaintainer;
+
+  packagesPerMaintainer = lib.attrsets.mapAttrs (
+    maintainer: packages: builtins.map (pkg: pkg.packageName) packages
+  ) byMaintainer;
+in
+packagesPerMaintainer
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 82ba64e06a17..04ac4f6e6162 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -11,6 +11,7 @@ rec {
     into
       {
         name = "hello";
+        packagePath = [ "hello" ];
         platform = "aarch64-linux";
       }
   */
@@ -30,6 +31,9 @@ rec {
       null
     else
       {
+        # [ "python312Packages" "numpy" ]
+        inherit packagePath;
+
         # python312Packages.numpy
         inherit name;
 
@@ -52,12 +56,12 @@ rec {
       ]
     into
       [
-        { name = "hello"; platform = "aarch64-linux"; }
-        { name = "hello"; platform = "x86_64-linux"; }
-        { name = "hello"; platform = "aarch64-darwin"; }
-        { name = "hello"; platform = "x86_64-darwin"; }
-        { name = "bye"; platform = "aarch64-darwin"; }
-        { name = "bye"; platform = "x86_64-darwin"; }
+        { name = "hello"; platform = "aarch64-linux"; packagePath = [ "hello" ]; }
+        { name = "hello"; platform = "x86_64-linux"; packagePath = [ "hello" ]; }
+        { name = "hello"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; }
+        { name = "hello"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; }
+        { name = "bye"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; }
+        { name = "bye"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; }
       ]
   */
   convertToPackagePlatformAttrs =
@@ -120,12 +124,12 @@ rec {
 
     Turns
       [
-        { name = "hello"; platform = "aarch64-linux"; }
-        { name = "hello"; platform = "x86_64-linux"; }
-        { name = "hello"; platform = "aarch64-darwin"; }
-        { name = "hello"; platform = "x86_64-darwin"; }
-        { name = "bye"; platform = "aarch64-darwin"; }
-        { name = "bye"; platform = "x86_64-darwin"; }
+        { name = "hello"; platform = "aarch64-linux"; ... }
+        { name = "hello"; platform = "x86_64-linux"; ... }
+        { name = "hello"; platform = "aarch64-darwin"; ... }
+        { name = "hello"; platform = "x86_64-darwin"; ... }
+        { name = "bye"; platform = "aarch64-darwin"; ... }
+        { name = "bye"; platform = "x86_64-darwin"; ... }
       ]
     into
       {
@@ -145,12 +149,12 @@ rec {
 
   # Turns
   # [
-  #   { name = "hello"; platform = "aarch64-linux"; }
-  #   { name = "hello"; platform = "x86_64-linux"; }
-  #   { name = "hello"; platform = "aarch64-darwin"; }
-  #   { name = "hello"; platform = "x86_64-darwin"; }
-  #   { name = "bye"; platform = "aarch64-darwin"; }
-  #   { name = "bye"; platform = "x86_64-darwin"; }
+  #   { name = "hello"; platform = "aarch64-linux"; ... }
+  #   { name = "hello"; platform = "x86_64-linux"; ... }
+  #   { name = "hello"; platform = "aarch64-darwin"; ... }
+  #   { name = "hello"; platform = "x86_64-darwin"; ... }
+  #   { name = "bye"; platform = "aarch64-darwin"; ... }
+  #   { name = "bye"; platform = "x86_64-darwin"; ... }
   # ]
   #
   # into

From b844cba4e6fcac4c4ceef81e481a5f93a01e4631 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Wed, 18 Dec 2024 22:05:49 +0100
Subject: [PATCH 0238/1504] workflows/eval: Use maintainer GitHub IDs for
 review requests of changed packages

The handles can change over time and there's nothing guaranteeing the
ones in the maintainer list are up-to-date. In comparison GitHub IDs
never change.
---
 .github/workflows/eval.yml      | 9 ++++++++-
 ci/eval/compare/maintainers.nix | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a0604bbc8fcd..487c70f267c9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -267,11 +267,18 @@ jobs:
               -f "labels[]=$toAdd"
           done < <(comm -13 before after)
 
+          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
+          # There appears to be no API to request reviews based on GitHub IDs
+          jq -r 'keys[]' comparison/maintainers.json \
+            | while read -r id; do gh api /user/"$id"; done \
+            | jq -s '{ reviewers: map(.login) }' \
+            > reviewers.json
+
           # Request reviewers from maintainers of changed output paths
           GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
             --method POST \
             /repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers \
-            --input <(jq '{ reviewers: keys }' comparison/maintainers.json)
+            --input reviewers.json
 
         env:
           GH_TOKEN: ${{ github.token }}
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 0c08f85cec43..6728929952d4 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -92,7 +92,7 @@ let
     builtins.map (
       pkg:
       builtins.map (maintainer: {
-        handle = lib.toLower maintainer.github;
+        id = maintainer.githubId;
         packageName = pkg.name;
         dueToFiles = pkg.filenames;
       }) pkg.maintainers
@@ -103,9 +103,9 @@ let
     ping: collector:
     collector
     // {
-      "${ping.handle}" = [
+      "${toString ping.id}" = [
         { inherit (ping) packageName dueToFiles; }
-      ] ++ (collector."${ping.handle}" or [ ]);
+      ] ++ (collector."${toString ping.id}" or [ ]);
     }
   ) { } listToPing;
 

From 470956763783e67a2c24130bcb1dfa34b6284f68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Dec 2024 13:57:09 +0000
Subject: [PATCH 0239/1504] cairo-lang: 2.8.5 -> 2.9.2

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

diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix
index c7c6fb5d55b0..21a2201d1a30 100644
--- a/pkgs/by-name/ca/cairo-lang/package.nix
+++ b/pkgs/by-name/ca/cairo-lang/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cairo";
-  version = "2.8.5";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "starkware-libs";
     repo = "cairo";
     rev = "v${version}";
-    hash = "sha256-zNSQVMF5ciGGUBQyPFvIVtePNMbJ3e0LXBmRWMohoGA=";
+    hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU=";
   };
 
-  cargoHash = "sha256-jVQErw89rCm9f3uJftmyytru1xQa+FKsUkszHJWBGNU=";
+  cargoHash = "sha256-2qm2hL4M2xHidRYF9Fhxxn2IG22mPEBZW5yhu6wPVDY=";
 
   # openssl crate requires perl during build process
   nativeBuildInputs = [

From b20ab0c38e043b8590e973582cad1c9c086082f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 23:16:40 +0000
Subject: [PATCH 0240/1504] gi-crystal: 0.22.2 -> 0.24.0

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

diff --git a/pkgs/by-name/gi/gi-crystal/package.nix b/pkgs/by-name/gi/gi-crystal/package.nix
index 0b17b733833b..a783ece5d4ad 100644
--- a/pkgs/by-name/gi/gi-crystal/package.nix
+++ b/pkgs/by-name/gi/gi-crystal/package.nix
@@ -7,13 +7,13 @@
 }:
 crystal.buildCrystalPackage rec {
   pname = "gi-crystal";
-  version = "0.22.2";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "hugopl";
     repo = "gi-crystal";
     rev = "v${version}";
-    hash = "sha256-JfBbKqobikpTGMryeO86zZ46EbOHybem+Cc5FZEL6i4=";
+    hash = "sha256-0LsYREn4zWLQYUTpNWJhLLHWmg7UQzxOoQiAMmw3ZXQ=";
   };
 
   # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path

From f3ffbef1da7bcdebdbd9e4170618de451336ce5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 00:36:19 +0000
Subject: [PATCH 0241/1504] asdf-vm: 0.14.1 -> 0.15.0

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

diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix
index 2c2bc6fba121..1acbce85e93a 100644
--- a/pkgs/by-name/as/asdf-vm/package.nix
+++ b/pkgs/by-name/as/asdf-vm/package.nix
@@ -48,13 +48,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "asdf-vm";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "asdf-vm";
     repo = "asdf";
     rev = "v${version}";
-    sha256 = "sha256-1dacsAoZVwoQv8+V4FrjRLa7awLIZchlhkuET0wTO7w=";
+    sha256 = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA=";
   };
 
   nativeBuildInputs = [

From 4680d11d112fbce66bab5ab893b0177c5e005c48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 00:39:06 +0000
Subject: [PATCH 0242/1504] clightning: 24.11 -> 24.11.1

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

diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index 38ee7892c2b9..2484b659a4a8 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "24.11";
+  version = "24.11.1";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-MWTzUn5kCBMr6u5k3qD7bVZjd7d+C+Z6I1noDcvXup4=";
+    hash = "sha256-FdrD+FA0t90oJnXjUA8oalU7DDjUv70fAteNxbhscgk=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool

From 03feaccae82ae21f91beaa41222958979b4fd90c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 01:02:12 +0000
Subject: [PATCH 0243/1504] soapui: 5.7.2 -> 5.8.0

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

diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix
index bde8a72416ff..4912f0932c96 100644
--- a/pkgs/applications/networking/soapui/default.nix
+++ b/pkgs/applications/networking/soapui/default.nix
@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "soapui";
-  version = "5.7.2";
+  version = "5.8.0";
 
   src = fetchurl {
     url = "https://dl.eviware.com/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz";
-    sha256 = "sha256-pT0ZANVC7Sv7zxMDPY86aclIUGZeazOZadiVVsmEjtw=";
+    sha256 = "sha256-Xg1aeB/KQ5zMlJADFCnnpzA6iQMTlMgO7YKuWW8Y6oI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 31666700b5545aa98a23dbc70bd3e43bc3576e4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 01:05:05 +0000
Subject: [PATCH 0244/1504] flowblade: 2.16.3 -> 2.18

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

diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix
index 7d8d72458072..441da2aec4ce 100644
--- a/pkgs/by-name/fl/flowblade/package.nix
+++ b/pkgs/by-name/fl/flowblade/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flowblade";
-  version = "2.16.3";
+  version = "2.18";
 
   src = fetchFromGitHub {
     owner = "jliljebl";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-WXB071lndw4/APTgwxNVjmYBvzMXZdLn1OaWqBXjW2Q=";
+    sha256 = "sha256-zdQY85sm4bv0WBcCK+xo3j0zIjjMQ5j7w7zljqD9WU8=";
   };
 
   buildInputs = [

From 941c3b20ba257c3092afd04c5b9dfd40e7f257e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 01:32:22 +0000
Subject: [PATCH 0245/1504] imgproxy: 3.26.1 -> 3.27.0

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

diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix
index d6c2af61ff98..b81f51f1986c 100644
--- a/pkgs/by-name/im/imgproxy/package.nix
+++ b/pkgs/by-name/im/imgproxy/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "imgproxy";
-  version = "3.26.1";
+  version = "3.27.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    hash = "sha256-r8yczisCN2jfWFc0L+EIgJLw5MPK4r5+lJsW6FM2hUY=";
+    hash = "sha256-swqbT/DXI2LsW006wBesqYLbAEscn2p/36gT3VE7pqg=";
     rev = "v${version}";
   };
 
-  vendorHash = "sha256-LGQ+JJ3OqDisT+CsnseVO54wyRTOkGpG9/zzpJw9P1I=";
+  vendorHash = "sha256-VBJo9Ai130u9tChU2f2tdSynuad7TACTSiYyULTK5Bw=";
 
   nativeBuildInputs = [
     pkg-config

From dcf68b3b5d9367dc335e7e4ce7a74bd9eee55d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Tue, 10 Dec 2024 18:16:40 +0100
Subject: [PATCH 0246/1504] flirt: Add update script using nix-update

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

diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix
index a01722b656a6..120b1fd7a793 100644
--- a/pkgs/by-name/fl/flirt/package.nix
+++ b/pkgs/by-name/fl/flirt/package.nix
@@ -2,6 +2,7 @@
   rustPlatform,
   fetchFromSourcehut,
   lib,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-gVtRU+tjwf3rTei/TjUFYSMvLB9g6gNeGYO+9NBxgYQ=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "FiLe InteRacT, the file interaction tool for your command line";
     homepage = "https://git.sr.ht/~hadronized/flirt";

From 3aa17d16b9b307357c320c1b7f53b4a2fc1ac8f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 04:47:38 +0000
Subject: [PATCH 0247/1504] telepresence2: 2.20.3 -> 2.21.1

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

diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix
index 8cd9de5f56ae..196b04983ca2 100644
--- a/pkgs/by-name/te/telepresence2/package.nix
+++ b/pkgs/by-name/te/telepresence2/package.nix
@@ -31,13 +31,13 @@ let
 in
 buildGoModule rec {
   pname = "telepresence2";
-  version = "2.20.3";
+  version = "2.21.1";
 
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
     rev = "v${version}";
-    hash = "sha256-Oi3clmECnUyz+VX1HrZRu/EUTmkQay9c/ejdcdNjoGo=";
+    hash = "sha256-YXGhgxpNVk1u8pFJmN194OP8wFVaMfFRiK0yitxFBPo=";
   };
 
   propagatedBuildInputs = [
@@ -51,7 +51,7 @@ buildGoModule rec {
     export CGO_ENABLED=0
   '';
 
-  vendorHash = "sha256-1Of/IBwXqyKzOSXsJE3vavurvo7ZghfBDlLn4QCR40o=";
+  vendorHash = "sha256-7ZMFKApMjxDBGuk5q+Px7ovIPO8SteNuZ1d1IdPtme0=";
 
   ldflags = [
     "-s"

From 5cc5a0037431b8441923f89c7b1bc033d34495e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 10:30:41 +0000
Subject: [PATCH 0248/1504] databricks-cli: 0.236.0 -> 0.237.0

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

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 876cb6b58b9e..fa6ca494349e 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "databricks-cli";
-  version = "0.236.0";
+  version = "0.237.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-ldxRPZQgbr9FHqekjYdr+puLLq4AtXZ75sVeCmrPq9k=";
+    hash = "sha256-dGhEOghGs0Fif1/6Yfyy+aMzY+/ougl7GiPh3AikE1c=";
   };
 
-  vendorHash = "sha256-S2j4cnTH9uB97v6SRnphWXBr9yWTTcoWn0OF4iiDt2g=";
+  vendorHash = "sha256-GYgbZ8JdQXEOYCAxrloHccA0eS02hs9NTMRfD+hakks=";
 
   excludedPackages = [ "bundle/internal" ];
 

From 2ab54fcb48c044c8238225a02505b93c22835601 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 11:04:26 +0000
Subject: [PATCH 0249/1504] marimo: 0.9.27 -> 0.10.5

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

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 02755b8ed342..7958d63eb9ee 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -30,13 +30,13 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.9.27";
+  version = "0.10.5";
   pyproject = true;
 
   # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vs1miLjM/xRrnFYpHte65CfDt4ZRoCKjFMClWukIWZY=";
+    hash = "sha256-KJKnGVOM0ahZOWDXHyS5meRS1xXypKzgo3X9RvD1tJs=";
   };
 
   build-system = [ hatchling ];

From 0bcf3d7e2f98d5d08ad7af44cd49bff2d5f519f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Dec 2024 20:21:06 +0000
Subject: [PATCH 0250/1504] argc: 1.21.1 -> 1.22.0

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

diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index cbb39455c1c1..7b9f0cc589a1 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "argc";
-  version = "1.21.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "argc";
     rev = "v${version}";
-    hash = "sha256-76QWVERWnA9tZoymEdQUlaHedLmo68rIlab1UFsVWtc=";
+    hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50=";
   };
 
-  cargoHash = "sha256-MzwIdsrSgKdHZ4AyLv4ofApxJN1DgXywyVAYLMPabwY=";
+  cargoHash = "sha256-xGL2degbWauMi+BPGQgYvza6SiIRQxE4KZ0jMOMec7M=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc;
 

From 3d0bc79b383e29399bc3b49596e797166ca94017 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 12:50:21 +0000
Subject: [PATCH 0251/1504] trezor-suite: 24.11.3 -> 24.12.3

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

diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index f246c84e7680..c40e1ec54a5a 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "trezor-suite";
-  version = "24.11.3";
+  version = "24.12.3";
 
   suffix =
     {
@@ -24,7 +24,7 @@ let
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
         aarch64-linux = "sha512-erNWQTaj/WWoqy3TO7wb+ijQkwXjqfCjqvQN6/9gCVjbHswURWHX36P0rJg9vuQu6odi5EKtooDusIxjIUkQzA==";
-        x86_64-linux = "sha512-BorpJI0Vi6fFRGo2lATcuBiI1vTLY8vfmnUXKckJkMCBiurs/ZR08ZxKPOTaoS61BzSanUCRwcovev294bcqkA==";
+        x86_64-linux = "sha512-Zd+Ou3YUymlKr5lOTdWEZVdCbz3cIJx3Ho65AGDUXkNXfOrCc0v9faE8Np/9TkpJDWWqjjUoTJkkvsbapiMOOQ==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From f1262d559522a2dd91185c85036a230127706eb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 14:48:50 +0000
Subject: [PATCH 0252/1504] carapace: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix
index c2107abb3fc0..fb90bfb8ffa4 100644
--- a/pkgs/shells/carapace/default.nix
+++ b/pkgs/shells/carapace/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "carapace";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bin";
     rev = "v${version}";
-    hash = "sha256-UUWZ/ZI8GTwvS8811Uzc8CjBsM/9ALxJLSFnzEE5pi4=";
+    hash = "sha256-4tsqzXQwLTJ3icoCFJAmUWEXvv/RwzBnOXJd4vXOE7s=";
   };
 
-  vendorHash = "sha256-Fd1tbeBfbGnhOfowas2lF90TwjoRwOuk5xx9GhYEiRc=";
+  vendorHash = "sha256-8EuPHhTNK+7OnjYKAdkSmIS/iZR2AYrDw4nfY5ixYIo=";
 
   ldflags = [
     "-s"

From 5ade7d90224094fd0bc1457ffc6cdfd703c40f57 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Thu, 19 Dec 2024 21:46:50 +0300
Subject: [PATCH 0253/1504] pvs-studio: disable automatic updates

---
 pkgs/by-name/pv/pvs-studio/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix
index 0d5144056f87..d6157bab9918 100644
--- a/pkgs/by-name/pv/pvs-studio/package.nix
+++ b/pkgs/by-name/pv/pvs-studio/package.nix
@@ -11,6 +11,7 @@
   pvs-studio,
 }:
 
+# nixpkgs-update: no auto update
 stdenv.mkDerivation rec {
   pname = "pvs-studio";
   version = "7.33.85330.89";

From dc95f0356bbd8250f9ce4936f6952b26a6ba76da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 20:17:04 +0000
Subject: [PATCH 0254/1504] cloudflared: 2024.11.1 -> 2024.12.2

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

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 2158073882b0..1826209e2ced 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2024.11.1";
+  version = "2024.12.2";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     rev = "refs/tags/${version}";
-    hash = "sha256-4gSR7CHeSzBR4y46QHPohszrz9uO37TxRxhEbYC18zc=";
+    hash = "sha256-gk18N8iJve4lznkUb93Qzdgl93fTCOZCAXqm1BjsDak=";
   };
 
   vendorHash = null;

From 54d0eb383b8d09693c871d75477e371cd80cec5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 20:44:09 +0000
Subject: [PATCH 0255/1504] python312Packages.awscrt: 0.23.0 -> 0.23.6

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

diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index ef55f5eebefc..050cbce9cf70 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "awscrt";
-  version = "0.23.0";
+  version = "0.23.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/fV2FX2CMt3jjpnJ4XjhfWVa1yWmWna7eYO/6npPxig=";
+    hash = "sha256-FMT4E0TseXccmqk4AFlClu5+qknbD7n9FatmKiH634o=";
   };
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From 5d4e2e5d2c864a2db001651b6b379a8151ec9b1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 21:03:05 +0000
Subject: [PATCH 0256/1504] jbang: 0.121.0 -> 0.122.0

---
 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 4754da247179..d96d1669e926 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.121.0";
+  version = "0.122.0";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-Zx0+ybvxh4M1B+KB8DQCO5AF/1T7LbQgMSB3JeQK9Bc=";
+    sha256 = "sha256-uBzIk4Ivy/XLFlsUpGejV45T8MIseE2l8AVprWJi3hI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5736cebc5c14b9596a6be0cdd586ae4b8a32f036 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 22:57:18 +0000
Subject: [PATCH 0257/1504] prowlarr: 1.26.1.4844 -> 1.28.2.4885

---
 pkgs/servers/prowlarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index 71deeefa1851..b248f7749160 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -21,15 +21,15 @@ let
   }.${stdenv.hostPlatform.system} or unsupported;
 
   hash = {
-    aarch64-darwin = "sha256-Ht8M0gHO6a+JVUGEZXdU2LFiNCx2jrGmErXT6kVTje0=";
-    aarch64-linux = "sha256-d3/6NxctWbMBSR7CPF2N46g1TJc63KnKKqZcu2p0A80=";
-    x86_64-darwin = "sha256-diShDytcYY+9/gNDAQM+xZ/79o40Qs+62dtxpW0EfaQ=";
-    x86_64-linux = "sha256-bb3UzRr0Df4QejSsFzL7x9PnyULL3ML8CL6EGmsqelM=";
+    aarch64-darwin = "sha256-cGHmreI6M9CI2CsL2iC9O0dOcyvdlYQDpJ8NRG1Yt2U=";
+    aarch64-linux = "sha256-vXFQL6Sifjin3NoEhvjH9pTbcBy7aqwA9LI6T7sJQyI=";
+    x86_64-darwin = "sha256-+OB+OBj9W2c9b655gUMcDg12iWePKC4gDa5pubsNImA=";
+    x86_64-linux = "sha256-h1mwt8iAv9z9Qg+zUgEkB698lsoTtcOocAJz5kKmKQI=";
   }.${stdenv.hostPlatform.system} or unsupported;
 
 in stdenv.mkDerivation rec {
   inherit pname;
-  version = "1.26.1.4844";
+  version = "1.28.2.4885";
 
   src = fetchurl {
     url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";

From edde55453f3aa5d98eef33fc9f07f8ce960abfb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 23:37:42 +0000
Subject: [PATCH 0258/1504] rednotebook: 2.36 -> 2.37

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

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 7600b3376d17..27d353c8f6c8 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.36";
+  version = "2.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
     tag = "v${version}";
-    sha256 = "sha256-ISwYQPI7qM0+cEdWnHLdrJA/07BUjDP4gzF/GzqNcsE=";
+    sha256 = "sha256-ytaj29xZflq20+6Iqmynsr34Q9DP5uOvSBkg+vIWXgU=";
   };
 
   # We have not packaged tests.

From 099cca9d2dc55797ca0380d52df46dbe592fc05c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 00:38:20 +0000
Subject: [PATCH 0259/1504] remmina: 1.4.36 -> 1.4.37

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

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 69f773163d0a..ba512da0c6aa 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -52,13 +52,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "remmina";
-  version = "1.4.36";
+  version = "1.4.37";
 
   src = fetchFromGitLab {
     owner = "Remmina";
     repo = "Remmina";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-u+ysAFi7I7nXIiAw7VCmHbqgtRoZgkPnRfy/Mnl1b2g=";
+    hash = "sha256-ZxQqRtJl4U33qSHbuYHN72r+VKx1ckfFH2iZQHl6qVE=";
   };
 
   nativeBuildInputs = [

From a79e449d58fe1edf854dbe731aceccdc98e83814 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 00:40:24 +0000
Subject: [PATCH 0260/1504] eslint_d: 14.2.2 -> 14.3.0

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

diff --git a/pkgs/by-name/es/eslint_d/package.nix b/pkgs/by-name/es/eslint_d/package.nix
index d36a4eed20a1..58d8f25d491a 100644
--- a/pkgs/by-name/es/eslint_d/package.nix
+++ b/pkgs/by-name/es/eslint_d/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "eslint_d";
-  version = "14.2.2";
+  version = "14.3.0";
 
   src = fetchFromGitHub {
     owner = "mantoni";
     repo = "eslint_d.js";
     rev = "v${version}";
-    hash = "sha256-7VsbGudZlfrjU+x3a9OWxu9qDCiDUq8xez85qNj08xY=";
+    hash = "sha256-Mu3dSgRIC2L9IImKixJfaUsltlajY0cYdXOSikNQuPo=";
   };
 
-  npmDepsHash = "sha256-u8kmHQ7UfCR446d+HbkGlK76Aki+KrOtBO6/a/VXoTg=";
+  npmDepsHash = "sha256-nZ9q+Xmd8JLs+xYEO1TVbDEmQl2UwR9D9OWqVChNHhw=";
 
   dontNpmBuild = true;
 

From 4acd290bdcd1ca7a20c431d89d83b85778f68e50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 00:55:43 +0000
Subject: [PATCH 0261/1504] kicad-small: 8.0.6 -> 8.0.7

---
 .../science/electronics/kicad/versions.nix    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 6c6f11813cd2..a0a35a789d3f 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,23 +3,23 @@
 {
   "kicad" = {
     kicadVersion = {
-      version =			"8.0.6";
+      version =			"8.0.7";
       src = {
-        rev =			"16c59e4e71dab2a0ed2f9e61f990b69657b4bfe2";
-        sha256 =		"1vc9igk8id2c34shilg7lh361psvwiqxpsn2yq7cwnwgaq7v1swq";
+        rev =			"bfcc0ac495d7a5fcfc5546c07bf16049d346b795";
+        sha256 =		"0k3xn2pkn4lw9jqx1l5r1h91x2azkq4b9zzhrq15cr4jw8af1y8w";
       };
     };
     libVersion = {
-      version =			"8.0.6";
+      version =			"8.0.7";
       libSources = {
-        symbols.rev =		"5fab56fc44319fed1d159cd7fa48e4468b0a5dad";
-        symbols.sha256 =	"1ahzx14bmjgpvifsl2xm8c76zagkj2spc9cpb8ms4jlda92lp078";
-        templates.rev =		"2343281a4df1ffbd4e0c6fcb9856f81adbbc201e";
+        symbols.rev =		"42f411da32d930a1255a9e842859d6ff8f034b17";
+        symbols.sha256 =	"0fp56xs7jb1pmqjammq0wkr5cq1fz1a3y3jriavxs09mrb56nghl";
+        templates.rev =		"8402f4c99a45cfbb2ba5185a975f60fb6718d631";
         templates.sha256 =	"03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza";
-        footprints.rev =	"2e76906e448f352228a8f6bc06f77ae959a57975";
-        footprints.sha256 =	"1fv0liwbl2blwd2xy9whwinkczi98ah83rwi4v6bvm9d9318vbig";
-        packages3d.rev =	"005244f418b0d014e2907ca42df5ab85a1e29466";
-        packages3d.sha256 =	"1i6ypl7lw7hnifl943z3lwv4sy00mfwgqi001bj9qh547kf9rxd4";
+        footprints.rev =	"e40b11ba8b166956f1a654fa02613f65683ae20d";
+        footprints.sha256 =	"1ssrmx2bh6v4psg89q0l69d40jj10adz0506p2mq5yc1sgy0bag2";
+        packages3d.rev =	"27171b4df32b3e76e7b47098eae8e5ec61b136e5";
+        packages3d.sha256 =	"159dm48zm5n6301ck2w48alwgy5a2yl075hb94gy67bir4sc0ijb";
       };
     };
   };

From e9b1c813e3a78437d8c9f133e9ce11f300aa7d39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 04:30:16 +0000
Subject: [PATCH 0262/1504] lilypond-unstable: 2.25.21 -> 2.25.22

---
 pkgs/misc/lilypond/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index 4935bd8e4b78..6a9b8fcb4bd2 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -5,10 +5,10 @@
 }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.21";
+  version = "2.25.22";
   src = fetchurl {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-mckXCpZLig0ePkeGpiqYQQREFxgioiK/+mpA3GBNwGc=";
+    hash = "sha256-+p0D//hU/AKVJ6DuPhoK9EOqZxZpTVRugabxidmHYLU=";
   };
 
   passthru.updateScript = {

From c89fcd0e45ffc142c4f32f428a4ec5267b817203 Mon Sep 17 00:00:00 2001
From: l1npengtul <l1npengtul@protonmail.com>
Date: Fri, 20 Dec 2024 14:08:11 +0900
Subject: [PATCH 0263/1504] maintainers: add l1npengtul

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13e3a49496f0..894eebee576a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12400,6 +12400,12 @@
     githubId = 168301;
     name = "Victor Engmark";
   };
+  l1npengtul = {
+    email = "l1npengtul@l1npengtul.lol";
+    github = "l1npengtul";
+    githubId = 35755164;
+    name = "l1npengtul";
+  };
   l33tname = {
     name = "l33tname";
     email = "hi@l33t.name";

From ac0da457b49e3cf199d3aec63e0590f09aec1162 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 07:05:04 +0000
Subject: [PATCH 0264/1504] jitsi-meet-prosody: 1.0.8242 -> 1.0.8302

---
 pkgs/misc/jitsi-meet-prosody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix
index 4606c24453a7..e7517c27e615 100644
--- a/pkgs/misc/jitsi-meet-prosody/default.nix
+++ b/pkgs/misc/jitsi-meet-prosody/default.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "jitsi-meet-prosody";
-  version = "1.0.8242";
+  version = "1.0.8302";
   src = fetchurl {
     url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
-    sha256 = "3DiPyZAAf//IH8jN+HevZaOpo0OhxsP6cBxzn8xxJ3M=";
+    sha256 = "CWAunopJ49LnEV9D12+rZ6pFbeN0oeJgtwNrGSpfj2k=";
   };
 
   nativeBuildInputs = [ dpkg ];

From 0d83cbce808e840b1ef15a33e89892135d24ee79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 07:37:44 +0000
Subject: [PATCH 0265/1504] tanka: 0.30.2 -> 0.31.0

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

diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index 8d7d67c165d7..66db433fcfd8 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tanka";
-  version = "0.30.2";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-46qnhjQDYmoqeFrRTo5ofr0oErS7U2SKWMb78N1z2+w=";
+    sha256 = "sha256-h7oIL9MWah5kEBj0N6Ro53P0T9fF0B8qdfv1031vLN8=";
   };
 
-  vendorHash = "sha256-w0xgtTsoUWyu5MQC+A6YrZsyBSeuGOCdYTN5VApvYwI=";
+  vendorHash = "sha256-/8tPq/piCrguFoRigzGoAUSBJ2C1AY0ghyHosPE5n68=";
 
   doCheck = false;
   # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK

From 226587381bac07f7d518b5f6c313fdce7ed7794b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 20 Dec 2024 10:39:09 +0100
Subject: [PATCH 0266/1504] jjui: Add update script using nix-update

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

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 9ad1b3cd6bcd..31930afb6f63 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 buildGoModule {
   pname = "jjui";
@@ -20,6 +21,8 @@ buildGoModule {
     mv $out/bin/cmd $out/bin/jjui
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "A TUI for Jujutsu VCS";
     homepage = "https://github.com/idursun/jjui";

From c951613d3cb3d61b14c890238017d0685ff359f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Fri, 20 Dec 2024 10:42:04 +0100
Subject: [PATCH 0267/1504] jjui: 0-unstable-2024-12-10 -> 0.1

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

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 31930afb6f63..625fad1d092c 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
   nix-update-script,
 }:
-buildGoModule {
+buildGoModule rec {
   pname = "jjui";
-  version = "0-unstable-2024-12-10";
+  version = "0.1";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
-    rev = "525c8042a51710cdaefa91176af68a22ad0045bd";
-    hash = "sha256-WSlcJFLOe5UVvWubSPP391+AxepEa5M6GpmZnjYMjww=";
+    rev = "v${version}";
+    hash = "sha256-MdSzY2JWL34qB13mX4FWG/4wzl30FmATYQ09N1v5Isc=";
   };
 
-  vendorHash = "sha256-kg5b3tzwyAhn00GwdUDf4OdYZvCJZHgkgpzHFWy5SxI=";
+  vendorHash = "sha256-pzbOFXSlEebc4fCyNyQSdeVqar+HfEjsSyJo+mHkQeg=";
 
   postFixup = ''
     mv $out/bin/cmd $out/bin/jjui

From 0fc370504fd21c2866551ce8d7f31fb80d61422d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 10:24:07 +0000
Subject: [PATCH 0268/1504] python312Packages.panel: 1.5.1 -> 1.5.5

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

diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index ab7927abbc28..a2b34a52dcb7 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "panel";
-  version = "1.5.1";
+  version = "1.5.5";
 
   format = "wheel";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # tries to fetch even more artifacts
   src = fetchPypi {
     inherit pname version format;
-    hash = "sha256-cglT8X3x6tb5ewWluKdTNDi4lFUQqeJQIBSmHGAGDmI=";
+    hash = "sha256-MfdvzTr+OoawjPGstBAhK7XpkqgVxk/CMApYsllRVv0=";
     dist = "py3";
     python = "py3";
   };

From 7c9c25edc1aaa9481a5f0e47f82ff6c8c51b6baf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 11:43:50 +0000
Subject: [PATCH 0269/1504] python312Packages.strawberry-graphql: 0.253.1 ->
 0.254.0

---
 .../python-modules/strawberry-graphql/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 28e192318adc..986b87ef7273 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.253.1";
+  version = "0.254.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -52,8 +52,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry";
-    rev = "refs/tags/${version}";
-    hash = "sha256-lerQynV/c0fLX+Du1j9bX0i2kvuWKmtH7RIBZxuDkK8=";
+    tag = version;
+    hash = "sha256-lD5TQvBxv4+1fuDHoX45kkTFRHrURRL2jLH/rPfCzzA=";
   };
 
   postPatch = ''

From db3e62b1f2f351bd31478fc3067a9de415d58a40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 12:03:44 +0000
Subject: [PATCH 0270/1504] python312Packages.num2words: 0.5.13 -> 0.5.14

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

diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix
index cde2beff63bd..3e818f7c33f0 100644
--- a/pkgs/development/python-modules/num2words/default.nix
+++ b/pkgs/development/python-modules/num2words/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.5.13";
+  version = "0.5.14";
   format = "setuptools";
   pname = "num2words";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-owZHFvu/kNdcRJRQzr+8c6ahPmOyUx0JvezDqxoiCc8=";
+    hash = "sha256-sGbsGOVrZhajs4CGtXR9qvuqiGiyJqNhJ+BFHAzzecY=";
   };
 
   propagatedBuildInputs = [ docopt ];

From ae97e9612f8faf83bb727da66e87ca2a1f8c7e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 20 Dec 2024 13:30:38 +0100
Subject: [PATCH 0271/1504] famistudio: move to finalAttrs

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

diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index 0dc7fc256436..9961002befab 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -24,14 +24,14 @@ let
     else
       throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}";
 in
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: {
   pname = "famistudio";
   version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
-    rev = "refs/tags/${version}";
+    rev = "refs/tags/${finalAttrs.version}";
     hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc=";
   };
 
@@ -43,8 +43,8 @@ buildDotnetModule rec {
         callPackage ./build-native-wrapper.nix (
           args
           // {
-            inherit version src;
-            sourceRoot = "${src.name}/ThirdParty/${args.depname}";
+            inherit (finalAttrs) version src;
+            sourceRoot = "${finalAttrs.src.name}/ThirdParty/${args.depname}";
           }
         );
       nativeWrapperToReplaceFormat =
@@ -117,10 +117,10 @@ buildDotnetModule rec {
       rm FamiStudio/*.{dll,dylib,so*}
 
       # Replace copying of vendored prebuilt native libraries with copying of our native libraries
-      substituteInPlace ${projectFile} ${libraryReplaceArgs}
+      substituteInPlace ${finalAttrs.projectFile} ${libraryReplaceArgs}
 
       # Un-hardcode target platform if set
-      sed -i -e '/PlatformTarget/d' ${projectFile}
+      sed -i -e '/PlatformTarget/d' ${finalAttrs.projectFile}
 
       # Don't require a special name to be preserved, our OpenAL isn't 32-bit
       substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \
@@ -168,4 +168,4 @@ buildDotnetModule rec {
     platforms = lib.platforms.unix;
     mainProgram = "FamiStudio";
   };
-}
+})

From 2c640658308eda0bf18a9cfebb0b79ba58d4cbe8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 15:10:40 +0000
Subject: [PATCH 0272/1504] taproot-assets: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix
index 04618d79b098..a91bf5c2aa7b 100644
--- a/pkgs/by-name/ta/taproot-assets/package.nix
+++ b/pkgs/by-name/ta/taproot-assets/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "taproot-assets";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "taproot-assets";
     rev = "v${version}";
-    hash = "sha256-aQYVPSDudLK4ZBcBN/wNjVoF/9inOaJRbcyTP6VMdA0=";
+    hash = "sha256-XOEbrz0kFJKoYG91VUeSAuMVJRfGRNTQ8jucMtnvxJo=";
   };
 
-  vendorHash = "sha256-IFzYW5vAtBoUC2ebFYnxS/TojQR4kXxQACNbyn2ZkCs=";
+  vendorHash = "sha256-hDmRyWSf4jokomfJQBLlIbm9I3v2/sg/xD52BW3Wvy4=";
 
   subPackages = [
     "cmd/tapcli"

From 21e85783e0732486f9052b18b4124d511680804e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 16:41:03 +0000
Subject: [PATCH 0273/1504] louvre: 2.9.0-1 -> 2.13.0-1

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

diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix
index d859934514df..ec04ad564341 100644
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "louvre";
-  version = "2.9.0-1";
+  version = "2.13.0-1";
 
   src = fetchFromGitHub {
     owner = "CuarzoSoftware";
     repo = "Louvre";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U=";
+    hash = "sha256-ZUGan5lcE44Lt6xEvVO9Nd1ONBEvvwj8QuLDnAaenpU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From 0a5de06f6ff57c4937fed7dff2b8ca4fe65305aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 17:29:09 +0000
Subject: [PATCH 0274/1504] gfold: 4.5.1 -> 4.6.0

---
 pkgs/applications/version-management/gfold/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix
index 9406ecbf95e7..7f764283d032 100644
--- a/pkgs/applications/version-management/gfold/default.nix
+++ b/pkgs/applications/version-management/gfold/default.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "gfold";
-  version = "4.5.1";
+  version = "4.6.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "nickgerace";
     repo = pname;
     rev = version;
-    hash = "sha256-lIEYz5ngARzpJ4I1iN2bGd4eha1BiSmREJG6Cy2Lqrs=";
+    hash = "sha256-z5E+YS2zO4zgsW7mZbVN0z4HOurqoXwXn8hQc++9tks=";
   };
 
-  cargoHash = "sha256-9/Ro5aYKJCJ+5wvv6PmfWMrhYfc3a3d0DAhGDwMrvq4=";
+  cargoHash = "sha256-mSqqtHZDm1ySu48DdI2sF7i7A8rDkFS/4/9uB30JOI8=";
 
   passthru.tests.version = testers.testVersion {
     package = gfold;

From 0360d59d0f4596509bfe3ea9abefcceae0dcf926 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 17:52:50 +0000
Subject: [PATCH 0275/1504] healthchecks: 3.8 -> 3.9

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

diff --git a/pkgs/by-name/he/healthchecks/package.nix b/pkgs/by-name/he/healthchecks/package.nix
index 043431c53a3b..c0c42962278f 100644
--- a/pkgs/by-name/he/healthchecks/package.nix
+++ b/pkgs/by-name/he/healthchecks/package.nix
@@ -15,14 +15,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "healthchecks";
-  version = "3.8";
+  version = "3.9";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "healthchecks";
     repo = pname;
     tag = "v${version}";
-    sha256 = "sha256-RVmIaobts6GT1I4pc5/kZblbo6CwwQ33m3xBruSXZss=";
+    sha256 = "sha256-78Ku7yYhgIZ+uIMPKkExIXUOKmfiRMjEiBm2SugyD+s=";
   };
 
   propagatedBuildInputs = with py.pkgs; [

From 976ec244339e39e63b3297ae7941f55de281a948 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 20 Dec 2024 19:40:35 +0100
Subject: [PATCH 0276/1504] matomo: 5.2.0 -> 5.2.1

---
 pkgs/servers/web-apps/matomo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 3eb4c2a8113a..eab263044cec 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -10,15 +10,15 @@
 let
   versions = {
     matomo = {
-      version = "5.2.0";
-      hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA=";
+      version = "5.2.1";
+      hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
     };
     matomo-beta = {
-      version = "5.2.0";
+      version = "5.2.1";
       # `beta` examples: "b1", "rc1", null
       # when updating: use null if stable version is >= latest beta or release candidate
       beta = null;
-      hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA=";
+      hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks=";
     };
   };
   common =

From cf37a496573ba6590f580702580e8d17b7531c43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 20:40:30 +0000
Subject: [PATCH 0277/1504] zoekt: 3.7.2-2-unstable-2024-12-09 ->
 3.7.2-2-unstable-2024-12-18

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

diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index fd7bcbc06d78..eb5430d3742d 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2024-12-09";
+  version = "3.7.2-2-unstable-2024-12-18";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "37c4df87f75cb0de7b71181301e0f6df6aa9ade6";
-    hash = "sha256-pH21Kz/qMs7Cy1nKoaWOzUt6W9jBYtmgIiF6GIcdwsg=";
+    rev = "dc1b23bb0da9a0fa91056ad6d5fcf9b8e641f67d";
+    hash = "sha256-sMYGFA6zazY64IGELbp4H1xNfKeH72pJ7bJ0Vy9YYFk=";
   };
 
   vendorHash = "sha256-Dvs8XMOxZEE9moA8aCxuxg947+x/6C8cKtgdcByL4Eo=";

From a21e4fa9e0773cdb937a492a60a3207eb231f0cc Mon Sep 17 00:00:00 2001
From: Ilya Epifanov <mail@ilya.network>
Date: Fri, 20 Dec 2024 22:05:47 +0100
Subject: [PATCH 0278/1504] restic: fixed handling of arguments with spaces in
 restic wrappers

---
 nixos/modules/services/backup/restic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 0fb601cce589..e4ca2740f8e1 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -412,7 +412,7 @@ in
       ]}
       PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH
 
-      exec ${resticCmd} $@
+      exec ${resticCmd} "$@"
     '') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups);
   };
 }

From 62659a8ca7bba5d151365ff641b74439181725c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 23:02:11 +0000
Subject: [PATCH 0279/1504] jdt-language-server: 1.42.0 -> 1.43.0

---
 pkgs/by-name/jd/jdt-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix
index 0f6609651100..fc6c759f1696 100644
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@@ -6,15 +6,15 @@
 }:
 
 let
-  timestamp = "202411281516";
+  timestamp = "202412191447";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdt-language-server";
-  version = "1.42.0";
+  version = "1.43.0";
 
   src = fetchurl {
     url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
-    hash = "sha256-ddJtwD+IbAiZWKZo3Iuu3hpVmm6DvxLJYHCk7hmdxY4=";
+    hash = "sha256-46M/+Iiq8dmY7AtuDx7LjurFPu+I3eIiBMPNM3nl+5g=";
   };
 
   sourceRoot = ".";

From e9e1d145f6e6da36d743619704aa8e1eed14704b Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 20 Dec 2024 15:47:57 -0800
Subject: [PATCH 0280/1504] nixos/fontdir: fix X11-fonts cross compilation

---
 nixos/modules/config/fonts/fontdir.nix | 42 ++++++++++++++++++--------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index 1d47970d131d..c0ca9d1b537a 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -8,19 +8,35 @@ let
 
   cfg = config.fonts.fontDir;
 
-  x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
-    mkdir -p "$out/share/X11/fonts"
-    font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
-    find ${toString config.fonts.packages} -regex "$font_regexp" \
-      -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
-    cd "$out/share/X11/fonts"
-    ${lib.optionalString cfg.decompressFonts ''
-      ${pkgs.gzip}/bin/gunzip -f *.gz
-    ''}
-    ${pkgs.xorg.mkfontscale}/bin/mkfontscale
-    ${pkgs.xorg.mkfontdir}/bin/mkfontdir
-    cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias
-  '';
+  x11Fonts = pkgs.callPackage (
+    {
+      runCommand,
+      gzip,
+      xorg,
+    }:
+    runCommand "X11-fonts"
+      {
+        preferLocalBuild = true;
+        nativeBuildInputs = [
+          gzip
+          xorg.mkfontscale
+          xorg.mkfontdir
+        ];
+      }
+      ''
+        mkdir -p "$out/share/X11/fonts"
+        font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
+        find ${toString config.fonts.packages} -regex "$font_regexp" \
+          -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
+        cd "$out/share/X11/fonts"
+        ${lib.optionalString cfg.decompressFonts ''
+          gunzip -f *.gz
+        ''}
+        mkfontscale
+        mkfontdir
+        cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias
+      ''
+  ) { };
 
 in
 

From e344f839716f022bb48c68789c6bff327307e5ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 01:05:19 +0000
Subject: [PATCH 0281/1504] tinygo: 0.34.0 -> 0.35.0

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

diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix
index 1829c3be1b4a..ea4a10ae09c8 100644
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/pkgs/development/compilers/tinygo/default.nix
@@ -34,13 +34,13 @@ in
 
 buildGoModule rec {
   pname = "tinygo";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "tinygo-org";
     repo = "tinygo";
     rev = "v${version}";
-    hash = "sha256-jntixwHGg9buWQuu9I47DHUxK1xJbDRHxRMEwKoOhHo=";
+    hash = "sha256-oy6797o3lMMRJ+bPHY59Bv7mX25aEwBn4OslAohfY2g=";
     fetchSubmodules = true;
     # The public hydra server on `hydra.nixos.org` is configured with
     # `max_output_size` of 3GB. The purpose of this `postFetch` step

From 7e80b7355b8698e522383dff6710c7d51aab12c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 01:11:30 +0000
Subject: [PATCH 0282/1504] noseyparker: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix
index be2c5971598f..adb032933e26 100644
--- a/pkgs/by-name/no/noseyparker/package.nix
+++ b/pkgs/by-name/no/noseyparker/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "noseyparker";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "noseyparker";
     rev = "v${version}";
-    hash = "sha256-mRGlJto2b/oPLsvktQuBUsIO0kao9i4GjbmgztdAwiQ=";
+    hash = "sha256-HRuqeKV0Y8kf/KBSHIK25Xrpr7tJODQQa4BoqxiulzU=";
   };
 
-  cargoHash = "sha256-NibALhXquX/izimso8BBSWDCwDIykvbr7yN610nnOS4=";
+  cargoHash = "sha256-/EeKoR4IHNwQj8Ohs46U2BYJWkutJ1XWhW6xsR+k7Yg=";
 
   nativeCheckInputs = [
     git

From 02e0722c208a36b81796f8e3e27c1e6f2ddd45f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 02:03:15 +0000
Subject: [PATCH 0283/1504] ostree-full: 2024.8 -> 2024.10

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

diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix
index 3bed8333cb25..bab231271d53 100644
--- a/pkgs/by-name/os/ostree/package.nix
+++ b/pkgs/by-name/os/ostree/package.nix
@@ -45,13 +45,13 @@ let
   ]);
 in stdenv.mkDerivation rec {
   pname = "ostree";
-  version = "2024.8";
+  version = "2024.10";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
-    sha256 = "sha256-4hNuEWZp8RT/c0nxLimfY8C+znM0UWSUFKjc2FuGPD8=";
+    sha256 = "sha256-VOM4fe4f8WAxoGeayitg2pCrf0omwhGCIzPH8jAAq+4=";
   };
 
 

From 42df0b494b2e4d60a755488a6b7a333235c29458 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Dec 2024 22:21:09 -0500
Subject: [PATCH 0284/1504] {itk_5_2, python312Packages.itk}: unbreak by
 disabling RTK cmake module

---
 pkgs/development/libraries/itk/generic.nix | 34 +++++++++++++---------
 pkgs/top-level/all-packages.nix            |  1 +
 pkgs/top-level/python-packages.nix         |  1 +
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index b569c84e4ed6..3d7c6eb73845 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -32,6 +32,7 @@
   zlib,
   Cocoa,
   enablePython ? false,
+  enableRtk ? true,
 }:
 
 let
@@ -129,6 +130,8 @@ stdenv.mkDerivation {
       "-DModule_MGHIO=ON"
       "-DModule_AdaptiveDenoising=ON"
       "-DModule_GenericLabelInterpolator=ON"
+    ]
+    ++ lib.optionals enableRtk [
       "-DModule_RTK=ON"
     ]
     ++ lib.optionals enablePython [
@@ -166,20 +169,23 @@ stdenv.mkDerivation {
   # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935,
   # so we simply propagate them again from ITK.
   # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration.
-  propagatedBuildInputs = [
-    # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated,
-    # otherwise other software built against ITK fails to configure since ITK headers
-    # refer to these previously vendored libraries:
-    expat
-    fftw
-    gdcm
-    hdf5-cpp
-    libjpeg
-    libminc
-    libpng
-    libtiff
-    zlib
-  ] ++ lib.optionals withVtk vtk.propagatedBuildInputs ++ lib.optionals enablePython [ numpy ];
+  propagatedBuildInputs =
+    [
+      # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated,
+      # otherwise other software built against ITK fails to configure since ITK headers
+      # refer to these previously vendored libraries:
+      expat
+      fftw
+      gdcm
+      hdf5-cpp
+      libjpeg
+      libminc
+      libpng
+      libtiff
+      zlib
+    ]
+    ++ lib.optionals withVtk vtk.propagatedBuildInputs
+    ++ lib.optionals enablePython [ numpy ];
 
   postInstall = lib.optionalString enablePython ''
     substitute \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 800bd0284480..65ecfd1220a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9566,6 +9566,7 @@ with pkgs;
 
   itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    enableRtk = false;
   };
 
   itk_5 = callPackage ../development/libraries/itk/5.x.nix {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 720602c1ffa8..990ac312b51d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6474,6 +6474,7 @@ self: super: with self; {
   itk = toPythonModule (pkgs.itk.override {
     inherit python numpy;
     enablePython = true;
+    enableRtk = false;
   });
 
 

From a693796eb0c2bf350a2c5932d4d7361a8f001a6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 07:50:37 +0000
Subject: [PATCH 0285/1504] python312Packages.meshtastic: 2.5.5 -> 2.5.6post1

---
 pkgs/development/python-modules/meshtastic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 18de6f4c4bb7..6e6a91298036 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.5";
+  version = "2.5.6post1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "Meshtastic-python";
-    rev = "refs/tags/${version}";
-    hash = "sha256-k+Hq3pIuh8lwyoCl1KyHLt2B3OrGzBC6XDauUfVEyd8=";
+    tag = version;
+    hash = "sha256-mt+6fPUAxyw3JFG9WyLdNbP00NJbDTeQc84EbccMt9I=";
   };
 
   pythonRelaxDeps = [

From f14218fa9056e57f01f7113fbe0b9215aceb6e88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 10:18:13 +0000
Subject: [PATCH 0286/1504] kaidan: 0.9.2 -> 0.10.1

---
 .../networking/instant-messengers/kaidan/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix
index 63eb3776a97f..d0c19f23c0e7 100644
--- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix
@@ -22,14 +22,14 @@
 
 mkDerivation rec {
   pname = "kaidan";
-  version = "0.9.2";
+  version = "0.10.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-2UzXWd/fR5UwGywebYGWhh817x+VC76zmVaVZSBOg7M=";
+    hash = "sha256-u+8uNBDfszH5YJokie4A2QhW04ANq/JTwkMeu5gY0to=";
   };
 
   nativeBuildInputs = [

From 73888229b960e47d3d44b25df4ec713b974ea034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 11:26:48 +0000
Subject: [PATCH 0287/1504] kak-tree-sitter-unwrapped: 1.1.2 -> 1.1.3

---
 pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
index 49c04df4dd03..b15e544e2224 100644
--- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
+++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kak-tree-sitter-unwrapped";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromSourcehut {
     owner = "~hadronized";
     repo = "kak-tree-sitter";
     rev = "kak-tree-sitter-v${version}";
-    hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
+    hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU=";
   };
 
-  cargoHash = "sha256-v0DNcWPoHdquOlyPoPLoFulz66yCPR1W1Z3uuTjli5k=";
+  cargoHash = "sha256-bDxQEbUyeNUqYRaWV2kBL60ZFGtA4s+kwmgz6y88MAw=";
 
   passthru = {
     updateScript = nix-update-script { };

From 41fe8d27061c9d0ac3db30dcfe59ec6ac762bb28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 13:08:19 +0000
Subject: [PATCH 0288/1504] peergos: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index 7331fbd63651..bff626692ea9 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -9,10 +9,10 @@
 
 stdenv.mkDerivation rec {
   pname = "peergos";
-  version = "0.21.0";
+  version = "0.22.0";
   src = fetchurl {
     url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar";
-    hash = "sha256-jhZ/75MM6DSXgux+rniINQrvlvPldnAaCe3E/2IHziM=";
+    hash = "sha256-JjJBHL2wdAt+V9wAujvBIdAw/OAe89sHsYsv+cXEjTY=";
   };
 
   dontUnpack = true;

From 3e4c8d33b5a0d00f61637c65dcb7bb671559015e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 16:50:42 +0000
Subject: [PATCH 0289/1504] jitsi-videobridge: 2.3-174-gd011ddf7 ->
 2.3-187-gc7ef8e66

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

diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix
index 194b929502c0..d9d8d21c9983 100644
--- a/pkgs/servers/jitsi-videobridge/default.nix
+++ b/pkgs/servers/jitsi-videobridge/default.nix
@@ -11,10 +11,10 @@
 
 let
   pname = "jitsi-videobridge2";
-  version = "2.3-174-gd011ddf7";
+  version = "2.3-187-gc7ef8e66";
   src = fetchurl {
     url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
-    sha256 = "qBI++Awoe2NlCedgxXmqm4zXR3fYekVCyXRBF/SirWk=";
+    sha256 = "ExihaHPQeShvKgnZKOsPJTDFTqU9KkOHMnknF1ksJB4=";
   };
 in
 stdenv.mkDerivation {

From b431444b9c3dd754fd88783dc4ab0977657f624c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 17:22:20 +0000
Subject: [PATCH 0290/1504] python312Packages.sumo: 2.3.9 -> 2.3.10

---
 pkgs/development/python-modules/sumo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix
index ca71f426fa11..3cf6e4150683 100644
--- a/pkgs/development/python-modules/sumo/default.nix
+++ b/pkgs/development/python-modules/sumo/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "sumo";
-  version = "2.3.9";
+  version = "2.3.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SMTG-UCL";
     repo = "sumo";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-e+nkTRopI0QeGq52e3Eqx2RJg82A7mvIaIuZ+yN18+o=";
+    tag = "v${version}";
+    hash = "sha256-WoOW+JPo5x9V6LN+e8Vf3Q3ohHhQVK81s0Qk7oPn1Tk=";
   };
 
   nativeBuildInputs = [ cython ];

From 4083d721929d5594a0633bb417469aab47cd2e08 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 21 Dec 2024 12:36:22 -0500
Subject: [PATCH 0291/1504] itk: 5.4.0 -> 5.4.1

---
 pkgs/development/libraries/itk/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix
index c3086d86ac11..80a9c0123bf2 100644
--- a/pkgs/development/libraries/itk/5.x.nix
+++ b/pkgs/development/libraries/itk/5.x.nix
@@ -1,5 +1,5 @@
 import ./generic.nix rec {
-  version = "5.4.0";
+  version = "5.4.1";
   rev = "refs/tags/v${version}";
-  sourceSha256 = "sha256-1RSWgH0iQ2NQNsieW2m37udXWQlqYslJNM3TXC9xeP4=";
+  sourceSha256 = "sha256-XzBmfyv7Bz7CD/RaNgL888R6rUossWLCS8QtbCLPBnY=";
 }

From 1987668c4b06162d5fb751bf1fbd2751db90eef7 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Sat, 21 Dec 2024 18:14:56 +0000
Subject: [PATCH 0292/1504] cargo-lambda: 1.5.0 -> 1.6.1

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

diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index c66e39c01baa..a3f1d083d9bc 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-lambda";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-58kVtwBZEAlv9eVesqmWMZ+KxAwEiGMm8mCf9X5tPMI=";
+    hash = "sha256-O4yJ+6Uk4dHjCDp28JbUtL/B+v9JJEGkinZ4MsIpjUk=";
   };
 
-  cargoHash = "sha256-DoMIVpYtEHvYSW2THpZFdhoFI0zjC70hYnwnzGwkJ4Q=";
+  cargoHash = "sha256-vK37S5hLuHYimTljo0i6iRq2kt/r0kZ6Uqw2wQMhSGc=";
 
   nativeCheckInputs = [ cacert ];
 
@@ -42,11 +42,6 @@ rustPlatform.buildRustPackage rec {
       Security
     ];
 
-  checkFlags = [
-    # Tests disabled because they access the network.
-    "--skip=test_download_example"
-  ];
-
   # Remove files that don't make builds reproducible:
   # - Remove build.rs file that adds the build date to the version.
   # - Remove cargo_lambda.rs that contains tests that reach the network.

From 334a9bd0b269b616fbc33a6f7c02470ebc4b8efd Mon Sep 17 00:00:00 2001
From: pwnwriter <hi@pwnwriter.me>
Date: Thu, 19 Dec 2024 11:13:47 -0500
Subject: [PATCH 0293/1504] rwalk: init at 0.8.7

---
 pkgs/by-name/rw/rwalk/Cargo.lock  | 3263 +++++++++++++++++++++++++++++
 pkgs/by-name/rw/rwalk/package.nix |   54 +
 2 files changed, 3317 insertions(+)
 create mode 100644 pkgs/by-name/rw/rwalk/Cargo.lock
 create mode 100644 pkgs/by-name/rw/rwalk/package.nix

diff --git a/pkgs/by-name/rw/rwalk/Cargo.lock b/pkgs/by-name/rw/rwalk/Cargo.lock
new file mode 100644
index 000000000000..5dd721af76dd
--- /dev/null
+++ b/pkgs/by-name/rw/rwalk/Cargo.lock
@@ -0,0 +1,3263 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "const-random",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi-str"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cf4578926a981ab0ca955dc023541d19de37112bc24c1a197bd806d3d86ad1d"
+dependencies = [
+ "ansitok",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "ansitok"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83"
+dependencies = [
+ "nom 7.1.3",
+ "vte 0.10.1",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "async-trait"
+version = "0.1.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "better-panic"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036"
+dependencies = [
+ "backtrace",
+ "console",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytecount"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+
+[[package]]
+name = "cc"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "4.5.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap-markdown"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ebc67e6266e14f8b31541c2f204724fa2ac7ad5c17d6f5908fbb92a60f42cff"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+ "terminal_size",
+]
+
+[[package]]
+name = "clap_complete"
+version = "4.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_complete_nushell"
+version = "4.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "clipboard-win"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
+dependencies = [
+ "error-code",
+]
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "colored"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+dependencies = [
+ "lazy_static 1.5.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "config"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
+dependencies = [
+ "lazy_static 1.5.0",
+ "nom 5.1.3",
+ "rust-ini",
+ "serde 1.0.216",
+ "serde-hjson",
+ "serde_json",
+ "toml 0.5.11",
+ "yaml-rust",
+]
+
+[[package]]
+name = "console"
+version = "0.15.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "unicode-width 0.2.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "cssparser"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa",
+ "phf 0.11.2",
+ "smallvec",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+dependencies = [
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "csv"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "directories"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "dtoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
+
+[[package]]
+name = "dtoa-short"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
+dependencies = [
+ "dtoa",
+]
+
+[[package]]
+name = "ego-tree"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "error-code"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fd-lock"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
+dependencies = [
+ "cfg-if",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
+dependencies = [
+ "mac",
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width 0.1.14",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.2.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.2.0",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-rest-file"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d2f9d7798b724494ce3c33694afb86fb67bc33bcd03877c6f38953a180c05f"
+dependencies = [
+ "http 0.2.12",
+ "regex",
+ "serde 1.0.216",
+ "serde_json",
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "httparse"
+version = "1.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+
+[[package]]
+name = "human-panic"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "backtrace",
+ "os_info",
+ "serde 1.0.216",
+ "serde_derive",
+ "toml 0.8.19",
+ "uuid",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "hyper"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.2.0",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.2.0",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-segmentation",
+ "unicode-width 0.2.0",
+ "web-time",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+dependencies = [
+ "hermit-abi 0.4.0",
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "js-sys"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+
+[[package]]
+name = "markup5ever"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
+dependencies = [
+ "log",
+ "phf 0.11.2",
+ "phf_codegen 0.11.2",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "merge"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9"
+dependencies = [
+ "merge_derive",
+ "num-traits 0.2.19",
+]
+
+[[package]]
+name = "merge_derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "nom"
+version = "5.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
+dependencies = [
+ "lexical-core",
+ "memchr",
+ "version_check",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+dependencies = [
+ "num-traits 0.2.19",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "openssl"
+version = "0.10.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-src"
+version = "300.4.1+3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+dependencies = [
+ "cc",
+ "libc",
+ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits 0.2.19",
+]
+
+[[package]]
+name = "os_info"
+version = "3.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce"
+dependencies = [
+ "log",
+ "serde 1.0.216",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "papergrid"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb"
+dependencies = [
+ "ansi-str",
+ "ansitok",
+ "bytecount",
+ "fnv",
+ "unicode-width 0.1.14",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_shared 0.10.0",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared 0.11.2",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
+dependencies = [
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared 0.10.0",
+ "rand",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared 0.11.2",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "ptree"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "config",
+ "directories",
+ "petgraph",
+ "serde 1.0.216",
+ "serde-value",
+ "tint",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "reqwest"
+version = "0.12.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.2.0",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde 1.0.216",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
+[[package]]
+name = "rhai"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0277a46f29fe3b3eb10821ca2c65a4751b686b6c84422aae31695ba167b0fbc"
+dependencies = [
+ "ahash",
+ "bitflags 2.6.0",
+ "instant",
+ "no-std-compat",
+ "num-traits 0.2.19",
+ "once_cell",
+ "rhai_codegen",
+ "serde 1.0.216",
+ "smallvec",
+ "smartstring",
+ "thin-vec",
+]
+
+[[package]]
+name = "rhai_codegen"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustix"
+version = "0.38.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+
+[[package]]
+name = "rustyline"
+version = "13.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "clipboard-win",
+ "fd-lock",
+ "home",
+ "libc",
+ "log",
+ "memchr",
+ "nix",
+ "radix_trie",
+ "unicode-segmentation",
+ "unicode-width 0.1.14",
+ "utf8parse",
+ "winapi",
+]
+
+[[package]]
+name = "rwalk"
+version = "0.8.7"
+dependencies = [
+ "async-trait",
+ "better-panic",
+ "clap",
+ "clap-markdown",
+ "clap_complete",
+ "clap_complete_nushell",
+ "color-eyre",
+ "colored",
+ "csv",
+ "dirs",
+ "env_logger",
+ "futures",
+ "http-rest-file",
+ "human-panic",
+ "indicatif",
+ "itertools",
+ "lazy_static 1.5.0",
+ "log",
+ "md5",
+ "merge",
+ "num_cpus",
+ "parking_lot",
+ "ptree",
+ "regex",
+ "reqwest",
+ "rhai",
+ "rustyline",
+ "scraper",
+ "serde 1.0.216",
+ "serde_json",
+ "strip-ansi-escapes",
+ "strsim",
+ "tabled",
+ "tokio",
+ "toml 0.8.19",
+ "url",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "scraper"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "761fb705fdf625482d2ed91d3f0559dcfeab2798fe2771c69560a774865d0802"
+dependencies = [
+ "ahash",
+ "cssparser",
+ "ego-tree",
+ "getopts",
+ "html5ever",
+ "once_cell",
+ "selectors",
+ "tendril",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "selectors"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
+dependencies = [
+ "bitflags 2.6.0",
+ "cssparser",
+ "derive_more",
+ "fxhash",
+ "log",
+ "new_debug_unreachable",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
+ "precomputed-hash",
+ "servo_arc",
+ "smallvec",
+]
+
+[[package]]
+name = "serde"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
+
+[[package]]
+name = "serde"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-hjson"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
+dependencies = [
+ "lazy_static 1.5.0",
+ "num-traits 0.1.43",
+ "regex",
+ "serde 0.8.23",
+]
+
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float",
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "servo_arc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static 1.5.0",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+dependencies = [
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "smartstring"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
+dependencies = [
+ "autocfg",
+ "serde 1.0.216",
+ "static_assertions",
+ "version_check",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "strip-ansi-escapes"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa"
+dependencies = [
+ "vte 0.11.1",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "tabled"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e"
+dependencies = [
+ "ansi-str",
+ "ansitok",
+ "papergrid",
+ "tabled_derive",
+ "unicode-width 0.1.14",
+]
+
+[[package]]
+name = "tabled_derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "tendril"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
+dependencies = [
+ "futf",
+ "mac",
+ "utf-8",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thin-vec"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
+dependencies = [
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tint"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7af24570664a3074673dbbf69a65bdae0ae0b72f2949b1adfbacb736ee4d6896"
+dependencies = [
+ "lazy_static 0.2.11",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde 1.0.216",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde 1.0.216",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "serde 1.0.216",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vte"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
+dependencies = [
+ "arrayvec",
+ "utf8parse",
+ "vte_generate_state_changes",
+]
+
+[[package]]
+name = "vte"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197"
+dependencies = [
+ "utf8parse",
+ "vte_generate_state_changes",
+]
+
+[[package]]
+name = "vte_generate_state_changes"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+
+[[package]]
+name = "web-sys"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde 1.0.216",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
new file mode 100644
index 000000000000..72ea23c1fadc
--- /dev/null
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  stdenv,
+  darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rwalk";
+  version = "0.8.7";
+
+  src = fetchFromGitHub {
+    owner = "cestef";
+    repo = "rwalk";
+    tag = "v${version}";
+    hash = "sha256-rEecl8KdPqPreCRq8CZCBfpedInYD7+gfCwCst+VS90=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+  };
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      openssl
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+  };
+
+  meta = {
+    description = "A blazingly fast web directory scanner written in Rust";
+    homepage = "https://github.com/cestef/rwalk";
+    changelog = "https://github.com/cestef/rwalk/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pwnwriter ];
+    mainProgram = "rwalk";
+  };
+}

From ab94430a32417f36104660412d2e7742847b1303 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 19:10:58 +0000
Subject: [PATCH 0294/1504] kickstart: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix
index 3f22c0373771..c02ed94dfab6 100644
--- a/pkgs/by-name/ki/kickstart/package.nix
+++ b/pkgs/by-name/ki/kickstart/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kickstart";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "Keats";
     repo = "kickstart";
     rev = "v${version}";
-    hash = "sha256-GIBSHPIUq+skTx5k+94/K1FJ30BCboWPA6GadgXwp+I=";
+    hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII=";
   };
 
-  cargoHash = "sha256-cOcldEte7zxyxzvj7v7uCczs5AQ+v4mMfqmTK9hrv1o=";
+  cargoHash = "sha256-wMy3c4iqHOWmbJNCdy4/2XVgyF6lcAxSs3pAaD53JAg=";
 
   checkFlags = [
     # remote access

From 1ad7b8d1293fa3fe9ed89bcb6c19374622bfc293 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 19:18:53 +0000
Subject: [PATCH 0295/1504] zxtune: 5080 -> 5081

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

diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index d938a5dc1b4e..764bedfa9679 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -43,7 +43,7 @@ let
     ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase);
 in stdenv.mkDerivation rec {
   pname = "zxtune";
-  version = "5080";
+  version = "5081";
 
   outputs = [ "out" ];
 
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
     owner = "zxtune";
     repo = "zxtune";
     rev = "r${version}";
-    hash = "sha256-It+CTDuh6Bxbac4KqFc7MmOXpkEhqSyiPs81Z3T1wyc=";
+    hash = "sha256-gim73TF+zBnyxq2qu4uJnr0bCBfWlyYT/75UaZnij8c=";
   };
 
   passthru.updateScript = nix-update-script {

From 226fc8388b008f660cc94351a3c2c5236689ace4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 19:22:28 +0000
Subject: [PATCH 0296/1504] yourkit-java: 2024.9-b160 -> 2024.9-b161

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

diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index 693bc142679f..6d3e410b65c5 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -9,7 +9,7 @@
 let
   vPath = v: lib.elemAt (lib.splitString "-" v) 0;
 
-  version = "2024.9-b160";
+  version = "2024.9-b161";
 
   arches = {
     aarch64-linux = "arm64";
@@ -20,8 +20,8 @@ let
     arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
 
   hashes = {
-    arm64 = "sha256-/3LoKuB3LwjqnlPBDjRsXmal8KiNPtImBn/5vM5GQRI=";
-    x64 = "sha256-TBzKaEC+JjI9WQb3CmsHbt5u5614bloTfdiamXromSk=";
+    arm64 = "sha256-fUXZau0tK6CDfrVHZeHFpnoZQyNRVyuBYwY8ChjLqjc=";
+    x64 = "sha256-3AJ0PFEbDaY+x7XgcV+YWyl7wVyefjHYd9DB57I5FKc=";
   };
 
   desktopItem = makeDesktopItem {

From efe29687afdb726ace952caf9a015427da9afea6 Mon Sep 17 00:00:00 2001
From: Steve Streza <steve@stevestreza.com>
Date: Sat, 21 Dec 2024 12:08:19 -0800
Subject: [PATCH 0297/1504] maintainers: add stevestreza

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1ebcd16a4c0e..2b31bee5da97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21631,6 +21631,13 @@
     githubId = 853468;
     name = "Steven Roose";
   };
+  stevestreza = {
+    email = "nixpkgs@stevestreza.com";
+    github = "stevestreza";
+    githubId = 28552;
+    name = "Steve Streza";
+    keys = [ { fingerprint = "DFED 4E42 34E7 348C 57D4  6568 C4DC 30F8 5ABC 6FA1"; } ];
+  };
   stianlagstad = {
     email = "stianlagstad@gmail.com";
     github = "stianlagstad";

From fe0501f48683d0377028f2abfa744bf713c8d9a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 20:28:49 +0000
Subject: [PATCH 0298/1504] python312Packages.fakeredis: 2.26.1 -> 2.26.2

---
 pkgs/development/python-modules/fakeredis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index eb4cc8a9c1f4..5d40b88886ed 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.26.1";
+  version = "2.26.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-eBWdrN6QfrZaavKGuVMaU0s+k0VpsBCIaIzuxC7HyYE=";
+    tag = "v${version}";
+    hash = "sha256-jD0e04ltH1MjExfrPsR6LUn4X0/qoJZWzX9i2A58HHI=";
   };
 
   build-system = [ poetry-core ];

From 4d4e9f6ae91194849aecb191e1954b25fd54ce78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 20:28:54 +0000
Subject: [PATCH 0299/1504] zrok: 0.4.44 -> 0.4.45

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

diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix
index 4d26579be450..93ead3af039c 100644
--- a/pkgs/tools/networking/zrok/default.nix
+++ b/pkgs/tools/networking/zrok/default.nix
@@ -18,15 +18,15 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-oga8WQYxFeJlXhkJRpgb08QSV1vA7rfbVzwxxdl8xUw=";
-      aarch64-linux = "sha256-Xa7CGpv35fZDZjYmR3y3NUriOt1/I85556P32eP9UjQ=";
-      armv7l-linux = "sha256-k3FGn5pZX5Iqzh0J/nclQC4+n6CMrr+JPt2/rabnWvo=";
+      x86_64-linux = "sha256-eF+PazWfQjWvrQrrf1D/8wEJgzQZGzpWEEYsJTN07pM=";
+      aarch64-linux = "sha256-y8Vqh4I8BW2KfK6TVbRAT1Hx0G0oAJrkCDihgO8VH18=";
+      armv7l-linux = "sha256-RSwBFM6glrVbl7KttGT7kl/sB8ctyVhu+MZUXSmFyYY=";
     }
     .${system} or throwSystem;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zrok";
-  version = "0.4.44";
+  version = "0.4.45";
 
   src = fetchzip {
     url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";

From 73feb7813e3754b07aa0fe0ca6100783de97db8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 20:44:50 +0000
Subject: [PATCH 0300/1504] graphite-cli: 1.4.8 -> 1.4.11

---
 pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++--
 pkgs/by-name/gr/graphite-cli/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
index 446a91efc0ff..f7f98e5226d8 100644
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@withgraphite/graphite-cli",
-  "version": "1.4.8",
+  "version": "1.4.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@withgraphite/graphite-cli",
-      "version": "1.4.8",
+      "version": "1.4.11",
       "hasInstallScript": true,
       "license": "None",
       "dependencies": {
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index 8066ec5321ed..34d94ab3c8d0 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -8,14 +8,14 @@
 
 buildNpmPackage rec {
   pname = "graphite-cli";
-  version = "1.4.8";
+  version = "1.4.11";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-PzoMDBoWAXVbK3itcpybpjZ+lWd8tS7UOFtWWMwTh5U=";
+    hash = "sha256-gky/nv7GS6hR3Zjm+J1Ob0SSbw4PneOm54WK7Ls9i9g=";
   };
 
-  npmDepsHash = "sha256-mybKtbguxxHkPUm9oSYPjxGZxf6tEy4OKqyI5dNQFnE=";
+  npmDepsHash = "sha256-WvLASGTsNbM/IC+qyOAruiYKnHSx0bGc03Bh1wtnPn8=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From cb0f1fafa83dd30199cbeb6e58a7de4904b8dce2 Mon Sep 17 00:00:00 2001
From: Qusic <qusicx@gmail.com>
Date: Sat, 21 Dec 2024 15:14:17 -0800
Subject: [PATCH 0301/1504] wrangler: add updateScript

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

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 84427e0be7d5..6654ee0f063d 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -10,6 +10,7 @@
   llvmPackages,
   musl,
   xorg,
+  gitUpdater,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
@@ -27,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ=";
   };
 
+  passthru.updateScript = gitUpdater { rev-prefix = "wrangler@"; };
+
   buildInputs =
     [
       llvmPackages.libcxx

From 2de7b67eec963916a26d369d987d55983d85458e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20L=C3=B6per?= <martin.loeper@nesto-software.de>
Date: Sun, 22 Dec 2024 00:27:12 +0100
Subject: [PATCH 0302/1504] lens-desktop: 2024.3.191333 -> 2024.11.261604

---
 pkgs/by-name/le/lens/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix
index 284b06e4762b..ad1ea1c9f985 100644
--- a/pkgs/by-name/le/lens/package.nix
+++ b/pkgs/by-name/le/lens/package.nix
@@ -1,4 +1,4 @@
-{
+{ 
   stdenv,
   callPackage,
   fetchurl,
@@ -8,20 +8,20 @@
 let
 
   pname = "lens-desktop";
-  version = "2024.3.191333";
+  version = "2024.11.261604";
 
   sources = {
     x86_64-linux = {
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage";
-      hash = "sha256-OywOjXzeW/5uyt50JrutiLgem9S1CrlwPFqfK6gUc7U=";
+      hash = "sha256-AbuEU5gOckVU+eDIFnomc7ryLq68ihuk3c0XosoJp74=";
     };
     x86_64-darwin = {
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg";
-      hash = "sha256-yf+WBcOdOM3XsfiXJThVws2r84vG2jwfNV1c+sq6A4s=";
+      hash = "sha256-MQQRGTCe+LEHXJi6zjnpENbtlWNP+XVH9rWXRMk+26w=";
     };
     aarch64-darwin = {
       url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg";
-      hash = "sha256-hhd8MnwKWpvG7UebkeEoztS45SJVnpvvJ9Zy+y5swik=";
+      hash = "sha256-aakJCLnQBAnUdrrniTcahS+q3/kP09mlaPTV8FW5afI=";
     };
   };
 
@@ -43,7 +43,8 @@ let
 
 in
 if stdenv.hostPlatform.isDarwin then
-  callPackage ./darwin.nix {
+  callPackage ./darwin.nix
+  {
     inherit
       pname
       version

From c781dc915a88ed79a18be9aacbd249fa3ee4e4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20L=C3=B6per?= <martin.loeper@nesto-software.de>
Date: Sun, 22 Dec 2024 01:12:11 +0100
Subject: [PATCH 0303/1504] fix: formatting

---
 pkgs/by-name/le/lens/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix
index ad1ea1c9f985..34d68055f8b8 100644
--- a/pkgs/by-name/le/lens/package.nix
+++ b/pkgs/by-name/le/lens/package.nix
@@ -1,4 +1,4 @@
-{ 
+{
   stdenv,
   callPackage,
   fetchurl,
@@ -43,8 +43,7 @@ let
 
 in
 if stdenv.hostPlatform.isDarwin then
-  callPackage ./darwin.nix
-  {
+  callPackage ./darwin.nix {
     inherit
       pname
       version

From 7f12e53e88ed2c31f59fbde03722dcc6fb9c0d96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 08:33:33 +0000
Subject: [PATCH 0304/1504] protonmail-desktop: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 062533379069..99fa4700b2bf 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -9,7 +9,7 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.6.0";
+  version = "1.6.1";
 
 in
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
-    sha256 = "sha256-17JHxczPA2Z17PCgXWPG7gyoIQNcMS+rfv6vuYXdAZM=";
+    sha256 = "sha256-ajN7f3SmqUfgJGksPVRuc1qR2FjEQaY+y/rpn7Hs71I=";
   };
 
   dontConfigure = true;

From 3fd20a94c0f21d9de73f4c58e10badb27e8ea296 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Sun, 22 Dec 2024 07:11:34 +0000
Subject: [PATCH 0305/1504] python312Packages.pytorch: just disable -Werror;
 fix darwin x64 build

pytorch and many of the vendored libs build with -Werror and the
derivation meticulously then disables any warning that results in a
build failure. Just disable -Werror and fix the x64 darwin build.
---
 .../python-modules/torch/default.nix          | 54 ++-----------------
 1 file changed, 3 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index f85ccc9e85f4..961bccd18389 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -454,59 +454,11 @@ buildPythonPackage rec {
 
   env =
     {
-      # Suppress a weird warning in mkl-dnn, part of ideep in pytorch
-      # (upstream seems to have fixed this in the wrong place?)
-      # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
-      # https://github.com/pytorch/pytorch/issues/22346
-      #
+      # disable warnings as errors as they break the build on every compiler
+      # bump, among other things.
       # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++:
       # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17
-      NIX_CFLAGS_COMPILE = toString (
-        (
-          lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]
-          # Suppress gcc regression: avx512 math function raises uninitialized variable warning
-          # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105593
-          # See also: Fails to compile with GCC 12.1.0 https://github.com/pytorch/pytorch/issues/77939
-          ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12.0.0") [
-            "-Wno-error=maybe-uninitialized"
-            "-Wno-error=uninitialized"
-          ]
-          # Since pytorch 2.0:
-          # gcc-12.2.0/include/c++/12.2.0/bits/new_allocator.h:158:33: error: ‘void operator delete(void*, std::size_t)’
-          # ... called on pointer ‘<unknown>’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object]
-          ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12") [
-            "-Wno-error=free-nonheap-object"
-          ]
-          # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3:
-          # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict]
-          ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [
-            "-Wno-error=cast-function-type-strict"
-            # Suppresses the most spammy warnings.
-            # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895.
-          ]
-          ++ lib.optionals rocmSupport [
-            "-Wno-#warnings"
-            "-Wno-cpp"
-            "-Wno-unknown-warning-option"
-            "-Wno-ignored-attributes"
-            "-Wno-deprecated-declarations"
-            "-Wno-defaulted-function-deleted"
-            "-Wno-pass-failed"
-          ]
-          ++ [
-            "-Wno-unused-command-line-argument"
-            "-Wno-uninitialized"
-            "-Wno-array-bounds"
-            "-Wno-free-nonheap-object"
-            "-Wno-unused-result"
-          ]
-          ++ lib.optionals stdenv.cc.isGNU [
-            "-Wno-maybe-uninitialized"
-            "-Wno-stringop-overflow"
-          ]
-        )
-      );
-
+      NIX_CFLAGS_COMPILE = "-Wno-error";
       USE_VULKAN = setBool vulkanSupport;
     }
     // lib.optionalAttrs vulkanSupport {

From 57c9e83452f99bd823d971351197406303a5e8ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 08:56:43 +0000
Subject: [PATCH 0306/1504] rocmPackages_5.rocm-docs-core: 1.8.2 -> 1.12.0

---
 pkgs/development/rocm-modules/5/rocm-docs-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
index 2e32240ca313..f199bc9b9277 100644
--- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix
@@ -24,14 +24,14 @@
 # FIXME: Move to rocmPackages_common
 buildPythonPackage rec {
   pname = "rocm-docs-core";
-  version = "1.8.2";
+  version = "1.12.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "RadeonOpenCompute";
     repo = "rocm-docs-core";
     rev = "v${version}";
-    hash = "sha256-BB3jXs6tf9PKGOl/hDnTR5jm6+TTWUp1GXbmDVelVfU=";
+    hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA=";
   };
 
   buildInputs = [ setuptools ];

From 7aea8294a56a0c593d85703bdcacdad9aee3dead Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 10:28:29 +0000
Subject: [PATCH 0307/1504] rocmPackages.rocm-docs-core: 1.11.0 -> 1.12.0

---
 pkgs/development/rocm-modules/6/rocm-docs-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
index 268ace19f741..06232b1575e3 100644
--- a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix
@@ -23,14 +23,14 @@
 # FIXME: Move to rocmPackages_common
 buildPythonPackage rec {
   pname = "rocm-docs-core";
-  version = "1.11.0";
+  version = "1.12.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "ROCm";
     repo = "rocm-docs-core";
     rev = "v${version}";
-    hash = "sha256-JDpwR56vcCJgCTOM3RsK6KygZTLylQtDcZ+0W93lAAk=";
+    hash = "sha256-++Vi0jZLtHWsGy5IUohgF3P+Q6Jg/d0xWyDA6urbHUA=";
   };
 
   buildInputs = [ setuptools ];

From 16f7997902bade385fc3928c9b377552c7940e1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 13:00:10 +0000
Subject: [PATCH 0308/1504] papermc: 1.21.4-12 -> 1.21.4-15

---
 pkgs/games/papermc/versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 8fc65d9017f4..060f5d3a18b9 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -68,7 +68,7 @@
         "version": "1.21.3-81"
     },
     "1.21.4": {
-        "hash": "sha256-SCm+hrMdYGT8YKJAPwPBKWyUzNdrh7LM8Lp4FUP8q5w=",
-        "version": "1.21.4-12"
+        "hash": "sha256-FDVaeckg1PoHfiwuwxBRLD2uZkwtAMshEJeSQY9NM8E=",
+        "version": "1.21.4-15"
     }
 }

From 729a6c72f9e74a162f063b95626eee3ba5229d6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 13:23:26 +0000
Subject: [PATCH 0309/1504] libdwarf-lite: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix
index e8bf9bfee696..3d5df9741cac 100644
--- a/pkgs/by-name/li/libdwarf-lite/package.nix
+++ b/pkgs/by-name/li/libdwarf-lite/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdwarf-lite";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "jeremy-rifkin";
     repo = "libdwarf-lite";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S2KDfWqqdQfK5+eQny2X5k0A5u9npkQ8OFRLBmTulao=";
+    hash = "sha256-qHikjAG5xuuHquqqKGuiDHXVZSlg/MbNp9JNSAKM/Hs=";
   };
 
   outputs = [

From 4f6c1008f34237bb1c33af6be17ee23ec6d0ad92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 13:33:11 +0000
Subject: [PATCH 0310/1504] ansel: 0-unstable-2024-10-28 ->
 0-unstable-2024-12-19

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

diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index e334e7e9e890..8899d6efbbcc 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -78,13 +78,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2024-10-28";
+  version = "0-unstable-2024-12-19";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "7f23d9d38630629e559e76073ec4dbe71733c225";
-    hash = "sha256-2AEQlt75nnVD8ZFpVUEvgxRV94NtWDK0R+zVd/ytXuU=";
+    rev = "854924f0cefd485ede726eb060b765712c0d393c";
+    hash = "sha256-G8+A4c2d6OFfYo7T5sk8JsDw5RrNnH5Bmmo8YkCsbsA=";
     fetchSubmodules = true;
   };
 

From 4a0e3ff8447026a78fb0c67a20f4557351c7173e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 16:37:07 +0000
Subject: [PATCH 0311/1504] zsh-prezto: 0-unstable-2024-06-03 ->
 0-unstable-2024-12-12

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

diff --git a/pkgs/by-name/zs/zsh-prezto/package.nix b/pkgs/by-name/zs/zsh-prezto/package.nix
index 7fce5d1f10cf..34a8f6edd259 100644
--- a/pkgs/by-name/zs/zsh-prezto/package.nix
+++ b/pkgs/by-name/zs/zsh-prezto/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zsh-prezto";
-  version = "0-unstable-2024-06-03";
+  version = "0-unstable-2024-12-12";
 
   src = fetchFromGitHub {
     owner = "sorin-ionescu";
     repo = "prezto";
-    rev = "9195b66161b196238cbd52a8a4abd027bdaf5f73";
-    sha256 = "wN/86uFBahUWl9RnKvdf88zVxou7B8Kh7/s3JfMye0g=";
+    rev = "9626ce2beb8e20afb8f63020d974ff8a213bc773";
+    sha256 = "TkmzNyPKv/K9sW0CCiR8hnXXM0d6En49HcdPsa011Xw=";
     fetchSubmodules = true;
   };
 

From aa32a2b58bb8c14c72be2221e9f246a05687fd14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 17:06:16 +0000
Subject: [PATCH 0312/1504] python312Packages.cantools: 39.4.13 -> 40.0.0

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

diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index ffa4dbbed010..282ba38bf99e 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "cantools";
-  version = "39.4.13";
+  version = "40.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rYT7Vh9asgzNKkW3/LKQkwCPbImByfY28tlGE+03w9E=";
+    hash = "sha256-Wy0tfFAe2JA7vIEE4ojO9MKd7m9Yu2Yrx0vYvgPVmsI=";
   };
 
   nativeBuildInputs = [

From 38ce7109ae94c4d32b6a010a9cc743a9682f667d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 18:06:15 +0000
Subject: [PATCH 0313/1504] jicofo: 1.0-1104 -> 1.0-1117

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

diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix
index fd8fc8bfcfe8..da3829bae8f8 100644
--- a/pkgs/servers/jicofo/default.nix
+++ b/pkgs/servers/jicofo/default.nix
@@ -9,10 +9,10 @@
 
 let
   pname = "jicofo";
-  version = "1.0-1104";
+  version = "1.0-1117";
   src = fetchurl {
     url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
-    sha256 = "T4pv3rJLdpTMd8notPxsEq0rbfswxI/1uqrKzV+n5ts=";
+    sha256 = "PUIPLCdL68+cf3eue7+p0aptYavq046RtSaFM9XPgQQ=";
   };
 in
 stdenv.mkDerivation {

From 8f16c8fc389ffd59a2a90e0784da135fbfc7632f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 18:16:36 +0000
Subject: [PATCH 0314/1504] jackett: 0.22.1064 -> 0.22.1109

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 5b3a3b4beabf..087b224cd64a 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.22.1064";
+  version = "0.22.1109";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-+4A3hQllNoBul1V8lK1nNx+ZN9apMPOOnEeyegKIRDRXV/voDzxpEf2+RS7XhquPyPkQkDNkPN+iMrD5+eyA5Q==";
+    hash = "sha512-iuhArQtzOTxHLKP9VruCZp134BIc+haOAnLUtP4phcsjrFerD7SN1OwwG581iEEzNh8jiFSEbCgQzOlltM/GyQ==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";

From 03589ed5bf9f8db99fd9d705c9aeabdab24af6f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 19:00:16 +0000
Subject: [PATCH 0315/1504] etesync-dav: 0.33.4 -> 0.33.6

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

diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix
index f0c0e1c6a3fc..6f024cdca10c 100644
--- a/pkgs/by-name/et/etesync-dav/package.nix
+++ b/pkgs/by-name/et/etesync-dav/package.nix
@@ -8,13 +8,13 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "etesync-dav";
-  version = "0.33.4";
+  version = "0.33.6";
 
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "etesync-dav";
     tag = "v${version}";
-    hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE=";
+    hash = "sha256-CkdO/63IgUOf8AC2fUDKPyax0CHWVs8AkoTaperWxFk=";
   };
 
   dependencies = with python3Packages; [

From 8616d6d65ce3e1ba450aad60f25952895e8b35b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 19:03:27 +0000
Subject: [PATCH 0316/1504] lxd-ui: 0.14 -> 0.15

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

diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix
index f6cc5cdfb1c3..9e4e07e761b5 100644
--- a/pkgs/by-name/lx/lxd-ui/package.nix
+++ b/pkgs/by-name/lx/lxd-ui/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation rec {
   pname = "lxd-ui";
-  version = "0.14";
+  version = "0.15";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lxd-ui";
     rev = "refs/tags/${version}";
-    hash = "sha256-mrJpoD8eq/LxZl0JJ0ZqnAvMqqNGqRfi9UUh40PD0TY=";
+    hash = "sha256-HqdaG51W7eUCGUhA+9pYrAWaA6qyK7Fc95CKJvk9GaA=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-dkATFNjAPhrPbXhcJ/R4eIpcagKEwBSnRfLwqTPIe6c=";
+    hash = "sha256-O7oEAjmCEmPpsO/rdkZVhUkxhFzhHpPRbmci3yRBA7g=";
   };
 
   nativeBuildInputs = [

From e94b558c5c775df08af57edaa66e2e2e26e8feb6 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 22 Dec 2024 21:59:50 +0100
Subject: [PATCH 0317/1504] python3Packages.tinytag: 1.10.4 -> 2.0.0

---
 pkgs/development/python-modules/tinytag/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tinytag/default.nix b/pkgs/development/python-modules/tinytag/default.nix
index c15501951792..935c7e4d0686 100644
--- a/pkgs/development/python-modules/tinytag/default.nix
+++ b/pkgs/development/python-modules/tinytag/default.nix
@@ -3,22 +3,26 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  flit-core,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "tinytag";
-  version = "1.10.1";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tinytag";
     repo = "tinytag";
     rev = "refs/tags/${version}";
-    hash = "sha256-Kg67EwDIi/Io7KKnNiqPzQKginrfuE6FAeOCjFgEJkY=";
+    hash = "sha256-HSDEsyM9jGmS0o/EQj0GS/Ur4aepFgv8VpVNoJTyZGA=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    flit-core
+  ];
 
   pythonImportsCheck = [ "tinytag" ];
 

From 39a3cf0bab47848e7d70dbf7ae68e36c97a86f22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 23:26:51 +0000
Subject: [PATCH 0318/1504] weaviate: 1.28.0 -> 1.28.2

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

diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index f3d72dd53b6e..2eee886bc729 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.28.0";
+  version = "1.28.2";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-HSBgsnjkkWie1hjo3WlZmh3InLnUz+8f7FhRMfRFpeU=";
+    hash = "sha256-yIa8AHyoT1z/M/tyPtlNtSMgOhU3XyWtw9OsqrDjO7A=";
   };
 
-  vendorHash = "sha256-A6Ikxy+zrAgy617ldtj4BkIFN/KiiEgjMb0ZNG6mVrs=";
+  vendorHash = "sha256-u1pfPsc1NuzONyuXPVNO5UcA6vekChnBkLT3MHa2xcc=";
 
   subPackages = [ "cmd/weaviate-server" ];
 

From 317967e32f7b824739d5b7191792fc4ee0aa0138 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 23:28:11 +0000
Subject: [PATCH 0319/1504] bngblaster: 0.9.13 -> 0.9.14

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

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index f7fa9403daee..79b4cbb77105 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.13";
+  version = "0.9.14";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-fMaa4UCERsZ/LIXJT4XIeb0TLYAJVzhdFFd+56n6ASA=";
+    hash = "sha256-vToKrP/T3qVb9UylNyZRvP+kWoizIjjXTbVlNebKG/M=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6314893899dea79c294fe312c94867ed265a1170 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 23:39:13 +0000
Subject: [PATCH 0320/1504] clusterctl: 1.9.0 -> 1.9.2

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

diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index 0e51c630ad7c..9b6604c8c52c 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.9.0";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-ENbNgstu+YsNESJ2RsJri3B4zO8UI3Dt60/8AFgsxn8=";
+    hash = "sha256-H86EkdGmzvQDGC/a+J6ISB0aYkJabBjE2P6Ab5FRlv4=";
   };
 
-  vendorHash = "sha256-rjo8fwUAnVDM7XvY31I5z6RMRSrNSur6wH7NfGTIdcc=";
+  vendorHash = "sha256-JSWk6FgjWnDcVmp/9+M0x7QsiX08QtIOn5RRifjs2mI=";
 
   subPackages = [ "cmd/clusterctl" ];
 

From 26f1667071631ec68a994418fbfa386f95bca484 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 23:39:41 +0000
Subject: [PATCH 0321/1504] ibus-engines.typing-booster-unwrapped: 2.26.12 ->
 2.27.1

---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 43e901a57c91..b587e1cbfa73 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.26.12";
+  version = "2.27.1";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    hash = "sha256-32WMxZnr1JDFf86zKQ9XgYFSdg3ZrbudmxoO9oTZrMQ=";
+    hash = "sha256-BD+FhBAXWuaO4lP0B8q2IEhP9xR1FSFPvuFkFIKl7XQ=";
   };
 
   nativeBuildInputs = [

From 340e51e1e7cd8407053fc4c22ffe3e3df9b478a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 02:19:45 +0000
Subject: [PATCH 0322/1504] prometheus-nextcloud-exporter: 0.7.0 -> 0.8.0

---
 pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
index f07f4e099f48..de6e31c91eae 100644
--- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "prometheus-nextcloud-exporter";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "xperimental";
     repo = "nextcloud-exporter";
     rev = "v${version}";
-    sha256 = "sha256-tbzXxrAzMZyyePeI+Age31+XJFJcp+1RqoCAGCKaLmQ=";
+    sha256 = "sha256-lK5a63ZokFlm5S3k1a0MGBm+vAAqQV/5ERjJ0zZ4Yno=";
   };
 
-  vendorHash = "sha256-9ABGc5uSOIjhKcnTH5WOuwg0kXhFsxOlAkatcOQy3dg=";
+  vendorHash = "sha256-9+Vv2GodEocDppWvTj4W3/tBqSJJZ9LkyTl5evm/45Y=";
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; };
 

From 2c0b84284157dd15073500dd73316b7299502030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 02:31:17 +0000
Subject: [PATCH 0323/1504] package-project-cmake: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/by-name/pa/package-project-cmake/package.nix b/pkgs/by-name/pa/package-project-cmake/package.nix
index 10e40923e418..fa97e0e7f48d 100644
--- a/pkgs/by-name/pa/package-project-cmake/package.nix
+++ b/pkgs/by-name/pa/package-project-cmake/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "package-project-cmake";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "TheLartians";
     repo = "PackageProject.cmake";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TMf9nA0V1qTXpzEJ0A6b3mIVN0MIogn5WlZeVY+Q2bg=";
+    hash = "sha256-RbqywBm+C1Bo1KeFL2MdsE2PMKWbc3x2iWswKGXtO9o=";
   };
 
   dontConfigure = true;

From 5e0eaf68ab71432fb5e567f2cba1a6e7e2261c53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 02:36:53 +0000
Subject: [PATCH 0324/1504] pgmodeler: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index b1dcadb75b34..c134f00b2f88 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmodeler";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
     rev = "v${version}";
-    sha256 = "sha256-VbAGdMeuIQLzcHwYoPbkC0UjzxXgW4BGlYfz32oHmms=";
+    sha256 = "sha256-ZoWCXCRaFQMf/RbcgXZQiF4+TDogdMOtccxOTk1c7Jw=";
   };
 
   nativeBuildInputs = [

From 4bdb74811ea2b24688e5995e004c47444a905d0b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:38:38 -0300
Subject: [PATCH 0325/1504] nextcloudXXPackages.apps.recognize: add
 meta.description

and meta.changelog
---
 pkgs/servers/nextcloud/packages/apps/recognize.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 86d648447959..2e0a45ca4dd2 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -135,5 +135,7 @@ stdenv.mkDerivation rec {
       This app goes through your media collection and adds fitting tags, automatically categorizing your photos and music.
     '';
     homepage = "https://apps.nextcloud.com/apps/recognize";
+    description = "Smart media tagging for Nextcloud: recognizes faces, objects, landscapes, music genres";
+    changelog = "https://github.com/nextcloud/recognize/blob/v${version}/CHANGELOG.md";
   };
 }

From 9468b63e4c0129a1a95b061a996a6994b6469a22 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 22 Dec 2024 22:22:34 -0500
Subject: [PATCH 0326/1504] adms: enable on darwin

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

diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix
index 9546378e01b2..2602b900e244 100644
--- a/pkgs/by-name/ad/adms/package.nix
+++ b/pkgs/by-name/ad/adms/package.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Qucs/adms";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ disassembler ];
-    platforms = with lib.platforms; linux;
+    platforms = with lib.platforms; unix;
   };
 }

From 0bd44ede0a2235afaacefbd63fe56670e1654fe8 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 22 Dec 2024 22:23:40 -0500
Subject: [PATCH 0327/1504] qucs-s: enable on darwin

---
 .../science/electronics/qucs-s/default.nix    | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix
index 3fd4273fd49a..1f89610c568b 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/applications/science/electronics/qucs-s/default.nix
@@ -29,8 +29,29 @@ stdenv.mkDerivation rec {
     hash = "sha256-ll5P8cqJBzoieExElggn5tRbDcmH7L3yvcbtAQ0BBww=";
   };
 
+  postPatch = ''
+    # Workaround a CMake bug (we don't generally do distributable bundles in nixpkgs anyway):
+    #   warning: cannot resolve item '/usr/lib/libSystem.B.dylib'
+    #
+    #   possible problems:
+    #       need more directories?
+    #           need to use InstallRequiredSystemLibraries?
+    #               run in install tree instead of build tree?
+    for filename in \
+      qucs/CMakeLists.txt \
+      qucs-transcalc/CMakeLists.txt \
+      qucs-attenuator/CMakeLists.txt \
+      qucs-s-spar-viewer/CMakeLists.txt \
+      ; do
+      substituteInPlace "$filename" \
+        --replace-fail 'fixup_bundle(' 'message(\"nixpkgs will not fixup_bundle: \" '
+    done
+  '';
+
   nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ];
-  buildInputs = [ qtbase qttools qtcharts qtsvg qtwayland libX11 gperf adms ] ++ kernels;
+  buildInputs = [ qtbase qttools qtcharts qtsvg gperf adms ]
+    ++ lib.optionals stdenv.isLinux [ qtwayland libX11 ]
+    ++ kernels;
 
   cmakeFlags = [
     "-DWITH_QT6=ON"
@@ -56,6 +77,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     mainProgram = "qucs-s";
     maintainers = with maintainers; [ mazurel kashw2 thomaslepoix ];
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }

From 256577c3605c4e7e46af3c8f62b333b0038298ce Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 22 Dec 2024 22:42:02 -0500
Subject: [PATCH 0328/1504] qucsator-rf: enable on darwin

---
 pkgs/by-name/qu/qucsator-rf/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix
index 3667d84b280f..f3ef6f64d18a 100644
--- a/pkgs/by-name/qu/qucsator-rf/package.nix
+++ b/pkgs/by-name/qu/qucsator-rf/package.nix
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-IvB4CTvK6x4wwUXMoXIqBku1Hh9em6ITTpwFllYsTEg=";
   };
 
+  # Upstream forces NO_DEFAULT_PATH on APPLE
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail '"/usr/local/opt/bison/bin/"' '"${bison}/bin"'
+  '';
+
   nativeBuildInputs = [
     cmake
     flex
@@ -43,6 +49,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     mainProgram = "qucsator_rf";
     maintainers = with lib.maintainers; [ thomaslepoix ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

From 854f0111d37e93dd870035c5512d3d2fbaee6e5e Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Mon, 23 Dec 2024 10:33:28 +0000
Subject: [PATCH 0329/1504] rquickshare: fix opening

This fixes https://github.com/NixOS/nixpkgs/issues/350315 by applying upstream instructions and downloading the legacy package instead.

The app should open now.
---
 pkgs/by-name/rq/rquickshare/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index ae38de23828a..2e40ec4a4494 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -7,17 +7,17 @@ let
   pname = "rquickshare";
   version = "0.11.2";
   src = fetchurl {
-    url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-main_v${version}_glibc-2.39_amd64.AppImage";
-    hash = "sha256-7w1zybCPRg4RK5bKHoHLDUDXVDQL23ox/6wh8H9vTPg=";
+    url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-legacy_v${version}_glibc-2.31_amd64.AppImage";
+    hash = "sha256-VXYiYrTSedH8xFjuxbdplzVdfnO6s3ftY2I121Unlfw=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
 appimageTools.wrapType2 {
   inherit pname version src;
   extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/rquickshare.desktop -t $out/share/applications
-    substituteInPlace $out/share/applications/rquickshare.desktop \
-      --replace-fail 'Exec=rquickshare' 'Exec=rquickshare %u'
+    install -Dm444 ${appimageContents}/r-quick-share.desktop -t $out/share/applications
+    substituteInPlace $out/share/applications/r-quick-share.desktop \
+      --replace-fail 'Exec=r-quick-share' 'Exec=r-quick-share %u'
     cp -r ${appimageContents}/usr/share/icons $out/share
   '';
 

From b7c1e20c24f27e228cf283c92460285cfd6276cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 12:33:20 +0000
Subject: [PATCH 0330/1504] bookstack: 24.10.3 -> 24.12

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

diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index 65807d3f0ac6..a5eaa9dbc521 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -27,13 +27,13 @@ let
 in
 package.override rec {
   pname = "bookstack";
-  version = "24.10.3";
+  version = "24.12";
 
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11gbzx5qb79vknrs2ci5g21jxz7sxm3b69m0xhqpkbpdfnrgp4pl";
+    sha256 = "sha256-7ZC4C84XNGAR8efwQsupbAQbRGA8LUixuDoirCHPkiQ=";
   };
 
   meta = with lib; {

From d0c1c2885b980cec2fb4f1e66e258949b39c1a22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 13:16:24 +0000
Subject: [PATCH 0331/1504] gotrue-supabase: 2.165.1 -> 2.166.0

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

diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index 48da315e59cd..cf37dbabfb41 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.165.1";
+  version = "2.166.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-Tp8h20GM2YULlElFtHS41rFyWSIT3EGGXKtExkuO5P8=";
+    hash = "sha256-e4PLop+enPt0IkPYRNH0UyZwiBhQKsk0mTFXokGcLug=";
   };
 
-  vendorHash = "sha256-w6qbqHHdXdDYHO5Asa0fkf0UBI7Wr2Voc2K4Ss1zDCE=";
+  vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M=";
 
   ldflags = [
     "-s"

From 57ed908d011454a845340df81cde77027fd02bf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 14:50:20 +0000
Subject: [PATCH 0332/1504] treesheets: 0-unstable-2024-12-11 ->
 0-unstable-2024-12-22

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

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 1d71eec0f26e..354a7c8b5d48 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2024-12-11";
+  version = "0-unstable-2024-12-22";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "81e74a0f3f325ada0abe35211e90b74132f91470";
-    hash = "sha256-6Ao1dl0tRLAZZxx0xV7uaojuCO9i3bUIdccsZ37Jm/g=";
+    rev = "b3bf8f2763aa9efaac428107d62194582839df1b";
+    hash = "sha256-qY5DSFW6jnngvHCBgz9Go9Xsfo2nd7xDyZWuKSpyMMM=";
   };
 
   nativeBuildInputs = [

From 5c5fab76c211ed71132cd71657cc69f260e8b0c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 15:04:53 +0000
Subject: [PATCH 0333/1504] qbittorrent-enhanced-nox: 5.0.2.10 -> 5.0.3.10

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

diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
index 82fd6dcc9527..b1aff2a81540 100644
--- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
+++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
@@ -7,13 +7,13 @@
 
 (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
   pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.0.2.10";
+  version = "5.0.3.10";
 
   src = fetchFromGitHub {
     owner = "c0re100";
     repo = "qBittorrent-Enhanced-Edition";
     rev = "release-${version}";
-    hash = "sha256-9RCG530zWQ+qzP0Y+y69NFlBWVA8GT29dY8aC1cvq7o=";
+    hash = "sha256-efQFjdJeVMrPvCQ5aYtUb65hozKc73MnP0/Kheti9BI=";
   };
 
   meta = old.meta // {

From 59020cac7545401603f906b1a2809c080d280426 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 16:22:19 +0000
Subject: [PATCH 0334/1504] python312Packages.scikit-posthocs: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix
index 687520c3ed48..feffc4ddf6ed 100644
--- a/pkgs/development/python-modules/scikit-posthocs/default.nix
+++ b/pkgs/development/python-modules/scikit-posthocs/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-posthocs";
-  version = "0.11.1";
+  version = "0.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maximtrp";
     repo = "scikit-posthocs";
     tag = "v${version}";
-    hash = "sha256-RPTWbhaDMdPiIQ6TLeWwZKYI9m23dEXu9iqBLYIEVN4=";
+    hash = "sha256-ChYBjT7xeAiKJFRI9ov4vOGucy0aK0j/0dndNs4ewBo=";
   };
 
   build-system = [ setuptools ];

From 2723f90663031476cc02126b8ea3239c14e6e725 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 16:43:00 +0000
Subject: [PATCH 0335/1504] gren: 0.4.5 -> 0.5.2

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

diff --git a/pkgs/by-name/gr/gren/generated-package.nix b/pkgs/by-name/gr/gren/generated-package.nix
index 5fb245debbf9..6906bbb6b636 100644
--- a/pkgs/by-name/gr/gren/generated-package.nix
+++ b/pkgs/by-name/gr/gren/generated-package.nix
@@ -32,11 +32,11 @@
 }:
 mkDerivation {
   pname = "gren";
-  version = "0.4.5";
+  version = "0.5.2";
   src = fetchgit {
     url = "https://github.com/gren-lang/compiler.git";
-    sha256 = "0hbxzn14m9y7sqwk347yj7hblwmj5fyzmy7kjqc8zjd63gmrkdh8";
-    rev = "0efe25e3f48663a36eec525d2df0d957f53c9b4e";
+    sha256 = "1mksfma6c1dn091ab4x794hs71v44bx294wbn80qfc5kgrrl5lf4";
+    rev = "ee19481f5715b78cad8be09e29e56dcb82d65f4f";
     fetchSubmodules = true;
   };
   isLibrary = false;

From 41d38a5aa5629562a424717665f3349c5fc1f27a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 19:26:51 +0000
Subject: [PATCH 0336/1504] alsa-utils: 1.2.12 -> 1.2.13

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

diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix
index afbbb45e92d5..f85f379380de 100644
--- a/pkgs/by-name/al/alsa-utils/package.nix
+++ b/pkgs/by-name/al/alsa-utils/package.nix
@@ -30,11 +30,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "alsa-utils";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchurl {
     url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2";
-    hash = "sha256-mLxmd9DAB0AGZ5BRgiMkoKsIea6lWKj2i1EXgNMM2SQ=";
+    hash = "sha256-FwKmsc35uj6ZbsvB3c+RceaAj1lh1QPQ8n6A7hYvHao=";
   };
 
   nativeBuildInputs = [

From baaca5ddd85ad58c04322364a2be0ac532f47667 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 21:29:48 +0000
Subject: [PATCH 0337/1504] kube-bench: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix
index 10c6b4b8f3ec..deb2e879f5c8 100644
--- a/pkgs/by-name/ku/kube-bench/package.nix
+++ b/pkgs/by-name/ku/kube-bench/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "kube-bench";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-i0iSIK3nJ83bCuxIVxLBjJbBCpTU5TavmX2DTEJzG+Q=";
+    hash = "sha256-SkXf8zZif1l+yOSUjYpW474gYOmxifaLtj/DNK+ZNfg=";
   };
 
-  vendorHash = "sha256-c4+ruUR52TcjI+Xvuv9Xt8GAyjpbEvJhqDqWSRgVGWI=";
+  vendorHash = "sha256-6ApPEt9SkPI5yu3ejzR1AU1ZCHmltp8Cxso6j//pEAk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 09332bf97c98e1da7f9e1313b8739257934df701 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 21:38:55 +0000
Subject: [PATCH 0338/1504] spring-boot-cli: 3.4.0 -> 3.4.1

---
 pkgs/by-name/sp/spring-boot-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
index dd6708bdee9c..b741dab8889a 100644
--- a/pkgs/by-name/sp/spring-boot-cli/package.nix
+++ b/pkgs/by-name/sp/spring-boot-cli/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spring-boot-cli";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchzip {
     url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-jmqmWlp40DE/CWzPEMfApb3OTDDb0upcePCHj1+yTs4=";
+    hash = "sha256-XJGopVQclKVfVXNlHj9LXu8Kt3hcfsajH5p63k6nQ94=";
   };
 
   nativeBuildInputs = [

From 5b4ea980e508a0bb6ad2b122f16142d97f44644f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 21:58:34 +0000
Subject: [PATCH 0339/1504] tutanota-desktop: 253.241203.1 -> 259.241223.0

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

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 770317c2189b..7c0470e6bafa 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "253.241203.1";
+  version = "259.241223.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-UtryT5nd8zZQ4Bz3BBes4eL/AchEoIVE6BZ5ZHG/874=";
+    hash = "sha256-PfgdYKy3JfId04hu8qrNhmdpwOmyfsfz7Bk7KpLTdzk=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 3517b02dcef6a2c6912b3f10948759740d28dfaf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 03:43:38 +0000
Subject: [PATCH 0340/1504] ltex-ls-plus: 18.3.0 -> 18.4.0

---
 pkgs/by-name/lt/ltex-ls-plus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix
index e48bd3d4b136..08b74fc4b9da 100644
--- a/pkgs/by-name/lt/ltex-ls-plus/package.nix
+++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ltex-ls-plus";
-  version = "18.3.0";
+  version = "18.4.0";
 
   src = fetchurl {
     url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz";
-    sha256 = "sha256-TV8z8nYz2lFsL86yxpIWDh3hDEZn/7P0kax498oicls=";
+    sha256 = "sha256-BkVPLtyF62keDDEnET8zF7g0FqDz6UkDWI6BM8W2qMQ=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 8cd53510161e46a0c15e1352013c3263fcda1164 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 04:01:52 +0000
Subject: [PATCH 0341/1504] pluto: 5.20.3 -> 5.21.0

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

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 4ce48aceaf4f..53f70bc1f52a 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.20.3";
+  version = "5.21.0";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-WbXIg453VewOejX/hyGi1DEi0cSwcQ+hKUFG8Ne4cPE=";
+    hash = "sha256-jz1hne6Lwow1a2Ckfp4C1/gD57V2kYFdik9DQ/EkjLI=";
   };
 
   vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak=";

From 2390145ef5177b24d65d1afa32c52b18265d593a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 04:05:56 +0000
Subject: [PATCH 0342/1504] xq-xml: 1.2.5 -> 1.3.0

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

diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index 4759aa760700..94571f41c3f8 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "xq";
-  version = "1.2.5";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "sibprogrammer";
     repo = "xq";
     rev = "v${version}";
-    hash = "sha256-Xr5k7YBx8GjrBapmThpLnPPvzEP6mcQG4mKXxZaEan4=";
+    hash = "sha256-KLpf4db3D+SQzbitc9ROO+k/VHggWpwZmwwhV3QVNiE=";
   };
 
-  vendorHash = "sha256-UV6Z4GyeFPkiyhUll7hCFkt+iBdWAl02QdzYYX0N2e4=";
+  vendorHash = "sha256-LKkYA0wZ+MQ67Gox2e+iuWSgbxF0daJj7RWLA6C+v+I=";
 
   ldflags = [
     "-s"

From f8dca9319b78cb6973734b659e1febac1e7e6f47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 04:13:22 +0000
Subject: [PATCH 0343/1504] lcm: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix
index 767d453a4776..dd2c4df711f6 100644
--- a/pkgs/by-name/lc/lcm/package.nix
+++ b/pkgs/by-name/lc/lcm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lcm";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "lcm-proj";
     repo = "lcm";
     rev = "v${version}";
-    hash = "sha256-IFHoJl5OtnUb+w3gLG5f578yAektjgrY9Uj2eUVoIrc=";
+    hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs=";
   };
 
   outputs = [

From 2c8cda529a4789648c086d3210a48ebd7673e62f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 04:24:36 +0000
Subject: [PATCH 0344/1504] grails: 6.2.2 -> 7.0.0-M1

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

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 84f6260adc1e..0e2678281b8e 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "grails";
-  version = "6.2.2";
+  version = "7.0.0-M1";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "sha256-UPgayFp4CYZzo1yHhII28Bx+CUq+z5E3+yKjXVLSZ0E=";
+    sha256 = "sha256-5ZcYSKdwFTfqomk3AMNSc9icecJt2abhTGz7fDNkyo0=";
   };
 
   nativeBuildInputs = [ unzip ];

From 2f50751f439a46a0096e6cf5175a79888ef1caa7 Mon Sep 17 00:00:00 2001
From: Steve Streza <steve@stevestreza.com>
Date: Sat, 21 Dec 2024 12:17:17 -0800
Subject: [PATCH 0345/1504] tangara-cli: init at 0.4.3

---
 pkgs/by-name/ta/tangara-cli/package.nix | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/ta/tangara-cli/package.nix

diff --git a/pkgs/by-name/ta/tangara-cli/package.nix b/pkgs/by-name/ta/tangara-cli/package.nix
new file mode 100644
index 000000000000..ba360e09cd0f
--- /dev/null
+++ b/pkgs/by-name/ta/tangara-cli/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+
+  pkg-config,
+  udev,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tangara-cli";
+  version = "0.4.3";
+
+  src = fetchFromGitHub {
+    owner = "haileys";
+    repo = "tangara-companion";
+    tag = "v${version}";
+    hash = "sha256-pTE+xlXWIOOt1oiKosnbXTCLYoAqP3CfXA283a//Ds0=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-C7Q3Oo/aBBH6pW1zSFQ2nD07+wu8uXfRSwNif2pVlW0=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    udev
+  ];
+
+  buildAndTestSubdir = "crates/tangara-cli";
+
+  meta = {
+    description = "Command-line tool for managing the Cool Tech Zone Tangara";
+    mainProgram = "tangara";
+    homepage = "https://github.com/haileys/tangara-companion";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ stevestreza ];
+    platforms = lib.platforms.linux;
+  };
+}

From 5c5d7df9cfc6cf6ecffe2c847fead30aa7b87cc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 05:41:56 +0000
Subject: [PATCH 0346/1504] tenv: 3.2.11 -> 4.0.3

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

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index 1fe5197e7140..9f347521abe6 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "3.2.11";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-9xQsfgQrLBhanwr9rgFkt8Ej2Mvt6L7iViTK4duBIRg=";
+    hash = "sha256-DqKgoobzaAGoT7ODA9d5Zgs1dnlAishNJ0E23Nqbp8Y=";
   };
 
-  vendorHash = "sha256-zx3VQu4LsvQ3OgjM9n000wBzWjwZo5MtctppnVx7fYM=";
+  vendorHash = "sha256-JrAzjnXqZSlsukLRXqHReiKPuOyWQS85/F2EnXf043U=";
 
   # Tests disabled for requiring network access to release.hashicorp.com
   doCheck = false;

From aa1d45dc665330c7647aede5684f34a6497ecfaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 06:12:17 +0000
Subject: [PATCH 0347/1504] turnon: 1.6.2 -> 2.0.0

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

diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix
index 517672f7510d..aba0ff47ae19 100644
--- a/pkgs/by-name/tu/turnon/package.nix
+++ b/pkgs/by-name/tu/turnon/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "turnon";
-  version = "1.6.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "swsnr";
     repo = "turnon";
     rev = "v${version}";
-    hash = "sha256-e9xrBtLAe/OAiDMn87IuzS/6NT8s4ZRHLAI/KF42ZdU=";
+    hash = "sha256-HCeK0aOGxeiZD7Am+kUf3z4rT7JENQxyrAufBStrSms=";
   };
 
-  cargoHash = "sha256-DlEoJ5YJe679RFRfk/Bs217KrOSxSgqDJa+xpdJaTVs=";
+  cargoHash = "sha256-43hv+ZCpgXK6GGMDG0hXza7g4jvRNmr57MTgkvTOvVQ=";
 
   nativeBuildInputs = [
     cairo

From e52ed6eeb1b7ba147d5bbc1db64393128ce32218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 06:42:57 +0000
Subject: [PATCH 0348/1504] rattler-build: 0.32.1 -> 0.33.1

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

diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index c563b1f19da5..bd9646242741 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rattler-build";
-  version = "0.32.1";
+  version = "0.33.1";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jVYck9UCeOJlRaQsdk3GTPZLYZbRjoDH4NbEdwNr6mM=";
+    hash = "sha256-yceScRfZuMVnNVNVg3Xs+jU3spdFn0hPMmwMLaYzkNE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8TK5xtKAMv5QCbq+he/ptnQf+pbrR5UfNb76qTh99+c=";
+  cargoHash = "sha256-eJH7a+9asSPDv0gBwvLc4zssJGCY2jAfVKKOWb3oQ/Q=";
 
   doCheck = false; # test requires network access
 

From e19c22f9f71b4307d9564883323b8281ede226aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 06:54:41 +0000
Subject: [PATCH 0349/1504] python312Packages.pyinstaller-hooks-contrib:
 2024.10 -> 2024.11

---
 .../python-modules/pyinstaller-hooks-contrib/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
index 5ca881319e38..f26f4af855e8 100644
--- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller-hooks-contrib";
-  version = "2024.10";
+  version = "2024.11";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyinstaller_hooks_contrib";
     inherit version;
-    hash = "sha256-ikZlXlxbAYa15Sc5kRips0LxBRPrFCXEg/pPbQLogAw=";
+    hash = "sha256-hDma9rS5AgMJWAY98l9lerv/JJ0PMpxTRJKDVcmDOrQ=";
   };
 
   build-system = [ setuptools ];

From c1eba5edbbc7d4044b04b6090efa85b76d58453e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 07:03:42 +0000
Subject: [PATCH 0350/1504] trunk: 0.21.4 -> 0.21.5

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

diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index 47a2e63112e1..abda881970ae 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "trunk";
-  version = "0.21.4";
+  version = "0.21.5";
 
   src = fetchFromGitHub {
     owner = "trunk-rs";
     repo = "trunk";
     rev = "v${version}";
-    hash = "sha256-tU0Xob0dS1+rrfRVitwOe0K1AG05LHlGPHhFL0yOjxM=";
+    hash = "sha256-AHW686xPGCMLISrOLLfDR5g+2XpMJ+zfmWGn3fMfKbA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   # requires network
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
-  cargoHash = "sha256-iuxACtr91qWzojKWaieAd6kk/q9j5JSD1Fa50oCKogA=";
+  cargoHash = "sha256-m09ZV0Z4bNyAfO6XNiDKyqMeqv2/tx4vpQnWlesCW2A=";
 
   meta = with lib; {
     homepage = "https://github.com/trunk-rs/trunk";

From 67bfb72264075930841bfe7c7060659a81bf5daa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 08:07:25 +0000
Subject: [PATCH 0351/1504] terraform-ls: 0.36.2 -> 0.36.3

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

diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix
index 4a1995df9445..ca0531e334f1 100644
--- a/pkgs/by-name/te/terraform-ls/package.nix
+++ b/pkgs/by-name/te/terraform-ls/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "terraform-ls";
-  version = "0.36.2";
+  version = "0.36.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-XihFvQZQ+cJrFd9ly9mDVcXUDBXwndd796bterxaaAQ=";
+    hash = "sha256-bn4eDAR3fYioT2kB7Hp0zP1190FMFAJ1L5lYFUUwhWk=";
   };
 
-  vendorHash = "sha256-/ZlWx8/6eJfoiCl6yOtotoju2LVPP6YHqjk+5WE7jzQ=";
+  vendorHash = "sha256-Qx18IisnEt0xr6Mb0nxjRp+ORu5xbmSJKrRCgRJFlbc=";
 
   ldflags = [
     "-s"

From a9db27f07c8e6c2222009aacbe047a18dc5d4b09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 09:28:06 +0000
Subject: [PATCH 0352/1504] prometheus-mongodb-exporter: 0.43.0 -> 0.43.1

---
 pkgs/servers/monitoring/prometheus/mongodb-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
index 0b481422db39..c22a8e8dcda4 100644
--- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mongodb_exporter";
-  version = "0.43.0";
+  version = "0.43.1";
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = "mongodb_exporter";
     rev = "v${version}";
-    hash = "sha256-MmevWy5RJaSC1ocuuxqFYpagyjIaHBbd5PQ8HfCF0R0=";
+    hash = "sha256-lf5sh9ADz1L5thNsjj1EdGJGuNmlcFOMUxwOUZUf8Xo=";
   };
 
-  vendorHash = "sha256-VHQdmEOCHTwszUUOF5JTbBWacgLM6MyuxAC6FNFD5PI=";
+  vendorHash = "sha256-c5PET4xGR2RzgOW9gUxo2JB/P1XO1JgWr2hQ/vGfk6E=";
 
   ldflags = [
     "-s"

From 1a5d332428e41701cd0c5d544815190b6c48a2ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 11:57:54 +0000
Subject: [PATCH 0353/1504] python312Packages.databricks-sql-connector: 3.6.0
 -> 3.7.0

---
 .../python-modules/databricks-sql-connector/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix
index 08668b89a777..ba477b3a3cb4 100644
--- a/pkgs/development/python-modules/databricks-sql-connector/default.nix
+++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "databricks-sql-connector";
-  version = "3.6.0";
+  version = "3.7.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sql-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Y0jI/06jVbivKkKd8ZXvotBBo+nvo7Wmp4VypTzDf5k=";
+    tag = "v${version}";
+    hash = "sha256-drtMkES3eHo1LfUICwxsIwfVc1qA0+0ZWm5W+Av81Z8=";
   };
 
   pythonRelaxDeps = [

From 3046569950964ead1ad865c0c44e6f26a26978c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 12:37:21 +0000
Subject: [PATCH 0354/1504] rocksndiamonds: 4.3.8.2 -> 4.4.0.0

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

diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
index 66f937a2cb55..e820bcdfbfa9 100644
--- a/pkgs/by-name/ro/rocksndiamonds/package.nix
+++ b/pkgs/by-name/ro/rocksndiamonds/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rocksndiamonds";
-  version = "4.3.8.2";
+  version = "4.4.0.0";
 
   src = fetchurl {
     url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz";
-    hash = "sha256-e/aYjjnEM6MP14FGX+N92U9fRNEjIaDfE1znl6A+4As=";
+    hash = "sha256-aKHHD/v+zqxCsOYp06nqB2TShlwCwE1JaU0adO4T4Cw=";
   };
 
   desktopItem = makeDesktopItem {

From 20722013573dd7643b745e5c6c44cc479338d174 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 12:40:06 +0000
Subject: [PATCH 0355/1504] parallel: 20241122 -> 20241222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index f5567b9a1c9c..38aca4881395 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "parallel";
-  version = "20241122";
+  version = "20241222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${version}.tar.bz2";
-    hash = "sha256-Gp51L0LBfKELwH0KY6LKbtzuUyKC5V0rNL2d0UyXilg=";
+    hash = "sha256-ehsDjLGYYEEH+WAbfCoXbnjYRYWBIXCPqGkGccswGnk=";
   };
 
   outputs = [

From 540870a4d0b9d4ded6109d85d20a727170cecd70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 13:27:55 +0000
Subject: [PATCH 0356/1504] linuxkit: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index bad149ffeed6..d646d96ea9ef 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "linuxkit";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "linuxkit";
     repo = "linuxkit";
     rev = "v${version}";
-    sha256 = "sha256-M/M4m/vsvvtSDnNNy8p6x+xpv1QmVzyfPRf/BNBX7zA=";
+    sha256 = "sha256-dCRTBy2Nbl5KP8dxXt+1ww1BF/gWm3PfLtSBAaVcBvw=";
   };
 
   vendorHash = null;

From e24aa49b5d5feffbf6946b523a7e63594d852d74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 14:15:02 +0000
Subject: [PATCH 0357/1504] iosevka-bin: 32.2.1 -> 32.3.0

---
 pkgs/data/fonts/iosevka/bin.nix      |   2 +-
 pkgs/data/fonts/iosevka/variants.nix | 180 +++++++++++++--------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index cf1b9602799d..057e40799bcc 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "32.2.1";
+  version = "32.3.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 1be9c1b82968..1f2f4aec7ae1 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0y1gsyjj0931rfhimszjcbmwkffznbhjdnjiqszg6g9wiqd3q8kv";
-  IosevkaAile = "04qynqhpzcz45plpdrik4y5x2h2pz2l2jzymdb1smp3dm4f6sk5p";
-  IosevkaCurly = "02qrd3j6xiz69a932cn6qdnz4bab7ycsg48dzxdwkakyympmhh7c";
-  IosevkaCurlySlab = "0sc4hylp72x84f6y3sjrc0jkw5nx0hynr0swram8fs4yvddqgrq8";
-  IosevkaEtoile = "0qkjivzjm3h2cwydxy5rhrk37qb5ci2bsrdmggmlv6v1syyn46kn";
-  IosevkaSlab = "1bg43x2baifa3y44bwsjav5lhbn7i0g5fhvwz0c55j16sqb4rizi";
-  IosevkaSS01 = "10pzgi0vhkmlnwsyc9jqjkzi4id5gmspyd1x467x3wrdjhm9zihv";
-  IosevkaSS02 = "1kyciyfdlvxvi4gbn5x8921mz71nxkhpyb48mwcmqjri6h7a4hkb";
-  IosevkaSS03 = "15f0khxancql140bivimg3mgn0kmzcykarrgqd0lmjqdv3iyng9a";
-  IosevkaSS04 = "1ym8pynzgsm16fr2myh2z9z6dn38lny736jbn8q92ngcl6mca0bl";
-  IosevkaSS05 = "0a3dkc2by23qls050ahri14sdgqclfagjhsxhhzv9cc66qvmr3xr";
-  IosevkaSS06 = "09d2ir6hrzpr5vq85j4jkhqkpghjid1zp0dxinps4digbix9ylc0";
-  IosevkaSS07 = "1m4mmr4px56b4fhpn77s0gf46as153c23gslhhbldj1jiyzfd1q8";
-  IosevkaSS08 = "01iv4sx21f2mkg6cspkpxcq9a1pp7b897jcwnf1gx6y4r9s04zj7";
-  IosevkaSS09 = "15v6y640qadq27rh5vx35ay6qj2xgyirza8182m7ypjrvnb96rip";
-  IosevkaSS10 = "1b35zy0rv5kgaiwm8wqak7drq3mncbvdgqbkwrk1hrfpf9j0hxch";
-  IosevkaSS11 = "0qdz0x9rbwycddq4yhmzf8daihqkpgpbn8kk0781vcfc38jayfbd";
-  IosevkaSS12 = "0lq23n4n9pyrb4z2zgp8y45asb36yl2r2s80y2p5l7anjndpwczs";
-  IosevkaSS13 = "13csq6ka9mhs5y2dl6l2imgldw5dm9ivjckx9ap1h90aq73ld3m1";
-  IosevkaSS14 = "1hv5y0z123a3a28wxargpkw9yvrciyvb48z29viwrlm3laf14f78";
-  IosevkaSS15 = "1pxh0nqnw8901d964hjiddzgaxnhhgbjsc4dv2gbs1nvfp4wz613";
-  IosevkaSS16 = "1bja13nxf5iqy6kzwqjpwxrv74kdaydamk3325km1lgaca6b13a9";
-  IosevkaSS17 = "00c4807ligsx29ipm75g7a3siqi4lfaf5dqjqrll5x2f5l04q4c1";
-  IosevkaSS18 = "1bk0p24h0vizjrlx4dzyz4yyi1b6s9ymakckprx4gxa97jln71z9";
-  SGr-Iosevka = "1vrxg8kbrm767mzrzlainfqv2prqmkwgip0ab4wd875x8lv3mq1w";
-  SGr-IosevkaCurly = "0mm0bmdr9ca29096bcb4z583ivyz7qf8h6bin74dd9vvvi3rlkla";
-  SGr-IosevkaCurlySlab = "0f45a6p3kgjqgyci5m7gj1bnlsdv2cif2yx8yp1npgqdyyaiq8ah";
-  SGr-IosevkaFixed = "1jfwj3w2rmhf00l628c9813yrx65cvjbl2q74xmwxwp4m7gjh7m6";
-  SGr-IosevkaFixedCurly = "05230lnw2p7hz77bgch20fibb2kvn1jqp0zl92vdim3f13n7yfv4";
-  SGr-IosevkaFixedCurlySlab = "1xqv070hfzng7bdi7dwhypi8vx4b7nlkz2d65gsvfxj1vk229c5l";
-  SGr-IosevkaFixedSlab = "14v3fawjijzzn94zgybkjkgz6bw2g4hqwxjz0rwflvr1w5m3fh1z";
-  SGr-IosevkaFixedSS01 = "1n221fd0ln91q2p506c2rgfc46xhgxksaajnbwan5hlll618y90v";
-  SGr-IosevkaFixedSS02 = "1zm8kzn2layp17glbs7l6243kmvmfz1cngbrgj3iwgraman6ac62";
-  SGr-IosevkaFixedSS03 = "0bgmgdipk1xysc658ngdhqyy6plfkcb4vbmq2vk8cjz8ixk12mh6";
-  SGr-IosevkaFixedSS04 = "046yjmmir4cxyl8mk3wyp3zy6rnm85mzxcpy8gmd9yb4qnbq9nm1";
-  SGr-IosevkaFixedSS05 = "106ii42m4wpffpynd35r97ks5q6a8py3g1h8k8q5919kxqakrfnh";
-  SGr-IosevkaFixedSS06 = "1g0d5jhb76g1x50z8qg934s5j97c60fg1aqga1n1dmqvmm0zmdwv";
-  SGr-IosevkaFixedSS07 = "13z7f78p01v0225rq49zv8wq7p4g303rj17zh8y96ggyajbhfn6y";
-  SGr-IosevkaFixedSS08 = "1sbkhmzdlh9z3zfmy1mdag4nccb2ndvz0lnli2hsk72iszjsk325";
-  SGr-IosevkaFixedSS09 = "1fkg5qhdx19v9k56kbrf69sfg87skc0h57mpz7jdiwzwpzlqv79v";
-  SGr-IosevkaFixedSS10 = "0smg99rxh27b8i7p07r0gmywpxlhn75ln8ccf18jlzv4baa12pn7";
-  SGr-IosevkaFixedSS11 = "07winxlw5di447j0yjxg7fxyj7vl1iwa766rx44xj9vz34s62v9l";
-  SGr-IosevkaFixedSS12 = "1l23f8d0gbddcawx2sdk2zcz8pqkj03gi9l0bw05pig72i3ipls6";
-  SGr-IosevkaFixedSS13 = "1b7yvrmfnspxa14kwb6rinqx9h712iadii4yf8v6z14iss6vrk87";
-  SGr-IosevkaFixedSS14 = "0fxwsss5mrizrg426gn1g0aj4imnr0ghkfbyx081hjbgn9569mid";
-  SGr-IosevkaFixedSS15 = "18xr3100ixq6p5s80ixlrdxna21cy9hqw1x6vypyvbqz9fc3nakx";
-  SGr-IosevkaFixedSS16 = "05j75njl8pi54kdp0hbaww4hm9mpyswl4msk0vma1v1jjasvggxp";
-  SGr-IosevkaFixedSS17 = "0xqp0dy1srqlzf92fvg45msay8r42k0bcfv04hsii87h6xq28q6i";
-  SGr-IosevkaFixedSS18 = "0rs2vwr3v6wy471cd604rm5qc5m35gg1pyna2l3kch1vrcjcvfas";
-  SGr-IosevkaSlab = "1g7aidcc43ibc7jwwmrlbwj2v0yq34cb5rs3q76bhyl498hizvn4";
-  SGr-IosevkaSS01 = "0wjsjv9g2xmvw1338lah688lj7hw8dlfn2y6x0pafffach2a42cs";
-  SGr-IosevkaSS02 = "1l7l4gpi0vk4d1rx8j2fysfwfdq8ifkx88qh610z3lqd9lia25ik";
-  SGr-IosevkaSS03 = "1pal6kg3dd4rq5vyr22ngziqrbs48prvz40jaynb78nd4v5hfm96";
-  SGr-IosevkaSS04 = "0381kgbx3l26wqi9i9fvsprqjxlvj2jfczni4qsiw4vczdiclkg8";
-  SGr-IosevkaSS05 = "0fzgncaln6il7zp5bxx47kygawkpaibvcchznpfr1kmb6i8mcy4a";
-  SGr-IosevkaSS06 = "0yh9gpzddwi8j752h7d9k4xmqp2092xhjpfd6qwzs98g180czqyx";
-  SGr-IosevkaSS07 = "1i6rnbddc7r69133y1pn44hng461hcdanl2xksjws49wcyhrdclz";
-  SGr-IosevkaSS08 = "0d4j6x79nlsrb1fpg52bscxdl8bsfzp2qjr3lmn1kph5n12g91an";
-  SGr-IosevkaSS09 = "1lmqi80hqb3nx5nl5w0fdbakkqp0w261zh19m48yii2wq8bl48sj";
-  SGr-IosevkaSS10 = "083g92r66mlklsh4xn6v650p1czcg0vszl758861jmsqrj1irknp";
-  SGr-IosevkaSS11 = "006fybldx9iz48yc1ndwnhxjdqjy9k1raxibcdgdm73n0y1fiwg6";
-  SGr-IosevkaSS12 = "0r2w6wk82yws1qnvipia5srxrvxcp17hvy1zzbs7756h9xq2qyjv";
-  SGr-IosevkaSS13 = "0q7z5a8z9dwvi3ax6f2zix020icx78wz8xq6i7mb1p9v5mr7vh22";
-  SGr-IosevkaSS14 = "16ii7aynq3q1k1h22q0hz5jxxhrwx9w06c7jfyqcmc4166xmz1bc";
-  SGr-IosevkaSS15 = "1lbi138qxpwbasl10447ql23j26ib0rsmvb3db54rdd458yhc99b";
-  SGr-IosevkaSS16 = "0xq8fnmlz7v6jamsqfvdg81vry8ccc0164nzl93rfj7i6ri0jvg0";
-  SGr-IosevkaSS17 = "0j3gzn6mghyjndzkxyrjbgpr5284hpwr9b9aifq0m4ri1pmsbwnn";
-  SGr-IosevkaSS18 = "0b3hgfl4r5s1f5i7n401yp22glbjghkh2wcx7k4mn8qrci7lhvwv";
-  SGr-IosevkaTerm = "0ijcrzh91pinf83wdqdk42z3raas2mjw2p872xgkkx0wpzy01vbn";
-  SGr-IosevkaTermCurly = "0s2g9dpnc1nw7f9cpgnw6yjfm71c4q63qvmf5ld35sp4h21qgc3w";
-  SGr-IosevkaTermCurlySlab = "1kndi5p6w7pm64621v9bjkmk80r1wq5p8ihxmnzv7va84r43sjdy";
-  SGr-IosevkaTermSlab = "0ah7vn8ycrwxvarpmxjf07spky9r3fa3qvjy38nvagwh3ppx0xxd";
-  SGr-IosevkaTermSS01 = "1c36199qjdvcs0h237xy0pvcbk6rjkrrsnq35k432y7b1jp9nyy2";
-  SGr-IosevkaTermSS02 = "0b16096xihjy1ny5k35rg2nm73fpkk9yb05gf2i8b34nwmysif8m";
-  SGr-IosevkaTermSS03 = "17kq2cylrgccqkmzjg03m3apib4z0zjs25sp9sdx2wahjh07bw6d";
-  SGr-IosevkaTermSS04 = "12qsqpp3jlw6961mdal8ihx07x4lb8c8ckiwaks00y53shrknq6s";
-  SGr-IosevkaTermSS05 = "0yy8ls7vvsj5h411cg1x7ys1va1qp1dkza8zrr562r04q671748m";
-  SGr-IosevkaTermSS06 = "01dd1pbfj0ga4h1bvzk8z16hw5syc41appbdc6ysr3rcr982p8as";
-  SGr-IosevkaTermSS07 = "1181rabk0abiny2ifs3v0431s8i9zm8ins7pdfk1qlgjfx0axkwb";
-  SGr-IosevkaTermSS08 = "07az3bnr0l7igybcm4a0mhh6l0disvrih61zdvm2c2nx8308bl4l";
-  SGr-IosevkaTermSS09 = "0fssz0j9nlph94hqzwgiqs1hdbw8qkr5f442hw0f1j1fmkbr8h41";
-  SGr-IosevkaTermSS10 = "0847d38s6dpkagymna374wqnw7bg05idj370bgjnk7l6xqbwh096";
-  SGr-IosevkaTermSS11 = "1d5in68yzllcq6bkmdyws4amysh7fi8i9mvphdd4sdw26abwpyw6";
-  SGr-IosevkaTermSS12 = "0wdax0f8w1qrczaa9dyg9b2jkl37vnm0ms4bwa7gzifg1v6rkl83";
-  SGr-IosevkaTermSS13 = "1vh13gc5dddjkb4qmdr1dpq2vqwbf2xggpn6mdj6s2my1irgqhv1";
-  SGr-IosevkaTermSS14 = "1bcjhxpdl0m2nc895rg4ha90mpakz4l8xdhhlm88fvdakjp3wa53";
-  SGr-IosevkaTermSS15 = "0mwxzjdrrnl85q3y97hlsb63n2rl6ysvcpi2yf0828f81x9xgldj";
-  SGr-IosevkaTermSS16 = "1cglchggcb49p6v6irapkx9dwdic0qalrpk447p6lg2vhv0ka676";
-  SGr-IosevkaTermSS17 = "00d0cydhjxplyavp47bsaijrxb06hnriqili5mq8p0g01r1fzxqb";
-  SGr-IosevkaTermSS18 = "1n6mc2hfkgyb0rqffnc65i07p94p61sf0yf9vr8k6ir7m7fb30n9";
+  Iosevka = "0x9h41jhhxgafad7zc39jb4la30sxkqcz1m4l2har9zfakc3jhnm";
+  IosevkaAile = "1rf70nsqkza1zwzpl2i015rhxs2wqq9msvkjhghg6scfir2bmpky";
+  IosevkaCurly = "0hqn94k9vh9ds077m4gmdhdhcg1x8libb6cp1c2iqgy7nyc9qywd";
+  IosevkaCurlySlab = "18ya3c8fw0hwifxdkyyfrnqybpwhf21ir3lhajs0x772ifs7xs22";
+  IosevkaEtoile = "1ycwyfyg1dk47mxgnc729liqnffyk2f5f0vzavdamydfdqnd9wrq";
+  IosevkaSlab = "1dfgbx0clsz7dxy32n7gzza8bx63gfq2j77vyfqwi9201qbmsyqr";
+  IosevkaSS01 = "1x4fayq749lcn857v5kls4kizdn2nm7sv3n5r9ac3x1vhnjp03c9";
+  IosevkaSS02 = "0ghwab6cx958kk5znc8d59bkjw1pfif3cz583j99n2jyd524y6bf";
+  IosevkaSS03 = "04g41ds76nkva8ai23xbq62szfdvrn659hrn0bjn1f754aq921h8";
+  IosevkaSS04 = "1c34cbmnmfnss9sncrkh92n054q8lhdpn7qvvi0p3kq1xbg17iny";
+  IosevkaSS05 = "03ii0w908k9xvgal7ja6sw3bmc3gnvhkgd6j023whrcjis77ryi9";
+  IosevkaSS06 = "1hv41jn17zacmfck1r6kc905i0aikz51xwx4zdnmmqq0xyyxdkrn";
+  IosevkaSS07 = "0vfys80wc4rznynvv8zck8h41nfz5ig01by03f6m8qd5fnjdbhw1";
+  IosevkaSS08 = "0ramm4jd6wfkfnwymfqpcgapbrqcsq1irfh33mkzamj35racnkgm";
+  IosevkaSS09 = "0f0y536nfmbkz5b57wm978ywrn5qc3f1wzfmwpdc7h3jqygakbdc";
+  IosevkaSS10 = "030blnwf75psiiqi5haypwvp9f9jnh5h24fz9x6swxx23x6pl6gn";
+  IosevkaSS11 = "06c9ka1ca57srnn81ahbmnvimcyb090izw22yrkkyd6nnf59ma34";
+  IosevkaSS12 = "11jv4xy9xva97v1lhz7w8c1qj9yb69a7l17aycdq1ma3mx73dpk0";
+  IosevkaSS13 = "07l3adjiz9i7hqfs8174db1283m2ly6nn0c91njx84fm541sizfn";
+  IosevkaSS14 = "1862fcq9zxdm5dh2032bvs2l2wg3ryrcsyjz0addgih7arp4gzfd";
+  IosevkaSS15 = "111pj1l1vmfcpj1jcb1cpdl1xbm2pjvmlvpmxbn8qh3ms2cvdgra";
+  IosevkaSS16 = "14dk6j8dw8scd0kn7hazld41731fgf5ym6ylljdq4jcgi6kygsiz";
+  IosevkaSS17 = "0ci8l5i2iwb8yjdxdzs41204x3zypsbcdn7a4sgjwc0fcg6ln89m";
+  IosevkaSS18 = "1wkwfdlz0kxymiii4i1wg1kiwbksnqkdpd5xjlg5abixj9dg2kcf";
+  SGr-Iosevka = "1q3x9b9h7daxfhz56mnlgsbcl3a4sr3h87f04dl3cxqxwmf1c65q";
+  SGr-IosevkaCurly = "0xplpj2na2427znwphrifyh5firc2z1pdq6sf7rc5apfizydspxc";
+  SGr-IosevkaCurlySlab = "1jbsq475fg0bmjjbrl0ylxzpi59cn9wm00693y3f2n900lrbbd6x";
+  SGr-IosevkaFixed = "1kw90cqj9fkjhhgjpi2pmjjxljhirfk68jz2k07b213qvg1ca1ab";
+  SGr-IosevkaFixedCurly = "1kpvimfga2harfb13i1gp4h5nl8qffa6a4dg9fcjwi56j9p1r0hq";
+  SGr-IosevkaFixedCurlySlab = "03r9h4gh7g7b80pwddm9vvldps9b32wfzd4bysmgn918wqiqkcwh";
+  SGr-IosevkaFixedSlab = "0q9l1djgsg15qhwl11kxdckrds05pkr6w34048r2hdxgvzr7f6gm";
+  SGr-IosevkaFixedSS01 = "1acc8cv14vv21p60iv0ldpmkd7a0hzpi6s1mw5z1zilnrm8swbfk";
+  SGr-IosevkaFixedSS02 = "1kp2b891wna0k4y8k40hdmm34a0p7788ja2ip9h7xvc2n1g64yl8";
+  SGr-IosevkaFixedSS03 = "1vgb6vdwc2kmh0219rpzqhg27zamka801zv7gm9ic24hfizy713x";
+  SGr-IosevkaFixedSS04 = "1g49bqkzsjdb5bli3pxh1rbmr8n6c0dxn2vdxjachxcz5mf4ja9z";
+  SGr-IosevkaFixedSS05 = "1sni2mxlwsbpvgh0rpjmr3ifjq4awgsc44s3yjiqw0y8wmd90qmg";
+  SGr-IosevkaFixedSS06 = "0nsv3bxjbm2r6dnva74d67f9r3k42jdvcjfrdgxkpwgydrcrkar7";
+  SGr-IosevkaFixedSS07 = "0qxx9mmg5i7rgqwl7zy3m11bhrqr6akv4jqlns4119clfq1bh1ip";
+  SGr-IosevkaFixedSS08 = "0w9v8slpp9q2ywn5absc97zqmg3f55vfd52rrv6rcc7jkd7zsz72";
+  SGr-IosevkaFixedSS09 = "19js1wah54mbkpf3vjqrxwk6lf2y7nq86dc5xxrj015yimkzsbsw";
+  SGr-IosevkaFixedSS10 = "03vvjfm69mvm0873b1ws93vkjbqjzd7f3kg65h7zwxg6r9l20ikc";
+  SGr-IosevkaFixedSS11 = "0jcwgblwx0bhvfibnlizsgwqryjqhyj80cz4dqhhrjlviirm17v3";
+  SGr-IosevkaFixedSS12 = "1pm1kmlmpaz5nnkbk4s0n12am134kb5mh2b6rhs104dkngf1zfkf";
+  SGr-IosevkaFixedSS13 = "1h3v8c7qsf7iyypvbhn7qsmm0a7mfyyh7i0p4f3pvkfdpb1sd509";
+  SGr-IosevkaFixedSS14 = "1fpwrck8dhha5rkrbz7dykyqrlg46fgih3sn1c36s7j737j69vch";
+  SGr-IosevkaFixedSS15 = "16iwab1gpc3xzgxld8km43n9dm6jxv0z39zgyxknw7xdxkwy247z";
+  SGr-IosevkaFixedSS16 = "0di6sr995gjadky3nd6k68i88cl745i2awq69cnv6akvcyy53fhd";
+  SGr-IosevkaFixedSS17 = "1p7qm49ww201yaddc0m18vjgp5xjn69cpmg3lsxav4bapf3yq01q";
+  SGr-IosevkaFixedSS18 = "08858lgilwqhrvpzciagh95a2cqc4bfipdyidl9bj718z67vwmgq";
+  SGr-IosevkaSlab = "10y6ykq3aaki5m4j4kmsv5y79li3l9bqisrwbvzw6vcs4895z6qw";
+  SGr-IosevkaSS01 = "0mdkm5fb6srxd9bmw41a1rglnap0fmfv78anzff6w0g4azvxlwxj";
+  SGr-IosevkaSS02 = "1z6bf14qcx5qkhfd99g0p26flin8wqmvlkqmxl32r0697a1yhaqm";
+  SGr-IosevkaSS03 = "1jvf58qnx89f90h1gwlm8nzfb4ab1wv6z39p9fzawcrsk70fj29q";
+  SGr-IosevkaSS04 = "11akqjhjc1nnmc1b0x05v78b3pr2mq4x1w9ldq07mq088cp9n1v8";
+  SGr-IosevkaSS05 = "0dn1d4gkgfqars6nj84lbic3ybld3h0h321kkrbl4s5wplli264k";
+  SGr-IosevkaSS06 = "1lxjvgipr4w7865xvcrx5vl5w40c9bz91rb7wm6lnxs9fljg9nim";
+  SGr-IosevkaSS07 = "0kyb0qyvq7z0m1z8561w6bkz73hfhnxp4hshx68pcbvyh3ah25hs";
+  SGr-IosevkaSS08 = "07f1qy450v6k9dn2l15b8xfdhkx2ri773lnld2jv482wm8nqn54z";
+  SGr-IosevkaSS09 = "1gkxlaip18fnxkcdf6iqh7in0qgjk4kvjqky3qjwhww3nbkww5cl";
+  SGr-IosevkaSS10 = "0g25n440ad8n2xxc4m9mrjfi5lf77jhjg9hld26w9ir5fhbg5gd9";
+  SGr-IosevkaSS11 = "06xgh13qsmfjzk925s30qwrvdhaxk3f04qrsyb12fyns7r8q39k2";
+  SGr-IosevkaSS12 = "05s9x6h609mrmq9dn1ca25crbb2nkf4v3av0mb7phc9narp2nl9d";
+  SGr-IosevkaSS13 = "1yz26cgb1mcbqhn2x85yh3hhivkdmrxpnkkqh28kqhp6yajb7cma";
+  SGr-IosevkaSS14 = "0ql72ic7m28p1k5c2zbrgpdllsciggcm26iylxxqvirsvrxpa4gg";
+  SGr-IosevkaSS15 = "1j3xib3szygxjx658jj1kzn8sn5qyyw14w7ayz9zi5dr2l86cnzy";
+  SGr-IosevkaSS16 = "0m48y236m5incc8p45mq7rryqyisjfrpihym7fsv10hylvfmjfp4";
+  SGr-IosevkaSS17 = "1c7hwxjzjcdil0vl44pndsa89rlp4i9p254zsr7qb23frjrd1jn5";
+  SGr-IosevkaSS18 = "0m09ilj16p2fl6mcf6hx2v3v2zshr1fwm49jvhcc1l72niafm2wm";
+  SGr-IosevkaTerm = "0n91a4icwxxbg3nhr4jc0ssjxf70wh7r5k7rhacha80kbb3n5yai";
+  SGr-IosevkaTermCurly = "0fbkad52yi2svh309klhr36pf79avp62nnh0sgh3pi5ss0fs1msr";
+  SGr-IosevkaTermCurlySlab = "0pzffbjjb8rm1cbc8v6qpl0xavgq0hdfipi3fafw5grl79hiz266";
+  SGr-IosevkaTermSlab = "01sif6fvszbsjq35gpydiy450n3l9s6zcgv16yg0yl7qpkcdjnyj";
+  SGr-IosevkaTermSS01 = "06x65513mr1xjqhvq72l28ki341v9zy51006pjm7q47gryvj9z9g";
+  SGr-IosevkaTermSS02 = "1wxryjk65idhkjbzamxr82zbqhh5vzc6kfi8f4zjsqi5mvd3x1fc";
+  SGr-IosevkaTermSS03 = "08vdzxy4rvpsdn2q1014ma4v9sk7f75i4633x2d3cysj08yq62qg";
+  SGr-IosevkaTermSS04 = "143wf50dfwn734zmq69d9nm98ynhicv0685d8s86kdn9lwrviz6a";
+  SGr-IosevkaTermSS05 = "1myql01syc1d9i61jrfdkk6j515dj6v01dkn8fcn1rcqkavz0r6j";
+  SGr-IosevkaTermSS06 = "1sha89llc72n4jf76yqh87pa2dx0rqwz1pq2v2gcljlmimmvknki";
+  SGr-IosevkaTermSS07 = "1ksd28c7i047ms01jih3xfkq39l1dvfmrr8zb994363qrxa8ycp8";
+  SGr-IosevkaTermSS08 = "02f35fkr31zm5z7zd081v2slv65f584lymbf5a6hjdpvf5bl42br";
+  SGr-IosevkaTermSS09 = "130xq18wwkbfr8myvga9zrpwf3y57ca5943ff1j88prmsq4m2gpx";
+  SGr-IosevkaTermSS10 = "0wj8k7a0ddgysrdfwqvcr615ch4d55rd22cr96jwmindx0k86az3";
+  SGr-IosevkaTermSS11 = "0bv4jxpq43gp8y6wbml06zbdzwb7zzk3l593c1zq41vs28lk6qb0";
+  SGr-IosevkaTermSS12 = "0nijgws4mlv6sp34l9fqlrk78krrbc2zxzkbbn7a0yalpnzddilz";
+  SGr-IosevkaTermSS13 = "04i434zafahf1wkdj87zd8fdvpi7nc83h00d844afcx8rdamm3fq";
+  SGr-IosevkaTermSS14 = "0qsb5jdq4b0p749fksqvj6givkn8ba5lqpm93rjrf2xxqv1bacy4";
+  SGr-IosevkaTermSS15 = "1j9jcr1823vw8bfvvvlw1v1sar14csmmwwcam4m69p9f3yxp8l2c";
+  SGr-IosevkaTermSS16 = "02v6qb7j0rnzm87mx4mvhkfj2888752a850sflsfv97fk5g4dnxs";
+  SGr-IosevkaTermSS17 = "1d1b5h8z21yqqzppnfwx22q3938a9r5gdkr5183608jrqhwnjlzr";
+  SGr-IosevkaTermSS18 = "1jzihaabkj33bxp2wxi6mndkxwfiv153i3941hmh5p6gmbm386a7";
 }

From ac5b74c44f2d26ec6b27f6ef429833d83b81a9ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 14:59:52 +0000
Subject: [PATCH 0358/1504] bkcrack: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/by-name/bk/bkcrack/package.nix b/pkgs/by-name/bk/bkcrack/package.nix
index 3dd3bb22d926..720808a2342f 100644
--- a/pkgs/by-name/bk/bkcrack/package.nix
+++ b/pkgs/by-name/bk/bkcrack/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bkcrack";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "kimci86";
     repo = "bkcrack";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-smDmnqmYuFT3ip3ULQfiiF5YxkwzPwPYBujqq9GUyMs=";
+    hash = "sha256-88zAR1XE+C5UNmvY/ph1I1tL2nVGbywqh6zHRGbImXU=";
   };
 
   passthru.updateScript = nix-update-script { };

From b3eb30da65321a835af823ddfea46bae9bb72b7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 15:27:26 +0000
Subject: [PATCH 0359/1504] wgcf: 2.2.23 -> 2.2.24

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

diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix
index 361083c5bfb3..58aefaed241f 100644
--- a/pkgs/by-name/wg/wgcf/package.nix
+++ b/pkgs/by-name/wg/wgcf/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "wgcf";
-  version = "2.2.23";
+  version = "2.2.24";
 
   src = fetchFromGitHub {
     owner = "ViRb3";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-zASb21C3GX4wQGf5V5Y+rKwq28S3CDi0gh696lspVnM=";
+    hash = "sha256-BtZvR+dZzauByQR5+VWzh6tOgAQV1sXfr0ThOy05uRo=";
   };
 
   subPackages = ".";
 
-  vendorHash = "sha256-ihcIEoVNSPJzJGeH2bRot4fldIhZ0r/yuYU6Jp9F1Eo=";
+  vendorHash = "sha256-txE00e8n9JJ89G1Exp/k8LTv36+MkGduCjqL7mHXuoQ=";
 
   meta = with lib; {
     description = "Cross-platform, unofficial CLI for Cloudflare Warp";

From e7751bceade3e506e0c4aa8ad55b264b5659caaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 16:23:59 +0000
Subject: [PATCH 0360/1504] kube-router: 2.3.0 -> 2.4.1

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

diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix
index 0e2a0baeeba9..e1d4854bbe4c 100644
--- a/pkgs/by-name/ku/kube-router/package.nix
+++ b/pkgs/by-name/ku/kube-router/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kube-router";
-  version = "2.3.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "cloudnativelabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-eyO8eMlxWobUQBuswh4kM07kJV3fsRz4gTeP/tIR3aM=";
+    hash = "sha256-N1AC4r5NLW7hxBHGFRKcDZ1sLLKlcqqNmXeh8Zt3l1g=";
   };
 
-  vendorHash = "sha256-KmAMGKm+cFGRMD1Nyn9/CHv9vUvflAiLJcro08GIGtw=";
+  vendorHash = "sha256-Yai6nszdaw2TwOi9N3BkY/4zz2aJGdCqWskHmnBKTDk=";
 
   env.CGO_ENABLED = 0;
 

From 672efea1738a1ce6a71fb9837b9bc28d14f84db1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 16:39:53 +0000
Subject: [PATCH 0361/1504] python312Packages.duckdb-engine: 0.13.4 -> 0.14.0

---
 pkgs/development/python-modules/duckdb-engine/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix
index 6c77fc97c016..b72640d52128 100644
--- a/pkgs/development/python-modules/duckdb-engine/default.nix
+++ b/pkgs/development/python-modules/duckdb-engine/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "duckdb-engine";
-  version = "0.13.4";
+  version = "0.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,8 +27,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "duckdb_engine";
     owner = "Mause";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-B9vh8OILmRZKKznBbEkkm3zlAwGwMGdiuc378msiywE=";
+    tag = "v${version}";
+    hash = "sha256-tzVpCbX1zAU77lKGaYT3BqC/K0m12K+XPW8oyFwHKpg=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From c4ca3376f4d6b855444459cde218e79edbafa063 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 16:43:56 +0000
Subject: [PATCH 0362/1504] sendme: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 13760d2ff62d..a86f9527e44d 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-wnQ2NO+s6HumdxpO/qS/UeVdHgk9MvE6jpiSiBO0EIg=";
+    hash = "sha256-t6861ct4zGqm4MuQGVIyGUlRY+ZhojKpbCYbip6Uoec=";
   };
 
-  cargoHash = "sha256-5H/AQBPNSE5J+NQsSFn0z9dfG0ssxungpFJR220scgY=";
+  cargoHash = "sha256-nYdJbuBwW66uZs3gK05cRlQni0vT3BNlohaysYmddhQ=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From a9baae6151da9503b3ab0425107374714066be4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 16:49:58 +0000
Subject: [PATCH 0363/1504] dumbpipe: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index b9ee61768ef0..91e2e870081b 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dumbpipe";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-WJwjxVtv022Qm1NUnibh2jq1g0P/hi0HjeA9l7fMdRw=";
+    hash = "sha256-NNSR8qAikwXC0bJ4jGQQ2gZZmgPin5M6xAaY2YhuBvw=";
   };
 
-  cargoHash = "sha256-oq8jWRFVEB9sMZ7ufke5D1BMpGms8WJWVL/LGV+g/GI=";
+  cargoHash = "sha256-yAz/VjdS4FeKKM9vjOPcASGByNQp2StvrFHwJnk2YUg=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From d59e60c4ac54d8a8fd301ebed0e79d8f7bfc31f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 17:34:24 +0000
Subject: [PATCH 0364/1504] coursier: 2.1.19 -> 2.1.22

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

diff --git a/pkgs/by-name/co/coursier/package.nix b/pkgs/by-name/co/coursier/package.nix
index 37bf0f40d9a3..74fbec4ad226 100644
--- a/pkgs/by-name/co/coursier/package.nix
+++ b/pkgs/by-name/co/coursier/package.nix
@@ -20,11 +20,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "coursier";
-  version = "2.1.19";
+  version = "2.1.22";
 
   src = fetchurl {
     url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    hash = "sha256-E6LEi2m/BMCT9T5UYzMbIcoj42MKP2OIc27XGDMUI7w=";
+    hash = "sha256-0ugWgvG3AHt7h8F8W8kCksyx93YO51i5StqGAEZXGmg=";
   };
 
   dontUnpack = true;

From c62f9479d92e717e4eab0e35e8f67c6fc01b1049 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 18:05:50 +0000
Subject: [PATCH 0365/1504] discordo: 0-unstable-2024-12-12 ->
 0-unstable-2024-12-22

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

diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix
index 8162ba9e60f1..e798685a1ab1 100644
--- a/pkgs/applications/networking/discordo/default.nix
+++ b/pkgs/applications/networking/discordo/default.nix
@@ -3,13 +3,13 @@
 
 buildGoModule rec {
   pname = "discordo";
-  version = "0-unstable-2024-12-12";
+  version = "0-unstable-2024-12-22";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = pname;
-    rev = "c97307d5425ba0fef24f0bdd5b9d63f660e11b20";
-    hash = "sha256-I2rO0PKtxQUiyaAt4BmE4zvOmqShbydGwWbPmnzUjHY=";
+    rev = "9f15a6342413f68531402b8aeb5ed272159fc370";
+    hash = "sha256-8VBw7DsX/xnNkfiIe8jiG2oXjIp1tNT6wy6eTDBZxUg=";
   };
 
   vendorHash = "sha256-UTZIx4zXIMdQBQXfzk3+j43yx7vlitw4Mwmon8oYjd8=";

From 20fbe9ecfdbdef1648bc3e9ba0b80aea0ea0b882 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 20:48:21 +0000
Subject: [PATCH 0366/1504] bitwuzla: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix
index 2f797610eae6..4c3a3b718727 100644
--- a/pkgs/by-name/bi/bitwuzla/package.nix
+++ b/pkgs/by-name/bi/bitwuzla/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bitwuzla";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "bitwuzla";
     repo = "bitwuzla";
     rev = finalAttrs.version;
-    hash = "sha256-auW+YeUCpl7SzVAMTyHxrWh6ShwElq6wTEP7Qf2M7jk=";
+    hash = "sha256-S8CtK8WEehUdOoqOmu5KnoqHFpCGrYWjZKv1st4M7bo=";
   };
 
   strictDeps = true;

From d345aa9c88bf1409b550721720fdcd94d1c2dd14 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 24 Dec 2024 13:29:25 -0800
Subject: [PATCH 0367/1504] =?UTF-8?q?openafs:=201.8.13=20=E2=86=92=201.8.1?=
 =?UTF-8?q?3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/servers/openafs/1.8/module.nix | 22 +---------------------
 pkgs/servers/openafs/1.8/srcs.nix   |  6 +++---
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index d0e600f056ec..b2584ca00e35 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -11,7 +11,6 @@
 , perl
 , libtool_2
 , libkrb5
-, fetchpatch
 }:
 
 let
@@ -26,26 +25,7 @@ stdenv.mkDerivation {
   version = "${version}-${kernel.modDirVersion}";
   inherit src;
 
-  patches = [
-    # Linux: Define Clear/Set PageError macros as NOPs
-    (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/15964/revisions/917d071a1b3c3e23c984ca8e5501ddccd62a01b6/patch";
-      decode = "base64 -d";
-      hash = "sha256-WqAHRN1YZj7Cz4X4iF1K3DJC1h8nXlnA9gveClL3KHc=";
-    })
-    # Linux: Refactor afs_linux_write_begin() variants
-    (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/15965/revisions/c955b666b904b96620df10328a9a37c2fb5f2ed6/patch";
-      decode = "base64 -d";
-      hash = "sha256-U2W+8YrD1K7Pb/Jq08uBcuPnGkVvcSyTpwaWWcTbq0w=";
-    })
-    # Linux: Use folios for aops->write_begin/end
-    (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/15966/revisions/d1706bdc5080b86b1876d10f062c369e8d898188/patch";
-      decode = "base64 -d";
-      hash = "sha256-jY+r9LO/4g6K9J1stxNCa38nyr1/J3beOhG9YilEbzg=";
-    })
-  ];
+  patches = [ ];
 
   nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
     ++ kernel.moduleBuildDependencies;
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix
index 3c4c24f1661b..82aadbb0f6ea 100644
--- a/pkgs/servers/openafs/1.8/srcs.nix
+++ b/pkgs/servers/openafs/1.8/srcs.nix
@@ -1,16 +1,16 @@
 { fetchurl }:
 rec {
-  version = "1.8.13";
+  version = "1.8.13.1";
   src = fetchurl {
     url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    hash = "sha256-eRABcMokkLEpXZuLEwWPMOI9eruJe/GgcXVddnB4vdE=";
+    hash = "sha256-eVc9fu/RzGUODFSd1oeiObxrGn7iys82KxoqOz9G/To=";
   };
 
   srcs = [
     src
     (fetchurl {
       url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
-      hash = "sha256-1PPUL05XZkfbIV2rc8Nl0gQ9MmrT0hqA+MRzGdPkP+U=";
+      hash = "sha256-JwGqr0g1tanct8VISVOggiH63BOfrAVQ2kIukG5Xtcs=";
     })
   ];
 }

From 27c0af47745bb5fd30e6df7a4b17a700a7b99ec7 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Tue, 24 Dec 2024 22:42:31 +0100
Subject: [PATCH 0368/1504] proxmox-backup-client: 3.2.2 -> 3.3.2

Needs some refreshed patches and an additional crate to fetch/patch
extra.

Patches are taken from the (unofficial) AUR package as applicable.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 ...ependencies-not-available-on-crates..patch |  209 +++
 ...-docs-Add-target-path-fixup-variable.patch |   33 -
 ...-docs-Add-target-path-fixup-variable.patch |   25 +
 ...argo-use-local-patched-h2-dependency.patch |   26 +
 .../pr/proxmox-backup-client/Cargo.lock       | 1379 ++++++++++-------
 .../pr/proxmox-backup-client/package.nix      |   60 +-
 6 files changed, 1147 insertions(+), 585 deletions(-)
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
 delete mode 100644 pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch

diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
new file mode 100644
index 000000000000..c1ba7aa5290f
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
@@ -0,0 +1,209 @@
+From 15345a1ca0a52f2e977361002fe984609704ec90 Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Tue, 24 Dec 2024 17:40:48 +0100
+Subject: [PATCH 1/3] cargo: re-route dependencies not available on crates.io
+ to git repos
+
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ Cargo.toml | 147 ++++++++++-------------------------------------------
+ 1 file changed, 26 insertions(+), 121 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 9354fb17..d2014429 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -42,8 +42,6 @@ members = [
+ 
+     "proxmox-backup-banner",
+     "proxmox-backup-client",
+-    "proxmox-file-restore",
+-    "proxmox-restore-daemon",
+ 
+     "pxar-bin",
+ ]
+@@ -112,7 +110,6 @@ pbs-tools = { path = "pbs-tools" }
+ # regular crates
+ anyhow = "1.0"
+ async-trait = "0.1.56"
+-apt-pkg-native = "0.3.2"
+ base64 = "0.13"
+ bitflags = "2.4"
+ bytes = "1.0"
+@@ -126,7 +123,6 @@ flate2 = "1.0"
+ foreign-types = "0.3"
+ futures = "0.3"
+ h2 = { version = "0.4", features = [ "stream" ] }
+-handlebars = "3.0"
+ hex = "0.4.3"
+ http = "0.2"
+ hyper = { version = "0.14", features = [ "full" ] }
+@@ -162,139 +158,48 @@ xdg = "2.2"
+ zstd = { version = "0.12", features = [ "bindgen" ] }
+ zstd-safe = "6.0"
+ 
+-[dependencies]
+-anyhow.workspace = true
+-async-trait.workspace = true
+-base64.workspace = true
+-bytes.workspace = true
+-cidr.workspace = true
+-const_format.workspace = true
+-crc32fast.workspace = true
+-crossbeam-channel.workspace = true
+-endian_trait.workspace = true
+-futures.workspace = true
+-h2.workspace = true
+-hex.workspace = true
+-http.workspace = true
+-hyper.workspace = true
+-libc.workspace = true
+-log.workspace = true
+-nix.workspace = true
+-nom.workspace = true
+-num-traits.workspace = true
+-once_cell.workspace = true
+-openssl.workspace = true
+-percent-encoding.workspace = true
+-regex.workspace = true
+-rustyline.workspace = true
+-serde.workspace = true
+-serde_json.workspace = true
+-syslog.workspace = true
+-termcolor.workspace = true
+-thiserror.workspace = true
+-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
+-tokio-openssl.workspace = true
+-tokio-stream.workspace = true
+-tokio-util = { workspace = true, features = [ "codec" ] }
+-tracing.workspace = true
+-udev.workspace = true
+-url.workspace = true
+-walkdir.workspace = true
+-zstd.workspace = true
+-
+-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
+-
+-# proxmox workspace
+-proxmox-apt.workspace = true
+-proxmox-apt-api-types.workspace = true
+-proxmox-async.workspace = true
+-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] }
+-proxmox-compression.workspace = true
+-proxmox-config-digest.workspace = true
+-proxmox-daemon.workspace = true
+-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these
+-proxmox-human-byte.workspace = true
+-proxmox-io.workspace = true
+-proxmox-lang.workspace = true
+-proxmox-log.workspace = true
+-proxmox-ldap.workspace = true
+-proxmox-metrics.workspace = true
+-proxmox-notify = { workspace = true, features = [ "pbs-context" ] }
+-proxmox-openid.workspace = true
+-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
+-proxmox-router = { workspace = true, features = [ "cli", "server"] }
+-proxmox-schema = { workspace = true, features = [ "api-macro" ] }
+-proxmox-section-config.workspace = true
+-proxmox-serde = { workspace = true, features = [ "serde_json" ] }
+-proxmox-shared-cache.workspace = true
+-proxmox-shared-memory.workspace = true
+-proxmox-sortable-macro.workspace = true
+-proxmox-subscription.workspace = true
+-proxmox-sys = { workspace = true, features = [ "timer" ] }
+-proxmox-systemd.workspace = true
+-proxmox-tfa.workspace = true
+-proxmox-time.workspace = true
+-proxmox-uuid.workspace = true
+-proxmox-worker-task.workspace = true
+-
+-# in their respective repo
+-proxmox-acme.workspace = true
+-pxar.workspace = true
+-
+-# proxmox-backup workspace/internal crates
+-pbs-api-types.workspace = true
+-pbs-buildcfg.workspace = true
+-pbs-client.workspace = true
+-pbs-config.workspace = true
+-pbs-datastore.workspace = true
+-pbs-key-config.workspace = true
+-pbs-tape.workspace = true
+-pbs-tools.workspace = true
+-proxmox-rrd.workspace = true
+-proxmox-rrd-api-types.workspace = true
+-
+ # Local path overrides
+ # NOTE: You must run `cargo update` after changing this for it to take effect!
+ [patch.crates-io]
+ 
+ #proxmox-apt = { path = "../proxmox/proxmox-apt" }
+-#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
+-#proxmox-async = { path = "../proxmox/proxmox-async" }
+-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
+-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
+-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
+-#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
++proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
++proxmox-async = { path = "../proxmox/proxmox-async" }
++proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
++proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
++proxmox-compression = { path = "../proxmox/proxmox-compression" }
++proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
+ #proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
+-#proxmox-fuse = { path = "../proxmox-fuse" }
+-#proxmox-http = { path = "../proxmox/proxmox-http" }
+-#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
+-#proxmox-io = { path = "../proxmox/proxmox-io" }
+-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
+-#proxmox-log = { path = "../proxmox/proxmox-log" }
++proxmox-fuse = { path = "../proxmox-fuse" }
++proxmox-http = { path = "../proxmox/proxmox-http" }
++proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
++proxmox-io = { path = "../proxmox/proxmox-io" }
++proxmox-lang = { path = "../proxmox/proxmox-lang" }
++proxmox-log = { path = "../proxmox/proxmox-log" }
+ #proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
+ #proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
+-#proxmox-notify = { path = "../proxmox/proxmox-notify" }
++proxmox-notify = { path = "../proxmox/proxmox-notify" }
+ #proxmox-openid = { path = "../proxmox/proxmox-openid" }
+ #proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
+-#proxmox-router = { path = "../proxmox/proxmox-router" }
++proxmox-router = { path = "../proxmox/proxmox-router" }
+ #proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
+ #proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
+-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
+-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
+-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
+-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
+-#proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
++proxmox-schema = { path = "../proxmox/proxmox-schema" }
++proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
++proxmox-serde = { path = "../proxmox/proxmox-serde" }
++proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
++proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
+ #proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
+-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
+-#proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
++proxmox-sys = { path = "../proxmox/proxmox-sys" }
++proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
+ #proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
+-#proxmox-time = { path = "../proxmox/proxmox-time" }
+-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
+-#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
++proxmox-time = { path = "../proxmox/proxmox-time" }
++proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
++proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
+ 
+ #proxmox-acme = { path = "../proxmox/proxmox-acme" }
+-#pathpatterns = {path = "../pathpatterns" }
+-#pxar = { path = "../pxar" }
++pathpatterns = {path = "../pathpatterns" }
++pxar = { path = "../pxar" }
+ 
+ [features]
+ default = []
+-- 
+2.47.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
deleted file mode 100644
index 1999461ade5a..000000000000
--- a/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f8c26751c51c1618278689d8b3ce94496c579064 Mon Sep 17 00:00:00 2001
-From: Christoph Heiss <christoph@c8h4.io>
-Date: Fri, 10 Feb 2023 23:54:41 +0100
-Subject: [PATCH] docs: Add target path fixup variable
-
-Signed-off-by: Christoph Heiss <christoph@c8h4.io>
----
- docs/Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/docs/Makefile b/docs/Makefile
-index 94130228..f4766a64 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -67,12 +67,13 @@ API_VIEWER_FILES :=							\
- SPHINXOPTS    =
- SPHINXBUILD   = sphinx-build
- BUILDDIR      = output
-+RUSTC_TARGET ?=
- 
- ifeq ($(BUILD_MODE), release)
--COMPILEDIR := ../target/release
-+COMPILEDIR := ../target/$(RUSTC_TARGET)/release
- SPHINXOPTS    += -t release
- else
--COMPILEDIR := ../target/debug
-+COMPILEDIR := ../target/$(RUSTC_TARGET)/debug
- SPHINXOPTS    += -t devbuild
- endif
- 
--- 
-2.40.0
-
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
new file mode 100644
index 000000000000..a052c9b7fba0
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
@@ -0,0 +1,25 @@
+From fbfbc075c7451cda415fc5678cf5bce8bb11dc78 Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Tue, 24 Dec 2024 17:22:35 +0100
+Subject: [PATCH 2/3] docs: Add target path fixup variable
+
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ docs/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index 66da6037..a9939131 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -92,6 +92,7 @@ API_VIEWER_FILES :=							\
+ SPHINXOPTS    = -E
+ SPHINXBUILD   = sphinx-build
+ BUILDDIR      = output
++DEB_HOST_RUST_TYPE ?= $(RUSTC_TARGET)
+ 
+ ifeq ($(BUILD_MODE), release)
+ COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release
+-- 
+2.47.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
new file mode 100644
index 000000000000..4a92350d3ebd
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
@@ -0,0 +1,26 @@
+From 3fc7e2ab65ad6a8af360fafa84b97f551fa1b619 Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Tue, 24 Dec 2024 17:35:40 +0100
+Subject: [PATCH 3/3] cargo: use local patched h2 dependency
+
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ Cargo.toml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index d2014429..54f951c8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -201,6 +201,8 @@ proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
+ pathpatterns = {path = "../pathpatterns" }
+ pxar = { path = "../pxar" }
+ 
++h2 = { path = "./h2" }
++
+ [features]
+ default = []
+ #valgrind = ["valgrind_request"]
+-- 
+2.47.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
index 2412f6a78da6..f7420ac3d37e 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
+++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
@@ -40,35 +40,41 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -85,22 +91,22 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
  "itertools",
  "lazy_static",
  "lazycell",
- "proc-macro2 1.0.81",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.60",
+ "syn 2.0.91",
  "which",
 ]
 
@@ -112,9 +118,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "block-buffer"
@@ -133,19 +139,19 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
+ "shlex",
 ]
 
 [[package]]
@@ -169,15 +175,15 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
  "stacker",
 ]
 
 [[package]]
 name = "clang-sys"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -197,22 +203,22 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "unicode-xid 0.2.4",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "unicode-xid 0.2.6",
 ]
 
 [[package]]
@@ -227,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -291,16 +297,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "either"
-version = "1.11.0"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "email-encoding"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f"
+checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc"
 dependencies = [
  "base64 0.22.1",
  "memchr",
@@ -308,9 +325,9 @@ dependencies = [
 
 [[package]]
 name = "email_address"
-version = "0.2.4"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112"
+checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
 
 [[package]]
 name = "endian-type"
@@ -358,12 +375,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -378,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fd-lock"
@@ -395,21 +412,21 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -447,9 +464,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -462,9 +479,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -472,15 +489,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -489,38 +506,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -546,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -557,9 +574,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -586,6 +603,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "h2"
+version = "0.4.7"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "handlebars"
 version = "3.5.5"
@@ -611,10 +645,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "hashbrown"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hex"
@@ -627,11 +667,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -669,9 +709,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -687,15 +727,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
+ "h2 0.3.26",
  "http",
  "http-body",
  "httparse",
@@ -710,30 +750,159 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -751,33 +920,34 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -787,9 +957,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "lettre"
-version = "0.11.7"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969"
+checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5"
 dependencies = [
  "base64 0.22.1",
  "chumsky",
@@ -812,18 +982,18 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -832,8 +1002,9 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -848,21 +1019,27 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
@@ -896,31 +1073,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -978,37 +1154,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.16.0"
+name = "nu-ansi-term"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
- "hermit-abi",
- "libc",
+ "overload",
+ "winapi",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1023,9 +1199,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
@@ -1036,9 +1212,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -1046,6 +1222,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "pathpatterns"
 version = "0.3.0"
@@ -1061,8 +1243,8 @@ dependencies = [
  "anyhow",
  "const_format",
  "hex",
- "lazy_static",
  "percent-encoding",
+ "proxmox-apt-api-types",
  "proxmox-auth-api",
  "proxmox-human-byte",
  "proxmox-lang",
@@ -1077,28 +1259,25 @@ dependencies = [
 
 [[package]]
 name = "pbs-buildcfg"
-version = "3.2.2"
+version = "3.3.2"
 
 [[package]]
 name = "pbs-client"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "bytes",
  "futures",
- "h2",
+ "h2 0.4.7",
  "hex",
  "http",
  "hyper",
- "lazy_static",
  "libc",
- "log",
  "nix 0.26.4",
  "openssl",
  "pathpatterns",
  "pbs-api-types",
- "pbs-buildcfg",
  "pbs-datastore",
  "pbs-tools",
  "percent-encoding",
@@ -1109,7 +1288,7 @@ dependencies = [
  "proxmox-http",
  "proxmox-human-byte",
  "proxmox-io",
- "proxmox-lang",
+ "proxmox-log",
  "proxmox-router",
  "proxmox-schema",
  "proxmox-sys",
@@ -1132,7 +1311,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "const_format",
- "lazy_static",
  "libc",
  "nix 0.26.4",
  "once_cell",
@@ -1161,7 +1339,6 @@ dependencies = [
  "endian_trait",
  "futures",
  "hex",
- "lazy_static",
  "libc",
  "log",
  "nix 0.26.4",
@@ -1181,12 +1358,15 @@ dependencies = [
  "proxmox-sys",
  "proxmox-time",
  "proxmox-uuid",
+ "proxmox-worker-task",
  "pxar",
  "serde",
  "serde_json",
  "tokio",
+ "tracing",
  "walkdir",
  "zstd",
+ "zstd-safe",
 ]
 
 [[package]]
@@ -1195,7 +1375,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures",
- "lazy_static",
  "libc",
  "log",
  "nix 0.26.4",
@@ -1244,18 +1423,19 @@ name = "pbs-tape"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "endian_trait",
  "hex",
- "lazy_static",
  "libc",
  "log",
  "nix 0.26.4",
  "openssl",
  "pbs-api-types",
+ "pbs-buildcfg",
  "pbs-config",
  "proxmox-io",
  "proxmox-lang",
+ "proxmox-log",
  "proxmox-router",
  "proxmox-schema",
  "proxmox-sys",
@@ -1264,7 +1444,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "udev",
 ]
 
@@ -1273,34 +1453,19 @@ name = "pbs-tools"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
  "bytes",
- "crc32fast",
- "endian_trait",
- "flate2",
  "foreign-types",
- "futures",
  "hex",
- "lazy_static",
  "libc",
- "log",
- "nix 0.26.4",
  "nom",
  "openssl",
- "pbs-api-types",
- "pbs-buildcfg",
  "proxmox-async",
  "proxmox-human-byte",
  "proxmox-io",
- "proxmox-lang",
  "proxmox-sys",
  "proxmox-time",
- "regex",
  "serde_json",
  "tokio",
- "url",
- "walkdir",
- "zstd",
 ]
 
 [[package]]
@@ -1311,20 +1476,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.10"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 2.0.9",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.10"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1332,22 +1497,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.10"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.10"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
  "once_cell",
  "pest",
@@ -1356,9 +1521,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -1368,9 +1533,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "proc-macro2"
@@ -1383,30 +1548,39 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proxmox-api-macro"
-version = "1.0.8"
+version = "1.2.1"
 dependencies = [
  "anyhow",
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+]
+
+[[package]]
+name = "proxmox-apt-api-types"
+version = "1.0.2"
+dependencies = [
+ "proxmox-config-digest",
+ "proxmox-schema",
+ "serde",
+ "serde_plain",
 ]
 
 [[package]]
 name = "proxmox-async"
-version = "0.4.1"
+version = "0.4.3"
 dependencies = [
  "anyhow",
  "futures",
- "lazy_static",
  "pin-utils",
  "proxmox-io",
  "proxmox-lang",
@@ -1415,11 +1589,10 @@ dependencies = [
 
 [[package]]
 name = "proxmox-auth-api"
-version = "0.3.5"
+version = "0.4.6"
 dependencies = [
  "anyhow",
  "const_format",
- "lazy_static",
  "proxmox-schema",
  "regex",
  "serde",
@@ -1428,7 +1601,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-backup"
-version = "3.2.2"
+version = "3.3.2"
 
 [[package]]
 name = "proxmox-backup-banner"
@@ -1445,7 +1618,6 @@ dependencies = [
  "anyhow",
  "futures",
  "hyper",
- "libc",
  "log",
  "nix 0.26.4",
  "openssl",
@@ -1453,20 +1625,20 @@ dependencies = [
  "pbs-api-types",
  "pbs-buildcfg",
  "pbs-client",
- "pbs-config",
  "pbs-datastore",
  "pbs-fuse-loop",
  "pbs-key-config",
  "pbs-pxar-fuse",
  "pbs-tools",
  "proxmox-async",
- "proxmox-fuse",
  "proxmox-human-byte",
  "proxmox-io",
+ "proxmox-log",
  "proxmox-router",
  "proxmox-schema",
  "proxmox-sortable-macro",
  "proxmox-sys",
+ "proxmox-systemd",
  "proxmox-time",
  "pxar",
  "serde",
@@ -1484,7 +1656,7 @@ version = "1.0.1"
 
 [[package]]
 name = "proxmox-compression"
-version = "0.2.1"
+version = "0.2.4"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1502,6 +1674,17 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "proxmox-config-digest"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "proxmox-schema",
+ "serde",
+ "serde_plain",
+]
+
 [[package]]
 name = "proxmox-fuse"
 version = "0.1.7"
@@ -1516,14 +1699,16 @@ dependencies = [
 
 [[package]]
 name = "proxmox-http"
-version = "0.9.1"
+version = "0.9.4"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
  "futures",
  "http",
  "hyper",
+ "native-tls",
  "openssl",
+ "proxmox-compression",
  "proxmox-io",
  "proxmox-lang",
  "proxmox-sys",
@@ -1555,7 +1740,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-io"
-version = "1.0.1"
+version = "1.1.0"
 dependencies = [
  "endian_trait",
  "tokio",
@@ -1563,23 +1748,41 @@ dependencies = [
 
 [[package]]
 name = "proxmox-lang"
-version = "1.1.0"
+version = "1.4.0"
+
+[[package]]
+name = "proxmox-log"
+version = "0.2.7"
+dependencies = [
+ "anyhow",
+ "nix 0.26.4",
+ "proxmox-sys",
+ "proxmox-time",
+ "tokio",
+ "tracing",
+ "tracing-journald",
+ "tracing-log",
+ "tracing-subscriber",
+]
 
 [[package]]
 name = "proxmox-notify"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "anyhow",
+ "base64 0.13.1",
  "const_format",
  "handlebars",
+ "http",
  "lettre",
- "log",
  "openssl",
+ "percent-encoding",
  "proxmox-http",
  "proxmox-http-error",
  "proxmox-human-byte",
  "proxmox-schema",
  "proxmox-section-config",
+ "proxmox-sendmail",
  "proxmox-serde",
  "proxmox-sys",
  "proxmox-time",
@@ -1587,14 +1790,16 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
+ "tracing",
 ]
 
 [[package]]
 name = "proxmox-router"
-version = "2.1.3"
+version = "3.0.0"
 dependencies = [
  "anyhow",
  "env_logger",
+ "futures",
  "http",
  "hyper",
  "libc",
@@ -1602,22 +1807,20 @@ dependencies = [
  "percent-encoding",
  "proxmox-async",
  "proxmox-http-error",
- "proxmox-lang",
  "proxmox-schema",
  "rustyline",
  "serde",
  "serde_json",
- "tokio",
+ "serde_plain",
  "unicode-width",
 ]
 
 [[package]]
 name = "proxmox-schema"
-version = "3.1.0"
+version = "3.2.0"
 dependencies = [
  "anyhow",
  "const_format",
- "lazy_static",
  "proxmox-api-macro",
  "regex",
  "serde",
@@ -1627,7 +1830,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-section-config"
-version = "2.0.1"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "hex",
@@ -1637,9 +1840,19 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "proxmox-sendmail"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base64 0.13.1",
+ "percent-encoding",
+ "proxmox-time",
+]
+
 [[package]]
 name = "proxmox-serde"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1650,7 +1863,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-shared-memory"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "anyhow",
  "libc",
@@ -1662,64 +1875,73 @@ dependencies = [
 name = "proxmox-sortable-macro"
 version = "0.1.3"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "proxmox-sys"
-version = "0.5.3"
+version = "0.6.5"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
- "lazy_static",
  "libc",
  "log",
  "nix 0.26.4",
+ "openssl",
  "proxmox-io",
  "proxmox-lang",
- "proxmox-time",
  "regex",
  "serde",
  "serde_json",
 ]
 
+[[package]]
+name = "proxmox-systemd"
+version = "0.1.0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "proxmox-time"
-version = "1.1.6"
+version = "2.0.3"
 dependencies = [
  "anyhow",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "js-sys",
- "lazy_static",
  "libc",
  "nom",
 ]
 
 [[package]]
 name = "proxmox-uuid"
-version = "1.0.2"
+version = "1.0.3"
 dependencies = [
  "js-sys",
- "libc",
  "serde",
 ]
 
+[[package]]
+name = "proxmox-worker-task"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+]
+
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "pxar"
-version = "0.10.2"
+version = "0.12.1"
 dependencies = [
- "bitflags 1.3.2",
  "endian_trait",
  "libc",
  "siphasher",
@@ -1732,13 +1954,14 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures",
- "log",
  "nix 0.26.4",
  "pathpatterns",
+ "pbs-api-types",
  "pbs-client",
  "pbs-pxar-fuse",
- "pbs-tools",
  "proxmox-async",
+ "proxmox-human-byte",
+ "proxmox-log",
  "proxmox-router",
  "proxmox-schema",
  "proxmox-sys",
@@ -1764,18 +1987,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
- "proc-macro2 1.0.81",
+ "proc-macro2 1.0.92",
 ]
 
 [[package]]
 name = "quoted_printable"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0"
+checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
 
 [[package]]
 name = "radix_trie"
@@ -1789,29 +2012,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1821,9 +2044,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1832,30 +2055,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -1865,36 +2073,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
@@ -1905,30 +2099,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.5.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 
 [[package]]
 name = "rustyline"
@@ -1956,9 +2138,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -1971,11 +2153,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1986,11 +2168,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -1999,9 +2181,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2009,31 +2191,32 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -2058,6 +2241,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -2102,31 +2294,31 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "spin"
-version = "0.9.8"
+name = "stable_deref_trait"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2135,12 +2327,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
 [[package]]
 name = "syn"
 version = "0.12.15"
@@ -2154,20 +2340,31 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "unicode-ident",
 ]
 
 [[package]]
-name = "tar"
-version = "0.4.40"
+name = "synstructure"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
@@ -2176,14 +2373,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2208,75 +2406,98 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+dependencies = [
+ "thiserror-impl 2.0.9",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.6.0"
+name = "thiserror-impl"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
 dependencies = [
- "tinyvec_macros",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
+name = "thread_local"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
 name = "tokio-openssl"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d"
+checksum = "59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd"
 dependencies = [
- "futures-util",
  "openssl",
  "openssl-sys",
  "tokio",
@@ -2284,9 +2505,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2295,41 +2516,89 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
-name = "tracing-core"
-version = "0.1.32"
+name = "tracing-attributes"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-journald"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657"
+dependencies = [
+ "libc",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+dependencies = [
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -2346,9 +2615,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "udev"
@@ -2360,17 +2629,11 @@ dependencies = [
  "libudev-sys",
 ]
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-linebreak"
@@ -2378,26 +2641,17 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
@@ -2407,39 +2661,29 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "ureq"
-version = "2.9.7"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64 0.22.1",
- "flate2",
  "log",
+ "native-tls",
  "once_cell",
- "rustls",
  "rustls-native-certs",
- "rustls-pki-types",
- "rustls-webpki",
  "url",
- "webpki-roots",
 ]
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2447,10 +2691,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "utf8parse"
-version = "0.2.1"
+name = "utf16_iter"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "vcpkg"
@@ -2460,9 +2722,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
@@ -2491,66 +2753,57 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
- "quote 1.0.36",
+ "quote 1.0.37",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
-dependencies = [
- "rustls-pki-types",
-]
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "which"
@@ -2582,11 +2835,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2602,7 +2855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
  "windows-core",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2611,7 +2864,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2629,7 +2882,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2649,18 +2911,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -2671,9 +2933,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -2683,9 +2945,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -2695,15 +2957,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -2713,9 +2975,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -2725,9 +2987,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -2737,9 +2999,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -2749,9 +3011,21 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "xattr"
@@ -2771,30 +3045,91 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
-name = "zerocopy"
-version = "0.7.32"
+name = "yoke"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
- "proc-macro2 1.0.81",
- "quote 1.0.36",
- "syn 2.0.60",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
 ]
 
 [[package]]
-name = "zeroize"
-version = "1.7.0"
+name = "zerofrom"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.91",
+]
 
 [[package]]
 name = "zstd"
@@ -2817,27 +3152,11 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "bindgen",
  "cc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "proxmox-apt"
-version = "0.10.9"
-
-[[patch.unused]]
-name = "proxmox-rest-server"
-version = "0.5.2"
-
-[[patch.unused]]
-name = "proxmox-subscription"
-version = "0.4.3"
-
-[[patch.unused]]
-name = "proxmox-tfa"
-version = "4.1.2"
diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
index c6cde45e9859..540d9b5ae08d 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/package.nix
+++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchgit,
+  fetchFromGitHub,
   rustPlatform,
   pkg-config,
   pkgconf,
@@ -12,6 +13,7 @@
   git,
   installShellFiles,
   sphinx,
+  systemd,
   stdenv,
   fetchpatch,
   testers,
@@ -20,22 +22,20 @@
 
 let
   pname = "proxmox-backup-client";
-  version = "3.2.2";
+  version = "3.3.2";
 
   proxmox-backup_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox-backup.git";
-    rev = "v${version}";
+    rev = "ed8bc69a50301ad420366d8431a7891b4992408d"; # no version tag unfortunately
     name = "proxmox-backup";
-    hash = "sha256-9rzUGaUoc87VkB4XJUwI0BjuvxdemE6fjTIR7VRp55Y=";
+    hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y=";
   };
 
-  # Same revision as used in
-  # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=proxmox-backup-client
   proxmox_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox.git";
-    rev = "863d7603403405ccbf8e841b875bf3c9a7a76116";
+    rev = "df6b705f564ff145faa14770db6493bc5da8cab3";
     name = "proxmox";
-    hash = "sha256-aSBT0TGhmM7QDux4gDY1k4HQhAMNWvxX+IVIsq6KeuM=";
+    hash = "sha256-6fQVK+G5FMPy+29hScMkvQ+MQQryYs8f8oooq1YGXbg=";
   };
 
   proxmox-fuse_src = fetchgit {
@@ -47,9 +47,9 @@ let
 
   proxmox-pxar_src = fetchgit {
     url = "git://git.proxmox.com/git/pxar.git";
-    rev = "675ecff32fbeff0973eaea016c4b8f3877015adb";
+    rev = "410f326a08ef6c08141af5c7431beb2e16f0c666"; # 0.12.1
     name = "pxar";
-    hash = "sha256-P5fblRCFq7NI1UkP/jkg38bamM1yuJYX+YhCKPgS15Y=";
+    hash = "sha256-USvtrWTbP3VUiy9MB9Ym6s4wXBNZ4Ooyg4MRDwRVOtU=";
   };
 
   proxmox-pathpatterns_src = fetchgit {
@@ -59,7 +59,16 @@ let
     hash = "sha256-717XSlvQdvP0Q516fEx04rsrLCk3QI8frTD5NMmkSr4=";
   };
 
-  aurPatchCommit = "12c04aa14ee09cb3dafcbe193da9d36a6809695d";
+  # needs a patched version
+  h2_src = fetchFromGitHub {
+    name = "h2";
+    owner = "hyperium";
+    repo = "h2";
+    rev = "v0.4.7";
+    hash = "sha256-GcO4321Jqt1w7jbvQKd0GXIjptyz+tlN2SuxHoBJ/9k=";
+  };
+
+  aurPatchCommit = "6f83f58d54bc7186211d0cfa637c652b13e0dfee";
 in
 
 rustPlatform.buildRustPackage {
@@ -71,6 +80,7 @@ rustPlatform.buildRustPackage {
     proxmox-fuse_src
     proxmox-pxar_src
     proxmox-pathpatterns_src
+    h2_src
   ];
 
   sourceRoot = proxmox-backup_src.name;
@@ -81,27 +91,32 @@ rustPlatform.buildRustPackage {
     # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or
     # Debian packages). This patch redirects all these dependencies to a local, relative path, which
     # works in combination with the other three repos being checked out.
-    (fetchpatch {
-      name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=${aurPatchCommit}";
-      hash = "sha256-YOlC8A1FKIbNY9+q6n/gDV0efHx2i3kwsmIdZcYhf80=";
-    })
+    ./0001-cargo-re-route-dependencies-not-available-on-crates..patch
+    # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due
+    # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`.
+    # This patch simply fixes that up.
+    ./0002-docs-Add-target-path-fixup-variable.patch
+    # Need to use a patched version of the `h2` crate (with a downgraded dependency, see also postPatch).
+    # This overrides it in the Cargo.toml as needed.
+    ./0003-cargo-use-local-patched-h2-dependency.patch
     # This patch prevents the generation of the man-pages for other components inside the repo,
     # which would require them too be built too. Thus avoid wasting resources and just skip them.
     (fetchpatch {
       name = "0002-docs-drop-all-but-client-man-pages.patch";
       url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}";
-      hash = "sha256-vUGDBx+g05ipL+boY9DaWDAMmstY1IDZs5nILbCIBLY=";
+      hash = "sha256-AlIGfJZGaZl2NBVfuFxpDL6bgyvXA2Wcz7UWSrnQa24=";
     })
-    # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due
-    # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`.
-    # This patch simply fixes that up.
-    ./0001-docs-Add-target-path-fixup-variable.patch
   ];
 
   postPatch = ''
+    # need to downgrade the `http` crate for `h2`
+    # see https://aur.archlinux.org/cgit/aur.git/tree/0003-cargo-downgrade-http-to-0.2.12.patch?h=proxmox-backup-client
+    cp -r ../h2 .
+    chmod u+w ./h2
+    (cd h2 && sed -i 's/^http = "1"$/http = "0.2.12"/' Cargo.toml)
+
     cp ${./Cargo.lock} Cargo.lock
-    rm .cargo/config
+    rm .cargo/config.toml
   '';
 
   postBuild = ''
@@ -152,6 +167,7 @@ rustPlatform.buildRustPackage {
     libuuid
     acl
     libxcrypt
+    systemd.dev
   ];
 
   passthru.tests.version = testers.testVersion {
@@ -162,7 +178,7 @@ rustPlatform.buildRustPackage {
   meta = with lib; {
     description = "Command line client for Proxmox Backup Server";
     homepage = "https://pbs.proxmox.com/docs/backup-client.html";
-    changelog = "https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=debian/changelog;hb=refs/tags/v${version}";
+    changelog = "https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=debian/changelog;hb=${proxmox-backup_src.rev}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [
       cofob

From 1c5316a00d6a62dbdca0d34e81abf90a6db15d7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 21:48:31 +0000
Subject: [PATCH 0369/1504] micronaut: 4.7.2 -> 4.7.3

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

diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix
index 8341e2ada417..74392e4a4db2 100644
--- a/pkgs/by-name/mi/micronaut/package.nix
+++ b/pkgs/by-name/mi/micronaut/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.7.2";
+  version = "4.7.3";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-oyLJ3PGXT7/PDtXiPl0vX/jhaaYavwtoxuFPRLdGV8w=";
+    sha256 = "sha256-rCGJnZ+WD0chYVa6XqkhHJqJUQKw2K+AebzYSftAsOk=";
   };
 
   nativeBuildInputs = [

From 83c72c7305c29d6ea6d023568484e8a51d77ecdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 21:48:59 +0000
Subject: [PATCH 0370/1504] nsc: 2.10.1 -> 2.10.2

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

diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix
index a9fd24309c11..c699118ca75e 100644
--- a/pkgs/by-name/ns/nsc/package.nix
+++ b/pkgs/by-name/ns/nsc/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "nsc";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-8HFlWrkDgekW/0IV9LQdn68vygFq0QtR6p4xyJZwAw4=";
+    hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE=";
   };
 
   ldflags = [
@@ -47,7 +47,7 @@ buildGoModule rec {
   # the test strips table formatting from the command output in a naive way
   # that removes all the table characters, including '-'.
   # The nix build directory looks something like:
-  # /private/tmp/nix-build-nsc-2.10.1.drv-0/nsc_test2000598938/keys
+  # /private/tmp/nix-build-nsc-2.10.2.drv-0/nsc_test2000598938/keys
   # Then the `-` are removed from the path unintentionally and the test fails.
   # This should be fixed upstream to avoid mangling the path when
   # removing the table decorations from the command output.

From 870d582592bcfe4a33dbe42d3480a0fa51d77c5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 21:49:38 +0000
Subject: [PATCH 0371/1504] likwid: 5.4.0 -> 5.4.1

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

diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix
index b3a323f592a9..37821264d625 100644
--- a/pkgs/by-name/li/likwid/package.nix
+++ b/pkgs/by-name/li/likwid/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "likwid";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchurl {
     url = "https://ftp.fau.de/pub/likwid/likwid-${version}.tar.gz";
-    hash = "sha256-DytnHGnKqZP+20gYezvcyUwiQA7ITJJv0ImNv/aKoD4=";
+    hash = "sha256-V3OFFFXbukieLjc1kx5RVHN3zReWyYKlrIjQ8imcCBE=";
   };
 
   nativeBuildInputs = [ perl ];

From 422e761b67dce6bffded934153c5cc6f99ce9987 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Tue, 24 Dec 2024 23:00:24 +0100
Subject: [PATCH 0372/1504] proxmox-backup-client: switch to versionCheckHook

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/pr/proxmox-backup-client/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
index 540d9b5ae08d..2ba4618160d0 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/package.nix
+++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix
@@ -16,8 +16,7 @@
   systemd,
   stdenv,
   fetchpatch,
-  testers,
-  proxmox-backup-client,
+  versionCheckHook,
 }:
 
 let
@@ -170,10 +169,9 @@ rustPlatform.buildRustPackage {
     systemd.dev
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = proxmox-backup-client;
-    command = "${pname} version";
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = [ "version" ];
 
   meta = with lib; {
     description = "Command line client for Proxmox Backup Server";

From 20a6e0c6ca89acea7f5208969e8515060dc52d25 Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Tue, 24 Dec 2024 21:22:59 +0000
Subject: [PATCH 0373/1504] newlib: 4.3.0.20230120 -> 4.4.0.20231231

This update allows newlib to compile with GCC 14, which in turn fixes
the cross-compilers which use newlib for their libc (for example,
`pkgsCross.riscv64-embedded.buildPackages.gcc`).
---
 pkgs/development/misc/newlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index ee34f56ebb5c..e891cf39dc3a 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newlib";
-  version = "4.3.0.20230120";
+  version = "4.4.0.20231231";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/newlib/newlib-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-g6Yqma9Z4465sMWO0JLuJNcA//Q6IsA+QzlVET7zUVA=";
+    sha256 = "sha256-DBZqOeG/CVHfr81olJ/g5LbTZYCB1igvOa7vxjEPLxM=";
   };
 
   patches = lib.optionals nanoizeNewlib [

From 247d47909ab1e7790a613a66712a654d0cc55aaf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 22:59:22 +0000
Subject: [PATCH 0374/1504] grml-zsh-config: 0.19.8 -> 0.19.11

---
 pkgs/by-name/gr/grml-zsh-config/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
index a8ec04dfc939..fb15cd901012 100644
--- a/pkgs/by-name/gr/grml-zsh-config/package.nix
+++ b/pkgs/by-name/gr/grml-zsh-config/package.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, lib, zsh, coreutils, inetutils, procps, txt2tags }:
 stdenv.mkDerivation rec {
   pname = "grml-zsh-config";
-  version = "0.19.8";
+  version = "0.19.11";
 
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
     rev = "v${version}";
-    sha256 = "sha256-Tx9u0mH3hFYmyKGAmI5lLxrau/tmE9/BaU43gSr7iFw=";
+    sha256 = "sha256-plVyzuVFw7wxFlhfCCjZe2QqkytTgUvsxrIdB7nv66g=";
   };
 
   strictDeps = true;

From 1ed6811f3a508ef4b827a5f754b8ee13a9052a03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 00:22:14 +0000
Subject: [PATCH 0375/1504] python312Packages.berkeleydb: 18.1.10 -> 18.1.12

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

diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix
index efb065b17194..b82658ed4b8c 100644
--- a/pkgs/development/python-modules/berkeleydb/default.nix
+++ b/pkgs/development/python-modules/berkeleydb/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "berkeleydb";
-  version = "18.1.10";
+  version = "18.1.12";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QmNBoWAHqQAtmHpvTZcib46v/8saBIhIgFPTijEnyBo=";
+    hash = "sha256-SVqBecajayLQ+i9ogfp4PPdSIUooV2BSlgX2CBAd6yg=";
   };
 
   build-system = [ setuptools ];

From 89e79d58769436a8cfd0d80ae28012d51134f2f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 00:34:55 +0000
Subject: [PATCH 0376/1504] bazarr: 1.4.5 -> 1.5.0

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

diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index d08dfe0e14a9..0e4cc9c4e9c0 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bazarr";
-  version = "1.4.5";
+  version = "1.5.0";
 
   src = fetchzip {
     url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    hash = "sha256-BV+ON+SavPc0ZUlIk6tlsvmWub8TiYSSJSRutZb1q+g=";
+    hash = "sha256-Q/KlqvVWhegSxkxHls0WwCClaQwkmLAfuzfi3X4xgAY=";
     stripRoot = false;
   };
 

From 73a527ae79c8450aa9b29b7235874d672837590d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 00:49:51 +0000
Subject: [PATCH 0377/1504] eclint: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/ec/eclint/package.nix b/pkgs/by-name/ec/eclint/package.nix
index 6480efde0136..3928cb5ef5b9 100644
--- a/pkgs/by-name/ec/eclint/package.nix
+++ b/pkgs/by-name/ec/eclint/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "eclint";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitLab {
     owner = "greut";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-x0dBiRHaDxKrTCR2RfP2/bpBo6xewu8FX7Bv4ugaUAY=";
+    hash = "sha256-XY+D0bRIgWTm2VH+uDVodYeyGeu+8Xyyq4xDvTDLii4=";
   };
 
-  vendorHash = "sha256-aNQuALDe37lsmTGpClIBOQJlL0NFSAZCgcmTjx0kP+U=";
+  vendorHash = "sha256-4bka3GRl75aUYpZrWuCIvKNwPY8ykp25e+kn+G6JQ/I=";
 
   ldflags = [ "-X main.version=${version}" ];
 

From 429a95e3c5071f11487d59048945276b54ce3425 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 01:44:07 +0000
Subject: [PATCH 0378/1504] plumber: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix
index febd8ca76fb4..1c838f2456db 100644
--- a/pkgs/by-name/pl/plumber/package.nix
+++ b/pkgs/by-name/pl/plumber/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "plumber";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "streamdal";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-38tLlFeQtXIiHuQa9c/IfIYbyf+GrOsERAdWQnHSeck=";
+    hash = "sha256-0pyeCTkmS7gG51Xm4Gc62p+I5DRUA2F9tPHaZjO+/WE=";
   };
 
   vendorHash = null;

From dcc61ce6d89d816097f5c96f357b7e85cb4e6e1b Mon Sep 17 00:00:00 2001
From: Bartosz Wojno <bartoszwjn@gmail.com>
Date: Wed, 25 Dec 2024 04:06:52 +0100
Subject: [PATCH 0379/1504] worldofgoo: don't strip debug symbols

The program fails to launch without this.
---
 pkgs/by-name/wo/worldofgoo/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wo/worldofgoo/package.nix b/pkgs/by-name/wo/worldofgoo/package.nix
index e4b3ddf5a5b2..646a4975ec8c 100644
--- a/pkgs/by-name/wo/worldofgoo/package.nix
+++ b/pkgs/by-name/wo/worldofgoo/package.nix
@@ -73,6 +73,8 @@ stdenv.mkDerivation rec {
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath $out/bin/WorldOfGoo.bin.${arch}
   '';
 
+  dontStrip = true;
+
   meta = with lib; {
     description = "Physics based puzzle game";
     longDescription = ''

From 5c165277e629e5f0f9bf26eba488b7e2ecd7965b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 03:46:05 +0000
Subject: [PATCH 0380/1504] python312Packages.croniter: 3.0.3 -> 6.0.0

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

diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 2437785db5b2..5492e118943f 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "croniter";
-  version = "3.0.3";
+  version = "6.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NBF+wXQfEKe9DsOtfY8OuPpFei/rm+MuaiJQ4ViVdmg=";
+    hash = "sha256-N8UEsxOVYRSpg+ziwrB3kLHxCU/p2BzJRzkhR0glVXc=";
   };
 
   nativeBuildInputs = [ setuptools ];

From e32ee3259a7e6627373406ee899fe9cbb834ea5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 04:26:56 +0000
Subject: [PATCH 0381/1504] python312Packages.bokeh: 3.6.0 -> 3.6.2

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

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index f53d8396c6e0..9ed21c339dee 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -46,14 +46,14 @@
 buildPythonPackage rec {
   pname = "bokeh";
   # update together with panel which is not straightforward
-  version = "3.6.0";
+  version = "3.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ADLcHnatCXsHYm5RWEaF/0jGVIH7qq0QVmOxBGFlhno=";
+    hash = "sha256-LzBD2eyz1dwujA6/itVXJ2FxiNTlNPPnIIs2NX41I5Y=";
   };
 
   src_test = fetchFromGitHub {

From 1feb816127ff2f7ff2a92ba8ae32d788e21a2599 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 04:52:45 +0000
Subject: [PATCH 0382/1504] libvpl: 2.13.0 -> 2.14.0

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

diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix
index 695f7ab3d49f..25304bc909e1 100644
--- a/pkgs/by-name/li/libvpl/package.nix
+++ b/pkgs/by-name/li/libvpl/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libvpl";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libvpl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-H+pRdpk1B/QgsXaTxhQfm3JW5Plgz4esrUV1kKfjY1s=";
+    hash = "sha256-51kl9w1xqldQXGWbk6bveS2jMZWQOz/gYP/hPXDk/7M=";
   };
 
   nativeBuildInputs = [

From 1cf301833050858627f3eb7e7510c7edb726fb12 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:30:42 +0100
Subject: [PATCH 0383/1504] python312Packages.archinfo: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index a3047f14ef87..9eb5be283c87 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-opIQm/59X+5PDJiFW8SkB0CrFkICBTgbNW8ZUXMfrnw=";
+    hash = "sha256-3NfiK75RyEFz2Pe+NPLMrbyvwgZxD7fKCGg4o8SpO40=";
   };
 
   build-system = [ setuptools ];

From f5e1da29af5022044aa49b3401eaaed08e913f92 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:31:06 +0100
Subject: [PATCH 0384/1504] python312Packages.ailment: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 3212fd2c284a..c6a3381ca2fb 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3yNMrIQWW+pvwfGzox1rHLXzfY3Y6jjU8YFdrZgMePA=";
+    hash = "sha256-ev3/5TNj7bK0T9ouWVdA6PXqEiC+KFwtM35QD9BIyJs=";
   };
 
   build-system = [ setuptools ];

From c9c5d2b68d9db3df4d1d710d9c8c2949b286e523 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:32:51 +0100
Subject: [PATCH 0385/1504] python312Packages.pyvex: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index cd719047b6a7..1a1fc99ac3d4 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uFoMI8byPyjwpQhruh8Hpk9MF8PZBkTvqbXemUHDWqs=";
+    hash = "sha256-uskSojAEE+9pQD4531+L5OkgRIAtxwvE4/7AZnlkiBI=";
   };
 
   build-system = [ setuptools ];

From 088b668f2cb9839f67b5f4f8abfde9f89896ebd0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:34:17 +0100
Subject: [PATCH 0386/1504] python312Packages.claripy: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 993a8ecd4b83..6b4c1ea360b9 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Fdeh0wr7hPa6SG7UG5Ue58W3x7JYD97NAU29FFklLcA=";
+    hash = "sha256-jz7eF01dYOsa/f6ssAwBK66LGxBXozG075yEllq8j9Y=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From d69ae91df29b1d2a25440a29ca7b0d748cba1288 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:36:09 +0100
Subject: [PATCH 0387/1504] python312Packages.cle: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 26d273b793f9..77ad1bd24587 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,14 +16,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.133";
+  version = "9.2.134";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+vAD9XvqV45wf7sf+VuhTbw2gFeJra5gBptfg8r8e8U=";
+    hash = "sha256-2C4vA8lRLLcfwqGoQ3dqV1kGGtlKx2sgSOKy1QqsEVY=";
   };
 in
 buildPythonPackage rec {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-R57Qd04/xtDW7/WDcZpOhkYOBCSmBNq2Bn3BYDfjseA=";
+    hash = "sha256-0txid9qiNMEBemSphwok5Gkk3NJvzWSIlvrqFnre5TA=";
   };
 
   build-system = [ setuptools ];

From 92f6de17476dc717dacb5f2ee20bb41353082177 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:58:41 +0100
Subject: [PATCH 0388/1504] python311Packages.angr: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 4d74eae25fc9..d24131f42230 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dHksVhuQUC0f55WNPSkVHTXTGVuul742LeWSz0CTwrw=";
+    hash = "sha256-wBneJJ+kR99hNHf0Ki1U6CS9pru60wiwIGV26JC8lWU=";
   };
 
   postPatch = ''

From 7438a7b794f92b2469cf25e92f3ba5581eed6e42 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 25 Dec 2024 19:41:20 +0800
Subject: [PATCH 0389/1504] gradm: 3.1-202102241600 -> 3.1-202111052217

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

diff --git a/pkgs/by-name/gr/gradm/package.nix b/pkgs/by-name/gr/gradm/package.nix
index 0197e3ded81c..d92f7c90119c 100644
--- a/pkgs/by-name/gr/gradm/package.nix
+++ b/pkgs/by-name/gr/gradm/package.nix
@@ -7,25 +7,26 @@
   pam,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gradm";
-  version = "3.1-202102241600";
+  version = "3.1-202111052217";
 
   src = fetchurl {
-    url = "https://grsecurity.net/stable/${pname}-${version}.tar.gz";
-    sha256 = "02ni34hpggv00140p9gvh0lqi173zdddd2qhfi96hyr1axd5pl50";
+    url = "https://grsecurity.net/stable/gradm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-JFkpDzZ6R8ihzk6i7Ag1l5nqM9wV7UQ2Q5WWzogoT7k=";
   };
 
   nativeBuildInputs = [
     bison
     flex
   ];
+
   buildInputs = [ pam ];
 
   enableParallelBuilding = true;
 
   makeFlags = [
-    "DESTDIR=$(out)"
+    "DESTDIR=${placeholder "out"}"
     "LEX=${flex}/bin/flex"
     "MANDIR=/share/man"
     "MKNOD=true"
@@ -48,14 +49,14 @@ stdenv.mkDerivation rec {
 
   postInstall = "rmdir $out/dev";
 
-  meta = with lib; {
+  meta = {
     description = "grsecurity RBAC administration and policy analysis utility";
     homepage = "https://grsecurity.net";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       thoughtpolice
       joachifm
     ];
   };
-}
+})

From 0f05cd43aafd9f258880c156b921d4d0ab7b77ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 13:46:11 +0000
Subject: [PATCH 0390/1504] paper-age: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix
index 4d0332000bd4..0db8af43493c 100644
--- a/pkgs/by-name/pa/paper-age/package.nix
+++ b/pkgs/by-name/pa/paper-age/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "paper-age";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "matiaskorhonen";
     repo = "paper-age";
     rev = "v${version}";
-    hash = "sha256-XnJSsxWe4/NLOqBjU7++bwLtVfIR9n8hpBxL3K8Bmho=";
+    hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg=";
   };
 
-  cargoHash = "sha256-808+lQxjE9dxgNZm/FuZwFuBFJgx/7kCpNn+FrMvuoY=";
+  cargoHash = "sha256-FmtExP4M6MiKNlekNZZRGs6Y/AY+OQrHC7dmkxkyPQQ=";
 
   meta = with lib; {
     description = "Easy and secure paper backups of secrets";

From 40effac24bad6f1f3bcfb326fb2226477c728776 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 25 Dec 2024 21:58:28 +0800
Subject: [PATCH 0391/1504] aerogramme: re-enable build

---
 pkgs/by-name/ae/aerogramme/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix
index a8643ba1b6cf..b28ebe1eb61c 100644
--- a/pkgs/by-name/ae/aerogramme/package.nix
+++ b/pkgs/by-name/ae/aerogramme/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchgit {
     url = "https://git.deuxfleurs.fr/Deuxfleurs/aerogramme/";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ER+P/XGqNzTLwDLK5EBZq/Dl29ZZKl2FdxDb+oLEJ8Y=";
   };
 
@@ -20,16 +20,8 @@ rustPlatform.buildRustPackage rec {
     ./0001-update-time-rs.patch
   ];
 
-  # must use our own Cargo.lock due to git dependencies
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "imap-codec-2.0.0" = "sha256-o64Q74Q84xLRfU4K4JtcjyS0J8mfoApvUs9siscd0RA=";
-      "imap-flow-0.1.0" = "sha256-IopxybuVt5OW6vFiw/4MxojzaNZrKu2xyfaX6F8IYlA=";
-      "k2v-client-0.0.4" = "sha256-V71FCIsgK3VStFOzVntm8P0vXRobF5rQ74qar+cKyik=";
-      "smtp-message-0.1.0" = "sha256-FoSakm3D1xg1vefLf/zkyvzsij1G0QstK3CRo+LbByE=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-GPj8qhfKgfAadQD9DJafN4ec8L6oY62PS/w/ljkPHpw=";
 
   # disable network tests as Nix sandbox breaks them
   doCheck = false;
@@ -50,6 +42,5 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ supinie ];
     mainProgram = "aerogramme";
     platforms = lib.platforms.linux;
-    broken = true; # https://github.com/rust-lang/rust/issues/129811
   };
 }

From e6a2ac9fdc0b04afae5bd78ce8dc7a46b5d06636 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 14:36:08 +0000
Subject: [PATCH 0392/1504] python312Packages.pytask: 0.5.1 -> 0.5.2

---
 pkgs/development/python-modules/pytask/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytask/default.nix b/pkgs/development/python-modules/pytask/default.nix
index 260b9634b311..17336a59d6b9 100644
--- a/pkgs/development/python-modules/pytask/default.nix
+++ b/pkgs/development/python-modules/pytask/default.nix
@@ -25,15 +25,15 @@
 }:
 buildPythonPackage rec {
   pname = "pytask";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "pytask-dev";
     repo = "pytask";
-    rev = "v${version}";
-    hash = "sha256-b+sS+l0Rp5bb8Dh6UBv3xHYTYKFp3dD5AuLqxB3n6Go=";
+    tag = "v${version}";
+    hash = "sha256-YJouWQ9Edj27nD72m7EDSH9TXcrsu6X+pGDo5fgGU5U=";
   };
 
   build-system = [

From bd7512fd1bbc355c3fd71c6c3160371b694926b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 15:12:38 +0000
Subject: [PATCH 0393/1504] todo-txt-cli: 2.12.0 -> 2.13.0

---
 pkgs/by-name/to/todo-txt-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/to/todo-txt-cli/package.nix b/pkgs/by-name/to/todo-txt-cli/package.nix
index 926264480beb..29c2d2487f6e 100644
--- a/pkgs/by-name/to/todo-txt-cli/package.nix
+++ b/pkgs/by-name/to/todo-txt-cli/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
 }:
 let
-  version = "2.12.0";
+  version = "2.13.0";
 in
 stdenv.mkDerivation {
   pname = "todo.txt-cli";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
-    sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6";
+    sha256 = "sha256-07klQ0ApqsISITwQP7ZXOk+WDHTdRno++sm9mv6J0V8=";
   };
 
   installPhase = ''

From 7e119192304c528e8a283701eae8cd6b029abbf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 15:58:51 +0000
Subject: [PATCH 0394/1504] python312Packages.python-osc: 1.9.0 -> 1.9.3

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

diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix
index bb388ab450db..d96fa71747b2 100644
--- a/pkgs/development/python-modules/python-osc/default.nix
+++ b/pkgs/development/python-modules/python-osc/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "python-osc";
-  version = "1.9.0";
+  version = "1.9.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_osc";
     inherit version;
-    hash = "sha256-q1D2axoZ79W/9yLyarZFDfGc3YS6ho8IyaM+fHhRRFY=";
+    hash = "sha256-vQ+kDe9DzlCYlHCf6w4Y8CGSrKGSxebI/iumnljyF5Q=";
   };
 
   build-system = [ setuptools ];

From d77da17f0c54e99a0ad37bf7d6d43749600369bd Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Wed, 25 Dec 2024 17:22:45 +0100
Subject: [PATCH 0395/1504] stellarium: 24.3 -> 24.4

https://github.com/Stellarium/stellarium/releases/tag/v24.4
---
 .../science/astronomy/stellarium/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e970cfc16b34..54728665daea 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -28,20 +28,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stellarium";
-  version = "24.3";
+  version = "24.4";
 
   src = fetchFromGitHub {
     owner = "Stellarium";
     repo = "stellarium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-shDp2tCOynMiEuTSx4TEK8V9h3EsMDq+kkZFhldrinM=";
+    hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA=";
   };
 
   patches = [
-    # Compatibility with INDI 2.0 series from https://github.com/Stellarium/stellarium/pull/3269
+    # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025
     (fetchpatch {
-      url = "https://github.com/Stellarium/stellarium/commit/31fd7bebf33fa710ce53ac8375238a24758312bc.patch";
-      hash = "sha256-eJEqqitZgtV6noeCi8pDBYMVTFIVWXZU1fiEvoilX8o=";
+      url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch";
+      hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A=";
     })
   ];
 

From e096f35165e77947d1bbf69d8dbdea2759d0ab64 Mon Sep 17 00:00:00 2001
From: merrkry <merrkry@tsubasa.moe>
Date: Wed, 25 Dec 2024 17:50:58 +0100
Subject: [PATCH 0396/1504] tsukimi: 0.17.3 -> 0.18.0

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

diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index a9ebde1eb854..24439218b890 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -15,18 +15,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tsukimi";
-  version = "0.17.3";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "tsukinaha";
     repo = "tsukimi";
     rev = "v${version}";
-    hash = "sha256-2AmDP4R06toNrtjV0HSO+Fj8mrXbLgC7bMQPvl10un0=";
+    hash = "sha256-JHB1D94ymVjP3PEHZ4fTT4c6VOEkFgSdpanzs1AzJUc=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3xu4h9ZHlqnaB6Pgn2ixyBF3VS6OF8ZkLaNU4unir7A=";
+  cargoHash = "sha256-Gh9CPQ73+EpwZTixgQpV4rSwZnedVHQwZRlLQXr8EUo=";
 
   nativeBuildInputs = [
     pkg-config

From ee0d700741418f8f5417e81b9df25106e8eab8ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 18:00:50 +0000
Subject: [PATCH 0397/1504] python312Packages.nbsphinx: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix
index c819eee79ab6..633fc72c0ed3 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "nbsphinx";
-  version = "0.9.5";
+  version = "0.9.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-c2kW57Daso/JBPSprjtTqaUMKfzMYynAUvzHSFq88rc=";
+    hash = "sha256-wrKKLXAvEVmpW4Q4MXmOhuYKF/xke5v/m6FYU1XeVOM=";
   };
 
   build-system = [ setuptools ];

From 5828a0500a543a16df6d18d144d96d103dd76bc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 18:07:05 +0000
Subject: [PATCH 0398/1504] python312Packages.pyaprilaire: 0.7.6 -> 0.7.7

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

diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix
index c9a2212a0715..4df4f7be7393 100644
--- a/pkgs/development/python-modules/pyaprilaire/default.nix
+++ b/pkgs/development/python-modules/pyaprilaire/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyaprilaire";
-  version = "0.7.6";
+  version = "0.7.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chamberlain2007";
     repo = "pyaprilaire";
     tag = version;
-    hash = "sha256-7jTV0F7g6IMsBUYk1GMakyvQ66k7glOUNWv6tdKjdnQ=";
+    hash = "sha256-1cTbmpRB4PzjqCPmHULLVEs7r7IWxIglnHkXsLksp0I=";
   };
 
   build-system = [ setuptools ];

From 7de9f42e2be478693baf067d1f0879859cf712ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 20:12:25 +0000
Subject: [PATCH 0399/1504] python312Packages.gwcs: 0.21.0 -> 0.22.1

---
 pkgs/development/python-modules/gwcs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix
index 07b235b41080..af8aa9d36ef2 100644
--- a/pkgs/development/python-modules/gwcs/default.nix
+++ b/pkgs/development/python-modules/gwcs/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "gwcs";
-  version = "0.21.0";
+  version = "0.22.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spacetelescope";
     repo = "gwcs";
-    rev = "refs/tags/${version}";
-    hash = "sha256-76h2lDIaPHj7HarVcE0t5k6CA/hLCwquaz+2wMsKj+Y=";
+    tag = version;
+    hash = "sha256-9s3HwKFpUXb0aqcSEJVL2SB6G2pQc8xQT5HdZYoHd/I=";
   };
 
   build-system = [

From b1005fcc01142c049c80e8b9940c752e9914ed6b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 21:38:52 +0100
Subject: [PATCH 0400/1504] python311Packages.dvclive: 3.48.0 -> 3.48.1

Diff: https://github.com/iterative/dvclive/compare/refs/tags/3.48.0...3.48.1

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

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index 6124823fce59..a5598661cc57 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "3.48.0";
+  version = "3.48.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvclive";
     rev = "refs/tags/${version}";
-    hash = "sha256-WIVRpJD7B6OI7ZfdHT+DunRRiaxHhri5Ge/B1BQ1kJY=";
+    hash = "sha256-fLlP3kWmThQVVPEOd9KWitBIye/fhd/+zcHoVTF/pV8=";
   };
 
   build-system = [ setuptools-scm ];

From 4f0de47b2b26e64b6f49f346df345df9a569ec88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 20:44:52 +0000
Subject: [PATCH 0401/1504] python312Packages.fastrlock: 0.8.2 -> 0.8.3

---
 pkgs/development/python-modules/fastrlock/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix
index 547ab78b759e..27e505a24641 100644
--- a/pkgs/development/python-modules/fastrlock/default.nix
+++ b/pkgs/development/python-modules/fastrlock/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastrlock";
-  version = "0.8.2";
+  version = "0.8.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scoder";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-2h+rhP/EVMG3IkJVkE74p4GeBTwV3BS7fUkKpwedr2k=";
+    tag = "v${version}";
+    hash = "sha256-NB/AR6g1ZP5Atc0zwZNuXLsxg8BM67rWnx3Q6Pb0k5k=";
   };
 
   nativeBuildInputs = [ cython ];

From fc6ed6544d21bfcdad300a61373632ce43b24e7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 21:27:45 +0000
Subject: [PATCH 0402/1504] python312Packages.py4j: 0.10.9.7 -> 0.10.9.8

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

diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix
index 9433dbdf37e3..a6018280d6fb 100644
--- a/pkgs/development/python-modules/py4j/default.nix
+++ b/pkgs/development/python-modules/py4j/default.nix
@@ -7,12 +7,12 @@
 buildPythonPackage rec {
   pname = "py4j";
 
-  version = "0.10.9.7";
+  version = "0.10.9.8";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-C25TFbs62lz2KsZR0Qe7LrwC3vPe6dlUjjuqxkTqjbs=";
+    hash = "sha256-evqA2+QFmFEYEZ7EfdXaldsqfW42f79d7lvZSYMtC3U=";
   };
 
   # No tests in archive

From ef63f5b6fe7179015af8a2cba8e9ce3b6f1933b1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 18 Oct 2024 23:28:51 +0200
Subject: [PATCH 0403/1504] python312Packages.torchmetrics: 1.4.3 -> 1.6.0

Diff:
https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.4.3...v1.6.1

Changelog:
https://github.com/Lightning-AI/torchmetrics/releases/tag/v1.6.1
---
 .../python-modules/torchmetrics/default.nix   | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix
index 52f905878ae0..5f996b4d0a2e 100644
--- a/pkgs/development/python-modules/torchmetrics/default.nix
+++ b/pkgs/development/python-modules/torchmetrics/default.nix
@@ -7,59 +7,48 @@
   numpy,
   lightning-utilities,
   packaging,
-  pretty-errors,
 
   # buildInputs
   torch,
 
   # tests
-  cloudpickle,
-  psutil,
   pytestCheckHook,
   pytest-doctestplus,
   pytest-xdist,
   pytorch-lightning,
   scikit-image,
-  scikit-learn,
 
   # passthru
   torchmetrics,
 }:
 
-let
+buildPythonPackage rec {
   pname = "torchmetrics";
-  version = "1.4.3";
-in
-buildPythonPackage {
-  inherit pname version;
+  version = "1.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "torchmetrics";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-527cHPFdFw/JajHe7Kkz7+zl4EfePaLx77I2OTjjxaA=";
+    tag = "v${version}";
+    hash = "sha256-itLFJB920hQGX2VLOLolHhmXFVHAOkfRRFtUGB9neKM=";
   };
 
   dependencies = [
     numpy
     lightning-utilities
     packaging
-    pretty-errors
   ];
 
   # Let the user bring their own instance
   buildInputs = [ torch ];
 
   nativeCheckInputs = [
-    cloudpickle
-    psutil
     pytestCheckHook
     pytest-doctestplus
     pytest-xdist
     pytorch-lightning
     scikit-image
-    scikit-learn
   ];
 
   # A cyclic dependency in: integrations/test_lightning.py
@@ -73,16 +62,20 @@ buildPythonPackage {
     dontInstall = true;
   });
 
-  disabledTests = [
-    # `IndexError: list index out of range`
-    "test_metric_lightning_log"
-  ];
-
   disabledTestPaths = [
     # These require too many "leftpad-level" dependencies
     # Also too cross-dependent
     "tests/unittests"
 
+    # AttributeError: partially initialized module 'pesq' has no attribute 'pesq' (most likely due to a circular import)
+    "examples/audio/pesq.py"
+
+    # Require internet access
+    "examples/text/bertscore.py"
+    "examples/image/clip_score.py"
+    "examples/text/perplexity.py"
+    "examples/text/rouge.py"
+
     # A trillion import path mismatch errors
     "src/torchmetrics"
   ];

From 3554e3ee8450363233878b000db2aa721f56f11e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 00:00:19 +0000
Subject: [PATCH 0404/1504] python312Packages.pysmart: 1.3.0 -> 1.4.0

---
 pkgs/development/python-modules/pysmart/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix
index 4ad6663152d1..73d69ba51244 100644
--- a/pkgs/development/python-modules/pysmart/default.nix
+++ b/pkgs/development/python-modules/pysmart/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pysmart";
-  version = "1.3.0";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "truenas";
     repo = "py-SMART";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-1k+5XnIT/AfZmzKUxkyU/uc0eW05CvugpY6OdJCoALc=";
+    tag = "v${version}";
+    hash = "sha256-gsMFJbh2I64W1CDbwu9HUHjzS2pxsw91nD3lOYlBUEY=";
   };
 
   postPatch = ''

From f1d389fc1d51787e9bde68d0f141d295217cdea9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 00:12:40 +0000
Subject: [PATCH 0405/1504] python312Packages.pyspellchecker: 0.8.1 -> 0.8.2

---
 pkgs/development/python-modules/pyspellchecker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix
index e1696d0382a1..693863346bb7 100644
--- a/pkgs/development/python-modules/pyspellchecker/default.nix
+++ b/pkgs/development/python-modules/pyspellchecker/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyspellchecker";
-  version = "0.8.1";
+  version = "0.8.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "barrust";
     repo = "pyspellchecker";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-8IwTMj/RqMc9UqhzyvmrirPGuMEwj3iMr+FmF+8312U=";
+    tag = "v${version}";
+    hash = "sha256-sQNYtm+EK/F4S/Kfy87MwqDjCfV33/v8bYi48UBz+qc=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 1b3d2ac6f462995f4e2958313437cf94c81722b7 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 26 Dec 2024 08:39:10 +0800
Subject: [PATCH 0406/1504] stdenv.mkDerivation: inputDerivation: fix for
 __structuredAttrs = true

---
 pkgs/stdenv/generic/make-derivation.nix | 29 +++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 087787055c1e..76c2cd3da4be 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -644,15 +644,26 @@ extendDerivation
              printf "%s" "$(< "''${!pathVar}")" >> $out
          done
        '' ];
-
-       # inputDerivation produces the inputs; not the outputs, so any
-       # restrictions on what used to be the outputs don't serve a purpose
-       # anymore.
-       allowedReferences = null;
-       allowedRequisites = null;
-       disallowedReferences = [ ];
-       disallowedRequisites = [ ];
-     });
+     }
+     // (
+       let
+         sharedOutputChecks = {
+           # inputDerivation produces the inputs; not the outputs, so any
+           # restrictions on what used to be the outputs don't serve a purpose
+           # anymore.
+           allowedReferences = null;
+           allowedRequisites = null;
+           disallowedReferences = [ ];
+           disallowedRequisites = [ ];
+         };
+       in
+       if __structuredAttrs then
+         {
+           outputChecks.out = sharedOutputChecks;
+         }
+       else
+         sharedOutputChecks
+     ));
 
      inherit passthru overrideAttrs;
      inherit meta;

From b12eaf3813b24261705488d48ba9902f15b9f8eb Mon Sep 17 00:00:00 2001
From: Daniel Coonce <1077480+coonce@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:01:21 -0600
Subject: [PATCH 0407/1504] jellyseerr: 1.9.2 -> 2.1.0

---
 nixos/modules/services/misc/jellyseerr.nix |   4 +-
 pkgs/by-name/je/jellyseerr/package.json    | 247 ---------------------
 pkgs/by-name/je/jellyseerr/package.nix     |  79 +++----
 pkgs/by-name/je/jellyseerr/update.sh       |  16 --
 4 files changed, 35 insertions(+), 311 deletions(-)
 delete mode 100644 pkgs/by-name/je/jellyseerr/package.json
 delete mode 100755 pkgs/by-name/je/jellyseerr/update.sh

diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix
index e09de7aec50b..09aaf4ed5b97 100644
--- a/nixos/modules/services/misc/jellyseerr.nix
+++ b/nixos/modules/services/misc/jellyseerr.nix
@@ -31,10 +31,10 @@ in
       serviceConfig = {
         Type = "exec";
         StateDirectory = "jellyseerr";
-        WorkingDirectory = "${cfg.package}/libexec/jellyseerr/deps/jellyseerr";
+        WorkingDirectory = "${cfg.package}/share/dist";
         DynamicUser = true;
         ExecStart = lib.getExe cfg.package;
-        BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ];
+        BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/share/dist/config/" ];
         Restart = "on-failure";
         ProtectHome = true;
         ProtectSystem = "strict";
diff --git a/pkgs/by-name/je/jellyseerr/package.json b/pkgs/by-name/je/jellyseerr/package.json
deleted file mode 100644
index 6e97347f75b7..000000000000
--- a/pkgs/by-name/je/jellyseerr/package.json
+++ /dev/null
@@ -1,247 +0,0 @@
-{
-  "name": "jellyseerr",
-  "version": "1.9.2",
-  "private": true,
-  "scripts": {
-    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
-    "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
-    "build:next": "next build",
-    "build": "yarn build:next && yarn build:server",
-    "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache",
-    "lintfix": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --fix",
-    "start": "NODE_ENV=production node dist/index.js",
-    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
-    "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts",
-    "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts",
-    "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts",
-    "format": "prettier --loglevel warn --write --cache .",
-    "format:check": "prettier --check --cache .",
-    "typecheck": "yarn typecheck:server && yarn typecheck:client",
-    "typecheck:server": "tsc --project server/tsconfig.json --noEmit",
-    "typecheck:client": "tsc --noEmit",
-    "prepare": "husky install",
-    "cypress:open": "cypress open",
-    "cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts",
-    "cypress:build": "yarn build && yarn cypress:prepare"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/fallenbagel/jellyseerr.git"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@formatjs/intl-displaynames": "6.2.6",
-    "@formatjs/intl-locale": "3.1.1",
-    "@formatjs/intl-pluralrules": "5.1.10",
-    "@formatjs/intl-utils": "3.8.4",
-    "@headlessui/react": "1.7.12",
-    "@heroicons/react": "2.0.16",
-    "@supercharge/request-ip": "1.2.0",
-    "@svgr/webpack": "6.5.1",
-    "@tanem/react-nprogress": "5.0.30",
-    "ace-builds": "1.15.2",
-    "axios": "1.3.4",
-    "axios-rate-limit": "1.3.0",
-    "bcrypt": "5.1.0",
-    "bowser": "2.11.0",
-    "cacheable-lookup": "^7.0.0",
-    "connect-typeorm": "1.1.4",
-    "cookie-parser": "1.4.6",
-    "copy-to-clipboard": "3.3.3",
-    "country-flag-icons": "1.5.5",
-    "cronstrue": "2.23.0",
-    "csurf": "1.11.0",
-    "date-fns": "2.29.3",
-    "dayjs": "1.11.7",
-    "email-templates": "9.0.0",
-    "email-validator": "2.0.4",
-    "express": "4.18.2",
-    "express-openapi-validator": "4.13.8",
-    "express-rate-limit": "6.7.0",
-    "express-session": "1.17.3",
-    "formik": "2.2.9",
-    "gravatar-url": "3.1.0",
-    "intl": "1.2.5",
-    "lodash": "4.17.21",
-    "next": "12.3.4",
-    "node-cache": "5.1.2",
-    "node-gyp": "9.3.1",
-    "node-schedule": "2.1.1",
-    "nodemailer": "6.9.1",
-    "openpgp": "5.7.0",
-    "plex-api": "5.3.2",
-    "pug": "3.0.2",
-    "react": "18.2.0",
-    "react-ace": "10.1.0",
-    "react-animate-height": "2.1.2",
-    "react-aria": "3.23.0",
-    "react-dom": "18.2.0",
-    "react-intersection-observer": "9.4.3",
-    "react-intl": "6.2.10",
-    "react-markdown": "8.0.5",
-    "react-popper-tooltip": "4.4.2",
-    "react-select": "5.7.0",
-    "react-spring": "9.7.1",
-    "react-tailwindcss-datepicker-sct": "1.3.4",
-    "react-toast-notifications": "2.5.1",
-    "react-truncate-markup": "5.1.2",
-    "react-use-clipboard": "1.0.9",
-    "reflect-metadata": "0.1.13",
-    "secure-random-password": "0.2.3",
-    "semver": "7.3.8",
-    "sqlite3": "5.1.4",
-    "swagger-ui-express": "4.6.2",
-    "swr": "2.0.4",
-    "typeorm": "0.3.12",
-    "web-push": "3.5.0",
-    "winston": "3.8.2",
-    "winston-daily-rotate-file": "4.7.1",
-    "xml2js": "0.4.23",
-    "yamljs": "0.3.0",
-    "yup": "0.32.11",
-    "zod": "3.20.6"
-  },
-  "devDependencies": {
-    "@babel/cli": "7.21.0",
-    "@commitlint/cli": "17.4.4",
-    "@commitlint/config-conventional": "17.4.4",
-    "@semantic-release/changelog": "6.0.2",
-    "@semantic-release/commit-analyzer": "9.0.2",
-    "@semantic-release/exec": "6.0.3",
-    "@semantic-release/git": "10.0.1",
-    "@tailwindcss/aspect-ratio": "0.4.2",
-    "@tailwindcss/forms": "0.5.3",
-    "@tailwindcss/typography": "0.5.9",
-    "@types/bcrypt": "5.0.0",
-    "@types/cookie-parser": "1.4.3",
-    "@types/country-flag-icons": "1.2.0",
-    "@types/csurf": "1.11.2",
-    "@types/email-templates": "8.0.4",
-    "@types/express": "4.17.17",
-    "@types/express-session": "1.17.6",
-    "@types/lodash": "4.14.191",
-    "@types/node": "17.0.36",
-    "@types/node-schedule": "2.1.0",
-    "@types/nodemailer": "6.4.7",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.0.11",
-    "@types/react-transition-group": "4.4.5",
-    "@types/secure-random-password": "0.2.1",
-    "@types/semver": "7.3.13",
-    "@types/swagger-ui-express": "4.1.3",
-    "@types/web-push": "3.3.2",
-    "@types/xml2js": "0.4.11",
-    "@types/yamljs": "0.2.31",
-    "@types/yup": "0.29.14",
-    "@typescript-eslint/eslint-plugin": "5.54.0",
-    "@typescript-eslint/parser": "5.54.0",
-    "autoprefixer": "10.4.13",
-    "babel-plugin-react-intl": "8.2.25",
-    "babel-plugin-react-intl-auto": "3.3.0",
-    "commitizen": "4.3.0",
-    "copyfiles": "2.4.1",
-    "cy-mobile-commands": "0.3.0",
-    "cypress": "12.7.0",
-    "cz-conventional-changelog": "3.3.0",
-    "eslint": "8.35.0",
-    "eslint-config-next": "12.3.4",
-    "eslint-config-prettier": "8.6.0",
-    "eslint-plugin-formatjs": "4.9.0",
-    "eslint-plugin-jsx-a11y": "6.7.1",
-    "eslint-plugin-no-relative-import-paths": "1.5.2",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.32.2",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "extract-react-intl-messages": "4.1.1",
-    "husky": "8.0.3",
-    "lint-staged": "13.1.2",
-    "nodemon": "2.0.20",
-    "postcss": "8.4.21",
-    "prettier": "2.8.4",
-    "prettier-plugin-organize-imports": "3.2.2",
-    "prettier-plugin-tailwindcss": "0.2.3",
-    "semantic-release": "19.0.5",
-    "semantic-release-docker-buildx": "1.0.1",
-    "tailwindcss": "3.2.7",
-    "ts-node": "10.9.1",
-    "tsc-alias": "1.8.2",
-    "tsconfig-paths": "4.1.2",
-    "typescript": "4.9.5"
-  },
-  "resolutions": {
-    "sqlite3/node-gyp": "8.4.1",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.0.11",
-    "@types/express-session": "1.17.6"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
-  },
-  "lint-staged": {
-    "**/*.{ts,tsx,js}": [
-      "prettier --write",
-      "eslint"
-    ],
-    "**/*.{json,md,css}": [
-      "prettier --write"
-    ]
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "release": {
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      [
-        "@semantic-release/changelog",
-        {
-          "changelogFile": "CHANGELOG.md"
-        }
-      ],
-      "@semantic-release/npm",
-      [
-        "@semantic-release/git",
-        {
-          "assets": [
-            "package.json",
-            "CHANGELOG.md"
-          ],
-          "message": "chore(release): ${nextRelease.version}"
-        }
-      ],
-      "semantic-release-docker-buildx",
-      [
-        "@semantic-release/github",
-        {
-          "addReleases": "bottom"
-        }
-      ]
-    ],
-    "branches": [
-      "main"
-    ],
-    "npmPublish": false,
-    "publish": [
-      {
-        "path": "semantic-release-docker-buildx",
-        "buildArgs": {
-          "COMMIT_TAG": "$GIT_SHA"
-        },
-        "imageNames": [
-          "fallenbagel/jellyseerr"
-        ],
-        "platforms": [
-          "linux/amd64",
-          "linux/arm64",
-          "linux/arm/v7"
-        ]
-      },
-      "@semantic-release/github"
-    ]
-  }
-}
diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix
index 42f258da608a..10ced98b0050 100644
--- a/pkgs/by-name/je/jellyseerr/package.nix
+++ b/pkgs/by-name/je/jellyseerr/package.nix
@@ -1,84 +1,71 @@
 {
   lib,
-  mkYarnPackage,
+  pnpm_9,
   fetchFromGitHub,
-  fetchYarnDeps,
+  stdenv,
   makeWrapper,
-  node-pre-gyp,
   nodejs,
   python3,
   sqlite,
+  nix-update-script,
 }:
 
-mkYarnPackage rec {
+stdenv.mkDerivation rec {
   pname = "jellyseerr";
-  version = "1.9.2";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Fallenbagel";
     repo = "jellyseerr";
     rev = "v${version}";
-    hash = "sha256-TXe/k/pb7idu7G1wGu6TZksnoFQ5/PN0voVlve3k1UI=";
+    hash = "sha256-5kaeqhjUy9Lgx4/uFcGRlAo+ROEOdTWc2m49rq8R8Hs=";
   };
 
-  packageJSON = ./package.json;
-
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-2iRxguxEI+YKm8ddhRgZMvfZuUgQmCK5ER4jMCFJQMQ=";
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit pname version src;
+    hash = "sha256-xu6DeaBArQmnqEnIgjc1DTZujQebSkjuai9tMHeQWCk=";
   };
 
+  buildInputs = [ sqlite ];
+
   nativeBuildInputs = [
+    python3
     nodejs
     makeWrapper
+    pnpm_9.configHook
   ];
 
-  # Fixes "SQLite package has not been found installed" at launch
-  pkgConfig.sqlite3 = {
-    nativeBuildInputs = [
-      node-pre-gyp
-      python3
-      sqlite
-    ];
-    postInstall = ''
-      export CPPFLAGS="-I${nodejs}/include/node"
-      node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node --sqlite=${sqlite.dev}
-      rm -r build-tmp-napi-v6
-    '';
-  };
-
-  pkgConfig.bcrypt = {
-    nativeBuildInputs = [
-      node-pre-gyp
-      python3
-    ];
-    postInstall = ''
-      export CPPFLAGS="-I${nodejs}/include/node"
-      node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node
-    '';
-  };
+  preBuild = ''
+    export npm_config_nodedir=${nodejs}
+    pushd node_modules
+    pnpm rebuild bcrypt sqlite3
+    popd
+  '';
 
   buildPhase = ''
     runHook preBuild
-    (
-      shopt -s dotglob
-      cd deps/jellyseerr
-      rm -r config/*
-      yarn build
-      rm -r .next/cache
-    )
+    pnpm build
+    pnpm prune --prod --ignore-scripts
+    rm -rf .next/cache
     runHook postBuild
   '';
 
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share
+    cp -r -t $out/share .next node_modules dist public package.json overseerr-api.yml
+    runHook postInstall
+  '';
+
   postInstall = ''
+    mkdir -p $out/bin
     makeWrapper '${nodejs}/bin/node' "$out/bin/jellyseerr" \
-      --add-flags "$out/libexec/jellyseerr/deps/jellyseerr/dist/index.js" \
+      --add-flags "$out/share/dist/index.js" \
+      --chdir "$out/share" \
       --set NODE_ENV production
   '';
 
-  doDist = false;
-
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
     description = "Fork of overseerr for jellyfin support";
diff --git a/pkgs/by-name/je/jellyseerr/update.sh b/pkgs/by-name/je/jellyseerr/update.sh
deleted file mode 100755
index cd8f6c03081c..000000000000
--- a/pkgs/by-name/je/jellyseerr/update.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq common-updater-scripts nix prefetch-yarn-deps
-
-set -eu -o pipefail
-
-version=${1:-$(curl -s https://api.github.com/repos/Fallenbagel/jellyseerr/releases/latest | jq --raw-output '.tag_name[1:]')}
-update-source-version jellyseerr $version
-
-nix_file=$(nix-instantiate --eval --strict -A "jellyseerr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
-nix_dir=$(dirname $nix_file)
-cp $(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/package.json"' | sed 's/"//g') $nix_dir
-
-old_yarn_hash=$(nix-instantiate --eval --strict -A "jellyseerr.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')
-lock_file=$(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/yarn.lock"' | sed 's/"//g')
-new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps $lock_file))
-sed -i "$nix_file" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"

From 4b21c0c436e5623ff096ff647c5e4dee50fd0197 Mon Sep 17 00:00:00 2001
From: Daniel Coonce <1077480+coonce@users.noreply.github.com>
Date: Wed, 25 Dec 2024 18:49:03 -0600
Subject: [PATCH 0408/1504] nixos/jellyseerr: add configDir option

---
 nixos/modules/services/misc/jellyseerr.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix
index 09aaf4ed5b97..c500cc8b3a62 100644
--- a/nixos/modules/services/misc/jellyseerr.nix
+++ b/nixos/modules/services/misc/jellyseerr.nix
@@ -20,6 +20,12 @@ in
       default = 5055;
       description = ''The port which the Jellyseerr web UI should listen to.'';
     };
+
+    configDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/jellyseerr/config";
+      description = "Config data directory";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -27,14 +33,15 @@ in
       description = "Jellyseerr, a requests manager for Jellyfin";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment.PORT = toString cfg.port;
+      environment = {
+        PORT = toString cfg.port;
+        CONFIG_DIRECTORY = cfg.configDir;
+      };
       serviceConfig = {
         Type = "exec";
         StateDirectory = "jellyseerr";
-        WorkingDirectory = "${cfg.package}/share/dist";
         DynamicUser = true;
         ExecStart = lib.getExe cfg.package;
-        BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/share/dist/config/" ];
         Restart = "on-failure";
         ProtectHome = true;
         ProtectSystem = "strict";

From 4f9faeddf5fc7f9d42c5a7958cc99af61964c940 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 26 Dec 2024 02:06:09 +0100
Subject: [PATCH 0409/1504] vale: 3.9.1 -> 3.9.2

Diff: https://github.com/errata-ai/vale/compare/v3.9.1...v3.9.2

Changelog: https://github.com/errata-ai/vale/releases/tag/v3.9.2
---
 pkgs/by-name/va/vale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 0bae85aa2015..c4afbd084e49 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.9.1";
+  version = "3.9.2";
 
   subPackages = [ "cmd/vale" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     rev = "v${version}";
-    hash = "sha256-WGI5PiAZosMO88pXbNapnxvVJ1ays4XBRPkUtCaZUMI=";
+    hash = "sha256-2LiuzO1Fha4uS0WNs2mihE/EOSTZa0fOWPzuBw22VlM=";
   };
 
   vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";

From ee6835bf5995e7f23a3f7370dcbd3cb4aa617282 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 03:13:36 +0000
Subject: [PATCH 0410/1504] mani: 0.25.0 -> 0.30.0

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

diff --git a/pkgs/by-name/ma/mani/package.nix b/pkgs/by-name/ma/mani/package.nix
index 44be4bc8c34f..395328e94834 100644
--- a/pkgs/by-name/ma/mani/package.nix
+++ b/pkgs/by-name/ma/mani/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "mani";
-  version = "0.25.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "alajmo";
     repo = "mani";
     rev = "v${version}";
-    sha256 = "sha256-TqxoU2g4ZegJGHrnNO+ivPu209NDFcLnxpHGj8pOA4E=";
+    sha256 = "sha256-LxW9LPK4cXIXhBWPhOYWLeV5PIf+o710SWX8JVpZhPI=";
   };
 
-  vendorHash = "sha256-mFan09oJ+BPVJHAxoROj282WJ+4e7TD0ZqeQH1kDabQ=";
+  vendorHash = "sha256-8ckflry+KsEu+QgqjocXg6yyfS9R7fCfCMXwUqUSlhE=";
 
   nativeBuildInputs = [
     installShellFiles

From bc34b982694dc10ad79cfd31dd6334ca232ff715 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 03:14:04 +0000
Subject: [PATCH 0411/1504] makima: 0.9.5 -> 0.10.0

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

diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix
index 65d4b66b26cb..171d0d1a09ff 100644
--- a/pkgs/by-name/ma/makima/package.nix
+++ b/pkgs/by-name/ma/makima/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "makima";
-  version = "0.9.5";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "cyber-sushi";
     repo = "makima";
     rev = "v${version}";
-    hash = "sha256-yKaUDFrUEXXgYaGKuFnuViAEet2BVh1ZbGRo6wuC69g=";
+    hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o=";
   };
 
-  cargoHash = "sha256-rtVO1pmWI2U+m8RVHjPEi++OtsLEjmXkhzpg6UkgNuE=";
+  cargoHash = "sha256-70gkCv9YHeHj1Hj9gLTvHTRULEJJwezaqSECWbgPIc4=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ udev ];

From 591447c9557f67ecc2a117a4150ba9c4cc9e6b48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 08:58:27 +0000
Subject: [PATCH 0412/1504] python312Packages.pytest-testmon: 2.1.1 -> 2.1.3

---
 pkgs/development/python-modules/pytest-testmon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix
index 7fdf801dd110..170e64f13f0c 100644
--- a/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-testmon";
-  version = "2.1.1";
+  version = "2.1.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tarpas";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-zbMX9r9lftdm9hzXMZRZZ/GEDViGk9QiYYUhO9ZcEAc=";
+    tag = "v${version}";
+    hash = "sha256-LSp3GkvyZ8wX6qelGy4PdCliGIzXo2nJNrYqxdSo/wM=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 84fb4a0520f90634425790b66c0865a02f4ab610 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 09:20:35 +0000
Subject: [PATCH 0413/1504] python312Packages.django-modelcluster: 6.3 -> 6.4

---
 .../python-modules/django-modelcluster/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix
index ed4f3a05a764..ed7147e67d22 100644
--- a/pkgs/development/python-modules/django-modelcluster/default.nix
+++ b/pkgs/development/python-modules/django-modelcluster/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "django-modelcluster";
-  version = "6.3";
+  version = "6.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wagtail";
     repo = "django-modelcluster";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU=";
+    tag = "v${version}";
+    hash = "sha256-JoDDHvZ9N+7hcIxRsbVrYW8/95iUcNHDQkvtmDVUzws=";
   };
 
   build-system = [ setuptools ];

From 0147b6de2dd5dc926202b3286d9cb99058ff6d09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 10:09:45 +0000
Subject: [PATCH 0414/1504] python312Packages.notion-client: 2.2.1 -> 2.3.0

---
 pkgs/development/python-modules/notion-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix
index 12500e9fe854..46a6f2041f53 100644
--- a/pkgs/development/python-modules/notion-client/default.nix
+++ b/pkgs/development/python-modules/notion-client/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "notion-client";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramnes";
     repo = "notion-sdk-py";
-    rev = "refs/tags/${version}";
-    hash = "sha256-IEWFrdqrawFbuwA8bUewanmBoGWsjHJ7ucgvHQEaMcA=";
+    tag = version;
+    hash = "sha256-oqYBT7K0px0QvShSx1fnr2181h+QXz7I8sdURsBRgWw=";
   };
 
   nativeBuildInputs = [ setuptools ];

From aee561742c7922005ec624b9b8332d31b25a0891 Mon Sep 17 00:00:00 2001
From: weriomat <engel@weriomat.com>
Date: Thu, 26 Dec 2024 11:39:16 +0100
Subject: [PATCH 0415/1504] pingvin-share: 1.7.0 -> 1.7.1

---
 pkgs/servers/pingvin-share/backend.nix  | 2 +-
 pkgs/servers/pingvin-share/default.nix  | 4 ++--
 pkgs/servers/pingvin-share/frontend.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix
index 6cd1dd9f94cb..258ed2da3ef5 100644
--- a/pkgs/servers/pingvin-share/backend.nix
+++ b/pkgs/servers/pingvin-share/backend.nix
@@ -31,7 +31,7 @@ buildNpmPackage {
     prisma
   ];
 
-  npmDepsHash = "sha256-BkwFQVHpg7PuMU5MaW73S6R+wbdGOJ62PR9EE2ghQFg=";
+  npmDepsHash = "sha256-SBVkrrNKD3hCf1dT4ZWXYcQCat+wVQ9+ti1d0hfpWIw=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 
diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix
index 447a00670a56..f6169075f43e 100644
--- a/pkgs/servers/pingvin-share/default.nix
+++ b/pkgs/servers/pingvin-share/default.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.7.0";
+  version = "1.7.1";
   src = fetchFromGitHub {
     owner = "stonith404";
     repo = "pingvin-share";
     rev = "v${version}";
-    hash = "sha256-wZV3PKnGoD3g4PjSDPwMm4ftUTlEZykNkWlwLCDJfuM=";
+    hash = "sha256-XchwPP573z4tzwAlSdWwi0aZwNlLcL1wGGgGyYgJAWg=";
   };
 in
 
diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix
index 6c50bf697225..810448aca363 100644
--- a/pkgs/servers/pingvin-share/frontend.nix
+++ b/pkgs/servers/pingvin-share/frontend.nix
@@ -23,7 +23,7 @@ buildNpmPackage {
   buildInputs = [ vips ];
   nativeBuildInputs = [ pkg-config ];
 
-  npmDepsHash = "sha256-uu/JX039QjVwMtGI8lOjuzPC7kM1knhKycbJ/4cc1o4=";
+  npmDepsHash = "sha256-TC5yMvAXO3oKRhyVgGAiXT213vvv+cOxY4z6vQU1gX4=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 

From 602d4037c6b68deae5b61414d9f88a14e0754576 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 11:27:15 +0000
Subject: [PATCH 0416/1504] python312Packages.pytest-mypy-plugins: 3.1.2 ->
 3.2.0

---
 .../python-modules/pytest-mypy-plugins/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
index ecc53049ee1c..e1f918ea2bca 100644
--- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
+++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-mypy-plugins";
-  version = "3.1.2";
+  version = "3.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "typeddjango";
     repo = "pytest-mypy-plugins";
-    rev = "refs/tags/${version}";
-    hash = "sha256-yme1g9Kj5guao0Lf8mbkNJRw6ipS2Wd4Io1cSlEBAGo=";
+    tag = version;
+    hash = "sha256-60VxMUUCIP+Mp+OsgdyRTPZVLGC/3iaMxxhw02ABB9k=";
   };
 
   build-system = [ setuptools ];

From e560123760f902c4d3005d1bac65370d9bc8fa9d Mon Sep 17 00:00:00 2001
From: Toast <39011842+toast003@users.noreply.github.com>
Date: Thu, 26 Dec 2024 12:40:39 +0100
Subject: [PATCH 0417/1504] handheld-daemon: 3.8.1 -> 3.9.0

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

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 3372b3976987..1c11cd3b59b2 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -14,14 +14,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "handheld-daemon";
-  version = "3.8.1";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     tag = "v${version}";
-    hash = "sha256-LDZ3z1IZTkqdJ/xli9b65yO9t1Pj6a4F0DrYdOnOgNU=";
+    hash = "sha256-y3CxdWqQEwdNYs4m1NEUeRjTvvhEpS5S739wyFlluWo=";
   };
 
   # This package relies on several programs expected to be on the user's PATH.

From 9cf8344f7173e451790bad06dd9e14c40c2d62dc Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Thu, 26 Dec 2024 17:50:39 +0530
Subject: [PATCH 0418/1504] nixos/google-compute-image: fix image build

---
 nixos/modules/virtualisation/google-compute-image.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 8bdbd75783a4..98190e7e2276 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -88,9 +88,13 @@ in
           ]
         }
         pushd $out
-        tar -Sc $diskImage | gzip -${toString cfg.compressionLevel} > \
+        # RTFM:
+        # https://cloud.google.com/compute/docs/images/create-custom
+        # https://cloud.google.com/compute/docs/import/import-existing-image
+        mv $diskImage disk.raw
+        tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \
           ${config.image.fileName}
-        rm $diskImage
+        rm disk.raw
         popd
       '';
       format = "raw";

From 1882405e66542ccbc56cfef1728a9043262e4ceb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 12:30:17 +0000
Subject: [PATCH 0419/1504] python312Packages.ipympl: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix
index f9905bdfc446..aff2fe112b47 100644
--- a/pkgs/development/python-modules/ipympl/default.nix
+++ b/pkgs/development/python-modules/ipympl/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ipympl";
-  version = "0.9.4";
+  version = "0.9.5";
   format = "wheel";
 
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version format;
-    hash = "sha256-WwwIxvT26mVbpYI5NjRXwQ+5IVV/UDjBpG20RX1taw4=";
+    hash = "sha256-/xSjV/Q1UuySWC64svdrhEtGmqL6doM/FerX+lhMGfw=";
     dist = "py3";
     python = "py3";
   };

From 56d6ef7f046088ea13591f07f9b44aeef35627ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 13:46:48 +0000
Subject: [PATCH 0420/1504] python312Packages.skl2onnx: 1.17.0 -> 1.18.0

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

diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix
index d02b350dc7cd..cc6667fe48cb 100644
--- a/pkgs/development/python-modules/skl2onnx/default.nix
+++ b/pkgs/development/python-modules/skl2onnx/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "skl2onnx";
-  version = "1.17.0";
+  version = "1.18.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cSfchORw9In2gJTM//mlqBW2CfcA1D5wjm9lijOwZAM=";
+    hash = "sha256-OepK4wxcGCNVoYJEZwExWCFERODOCxjzMzi9gn1PsA8=";
   };
 
   propagatedBuildInputs = [

From 76923bc7a0a56a05ab04676caefe479d551fe1c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 13:51:26 +0000
Subject: [PATCH 0421/1504] python312Packages.azure-mgmt-network: 28.0.0 ->
 28.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 8776844ae51a..ede68a5c714e 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-network";
-  version = "28.0.0";
+  version = "28.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_network";
     inherit version;
-    hash = "sha256-QDVtNI70g4Mk8ZpBzYA0C0+N1KwvChiky9XMle8pdPM=";
+    hash = "sha256-jIS/+17HXG4CROWOzwfADV/EIdYWsMs2nG/lha8zz4c=";
   };
 
   build-system = [ setuptools ];

From 7384dfd89aad85a46241d9986762be95af97cc43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 14:07:40 +0000
Subject: [PATCH 0422/1504] python312Packages.hvplot: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index 0687b65e297f..6c5010fc61b0 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "hvplot";
-  version = "0.11.1";
+  version = "0.11.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mJ7QOJGJrcR+3NJgHS6rGL82bnSwf14oc+AhMjxKFLs=";
+    hash = "sha256-t60fLxxwXkfiayLInBFxGoT3d0+qq6t1a0Xo0eAKYBA=";
   };
 
   build-system = [

From f0eaea5be13f0770b0fb0bb0d8a714b74c1ab26d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 14:21:15 +0000
Subject: [PATCH 0423/1504] python312Packages.rst2pdf: 0.102 -> 0.103.1

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

diff --git a/pkgs/development/python-modules/rst2pdf/default.nix b/pkgs/development/python-modules/rst2pdf/default.nix
index 40225a9acb03..4a4f297b4b55 100644
--- a/pkgs/development/python-modules/rst2pdf/default.nix
+++ b/pkgs/development/python-modules/rst2pdf/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "rst2pdf";
-  version = "0.102";
+  version = "0.103.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NzAGJOlTpz7d3cuubyRjDvVGfCC+61jfZIrcUwhE9CU=";
+    hash = "sha256-P/6BbUsyda7iG4/90Isua+TXWQzYixifczy8aZbWN4Y=";
   };
 
   outputs = [

From dc1d48de03616562e3b76376f3381d566b763772 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 16:17:17 +0000
Subject: [PATCH 0424/1504] python312Packages.livereload: 2.7.0 -> 2.7.1

---
 pkgs/development/python-modules/livereload/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix
index a29e06f15c1f..58efd89f946a 100644
--- a/pkgs/development/python-modules/livereload/default.nix
+++ b/pkgs/development/python-modules/livereload/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "livereload";
-  version = "2.7.0";
+  version = "2.7.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "python-livereload";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-1at/KMgDTj0TTnq5Vjgklkyha3QUF8bFeKxQSrvx1oE=";
+    tag = "v${version}";
+    sha256 = "sha256-WFpPCUjvyGT826EkIuqAB4jcJOEqoohJY9Xw/EJrk6c=";
   };
 
   buildInputs = [ django ];

From 8ce135bef9a6ab2b340447ba7c20bc7deddcf9aa Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Wed, 25 Dec 2024 22:39:14 +0300
Subject: [PATCH 0425/1504] ecwolf: fix build with gcc-14

---
 pkgs/by-name/ec/ecwolf/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix
index e1b571f52e74..76d679f8a80d 100644
--- a/pkgs/by-name/ec/ecwolf/package.nix
+++ b/pkgs/by-name/ec/ecwolf/package.nix
@@ -15,6 +15,7 @@
   writers,
   python3Packages,
   nix-update,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,6 +29,15 @@ stdenv.mkDerivation rec {
     sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
   };
 
+  patches = [
+    # Fixes build with gcc >= 14. Shouldn't be needed for ecwolf versions > 1.4.1.
+    (fetchpatch {
+      name = "tmemory.h-const-correctness.patch";
+      url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw";
+      hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 81ec266e5915c82fcde7d7f9aadf3ca072a0a0c3 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Wed, 25 Dec 2024 22:40:11 +0300
Subject: [PATCH 0426/1504] ecwolf: don't use pname in fetchFromBitbucket

This is discouraged. See https://github.com/NixOS/nixpkgs/issues/277994.
---
 pkgs/by-name/ec/ecwolf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix
index 76d679f8a80d..6faeba5aa5c0 100644
--- a/pkgs/by-name/ec/ecwolf/package.nix
+++ b/pkgs/by-name/ec/ecwolf/package.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   version = "1.4.1";
 
   src = fetchFromBitbucket {
-    owner = pname;
-    repo = pname;
+    owner = "ecwolf";
+    repo = "ecwolf";
     rev = version;
     sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
   };

From 45484b9a5c829ca8cd69c91b98131c46dc5360d7 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Wed, 25 Dec 2024 22:46:33 +0300
Subject: [PATCH 0427/1504] ecwolf: use finalAttrs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this change, the ecwolf package used a recursive attribute set.
In general, it’s recommended that you avoid using recursive attribute
sets [1]. This change makes it so that the ecwolf package uses
finalAttrs instead of a recursive attribute set. As an added bonus, this
also means that ecwolf.src.rev will automatically get updated if someone
calls ecwolf.overrideAttrs and overrides ecwolf.version.

[1]: <https://nix.dev/guides/best-practices.html#recursive-attribute-set-rec>

Co-authored-by: Jason Yundt <jason@jasonyundt.email>
---
 pkgs/by-name/ec/ecwolf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix
index 6faeba5aa5c0..68b8b503a044 100644
--- a/pkgs/by-name/ec/ecwolf/package.nix
+++ b/pkgs/by-name/ec/ecwolf/package.nix
@@ -18,14 +18,14 @@
   fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ecwolf";
   version = "1.4.1";
 
   src = fetchFromBitbucket {
     owner = "ecwolf";
     repo = "ecwolf";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
   };
 
@@ -115,4 +115,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.all;
   };
-}
+})

From 32c483ca576a96b7e7a607491b806f0e81a233a1 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Thu, 26 Dec 2024 10:05:24 -0500
Subject: [PATCH 0428/1504] ecwolf: make sure that a tag is fetched
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this change, ecwolf.src.rev was set to the name of a tag. This is
generally not recommended. It’s better to set rev to
"refs/tags/<tag-name>" [1].

[1]: <https://nixos.org/manual/nixpkgs/stable/#fetchgit>
---
 pkgs/by-name/ec/ecwolf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix
index 68b8b503a044..dee16bc3d3b0 100644
--- a/pkgs/by-name/ec/ecwolf/package.nix
+++ b/pkgs/by-name/ec/ecwolf/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromBitbucket {
     owner = "ecwolf";
     repo = "ecwolf";
-    rev = finalAttrs.version;
+    rev = "refs/tags/${finalAttrs.version}";
     sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
   };
 

From d1d588d4021675478d21054b2cbbc14871bcd389 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Wed, 25 Dec 2024 22:48:56 +0300
Subject: [PATCH 0429/1504] ecwolf: sha256 -> hash

It looks like sha256 will eventually be deprecated in favor of hash:
<https://github.com/NixOS/nixpkgs/issues/325892>.
---
 pkgs/by-name/ec/ecwolf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix
index dee16bc3d3b0..f8c3a8fe638a 100644
--- a/pkgs/by-name/ec/ecwolf/package.nix
+++ b/pkgs/by-name/ec/ecwolf/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ecwolf";
     repo = "ecwolf";
     rev = "refs/tags/${finalAttrs.version}";
-    sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
+    hash = "sha256-V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
   };
 
   patches = [

From 4915c2ec6ff1dcaf042995e4d6345fe720fc8612 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Wed, 25 Dec 2024 23:02:12 +0300
Subject: [PATCH 0430/1504] lzwolf: fix build with gcc-14

---
 pkgs/games/lzwolf/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix
index 9bfba6f91601..2d68ed1d5462 100644
--- a/pkgs/games/lzwolf/default.nix
+++ b/pkgs/games/lzwolf/default.nix
@@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
       url = "https://bitbucket.org/soturi/lzwolf/commits/41f212026dff4f089d1c0921cb49ab1a2b81e0d6/raw";
       hash = "sha256-EgSdDaZovD7DyZ0BkuX8ZdsrX7J7v8/D6y5P1NWGJew=";
     })
+    # Fixes build with gcc >= 14. Picked patch from the original ecwolf repo.
+    (fetchpatch {
+      name = "tmemory.h-const-correctness.patch";
+      url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw";
+      hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU=";
+    })
   ];
 
   postPatch = ''

From 83378e0387a5a0e3f6e29746ea5d0d2875c0f55f Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Wed, 25 Dec 2024 23:04:58 +0300
Subject: [PATCH 0431/1504] lzwolf: sha256 -> hash

It looks like sha256 will eventually be deprecated in favor of hash:
<https://github.com/NixOS/nixpkgs/issues/325892>.
---
 pkgs/games/lzwolf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix
index 2d68ed1d5462..44551efd384a 100644
--- a/pkgs/games/lzwolf/default.nix
+++ b/pkgs/games/lzwolf/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "linuxwolf6";
     repo = "lzwolf";
     rev = "a24190604296e16941c601b57afe4350462fc659";
-    sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
+    hash = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
   };
 
   patches = [

From fcb64662061adc87195f122d6a76e588445470a1 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:41:50 +0100
Subject: [PATCH 0432/1504] antora-ui-default: use correct version naming
 convention

Fixes: c5f5cc355f8b ("antora-ui-default: init at 0")
Link: pkgs/README.md
---
 pkgs/by-name/an/antora-ui-default/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 5c7781488fe4..6609ac08a4d8 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -13,7 +13,7 @@ let
 in
 stdenvNoCC.mkDerivation {
   pname = "antora-ui-default";
-  version = "0";
+  version = "0-unstable-2024-09-20";
 
   # The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork
   # for the following reasons:

From 4ac918031e6a6b3e9818a8b98cf61d3c7cc6de8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 16:57:47 +0000
Subject: [PATCH 0433/1504] python312Packages.pvlib: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index e9237152d0a0..6051b9011e87 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "pvlib";
-  version = "0.11.1";
+  version = "0.11.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0C29pRXyvlTv0uMoOVJ8D4Lp+ZAotGBWX6ytBorIV0o=";
+    hash = "sha256-NxZF9OZsJ45s8rGySHxiwrrUef9iom7YRCFtD4Q89cw=";
   };
 
   build-system = [

From 518ba1789aa216d697a320bf6b40defdd1c18993 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:22:59 +0100
Subject: [PATCH 0434/1504] antora-ui-default: 0-unstable-2024-09-20 ->
 0-unstable-2024-12-26

---
 pkgs/by-name/an/antora-ui-default/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 6609ac08a4d8..329841bd4d43 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -8,12 +8,12 @@ let
     hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM=";
     owner = "trueNAHO";
     repo = "antora-ui-default";
-    rev = "83bf9bf5f22a6dee397f8b089eb0315c14a278b5";
+    rev = "11f563294248e9b64124b9289d639e349f2e9f5f";
   };
 in
 stdenvNoCC.mkDerivation {
   pname = "antora-ui-default";
-  version = "0-unstable-2024-09-20";
+  version = "0-unstable-2024-12-26";
 
   # The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork
   # for the following reasons:
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation {
   #
   # For reference, the UI bundle from [3] is 300K large.
   #
-  # [3]: https://gitlab.com/trueNAHO/antora-ui-default/-/commit/83bf9bf5f22a6dee397f8b089eb0315c14a278b5
+  # [3]: https://gitlab.com/trueNAHO/antora-ui-default/-/commit/11f563294248e9b64124b9289d639e349f2e9f5f
   src = fetchFromGitLab srcFetchFromGitLab;
 
   phases = [ "installPhase" ];

From b57b45463cd1af467faddd2602ee568f45ce4e39 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 26 Dec 2024 11:45:08 -0800
Subject: [PATCH 0435/1504] libpoly: remove -Werror; fix clang-19

---
 pkgs/by-name/li/libpoly/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libpoly/package.nix b/pkgs/by-name/li/libpoly/package.nix
index f11ce14ce59d..2ffc34ba5a55 100644
--- a/pkgs/by-name/li/libpoly/package.nix
+++ b/pkgs/by-name/li/libpoly/package.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-7aFz+6XJOVEA/Fmi0ywd6rZdTW8sHq8MoHqXR0Hc2o4=";
   };
 
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-warn " -Werror " " "
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From c4a5305d27241767828d90331fe50b21ec5a1ee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 20:23:19 +0000
Subject: [PATCH 0436/1504] python312Packages.google-cloud-datacatalog: 3.23.0
 -> 3.24.1

---
 .../python-modules/google-cloud-datacatalog/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index c0d307c942d6..bcf48bb812d5 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datacatalog";
-  version = "3.23.0";
+  version = "3.24.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_datacatalog";
     inherit version;
-    hash = "sha256-Rpx5+Mv+KTvJdposPJg+J/GNmHoj0I1jBp6YUOlcXmI=";
+    hash = "sha256-JYcOb+suHqXNPGNoGhXm1GI33UWFM3lo766HXf9mek8=";
   };
 
   build-system = [ setuptools ];

From 36f1e00474ab38f508d96d36e2145c6faccb63d5 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Fri, 1 Nov 2024 09:15:20 +1100
Subject: [PATCH 0437/1504] R: 4.4.1 -> 4.4.2

---
 pkgs/applications/science/math/R/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 33ea13322db6..5f2ad1b74b96 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "R";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = let
     inherit (finalAttrs) pname version;
   in fetchurl {
     url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-tMtnXequtymdOyZdIYzeQ/GSlRzluJt7saUUijay2U0=";
+    sha256 = "sha256-FXjNYD6NhmtYdD5J2L+ZxWnoEHm2pgzzPN973/64F+w=";
   };
 
   outputs = [ "out" "tex" ];

From a63ec8ff99dd0096cdc32ececb9b82a3121e6693 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 20:58:45 +0000
Subject: [PATCH 0438/1504] python312Packages.pyathena: 3.10.0 -> 3.12.0

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

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index 58ea74488def..6b24ca4deeb0 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "3.10.0";
+  version = "3.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-paFTmhPGr2qz1CK425tbSHEbexcl+lqmgoL6RZmfC2o=";
+    hash = "sha256-QASQXfDcReVNN1cRLmndhgY8Xkx5Q+z0lJXYdYV903E=";
   };
 
   build-system = [ hatchling ];

From f3e154aa734cfd0e2a8d12a4fc3d929abe94def2 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 26 Dec 2024 21:18:17 +0000
Subject: [PATCH 0439/1504] hal-hardware-analyzer: fix gcc-14 build

add missing include <algorithm>
`https://github.com/emsec/hal/issues/602`
---
 .../science/electronics/hal-hardware-analyzer/default.nix       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 9d1c447c9c84..1f42d5ae2a62 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
     shopt -s extglob
     rm -rf deps/!(abc|sanitizers-cmake|subprocess)/*
     shopt -u extglob
+    # https://github.com/emsec/hal/issues/602
+    sed -i 1i'#include <algorithm>' include/hal_core/utilities/utils.h
   '';
 
   nativeBuildInputs = [

From ee9bcc1d90a609c5e5cc964f2a098fa3b811f5cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 21:38:15 +0000
Subject: [PATCH 0440/1504] trippy: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index 1bc73ec2848f..5f5b6d3e2c4b 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "trippy";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "fujiapple852";
     repo = "trippy";
     rev = version;
-    hash = "sha256-0JV8Lvl8j1PWvhVnAs8YXwV5b0LWpHPKQpeGL/NetnQ=";
+    hash = "sha256-Kn694KUCl2fYl8BkYUgRPxNx9LW/IVOsmA5mE9cS/nQ=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  cargoHash = "sha256-0+Vq6I9m4YWfrdtWBlbhCwxsLnavDsNpMHVIide6aPY=";
+  cargoHash = "sha256-+lvh2HHW2yAI8rT07yCz4hL+ESXnjKXsskbgTvFPJZQ=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     local INSTALL="$out/bin/trip"

From eb46f107af50a54d18a9dcc6c8f9327e05507941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 10 Dec 2024 17:33:05 +0100
Subject: [PATCH 0441/1504] nixos/hydra: fix hydra-compress-logs choking up on
 quoting when using zstd

---
 .../services/continuous-integration/hydra/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 45d6b2428a46..456bd136d1d9 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -515,12 +515,12 @@ in
           ''
             set -eou pipefail
             compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf)
-            if [[ $compression == "" ]]; then
-              compression="bzip2"
+            if [[ $compression == "" || $compression == bzip2 ]]; then
+              compressionCmd=(bzip2)
             elif [[ $compression == zstd ]]; then
-              compression="zstd --rm"
+              compressionCmd=(zstd --rm)
             fi
-            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "$compression" --force --quiet
+            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "''${compressionCmd[@]}" --force --quiet
           '';
         startAt = "Sun 01:45";
         serviceConfig.Slice = "system-hydra.slice";

From edb59b6d8e0b1d3595887d29863140b429e51b85 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 10 Dec 2024 22:21:59 +0000
Subject: [PATCH 0442/1504] buildbot: 4.1.0 -> 4.2.0

https://github.com/buildbot/buildbot/releases/tag/v4.2.0
---
 .../allow_git_urls_to_be_renderable_again.patch   | 15 +++++++++++++++
 .../continuous-integration/buildbot/master.nix    |  7 +++++--
 .../continuous-integration/buildbot/plugins.nix   | 12 ++++++------
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch

diff --git a/pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch b/pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch
new file mode 100644
index 000000000000..1fadce445163
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch
@@ -0,0 +1,15 @@
+diff --git a/master/buildbot/util/git.py b/master/buildbot/util/git.py
+index 0ed9ac3037f..49ef359537c 100644
+--- a/master/buildbot/util/git.py
++++ b/master/buildbot/util/git.py
+@@ -67,8 +67,8 @@ def getSshCommand(keyPath, knownHostsPath):
+ 
+ 
+ def scp_style_to_url_syntax(address, port=22, scheme='ssh'):
+-    if any(['://' in address, ':\\' in address, ':' not in address]):
+-        # the address already has a URL syntax or is a local path
++    if not isinstance(address, str) or any(['://' in address, ':\\' in address, ':' not in address]):
++        # the address already has a URL syntax or is a local path or is a renderable
+         return address
+     host, path = address.split(':')
+     return f'{scheme}://{host}:{port}/{path}'
diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index e5bfb0f9c4cc..1d624c3fc17e 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -76,7 +76,7 @@ let
 in
 buildPythonApplication rec {
   pname = "buildbot";
-  version = "4.1.0";
+  version = "4.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -85,7 +85,7 @@ buildPythonApplication rec {
     owner = "buildbot";
     repo = "buildbot";
     rev = "v${version}";
-    hash = "sha256-RPg4eXqpm/F1SSoB4MVo61DgZv/iE2R4VtCkUU69iA8=";
+    hash = "sha256-eraNF2J5x04qQESkned/2Io9gb2ZL9XzUfWHwSGErNY=";
   };
 
   build-system = [
@@ -143,6 +143,9 @@ buildPythonApplication rec {
     # This patch disables the test that tries to read /etc/os-release which
     # is not accessible in sandboxed builds.
     ./skip_test_linux_distro.patch
+
+    # https://github.com/buildbot/buildbot/issues/8274
+    ./allow_git_urls_to_be_renderable_again.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
index 1faf0e56eafe..c13060fac8df 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix
@@ -18,7 +18,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-+ZiOkTZLdwqsZfApW6aQxoNkbcFCaB4BHEjMTZIl+Rg=";
+      hash = "sha256-pd6ZzrFHKB/acffuM7TxUtXRsZTMIyoUWVqIiilJH/s=";
     };
 
     # Remove unnecessary circular dependency on buildbot
@@ -48,7 +48,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-IgG/afjU//zrcHuTXMBLlz1gCmB31fWaECIm+UqaMgA=";
+      hash = "sha256-XfELWX6d4Lat5ByNcsdw9qJd7FjUGL8GRqJkWHKjoTI=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -70,7 +70,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-E0yFY3PtTZ8XtJGDMh0aRljhTNsWHqHQzcBORTgrCIA=";
+      hash = "sha256-1osf0WefIjogFk3BqRsX/pjVIzvd18W/NG8LyuFMI/U=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -92,7 +92,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-KR4M7RSULCM1aS7vYjWuMXIHGpO+xFjfhC8+YncAmlE=";
+      hash = "sha256-3BqQTTj6WPbmHr6bzR4PcVnl8WcTKokY1YHLuwHYqLw=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -114,7 +114,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-L7DayDddqrwOyBwgy4w1waCL+49GMtdrCdZNpcLrFXk=";
+      hash = "sha256-tZBsyaBhewXs0PWxJMtPJ3yv8Z3dS1wESmJI0beMG28=";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -136,7 +136,7 @@
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-CnRTSnwhSj6cjrATUuVerGrqt7XxJZYgC5XjUC4+Xrs=";
+      hash = "sha256-oQ+exQ4eiF+y9JiYPXbJf9azJVgFZgbBby4MRcBLZgQ=";
     };
 
     buildInputs = [ buildbot-pkg ];

From f1d8b891b83758e8d3809484cba6d96a3ce83b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 Dec 2024 00:30:43 +0100
Subject: [PATCH 0443/1504] youtube-music: 3.6.2 -> 3.7.1

Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.0
Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.1
---
 pkgs/applications/audio/youtube-music/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index b3cf7a032fad..8f9deb27dd5e 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -13,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "youtube-music";
-  version = "3.6.2";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "th-ch";
     repo = "youtube-music";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S13f3vGMQJvpJbdfUstJlA8MfY5Q1efRA7QcPXYvhMI=";
+    hash = "sha256-IV8uTfogy4LchZYIMqDDT96N+5NYE/jwSFc18EhFCb0=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-brHNp19BEYzgxhdNnn7n1GYhBdyi3S/2VqvKWXmKGX8=";
+    hash = "sha256-ET4NDUtsTTY3t06VSJLa8Cjd6fP4zs71w83FlsJnq1U=";
   };
 
   nativeBuildInputs = [

From 5228a3f83a476a50b3be5b674ce12d2f16673b59 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 00:22:16 +0100
Subject: [PATCH 0444/1504] rPackages: fixed script to generate rPackages set

---
 pkgs/development/r-modules/generate-r-packages.R | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index fb15ec40ad22..57f55a6eb65b 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -16,9 +16,9 @@ locale <- Sys.setlocale(locale = "C")
 biocVersion <- BiocManager:::.version_map()
 biocVersion <- biocVersion[biocVersion$R == getRversion()[, 1:2],c("Bioc", "BiocStatus")]
 if ("release" %in% biocVersion$BiocStatus) {
-  biocVersion <-  as.numeric(as.character(biocVersion[biocVersion$BiocStatus == "release", "Bioc"]))
+  biocVersion <-  as.character(biocVersion[biocVersion$BiocStatus == "release", "Bioc"])
 } else {
-  biocVersion <-  max(as.numeric(as.character(biocVersion$Bioc)))
+  biocVersion <-  max(as.character(biocVersion$Bioc))
 }
 
 mirrorUrls <- list( bioc=paste0("http://bioconductor.org/packages/", biocVersion, "/bioc/src/contrib/")
@@ -115,4 +115,3 @@ if (mirrorType != "cran") {
 cat(toJSON(list(extraArgs=extraArgs, packages=c(pkgs, brokenPkgs)), pretty=TRUE))
 cat("\n")
 write("done", stderr())
-

From 3546c2f64dd884856c1f424bd664f25a971d5b91 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Fri, 1 Nov 2024 11:20:58 +1100
Subject: [PATCH 0445/1504] rPackages: CRAN and BioC update

---
 .../r-modules/bioc-annotation-packages.json   |  1000 +-
 .../r-modules/bioc-experiment-packages.json   |  5368 ++--
 pkgs/development/r-modules/bioc-packages.json | 12113 +++++----
 pkgs/development/r-modules/cran-packages.json | 21210 ++++++++++------
 4 files changed, 23663 insertions(+), 16028 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-annotation-packages.json b/pkgs/development/r-modules/bioc-annotation-packages.json
index 1f127a974408..b4585525f563 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.json
+++ b/pkgs/development/r-modules/bioc-annotation-packages.json
@@ -1,6 +1,6 @@
 {
   "extraArgs": {
-    "biocVersion": "3.19"
+    "biocVersion": "3.20"
   },
   "packages": {
     "AHCytoBands": {
@@ -11,8 +11,8 @@
     },
     "AHEnsDbs": {
       "name": "AHEnsDbs",
-      "version": "1.5.1",
-      "sha256": "02gvrlfld6y03gcw7931fplm220dhnhh12xljb0xm6f3inl0vwa6",
+      "version": "1.6.0",
+      "sha256": "1l62703d0czlysvxggvzsqfn1cgjgim7vd0wgzav70vj572z2bs5",
       "depends": ["AnnotationHubData", "ensembldb"]
     },
     "AHLRBaseDbs": {
@@ -401,14 +401,14 @@
     },
     "BSgenome_Hsapiens_UCSC_hg17": {
       "name": "BSgenome.Hsapiens.UCSC.hg17",
-      "version": "1.3.1000",
-      "sha256": "1q8p0zp5xpp22znwnygl3jhc159db4q3kkpj5wfij5a6z19zs1w3",
+      "version": "1.3.1001",
+      "sha256": "10vxkdr7vjbyginq5dnw6199l6kwvis45dhl9khh4aywv9l0ky0x",
       "depends": ["BSgenome"]
     },
     "BSgenome_Hsapiens_UCSC_hg17_masked": {
       "name": "BSgenome.Hsapiens.UCSC.hg17.masked",
-      "version": "1.3.99",
-      "sha256": "1pg39kmbmnync0xxdbgsn6gpz78hfbzd7iffidpv8mfk734srwzn",
+      "version": "1.3.999",
+      "sha256": "0mycmcp6j0zl3nw8fwypc94i9v1ii910myyr2ipawxi3yb3ch136",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg17"]
     },
     "BSgenome_Hsapiens_UCSC_hg18": {
@@ -881,8 +881,8 @@
     },
     "GO_db": {
       "name": "GO.db",
-      "version": "3.19.1",
-      "sha256": "199vk4y069yik7fn25pp73nkhs1vaw9km9rcmm1cirncwm2n0vhg",
+      "version": "3.20.0",
+      "sha256": "1p0hw5j6a7q7pgp7l40rs27ci16n6jpyd39irhrpys94hqrqx5pz",
       "depends": ["AnnotationDbi"]
     },
     "GeneSummary": {
@@ -893,8 +893,8 @@
     },
     "GenomeInfoDbData": {
       "name": "GenomeInfoDbData",
-      "version": "1.2.12",
-      "sha256": "0md3jl5bz4d2wkvf4yra7rydf5dgykrijrdqwwxc7f77l30nsmgp",
+      "version": "1.2.13",
+      "sha256": "0kh7yxk8aqadv9xdnvrp2ysa1xxxgjqkj83w3bw1w9k55r1kr8si",
       "depends": []
     },
     "GenomicState": {
@@ -905,9 +905,9 @@
     },
     "HDO_db": {
       "name": "HDO.db",
-      "version": "0.99.1",
-      "sha256": "14ngyxailmxrbxqqi9m7mchqcvchmbg7zm34i8a927b20s6z4z61",
-      "depends": ["AnnotationDbi"]
+      "version": "1.0.0",
+      "sha256": "0h026xkncm8nc1q8z7qk3nlw445rf3dncaf20b80x7xfl2nm3f84",
+      "depends": ["AnnotationDbi", "DBI"]
     },
     "HPO_db": {
       "name": "HPO.db",
@@ -1035,6 +1035,18 @@
       "sha256": "1z4b15x8cai27cqhl2lhl02nx0lv8q5c1774vdvvdajx2hivn77l",
       "depends": ["minfi"]
     },
+    "IlluminaHumanMethylationMSAanno_ilm10a1_hg38": {
+      "name": "IlluminaHumanMethylationMSAanno.ilm10a1.hg38",
+      "version": "0.1.0",
+      "sha256": "07vzgmzf4sshva1xchxfzvks7qd6png63vzi2vvawalsbh7nmibw",
+      "depends": ["minfi"]
+    },
+    "IlluminaHumanMethylationMSAmanifest": {
+      "name": "IlluminaHumanMethylationMSAmanifest",
+      "version": "0.1.0",
+      "sha256": "01q7i5a2zc9pby9ivsqq8pdp80732akq4g8d594h9dn6qgm0znz3",
+      "depends": ["minfi"]
+    },
     "JASPAR2018": {
       "name": "JASPAR2018",
       "version": "1.1.1",
@@ -1085,8 +1097,8 @@
     },
     "MPO_db": {
       "name": "MPO.db",
-      "version": "0.99.7",
-      "sha256": "0x1rcikg189akbd71yh0p02482km9hry6i69s2srdf5mlgqficvl",
+      "version": "0.99.8",
+      "sha256": "1aaz4s8ydcqxx5qwfqxxs7fc20bjbdjxzg700gwd59kjgk6ijm92",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "DBI"]
     },
     "MafDb_1Kgenomes_phase1_GRCh38": {
@@ -1173,12 +1185,6 @@
       "sha256": "0y42ncmilijdxsgqsmskz7gff3il3fdf2kpflknmz1z9kybzaday",
       "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "IRanges", "S4Vectors"]
     },
-    "MafH5_gnomAD_v3_1_2_GRCh38": {
-      "name": "MafH5.gnomAD.v3.1.2.GRCh38",
-      "version": "3.15.1",
-      "sha256": "1q9hlva814sjfz8vm9bzw7xzppbcfy5qq7nnz9w742yr59cjb6mp",
-      "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "S4Vectors", "rhdf5"]
-    },
     "MafH5_gnomAD_v4_0_GRCh38": {
       "name": "MafH5.gnomAD.v4.0.GRCh38",
       "version": "3.19.0",
@@ -1229,8 +1235,8 @@
     },
     "Orthology_eg_db": {
       "name": "Orthology.eg.db",
-      "version": "3.19.1",
-      "sha256": "1zg50j46kka5y0mfgqw3vh5xibd3yk7ay051dnci6mgd7v9gns5w",
+      "version": "3.20.0",
+      "sha256": "0876srbhjg872v46373p4bjy9kxpyqncbysc577bn2zf7miaxsal",
       "depends": ["AnnotationDbi"]
     },
     "PANTHER_db": {
@@ -1241,8 +1247,8 @@
     },
     "PFAM_db": {
       "name": "PFAM.db",
-      "version": "3.19.1",
-      "sha256": "0jjba22p8x4cfnihsa3gah3amdr4yrqpfm0zfr990jcjkvf94wvk",
+      "version": "3.20.0",
+      "sha256": "0ibhdvb7vc2s70n6dq13357y9fgvkg0bdjxcq13n9rqajk6bmaw6",
       "depends": ["AnnotationDbi"]
     },
     "POCRCannotation_db": {
@@ -1359,6 +1365,12 @@
       "sha256": "1qk4frv4hn3pfwbhqd92r8d59ksvgzs9399w4ca7knmij6zzl73p",
       "depends": ["AnnotationDbi", "DBI", "org_Hs_eg_db"]
     },
+    "TENET_AnnotationHub": {
+      "name": "TENET.AnnotationHub",
+      "version": "0.99.4",
+      "sha256": "0kfdwxbxi4y773nknpd712wz3zcqbigkycnsrrd40jp04my91mpm",
+      "depends": ["AnnotationHub", "GenomicRanges"]
+    },
     "TxDb_Athaliana_BioMart_plantsmart22": {
       "name": "TxDb.Athaliana.BioMart.plantsmart22",
       "version": "3.0.1",
@@ -1505,8 +1517,8 @@
     },
     "TxDb_Hsapiens_UCSC_hg38_knownGene": {
       "name": "TxDb.Hsapiens.UCSC.hg38.knownGene",
-      "version": "3.18.0",
-      "sha256": "0ak6acjll2djamakpn60ks47lfs2y0r8xwhjazj6fvch34xkc2d5",
+      "version": "3.20.0",
+      "sha256": "15qmd51wcjhwzg3w1s13ky39km0waypwzipvr4cisvhvkbr7sqn4",
       "depends": ["AnnotationDbi", "GenomicFeatures"]
     },
     "TxDb_Hsapiens_UCSC_hg38_refGene": {
@@ -1547,8 +1559,8 @@
     },
     "TxDb_Mmusculus_UCSC_mm39_knownGene": {
       "name": "TxDb.Mmusculus.UCSC.mm39.knownGene",
-      "version": "3.18.0",
-      "sha256": "061rfyddq15sz684jchvwxww1ipi94xljcgwbz4a92k8i9cnysva",
+      "version": "3.20.0",
+      "sha256": "1bvq9msb9z7j82gf37lfgxjl24qbvs7ydndil3c110jzaja2yn00",
       "depends": ["AnnotationDbi", "GenomicFeatures"]
     },
     "TxDb_Mmusculus_UCSC_mm39_refGene": {
@@ -1703,14 +1715,14 @@
     },
     "anopheles_db0": {
       "name": "anopheles.db0",
-      "version": "3.19.1",
-      "sha256": "190yjnl86b6vm2xmdfm43hn5xy7jsf83rwd103v537y4qhxdy0yq",
+      "version": "3.20.0",
+      "sha256": "07vfxbvw41w7600xv70bnh37wxxwsbkkhihypmibprxmwibf7dvp",
       "depends": ["AnnotationDbi"]
     },
     "arabidopsis_db0": {
       "name": "arabidopsis.db0",
-      "version": "3.19.1",
-      "sha256": "1fi4akbk7yc6drkdwp0dfaxdn5axg1c5qp9b445318zszdylxbd3",
+      "version": "3.20.0",
+      "sha256": "15rcqa844plk5hg1pagry4ybhbcq41n3lccqprmvvlxw5xsrhkv4",
       "depends": ["AnnotationDbi"]
     },
     "ath1121501_db": {
@@ -1757,8 +1769,8 @@
     },
     "bovine_db0": {
       "name": "bovine.db0",
-      "version": "3.19.1",
-      "sha256": "1qyhzbr81r302xnzg76njwj3b88rrbk02qsxsrg7728qwpwd412v",
+      "version": "3.20.0",
+      "sha256": "0z6g9kn85v88mm94qm4j0m6081qjqqrdwnxgz8j0i85cyw2l730q",
       "depends": ["AnnotationDbi"]
     },
     "bovinecdf": {
@@ -1811,8 +1823,8 @@
     },
     "canine_db0": {
       "name": "canine.db0",
-      "version": "3.19.1",
-      "sha256": "0qagfxza04zncjrd97b0mrqrd5jchifv1pxbzv3npdp0801yym2f",
+      "version": "3.20.0",
+      "sha256": "1lllajhmmics9jvdympy8fx54wdan9ipcmwpq5sfm3ncm5bh10bj",
       "depends": ["AnnotationDbi"]
     },
     "canine2_db": {
@@ -1871,8 +1883,8 @@
     },
     "chicken_db0": {
       "name": "chicken.db0",
-      "version": "3.19.1",
-      "sha256": "1qba9s4fmh17b3g6z6jfb2cdby0mhc80xjj0r9a2wvd8qlm5gyw1",
+      "version": "3.20.0",
+      "sha256": "0s8ag58f5xfcyvhx6cgg95dmkgdllvmz4s5vd24g4rn1l4ikvrw9",
       "depends": ["AnnotationDbi"]
     },
     "chickencdf": {
@@ -1889,8 +1901,8 @@
     },
     "chimp_db0": {
       "name": "chimp.db0",
-      "version": "3.19.1",
-      "sha256": "1vsb2235k00jxmff9i7lbc3kmiqkz5xvm21bzhryql7kgy5i64yf",
+      "version": "3.20.0",
+      "sha256": "1jx6cl4l226yp3fjd1md034bdmif8yg0f1bjivsqbb6mxrvdypa1",
       "depends": ["AnnotationDbi"]
     },
     "chromhmmData": {
@@ -2033,14 +2045,14 @@
     },
     "ecoliK12_db0": {
       "name": "ecoliK12.db0",
-      "version": "3.19.1",
-      "sha256": "0fi0cxl5hj5mx2z2r0j86qf3bfx1dz8abn86maim9b1l89whvqwd",
+      "version": "3.20.0",
+      "sha256": "168byg9z4chby69cxkgmih3q5bad9shcmhmcn5b27qqyg737r29f",
       "depends": ["AnnotationDbi"]
     },
     "ecoliSakai_db0": {
       "name": "ecoliSakai.db0",
-      "version": "3.19.1",
-      "sha256": "1kqpmmddqyfjx2y2kbp53mv1vazbjhpwl3crpx2iq0q1b2ynb63f",
+      "version": "3.20.0",
+      "sha256": "0nmjqxmic1crpy2rhjn86ls68j2w1x67sbc8q5j42zm75crb752k",
       "depends": ["AnnotationDbi"]
     },
     "ecoliasv2cdf": {
@@ -2081,8 +2093,8 @@
     },
     "fly_db0": {
       "name": "fly.db0",
-      "version": "3.19.1",
-      "sha256": "0726vpqc092mq9j23ghvy5yjg3v6fm26fynlad5k4wshyfw1szxk",
+      "version": "3.20.0",
+      "sha256": "0nsxzbxg284jg9gd9fnn55qhsw7lbsnywwyh5dp9ssmmhwf746ix",
       "depends": ["AnnotationDbi"]
     },
     "geneplast_data": {
@@ -2879,8 +2891,8 @@
     },
     "human_db0": {
       "name": "human.db0",
-      "version": "3.19.1",
-      "sha256": "006q28yvh8l5h7pa9qdhcvjd9049bzg1v5nnvphivwn186hv47ww",
+      "version": "3.20.0",
+      "sha256": "0l4nlgnwwxrizbywzd1n3nq0p98l32hm93kk250l6hwh9jacmi6b",
       "depends": ["AnnotationDbi"]
     },
     "human1mduov3bCrlmm": {
@@ -3107,8 +3119,8 @@
     },
     "malaria_db0": {
       "name": "malaria.db0",
-      "version": "3.19.1",
-      "sha256": "0gyx0s801pzhcaa0hqbcj69hjgz63b6d764wiflpdg90c79db2is",
+      "version": "3.20.0",
+      "sha256": "1m2s9pa0xhcgvxxz240chl3qscdy7bsk8f6wf27svws6h4d0zvrc",
       "depends": ["AnnotationDbi"]
     },
     "medicagocdf": {
@@ -3437,8 +3449,8 @@
     },
     "mouse_db0": {
       "name": "mouse.db0",
-      "version": "3.19.1",
-      "sha256": "00payj4mc0z5s5iv8ai8w1vg2j68xi12qbg4yxcyjc69vslcgpv0",
+      "version": "3.20.0",
+      "sha256": "1xx66q0mgylyapflczrnmci933byb24b6psiqybx2a8zd2mw9i87",
       "depends": ["AnnotationDbi"]
     },
     "mouse4302_db": {
@@ -3665,80 +3677,80 @@
     },
     "org_Ag_eg_db": {
       "name": "org.Ag.eg.db",
-      "version": "3.19.1",
-      "sha256": "1j8aaraq4wrj633kwfldycsshyygx1k5bvacpha5qg6g7c00bb79",
+      "version": "3.20.0",
+      "sha256": "0r5flj8h3w0hxacwdk4hq54r0dvjnj6fyv31m22x7ld7c466awf0",
       "depends": ["AnnotationDbi"]
     },
     "org_At_tair_db": {
       "name": "org.At.tair.db",
-      "version": "3.19.1",
-      "sha256": "0g4b2h08z4fy2wq9nskgp3h5vffs9zk3xx1ax1l86wl16ji2591x",
+      "version": "3.20.0",
+      "sha256": "01cchwj03hq8jng0xaxwc96ibbmrrai26hnp61g8bxlfgnn5zh4k",
       "depends": ["AnnotationDbi"]
     },
     "org_Bt_eg_db": {
       "name": "org.Bt.eg.db",
-      "version": "3.19.1",
-      "sha256": "0rbbjv47fadc6jgpqrimsd91f35fw6sw8d805vf61nx5xhbl3lpc",
+      "version": "3.20.0",
+      "sha256": "0ryfpblhpqzkww1xb63k2c5ki8xh73as8fwl8f8kvsy4x7axfr5g",
       "depends": ["AnnotationDbi"]
     },
     "org_Ce_eg_db": {
       "name": "org.Ce.eg.db",
-      "version": "3.19.1",
-      "sha256": "0vg6nw4qzj8janmkv6k2z471m3l4xnd1h232h0w5i53b20c7p6ys",
+      "version": "3.20.0",
+      "sha256": "1r7fzzrqcas23bxcd55ppflx0ls1biifis3qj36iv5gwhhwimq3i",
       "depends": ["AnnotationDbi"]
     },
     "org_Cf_eg_db": {
       "name": "org.Cf.eg.db",
-      "version": "3.19.1",
-      "sha256": "07grx4zgba2q4xgs9x7j3ryy12xkl32mzzgfgivxq68xg7ipj2fk",
+      "version": "3.20.0",
+      "sha256": "0sf7lyh16mbh1h986dkbdci5rmkvg1rj80far1grcd2hwpdgaq7s",
       "depends": ["AnnotationDbi"]
     },
     "org_Dm_eg_db": {
       "name": "org.Dm.eg.db",
-      "version": "3.19.1",
-      "sha256": "1sqw38z73sgq66x8qrb5xw0jxyimy7l1hs2iwm7xq9ylzrjw3yj0",
+      "version": "3.20.0",
+      "sha256": "1v21rx7kpdi30898jbnvg1cd3xgghvqhkiipkasn5wjz22z1lqna",
       "depends": ["AnnotationDbi"]
     },
     "org_Dr_eg_db": {
       "name": "org.Dr.eg.db",
-      "version": "3.19.1",
-      "sha256": "041hp3xhkiwh8vb4zq5kwvrsmp8paqlri6gaj1qy0a5zjlkw0fl6",
+      "version": "3.20.0",
+      "sha256": "0ayva6p2qav16s4nvngxqi8zwl4ylrl5riww3lwc2dql0kkgbvrs",
       "depends": ["AnnotationDbi"]
     },
     "org_EcK12_eg_db": {
       "name": "org.EcK12.eg.db",
-      "version": "3.19.1",
-      "sha256": "1af2yrbpn58z34jq39qmmwprzsffgxbrs84dsxny4rksa8k6j70s",
+      "version": "3.20.0",
+      "sha256": "0qd6ppvcpsprbw8c9rp3fx5i8cs6gv0n4mqwxwjs1421p19m1bqd",
       "depends": ["AnnotationDbi"]
     },
     "org_EcSakai_eg_db": {
       "name": "org.EcSakai.eg.db",
-      "version": "3.19.1",
-      "sha256": "02wbh31iqdywy0gqj43l9faijxagsa3fcgcx7y8mafwpgd7aqr7m",
+      "version": "3.20.0",
+      "sha256": "1dqs6lkjlyy32pg3qiv6ll1mqbs4h0j0wkkn1zwdnban6migv1y2",
       "depends": ["AnnotationDbi"]
     },
     "org_Gg_eg_db": {
       "name": "org.Gg.eg.db",
-      "version": "3.19.1",
-      "sha256": "0fnxscjps85jmd683212hsp6rs5f4bybcxj8xfqggi4l87fkzng0",
+      "version": "3.20.0",
+      "sha256": "1v22p36gxjs4fjc4zamaj4h10qvhknvz22chlnjqn4lisifpg325",
       "depends": ["AnnotationDbi"]
     },
     "org_Hs_eg_db": {
       "name": "org.Hs.eg.db",
-      "version": "3.19.1",
-      "sha256": "1xrbf0zmik1j70i6bg5wqvfwz4vcf3vgypan36r1lv6lspsfychr",
+      "version": "3.20.0",
+      "sha256": "1gykdrfkzvx83bkpbggsnk8gd0w9xh5g071r3ngykjh5x36w6dlc",
       "depends": ["AnnotationDbi"]
     },
     "org_Mm_eg_db": {
       "name": "org.Mm.eg.db",
-      "version": "3.19.1",
-      "sha256": "12d8lrf6bxvqzfxzdbxqmjcywy2myhwhi99kxdwpijsczxxfikj7",
+      "version": "3.20.0",
+      "sha256": "1wlc34qq0hv9fmdw810jc26gyf7ibicy8rsbll4is7bp2i1hxk47",
       "depends": ["AnnotationDbi"]
     },
     "org_Mmu_eg_db": {
       "name": "org.Mmu.eg.db",
-      "version": "3.19.1",
-      "sha256": "0fz2rrw52nsa2mnl3gmx3ap9zjj0w37zyzwnvxzhmi6wmamr1nk4",
+      "version": "3.20.0",
+      "sha256": "0qpzslrjd77s4zgv68pmkm2kbbrb0h8ginzp9wppsnb58qvbz4nv",
       "depends": ["AnnotationDbi"]
     },
     "org_Mxanthus_db": {
@@ -3749,38 +3761,38 @@
     },
     "org_Pf_plasmo_db": {
       "name": "org.Pf.plasmo.db",
-      "version": "3.19.1",
-      "sha256": "1klkhazb4rbmnpp3ywj266202740p1c0xsi6dlz84r2cxsrvw1kn",
+      "version": "3.20.0",
+      "sha256": "1n8xs8l9ggg18x8gkhf6pr0ic6sgdf63gbfrm6w5ixzmwdfazq90",
       "depends": ["AnnotationDbi"]
     },
     "org_Pt_eg_db": {
       "name": "org.Pt.eg.db",
-      "version": "3.19.1",
-      "sha256": "1l17ys29ms7iiyflhbk47nvy069rrjpz2f1b5cbfklpr0lzy583b",
+      "version": "3.20.0",
+      "sha256": "05hkhwjh5r18wpk60vwk06bfra6fwrnrr0jshc71hzr6cc15jqfk",
       "depends": ["AnnotationDbi"]
     },
     "org_Rn_eg_db": {
       "name": "org.Rn.eg.db",
-      "version": "3.19.1",
-      "sha256": "0bq42q2j4jddzi2s4lzhmzplbhkd2drw6545ffhcpi4r7ryrzqkn",
+      "version": "3.20.0",
+      "sha256": "009c22ry5nnklzdc5dywnf8lq41cj3141yr5vw1kgifys6lanj01",
       "depends": ["AnnotationDbi"]
     },
     "org_Sc_sgd_db": {
       "name": "org.Sc.sgd.db",
-      "version": "3.19.1",
-      "sha256": "1sbjwyf0ibivdhhxsaljgqa4lqp3hcf8gcrlcm2vd78bfm5cm7bg",
+      "version": "3.20.0",
+      "sha256": "0p7mvra93l21pb14qbvqjg7pwl6n572d8a3k15v9fsafikd07v8a",
       "depends": ["AnnotationDbi"]
     },
     "org_Ss_eg_db": {
       "name": "org.Ss.eg.db",
-      "version": "3.19.1",
-      "sha256": "0cdql2zvgsrirpby6vahkfxqwnfpbs1hmfl55j8i4n4dv184cbhf",
+      "version": "3.20.0",
+      "sha256": "0ls2w86r06rwdvmgsv54fksp0wk9nk0a88xaljx85d2x0x5vfkwj",
       "depends": ["AnnotationDbi"]
     },
     "org_Xl_eg_db": {
       "name": "org.Xl.eg.db",
-      "version": "3.19.1",
-      "sha256": "0xl3xg4sa5fc7ms6c61pq633y45p2ayh8l02ws1k2yadcmykajrh",
+      "version": "3.20.0",
+      "sha256": "0g20n9c1rrh82w809sisrwm05jzldzqyzvmjj5rfv23i158rjhc2",
       "depends": ["AnnotationDbi"]
     },
     "paeg1acdf": {
@@ -4859,8 +4871,8 @@
     },
     "pig_db0": {
       "name": "pig.db0",
-      "version": "3.19.1",
-      "sha256": "10s39hcyia1w2wik2yxlalnli8a3bw8siqbrnmfyh0hx50plhhmv",
+      "version": "3.20.0",
+      "sha256": "0mlc62dj7im85czy9idqfld510d3dfygqm03sx9s8lksb0ib0g7n",
       "depends": ["AnnotationDbi"]
     },
     "plasmodiumanophelescdf": {
@@ -5039,8 +5051,8 @@
     },
     "rat_db0": {
       "name": "rat.db0",
-      "version": "3.19.1",
-      "sha256": "0vl2an3b00h94z1ba29fz83q04p4n641qs4xgp53zz3jg8lgm4si",
+      "version": "3.20.0",
+      "sha256": "0515r25qj1gca0rr2cydn3rzwxrifbfpx354chj94rl0xz2ppk3n",
       "depends": ["AnnotationDbi"]
     },
     "rat2302_db": {
@@ -5087,8 +5099,8 @@
     },
     "reactome_db": {
       "name": "reactome.db",
-      "version": "1.88.0",
-      "sha256": "1fwbf53vklhvqa6n6pijb8xqyv2pap1hskkirnm5c42wmd6g4ql7",
+      "version": "1.89.0",
+      "sha256": "1r4h9wdm3h99b9w18kihma8n9hprxqp1il5k43cfrf191l6wic38",
       "depends": ["AnnotationDbi"]
     },
     "rgu34a_db": {
@@ -5171,8 +5183,8 @@
     },
     "rhesus_db0": {
       "name": "rhesus.db0",
-      "version": "3.19.1",
-      "sha256": "1687fgxx9rj1ghjg7vhmli360algh6piwafdsi4l347sl1yhklcd",
+      "version": "3.20.0",
+      "sha256": "09b8lqna4vp92dwjs6cqw71kfb7w31zaph6x47l2aq0phn0zr0q4",
       "depends": ["AnnotationDbi"]
     },
     "rhesuscdf": {
@@ -5411,14 +5423,14 @@
     },
     "worm_db0": {
       "name": "worm.db0",
-      "version": "3.19.1",
-      "sha256": "1v24lpw3kfzlzq577vqpqy5bypwfkw1khag7smpq9bgv8dmfcx8r",
+      "version": "3.20.0",
+      "sha256": "1r5man0ad7gkl0444ys7r60jiandb93i6d23g4vx5p31a2ih07jj",
       "depends": ["AnnotationDbi"]
     },
     "xenopus_db0": {
       "name": "xenopus.db0",
-      "version": "3.19.1",
-      "sha256": "1d6bhq0ppgm087zkh4nmm3qx6f2mp0lblhzvayc6fqyzrzanvjiy",
+      "version": "3.20.0",
+      "sha256": "1pk2i3rl421hs79s6rzaxlha6x41ggq2k3salm73p3f4xymzrpc6",
       "depends": ["AnnotationDbi"]
     },
     "xenopuslaeviscdf": {
@@ -5489,8 +5501,8 @@
     },
     "yeast_db0": {
       "name": "yeast.db0",
-      "version": "3.19.1",
-      "sha256": "00zbg60zn0yzmfdm017al4hbncrlsdfb5syj8mfxha3522q1114h",
+      "version": "3.20.0",
+      "sha256": "0wvk457jlw05g28f158bd49ymri13x0mbbr6gif8msrj78zkdi3j",
       "depends": ["AnnotationDbi"]
     },
     "yeast2_db": {
@@ -5543,8 +5555,8 @@
     },
     "zebrafish_db0": {
       "name": "zebrafish.db0",
-      "version": "3.19.1",
-      "sha256": "1bg35zyxdvdhv0a1l5v61z6g0vz2h2ikad4lyv4akrmwndcrxijy",
+      "version": "3.20.0",
+      "sha256": "08w5hcpq71gfwzai0niyxd27pay2755nywqxjh5kxb8l050kpjnf",
       "depends": ["AnnotationDbi"]
     },
     "zebrafishcdf": {
@@ -5559,6 +5571,20 @@
       "sha256": "1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0",
       "depends": ["AnnotationDbi"]
     },
+    "IlluminaHumanMethylation450k_db": {
+      "name": "IlluminaHumanMethylation450k.db",
+      "version": "2.0.9",
+      "sha256": "1zmm65qnm95w9c8z30c9vncca451npbhhnlkpkpp894svsakxziz",
+      "depends": ["AnnotationDbi", "org_Hs_eg_db"],
+      "broken": true
+    },
+    "KEGG_db": {
+      "name": "KEGG.db",
+      "version": "3.2.2",
+      "sha256": "074dn5fy8b8p6mwb2l058sn9a3vy2j8isc5fv9vnmn0p9h0aqhi4",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
     "LRBase_Ath_eg_db": {
       "name": "LRBase.Ath.eg.db",
       "version": "2.0.1",
@@ -5643,6 +5669,41 @@
       "depends": ["LRBaseDbi", "RSQLite"],
       "broken": true
     },
+    "MafDb_ALL_wgs_phase1_release_v3_20101123": {
+      "name": "MafDb.ALL.wgs.phase1.release.v3.20101123",
+      "version": "3.2.0",
+      "sha256": "1zd2hpp9f4ilajsx6xpimgiqzkxhc3lyhanr4n4gv0d3cdkxa1mb",
+      "depends": ["AnnotationDbi", "Biobase", "Biostrings", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "VariantAnnotation", "VariantFiltering"],
+      "broken": true
+    },
+    "MafDb_ALL_wgs_phase3_release_v5a_20130502": {
+      "name": "MafDb.ALL.wgs.phase3.release.v5a.20130502",
+      "version": "3.2.0",
+      "sha256": "06bdbrjqh0gc7sypp94v0bwq4cfbz8vnq6z3g36w8906ziss6a8j",
+      "depends": ["AnnotationDbi", "Biobase", "Biostrings", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "VariantAnnotation", "VariantFiltering"],
+      "broken": true
+    },
+    "MafDb_ALL_wgs_phase3_release_v5b_20130502": {
+      "name": "MafDb.ALL.wgs.phase3.release.v5b.20130502",
+      "version": "3.2.0",
+      "sha256": "1cc2aphc98nip100jfxy39clknrnpn5z838f1b8fb542whypikn7",
+      "depends": ["AnnotationDbi", "Biobase", "Biostrings", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "VariantAnnotation", "VariantFiltering"],
+      "broken": true
+    },
+    "MafDb_ESP6500SI_V2_SSA137": {
+      "name": "MafDb.ESP6500SI.V2.SSA137",
+      "version": "3.2.0",
+      "sha256": "1dykp9bz1srb144yimkyagfhigr5dzg8ybxa5fsn3sr99p31va69",
+      "depends": ["AnnotationDbi", "Biobase", "Biostrings", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "VariantAnnotation", "VariantFiltering"],
+      "broken": true
+    },
+    "MafDb_ExAC_r0_3_sites": {
+      "name": "MafDb.ExAC.r0.3.sites",
+      "version": "3.2.0",
+      "sha256": "1qb3zwlkqaw2p5faajjahpp6g8wp02gd733kw9kim9xddjvjba14",
+      "depends": ["AnnotationDbi", "Biobase", "Biostrings", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "VariantAnnotation", "VariantFiltering"],
+      "broken": true
+    },
     "MafDb_gnomAD_r3_0_GRCh38": {
       "name": "MafDb.gnomAD.r3.0.GRCh38",
       "version": "3.13.0",
@@ -5664,227 +5725,241 @@
       "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "rhdf5", "S4Vectors"],
       "broken": true
     },
+    "MafH5_gnomAD_v3_1_2_GRCh38": {
+      "name": "MafH5.gnomAD.v3.1.2.GRCh38",
+      "version": "3.15.1",
+      "sha256": "1q9hlva814sjfz8vm9bzw7xzppbcfy5qq7nnz9w742yr59cjb6mp",
+      "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "GenomicScores", "HDF5Array", "IRanges", "S4Vectors", "rhdf5"],
+      "broken": true
+    },
     "MeSH_AOR_db": {
       "name": "MeSH.AOR.db",
-      "version": "1.15.1",
-      "sha256": "1d33krs3xs0pa14gm7haiaglnlx5z41m6gx92gg8ckfpblyz49q2",
+      "version": "1.5.0",
+      "sha256": "07mcj2lrrgnazzk4kgnzriyrny6mv1n0bpyi2s4vkv58xxm2n04k",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Aca_eg_db": {
       "name": "MeSH.Aca.eg.db",
-      "version": "1.15.1",
-      "sha256": "195hs3x0sfs4s5kry452r0fhnq19ayv82j4dr1394zr104r17kb1",
+      "version": "1.5.0",
+      "sha256": "0jp07lnlxmb05cs0j3zr4spnlnqbh846j08ic7nhcl1bgzh652dp",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Aga_PEST_eg_db": {
       "name": "MeSH.Aga.PEST.eg.db",
-      "version": "1.15.1",
-      "sha256": "1kyjhnfv3b0jxdali2v1wdqd1zkl9vsf2z9ba6dkhlm1hghsnv63",
+      "version": "1.5.0",
+      "sha256": "0rf2sr7sv2vpszi5wssznx25crx1ad4nbjj3w9whvhn2bzprksw3",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ame_eg_db": {
       "name": "MeSH.Ame.eg.db",
-      "version": "1.15.1",
-      "sha256": "1szzcnf5fwaqpj2ra2b1xics971lwg3rnzdria8j3yl705zxnl3g",
+      "version": "1.5.0",
+      "sha256": "0ggh4r8vrah8ln14hhvn3rxcv8xxjv8g72pw4l6rrxcwqbicy2pq",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Aml_eg_db": {
       "name": "MeSH.Aml.eg.db",
-      "version": "1.15.1",
-      "sha256": "1pgfhm5qhm9d7s0sr4iij7272m2i6y9di51r137mrmpc5fcc1mmx",
+      "version": "1.5.0",
+      "sha256": "1x6rap57yzshli4vx4ljv3n8pmrd4xy3lblcpl4nd3319hnl9nfy",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ana_eg_db": {
       "name": "MeSH.Ana.eg.db",
-      "version": "1.15.1",
-      "sha256": "117sz11lg3kl90v7bkai3acyvcxjggar8fpgyac99369pinkqikp",
+      "version": "1.5.0",
+      "sha256": "0iz8aq9sxy485csm3fib3p5mvsnv81kq5d6a1jsnqqhh629c6pf3",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ani_FGSC_eg_db": {
       "name": "MeSH.Ani.FGSC.eg.db",
-      "version": "1.15.1",
-      "sha256": "1hwhvm7ip3kjdb31glasixqzwja37352x70id18n2bfbjgq4x3r2",
+      "version": "1.5.0",
+      "sha256": "0dqnnmm668ahychvksbfsk21v7p51ac3qz8n9nff608z8nrry67p",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ath_eg_db": {
       "name": "MeSH.Ath.eg.db",
-      "version": "1.15.1",
-      "sha256": "12dmbr6aynxyfg0cv5jrshj27rmk89apbpsg1zxf7cmqkkvq8bcv",
+      "version": "1.5.0",
+      "sha256": "0qka863lgsbyv4xny6h1d9xjgckyvbzw4hrd59ykk5j6bjar3zvq",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Bfl_eg_db": {
       "name": "MeSH.Bfl.eg.db",
-      "version": "1.15.1",
-      "sha256": "1y6r6hillawafxgxvkcffg8bx125ra6b4f9cclcz1n3qzqfnjj0s",
+      "version": "1.5.0",
+      "sha256": "0wbrqgxqzvv7s1ak4axkh5x7wl0wlgl9zds2xm1675w5li40j6dv",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Bsu_168_eg_db": {
       "name": "MeSH.Bsu.168.eg.db",
-      "version": "1.15.1",
-      "sha256": "0d363769blvq0hm3yzbff007sn3sq8fb4gay8qgrcj2jrnnd4wp4",
+      "version": "1.5.0",
+      "sha256": "0va8mqhxq7r02bjyi2pyr0y4zhl6jn8lq8367qbzs4bfbj7y2w44",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Bsu_TUB10_eg_db": {
+      "name": "MeSH.Bsu.TUB10.eg.db",
+      "version": "1.5.0",
+      "sha256": "1igsl86sgwmxwy4j1igp5a355rff4jm9pia1hv59s9c6nni5xdfc",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Bta_eg_db": {
       "name": "MeSH.Bta.eg.db",
-      "version": "1.15.1",
-      "sha256": "0g9m2y209gl6nyn05j4fznnh21raz8xwj1if7zb1aixxzykqi313",
+      "version": "1.5.0",
+      "sha256": "1v8vmyhdw625s9gl6wfrfbq653mxjhsxayjgm0m9m0h3rkw6nadw",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cal_SC5314_eg_db": {
       "name": "MeSH.Cal.SC5314.eg.db",
-      "version": "1.15.1",
-      "sha256": "1z3id2838fd14x9nib931cmjb0x339hq1izdr3gq8kc4yfvl40r5",
+      "version": "1.5.0",
+      "sha256": "03lxs5hkbfqw6wdgdsdspblj6a7pwyqny8ypw72rl6gs0m1jha25",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cbr_eg_db": {
       "name": "MeSH.Cbr.eg.db",
-      "version": "1.15.1",
-      "sha256": "0fbg3sv5addw9ad586nyh0vbwfdnjzwqnqxa8jz8plpmjn043wl0",
+      "version": "1.5.0",
+      "sha256": "1jfn1qdx7dzqi5hwgcz02g5sc0wnqmgc1rm0n3d6mapzz286jl3q",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cel_eg_db": {
       "name": "MeSH.Cel.eg.db",
-      "version": "1.15.1",
-      "sha256": "19hp0f0vqlzdqbn9qs839b8sflbcww02k7fzsmyzpqd38kvhwf2w",
+      "version": "1.5.0",
+      "sha256": "171243fbgalpa5fjfqprj8gvg04wrcn1x8l465mzw8jj4y58pc60",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cfa_eg_db": {
       "name": "MeSH.Cfa.eg.db",
-      "version": "1.15.1",
-      "sha256": "19jjdp5cq1pisgk7nxwi8cdzjk44bbh02fjy027f50i6dnj75i7i",
+      "version": "1.5.0",
+      "sha256": "1gcnrynfnjapwdk13xk2x5g2jphk16ycp04qhwxp2qn53pgrj15k",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cin_eg_db": {
       "name": "MeSH.Cin.eg.db",
-      "version": "1.15.1",
-      "sha256": "0y53q8q1ca93ri6msnjzj3m6rqangidfvvchirgk9pa4k67dh534",
+      "version": "1.5.0",
+      "sha256": "0fdfslzh69rln2yj8hvb0igg3hmvn58pmkzfg0wpr3cc2y51jjvq",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cja_eg_db": {
       "name": "MeSH.Cja.eg.db",
-      "version": "1.15.1",
-      "sha256": "0jsbncm9ggi63fjng8nl08bhzajgjrckfq2ngqbcnmf8p1gzg60a",
+      "version": "1.5.0",
+      "sha256": "0m1z665crgj2q00bcz9m9gb0i55fca19agfpdd1b3nyiqil5fwqs",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cpo_eg_db": {
       "name": "MeSH.Cpo.eg.db",
-      "version": "1.15.1",
-      "sha256": "1w47fmy9akwxxsvdx7d1s0qdzafxyghl6lh33cy5jcb4bj525635",
+      "version": "1.5.0",
+      "sha256": "1xxlvi78mwjgqigrbxg0zas39i6j9c8ih6yh2s1xvmfm9mdg8v0j",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Cre_eg_db": {
       "name": "MeSH.Cre.eg.db",
-      "version": "1.15.1",
-      "sha256": "0bq8r70vv55shfgdx94qiympk0vf9rf7xr467bps82ks0kklzr7v",
+      "version": "1.5.0",
+      "sha256": "0s8w895f3l43v68s5wipggk4lq31cxsvlz7p6rfplj3chqkb4z2c",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dan_eg_db": {
       "name": "MeSH.Dan.eg.db",
-      "version": "1.15.1",
-      "sha256": "1k5dfwm5fn4zghaphsjs0f7jzjcdcay1afm2c09qyh7xv9m1cpry",
+      "version": "1.5.0",
+      "sha256": "0ra8hqg6w6w8w5wib4qa3py6bk961v47bmr47c9f5zbmp2n4ghwn",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dda_3937_eg_db": {
       "name": "MeSH.Dda.3937.eg.db",
-      "version": "1.15.1",
-      "sha256": "0idh5djnz1wwxp09xpjwac4dhz6kvwp1l0j92195b0xwv4n11pzk",
+      "version": "1.5.0",
+      "sha256": "0y1hcpbf3ddby76i19x933l4hz92a6v03k1cpyqipf1x8gdlkm1z",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ddi_AX4_eg_db": {
       "name": "MeSH.Ddi.AX4.eg.db",
-      "version": "1.15.1",
-      "sha256": "0aprxgrlz7hnk31fr6vqpprahjn07r48dnva9gszgyp740mx1m1d",
+      "version": "1.5.0",
+      "sha256": "1dlnxpp0ad5n0k43sy3jaz8ak9qxrmy57zg5bsxp65c04fgr3j9j",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Der_eg_db": {
       "name": "MeSH.Der.eg.db",
-      "version": "1.15.1",
-      "sha256": "0wbv1f5bsb3xl8rj1qndb0n77rmg2s9m5nl2f95naqaf3hfypsmd",
+      "version": "1.5.0",
+      "sha256": "0zllh66mbh20z402wv31993g06q4ap41f5fc7karkf17fbxz7nsl",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dgr_eg_db": {
       "name": "MeSH.Dgr.eg.db",
-      "version": "1.15.1",
-      "sha256": "07zzwf4aqpkvjmbbvzc6bq662frxblsx4l0ljna70gr4xb218swl",
+      "version": "1.5.0",
+      "sha256": "1lhqac659i3hys4r90r5y9k5m48r6ai2f3kir5v2046b8y5gbdx9",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dme_eg_db": {
       "name": "MeSH.Dme.eg.db",
-      "version": "1.15.1",
-      "sha256": "1fls5b3w6n2n9vy4fsvri74f6r2qmlrx8vlrgqmb7plxdp35q0jw",
+      "version": "1.5.0",
+      "sha256": "03fq4zj3d8ag5k05g9jvfll99dir9cnl04lkaw9n3h0q28hrsjg2",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dmo_eg_db": {
       "name": "MeSH.Dmo.eg.db",
-      "version": "1.15.1",
-      "sha256": "0fphjwbxnymf30ccppjyfgwz0pv5n1lwzm7h05lppk7a7f8ys665",
+      "version": "1.5.0",
+      "sha256": "0zh1awvf8v4axzqhazf8rqb8srp8sas3raiackw2z1niq89l0jw9",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dpe_eg_db": {
       "name": "MeSH.Dpe.eg.db",
-      "version": "1.15.1",
-      "sha256": "0921dxba9crqml8in0hwnwlzcqvjhhi94mllbmksp8cwka48rzs8",
+      "version": "1.5.0",
+      "sha256": "0myhby94b2i2sp4fzm5wa7j102admbp3lkdzyjwwbq6sw7hznb47",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dre_eg_db": {
       "name": "MeSH.Dre.eg.db",
-      "version": "1.15.1",
-      "sha256": "087pcpbskgc59c04bn3201d4agy9vsma0r1wsf60zxr3l491yn6v",
+      "version": "1.5.0",
+      "sha256": "1bxrfqh2pwkxdqs9vzvcwh5k1whik45bsmnbkr5c9yaryz8g801y",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dse_eg_db": {
       "name": "MeSH.Dse.eg.db",
-      "version": "1.15.1",
-      "sha256": "0drqyd131l7vr9v899hjvva4d5mmv7fbhmflgz49i2iy3360xz32",
+      "version": "1.5.0",
+      "sha256": "0qp2zqm2z998sx3gzkam0h5f38bblkvwb0jsvxckdr1n7j0ld3bz",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dsi_eg_db": {
       "name": "MeSH.Dsi.eg.db",
-      "version": "1.15.1",
-      "sha256": "0i3j3392d690xkg7cfzqnw0s09q8mpiq2wfpifkk0hbxnc5aahwd",
+      "version": "1.5.0",
+      "sha256": "0l675bqgmk455jx2iwzc3rn3v3a125grc0w6g1j25agbar8fznln",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dvi_eg_db": {
       "name": "MeSH.Dvi.eg.db",
-      "version": "1.15.1",
-      "sha256": "168jy0v39j2fpy59s3dpz0xs3axmnc7kb1dv88b5j1xccymkd3gl",
+      "version": "1.5.0",
+      "sha256": "190rfd5y5rrjphsc0dhnsms4bx2dkzs8m2ljv5rj1ygwhx78smz6",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Dya_eg_db": {
       "name": "MeSH.Dya.eg.db",
-      "version": "1.15.1",
-      "sha256": "1ibbh07nczp75f0x2mnq5mnli6fgg7mn2aqk434l3iwjx686mcpj",
+      "version": "1.5.0",
+      "sha256": "1ci0s1hklzaxc5h0wbfx21llqawi5n9bl0fddpiwwqma8mpy07k5",
       "depends": ["MeSHDbi"],
       "broken": true
     },
@@ -5895,311 +5970,437 @@
       "depends": ["MeSHDbi"],
       "broken": true
     },
+    "MeSH_Eco_55989_eg_db": {
+      "name": "MeSH.Eco.55989.eg.db",
+      "version": "1.4.0",
+      "sha256": "1r9q1vk8p9ah28k6gc2dlglwyi1i0y5zaxmzcrkxyw04pfzn41f7",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_CFT073_eg_db": {
+      "name": "MeSH.Eco.CFT073.eg.db",
+      "version": "1.4.0",
+      "sha256": "0r7hlxd5k9n9shq3wj5ldqj00apvx4bv8h38v2i4adv29s5x7973",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_ED1a_eg_db": {
+      "name": "MeSH.Eco.ED1a.eg.db",
+      "version": "1.5.0",
+      "sha256": "0qaciqrisxq7nhib661ha3ixwl2gpc3040dxiw7n4hy87bxa17g4",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_HS_eg_db": {
+      "name": "MeSH.Eco.HS.eg.db",
+      "version": "1.4.0",
+      "sha256": "0gyrfjyp3k5jbcg92qzz4fjpmk9m4i0v7q2yvja73sni6976g9ca",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_IAI1_eg_db": {
+      "name": "MeSH.Eco.IAI1.eg.db",
+      "version": "1.4.0",
+      "sha256": "16mxh182ij25qgfk14dzzpvaac7fqcnzx58j5m6hfrz3wvgh9jrq",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_IAI39_eg_db": {
+      "name": "MeSH.Eco.IAI39.eg.db",
+      "version": "1.5.0",
+      "sha256": "0cgyb709k0894m5f8gzsfx0215mf058dwmpi41rm4xbv98ww9x2p",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_K12_DH10B_eg_db": {
+      "name": "MeSH.Eco.K12.DH10B.eg.db",
+      "version": "1.4.0",
+      "sha256": "00y5qlqrsjl941iaqln4m5jvskc2a6kildys881ml92f14cmgs07",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
     "MeSH_Eco_K12_MG1655_eg_db": {
       "name": "MeSH.Eco.K12.MG1655.eg.db",
-      "version": "1.15.1",
-      "sha256": "0p3gf9hwr3hrzlczwr7lhwxnl46iqfz66dvz38h7c02bjlpjjdjd",
+      "version": "1.5.0",
+      "sha256": "1az1si0pkd9jngddvd5b37k0h5y5p2mkis9z1y6w9g3kp2z5b3wy",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_O127_H6_E2348_69_eg_db": {
+      "name": "MeSH.Eco.O127.H6.E2348.69.eg.db",
+      "version": "1.4.0",
+      "sha256": "1as23bz0yylgf24sy84xm46bblvkacp84kjr2g8c9if1vll2x2dg",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_O157_H7_EDL933_eg_db": {
+      "name": "MeSH.Eco.O157.H7.EDL933.eg.db",
+      "version": "1.4.0",
+      "sha256": "0qnnp2a2v3nv1br1lg2km0p96q1knwa1fx95cg4wp38nc5g0jcc9",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Eco_O157_H7_Sakai_eg_db": {
       "name": "MeSH.Eco.O157.H7.Sakai.eg.db",
-      "version": "1.15.1",
-      "sha256": "0wda4hkzwfvkn51fchzpwgc5p9964yyfjg8bpvk2331zx9lsvgs2",
+      "version": "1.5.0",
+      "sha256": "12x6fp6h45ixxisib2x16rvx5xv57xfh9pcrwpprrj8sy2pv2gbb",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_S88_eg_db": {
+      "name": "MeSH.Eco.S88.eg.db",
+      "version": "1.4.0",
+      "sha256": "15k44ricv7vi7sbw5s2nckm6jwbfzrrjp8ck06ydjp9q70hfzmhy",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eco_UMN026_eg_db": {
+      "name": "MeSH.Eco.UMN026.eg.db",
+      "version": "1.5.0",
+      "sha256": "1a6f5xz5zc609k27fivaav5dg9kmz9wyrmjm4cz194ac36zj57q7",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Eqc_eg_db": {
+      "name": "MeSH.Eqc.eg.db",
+      "version": "1.5.0",
+      "sha256": "02lp2sdgbz8a50l0s8mfw7halgdg2sc00sxc6k2dr7his3clhnby",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Gga_eg_db": {
       "name": "MeSH.Gga.eg.db",
-      "version": "1.15.1",
-      "sha256": "0d72haww3zi1x06qllwnlsrwkwivn6z8ws9nkrnb24vn3saxv41b",
+      "version": "1.5.0",
+      "sha256": "1i8vlkis021cw5ym0f74rgpcml8x8wcsjvaynpadpvfkyra49946",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Gma_eg_db": {
       "name": "MeSH.Gma.eg.db",
-      "version": "1.15.1",
-      "sha256": "1xbwkxn351yhjbc529y4fkj366a3pnk1b8s3h1ys5w8czz3szfn3",
+      "version": "1.5.0",
+      "sha256": "1awwmbmrgi5jpsa6xys4aqd8c4vjcfy0d1fbs918v8dha9ksy202",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Hsa_eg_db": {
       "name": "MeSH.Hsa.eg.db",
-      "version": "1.15.1",
-      "sha256": "1cgfwp8hk40af0d5rzi3vsmvx22jp1nwsgyld1mzkry2i8ilbzyj",
+      "version": "1.5.0",
+      "sha256": "13cpchm3lyc259r739k1kcljmjpr31l7wp9zgiliyqc1l7hw279k",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Laf_eg_db": {
       "name": "MeSH.Laf.eg.db",
-      "version": "1.15.1",
-      "sha256": "1r2bnakd47gq95s47rywhak7csz77zphml0zfrchi189kh01prg4",
+      "version": "1.5.0",
+      "sha256": "09sbzwqh1bi0bbdxbin107nbqw9vch09vsr2d2pq3z5q3bdz52sh",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Lma_eg_db": {
       "name": "MeSH.Lma.eg.db",
-      "version": "1.15.1",
-      "sha256": "1x3rjw2hvzxaq68abyh8b9bw1zizkrqxj6pgd5d6ggcl8l0x1fnz",
+      "version": "1.5.0",
+      "sha256": "0f71ywvjsc2ly8l7lrxm6nrkrnm2vlkbmnm0bi22yqwvr5q5gm4q",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Mdo_eg_db": {
       "name": "MeSH.Mdo.eg.db",
-      "version": "1.15.1",
-      "sha256": "156dc2vssa8x0a0985fhyx7h5vaw4d3ingz0s09181ai9fxqc1jx",
+      "version": "1.5.0",
+      "sha256": "1l3yfi4vx3yzw8i85ymy0fj1k1q66gyv4fjl5mbq5nlz8g6r19y0",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Mes_eg_db": {
       "name": "MeSH.Mes.eg.db",
-      "version": "1.15.1",
-      "sha256": "0a3gdmpp9y6s6aw7lyh7j25dahgmkb0azg7g57073fqwhgivs2mx",
+      "version": "1.5.0",
+      "sha256": "01mr5crin0ak57gdm1p36m3066a2x2m81g74minf2ijghpnb67q5",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Mga_eg_db": {
       "name": "MeSH.Mga.eg.db",
-      "version": "1.15.1",
-      "sha256": "1gil8g9h8qyd0b4qmqrk7dakvjqwlychzld0wv20z7hipqas975d",
+      "version": "1.5.0",
+      "sha256": "0icm9jnyi46bp5knsxmb1fv2fghimrmwskq9p5yzgm1jhr43qgjd",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Miy_eg_db": {
       "name": "MeSH.Miy.eg.db",
-      "version": "1.15.1",
-      "sha256": "1p1f6vk1f360zx4wkzcyczi4p4x6mgf4pfrvhslz4kn6xg0cnm73",
+      "version": "1.5.0",
+      "sha256": "0d3y2837n0k74mn2bv75x3f3bm1xlzfh728221vfhyj9xzbs6131",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Mml_eg_db": {
       "name": "MeSH.Mml.eg.db",
-      "version": "1.15.1",
-      "sha256": "16372gs4nh9cr18xy4nzssjmdarxbkx7c6208s4vx6232mbc1azl",
+      "version": "1.5.0",
+      "sha256": "04ba79mky8m6wiiwi0fkcz9c6gfk1c81pypz77258qwbi98p6y32",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Mmu_eg_db": {
       "name": "MeSH.Mmu.eg.db",
-      "version": "1.15.1",
-      "sha256": "1557vn9sy1a2picwj27gkajqp8qlqza0yqf69czimd1myskdicps",
+      "version": "1.5.0",
+      "sha256": "0ligmwg9f6qs99ngnk81imlp6n48cw5jjnqklaw8dcy8ph016vhf",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Mtr_eg_db": {
       "name": "MeSH.Mtr.eg.db",
-      "version": "1.15.1",
-      "sha256": "1gi2v9x0jja6ambdljp9m11g6yhd3wcfcjblgx58i42ix5h5mviw",
+      "version": "1.5.0",
+      "sha256": "187bw5svsbssyjm3rdy9lh5wp5r0wkspxska80hqf26swbjl4ymm",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Nle_eg_db": {
       "name": "MeSH.Nle.eg.db",
-      "version": "1.15.1",
-      "sha256": "1vplci90jb1cihwbxqkynqk9frr7j09gh80q020dhm24f3rwlfqk",
+      "version": "1.5.0",
+      "sha256": "1gairkwy29jg949i270ndzsa6f9zwcs7i61lj6w26piz6hcjgv28",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Oan_eg_db": {
       "name": "MeSH.Oan.eg.db",
-      "version": "1.15.1",
-      "sha256": "1fmwfmws100qmg3wy25qg0s36nk81rwf6b1csvqg4vfy9p0r2pdw",
+      "version": "1.5.0",
+      "sha256": "1wk2mfd1qg1ycfqsd0v5zp470cb49vczsarar8wfkly5mvl561m4",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ocu_eg_db": {
       "name": "MeSH.Ocu.eg.db",
-      "version": "1.15.1",
-      "sha256": "019ydfl6dqymn8yk2n101rdrmyv82ypcbvwmslimdhnlk3bzrj3a",
+      "version": "1.5.0",
+      "sha256": "12xkw4s3ycr9fpz2q36rcg3mhvzplmg8fmigcigd5vg0g5029wi8",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Oni_eg_db": {
       "name": "MeSH.Oni.eg.db",
-      "version": "1.15.1",
-      "sha256": "1jadbca3c3xw24p8zvrd3q7ijjrrfjxkf1bw08ay3a9gazqyv0rh",
+      "version": "1.5.0",
+      "sha256": "0jwrkhdfykm71cn1smzzp5wjph04v687lvk0hyazd1hb5wwhwkyi",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Osa_eg_db": {
       "name": "MeSH.Osa.eg.db",
-      "version": "1.15.1",
-      "sha256": "028lw4xjd1v7afp1l0xizswciy1hxhllrf9ij328si5a0kb3dxwc",
+      "version": "1.5.0",
+      "sha256": "105qz16b2l2sbr1r8if3bkc6w0cll7lhg67j09l8a9y9f4ddwa65",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_PCR_db": {
       "name": "MeSH.PCR.db",
-      "version": "1.15.1",
-      "sha256": "1hdk3s3ixh1haqp70ww547cbnwhllk6fhc4fgriidw0jivbkawx1",
+      "version": "1.5.0",
+      "sha256": "03hrggzl4j29k9fvvhzhbil506k02lmnpl3rm63m3x35416g7wsj",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Pab_eg_db": {
       "name": "MeSH.Pab.eg.db",
-      "version": "1.15.1",
-      "sha256": "00hy436bbk7jza00dv2xgnbji3k72x405n88pgd8d9rgj7cmqvjp",
+      "version": "1.5.0",
+      "sha256": "0kd4cz233y4kld8gb3qhnv5bjm9jpfngkc5d6y4bk91jkq1d4g3a",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Pae_PAO1_eg_db": {
       "name": "MeSH.Pae.PAO1.eg.db",
-      "version": "1.15.1",
-      "sha256": "04pprh5m431cpk4whfsiqb8fglda82jk4d06nhlz9k9nd5x9np82",
+      "version": "1.5.0",
+      "sha256": "0cm5ja8l1mkvzpv68gg4aimy68kxzpppps50iwhxc191h2dxkl4r",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Pfa_3D7_eg_db": {
       "name": "MeSH.Pfa.3D7.eg.db",
-      "version": "1.15.1",
-      "sha256": "1a0q8xyhfvjvdsxq5hgh255q3rg823l1b8nyswnkai3sl3hq3szd",
+      "version": "1.5.0",
+      "sha256": "1l793h8x3bhm8nydxf517gi8b9paf0plw6i3kmi84gwczvywffqq",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Pto_eg_db": {
       "name": "MeSH.Pto.eg.db",
-      "version": "1.15.1",
-      "sha256": "0z4l55029lrmvysj26vn97c690yyhji46axvxsdjvzwp8llhwy3m",
+      "version": "1.5.0",
+      "sha256": "1g131cjhlxjppvrjdcl1rwz8856f110a467lyp1kk0pvd2d0xhvz",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ptr_eg_db": {
       "name": "MeSH.Ptr.eg.db",
-      "version": "1.15.1",
-      "sha256": "1h1ci6y0hjii1r6gp24y2m7qqn8d0r954swbc9crb0i2mfak7l1a",
+      "version": "1.5.0",
+      "sha256": "0z7ypnmi68spzr4dv98lswj5wna0rwnwvmbw1g6ihi25vd26cd37",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Rno_eg_db": {
       "name": "MeSH.Rno.eg.db",
-      "version": "1.15.1",
-      "sha256": "1rfxbfz72xazay0rszhjvxxqry532dx72kkp5vd0pi44536kly49",
+      "version": "1.5.0",
+      "sha256": "1hzwrc6l41psr1f3zjm71b87rf5bjzwskkanfv1rx87ynq1h2m81",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Sau_USA300TCH1516_eg_db": {
+      "name": "MeSH.Sau.USA300TCH1516.eg.db",
+      "version": "1.4.0",
+      "sha256": "109kvsdqvra8x392l82djbd46l8z4hv4z92785ivgdcnchsdjq7p",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Sce_S288c_eg_db": {
       "name": "MeSH.Sce.S288c.eg.db",
-      "version": "1.15.1",
-      "sha256": "100fcybyv4lsnxj23ndchhn25i2bfppk6w0y2lfnrla1vn8p5nnp",
+      "version": "1.5.0",
+      "sha256": "07xvrvhyb0gfq2fx47prkcax46csrb3c2rmvik6lbm17h0ah55x4",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Sco_A32_eg_db": {
       "name": "MeSH.Sco.A32.eg.db",
-      "version": "1.15.1",
-      "sha256": "1y5nh82hbwh7higzg0fv4rkvxl2p988w7aznygaq5z3g1q15l9sp",
+      "version": "1.5.0",
+      "sha256": "0y9afs85yqgyz9701fpwkz3y3wabwks56m1ar3qv8zap6s124fh7",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Sil_eg_db": {
       "name": "MeSH.Sil.eg.db",
-      "version": "1.15.1",
-      "sha256": "09vj1ix13kxyb330s69nnig07a7cwyz7nasvv5kv83cnc27df92m",
+      "version": "1.5.0",
+      "sha256": "02p6g63rcfnx6db91njw33qrzbr4nra9ddwbwg23jz1vhqlxcv5a",
+      "depends": ["MeSHDbi"],
+      "broken": true
+    },
+    "MeSH_Spo_972h_eg_db": {
+      "name": "MeSH.Spo.972h.eg.db",
+      "version": "1.5.0",
+      "sha256": "083pg2bc56s52rkv7mvbziq0hjrfndwja32jd31pxdd0cjdv3c3q",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Spu_eg_db": {
       "name": "MeSH.Spu.eg.db",
-      "version": "1.15.1",
-      "sha256": "0gmpcabxs0d61krhyllyrb92x0xgr67jv2wc8qbjv8m8vpiynnxh",
+      "version": "1.5.0",
+      "sha256": "1vx6h5pv7hygmgrd5wjdcx576bvr23xfhh4aba3a2jzsjwvg0c9c",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Ssc_eg_db": {
       "name": "MeSH.Ssc.eg.db",
-      "version": "1.15.1",
-      "sha256": "05ybk27chnxf3mqvngfzlrmnlpjdraqzd0qcsj6zmhsyx6j20qh5",
+      "version": "1.5.0",
+      "sha256": "0c8ijwz4vcwcbf18jsf2z3wxis09h9wrsb9fki5wspgjc486lz9n",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Syn_eg_db": {
       "name": "MeSH.Syn.eg.db",
-      "version": "1.15.1",
-      "sha256": "1rkc9gv9an0zan04qalmyvry380yhf2vx8scfvck9jwkq5x05w97",
+      "version": "1.5.0",
+      "sha256": "03sd73jipya5zqdzqxd6iwnmwmxkqp1mz9hg2bzmfnx3jz3fd5sv",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Tbr_9274_eg_db": {
       "name": "MeSH.Tbr.9274.eg.db",
-      "version": "1.15.1",
-      "sha256": "1nak2sz25l8mc3f60h84519wm7lb8iamj9116mbf4b6ybdp0k4gd",
+      "version": "1.5.0",
+      "sha256": "05fandy9ig1arahaag0wa09gwz8g4g7bpyns0jchmw88044jvgqs",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Tgo_ME49_eg_db": {
       "name": "MeSH.Tgo.ME49.eg.db",
-      "version": "1.15.1",
-      "sha256": "16j9wiv0lgik94yp7vqgcc5lykjynn07sbvvq2llcyvr6n3l3gwy",
+      "version": "1.5.0",
+      "sha256": "03bysvpymrq4n4xa48hksm9vayww6gvjpncnb4q5891azja3drpr",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Tgu_eg_db": {
       "name": "MeSH.Tgu.eg.db",
-      "version": "1.15.1",
-      "sha256": "0j0ygcrfx2df2q597wkkiqg9264n2v7bsh3kfvra9ma3wdxqlipd",
+      "version": "1.5.0",
+      "sha256": "0vdxabqli7z2cpdq015jhaddzsxh23k7x0pzc28k8aqbp84czb89",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Vvi_eg_db": {
       "name": "MeSH.Vvi.eg.db",
-      "version": "1.15.1",
-      "sha256": "0dnhjs43v9q42w82km5vvs8p8zniljvskiv946psy2z8l27q6srj",
+      "version": "1.5.0",
+      "sha256": "0cyn8lflhb8n4fkh7sm0ky9q5n640cwxks22a54x16bvr7bb7f1k",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Xla_eg_db": {
       "name": "MeSH.Xla.eg.db",
-      "version": "1.15.1",
-      "sha256": "1n3kmkqgb8nnm13jrhn6dzpjcqgddf7k68vsm52bkg7dh3dfcn8v",
+      "version": "1.5.0",
+      "sha256": "04ihvbp7dlb4fb68snlq0imh3igfhacjsqjnjnwnm1xqgynzn6f6",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Xtr_eg_db": {
       "name": "MeSH.Xtr.eg.db",
-      "version": "1.15.1",
-      "sha256": "19waylyzyga4zqygar6509gq36a8z36fbpz55msb0zsin24s0y82",
+      "version": "1.5.0",
+      "sha256": "09g6wh866n2xbdy4xmglbk361zwiyywgxwbzndm8yd1xdkzc4myw",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_Zma_eg_db": {
       "name": "MeSH.Zma.eg.db",
-      "version": "1.15.1",
-      "sha256": "0plldymwirg8hyj9yv5jw4ldrlnvf5dx60gymb8rgmmxvrmhay66",
+      "version": "1.5.0",
+      "sha256": "00vm12fgmlw79bpkfbc4yrwvf8c6daw3fkxysag6qpjfsjrbdhlg",
       "depends": ["MeSHDbi"],
       "broken": true
     },
     "MeSH_db": {
       "name": "MeSH.db",
-      "version": "1.15.1",
-      "sha256": "0ixlxcakcc9f6d3dzxfdda4nh5gnivqvbi9dw7c85c0145dgnpzx",
+      "version": "1.5.0",
+      "sha256": "1r6iyc1066g7bgil9d0dk5s23bz3bv7idn7k18kbgzm2j3dm9m5g",
       "depends": ["MeSHDbi"],
       "broken": true
     },
+    "SNPlocs_Hsapiens_dbSNP_20090506": {
+      "name": "SNPlocs.Hsapiens.dbSNP.20090506",
+      "version": "0.99.9",
+      "sha256": "10943wbc56mz8ywcd71ndbdz7h3a9a17mzfdvj237wsgp62arfh6",
+      "depends": ["BSgenome", "GenomicRanges", "IRanges"],
+      "broken": true
+    },
+    "SNPlocs_Hsapiens_dbSNP_20100427": {
+      "name": "SNPlocs.Hsapiens.dbSNP.20100427",
+      "version": "0.99.7",
+      "sha256": "16m15sqxnczb399bcy7nll804h4955f6w8mag5jlda6h11yh732z",
+      "depends": ["GenomicRanges", "IRanges", "S4Vectors"],
+      "broken": true
+    },
     "SNPlocs_Hsapiens_dbSNP_20101109": {
       "name": "SNPlocs.Hsapiens.dbSNP.20101109",
-      "version": "0.99.9",
-      "sha256": "1qxsaq2wai1rqbidz005frjw8r8m2ia9cd87ziw8i66a798rzima",
+      "version": "0.99.7",
+      "sha256": "1r1gvx563gv1lidi099yw7lvf8c0983yck9yf8r8iypiz1d4az73",
+      "depends": ["GenomicRanges", "IRanges", "S4Vectors"],
+      "broken": true
+    },
+    "SNPlocs_Hsapiens_dbSNP_20110815": {
+      "name": "SNPlocs.Hsapiens.dbSNP.20110815",
+      "version": "0.99.7",
+      "sha256": "0nvpa44xy7zb9q63max1q0pmfibh976blmnirryxcca20j41f8ic",
+      "depends": ["GenomicRanges", "IRanges", "S4Vectors"],
+      "broken": true
+    },
+    "SNPlocs_Hsapiens_dbSNP_20111119": {
+      "name": "SNPlocs.Hsapiens.dbSNP.20111119",
+      "version": "0.99.7",
+      "sha256": "1znblqzb1hx5yjs2g387l3az8dga51si5blpwngvs0zbbdypgww8",
       "depends": ["GenomicRanges", "IRanges", "S4Vectors"],
       "broken": true
     },
     "SNPlocs_Hsapiens_dbSNP_20120608": {
       "name": "SNPlocs.Hsapiens.dbSNP.20120608",
-      "version": "0.99.13",
-      "sha256": "123n3rwkq8c8gqwhbwpsvis2x1xp137hchg9y7sv7l1givb6n2kf",
+      "version": "0.99.10",
+      "sha256": "10crnx5jk2790h936j515jgdf2mirzzmlnvn6pbp81fd5imkvdpd",
       "depends": ["BSgenome", "GenomicRanges", "IRanges"],
       "broken": true
     },
     "SNPlocs_Hsapiens_dbSNP141_GRCh38": {
       "name": "SNPlocs.Hsapiens.dbSNP141.GRCh38",
-      "version": "0.99.12",
-      "sha256": "1hfqbf03jd2r7ybb19rl3czrjb4h4vjqlrrilfqc8yymy7myvqqb",
-      "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"],
+      "version": "0.99.10",
+      "sha256": "1a8ic2naa6bqc1fcylxc81j51xmc249fn40nk4yrvpjz59d6h381",
+      "depends": ["BSgenome", "GenomicRanges", "IRanges", "S4Vectors"],
       "broken": true
     },
     "SNPlocs_Hsapiens_dbSNP142_GRCh37": {
       "name": "SNPlocs.Hsapiens.dbSNP142.GRCh37",
-      "version": "0.99.6",
-      "sha256": "17ql8fsali09dx1vv9178ya7zx901vwq4bnjrs35fjrjdvx6yvfd",
+      "version": "0.99.5",
+      "sha256": "13kmgfwzwmbrwd2g24a3cbp634jih7jigzhzq55bzzf3js48h3n3",
       "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges"],
       "broken": true
     },
@@ -6212,11 +6413,179 @@
     },
     "XtraSNPlocs_Hsapiens_dbSNP141_GRCh38": {
       "name": "XtraSNPlocs.Hsapiens.dbSNP141.GRCh38",
-      "version": "0.99.13",
-      "sha256": "1fidmrf0xr7wwd4v1y7x2wwyplplbs1z8jqpfdjpc8aclcy38m3f",
+      "version": "0.99.12",
+      "sha256": "0a27y0ngg760y5wwcja4dpd7cjd8h5zg1s2b3a1r54s21k65zny3",
       "depends": ["BSgenome", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"],
       "broken": true
     },
+    "gahgu133a_db": {
+      "name": "gahgu133a.db",
+      "version": "2.2.0",
+      "sha256": "1ikyvj1gi39qbakpn5wl0823ljavng1k33zvpf2k24jdhdw927qb",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu133acdf": {
+      "name": "gahgu133acdf",
+      "version": "2.2.1",
+      "sha256": "0hvd4iwj2fjiqp1jzbz68i1w6jn77nrsih316jlj85bhb35f7cyv",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu133aprobe": {
+      "name": "gahgu133aprobe",
+      "version": "2.2.1",
+      "sha256": "108lki2bg55ysh485shxxsz1imm26g5a3grgcmxbfs4pgna3g4h0",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu133b_db": {
+      "name": "gahgu133b.db",
+      "version": "2.2.0",
+      "sha256": "06hyjnr387wk40jjdk8gzqpfp4afjzva9fky3l4qs249ycy4snic",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu133bcdf": {
+      "name": "gahgu133bcdf",
+      "version": "2.2.1",
+      "sha256": "0qbqirflzjy0is3m9zca1660aszxf947fa7d26baw6vm2b37qg4q",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu133bprobe": {
+      "name": "gahgu133bprobe",
+      "version": "2.2.1",
+      "sha256": "1i8wcnp8434f6zxib86yhpm904clwg907x1hgjfsgy4viqa4jbqv",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu133plus2_db": {
+      "name": "gahgu133plus2.db",
+      "version": "2.2.0",
+      "sha256": "1p48q1zqrjdvv6qq5br9v24fpryp2zy3z079nkgrgr4d2brvhab8",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu133plus2cdf": {
+      "name": "gahgu133plus2cdf",
+      "version": "2.2.1",
+      "sha256": "1fmv6rrjbii1g5grcvgl13w814mbqqyqyav0wi82d30v4ijz58g9",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu133plus2probe": {
+      "name": "gahgu133plus2probe",
+      "version": "2.2.1",
+      "sha256": "0r3vizwmvy0jmsqbplagkincj5xs71dk7csgwwv4arx80kbl9l9l",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95av2_db": {
+      "name": "gahgu95av2.db",
+      "version": "2.2.0",
+      "sha256": "1c1hc79rjisx7jd7sdlr2d1lnk621y8azshriia12b5z0l5j9m4h",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95av2cdf": {
+      "name": "gahgu95av2cdf",
+      "version": "2.2.1",
+      "sha256": "1ckcjlb4v9x9zynf5w1h5fgmdr4ck22h9bjfwz3n184v48wgi39r",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu95av2probe": {
+      "name": "gahgu95av2probe",
+      "version": "2.2.1",
+      "sha256": "033zk49kp4r5in6yk3za8ll5wrchiklfrzc10c8lgqhpm6y8y5k2",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95b_db": {
+      "name": "gahgu95b.db",
+      "version": "2.2.0",
+      "sha256": "0v4lpbqqhm6mvpm0biykcq0ym1rb968zcwp9rg1lv6zka5arj9fq",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95bcdf": {
+      "name": "gahgu95bcdf",
+      "version": "2.2.1",
+      "sha256": "1f8yp4g3cjbl11x0wajln7bms3jhy6cbyh0bggm38gbb18gws4wg",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu95bprobe": {
+      "name": "gahgu95bprobe",
+      "version": "2.2.1",
+      "sha256": "1lr91f57ym3lxz5bi9xm3g63vskw5js991h5zk4c2i2npi0x22gm",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95c_db": {
+      "name": "gahgu95c.db",
+      "version": "2.2.0",
+      "sha256": "1psjf511agrv7nma4wa39jgd82z82df42d5g8jvwjrm2wb6l2v4l",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95ccdf": {
+      "name": "gahgu95ccdf",
+      "version": "2.2.1",
+      "sha256": "1lcal0y48vhafikkrn744l1gxrnlhkh7jmmhb7pglc9ldh7x9azh",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu95cprobe": {
+      "name": "gahgu95cprobe",
+      "version": "2.2.1",
+      "sha256": "155vnch85m6ph7av8j4ylrqajm3vc2v623qpkixqh06l4fy59pck",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95d_db": {
+      "name": "gahgu95d.db",
+      "version": "2.2.0",
+      "sha256": "0k0ricb8cl3xh93nq8rr3206w18b91ca67992cc5b2fbaf8lxlba",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95dcdf": {
+      "name": "gahgu95dcdf",
+      "version": "2.2.1",
+      "sha256": "181h5i9ywpn6vwdvcd2sq5yxkx41h09plgqsdfigw5w7816524k6",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu95dprobe": {
+      "name": "gahgu95dprobe",
+      "version": "2.2.1",
+      "sha256": "0znll2h3cm1sbyzjk121fxizs4qv5jd80kslr5zhdd73dkdlzlbm",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95e_db": {
+      "name": "gahgu95e.db",
+      "version": "2.2.0",
+      "sha256": "1qbsshgvzfavpjrawn3lbl0pcfwl0g7n8vr1109gvax6gj00la7n",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "gahgu95ecdf": {
+      "name": "gahgu95ecdf",
+      "version": "2.2.1",
+      "sha256": "1bsh380h7ai4l6j8jjz8yzfdwgxyhpnqm5fnb6mgma76xbiwab4b",
+      "depends": [],
+      "broken": true
+    },
+    "gahgu95eprobe": {
+      "name": "gahgu95eprobe",
+      "version": "2.2.1",
+      "sha256": "0c4zx8d7qsb3xhy0prfh7l6xbklgpxbbznqhq9mmgjb8qh5g9ygz",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
     "greengenes13_5MgDb": {
       "name": "greengenes13.5MgDb",
       "version": "2.0.0",
@@ -6224,6 +6593,111 @@
       "depends": [],
       "broken": true
     },
+    "hom_At_inp_db": {
+      "name": "hom.At.inp.db",
+      "version": "3.1.2",
+      "sha256": "1ka9ssjfxml9sz9k83bs6icbkkyz581svh0pwpvpifzg79qapzwi",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Ce_inp_db": {
+      "name": "hom.Ce.inp.db",
+      "version": "3.1.2",
+      "sha256": "1iw2xy8yfx1khxy4fkilfq6ms0m9l4q8lz4y0y50fvsh8iiygy98",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Dm_inp_db": {
+      "name": "hom.Dm.inp.db",
+      "version": "3.1.2",
+      "sha256": "0akg9ay7rgb3j5ckjmv4q9gvnnfhyfaad1phfr1j8zmkdr50x4kw",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Dr_inp_db": {
+      "name": "hom.Dr.inp.db",
+      "version": "3.1.2",
+      "sha256": "1x4iikf8b5awmg1m9x9wn2fzwsqq93l8yibrkc4r7x7dvm005yg7",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Hs_inp_db": {
+      "name": "hom.Hs.inp.db",
+      "version": "3.1.2",
+      "sha256": "0fixdcc80a3vb735pqafzva5cw02ygkf5pfy1ncws3f84s3p3zld",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Mm_inp_db": {
+      "name": "hom.Mm.inp.db",
+      "version": "3.1.2",
+      "sha256": "034b9wiis7w7zj3647s0fh1jspyfn654yf0lm5ymp65sww965cxh",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Rn_inp_db": {
+      "name": "hom.Rn.inp.db",
+      "version": "3.1.2",
+      "sha256": "02smfm88y72dgmj2kna9v7sbcg5dxr8b4sqgy6i8b3zw3a6776yp",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hom_Sc_inp_db": {
+      "name": "hom.Sc.inp.db",
+      "version": "3.1.2",
+      "sha256": "0l9nly3k7jnf6g1qnwyw22ga1hdyjdvn3hrlway8pb9rv7279bil",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "hta20stprobeset_db": {
+      "name": "hta20stprobeset.db",
+      "version": "8.3.0",
+      "sha256": "05blv54srnw7yrs8x32syzk1xdksrl8gswk837m7qjgciq8hazcn",
+      "depends": ["AnnotationDbi", "org_Hs_eg_db"],
+      "broken": true
+    },
+    "hta20sttranscriptcluster_db": {
+      "name": "hta20sttranscriptcluster.db",
+      "version": "8.3.1",
+      "sha256": "0ana9fg3ms22m394w8qbfvfy663l0r163w0qfwh5ir59rs4bpalf",
+      "depends": ["AnnotationDbi", "org_Hs_eg_db"],
+      "broken": true
+    },
+    "mta10stprobeset_db": {
+      "name": "mta10stprobeset.db",
+      "version": "8.4.0",
+      "sha256": "1chc4ld5g8dmy33vrvprx08yp2vasmr4x6m8bswhfyigzf6n3d6w",
+      "depends": ["AnnotationDbi", "org_Mm_eg_db"],
+      "broken": true
+    },
+    "mta10sttranscriptcluster_db": {
+      "name": "mta10sttranscriptcluster.db",
+      "version": "8.4.0",
+      "sha256": "0f890nbnc27hnfazdyyypb3k6sla1ipijb8fvfqfld40nm1is978",
+      "depends": ["AnnotationDbi", "org_Mm_eg_db"],
+      "broken": true
+    },
+    "org_Hs_ipi_db": {
+      "name": "org.Hs.ipi.db",
+      "version": "1.3.0",
+      "sha256": "06nkcjcavzwgnxzmbj05i4dapszf2wq7m5s0g8d6hm7kxz5wxddy",
+      "depends": ["AnnotationDbi", "PAnnBuilder"],
+      "broken": true
+    },
+    "org_Sco_eg_db": {
+      "name": "org.Sco.eg.db",
+      "version": "2.4.2",
+      "sha256": "1ppjl55059gk9jbh8c8xbsn2jlqz1hm650vm9gxnbd8hpnk63vgz",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
+    "org_Tgondii_eg_db": {
+      "name": "org.Tgondii.eg.db",
+      "version": "1.0",
+      "sha256": "1vq3qbk6jswfffj5lfwsic71h8ga7a6gqf6wfa7qcda3gvfhnwlc",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
     "ribosomaldatabaseproject11_5MgDb": {
       "name": "ribosomaldatabaseproject11.5MgDb",
       "version": "1.00.0",
diff --git a/pkgs/development/r-modules/bioc-experiment-packages.json b/pkgs/development/r-modules/bioc-experiment-packages.json
index 9e371d34469a..ea120d9a1be0 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.json
+++ b/pkgs/development/r-modules/bioc-experiment-packages.json
@@ -1,2593 +1,2594 @@
 {
   "extraArgs": {
-    "biocVersion": "3.19"
+    "biocVersion": "3.20"
   },
   "packages": {
     "ALL": {
       "name": "ALL",
-      "version": "1.46.0",
-      "sha256": "1yl8b8q8i19kx4viwinhyq9xn9d4axlfgjvm7cpf7pys4krhnrha",
+      "version": "1.48.0",
+      "sha256": "0bj7hd0k7rlyh1y68w09s5wpwi68fiw7hsdh0lwmald7x1asbjax",
       "depends": ["Biobase"]
     },
     "ALLMLL": {
       "name": "ALLMLL",
-      "version": "1.44.0",
-      "sha256": "0pmdw42wrmhqm3754s3kkz7wjih63h21zlrwl1b7lkli79vbzkpd",
+      "version": "1.46.0",
+      "sha256": "1ipp8ykdfldyxza2g8g8lj1yrwaynky0fwhmksym7pgn39gl910l",
       "depends": ["affy"]
     },
     "ARRmData": {
       "name": "ARRmData",
-      "version": "1.40.0",
-      "sha256": "02y44d0dappc3srl2d7lgipm6a62gvd8vivzaq4594dnmy8rvkw3",
+      "version": "1.42.0",
+      "sha256": "0hic3rm9z1z98dqg6g7nvs4mdq7xn0xvkpraqv95zw1izs0zvndi",
       "depends": []
     },
     "ASICSdata": {
       "name": "ASICSdata",
-      "version": "1.24.0",
-      "sha256": "03wlk2x9bz5xjhnfgxl5zdagnwm60f23bz1qhlgqfs94zfay0jrq",
+      "version": "1.26.0",
+      "sha256": "1vhhvdpnayxf33mq50hdg9ypfpbvxlnjk1h4p73k462517dzxpn0",
       "depends": []
     },
     "Affyhgu133A2Expr": {
       "name": "Affyhgu133A2Expr",
-      "version": "1.40.0",
-      "sha256": "0l55wr09j2p8dkzx8cas2whf404anf477h2bmpv267mglrs1sp32",
+      "version": "1.42.0",
+      "sha256": "1asq4vv6lh6yixnnkh12rrlpqckyw3j53vb107mfrwzq99vngmpa",
       "depends": []
     },
     "Affyhgu133Plus2Expr": {
       "name": "Affyhgu133Plus2Expr",
-      "version": "1.38.0",
-      "sha256": "04cxyjk1dhal8iapfilzck8kxpw8jvswxxb7fhnbxqghwlhjg617",
+      "version": "1.40.0",
+      "sha256": "0dy7bx5nncc90xfcmgy1gaf3bs29wkb0s2g2pjnf475xgvrjf07c",
       "depends": []
     },
     "Affyhgu133aExpr": {
       "name": "Affyhgu133aExpr",
-      "version": "1.42.0",
-      "sha256": "047yza31rrdmzjbg6chqrz61fh7j1a013fww5nj1nwp60rd6iln1",
+      "version": "1.44.0",
+      "sha256": "17bq293nyzb8rxn8ywgr2ypk72n5jrcgmyzjsmz9f9dp53icfgzk",
       "depends": []
     },
     "AffymetrixDataTestFiles": {
       "name": "AffymetrixDataTestFiles",
-      "version": "0.42.0",
-      "sha256": "1ijprvhbhq68v2g8z9yqwwqw2lz4f4a2pa7lnq2vhf54p9s96sn1",
+      "version": "0.44.0",
+      "sha256": "055msffzbv9ga74krp2hrxjlfxw57p7ldwb9bqp3rcji834d5nmb",
       "depends": []
     },
     "Affymoe4302Expr": {
       "name": "Affymoe4302Expr",
-      "version": "1.42.0",
-      "sha256": "11n5mx1m21j6cc4qrwzrxj3749zc42b1ivwnp47cf55h6j2c3rgm",
+      "version": "1.44.0",
+      "sha256": "1vnilic1lkx8s0gllrfznd03p49m05426fbjhgxmqznd45s7rjaw",
       "depends": []
     },
     "AmpAffyExample": {
       "name": "AmpAffyExample",
-      "version": "1.44.0",
-      "sha256": "0j5alica5z8fzcwiva3dg1wmncwwkchb7avwvhszk7p7ym0s983q",
+      "version": "1.46.0",
+      "sha256": "0hh3j161whmnw0crcrypv77sdkkcbjrzpfzvgvjvad9m9qkkgfb9",
       "depends": ["affy"]
     },
     "AneuFinderData": {
       "name": "AneuFinderData",
-      "version": "1.32.0",
-      "sha256": "1qysi874hsa4a7xz0na0cxv0sx02d3b74h77s30mfww1wsg8jy69",
+      "version": "1.34.0",
+      "sha256": "039ymqwxr66hmkzig333gwjxczzxlc6jl1x27jw7agriynjbqmgx",
       "depends": []
     },
     "AshkenazimSonChr21": {
       "name": "AshkenazimSonChr21",
-      "version": "1.34.0",
-      "sha256": "0bm2f7pnxibgcsi5kghjzmin01sirprym5i94qsiga7c6dknqgmn",
+      "version": "1.36.0",
+      "sha256": "0chcr50wa1lwcl1y9sgp2759i6hlwbqald5x5l0y4dldjsqfsr3s",
       "depends": []
     },
+    "BeadArrayUseCases": {
+      "name": "BeadArrayUseCases",
+      "version": "1.44.1",
+      "sha256": "0p7y8b75wf6628cig8mj87srp87c978mbyb3fzifxnr72m1wjg73",
+      "depends": ["GEOquery", "beadarray", "limma"]
+    },
+    "BeadSorted_Saliva_EPIC": {
+      "name": "BeadSorted.Saliva.EPIC",
+      "version": "1.14.0",
+      "sha256": "0pdm4vvic78zaxr4r9lp00m0jaj4617pmpcxbxxy1xn83qgbd2hc",
+      "depends": ["ExperimentHub", "minfi"]
+    },
+    "BioImageDbs": {
+      "name": "BioImageDbs",
+      "version": "1.14.0",
+      "sha256": "128kzcn1v4qp3d4yyr5qkqgqzdjf37c0i07wz94zw883snbigqra",
+      "depends": ["AnnotationHub", "EBImage", "ExperimentHub", "animation", "einsum", "filesstrings", "magick", "magrittr", "markdown", "rmarkdown"]
+    },
+    "BioPlex": {
+      "name": "BioPlex",
+      "version": "1.12.0",
+      "sha256": "0yjsfmj06jsrivj70y2c95kghicmq5m5jqacy6sqzk9gbg7sr594",
+      "depends": ["BiocFileCache", "GEOquery", "GenomeInfoDb", "GenomicRanges", "SummarizedExperiment", "graph"]
+    },
+    "BloodCancerMultiOmics2017": {
+      "name": "BloodCancerMultiOmics2017",
+      "version": "1.26.0",
+      "sha256": "1nr4jb85qlg2i11i6p1x6xg7klffpy8wk7801z3gawkby1zywfs0",
+      "depends": ["Biobase", "DESeq2", "RColorBrewer", "SummarizedExperiment", "beeswarm", "devtools", "dplyr", "ggdendro", "ggplot2", "glmnet", "gtable", "ipflasso", "reshape2", "scales", "survival", "tibble"]
+    },
+    "CCl4": {
+      "name": "CCl4",
+      "version": "1.44.0",
+      "sha256": "15z8x1f9m94v44m2w6pzqqcvm0q8vavda2w9m44chlsppmzsfl9j",
+      "depends": ["Biobase", "limma"]
+    },
+    "CLL": {
+      "name": "CLL",
+      "version": "1.46.0",
+      "sha256": "0c893wrfbbwbpd2lv1y0f5m61dvs94s51b9gdbgyv6ihwqn858lf",
+      "depends": ["Biobase", "affy"]
+    },
+    "CLLmethylation": {
+      "name": "CLLmethylation",
+      "version": "1.26.0",
+      "sha256": "111z7lwk1lic3j41cy6j1cq0ks5fi2gyj859laf4x4qahrkzap1b",
+      "depends": ["ExperimentHub", "SummarizedExperiment"]
+    },
+    "COHCAPanno": {
+      "name": "COHCAPanno",
+      "version": "1.42.0",
+      "sha256": "068k6p4bl4w0fa81517bfsrv2p1yd915zl2qjjsnlyczb77c4gkm",
+      "depends": []
+    },
+    "CONFESSdata": {
+      "name": "CONFESSdata",
+      "version": "1.34.0",
+      "sha256": "1qrnvd1c9jfjyn9k283x6g3z50zfvh4ryd5mig1w57a2hi714ars",
+      "depends": []
+    },
+    "COPDSexualDimorphism_data": {
+      "name": "COPDSexualDimorphism.data",
+      "version": "1.42.0",
+      "sha256": "08nrc8r21p1nvzfiahrbxigbyipzi82d6q7r064jq92qyc2fd8jh",
+      "depends": []
+    },
+    "COSMIC_67": {
+      "name": "COSMIC.67",
+      "version": "1.42.0",
+      "sha256": "0kb78j7wdjzcl6dygj18kq6lmnga67l6h9v6an9bvw97vdlwijkj",
+      "depends": ["GenomicRanges", "SummarizedExperiment", "VariantAnnotation"]
+    },
+    "CRCL18": {
+      "name": "CRCL18",
+      "version": "1.26.0",
+      "sha256": "03a0haskz3jpccgbb4r9jzgzrrxabprwh3h3j1r5mpjasq7yrwdv",
+      "depends": ["Biobase"]
+    },
+    "CardinalWorkflows": {
+      "name": "CardinalWorkflows",
+      "version": "1.38.0",
+      "sha256": "1wk1yrxbb22xablwy0blahj89y434607zpqap1d2sx71qgj64vwc",
+      "depends": ["Cardinal"]
+    },
+    "CellMapperData": {
+      "name": "CellMapperData",
+      "version": "1.32.0",
+      "sha256": "07ikbz8vfqmvqw6dpjvirlgvhldn4lc7cy8zjkiqv9a428hfgvb5",
+      "depends": ["CellMapper", "ExperimentHub"]
+    },
+    "ChAMPdata": {
+      "name": "ChAMPdata",
+      "version": "2.38.0",
+      "sha256": "0gcd58ad61niknq1dqn8ydr4v31i718jcg75q1hklbn78xlj2m3f",
+      "depends": ["BiocGenerics", "GenomicRanges"]
+    },
+    "ChIPXpressData": {
+      "name": "ChIPXpressData",
+      "version": "1.44.0",
+      "sha256": "0jf5357dw09dl8xf94jaipymz32qyi7zqm3yc0k4gxws42yw3xy8",
+      "depends": ["bigmemory"]
+    },
+    "ChIPexoQualExample": {
+      "name": "ChIPexoQualExample",
+      "version": "1.30.0",
+      "sha256": "0c6lxl79j65pqy6sgnwaqz83r9fwh0m10xmnj9zcp8s0j1cxn5xq",
+      "depends": []
+    },
+    "ChimpHumanBrainData": {
+      "name": "ChimpHumanBrainData",
+      "version": "1.44.0",
+      "sha256": "1797yccghjn4ajrrs2gz1dkbg4bp4vilxs2nhj657rqqap0gxwpy",
+      "depends": ["affy", "hexbin", "limma", "qvalue", "statmod"]
+    },
+    "CluMSIDdata": {
+      "name": "CluMSIDdata",
+      "version": "1.22.0",
+      "sha256": "07q2qzky019f1vbnbhgb2vkqfgqwi1h2y0vssbw3z14ff5drx126",
+      "depends": []
+    },
+    "CoSIAdata": {
+      "name": "CoSIAdata",
+      "version": "1.6.0",
+      "sha256": "1pd0k8gnn7s798qkvjvgvaschjpn72fvaf28ly1qvdg6mx1xfb2p",
+      "depends": ["ExperimentHub"]
+    },
+    "ConnectivityMap": {
+      "name": "ConnectivityMap",
+      "version": "1.42.0",
+      "sha256": "0lq9yjz104426dn8y2q7a51433x4zfv5y7rrlavy7hkwlqr4jm5j",
+      "depends": []
+    },
+    "CopyNeutralIMA": {
+      "name": "CopyNeutralIMA",
+      "version": "1.24.0",
+      "sha256": "1zls7gj8y5pav5gw0lxdi89p38b6idywryqppqfq7zn4mhdz198m",
+      "depends": ["ExperimentHub", "Rdpack"]
+    },
+    "CopyhelpeR": {
+      "name": "CopyhelpeR",
+      "version": "1.38.0",
+      "sha256": "1zg2cp7rff6yc1lk70gipy0q3z6ndizipay3102psv1q2916x8ln",
+      "depends": []
+    },
+    "CytoMethIC": {
+      "name": "CytoMethIC",
+      "version": "1.2.0",
+      "sha256": "1dmkqd3hk1nfd07j0bq4ljdrbh72kcjlb1xddazpfvsf3wm7ijkq",
+      "depends": ["BiocManager", "BiocParallel", "ExperimentHub", "sesame", "sesameData", "tibble"]
+    },
+    "DAPARdata": {
+      "name": "DAPARdata",
+      "version": "1.36.0",
+      "sha256": "0q7ql1971nls7wpvzgc2nk1h890zl2y6p1zdniwf42azahpvhcka",
+      "depends": ["MSnbase"]
+    },
+    "DExMAdata": {
+      "name": "DExMAdata",
+      "version": "1.14.0",
+      "sha256": "0i7d5cswh0gpyl0dj0ww34xy1m0gjzzssll5xjch9n4i4gq0kzs9",
+      "depends": ["Biobase"]
+    },
+    "DLBCL": {
+      "name": "DLBCL",
+      "version": "1.46.0",
+      "sha256": "0lw6554la5ihfp93idxy4pcp3iack03ng7f6pik109mijwnd68rq",
+      "depends": ["Biobase", "graph"]
+    },
+    "DMRcatedata": {
+      "name": "DMRcatedata",
+      "version": "2.24.0",
+      "sha256": "0w6mv0zclrnr897xjrsgbm3bki3mmvbafzdhj9bl55v07438wh7i",
+      "depends": ["ExperimentHub", "GenomicFeatures", "Gviz", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "plyr", "readxl", "rtracklayer"]
+    },
+    "DNAZooData": {
+      "name": "DNAZooData",
+      "version": "1.6.0",
+      "sha256": "042wk00vhc98p847fsja3hc8bp0076yn8b3nfi6khrgjr2cfrfns",
+      "depends": ["BiocFileCache", "HiCExperiment", "S4Vectors", "rjson"]
+    },
+    "DeSousa2013": {
+      "name": "DeSousa2013",
+      "version": "1.42.0",
+      "sha256": "0kyaycn5i1dxllzakc8m837apd4fj57d2ddsx01wb4zqk7dpsk2k",
+      "depends": ["AnnotationDbi", "Biobase", "ConsensusClusterPlus", "ROCR", "affy", "cluster", "frma", "frmaTools", "gplots", "hgu133plus2_db", "hgu133plus2frmavecs", "pamr", "rgl", "siggenes", "survival", "sva"]
+    },
+    "DmelSGI": {
+      "name": "DmelSGI",
+      "version": "1.37.0",
+      "sha256": "023ynaky11cc33ksmq8s77m17rlr45mp33bzrzaqija64z01rgih",
+      "depends": ["TSP", "abind", "gplots", "igraph", "knitr", "limma", "rhdf5"]
+    },
+    "DonaPLLP2013": {
+      "name": "DonaPLLP2013",
+      "version": "1.44.0",
+      "sha256": "0swc6a2pfk4rmd4am3y34xifmrcys4wyz8x6rmdncbzq6v78vjcm",
+      "depends": ["EBImage"]
+    },
+    "DropletTestFiles": {
+      "name": "DropletTestFiles",
+      "version": "1.16.0",
+      "sha256": "18js640mf07yx0hxswbyqpdq2iaf7rzpmz1alazx9yayzwlk7fhm",
+      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors"]
+    },
+    "DrugVsDiseasedata": {
+      "name": "DrugVsDiseasedata",
+      "version": "1.42.0",
+      "sha256": "18qgs1r86v35jm4d3m8cb81cz92m3rghx7wwvlshflfw581r5anb",
+      "depends": []
+    },
+    "DuoClustering2018": {
+      "name": "DuoClustering2018",
+      "version": "1.24.0",
+      "sha256": "1cf08ydsg8hj4klbl9wga0dmjabqq77rg22jms1dimpmf15a1vjk",
+      "depends": ["ExperimentHub", "dplyr", "ggplot2", "ggthemes", "magrittr", "mclust", "purrr", "reshape2", "tidyr", "viridis"]
+    },
+    "DvDdata": {
+      "name": "DvDdata",
+      "version": "1.42.0",
+      "sha256": "034dj6z8drk45w3v2izivrn6q5gwbyy3dc515ayj4irf756r5555",
+      "depends": []
+    },
+    "EGSEAdata": {
+      "name": "EGSEAdata",
+      "version": "1.34.0",
+      "sha256": "120csmjcr3zgskqdxzfy37j5kid58fd9fcwvk9p8fzmybz4x9lcw",
+      "depends": []
+    },
+    "ELMER_data": {
+      "name": "ELMER.data",
+      "version": "2.30.0",
+      "sha256": "02vz6n7dnc0jgszj9h9ym861jbhlp6z8w5dl8h3x3m0d8ka5jlw2",
+      "depends": ["GenomicRanges"]
+    },
+    "EatonEtAlChIPseq": {
+      "name": "EatonEtAlChIPseq",
+      "version": "0.44.0",
+      "sha256": "1zss730sqmbbn2hs9rqd5gnx86crjmgwbrwl90yybrya9ijfa7k4",
+      "depends": ["GenomicRanges", "ShortRead", "rtracklayer"]
+    },
+    "EpiMix_data": {
+      "name": "EpiMix.data",
+      "version": "1.8.0",
+      "sha256": "0qahz20cz3q31l2m9g3lyy52gdkccqj4xgsqqq76r4nqylgrqg2w",
+      "depends": ["ExperimentHub"]
+    },
+    "EpipwR_data": {
+      "name": "EpipwR.data",
+      "version": "1.0.0",
+      "sha256": "0m784qygmzn9drcfx73vgvc0fgz76iajnhh3wpiqsqfdpkyix59f",
+      "depends": ["ExperimentHub"]
+    },
+    "FANTOM3and4CAGE": {
+      "name": "FANTOM3and4CAGE",
+      "version": "1.42.0",
+      "sha256": "0kz91pajy3y2xsg88jinghx973190ncxsmg179mbqjimqkyzjfyv",
+      "depends": []
+    },
+    "FIs": {
+      "name": "FIs",
+      "version": "1.34.0",
+      "sha256": "1fgga7vm6mrq622drx8lhp7i9bql16sd0843w2dp0scq3w80qyhz",
+      "depends": []
+    },
+    "FieldEffectCrc": {
+      "name": "FieldEffectCrc",
+      "version": "1.16.0",
+      "sha256": "0gbj5qgxwilkbdab9q3i47dxj3ah3hfji4knvlvdxsa1sf4f8bhh",
+      "depends": ["AnnotationHub", "BiocStyle", "DESeq2", "ExperimentHub", "RUnit", "SummarizedExperiment"]
+    },
+    "Fletcher2013a": {
+      "name": "Fletcher2013a",
+      "version": "1.42.0",
+      "sha256": "02wb3d2dw29bdnapy25znvs1mrpifwfax13ngv07g3jbm64sfcbr",
+      "depends": ["Biobase", "VennDiagram", "gplots", "limma"]
+    },
+    "Fletcher2013b": {
+      "name": "Fletcher2013b",
+      "version": "1.42.0",
+      "sha256": "081l3af001i2z7zzhgjdlm02lwaw9g65bc9hkb393rrfxix974aq",
+      "depends": ["Fletcher2013a", "RColorBrewer", "RTN", "RedeR", "igraph"]
+    },
+    "FlowSorted_Blood_450k": {
+      "name": "FlowSorted.Blood.450k",
+      "version": "1.44.0",
+      "sha256": "1afjwjddx9nwg01png223zr9vcb3xq8i71wx8mj2cxdwsb0lyqsq",
+      "depends": ["minfi"]
+    },
+    "FlowSorted_Blood_EPIC": {
+      "name": "FlowSorted.Blood.EPIC",
+      "version": "2.10.0",
+      "sha256": "1zq5xbgr4r68mmzsszb16w11axkmgrxcrpl56dy33szs0ahk10xs",
+      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "genefilter", "minfi", "nlme", "quadprog"]
+    },
+    "FlowSorted_CordBlood_450k": {
+      "name": "FlowSorted.CordBlood.450k",
+      "version": "1.34.0",
+      "sha256": "0cxdhysyj1s5wrj1779km6gfyk6n8yz94sysg9w6cw7n561b2q5i",
+      "depends": ["minfi"]
+    },
+    "FlowSorted_CordBloodCombined_450k": {
+      "name": "FlowSorted.CordBloodCombined.450k",
+      "version": "1.22.0",
+      "sha256": "15phn2kikaap2yzv9pn1206iiv4lg87hrh1yn4ks45f30prryp9x",
+      "depends": ["AnnotationHub", "ExperimentHub", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "SummarizedExperiment", "minfi"]
+    },
+    "FlowSorted_CordBloodNorway_450k": {
+      "name": "FlowSorted.CordBloodNorway.450k",
+      "version": "1.32.0",
+      "sha256": "11w600kbk7gkm1pafqm513kv7y5cfrny589gw18z6magnkscffna",
+      "depends": ["minfi"]
+    },
+    "FlowSorted_DLPFC_450k": {
+      "name": "FlowSorted.DLPFC.450k",
+      "version": "1.42.0",
+      "sha256": "1338vkd2fjirmbydlz8ma2pxpln243fsj68a004bxp47gkvxpjnd",
+      "depends": ["minfi"]
+    },
+    "GIGSEAdata": {
+      "name": "GIGSEAdata",
+      "version": "1.24.0",
+      "sha256": "13ggd156s67asa0afpahazzi6xbk2yfb4rpnf71vak6bfvgpalim",
+      "depends": []
+    },
+    "GSBenchMark": {
+      "name": "GSBenchMark",
+      "version": "1.26.0",
+      "sha256": "0dyc1611nzg2hmm4gw71pdh5v6k6jpqcqmnc4p6hbgnbmmckijik",
+      "depends": []
+    },
+    "GSE103322": {
+      "name": "GSE103322",
+      "version": "1.12.0",
+      "sha256": "00v4hjw0mv1i2b3gy32dhgvh0np6lqm0pgr3ck9kymisjnj8q05k",
+      "depends": ["Biobase", "GEOquery"]
+    },
+    "GSE13015": {
+      "name": "GSE13015",
+      "version": "1.14.0",
+      "sha256": "143aails9r04z86n5j5dlr6bq6jq95br0gwg5iwg4cxv2xghrqqd",
+      "depends": ["Biobase", "GEOquery", "SummarizedExperiment", "preprocessCore"]
+    },
+    "GSE159526": {
+      "name": "GSE159526",
+      "version": "1.12.0",
+      "sha256": "0dqnbp4xpafvqg4490jw2l3g8ki7ghdzfypa40l74i76shlfp8sb",
+      "depends": []
+    },
+    "GSE62944": {
+      "name": "GSE62944",
+      "version": "1.34.0",
+      "sha256": "015jp3kmdwpvmv38wa3r4qy5yfbyxjzy9mgynfkwpapzswgpgf6f",
+      "depends": ["Biobase", "GEOquery"]
+    },
+    "GSVAdata": {
+      "name": "GSVAdata",
+      "version": "1.42.0",
+      "sha256": "160k1vsxcbjqwpfkdkhd7dsvnaasjbs270gnfdwdbnl0c6d24348",
+      "depends": ["Biobase", "GSEABase", "SummarizedExperiment", "hgu95a_db"]
+    },
+    "GWASdata": {
+      "name": "GWASdata",
+      "version": "1.44.0",
+      "sha256": "1rvl7mp5jimzsff2i1qlkx92ljk1fgqycrwhq21p03p9nakbpbs8",
+      "depends": ["GWASTools"]
+    },
+    "GenomicDistributionsData": {
+      "name": "GenomicDistributionsData",
+      "version": "1.14.0",
+      "sha256": "1k2agyxndlmn20lxraidmb63sx530736qmi5wx1dlgp8bj5ghaw5",
+      "depends": ["AnnotationFilter", "AnnotationHub", "BSgenome", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "data_table", "ensembldb"]
+    },
+    "GeuvadisTranscriptExpr": {
+      "name": "GeuvadisTranscriptExpr",
+      "version": "1.34.0",
+      "sha256": "02pm49hljlhabv6j5ryzrdj5kh69xzrpdz0sc7jk9c1ky0cb9f82",
+      "depends": []
+    },
+    "HCAData": {
+      "name": "HCAData",
+      "version": "1.22.0",
+      "sha256": "0gqh065bfdndvxmksg3m86kpb1l91qijpyva2mx4azng85fc5bm7",
+      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment"]
+    },
+    "HCATonsilData": {
+      "name": "HCATonsilData",
+      "version": "1.4.0",
+      "sha256": "0g3wfgkj09gx4knn2sw9kx09mxxdj3bdcg7951ba5ak6f99c3f5b",
+      "depends": ["ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "base64enc", "htmltools", "rmarkdown"]
+    },
+    "HD2013SGI": {
+      "name": "HD2013SGI",
+      "version": "1.46.0",
+      "sha256": "05q5xq1q2bvnm1y420gw4z8acpx6cgpqa4zcqhgydgn3af2q0ya9",
+      "depends": ["EBImage", "LSD", "RColorBrewer", "geneplotter", "gplots", "limma", "splots", "vcd"]
+    },
+    "HDCytoData": {
+      "name": "HDCytoData",
+      "version": "1.26.0",
+      "sha256": "10b5fjhyrz5rm08xrniv6pnnay0h96bhs838napxsmjgvmhqbibn",
+      "depends": ["ExperimentHub", "SummarizedExperiment", "flowCore"]
+    },
+    "HEEBOdata": {
+      "name": "HEEBOdata",
+      "version": "1.44.0",
+      "sha256": "0alndr9qzhdhibik5wlzf87m58jyvaiqp410cxi5ymqdg6vajc6z",
+      "depends": []
+    },
+    "HIVcDNAvantWout03": {
+      "name": "HIVcDNAvantWout03",
+      "version": "1.46.0",
+      "sha256": "046faa4gjnajcqszxha16xqvn31kdb8b015zd3vkg88w2p0i1s13",
+      "depends": []
+    },
+    "HMP16SData": {
+      "name": "HMP16SData",
+      "version": "1.26.0",
+      "sha256": "1km40658svlz6byv8bdm6ngmgpdpfrg80gk25g1i9dd860zqhy30",
+      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "kableExtra", "knitr", "magrittr", "readr", "stringr", "tibble"]
+    },
+    "HMP2Data": {
+      "name": "HMP2Data",
+      "version": "1.20.0",
+      "sha256": "07gh52z9xjlpkw36gil5xnv4ykym8s83rnvvgmhqr4zynnzspwdb",
+      "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "assertthat", "data_table", "dplyr", "kableExtra", "knitr", "magrittr", "phyloseq", "readr"]
+    },
+    "HSMMSingleCell": {
+      "name": "HSMMSingleCell",
+      "version": "1.26.0",
+      "sha256": "1mcckdpz4i6azm2dmjrkbn6py4c7bhq1dqzpb3h9am49s1jhzgiw",
+      "depends": []
+    },
+    "HarmanData": {
+      "name": "HarmanData",
+      "version": "1.34.0",
+      "sha256": "1xqlpvyw54dq2xmdqsvx7salph246wpq5vz38sv1k544vigzmkxy",
+      "depends": []
+    },
+    "HarmonizedTCGAData": {
+      "name": "HarmonizedTCGAData",
+      "version": "1.28.0",
+      "sha256": "1v12rnlwcy8xz2qsqba829ybrny7hqs7zw8p52z3sa98l7s4i0qp",
+      "depends": ["ExperimentHub"]
+    },
+    "HelloRangesData": {
+      "name": "HelloRangesData",
+      "version": "1.32.0",
+      "sha256": "0a6bjiyq8y505lcl4nn2jz7x5zkbspnw5l4zaar3p3hql981268a",
+      "depends": []
+    },
+    "HiBED": {
+      "name": "HiBED",
+      "version": "1.4.0",
+      "sha256": "11kqh3dj00gabyy8frvd5ac0h7ryh53sl97l6n2f19a5hkwcwqh2",
+      "depends": ["AnnotationHub", "FlowSorted_Blood_EPIC", "FlowSorted_DLPFC_450k", "SummarizedExperiment", "dplyr", "minfi", "tibble"]
+    },
+    "HiCDataHumanIMR90": {
+      "name": "HiCDataHumanIMR90",
+      "version": "1.26.0",
+      "sha256": "1l5as56kra8dnvgdynwhmpd4nlj91mrx8qal0mqanxzhdw6w0bzb",
+      "depends": []
+    },
+    "HiCDataLymphoblast": {
+      "name": "HiCDataLymphoblast",
+      "version": "1.42.0",
+      "sha256": "1i47am8j3ygzczl3hqjymnrpsjc1w5q41gcwl24j9h82qa80plrx",
+      "depends": []
+    },
+    "HiContactsData": {
+      "name": "HiContactsData",
+      "version": "1.8.0",
+      "sha256": "0lrgqri557l7iflsljj18vz5z8b3z1dyrcchxf5g798fvrb5jk0q",
+      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub"]
+    },
+    "HighlyReplicatedRNASeq": {
+      "name": "HighlyReplicatedRNASeq",
+      "version": "1.18.0",
+      "sha256": "08r930wyrmf23aiaipid766ckjal4f4q3fr7gxqk1vy21bhq2h70",
+      "depends": ["ExperimentHub", "S4Vectors", "SummarizedExperiment"]
+    },
+    "Hiiragi2013": {
+      "name": "Hiiragi2013",
+      "version": "1.41.0",
+      "sha256": "0z8ns2qsnng3kvzcris3hxggy1jmzrl8jwy0ndf6sbn1cqj1pnkl",
+      "depends": ["Biobase", "KEGGREST", "MASS", "RColorBrewer", "affy", "boot", "clue", "cluster", "genefilter", "geneplotter", "gplots", "gtools", "lattice", "latticeExtra", "mouse4302_db", "xtable"]
+    },
+    "HumanAffyData": {
+      "name": "HumanAffyData",
+      "version": "1.32.0",
+      "sha256": "1vdiwdivxxsz4r3505bqqv4mly6q11mzll0pq1g7dhjmdmy6xxzf",
+      "depends": ["Biobase", "ExperimentHub"]
+    },
+    "IHWpaper": {
+      "name": "IHWpaper",
+      "version": "1.34.0",
+      "sha256": "0vg5vj91k0pv80rh1l8x4psd4km9ds3yy4mlpw8qwgd1sqwj1h3x",
+      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "IHW", "Rcpp", "SummarizedExperiment", "cowplot", "dplyr", "fdrtool", "genefilter", "ggplot2", "qvalue"]
+    },
+    "ITALICSData": {
+      "name": "ITALICSData",
+      "version": "2.44.0",
+      "sha256": "0gdr3r7ivyyfawrx5bmlqf617z3s3hcv4la58bd0wq9xdw79fw74",
+      "depends": []
+    },
+    "Illumina450ProbeVariants_db": {
+      "name": "Illumina450ProbeVariants.db",
+      "version": "1.42.0",
+      "sha256": "0sp9znznmqhf0h4g5gbz34hn3frki6nfqvfs7v1w6kin3y9k2gr5",
+      "depends": []
+    },
+    "IlluminaDataTestFiles": {
+      "name": "IlluminaDataTestFiles",
+      "version": "1.44.0",
+      "sha256": "0xwck8i2r2866kaimwy9klg85fs81f6h4i9zw20zxxd0qmqkpzwi",
+      "depends": []
+    },
+    "Iyer517": {
+      "name": "Iyer517",
+      "version": "1.48.0",
+      "sha256": "1849ni75zk72mzpnmd5q9c6rxc2s7d0kx61fk5hkl0pilm9y9zy8",
+      "depends": ["Biobase"]
+    },
+    "JASPAR2014": {
+      "name": "JASPAR2014",
+      "version": "1.42.0",
+      "sha256": "0487bxyc24saxy0r3hdxapqcrh20qgr8rdwkskc1w8l4qgi01rj8",
+      "depends": ["Biostrings"]
+    },
+    "JASPAR2016": {
+      "name": "JASPAR2016",
+      "version": "1.34.0",
+      "sha256": "0vg47zvpb20vhk177d1hj959cj1srfql10ywakzkhw7h4hmc8jnl",
+      "depends": []
+    },
+    "JohnsonKinaseData": {
+      "name": "JohnsonKinaseData",
+      "version": "1.2.0",
+      "sha256": "0i9l1bdbdvv7npb8bviyl0y8fpmhg6wj3ysr8z6d9a8ycplsm3jr",
+      "depends": ["BiocParallel", "ExperimentHub", "checkmate", "dplyr", "purrr", "stringr", "tidyr"]
+    },
+    "KEGGandMetacoreDzPathwaysGEO": {
+      "name": "KEGGandMetacoreDzPathwaysGEO",
+      "version": "1.26.0",
+      "sha256": "0gpvw6hgn0xis0zkqx0i05hy2ijsda0kwsxddh9758r1ablzd0rl",
+      "depends": ["Biobase", "BiocGenerics"]
+    },
+    "KEGGdzPathwaysGEO": {
+      "name": "KEGGdzPathwaysGEO",
+      "version": "1.44.0",
+      "sha256": "15xvh2vm2mzwfqq2jw667k33y9kayjnpligz34yczjhv59559xs8",
+      "depends": ["Biobase", "BiocGenerics"]
+    },
+    "KOdata": {
+      "name": "KOdata",
+      "version": "1.32.0",
+      "sha256": "1iwjl8w5gbw190z40m4rani4kql2na4sil1wpdvbs5d4pnw5n2qa",
+      "depends": []
+    },
+    "LRcellTypeMarkers": {
+      "name": "LRcellTypeMarkers",
+      "version": "1.14.0",
+      "sha256": "0q5mw2fdz3hlnxx3k7qca7wr50s49jymgqyr8ydq4dfqqcvmzxyr",
+      "depends": ["ExperimentHub"]
+    },
+    "LegATo": {
+      "name": "LegATo",
+      "version": "1.0.0",
+      "sha256": "1lprd2g3qd0r3vqqzfaf3h25gyi4c0bbinqyvadvw3m68n55lcx0",
+      "depends": ["MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "animalcules", "data_table", "dplyr", "ggplot2", "magrittr", "plyr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
+    "LiebermanAidenHiC2009": {
+      "name": "LiebermanAidenHiC2009",
+      "version": "0.44.0",
+      "sha256": "0xa0j53i121r9yscklwcaibhm5826l878w2ys4hwn03kv1jbxm14",
+      "depends": ["IRanges", "KernSmooth"]
+    },
+    "ListerEtAlBSseq": {
+      "name": "ListerEtAlBSseq",
+      "version": "1.38.0",
+      "sha256": "0i3ql1pyyw53n8q3q2wwhqndhyb960l0j5616vx5777dfybm4j9n",
+      "depends": ["methylPipe"]
+    },
+    "LungCancerACvsSCCGEO": {
+      "name": "LungCancerACvsSCCGEO",
+      "version": "1.42.0",
+      "sha256": "0xnikck5idln235chn2lyrh7yaaihpwi3dm8d70i0hps9rg7ibix",
+      "depends": []
+    },
+    "LungCancerLines": {
+      "name": "LungCancerLines",
+      "version": "0.44.0",
+      "sha256": "1g6h8b94hrn8wp6fhjwx1mkrdmqmpmp1y22979apf4fn2al10y17",
+      "depends": ["Rsamtools"]
+    },
+    "M3DExampleData": {
+      "name": "M3DExampleData",
+      "version": "1.32.0",
+      "sha256": "08nid6lqbxf6jjqkp945wg5wr3pv33ljy499563rnvnnadi3gncm",
+      "depends": []
+    },
+    "MACSdata": {
+      "name": "MACSdata",
+      "version": "1.14.0",
+      "sha256": "15cs7096hyfqrw1b3lhnfzkirn3g9ryzymdypqdijjgp2l88j419",
+      "depends": []
+    },
+    "MAQCsubset": {
+      "name": "MAQCsubset",
+      "version": "1.44.0",
+      "sha256": "114sk6yxcz8v7wx2dh661y7nazn8dfik045r2m6zfm0zdkqljd6w",
+      "depends": ["Biobase", "affy", "lumi"]
+    },
+    "MEDIPSData": {
+      "name": "MEDIPSData",
+      "version": "1.42.0",
+      "sha256": "0vrnyjsdags72fk6ipy3jiw9kq46yrmv4inzff8hrc20rcq74yav",
+      "depends": []
+    },
+    "MEEBOdata": {
+      "name": "MEEBOdata",
+      "version": "1.44.0",
+      "sha256": "0imyssybgcl54capbh0bcppky0a8yb109gbsfh7g11j2af9nb0ps",
+      "depends": []
+    },
+    "MMDiffBamSubset": {
+      "name": "MMDiffBamSubset",
+      "version": "1.42.0",
+      "sha256": "0kyyz9fw03gfnpving4swjihz8wi0603l91f1qda5gqj692dg0rs",
+      "depends": []
+    },
+    "MOFAdata": {
+      "name": "MOFAdata",
+      "version": "1.22.0",
+      "sha256": "007rmp37qwrsfm02g1xwzr3az9rv43hz58j41f982z0ikzz8hl2q",
+      "depends": []
+    },
+    "MSMB": {
+      "name": "MSMB",
+      "version": "1.24.0",
+      "sha256": "0vshdk1axyvccfixzd3bsgxf6gxpissakg1zk8pqnd87zfznkh8z",
+      "depends": ["tibble"]
+    },
+    "MUGAExampleData": {
+      "name": "MUGAExampleData",
+      "version": "1.26.0",
+      "sha256": "1i2pck7nyq8g0vi61cqah570fcsmsx4wdif2siwi37vr17s9fvf7",
+      "depends": []
+    },
+    "MerfishData": {
+      "name": "MerfishData",
+      "version": "1.8.0",
+      "sha256": "0dnkvmbjpzk0xv8xzpy3qs6yqlrc7ac78n63h21vn7f7zmq7cpmf",
+      "depends": ["AnnotationHub", "BumpyMatrix", "EBImage", "ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"]
+    },
+    "MetaGxBreast": {
+      "name": "MetaGxBreast",
+      "version": "1.26.0",
+      "sha256": "02bhrm1ancachq9yx1nkl1yzvcji8qnqx7v306gx9z5rahr53n15",
+      "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "SummarizedExperiment", "impute", "lattice"]
+    },
+    "MetaGxOvarian": {
+      "name": "MetaGxOvarian",
+      "version": "1.26.0",
+      "sha256": "00wnfhj5bdq5gps26c3z0kv981wwy7qcradcjcc75v7la75wm8xw",
+      "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "SummarizedExperiment", "impute", "lattice"]
+    },
+    "MetaGxPancreas": {
+      "name": "MetaGxPancreas",
+      "version": "1.26.0",
+      "sha256": "11fbrva5yhjqw29vyl823k8g1gy8a476d3d1754x2a8yj5aw7n80",
+      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "impute"]
+    },
+    "MetaScope": {
+      "name": "MetaScope",
+      "version": "1.5.4",
+      "sha256": "1f69bkm7qb027pl1c1w9vlvbcw0sxi0da5az21a8i8xrz42aab57",
+      "depends": ["BiocFileCache", "Biostrings", "Matrix", "MultiAssayExperiment", "Rbowtie2", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "stringr", "tibble", "tidyr"]
+    },
+    "MethylAidData": {
+      "name": "MethylAidData",
+      "version": "1.38.0",
+      "sha256": "1y8kcbbi76cfw379g2wlml2adkf0vn1bmyhqq8vp70vdc23n9vr1",
+      "depends": ["MethylAid"]
+    },
+    "MethylSeqData": {
+      "name": "MethylSeqData",
+      "version": "1.16.0",
+      "sha256": "0qflbqkslp2fhprhhjagskd91833lxsxydfq12an57v5ww25ix4r",
+      "depends": ["ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "SummarizedExperiment", "rhdf5"]
+    },
+    "MicrobiomeBenchmarkData": {
+      "name": "MicrobiomeBenchmarkData",
+      "version": "1.8.0",
+      "sha256": "0ca79ss8a31diykqpy323dd4sb7iky4gqyvil2wagy6hq25mdqp7",
+      "depends": ["BiocFileCache", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape"]
+    },
+    "MouseAgingData": {
+      "name": "MouseAgingData",
+      "version": "1.2.0",
+      "sha256": "0cw03p2xk8amgswjzvka5l23crhd9f8p2ggr7rdib4wy3cidvhmg",
+      "depends": ["AnnotationHub", "ExperimentHub", "SingleCellExperiment"]
+    },
+    "MouseGastrulationData": {
+      "name": "MouseGastrulationData",
+      "version": "1.20.0",
+      "sha256": "1w2907hcja7rkdrizh0rmdf75liy2zx4v9kxp4xx12x222q9ngz6",
+      "depends": ["BiocGenerics", "BumpyMatrix", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"]
+    },
+    "MouseThymusAgeing": {
+      "name": "MouseThymusAgeing",
+      "version": "1.14.0",
+      "sha256": "0sbb4vr4gs2sbkn35cwhysx6gqp25l4ifx4pqvll7nywq9hr28if",
+      "depends": ["BiocGenerics", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"]
+    },
+    "NCIgraphData": {
+      "name": "NCIgraphData",
+      "version": "1.42.0",
+      "sha256": "15bvrqyvd3lg9y5qy749dc7giq4hx9ixlk342gbf7n2jhnjhh0gz",
+      "depends": []
+    },
+    "NGScopyData": {
+      "name": "NGScopyData",
+      "version": "1.26.0",
+      "sha256": "123gla377dck6vvki3dxv7absscp73229i2sl1p1kfzmy0bvf4lk",
+      "depends": []
+    },
+    "NanoporeRNASeq": {
+      "name": "NanoporeRNASeq",
+      "version": "1.16.0",
+      "sha256": "0z0aa9nd0f3l1ncl8gbm50x779lgpazi6fwzxl7p1xnrikwa7lzp",
+      "depends": ["ExperimentHub"]
+    },
+    "NestLink": {
+      "name": "NestLink",
+      "version": "1.22.0",
+      "sha256": "0fgl07gqipxmj0yqqa97inqdv8fma2n8lm20irpj825798f0iq6z",
+      "depends": ["AnnotationHub", "Biostrings", "ExperimentHub", "ShortRead", "gplots", "protViz"]
+    },
+    "NetActivityData": {
+      "name": "NetActivityData",
+      "version": "1.8.0",
+      "sha256": "0b6f07467l448dw2nrv243gf7mhhyq59w4by54iwdb9zk1gyvwlm",
+      "depends": []
+    },
+    "Neve2006": {
+      "name": "Neve2006",
+      "version": "0.44.0",
+      "sha256": "0qbqd501scsdx0d7s1pxfjdy2r7nj9d0dgfs368cpbf28wab51jw",
+      "depends": ["Biobase", "annotate", "hgu133a_db"]
+    },
+    "NxtIRFdata": {
+      "name": "NxtIRFdata",
+      "version": "1.12.0",
+      "sha256": "1i2s3mpv057qb543rs4dyqfr9h75w3v1rswrix5lbkp2654n323b",
+      "depends": ["BiocFileCache", "ExperimentHub", "R_utils", "rtracklayer"]
+    },
+    "OMICsPCAdata": {
+      "name": "OMICsPCAdata",
+      "version": "1.24.0",
+      "sha256": "0dqjx33flfcx54qwag5767gqxq09imvy6rgc1qw5d07ms9idv20l",
+      "depends": ["MultiAssayExperiment"]
+    },
+    "ObMiTi": {
+      "name": "ObMiTi",
+      "version": "1.14.0",
+      "sha256": "194m049axyprmvxfc3f40p8vkkwqnh2kjc47ayqiplfhdihr94n5",
+      "depends": ["ExperimentHub", "SummarizedExperiment"]
+    },
+    "OnassisJavaLibs": {
+      "name": "OnassisJavaLibs",
+      "version": "1.28.0",
+      "sha256": "00pryisrs1cy6xw9lmwxqd87ybmmjasch764d8kfbn0dhzn5s2h1",
+      "depends": ["rJava"]
+    },
+    "PCHiCdata": {
+      "name": "PCHiCdata",
+      "version": "1.34.0",
+      "sha256": "110b8ss4mfh9gvhbkvkwxhsjx82wzdk159b76643id9gwrhvick6",
+      "depends": ["Chicago"]
+    },
+    "PREDAsampledata": {
+      "name": "PREDAsampledata",
+      "version": "0.46.0",
+      "sha256": "1hif80a3w16c8da04bh1jw0n7yyp7msjshasni6k858ygw0q3wwh",
+      "depends": ["Biobase", "PREDA", "affy", "annotate"]
+    },
+    "PWMEnrich_Dmelanogaster_background": {
+      "name": "PWMEnrich.Dmelanogaster.background",
+      "version": "4.40.0",
+      "sha256": "13l0dylava0d7gmiqkn1wpqnkkixqcv3njlwr1v73hmmzi382sjs",
+      "depends": ["PWMEnrich"]
+    },
+    "PWMEnrich_Hsapiens_background": {
+      "name": "PWMEnrich.Hsapiens.background",
+      "version": "4.40.0",
+      "sha256": "0d0dz3w0c88xx9hw1pvaz3p2pxrfwdsmfwlf5ffy0xw9vn3mglhs",
+      "depends": ["PWMEnrich"]
+    },
+    "PWMEnrich_Mmusculus_background": {
+      "name": "PWMEnrich.Mmusculus.background",
+      "version": "4.40.0",
+      "sha256": "1jijn2kp5n3ng11bf9vj6mfi422zz1bzs2jb8rp9sdlzqf1n89kr",
+      "depends": ["PWMEnrich"]
+    },
+    "PasillaTranscriptExpr": {
+      "name": "PasillaTranscriptExpr",
+      "version": "1.34.0",
+      "sha256": "0bjxqnkybdcj6g4q88kiq2mpvap9qwayq99whl634fjawibpipk8",
+      "depends": []
+    },
+    "PathNetData": {
+      "name": "PathNetData",
+      "version": "1.42.0",
+      "sha256": "1wix226lja5mhxzqargmpa3vnyjxs54jvia71jq438pp4ssrsjzq",
+      "depends": []
+    },
+    "PepsNMRData": {
+      "name": "PepsNMRData",
+      "version": "1.24.0",
+      "sha256": "1rvmkyi9y6ny1xyz9xlblp99ddjx1s4wzp1wghdk53rc8qn3fm1v",
+      "depends": []
+    },
+    "PhyloProfileData": {
+      "name": "PhyloProfileData",
+      "version": "1.20.0",
+      "sha256": "1b1qf8s7il8cyjfmp5z3zrq21apzc8jyr9hyq2vb6y48gycjjs8k",
+      "depends": ["BiocStyle", "Biostrings", "ExperimentHub"]
+    },
+    "ProData": {
+      "name": "ProData",
+      "version": "1.44.0",
+      "sha256": "0hbglrqlqn6c5y8bhl88djid7bjvnd7m43n346qzqv1baba7rdcd",
+      "depends": ["Biobase"]
+    },
+    "ProteinGymR": {
+      "name": "ProteinGymR",
+      "version": "1.0.0",
+      "sha256": "0p260mha4492dv526sx6kc7dbniy5rmfh209kqi06mq3y5jv28j5",
+      "depends": ["ExperimentHub", "dplyr", "forcats", "ggdist", "gghalves", "ggplot2", "purrr", "queryup", "spdl", "tidyr", "tidyselect"]
+    },
+    "PtH2O2lipids": {
+      "name": "PtH2O2lipids",
+      "version": "1.32.0",
+      "sha256": "1rk9qk6d921lplj8q110kpnipndq576lxn59wpjmpzbzz1qz3946",
+      "depends": ["CAMERA", "LOBSTAHS", "xcms"]
+    },
+    "QDNAseq_hg19": {
+      "name": "QDNAseq.hg19",
+      "version": "1.36.0",
+      "sha256": "1k80df803nzbaqvbhnj6d973dzqcjsps3gaxhw1w1x6hm231qnjc",
+      "depends": ["QDNAseq"]
+    },
+    "QDNAseq_mm10": {
+      "name": "QDNAseq.mm10",
+      "version": "1.36.0",
+      "sha256": "0dy776lham0n7hjdy3xf34bs9a9bzqf70xsaxv4mc94x807bicfs",
+      "depends": ["QDNAseq"]
+    },
+    "QUBICdata": {
+      "name": "QUBICdata",
+      "version": "1.34.0",
+      "sha256": "1wyi0x64f7gvj2sxg0l01dpwx09h2ga14kiybjfbrhzsp54288w2",
+      "depends": []
+    },
+    "RGMQLlib": {
+      "name": "RGMQLlib",
+      "version": "1.26.0",
+      "sha256": "1j6n8nvkfcdyh39d70nscm6xmkvyahmq16znc1ya12azkp0n3fpg",
+      "depends": []
+    },
+    "RITANdata": {
+      "name": "RITANdata",
+      "version": "1.30.0",
+      "sha256": "1azrkw0zxplmzlb3vs58mw9nka23p13xblrq9pqdfvv7cpcpq4la",
+      "depends": []
+    },
+    "RMassBankData": {
+      "name": "RMassBankData",
+      "version": "1.44.0",
+      "sha256": "196n2qq63gkcjqlill2wc3v0hiq1zxqw75c2r4y9z6j6ac11ryz9",
+      "depends": []
+    },
+    "RNAinteractMAPK": {
+      "name": "RNAinteractMAPK",
+      "version": "1.41.0",
+      "sha256": "0dfxy6hhcwx8xd4c2a02v41dnrrj97lg7ddl4pfn492rk4qvd4s6",
+      "depends": ["Biobase", "MASS", "fields", "gdata", "genefilter", "lattice", "sparseLDA"]
+    },
+    "RNAmodR_Data": {
+      "name": "RNAmodR.Data",
+      "version": "1.20.0",
+      "sha256": "0msav01jgpv1vhf9p4q5zs50kgg6f1r8lrfad377zbflhf1pf2aw",
+      "depends": ["ExperimentHub", "ExperimentHubData"]
+    },
+    "RNAseqData_HNRNPC_bam_chr14": {
+      "name": "RNAseqData.HNRNPC.bam.chr14",
+      "version": "0.44.0",
+      "sha256": "1yhr798bbv3mc8wnalz4wag1np6kyq6akb0mbpvj47130ifi0wbx",
+      "depends": []
+    },
+    "RRBSdata": {
+      "name": "RRBSdata",
+      "version": "1.26.0",
+      "sha256": "1yxx7ssm831bph0qhzl9qv9mm4l4hgj9j1x7mn4kf2qqacpkvgjz",
+      "depends": ["BiSeq"]
+    },
+    "RTCGA_CNV": {
+      "name": "RTCGA.CNV",
+      "version": "1.34.0",
+      "sha256": "0g41nvnp3h35l4yvidbfcmdfx891vfh1h1iqg0fnyhammj6kkf3j",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_PANCAN12": {
+      "name": "RTCGA.PANCAN12",
+      "version": "1.34.0",
+      "sha256": "0qkkzrqhyixbrlib6k4918mv66kdvjrz95a6mlcybp1vfscj65p2",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_RPPA": {
+      "name": "RTCGA.RPPA",
+      "version": "1.34.0",
+      "sha256": "0n0gsijswgphpp6grjq8j7rgjml1zqcfkns48535v5pjgdz07qyk",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_clinical": {
+      "name": "RTCGA.clinical",
+      "version": "20151101.36.0",
+      "sha256": "1ax41ngjrngvnsgysffgh9wyixn2izbjyb4s494vkmhqrrsww055",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_mRNA": {
+      "name": "RTCGA.mRNA",
+      "version": "1.34.0",
+      "sha256": "1cmak5japs4afq3i2xh33dcxhj2h5qws2s33qkd8hy8rvk09x2vk",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_methylation": {
+      "name": "RTCGA.methylation",
+      "version": "1.34.0",
+      "sha256": "19k0c8q1xmzgjh59wv3c9p1wxkpssp072vpwnpyrgi0zrigxdz4q",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_miRNASeq": {
+      "name": "RTCGA.miRNASeq",
+      "version": "1.34.0",
+      "sha256": "1p2350rw2dwzpw5wa1cq1yijrhym2vwlf3khmvbjjlm4khgwznzq",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_mutations": {
+      "name": "RTCGA.mutations",
+      "version": "20151101.36.0",
+      "sha256": "1bklbf6rywgd5azig861iqg4x0czrx0rbf1s16x54g5ww8aci2bz",
+      "depends": ["RTCGA"]
+    },
+    "RTCGA_rnaseq": {
+      "name": "RTCGA.rnaseq",
+      "version": "20151101.36.0",
+      "sha256": "0yn89m988gvq4y5nv56581dlh6ydyhd6dkcx1clwalb453v390dz",
+      "depends": ["RTCGA"]
+    },
+    "RUVnormalizeData": {
+      "name": "RUVnormalizeData",
+      "version": "1.26.0",
+      "sha256": "1rbyrni2bfsm377vlmaw02wy0gz8llls7ad9h1mjiz0jw1jnql8i",
+      "depends": ["Biobase"]
+    },
+    "RcisTarget_hg19_motifDBs_cisbpOnly_500bp": {
+      "name": "RcisTarget.hg19.motifDBs.cisbpOnly.500bp",
+      "version": "1.26.0",
+      "sha256": "1c3gsk4jvbwyj7s18hms29liha52820p5mmnpfnhxdhh8g6ll4sc",
+      "depends": ["data_table"]
+    },
+    "ReactomeGSA_data": {
+      "name": "ReactomeGSA.data",
+      "version": "1.20.0",
+      "sha256": "0j1z4qaqvahjfd4ac5fy2q40f7fiac2jz358h7gdb157d0c7wx9x",
+      "depends": ["ReactomeGSA", "Seurat", "edgeR", "limma"]
+    },
+    "RegParallel": {
+      "name": "RegParallel",
+      "version": "1.24.0",
+      "sha256": "0611wimhjm3ylv1gasrzjl9dalcbd2vzyxvqn03pybi2hjyp5l52",
+      "depends": ["arm", "data_table", "doParallel", "foreach", "iterators", "stringr", "survival"]
+    },
+    "RforProteomics": {
+      "name": "RforProteomics",
+      "version": "1.44.0",
+      "sha256": "0rdx13pdqhfq6pijq9a5fn9j5vdihy95pymcidj5cymni6h3a4dd",
+      "depends": ["BiocManager", "MSnbase", "R_utils", "biocViews"]
+    },
+    "RnBeads_hg19": {
+      "name": "RnBeads.hg19",
+      "version": "1.38.0",
+      "sha256": "0hvsf3nvyl72rqrwvx54vpca1c445vfchz9h74kd90fgh8crydcm",
+      "depends": ["GenomicRanges"]
+    },
+    "RnBeads_hg38": {
+      "name": "RnBeads.hg38",
+      "version": "1.38.0",
+      "sha256": "1wpnkh1rsirnvbbl7y89lmr9q5r6hr331n20qjav92j3g41r3bqp",
+      "depends": ["GenomicRanges"]
+    },
+    "RnBeads_mm10": {
+      "name": "RnBeads.mm10",
+      "version": "2.14.0",
+      "sha256": "1yb22lkklsjs62vj6l5hhp80z5zgil4n93bc1yavixzf81hd7msq",
+      "depends": ["GenomicRanges"]
+    },
+    "RnBeads_mm9": {
+      "name": "RnBeads.mm9",
+      "version": "1.38.0",
+      "sha256": "0s6fq6zqrfm4ixchhqm21imar1hrcn8wmk0dp9wsi4wpc9rffn07",
+      "depends": ["GenomicRanges"]
+    },
+    "RnBeads_rn5": {
+      "name": "RnBeads.rn5",
+      "version": "1.38.0",
+      "sha256": "12vbjjw70l0fgx45bf66mpvxifck1sqpnkn6xdf3i8gdijj06jzp",
+      "depends": ["GenomicRanges"]
+    },
+    "RnaSeqSampleSizeData": {
+      "name": "RnaSeqSampleSizeData",
+      "version": "1.38.0",
+      "sha256": "094m8n0r4imwy9mqj1qqrn3wxbqazvbk6vj5b189sh3ll42xqddq",
+      "depends": ["edgeR"]
+    },
+    "SBGNview_data": {
+      "name": "SBGNview.data",
+      "version": "1.20.0",
+      "sha256": "1n76ggmsh5h7gdn22jlhy7vs81qmijgdx63nmalm4bmrm4m9jzgb",
+      "depends": ["bookdown", "knitr", "rmarkdown"]
+    },
+    "SCLCBam": {
+      "name": "SCLCBam",
+      "version": "1.38.0",
+      "sha256": "0fp2jrx2dpzipgkgzsvr2pasnhmwyms4p1mis9389bwxivni6giw",
+      "depends": []
+    },
+    "SFEData": {
+      "name": "SFEData",
+      "version": "1.8.1",
+      "sha256": "19wclzk4pd9lms64wfjpy8yd8iq6lv2a563lqdqcbk072i3c7m24",
+      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub"]
+    },
+    "SNAData": {
+      "name": "SNAData",
+      "version": "1.52.0",
+      "sha256": "0fjypgshp6xsqgqz55mcc0iwmz0i8zf9zgankpw0lbiganrnbmgv",
+      "depends": ["graph"]
+    },
+    "SNAGEEdata": {
+      "name": "SNAGEEdata",
+      "version": "1.42.0",
+      "sha256": "1n0akijkyq0rngcjalgz9srrqribpj605q7ph9wwf0yv9xnzq972",
+      "depends": []
+    },
+    "SNPhoodData": {
+      "name": "SNPhoodData",
+      "version": "1.36.0",
+      "sha256": "15kh75sk4025ixjp7c706923j719qbq6hk93sc87yl06w9yhq24w",
+      "depends": []
+    },
+    "STexampleData": {
+      "name": "STexampleData",
+      "version": "1.14.0",
+      "sha256": "1n2cq1ia7vi7a2gma9mhwv34dwy0fyxmap5fycy3f8f2bnm373kw",
+      "depends": ["ExperimentHub", "SingleCellExperiment", "SpatialExperiment"]
+    },
+    "SVM2CRMdata": {
+      "name": "SVM2CRMdata",
+      "version": "1.38.0",
+      "sha256": "15p33gwbwa41qm1hcs1a8aywqmmnd1ndaxl3fqbz92qfm0lcp9ml",
+      "depends": []
+    },
+    "SimBenchData": {
+      "name": "SimBenchData",
+      "version": "1.14.0",
+      "sha256": "1zcbdygmnpmphbmf6rly6vz9v4cq0gcv2rm9yq0yzs323290f8fr",
+      "depends": ["ExperimentHub", "S4Vectors"]
+    },
+    "Single_mTEC_Transcriptomes": {
+      "name": "Single.mTEC.Transcriptomes",
+      "version": "1.34.0",
+      "sha256": "1mqqpdf5b4rznm0bsm1pdiday6qxgav1622jpakp4av233ipswrn",
+      "depends": []
+    },
+    "SingleCellMultiModal": {
+      "name": "SingleCellMultiModal",
+      "version": "1.18.0",
+      "sha256": "14ph8yd82xsjlihidn39dqmll2cq00gxpqpj605fqz61i317vs23",
+      "depends": ["AnnotationHub", "BiocBaseUtils", "BiocFileCache", "ExperimentHub", "HDF5Array", "Matrix", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"]
+    },
+    "SingleMoleculeFootprintingData": {
+      "name": "SingleMoleculeFootprintingData",
+      "version": "1.14.0",
+      "sha256": "02ndxsbif4bnklwb8llxf8jkinnqcyfjb04x0qpcyyn3b0m43w5v",
+      "depends": ["ExperimentHub"]
+    },
+    "SomatiCAData": {
+      "name": "SomatiCAData",
+      "version": "1.44.0",
+      "sha256": "1ahh6hjsifg65x09miq2ilc85j58drxg9xajjd521kj75z4argag",
+      "depends": []
+    },
+    "SomaticCancerAlterations": {
+      "name": "SomaticCancerAlterations",
+      "version": "1.42.0",
+      "sha256": "1j7gdbw0n41f44l66xfw8m0q84rbx7c2lcwpdbpssb7k4mnkl9bf",
+      "depends": ["GenomicRanges", "IRanges", "S4Vectors"]
+    },
+    "SpatialDatasets": {
+      "name": "SpatialDatasets",
+      "version": "1.4.0",
+      "sha256": "0pl53dmcymlj819lplynxidk8vjfq5w46g5hwgyllc83mqjgc5rq",
+      "depends": ["ExperimentHub", "SpatialExperiment"]
+    },
+    "SpikeIn": {
+      "name": "SpikeIn",
+      "version": "1.48.0",
+      "sha256": "0rv0szm3izqldg7hpbq1b501l6mk7c27h7a1vf8vd0y68zcri8ck",
+      "depends": ["affy"]
+    },
+    "SpikeInSubset": {
+      "name": "SpikeInSubset",
+      "version": "1.46.0",
+      "sha256": "1xkhmy2jjdy50mqr3zpsqqk49slzvk89swqcxnp4nvcz5qhk6zgg",
+      "depends": ["Biobase", "affy"]
+    },
+    "SubcellularSpatialData": {
+      "name": "SubcellularSpatialData",
+      "version": "1.2.0",
+      "sha256": "0ivsn1s35vhfmwkn9y3q1pmcjlpyfplfqnsnz08jnknijkbyfmy4",
+      "depends": ["Matrix", "SpatialExperiment", "dplyr", "hexbin"]
+    },
+    "TBX20BamSubset": {
+      "name": "TBX20BamSubset",
+      "version": "1.42.0",
+      "sha256": "107pj3y40rr740mv7sphd67dh360ld8lbrlwknxp6kwwg08wyaj3",
+      "depends": ["Rsamtools", "xtable"]
+    },
+    "TCGAMethylation450k": {
+      "name": "TCGAMethylation450k",
+      "version": "1.42.0",
+      "sha256": "1lfxs3lva03pdxdx09llm2wirc367fdp30bia8lw0kb59c6d0s72",
+      "depends": []
+    },
+    "TCGAWorkflowData": {
+      "name": "TCGAWorkflowData",
+      "version": "1.30.0",
+      "sha256": "1g3xslb14xkygv6i6wlsna014aqqz052wz2c44afqffqrd8szm5d",
+      "depends": ["SummarizedExperiment"]
+    },
+    "TCGAbiolinksGUI_data": {
+      "name": "TCGAbiolinksGUI.data",
+      "version": "1.26.0",
+      "sha256": "16ki2mwippf7mk6xrr90m243njvdkdi74yq6lfbklnxsscwcw556",
+      "depends": []
+    },
+    "TCGAcrcmRNA": {
+      "name": "TCGAcrcmRNA",
+      "version": "1.26.0",
+      "sha256": "0cjbjzbnzhlzpc6p7v6z0x82igdsnyz1xjm5whlpf8d4x5q9xjjd",
+      "depends": ["Biobase"]
+    },
+    "TCGAcrcmiRNA": {
+      "name": "TCGAcrcmiRNA",
+      "version": "1.26.0",
+      "sha256": "1iwvzfncg4jy6fxqfwzhcbks8vlf1ynifhawd42g73cawgpbjlv5",
+      "depends": ["Biobase"]
+    },
+    "TENxBUSData": {
+      "name": "TENxBUSData",
+      "version": "1.20.0",
+      "sha256": "1xyb4cmndqkq5frg5ias5d6c4bgyx5g7pyhakm19v4rkwm6sjmf7",
+      "depends": ["AnnotationHub", "BiocGenerics", "ExperimentHub"]
+    },
+    "TENxBrainData": {
+      "name": "TENxBrainData",
+      "version": "1.26.0",
+      "sha256": "1xdi1x5kn6xb8ds6awvlm5rjv78lggci7fd6jw26f1kngfs1fgdm",
+      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment"]
+    },
+    "TENxPBMCData": {
+      "name": "TENxPBMCData",
+      "version": "1.24.0",
+      "sha256": "1a4sqag9wwn31mlbvm2whdcgxkqbzjia6bhrfvxs03b658xk8pv9",
+      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment"]
+    },
+    "TENxVisiumData": {
+      "name": "TENxVisiumData",
+      "version": "1.14.0",
+      "sha256": "19lc3z5w5icibyg62n6my42gxf7iwy4ic0mymdvbj4ili8ckpd4s",
+      "depends": ["ExperimentHub", "SpatialExperiment"]
+    },
+    "TENxXeniumData": {
+      "name": "TENxXeniumData",
+      "version": "1.2.0",
+      "sha256": "098dyr2h8f2zkmhadczgjpx3mnli1gb0pm6kvfgk21cdb0nwypf6",
+      "depends": ["BumpyMatrix", "ExperimentHub", "SpatialExperiment", "SpatialFeatureExperiment", "SummarizedExperiment"]
+    },
+    "TMExplorer": {
+      "name": "TMExplorer",
+      "version": "1.16.0",
+      "sha256": "0qsq54hac0j5lq3lh7lama2sqydjs298f5w073nvvdgpikyp3fc3",
+      "depends": ["BiocFileCache", "Matrix", "SingleCellExperiment"]
+    },
+    "TabulaMurisData": {
+      "name": "TabulaMurisData",
+      "version": "1.24.0",
+      "sha256": "0yzp36yyvxsll35d9l5fb0vmihhdj95g8j30k49zx2f3hixyqk25",
+      "depends": ["ExperimentHub"]
+    },
+    "TabulaMurisSenisData": {
+      "name": "TabulaMurisSenisData",
+      "version": "1.12.0",
+      "sha256": "0lgk1ihdwjc1q1b1izbsvnzdm589np45308jmql03d0wcy9vra83",
+      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment", "SummarizedExperiment", "gdata"]
+    },
+    "TargetScoreData": {
+      "name": "TargetScoreData",
+      "version": "1.42.0",
+      "sha256": "03pv722rjs086f545i1b8q55gc3g3d5lihhj779xy3l28lb98725",
+      "depends": []
+    },
+    "TargetSearchData": {
+      "name": "TargetSearchData",
+      "version": "1.44.0",
+      "sha256": "0k3nf4qan4d16myk5dc27wqjgz6s060zhp9ndqs5k961ll89a0x2",
+      "depends": []
+    },
+    "TimerQuant": {
+      "name": "TimerQuant",
+      "version": "1.36.0",
+      "sha256": "1mchffpddyl29x5yih6g3w1033pvshq9fcgh8jh8h7r258smrjij",
+      "depends": ["deSolve", "dplyr", "ggplot2", "gridExtra", "locfit", "shiny"]
+    },
+    "TransOmicsData": {
+      "name": "TransOmicsData",
+      "version": "1.2.0",
+      "sha256": "04jkip71ydq669l5nz9jaxx8g127lskdx4lqxh6n32rcqw3f061y",
+      "depends": ["S4Vectors"]
+    },
+    "TumourMethData": {
+      "name": "TumourMethData",
+      "version": "1.3.0",
+      "sha256": "01xbsi6x4bafkp0m5xi4l2w62067xnfqnlkaz59ng1hf2ld2p690",
+      "depends": ["ExperimentHub", "GenomicRanges", "HDF5Array", "R_utils", "SummarizedExperiment", "rhdf5"]
+    },
+    "VariantToolsData": {
+      "name": "VariantToolsData",
+      "version": "1.30.0",
+      "sha256": "1ms6abm0ymxv69kqdp14kay0lvga3b3bfhli0408wss3sjmhs50r",
+      "depends": ["BiocGenerics", "GenomicRanges", "VariantAnnotation"]
+    },
+    "VectraPolarisData": {
+      "name": "VectraPolarisData",
+      "version": "1.10.0",
+      "sha256": "06ax2dgkjd5p9lb24bhjrf05nq0bz9x0z2ydi1iv5lbl0ncc7hvc",
+      "depends": ["ExperimentHub", "SpatialExperiment"]
+    },
+    "WES_1KG_WUGSC": {
+      "name": "WES.1KG.WUGSC",
+      "version": "1.38.0",
+      "sha256": "17iyj3klw9c7pwv4g8895k2mkzgjymzp518ra77b25l0lfm6k2fc",
+      "depends": []
+    },
+    "WGSmapp": {
+      "name": "WGSmapp",
+      "version": "1.18.0",
+      "sha256": "1x96sq82qfsrbzijb8f9yyk8d60acar6wz5v0afc9rcavkina941",
+      "depends": ["GenomicRanges"]
+    },
+    "WeberDivechaLCdata": {
+      "name": "WeberDivechaLCdata",
+      "version": "1.8.0",
+      "sha256": "0chvnnn5ihmq24safy45fdh22h12d7ihbxsj7zwd9af0nb15g9z3",
+      "depends": ["ExperimentHub", "SingleCellExperiment", "SpatialExperiment"]
+    },
+    "XhybCasneuf": {
+      "name": "XhybCasneuf",
+      "version": "1.44.0",
+      "sha256": "1pg3bwi3aprn4f9y43agd25sjhmxj619k61is7zgrkm2ljg4mj00",
+      "depends": ["RColorBrewer", "affy", "ath1121501cdf", "tinesath1cdf"]
+    },
+    "adductData": {
+      "name": "adductData",
+      "version": "1.22.0",
+      "sha256": "1s9vflcvsi1136ax0isc1zskbz64cis6mlhhd458jrsx34cf5hff",
+      "depends": ["AnnotationHub", "ExperimentHub"]
+    },
+    "affycompData": {
+      "name": "affycompData",
+      "version": "1.44.0",
+      "sha256": "01x4qj2sc1b6z3221af2acpniaar97jhfdgg21lkb6429mm6g42r",
+      "depends": ["Biobase", "affycomp"]
+    },
+    "affydata": {
+      "name": "affydata",
+      "version": "1.54.0",
+      "sha256": "1yk3kgyl58wg48004h8249iwbr4g05rkk78rfcdcw4c5r4asfjng",
+      "depends": ["affy"]
+    },
+    "airway": {
+      "name": "airway",
+      "version": "1.26.0",
+      "sha256": "0cj8s2pxydq7n644lf07vb9g89gqbd91s3m0d0x1qvbp1sskp536",
+      "depends": ["SummarizedExperiment"]
+    },
+    "antiProfilesData": {
+      "name": "antiProfilesData",
+      "version": "1.42.0",
+      "sha256": "0590iff9pf7nc34w0llg2jk8gc8004vl5fxg93nb91n0jm86crdp",
+      "depends": ["Biobase"]
+    },
+    "aracne_networks": {
+      "name": "aracne.networks",
+      "version": "1.32.0",
+      "sha256": "10zp8nqb0xsxc5xbhlc3la34kcrk7f9m0yqrp45c3qaffzr63jki",
+      "depends": ["viper"]
+    },
+    "bcellViper": {
+      "name": "bcellViper",
+      "version": "1.42.0",
+      "sha256": "140wwk0d3lds60x7b0w2612ss0bdlbjza351j1w576bda47a48rg",
+      "depends": ["Biobase"]
+    },
+    "beadarrayExampleData": {
+      "name": "beadarrayExampleData",
+      "version": "1.44.0",
+      "sha256": "1nii7320r2mhnis67gg8ckj3rcm5x878hzanb0rqmjki36n6yxsb",
+      "depends": ["Biobase", "beadarray"]
+    },
+    "benchmarkfdrData2019": {
+      "name": "benchmarkfdrData2019",
+      "version": "1.20.0",
+      "sha256": "08wa4k2i4s92gfqcfh2fs7g7360dpbyz62qrkrs8xa7gfy3n3zfw",
+      "depends": ["ExperimentHub", "SummarizedExperiment"]
+    },
+    "beta7": {
+      "name": "beta7",
+      "version": "1.44.0",
+      "sha256": "16r77mvfajwvp59a40ffq23ryhx343l9zambyql29ba22g7jg653",
+      "depends": ["marray"]
+    },
+    "biotmleData": {
+      "name": "biotmleData",
+      "version": "1.30.0",
+      "sha256": "0bnjhn0xirv81lw83ymd4mcmllkrd19gya7fr4j7xq77hjrx1kl7",
+      "depends": []
+    },
+    "biscuiteerData": {
+      "name": "biscuiteerData",
+      "version": "1.20.0",
+      "sha256": "0x80ccnlh6wdknxfrkj8y6lxx2b369ma7hc9znhzw2xgr9fj6qpm",
+      "depends": ["AnnotationHub", "ExperimentHub", "GenomicRanges", "curl"]
+    },
+    "bladderbatch": {
+      "name": "bladderbatch",
+      "version": "1.44.0",
+      "sha256": "14lik0n2b3fnvggrcash3kcd03vgzqimzhv9w3vagz0cbvdr0s01",
+      "depends": ["Biobase"]
+    },
+    "blimaTestingData": {
+      "name": "blimaTestingData",
+      "version": "1.26.0",
+      "sha256": "1q7z4wdpmrd33hh8gj5cavxiiaxflygzssrzy6nm5p240vya6wi3",
+      "depends": []
+    },
+    "bodymapRat": {
+      "name": "bodymapRat",
+      "version": "1.22.0",
+      "sha256": "06rqhnri8nwy1p8srzmhi0z81q9nwdk1q413if7n3760gp0qfgbn",
+      "depends": ["ExperimentHub", "SummarizedExperiment"]
+    },
+    "breakpointRdata": {
+      "name": "breakpointRdata",
+      "version": "1.24.0",
+      "sha256": "08kwslm55w0vmcdjndsaq51pwm8gvlrxqy9cjz87dmwxd42giv46",
+      "depends": []
+    },
+    "breastCancerMAINZ": {
+      "name": "breastCancerMAINZ",
+      "version": "1.44.0",
+      "sha256": "03q5mq0rg4kv5nk9vk4lhyj2zbz3gc4x9b795v9i39lmab3qb9w6",
+      "depends": []
+    },
+    "breastCancerNKI": {
+      "name": "breastCancerNKI",
+      "version": "1.44.0",
+      "sha256": "05bs2rmsj5ca15rhc8q1670knsns7lgcvxzd0i5ak39vs4mj60l4",
+      "depends": []
+    },
+    "breastCancerTRANSBIG": {
+      "name": "breastCancerTRANSBIG",
+      "version": "1.44.0",
+      "sha256": "1qhpmabn814p3k7my0r0423f8wxz0fsvb7rzql8fhrr057ngg341",
+      "depends": []
+    },
+    "breastCancerUNT": {
+      "name": "breastCancerUNT",
+      "version": "1.44.0",
+      "sha256": "0bix9n9s6jpxw61vbh3prj1xd12h6b03sf8r9fc9zvjagh0yr1wh",
+      "depends": []
+    },
+    "breastCancerUPP": {
+      "name": "breastCancerUPP",
+      "version": "1.44.0",
+      "sha256": "1h76j3y2pwhgnayry539xgflq7hy0z61bgb7q9j7c90i1sv0d6h4",
+      "depends": []
+    },
+    "breastCancerVDX": {
+      "name": "breastCancerVDX",
+      "version": "1.44.0",
+      "sha256": "1q248675kn2r0q7spw6wa8fhcihsk98diys3zfr36xba1pr3f8yy",
+      "depends": []
+    },
+    "brgedata": {
+      "name": "brgedata",
+      "version": "1.28.0",
+      "sha256": "1ddcj8izlnzsn6chvyabha5qyigagqr2xa5paqi0h83kmmvpahkm",
+      "depends": ["Biobase", "SummarizedExperiment"]
+    },
+    "bronchialIL13": {
+      "name": "bronchialIL13",
+      "version": "1.44.0",
+      "sha256": "0fcin64vfvmdda664s1q5m9la8gxwsiqng1gwp2gr58kgr4ywyxy",
+      "depends": ["affy"]
+    },
+    "bsseqData": {
+      "name": "bsseqData",
+      "version": "0.44.0",
+      "sha256": "08vzvr6gqcgk1d3rhg5zcwg2lxsmj33phr37hy5hrpxn0syma018",
+      "depends": ["bsseq"]
+    },
+    "bugphyzz": {
+      "name": "bugphyzz",
+      "version": "1.0.0",
+      "sha256": "018rm85jyfp2gw4gnpaj1q7v97br1vhkf5zsdw4b4ahn0qx9haf5",
+      "depends": ["BiocFileCache", "S4Vectors", "dplyr", "httr2", "purrr", "stringr", "tidyr", "tidyselect"]
+    },
+    "cMap2data": {
+      "name": "cMap2data",
+      "version": "1.42.0",
+      "sha256": "0a584zh6ykxbym6ns5v9ws3grndn49m6d5ah89qybrwmv6cxqgdy",
+      "depends": []
+    },
+    "cancerdata": {
+      "name": "cancerdata",
+      "version": "1.44.0",
+      "sha256": "1kjra8im5wgjyfp1h2s62b5hqwc5440v0bjwwby8hdbmqz78549i",
+      "depends": ["Biobase"]
+    },
+    "ccdata": {
+      "name": "ccdata",
+      "version": "1.32.0",
+      "sha256": "19khzj5pfm8ysi4ra5pc255z9vxywlf0yjfy4myip6w70ba865nx",
+      "depends": []
+    },
+    "celarefData": {
+      "name": "celarefData",
+      "version": "1.24.0",
+      "sha256": "1szj7x00lsjf8751ni9azwds5w53gfg9028chv4vj6a4kj00blr5",
+      "depends": []
+    },
+    "celldex": {
+      "name": "celldex",
+      "version": "1.16.0",
+      "sha256": "0kn1mdnbiiag29n52gar2ymihx5q9hrjfjc6qssxm0m7ns9gm4hm",
+      "depends": ["AnnotationDbi", "AnnotationHub", "DBI", "DelayedArray", "DelayedMatrixStats", "ExperimentHub", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_se", "gypsum", "jsonlite"]
+    },
+    "cfToolsData": {
+      "name": "cfToolsData",
+      "version": "1.4.0",
+      "sha256": "1bxzihqz7miyriw8zvxc3ac6wgkqwa3h141x49y50mamhhcy8qy8",
+      "depends": ["ExperimentHub"]
+    },
+    "chipenrich_data": {
+      "name": "chipenrich.data",
+      "version": "2.30.0",
+      "sha256": "03jbpp8qxj9j3jglmcnmkp5b5ah96770g7qq7qij8hw222gw8wcg",
+      "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "readr", "rtracklayer"]
+    },
+    "chipseqDBData": {
+      "name": "chipseqDBData",
+      "version": "1.22.0",
+      "sha256": "1ygym612j46qgb3a16lnlldgriqqng9mws707h0yqh1r2szxqc34",
+      "depends": ["AnnotationHub", "ExperimentHub", "Rsamtools", "S4Vectors"]
+    },
+    "chromstaRData": {
+      "name": "chromstaRData",
+      "version": "1.32.0",
+      "sha256": "19kb4ya8p5shhm2zcdf8y172w8fsg409fjmkqlyagpncvcak0b04",
+      "depends": []
+    },
+    "clustifyrdatahub": {
+      "name": "clustifyrdatahub",
+      "version": "1.16.0",
+      "sha256": "1k2ihpw496zliycpa0wblcx9f53nx87ircf975p6dm7w54i0anqx",
+      "depends": ["ExperimentHub"]
+    },
+    "cnvGSAdata": {
+      "name": "cnvGSAdata",
+      "version": "1.42.0",
+      "sha256": "1irzc1irq93bfjcdh12q80k9fyl3rpmg28flb0kzs8b39scsm3v0",
+      "depends": ["cnvGSA"]
+    },
+    "colonCA": {
+      "name": "colonCA",
+      "version": "1.48.0",
+      "sha256": "1j4k0jnmcaabk568apk0yicy3k4ky1l0bxsm9pll1i6h7hxqy0pg",
+      "depends": ["Biobase"]
+    },
+    "crisprScoreData": {
+      "name": "crisprScoreData",
+      "version": "1.10.0",
+      "sha256": "1107c7fa5pjjjf4q6jf9xv1sbwdx9q1p2dalfwbjr9z2fhp6waw8",
+      "depends": ["AnnotationHub", "ExperimentHub"]
+    },
+    "curatedAdipoArray": {
+      "name": "curatedAdipoArray",
+      "version": "1.18.0",
+      "sha256": "0rzsaf48vfkf9kx6m1fbd900qc5hwhflz2yz84yxip4yic617hx7",
+      "depends": []
+    },
+    "curatedAdipoChIP": {
+      "name": "curatedAdipoChIP",
+      "version": "1.22.0",
+      "sha256": "1dy3sswxs0w8dhdw5zx38mbd32ich3v283sijina1yb0gdah66i1",
+      "depends": ["ExperimentHub", "SummarizedExperiment"]
+    },
+    "curatedAdipoRNA": {
+      "name": "curatedAdipoRNA",
+      "version": "1.22.0",
+      "sha256": "0k48x18z6pdrphknjz0v210fg8143a1dj2qiznrc421rznwy60lc",
+      "depends": ["SummarizedExperiment"]
+    },
+    "curatedBladderData": {
+      "name": "curatedBladderData",
+      "version": "1.42.0",
+      "sha256": "0s6wb14c2dyrd2pl9sq6dzylcg5500sbcki25qfyf9g7dgpabj6h",
+      "depends": ["affy"]
+    },
+    "curatedBreastData": {
+      "name": "curatedBreastData",
+      "version": "2.34.0",
+      "sha256": "1c5mw9yy27mqp0zk1llirzmk95j7k7fl3jr98is15l5a6f6rwh0x",
+      "depends": ["Biobase", "BiocStyle", "XML", "ggplot2", "impute"]
+    },
+    "curatedMetagenomicData": {
+      "name": "curatedMetagenomicData",
+      "version": "3.14.0",
+      "sha256": "1zpjkijhig7yg7asmnmb6ivvah9pbiifnfglrs7g9zb23wi2iymm",
+      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "dplyr", "magrittr", "mia", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
+    "curatedOvarianData": {
+      "name": "curatedOvarianData",
+      "version": "1.44.0",
+      "sha256": "0dl0v1v1imk5gy0glzllx32x19p4akma3scccwq0c6shdp3988v9",
+      "depends": ["Biobase", "BiocGenerics"]
+    },
+    "curatedPCaData": {
+      "name": "curatedPCaData",
+      "version": "1.2.0",
+      "sha256": "0l6wdc1h7pzap5zfpc11dl1y3jdfr75iq7ly3927bqq94nkp6wcq",
+      "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "reshape2", "rlang"]
+    },
+    "curatedTBData": {
+      "name": "curatedTBData",
+      "version": "2.2.0",
+      "sha256": "01s69cdd67l589r9vzl8qgkb00a5y8gqy8ijz73bw2nj2bsmrymr",
+      "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "rlang"]
+    },
+    "curatedTCGAData": {
+      "name": "curatedTCGAData",
+      "version": "1.28.1",
+      "sha256": "1g8hyi9b2423y3lbg52dxqqnaljj2jnnaybnb2a9x5h4sm4gbqw4",
+      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment"]
+    },
+    "davidTiling": {
+      "name": "davidTiling",
+      "version": "1.46.0",
+      "sha256": "0hw0j96a9zkd413114z69j17hdrpshnm47qijzcplna05js2djx9",
+      "depends": ["Biobase", "GO_db", "tilingArray"]
+    },
+    "depmap": {
+      "name": "depmap",
+      "version": "1.20.0",
+      "sha256": "1mjx8jx4n36hjgw4nf6cc84bm868qfxgrb9knpxvvildzq1a04g1",
+      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "curl", "dplyr", "httr2", "tibble"]
+    },
+    "derfinderData": {
+      "name": "derfinderData",
+      "version": "2.24.0",
+      "sha256": "0rkc54gh3yasms4nrayi58ly2raad0ksid3wmzbmhy22zib4n9hy",
+      "depends": []
+    },
+    "diffloopdata": {
+      "name": "diffloopdata",
+      "version": "1.34.0",
+      "sha256": "000zmrcic50mbx3byxpjn66ancpd3mp4dp7zn2dqd1g5d17j7xxg",
+      "depends": []
+    },
+    "diggitdata": {
+      "name": "diggitdata",
+      "version": "1.38.0",
+      "sha256": "0ar99whdbnq13cqxcsmvj64iqr1p8d9vrb3gbm4f26w1chm2crl0",
+      "depends": ["Biobase", "viper"]
+    },
+    "dorothea": {
+      "name": "dorothea",
+      "version": "1.18.0",
+      "sha256": "1s2kj3x1206cq61ncivizq8shscsdjwmc2g2493d6cqip0am47rw",
+      "depends": ["bcellViper", "decoupleR", "dplyr", "magrittr"]
+    },
+    "dressCheck": {
+      "name": "dressCheck",
+      "version": "0.44.0",
+      "sha256": "0k9lyibpnf87rcna233fjmr0gmw4dbrsa8ddbv37a2xy8clsli3j",
+      "depends": ["Biobase"]
+    },
+    "dyebiasexamples": {
+      "name": "dyebiasexamples",
+      "version": "1.46.0",
+      "sha256": "10vqaqdzs0c24slx2qnjbzah0rf69x76i7qssarcpgqpv35qm6vl",
+      "depends": ["GEOquery", "marray"]
+    },
+    "easierData": {
+      "name": "easierData",
+      "version": "1.12.0",
+      "sha256": "0lpgankpw7yrzmh5sfd05f0srhgf031rvqg7r2ap6fx3d6j53hrn",
+      "depends": ["AnnotationHub", "ExperimentHub", "SummarizedExperiment"]
+    },
+    "ecoliLeucine": {
+      "name": "ecoliLeucine",
+      "version": "1.46.0",
+      "sha256": "1w6fz8dnafqf47n16jh7p6j6fig31vigkygdkv14kric3xr4vf1k",
+      "depends": ["affy", "ecolicdf"]
+    },
+    "emtdata": {
+      "name": "emtdata",
+      "version": "1.14.0",
+      "sha256": "1g6im42wzkjr5xxrh21q2kh50m3igqjz6srp1zshjx2hg27gdd72",
+      "depends": ["ExperimentHub", "SummarizedExperiment", "edgeR"]
+    },
+    "eoPredData": {
+      "name": "eoPredData",
+      "version": "1.0.0",
+      "sha256": "1bmxqa6gsj3hkw9znpa13lc0fpi0yp1psqx1jpmy01bkk36y6ikw",
+      "depends": ["ExperimentHub"]
+    },
+    "epimutacionsData": {
+      "name": "epimutacionsData",
+      "version": "1.10.0",
+      "sha256": "18gmc4x7q5ff53gy4d7vmjyjjsg9spj4kgmkdf9yg34mc3laryfv",
+      "depends": []
+    },
+    "estrogen": {
+      "name": "estrogen",
+      "version": "1.52.0",
+      "sha256": "0bm7xxjbkcyd8b4pifqmhfz1ncdvrr5lq52mf4xniy873k7460jx",
+      "depends": []
+    },
+    "etec16s": {
+      "name": "etec16s",
+      "version": "1.33.0",
+      "sha256": "1xbj8z68006riah51lpk0bh8hq240wl9n1inlss84yj6kn4y5m0w",
+      "depends": ["Biobase"]
+    },
+    "ewceData": {
+      "name": "ewceData",
+      "version": "1.14.0",
+      "sha256": "1vcdyvdwklr3icz6i9015721ixxsjsgz4i4y0yabbrbwpxl6wcqp",
+      "depends": ["ExperimentHub"]
+    },
+    "faahKO": {
+      "name": "faahKO",
+      "version": "1.46.0",
+      "sha256": "1i52f5anjvag3n6hn1w6wyjc81h81rfb5a7w1lcnkg4q87g149nm",
+      "depends": ["xcms"]
+    },
+    "fabiaData": {
+      "name": "fabiaData",
+      "version": "1.44.0",
+      "sha256": "005hxja8g1608gkhgl5bi6xg5pkswvdh4400yzjp8ph8irsdcd4d",
+      "depends": ["Biobase"]
+    },
+    "ffpeExampleData": {
+      "name": "ffpeExampleData",
+      "version": "1.44.0",
+      "sha256": "096400prmh23jd5q3dab6vgh19vbkwar4hx4l57n8klrx8dxq7q4",
+      "depends": ["lumi"]
+    },
+    "fibroEset": {
+      "name": "fibroEset",
+      "version": "1.48.0",
+      "sha256": "050dmfl2v1z48kzr03nlxsp4xzshs0046bkd0lcdylzvk8gdwpyf",
+      "depends": ["Biobase"]
+    },
+    "fission": {
+      "name": "fission",
+      "version": "1.26.0",
+      "sha256": "07xg2j46jxx6g01wa6m774y1x9cawpq6njk61il08fxhxmv9zv0q",
+      "depends": ["SummarizedExperiment"]
+    },
+    "flowPloidyData": {
+      "name": "flowPloidyData",
+      "version": "1.32.0",
+      "sha256": "17a7cabqgfj4f6l7p2fxvf2z1lafhkl01wcklyhjycfb1803plsl",
+      "depends": []
+    },
+    "flowWorkspaceData": {
+      "name": "flowWorkspaceData",
+      "version": "3.18.0",
+      "sha256": "1bwykpv1y76iq0qhnn24snwymy0wirip7xwq1wqj1flbainzmv6g",
+      "depends": []
+    },
+    "fourDNData": {
+      "name": "fourDNData",
+      "version": "1.6.0",
+      "sha256": "1ippkbavwhwbhf7j6r2k50jnbdrzxzb6qv2ff5dab86wr59804x1",
+      "depends": ["BiocFileCache", "GenomicRanges", "HiCExperiment", "IRanges", "S4Vectors"]
+    },
+    "frmaExampleData": {
+      "name": "frmaExampleData",
+      "version": "1.42.0",
+      "sha256": "1sazkzs2nr0kbmc1ilb1rhwkjd2lwkjf8lx89id8qxra62wdc19f",
+      "depends": []
+    },
+    "furrowSeg": {
+      "name": "furrowSeg",
+      "version": "1.34.0",
+      "sha256": "052531x1fb47mx7p77y61amkxhdga6xsgcq98a55vxm3pg2jsf49",
+      "depends": ["EBImage", "abind", "dplyr", "locfit", "tiff"]
+    },
+    "gDNAinRNAseqData": {
+      "name": "gDNAinRNAseqData",
+      "version": "1.6.0",
+      "sha256": "1m05c19pqzaax9k9jmc6fja86867d38328i7gz8wcdhavgjlif5c",
+      "depends": ["BiocGenerics", "ExperimentHub", "RCurl", "Rsamtools", "XML"]
+    },
+    "gDRtestData": {
+      "name": "gDRtestData",
+      "version": "1.4.0",
+      "sha256": "1qqk9x8i2g5284p60hxznl95b6sp80qksx4qq724ycmknayg3kxb",
+      "depends": ["checkmate", "data_table"]
+    },
+    "gageData": {
+      "name": "gageData",
+      "version": "2.44.0",
+      "sha256": "0nbmm17ysyn7sar29sagdhbp2b8zi20ka8l56y9kznaxha7jfk7p",
+      "depends": []
+    },
+    "gaschYHS": {
+      "name": "gaschYHS",
+      "version": "1.44.0",
+      "sha256": "1c407h406giaq092mzmxdxz7b8y7r1yfjncwzz1yrgxn8z53pq71",
+      "depends": ["Biobase"]
+    },
+    "gcspikelite": {
+      "name": "gcspikelite",
+      "version": "1.44.0",
+      "sha256": "101y42f1pspgcxn2x8qnjzyyvybvwal9sqy6a3d6jf6hibayhlhh",
+      "depends": []
+    },
+    "geneLenDataBase": {
+      "name": "geneLenDataBase",
+      "version": "1.42.0",
+      "sha256": "1v23v859w75svl2vl0758h8i41mjy5vq6xq4w6z8v8w3zyhwycgp",
+      "depends": ["GenomicFeatures", "rtracklayer", "txdbmaker"]
+    },
+    "genomationData": {
+      "name": "genomationData",
+      "version": "1.38.0",
+      "sha256": "1ml8p99y4lba2gzphf0hsy840yqvfsanqscjh7sww5gk06yx9c4p",
+      "depends": []
+    },
+    "golubEsets": {
+      "name": "golubEsets",
+      "version": "1.48.0",
+      "sha256": "0f0lk9qp6d5frvgs5c34jm7fhnjw4v76wi45pdjbh0sr0fhzxf9z",
+      "depends": ["Biobase"]
+    },
+    "gpaExample": {
+      "name": "gpaExample",
+      "version": "1.18.0",
+      "sha256": "1f3llr6bfpc7qijsd7735077a7gwyyyrzsnngpfpl8rrricw2sd3",
+      "depends": []
+    },
+    "grndata": {
+      "name": "grndata",
+      "version": "1.38.0",
+      "sha256": "1d33wzrd1dvwqfaaqvkahmnn2dvcsdqwvrxglihr0ljj7aq693ip",
+      "depends": []
+    },
+    "h5vcData": {
+      "name": "h5vcData",
+      "version": "2.26.0",
+      "sha256": "048baw95mdq7y3d8b2m48d2g5zm6x9l722lh1zp14yqipv4ms8gi",
+      "depends": []
+    },
+    "hapmap100khind": {
+      "name": "hapmap100khind",
+      "version": "1.48.0",
+      "sha256": "0pmsrbl8s1n73pcix3r4rcssaqz9xd8znaifv72pzqbmcp0x755r",
+      "depends": []
+    },
+    "hapmap100kxba": {
+      "name": "hapmap100kxba",
+      "version": "1.48.0",
+      "sha256": "0bah2q34mkcc15s6hh21mlfd52qxjn93ip4mnfaq10m9q5imgp6i",
+      "depends": []
+    },
+    "hapmap500knsp": {
+      "name": "hapmap500knsp",
+      "version": "1.48.0",
+      "sha256": "0wk5p4r3ccklg7hss3kgs82k4chk1wyi1f9md8ygckghy6sap894",
+      "depends": []
+    },
+    "hapmap500ksty": {
+      "name": "hapmap500ksty",
+      "version": "1.48.0",
+      "sha256": "0r0i2xcg9bmm9y4hls21zhp8g10bg2x4rf81xb9v0fj3yqv1i5w0",
+      "depends": []
+    },
+    "hapmapsnp5": {
+      "name": "hapmapsnp5",
+      "version": "1.48.0",
+      "sha256": "1cy5hf9crbw06gdpwhhrndjbk3id70xhws6y18k72x4va8mxmzv7",
+      "depends": []
+    },
+    "hapmapsnp6": {
+      "name": "hapmapsnp6",
+      "version": "1.48.0",
+      "sha256": "0gcmrp3spglrzpx9x7xvb7hw0rqw5nk4mc5rwwhdjvppa4vma5h9",
+      "depends": []
+    },
+    "harbChIP": {
+      "name": "harbChIP",
+      "version": "1.44.0",
+      "sha256": "13awr28aaylkvbjxpw9l4wwghyxa6jmaxcrsjijk0chk0qnmnsig",
+      "depends": ["Biobase", "Biostrings", "IRanges"]
+    },
+    "healthyControlsPresenceChecker": {
+      "name": "healthyControlsPresenceChecker",
+      "version": "1.10.0",
+      "sha256": "1pzladgwl9453bfhbzldlyyx40n7lpnxnsmmzaib3ff8p2hbkfcc",
+      "depends": ["GEOquery", "geneExpressionFromGEO", "magrittr", "xml2"]
+    },
+    "healthyFlowData": {
+      "name": "healthyFlowData",
+      "version": "1.44.0",
+      "sha256": "0pwnhbdp1nnniqkzhf3hy9ikar05aflcv27rhx3627sgpaxy1z7y",
+      "depends": ["flowCore"]
+    },
+    "hgu133abarcodevecs": {
+      "name": "hgu133abarcodevecs",
+      "version": "1.44.0",
+      "sha256": "0nmfki6jljnan53xhykhxc754k0dpxilw1c9xy3kwdqnh1bpjh99",
+      "depends": []
+    },
+    "hgu133plus2CellScore": {
+      "name": "hgu133plus2CellScore",
+      "version": "1.26.0",
+      "sha256": "0rh6hqf8azrn65qx1h57flrq62hmj19w4bidwyrrx2aga31ycyd5",
+      "depends": ["Biobase"]
+    },
+    "hgu133plus2barcodevecs": {
+      "name": "hgu133plus2barcodevecs",
+      "version": "1.44.0",
+      "sha256": "1pqxszdmqf50pmgdqkvn78blzrqm54x24zfl1pjk8cgb87npi7kf",
+      "depends": []
+    },
+    "hgu2beta7": {
+      "name": "hgu2beta7",
+      "version": "1.46.0",
+      "sha256": "1warfbqli331l4cbvja9b91qzqw9521b06nal5x5jx66bnnnqv9y",
+      "depends": []
+    },
+    "homosapienDEE2CellScore": {
+      "name": "homosapienDEE2CellScore",
+      "version": "1.2.0",
+      "sha256": "0acpl7kslv7gn22gbqkyysp3fhh5rkmcq32rl8cikf854f2nkf6k",
+      "depends": ["BiocGenerics", "DESeq2", "ExperimentHub", "MatrixGenerics", "Rtsne", "S4Vectors", "SummarizedExperiment", "getDEE2"]
+    },
+    "humanStemCell": {
+      "name": "humanStemCell",
+      "version": "0.46.0",
+      "sha256": "02ml1vbcm3nbhxkgzxm62ag970d8pabn4gj9ll2d1xpglvkcam9v",
+      "depends": ["Biobase", "hgu133plus2_db"]
+    },
+    "imcdatasets": {
+      "name": "imcdatasets",
+      "version": "1.14.0",
+      "sha256": "1mck9r0w1n56ri21xwj0w0c5b6nf21fws7qinml9psiszrxhh763",
+      "depends": ["DelayedArray", "ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "cytomapper"]
+    },
+    "kidpack": {
+      "name": "kidpack",
+      "version": "1.48.0",
+      "sha256": "0ggps36p3bb303yfv81zlcsix04xyfaiflmb2sjkdz170zzzvpam",
+      "depends": ["Biobase"]
+    },
+    "leeBamViews": {
+      "name": "leeBamViews",
+      "version": "1.42.0",
+      "sha256": "1fqcjmhki1am8b2kw0cymnih3wii8v5a7mbk1imvkl858chh3npz",
+      "depends": ["BSgenome", "Biobase", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"]
+    },
+    "leukemiasEset": {
+      "name": "leukemiasEset",
+      "version": "1.42.0",
+      "sha256": "1zgzg38l24vf27hhyywiv5gan6n25idziwxva09nc5qw4hyy8ikr",
+      "depends": ["Biobase"]
+    },
+    "lumiBarnes": {
+      "name": "lumiBarnes",
+      "version": "1.46.0",
+      "sha256": "1d1xpxjh6shynsj3ngv3nryrkjkzqx3d1f14sjr93qlwsbvhypfm",
+      "depends": ["Biobase", "lumi"]
+    },
+    "lungExpression": {
+      "name": "lungExpression",
+      "version": "0.44.0",
+      "sha256": "1wmxg0655i59rdf5h5p6fxah4vdmgkrcqrbpl5rgzi3kixrdpvqx",
+      "depends": ["Biobase"]
+    },
+    "lydata": {
+      "name": "lydata",
+      "version": "1.32.0",
+      "sha256": "1ag3bbjf3x3g3f3ivyyc7nrhny1562p27b8m2hs01krc1a80m1ym",
+      "depends": []
+    },
+    "mCSEAdata": {
+      "name": "mCSEAdata",
+      "version": "1.26.1",
+      "sha256": "1qynhnpw7ap3k9imfpjccm0bkhrggjspwjnawq3i9mz4ahm6i4gk",
+      "depends": ["GenomicRanges"]
+    },
+    "macrophage": {
+      "name": "macrophage",
+      "version": "1.22.0",
+      "sha256": "0dw15l1zs1byk9afhf7rlh9pifvn356slm5l4pagcfhn867qd5d6",
+      "depends": []
+    },
+    "mammaPrintData": {
+      "name": "mammaPrintData",
+      "version": "1.42.0",
+      "sha256": "0limslpziil158drx8g783n425wnzvqr61h35hbv199nmrqc31in",
+      "depends": []
+    },
+    "maqcExpression4plex": {
+      "name": "maqcExpression4plex",
+      "version": "1.50.0",
+      "sha256": "059k1nsjc1c745vcpj3xnkfxymqpalmd8dn4drcj3z8f19gk76n4",
+      "depends": []
+    },
+    "marinerData": {
+      "name": "marinerData",
+      "version": "1.6.0",
+      "sha256": "0p5xphaw0061yc84cjpcmqhq7qvjfz623imxv4zx1sz1nmavbai7",
+      "depends": ["ExperimentHub"]
+    },
+    "mcsurvdata": {
+      "name": "mcsurvdata",
+      "version": "1.24.0",
+      "sha256": "165yychw6c1008nmaiac20zrk9ampmp7r3g1y3j9hv4lxjdczma6",
+      "depends": ["AnnotationHub", "Biobase", "ExperimentHub"]
+    },
+    "metaMSdata": {
+      "name": "metaMSdata",
+      "version": "1.42.0",
+      "sha256": "16a7ff9dc157gjiq6zk1ig3ql0g7yh22ccxjnw2hfk66s3idqfpc",
+      "depends": []
+    },
+    "methylclockData": {
+      "name": "methylclockData",
+      "version": "1.14.0",
+      "sha256": "1ivl919xlrdqi1y1y4i5793925vd2ysj582wr9r4kwnird2dwbmw",
+      "depends": ["ExperimentHub", "ExperimentHubData"]
+    },
+    "miRNATarget": {
+      "name": "miRNATarget",
+      "version": "1.44.0",
+      "sha256": "0arv3h8b3va3kcrpn8kj819mkqssjxi01322d3ijqy59ygbm91a3",
+      "depends": ["Biobase"]
+    },
+    "miRcompData": {
+      "name": "miRcompData",
+      "version": "1.36.0",
+      "sha256": "1wkr3i5pq9iwr2mrar9jky2z1qc7byxcfy9japidxfxsk287iapl",
+      "depends": []
+    },
+    "microRNAome": {
+      "name": "microRNAome",
+      "version": "1.28.0",
+      "sha256": "1mfdaahi4ww5j7bzzwwflqs7h2hx565dynm1r4w4csgki0vr0j4l",
+      "depends": ["SummarizedExperiment"]
+    },
+    "microbiomeDataSets": {
+      "name": "microbiomeDataSets",
+      "version": "1.14.0",
+      "sha256": "1mvdspp0kdv0x41z66iljr8x7cfyhsvp616h888sfiy7wh2jcmwc",
+      "depends": ["BiocGenerics", "Biostrings", "ExperimentHub", "MultiAssayExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape"]
+    },
+    "minfiData": {
+      "name": "minfiData",
+      "version": "0.52.0",
+      "sha256": "0vhf8hknls4dw49jgbgxqd8znx474g7x3imzvsh43cb7cs89xj3i",
+      "depends": ["IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "minfi"]
+    },
+    "minfiDataEPIC": {
+      "name": "minfiDataEPIC",
+      "version": "1.32.0",
+      "sha256": "0xqciawmlfxcb0s60d0dk9mc9jga12dmm7qx3dqs1i6p69lmdbiy",
+      "depends": ["IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "minfi"]
+    },
+    "minionSummaryData": {
+      "name": "minionSummaryData",
+      "version": "1.36.0",
+      "sha256": "0x5d0wrl6ck12g5xq8flyngvwi2wvij9pb6km34g7rz1c34wjj1n",
+      "depends": []
+    },
+    "mosaicsExample": {
+      "name": "mosaicsExample",
+      "version": "1.44.0",
+      "sha256": "0zr5xpm3znscr5bl2l22nsgikfbhap0f0zc6sh8vxjjj8scq4mma",
+      "depends": []
+    },
+    "mouse4302barcodevecs": {
+      "name": "mouse4302barcodevecs",
+      "version": "1.44.0",
+      "sha256": "108hilxnvywqy3m1iks6d1nlivxgpxjlgcn203nh9mpyzk98d0m3",
+      "depends": []
+    },
+    "msPurityData": {
+      "name": "msPurityData",
+      "version": "1.34.0",
+      "sha256": "16j10ncisvqfhyqkwqin4vclw87slgn9v2zq62rq437wjh9y0iqx",
+      "depends": []
+    },
+    "msd16s": {
+      "name": "msd16s",
+      "version": "1.25.0",
+      "sha256": "0lzcpwf9rhr8i80hn3dab0fpgx7qmy0q9l8j7fkrazq2paiiikj7",
+      "depends": ["Biobase"]
+    },
+    "msdata": {
+      "name": "msdata",
+      "version": "0.46.0",
+      "sha256": "10b8anw0ygbsq95p89agjhs3qvgj9xrlrblg75cdbgmlzks2jhdl",
+      "depends": []
+    },
+    "msigdb": {
+      "name": "msigdb",
+      "version": "1.14.0",
+      "sha256": "1bla3jj5vdvb956pz07fxsihiwqlkpm409rdhljbdnld438q3kpp",
+      "depends": ["AnnotationDbi", "AnnotationHub", "ExperimentHub", "GSEABase", "org_Hs_eg_db", "org_Mm_eg_db"]
+    },
+    "msqc1": {
+      "name": "msqc1",
+      "version": "1.34.0",
+      "sha256": "0qa0ki201miccd0pbcpc00wdpl3yxmwfjzwzk1jd816p10bn3qal",
+      "depends": ["lattice"]
+    },
+    "mtbls2": {
+      "name": "mtbls2",
+      "version": "1.36.0",
+      "sha256": "1n1vz29y2yx1hbaxl1xl2lfvbd0f8knbngk07ibgi3dcfyjii6rz",
+      "depends": []
+    },
+    "muleaData": {
+      "name": "muleaData",
+      "version": "1.2.0",
+      "sha256": "1zw62kqr429g4nqhvgjjmxir25g0wh0490gpmcfc0vg72a00gyhf",
+      "depends": []
+    },
+    "multiWGCNAdata": {
+      "name": "multiWGCNAdata",
+      "version": "1.4.0",
+      "sha256": "1l2pqrxk6yab39ghgyicdchkkahaa57xhjglnjq15k4ss447cy01",
+      "depends": ["ExperimentHub"]
+    },
+    "muscData": {
+      "name": "muscData",
+      "version": "1.20.0",
+      "sha256": "1y2aqhbj3v8z2rzibay6q5d3505vx6c5qmybj147k8nyvffc8w9r",
+      "depends": ["ExperimentHub", "SingleCellExperiment"]
+    },
+    "mvoutData": {
+      "name": "mvoutData",
+      "version": "1.42.0",
+      "sha256": "0w2fmzdfprk9kri8wmkr27p4gdps72i5gb9jj82pn7jlx3vqflkv",
+      "depends": ["Biobase", "affy", "lumi"]
+    },
+    "nanotubes": {
+      "name": "nanotubes",
+      "version": "1.22.0",
+      "sha256": "0ah9f2arylvvg0ndbn65qc79f573lv8pl5mzv8mpcm3xdh0gcf7v",
+      "depends": []
+    },
+    "nullrangesData": {
+      "name": "nullrangesData",
+      "version": "1.12.0",
+      "sha256": "0mi1h40aagfxh79hpcd0bvbp7g4fwzggsnagny9i58sixbjj4kf8",
+      "depends": ["ExperimentHub", "GenomicRanges", "InteractionSet"]
+    },
+    "oct4": {
+      "name": "oct4",
+      "version": "1.22.0",
+      "sha256": "1lh7cw5rjiv8l7f6g3nkk4h2390l8j5id1r42qw3b9mgz2dhhkc0",
+      "depends": []
+    },
+    "octad_db": {
+      "name": "octad.db",
+      "version": "1.8.0",
+      "sha256": "0n39hiwyrzpc7qmdak6s49fp7vypgixyh0li64gwgvqn7xawds29",
+      "depends": ["ExperimentHub"]
+    },
+    "optimalFlowData": {
+      "name": "optimalFlowData",
+      "version": "1.18.0",
+      "sha256": "0rmx15jxp6qqi8vi9y5n419bb6dph5m75r71p9i11q01lqbk0i5b",
+      "depends": []
+    },
+    "orthosData": {
+      "name": "orthosData",
+      "version": "1.4.0",
+      "sha256": "0iv8r0rnbix06kfrwcnrxvn31l0p0mlzciwsbxi7cyz8ar9h85j2",
+      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "HDF5Array", "SummarizedExperiment", "stringr"]
+    },
+    "pRolocdata": {
+      "name": "pRolocdata",
+      "version": "1.44.0",
+      "sha256": "0dh5zgwr248gnlygja7ly66dyhh4b4xf72n9ycp0xa02xdl0mwi3",
+      "depends": ["Biobase", "MSnbase"]
+    },
+    "parathyroidSE": {
+      "name": "parathyroidSE",
+      "version": "1.44.0",
+      "sha256": "0lg52jn0bw5qavlw00wv8lx5g0lqx63p1k85bg7p3nx335v3ddrm",
+      "depends": ["SummarizedExperiment"]
+    },
+    "pasilla": {
+      "name": "pasilla",
+      "version": "1.34.0",
+      "sha256": "1pa8s19q1n22nwjwdsdj9sla1x766wr87llxk5jywgfgl49317i7",
+      "depends": ["DEXSeq"]
+    },
+    "pasillaBamSubset": {
+      "name": "pasillaBamSubset",
+      "version": "0.44.0",
+      "sha256": "1i1z5vh0clvwrh2dlq0vw61k6nqvm9x7gzqxhm9wx4fxsgry6ncc",
+      "depends": []
+    },
+    "pd_atdschip_tiling": {
+      "name": "pd.atdschip.tiling",
+      "version": "0.44.0",
+      "sha256": "1h92qkdbhk11qh8286zczrk00158yxjny4ya053dxcbg7wrzyv1s",
+      "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"]
+    },
+    "pepDat": {
+      "name": "pepDat",
+      "version": "1.26.0",
+      "sha256": "114dx8nlx0hdi5kc5sjddsa1fbcjkx754ayfxxbdb1zl1zqxmbpi",
+      "depends": ["GenomicRanges"]
+    },
+    "plotgardenerData": {
+      "name": "plotgardenerData",
+      "version": "1.12.0",
+      "sha256": "0fi7ymf6kbgrr934xw0dj4skar8xvaan0s52j63rbzbvzsdvibz8",
+      "depends": []
+    },
+    "prebsdata": {
+      "name": "prebsdata",
+      "version": "1.42.0",
+      "sha256": "0q0dcd440ddq9jmjva3if4553shqydx5m11pqivirjjfbfdgjidn",
+      "depends": []
+    },
+    "preciseTADhub": {
+      "name": "preciseTADhub",
+      "version": "1.14.0",
+      "sha256": "05kia0l07qknpad8rb3afyfwin78gjs5b423afb7r9saj5yba041",
+      "depends": ["ExperimentHub"]
+    },
+    "prostateCancerCamcap": {
+      "name": "prostateCancerCamcap",
+      "version": "1.34.0",
+      "sha256": "0wfaivl8f9g4dpgjmcj34md9yq9gdi31761lys70i9bpbq9p5mgy",
+      "depends": ["Biobase"]
+    },
+    "prostateCancerGrasso": {
+      "name": "prostateCancerGrasso",
+      "version": "1.34.0",
+      "sha256": "1q9a5jijr0pi7yh6aw6ygd9plczfj52rv7vs5gbl68rmhy63374r",
+      "depends": ["Biobase"]
+    },
+    "prostateCancerStockholm": {
+      "name": "prostateCancerStockholm",
+      "version": "1.34.0",
+      "sha256": "1168mpfzx16qnwpvnlibaspi0v5zcncwa99cbv0prg7radp3wrzm",
+      "depends": ["Biobase"]
+    },
+    "prostateCancerTaylor": {
+      "name": "prostateCancerTaylor",
+      "version": "1.34.0",
+      "sha256": "0qn2lysb70scvw52kq2qz5hzivl9yhsbisb5x68f375yns9s40h9",
+      "depends": ["Biobase"]
+    },
+    "prostateCancerVarambally": {
+      "name": "prostateCancerVarambally",
+      "version": "1.34.0",
+      "sha256": "0akyyjbg6mh4j53h6lf6m2mr0c9p667cmj94mflcp3b64a0n2y9r",
+      "depends": ["Biobase"]
+    },
+    "ptairData": {
+      "name": "ptairData",
+      "version": "1.14.0",
+      "sha256": "0kmqzzgpy3kbi8w462wwb8c8gviiyk0w2v7k5w9zi3zxdrmw7ccm",
+      "depends": ["rhdf5", "signal"]
+    },
+    "pumadata": {
+      "name": "pumadata",
+      "version": "2.42.0",
+      "sha256": "1ha92bc24qxdzjp1m98a0261snp44i293ryl0vkwgafdq4q9w320",
+      "depends": ["Biobase", "oligo", "puma"]
+    },
+    "qPLEXdata": {
+      "name": "qPLEXdata",
+      "version": "1.24.0",
+      "sha256": "08cji317gf0di58hx30faan8hii69acd70d6z903pf4m4mcx8q98",
+      "depends": ["MSnbase", "dplyr", "knitr", "qPLEXanalyzer"]
+    },
+    "rRDPData": {
+      "name": "rRDPData",
+      "version": "1.26.0",
+      "sha256": "0f662rxavvzrfmg275h4fs12v36dlm5vagjxdwfrslpayw10mjf9",
+      "depends": ["rRDP"]
+    },
+    "raerdata": {
+      "name": "raerdata",
+      "version": "1.4.0",
+      "sha256": "01zvkzqiw2m6nvr2z45i6aqzwgp3ck7rrxdkx1ycqdc2xg2jm36c",
+      "depends": ["BiocGenerics", "ExperimentHub", "Rsamtools", "SingleCellExperiment", "rtracklayer"]
+    },
+    "rcellminerData": {
+      "name": "rcellminerData",
+      "version": "2.28.0",
+      "sha256": "15jx4nnn6zqi6agq7ddcbdqng4pzikl6dckig4phv2zblfq7jvhv",
+      "depends": ["Biobase"]
+    },
+    "rheumaticConditionWOLLBOLD": {
+      "name": "rheumaticConditionWOLLBOLD",
+      "version": "1.44.0",
+      "sha256": "0749nv3qspwqvaqwd0mssyvqcz8nyircrn87bmmd9pdwsw1i4p18",
+      "depends": []
+    },
+    "sampleClassifierData": {
+      "name": "sampleClassifierData",
+      "version": "1.30.0",
+      "sha256": "0q46jri2x8wi2b2xgp17fqpjp3grn6vn9gs16nfvdfcbr19lhfj9",
+      "depends": ["SummarizedExperiment"]
+    },
+    "scATAC_Explorer": {
+      "name": "scATAC.Explorer",
+      "version": "1.12.1",
+      "sha256": "0zafzrvdll5w0kig13nzfvcykz0m4a12vfzzdgxnjsyyffsf1szv",
+      "depends": ["BiocFileCache", "Matrix", "S4Vectors", "SingleCellExperiment", "data_table", "zellkonverter"]
+    },
+    "scMultiome": {
+      "name": "scMultiome",
+      "version": "1.6.0",
+      "sha256": "1wfjk5vq1apy9s2hn86b379kd2zbi0r3wxcvw6dz599pgsxly35y",
+      "depends": ["AnnotationHub", "AzureStor", "ExperimentHub", "GenomicRanges", "HDF5Array", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "alabaster_matrix", "checkmate", "rhdf5"]
+    },
+    "scRNAseq": {
+      "name": "scRNAseq",
+      "version": "2.20.0",
+      "sha256": "1vjww44d3w2rvvj1b2fdbcv0pwpsspqdhzbykwvsqmw559k9viz1",
+      "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "DBI", "DelayedArray", "ExperimentHub", "GenomicFeatures", "GenomicRanges", "Matrix", "RSQLite", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_sce", "ensembldb", "gypsum", "jsonlite"]
+    },
+    "scTHI_data": {
+      "name": "scTHI.data",
+      "version": "1.18.0",
+      "sha256": "17m8f5jg184cg95wh24ya63imaxcb71k4rsw95kfv0dsnv6203ls",
+      "depends": []
+    },
+    "scaeData": {
+      "name": "scaeData",
+      "version": "1.2.0",
+      "sha256": "0pjk97akkn5i83z6n63hzgwpw6rdl6d6xrx95hbxvk2srij4jx4l",
+      "depends": ["ExperimentHub"]
+    },
+    "scanMiRData": {
+      "name": "scanMiRData",
+      "version": "1.12.0",
+      "sha256": "1rw4mfqx86j2ln637lwk2z4cn5bwfc3icrp4w2yvq8ll7jlgzazm",
+      "depends": ["scanMiR"]
+    },
+    "scpdata": {
+      "name": "scpdata",
+      "version": "1.13.0",
+      "sha256": "0fcr86ps9y5rszf6wxysqv7f8snxwi5b05dcy0bk86p8gjgdgbdh",
+      "depends": ["AnnotationHub", "ExperimentHub", "QFeatures", "S4Vectors", "SingleCellExperiment"]
+    },
+    "seq2pathway_data": {
+      "name": "seq2pathway.data",
+      "version": "1.38.0",
+      "sha256": "0ad7g1m4dca0dqhri4g6gm6332r890ba0pvxbnajk8ahjlhzs0j3",
+      "depends": []
+    },
+    "seqc": {
+      "name": "seqc",
+      "version": "1.40.0",
+      "sha256": "1cpfb3xml4bmvhlnprw5kg7k1rk8r5p88i4n11g23n3ban4ynbah",
+      "depends": ["Biobase"]
+    },
+    "serumStimulation": {
+      "name": "serumStimulation",
+      "version": "1.42.0",
+      "sha256": "1g2v40x150j4v467wns6b5z7blrz9xf5wqi7jm52dwgh6fp145hp",
+      "depends": []
+    },
+    "sesameData": {
+      "name": "sesameData",
+      "version": "1.24.0",
+      "sha256": "1dgf9qi27rc98mwlyax0v86h7fmwbnp0xna1c0ppsj0fpwbmj50y",
+      "depends": ["AnnotationHub", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "readr", "stringr"]
+    },
+    "seventyGeneData": {
+      "name": "seventyGeneData",
+      "version": "1.42.0",
+      "sha256": "1g7qfjgljm8945rjm371f2677aks0v5hbb84hxj3572bp3jqi7z7",
+      "depends": []
+    },
+    "shinyMethylData": {
+      "name": "shinyMethylData",
+      "version": "1.26.0",
+      "sha256": "09ddyzfxf8pihma6fadxsvil00ikx9xivdpybb5gm6ij9g9vsksl",
+      "depends": []
+    },
+    "signatureSearchData": {
+      "name": "signatureSearchData",
+      "version": "1.20.0",
+      "sha256": "14q30cbym19p3k6d5052c6h05vqkdzkhqh230v91nmjwa2qkvw0b",
+      "depends": ["Biobase", "ExperimentHub", "R_utils", "affy", "dplyr", "limma", "magrittr", "rhdf5"]
+    },
+    "simpIntLists": {
+      "name": "simpIntLists",
+      "version": "1.42.0",
+      "sha256": "0b6z5ya7bbf6j4blc3f2l705k19fxq02sk9by3dg3qx63vishra4",
+      "depends": []
+    },
+    "smokingMouse": {
+      "name": "smokingMouse",
+      "version": "1.4.0",
+      "sha256": "0nzadqpsxshic7kprvdfjxvd4hhb531902fjh7r3n4mn34r2v8c5",
+      "depends": []
+    },
+    "spatialDmelxsim": {
+      "name": "spatialDmelxsim",
+      "version": "1.12.0",
+      "sha256": "0qdjm8pvvxggwb4s0202mnyy68zpmx8c31zvg3cddkyf9cw9lynb",
+      "depends": ["ExperimentHub", "SummarizedExperiment"]
+    },
+    "spatialLIBD": {
+      "name": "spatialLIBD",
+      "version": "1.18.0",
+      "sha256": "0n1gywjhz72m196frw2p3zhxwxhkyd22m1gsby42w2myms939mj4",
+      "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "DT", "ExperimentHub", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "benchmarkme", "cowplot", "dplyr", "edgeR", "fields", "ggplot2", "golem", "jsonlite", "limma", "magick", "paletteer", "plotly", "png", "rlang", "rtracklayer", "scater", "scuttle", "sessioninfo", "shiny", "shinyWidgets", "statmod", "tibble", "viridisLite"]
+    },
+    "spqnData": {
+      "name": "spqnData",
+      "version": "1.18.0",
+      "sha256": "1r94c4p4cjwjwv9wsfvf90a6i3c4a3n31248yi29bly1v56hpwff",
+      "depends": ["SummarizedExperiment"]
+    },
+    "stemHypoxia": {
+      "name": "stemHypoxia",
+      "version": "1.42.0",
+      "sha256": "1kxnqgn52a07iy8770k7wd72p1chjbcb11qhzb4s9c5ydhmb9vyw",
+      "depends": []
+    },
+    "synapterdata": {
+      "name": "synapterdata",
+      "version": "1.44.0",
+      "sha256": "1csrkpyjmp54a8wdahwdm2kqjraff0hg91jzrz209pqv88ymf1jm",
+      "depends": ["synapter"]
+    },
+    "systemPipeRdata": {
+      "name": "systemPipeRdata",
+      "version": "2.10.0",
+      "sha256": "0276cyzcd9pzma9s4f300snlkyq2xlnavbwm8rwvn22dpgzapskd",
+      "depends": ["BiocGenerics", "Biostrings", "jsonlite", "remotes"]
+    },
+    "tartare": {
+      "name": "tartare",
+      "version": "1.20.0",
+      "sha256": "1ay9mglinp92c2rhac1yrvhc86pa4inn7fhifzi3scrblwwz0fyx",
+      "depends": ["AnnotationHub", "ExperimentHub"]
+    },
+    "timecoursedata": {
+      "name": "timecoursedata",
+      "version": "1.16.0",
+      "sha256": "1frz3ya65qhb6pr7iysmm1ijvzvhgmr5hfhldrq69xmdin2vfzk5",
+      "depends": ["SummarizedExperiment"]
+    },
+    "tinesath1cdf": {
+      "name": "tinesath1cdf",
+      "version": "1.44.0",
+      "sha256": "1977lhsjhp1r2abaaz1yqj8wgkjc3jxw0kpvwqwv49g2dkrrajgh",
+      "depends": []
+    },
+    "tinesath1probe": {
+      "name": "tinesath1probe",
+      "version": "1.44.0",
+      "sha256": "0rvqal11clfisj9srraw2fmw401264l1lbzcb8l4rssqspvfabi1",
+      "depends": ["AnnotationDbi"]
+    },
+    "tissueTreg": {
+      "name": "tissueTreg",
+      "version": "1.26.0",
+      "sha256": "0l2dq57dmavqyp22rn0rvhcir7xagxn981rynpi7yjadhs2vx9yb",
+      "depends": []
+    },
+    "tofsimsData": {
+      "name": "tofsimsData",
+      "version": "1.34.0",
+      "sha256": "1y72masgz7l9g29n9r2p09b02spr19pxkzwxid5sckivrfacr581",
+      "depends": []
+    },
+    "topdownrdata": {
+      "name": "topdownrdata",
+      "version": "1.28.0",
+      "sha256": "1192ws4a062a5xwqzpnavy9kby1vj4acgkfy39yxxawl4vk1snzj",
+      "depends": ["topdownr"]
+    },
+    "tuberculosis": {
+      "name": "tuberculosis",
+      "version": "1.12.0",
+      "sha256": "03vh5rarggydia75pzz37jqbpf6jwl2mzsrrp5sww331274djbyl",
+      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "dplyr", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
+    },
+    "tweeDEseqCountData": {
+      "name": "tweeDEseqCountData",
+      "version": "1.44.0",
+      "sha256": "1xgqfx9mnqa1xgxyayijl1873philc24cr91r5wm25y56hp2c6yb",
+      "depends": ["Biobase"]
+    },
+    "tximportData": {
+      "name": "tximportData",
+      "version": "1.34.0",
+      "sha256": "1x4c4pd4yyfd8z5gyv7kqiip25bi9mdzl5qix1rb27ljvnyz9405",
+      "depends": []
+    },
+    "vulcandata": {
+      "name": "vulcandata",
+      "version": "1.28.0",
+      "sha256": "10742vjwrf9b5vgqgy8girpxczgcl6jybsmf0pa6y5dlf81lkkby",
+      "depends": []
+    },
+    "xcoredata": {
+      "name": "xcoredata",
+      "version": "1.10.0",
+      "sha256": "0y8z0gfkcacl82s6j5g3fjg7a5k8hyz4w4xfx6lyjsp7fxdbmc9f",
+      "depends": ["ExperimentHub"]
+    },
+    "yeastCC": {
+      "name": "yeastCC",
+      "version": "1.46.0",
+      "sha256": "12nfq7dndl3snmqg3zcpbgk93dlnqlkvccadhipmdqb1j7l0k686",
+      "depends": ["Biobase"]
+    },
+    "yeastExpData": {
+      "name": "yeastExpData",
+      "version": "0.52.0",
+      "sha256": "0dqg5im7k31l217qg6sv8bzw83ix6zd9p0c28gx9hzarvh3hr5vl",
+      "depends": ["graph"]
+    },
+    "yeastGSData": {
+      "name": "yeastGSData",
+      "version": "0.44.0",
+      "sha256": "1i7z5pf4ci4rzv8ns42j9kw4y5rdq4lw18basdxg3syhiiqd21pd",
+      "depends": []
+    },
+    "yeastNagalakshmi": {
+      "name": "yeastNagalakshmi",
+      "version": "1.42.0",
+      "sha256": "0j6by8n9cdfnfzapn2985zsmb3861p59xhmzyxbpyhxz465m6d5x",
+      "depends": []
+    },
+    "yeastRNASeq": {
+      "name": "yeastRNASeq",
+      "version": "0.44.0",
+      "sha256": "08pk3p21m3ida96psy7a2shffhz2qx5kz9arhhgk3vm7c1ai25l6",
+      "depends": []
+    },
+    "zebrafishRNASeq": {
+      "name": "zebrafishRNASeq",
+      "version": "1.26.0",
+      "sha256": "0h9bgqbyrakpmp15fvwpygmf0yrf8wqyfg3fnr30k46xvn265axh",
+      "depends": []
+    },
+    "ABAData": {
+      "name": "ABAData",
+      "version": "1.0.0",
+      "sha256": "1p2q03c87ilwfz7gbypkfi0n3m9m3c4z6ci9b5v4pr46q4ppl7s9",
+      "depends": [],
+      "broken": true
+    },
     "AssessORFData": {
       "name": "AssessORFData",
       "version": "1.21.0",
       "sha256": "10rbwdcjqfhq9ramrzfxd3bl2q2nqminsj3pigid6fmvyg0ykfhk",
-      "depends": ["DECIPHER"]
-    },
-    "BeadArrayUseCases": {
-      "name": "BeadArrayUseCases",
-      "version": "1.42.0",
-      "sha256": "1s62vqvl3zxf97syp5lymacah594m8szk23skl4bk88jkzkkx6a5",
-      "depends": ["GEOquery", "beadarray", "limma"]
-    },
-    "BeadSorted_Saliva_EPIC": {
-      "name": "BeadSorted.Saliva.EPIC",
-      "version": "1.12.0",
-      "sha256": "1pjnamvgx9w3g40j82rbdysbarx11gm8k6lb3vhkgb2nxv1vij84",
-      "depends": ["ExperimentHub", "minfi"]
-    },
-    "BioImageDbs": {
-      "name": "BioImageDbs",
-      "version": "1.12.0",
-      "sha256": "1cs6c80h34xbzpsgrpy5aj1f0nlxmy713jj1q5g156z5kiz3mzwc",
-      "depends": ["AnnotationHub", "EBImage", "ExperimentHub", "animation", "einsum", "filesstrings", "magick", "magrittr", "markdown", "rmarkdown"]
-    },
-    "BioPlex": {
-      "name": "BioPlex",
-      "version": "1.10.0",
-      "sha256": "1bkakf7yi1lhwc48pmwifk7qdnc9hzaqnlcni7sy0ypwgb1mfsh7",
-      "depends": ["BiocFileCache", "GEOquery", "GenomeInfoDb", "GenomicRanges", "SummarizedExperiment", "graph"]
-    },
-    "BloodCancerMultiOmics2017": {
-      "name": "BloodCancerMultiOmics2017",
-      "version": "1.24.0",
-      "sha256": "16c6nirflpj0zf2wrj0hb5xcq2168si95np3sm76r3kvwlr48zm7",
-      "depends": ["Biobase", "DESeq2", "RColorBrewer", "SummarizedExperiment", "beeswarm", "devtools", "dplyr", "ggdendro", "ggplot2", "glmnet", "gtable", "ipflasso", "reshape2", "scales", "survival", "tibble"]
-    },
-    "CCl4": {
-      "name": "CCl4",
-      "version": "1.42.0",
-      "sha256": "0n3kx176if48gmw3qd5knlv5q7v7738c54ix8cwr2xhsqc7ah800",
-      "depends": ["Biobase", "limma"]
-    },
-    "CLL": {
-      "name": "CLL",
-      "version": "1.44.0",
-      "sha256": "18bjaqf6cjvjfcp80b5zmb48qbywacqs6aiarsh6ksq2yj4np4zs",
-      "depends": ["Biobase", "affy"]
-    },
-    "CLLmethylation": {
-      "name": "CLLmethylation",
-      "version": "1.24.0",
-      "sha256": "0pafgk4sagyrsddzg5a0nigs518ki2rikhkj02mngh9x4kipkhip",
-      "depends": ["ExperimentHub", "SummarizedExperiment"]
-    },
-    "COHCAPanno": {
-      "name": "COHCAPanno",
-      "version": "1.40.0",
-      "sha256": "0gdb08vxna4rhf5lyhjr9prww58sikjiv49i4sy6hgj5a1chz288",
-      "depends": []
-    },
-    "CONFESSdata": {
-      "name": "CONFESSdata",
-      "version": "1.32.0",
-      "sha256": "0xmbgr6iq4nzxw8gvb099c65bxsc0aqfwn55l2hyr7zskqc3apka",
-      "depends": []
-    },
-    "COPDSexualDimorphism_data": {
-      "name": "COPDSexualDimorphism.data",
-      "version": "1.40.0",
-      "sha256": "0wxhsj29yycmfgwl1sxz3yynwwwccxs1n9kcvdd6940jm4rz8nvq",
-      "depends": []
-    },
-    "COSMIC_67": {
-      "name": "COSMIC.67",
-      "version": "1.40.0",
-      "sha256": "0b9w91qvxakrwwgkzfmhd7ily9yy5jmwimiykckksrhf1fr7i7zp",
-      "depends": ["GenomicRanges", "SummarizedExperiment", "VariantAnnotation"]
-    },
-    "CRCL18": {
-      "name": "CRCL18",
-      "version": "1.24.0",
-      "sha256": "1f513yxinql9qnxmlcfarhn840bxkbwxjqs661c9zliah26hv2wp",
-      "depends": ["Biobase"]
-    },
-    "CardinalWorkflows": {
-      "name": "CardinalWorkflows",
-      "version": "1.36.0",
-      "sha256": "09b0a7ss64mx0ag6rwa7nld0hfzhrr7pfy4iimd0isfz1hm55kd8",
-      "depends": ["Cardinal"]
-    },
-    "CellMapperData": {
-      "name": "CellMapperData",
-      "version": "1.30.0",
-      "sha256": "1rw0793g5bj1zwa5wi4f9d7l3y29c88c2s16ia0ph1j72zr0vyrn",
-      "depends": ["CellMapper", "ExperimentHub"]
-    },
-    "ChAMPdata": {
-      "name": "ChAMPdata",
-      "version": "2.36.0",
-      "sha256": "0x006ilgqrf15135ivxv8qrcyhssl1w6pm1gpnna96za58l2f2rr",
-      "depends": ["BiocGenerics", "GenomicRanges"]
-    },
-    "ChIPXpressData": {
-      "name": "ChIPXpressData",
-      "version": "1.42.0",
-      "sha256": "0jfiii3akdsg4drj3x3rmjakzr85bhzdxl5w433qkrzb4dm724q0",
-      "depends": ["bigmemory"]
-    },
-    "ChIPexoQualExample": {
-      "name": "ChIPexoQualExample",
-      "version": "1.28.0",
-      "sha256": "07m4515g0gq4qv7yyx0qy0y4c2zb1dm30yhkzh43z34m6rkgsf1f",
-      "depends": []
-    },
-    "ChimpHumanBrainData": {
-      "name": "ChimpHumanBrainData",
-      "version": "1.42.0",
-      "sha256": "04cixcachip43kynlz4l6fh1y0wdzijgipvkz5rvlhqca7mpdqss",
-      "depends": ["affy", "hexbin", "limma", "qvalue", "statmod"]
-    },
-    "CluMSIDdata": {
-      "name": "CluMSIDdata",
-      "version": "1.20.0",
-      "sha256": "01r4cfy0ny5vh0x1ihkynyxfxgjsprhim7913vzj0d1kgdkzdr6z",
-      "depends": []
-    },
-    "CoSIAdata": {
-      "name": "CoSIAdata",
-      "version": "1.4.0",
-      "sha256": "1mld9j54ywkgz63brf8lmfi57f1hmclyv3m9lw201wyni48nx377",
-      "depends": ["ExperimentHub"]
-    },
-    "ConnectivityMap": {
-      "name": "ConnectivityMap",
-      "version": "1.40.0",
-      "sha256": "1i7bv10kmmgb355nmp3qsm9awcba69h8chhvcmw718hg5x2axrdh",
-      "depends": []
-    },
-    "CopyNeutralIMA": {
-      "name": "CopyNeutralIMA",
-      "version": "1.22.0",
-      "sha256": "12pw212lrqsas08hzan6sh56iasx74adbnngvyj2dllgc30971i8",
-      "depends": ["ExperimentHub", "Rdpack"]
-    },
-    "CopyhelpeR": {
-      "name": "CopyhelpeR",
-      "version": "1.36.0",
-      "sha256": "1ijlba601wknkj6ybbnarcdw1z54f76gkdgynpry1v8jpbpvcadr",
-      "depends": []
-    },
-    "CytoMethIC": {
-      "name": "CytoMethIC",
-      "version": "1.0.0",
-      "sha256": "19ms0i2rs0b3lbg71m3k43hy0wx45yif6pv3nnchbafysnlzp04n",
-      "depends": ["BiocManager", "BiocParallel", "ExperimentHub", "sesame", "sesameData", "tibble"]
-    },
-    "DAPARdata": {
-      "name": "DAPARdata",
-      "version": "1.34.0",
-      "sha256": "055rlbc2sky8am6vcz09vxpj8n34y3lmajlp8n6zz086w7fgfd8d",
-      "depends": ["MSnbase"]
-    },
-    "DExMAdata": {
-      "name": "DExMAdata",
-      "version": "1.12.0",
-      "sha256": "17gm48hawh42cdbqr1bbrb7nccx3lwan8nca353vyj43pjr3s46n",
-      "depends": ["Biobase"]
-    },
-    "DLBCL": {
-      "name": "DLBCL",
-      "version": "1.44.0",
-      "sha256": "0sakxhj192khn777aspzzckrjnzi89ng5wnzvzxgfdbpwh2nfl4d",
-      "depends": ["Biobase", "graph"]
-    },
-    "DMRcatedata": {
-      "name": "DMRcatedata",
-      "version": "2.22.0",
-      "sha256": "119r3c2yc5hbj5x0h7r930rwhp0k5rsnfmbmvl2rhz02wq2ychhy",
-      "depends": ["ExperimentHub", "GenomicFeatures", "Gviz", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "plyr", "readxl", "rtracklayer"]
-    },
-    "DNAZooData": {
-      "name": "DNAZooData",
-      "version": "1.4.0",
-      "sha256": "1bs2pnak2v2szp7zly8ysf8pqh7f70w70cbqqzvnxlf35npv7cxd",
-      "depends": ["BiocFileCache", "HiCExperiment", "S4Vectors", "rjson"]
-    },
-    "DeSousa2013": {
-      "name": "DeSousa2013",
-      "version": "1.40.0",
-      "sha256": "1icjl4rr8jk16hs8ri925v3gf9lasi4x39yf5a7av39byb2zwqif",
-      "depends": ["AnnotationDbi", "Biobase", "ConsensusClusterPlus", "ROCR", "affy", "cluster", "frma", "frmaTools", "gplots", "hgu133plus2_db", "hgu133plus2frmavecs", "pamr", "rgl", "siggenes", "survival", "sva"]
-    },
-    "DmelSGI": {
-      "name": "DmelSGI",
-      "version": "1.36.0",
-      "sha256": "0xjj2ky0k8vazw97qsaf79c6cc3whxg0n5v6lrj6slk4hyfcmbw4",
-      "depends": ["TSP", "abind", "gplots", "igraph", "knitr", "limma", "rhdf5"]
-    },
-    "DonaPLLP2013": {
-      "name": "DonaPLLP2013",
-      "version": "1.42.0",
-      "sha256": "0mcz0vdawz62qpdz8dmw359qim0b5wy42wp5r0h5pw05fh03b9bp",
-      "depends": ["EBImage"]
-    },
-    "DropletTestFiles": {
-      "name": "DropletTestFiles",
-      "version": "1.14.0",
-      "sha256": "1n98mgzc6dscm6wy18mf0l5l5bvx3m35xdniarv83j8302xra9n1",
-      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors"]
-    },
-    "DrugVsDiseasedata": {
-      "name": "DrugVsDiseasedata",
-      "version": "1.40.0",
-      "sha256": "0pmydn60f80ga6la6gxn1l1baw22kqqf1v2gbcniq7qm5axj6vh2",
-      "depends": []
-    },
-    "DuoClustering2018": {
-      "name": "DuoClustering2018",
-      "version": "1.22.0",
-      "sha256": "042v3dpirp68qsdbhygvx3apx94xxdmzpm0swii30kzkw1r1xfck",
-      "depends": ["ExperimentHub", "dplyr", "ggplot2", "ggthemes", "magrittr", "mclust", "purrr", "reshape2", "tidyr", "viridis"]
-    },
-    "DvDdata": {
-      "name": "DvDdata",
-      "version": "1.40.0",
-      "sha256": "0l298n6fj57yz6ml5xp1gmwxkj200pwsijbxxf2k8f028m4igy0k",
-      "depends": []
-    },
-    "EGSEAdata": {
-      "name": "EGSEAdata",
-      "version": "1.32.0",
-      "sha256": "0448hr7zz1wibi8l3plb9hsr6x0a7hz0pmqchhbzbsqwjjdrsgid",
-      "depends": []
-    },
-    "ELMER_data": {
-      "name": "ELMER.data",
-      "version": "2.28.0",
-      "sha256": "1ppmdqc0j3hkngg0nzx18vw8sgnfbrhxyb3l1l5mhv3gq02rslxz",
-      "depends": ["GenomicRanges"]
-    },
-    "EatonEtAlChIPseq": {
-      "name": "EatonEtAlChIPseq",
-      "version": "0.42.0",
-      "sha256": "109law5cc64xipwqyanw71h8v5nx08s1iaskh05hm1w18dsjxff1",
-      "depends": ["GenomicRanges", "ShortRead", "rtracklayer"]
-    },
-    "EpiMix_data": {
-      "name": "EpiMix.data",
-      "version": "1.6.0",
-      "sha256": "037kp9ziawdxfxydg4jb64k6klv9j78wp45gi72prisl4hj5hlp3",
-      "depends": ["ExperimentHub"]
-    },
-    "FANTOM3and4CAGE": {
-      "name": "FANTOM3and4CAGE",
-      "version": "1.40.0",
-      "sha256": "0vmpgq694jvrcbnx2ik7cyq2axfm7xl3sibd2b9k3dpxaw62gipm",
-      "depends": []
-    },
-    "FIs": {
-      "name": "FIs",
-      "version": "1.32.0",
-      "sha256": "0l084k6p8nsnv51fxb55lass72qhjm4ff84i4y3if5p29gzl8frz",
-      "depends": []
-    },
-    "FieldEffectCrc": {
-      "name": "FieldEffectCrc",
-      "version": "1.14.0",
-      "sha256": "0g9b5a7l802z6g2s95x4m914hwwn5qqnlxvag3qbvy3bhwx3xyi6",
-      "depends": ["AnnotationHub", "BiocStyle", "DESeq2", "ExperimentHub", "RUnit", "SummarizedExperiment"]
-    },
-    "Fletcher2013a": {
-      "name": "Fletcher2013a",
-      "version": "1.40.0",
-      "sha256": "0l839hd76xr94qjcnscr9c40nvsx99ir6vsy1zx6dn7cha52mpar",
-      "depends": ["Biobase", "VennDiagram", "gplots", "limma"]
-    },
-    "Fletcher2013b": {
-      "name": "Fletcher2013b",
-      "version": "1.40.0",
-      "sha256": "0agnkc207bma3h89xxrzcywny664f42vfd63qnmyda4kvdvvk0km",
-      "depends": ["Fletcher2013a", "RColorBrewer", "RTN", "RedeR", "igraph"]
-    },
-    "FlowSorted_Blood_450k": {
-      "name": "FlowSorted.Blood.450k",
-      "version": "1.42.0",
-      "sha256": "0lc45dg5jq0kqycpsggrhi5fa4xj1ciqrj6iw548ccjgdyy2w1xh",
-      "depends": ["minfi"]
-    },
-    "FlowSorted_Blood_EPIC": {
-      "name": "FlowSorted.Blood.EPIC",
-      "version": "2.8.0",
-      "sha256": "1b0azyslk2g08i6v1vv2niw32f0zqasw85b9klw83zdy2f5dcdvh",
-      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "genefilter", "minfi", "nlme", "quadprog"]
-    },
-    "FlowSorted_CordBlood_450k": {
-      "name": "FlowSorted.CordBlood.450k",
-      "version": "1.32.0",
-      "sha256": "1bbx2s8vzkawwpywcc33xbgjbc134q6fqgnflk30sfq1pfpxcmsm",
-      "depends": ["minfi"]
-    },
-    "FlowSorted_CordBloodCombined_450k": {
-      "name": "FlowSorted.CordBloodCombined.450k",
-      "version": "1.20.0",
-      "sha256": "14486v4cs3j1jmifsgy3ihpm5x7i9581yz4bwsl3h2a7p86cdsbv",
-      "depends": ["AnnotationHub", "ExperimentHub", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "SummarizedExperiment", "minfi"]
-    },
-    "FlowSorted_CordBloodNorway_450k": {
-      "name": "FlowSorted.CordBloodNorway.450k",
-      "version": "1.30.0",
-      "sha256": "1r78j0786bl9420cxcmhw07bzakl71r2kar41bwkd6xwfpj2znj5",
-      "depends": ["minfi"]
-    },
-    "FlowSorted_DLPFC_450k": {
-      "name": "FlowSorted.DLPFC.450k",
-      "version": "1.40.0",
-      "sha256": "0h21h2nywy9dfqw3d1xw87wah19nidl8k7d0zqpqxql6agr1p92j",
-      "depends": ["minfi"]
-    },
-    "GIGSEAdata": {
-      "name": "GIGSEAdata",
-      "version": "1.22.0",
-      "sha256": "1pwi3bn7xj2m7kg02dwn17rnhirl2qf1d67p2m9194f3iwy4vrp8",
-      "depends": []
-    },
-    "GSBenchMark": {
-      "name": "GSBenchMark",
-      "version": "1.24.0",
-      "sha256": "1al1k9c513l3if8kag24dkrmr6m8ajck30gd8yqkcncsrrgc769j",
-      "depends": []
-    },
-    "GSE103322": {
-      "name": "GSE103322",
-      "version": "1.10.0",
-      "sha256": "0iv75phj9s8yyk0h3mnv12aak26kspbqhxvc4dbjjdd4g6jawlgv",
-      "depends": ["Biobase", "GEOquery"]
-    },
-    "GSE13015": {
-      "name": "GSE13015",
-      "version": "1.12.0",
-      "sha256": "0l1v30g1g93wk5bnhkw52pwypby6n0rxpp11aw93j733whn9j2y4",
-      "depends": ["Biobase", "GEOquery", "SummarizedExperiment", "preprocessCore"]
-    },
-    "GSE159526": {
-      "name": "GSE159526",
-      "version": "1.10.0",
-      "sha256": "1j8dy1zrw4isscspzb83n7k0x8yaf97zyyfyjh26ff7l997cqdvk",
-      "depends": []
-    },
-    "GSE62944": {
-      "name": "GSE62944",
-      "version": "1.32.0",
-      "sha256": "041sby283m8ajb96gdg3zcrs0l6760svx8wijxfabq9dygiiaqp8",
-      "depends": ["Biobase", "GEOquery"]
-    },
-    "GSVAdata": {
-      "name": "GSVAdata",
-      "version": "1.40.0",
-      "sha256": "0d1xgjizi58hwbralla62jch3kl4bqx0dg0lhh0h1bk9jyicyqjy",
-      "depends": ["Biobase", "GSEABase", "hgu95a_db"]
-    },
-    "GWASdata": {
-      "name": "GWASdata",
-      "version": "1.42.0",
-      "sha256": "08w9qlf6vprvf383mji0hhzpn65jicqmkbljqndh7r7s4hp1z9jr",
-      "depends": ["GWASTools"]
-    },
-    "GenomicDistributionsData": {
-      "name": "GenomicDistributionsData",
-      "version": "1.12.0",
-      "sha256": "16cj8w6n053aciz9wclppmc22b9s4a9lh58r6wi2lhs0sp7iirzn",
-      "depends": ["AnnotationFilter", "AnnotationHub", "BSgenome", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "data_table", "ensembldb"]
-    },
-    "GeuvadisTranscriptExpr": {
-      "name": "GeuvadisTranscriptExpr",
-      "version": "1.32.0",
-      "sha256": "1n9yq4lqs6v9qdw9rm9hy8dww6n5axpkncms2drkjn2hv8xlqgj8",
-      "depends": []
-    },
-    "HCAData": {
-      "name": "HCAData",
-      "version": "1.20.0",
-      "sha256": "1kdp9iwn0vy7hlxyh09vrl6cwj7ajy2zqk23w3rxa5py710prp1q",
-      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment"]
-    },
-    "HCATonsilData": {
-      "name": "HCATonsilData",
-      "version": "1.2.0",
-      "sha256": "1wg0mvc3gwf80bgsfkvdcnnzy7qbnffbbrcy3f87jyw4a20irpp1",
-      "depends": ["ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "base64enc", "htmltools", "rmarkdown"]
-    },
-    "HD2013SGI": {
-      "name": "HD2013SGI",
-      "version": "1.44.0",
-      "sha256": "0r4nlbz7b70z1ii9wisk8nj218m2j5qmpfj8k2sp8k723gmsg4x0",
-      "depends": ["EBImage", "LSD", "RColorBrewer", "geneplotter", "gplots", "limma", "splots", "vcd"]
-    },
-    "HDCytoData": {
-      "name": "HDCytoData",
-      "version": "1.24.0",
-      "sha256": "0pmzgp7x1zam3b7agi8mdq14qmx8nln9lnhiglax2pvg2a5n4ii4",
-      "depends": ["ExperimentHub", "SummarizedExperiment", "flowCore"]
-    },
-    "HEEBOdata": {
-      "name": "HEEBOdata",
-      "version": "1.42.0",
-      "sha256": "0nkggzidbzya9g7v412iwjkm6pah5siha1jai48k3hhfa4i51jj7",
-      "depends": []
-    },
-    "HIVcDNAvantWout03": {
-      "name": "HIVcDNAvantWout03",
-      "version": "1.44.0",
-      "sha256": "1mrza15digswpqszff88caclfwbwxql7dx6gih4gz72cnpyx3fpj",
-      "depends": []
-    },
-    "HMP16SData": {
-      "name": "HMP16SData",
-      "version": "1.24.0",
-      "sha256": "16x7mw5bdsyda1qv0v739pkr8lxq8hga84vhmaa8qnx45pwqyyh0",
-      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "kableExtra", "knitr", "magrittr", "readr", "stringr", "tibble"]
-    },
-    "HMP2Data": {
-      "name": "HMP2Data",
-      "version": "1.18.0",
-      "sha256": "014bf29kg9dizi3p0fdxrs42bf9a0dc2f7zd7yxzvzs3jqvniji2",
-      "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "assertthat", "data_table", "dplyr", "kableExtra", "knitr", "magrittr", "phyloseq", "readr"]
-    },
-    "HSMMSingleCell": {
-      "name": "HSMMSingleCell",
-      "version": "1.24.0",
-      "sha256": "18p8hk2dq26pp4fvcf1m8wsvj1mn66i8nr900knl2n9vs09j70wy",
-      "depends": []
-    },
-    "HarmanData": {
-      "name": "HarmanData",
-      "version": "1.32.0",
-      "sha256": "1bf9jl9gl10gawv835hp8wxzzs1v9g3y3qzpki63j3dw5yssazh5",
-      "depends": []
-    },
-    "HarmonizedTCGAData": {
-      "name": "HarmonizedTCGAData",
-      "version": "1.26.0",
-      "sha256": "1zi0605nq51zpgap9jsbkilpxalwlpld0crvxivk6pmgrbavvlf7",
-      "depends": ["ExperimentHub"]
-    },
-    "HelloRangesData": {
-      "name": "HelloRangesData",
-      "version": "1.30.0",
-      "sha256": "19gk0xhvpnqqrr6pxiwyyhszi93pjjfiknfj1gvzdrj81p06qhbh",
-      "depends": []
-    },
-    "HiBED": {
-      "name": "HiBED",
-      "version": "1.2.0",
-      "sha256": "0sqxlm2nn8g7qfwhndf79dg7v57ngmznr0b297v59nhhpigs1g2q",
-      "depends": ["AnnotationHub", "FlowSorted_Blood_EPIC", "FlowSorted_DLPFC_450k", "SummarizedExperiment", "dplyr", "minfi", "tibble"]
-    },
-    "HiCDataHumanIMR90": {
-      "name": "HiCDataHumanIMR90",
-      "version": "1.24.0",
-      "sha256": "1xndbds4clzpblc6gjz7lr48pkvi3j2m0a9jzavff45ds7aa6jxk",
-      "depends": []
-    },
-    "HiCDataLymphoblast": {
-      "name": "HiCDataLymphoblast",
-      "version": "1.40.0",
-      "sha256": "1sb384dca5n1lanv5k4idjx1b1hmvfdv1xp14m8k00gcnacgj9v3",
-      "depends": []
-    },
-    "HiContactsData": {
-      "name": "HiContactsData",
-      "version": "1.6.0",
-      "sha256": "0q92gvvlx4zx6sxi9sdzwjmwvdzaw6fj0nkr5d4h8j0hv7ycylmi",
-      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub"]
-    },
-    "HighlyReplicatedRNASeq": {
-      "name": "HighlyReplicatedRNASeq",
-      "version": "1.16.0",
-      "sha256": "01b09hk33p14lfrrpk0agi6prf9wbv6zs0qn07jdsm63vmawscds",
-      "depends": ["ExperimentHub", "S4Vectors", "SummarizedExperiment"]
-    },
-    "Hiiragi2013": {
-      "name": "Hiiragi2013",
-      "version": "1.40.0",
-      "sha256": "0xn3ayh2x04cvwrr476k8vlp8lhk5lxaqg01a0ynkrrc4scf2f99",
-      "depends": ["Biobase", "KEGGREST", "MASS", "RColorBrewer", "affy", "boot", "clue", "cluster", "genefilter", "geneplotter", "gplots", "gtools", "lattice", "latticeExtra", "mouse4302_db", "xtable"]
-    },
-    "HumanAffyData": {
-      "name": "HumanAffyData",
-      "version": "1.30.0",
-      "sha256": "0jnikpd3djps3wp4vd3l9911jkzfm8h5pp0gv8l9bx5s2skkdrw1",
-      "depends": ["Biobase", "ExperimentHub"]
-    },
-    "IHWpaper": {
-      "name": "IHWpaper",
-      "version": "1.32.0",
-      "sha256": "0s3x2chbr8ik3rhgzmfhaq8xlsnnkzfhjh4p327sn5aar6xhaj67",
-      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "IHW", "Rcpp", "SummarizedExperiment", "cowplot", "dplyr", "fdrtool", "genefilter", "ggplot2", "qvalue"]
-    },
-    "ITALICSData": {
-      "name": "ITALICSData",
-      "version": "2.42.0",
-      "sha256": "1d0awis142kgx9hi0dggl6gqg17m0awqzn8ncpqh2lwaka372dq8",
-      "depends": []
-    },
-    "Illumina450ProbeVariants_db": {
-      "name": "Illumina450ProbeVariants.db",
-      "version": "1.40.0",
-      "sha256": "1jpknhp624753rhalf81kvl02k4wj19xpncagzf85c878953vph0",
-      "depends": []
-    },
-    "IlluminaDataTestFiles": {
-      "name": "IlluminaDataTestFiles",
-      "version": "1.42.0",
-      "sha256": "0xmyhqaa34chd2fxzbs7rk72wyx086cfhnjjh4lwjmb8acbp9xi8",
-      "depends": []
-    },
-    "Iyer517": {
-      "name": "Iyer517",
-      "version": "1.46.0",
-      "sha256": "0b9j6bc0dfx5mqyd7z7bzmfp6s59cy4dqr1pxzjy05yyfznbc72p",
-      "depends": ["Biobase"]
-    },
-    "JASPAR2014": {
-      "name": "JASPAR2014",
-      "version": "1.40.0",
-      "sha256": "0m4g6vp78zsnzkfjmjfjwvd04505lz55njm7ml7dycwv6lmaxivk",
-      "depends": ["Biostrings"]
-    },
-    "JASPAR2016": {
-      "name": "JASPAR2016",
-      "version": "1.32.0",
-      "sha256": "09q5m71drbp64n26plr0a9bz71akcs4g7pqqyjmsmjrzi40kx7hr",
-      "depends": []
-    },
-    "JohnsonKinaseData": {
-      "name": "JohnsonKinaseData",
-      "version": "1.0.0",
-      "sha256": "1ry5p2zll8hazxil4sa57v50b7xr9bk4p5a509i4mvasb089al3l",
-      "depends": ["BiocParallel", "ExperimentHub", "checkmate", "dplyr", "purrr", "stringr", "tidyr"]
-    },
-    "KEGGandMetacoreDzPathwaysGEO": {
-      "name": "KEGGandMetacoreDzPathwaysGEO",
-      "version": "1.24.0",
-      "sha256": "1fqybcvwa8dls2kv8mkdydmkw0bzihr3xp3m853mffkdjjsrzkyk",
-      "depends": ["Biobase", "BiocGenerics"]
-    },
-    "KEGGdzPathwaysGEO": {
-      "name": "KEGGdzPathwaysGEO",
-      "version": "1.42.0",
-      "sha256": "1mbvy9x8zp02337sw92hh00vvqcamldqdsdy4zp53qiskrpidkdc",
-      "depends": ["Biobase", "BiocGenerics"]
-    },
-    "KOdata": {
-      "name": "KOdata",
-      "version": "1.30.0",
-      "sha256": "1ia8fyas2yfird4a0md85s3ak96hb1pdrvay48zzsmhmpgf1yj44",
-      "depends": []
-    },
-    "LRcellTypeMarkers": {
-      "name": "LRcellTypeMarkers",
-      "version": "1.12.0",
-      "sha256": "1cghhh1rv8w7819dzi982q862m6yj62pckx8r925j2di1him9db8",
-      "depends": ["ExperimentHub"]
-    },
-    "LiebermanAidenHiC2009": {
-      "name": "LiebermanAidenHiC2009",
-      "version": "0.42.0",
-      "sha256": "0hx2lfpidg54r6kslz3yx6d1lv4vjdrk6s2whii0070hbr18lvjj",
-      "depends": ["IRanges", "KernSmooth"]
-    },
-    "ListerEtAlBSseq": {
-      "name": "ListerEtAlBSseq",
-      "version": "1.36.0",
-      "sha256": "0j4vvac93m8vqidwvqczggkfdk07dabycqprhsnmj8f0g8hpaq9v",
-      "depends": ["methylPipe"]
-    },
-    "LungCancerACvsSCCGEO": {
-      "name": "LungCancerACvsSCCGEO",
-      "version": "1.40.0",
-      "sha256": "1h0m67ak452bbza0s3dsmh2vi9wdi1mgl4bvflhin1gxcgb6fk6p",
-      "depends": []
-    },
-    "LungCancerLines": {
-      "name": "LungCancerLines",
-      "version": "0.42.0",
-      "sha256": "0gmjpagl71vddsvcx3iwql175lv0lc5m6j071wnwh10z59a9jams",
-      "depends": ["Rsamtools"]
-    },
-    "M3DExampleData": {
-      "name": "M3DExampleData",
-      "version": "1.30.0",
-      "sha256": "0g7p7vn2im6d4gamalfm2lcssdg874fgb23wra5c34dzrzz9nr0v",
-      "depends": []
-    },
-    "MACSdata": {
-      "name": "MACSdata",
-      "version": "1.12.0",
-      "sha256": "0wffmyshsylf118xfcdyl8bd5xy9gz726lpx3avmxz3a8x917vbr",
-      "depends": []
-    },
-    "MAQCsubset": {
-      "name": "MAQCsubset",
-      "version": "1.42.0",
-      "sha256": "0x59gbv91d90hasa2gwkv00c06zp8fj4fk18386ajfag0wpvpb2n",
-      "depends": ["Biobase", "affy", "lumi"]
-    },
-    "MEDIPSData": {
-      "name": "MEDIPSData",
-      "version": "1.40.0",
-      "sha256": "0x9317wgrhvqwh87d1vls5m06jyzsli2yhkc345n6iwxzz3a0brr",
-      "depends": []
-    },
-    "MEEBOdata": {
-      "name": "MEEBOdata",
-      "version": "1.42.0",
-      "sha256": "1cj563a0fjwdrbrwnfzk7l79mjg95hanp5rs6rvjz30b8s5gmwqm",
-      "depends": []
-    },
-    "MMAPPR2data": {
-      "name": "MMAPPR2data",
-      "version": "1.18.0",
-      "sha256": "0rbi0psjwk0jgjpliv0hhjvq9wmwb8w4wgqw45wqba6qfpm70wya",
-      "depends": ["Rsamtools"]
-    },
-    "MMDiffBamSubset": {
-      "name": "MMDiffBamSubset",
-      "version": "1.40.0",
-      "sha256": "1psm5f7wrqwqwxzkmqkaz629i1d7zn2s5zs6sgmhijqp7rzhmhc4",
-      "depends": []
-    },
-    "MOFAdata": {
-      "name": "MOFAdata",
-      "version": "1.20.0",
-      "sha256": "1sjpvs2vdmmrr5mkk734502lhs3nr3n0brscvh77y1n42abxy26x",
-      "depends": []
-    },
-    "MSMB": {
-      "name": "MSMB",
-      "version": "1.22.0",
-      "sha256": "0kwjdgf526q63kln6j7a0v6v14x1qx5hlpannpb5grah2lyxz4rw",
-      "depends": ["tibble"]
-    },
-    "MUGAExampleData": {
-      "name": "MUGAExampleData",
-      "version": "1.24.0",
-      "sha256": "0mrap1whvlzlmbrfg611cq3c9a1w2pq3wmijk842cybsx8az59xd",
-      "depends": []
-    },
-    "MerfishData": {
-      "name": "MerfishData",
-      "version": "1.6.0",
-      "sha256": "1i8war9rg7fwjdfhj5xa6sp3lmp30j0di04gckskmz6pk9pjjg4r",
-      "depends": ["AnnotationHub", "BumpyMatrix", "EBImage", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"]
-    },
-    "MetaGxBreast": {
-      "name": "MetaGxBreast",
-      "version": "1.24.0",
-      "sha256": "05cz500r6fhlq5pfviiqj8cfv173027dqsdvhvvi57cbbx3qqn6r",
-      "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "SummarizedExperiment", "impute", "lattice"]
-    },
-    "MetaGxOvarian": {
-      "name": "MetaGxOvarian",
-      "version": "1.24.0",
-      "sha256": "01cnm2rf6ls1q5plgazxqkrrw3b6mcrxbq0wrmi0ra8daqh6asi7",
-      "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "SummarizedExperiment", "impute", "lattice"]
-    },
-    "MetaGxPancreas": {
-      "name": "MetaGxPancreas",
-      "version": "1.24.0",
-      "sha256": "150i72jrq3qshsh0m20kxdcx7zxz1cgvlk0y2nxnacs1xbdnywxv",
-      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "impute"]
-    },
-    "MetaScope": {
-      "name": "MetaScope",
-      "version": "1.4.0",
-      "sha256": "1kaisvhp66g95w4dycw8jzsxh00f2c193rjcla6l5k2dn5rnsyr9",
-      "depends": ["BiocFileCache", "Biostrings", "Matrix", "MultiAssayExperiment", "Rbowtie2", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "stringr", "taxize", "tibble", "tidyr"]
-    },
-    "MethylAidData": {
-      "name": "MethylAidData",
-      "version": "1.36.0",
-      "sha256": "1f328mhf9b64scr45c9sshcgnsw9lb1g9in22xx2sak40dspjx2a",
-      "depends": ["MethylAid"]
-    },
-    "MethylSeqData": {
-      "name": "MethylSeqData",
-      "version": "1.14.0",
-      "sha256": "197347pavq9hjcpwa9lq66lyjr1jb7mymd9pjz01rr9f77d7rqq5",
-      "depends": ["ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "SummarizedExperiment", "rhdf5"]
-    },
-    "MicrobiomeBenchmarkData": {
-      "name": "MicrobiomeBenchmarkData",
-      "version": "1.6.0",
-      "sha256": "00lr183x24yx4xd9cpxvzkcxmqp4dinfi1nz2arqqxnbfcp2s25j",
-      "depends": ["BiocFileCache", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape"]
-    },
-    "MouseAgingData": {
-      "name": "MouseAgingData",
-      "version": "1.0.0",
-      "sha256": "1867xjhwbsjlzlm8fq0j8ggbhhym427l7vcx9i9g6zwkda7p64x3",
-      "depends": ["AnnotationHub", "ExperimentHub", "SingleCellExperiment"]
-    },
-    "MouseGastrulationData": {
-      "name": "MouseGastrulationData",
-      "version": "1.18.0",
-      "sha256": "0adw98vym1jir1jrzaws7zrlfvls6rfl8bvkpq5sjy4crb33lxy2",
-      "depends": ["BiocGenerics", "BumpyMatrix", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"]
-    },
-    "MouseThymusAgeing": {
-      "name": "MouseThymusAgeing",
-      "version": "1.12.0",
-      "sha256": "1vkbfni6zyr9qhzxfgfj7c5y639amsgbi3chcnsch36r35bnaxp2",
-      "depends": ["BiocGenerics", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"]
-    },
-    "NCIgraphData": {
-      "name": "NCIgraphData",
-      "version": "1.40.0",
-      "sha256": "0macj01775q3dzqhvsbfb2gkz0s8w49vgbfh2nhpgfykwzx5bwjm",
-      "depends": []
-    },
-    "NGScopyData": {
-      "name": "NGScopyData",
-      "version": "1.24.0",
-      "sha256": "1j780dkzv08ajyz0c9dh2ygqsyycyhnzvxl1jrc3gvxdddr1syvj",
-      "depends": []
-    },
-    "NanoporeRNASeq": {
-      "name": "NanoporeRNASeq",
-      "version": "1.14.0",
-      "sha256": "0lpjxpw5jd4zj9pjd3xjcaxkcn135rbhz628zpl44qrdnmyjg2wk",
-      "depends": ["ExperimentHub"]
-    },
-    "NestLink": {
-      "name": "NestLink",
-      "version": "1.20.0",
-      "sha256": "1yh1nivipyrx3h0par8cf943licl1rs47jvfwz1392hi09vji15j",
-      "depends": ["AnnotationHub", "Biostrings", "ExperimentHub", "ShortRead", "gplots", "protViz"]
-    },
-    "NetActivityData": {
-      "name": "NetActivityData",
-      "version": "1.6.0",
-      "sha256": "1jcj9k5mzf30wimwwv4gix85n597bv20bjh32nrha2yqiihp9k34",
-      "depends": []
-    },
-    "Neve2006": {
-      "name": "Neve2006",
-      "version": "0.42.0",
-      "sha256": "0w3ph610lhxyg1knhsnnxpw32sw2n5p57svpbhqm3zmphx29nw3h",
-      "depends": ["Biobase", "annotate", "hgu133a_db"]
-    },
-    "NxtIRFdata": {
-      "name": "NxtIRFdata",
-      "version": "1.10.0",
-      "sha256": "0qwqpzaqp9m8202sp7pdpii90j9yh97ipk36ivh9ba3s05agwq8p",
-      "depends": ["BiocFileCache", "ExperimentHub", "R_utils", "rtracklayer"]
-    },
-    "OMICsPCAdata": {
-      "name": "OMICsPCAdata",
-      "version": "1.22.0",
-      "sha256": "0p0pjgffxc72b3wx6wnn0d0wc27qdp5z6my1xr19604drn7sd20x",
-      "depends": ["MultiAssayExperiment"]
-    },
-    "ObMiTi": {
-      "name": "ObMiTi",
-      "version": "1.12.0",
-      "sha256": "061qyy69wlr5zhp3m499lq83dq7rwch8ll3a10vwmmwx1l40n8xa",
-      "depends": ["ExperimentHub", "SummarizedExperiment"]
-    },
-    "OnassisJavaLibs": {
-      "name": "OnassisJavaLibs",
-      "version": "1.26.0",
-      "sha256": "1j2nyrkx9ish1v2yvr8wsahhclpy2mvdnrwnk19fkv8kr1hjwjws",
-      "depends": ["rJava"]
-    },
-    "PCHiCdata": {
-      "name": "PCHiCdata",
-      "version": "1.32.0",
-      "sha256": "12nzy9m96jsal7sfqqdi8q7vq9rb4jc5h3hbl11aq4ik66048dyh",
-      "depends": ["Chicago"]
-    },
-    "PREDAsampledata": {
-      "name": "PREDAsampledata",
-      "version": "0.44.0",
-      "sha256": "0ydb4y2s8kshia7k6mr941f1fc7nsqahm1g86ig3wpcq7al33z1b",
-      "depends": ["Biobase", "PREDA", "affy", "annotate"]
-    },
-    "PWMEnrich_Dmelanogaster_background": {
-      "name": "PWMEnrich.Dmelanogaster.background",
-      "version": "4.38.0",
-      "sha256": "1wnm4jq5lzz50wzsz9v0kw104c1m67j68qlq6773ikdblsrlq23x",
-      "depends": ["PWMEnrich"]
-    },
-    "PWMEnrich_Hsapiens_background": {
-      "name": "PWMEnrich.Hsapiens.background",
-      "version": "4.38.0",
-      "sha256": "0fjzlnzv4fk9a90vnl39shx6d84bv61rc3hda6h18md5al202jyj",
-      "depends": ["PWMEnrich"]
-    },
-    "PWMEnrich_Mmusculus_background": {
-      "name": "PWMEnrich.Mmusculus.background",
-      "version": "4.38.0",
-      "sha256": "0w815iqjfv0f0kybr84y3q4xsvxihixbiljsdz09xgafam3l80a3",
-      "depends": ["PWMEnrich"]
-    },
-    "PasillaTranscriptExpr": {
-      "name": "PasillaTranscriptExpr",
-      "version": "1.32.0",
-      "sha256": "0pwqfmcm0cw0z42571fa8w2lpy5mx516mckvk1dwys2yzdhjj24a",
-      "depends": []
-    },
-    "PathNetData": {
-      "name": "PathNetData",
-      "version": "1.40.0",
-      "sha256": "1pa6hrkyz1byldlch3h7brw2klxi9v2gg97j6814qiqiv84ms90y",
-      "depends": []
-    },
-    "PepsNMRData": {
-      "name": "PepsNMRData",
-      "version": "1.22.0",
-      "sha256": "1yzdpfbfivkyvnw76c24j2rbwfkjsnh0blv2z9x8aj1s0b3m5rjy",
-      "depends": []
-    },
-    "PhyloProfileData": {
-      "name": "PhyloProfileData",
-      "version": "1.18.0",
-      "sha256": "1bnzrqcyvhr4cnxkiwlpw5rjhrkbs6lm050yjnm79b2gd2whyk81",
-      "depends": ["BiocStyle", "Biostrings", "ExperimentHub"]
-    },
-    "ProData": {
-      "name": "ProData",
-      "version": "1.42.0",
-      "sha256": "0ysmv66irrq7q8yzk77kkcrxdrcs1pa0z20dfhcsaqkd84yn74jz",
-      "depends": ["Biobase"]
-    },
-    "PtH2O2lipids": {
-      "name": "PtH2O2lipids",
-      "version": "1.30.0",
-      "sha256": "0garsf77h2nb1zcy3z8ypk3c95pjjnzhxvfwlznn4i1l6qi45mds",
-      "depends": ["CAMERA", "LOBSTAHS", "xcms"]
-    },
-    "QDNAseq_hg19": {
-      "name": "QDNAseq.hg19",
-      "version": "1.34.0",
-      "sha256": "054c565wqr3cadym8kmf0wm0k2n3ri6x4bla4zyhra0v8cz6axjb",
-      "depends": ["QDNAseq"]
-    },
-    "QDNAseq_mm10": {
-      "name": "QDNAseq.mm10",
-      "version": "1.34.0",
-      "sha256": "08lj3vcnjg38fnnppa3nsg8sw6gfhklak9prpjxig9yzcg4pggwx",
-      "depends": ["QDNAseq"]
-    },
-    "QUBICdata": {
-      "name": "QUBICdata",
-      "version": "1.32.0",
-      "sha256": "0gdsyvfrwsbbm786bkkqxxsc5s3wpn7fyhf4f227gr8sg3l7fkbi",
-      "depends": []
-    },
-    "RGMQLlib": {
-      "name": "RGMQLlib",
-      "version": "1.24.0",
-      "sha256": "09149yaw2gpypp0m7cghbjqksbj0ncly8fxlv1n7l2s8kaq5jkdq",
-      "depends": []
-    },
-    "RITANdata": {
-      "name": "RITANdata",
-      "version": "1.28.0",
-      "sha256": "0k1rziwpb26y19j2cii9y2vffr0sdkskll41njwpkl5mla5bzylv",
-      "depends": []
-    },
-    "RLHub": {
-      "name": "RLHub",
-      "version": "1.9.0",
-      "sha256": "0hm3wplzmmzsygz8dalwf6y798p4g2bssjdsg51w17s2mgm4hl98",
-      "depends": ["AnnotationHub", "ExperimentHub"]
-    },
-    "RMassBankData": {
-      "name": "RMassBankData",
-      "version": "1.42.0",
-      "sha256": "10g42s6wq66fhvrxcwxf08073scpkinfldwwdl03r7lxy1wka426",
-      "depends": []
-    },
-    "RNAinteractMAPK": {
-      "name": "RNAinteractMAPK",
-      "version": "1.42.0",
-      "sha256": "0vm20x1lfgl671rrwvxybcwjgk7falb3d5xi6hiq9jivvbms9120",
-      "depends": ["Biobase", "MASS", "RNAinteract", "fields", "gdata", "genefilter", "lattice", "sparseLDA"]
-    },
-    "RNAmodR_Data": {
-      "name": "RNAmodR.Data",
-      "version": "1.18.0",
-      "sha256": "0k5ykbry5si0wc6f1am3ln9pcl842hjrpmmw15j9sm565k5pmvmf",
-      "depends": ["ExperimentHub", "ExperimentHubData"]
-    },
-    "RNAseqData_HNRNPC_bam_chr14": {
-      "name": "RNAseqData.HNRNPC.bam.chr14",
-      "version": "0.42.0",
-      "sha256": "1xc5ya20nnrhdkib7590zv5g8q6cppd6qiwglxc6fj26ncdj6s73",
-      "depends": []
-    },
-    "RRBSdata": {
-      "name": "RRBSdata",
-      "version": "1.24.0",
-      "sha256": "1s6fjkz0dld7mlb1ylqmrw63jk3k0162rv2li6zkz66gc4aq10p0",
-      "depends": ["BiSeq"]
-    },
-    "RTCGA_CNV": {
-      "name": "RTCGA.CNV",
-      "version": "1.32.0",
-      "sha256": "0ll5zj9d9d3ykkkq7iqq5sfvz8i4dc297nwkjpvjxrlazw28iiyl",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_PANCAN12": {
-      "name": "RTCGA.PANCAN12",
-      "version": "1.32.0",
-      "sha256": "0rmgg5j4rzqg78i43l9975vhdnh8r23lz78fkwwa94ihpqv1pbic",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_RPPA": {
-      "name": "RTCGA.RPPA",
-      "version": "1.32.0",
-      "sha256": "158m31hysybyh3ha5n324srrxzc76bkv9fpblida2znv9sni6c52",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_clinical": {
-      "name": "RTCGA.clinical",
-      "version": "20151101.34.0",
-      "sha256": "1s7fss644wkrvimqp2h3hq14gr0gjdqyj92hcrzff2qwyy5fzhky",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_mRNA": {
-      "name": "RTCGA.mRNA",
-      "version": "1.32.0",
-      "sha256": "1anwv8cg38lpwfyxicqi8kml9q9gigrc7bzmp163322lxaq79c1q",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_methylation": {
-      "name": "RTCGA.methylation",
-      "version": "1.32.0",
-      "sha256": "04q23w331vjmmmy2iy79grkgdn03iz53vw8npwx2wq1w8if8xdi4",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_miRNASeq": {
-      "name": "RTCGA.miRNASeq",
-      "version": "1.32.0",
-      "sha256": "1bgcgsx01s7p24014rp8jiklmml822hxabrgf4xxagx4jzr91fxn",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_mutations": {
-      "name": "RTCGA.mutations",
-      "version": "20151101.34.0",
-      "sha256": "19las4v4zg8wbb52wa4zmwpfpn80pyjp1kyvqkhgvpd8m3dj7951",
-      "depends": ["RTCGA"]
-    },
-    "RTCGA_rnaseq": {
-      "name": "RTCGA.rnaseq",
-      "version": "20151101.34.0",
-      "sha256": "03kr2l5l5a7v98rna3a43543b7pqcwc7zhawnh92g3rdabk03w9s",
-      "depends": ["RTCGA"]
-    },
-    "RUVnormalizeData": {
-      "name": "RUVnormalizeData",
-      "version": "1.24.0",
-      "sha256": "0w62ybdiq0dwd11ld48kl178qpd53xbfl51z2jwpi2pj1b86fg9l",
-      "depends": ["Biobase"]
-    },
-    "RcisTarget_hg19_motifDBs_cisbpOnly_500bp": {
-      "name": "RcisTarget.hg19.motifDBs.cisbpOnly.500bp",
-      "version": "1.24.0",
-      "sha256": "170wjqnrvmdjcpx0bwwky3j7cxhbqvch781dzl6il2igca9kbqhq",
-      "depends": ["data_table"]
-    },
-    "ReactomeGSA_data": {
-      "name": "ReactomeGSA.data",
-      "version": "1.18.0",
-      "sha256": "1410ks6s7albf6sly8ry0ln58ws9jlfn62amniqqsg46kx4xc4bh",
-      "depends": ["ReactomeGSA", "Seurat", "edgeR", "limma"]
-    },
-    "RegParallel": {
-      "name": "RegParallel",
-      "version": "1.22.0",
-      "sha256": "0zaask3zpbqh6pmrx4hsi5wz7kkfhbl15xzhz10s8h9m739wm8c0",
-      "depends": ["arm", "data_table", "doParallel", "foreach", "iterators", "stringr", "survival"]
-    },
-    "RforProteomics": {
-      "name": "RforProteomics",
-      "version": "1.42.0",
-      "sha256": "0irg6wrwy82xhlkgj1vphh6ncp9s6qcpp40mxv1vq969qjjchkk9",
-      "depends": ["BiocManager", "MSnbase", "R_utils", "biocViews"]
-    },
-    "RnBeads_hg19": {
-      "name": "RnBeads.hg19",
-      "version": "1.36.0",
-      "sha256": "0yn7n3zv9i76abx9wp0vw6wa7iylbrj2ffhzbc3irc104id0i4f9",
-      "depends": ["GenomicRanges"]
-    },
-    "RnBeads_hg38": {
-      "name": "RnBeads.hg38",
-      "version": "1.36.0",
-      "sha256": "05ffx8a76z9nnl3qhfjf6vfnnc2pqkw2jy4pc0wgqc1y3w9vg60l",
-      "depends": ["GenomicRanges"]
-    },
-    "RnBeads_mm10": {
-      "name": "RnBeads.mm10",
-      "version": "2.12.0",
-      "sha256": "151ivmy35ff850f1ij403bj5g9jhw8r515jjqbvq182x1cygbdfl",
-      "depends": ["GenomicRanges"]
-    },
-    "RnBeads_mm9": {
-      "name": "RnBeads.mm9",
-      "version": "1.36.0",
-      "sha256": "1bd5jai5jk1d3mqbx7x05ypfxma8s330na9n5bb9qzwxq7imd50b",
-      "depends": ["GenomicRanges"]
-    },
-    "RnBeads_rn5": {
-      "name": "RnBeads.rn5",
-      "version": "1.36.0",
-      "sha256": "098vy604ca0g408hl2g0p6kh2zzvzvbmyhbr0z081rbdpvzlnf4f",
-      "depends": ["GenomicRanges"]
-    },
-    "RnaSeqSampleSizeData": {
-      "name": "RnaSeqSampleSizeData",
-      "version": "1.36.0",
-      "sha256": "1gm55gmsxna8a53k7a7yd99nzc4mg1kw7l5lnmkipa03lafa2yff",
-      "depends": ["edgeR"]
-    },
-    "SBGNview_data": {
-      "name": "SBGNview.data",
-      "version": "1.18.0",
-      "sha256": "1hycjipfz6lr1hs1r7g65l565pcx77sz8bjacg5gdcv3rs1by2ql",
-      "depends": ["bookdown", "knitr", "rmarkdown"]
-    },
-    "SCLCBam": {
-      "name": "SCLCBam",
-      "version": "1.36.0",
-      "sha256": "18im1j8j1y4hva4wg6vki59j1bifz9apijyi44wngsx68z19az35",
-      "depends": []
-    },
-    "SFEData": {
-      "name": "SFEData",
-      "version": "1.6.0",
-      "sha256": "03f7f9jrdszvwqgskk12jqw8mvyrrhcjd5v1nzdiy3csg2fa7nbs",
-      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub"]
-    },
-    "SNAData": {
-      "name": "SNAData",
-      "version": "1.50.0",
-      "sha256": "1l3g5gsiv5s83b6406s23snf62zav75s28nq68s8czbm1rsv6xw5",
-      "depends": ["graph"]
-    },
-    "SNAGEEdata": {
-      "name": "SNAGEEdata",
-      "version": "1.40.0",
-      "sha256": "00m10r01sx027pnahw5ck1paplqpwsyq11dkacxq21ssvlc8kbl6",
-      "depends": []
-    },
-    "SNPhoodData": {
-      "name": "SNPhoodData",
-      "version": "1.34.0",
-      "sha256": "0r036vskwlk0mp7bgcbvr7iwffcm7g7imzwh5gri05j5p0rhny72",
-      "depends": []
-    },
-    "STexampleData": {
-      "name": "STexampleData",
-      "version": "1.12.3",
-      "sha256": "1c9lbghi1ybilrc7yiff12sjyaqpr8095wdvz941lnf3cmgci79q",
-      "depends": ["ExperimentHub", "SingleCellExperiment", "SpatialExperiment"]
-    },
-    "SVM2CRMdata": {
-      "name": "SVM2CRMdata",
-      "version": "1.36.0",
-      "sha256": "18pd61cg12ghi8kjh1cjyrd248r20l39drbg9vpqmmcpai5f45wy",
-      "depends": []
-    },
-    "SimBenchData": {
-      "name": "SimBenchData",
-      "version": "1.12.0",
-      "sha256": "0a3q2ajr0pzwdabx306c8bia25cbih3hfzd5jgm2cx9f5i37f11v",
-      "depends": ["ExperimentHub", "S4Vectors"]
-    },
-    "Single_mTEC_Transcriptomes": {
-      "name": "Single.mTEC.Transcriptomes",
-      "version": "1.32.0",
-      "sha256": "0h54w7lc8v5jicm6xf5i16pi8rw2fxqvssf7a0ql9qa6bv4c7sqy",
-      "depends": []
-    },
-    "SingleCellMultiModal": {
-      "name": "SingleCellMultiModal",
-      "version": "1.16.0",
-      "sha256": "1kzfzprma01ppbpbzgfgaa3dins2915n3wqsrqapcxfks7zvaciq",
-      "depends": ["AnnotationHub", "BiocBaseUtils", "BiocFileCache", "ExperimentHub", "HDF5Array", "Matrix", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment"]
-    },
-    "SingleMoleculeFootprintingData": {
-      "name": "SingleMoleculeFootprintingData",
-      "version": "1.12.0",
-      "sha256": "0xdi5rpqpj07h8j1n7wxfsmvrp6zsnc5rq1b2frdp8x3xdlf5dxn",
-      "depends": ["ExperimentHub"]
-    },
-    "SomatiCAData": {
-      "name": "SomatiCAData",
-      "version": "1.42.0",
-      "sha256": "01k9s97rd78pciv4yaij07zzrijvfidpg6hh4h67mnxc90pg3r8w",
-      "depends": []
-    },
-    "SomaticCancerAlterations": {
-      "name": "SomaticCancerAlterations",
-      "version": "1.40.0",
-      "sha256": "11jvin7y5ys1lxwfjrwb4vw4gcpj09y0n6rhs87w27gcpj4dk7dm",
-      "depends": ["GenomicRanges", "IRanges", "S4Vectors"]
-    },
-    "SpatialDatasets": {
-      "name": "SpatialDatasets",
-      "version": "1.2.0",
-      "sha256": "0qg9x657kamqqcifziagp3qrk5h2zh16jl8dprzl7nnrxhp0cra2",
-      "depends": ["ExperimentHub", "SpatialExperiment"]
-    },
-    "SpikeIn": {
-      "name": "SpikeIn",
-      "version": "1.46.0",
-      "sha256": "1bnhag1cck99k6mgfnqddjxjhmpgax76p28hm686jkil416y0y47",
-      "depends": ["affy"]
-    },
-    "SpikeInSubset": {
-      "name": "SpikeInSubset",
-      "version": "1.44.0",
-      "sha256": "118v972wwq4h2ww2nlb7mzva3d38c4hzmbq0v28500q2zc1ykv4l",
-      "depends": ["Biobase", "affy"]
-    },
-    "SubcellularSpatialData": {
-      "name": "SubcellularSpatialData",
-      "version": "1.0.0",
-      "sha256": "0lyg6hiv8ch7c8a7zzi02c9fmq2zqif88khhslj15gvg5dznw79v",
-      "depends": ["Matrix", "SpatialExperiment", "dplyr", "hexbin"]
-    },
-    "TBX20BamSubset": {
-      "name": "TBX20BamSubset",
-      "version": "1.40.0",
-      "sha256": "0hxmizdgrbv6vqlxj6hn4wiazjf3cwaaq17pagqmjlfxbqb4mlzk",
-      "depends": ["Rsamtools", "xtable"]
-    },
-    "TCGAMethylation450k": {
-      "name": "TCGAMethylation450k",
-      "version": "1.40.0",
-      "sha256": "1c2jgrh5fsnq4d8aw8p1147jsdz8yi60i3naxsd8kj3s9mn1vfn2",
-      "depends": []
-    },
-    "TCGAWorkflowData": {
-      "name": "TCGAWorkflowData",
-      "version": "1.28.0",
-      "sha256": "0sg9zn06rf63n9z6qggxwrh5mxjg0gq1zjj1fn141d7xdbw1j784",
-      "depends": ["SummarizedExperiment"]
-    },
-    "TCGAbiolinksGUI_data": {
-      "name": "TCGAbiolinksGUI.data",
-      "version": "1.24.0",
-      "sha256": "1r36f7nvvjjgkgmhha81n2iyr9k4nzy0qkkblm483rgzxav4gqa6",
-      "depends": []
-    },
-    "TCGAcrcmRNA": {
-      "name": "TCGAcrcmRNA",
-      "version": "1.24.0",
-      "sha256": "07sszvf7wd50gj5sgkj4di9a5y4yqcgi9ykssmp9n16bam1xp0a8",
-      "depends": ["Biobase"]
-    },
-    "TCGAcrcmiRNA": {
-      "name": "TCGAcrcmiRNA",
-      "version": "1.24.0",
-      "sha256": "0jc6shc18kvd69v8wrgifg3cvi5idv1hlnd4x93njxbj9yyxr8xd",
-      "depends": ["Biobase"]
-    },
-    "TENxBUSData": {
-      "name": "TENxBUSData",
-      "version": "1.18.0",
-      "sha256": "19a909cs0z8zy6vwlxxgk76ybj9yrhsxd2z8narf50rv96nyid0s",
-      "depends": ["AnnotationHub", "BiocGenerics", "ExperimentHub"]
-    },
-    "TENxBrainData": {
-      "name": "TENxBrainData",
-      "version": "1.24.0",
-      "sha256": "1kb5i3xrins9jd40xzyi4sj9nks83vzw1w8pk7ji6kgyjdgm1by6",
-      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment"]
-    },
-    "TENxPBMCData": {
-      "name": "TENxPBMCData",
-      "version": "1.22.0",
-      "sha256": "089q81wiq7flr1a72gmj7y1ds73zzc2h96pnjm7s5sbysgy4jgx9",
-      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment"]
-    },
-    "TENxVisiumData": {
-      "name": "TENxVisiumData",
-      "version": "1.12.0",
-      "sha256": "08jcq5vq0ki4q6ndpm3799kwiy62j446v4kbfdfw7j7rwgjmhjhs",
-      "depends": ["ExperimentHub", "SpatialExperiment"]
-    },
-    "TENxXeniumData": {
-      "name": "TENxXeniumData",
-      "version": "1.0.0",
-      "sha256": "1zjyry8m4f8xw6apib90rv8lyxhpdy3nqgawshhslv8w8qwk3xs9",
-      "depends": ["BumpyMatrix", "ExperimentHub", "SpatialExperiment", "SpatialFeatureExperiment", "SummarizedExperiment"]
-    },
-    "TMExplorer": {
-      "name": "TMExplorer",
-      "version": "1.14.0",
-      "sha256": "0qxm46dryq7c4xrbkhgbfqxqn0p7x1nxklqhkdw8qmklszc2b870",
-      "depends": ["BiocFileCache", "Matrix", "SingleCellExperiment"]
-    },
-    "TabulaMurisData": {
-      "name": "TabulaMurisData",
-      "version": "1.22.0",
-      "sha256": "0gnv8yfksrc59prki6w6xa5pw5nszxkx88i5av3ln21hq5idj4cm",
-      "depends": ["ExperimentHub"]
-    },
-    "TabulaMurisSenisData": {
-      "name": "TabulaMurisSenisData",
-      "version": "1.10.0",
-      "sha256": "1b1aj06qacvzpabz8r0vkqpm0pp48vx26xx84h5ihzg9232wrqmy",
-      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "SingleCellExperiment", "SummarizedExperiment", "gdata"]
-    },
-    "TargetScoreData": {
-      "name": "TargetScoreData",
-      "version": "1.40.0",
-      "sha256": "18y7vidhgkhpr9nlhxwhhi7z07vj6ii1vwl9c8dyyhzfc8icsmsn",
-      "depends": []
-    },
-    "TargetSearchData": {
-      "name": "TargetSearchData",
-      "version": "1.42.0",
-      "sha256": "0dzb1jazdwx37kx0xwvv9i7rfq1712bifz542x4liahvxjgz7prg",
-      "depends": []
-    },
-    "TimerQuant": {
-      "name": "TimerQuant",
-      "version": "1.34.0",
-      "sha256": "1gjnfmsbcj8ndj1fssclzlb5qd482c38gpi0q4x7ls98bk42r44x",
-      "depends": ["deSolve", "dplyr", "ggplot2", "gridExtra", "locfit", "shiny"]
-    },
-    "TransOmicsData": {
-      "name": "TransOmicsData",
-      "version": "1.0.1",
-      "sha256": "0sfpks0wfzlrh5qqg0id5c99l1dzj2l1nd5h3shjhp0lm4f5v8w0",
-      "depends": ["S4Vectors"]
-    },
-    "TumourMethData": {
-      "name": "TumourMethData",
-      "version": "1.2.0",
-      "sha256": "1xwm2amlb1vrf3hpdw9387nglc6pbxxdxik56byr5p8856fkjdav",
-      "depends": ["ExperimentHub", "GenomicRanges", "HDF5Array", "R_utils", "SummarizedExperiment", "rhdf5"]
-    },
-    "VariantToolsData": {
-      "name": "VariantToolsData",
-      "version": "1.28.0",
-      "sha256": "0k8fg4bhghva32qk4l6r4g6asdkyl2afx0frbk0f57b2hqix69fb",
-      "depends": ["BiocGenerics", "GenomicRanges", "VariantAnnotation"]
-    },
-    "VectraPolarisData": {
-      "name": "VectraPolarisData",
-      "version": "1.8.0",
-      "sha256": "13r0r1whcxzzhlsa3bjsq9kp3csgnynbcrxj06v5s73xf8xify00",
-      "depends": ["ExperimentHub", "SpatialExperiment"]
-    },
-    "WES_1KG_WUGSC": {
-      "name": "WES.1KG.WUGSC",
-      "version": "1.36.0",
-      "sha256": "1yv62ydvlsl52awzn2nsa52vaz4naf4biw57awpmz0cp4rb68kdb",
-      "depends": []
-    },
-    "WGSmapp": {
-      "name": "WGSmapp",
-      "version": "1.16.0",
-      "sha256": "0k4zyj9dn5x710a1vv11156brz52yf9lzmlmx9axcfsch5dcvi7x",
-      "depends": ["GenomicRanges"]
-    },
-    "WeberDivechaLCdata": {
-      "name": "WeberDivechaLCdata",
-      "version": "1.6.0",
-      "sha256": "0nkh8c329n0jh33wa0knnwi9vvk8na1d3lpm3g5lrzl8624kdllv",
-      "depends": ["ExperimentHub", "SingleCellExperiment", "SpatialExperiment"]
-    },
-    "XhybCasneuf": {
-      "name": "XhybCasneuf",
-      "version": "1.42.0",
-      "sha256": "0n0k6h9b9gkywy6cmlx15g09287aqzvc228j3jgjkv0ljbwsq756",
-      "depends": ["RColorBrewer", "affy", "ath1121501cdf", "tinesath1cdf"]
-    },
-    "adductData": {
-      "name": "adductData",
-      "version": "1.20.0",
-      "sha256": "1ydd7zxag0cmw7mj38srqs4w6lbp1ic5i8s1ay6pifv14arcncrz",
-      "depends": ["AnnotationHub", "ExperimentHub"]
-    },
-    "affycompData": {
-      "name": "affycompData",
-      "version": "1.42.0",
-      "sha256": "16fri51jhp0lm3aj9hw2s6jzxjlxz2qbd36j9zcbcs7sb6jh42jy",
-      "depends": ["Biobase", "affycomp"]
-    },
-    "affydata": {
-      "name": "affydata",
-      "version": "1.52.0",
-      "sha256": "0srmrb2pf5dhjfm1l1jd06jgnah16qxillxi5zjr8vq7pgvw8x4b",
-      "depends": ["affy"]
-    },
-    "airway": {
-      "name": "airway",
-      "version": "1.24.0",
-      "sha256": "0yj9ac58iplcakzw6yyglyiwwhiyslp2hlnszhp3258grvbfvcby",
-      "depends": ["SummarizedExperiment"]
-    },
-    "antiProfilesData": {
-      "name": "antiProfilesData",
-      "version": "1.40.0",
-      "sha256": "1mlps08fra7ssbymwf260c43skp2pzw477mp090ycfaj8ncdzqqp",
-      "depends": ["Biobase"]
-    },
-    "aracne_networks": {
-      "name": "aracne.networks",
-      "version": "1.30.0",
-      "sha256": "1xfzs1n9wis3r0q4g0hg4amhx4zldbslidx1i4d90vcrgzfdh4x6",
-      "depends": ["viper"]
-    },
-    "bcellViper": {
-      "name": "bcellViper",
-      "version": "1.40.0",
-      "sha256": "0mx92gs9065lz0c01mzng9snalvmdb3xbsm1r3f6fnhg478da4yq",
-      "depends": ["Biobase"]
-    },
-    "beadarrayExampleData": {
-      "name": "beadarrayExampleData",
-      "version": "1.42.0",
-      "sha256": "0l5n1d7x4gc3w2kc6vq0gqxp1wdpa2sn5k75yf5fc802m11nrkd1",
-      "depends": ["Biobase", "beadarray"]
-    },
-    "benchmarkfdrData2019": {
-      "name": "benchmarkfdrData2019",
-      "version": "1.18.0",
-      "sha256": "1k8gpql57jps51bh5kdn5j5mgz36a369p4sz37sbqkfrskfs8m91",
-      "depends": ["ExperimentHub", "SummarizedExperiment"]
-    },
-    "beta7": {
-      "name": "beta7",
-      "version": "1.42.0",
-      "sha256": "0c7zal2hk7knw2mcfkfh7svz3b6nz98y895mhl3ari986wqpj4nv",
-      "depends": ["marray"]
-    },
-    "biotmleData": {
-      "name": "biotmleData",
-      "version": "1.28.0",
-      "sha256": "0c50778lwkapgvwn7nvhjyn7irxn85d97mfyawgfgs9kzyfxx1a3",
-      "depends": []
-    },
-    "biscuiteerData": {
-      "name": "biscuiteerData",
-      "version": "1.18.0",
-      "sha256": "1qv2ajy312diacb3mihc3q7hrrlq48k5vd9v0g6w38cqz6gnz0as",
-      "depends": ["AnnotationHub", "ExperimentHub", "GenomicRanges", "curl"]
-    },
-    "bladderbatch": {
-      "name": "bladderbatch",
-      "version": "1.42.0",
-      "sha256": "00cgkpa6mb32q3xl5clkpdh5rkwx7c81rxmyh2qr0jpwpmd3gjwc",
-      "depends": ["Biobase"]
-    },
-    "blimaTestingData": {
-      "name": "blimaTestingData",
-      "version": "1.24.0",
-      "sha256": "0414hiah3yzkcdayb43vz5dafv6samaczg556wyl7ig2275k3q6h",
-      "depends": []
-    },
-    "bodymapRat": {
-      "name": "bodymapRat",
-      "version": "1.20.0",
-      "sha256": "15kjgqq7lq94pjqg380swqrkv684kgbpkaikfxxdx4cpgx8sjzn7",
-      "depends": ["ExperimentHub", "SummarizedExperiment"]
-    },
-    "breakpointRdata": {
-      "name": "breakpointRdata",
-      "version": "1.22.0",
-      "sha256": "1hm190ji3s451x2hchmpyzx6v4n8p1n6fdqg7cbzmj19rzsb4wha",
-      "depends": []
-    },
-    "breastCancerMAINZ": {
-      "name": "breastCancerMAINZ",
-      "version": "1.42.0",
-      "sha256": "1i2h0f38skkv1m5gas15jdjw4jl8ma4w1sv74j1x9g1zfl9xq3rg",
-      "depends": []
-    },
-    "breastCancerNKI": {
-      "name": "breastCancerNKI",
-      "version": "1.42.0",
-      "sha256": "0vnwyqn5wg9iqmgb6zx6rciw62n8bxkdyfxlaggl35dpwwpzdb2f",
-      "depends": []
-    },
-    "breastCancerTRANSBIG": {
-      "name": "breastCancerTRANSBIG",
-      "version": "1.42.0",
-      "sha256": "0s2h6qy19jnk5s23r0vkv6j77n5qr7ncanmkz0ybx5qyfyicz9m4",
-      "depends": []
-    },
-    "breastCancerUNT": {
-      "name": "breastCancerUNT",
-      "version": "1.42.0",
-      "sha256": "0i8xw534hywfa382nyfy94g2fk0nfaid306dxrlijkfbs2b24dy9",
-      "depends": []
-    },
-    "breastCancerUPP": {
-      "name": "breastCancerUPP",
-      "version": "1.42.0",
-      "sha256": "183dy6c3wqc2m65vihdn840wvnq64vwndwcfsvhw39znqpszhs9k",
-      "depends": []
-    },
-    "breastCancerVDX": {
-      "name": "breastCancerVDX",
-      "version": "1.42.0",
-      "sha256": "0mvm2a77mss85vi8x3i35d54z70advyshsmadhl6aysrzfiw5ifd",
-      "depends": []
-    },
-    "brgedata": {
-      "name": "brgedata",
-      "version": "1.26.0",
-      "sha256": "1h2ka8k12lx4326y50scw80n21xkf67ks7kqs2ss6sbwd536gm61",
-      "depends": ["Biobase", "SummarizedExperiment"]
-    },
-    "bronchialIL13": {
-      "name": "bronchialIL13",
-      "version": "1.42.0",
-      "sha256": "0g1cfhfjycpv1jmba5jddff88m7pbz1l02kci9w73qzjcnqgpp12",
-      "depends": ["affy"]
-    },
-    "bsseqData": {
-      "name": "bsseqData",
-      "version": "0.42.0",
-      "sha256": "06k6r288bqi9dshpdz6qlz0d3p1srz8yc1b0xrar9wy5fckdb97d",
-      "depends": ["bsseq"]
-    },
-    "cMap2data": {
-      "name": "cMap2data",
-      "version": "1.40.0",
-      "sha256": "1vaqqszdx3bfdqm3ckn12w9f474wnyqyi7kz0wrj1y50wnwpm38f",
-      "depends": []
-    },
-    "cancerdata": {
-      "name": "cancerdata",
-      "version": "1.42.0",
-      "sha256": "1jgcg16v09wpga5zivx221mz2bnl37gwpjhlmq9a8h5vxlqcb9wl",
-      "depends": ["Biobase"]
-    },
-    "ccdata": {
-      "name": "ccdata",
-      "version": "1.30.0",
-      "sha256": "0q77dk9rifwpp1c2ga1y3yxf1dwvlkmmn5sw285a1c5h6pipxsj3",
-      "depends": []
-    },
-    "celarefData": {
-      "name": "celarefData",
-      "version": "1.22.0",
-      "sha256": "1njq6i1803avcn2h9p3d2cnp8viwv7jak1b5kfqhcvl8jwwxlr59",
-      "depends": []
-    },
-    "celldex": {
-      "name": "celldex",
-      "version": "1.14.0",
-      "sha256": "155hnh62ra06b52xk78f111b10gm34d1djvl5w5mabvrk4vknwj6",
-      "depends": ["AnnotationDbi", "AnnotationHub", "DBI", "DelayedArray", "DelayedMatrixStats", "ExperimentHub", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_se", "gypsum", "jsonlite"]
-    },
-    "cfToolsData": {
-      "name": "cfToolsData",
-      "version": "1.2.0",
-      "sha256": "0hhc9fn6rm9dnzlvs3lk5v0h5m76knl5nblnda26a36wdwz547ld",
-      "depends": ["ExperimentHub"]
-    },
-    "chipenrich_data": {
-      "name": "chipenrich.data",
-      "version": "2.28.0",
-      "sha256": "1kpc3ljayxycadshdgyzkbagh4vd7cmyqqccy61269skpasdnwbv",
-      "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "readr", "rtracklayer"]
-    },
-    "chipseqDBData": {
-      "name": "chipseqDBData",
-      "version": "1.20.0",
-      "sha256": "16mfq2mdwrc40i6wyjc9g897sk2rk0way6shc0nw9d1fkf4fsf8l",
-      "depends": ["AnnotationHub", "ExperimentHub", "Rsamtools", "S4Vectors"]
-    },
-    "chromstaRData": {
-      "name": "chromstaRData",
-      "version": "1.30.0",
-      "sha256": "0v28zg8z5b72hci7rqbvjvcgp979zxnq6xgck4baypmkj9ac5wn3",
-      "depends": []
-    },
-    "clustifyrdatahub": {
-      "name": "clustifyrdatahub",
-      "version": "1.14.0",
-      "sha256": "1asssxa8kw2r5ai14kg06ajzkqfmqfvrp6ydjwgf8pkyc4m53r4p",
-      "depends": ["ExperimentHub"]
-    },
-    "cnvGSAdata": {
-      "name": "cnvGSAdata",
-      "version": "1.40.0",
-      "sha256": "19dskn9kjk1phn2xlsx4wikwvagv48av6ar845hzwwyq7rzllyy6",
-      "depends": ["cnvGSA"]
-    },
-    "colonCA": {
-      "name": "colonCA",
-      "version": "1.46.0",
-      "sha256": "17h4vcpvll01ggp280bspxsl1swiakfabs6n73874sjnik64wp2q",
-      "depends": ["Biobase"]
-    },
-    "crisprScoreData": {
-      "name": "crisprScoreData",
-      "version": "1.8.0",
-      "sha256": "1a5ji6zbvnlbdzcqj4arpi6am7vaq31brxaxawr93knpy4lksd4f",
-      "depends": ["AnnotationHub", "ExperimentHub"]
-    },
-    "curatedAdipoArray": {
-      "name": "curatedAdipoArray",
-      "version": "1.16.0",
-      "sha256": "0gs68q5gfn0ba6y0p429s8v989cfnnlii9066wvqgd8ixqcig66i",
-      "depends": []
-    },
-    "curatedAdipoChIP": {
-      "name": "curatedAdipoChIP",
-      "version": "1.20.0",
-      "sha256": "1yzxz6wjddf4mn6yw8zlz2yq6rhfs0639widql99hjclni1llxkc",
-      "depends": ["ExperimentHub", "SummarizedExperiment"]
-    },
-    "curatedAdipoRNA": {
-      "name": "curatedAdipoRNA",
-      "version": "1.20.0",
-      "sha256": "1q22clkypj8y6am609h4748z2jc2lhhm8kdcv9s3dzx272dmm0w5",
-      "depends": ["SummarizedExperiment"]
-    },
-    "curatedBladderData": {
-      "name": "curatedBladderData",
-      "version": "1.40.0",
-      "sha256": "0ma11myfh5kddksn81rspjq7l44vn0mgz2c98krpdgfv8qynf6ky",
-      "depends": ["affy"]
-    },
-    "curatedBreastData": {
-      "name": "curatedBreastData",
-      "version": "2.32.0",
-      "sha256": "0zglh1h9hw6rnpdl4v5v7cmzgcvxa0phfixfwwmi8il0rn40jd68",
-      "depends": ["Biobase", "BiocStyle", "XML", "ggplot2", "impute"]
-    },
-    "curatedCRCData": {
-      "name": "curatedCRCData",
-      "version": "2.35.0",
-      "sha256": "1q6xmp32w39jsw7jrphpygyv63vd640nmpz69nlhhisbbpjd259c",
-      "depends": ["BiocGenerics", "nlme"]
-    },
-    "curatedMetagenomicData": {
-      "name": "curatedMetagenomicData",
-      "version": "3.12.0",
-      "sha256": "1hp1s5v567xidmmpn6jv7i3fid5hwg3i43y9471aabq00nsg67b1",
-      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "dplyr", "magrittr", "mia", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
-    },
-    "curatedOvarianData": {
-      "name": "curatedOvarianData",
-      "version": "1.42.0",
-      "sha256": "0rigr8nwcr60vp164hyjw20dw54mwlfg71m4naiz6m1v47d7cg1i",
-      "depends": ["Biobase", "BiocGenerics"]
-    },
-    "curatedPCaData": {
-      "name": "curatedPCaData",
-      "version": "1.0.0",
-      "sha256": "0wqvg0z19lxyqbbsl7fbq12jgycpqycx45vy24z4sph48kz2ag3w",
-      "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "rlang"]
-    },
-    "curatedTBData": {
-      "name": "curatedTBData",
-      "version": "2.0.0",
-      "sha256": "03wmr9iyhqwbpmp7azq9im5waxy4viqhx0lsmqpk2bsijmigrg0z",
-      "depends": ["AnnotationHub", "ExperimentHub", "MultiAssayExperiment", "rlang"]
-    },
-    "curatedTCGAData": {
-      "name": "curatedTCGAData",
-      "version": "1.26.0",
-      "sha256": "1xdygjwqgy6kjjxzvsy25bckc0f8j5m42wrj1vrnwy5fp0q7y287",
-      "depends": ["AnnotationHub", "ExperimentHub", "HDF5Array", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment"]
-    },
-    "davidTiling": {
-      "name": "davidTiling",
-      "version": "1.44.0",
-      "sha256": "06r600sn2ga5jrwahxh3ysv4c713sxi0g6y6v46zpcwilkj10gp3",
-      "depends": ["Biobase", "GO_db", "tilingArray"]
-    },
-    "depmap": {
-      "name": "depmap",
-      "version": "1.18.0",
-      "sha256": "0imajc5kiqf45sjwxagvg5bjvmnrzrk3ls4bflwxj9rnd84v2r62",
-      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "curl", "dplyr", "httr2", "tibble"]
-    },
-    "derfinderData": {
-      "name": "derfinderData",
-      "version": "2.22.0",
-      "sha256": "14gyw3cii7np0rw9j39hcrij9kcybbrwxwz9qa4wx98ddzfixrcn",
-      "depends": []
-    },
-    "diffloopdata": {
-      "name": "diffloopdata",
-      "version": "1.32.0",
-      "sha256": "0qhbdq5j900nmpfbz3bcr4jn9zd43fnr7rd94lsv69dpjmsv7ikw",
-      "depends": []
-    },
-    "diggitdata": {
-      "name": "diggitdata",
-      "version": "1.36.0",
-      "sha256": "0js94wbi9rfsmwj7q8mbh2fimwpiw45ahb1a1g0300zxzf9y61ax",
-      "depends": ["Biobase", "viper"]
-    },
-    "dorothea": {
-      "name": "dorothea",
-      "version": "1.16.0",
-      "sha256": "08s961ra7f6q4dag39rgdrg5minvzm58g22r8xkwfiw0hfavacbg",
-      "depends": ["bcellViper", "decoupleR", "dplyr", "magrittr"]
-    },
-    "dressCheck": {
-      "name": "dressCheck",
-      "version": "0.42.0",
-      "sha256": "1i6lcf8lxp0v0lpkckx3yhzyzj841w3x6qj3kaxls4bfkzr3hls6",
-      "depends": ["Biobase"]
-    },
-    "dyebiasexamples": {
-      "name": "dyebiasexamples",
-      "version": "1.44.0",
-      "sha256": "1ihkhfhgqywnp2vxrqpzvm5w3ncy6acwcns2ah1fm8xsq1bvcs5v",
-      "depends": ["GEOquery", "marray"]
-    },
-    "easierData": {
-      "name": "easierData",
-      "version": "1.10.0",
-      "sha256": "0l6qhlaa02d2sqaa0yfxqqm1giga5jppq74sfgrih1ccqh348am7",
-      "depends": ["AnnotationHub", "ExperimentHub", "SummarizedExperiment"]
-    },
-    "ecoliLeucine": {
-      "name": "ecoliLeucine",
-      "version": "1.44.0",
-      "sha256": "09pk2ay2j5gvk60vavs03cgfhma8bvsynxabkfcvr1hkl87qfl2k",
-      "depends": ["affy", "ecolicdf"]
-    },
-    "emtdata": {
-      "name": "emtdata",
-      "version": "1.12.0",
-      "sha256": "0b3hvggndw3bzddk0vflbn0wx8fr08b6nphjhil1wqlyp3535xk4",
-      "depends": ["ExperimentHub", "SummarizedExperiment", "edgeR"]
-    },
-    "epimutacionsData": {
-      "name": "epimutacionsData",
-      "version": "1.8.0",
-      "sha256": "06z3lxp8lsr2nqw3yqiddy3h4y6iid3n7s1ykbaz0dpm05vdq8i2",
-      "depends": []
-    },
-    "estrogen": {
-      "name": "estrogen",
-      "version": "1.50.0",
-      "sha256": "077mr5xz2w90iik8r6jraip377dbily14rnkpc7njicqnnq1d6m7",
-      "depends": []
-    },
-    "etec16s": {
-      "name": "etec16s",
-      "version": "1.32.0",
-      "sha256": "0hlvvmgm42g0lzsb5kljdfs0fcdpwwz3b3h7x88szg7fzqlvainz",
-      "depends": ["Biobase", "metagenomeSeq"]
-    },
-    "ewceData": {
-      "name": "ewceData",
-      "version": "1.12.0",
-      "sha256": "1xk4i38a1yb3zx42hfh2b427y28103h2mpjvxa03fnwkl0lcb46j",
-      "depends": ["ExperimentHub"]
-    },
-    "faahKO": {
-      "name": "faahKO",
-      "version": "1.44.0",
-      "sha256": "0bd93q332m7agqgsfkgsp87wv5fx6g2qsgn2z2n0bfsn3vmjjzc4",
-      "depends": ["xcms"]
-    },
-    "fabiaData": {
-      "name": "fabiaData",
-      "version": "1.42.0",
-      "sha256": "1wzq802q1i52jh82yh9i2kdbya7qrmcjr646dc78vr6vng2k541s",
-      "depends": ["Biobase"]
-    },
-    "ffpeExampleData": {
-      "name": "ffpeExampleData",
-      "version": "1.42.0",
-      "sha256": "1dzrbqlgh114m4lvikp638bqmw0yq3rwz9bpb1cfbpqlyji97wx7",
-      "depends": ["lumi"]
-    },
-    "fibroEset": {
-      "name": "fibroEset",
-      "version": "1.46.0",
-      "sha256": "09lpn8s95rbbmv0zk3mg512ddxdv7gpp16hqyh7krsrfr9r8kjxs",
-      "depends": ["Biobase"]
-    },
-    "fission": {
-      "name": "fission",
-      "version": "1.24.0",
-      "sha256": "095fd01jd105826gpv038zwj7p4iz7drbm3gy6r0w329xlv4lpp2",
-      "depends": ["SummarizedExperiment"]
-    },
-    "flowPloidyData": {
-      "name": "flowPloidyData",
-      "version": "1.30.0",
-      "sha256": "1qlwv4v1mgxk444scdvmdpak0rpph51mc4al1qfbavd34l4yq6zc",
-      "depends": []
-    },
-    "flowWorkspaceData": {
-      "name": "flowWorkspaceData",
-      "version": "3.16.0",
-      "sha256": "11p2b85h8dmajj0pakmb7i4lr2rx9ghlm8sy3pa696hpqnszimjl",
-      "depends": []
-    },
-    "fourDNData": {
-      "name": "fourDNData",
-      "version": "1.4.0",
-      "sha256": "1lixqb8n99w0qwr6hi5sql2r84dnp4zc7lqd6lhj0mgpya85b5zr",
-      "depends": ["BiocFileCache", "GenomicRanges", "HiCExperiment", "IRanges", "S4Vectors"]
-    },
-    "frmaExampleData": {
-      "name": "frmaExampleData",
-      "version": "1.40.0",
-      "sha256": "1dgirbhamg53dmfwc76s5ivclxmy7sjhjm9crzwrj1bzl6056cr3",
-      "depends": []
-    },
-    "furrowSeg": {
-      "name": "furrowSeg",
-      "version": "1.32.0",
-      "sha256": "125wyqi4h7kkrhbcn4gknwlw6panian2hfsapwyqfxz0mg6ssg5z",
-      "depends": ["EBImage", "abind", "dplyr", "locfit", "tiff"]
-    },
-    "gDNAinRNAseqData": {
-      "name": "gDNAinRNAseqData",
-      "version": "1.4.0",
-      "sha256": "0wpv9p96qxnk22p7ili8ic4gr8p3wb6jfn4v9f0d4kn385vvfwyp",
-      "depends": ["BiocGenerics", "ExperimentHub", "RCurl", "Rsamtools", "XML"]
-    },
-    "gDRtestData": {
-      "name": "gDRtestData",
-      "version": "1.2.0",
-      "sha256": "0kdlqbs5qj6svnhsrhnsd644kcxyd8haws5h4djm4gplyx6vwqyj",
-      "depends": ["checkmate", "data_table"]
-    },
-    "gageData": {
-      "name": "gageData",
-      "version": "2.42.0",
-      "sha256": "1kbs0fz1jnx3grd9mpclbahwbp3749ipwfs8ggl9299bhjrgh9i6",
-      "depends": []
-    },
-    "gaschYHS": {
-      "name": "gaschYHS",
-      "version": "1.42.0",
-      "sha256": "01r25gx65a9lcjzbjm6gckzy3hyr70cxswxkvprsbphh7pkll3np",
-      "depends": ["Biobase"]
-    },
-    "gcspikelite": {
-      "name": "gcspikelite",
-      "version": "1.42.0",
-      "sha256": "0cphbkq13jknmzs6qyv3cj1m73a1wncnj7znjnymbc0ha7rwcd5i",
-      "depends": []
-    },
-    "geneLenDataBase": {
-      "name": "geneLenDataBase",
-      "version": "1.40.1",
-      "sha256": "0c8f0sqgrg7rc2vs9id9xzbwwv3zhy6ylqiisji20rw9ipzgv7k8",
-      "depends": ["GenomicFeatures", "rtracklayer", "txdbmaker"]
-    },
-    "genomationData": {
-      "name": "genomationData",
-      "version": "1.36.0",
-      "sha256": "16mghhik2xzin14d7mqlwfy2dah3ccnga947z9id44vyz906wws7",
-      "depends": []
-    },
-    "golubEsets": {
-      "name": "golubEsets",
-      "version": "1.46.0",
-      "sha256": "1rv5y7cj4rpdg8vl0qd3071d12rvgqcffqsf1gx8kmdgz13hi4gl",
-      "depends": ["Biobase"]
-    },
-    "gpaExample": {
-      "name": "gpaExample",
-      "version": "1.16.0",
-      "sha256": "0q87x5k8ql01k9m503k87wn5pkrygrilqrsb0aix7xjpxa8aia1n",
-      "depends": []
-    },
-    "grndata": {
-      "name": "grndata",
-      "version": "1.36.0",
-      "sha256": "1qkxpljvm9sipphgjygnrynbslyv5rlpvfy34q6w1rqhf6qv0n89",
-      "depends": []
-    },
-    "h5vcData": {
-      "name": "h5vcData",
-      "version": "2.24.0",
-      "sha256": "04ymiclfwwp68h8pzpxrfrb5x9njqknhyhihbcj4v51qzx0y4jid",
-      "depends": []
-    },
-    "hapmap100khind": {
-      "name": "hapmap100khind",
-      "version": "1.46.0",
-      "sha256": "0a8j45fxr3sm4q689v29n9gj60g21pk3ixhv7s9plig12ma7nfnz",
-      "depends": []
-    },
-    "hapmap100kxba": {
-      "name": "hapmap100kxba",
-      "version": "1.46.0",
-      "sha256": "1afvfh6mckyi575qlp579p1akya4q7h0c9zp28s7n5nyljmh572i",
-      "depends": []
-    },
-    "hapmap500knsp": {
-      "name": "hapmap500knsp",
-      "version": "1.46.0",
-      "sha256": "0lbrn02lyca76xk2h2iddxpkvsj2kvz37m1dn0l5pwbz6igpllqp",
-      "depends": []
-    },
-    "hapmap500ksty": {
-      "name": "hapmap500ksty",
-      "version": "1.46.0",
-      "sha256": "0lnzwdcjz5f9imqprkh9qxrakg8qdh3j83bq5qaaq54mdh76kd68",
-      "depends": []
-    },
-    "hapmapsnp5": {
-      "name": "hapmapsnp5",
-      "version": "1.46.0",
-      "sha256": "03pmlz3cskxf683dpdns258gh8rv33amzpvb9mabbg0jagg2b9lw",
-      "depends": []
-    },
-    "hapmapsnp6": {
-      "name": "hapmapsnp6",
-      "version": "1.46.0",
-      "sha256": "15npa8h6qpp1i0ir2y6knvzb5f4rn9zimyl6sw24ccqbvimjkf7f",
-      "depends": []
-    },
-    "harbChIP": {
-      "name": "harbChIP",
-      "version": "1.42.0",
-      "sha256": "1pliyvn6g3gbkiinz4q24ajmq0apw035a2c9xq6b91ccm8m7ddrk",
-      "depends": ["Biobase", "Biostrings", "IRanges"]
-    },
-    "healthyControlsPresenceChecker": {
-      "name": "healthyControlsPresenceChecker",
-      "version": "1.8.0",
-      "sha256": "14gq24z99l04kcn13414zjn17184l3p5l6draxwy3820m9sijzgq",
-      "depends": ["GEOquery", "geneExpressionFromGEO", "magrittr", "xml2"]
-    },
-    "healthyFlowData": {
-      "name": "healthyFlowData",
-      "version": "1.42.0",
-      "sha256": "01hq1nchjyzps5nvsvpgxrw1vds92fv0sggzlls21ggrjhyrx8kp",
-      "depends": ["flowCore"]
-    },
-    "hgu133abarcodevecs": {
-      "name": "hgu133abarcodevecs",
-      "version": "1.42.0",
-      "sha256": "1p9l32lhk5cvqfgxkk3bdz4s9dcyczh9b0a8rvb2cf6zz0i3l6fh",
-      "depends": []
-    },
-    "hgu133plus2CellScore": {
-      "name": "hgu133plus2CellScore",
-      "version": "1.24.0",
-      "sha256": "0akf6y1pwjiffhxgd2s01kmw4aylbfbh9hv8yyfvm3r72j07lbvs",
-      "depends": ["Biobase"]
-    },
-    "hgu133plus2barcodevecs": {
-      "name": "hgu133plus2barcodevecs",
-      "version": "1.42.0",
-      "sha256": "0d6jcyb1v58f1p76mng0l327v6i1cskrgcj4p2r9z2pjbgyicgq2",
-      "depends": []
-    },
-    "hgu2beta7": {
-      "name": "hgu2beta7",
-      "version": "1.44.0",
-      "sha256": "0wlkv4yppzg520zbhk7v19jfxbiran9di0bm10bfb9lizdszwd75",
-      "depends": []
-    },
-    "homosapienDEE2CellScore": {
-      "name": "homosapienDEE2CellScore",
-      "version": "1.0.0",
-      "sha256": "1vwasylfqv4xgmhkzykdwhlxh0kk4pl4bcndx5dpn7i386zp6chs",
-      "depends": ["BiocGenerics", "DESeq2", "ExperimentHub", "MatrixGenerics", "Rtsne", "S4Vectors", "SummarizedExperiment", "getDEE2"]
-    },
-    "humanStemCell": {
-      "name": "humanStemCell",
-      "version": "0.44.0",
-      "sha256": "0yr4z1j4xaxaby3ka9k6h5bshzn78ymp0ic0ycblbl6zzr0vzym2",
-      "depends": ["Biobase", "hgu133plus2_db"]
-    },
-    "imcdatasets": {
-      "name": "imcdatasets",
-      "version": "1.12.0",
-      "sha256": "135sffkn322g6zp6wz6ri2cg4wj9pwadmv4b6zaaxwximpx5xy04",
-      "depends": ["DelayedArray", "ExperimentHub", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "cytomapper"]
-    },
-    "kidpack": {
-      "name": "kidpack",
-      "version": "1.46.0",
-      "sha256": "0802kn1n9ivjil19faphg4z4iy0y7n1hmixd9bkfv7livfl8yn0b",
-      "depends": ["Biobase"]
-    },
-    "leeBamViews": {
-      "name": "leeBamViews",
-      "version": "1.40.0",
-      "sha256": "15prksw8pi302i8qpw3skwljyj3hfm9wld2lzpcgz7nnpzrqm8bc",
-      "depends": ["BSgenome", "Biobase", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"]
-    },
-    "leukemiasEset": {
-      "name": "leukemiasEset",
-      "version": "1.40.0",
-      "sha256": "0r5dmd9m8fcbdns3r1vsw4xmxdbjp5gf4klsb148rpgmp5avjar4",
-      "depends": ["Biobase"]
-    },
-    "lumiBarnes": {
-      "name": "lumiBarnes",
-      "version": "1.44.0",
-      "sha256": "0in8rkcg1r7mjq3fzhyc8446dc09b1mm371vd6l0x541sj7x4n50",
-      "depends": ["Biobase", "lumi"]
-    },
-    "lungExpression": {
-      "name": "lungExpression",
-      "version": "0.42.0",
-      "sha256": "1r4xn6r0vwnkfbi49gjrxgdscqdpwpfwzb61mrxa9m1hgjy1dr80",
-      "depends": ["Biobase"]
-    },
-    "lydata": {
-      "name": "lydata",
-      "version": "1.30.0",
-      "sha256": "1f13r5krfqc2f4gc03dxk8ajxlm62yxif03m0nx8lqxvijgm4abq",
-      "depends": []
-    },
-    "mCSEAdata": {
-      "name": "mCSEAdata",
-      "version": "1.24.0",
-      "sha256": "0364bvsx286nsnyp5mh2i7i71dpdlpgn0907hnpxck1hcw19npnn",
-      "depends": ["GenomicRanges"]
-    },
-    "macrophage": {
-      "name": "macrophage",
-      "version": "1.20.0",
-      "sha256": "11ydl4srfxbcqnb42kwk783xd74231g6vgp1f0qs3hl8slc1hk1w",
-      "depends": []
-    },
-    "mammaPrintData": {
-      "name": "mammaPrintData",
-      "version": "1.40.0",
-      "sha256": "1vna6vg7md9pl9hfrvbb4pi2rpnm0pm9l3ndh8ifdhqrz2vjhfpz",
-      "depends": []
-    },
-    "maqcExpression4plex": {
-      "name": "maqcExpression4plex",
-      "version": "1.48.0",
-      "sha256": "086pkn4x1nr7qqhawhyxdcrh9pnsqdpfgy07zxyf1i2by3b7b0v9",
-      "depends": []
-    },
-    "marinerData": {
-      "name": "marinerData",
-      "version": "1.4.0",
-      "sha256": "1blrqzi840vcvdslyxkljbc2ihbx7yvvfxmxcs2kq8590jagl425",
-      "depends": ["ExperimentHub"]
-    },
-    "mcsurvdata": {
-      "name": "mcsurvdata",
-      "version": "1.22.0",
-      "sha256": "1pf4vljmfbks31rdhb1088x2lyck5bj1a5ci1z6qam8yi4kzgh1y",
-      "depends": ["AnnotationHub", "Biobase", "ExperimentHub"]
-    },
-    "metaMSdata": {
-      "name": "metaMSdata",
-      "version": "1.40.0",
-      "sha256": "12x7p2jyzggjfb7v2ax9by5hly84jjkkm6fq3i2ycyryjl8f0p6s",
-      "depends": []
-    },
-    "methylclockData": {
-      "name": "methylclockData",
-      "version": "1.12.0",
-      "sha256": "1bwrgib7k71i4i6iq4l71n0z9adq3bg9k8j10bpi79ygn9169np5",
-      "depends": ["ExperimentHub", "ExperimentHubData"]
-    },
-    "miRNATarget": {
-      "name": "miRNATarget",
-      "version": "1.42.0",
-      "sha256": "1l8k9j7gwmg5ml68j0rj903im8q74ksanzfarwcx0hdxx4srsv2j",
-      "depends": ["Biobase"]
-    },
-    "miRcompData": {
-      "name": "miRcompData",
-      "version": "1.34.0",
-      "sha256": "17cg4j5lgn5wf0dcrb71sqf8amkjql5zgvjr85szxlzimkjykfyd",
-      "depends": []
-    },
-    "microRNAome": {
-      "name": "microRNAome",
-      "version": "1.26.0",
-      "sha256": "0ry0pi7gcdwgfij7sw96pv9krqyq1lx5n81c1prhla45q26w9zpc",
-      "depends": ["SummarizedExperiment"]
-    },
-    "microbiomeDataSets": {
-      "name": "microbiomeDataSets",
-      "version": "1.12.1",
-      "sha256": "1jc5xcf48xwa7m1g55z38mjnbsqj7gqzwdb37kg1q60rk6bj4mj2",
-      "depends": ["BiocGenerics", "Biostrings", "ExperimentHub", "MultiAssayExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape"]
-    },
-    "minfiData": {
-      "name": "minfiData",
-      "version": "0.50.0",
-      "sha256": "1myxv7cqh7d1rjav9qhwqsmw3s1xh3zm34vbxwprqaqg87dg4bw0",
-      "depends": ["IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "minfi"]
-    },
-    "minfiDataEPIC": {
-      "name": "minfiDataEPIC",
-      "version": "1.30.0",
-      "sha256": "1sgcw9gdlgk6dyzw61c0k2q26w7vzbqzyrl5qimx466x76knz4hj",
-      "depends": ["IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "minfi"]
-    },
-    "minionSummaryData": {
-      "name": "minionSummaryData",
-      "version": "1.34.0",
-      "sha256": "0mmj48c1djl026g7ckn5k7shvyy7xa0fp7nsavm15a8l4blbq1ri",
-      "depends": []
-    },
-    "mosaicsExample": {
-      "name": "mosaicsExample",
-      "version": "1.42.0",
-      "sha256": "0sy85jkl5z82a7y3fg8a1mfq5cpjq2c5arvwplz427rsi02ppqan",
-      "depends": []
-    },
-    "mouse4302barcodevecs": {
-      "name": "mouse4302barcodevecs",
-      "version": "1.42.0",
-      "sha256": "1bdcfbjpz60fldj8xq3hwgvdqmv5axc8cl2l57i4xk4piggah22r",
-      "depends": []
-    },
-    "msPurityData": {
-      "name": "msPurityData",
-      "version": "1.32.0",
-      "sha256": "0pbdx6pg3cdwx6qngn01w46bvvqv2hhyicgi39y182gbwliv0fxl",
-      "depends": []
-    },
-    "msd16s": {
-      "name": "msd16s",
-      "version": "1.24.0",
-      "sha256": "16ska3qh5bav3y891gz805pj638j4kx73izv8krpqgpycin719ar",
-      "depends": ["Biobase", "metagenomeSeq"]
-    },
-    "msdata": {
-      "name": "msdata",
-      "version": "0.44.0",
-      "sha256": "0g7mlgks3nfnfipnybs7pvsnmrvmq8888g39badca8pi73q1cm25",
-      "depends": []
-    },
-    "msigdb": {
-      "name": "msigdb",
-      "version": "1.12.0",
-      "sha256": "080wm9sjwqhaxqx1r3kly1bi1gvkssqpsadnvabx11w493356qr0",
-      "depends": ["AnnotationDbi", "AnnotationHub", "ExperimentHub", "GSEABase", "org_Hs_eg_db", "org_Mm_eg_db"]
-    },
-    "msqc1": {
-      "name": "msqc1",
-      "version": "1.32.0",
-      "sha256": "1wac6i792ndmv98rb3k7pz07q4l830yhkfs89ahlcalrah6m9cld",
-      "depends": ["lattice"]
-    },
-    "mtbls2": {
-      "name": "mtbls2",
-      "version": "1.34.0",
-      "sha256": "0bycprz32ihj7kzy5f31275sd4b855nd9vm34447x5y33wdiq9b9",
-      "depends": []
-    },
-    "muleaData": {
-      "name": "muleaData",
-      "version": "1.0.0",
-      "sha256": "0n5q0whp2fad980b72b9z85swkm8dc2r888javkzhb5c9sajz1w0",
-      "depends": []
-    },
-    "multiWGCNAdata": {
-      "name": "multiWGCNAdata",
-      "version": "1.2.0",
-      "sha256": "1hpm0hf8yh3308rlfcm5f9hi1mcwgcij1baikrx4nrwn7fgi30l3",
-      "depends": ["ExperimentHub"]
-    },
-    "muscData": {
-      "name": "muscData",
-      "version": "1.18.0",
-      "sha256": "1snpzvmxrpzspfl5gy18w2mcdpszq7wn2l3z1mbvjdp8ffh4qv00",
-      "depends": ["ExperimentHub", "SingleCellExperiment"]
-    },
-    "mvoutData": {
-      "name": "mvoutData",
-      "version": "1.40.0",
-      "sha256": "01rxr4867w2zcy4gmcg868g2xqal5vb4xw2izfmcwplxah5380wv",
-      "depends": ["Biobase", "affy", "lumi"]
-    },
-    "nanotubes": {
-      "name": "nanotubes",
-      "version": "1.20.0",
-      "sha256": "0gsgs0i3117753pxypr2q8pc3zc8bd3fkp5xj30jx142wvi4y0al",
-      "depends": []
-    },
-    "nullrangesData": {
-      "name": "nullrangesData",
-      "version": "1.10.0",
-      "sha256": "099ynygy9ld7ckzh38rf5nglx70mjwha0jz3ngn85ncnaz64cw26",
-      "depends": ["ExperimentHub", "GenomicRanges", "InteractionSet"]
-    },
-    "oct4": {
-      "name": "oct4",
-      "version": "1.20.0",
-      "sha256": "0q6q5zg33fxq9cjnxdbc53q4wqsqcgid8ax0z2b8sbyv86knj620",
-      "depends": []
-    },
-    "octad_db": {
-      "name": "octad.db",
-      "version": "1.6.0",
-      "sha256": "1n8zwjhf7s61gaqr1zs5gvc5l3xsbzilj38lpsh8k80y175msgbx",
-      "depends": ["ExperimentHub"]
-    },
-    "optimalFlowData": {
-      "name": "optimalFlowData",
-      "version": "1.16.0",
-      "sha256": "0b5r3hqs2pnj2s9qizrqpkkidq3r5ig75rmk1ygsppad0dl98qyh",
-      "depends": []
-    },
-    "orthosData": {
-      "name": "orthosData",
-      "version": "1.2.0",
-      "sha256": "000jqijl7mpp0qfgg0aqx7jzn5bviybp2ndxmikyn0rmcvi9057k",
-      "depends": ["AnnotationHub", "BiocFileCache", "ExperimentHub", "HDF5Array", "SummarizedExperiment", "stringr"]
-    },
-    "pRolocdata": {
-      "name": "pRolocdata",
-      "version": "1.42.0",
-      "sha256": "0drc8srg2frzjpq7j00pfr1371n0jiry5gz1rz2hbagcz2q51aad",
-      "depends": ["Biobase", "MSnbase"]
-    },
-    "parathyroidSE": {
-      "name": "parathyroidSE",
-      "version": "1.42.0",
-      "sha256": "183cyn1i0i2p8npajwmbwzr2ncrrzwgpvh8adhjxzrdqkn3qdnr5",
-      "depends": ["SummarizedExperiment"]
-    },
-    "pasilla": {
-      "name": "pasilla",
-      "version": "1.32.0",
-      "sha256": "0r5i64125qq5z4c8zliazsi68035d1bsz6ingzqdh37m8prdw1cr",
-      "depends": ["DEXSeq"]
-    },
-    "pasillaBamSubset": {
-      "name": "pasillaBamSubset",
-      "version": "0.42.0",
-      "sha256": "0q0wawb4hj45lm9z8h0q905dvmx13x25cv64qmm1nf0342m8gccn",
-      "depends": []
-    },
-    "pcxnData": {
-      "name": "pcxnData",
-      "version": "2.25.0",
-      "sha256": "1mlqkxlkqfb8x5jp2fdx5nfrpfh8g3lghfj6sqkaf958n5yl1dg3",
-      "depends": []
-    },
-    "pd_atdschip_tiling": {
-      "name": "pd.atdschip.tiling",
-      "version": "0.42.0",
-      "sha256": "17sf3x7mhkjk605hmc0idx1d3pbx49hyfaxzifkc6bq1mmq5113x",
-      "depends": ["Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "oligo", "oligoClasses"]
-    },
-    "pepDat": {
-      "name": "pepDat",
-      "version": "1.24.0",
-      "sha256": "01svdmjhijbmjypp9hzninmagjl24zk4kjigmrjiasfski8yjln5",
-      "depends": ["GenomicRanges"]
-    },
-    "plotgardenerData": {
-      "name": "plotgardenerData",
-      "version": "1.10.0",
-      "sha256": "14y5hh4r7j7kkbh7kl6wwh6xyva9pbqxzz4ch7dp7p0kj5kgh52s",
-      "depends": []
-    },
-    "prebsdata": {
-      "name": "prebsdata",
-      "version": "1.40.0",
-      "sha256": "0agdmcin4mqigrpm004wvaqd9ciy2kc7di1yiycgdnd4ccglhllk",
-      "depends": []
-    },
-    "preciseTADhub": {
-      "name": "preciseTADhub",
-      "version": "1.12.0",
-      "sha256": "0449ppjh29rwykf5i2c8f8sfy9s87p2kxgvylfa016x3g2gbnygw",
-      "depends": ["ExperimentHub"]
-    },
-    "prostateCancerCamcap": {
-      "name": "prostateCancerCamcap",
-      "version": "1.32.0",
-      "sha256": "03pfci7cx5r2lagfzi0j8b2ry9s6c211qamfqlqrx5siw0yxllrx",
-      "depends": ["Biobase"]
-    },
-    "prostateCancerGrasso": {
-      "name": "prostateCancerGrasso",
-      "version": "1.32.0",
-      "sha256": "11sl00lfi85gpwh2619w3z54vb0mw05bwcgdblg1c6wnrn17qd9h",
-      "depends": ["Biobase"]
-    },
-    "prostateCancerStockholm": {
-      "name": "prostateCancerStockholm",
-      "version": "1.32.0",
-      "sha256": "02kcm3wvz4wrdnn4cfna67gqx7p8765j4j0cl7x08j7qjlnsnq2z",
-      "depends": ["Biobase"]
-    },
-    "prostateCancerTaylor": {
-      "name": "prostateCancerTaylor",
-      "version": "1.32.0",
-      "sha256": "1ynjyrcp7d8ywzlfkv2909r1l3ihap4yiamq0jrqa27xh6lvpqfd",
-      "depends": ["Biobase"]
-    },
-    "prostateCancerVarambally": {
-      "name": "prostateCancerVarambally",
-      "version": "1.32.0",
-      "sha256": "1f0wzm4hlax0dcx3ibssiq1nmli8zhrp7b2r1znjs38v2p5skx53",
-      "depends": ["Biobase"]
-    },
-    "ptairData": {
-      "name": "ptairData",
-      "version": "1.12.0",
-      "sha256": "1w7j8zx0x0kihsv295l389vlxii72z22gyi2mhdfviyay7g4n2gd",
-      "depends": ["rhdf5", "signal"]
-    },
-    "pumadata": {
-      "name": "pumadata",
-      "version": "2.40.0",
-      "sha256": "0ryrlsfyc64kbcn6mhq5xv09n9dv58d6azhywx21kg01iayrmnvb",
-      "depends": ["Biobase", "oligo", "puma"]
-    },
-    "qPLEXdata": {
-      "name": "qPLEXdata",
-      "version": "1.22.0",
-      "sha256": "1a8mzbll0s9w82y4sy153jna6677sdpp3bfzs83qaqpnjymjzfpc",
-      "depends": ["MSnbase", "dplyr", "knitr", "qPLEXanalyzer"]
-    },
-    "rRDPData": {
-      "name": "rRDPData",
-      "version": "1.24.0",
-      "sha256": "030hnp9sghl0f2wfg243ll6myp9gr5zzbwlfzaz8m7q8xk2if363",
-      "depends": ["rRDP"]
-    },
-    "raerdata": {
-      "name": "raerdata",
-      "version": "1.2.0",
-      "sha256": "15j7sw3kvgqqb7m4y4kn40p8g8s1f204lfnb5zskkjfakj6c2j03",
-      "depends": ["BiocGenerics", "ExperimentHub", "Rsamtools", "SingleCellExperiment", "rtracklayer"]
-    },
-    "rcellminerData": {
-      "name": "rcellminerData",
-      "version": "2.26.0",
-      "sha256": "1al3v586q2ak77hjbl3xlvrxqs3xid8y06lf601c5diyrd7vp7r7",
-      "depends": ["Biobase"]
-    },
-    "restfulSEData": {
-      "name": "restfulSEData",
-      "version": "1.26.0",
-      "sha256": "17ia2d5g0zawfpcqvpncw05qshhn09p05j2frxmz0mwjfp7mya27",
-      "depends": ["DelayedArray", "ExperimentHub", "HDF5Array", "SummarizedExperiment"]
-    },
-    "rheumaticConditionWOLLBOLD": {
-      "name": "rheumaticConditionWOLLBOLD",
-      "version": "1.42.0",
-      "sha256": "0s75faby72cv6i1y1mj5d3qfvfp6907jinnfm17zvgdvcl0xx06h",
-      "depends": []
-    },
-    "sampleClassifierData": {
-      "name": "sampleClassifierData",
-      "version": "1.28.0",
-      "sha256": "0bjncqk3h11gcsg8zp64f22xjsbgr20dqangg7h84d9m0rr6x0kg",
-      "depends": ["SummarizedExperiment"]
-    },
-    "scATAC_Explorer": {
-      "name": "scATAC.Explorer",
-      "version": "1.10.0",
-      "sha256": "0s2w9b9bb1bzqnlhlrgvp17bifhryvymzaid02ypkqaql06d6nyx",
-      "depends": ["BiocFileCache", "Matrix", "S4Vectors", "SingleCellExperiment", "data_table"]
-    },
-    "scMultiome": {
-      "name": "scMultiome",
-      "version": "1.4.1",
-      "sha256": "0rgcg8qhpap7wnlndf9bmild55yxv21zdn89hs5h1503rfchlx2d",
-      "depends": ["AnnotationHub", "AzureStor", "DelayedArray", "ExperimentHub", "GenomicRanges", "HDF5Array", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "rhdf5"]
-    },
-    "scRNAseq": {
-      "name": "scRNAseq",
-      "version": "2.18.0",
-      "sha256": "0jsq037ba4xsb3bwwf021jw2hqv30vb5nrjag97xadx75z5fzqlr",
-      "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "DBI", "DelayedArray", "ExperimentHub", "GenomicFeatures", "GenomicRanges", "Matrix", "RSQLite", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_sce", "ensembldb", "gypsum", "jsonlite"]
-    },
-    "scTHI_data": {
-      "name": "scTHI.data",
-      "version": "1.16.0",
-      "sha256": "03zixwlainshb8q3jsb6w9vah790vq17p742fpa2h8f0vcamqxa4",
-      "depends": []
-    },
-    "scaeData": {
-      "name": "scaeData",
-      "version": "1.0.0",
-      "sha256": "0ghd2qyc9kz2d0g0whdy7cpys7j265iq9w7a02mnfwk8s0vplrk5",
-      "depends": ["ExperimentHub"]
-    },
-    "scanMiRData": {
-      "name": "scanMiRData",
-      "version": "1.10.0",
-      "sha256": "1h7bla3l5mmydwz6pgq6ja560r02i741k0259f3a5lf07y4rdab6",
-      "depends": ["scanMiR"]
-    },
-    "scpdata": {
-      "name": "scpdata",
-      "version": "1.12.0",
-      "sha256": "1mn3a27wmdsn582v6ajavn2fxqqqlv79zyy40zfg6pnza19izpbx",
-      "depends": ["AnnotationHub", "ExperimentHub", "QFeatures", "S4Vectors", "SingleCellExperiment"]
-    },
-    "seq2pathway_data": {
-      "name": "seq2pathway.data",
-      "version": "1.36.0",
-      "sha256": "0i45qxvbirh4l048a2hzk9iahydsgk6az0yjlfsypa0zq6hcz3cj",
-      "depends": []
-    },
-    "seqc": {
-      "name": "seqc",
-      "version": "1.38.0",
-      "sha256": "0g1zwzm38xqdpzfhpbwlw8zcdl8lvyd7pfncgwk7y50w1mblxqah",
-      "depends": ["Biobase"]
-    },
-    "serumStimulation": {
-      "name": "serumStimulation",
-      "version": "1.40.0",
-      "sha256": "1lkwx3gc7c6scznaf1z62szi4mb944dg1jprp8zlmm51a73w9kp9",
-      "depends": []
-    },
-    "sesameData": {
-      "name": "sesameData",
-      "version": "1.22.0",
-      "sha256": "05k67isysszzfkkbi811dkab0cmxnwz81p2ldcqz3gsq5qin3p1g",
-      "depends": ["AnnotationHub", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "readr", "stringr"]
-    },
-    "seventyGeneData": {
-      "name": "seventyGeneData",
-      "version": "1.40.0",
-      "sha256": "0yy9pywbr5fjkjc2gaaf8cfw5q2barw1a3yin99a7sphq062lfvj",
-      "depends": []
-    },
-    "shinyMethylData": {
-      "name": "shinyMethylData",
-      "version": "1.24.0",
-      "sha256": "17l63xmdi6zhaqggw45nhpiclag96xjbkngmcqhihfykkrgbb18p",
-      "depends": []
-    },
-    "signatureSearchData": {
-      "name": "signatureSearchData",
-      "version": "1.18.0",
-      "sha256": "11y1dbixj9b91whzq4lrmad5f4f6gqdv70ar4rg20ql1699dx5l5",
-      "depends": ["Biobase", "ExperimentHub", "R_utils", "affy", "dplyr", "limma", "magrittr", "rhdf5"]
-    },
-    "simpIntLists": {
-      "name": "simpIntLists",
-      "version": "1.40.0",
-      "sha256": "03d7whna1h2ffgci060gqfdwbjwmjg6q3yfd8l6vc25kiblc4igp",
-      "depends": []
-    },
-    "smokingMouse": {
-      "name": "smokingMouse",
-      "version": "1.2.0",
-      "sha256": "1z3kbmlqylmaingkcdm6wxlx848zipqfh6kha7f55s6aklgcv5d7",
-      "depends": []
-    },
-    "spatialDmelxsim": {
-      "name": "spatialDmelxsim",
-      "version": "1.10.0",
-      "sha256": "172hgg2wxjc32950lga8fqwygd6x07i0ilsvfp46sd7nmysy6cpn",
-      "depends": ["ExperimentHub", "SummarizedExperiment"]
-    },
-    "spatialLIBD": {
-      "name": "spatialLIBD",
-      "version": "1.16.2",
-      "sha256": "0bbwh9mfz7iscv8a1jlc7g1c452hv4qr95hwv3z6h2mqf8pcr5g8",
-      "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "DT", "ExperimentHub", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "benchmarkme", "cowplot", "edgeR", "fields", "ggplot2", "golem", "jsonlite", "limma", "magick", "paletteer", "plotly", "png", "rlang", "rtracklayer", "scater", "scuttle", "sessioninfo", "shiny", "shinyWidgets", "statmod", "tibble", "viridisLite"]
-    },
-    "spqnData": {
-      "name": "spqnData",
-      "version": "1.16.0",
-      "sha256": "047dbhcfqs0zddmnfpabpjhym86m5zlxnwccidkx0b131wxb22gv",
-      "depends": ["SummarizedExperiment"]
-    },
-    "stemHypoxia": {
-      "name": "stemHypoxia",
-      "version": "1.40.0",
-      "sha256": "0i8rvz2l6hgzd4zcmfzszjck0riy2m34qf2nidrxx6bjza4iqwpy",
-      "depends": []
-    },
-    "synapterdata": {
-      "name": "synapterdata",
-      "version": "1.42.0",
-      "sha256": "0p6rrnqvdifrajil2akjvrzjm1k7gyywspg5cb5p2k62lyz0f06k",
-      "depends": ["synapter"]
-    },
-    "systemPipeRdata": {
-      "name": "systemPipeRdata",
-      "version": "2.8.0",
-      "sha256": "131p4s5cgm75f32a5dzyj059aznxjcy76h7h8dbccblqlqxgx1ix",
-      "depends": ["BiocGenerics", "Biostrings", "jsonlite", "remotes"]
-    },
-    "tartare": {
-      "name": "tartare",
-      "version": "1.18.0",
-      "sha256": "1wxq6sfzdah29ql9q7w3d35x7bf1bh1417ih55rg07qbs8cnxb9v",
-      "depends": ["AnnotationHub", "ExperimentHub"]
-    },
-    "timecoursedata": {
-      "name": "timecoursedata",
-      "version": "1.14.0",
-      "sha256": "0wjfc5awj4spvwwj3mp1bn3dqngjdnfz7bnlv7azqxmnd4q72ckr",
-      "depends": ["SummarizedExperiment"]
-    },
-    "tinesath1cdf": {
-      "name": "tinesath1cdf",
-      "version": "1.42.0",
-      "sha256": "0anb8n6kni2i56rhhd6wlvq7am6jifiqfmm6v54yh96i2m3gsbq9",
-      "depends": []
-    },
-    "tinesath1probe": {
-      "name": "tinesath1probe",
-      "version": "1.42.0",
-      "sha256": "0jcjzgazj3z4ls2b0mhi15n1vh4adxv2ysm6x3r8w4a4hzm4gnmg",
-      "depends": ["AnnotationDbi"]
-    },
-    "tissueTreg": {
-      "name": "tissueTreg",
-      "version": "1.24.0",
-      "sha256": "0wv7hlq4v69gwypg9lvkcxf7w191iq8j5rzh2gqvg25ajxhm0bwl",
-      "depends": []
-    },
-    "tofsimsData": {
-      "name": "tofsimsData",
-      "version": "1.32.0",
-      "sha256": "02svkikiw72lpnsm3w333py7gwc52qi3qina215rp7fknrsqrw07",
-      "depends": []
-    },
-    "topdownrdata": {
-      "name": "topdownrdata",
-      "version": "1.26.0",
-      "sha256": "13vcis52fadfpahw31v2z3p2q47d4yp7yl719mibkwga9iyklgva",
-      "depends": ["topdownr"]
-    },
-    "tuberculosis": {
-      "name": "tuberculosis",
-      "version": "1.10.0",
-      "sha256": "1l9gm8jlvall905053mmbn0wd053ssnsxy74gza37w669il85awn",
-      "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "SummarizedExperiment", "dplyr", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
-    },
-    "tweeDEseqCountData": {
-      "name": "tweeDEseqCountData",
-      "version": "1.42.0",
-      "sha256": "01cgv28yyqjg8f86dskafb3xy4ylcl4schcad44f9jpvc6zk48qs",
-      "depends": ["Biobase"]
-    },
-    "tximportData": {
-      "name": "tximportData",
-      "version": "1.32.0",
-      "sha256": "15wy0dhs9sbz27ii64b4i0zxlsm6v75m2f32gisdy9f6gnbgwkjg",
-      "depends": []
-    },
-    "vulcandata": {
-      "name": "vulcandata",
-      "version": "1.26.0",
-      "sha256": "13cdb630w1xy734h15dgpzzk64g1rpr5xwh9q2hvs1z3ljyws8qd",
-      "depends": []
-    },
-    "xcoredata": {
-      "name": "xcoredata",
-      "version": "1.8.0",
-      "sha256": "0sn3h2c0h9jpdp17jcxskcqjy31vx6wz2d5xb98ag19cfbimv3nl",
-      "depends": ["ExperimentHub"]
-    },
-    "yeastCC": {
-      "name": "yeastCC",
-      "version": "1.44.0",
-      "sha256": "1y3k3dvxrv68pcsdqhyvhxvwnmhm0iv7yr3rc6b0gm8g2nv9kcqm",
-      "depends": ["Biobase"]
-    },
-    "yeastExpData": {
-      "name": "yeastExpData",
-      "version": "0.50.0",
-      "sha256": "1ila3h87j9l37nvwhabrayxawx3mcklhlr3y9cqzpwkg7iayrplf",
-      "depends": ["graph"]
-    },
-    "yeastGSData": {
-      "name": "yeastGSData",
-      "version": "0.42.0",
-      "sha256": "1m3hrjmibmp8zzcc6acg6m21zq83rpnclya4ivivj60nw6ardbkr",
-      "depends": []
-    },
-    "yeastNagalakshmi": {
-      "name": "yeastNagalakshmi",
-      "version": "1.40.0",
-      "sha256": "16n48lcyl63cmlc796xizf19rmm5qmdic0msaadz12wh743phh3a",
-      "depends": []
-    },
-    "yeastRNASeq": {
-      "name": "yeastRNASeq",
-      "version": "0.42.0",
-      "sha256": "1jk6451ypys3xskmlm6xpvjxxzrx1g0hnzfcsahf3gqgg63pfj7h",
-      "depends": []
-    },
-    "zebrafishRNASeq": {
-      "name": "zebrafishRNASeq",
-      "version": "1.24.1",
-      "sha256": "0khmilw21jnq2ivl7bh7fwz9nxlphljl5fh4w28q9gzydrv0vxci",
-      "depends": []
-    },
-    "ABAData": {
-      "name": "ABAData",
-      "version": "1.24.0",
-      "sha256": "1wgniq7ibvjj6dx63ixr3i5yclqmg94qpifzfbzzn9yjj3wnikzr",
-      "depends": [],
+      "depends": ["DECIPHER"],
       "broken": true
     },
     "ChIC_data": {
@@ -2597,27 +2598,55 @@
       "depends": ["caret", "genomeIntervals", "randomForest"],
       "broken": true
     },
+    "CopyNumber450kData": {
+      "name": "CopyNumber450kData",
+      "version": "1.6.0",
+      "sha256": "1scg0mij4rpgb4sfk7fzrd3yxryglnj94gv5dgj6k2gw1551xiyh",
+      "depends": ["IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "minfi"],
+      "broken": true
+    },
     "DREAM4": {
       "name": "DREAM4",
-      "version": "1.31.0",
-      "sha256": "11ypc84agvq0q0v7bk0b25cm48awxay5hhhjd95gw9s7jk196i2p",
+      "version": "1.6.0",
+      "sha256": "1plla7jzqarwcanyb2ss330y9ssmrr6ka6fa6040r1z0y64c12qj",
       "depends": ["SummarizedExperiment"],
       "broken": true
     },
+    "FunciSNP_data": {
+      "name": "FunciSNP.data",
+      "version": "1.6.0",
+      "sha256": "15f3b6p5gr25pfrnzsd90w9dnajryia66scpd4jfrws8jagccszq",
+      "depends": ["IRanges", "rtracklayer"],
+      "broken": true
+    },
+    "GGdata": {
+      "name": "GGdata",
+      "version": "1.8.0",
+      "sha256": "1r2kshwi8iajk0rwzkccdw389ffvkzivg82f4bri3xw0sq57fm50",
+      "depends": ["AnnotationDbi", "Biobase", "GGBase", "illuminaHumanv1_db", "snpStats"],
+      "broken": true
+    },
     "MAQCsubsetAFX": {
       "name": "MAQCsubsetAFX",
-      "version": "1.30.0",
-      "sha256": "14mwg96g7aza81vc3hpmb41scmygl8vnsi6s8p48c8v92106asmb",
-      "depends": ["affy", "Biobase"],
+      "version": "1.8.0",
+      "sha256": "0kp9p51v0c3025d74gx64qpyxhgc0rrdp5li0x2jvihyjgd1wz4r",
+      "depends": ["Biobase", "affy"],
       "broken": true
     },
     "MAQCsubsetILM": {
       "name": "MAQCsubsetILM",
-      "version": "1.40.0",
-      "sha256": "1bb158bmy7195wnj0wap08g621xbzflvj30pv4l7mwc54lm1vqfx",
+      "version": "1.8.0",
+      "sha256": "0a9mihv039f45n6h8isc834nmckcxhailah5lqmgca6lz7hclnpf",
       "depends": ["Biobase", "lumi"],
       "broken": true
     },
+    "MEALData": {
+      "name": "MEALData",
+      "version": "1.0.0",
+      "sha256": "19k7fppx41v3lwrbm13d9wni7z1hjaxms14aap00ffwpwzs6f0z5",
+      "depends": [],
+      "broken": true
+    },
     "MIGSAdata": {
       "name": "MIGSAdata",
       "version": "1.24.0",
@@ -2625,6 +2654,20 @@
       "depends": [],
       "broken": true
     },
+    "MMAPPR2data": {
+      "name": "MMAPPR2data",
+      "version": "1.18.0",
+      "sha256": "0rbi0psjwk0jgjpliv0hhjvq9wmwb8w4wgqw45wqba6qfpm70wya",
+      "depends": ["Rsamtools"],
+      "broken": true
+    },
+    "MSBdata": {
+      "name": "MSBdata",
+      "version": "0.8.0",
+      "sha256": "10yngdppq6706jmvd8i00l01mva8757aavfmz8mmvcyi5cggz200",
+      "depends": [],
+      "broken": true
+    },
     "MSstatsBioData": {
       "name": "MSstatsBioData",
       "version": "1.13.0",
@@ -2632,6 +2675,27 @@
       "depends": [],
       "broken": true
     },
+    "Mulder2012": {
+      "name": "Mulder2012",
+      "version": "0.10.0",
+      "sha256": "1dlk8nrvpfk4byii5yssss016yz3qc8ndldgj44p97bqs4nfnjb4",
+      "depends": ["HTSanalyzeR", "KEGG_db", "MASS", "PANR", "RedeR", "igraph", "org_Hs_eg_db", "pvclust"],
+      "broken": true
+    },
+    "RIPSeekerData": {
+      "name": "RIPSeekerData",
+      "version": "1.6.0",
+      "sha256": "1z0dbjid7fj9zixi3nyx9cjzmxhc684wsfglkd937a248s7f402f",
+      "depends": ["RIPSeeker"],
+      "broken": true
+    },
+    "RLHub": {
+      "name": "RLHub",
+      "version": "1.9.0",
+      "sha256": "0hm3wplzmmzsygz8dalwf6y798p4g2bssjdsg51w17s2mgm4hl98",
+      "depends": ["AnnotationHub", "ExperimentHub"],
+      "broken": true
+    },
     "RNASeqRData": {
       "name": "RNASeqRData",
       "version": "1.16.0",
@@ -2639,6 +2703,13 @@
       "depends": [],
       "broken": true
     },
+    "RnaSeqTutorial": {
+      "name": "RnaSeqTutorial",
+      "version": "0.8.0",
+      "sha256": "0xqzzrgw759kh9had1iav2ffvvdbpf83f8wvpxwb3djpikaxh8s7",
+      "depends": ["easyRNASeq"],
+      "broken": true
+    },
     "SCATEData": {
       "name": "SCATEData",
       "version": "1.10.0",
@@ -2662,22 +2733,190 @@
     },
     "ccTutorial": {
       "name": "ccTutorial",
-      "version": "1.40.0",
-      "sha256": "1rqblyk7389xqwzvib2xjyjrc8l3qd2g8z9vj96mrfyr8dpccjjs",
-      "depends": ["affy", "Biobase", "Ringo", "topGO"],
+      "version": "1.8.0",
+      "sha256": "0lvsl9127djdrkpk5c4n570sr06yj5x24lfbhrvy4jk8qa4g1qx3",
+      "depends": ["Biobase", "Ringo", "affy", "topGO"],
+      "broken": true
+    },
+    "ceu1kg": {
+      "name": "ceu1kg",
+      "version": "0.8.0",
+      "sha256": "1cm2myjmrn2kiwgfjpkslz0s6l8qvs8g3y0jbfckp31sd1211kkh",
+      "depends": ["Biobase", "GGBase", "GGtools"],
+      "broken": true
+    },
+    "ceu1kgv": {
+      "name": "ceu1kgv",
+      "version": "0.12.0",
+      "sha256": "165qp5cfs87ds7sx525fpj5cwisl4520b911l0xxmgcvhz6gjyi5",
+      "depends": ["Biobase", "GGBase"],
+      "broken": true
+    },
+    "ceuhm3": {
+      "name": "ceuhm3",
+      "version": "0.8.0",
+      "sha256": "10plz831m2vynwn5x4kh93iwcwkn6x39q9qg25lvlrj8j3mqgjmg",
+      "depends": ["Biobase", "GGBase", "GGtools"],
+      "broken": true
+    },
+    "cgdv17": {
+      "name": "cgdv17",
+      "version": "0.8.0",
+      "sha256": "0wjx4072gpsv6w1x7d5q0qya0ism5xw13zl8d1m49jhszk2kns1j",
+      "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "VariantAnnotation"],
+      "broken": true
+    },
+    "charmData": {
+      "name": "charmData",
+      "version": "1.6.0",
+      "sha256": "0qy3dcx745diza5xy6f1qipnnawqx20vp6p0piy9wvwvgalcx886",
+      "depends": ["charm", "pd_charm_hg18_example"],
+      "broken": true
+    },
+    "cheung2010": {
+      "name": "cheung2010",
+      "version": "0.8.0",
+      "sha256": "0qrq5k8gpsvqv5vhq67lgql69x7gqsqyfrs87ih8jir1nhgyrmzy",
+      "depends": ["AnnotationDbi", "Biobase", "GGtools", "GenomicRanges", "hgfocus_db"],
+      "broken": true
+    },
+    "curatedCRCData": {
+      "name": "curatedCRCData",
+      "version": "2.2.0",
+      "sha256": "0p4jgmg3234siglzf1klzq70vgrsnxcz4w2fw16h34m7jkrhiqas",
+      "depends": ["BiocGenerics", "nlme"],
+      "broken": true
+    },
+    "dsQTL": {
+      "name": "dsQTL",
+      "version": "0.8.0",
+      "sha256": "0qh73b5xbrcdmp3kszykiqiha8s40r0npsajc1h0m7xh26b81d90",
+      "depends": ["Biobase", "GGBase", "SummarizedExperiment"],
+      "broken": true
+    },
+    "encoDnaseI": {
+      "name": "encoDnaseI",
+      "version": "0.8.0",
+      "sha256": "1n6n5jfaqh1gr19grvxkpbs30314s524wfy6ppfqczxw00yrsvqk",
+      "depends": ["Biobase", "GGBase", "GGtools", "lattice"],
+      "broken": true
+    },
+    "facopy_annot": {
+      "name": "facopy.annot",
+      "version": "0.104.0",
+      "sha256": "139wd2w7mmrwi69h5mlf73zs3zaqr0kcjv116pd2r7b1dryla9y5",
+      "depends": [],
+      "broken": true
+    },
+    "facsDorit": {
+      "name": "facsDorit",
+      "version": "1.12.0",
+      "sha256": "0dlbjvzalixpxcxwls6wrlzz4lrmsxs23g1yvin940al9hli612d",
+      "depends": ["prada"],
+      "broken": true
+    },
+    "flowFitExampleData": {
+      "name": "flowFitExampleData",
+      "version": "1.6.0",
+      "sha256": "0ngq0khy7f7w41mj89fdrrd5lpxznnxg53x6zfgc6mx0vm1q13ak",
+      "depends": ["flowCore"],
       "broken": true
     },
     "gatingMLData": {
       "name": "gatingMLData",
-      "version": "2.38.0",
-      "sha256": "1dhm48nrh1y0x6p50045cn6f21bg35i0b4z7bjymn9aw0n9r5fyk",
+      "version": "2.10.0",
+      "sha256": "1ql5s1p4phhcc9lh3knrgnazkpxlxhvwpvxi0d978g6mjlbbprs2",
+      "depends": [],
+      "broken": true
+    },
+    "geuvPack": {
+      "name": "geuvPack",
+      "version": "1.2.0",
+      "sha256": "17wy3fkwq16kg3zcm30b06p0a6xwpjbjqrd2rz42ypw7d7danc3h",
+      "depends": ["SummarizedExperiment"],
+      "broken": true
+    },
+    "geuvStore": {
+      "name": "geuvStore",
+      "version": "1.2.0",
+      "sha256": "14xm3d808mzbvjliazn2rzz9l98b44h4x4s50ass2mfr470k79fs",
+      "depends": ["BatchJobs", "GenomicRanges", "gQTLBase"],
+      "broken": true
+    },
+    "ggtut": {
+      "name": "ggtut",
+      "version": "0.7.0",
+      "sha256": "0vpqzanzx3mwaz0dz29s5k9l0nly004sn3f5rjx7z8ww67ka4ii6",
+      "depends": ["ChIPpeakAnno", "GGdata", "GGtools", "GenomicFeatures", "GenomicRanges", "Rsamtools", "SNPlocs_Hsapiens_dbSNP_20120608", "cheung2010", "ff", "hmyriB36", "snpStats"],
+      "broken": true
+    },
+    "gskb": {
+      "name": "gskb",
+      "version": "1.2.0",
+      "sha256": "0b2vd4vn1khk4cd3pdcxwbd26srk3w3zdlk864vhgha5n9wb89kb",
+      "depends": [],
+      "broken": true
+    },
+    "hmyriB36": {
+      "name": "hmyriB36",
+      "version": "1.6.0",
+      "sha256": "033afw26ng2vc0fj3ipljmrq8vm0q5nbr7gh78i5vmpnkh4d5wgp",
+      "depends": ["Biobase", "GGBase"],
+      "broken": true
+    },
+    "ind1KG": {
+      "name": "ind1KG",
+      "version": "0.8.0",
+      "sha256": "10yiqj0c4vclblblkr0hwair1hyyrlp5z81y72vcjgv4wkfmxsbk",
+      "depends": ["chopsticks"],
+      "broken": true
+    },
+    "iontreeData": {
+      "name": "iontreeData",
+      "version": "1.6.0",
+      "sha256": "1bl2f2kk930bry8ibl3234s3ijszxfm0xhcqjay771xcfhf9c14q",
       "depends": [],
       "broken": true
     },
     "mAPKLData": {
       "name": "mAPKLData",
-      "version": "1.34.0",
-      "sha256": "0vhysi7wyw7d3vbq4qcq3i3ic953awppg2bix40ywz1459b5p43g",
+      "version": "1.2.0",
+      "sha256": "03x2yzpr6xr19k7kk52x6zlpjkfjhhfly1xsvdijrma6dc0rzg8a",
+      "depends": [],
+      "broken": true
+    },
+    "mitoODEdata": {
+      "name": "mitoODEdata",
+      "version": "1.6.0",
+      "sha256": "07dpak6jdw7mz5jjnysyg82wikjxnk8z4wngfhdfzl0wxg23pbzx",
+      "depends": [],
+      "broken": true
+    },
+    "pcaGoPromoter_Hs_hg19": {
+      "name": "pcaGoPromoter.Hs.hg19",
+      "version": "1.6.0",
+      "sha256": "1kzl95mw08162widlycg3g1230c2dsf3cbvai1pb6sc4s1sb5m1k",
+      "depends": [],
+      "broken": true
+    },
+    "pcaGoPromoter_Mm_mm9": {
+      "name": "pcaGoPromoter.Mm.mm9",
+      "version": "1.6.0",
+      "sha256": "0h6yg6glzsncq7k72vn3l8gxihs3r3kq7420c0sqbp2pljkcycn7",
+      "depends": [],
+      "broken": true
+    },
+    "pcaGoPromoter_Rn_rn4": {
+      "name": "pcaGoPromoter.Rn.rn4",
+      "version": "1.6.0",
+      "sha256": "087fq848yyq5vl1sv5984qwbjk7navdx82gqwq4446035cv409x5",
+      "depends": [],
+      "broken": true
+    },
+    "pcxnData": {
+      "name": "pcxnData",
+      "version": "2.25.0",
+      "sha256": "1mlqkxlkqfb8x5jp2fdx5nfrpfh8g3lghfj6sqkaf958n5yl1dg3",
       "depends": [],
       "broken": true
     },
@@ -2690,8 +2929,8 @@
     },
     "ppiData": {
       "name": "ppiData",
-      "version": "0.34.0",
-      "sha256": "10xbp12wim5kj1h2vkxn9x22fd92s2038w653y81jwbh2hyidybf",
+      "version": "0.8.0",
+      "sha256": "09f14jlrbc9pqna1a5lhd9l32m4jhjgghhdczlc7kni75mzsb7ii",
       "depends": ["AnnotationDbi", "graph"],
       "broken": true
     },
@@ -2702,17 +2941,24 @@
       "depends": ["ExperimentHub"],
       "broken": true
     },
+    "restfulSEData": {
+      "name": "restfulSEData",
+      "version": "1.26.0",
+      "sha256": "17ia2d5g0zawfpcqvpncw05qshhn09p05j2frxmz0mwjfp7mya27",
+      "depends": ["DelayedArray", "ExperimentHub", "HDF5Array", "SummarizedExperiment"],
+      "broken": true
+    },
     "seqCNA_annot": {
       "name": "seqCNA.annot",
-      "version": "1.38.0",
-      "sha256": "0kzmn5hx8ag02pz8b78cq7dbalw2w60y441cjyyvxjgycwcfvmvj",
+      "version": "1.6.0",
+      "sha256": "1avgc0qm26r18pxrdm3fp2wrqzcapind4cb88d4z4v2gmp8y04sh",
       "depends": [],
       "broken": true
     },
     "stjudem": {
       "name": "stjudem",
-      "version": "1.42.0",
-      "sha256": "0pcvvvaqalr5jklqy7vzxkp0cd9nj9dk941drgr7ndbqc2navz2c",
+      "version": "1.10.0",
+      "sha256": "18k39mj374c2lfvjkvnzmm2phnisq8dxmsg0jgarzwqxc6740xak",
       "depends": [],
       "broken": true
     },
@@ -2722,6 +2968,20 @@
       "sha256": "1kmh4iyh2h7vc1mlwb3sridn4nwkqdschz5md5dk53mxkn2wxcmi",
       "depends": ["bsseq", "ExperimentHub", "knitr"],
       "broken": true
+    },
+    "waveTilingData": {
+      "name": "waveTilingData",
+      "version": "1.6.0",
+      "sha256": "0xx60f6gvcqvj6m5wqh7mjcf0skbzz5w5bchcalmhgy56l7229a1",
+      "depends": [],
+      "broken": true
+    },
+    "yri1kgv": {
+      "name": "yri1kgv",
+      "version": "0.12.0",
+      "sha256": "07lmji9sljscwqd96bcllwc3hqzrl8mwj9z7fc6kjaam491iz09f",
+      "depends": ["Biobase", "GGBase"],
+      "broken": true
     }
   }
 }
diff --git a/pkgs/development/r-modules/bioc-packages.json b/pkgs/development/r-modules/bioc-packages.json
index 12ddee64deee..4ed57f6c46c1 100644
--- a/pkgs/development/r-modules/bioc-packages.json
+++ b/pkgs/development/r-modules/bioc-packages.json
@@ -1,13351 +1,13339 @@
 {
   "extraArgs": {
-    "biocVersion": "3.19"
+    "biocVersion": "3.20"
   },
   "packages": {
     "ABSSeq": {
       "name": "ABSSeq",
-      "version": "1.58.0",
-      "sha256": "0zqb2w055x4whgl3mljarsnps6lkz90fwlx2lnirbnrgmlnalwjz",
+      "version": "1.60.0",
+      "sha256": "02yypkrvd2gbclcddjvw5zdl4crh286ifddxj5cix1d4hhas1gc4",
       "depends": ["limma", "locfit"]
     },
     "ABarray": {
       "name": "ABarray",
-      "version": "1.72.0",
-      "sha256": "1kfqq4df55pxl7gnwf24aaryxijym4gzqfjyif28arlbjci9hlv6",
+      "version": "1.74.0",
+      "sha256": "0iay7aai5ijg0ai42mz4sks6qvndy69hdwavy5qvbhgfsgbdpmxv",
       "depends": ["Biobase", "multtest"]
     },
     "ACE": {
       "name": "ACE",
-      "version": "1.22.0",
-      "sha256": "1gpn9z09cfcy2mj7m32xfb2bjjwl01g9qn9nqaivmqbi4k6icrr8",
+      "version": "1.24.0",
+      "sha256": "0ky6l0x5wbwil0lqnclgfpdhn94954k62xpv0z3mhy4lvqf07h4j",
       "depends": ["Biobase", "GenomicRanges", "QDNAseq", "ggplot2"]
     },
     "ACME": {
       "name": "ACME",
-      "version": "2.60.0",
-      "sha256": "0jak83dlavhczaa2nqk5g2l0h4grnc9v24bg6v9mjfn6bqhl1s7j",
+      "version": "2.62.0",
+      "sha256": "05lvljiq3wgn0xqax8nhrsfwfxkslch9fyzk8v7qdvi72j0j3g9b",
       "depends": ["Biobase", "BiocGenerics"]
     },
     "ADAM": {
       "name": "ADAM",
-      "version": "1.20.0",
-      "sha256": "0z0rmpwfhd8p6c4zscviwsningsm740r3pb95cl8brasfdg1kl3v",
+      "version": "1.22.0",
+      "sha256": "044r6ykd3kv1zswmnw82q961mxywcmxxyj9x55z6qbykww5868lz",
       "depends": ["DT", "GO_db", "KEGGREST", "Rcpp", "SummarizedExperiment", "dplyr", "knitr", "pbapply", "stringr"]
     },
     "ADAMgui": {
       "name": "ADAMgui",
-      "version": "1.20.0",
-      "sha256": "08kxkb6hgbw7l9dv1wn3jfdkc0sizqdgmjkrzpq73q7rf0p4248g",
+      "version": "1.22.0",
+      "sha256": "1gpc5gzrwlji7a0vlr1jidn1c2nkzdv8qb82jhrg5yfglaxf1ddd",
       "depends": ["ADAM", "DT", "GO_db", "RColorBrewer", "colorRamps", "data_table", "dplyr", "ggplot2", "ggpubr", "ggrepel", "ggsignif", "gridExtra", "knitr", "reshape2", "shiny", "shinyjs", "stringi", "stringr", "testthat", "varhandle"]
     },
+    "ADAPT": {
+      "name": "ADAPT",
+      "version": "1.0.0",
+      "sha256": "111k0q40znpjacqkgcswjdp5iqbxxx60d1bjkziazgk3kgz6ly44",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "ggrepel", "phyloseq"]
+    },
     "ADImpute": {
       "name": "ADImpute",
-      "version": "1.14.0",
-      "sha256": "0kihg0mwm2ysgnx3jg6xln7ibvgmky0x2hjbcmdqlg65znczh4b6",
+      "version": "1.16.0",
+      "sha256": "1738j07hk2kj7w29vba1xhxnjj5w2zxcf59d3r4mwrxbhc771sqy",
       "depends": ["BiocParallel", "DrImpute", "MASS", "Matrix", "S4Vectors", "SAVER", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "data_table", "kernlab", "rsvd"]
     },
     "ADaCGH2": {
       "name": "ADaCGH2",
-      "version": "2.44.0",
-      "sha256": "1j9dn0xw8mdfvi2ccm1d5j9q740wb89wqi6715n6jy3dljlc8irz",
+      "version": "2.46.0",
+      "sha256": "1pzzbqh5wflhn9zqpdggx80y6zhdzg6i4xwgzjrh89bq90ibck04",
       "depends": ["DNAcopy", "GLAD", "aCGH", "bit", "cluster", "ff", "tilingArray", "waveslim"]
     },
     "AGDEX": {
       "name": "AGDEX",
-      "version": "1.52.0",
-      "sha256": "088r2ahqjv61wnzp7by4c5v9aivahmyfkzr7prnkk3ff8zh6pznl",
+      "version": "1.54.0",
+      "sha256": "02kldgslgyx5xr5zn45vndai37j66wp4xdjpvasdv46b7rm7drx2",
       "depends": ["Biobase", "GSEABase"]
     },
     "AHMassBank": {
       "name": "AHMassBank",
-      "version": "1.4.0",
-      "sha256": "1inlsknrkb5am3aqfp3mk1fd0aaj89wfiq1549k7dqy71ng7rpf9",
+      "version": "1.6.0",
+      "sha256": "1z9sd8rkzq4bgx3abrm2d31kmxq3q8b2lrkp45gw46026nvz8217",
       "depends": ["AnnotationHubData"]
     },
     "AIMS": {
       "name": "AIMS",
-      "version": "1.36.0",
-      "sha256": "0ljdv1gww01yi0h9j9br8kp67k5wizr1dy0091kngjcbn0dxzmla",
+      "version": "1.38.0",
+      "sha256": "04xch3ld6f9bwsp3v8m1klxppr52flaj0svk2fjak5m9dar5lg0b",
       "depends": ["Biobase", "e1071"]
     },
     "ALDEx2": {
       "name": "ALDEx2",
-      "version": "1.36.0",
-      "sha256": "1bqpk93bbyajw2dm54d68f3dkc0jgcny109asfm6kcz7dg7szi3y",
+      "version": "1.38.0",
+      "sha256": "1c22h27w852b5mbniw6266r8pxf28ii5czi8iki6ik9k3l4n6xzd",
       "depends": ["BiocParallel", "GenomicRanges", "IRanges", "Rfast", "S4Vectors", "SummarizedExperiment", "directlabels", "lattice", "latticeExtra", "multtest", "zCompositions"]
     },
     "AMARETTO": {
       "name": "AMARETTO",
-      "version": "1.20.0",
-      "sha256": "0n3w00x1qajkg43ip3l63k2qs0d1x2zv8wv4xj0iqwl6r6cqgxnf",
+      "version": "1.22.0",
+      "sha256": "0lk7rd4ipwgx2mzwwy9kc4ngd9849p804499xdwy2j4ygq01zrkq",
       "depends": ["BiocFileCache", "ComplexHeatmap", "DT", "Matrix", "MultiAssayExperiment", "Rcpp", "callr", "circlize", "curatedTCGAData", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "gridExtra", "httr", "impute", "knitr", "limma", "matrixStats", "readr", "reshape2", "rmarkdown", "tibble"]
     },
     "AMOUNTAIN": {
       "name": "AMOUNTAIN",
-      "version": "1.30.0",
-      "sha256": "1y2k1vg31siic6j98700m54sswbj6wr4dvbw2mz3hlm0nmsmpxc1",
+      "version": "1.32.0",
+      "sha256": "0w1m0y9q7vksxnhxa8gz3fl47niss7zcbvvrjsdrf82yx6x8vp6j",
       "depends": []
     },
     "ANCOMBC": {
       "name": "ANCOMBC",
-      "version": "2.6.0",
-      "sha256": "14jdfcv3hghl1z2f7zj2mdqdyblz5sn4l1iwh8bhvih86cpigb58",
-      "depends": ["CVXR", "DescTools", "Hmisc", "MASS", "Matrix", "Rdpack", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "doParallel", "doRNG", "energy", "foreach", "gtools", "lme4", "lmerTest", "mia", "multcomp", "nloptr"]
+      "version": "2.8.0",
+      "sha256": "0cbz7yxrci57divf85d9ffkzi1rh7xy2ara9x1wng75vc0qcnj9c",
+      "depends": ["CVXR", "DescTools", "Hmisc", "MASS", "Matrix", "Rdpack", "doParallel", "doRNG", "energy", "foreach", "gtools", "lme4", "lmerTest", "multcomp", "nloptr"]
     },
     "ANF": {
       "name": "ANF",
-      "version": "1.26.0",
-      "sha256": "00s2rlkh5snqmvlz5a21ilmm0ngh4g362y7iayr6f78nh8gwp617",
+      "version": "1.28.0",
+      "sha256": "1v1lzd0lbg21z1gyca1p45p50akznjlq0b3999sny7hfh20954fr",
       "depends": ["Biobase", "MASS", "RColorBrewer", "igraph", "survival"]
     },
     "APAlyzer": {
       "name": "APAlyzer",
-      "version": "1.18.0",
-      "sha256": "102zs1rlz58dzvrgidf7cvq4wcmk6sffc9fv4b0xlqk5d6il32w4",
+      "version": "1.20.0",
+      "sha256": "06zalaf2lqw0ba3wa47mfdj4nidqs4i0arcqnpdrgdnjw1b679mv",
       "depends": ["DESeq2", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "HybridMTest", "Rsamtools", "Rsubread", "SummarizedExperiment", "VariantAnnotation", "dplyr", "ggplot2", "ggrepel", "repmis", "rtracklayer", "tidyr"]
     },
     "APL": {
       "name": "APL",
-      "version": "1.8.0",
-      "sha256": "1mkm9aad0qamqs7595mqcbz37qz4ykn0y24wsl3ngj6ifyfxf643",
-      "depends": ["Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggrepel", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "reticulate", "rlang", "topGO", "viridisLite"]
+      "version": "1.10.2",
+      "sha256": "0z3djj3sdr10i8virdp21fn7vv8jg99v6868234rvzkghyij3i68",
+      "depends": ["Matrix", "RSpectra", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggrepel", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "rlang", "topGO", "viridisLite"]
     },
     "ARRmNormalization": {
       "name": "ARRmNormalization",
-      "version": "1.44.0",
-      "sha256": "0wg799c5pzw9g0dbkaa5j4jyccvixqbc8x3xnwk3cgi1dsbhpk34",
+      "version": "1.46.0",
+      "sha256": "0v6b86gaqszbbp8dx9i8bkz95lxkb4ci20w1l596b3vzqs2a8fb2",
       "depends": ["ARRmData"]
     },
     "ASAFE": {
       "name": "ASAFE",
-      "version": "1.30.0",
-      "sha256": "13qf4jvf0m6i46bwqxdhd4zllac370ckwnd9xh6p56r1lrgcl4sa",
+      "version": "1.32.0",
+      "sha256": "0q7rv3aasc8xdl0mamggncgs2cdyqyagq4rnskc0c3qccb7mvakg",
       "depends": []
     },
     "ASEB": {
       "name": "ASEB",
-      "version": "1.48.0",
-      "sha256": "1h5rgy2n7rxd72ypzwnfclw8h5hvdnac48fgbfll669z2k97dsmm",
+      "version": "1.50.0",
+      "sha256": "0ks9h4gzsjpjjwifscid9y175kdshqng22rqc129fq4ch17pd0bs",
       "depends": []
     },
     "ASGSCA": {
       "name": "ASGSCA",
-      "version": "1.38.0",
-      "sha256": "0gvpb1pspm7zlllg77fbi3g6csa3cpp2lbljna2m0xfi0c5zdqvw",
+      "version": "1.40.0",
+      "sha256": "1c004m9n7z7xg15pd212gjxsawir68xvqrhsxgsm5vz7viwmyqqr",
       "depends": ["MASS", "Matrix"]
     },
     "ASICS": {
       "name": "ASICS",
-      "version": "2.20.1",
-      "sha256": "0halznbl3bflnn38rh9h5a5f0dsc88n6x6kwdffbpnin9i192q1k",
+      "version": "2.22.0",
+      "sha256": "1ab8j2rmqig1c25z70ys5ip9818idy0md2a755lz0jcy0srk425j",
       "depends": ["BiocParallel", "Matrix", "PepsNMR", "SummarizedExperiment", "ggplot2", "glmnet", "gridExtra", "mvtnorm", "plyr", "quadprog", "ropls", "zoo"]
     },
     "ASSET": {
       "name": "ASSET",
-      "version": "2.22.0",
-      "sha256": "1wqsnp7w3ml7azrx72fafcfbmjg4324jaxcijpcrlrrccxl5rwp4",
+      "version": "2.24.0",
+      "sha256": "0lq07mq7ai51c1dkjkmjrafq3caw6wpzrpbfsbqa3dyjn3vp3c04",
       "depends": ["MASS", "msm", "rmeta"]
     },
     "ASSIGN": {
       "name": "ASSIGN",
-      "version": "1.40.0",
-      "sha256": "1aq302awy940jrc1hnsf0rn05y4fg5m9aljsl1mclxxig6b8mrd2",
+      "version": "1.42.0",
+      "sha256": "0avr3zn9nyamcdkr5b9qklcl9gzk36w9w7ky6qwhm7innqhmfapp",
       "depends": ["Rlab", "ggplot2", "gplots", "msm", "sva", "yaml"]
     },
     "ASURAT": {
       "name": "ASURAT",
-      "version": "1.8.0",
-      "sha256": "1fjzmvc4if1kqhwzhd38l5ryvk2qg3001jwapbnkfagxkhmnwymg",
+      "version": "1.10.0",
+      "sha256": "0dak5kx8fwmz9kx2a2r7dgzg5d8jhbf5qx6014p4g54lxns0zxj5",
       "depends": ["ComplexHeatmap", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "cluster", "plot3D"]
     },
     "ASpli": {
       "name": "ASpli",
-      "version": "2.14.0",
-      "sha256": "1br4apbc3zn06ilg8fjb8xcxaimz4h7rnx9i60ak4wnpvgzgbyh2",
+      "version": "2.16.0",
+      "sha256": "160cdm2f8mi3smnx5svaw0mhwnvcmqrl8hikhwj69fygh0razfix",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocStyle", "DT", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "MASS", "Rsamtools", "S4Vectors", "UpSetR", "data_table", "edgeR", "htmltools", "igraph", "limma", "pbmcapply", "tidyr", "txdbmaker"]
     },
-    "ATACCoGAPS": {
-      "name": "ATACCoGAPS",
-      "version": "1.6.0",
-      "sha256": "09h32q9y7z65ck33rwqzw2wkl8l6016s0sdkhf2g094yxhkz26rh",
-      "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm10", "CoGAPS", "GeneOverlap", "GenomicFeatures", "GenomicRanges", "Homo_sapiens", "IRanges", "JASPAR2016", "Mus_musculus", "TFBSTools", "chromVAR", "dplyr", "fgsea", "gplots", "gtools", "motifmatchr", "msigdbr", "projectR", "rGREAT", "stringr", "tidyverse"]
-    },
     "ATACseqQC": {
       "name": "ATACseqQC",
-      "version": "1.28.0",
-      "sha256": "0licdpzhh6xlma0hnvs4rr4bjr5q4q3g18kipf0is47zj4l91smy",
+      "version": "1.30.0",
+      "sha256": "128ka9fzj8zy6mlccszi5xnq25ivhpgq08q9jsiazm65kzxpvqfb",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "ChIPpeakAnno", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "GenomicScores", "IRanges", "KernSmooth", "Rsamtools", "S4Vectors", "edgeR", "limma", "motifStack", "preseqR", "randomForest", "rtracklayer"]
     },
     "ATACseqTFEA": {
       "name": "ATACseqTFEA",
-      "version": "1.6.0",
-      "sha256": "1dfw6vb0fx02xx21msvy8iarwmn41p1l3ryx1zs39668bz6zz06j",
+      "version": "1.8.0",
+      "sha256": "08s06npspgggfg5vpw4iwmlx2ygbc19nwfp97pphc7lml0d3dhmb",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TFBSTools", "dplyr", "ggplot2", "ggrepel", "limma", "motifmatchr", "pracma", "rtracklayer"]
     },
     "AUCell": {
       "name": "AUCell",
-      "version": "1.26.0",
-      "sha256": "009ha82393giapvmfw2mi8pmi88f61mr69qj64y5vphcr1smvcl0",
+      "version": "1.28.0",
+      "sha256": "1n5xb6qymfywglnnh1klxlqzhry78kwn8zlpvz7z06w6ixfc9q80",
       "depends": ["BiocGenerics", "DelayedArray", "DelayedMatrixStats", "GSEABase", "Matrix", "R_utils", "SummarizedExperiment", "data_table", "mixtools"]
     },
     "AWFisher": {
       "name": "AWFisher",
-      "version": "1.18.0",
-      "sha256": "0z5qs337zqqri2g3m69m85xg4x5sxnqlkbwz83vhnqfzmy9nqym0",
+      "version": "1.20.0",
+      "sha256": "040x6millcnii58q441zh99zkskl0v1s9g9cx54srhca25qywfnr",
       "depends": ["edgeR", "limma"]
     },
     "AffiXcan": {
       "name": "AffiXcan",
-      "version": "1.22.0",
-      "sha256": "1241vpqkv4p3yarr6fsz1a7awvc4ff7q75ia3ra7vgkvg7gx9p93",
+      "version": "1.24.0",
+      "sha256": "1a76l58hl78f0cn602mxxisq7rbgm3ywb45nd20d5h01wmgv3bci",
       "depends": ["BiocParallel", "MultiAssayExperiment", "SummarizedExperiment", "crayon"]
     },
     "AffyRNADegradation": {
       "name": "AffyRNADegradation",
-      "version": "1.50.0",
-      "sha256": "19lcs76jsdy5dz57rkdb8qqankpasrw2r5z4cy98q94az6582ix4",
+      "version": "1.52.0",
+      "sha256": "1k7d2w377w9ab7f9j71mc92lx3w851mxbm7lrrbzv63zbv7cynbk",
       "depends": ["affy"]
     },
     "AgiMicroRna": {
       "name": "AgiMicroRna",
-      "version": "2.54.0",
-      "sha256": "1bm8rxfdgd0fx48fi70by08qr855jv6r4xcr7al2v9akv6vphws2",
+      "version": "2.56.0",
+      "sha256": "1w1x1pzas8vq4x93700j4slkpq3xmwrm3w9zk3nf2366fxrjp65i",
       "depends": ["Biobase", "affy", "affycoretools", "limma", "preprocessCore"]
     },
     "AllelicImbalance": {
       "name": "AllelicImbalance",
-      "version": "1.42.0",
-      "sha256": "0mbmw450gdlr46ggvhrgimkbir3lg5dnqsfadn7yyrn7wkcr302f",
+      "version": "1.44.0",
+      "sha256": "1grjrbq15xd05m819j7804v3hzrjnmqj7jmdypc2wn53jxnbpqf5",
       "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "gridExtra", "lattice", "latticeExtra", "nlme", "seqinr"]
     },
     "AlphaBeta": {
       "name": "AlphaBeta",
-      "version": "1.18.0",
-      "sha256": "192jyfw2676x8pgcp9h4d78283p7n6gnsdw7wzphfjn12v266fb5",
+      "version": "1.20.0",
+      "sha256": "0zyf38xa5dbk8n71l1bgk1d49ic0f009nggajggyhgsrgf5j14gr",
       "depends": ["BiocParallel", "data_table", "dplyr", "expm", "ggplot2", "gtools", "igraph", "optimx", "plotly", "stringr"]
     },
     "AlphaMissenseR": {
       "name": "AlphaMissenseR",
-      "version": "1.0.2",
-      "sha256": "1y8dzcrjqmqagnl4jiwcsfkj28n544j2d6li0ga6rrqmjwrnxzv0",
-      "depends": ["BiocBaseUtils", "BiocFileCache", "DBI", "curl", "dplyr", "duckdb", "memoise", "rjsoncons", "rlang", "spdl", "whisker"]
+      "version": "1.2.0",
+      "sha256": "0lmpij9k36hi8adp0mnbjagh6mfyykhvsyzyk1vabvbnqi9d3zxk",
+      "depends": ["BiocBaseUtils", "BiocFileCache", "DBI", "curl", "dplyr", "duckdb", "ggplot2", "memoise", "rjsoncons", "rlang", "spdl", "whisker"]
     },
     "AlpsNMR": {
       "name": "AlpsNMR",
-      "version": "4.6.0",
-      "sha256": "1c8ynw9424ygc4wj4drbm9gdkdqwgb5z7p72zk3x5zh3zqai0d1d",
-      "depends": ["BiocParallel", "baseline", "cli", "dplyr", "fs", "future", "generics", "ggplot2", "glue", "htmltools", "magrittr", "matrixStats", "mixOmics", "pcaPP", "purrr", "readxl", "reshape2", "rlang", "rmarkdown", "scales", "signal", "speaq", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
+      "version": "4.8.0",
+      "sha256": "0aqf87i96fgbjkwkpa86k6kika0xz5f1jw6zs1sjq56q63xnd4bx",
+      "depends": ["BiocParallel", "baseline", "cli", "dplyr", "fs", "generics", "ggplot2", "glue", "htmltools", "magrittr", "matrixStats", "mixOmics", "pcaPP", "purrr", "readxl", "reshape2", "rlang", "rmarkdown", "scales", "signal", "speaq", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "AnVIL": {
       "name": "AnVIL",
-      "version": "1.16.1",
-      "sha256": "0i4skg2bpj0rbb3fbaprfs4d4nxg9aj8d6pni4a3k0wip3dw1cf9",
-      "depends": ["BiocBaseUtils", "BiocManager", "DT", "dplyr", "futile_logger", "htmltools", "httr", "jsonlite", "miniUI", "rapiclient", "rlang", "shiny", "tibble", "tidyr", "tidyselect", "yaml"]
+      "version": "1.18.2",
+      "sha256": "0hyva98m0sabyfbr8y418szla54p9p0ik7gq6nxmba17majyhp7b",
+      "depends": ["AnVILBase", "BiocBaseUtils", "BiocManager", "DT", "dplyr", "futile_logger", "htmltools", "httr", "jsonlite", "miniUI", "rapiclient", "rlang", "shiny", "tibble", "tidyr", "tidyselect", "yaml"]
+    },
+    "AnVILAz": {
+      "name": "AnVILAz",
+      "version": "1.0.0",
+      "sha256": "0b0rpq5f394y50djiwq1ldjr7wfvd4c4vw1nfdqzgizx6cybii7a",
+      "depends": ["AnVILBase", "BiocBaseUtils", "curl", "httr2", "jsonlite", "rjsoncons", "tibble"]
+    },
+    "AnVILBase": {
+      "name": "AnVILBase",
+      "version": "1.0.0",
+      "sha256": "0cjik5yvbbpryyawkqb6y38h92in0jkkm46a4kisbsif42hwa2i5",
+      "depends": ["dplyr", "httr", "httr2", "jsonlite", "tibble"]
     },
     "AnVILBilling": {
       "name": "AnVILBilling",
-      "version": "1.14.0",
-      "sha256": "0z05zp70l7r1wxf1s825gsgaj6kzj4fgw3962gp0z90whz398jyf",
+      "version": "1.16.0",
+      "sha256": "1g7j9q1n11nnyjkz68wrpavinchwfpshcs2bridag45n6l42zd16",
       "depends": ["DBI", "DT", "bigrquery", "dplyr", "ggplot2", "lubridate", "magrittr", "plotly", "shiny", "shinytoastr"]
     },
+    "AnVILGCP": {
+      "name": "AnVILGCP",
+      "version": "1.0.0",
+      "sha256": "0m0assxfq65smzqif7rqsqzlw0y8zjdnyq0nxij0snqzjd9a0iih",
+      "depends": ["AnVILBase", "BiocBaseUtils", "dplyr", "httr", "jsonlite", "rlang", "tibble", "tidyr"]
+    },
     "AnVILPublish": {
       "name": "AnVILPublish",
-      "version": "1.14.0",
-      "sha256": "030bm9hxqzgfp94h64wfizcbp4q8b9h2irk4zv679v0wnbspp3zz",
-      "depends": ["AnVIL", "BiocBaseUtils", "BiocManager", "httr", "jsonlite", "readr", "rmarkdown", "whisker", "yaml"]
+      "version": "1.16.0",
+      "sha256": "1fyz9xaycm9skaisa0v8mr6bp57an29482sbj7yfqz8p421dydkp",
+      "depends": ["AnVIL", "AnVILGCP", "BiocBaseUtils", "BiocManager", "httr", "jsonlite", "readr", "rmarkdown", "whisker", "yaml"]
     },
     "AnVILWorkflow": {
       "name": "AnVILWorkflow",
-      "version": "1.4.0",
-      "sha256": "0qk20pg45z2fk7c3ickyzpv99w48pa3r2lfp1aqvh2blbdvp6z88",
-      "depends": ["AnVIL", "dplyr", "httr", "jsonlite", "tibble"]
+      "version": "1.6.0",
+      "sha256": "0yix1ilxw3wz5x195bqj6n333kdqb4pqckpdar32sl28zx9ymhzr",
+      "depends": ["AnVIL", "AnVILBase", "AnVILGCP", "dplyr", "httr", "jsonlite", "plyr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "Anaquin": {
       "name": "Anaquin",
-      "version": "2.28.0",
-      "sha256": "0hfvwzkfy6bm2ffghax5b228k2l6wf8zq82q13h6bxfps4wz0jgb",
+      "version": "2.30.0",
+      "sha256": "0krfyb0bcc4vpna7ygyd9rqsdpnqmizlmf8sgpcyfk722dbavvdn",
       "depends": ["DESeq2", "ROCR", "ggplot2", "knitr", "locfit", "plyr", "qvalue"]
     },
     "AneuFinder": {
       "name": "AneuFinder",
-      "version": "1.32.0",
-      "sha256": "0dgmg0slyrh025wgz299dzzmpirlmdhmabxspci1qfarakw5yicf",
+      "version": "1.34.0",
+      "sha256": "0zqbpip172w02d9iw3n10b0c3pcnk63fp28m886333wcsm7j84b0",
       "depends": ["AneuFinderData", "BiocGenerics", "Biostrings", "DNAcopy", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "bamsignals", "cowplot", "doParallel", "ecp", "foreach", "ggdendro", "ggplot2", "ggrepel", "mclust", "reshape2"]
     },
     "AnnotationDbi": {
       "name": "AnnotationDbi",
-      "version": "1.66.0",
-      "sha256": "1g2yzbx7djkk8kccbclxv953iijmjvsjsalfv1ihmmcai33979rs",
+      "version": "1.68.0",
+      "sha256": "13gqbmx7pqnl6g087kz1isnw61jbljq8pizzn5wf4hv9c76dlvpf",
       "depends": ["Biobase", "BiocGenerics", "DBI", "IRanges", "KEGGREST", "RSQLite", "S4Vectors"]
     },
     "AnnotationFilter": {
       "name": "AnnotationFilter",
-      "version": "1.28.0",
-      "sha256": "1sdm85sl4d9mqbjgjh3yizcmrzgz0g4x17s25gss2f6cjwy5jp40",
+      "version": "1.30.0",
+      "sha256": "1a7ffcxdx95irbcr2sh7sph6x5lf7spnyq084pvx9qd18i6cif5n",
       "depends": ["GenomicRanges", "lazyeval"]
     },
     "AnnotationForge": {
       "name": "AnnotationForge",
-      "version": "1.46.0",
-      "sha256": "1ikri9hb1s0jzw1wyfpwsl02hg8dw2xs703sp085sbsq3cwk9cn1",
+      "version": "1.48.0",
+      "sha256": "1m3s3jkq43w94mr4g3cqfgndan7ihhhnx84ag4xm1rzmvdpsd0pp",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "RCurl", "RSQLite", "S4Vectors", "XML"]
     },
     "AnnotationHub": {
       "name": "AnnotationHub",
-      "version": "3.12.0",
-      "sha256": "1da2n13j2xysnd175zi7s6zm8yllnp0k59vygkx9id85jcldqf51",
+      "version": "3.14.0",
+      "sha256": "1l0wjc6kapkvj047g11755ardsg12jmlmvb6bq3jvp34ida7j8in",
       "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "BiocManager", "BiocVersion", "RSQLite", "S4Vectors", "curl", "dplyr", "httr", "rappdirs", "yaml"]
     },
     "AnnotationHubData": {
       "name": "AnnotationHubData",
-      "version": "1.34.0",
-      "sha256": "0wcbghjvgr8sx1qg9kyjxb7znkxhihy7jvzycrv4pyq746154xbi",
+      "version": "1.36.0",
+      "sha256": "0b279vpqyq4a88w543yj9hwlifl0c1qxjvz1msrxxxibz21fk3r8",
       "depends": ["AnnotationDbi", "AnnotationForge", "AnnotationHub", "Biobase", "BiocCheck", "BiocGenerics", "BiocManager", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "OrganismDbi", "RCurl", "RSQLite", "Rsamtools", "S4Vectors", "XML", "biocViews", "futile_logger", "graph", "jsonlite", "rtracklayer"]
     },
     "ArrayExpress": {
       "name": "ArrayExpress",
-      "version": "1.64.0",
-      "sha256": "1ad6h0pi04r9m3nwxrn7sha837m95kwii8z6s7j4zbka9ijy2pr4",
+      "version": "1.66.0",
+      "sha256": "1ngmgf05zxdhgg15c8qplc04j5azr4kjw0x4s0hcvrjay6kimvlw",
       "depends": ["Biobase", "httr", "jsonlite", "limma", "oligo", "rlang"]
     },
     "AssessORF": {
       "name": "AssessORF",
-      "version": "1.22.0",
-      "sha256": "1gzaafsfqzy2x35i251gvkd1syif80qb08kkvgnf1i6c8d2czmps",
+      "version": "1.24.0",
+      "sha256": "1q0m5a9wqqn1mm8mkqyqs85g33a6pccgxbzlgwimihdbxhddg9qd",
       "depends": ["Biostrings", "DECIPHER", "GenomicRanges", "IRanges"]
     },
     "BADER": {
       "name": "BADER",
-      "version": "1.42.0",
-      "sha256": "15lsvfmp4qsrv12bcrz5q8yz8xyg9rckrcflr3k6si03z2vw812p",
+      "version": "1.44.0",
+      "sha256": "1bksx6a0xg7hd3nd32d5pjfwb9iy64asvdp6drwlkyxv9fys976y",
       "depends": []
     },
     "BAGS": {
       "name": "BAGS",
-      "version": "2.44.0",
-      "sha256": "1xc7gp5fljqz26lj8sjcilm01g636p4wlzy4pzy5wgqxgfcw3zps",
+      "version": "2.46.0",
+      "sha256": "0wv55pmn0435wn4as4r1ihf8w82v2a95n59wq94n25lx46gzjih7",
       "depends": ["Biobase", "breastCancerVDX"]
     },
     "BANDITS": {
       "name": "BANDITS",
-      "version": "1.20.0",
-      "sha256": "1iizs0bvs7rbkwv3vs6xk26jy222kql80fp6cki0qs9h9igpzk5h",
+      "version": "1.22.0",
+      "sha256": "01ksk9wqzmg14pn0x0dch1fcrdwxw9qrfc592gkx9cy4sh8kdf3n",
       "depends": ["BiocParallel", "DRIMSeq", "MASS", "R_utils", "Rcpp", "RcppArmadillo", "data_table", "doParallel", "doRNG", "foreach", "ggplot2"]
     },
     "BASiCS": {
       "name": "BASiCS",
-      "version": "2.16.0",
-      "sha256": "0rcc8na0nravf2687bcvbaklwa0z8b43lvdy0nf9xvfrfpr1zjnw",
+      "version": "2.18.0",
+      "sha256": "1pdbkxamzcpgiqycp3dzmakj3laclgj3r9q9garz3q86m59fkrzb",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "coda", "cowplot", "ggExtra", "ggplot2", "hexbin", "matrixStats", "posterior", "reshape2", "scran", "scuttle", "viridis"]
     },
     "BASiCStan": {
       "name": "BASiCStan",
-      "version": "1.6.0",
-      "sha256": "1q6lhmdy19v30aq9hzphxicq6blyzr6z94wcqsqzwb0xjij1z5f9",
+      "version": "1.8.0",
+      "sha256": "1ss9bc2vnr7637rhmljijlr87rqx956br0ghrnsf80s6qvz01rzh",
       "depends": ["BASiCS", "BH", "Rcpp", "RcppEigen", "RcppParallel", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "glmGamPoi", "rstan", "rstantools", "scran", "scuttle"]
     },
     "BBCAnalyzer": {
       "name": "BBCAnalyzer",
-      "version": "1.34.0",
-      "sha256": "16zm6fix5f5277dkdaxyxl1q1n52960ma3vw8001a5bjxhic58rn",
+      "version": "1.36.0",
+      "sha256": "1021srhg6j3p0lwkn3d777iylrjqm8rvspfvj73hphk8l828cd53",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "VariantAnnotation"]
     },
     "BCRANK": {
       "name": "BCRANK",
-      "version": "1.66.0",
-      "sha256": "0ydajrbggvqakdf01pq5mqi1v3slz00irpbx4s9fmxvci9ganwp7",
+      "version": "1.68.0",
+      "sha256": "1fjnxv3i8mi3l5gl1c6wpph4fsn8ax08h2b25m9ihs1nxp97x682",
       "depends": ["Biostrings"]
     },
-    "BEARscc": {
-      "name": "BEARscc",
-      "version": "1.24.0",
-      "sha256": "0f66pbhf4fz66021k7f6rlwzxdikznbhjqqpxwrj07yg65q5sd1l",
-      "depends": ["SingleCellExperiment", "data_table", "ggplot2"]
-    },
     "BEAT": {
       "name": "BEAT",
-      "version": "1.42.0",
-      "sha256": "0s63nwf21ai1gys0dzjsjqy64sal7dpp040f0jqskyf2y6gdf9v9",
+      "version": "1.44.0",
+      "sha256": "0vsq1184n4nqjih31y1mkyzf3g38ajm26590g10d4ri63rqkdd5y",
       "depends": ["BSgenome", "Biostrings", "GenomicRanges", "ShortRead"]
     },
     "BERT": {
       "name": "BERT",
-      "version": "1.0.0",
-      "sha256": "1n2v8sdvh40sqz8gpzszwhp2w6npxnl48bsp9l0bzz8w148cwyk8",
+      "version": "1.2.0",
+      "sha256": "1h4sx9bnvxhz7sxzw4nklfzirkc2ris3y4485jssf5np7k1si8j2",
       "depends": ["BiocParallel", "SummarizedExperiment", "cluster", "comprehenr", "foreach", "invgamma", "iterators", "janitor", "limma", "logging", "sva"]
     },
     "BEclear": {
       "name": "BEclear",
-      "version": "2.20.0",
-      "sha256": "17i93h0q1fwl8wymmlgjsh8hbnaws6baf4jid5k579aap32zb5ha",
+      "version": "2.22.0",
+      "sha256": "06kz8433vazx7dkxysh8z9lp098irayxh23hra17bf0dih9xjcjp",
       "depends": ["BiocParallel", "Matrix", "Rcpp", "Rdpack", "abind", "data_table", "dixonTest", "futile_logger", "ids"]
     },
     "BG2": {
       "name": "BG2",
-      "version": "1.4.0",
-      "sha256": "0nby9b7kha4bz2x7a8b9nk78qai98m76csndnaikcpg79mpzygv5",
+      "version": "1.6.0",
+      "sha256": "1hhqij5k8pw3gply0x75lyz1ggzgbkw5rczcl14cwcv01js0j7h2",
       "depends": ["GA", "MASS", "Matrix", "caret", "memoise"]
     },
-    "BHC": {
-      "name": "BHC",
-      "version": "1.56.0",
-      "sha256": "1fam1k42dwd0gh7dw2gz4yl6bnbkfrw0bd44v8sdpvwwyd1dq1r8",
-      "depends": []
-    },
     "BLMA": {
       "name": "BLMA",
-      "version": "1.28.0",
-      "sha256": "1b6hcjy6dv55cpprm8ylz7akl4vyvi6lky0qc31q6skxxdp3266k",
+      "version": "1.30.0",
+      "sha256": "0mcmzc4siiv8k6dqq3w6f3p29fqg0ls0m8whbnr8gx6bswrmhhnq",
       "depends": ["Biobase", "GSA", "PADOG", "ROntoTools", "graph", "limma", "metafor"]
     },
     "BOBaFIT": {
       "name": "BOBaFIT",
-      "version": "1.8.0",
-      "sha256": "18xzy91rblcdc4x8c4cxi5b03cskdwjpryzajhzycdpdb4hfg89q",
+      "version": "1.10.0",
+      "sha256": "0gvldzwzcdrl609678fnjr4afh2lwlg9zcc1g2rf3kps33g17wj5",
       "depends": ["GenomicRanges", "NbClust", "dplyr", "ggbio", "ggforce", "ggplot2", "magrittr", "plyranges", "stringr", "tidyr"]
     },
     "BPRMeth": {
       "name": "BPRMeth",
-      "version": "1.30.0",
-      "sha256": "0ax88n7i72lhlrrq4zc6ay5mg9ds37qlg10xafgkilgliz309ykn",
+      "version": "1.32.0",
+      "sha256": "0mp30pcmvgvckxbay843srcq0c3808lz7k7b82nk8xdb1zvbmixd",
       "depends": ["BiocStyle", "GenomicRanges", "IRanges", "MASS", "Rcpp", "RcppArmadillo", "S4Vectors", "assertthat", "cowplot", "data_table", "doParallel", "e1071", "earth", "foreach", "ggplot2", "kernlab", "magrittr", "matrixcalc", "mvtnorm", "randomForest", "truncnorm"]
     },
     "BRAIN": {
       "name": "BRAIN",
-      "version": "1.50.0",
-      "sha256": "0l712ilc308amafhbl9g6g6jvn1px0x0wlc53y2ql397l9bivva3",
+      "version": "1.52.0",
+      "sha256": "1hvxfkxa2hrin416qkia343iijq4iam2sbvxqfjsy1n8j2s1sz85",
       "depends": ["Biostrings", "PolynomF", "lattice"]
     },
     "BREW3R_r": {
       "name": "BREW3R.r",
-      "version": "1.0.1",
-      "sha256": "0i0r5sryvq721dlffs9d092776jx0j7r9mfiyi24glgqalmrslag",
+      "version": "1.2.0",
+      "sha256": "19qvwv6papinrqcn98a7j06rckv3yjqba971ya7y8vzgmw9sf74p",
       "depends": ["GenomicRanges", "S4Vectors", "rlang"]
     },
     "BSgenome": {
       "name": "BSgenome",
-      "version": "1.72.0",
-      "sha256": "1pjbkakrycvaifl7xrmri2h94zc1ap8a9d1q4c83qji3xa21cm4q",
+      "version": "1.74.0",
+      "sha256": "0abcz2rpw9af2cfyssz6adbx36issjlwzf7ipj1vkcmia6j5f1ji",
       "depends": ["BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "XVector", "matrixStats", "rtracklayer"]
     },
     "BSgenomeForge": {
       "name": "BSgenomeForge",
-      "version": "1.4.0",
-      "sha256": "0100y9lqj0xjz1ycazn4v74m7h26fxdbb03xa7ryvpdq61b0gc8p",
+      "version": "1.6.0",
+      "sha256": "0zjr1wm274l3c5bkf030mvif5pnsb8hclsyzxjfsghs7c1z3wdas",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer"]
     },
     "BUMHMM": {
       "name": "BUMHMM",
-      "version": "1.28.0",
-      "sha256": "0c35x7bjp97qiahykkvk8krsnvy1w29qvrb6x8wa4vwn58a56naa",
+      "version": "1.30.0",
+      "sha256": "0xsz9hsp7pxigjhk05srnlncnhfa2zzrqw4d9jbg9xl7xv7jnkh0",
       "depends": ["Biostrings", "IRanges", "SummarizedExperiment", "devtools", "gtools", "stringi"]
     },
     "BUS": {
       "name": "BUS",
-      "version": "1.60.0",
-      "sha256": "1xwdqz9lyz110bh96ihldwg50k7fbnvnkivyqd9qj1iwk3vz7qd6",
+      "version": "1.62.0",
+      "sha256": "0hrxx8gsfjyppwiwfhvdprq64v290gcbwm9bx67vviawig1dj364",
       "depends": ["infotheo", "minet"]
     },
     "BUScorrect": {
       "name": "BUScorrect",
-      "version": "1.22.0",
-      "sha256": "1crq6h9s3kxk1z7xpapq1jwwqwpa2fznhykm84k2zjl8jzvc7lmi",
+      "version": "1.24.0",
+      "sha256": "0iq8cz42pp3n1mg657n4pnsp5g9h5g201zpqndssdki9ahhyqppv",
       "depends": ["SummarizedExperiment", "gplots"]
     },
     "BUSpaRse": {
       "name": "BUSpaRse",
-      "version": "1.18.1",
-      "sha256": "0dvs4c47v27ndc7xvpzx1acrh9v6dw99nz21lf1q7d0liiy26iyb",
+      "version": "1.20.0",
+      "sha256": "1i1jdn93w6cli6idfvll64pgskwjqap183vpaqcs60vpw1cdbsd0",
       "depends": ["AnnotationDbi", "AnnotationFilter", "BH", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "S4Vectors", "biomaRt", "dplyr", "ensembldb", "ggplot2", "magrittr", "plyranges", "stringr", "tibble", "tidyr", "zeallot"]
     },
     "BUSseq": {
       "name": "BUSseq",
-      "version": "1.10.0",
-      "sha256": "19ajpfgz3aj1p6955z128smanna1gff6dfgh7dz8vhjyyz5nbi1q",
+      "version": "1.12.0",
+      "sha256": "0as429r1y5vm5230xk5bd980l6fa8p2vw40qrxb9law6fd9kp0w7",
       "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "gplots"]
     },
     "BaalChIP": {
       "name": "BaalChIP",
-      "version": "1.30.0",
-      "sha256": "1xm6czgbfz2rjrz5996d0n7xmlh9pd1mw9i8ac66pmn5fi44pbz2",
+      "version": "1.32.0",
+      "sha256": "0zhxsw1sbk6kmxm9ypw211ybdn29lid5r2cjz7j855822afgg0l4",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "coda", "doBy", "doParallel", "foreach", "ggplot2", "reshape2", "scales"]
     },
     "BadRegionFinder": {
       "name": "BadRegionFinder",
-      "version": "1.32.0",
-      "sha256": "1hs1mv8gj4w0wk6sw6r08j237vw3lhjrv9zip5nk6l1g1r0pg597",
+      "version": "1.34.0",
+      "sha256": "1xnzg4vaadh46dyqrrk1srzxkm57bkwm942xrsvlf46vibd4l9iw",
       "depends": ["GenomicRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "biomaRt"]
     },
     "Banksy": {
       "name": "Banksy",
-      "version": "1.0.0",
-      "sha256": "1qz5nhf2qcdwcbi4kbwdjgbxpql8w5391cnb8i73gj54chc8bvn1",
+      "version": "1.2.0",
+      "sha256": "0irm6jfqw1fnzqhqrgpdvq7gkgzbd172fz6xc7bmdhcdrz380xzx",
       "depends": ["RcppHungarian", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "aricode", "data_table", "dbscan", "igraph", "irlba", "leidenAlg", "matrixStats", "mclust", "uwot"]
     },
     "BaseSpaceR": {
       "name": "BaseSpaceR",
-      "version": "1.48.0",
-      "sha256": "02f2l42p08xags155qydz97ipg5vya0prmrlw4kvahgbq5p0xm44",
+      "version": "1.50.0",
+      "sha256": "1fbj41m9rqg1x6lmklk5zkq2hn5vvv2w693i5xv7nw0rprbjq5x3",
       "depends": ["RCurl", "RJSONIO"]
     },
     "Basic4Cseq": {
       "name": "Basic4Cseq",
-      "version": "1.40.0",
-      "sha256": "0ipxhdsqa8q49d2i17kvwyn6w2rpyl9jmq9bhch7cjawykjla5kf",
+      "version": "1.42.0",
+      "sha256": "0yv1j494kjkp7qgyv67j1shd0lmxsr67dsibj27ldp43p2ipyr1h",
       "depends": ["BSgenome_Ecoli_NCBI_20080805", "Biostrings", "GenomicAlignments", "GenomicRanges", "RCircos", "caTools"]
     },
     "BasicSTARRseq": {
       "name": "BasicSTARRseq",
-      "version": "1.32.0",
-      "sha256": "1w69qc81pj3c4gq158ag59wbpm2aaiqmnnb79m0h7dlsnf964cjv",
+      "version": "1.34.0",
+      "sha256": "0mnvrnk2p5qnrmncrkyv2ajx8wff5ax15p0z0wh8rhi3n8bhja4f",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "S4Vectors"]
     },
     "BatchQC": {
       "name": "BatchQC",
-      "version": "2.0.0",
-      "sha256": "1kijj3ivlrwk4490jsb7vsrc7kmx32hla52cg3zb3vj6l5cwq7g6",
-      "depends": ["DESeq2", "EBSeq", "RColorBrewer", "SummarizedExperiment", "data_table", "dplyr", "ggdendro", "ggnewscale", "ggplot2", "limma", "matrixStats", "pheatmap", "reader", "reshape2", "scran", "shiny", "sva", "tibble", "tidyr", "tidyverse"]
+      "version": "2.2.0",
+      "sha256": "0jyxfyw2c1q930y2hi6xydpq98fwih3pyivv1dm51a901378cy7h",
+      "depends": ["DESeq2", "EBSeq", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggdendro", "ggnewscale", "ggplot2", "limma", "matrixStats", "pheatmap", "reader", "reshape2", "scran", "shiny", "shinyjs", "shinythemes", "sva", "tibble", "tidyr", "tidyverse"]
     },
     "BayesKnockdown": {
       "name": "BayesKnockdown",
-      "version": "1.30.0",
-      "sha256": "05plmh36s00jh4ckcgvi2s9ypa8mxlsy23mzysazbfsr022x3vqa",
+      "version": "1.32.0",
+      "sha256": "149ksni85zcms0kiz0as30jji9w55djzv7isnc69nd0xxp54gnyj",
       "depends": ["Biobase"]
     },
     "BayesSpace": {
       "name": "BayesSpace",
-      "version": "1.14.0",
-      "sha256": "0q1haqsyc61yxz1n197sv3s6csjpns4fi288kf58nnf5jgdwnyx5",
-      "depends": ["BiocFileCache", "BiocSingular", "DirichletReg", "Matrix", "RCurl", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "coda", "ggplot2", "mclust", "purrr", "rhdf5", "scales", "scater", "scran", "xgboost"]
+      "version": "1.16.0",
+      "sha256": "08q2k2l90rjw95khlvnyz1jjlq1qyn3y5qc635nsvdlkf75fc7rz",
+      "depends": ["BiocFileCache", "BiocParallel", "BiocSingular", "DirichletReg", "Matrix", "RCurl", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "arrow", "assertthat", "coda", "dplyr", "ggplot2", "magrittr", "mclust", "microbenchmark", "purrr", "rhdf5", "rjson", "rlang", "scales", "scater", "scran", "tibble", "tidyr", "xgboost"]
     },
     "BeadDataPackR": {
       "name": "BeadDataPackR",
-      "version": "1.56.0",
-      "sha256": "0wz3prri0mfjczmb432faxfjc99wg4lq26l3a60rmxyxq8mcnpkv",
+      "version": "1.58.0",
+      "sha256": "0qzgn3kj7137yp8crj4d8ir597c5k0qscg7n7fdzhi7540jjnpsb",
       "depends": []
     },
     "BgeeCall": {
       "name": "BgeeCall",
-      "version": "1.20.1",
-      "sha256": "02k83a01fb4gydnw81j2vc3d1m92y0n44bskbdrlm7cb1zscvc13",
+      "version": "1.22.0",
+      "sha256": "13lhps2dswd29rxr08yhpd9aqbdcvcgq5kfbymmrgr5ampl9dk29",
       "depends": ["Biostrings", "GenomicFeatures", "biomaRt", "data_table", "dplyr", "jsonlite", "rhdf5", "rslurm", "rtracklayer", "sjmisc", "txdbmaker", "tximport"]
     },
     "BgeeDB": {
       "name": "BgeeDB",
-      "version": "2.30.0",
-      "sha256": "1jbb93inv7z0i8b1jr6ax98gqkqn73m86hj61irgyysk7hn4bbg6",
-      "depends": ["Biobase", "RCurl", "RSQLite", "R_utils", "curl", "data_table", "digest", "dplyr", "graph", "tidyr", "topGO"]
+      "version": "2.32.0",
+      "sha256": "15hnn6rk9hv623zzjsg1axydvlj3vjpwyhvhw0xpmk9q7zm6g79h",
+      "depends": ["Biobase", "HDF5Array", "RCurl", "RSQLite", "R_utils", "anndata", "bread", "curl", "data_table", "digest", "dplyr", "graph", "tidyr", "topGO", "zellkonverter"]
     },
     "BiFET": {
       "name": "BiFET",
-      "version": "1.24.0",
-      "sha256": "148j41mawxvzyal9lfjy7h1gp0w8zwmgc7s32wiqa30qjcc82snx",
+      "version": "1.26.0",
+      "sha256": "0p5ziib0k8clv8jk99k1z6izk63fpklb6nkf40ar4i63ri4yp776",
       "depends": ["GenomicRanges", "poibin"]
     },
     "BiGGR": {
       "name": "BiGGR",
-      "version": "1.40.0",
-      "sha256": "1ja5j9753rgx61jwkax0mzkxh7ybh3m4ampkr5ikw3afda23wg1z",
+      "version": "1.42.0",
+      "sha256": "0zvazxkyllalb2j3k6hwh1g1p0jbm2kcn0yf9ypi8v5wfw71c5dc",
       "depends": ["LIM", "hyperdraw", "hypergraph", "limSolve", "rsbml", "stringr"]
     },
     "BiRewire": {
       "name": "BiRewire",
-      "version": "3.36.0",
-      "sha256": "1l3hkq6n7i9j82aym4ngwablj8jqb70a7y6skx0rjkflya6wbim7",
+      "version": "3.38.0",
+      "sha256": "0503vd2alhpda2brqgg0cqw6w9bad3yz92gsm4fbmyf1lklwlhg8",
       "depends": ["Matrix", "Rtsne", "igraph", "slam"]
     },
     "BiSeq": {
       "name": "BiSeq",
-      "version": "1.44.0",
-      "sha256": "12nkdaz54ga133v38mmqaf3xcsx7ps2rcxxvni100vsk93hv155z",
+      "version": "1.46.0",
+      "sha256": "0izla8shaqjyjv25sjqs1c1410s8fph2dq11n27r94gx21l8x8xf",
       "depends": ["Biobase", "BiocGenerics", "Formula", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "betareg", "globaltest", "lokern", "rtracklayer"]
     },
     "BicARE": {
       "name": "BicARE",
-      "version": "1.62.0",
-      "sha256": "0397xg4sj988b0chzfpy23dszpjbdkch59wfynbn4pwyvl0qmp9j",
+      "version": "1.64.0",
+      "sha256": "1x8fxcv8lvclb3ynj16gld6l07jdqlarrk1j26g5bsqy0zd0v7gm",
       "depends": ["Biobase", "GO_db", "GSEABase", "multtest"]
     },
     "BindingSiteFinder": {
       "name": "BindingSiteFinder",
-      "version": "2.2.0",
-      "sha256": "1icgz7wfayqzr1wd0n7sb71bh149d4d1m7rh5s5ap07llnn7vsq1",
+      "version": "2.4.0",
+      "sha256": "057f0yd7kjgwjkgbndpwqhsky9wkwbam5wqsrz2y1yici9w1q1cq",
       "depends": ["ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "dplyr", "forcats", "ggdist", "ggforce", "ggplot2", "kableExtra", "lifecycle", "matrixStats", "plyr", "rlang", "rtracklayer", "tibble", "tidyr"]
     },
     "BioCartaImage": {
       "name": "BioCartaImage",
-      "version": "1.2.0",
-      "sha256": "0kcqhgr6q86b874i56p0cai8kiqbx8q3vk40xq221dzjf19r8ag8",
+      "version": "1.4.0",
+      "sha256": "0mni5hf5ir8h0bx3d3d4xf35q0f8lajgzlgpjwz90ki4n099rv1h",
       "depends": ["magick"]
     },
     "BioCor": {
       "name": "BioCor",
-      "version": "1.28.0",
-      "sha256": "0jpi51f9cv3sv4l69974bba8c8k0inb6zxviv7i907ldaiiblr07",
+      "version": "1.30.0",
+      "sha256": "0f282cfs326xj0dib57wqclqj0gnllqxm8zcy0s23qx5kb4jzq08",
       "depends": ["BiocParallel", "GSEABase", "Matrix"]
     },
+    "BioGA": {
+      "name": "BioGA",
+      "version": "1.0.0",
+      "sha256": "1g3409z332cg9sbqs4ld9w7mlf9pilwmdwwbc1y5cpjs1xhms7pg",
+      "depends": ["BiocStyle", "Rcpp", "SummarizedExperiment", "animation", "biocViews", "ggplot2", "rlang", "sessioninfo"]
+    },
     "BioMVCClass": {
       "name": "BioMVCClass",
-      "version": "1.72.0",
-      "sha256": "0dfdksk3nc6pzw21sbd4cdqr05489qh4984wv0f906hyb52waxk2",
+      "version": "1.74.0",
+      "sha256": "0jsnycykbf2vgqfjnd7fff6k2hly7n50mavcj940vsg3gy2hfady",
       "depends": ["Biobase", "MVCClass", "Rgraphviz", "graph"]
     },
     "BioNAR": {
       "name": "BioNAR",
-      "version": "1.6.3",
-      "sha256": "0gr3pf34xgs778bfndmml9df7l0w6ypa8d83h31krlxzd1h4wz0h",
-      "depends": ["AnnotationDbi", "GO_db", "Matrix", "RSpectra", "Rdpack", "WGCNA", "clusterCons", "cowplot", "data_table", "dplyr", "fgsea", "ggplot2", "ggrepel", "igraph", "latex2exp", "minpack_lm", "org_Hs_eg_db", "poweRlaw", "rSpectral", "scales", "stringr", "viridis"]
+      "version": "1.8.1",
+      "sha256": "014bidfkpxvrnnda4yky9q3n2hgi7z1ywnhp0n1cl3aqy671ix3q",
+      "depends": ["AnnotationDbi", "GO_db", "Matrix", "RSpectra", "Rdpack", "WGCNA", "cowplot", "data_table", "dplyr", "fgsea", "ggplot2", "ggrepel", "igraph", "latex2exp", "minpack_lm", "org_Hs_eg_db", "poweRlaw", "rSpectral", "scales", "stringr", "viridis"]
     },
     "BioNERO": {
       "name": "BioNERO",
-      "version": "1.12.0",
-      "sha256": "02jqlpd31mhxbvksj7ny34f6dv8skkkr76lkiaj5gm078kfr0zx5",
+      "version": "1.14.0",
+      "sha256": "08mhr9ichh2kynnwchmcqf4l0sn38v5sww6995jwqfyxy5vqvx4x",
       "depends": ["BiocParallel", "ComplexHeatmap", "GENIE3", "NetRep", "RColorBrewer", "SummarizedExperiment", "WGCNA", "dynamicTreeCut", "ggdendro", "ggnetwork", "ggplot2", "ggrepel", "igraph", "intergraph", "matrixStats", "minet", "patchwork", "reshape2", "rlang", "sva"]
     },
     "BioNet": {
       "name": "BioNet",
-      "version": "1.64.0",
-      "sha256": "0lpqvm0cx7pnb99jh7na49x10w2v04xydiwxn9l41ngxysp8v0h6",
+      "version": "1.66.0",
+      "sha256": "0s1mi4sjbhjs548a2bjqlj5bhslf7wzqkag80g9f2m86hxnmkxwc",
       "depends": ["AnnotationDbi", "Biobase", "RBGL", "graph", "igraph"]
     },
     "BioQC": {
       "name": "BioQC",
-      "version": "1.32.0",
-      "sha256": "14yrqf5wl9r596zvlpf4y48nykg0gwzlxfgi3kdx0i5pfgvi43vk",
+      "version": "1.34.0",
+      "sha256": "10m1ch170d1frq6qcryiqbhb0m1nk921frw04qrxf3b4xfmgiq8c",
       "depends": ["Biobase", "Rcpp", "edgeR"]
     },
+    "BioTIP": {
+      "name": "BioTIP",
+      "version": "1.20.0",
+      "sha256": "0p9f9i4snkc4xgb00nwd7cky4n8s7z99lkv2lahmggk2a53bzx13",
+      "depends": ["GenomicRanges", "MASS", "cluster", "igraph", "psych", "scran", "stringr"]
+    },
     "Biobase": {
       "name": "Biobase",
-      "version": "2.64.0",
-      "sha256": "09xnl0qq4qsd981i9srw07228lgashcvcavi8k0izdzfyk6ka7m2",
+      "version": "2.66.0",
+      "sha256": "1ndkvl44pxdsw39gka1ivlb8l89m1ix58nkji7b65qq9mj6dw31k",
       "depends": ["BiocGenerics"]
     },
     "BiocBaseUtils": {
       "name": "BiocBaseUtils",
-      "version": "1.6.0",
-      "sha256": "0f8bzhpi6xla52sbvpd20sgli7mp5xfk2aqpcv6jkf8s59jsmn54",
+      "version": "1.8.0",
+      "sha256": "10xzfxyl12zkcx8l0b5hnmcnq6bdr1gg1dp64indvrnwwqpdjqjp",
       "depends": []
     },
     "BiocBook": {
       "name": "BiocBook",
-      "version": "1.2.0",
-      "sha256": "0rdsx2slwp69l6svsaj3pndd6bv318jkla5j84avwgfi63wks092",
+      "version": "1.4.0",
+      "sha256": "03kvqrj91jh9sg5dfga1jgqh0qhaz4853d7ysfy9mkhxdagxqljc",
       "depends": ["BiocGenerics", "available", "cli", "dplyr", "gert", "gh", "gitcreds", "glue", "httr", "purrr", "quarto", "renv", "rlang", "rprojroot", "stringr", "tibble", "usethis", "yaml"]
     },
     "BiocCheck": {
       "name": "BiocCheck",
-      "version": "1.40.0",
-      "sha256": "0rvr68d5anir7bj913nxwwfj7i3h2dvadcfvjjdbdr3m35wyx1g8",
-      "depends": ["BiocBaseUtils", "BiocFileCache", "BiocManager", "biocViews", "callr", "codetools", "graph", "httr2", "knitr", "rvest", "stringdist"]
+      "version": "1.42.0",
+      "sha256": "0c0gwa2wxwfh8ypj1vgy5lp89msn2s9cd155mwn0ginabvp9v36r",
+      "depends": ["BiocBaseUtils", "BiocFileCache", "BiocManager", "biocViews", "callr", "cli", "codetools", "graph", "httr2", "knitr", "rvest", "stringdist"]
     },
     "BiocFHIR": {
       "name": "BiocFHIR",
-      "version": "1.6.0",
-      "sha256": "0zw59xb6jxxqg9aiwn6h4ak4056b64y22irkysl51rvdrb12n32h",
+      "version": "1.8.0",
+      "sha256": "1rcvlbqszis0hf4s5skagljxjy8bwyzi4xyy8yigp3x3jjfm2dhn",
       "depends": ["BiocBaseUtils", "DT", "dplyr", "graph", "jsonlite", "shiny", "tidyr", "visNetwork"]
     },
     "BiocFileCache": {
       "name": "BiocFileCache",
-      "version": "2.12.0",
-      "sha256": "0jv6hni5x91ssvz4ilhi3y6lylrw4w3xfk8ljmq6gjvyl886sw9f",
+      "version": "2.14.0",
+      "sha256": "08j0589rwylirna6r4bwk5vb965fp4zpj0msk0mlhppngqzlc2kc",
       "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "filelock", "httr"]
     },
     "BiocGenerics": {
       "name": "BiocGenerics",
-      "version": "0.50.0",
-      "sha256": "0500ya3df53xx1dfdmk50bh30ja28y6qkdwds1c1m4c7q0h2xmqi",
+      "version": "0.52.0",
+      "sha256": "1nbzbrb07v7wx19qhm65py9bl7ij4bpiqw87ixd00b6w6j6nmx8l",
       "depends": []
     },
-    "BiocHail": {
-      "name": "BiocHail",
-      "version": "1.4.0",
-      "sha256": "1p8wkl31c7snv8l8zkmg2hf9pb2p0gif4gfgjia0npi91y2h5hfp",
-      "depends": ["BiocFileCache", "BiocGenerics", "basilisk", "dplyr", "reticulate"]
-    },
     "BiocHubsShiny": {
       "name": "BiocHubsShiny",
-      "version": "1.4.0",
-      "sha256": "19ihc6fi04kbgmlvn5k1cjpckc03p5yfjpc3gjmmf3pn69qgljzf",
+      "version": "1.6.0",
+      "sha256": "119n3pgx7gpxjih4abjzxwnw6m5hy3fb2q85njlzdzwyqcihx068",
       "depends": ["AnnotationHub", "DT", "ExperimentHub", "S4Vectors", "htmlwidgets", "shiny", "shinyAce", "shinyjs", "shinythemes", "shinytoastr"]
     },
     "BiocIO": {
       "name": "BiocIO",
-      "version": "1.14.0",
-      "sha256": "0ppsldpn3vbliimjvnxadn61crck45j581dw4lc5f3w1vy5vs44h",
+      "version": "1.16.0",
+      "sha256": "1dqsilhlw5xwbmy04bcf6fqgnlkmzszr5xgfzhlgywdbh0pqm1lr",
       "depends": ["BiocGenerics", "S4Vectors"]
     },
     "BiocNeighbors": {
       "name": "BiocNeighbors",
-      "version": "1.22.0",
-      "sha256": "1krg4cs406ymk27qcj3j1jsl8vl4j9k5zvwf4vzxgbw3x6lpywid",
-      "depends": ["BiocParallel", "Matrix", "Rcpp", "RcppHNSW", "S4Vectors"]
-    },
-    "BiocOncoTK": {
-      "name": "BiocOncoTK",
-      "version": "1.24.0",
-      "sha256": "0h4cr7lrmbyx7kdj81s7ff75svr01rvzn54svqi93vjilawmpbm3",
-      "depends": ["ComplexHeatmap", "DBI", "DT", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "bigrquery", "car", "curatedTCGAData", "dplyr", "ggplot2", "ggpubr", "graph", "httr", "magrittr", "plyr", "rjson", "scales", "shiny"]
+      "version": "2.0.1",
+      "sha256": "0dzk92ixhgnhrqkmw9fgap0yvmrml5a4cw1r3wbgf5vgq2ccx2yq",
+      "depends": ["Rcpp", "assorthead"]
     },
     "BiocParallel": {
       "name": "BiocParallel",
-      "version": "1.38.0",
-      "sha256": "1miw26r2a8wvgnfr9sapfv6rqk219rmsyjh6v04annafxdxy15ky",
+      "version": "1.40.0",
+      "sha256": "1avnn7xpcabw73w75x66fxlx8wmlmv69p1zmr493gbgvy85plv1z",
       "depends": ["BH", "codetools", "cpp11", "futile_logger", "snow"]
     },
     "BiocPkgTools": {
       "name": "BiocPkgTools",
-      "version": "1.22.0",
-      "sha256": "1nbzr1yjz65r0y8c312hnvagnc1pdgda4v6sxbpvlkl3z93jsy6x",
+      "version": "1.24.0",
+      "sha256": "0d0acbhqm7x7813jmm90hw9fmv559zrahxnlm6smaw3jz74kb2q4",
       "depends": ["BiocFileCache", "BiocManager", "DT", "RBGL", "biocViews", "dplyr", "gh", "graph", "htmltools", "htmlwidgets", "httr", "igraph", "jsonlite", "magrittr", "readr", "rlang", "rorcid", "rvest", "stringr", "tibble", "xml2"]
     },
     "BiocSet": {
       "name": "BiocSet",
-      "version": "1.18.0",
-      "sha256": "1r1if1k7qgni3dk7gsl4vcyvd6hnhx94rcq5yi9w7dvyyrbvnwwa",
+      "version": "1.20.0",
+      "sha256": "1jl4q3r6zcn837kd627wfki6z42bxdfklrj97c4r3cr3bnbyxvk0",
       "depends": ["AnnotationDbi", "BiocIO", "KEGGREST", "S4Vectors", "dplyr", "ontologyIndex", "plyr", "rlang", "tibble", "tidyr"]
     },
     "BiocSingular": {
       "name": "BiocSingular",
-      "version": "1.20.0",
-      "sha256": "1xl9wn3slj3ywjglb8zq2p0ifx4xwxbqsm99fjlf6hanfhmnxyay",
-      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "Matrix", "Rcpp", "S4Vectors", "ScaledMatrix", "beachmat", "irlba", "rsvd"]
+      "version": "1.22.0",
+      "sha256": "17flxapf8jw44rsbfz0iifhn6kdb2248lppbq0iz9c021wxlk28h",
+      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "Matrix", "Rcpp", "S4Vectors", "ScaledMatrix", "assorthead", "beachmat", "irlba", "rsvd"]
     },
     "BiocSklearn": {
       "name": "BiocSklearn",
-      "version": "1.26.0",
-      "sha256": "19s38zpgdscbrqypyg17l1jw53x88lgkcrqg20gchfi6mig36a3w",
+      "version": "1.28.0",
+      "sha256": "0ic17zcw4110rdk83p00ddq1lz2cm7vr5xpsb6y9ibf1hnk7s2al",
       "depends": ["SummarizedExperiment", "basilisk", "reticulate"]
     },
     "BiocStyle": {
       "name": "BiocStyle",
-      "version": "2.32.1",
-      "sha256": "1m0nn2m548726w576mx8mx29xj428q1rkpn7z7a7m8kzgcvvgkkr",
+      "version": "2.34.0",
+      "sha256": "1n6dg53sx1vmz2xzfj040l26znp3664wcam92nxm7hsi0l5lbqyx",
       "depends": ["BiocManager", "bookdown", "knitr", "rmarkdown", "yaml"]
     },
     "BiocVersion": {
       "name": "BiocVersion",
-      "version": "3.19.1",
-      "sha256": "1zhm28313gsbscfhfdbqizvb5v67n4l0dapjmb1xq010ikly95mh",
+      "version": "3.20.0",
+      "sha256": "1ixn9pwzm15z79da90iqniv8c6x8w7k5wdwzpj9dm1ghwd04xqcx",
       "depends": []
     },
     "BiocWorkflowTools": {
       "name": "BiocWorkflowTools",
-      "version": "1.30.0",
-      "sha256": "1gw0lmdhkzp5ar54yv9jagqmpxp7j9ajfmdqb2y2qrnhh39hymzs",
+      "version": "1.32.0",
+      "sha256": "195n6va4y1caj9g5dzdimzdi7ygkapmiq0cxd1lzk8sf2skg5dwb",
       "depends": ["BiocStyle", "bookdown", "git2r", "httr", "knitr", "rmarkdown", "rstudioapi", "stringr", "usethis"]
     },
     "Biostrings": {
       "name": "Biostrings",
-      "version": "2.72.1",
-      "sha256": "067vy2v7spbdsknvi0fcpdi085kn8v20pyrhkc7wy357v21h7hgs",
+      "version": "2.74.1",
+      "sha256": "1kyyrkcnpblyl37x5ncbhz412l5jm1l0ci7r7d1z60dhikysbpxl",
       "depends": ["BiocGenerics", "GenomeInfoDb", "IRanges", "S4Vectors", "XVector", "crayon"]
     },
     "BloodGen3Module": {
       "name": "BloodGen3Module",
-      "version": "1.12.0",
-      "sha256": "0mksc9jfzcj255a01hg8gjrs6k2plkpfqgv951csldvy7vqrdkma",
+      "version": "1.14.0",
+      "sha256": "1lhjhy07ly81gj6dbs9i25lbr3vzygrv0nghwabkq0ypklzppg24",
       "depends": ["ComplexHeatmap", "ExperimentHub", "SummarizedExperiment", "V8", "circlize", "ggplot2", "gtools", "limma", "matrixStats", "preprocessCore", "randomcoloR", "reshape2", "testthat"]
     },
     "BridgeDbR": {
       "name": "BridgeDbR",
-      "version": "2.14.0",
-      "sha256": "0nsn1i5ah3l95wd1afcppxb364l44r3apma0aa79g4jday4zhbv5",
+      "version": "2.16.0",
+      "sha256": "1gqnmq3669rw39b1jizcq2f2vw5a3ca6b4m2m7zhi7gxz8mf27zr",
       "depends": ["curl", "rJava"]
     },
     "BrowserViz": {
       "name": "BrowserViz",
-      "version": "2.26.0",
-      "sha256": "0wq1vc6m54kb8dw6c0qzw8hvvwjq78lqd18whph2nmywjcy9j9hw",
+      "version": "2.28.0",
+      "sha256": "1sgj7193rqvj0f5z64krkvs45k939xj4lrq7h2c6zdpvl01g37dc",
       "depends": ["BiocGenerics", "httpuv", "jsonlite"]
     },
     "BubbleTree": {
       "name": "BubbleTree",
-      "version": "2.34.0",
-      "sha256": "0l69q8l6dacyqdbfdnxlg70f064xm8w5p07pi2x0baacxv8bs5d4",
+      "version": "2.36.0",
+      "sha256": "1f0ikkwyrjmbxdxbyqjf90j8q7dn4kd00lbxiv0b9qhabczp2dcb",
       "depends": ["Biobase", "BiocGenerics", "BiocStyle", "GenomicRanges", "IRanges", "RColorBrewer", "WriteXLS", "biovizBase", "dplyr", "e1071", "ggplot2", "gridExtra", "gtable", "gtools", "limma", "magrittr", "plyr"]
     },
     "BufferedMatrix": {
       "name": "BufferedMatrix",
-      "version": "1.68.0",
-      "sha256": "1rd446pzwplkjzqqg19ba3gn94kvsxxi472n6r9raxrggqic0bmi",
+      "version": "1.70.0",
+      "sha256": "14wd9chwhagy2m12fvn5s0z27dh2hirqbzk188sch9myg2jndhjf",
       "depends": []
     },
     "BufferedMatrixMethods": {
       "name": "BufferedMatrixMethods",
-      "version": "1.68.0",
-      "sha256": "1y8skcqbql4mi1zi53771jwsyw8665b13xyh9bnrv18j18axldk6",
+      "version": "1.70.0",
+      "sha256": "0bdgxjz6bk094znrs6w6h3z3nx6gk4nfz6c3r6l7n3v4b93vqgzp",
       "depends": ["BufferedMatrix"]
     },
     "BumpyMatrix": {
       "name": "BumpyMatrix",
-      "version": "1.12.0",
-      "sha256": "1f8xa184x6l363psbqn0a5yh16ghm2mciv726aii58bkln5qwkmb",
+      "version": "1.14.0",
+      "sha256": "1ffg36b35li50nx1gs0knjl32k0jlqyhcw6j7zqw651apfknvd4i",
       "depends": ["IRanges", "Matrix", "S4Vectors"]
     },
     "CAEN": {
       "name": "CAEN",
-      "version": "1.12.0",
-      "sha256": "1z4prnbh7y6i9b0d3y4fncmsj8vrz4i0k48l69kh14xi9lyhc773",
+      "version": "1.14.0",
+      "sha256": "1azfpxvsgcr0yvap9l76hwjyl90fg0xkpkll4ykbgyn1bprl8vcw",
       "depends": ["PoiClaClu", "SummarizedExperiment"]
     },
     "CAFE": {
       "name": "CAFE",
-      "version": "1.40.0",
-      "sha256": "1vq1yf78yfsfnsjpqb89zghzr677mdwvpi5zl3ikz2j5z40h1rjj",
+      "version": "1.42.0",
+      "sha256": "0dfjdyb2vzy87mgw3aq0jyfm448mk3k3zsjcyfwa4z8lcn3dr7z9",
       "depends": ["Biobase", "GenomicRanges", "IRanges", "affy", "annotate", "biovizBase", "ggbio", "ggplot2", "gridExtra"]
     },
     "CAGEfightR": {
       "name": "CAGEfightR",
-      "version": "1.24.0",
-      "sha256": "1i6q5bwg55d3iydcy3h6j9hg30581vvc592rs5cac310qxzcj8hj",
+      "version": "1.26.0",
+      "sha256": "1lpci0dnblrchhbpbc3f31c3i98hsmik94m1jvc53av15v2fkxdc",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicInteractions", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Matrix", "S4Vectors", "SummarizedExperiment", "assertthat", "pryr", "rtracklayer"]
     },
     "CAGEr": {
       "name": "CAGEr",
-      "version": "2.10.0",
-      "sha256": "1amx7l5y1v8ccmlpjmr9wm2dbc85xadx4ayy8m45vabi97j8nrp4",
-      "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "CAGEfightR", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "KernSmooth", "MultiAssayExperiment", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "data_table", "formula_tools", "ggplot2", "gtools", "memoise", "plyr", "reshape2", "rtracklayer", "som", "stringdist", "stringi", "vegan"]
+      "version": "2.12.0",
+      "sha256": "17hxhpsh6cvifrkzfz4l643kvphbahn9w54dc3xfal6f135cyal7",
+      "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "CAGEfightR", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "KernSmooth", "MultiAssayExperiment", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "data_table", "formula_tools", "ggplot2", "gtools", "memoise", "plyr", "reshape2", "rlang", "rtracklayer", "scales", "som", "stringdist", "stringi", "vegan"]
     },
     "CAMERA": {
       "name": "CAMERA",
-      "version": "1.60.0",
-      "sha256": "1wcihfi7vzdb5xkk2r7cdb4pqdbnph01m3dsz126984rzplpcd44",
+      "version": "1.62.0",
+      "sha256": "0b6k1k6qaapp17cqjjzz11bcg98q41b2llyyj12vz9ngy3qn570a",
       "depends": ["Biobase", "Hmisc", "RBGL", "graph", "igraph", "xcms"]
     },
     "CARNIVAL": {
       "name": "CARNIVAL",
-      "version": "2.14.0",
-      "sha256": "05cjffkhawhrbvd9m4blm8klkhpv939qgnhpyx0mqfmk8b63rc26",
+      "version": "2.16.0",
+      "sha256": "05sx2p8i0gxxki26nbb76xm2i2m8fdabi6k5li5yncg3p28gw3q2",
       "depends": ["dplyr", "igraph", "lpSolve", "readr", "rjson", "rmarkdown", "stringr", "tibble", "tidyr"]
     },
     "CATALYST": {
       "name": "CATALYST",
-      "version": "1.28.0",
-      "sha256": "168yfkqlg6af8ndlw4wzb9adg4lgkgkjbsi4a435ks0n4c9dycb7",
+      "version": "1.30.2",
+      "sha256": "0i6rf1z1m4v43aw7mh4j44a7mscz5xnbnbmpbgzksw74zjg17604",
       "depends": ["ComplexHeatmap", "ConsensusClusterPlus", "FlowSOM", "Matrix", "RColorBrewer", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "cowplot", "data_table", "dplyr", "drc", "flowCore", "ggplot2", "ggrepel", "ggridges", "gridExtra", "matrixStats", "nnls", "purrr", "reshape2", "scales", "scater"]
     },
     "CBEA": {
       "name": "CBEA",
-      "version": "1.4.0",
-      "sha256": "0j43lvz55xawwk723rsfpir6vir5wbxpwslpk4x2frslf5i00mky",
+      "version": "1.6.0",
+      "sha256": "1mbd62wakjn9pwhy2q2hfxkx09ny577a4j6lssnjj65jb3s7gjr6",
       "depends": ["BiocParallel", "BiocSet", "Rcpp", "SummarizedExperiment", "TreeSummarizedExperiment", "dplyr", "fitdistrplus", "generics", "glue", "goftest", "lmom", "magrittr", "mixtools", "rlang", "tibble", "tidyr"]
     },
     "CBNplot": {
       "name": "CBNplot",
-      "version": "1.4.0",
-      "sha256": "1n85clswpk1xxfq423sgk38qb9kjkjj2kghnxw8a4618vxypwsrv",
-      "depends": ["BiocFileCache", "ExperimentHub", "Rmpfr", "bnlearn", "clusterProfiler", "depmap", "dplyr", "enrichplot", "ggdist", "ggforce", "ggplot2", "ggraph", "graphite", "graphlayouts", "igraph", "magrittr", "oaqc", "org_Hs_eg_db", "patchwork", "purrr", "pvclust", "reshape2", "rlang", "stringr", "tidyr"]
+      "version": "1.6.0",
+      "sha256": "1xg1d3p64h9pqfk9kb889c3vnnvcvzn3dncr3v76zxmlfr6vn215",
+      "depends": ["BiocFileCache", "ExperimentHub", "Rmpfr", "bnlearn", "clusterProfiler", "depmap", "dplyr", "enrichplot", "ggdist", "ggforce", "ggplot2", "ggraph", "graphite", "graphlayouts", "igraph", "magrittr", "org_Hs_eg_db", "patchwork", "purrr", "pvclust", "reshape2", "rlang", "stringr", "tidyr"]
     },
     "CCPROMISE": {
       "name": "CCPROMISE",
-      "version": "1.30.0",
-      "sha256": "0qicm8zgr4897m0ldlmsrchi66b3swfdxy2gv12pnssjmrybq5di",
+      "version": "1.32.0",
+      "sha256": "0596j63169n0gsn24j52l0ph8ryynklsv26akfy514d96vm52nwg",
       "depends": ["Biobase", "CCP", "GSEABase", "PROMISE"]
     },
     "CCPlotR": {
       "name": "CCPlotR",
-      "version": "1.2.0",
-      "sha256": "05qh8yqk2yv4vw314aflys7qn4kwhy839wj5cdw9iysaklkyjscg",
+      "version": "1.4.0",
+      "sha256": "0iyrg8ibah5lny59y8496k6v6gpgpyc8vw0kszmryb6sf63n5ks9",
       "depends": ["ComplexHeatmap", "RColorBrewer", "circlize", "dplyr", "forcats", "ggbump", "ggh4x", "ggplot2", "ggraph", "ggtext", "igraph", "patchwork", "plyr", "scales", "scatterpie", "stringr", "tibble", "tidyr", "viridis"]
     },
     "CDI": {
       "name": "CDI",
-      "version": "1.2.0",
-      "sha256": "0nc4s8prs6p0k7qp2lc5fzdqx177y1xamrwizldwi5p3yq1zq1nx",
+      "version": "1.4.0",
+      "sha256": "18m3m39hqhl225f1cm8hgf8xldgj23c8ywlq83s4csdwagqigxbm",
       "depends": ["BiocParallel", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggsci", "matrixStats", "reshape2"]
     },
     "CEMiTool": {
       "name": "CEMiTool",
-      "version": "1.28.0",
-      "sha256": "1pcyw8njyrcjriyzq52km0qhn1n288gqvn1qdkzx2yfv4a1i6rxk",
+      "version": "1.30.0",
+      "sha256": "00ycl82cnphnzxmyli7fxs2wlgyx64131s4gvkigi5rbbaiij24k",
       "depends": ["DT", "WGCNA", "clusterProfiler", "data_table", "dplyr", "fastcluster", "fgsea", "ggdendro", "ggplot2", "ggpmisc", "ggrepel", "ggthemes", "gridExtra", "gtable", "htmltools", "igraph", "intergraph", "knitr", "matrixStats", "network", "pracma", "rmarkdown", "scales", "sna", "stringr"]
     },
     "CFAssay": {
       "name": "CFAssay",
-      "version": "1.38.0",
-      "sha256": "1j2bprw0dq4cn4md2ixh3jmk507w0zlzm65gvx9k3z924la0hyhv",
+      "version": "1.40.0",
+      "sha256": "0ssph2s9cqzfccd628q4zqvra7lrlnbdq4bbk9vzdx3ahri5m4r9",
       "depends": []
     },
     "CGEN": {
       "name": "CGEN",
-      "version": "3.40.0",
-      "sha256": "01ayir95zhdcxnczzggx914q9x0awcr3hvfxvswqdjcl5a5490k1",
+      "version": "3.42.0",
+      "sha256": "1skk62ziygjlx23b4nl5nc9ryjq133w76cnhnv9hq9b09mj4g9nj",
       "depends": ["mvtnorm", "survival"]
     },
     "CGHbase": {
       "name": "CGHbase",
-      "version": "1.64.0",
-      "sha256": "1fz39fdkfvfhzm69pfvliqvp48wsldwm3kpgbsaacrdh46jg5vzk",
+      "version": "1.66.0",
+      "sha256": "0gcw2765ljqnhvnmawxhcz8xrfrjvh9slsaqhy8ggzhr47g7xnb6",
       "depends": ["Biobase", "marray"]
     },
     "CGHcall": {
       "name": "CGHcall",
-      "version": "2.66.0",
-      "sha256": "1gjd3ggiw93cwcacjb1472ia98aaapj9gln04v5pbwmp2r4xfcs7",
+      "version": "2.68.0",
+      "sha256": "178gi1d0mdm201ay1srikndd6dsbi41rmn8h3rvmv3q2ngzk70hm",
       "depends": ["Biobase", "CGHbase", "DNAcopy", "impute", "snowfall"]
     },
     "CGHnormaliter": {
       "name": "CGHnormaliter",
-      "version": "1.58.0",
-      "sha256": "06zsh097v8hfz9yh7q4ppvnlxvgqgs3yzm724khbzi8xfz1h3yja",
+      "version": "1.60.0",
+      "sha256": "0zi9yj3clqaf7gz3y8b1zg6x5v7py77j73b31dy3kg370mw4qc95",
       "depends": ["Biobase", "CGHbase", "CGHcall"]
     },
     "CGHregions": {
       "name": "CGHregions",
-      "version": "1.62.0",
-      "sha256": "0swyfbc37mxghphgrlh735gg3w3wnlmplrrlksr7jb8gdzvcczbk",
+      "version": "1.64.0",
+      "sha256": "1zd41040m8k91c0gwqjivl8r8371f2rkhrlyaq61z0yx9qd0prig",
       "depends": ["Biobase", "CGHbase"]
     },
     "CHETAH": {
       "name": "CHETAH",
-      "version": "1.20.0",
-      "sha256": "19vb0c9kla6jn79v5sc8sig195lnzzhki2089pvjsy4gw2q3nmnh",
+      "version": "1.22.0",
+      "sha256": "1s4i9xmfksq1zb2r2jdmila0qc04f80pvwkzi9zxygsidx6d2n9g",
       "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bioDist", "corrplot", "cowplot", "dendextend", "ggplot2", "pheatmap", "plotly", "reshape2", "shiny"]
     },
     "CHRONOS": {
       "name": "CHRONOS",
-      "version": "1.32.0",
-      "sha256": "06ynbgmzp820l85n25lrhks1vl1ccaf3giypgp59s79v496vps3x",
+      "version": "1.34.0",
+      "sha256": "0q9r5xlk9ng85z3lyr3sk7fz31yzphakm70qh29n0qkn4hinnghr",
       "depends": ["RBGL", "RCurl", "XML", "biomaRt", "circlize", "doParallel", "foreach", "graph", "igraph", "openxlsx", "rJava"]
     },
     "CIMICE": {
       "name": "CIMICE",
-      "version": "1.12.0",
-      "sha256": "18m6mb1r9s8cqi1lsignmf9p8q7qigazxyif14z6f1h5kdcs6707",
+      "version": "1.14.0",
+      "sha256": "00c07gs5syzhq7nh288vmx2bbcl6qk5db5b4ianysdp7x4794jg2",
       "depends": ["Matrix", "assertthat", "dplyr", "expm", "ggcorrplot", "ggplot2", "ggraph", "glue", "igraph", "maftools", "networkD3", "purrr", "tidygraph", "tidyr", "visNetwork"]
     },
     "CINdex": {
       "name": "CINdex",
-      "version": "1.32.0",
-      "sha256": "1cgq0bcrgdwzxci47issdck4pz8pnbpfzz7i57mi0ga3jqih0g2i",
+      "version": "1.34.0",
+      "sha256": "0ks867899b912gxqdvyiwnvikiikfmfrd2d52ps5430avjhkipvp",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bitops", "dplyr", "gplots", "gridExtra", "png", "som", "stringr"]
     },
     "CMA": {
       "name": "CMA",
-      "version": "1.62.0",
-      "sha256": "08q64y5f52p3skpxk7fva30h41ar3751jk3528gicnqngbb3wv3g",
+      "version": "1.64.0",
+      "sha256": "0v7yzm8vfb2i2irg55rbhcm66ila2lcwkgxxcqqfpw2h4hqwx0v9",
       "depends": ["Biobase"]
     },
     "CNAnorm": {
       "name": "CNAnorm",
-      "version": "1.50.0",
-      "sha256": "0z9x4khrsdinb5dhi7zgfa4pj55h7300fp3a636akwjq3pwzlvlp",
+      "version": "1.52.0",
+      "sha256": "18w48lxif8xzfmi3kxi2diq80498kd3jjk0ckf5fz1cp8n82fslg",
       "depends": ["DNAcopy"]
     },
     "CNEr": {
       "name": "CNEr",
-      "version": "1.40.0",
-      "sha256": "19kfh7p8zlb1nbwpsj6i1b7pqy829dij7n7iavznhxw44cmif6sv",
+      "version": "1.42.0",
+      "sha256": "0f4hbg5vprsygpd3d79vrvz2d35rbicv5wgllnk5cyvyrgsp15c7",
       "depends": ["BiocGenerics", "Biostrings", "DBI", "GO_db", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "KEGGREST", "RSQLite", "R_utils", "S4Vectors", "XVector", "annotate", "ggplot2", "poweRlaw", "pwalign", "readr", "reshape2", "rtracklayer"]
     },
     "CNORdt": {
       "name": "CNORdt",
-      "version": "1.46.0",
-      "sha256": "1f9d2jmqxcmzvwvshf8yni0j28y13cdb5w9z1mcl7f3gcd0vn3rx",
+      "version": "1.48.0",
+      "sha256": "0dv9vq2qcmjwacxjwisrnm95khqf9p6idrycwgr3zm0d1ci5rzd9",
       "depends": ["CellNOptR", "abind"]
     },
     "CNORfeeder": {
       "name": "CNORfeeder",
-      "version": "1.44.0",
-      "sha256": "1q1xpdg0qbh5cqnjc080gbkaw20p3xksc76f7dxsprlnzzad9id5",
+      "version": "1.46.0",
+      "sha256": "0l47748si5fvlga8wxzxk4j47354k3y87b9y2br1f1njqz8z2ij0",
       "depends": ["CellNOptR", "graph"]
     },
     "CNORfuzzy": {
       "name": "CNORfuzzy",
-      "version": "1.46.0",
-      "sha256": "0wp9ma4c1nph6vximqizgmwvq29ijf5wkjda7yxc23hl51wig0gg",
+      "version": "1.48.0",
+      "sha256": "1bsr5bqqs5ymjlb46g9f3v1kd8smfk6qwspr4g94swl1hxswx6dv",
       "depends": ["CellNOptR", "nloptr"]
     },
     "CNORode": {
       "name": "CNORode",
-      "version": "1.46.0",
-      "sha256": "0j66h000p02qnd8jrhdydggxiljynndfvjv9vlh844mb8n0dxx53",
+      "version": "1.48.0",
+      "sha256": "1daxx83yli5qbf91yxlji6abb7v70s1fn0axh15w0ys9n57w7j93",
       "depends": ["CellNOptR", "genalg"]
     },
     "CNTools": {
       "name": "CNTools",
-      "version": "1.60.0",
-      "sha256": "1m049jdb1vp5161q4zhcxwbzbzappdg02h80ar9ppwd10chf3bsm",
+      "version": "1.62.0",
+      "sha256": "0w4zyacyr8zbqi26qkrv7gk5ih0r1f4w5qmma1z0scwa1sxfgqcj",
       "depends": ["genefilter"]
     },
     "CNVMetrics": {
       "name": "CNVMetrics",
-      "version": "1.8.0",
-      "sha256": "1vf04v7sr4f8mizzvbr3q4w83vdb62mabg5pl5dh53zvhrrzk1hi",
+      "version": "1.10.0",
+      "sha256": "1mjjmwgi6zcfly3xgivpk94kigvhpv61kwp0ybm1qkbnw871p4nb",
       "depends": ["BiocParallel", "GenomicRanges", "IRanges", "S4Vectors", "gridExtra", "magrittr", "pheatmap", "rBeta2009"]
     },
     "CNVPanelizer": {
       "name": "CNVPanelizer",
-      "version": "1.36.0",
-      "sha256": "0gpi1psr14b572xn4qx92lfxwy6d7jdkarf67w7f3glvif93vm9k",
+      "version": "1.38.0",
+      "sha256": "0115ifqr5n9wx4f8kzsih9m6g9zgm8c8mzjfvikv0nfhzr8b28z4",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "NOISeq", "Rsamtools", "S4Vectors", "foreach", "ggplot2", "gplots", "openxlsx", "plyr", "reshape2", "shiny", "shinyFiles", "shinyjs", "stringr", "testthat"]
     },
     "CNVRanger": {
       "name": "CNVRanger",
-      "version": "1.20.0",
-      "sha256": "1lwav9nv9rm7zyqxl9sx46vp4016i2175hvys3skj8myyjgcdd7n",
+      "version": "1.22.0",
+      "sha256": "0gf8fsjizh7c0d9b44gri95nw4yv56lk5kqd6wspy09h0agjaymx",
       "depends": ["BiocGenerics", "BiocParallel", "GDSArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "RaggedExperiment", "S4Vectors", "SNPRelate", "SummarizedExperiment", "data_table", "edgeR", "gdsfmt", "lattice", "limma", "plyr", "qqman", "rappdirs", "reshape2"]
     },
     "CNVfilteR": {
       "name": "CNVfilteR",
-      "version": "1.18.0",
-      "sha256": "1jqpdqcnyxww2h5x784yl3i07i3x5kf0xyqgv558rzs936gzc23a",
+      "version": "1.20.0",
+      "sha256": "1aibk5fcp2vxkw9ihrglfafk0pvnsg8r1prpdca806n5j52r2zfb",
       "depends": ["Biostrings", "CopyNumberPlots", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "VariantAnnotation", "assertthat", "karyoploteR", "pracma", "regioneR"]
     },
     "CNViz": {
       "name": "CNViz",
-      "version": "1.12.0",
-      "sha256": "1s7j8lrl999b7v76z91y56m8nyy3lwjmqlnd1qpxg23jdlgb6bhv",
+      "version": "1.14.0",
+      "sha256": "1clfk49abjq1vyyd0ab803jl9gd7ws9j6fydx8d1pxk85lksm7jl",
       "depends": ["CopyNumberPlots", "DT", "GenomicRanges", "dplyr", "karyoploteR", "magrittr", "plotly", "scales", "shiny"]
     },
     "CNVrd2": {
       "name": "CNVrd2",
-      "version": "1.42.0",
-      "sha256": "1kbs82a7pri8xv3ci9xdi47ml7r70wjxi0jnsxhrzbaqjss5b4v6",
+      "version": "1.44.0",
+      "sha256": "192vdqq2zd58z7mq5izp3ga268q4a1a6ibszr34m54r836wscl2x",
       "depends": ["DNAcopy", "IRanges", "Rsamtools", "VariantAnnotation", "ggplot2", "gridExtra", "rjags"]
     },
     "COCOA": {
       "name": "COCOA",
-      "version": "2.18.0",
-      "sha256": "0achirgsp2psybk140wiiagjr9qsapkhdmy4mnf5zg4hc8nx3yn3",
+      "version": "2.20.0",
+      "sha256": "0ifjr7xkrilhyckm2xpq35565rznag05nripl7kb446vbqn5lc8s",
       "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "GenomicRanges", "IRanges", "MIRA", "S4Vectors", "data_table", "fitdistrplus", "ggplot2", "simpleCache", "tidyr"]
     },
     "CODEX": {
       "name": "CODEX",
-      "version": "1.36.0",
-      "sha256": "0p3d7hqi14qclz4d7fhp3x4z2dnkwpzpzlgrwacj4njkw94cwdaz",
+      "version": "1.38.0",
+      "sha256": "0zqpgiqhcjr04kff1qg0gihwds3kjdy3f2gj14yynfbnmxklrmz2",
       "depends": ["BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "GenomeInfoDb", "IRanges", "Rsamtools", "S4Vectors"]
     },
     "COMPASS": {
       "name": "COMPASS",
-      "version": "1.42.0",
-      "sha256": "0xh3ysmcz4bjqcyqdv9wrmfgblj3k7g7i6wiw2m1vmx5gf98rfpa",
+      "version": "1.44.0",
+      "sha256": "1pnfyyfjrsalc4ilaxbi566rni6yjhgz1ha5n15vz485rwblvp8j",
       "depends": ["BiocStyle", "RColorBrewer", "Rcpp", "abind", "clue", "coda", "data_table", "dplyr", "foreach", "knitr", "magrittr", "pdist", "plyr", "reshape2", "rlang", "rmarkdown", "scales", "tidyr"]
     },
     "CONFESS": {
       "name": "CONFESS",
-      "version": "1.32.0",
-      "sha256": "14m7nz6ls58g4c45x5m7r30ms3kgxslg22jikjsi1cx49ycyk9dl",
+      "version": "1.34.0",
+      "sha256": "0hd90fkbq2m40ql6cmkfklwnnjgmgv0fw1j9ddasc1326n85qn8i",
       "depends": ["EBImage", "MASS", "SamSPECTRAL", "changepoint", "cluster", "contrast", "data_table", "ecp", "flexmix", "flowClust", "flowCore", "flowMeans", "flowMerge", "flowPeaks", "foreach", "ggplot2", "limma", "moments", "outliers", "plotrix", "raster", "readbitmap", "reshape2", "waveslim", "wavethresh", "zoo"]
     },
     "CONSTANd": {
       "name": "CONSTANd",
-      "version": "1.12.0",
-      "sha256": "17vfhh6w2sxnliv68wraf24z85dw369cs58nsrql6xgrm1wyp6h6",
+      "version": "1.14.0",
+      "sha256": "1jzl6krqy51fsk9l9jn1gqh1lviwsq98n0rnkh4z8d968s7mrzyy",
       "depends": []
     },
     "COSNet": {
       "name": "COSNet",
-      "version": "1.38.0",
-      "sha256": "0bb5lz4yqhhq2qjx7381877bwyrmh8286m9yq3fhyhzm4g6l4hfn",
+      "version": "1.40.0",
+      "sha256": "1jp7l3chnyshva82f7qaz59gvwhz855x6257bq250nljwbv62x54",
       "depends": []
     },
     "COTAN": {
       "name": "COTAN",
-      "version": "2.4.4",
-      "sha256": "1b4g6wkk90kjrv8dz4larg3b7pyyid3z7336niwjp7x0ms6hp3zw",
-      "depends": ["BiocSingular", "ComplexHeatmap", "Matrix", "PCAtools", "RColorBrewer", "Rfast", "Seurat", "assertthat", "circlize", "dendextend", "dplyr", "ggplot2", "ggrepel", "ggthemes", "parallelDist", "parallelly", "plyr", "rlang", "scales", "stringr", "tibble", "tidyr", "umap", "withr", "zeallot"]
+      "version": "2.6.1",
+      "sha256": "1gd7zvv05m6lxgscl0ng4vhfrj3iip5wh96qvp5m4frhy618757x",
+      "depends": ["BiocSingular", "ComplexHeatmap", "Matrix", "PCAtools", "RColorBrewer", "Rfast", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "circlize", "dendextend", "dplyr", "ggplot2", "ggrepel", "ggthemes", "parallelDist", "parallelly", "plyr", "rlang", "scales", "stringr", "tibble", "tidyr", "umap", "withr", "zeallot"]
     },
     "CRISPRball": {
       "name": "CRISPRball",
-      "version": "1.0.0",
-      "sha256": "1gxwmasr37azvc7h98izv0npxq5n7hvk1bvl2rgj5fv6da2ddmki",
+      "version": "1.2.0",
+      "sha256": "04gma48r31sirl33r74xfh884gpx06aydm1vdqissmsli0kqnxd3",
       "depends": ["ComplexHeatmap", "DT", "InteractiveComplexHeatmap", "MAGeCKFlute", "PCAtools", "circlize", "colourpicker", "dittoSeq", "ggplot2", "htmlwidgets", "matrixStats", "plotly", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs"]
     },
     "CRISPRseek": {
       "name": "CRISPRseek",
-      "version": "1.44.0",
-      "sha256": "1vmqwpbl1gplrr45bqs90np0cmrkqshw660k4sxmj9s9k0xdms7c",
+      "version": "1.46.0",
+      "sha256": "1p5983v1w4rj2i5ch2g3ygzxqssqvgv222anf3060s9zsyiycm9a",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "data_table", "dplyr", "hash", "keras", "mltools", "reticulate", "rhdf5", "seqinr"]
     },
     "CRImage": {
       "name": "CRImage",
-      "version": "1.52.0",
-      "sha256": "0nnyzgdn25s2m9x4xglp12z2b4fai5sbfnx935qadk0b9gb62bdg",
+      "version": "1.54.0",
+      "sha256": "08gh04dslr08dw5cb954v0p9p65g88yqdrlbwz4qyysva4yali0f",
       "depends": ["DNAcopy", "EBImage", "MASS", "aCGH", "e1071", "foreach", "sgeostat"]
     },
     "CSAR": {
       "name": "CSAR",
-      "version": "1.56.0",
-      "sha256": "0gdzj5czyj2r7gf7fkliydy6w1cyl92lby071jfyihfz5hwh55yr",
+      "version": "1.58.0",
+      "sha256": "1baqklp2pa7nam2vcjanpy4hip9dgmx9bxi1czdb92rrjgr6vk2l",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors"]
     },
     "CSSQ": {
       "name": "CSSQ",
-      "version": "1.16.0",
-      "sha256": "1jwrp0b6qkkc538j1vshqgkazajs9q3fq3dda3cl9a8cbma9jpfg",
+      "version": "1.18.0",
+      "sha256": "049lh3qypngcgz0a1yvmddighfyc81fm76amvmf4b9zgirdgf16p",
       "depends": ["GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "ggplot2", "rtracklayer"]
     },
     "CTDquerier": {
       "name": "CTDquerier",
-      "version": "2.12.0",
-      "sha256": "11z3gy6gn735dydjissdc09kllfd9qvg0gsf5v7a700fz6d78j2a",
+      "version": "2.14.0",
+      "sha256": "0kgnvsw13hmnkjy7ka23p6n5ixnyxim994q200jxcbnp7as0fh0b",
       "depends": ["BiocFileCache", "RCurl", "S4Vectors", "ggplot2", "gridExtra", "igraph", "stringdist", "stringr"]
     },
     "CTSV": {
       "name": "CTSV",
-      "version": "1.6.0",
-      "sha256": "1m7a0dqkpiwf234xags4fpg7s41bdhmsdd2ma375w49624wbwkyz",
+      "version": "1.8.0",
+      "sha256": "1i5zlcjyxs8y8wfhn9jfxgkfbz0r05if7hshvacx33c64drpj8jc",
       "depends": ["BiocParallel", "SpatialExperiment", "SummarizedExperiment", "knitr", "pscl", "qvalue"]
     },
     "CTdata": {
       "name": "CTdata",
-      "version": "1.4.0",
-      "sha256": "0hq3jfgb1sxzbs99m2r2xnymjz9dwaim3zpkn6icwgrfbgxil82l",
+      "version": "1.6.0",
+      "sha256": "1wyxhwhix4cpj02y0pvqa7l6lfqffwvsnk8sy36xp9fazxp962dy",
       "depends": ["ExperimentHub"]
     },
     "CTexploreR": {
       "name": "CTexploreR",
-      "version": "1.0.0",
-      "sha256": "0ld0hzd7vynwvks0bjggc3kfgdzb0jlsjxn1ggk68f2gxrqxv8i8",
+      "version": "1.2.0",
+      "sha256": "1k5c7zp5ks53n46gzay1dpax7018082mn70blzxy7vhdmwigisjl",
       "depends": ["BiocGenerics", "CTdata", "ComplexHeatmap", "GenomicRanges", "IRanges", "MatrixGenerics", "SingleCellExperiment", "SummarizedExperiment", "circlize", "dplyr", "ggplot2", "ggrepel", "rlang", "tibble", "tidyr"]
     },
     "CaDrA": {
       "name": "CaDrA",
-      "version": "1.2.0",
-      "sha256": "1m7ggdji6j64b6mz6ak2y8f8xyyi8l1gig5b13ksz7j6fgcbyx71",
-      "depends": ["MASS", "R_cache", "SummarizedExperiment", "doParallel", "ggplot2", "gplots", "gtable", "misc3d", "plyr", "ppcor", "reshape2"]
+      "version": "1.4.0",
+      "sha256": "1vb1rq4bs24swcswxvsid1bhc1lpivrynqsy39lb362d0bmgr211",
+      "depends": ["MASS", "R_cache", "SummarizedExperiment", "doParallel", "ggplot2", "gplots", "gtable", "knnmi", "misc3d", "plyr", "ppcor", "reshape2"]
     },
     "CaMutQC": {
       "name": "CaMutQC",
-      "version": "1.0.0",
-      "sha256": "1rri2730mpmz0nqb26kqfq950sgw0x97j8xk9vw09m7g89973zzs",
+      "version": "1.2.0",
+      "sha256": "1b1i3nkqb31rdlaznwwcwn8ksvlw9wmi2xmhi07cq7zkh4mrpgjb",
       "depends": ["DT", "MesKit", "clusterProfiler", "data_table", "dplyr", "ggplot2", "maftools", "org_Hs_eg_db", "stringr", "tidyr", "vcfR"]
     },
     "Cardinal": {
       "name": "Cardinal",
-      "version": "3.6.5",
-      "sha256": "08ka7llgnjprfxnwj6fdydsr6azxj66mgkyjx0g9hbdcqn5ph6av",
+      "version": "3.8.3",
+      "sha256": "1nza7j7y22f16pwdgzplx8bacqdp4i2rmsr6zfa874ivr0mf5grj",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CardinalIO", "EBImage", "Matrix", "ProtGenerics", "S4Vectors", "irlba", "matter", "nlme"]
     },
     "CardinalIO": {
       "name": "CardinalIO",
-      "version": "1.2.1",
-      "sha256": "1kzqz2zba8i5z1pkwwi0hzb6fm7xh22bymkk1jwicyrk94fzfw1l",
-      "depends": ["S4Vectors", "matter", "ontologyIndex"]
+      "version": "1.4.0",
+      "sha256": "1b773hvdk5dqkrzpb5yyb85xszpkn9pdkyzdsid406zfhsqwwn97",
+      "depends": ["BiocParallel", "S4Vectors", "matter", "ontologyIndex"]
     },
     "Category": {
       "name": "Category",
-      "version": "2.70.0",
-      "sha256": "0paz6h8rsbqvlxxj4di8cl76aybgjr842z5gdv8xi6c2d7zwbclw",
+      "version": "2.72.0",
+      "sha256": "0s65rfk9sw02qdqk7jhbkjybx1sm0hq0impdcxyypxbg77db5wk2",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GSEABase", "Matrix", "RBGL", "annotate", "genefilter", "graph"]
     },
+    "CatsCradle": {
+      "name": "CatsCradle",
+      "version": "1.0.0",
+      "sha256": "1xfinxwqrdlpr0x9jh37zw0f7sqsbi6484zljal1s7q7in47c38z",
+      "depends": ["EBImage", "Matrix", "Rfast", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "abind", "data_table", "geometry", "ggplot2", "igraph", "msigdbr", "networkD3", "pheatmap", "pracma", "rdist", "reshape2", "stringr"]
+    },
     "CausalR": {
       "name": "CausalR",
-      "version": "1.36.0",
-      "sha256": "0rf37qjl80wczgmb8lbnvzyq10v1fkqdgll24cg4b3vfhsscw0fl",
+      "version": "1.38.0",
+      "sha256": "089fhrl4n621pp7sba6hfbzv2wbiz3sqnb9yg6cwzlh0dw4wjy1k",
       "depends": ["igraph"]
     },
     "CeTF": {
       "name": "CeTF",
-      "version": "1.16.0",
-      "sha256": "0vpy0ns19wnq9pqhkc1dlx2b0y9rjxznq61z242p53gvh05zmzxi",
+      "version": "1.18.0",
+      "sha256": "13n7ym57fzzdx6d1b5g3b1mj02k6pfwns5sqlnvhxfl4s5drm80d",
       "depends": ["ComplexHeatmap", "DESeq2", "GGally", "GenomicTools_fileHandler", "Matrix", "RCy3", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "circlize", "clusterProfiler", "dplyr", "ggnetwork", "ggplot2", "ggpubr", "ggrepel", "igraph", "network"]
     },
     "CellBarcode": {
       "name": "CellBarcode",
-      "version": "1.10.0",
-      "sha256": "006mlhzw5pwdr335q27f05jwwwra8fs563qph7ghlr8s7ws55q9g",
+      "version": "1.12.0",
+      "sha256": "1c9gbqjwa8kabiwsy5yc99pspc78isfy8867kpklzfwbvsf0c641",
       "depends": ["BH", "Biostrings", "Ckmeans_1d_dp", "Rcpp", "Rsamtools", "S4Vectors", "ShortRead", "data_table", "egg", "ggplot2", "magrittr", "plyr", "seqinr", "stringr", "zlibbioc"]
     },
     "CellBench": {
       "name": "CellBench",
-      "version": "1.20.0",
-      "sha256": "0azswhd2r9yf2qlz31105kk911iaxfxd2b4drvdq2f57asqw6mwm",
+      "version": "1.22.0",
+      "sha256": "0c9qaqql1bcm4r1lhxlmbbw1v0l6z9g3dwaq3cm863fhi4822xl4",
       "depends": ["BiocFileCache", "BiocGenerics", "BiocParallel", "SingleCellExperiment", "assertthat", "dplyr", "glue", "lubridate", "magrittr", "memoise", "purrr", "rappdirs", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "CellMapper": {
       "name": "CellMapper",
-      "version": "1.30.0",
-      "sha256": "058f2ik0v7fw7cbk5fhc90zifg2dzc8bmrv0kdd2rshvxfjp48xv",
+      "version": "1.32.0",
+      "sha256": "1jbdpclya852yv9z2qb807spwrvs5yw8vnq2i238pbc4a7qngjvh",
       "depends": ["S4Vectors"]
     },
     "CellMixS": {
       "name": "CellMixS",
-      "version": "1.20.0",
-      "sha256": "16l2kw8rbnhn4qyz6sg1pnjfc6cjc12lsx5qzyysnpbpmgm7yqrv",
+      "version": "1.22.0",
+      "sha256": "1xg099xjbm6p4b36yvgckcirc4n0bm5md66gk9vyb9azka56x83r",
       "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "ggplot2", "ggridges", "kSamples", "magrittr", "purrr", "scater", "tidyr", "viridis"]
     },
     "CellNOptR": {
       "name": "CellNOptR",
-      "version": "1.50.0",
-      "sha256": "0b6q0xrhyqnpzwkwsdywv008axhikmagpx11z85vik1mml12nhs7",
+      "version": "1.52.0",
+      "sha256": "1gzjmxycgxd8zvjksfyp08sasgv532vk3864pg7ilmch96q8sw9r",
       "depends": ["RBGL", "RCurl", "Rgraphviz", "XML", "ggplot2", "graph", "igraph", "rmarkdown", "stringi", "stringr"]
     },
     "CellScore": {
       "name": "CellScore",
-      "version": "1.24.0",
-      "sha256": "17aspmnfs4asixn6cc12k0q4an70642cgx0wy650aqhhkqjlyq88",
+      "version": "1.26.0",
+      "sha256": "084bnxd132lfjk66lrx30qx33d7i37n6h8vzrqj0a7acag6w0mni",
       "depends": ["Biobase", "RColorBrewer", "SummarizedExperiment", "gplots", "lsa", "squash"]
     },
     "CellTrails": {
       "name": "CellTrails",
-      "version": "1.22.0",
-      "sha256": "0pqazyf5da9zw95gpmhlj9mbhvv78c0rl6cncy3pij293xcy02l4",
+      "version": "1.24.0",
+      "sha256": "11wbq43jrmh9g3p55hc2z4q9kvqpivmrzn58c5b47wrggayi66na",
       "depends": ["Biobase", "BiocGenerics", "EnvStats", "Rtsne", "SingleCellExperiment", "SummarizedExperiment", "cba", "dendextend", "dtw", "ggplot2", "ggrepel", "igraph", "maptree", "mgcv", "reshape2"]
     },
     "CelliD": {
       "name": "CelliD",
-      "version": "1.12.0",
-      "sha256": "0c7hls5qasjd5ahrqxp2mpd402jc12pi0pgy7spcbp1fkqm8qvbl",
+      "version": "1.14.0",
+      "sha256": "0qgkyl57ggkx9577a6lvpxb3vcqhjgi5r1l56xbxniphjcq41cpy",
       "depends": ["BiocParallel", "Matrix", "Rcpp", "RcppArmadillo", "Rtsne", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "data_table", "fastmatch", "fgsea", "ggplot2", "glue", "irlba", "matrixStats", "pbapply", "reticulate", "scater", "stringr", "tictoc", "umap"]
     },
     "Cepo": {
       "name": "Cepo",
-      "version": "1.10.2",
-      "sha256": "1vqfb797q3pd69ana2m7vbd89jzqkbhc3xhfzskj5cxrggd4d2cv",
+      "version": "1.12.0",
+      "sha256": "1qwz3y80sy6yjc3mc024pi76q019rs9vbpqwdi8fijmci6xgbyx2",
       "depends": ["BiocParallel", "DelayedArray", "DelayedMatrixStats", "GSEABase", "HDF5Array", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "patchwork", "purrr", "reshape2", "rlang"]
     },
     "CexoR": {
       "name": "CexoR",
-      "version": "1.42.0",
-      "sha256": "09376wzlknf8nlq81rrbbfsbbgd4mi5aagry51nykw5vc0870vdn",
+      "version": "1.44.0",
+      "sha256": "17w7mnrcv3kv5wnnaxs9nnb00wr7dbkpsdgwhp0n6jh4qbq2dzqb",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "genomation", "idr", "rtracklayer"]
     },
     "ChAMP": {
       "name": "ChAMP",
-      "version": "2.34.0",
-      "sha256": "06q539yhbmbp7qr71cwjai2vdw5nnhhjdv2ajlqmlyjpg04arc7v",
+      "version": "2.36.0",
+      "sha256": "0cbgzkza1gqrqyk32i9vy1s3qvvr0wx2j0fjwg1cqy42qdy24rax",
       "depends": ["ChAMPdata", "DMRcate", "DNAcopy", "DT", "GenomicRanges", "Hmisc", "Illumina450ProbeVariants_db", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "RColorBrewer", "RPMM", "bumphunter", "combinat", "dendextend", "doParallel", "ggplot2", "globaltest", "goseq", "illuminaio", "impute", "isva", "kpmt", "limma", "marray", "matrixStats", "minfi", "missMethyl", "plotly", "plyr", "preprocessCore", "prettydoc", "quadprog", "qvalue", "rmarkdown", "shiny", "shinythemes", "sva", "wateRmelon"]
     },
     "ChIPComp": {
       "name": "ChIPComp",
-      "version": "1.34.0",
-      "sha256": "013lmgdkj596gqzm0nlxjqpv0w94hap9vndp5znqpk4inq88gj8m",
+      "version": "1.36.0",
+      "sha256": "1pbzqldavg21zds4v9yvhfdf0knli7z66xldsmdz646v6f1q1579",
       "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm9", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "limma", "rtracklayer"]
     },
     "ChIPQC": {
       "name": "ChIPQC",
-      "version": "1.40.0",
-      "sha256": "0lnk5lchwjnrr03x2r6lwgrja42n0rhfp5w9sya2y69da47bcks4",
+      "version": "1.42.0",
+      "sha256": "01p2iahschwm3fy0sf1p79cm7f6z59a4y7akg99cmx44zwlzbj2x",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DiffBind", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Nozzle_R1", "Rsamtools", "S4Vectors", "TxDb_Celegans_UCSC_ce6_ensGene", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "TxDb_Rnorvegicus_UCSC_rn4_ensGene", "chipseq", "ggplot2", "gtools", "reshape2"]
     },
     "ChIPXpress": {
       "name": "ChIPXpress",
-      "version": "1.48.0",
-      "sha256": "09lkm6s98ip9pw9cwdx8a0z816krr4cgzrcrd7b3d4v4bcywsy7z",
+      "version": "1.50.0",
+      "sha256": "1whym24hvzaz0j60iblgwayw20lz5362mqxn2n1kmikrn4whz5gv",
       "depends": ["Biobase", "ChIPXpressData", "GEOquery", "affy", "biganalytics", "bigmemory", "frma"]
     },
     "ChIPanalyser": {
       "name": "ChIPanalyser",
-      "version": "1.26.0",
-      "sha256": "0jxsy6xd4cr3w5zjjxkziiqpzhg8fld0fh4c3rr34823646ly9ja",
+      "version": "1.28.0",
+      "sha256": "15xm5xap4vws1ah0iidb8529x53kw5k3hvli7xlz5gfpicdfg3hh",
       "depends": ["BSgenome", "BiocManager", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "ROCR", "RcppRoll", "S4Vectors", "rtracklayer"]
     },
     "ChIPexoQual": {
       "name": "ChIPexoQual",
-      "version": "1.28.0",
-      "sha256": "0y39fpbnykqf5ycpi9q3rw73dkn2ksll7n6nafimxvxsh463d8ky",
+      "version": "1.30.0",
+      "sha256": "0xmznc8cc6nphzr5gkc4cccix80d5397qnqwx6q7imdfbm0ygy8i",
       "depends": ["BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "biovizBase", "broom", "data_table", "dplyr", "ggplot2", "hexbin", "rmarkdown", "scales", "viridis"]
     },
     "ChIPpeakAnno": {
       "name": "ChIPpeakAnno",
-      "version": "3.38.1",
-      "sha256": "11mswd6y4c8l0adrpc4z8hh96dcx59bf70zy572r5lfsj8rz0rgk",
+      "version": "3.40.0",
+      "sha256": "0zzpmrni4la6d2zws8wxak51lnn9g2i9xbwj1f3micpyn1bxlsc9",
       "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "InteractionSet", "KEGGREST", "RBGL", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "biomaRt", "data_table", "dplyr", "ensembldb", "ggplot2", "graph", "matrixStats", "multtest", "pwalign", "regioneR", "rtracklayer", "scales", "stringr", "tibble", "tidyr", "universalmotif"]
     },
     "ChIPseeker": {
       "name": "ChIPseeker",
-      "version": "1.40.0",
-      "sha256": "00iknjk7vgj48vj1pp7l98g7nvc3x495z3jcq5nbvdiff02faj1f",
-      "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "aplot", "boot", "dplyr", "enrichplot", "ggplot2", "gplots", "gtools", "magrittr", "plotrix", "rtracklayer", "tibble", "yulab_utils"]
+      "version": "1.42.0",
+      "sha256": "0l15apga9c0pcclvdx4zdyl9zd3v4isc5rb95d7h7s2wa3mskaxh",
+      "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "aplot", "boot", "dplyr", "enrichplot", "ggplot2", "gplots", "gtools", "magrittr", "plotrix", "rlang", "rtracklayer", "scales", "tibble", "yulab_utils"]
     },
     "ChIPseqR": {
       "name": "ChIPseqR",
-      "version": "1.58.0",
-      "sha256": "1lgwy6qprrvx1yv04vx567kr5b6mwz46kwafsqldwgqr2by45kgm",
+      "version": "1.60.0",
+      "sha256": "1zflq6b863iiixgrvrj68g6kfkfvl2aki2ivr4151wqf7yxr00i0",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "HilbertVis", "IRanges", "S4Vectors", "ShortRead", "fBasics", "timsac"]
     },
     "ChIPsim": {
       "name": "ChIPsim",
-      "version": "1.58.0",
-      "sha256": "1cwn6khf8z3ijyjgz0sih24la4fw54ynw9vy0z2hi17vnp4136qi",
+      "version": "1.60.0",
+      "sha256": "1sj4d87y1pj56mhb4v0snk5pqd79pxb42d5kg10ijvmpygbz68nq",
       "depends": ["Biostrings", "IRanges", "ShortRead", "XVector"]
     },
     "ChemmineOB": {
       "name": "ChemmineOB",
-      "version": "1.42.0",
-      "sha256": "17yvmdg16pb1dmx160n6vcgw3sa1yf40f8yzivdyic3sckn4z4bw",
+      "version": "1.44.0",
+      "sha256": "0nvlc2s5s9w7zqalay6dz73mqrcalbkyv43jx52pcgnl842r4g95",
       "depends": ["BH", "BiocGenerics", "Rcpp", "zlibbioc"]
     },
     "ChemmineR": {
       "name": "ChemmineR",
-      "version": "3.56.0",
-      "sha256": "1252xy33bgjrd4gh4shrgzklgxry2lf67svzxjra5yckf8am0rdc",
+      "version": "3.58.0",
+      "sha256": "0gydxqchyhgx1jq4p3658dvhiqpmwhynngcmpkac9sim9ym968db",
       "depends": ["BH", "BiocGenerics", "DBI", "DT", "RCurl", "Rcpp", "base64enc", "digest", "ggplot2", "gridExtra", "jsonlite", "png", "rjson", "rsvg", "stringi"]
     },
     "Chicago": {
       "name": "Chicago",
-      "version": "1.32.0",
-      "sha256": "05djywxsyfxb26d0clx51q7wmsw3rq56va444d6iy5n7xlhj9m94",
+      "version": "1.34.0",
+      "sha256": "1g86hffd0j3zyz654h0pn2pviykskkh40pcglf4bq99cxslnzww2",
       "depends": ["Delaporte", "Hmisc", "MASS", "data_table", "matrixStats"]
     },
     "ChromHeatMap": {
       "name": "ChromHeatMap",
-      "version": "1.58.0",
-      "sha256": "1kzrx26rj7wfki6l5g1426p30fch6b92x0y06rg17i3psbmmkmqg",
+      "version": "1.60.0",
+      "sha256": "0zmm3s4in1dswh82xhabaivcyn1lj5b0n0hric50mgws34z261bh",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "annotate", "rtracklayer"]
     },
     "ChromSCape": {
       "name": "ChromSCape",
-      "version": "1.14.0",
-      "sha256": "12chaigwnqm765p0qlf00s94kkg3dphj2cbqv3vfsyya54hbhfzr",
+      "version": "1.16.0",
+      "sha256": "1x4zkpm84hg6shim0s8jpp060g4dm4fvicpx9nf5p66ydwy1q0nm",
       "depends": ["BiocParallel", "ConsensusClusterPlus", "DT", "DelayedArray", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rsamtools", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "colorRamps", "colourpicker", "coop", "dplyr", "edgeR", "forcats", "fs", "gggenes", "ggplot2", "ggrepel", "gridExtra", "irlba", "jsonlite", "kableExtra", "matrixTests", "msigdbr", "plotly", "qs", "qualV", "rlist", "rtracklayer", "scater", "scran", "shiny", "shinyFiles", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyhelper", "shinyjs", "stringdist", "stringr", "tibble", "tidyr", "umap", "viridis"]
     },
     "CircSeqAlignTk": {
       "name": "CircSeqAlignTk",
-      "version": "1.6.0",
-      "sha256": "1i9izbf9mzlc7sl2zi5gj4dhxa6mq9kkyysxdq9cj4myhrp9hgwz",
+      "version": "1.8.0",
+      "sha256": "1iivgzlbq63f7f77c5j7ffr4s23qnq3rp37qsmdyysqkh6v46nc3",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "R_utils", "Rbowtie2", "Rhisat2", "Rsamtools", "S4Vectors", "ShortRead", "dplyr", "ggplot2", "htmltools", "magrittr", "plotly", "rlang", "shiny", "shinyFiles", "shinyjs", "tidyr"]
     },
     "CiteFuse": {
       "name": "CiteFuse",
-      "version": "1.16.0",
-      "sha256": "1vxynidr7p0khq54d08vzzh2ijaxx1ghm7pxnpg7zppfxvlmsh35",
+      "version": "1.18.0",
+      "sha256": "0w12i1bshc1nflmc8d36skc9phkxiql7vg2r27c88z4bc85qpzz3",
       "depends": ["Matrix", "Rcpp", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "compositions", "cowplot", "dbscan", "ggplot2", "ggraph", "ggridges", "gridExtra", "igraph", "mixtools", "pheatmap", "randomForest", "reshape2", "rhdf5", "rlang", "scales", "scran", "uwot"]
     },
     "ClassifyR": {
       "name": "ClassifyR",
-      "version": "3.8.3",
-      "sha256": "1p52jn7zq8kyfksrg74vjy43aw20qc02fw1cbhhb8liqq5bhxak0",
-      "depends": ["BiocParallel", "MultiAssayExperiment", "S4Vectors", "dplyr", "genefilter", "generics", "ggplot2", "ggpubr", "ggupset", "ranger", "reshape2", "rlang", "survival", "tidyr"]
+      "version": "3.10.5",
+      "sha256": "11pwk9aic12472sz5b33qjz427b477wyaclrjra7s8xjmacs49p3",
+      "depends": ["BiocParallel", "MultiAssayExperiment", "S4Vectors", "broom", "dcanr", "dplyr", "genefilter", "generics", "ggplot2", "ggpubr", "ggupset", "ranger", "reshape2", "rlang", "survival", "tidyr"]
+    },
+    "CleanUpRNAseq": {
+      "name": "CleanUpRNAseq",
+      "version": "1.0.0",
+      "sha256": "1ddqx7pzna1iqvl89n28pqgl3wbz3hailagj26iqcgwyirx46n4h",
+      "depends": ["AnnotationFilter", "BSgenome", "BiocGenerics", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "KernSmooth", "R6", "RColorBrewer", "Rsamtools", "Rsubread", "SummarizedExperiment", "edgeR", "ensembldb", "ggplot2", "ggrepel", "limma", "pheatmap", "qsmooth", "reshape2", "tximport"]
     },
     "Clomial": {
       "name": "Clomial",
-      "version": "1.40.0",
-      "sha256": "17n0s9ppjfcvzb6fyyny61r1hdh4vyf6nf1yjd01vnw8wzyy01f6",
+      "version": "1.42.0",
+      "sha256": "1rcqdhrgdqlqg2g04nfbmc5r107v1k4vzfg58vlkad10a2cvvmj7",
       "depends": ["matrixStats", "permute"]
     },
     "CluMSID": {
       "name": "CluMSID",
-      "version": "1.20.0",
-      "sha256": "02y79fhzx2hzwj8sjafywm7zqqar48b1m156ld60jjvskrv8ywqf",
+      "version": "1.22.0",
+      "sha256": "0xsxcl6ck60v8lyh1kdrqrp1wcdnd4yhqyi8jky7ba23a3nl9ql4",
       "depends": ["Biobase", "GGally", "MSnbase", "RColorBrewer", "S4Vectors", "ape", "dbscan", "ggplot2", "gplots", "mzR", "network", "plotly", "sna"]
     },
     "ClustAll": {
       "name": "ClustAll",
-      "version": "1.0.0",
-      "sha256": "13qg0r6lqvzyggkf8gjyxh8d871f483fcrhgbhr4xwpfpwssv8k8",
+      "version": "1.2.0",
+      "sha256": "0nysladvhcdbvdchv09zn59r7ngiq1r2490wnxmd58swhmlfm48g",
       "depends": ["ComplexHeatmap", "FactoMineR", "RColorBrewer", "bigstatsr", "circlize", "clValid", "cluster", "doSNOW", "dplyr", "flock", "foreach", "fpc", "ggplot2", "mice", "modeest", "networkD3", "pbapply"]
     },
     "ClustIRR": {
       "name": "ClustIRR",
-      "version": "1.2.0",
-      "sha256": "1vp3yj16c8irifcvsn0ibvvz8kzbmsf81112cx1c7x6kj132hprx",
-      "depends": ["blaster", "igraph", "pwalign", "stringdist", "visNetwork"]
+      "version": "1.4.0",
+      "sha256": "04jhi80zjq7km5nhbs6931bsc366a096mccyk1v4yyqs7m9xwiqx",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "blaster", "future", "future_apply", "igraph", "pwalign", "reshape2", "rstan", "rstantools", "stringdist", "visNetwork"]
     },
     "ClusterFoldSimilarity": {
       "name": "ClusterFoldSimilarity",
-      "version": "1.0.0",
-      "sha256": "136bh473b8fznxlrszvxr4w0q6y2cxhhm0xd43fka5wq130x3nr9",
+      "version": "1.2.0",
+      "sha256": "1wm7gdf56igi3xv8wk4cvjkgq7y2rm31bnlw115yg6gnw3qvj16z",
       "depends": ["BiocParallel", "Matrix", "Seurat", "SeuratObject", "SingleCellExperiment", "cowplot", "dplyr", "ggdendro", "ggplot2", "igraph", "reshape2", "scales"]
     },
     "ClusterJudge": {
       "name": "ClusterJudge",
-      "version": "1.26.0",
-      "sha256": "012n1g47jri9d7cwxwli34xrd5qnv1ghps79l2xin3pbq5fr5h03",
+      "version": "1.28.0",
+      "sha256": "1544p82qyp2h380qsd490dbdk2lzbpla0khk4fd6pknfvsba4ljh",
       "depends": ["httr", "infotheo", "jsonlite", "lattice", "latticeExtra"]
     },
     "ClusterSignificance": {
       "name": "ClusterSignificance",
-      "version": "1.32.0",
-      "sha256": "0n12085247f51n8sp7fic7il73h9k25fkc8sj7wr7nmi81j497ah",
+      "version": "1.34.0",
+      "sha256": "0fjxr3pd5wh1k1agrnnl6gwmwqzs4qfncvflf0k2ivrzzcc8ys0a",
       "depends": ["RColorBrewer", "pracma", "princurve", "scatterplot3d"]
     },
     "CoCiteStats": {
       "name": "CoCiteStats",
-      "version": "1.76.0",
-      "sha256": "0v3b39nc53c6gzi4ghp5n64jzcx5gv11s8ayaq6f3426732cc2kx",
+      "version": "1.78.0",
+      "sha256": "0xjrwmjhpfp4nvcqrrzn14pars12argni9923l8v8jyrxwwhczkp",
       "depends": ["AnnotationDbi", "org_Hs_eg_db"]
     },
     "CoGAPS": {
       "name": "CoGAPS",
-      "version": "3.24.0",
-      "sha256": "1yq625qb5hb0j5jf0r6sxyhwm1zlycv4dkfr3kv2hkapfshirk2b",
+      "version": "3.26.0",
+      "sha256": "07p8cqqk10mkmkb4s5c1a53wc1d1ncjvwlbmjpbabmb8an71al7i",
       "depends": ["BH", "BiocParallel", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cluster", "dplyr", "fgsea", "forcats", "ggplot2", "gplots", "rhdf5"]
     },
+    "CoSIA": {
+      "name": "CoSIA",
+      "version": "1.6.0",
+      "sha256": "1rnd5y1vlcf330zvpl1njzknnima2zcsn9hsdsi8lvprj6llws6l",
+      "depends": ["AnnotationDbi", "ExperimentHub", "RColorBrewer", "annotationTools", "biomaRt", "dplyr", "ggplot2", "homologene", "magrittr", "org_Ce_eg_db", "org_Dm_eg_db", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "plotly", "readr", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "Cogito": {
       "name": "Cogito",
-      "version": "1.10.0",
-      "sha256": "1xin0jxc38qzdh6jfq4pkydsxbyf36pl5b4vipgw145nvll537vr",
+      "version": "1.12.0",
+      "sha256": "0q0572aiy1pma4sdpi1dbh0gd4dqqh7jfk5vlw89rkcvv5qvr9ks",
       "depends": ["AnnotationDbi", "BiocManager", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "TxDb_Mmusculus_UCSC_mm9_knownGene", "entropy", "ggplot2", "jsonlite", "magrittr", "rmarkdown"]
     },
     "ComPrAn": {
       "name": "ComPrAn",
-      "version": "1.12.0",
-      "sha256": "0nj1h3chqc1pspaj2r5ccxswdfz8zmwaqa1v3nmav54z5l5s70iv",
+      "version": "1.14.0",
+      "sha256": "1xd9jdzvs7gz04daw9gl9dw0k8kcb2k90p7i3azwqgia0j7zp4hj",
       "depends": ["DT", "RColorBrewer", "VennDiagram", "data_table", "dplyr", "forcats", "ggplot2", "magrittr", "purrr", "rio", "rlang", "scales", "shiny", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr"]
     },
     "ComplexHeatmap": {
       "name": "ComplexHeatmap",
-      "version": "2.20.0",
-      "sha256": "1ppzx850nvvdhz2xiggr43c79w0nr0vmsmmnszasd4flf3jm7v8v",
+      "version": "2.22.0",
+      "sha256": "1hab197h1d01p8960zqmb0vnhgw9bk68ibmappryhv1jb4ibmx60",
       "depends": ["GetoptLong", "GlobalOptions", "IRanges", "RColorBrewer", "circlize", "clue", "codetools", "colorspace", "digest", "doParallel", "foreach", "matrixStats", "png"]
     },
     "CompoundDb": {
       "name": "CompoundDb",
-      "version": "1.8.0",
-      "sha256": "10rg8419ng2zmgn7ydlywxsfqdz8m15rs5wmsicfngagd2nwp5mf",
+      "version": "1.10.0",
+      "sha256": "1yzqcqww4mysxaxlqiwcyvv18qwfnfig59jrv7x6p7dls5s8r88d",
       "depends": ["AnnotationFilter", "Biobase", "BiocGenerics", "BiocParallel", "ChemmineR", "DBI", "IRanges", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "RSQLite", "S4Vectors", "Spectra", "dbplyr", "dplyr", "jsonlite", "tibble", "xml2"]
     },
     "ConsensusClusterPlus": {
       "name": "ConsensusClusterPlus",
-      "version": "1.68.0",
-      "sha256": "0y91kz1n3byadk505432cnlj9dfiw521fgb460d6dmly9s0d9yif",
+      "version": "1.70.0",
+      "sha256": "06lrjjl7h9d3xyi1j9ciikrqjmpqxvw2d0z1yifwd1lwx6b6zsgb",
       "depends": ["ALL", "Biobase", "cluster"]
     },
     "CopyNumberPlots": {
       "name": "CopyNumberPlots",
-      "version": "1.20.0",
-      "sha256": "1b3yschvrwsaj5szrnwbwrxswfxvalfs495q26g1r7w6l26qjv5b",
+      "version": "1.22.0",
+      "sha256": "03pg348h88d55kd9cg0svlhvyjv5fb7vmgrx32l2345zg1j0m0g1",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "VariantAnnotation", "cn_mops", "karyoploteR", "regioneR", "rhdf5"]
     },
     "CoreGx": {
       "name": "CoreGx",
-      "version": "2.8.0",
-      "sha256": "05fyncpqiq08a169rjwyc117wkyckh714z0is2r0g79920i36jas",
+      "version": "2.10.0",
+      "sha256": "0lw1fby6jxkz6bcbvlz8yqa8p00k85bay59lsr2qk5qlbsgz894a",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "BumpyMatrix", "MatrixGenerics", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "bench", "checkmate", "crayon", "data_table", "glue", "lsa", "piano", "rlang"]
     },
     "Cormotif": {
       "name": "Cormotif",
-      "version": "1.50.0",
-      "sha256": "0lg52ixswgd7fa9z47sdm1ka49xyllgn04nz21bmv1488abpfm9d",
+      "version": "1.52.0",
+      "sha256": "192kqzyqxrwf6dcjzffmqvs0hiizl6bcmqv1hn02ikji0p5g9kbv",
       "depends": ["affy", "limma"]
     },
     "CoverageView": {
       "name": "CoverageView",
-      "version": "1.42.0",
-      "sha256": "1wgkn2adcxl6js3cvawhvzpxm3nmnnc16wbnzkrnsnd9l12aasih",
+      "version": "1.44.0",
+      "sha256": "0r9g6iwbgf1dfi606cgzi32bjp57f7dfzpjx1fa3y3z6ikffjykb",
       "depends": ["GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "rtracklayer"]
     },
     "CrispRVariants": {
       "name": "CrispRVariants",
-      "version": "1.32.0",
-      "sha256": "1nlmznpypfabzrn430hs4k3b8zbw6n1brfy1x2j00bnq3sdd7zgc",
+      "version": "1.34.0",
+      "sha256": "15dx4bzvn2b44lbjyb4h2g76kqychsqhmv5vrb8pn97fg6pmfsgy",
       "depends": ["AnnotationDbi", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ggplot2", "gridExtra", "reshape2"]
     },
     "CuratedAtlasQueryR": {
       "name": "CuratedAtlasQueryR",
-      "version": "1.2.0",
-      "sha256": "0b0p4q4nsn1bxxyz61gh9r9bqkwkmjybqrv1ij565kbjnwimbcxj",
+      "version": "1.4.0",
+      "sha256": "1bm06ykfzjxrrzs8rcs73r1812c6ckah2cy744lc8pdsl3xnha39",
       "depends": ["BiocGenerics", "DBI", "HDF5Array", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "assertthat", "cli", "dbplyr", "dplyr", "duckdb", "glue", "httr", "purrr", "rlang", "stringr", "tibble"]
     },
-    "CyTOFpower": {
-      "name": "CyTOFpower",
-      "version": "1.10.0",
-      "sha256": "158ixl91yfhzik2d22xijarllirbxg33783i5pxixcdz3amp1z56",
-      "depends": ["CytoGLMM", "DT", "SummarizedExperiment", "diffcyt", "dplyr", "ggplot2", "magrittr", "rlang", "shiny", "shinyFeedback", "shinyMatrix", "shinyjs", "tibble", "tidyr"]
-    },
     "CytoDx": {
       "name": "CytoDx",
-      "version": "1.24.0",
-      "sha256": "0lj5j7dzsd643mi0056gbrdbajcmy40bwy4rcicq75lvjc3cxlpd",
+      "version": "1.26.0",
+      "sha256": "03yihxbai0y02k0d1nlr37snvgaficrqlw1ylnl938mzcqza28f6",
       "depends": ["doParallel", "dplyr", "flowCore", "glmnet", "rpart", "rpart_plot"]
     },
     "CytoGLMM": {
       "name": "CytoGLMM",
-      "version": "1.12.0",
-      "sha256": "1dfrp97mx93fdx4mrd4p8w2v37hq9h5b829l75vxxpmx2xqv4c7a",
+      "version": "1.14.0",
+      "sha256": "1sdiz3mcl66gyrj0hs99w0vnmlgzz6jz1m9cib1x3bjfr11kr4ri",
       "depends": ["BiocParallel", "MASS", "Matrix", "RColorBrewer", "caret", "cowplot", "doParallel", "dplyr", "factoextra", "flexmix", "ggplot2", "ggrepel", "logging", "magrittr", "mbest", "pheatmap", "rlang", "stringr", "strucchange", "tibble", "tidyr"]
     },
     "CytoMDS": {
       "name": "CytoMDS",
-      "version": "1.0.0",
-      "sha256": "050zzhhiy8gckism9s20l1kb1mhfgkd9prci0aqg23fzlv6d6inm",
+      "version": "1.2.0",
+      "sha256": "014hfak9la8fgdq42id62qjbq3byvdgxg90a4c0hj7m2b07s4r5l",
       "depends": ["BiocParallel", "CytoPipeline", "flowCore", "ggforce", "ggplot2", "ggrepel", "patchwork", "pracma", "reshape2", "rlang", "smacof", "transport", "withr"]
     },
     "CytoML": {
       "name": "CytoML",
-      "version": "2.16.0",
-      "sha256": "11kflx3yahl7xjl6x2rgpd4hl5y69qgarzhalmz4qdci7b7ln7kr",
+      "version": "2.18.0",
+      "sha256": "039rs6l92gjgvgh1nb8hfdg7h6dvak9hb5pjinli8x09iw08c463",
       "depends": ["BH", "Biobase", "RBGL", "RProtoBufLib", "Rgraphviz", "Rhdf5lib", "XML", "cpp11", "cytolib", "data_table", "dplyr", "flowCore", "flowWorkspace", "ggcyto", "graph", "jsonlite", "openCyto", "tibble", "yaml"]
     },
     "CytoPipeline": {
       "name": "CytoPipeline",
-      "version": "1.4.0",
-      "sha256": "1c8w2v8990z8kp7wxc69ildhj0v5g3zx05dzyhb16nrlnb7bfcc4",
+      "version": "1.6.0",
+      "sha256": "0ja1w7xhqga1kkabx714jli21xwnq3i7bi3h41gbpcy60g65y32l",
       "depends": ["BiocFileCache", "BiocParallel", "PeacoQC", "diagram", "flowAI", "flowCore", "ggcyto", "ggplot2", "jsonlite", "rlang", "scales", "withr"]
     },
     "CytoPipelineGUI": {
       "name": "CytoPipelineGUI",
-      "version": "1.2.0",
-      "sha256": "1xr7c8gcccxz8zl74amh35r2va3g58c2lwvl1j9py5g8ipmwprzj",
+      "version": "1.4.0",
+      "sha256": "03zcr3393kyws8p1wqd13bwyphz1z4r507s6jwcd7q6nz03v1vqh",
       "depends": ["CytoPipeline", "flowCore", "ggplot2", "plotly", "shiny"]
     },
     "DAMEfinder": {
       "name": "DAMEfinder",
-      "version": "1.16.0",
-      "sha256": "1ffqa7a3a0f3m58j6al2hd7aa8bamv4z170y4yn1vr1f8jrb7kq5",
+      "version": "1.18.0",
+      "sha256": "03lk5i1sc0jfzw4qkhbkzjl86xqnv9v1398z5ykiajw8cama0lkq",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "bumphunter", "cowplot", "ggplot2", "limma", "plyr", "readr", "reshape2", "stringr"]
     },
     "DAPAR": {
       "name": "DAPAR",
-      "version": "1.36.2",
-      "sha256": "1800c6g39gg9q43v1s5r13qm4aj53x18qzbbyz75fpwrril967gr",
+      "version": "1.38.0",
+      "sha256": "0328lvwvwjlws2bh2aafbvgn605z4nql1khjf6xv2jdgnl1v8c1i",
       "depends": ["Biobase", "DAPARdata", "MSnbase", "foreach", "highcharter"]
     },
     "DART": {
       "name": "DART",
-      "version": "1.52.0",
-      "sha256": "1zqzcssiibb9cl1iv6rzfmwlcms2llina41j5lkx0i9s8xmrqi06",
+      "version": "1.54.0",
+      "sha256": "01vk7bs9cj9g2wimhwn0mn1d4c73pzck1x86zb4dd4jgx32hyc8n",
       "depends": ["igraph"]
     },
     "DCATS": {
       "name": "DCATS",
-      "version": "1.2.0",
-      "sha256": "1hf275h40d5ggya58malxbrmzqi5gi04w847gc567qzpzs1bqfp2",
+      "version": "1.4.0",
+      "sha256": "0hg76kcr9sdqmqs7mbr9cbbay8p15jvd0k9h03yay5zwsn98nnb5",
       "depends": ["MCMCpack", "aod", "e1071", "matrixStats", "robustbase"]
     },
     "DECIPHER": {
       "name": "DECIPHER",
-      "version": "3.0.0",
-      "sha256": "1bgzl3sy4l5xfgxrkw8z1dvygkn2dgcl2fl9ah13ggs8hc9h9nlm",
+      "version": "3.2.0",
+      "sha256": "18fvmlxch10pgl9lnyww2506r7jbjigx6h2agjsm9wn5bga4mqzm",
       "depends": ["Biostrings", "DBI", "IRanges", "S4Vectors", "XVector"]
     },
     "DEFormats": {
       "name": "DEFormats",
-      "version": "1.32.0",
-      "sha256": "0sxflb9b148gkylxpfmmk9pmh3gblc4wp6594n0w4a711xrv1jr9",
+      "version": "1.34.0",
+      "sha256": "13zybgyr91c4007nyqjqli6hhvzzfjmzaqacbnx16dxcq7kp2307",
       "depends": ["DESeq2", "GenomicRanges", "S4Vectors", "SummarizedExperiment", "checkmate", "data_table", "edgeR"]
     },
     "DEGraph": {
       "name": "DEGraph",
-      "version": "1.56.0",
-      "sha256": "0pxh6kyi4blz039yw7vzi9dj4jpzsbv0p2fw44fz2q2pzr98g2m9",
+      "version": "1.58.0",
+      "sha256": "0dgfad4rjx3q47012533ilcpi5b5f7968l418jaxh318rnnpssm0",
       "depends": ["KEGGgraph", "NCIgraph", "RBGL", "R_methodsS3", "R_utils", "Rgraphviz", "graph", "lattice", "mvtnorm", "rrcov"]
     },
     "DEGreport": {
       "name": "DEGreport",
-      "version": "1.40.1",
-      "sha256": "0z5wzdixw6pyfd72drh54aalmp9nd5p1xi5vn53d58w78hrb757p",
+      "version": "1.42.0",
+      "sha256": "01dhsr5lycr0mrcjgc3g4gb7sjpk6fdww3bl8w4fabqfpwkzz3d1",
       "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "ConsensusClusterPlus", "DESeq2", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "broom", "circlize", "cluster", "cowplot", "dendextend", "dplyr", "edgeR", "ggdendro", "ggplot2", "ggrepel", "knitr", "logging", "magrittr", "psych", "reshape", "rlang", "scales", "stringi", "stringr", "tibble", "tidyr"]
     },
     "DEGseq": {
       "name": "DEGseq",
-      "version": "1.58.0",
-      "sha256": "1ia2fkd1v0f8mlfrpdv3h0n34y5pg1s8xqf1w5rcmh2md4icm670",
+      "version": "1.60.0",
+      "sha256": "0gkpz4xij7as8l9kylzl60ic1pwnc6fl4k3a3q1yyvw6zpidbwwh",
       "depends": ["qvalue"]
     },
     "DELocal": {
       "name": "DELocal",
-      "version": "1.4.0",
-      "sha256": "0xxlf90h1zi97k5rsbv41l88yq7qgfmd1rrmyipfjzhbl3l2spaf",
+      "version": "1.6.0",
+      "sha256": "1kgw6vlkrilchxv98gir977cx2m6b9jihqlz814m65y6hgn9hqp7",
       "depends": ["DESeq2", "SummarizedExperiment", "dplyr", "ggplot2", "limma", "matrixStats", "reshape2"]
     },
     "DEP": {
       "name": "DEP",
-      "version": "1.26.0",
-      "sha256": "1z8ymvghbbr9igcdzqwaz62r8lk07c2b1gnjbk504cxrhyy301jx",
+      "version": "1.28.0",
+      "sha256": "001k86lqc810lscpnfnmvkmxylgh4wzckhj1slm671ikwxkf0w68",
       "depends": ["ComplexHeatmap", "DT", "MSnbase", "RColorBrewer", "SummarizedExperiment", "assertthat", "circlize", "cluster", "dplyr", "fdrtool", "ggplot2", "ggrepel", "gridExtra", "imputeLCMD", "limma", "purrr", "readr", "rmarkdown", "shiny", "shinydashboard", "tibble", "tidyr", "vsn"]
     },
     "DEScan2": {
       "name": "DEScan2",
-      "version": "1.24.0",
-      "sha256": "15ncl95mf7mxazic0ig15isnblyj59dcr2xjv05dcwxc11wz1fr0",
+      "version": "1.26.0",
+      "sha256": "1j6rizkwwynkl06fvrff0dbba5wpyhkg3pnh13f9ldqgd2nycy8n",
       "depends": ["BiocGenerics", "BiocParallel", "ChIPpeakAnno", "DelayedArray", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "glue", "plyr", "rtracklayer"]
     },
     "DESeq2": {
       "name": "DESeq2",
-      "version": "1.44.0",
-      "sha256": "1j7ivkxbc75hzxhl9d97w8vamrmxf6527n7841i1j9n6s7hz1cdn",
+      "version": "1.46.0",
+      "sha256": "0n0cq388rds9x8nxy13srzhm3sc0x539xb26nn1bz05c177kmwxb",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "GenomicRanges", "IRanges", "MatrixGenerics", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "ggplot2", "locfit", "matrixStats"]
     },
     "DESpace": {
       "name": "DESpace",
-      "version": "1.4.0",
-      "sha256": "0lx3igbclpxx6jjvsagwjdakg9iy325xhkw7iixj8m6b8s4dkmkp",
+      "version": "1.6.0",
+      "sha256": "0568npl5a7hmzvxma5vds5mmqh2yrjbzpbbaxisvx79ax6qi45vk",
       "depends": ["BiocGenerics", "BiocParallel", "Matrix", "S4Vectors", "SpatialExperiment", "SummarizedExperiment", "assertthat", "cowplot", "data_table", "dplyr", "edgeR", "ggforce", "ggnewscale", "ggplot2", "ggpubr", "limma", "patchwork", "scales"]
     },
     "DEWSeq": {
       "name": "DEWSeq",
-      "version": "1.18.0",
-      "sha256": "034p1rxc1w758zpy920sgpcfr0dmhkfqrcximqkary0n0m6n95i0",
+      "version": "1.20.0",
+      "sha256": "1rsw08v510mx17lsw9913arwznifphdxa5vcq51v8z0pp7lvvdvw",
       "depends": ["BiocGenerics", "BiocParallel", "DESeq2", "GenomeInfoDb", "GenomicRanges", "R_utils", "S4Vectors", "SummarizedExperiment", "data_table"]
     },
     "DEXSeq": {
       "name": "DEXSeq",
-      "version": "1.50.0",
-      "sha256": "13y3fhgvf7438yjv6qm28n8f42w4wgkklc0q229ypns1gfh54524",
+      "version": "1.52.0",
+      "sha256": "05sjxxv5299m0i9hnhz037dz6f5q8qdb70vbvr28jjzc1jcv7ym8",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "biomaRt", "genefilter", "geneplotter", "hwriter", "statmod", "stringr"]
     },
     "DEqMS": {
       "name": "DEqMS",
-      "version": "1.22.0",
-      "sha256": "0fiiyrzvy6nkk8xpxdjmar0fpjs9ardzplb993xxyi1n8vv0092l",
+      "version": "1.24.0",
+      "sha256": "1y0vjm7a64iwwsgd4pgvrlgrqwbd03p4sss4ggg4k29bgyjv36xi",
       "depends": ["ggplot2", "limma", "matrixStats"]
     },
     "DEsingle": {
       "name": "DEsingle",
-      "version": "1.24.0",
-      "sha256": "06bnvyivj4bx5l2zvwjj4za2hpshsifsa83lsi9fpgdwhn3526kd",
+      "version": "1.26.0",
+      "sha256": "1kb3sm43l7jhf253r1091pypksnhzp3jgi4ddapjhmkgh6p32xy5",
       "depends": ["BiocParallel", "MASS", "Matrix", "VGAM", "bbmle", "gamlss", "maxLik", "pscl"]
     },
     "DEsubs": {
       "name": "DEsubs",
-      "version": "1.30.0",
-      "sha256": "0p3vkm6116zl157nivwnm68svwm9h9cp9cplz9hncfywcii9a579",
+      "version": "1.32.0",
+      "sha256": "106304xck9qs463lay2j9ncv7x7w4bg79phmbqcy0y888apia9nd",
       "depends": ["DESeq2", "EBSeq", "Matrix", "NBPSeq", "RBGL", "circlize", "edgeR", "ggplot2", "graph", "igraph", "jsonlite", "limma", "locfit", "pheatmap"]
     },
     "DExMA": {
       "name": "DExMA",
-      "version": "1.12.0",
-      "sha256": "1mm45hvb3l1xvikgy25jxg9ppl71ha2sn4vh9qpf7wfr770hif3r",
+      "version": "1.14.0",
+      "sha256": "0kyjwwh6f4bpa9vpl4jbm629570q7mlfvyw8cv8c0jmbnx54rksz",
       "depends": ["Biobase", "DExMAdata", "GEOquery", "RColorBrewer", "bnstruct", "impute", "limma", "pheatmap", "plyr", "scales", "snpStats", "sva", "swamp"]
     },
     "DFP": {
       "name": "DFP",
-      "version": "1.62.0",
-      "sha256": "1rjc8a03pga0hyb663lnfkwrwfw3pipwsb11gn2aj3vx4wyf1gp1",
+      "version": "1.64.0",
+      "sha256": "0vq2pswzd3b47ld8scgbbi53yj06928d79pqk2lyscz8lz4mxqhq",
       "depends": ["Biobase"]
     },
-    "DIAlignR": {
-      "name": "DIAlignR",
-      "version": "2.12.0",
-      "sha256": "19zgjnd9sjxx09pcf50fl3w4fmd1gj8g765x114l0cqcpk9qfmm5",
-      "depends": ["DBI", "RMSNumpress", "RSQLite", "Rcpp", "RcppEigen", "ape", "bit64", "data_table", "dplyr", "ggplot2", "magrittr", "mzR", "phangorn", "pracma", "reticulate", "rlang", "signal", "tidyr", "zoo"]
+    "DFplyr": {
+      "name": "DFplyr",
+      "version": "1.0.0",
+      "sha256": "1vmk7zvcb11397r1x92vgc827azrm4dz1qcl255nvmpc4cxdl8xw",
+      "depends": ["BiocGenerics", "S4Vectors", "dplyr", "rlang", "tidyselect"]
     },
     "DMCFB": {
       "name": "DMCFB",
-      "version": "1.18.0",
-      "sha256": "0hpf7qkjy7hms4bpqb6y15gwkfah6p69icwab2vwsgmz8w94c44a",
+      "version": "1.20.0",
+      "sha256": "1sm2gixy4jf4aiycd5nbfmfdr9qzm6qasaak9cc7q2jd86q3ciaz",
       "depends": ["BiocParallel", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "SummarizedExperiment", "arm", "benchmarkme", "data_table", "fastDummies", "matrixStats", "rtracklayer", "speedglm", "tibble"]
     },
     "DMCHMM": {
       "name": "DMCHMM",
-      "version": "1.26.0",
-      "sha256": "0rv1v08nf7vbxci28j68sjxq77lj0swis26ryxp156alr397jfby",
+      "version": "1.28.0",
+      "sha256": "1hb55m1z4da92bmlqzm0yvp5bsflf9c4kvl0jf0wpawz0xdz71fi",
       "depends": ["BiocParallel", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "calibrate", "fdrtool", "multcomp", "rtracklayer"]
     },
     "DMRScan": {
       "name": "DMRScan",
-      "version": "1.26.0",
-      "sha256": "0j68kxzmn3kskqy88j1dqznigiw1rb3b14hwnvcmyckmyhiysx73",
+      "version": "1.28.0",
+      "sha256": "1nkw0njm6ghmagj3k87yxhx7w0zf5plpajcgv137hawmwyzllqp4",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "Matrix", "RcppRoll", "mvtnorm"]
     },
     "DMRcaller": {
       "name": "DMRcaller",
-      "version": "1.36.0",
-      "sha256": "0r9xm77y6xs4mginwfshnpvn2l8phpag35a8mcasj63aqs05js2h",
+      "version": "1.38.0",
+      "sha256": "0zhviryy86ml9gk8mmr2dixmdyrhgajjydc4d0xmskhslyd3q9r5",
       "depends": ["GenomicRanges", "IRanges", "Rcpp", "RcppRoll", "S4Vectors", "betareg"]
     },
     "DMRcate": {
       "name": "DMRcate",
-      "version": "3.0.5",
-      "sha256": "1m5ilcpknzxd3cdk0kyvqqsahshlwxi7xpscigr4w7a83p775vqc",
+      "version": "3.2.1",
+      "sha256": "1k0hbyqk4l6kqr60anmgk1jyk7kb1m0c1gjzvbbw2yc154ncyscq",
       "depends": ["AnnotationHub", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "SummarizedExperiment", "biomaRt", "bsseq", "edgeR", "limma", "minfi", "missMethyl", "plyr"]
     },
     "DNABarcodeCompatibility": {
       "name": "DNABarcodeCompatibility",
-      "version": "1.20.0",
-      "sha256": "0iiy81svi1nnghaimnc5hs1prrk1z5kgv1bd5naysb8fpagd0jgl",
-      "depends": ["DNABarcodes", "dplyr", "numbers", "purrr", "stringr", "tidyr"]
+      "version": "1.22.0",
+      "sha256": "1rhll5bmy85kk89g1v5yk0j3zm22pkf6rbq1agxb07lll4nlim01",
+      "depends": ["BH", "Rcpp", "dplyr", "numbers", "purrr", "stringr", "tidyr"]
     },
     "DNABarcodes": {
       "name": "DNABarcodes",
-      "version": "1.34.0",
-      "sha256": "0vxxg6fkgck640p9plk4vx3d05794s3xgxksv819d2wicvyby4hk",
+      "version": "1.36.0",
+      "sha256": "0pppm937415xsmw0g39022lr07x3551ki6h11p8d7cpwbjmym44f",
       "depends": ["BH", "Matrix", "Rcpp"]
     },
     "DNAcopy": {
       "name": "DNAcopy",
-      "version": "1.78.0",
-      "sha256": "1q4s6rb6iv9cmfkjymgdyb4h3z0x0kzzd2bvfdjrzzzza6vhjpxl",
+      "version": "1.80.0",
+      "sha256": "1ckbj338brcsj5kx5w0xs1gh8j3mx41b55lzf48irvfnslxk3iws",
       "depends": []
     },
     "DNAfusion": {
       "name": "DNAfusion",
-      "version": "1.6.0",
-      "sha256": "1rdm6x8dzk02ggx33bx9mgcq1p36ryysyxha333j05aysn2az2x0",
+      "version": "1.8.0",
+      "sha256": "0c9m0952ypgr19fzkydcy5sckdi2snvanrlgm59hnjyj6q524xbf",
       "depends": ["BiocBaseUtils", "BiocGenerics", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg38_knownGene", "bamsignals"]
     },
     "DNAshapeR": {
       "name": "DNAshapeR",
-      "version": "1.32.0",
-      "sha256": "0s5z3bh5dlym810rkb9i3bfxfap91qh7hj070i1nqnf4g2vamx9g",
+      "version": "1.34.0",
+      "sha256": "1dshmby6jxs2qizz87k7ad5i2cbzidliarkcm3s6r7s6dfak3r2n",
       "depends": ["Biostrings", "GenomicRanges", "Rcpp", "fields"]
     },
     "DOSE": {
       "name": "DOSE",
-      "version": "3.30.2",
-      "sha256": "1jf6l0ngmdz1lca2rcjg3rhi9qdrv1pzmn93wa09svi4glsfhy1h",
-      "depends": ["AnnotationDbi", "BiocParallel", "GOSemSim", "HDO_db", "fgsea", "ggplot2", "qvalue", "reshape2", "yulab_utils"]
+      "version": "4.0.0",
+      "sha256": "1x0dnlbgx2wsiki7l7c8np7v8kh4m5f30yjnavfzg9pjy3j98myq",
+      "depends": ["AnnotationDbi", "BiocParallel", "GOSemSim", "fgsea", "ggplot2", "qvalue", "reshape2", "yulab_utils"]
     },
     "DRIMSeq": {
       "name": "DRIMSeq",
-      "version": "1.32.0",
-      "sha256": "10skx3n3r9vp1p1499ddccgabi7q3cy1dpi5pbp4ap0gff5ika5x",
+      "version": "1.34.0",
+      "sha256": "0bfchi7igh21ifjjim59lwbql69gcddl39imxh49w2hv7pr3227w",
       "depends": ["BiocGenerics", "BiocParallel", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "edgeR", "ggplot2", "limma", "reshape2"]
     },
     "DSS": {
       "name": "DSS",
-      "version": "2.52.0",
-      "sha256": "1y9xg6ic3a03xswyfvyxdhnd7ngkljc96bm5fry4ni6kpa77bkv8",
+      "version": "2.54.0",
+      "sha256": "03dzxxlyqymp827w2sdrpwn51q8n5xggx06m8gh7p1aigk5c50ah",
       "depends": ["Biobase", "BiocParallel", "bsseq"]
     },
     "DTA": {
       "name": "DTA",
-      "version": "2.50.0",
-      "sha256": "0njm0v10s31sx7v35kdv44815yy6k9h814s9zn98ld5qcrzn2q77",
+      "version": "2.52.0",
+      "sha256": "04piid5sp39r9xfgxz6kiicf47608yisxdmb1rfjkx4sjkwxwwfl",
       "depends": ["LSD", "scatterplot3d"]
     },
     "DaMiRseq": {
       "name": "DaMiRseq",
-      "version": "2.16.0",
-      "sha256": "029idkjbha250f8wgwy6sjnjvlxqs0lkwal066693mc2h40rql11",
+      "version": "2.18.0",
+      "sha256": "0c6q6cf4v77hrjphnndk78gsmcsv4d7ivmsihnjhnh0z9z6hiy36",
       "depends": ["DESeq2", "EDASeq", "FSelector", "FactoMineR", "Hmisc", "MASS", "RColorBrewer", "RSNNS", "SummarizedExperiment", "arm", "caret", "corrplot", "e1071", "edgeR", "ggplot2", "ineq", "kknn", "limma", "lubridate", "pheatmap", "pls", "plsVarSel", "plyr", "randomForest", "reshape2", "sva"]
     },
     "Damsel": {
       "name": "Damsel",
-      "version": "1.0.0",
-      "sha256": "0n60wkrwk1npg1361x5plam6rabmqzlxdcij1qf5q351wfkqlp8y",
-      "depends": ["AnnotationDbi", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Rsamtools", "Rsubread", "dplyr", "edgeR", "ggbio", "ggplot2", "goseq", "magrittr", "patchwork", "plyranges", "reshape2", "rlang", "stringr", "tidyr"]
+      "version": "1.2.0",
+      "sha256": "05szhq61vbrhbp4zyh45c3s575jisq62j7ldf3malljk5576dn6m",
+      "depends": ["AnnotationDbi", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Rsamtools", "Rsubread", "dplyr", "edgeR", "ggbio", "ggplot2", "goseq", "magrittr", "patchwork", "plyranges", "reshape2", "rlang", "stringr", "tidyr"]
     },
     "DeMAND": {
       "name": "DeMAND",
-      "version": "1.34.0",
-      "sha256": "0pdqgb4fsqzwhan1hwb4hi326yh5xhxwqkdqlffzhgfkp4lwi1cb",
+      "version": "1.36.0",
+      "sha256": "1sf09sq05hv0h3a8396kqdfk8r6fh7d8kkgz3nz5nzmdvphmv970",
       "depends": ["KernSmooth"]
     },
     "DeMixT": {
       "name": "DeMixT",
-      "version": "1.20.0",
-      "sha256": "1hnaaidmflyh768pc1ivlq8rfjh5vrwycc0r6k1cyiinm53vknns",
+      "version": "1.22.0",
+      "sha256": "0l6nj59wa9iw7y2r5l4wrmzkgxlhlczax2lpzqz0m7mlsfrjw47n",
       "depends": ["DSS", "KernSmooth", "Rcpp", "SummarizedExperiment", "base64enc", "dendextend", "ggplot2", "knitr", "matrixStats", "matrixcalc", "psych", "rmarkdown", "sva", "truncdist"]
     },
-    "DeProViR": {
-      "name": "DeProViR",
-      "version": "1.0.0",
-      "sha256": "0m1nhzq5kl6jyi3d8fzb77iplzc4p85v7lj5q7i7125kjv6bycsm",
-      "depends": ["BiocFileCache", "PRROC", "caret", "data_table", "dplyr", "fmsb", "ggplot2", "keras", "pROC", "readr"]
-    },
     "DeconRNASeq": {
       "name": "DeconRNASeq",
-      "version": "1.46.0",
-      "sha256": "0hwvfsc48dakh3nvz60i92yciz2m5my9w57kzpyj4jyk92cs181g",
+      "version": "1.48.0",
+      "sha256": "0v37kdv3cvh8s8ih5bk397k19b3fd4wldc7h0h8nyzv1z9lyal7v",
       "depends": ["ggplot2", "limSolve", "pcaMethods"]
     },
     "DeepPINCS": {
       "name": "DeepPINCS",
-      "version": "1.12.0",
-      "sha256": "148klzaqa01yns02x38vnd3gn46ayi7p0z2f2s7m95ralby95qm0",
+      "version": "1.14.0",
+      "sha256": "0vl2wjx59wlpf1nbk1pp8cb8vbf9gkq3zhgary0k56y9ck982df7",
       "depends": ["CatEncoders", "PRROC", "keras", "matlab", "purrr", "rcdk", "reticulate", "stringdist", "tensorflow", "tokenizers", "ttgsea", "webchem"]
     },
+    "DeepTarget": {
+      "name": "DeepTarget",
+      "version": "1.0.0",
+      "sha256": "0cs5287jis2jby18knkxi7x9vxmwzbk4p1cy3j75wvmzhhbv6hnx",
+      "depends": ["BiocParallel", "depmap", "dplyr", "fgsea", "ggplot2", "ggpubr", "pROC", "readr", "stringr"]
+    },
     "DegCre": {
       "name": "DegCre",
-      "version": "1.0.0",
-      "sha256": "1wv2h8x45qsj8p4awwb22z1ilymmkrgmrhsl2y7l7dx13qh5l3dr",
-      "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "plotgardener"]
+      "version": "1.2.0",
+      "sha256": "1q2x3nwsgbw7dwlw8h9ml458rjbrjdf5nxynfibfhds5rska70y9",
+      "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "TxDb_Hsapiens_UCSC_hg38_knownGene", "org_Hs_eg_db", "plotgardener", "qvalue"]
     },
     "DegNorm": {
       "name": "DegNorm",
-      "version": "1.14.0",
-      "sha256": "15bh4x6rnqil3gcwialcpnqq5inznmjhzf0f4r54xylril0ad268",
+      "version": "1.16.0",
+      "sha256": "144ap65xcih6x38d3f8g1vshx82ahj35bl9hkkgqs3b1f807np4s",
       "depends": ["GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "data_table", "doParallel", "foreach", "ggplot2", "heatmaply", "plotly", "plyr", "txdbmaker", "viridis"]
     },
     "DelayedArray": {
       "name": "DelayedArray",
-      "version": "0.30.1",
-      "sha256": "0n6pparz2fg8wgrgcwciibqz3iyrnlmk5hdvnzjppcraxanz8sm6",
+      "version": "0.32.0",
+      "sha256": "12dbzjchx1f20i1va0fmh74xvn5pj84flnf0srmma2fma1i4rszy",
       "depends": ["BiocGenerics", "IRanges", "Matrix", "MatrixGenerics", "S4Arrays", "S4Vectors", "SparseArray"]
     },
     "DelayedDataFrame": {
       "name": "DelayedDataFrame",
-      "version": "1.20.0",
-      "sha256": "1j9akl3njqnrf6klccgiiss941l1k49vsrsrhrqjbg8f5vzg5i9w",
+      "version": "1.22.0",
+      "sha256": "1dw3y3z8zf38d606372r4vywgfh9j111hhz2g3i60qwz7hq2ix1k",
       "depends": ["BiocGenerics", "DelayedArray", "S4Vectors"]
     },
     "DelayedMatrixStats": {
       "name": "DelayedMatrixStats",
-      "version": "1.26.0",
-      "sha256": "1cqf6y0f18469v1jgfvdjnskkc89i3sfg79axxqcwa33mfjj736s",
-      "depends": ["DelayedArray", "IRanges", "Matrix", "MatrixGenerics", "S4Vectors", "sparseMatrixStats"]
+      "version": "1.28.0",
+      "sha256": "01yrbmdj38r6h4n0nvg5njz8v6qmqcfdq3mgg07z1cslvad958d3",
+      "depends": ["DelayedArray", "IRanges", "Matrix", "MatrixGenerics", "S4Vectors", "SparseArray", "sparseMatrixStats"]
     },
     "DelayedRandomArray": {
       "name": "DelayedRandomArray",
-      "version": "1.12.0",
-      "sha256": "0lzx0p9hq4vd6w1rvlqd98b3rvfs1zzgvqm21s99vlmdc3db5pqn",
-      "depends": ["BH", "DelayedArray", "Rcpp", "dqrng"]
+      "version": "1.14.0",
+      "sha256": "1132mkigdj6ipjdr0vhi6av46b49vxnbb6281ba57bvd5zig88rq",
+      "depends": ["BH", "DelayedArray", "Rcpp", "SparseArray", "dqrng"]
     },
     "DelayedTensor": {
       "name": "DelayedTensor",
-      "version": "1.10.0",
-      "sha256": "1f8qpi3xfhgng7zjm7zdxmd32ynri2mavxs6ffqg1izclrzqsb5q",
-      "depends": ["BiocSingular", "DelayedArray", "DelayedRandomArray", "HDF5Array", "Matrix", "einsum", "irlba", "rTensor"]
+      "version": "1.12.0",
+      "sha256": "0bp4r2jwphrykp09a7xv3q1zacgmvnj2hz8jwbck2v4pm6vfp1zr",
+      "depends": ["BiocSingular", "DelayedArray", "DelayedRandomArray", "HDF5Array", "Matrix", "S4Arrays", "SparseArray", "einsum", "irlba", "rTensor"]
     },
     "DepInfeR": {
       "name": "DepInfeR",
-      "version": "1.8.0",
-      "sha256": "0akyxyijjp4hwy1cs00nnahcnsbrp5j6gnrahwd2wrlx2dr0zxrm",
+      "version": "1.10.0",
+      "sha256": "14qwapq867bz5df0f74076fbx4igqq74cf1x9n8sx8vasinf238m",
       "depends": ["BiocParallel", "glmnet", "matrixStats"]
     },
     "DepecheR": {
       "name": "DepecheR",
-      "version": "1.20.0",
-      "sha256": "15lpn1p2p28lhmzi7svszr0p1zkyaivi69q8pxcrv4lvips38hk4",
+      "version": "1.22.0",
+      "sha256": "0xxgkj672ncsp8dfa27cp101albvy4rq6f1jm0zmcmmf5lwc9v1m",
       "depends": ["ClusterR", "FNN", "MASS", "Rcpp", "RcppEigen", "beanplot", "collapse", "doSNOW", "dplyr", "foreach", "ggplot2", "gmodels", "gplots", "matrixStats", "mixOmics", "moments", "reshape2", "robustbase", "viridis"]
     },
     "DiffBind": {
       "name": "DiffBind",
-      "version": "3.14.0",
-      "sha256": "1sr0zy5pbjmjzkwkpjmr26k4dcf3f3kxsl7z2nqw0p0a14rh57pm",
+      "version": "3.16.0",
+      "sha256": "1whb4k54wm21k74r6qyng130nnaii9czh9dhvl1x7hnqa8gq0dx7",
       "depends": ["BiocParallel", "DESeq2", "GenomicAlignments", "GenomicRanges", "GreyListChIP", "IRanges", "RColorBrewer", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "amap", "apeglm", "ashr", "dplyr", "ggplot2", "ggrepel", "gplots", "lattice", "limma", "locfit", "systemPipeR"]
     },
     "DiffLogo": {
       "name": "DiffLogo",
-      "version": "2.28.0",
-      "sha256": "00c75krimzaf8z35dyr9dq7vrh06ihb8fikyd61kybaakz6c4waj",
+      "version": "2.30.0",
+      "sha256": "0qqs31xdl5nvir60vsbz286fh3qfpng4j82vk9fs1l77isz43251",
       "depends": ["cba"]
     },
     "DifferentialRegulation": {
       "name": "DifferentialRegulation",
-      "version": "2.2.1",
-      "sha256": "170sfmm11vcgwi4wak6y699cnmbqiw4p8bipb5k7qzqaww99541s",
+      "version": "2.4.0",
+      "sha256": "1vdch5dlrh0izq6ng9hkmnv9yn87vqq88iyj87bd90lv5ig9rz71",
       "depends": ["BANDITS", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "data_table", "doParallel", "doRNG", "foreach", "ggplot2", "gridExtra", "tximport"]
     },
     "Dino": {
       "name": "Dino",
-      "version": "1.10.0",
-      "sha256": "0nfn61i6iczg3k8brfajddlxavskjzm0x56qliy81f76sjb3njr3",
+      "version": "1.12.0",
+      "sha256": "19hykazb6ysax10n1zpfsxabjhv9nnkm14awyxh5iskd0n4s6fxp",
       "depends": ["BiocParallel", "BiocSingular", "Matrix", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "matrixStats", "scran"]
     },
     "Director": {
       "name": "Director",
-      "version": "1.30.0",
-      "sha256": "1lm6qdmk1a4c74sph9n4vj174x9c41489ljrw7hxwrwifpjp4phd",
+      "version": "1.32.0",
+      "sha256": "1acfr9m1hbl4ji5i5dv7i9byg9abgfncqqnam5c6lksmh5wh0cyv",
       "depends": ["htmltools"]
     },
     "DirichletMultinomial": {
       "name": "DirichletMultinomial",
-      "version": "1.46.0",
-      "sha256": "0djd84vnf4skjr6m25ykqrvwa37lgs5r5aw9md81ykaqmi40szqb",
+      "version": "1.48.0",
+      "sha256": "1chwd1zidc0abjl4kc5j58f4dwbghwnzlqx47ymln35b2gggj61w",
       "depends": ["BiocGenerics", "IRanges", "S4Vectors"]
     },
     "DiscoRhythm": {
       "name": "DiscoRhythm",
-      "version": "1.20.0",
-      "sha256": "14scrzsx36j6rbnav5hn8xykhwyswr85kkvdvg66g4xdwc3d6v7b",
+      "version": "1.22.0",
+      "sha256": "1325b75svg47mknfq31z0v14bc58zm21gl2nqpwb1g49nlscgl8j",
       "depends": ["BiocGenerics", "BiocStyle", "DT", "MetaCycle", "S4Vectors", "SummarizedExperiment", "UpSetR", "VennDiagram", "broom", "data_table", "dplyr", "ggExtra", "ggplot2", "gridExtra", "heatmaply", "kableExtra", "knitr", "magick", "matrixStats", "matrixTests", "plotly", "reshape2", "rmarkdown", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "shinyjs", "viridis", "zip"]
     },
     "DominoEffect": {
       "name": "DominoEffect",
-      "version": "1.24.0",
-      "sha256": "1lwvji698xi63rx4i3g73xkv4k53m3gbjgkbcmxgm0gagn1mrczl",
+      "version": "1.26.0",
+      "sha256": "0b7b2kgx0vr3nwiwmd9044a6sf36aplvh2gr8x4v656rgvws6adh",
       "depends": ["AnnotationDbi", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "SummarizedExperiment", "VariantAnnotation", "biomaRt", "data_table", "pwalign"]
     },
     "Doscheda": {
       "name": "Doscheda",
-      "version": "1.26.0",
-      "sha256": "0iqcsyk4y8wkhf9s84hzm4rdmyg7bb5db7frm6xbxlsydfpzqy3l",
+      "version": "1.28.0",
+      "sha256": "0xix7bh9cvyjr24lciwrah4ag4b9hsydkqivh7fv7kvdi63ayy00",
       "depends": ["DT", "affy", "calibrate", "corrgram", "drc", "ggplot2", "gridExtra", "httr", "jsonlite", "limma", "matrixStats", "prodlim", "readxl", "reshape2", "shiny", "shinydashboard", "stringr", "vsn"]
     },
     "DriverNet": {
       "name": "DriverNet",
-      "version": "1.44.0",
-      "sha256": "0jj9vrbni8zc56pbs2c7nv6yks23nrwzqz757vb7a8lxcd3sziwr",
+      "version": "1.46.0",
+      "sha256": "17rl5drdsj8c7dr1cpsj9q654pi5jrk3n6y4rlhaw2yi10gjprmv",
       "depends": []
     },
     "DropletUtils": {
       "name": "DropletUtils",
-      "version": "1.24.0",
-      "sha256": "01y88cnii02sn1jgyvvmbx8j60qbzqyznqfxzv06yi4y0xj37klg",
-      "depends": ["BH", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "HDF5Array", "IRanges", "Matrix", "R_utils", "Rcpp", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "dqrng", "edgeR", "rhdf5", "scuttle"]
+      "version": "1.26.0",
+      "sha256": "0659hpzjcch68dwi73a9rnkbxxfvivd09208z60q2fd22w2qgdjx",
+      "depends": ["BH", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "HDF5Array", "IRanges", "Matrix", "R_utils", "Rcpp", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "beachmat", "dqrng", "edgeR", "rhdf5", "scuttle"]
     },
     "DrugVsDisease": {
       "name": "DrugVsDisease",
-      "version": "2.46.0",
-      "sha256": "1bzjjvv94hiyh7m0iqrvgl6lgxzz6s8jy5ry1mj2w821ivhz1gpy",
+      "version": "2.48.0",
+      "sha256": "165n6dcsayqs2s4s2xpmxrwyfb6fpakdyb1dsbndycpar48dh0vi",
       "depends": ["ArrayExpress", "BiocGenerics", "DrugVsDiseasedata", "GEOquery", "RUnit", "affy", "annotate", "biomaRt", "cMap2data", "hgu133a2_db", "hgu133a_db", "hgu133plus2_db", "limma", "qvalue", "xtable"]
     },
     "Dune": {
       "name": "Dune",
-      "version": "1.16.0",
-      "sha256": "0fiqbh9ywip75sxy54y76nbbqg6maji40d189qxarckdlmj09m7z",
+      "version": "1.18.0",
+      "sha256": "0clqfw8qc56y92q8xmpgknvc2gp2g4pailzfd9s428nihxn1448l",
       "depends": ["BiocParallel", "RColorBrewer", "SummarizedExperiment", "aricode", "dplyr", "gganimate", "ggplot2", "magrittr", "purrr", "tidyr"]
     },
+    "DuplexDiscovereR": {
+      "name": "DuplexDiscovereR",
+      "version": "1.0.0",
+      "sha256": "0x44mf83n23gqpknhyv5lqhibaasx0h81mci4g02klisp81a2gab",
+      "depends": ["Biostrings", "GenomicAlignments", "GenomicRanges", "Gviz", "InteractionSet", "dplyr", "ggsci", "igraph", "purrr", "rlang", "rtracklayer", "scales", "stringr", "tibble", "tidyr"]
+    },
     "DynDoc": {
       "name": "DynDoc",
-      "version": "1.82.0",
-      "sha256": "174jfdyq7g7mvn7wvmdkf36n0n969aqsg9bwd1nk6a5nw1khm7js",
+      "version": "1.84.0",
+      "sha256": "0pz2sz99p5dqprfwhnh22mw9j8895jk1gm3ffqysq7afim2fla5m",
       "depends": []
     },
     "EBImage": {
       "name": "EBImage",
-      "version": "4.46.0",
-      "sha256": "0qaafn9l9lwrj0yph74g39pghjpg009qz7by64frxg1q0j7ksd2w",
+      "version": "4.48.0",
+      "sha256": "16p3bzs13ihfx36fav3y1dxfryhyj00wvcwqc6mzx5ln2a2jpdbv",
       "depends": ["BiocGenerics", "RCurl", "abind", "fftwtools", "htmltools", "htmlwidgets", "jpeg", "locfit", "png", "tiff"]
     },
     "EBSEA": {
       "name": "EBSEA",
-      "version": "1.32.0",
-      "sha256": "1pms8d49pcr4ngcy79m556vh4h2xbscwkzcabvy5xr8l22biv84b",
+      "version": "1.34.0",
+      "sha256": "0mrsabqh3fph231757l3sw8jka3lkxmd75fjaqcaf9zwc5vi4wf0",
       "depends": ["DESeq2", "EmpiricalBrownsMethod"]
     },
     "EBSeq": {
       "name": "EBSeq",
-      "version": "2.2.0",
-      "sha256": "1lbvrw6fcjhrm6v71lmnphv4hbdh03czgx3822ckdk6xrvyh54cf",
+      "version": "2.4.0",
+      "sha256": "0hhs265p6y2118wmp5h8lp1b60d6vl27lb8fv12b0jfmln8ninzl",
       "depends": ["BH", "Rcpp", "RcppEigen", "blockmodeling", "gplots", "testthat"]
     },
     "EBarrays": {
       "name": "EBarrays",
-      "version": "2.68.0",
-      "sha256": "17ym1y90bz85afanggdjf91a49lz89qmmi2kyhxga0cw056lkdz0",
+      "version": "2.70.0",
+      "sha256": "1wzfi2bfzhdjc5nvs1iwb8b7ln0n9fhkvpqf27y3p082ajhybjdf",
       "depends": ["Biobase", "cluster", "lattice"]
     },
     "EBcoexpress": {
       "name": "EBcoexpress",
-      "version": "1.48.0",
-      "sha256": "0sfakxc2zz38w6krss8jqzkpvpmg8pj6xxc24775jhndv3aqjih1",
+      "version": "1.50.0",
+      "sha256": "0jns301q57gm527riq906p1nn41g9ss5sgyjwrjzqfw8452g09av",
       "depends": ["EBarrays", "mclust", "minqa"]
     },
     "EDASeq": {
       "name": "EDASeq",
-      "version": "2.38.0",
-      "sha256": "18h9zlah21lghy1sjpnzy6lddmff8vh3raxnqi15v00za9azk8yq",
+      "version": "2.40.0",
+      "sha256": "1k061w169p8r71xq4ss2hda7k2p38h8pxcggfpjfii57wb3mvdk0",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "ShortRead", "aroma_light", "biomaRt"]
     },
     "EDIRquery": {
       "name": "EDIRquery",
-      "version": "1.4.0",
-      "sha256": "154bnyjlvds909y95rmbd8x32rkhqfpkhb6vjbqhm56z4c9z33x7",
+      "version": "1.6.0",
+      "sha256": "0q3fypzcrarviiqnawgpf1vbfqxsy31fsfdk54lgb34q24xifrkd",
       "depends": ["GenomicRanges", "InteractionSet", "readr", "tibble", "tictoc"]
     },
     "EGAD": {
       "name": "EGAD",
-      "version": "1.32.0",
-      "sha256": "0y1fwvqmrvv8v7i8ncqaxbmpflaybbgnjn09qqzpmsavfk10wvgh",
+      "version": "1.34.0",
+      "sha256": "1przn4yncg04nc9cb36ljk2v4xn8i788fbh9jf07vv4z83bn3dvg",
       "depends": ["Biobase", "GEOquery", "MASS", "RColorBrewer", "RCurl", "gplots", "igraph", "impute", "limma", "plyr", "zoo"]
     },
     "EGSEA": {
       "name": "EGSEA",
-      "version": "1.32.0",
-      "sha256": "1fpa26l0jimy1b36cw71abgmn1zj10j4lkpc5g4k09kc74nmivqi",
+      "version": "1.34.0",
+      "sha256": "192zw8ms6hqzdybpz11bw5fygbl77hy1n12vpdw1gmxcg6qar8zx",
       "depends": ["AnnotationDbi", "Biobase", "DT", "EGSEAdata", "GSVA", "HTMLUtils", "PADOG", "RColorBrewer", "edgeR", "gage", "ggplot2", "globaltest", "gplots", "htmlwidgets", "hwriter", "limma", "metap", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "pathview", "plotly", "safe", "stringi", "topGO"]
     },
     "ELMER": {
       "name": "ELMER",
-      "version": "2.28.0",
-      "sha256": "012vxjagm3m9v98ds89xfwncnxzhwqlk7yigadnw73vg5r8ix6zd",
+      "version": "2.30.0",
+      "sha256": "12pvv1gc9g66nwzdi72knjh0y01bxkmwqi3iscswvcwzxa1ggc0q",
       "depends": ["ComplexHeatmap", "DelayedArray", "ELMER_data", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Matrix", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "TCGAbiolinks", "biomaRt", "circlize", "doParallel", "downloader", "dplyr", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "lattice", "magrittr", "plotly", "plyr", "progress", "purrr", "readr", "reshape", "reshape2", "rmarkdown", "rtracklayer", "rvest", "scales", "stringr", "tibble", "tidyr", "xml2"]
     },
     "EMDomics": {
       "name": "EMDomics",
-      "version": "2.34.0",
-      "sha256": "0lyaia1ngsw909avldz1pmly16v36ldqq1r7jz23fzmqa63ch87r",
+      "version": "2.36.0",
+      "sha256": "1hahqy0vvg3qkqzmdfcvrjba4zcj018ifh6gzh119qinphajdm30",
       "depends": ["BiocParallel", "CDFt", "emdist", "ggplot2", "matrixStats", "preprocessCore"]
     },
     "ENmix": {
       "name": "ENmix",
-      "version": "1.40.2",
-      "sha256": "1x8rzdzymibypb65axx3sgxsgrj5d1fldj9j70acvg46lqhmq8f2",
+      "version": "1.42.0",
+      "sha256": "1p0x2jq327r0lsnq1wdy19w5bsa4kvkhj5b6cr1dy1sgdxa7n4wr",
       "depends": ["AnnotationHub", "Biobase", "ExperimentHub", "IRanges", "RPMM", "S4Vectors", "SummarizedExperiment", "doParallel", "dynamicTreeCut", "foreach", "genefilter", "geneplotter", "gplots", "gtools", "illuminaio", "impute", "irlba", "matrixStats", "minfi", "quadprog"]
     },
     "ERSSA": {
       "name": "ERSSA",
-      "version": "1.22.0",
-      "sha256": "1bm64ydz0qlfm6vdrhqr699sc0njm6npdq0pmh2xb3w6iwh9dy92",
+      "version": "1.24.0",
+      "sha256": "1vbwyaj3jqi1dcmnz7q02iwshm3axfyw35r4bbpkx47b74yskf06",
       "depends": ["BiocParallel", "DESeq2", "RColorBrewer", "apeglm", "edgeR", "ggplot2", "plyr"]
     },
     "EWCE": {
       "name": "EWCE",
-      "version": "1.12.0",
-      "sha256": "19j1bl179kcih54ry9m4pgl9qvylkxyjaqk6pzna9wm5dpzdqnsl",
+      "version": "1.14.0",
+      "sha256": "0j8dj9dscy6ia2wy59a79rp53xnrj3dx48bfxwhhhld0s1zzs643",
       "depends": ["BiocParallel", "DelayedArray", "HGNChelper", "Matrix", "RNOmni", "SingleCellExperiment", "SummarizedExperiment", "data_table", "dplyr", "ewceData", "ggplot2", "limma", "orthogene", "reshape2", "stringr"]
     },
     "EasyCellType": {
       "name": "EasyCellType",
-      "version": "1.6.0",
-      "sha256": "0czz6yy7534xzfr28kp18hy47sdzsfkzpd9hz1jx5rfgl4sg6hbn",
+      "version": "1.8.0",
+      "sha256": "181564vl9fcm200svn7ilbhjy28xd9xvw9iyg6v03pi1ij8ls3pm",
       "depends": ["AnnotationDbi", "BiocStyle", "clusterProfiler", "dplyr", "forcats", "ggplot2", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "rlang", "vctrs"]
     },
     "EmpiricalBrownsMethod": {
       "name": "EmpiricalBrownsMethod",
-      "version": "1.32.0",
-      "sha256": "1r34sj45liw2ya6842c4fxnph6kax712f8mqr0flvcy2k7g45ccn",
+      "version": "1.34.0",
+      "sha256": "0vbzxw5cyhzadlazbrn4pwr2g7gl7wpgzf665v2hqn7f3pjbnw4s",
       "depends": []
     },
     "EnMCB": {
       "name": "EnMCB",
-      "version": "1.16.0",
-      "sha256": "1m3d92abl2qdkd82wnf6imx9xgxi4w94wiy84vnwn9g3r9kxl1p2",
+      "version": "1.18.0",
+      "sha256": "1y15nl9gx1qb6112ikx1pbslx0jz7s988mra7aq63q0igd33yz8n",
       "depends": ["BiocFileCache", "Matrix", "boot", "e1071", "ggplot2", "glmnet", "igraph", "mboost", "rms", "survival", "survivalROC", "survivalsvm"]
     },
     "EnhancedVolcano": {
       "name": "EnhancedVolcano",
-      "version": "1.22.0",
-      "sha256": "0ry5r74d6m5x15b4azw93mjrvq4fapj4rxpi9f6macz4l5l6j1j0",
+      "version": "1.24.0",
+      "sha256": "16z9117cgggq1dn9fymq39wbsjlhn2dvwqh69kzhf7cg79b2czap",
       "depends": ["ggplot2", "ggrepel"]
     },
+    "EnrichDO": {
+      "name": "EnrichDO",
+      "version": "1.0.0",
+      "sha256": "11hfq4qb0q9jylincbk89zp0r73hp9y2zw14ghlrabphyzgg287f",
+      "depends": ["BiocGenerics", "RColorBrewer", "Rgraphviz", "S4Vectors", "clusterProfiler", "dplyr", "ggplot2", "graph", "hash", "magrittr", "pheatmap", "purrr", "readr", "stringr", "tidyr"]
+    },
     "EnrichedHeatmap": {
       "name": "EnrichedHeatmap",
-      "version": "1.34.0",
-      "sha256": "0fmqz9xqs1108a5xxpsc63pplcc0i742r4zdk46p68my28ba2xfq",
+      "version": "1.36.0",
+      "sha256": "0qihf4ff9wwg2yfm5lgc8g59ni1spm3n2wjmvp2md83571cczm15",
       "depends": ["ComplexHeatmap", "GenomicRanges", "GetoptLong", "IRanges", "Rcpp", "circlize", "locfit", "matrixStats"]
     },
     "EnrichmentBrowser": {
       "name": "EnrichmentBrowser",
-      "version": "2.34.1",
-      "sha256": "1drmdr1z2fyyf566vv5arkbwpfkwxajh555nasnkbnpqdrq3b93q",
+      "version": "2.36.0",
+      "sha256": "0a2dgkmrqvnqkbvjlq1z4lmncg41dhgbh5pvvrniqzqsaqc7pyqz",
       "depends": ["AnnotationDbi", "BiocFileCache", "BiocManager", "GO_db", "GSEABase", "KEGGREST", "KEGGgraph", "Rgraphviz", "S4Vectors", "SPIA", "SummarizedExperiment", "edgeR", "graph", "graphite", "hwriter", "limma", "pathview", "safe"]
     },
+    "EpiCompare": {
+      "name": "EpiCompare",
+      "version": "1.10.0",
+      "sha256": "0pdkpxmvazax047fa2q1sxm6rddzqv2r58kk3dsi7vbdsi4c0cxh",
+      "depends": ["AnnotationHub", "BiocGenerics", "ChIPseeker", "GenomeInfoDb", "GenomicRanges", "IRanges", "data_table", "downloadthis", "genomation", "ggplot2", "htmltools", "plotly", "reshape2", "rmarkdown", "rtracklayer", "stringr"]
+    },
     "EpiDISH": {
       "name": "EpiDISH",
-      "version": "2.20.0",
-      "sha256": "17qkm5inavfdfrim9baqxdhs3w64c6y94qadw4y5p9xsck318frq",
+      "version": "2.22.0",
+      "sha256": "1az3paxj20bkp75q71lprdsws4vya6bwgjsw6nxx8j4rpd8jz8hn",
       "depends": ["MASS", "Matrix", "e1071", "locfdr", "matrixStats", "quadprog", "stringr"]
     },
     "EpiMix": {
       "name": "EpiMix",
-      "version": "1.6.1",
-      "sha256": "1m8mlxhci56d4d1iingwj8ddmddpm02an8dhh6m4ka4vpg7q51as",
+      "version": "1.8.0",
+      "sha256": "1cj0675faiy472gmhqvdwbf1fwrwajgfjmwllqj9ah7xr0q5mk5q",
       "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "ELMER_data", "EpiMix_data", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "RCurl", "RPMM", "R_matlab", "S4Vectors", "SummarizedExperiment", "biomaRt", "data_table", "doParallel", "doSNOW", "downloader", "dplyr", "foreach", "ggplot2", "impute", "limma", "plyr", "progress", "rlang", "tibble", "tidyr"]
     },
     "EpiTxDb": {
       "name": "EpiTxDb",
-      "version": "1.16.0",
-      "sha256": "11f2a9qhbl605mzj6z673j0hlgd3a80c2qigkcw9q81745rd5lrg",
+      "version": "1.18.0",
+      "sha256": "1m60d36q4ldjyrx1j4f6nr7qy07ghvy3cnsjsj9w3zf60ragiiqf",
       "depends": ["AnnotationDbi", "BiocFileCache", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Modstrings", "RSQLite", "S4Vectors", "curl", "httr", "rex", "tRNAdbImport", "txdbmaker", "xml2"]
     },
+    "EpipwR": {
+      "name": "EpipwR",
+      "version": "1.0.0",
+      "sha256": "09wxys47arlxvriwh78n1vycb0ph09wfxlgprsxgpizna6pxwmzl",
+      "depends": ["EpipwR_data", "ExperimentHub", "ggplot2"]
+    },
     "EventPointer": {
       "name": "EventPointer",
-      "version": "3.12.0",
-      "sha256": "1d13s9pww3kjdm0nfnz598jng9vl66jl6y52rczdcflxikfgip0i",
+      "version": "3.14.0",
+      "sha256": "1frr399md73nd12h8avn7hm8yxqg7dan3xwlc11842sgjg3f37rm",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Matrix", "RBGL", "S4Vectors", "SGSeq", "SummarizedExperiment", "abind", "affxparser", "cobs", "doParallel", "fgsea", "foreach", "glmnet", "graph", "igraph", "iterators", "limma", "lpSolve", "matrixStats", "nnls", "poibin", "prodlim", "qvalue", "rhdf5", "speedglm", "stringr", "tximport"]
     },
     "ExCluster": {
       "name": "ExCluster",
-      "version": "1.22.0",
-      "sha256": "1drpwz9pba4w36sbp53jrlmwbzr68fysrzqa06qb5347sxl94ac1",
+      "version": "1.24.0",
+      "sha256": "10ppwx5aj16d54qpcjs8v57ln0dipvr1sx7dfhm1f8l1ji37h3i2",
       "depends": ["GenomicRanges", "IRanges", "Rsubread", "matrixStats", "rtracklayer"]
     },
     "ExiMiR": {
       "name": "ExiMiR",
-      "version": "2.46.0",
-      "sha256": "01bdi0d9afwyndfcjkaand4qpmbx6i437183s9g16i13vzwh1wk4",
+      "version": "2.48.0",
+      "sha256": "1xm7c01x27xmdrlzzrc10bw3w4wz0wjd3h8fwvcf2paib0f181lq",
       "depends": ["Biobase", "affy", "affyio", "limma", "preprocessCore"]
     },
     "ExperimentHub": {
       "name": "ExperimentHub",
-      "version": "2.12.0",
-      "sha256": "0mj1aqxyp84mn5m0fwk9lijysy594hhga3kv4mddv45vqxdsr08h",
+      "version": "2.14.0",
+      "sha256": "1zawq85nffj4jvq2yvrgrxph4vhi2fjw2sc4qll0r45pdkx4vjr4",
       "depends": ["AnnotationHub", "BiocFileCache", "BiocGenerics", "BiocManager", "S4Vectors", "rappdirs"]
     },
     "ExperimentHubData": {
       "name": "ExperimentHubData",
-      "version": "1.30.0",
-      "sha256": "1adm3b0nacbdi4x5z71iiif9d876m3ip6crhbbr2hw4mbk6is7qn",
+      "version": "1.32.0",
+      "sha256": "1bg11hpmia4gbzslvlawrq8z5ycyx0sby9sg678x881zkaf107fm",
       "depends": ["AnnotationHubData", "BiocGenerics", "BiocManager", "DBI", "ExperimentHub", "S4Vectors", "curl", "httr"]
     },
     "ExperimentSubset": {
       "name": "ExperimentSubset",
-      "version": "1.14.0",
-      "sha256": "0san9jjdgx9m5cl2pdn17v6j6vd865jr80r4258fifywr7yqdnm1",
+      "version": "1.16.0",
+      "sha256": "0ip1qqfyhvlyp5alzpmqi9cgfdxm45w9m61zkpjyiy12r1wgvs6g",
       "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "TreeSummarizedExperiment"]
     },
     "ExploreModelMatrix": {
       "name": "ExploreModelMatrix",
-      "version": "1.16.0",
-      "sha256": "01ys9p7q3pmz7qfw1ggppchqq8yzrjsd91fa1r6h3a2rz8azdi2g",
+      "version": "1.18.0",
+      "sha256": "1wpp7pi0yayqm1mr3l9jszviym00gghl8ajm19436nyn3mkzmqxj",
       "depends": ["DT", "MASS", "S4Vectors", "cowplot", "dplyr", "ggplot2", "limma", "magrittr", "rintrojs", "scales", "shiny", "shinydashboard", "shinyjs", "tibble", "tidyr"]
     },
     "ExpressionAtlas": {
       "name": "ExpressionAtlas",
-      "version": "1.32.0",
-      "sha256": "1plxw5jf2lpa8away57nr1jch14d3lz0f33sjv958kyqzhar7zml",
+      "version": "1.34.0",
+      "sha256": "0j5s9c9k1vyxj3zbp4njapa4ccasr19av9vfba3g41d4d9fwqrrl",
       "depends": ["Biobase", "BiocStyle", "RCurl", "S4Vectors", "SummarizedExperiment", "XML", "httr", "jsonlite", "limma", "xml2"]
     },
     "FEAST": {
       "name": "FEAST",
-      "version": "1.12.0",
-      "sha256": "0w6pkq3lc9l42fnwa35lcnbw52ylbjs65w6dsh2k5wcgs0jig8rp",
+      "version": "1.14.0",
+      "sha256": "0z0mqrdbk9g89431hkl1gc5yszrmw6n7yghngdyis29gykhcf5h3",
       "depends": ["BiocParallel", "SC3", "SingleCellExperiment", "SummarizedExperiment", "TSCAN", "irlba", "matrixStats", "mclust"]
     },
     "FELLA": {
       "name": "FELLA",
-      "version": "1.24.0",
-      "sha256": "1rbb5lfz7maicw0hx5sd1jg9rqxlcmv6bfyakp4ics9azxwk899i",
+      "version": "1.26.0",
+      "sha256": "1r744bnvwzswfq3q31r2ybq3k10dm04hziqxdcpyj0lg4x29rq2l",
       "depends": ["KEGGREST", "Matrix", "igraph", "plyr"]
     },
     "FGNet": {
       "name": "FGNet",
-      "version": "3.38.0",
-      "sha256": "128dc1mhqj0vxqcivra79k0c8jwr9zcrcwzkkr69czzv5i7szw8d",
+      "version": "3.40.0",
+      "sha256": "1xbba8r4z634kvi749ac2idzmpsv7q9ajk5djh425a8d18679pm5",
       "depends": ["RColorBrewer", "R_utils", "XML", "hwriter", "igraph", "plotrix", "png", "reshape2"]
     },
     "FISHalyseR": {
       "name": "FISHalyseR",
-      "version": "1.38.0",
-      "sha256": "1f3iv48l2wbx8izn0z0lnk2k8ssm6bj6ai02kd5ww5kk7gqg6ka7",
+      "version": "1.40.0",
+      "sha256": "0nb47jnfv9i9z99l249a96zkal5m6clk34ywp6p8hhzcqc20gwg3",
       "depends": ["EBImage", "abind"]
     },
     "FLAMES": {
       "name": "FLAMES",
-      "version": "1.10.0",
-      "sha256": "1fcz0v1vy0q5zmdpawlk4a7fbqd01954p0jby9nbzgbk85hl16mi",
-      "depends": ["BiocGenerics", "Biostrings", "ComplexHeatmap", "DropletUtils", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bambu", "basilisk", "circlize", "cowplot", "dplyr", "future", "ggbio", "ggplot2", "gridExtra", "igraph", "jsonlite", "magrittr", "reticulate", "rtracklayer", "scater", "scran", "scuttle", "stringr", "testthat", "tibble", "tidyr", "tidyselect", "txdbmaker", "withr", "zlibbioc"]
+      "version": "2.0.2",
+      "sha256": "0yszsrnvs13h1vdv5gfja54g48f8b0dadlwd2h7n02pl8b569q38",
+      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "ComplexHeatmap", "DropletUtils", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "RColorBrewer", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "bambu", "basilisk", "circlize", "cowplot", "dplyr", "future", "ggbio", "ggplot2", "gridExtra", "igraph", "jsonlite", "magrittr", "readr", "reticulate", "rtracklayer", "scater", "scatterpie", "scran", "scuttle", "stringr", "testthat", "tibble", "tidyr", "tidyselect", "txdbmaker", "withr"]
     },
     "FRASER": {
       "name": "FRASER",
-      "version": "2.0.0",
-      "sha256": "0q36p80ff0hq37ddjpx6czkllpmlkj00h6fq32hbmr9cyh3rz2d8",
+      "version": "2.2.0",
+      "sha256": "1br4cb764r036kgpfbd7azkyddkv4vnin9g0jnnyy1hw3c0zkl67",
       "depends": ["AnnotationDbi", "BBmisc", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "HDF5Array", "IRanges", "OUTRIDER", "PRROC", "RColorBrewer", "R_utils", "Rcpp", "RcppArmadillo", "Rsamtools", "Rsubread", "S4Vectors", "SummarizedExperiment", "VGAM", "biomaRt", "cowplot", "data_table", "extraDistr", "generics", "ggplot2", "ggrepel", "matrixStats", "pcaMethods", "pheatmap", "plotly", "rhdf5", "tibble"]
     },
     "FRGEpistasis": {
       "name": "FRGEpistasis",
-      "version": "1.40.0",
-      "sha256": "0fpph9rrkakaxah4f8bcbny4yd8w4zp38666ff8mrvvlzx5fn313",
+      "version": "1.42.0",
+      "sha256": "0l56zdxw7p7ld6r2bxqvdkva0ljv7lbddp6jyf8dajg1n7hph9ni",
       "depends": ["MASS", "fda"]
     },
     "FamAgg": {
       "name": "FamAgg",
-      "version": "1.32.0",
-      "sha256": "0qcd028bamdj4v24rdqymk2zc02kj7yc8p1q19vvzk8h1hxvh98l",
+      "version": "1.34.0",
+      "sha256": "0i32yz7764vcaijy7pyfh30s3sf39a2k3v4n30pz0mvd0r1l9ix5",
       "depends": ["BiocGenerics", "Matrix", "gap", "igraph", "kinship2", "survey"]
     },
     "FastqCleaner": {
       "name": "FastqCleaner",
-      "version": "1.22.0",
-      "sha256": "0bwbg3b8w27whbg8gl2ga58fwm95cyra45f2y609izrx9vjz7dcr",
+      "version": "1.24.0",
+      "sha256": "1w320w45g8vhas53ly43gdj9445i3ha1bhdrhc179r9ykfgc5k6v",
       "depends": ["Biostrings", "DT", "IRanges", "Rcpp", "S4Vectors", "ShortRead", "htmltools", "shiny", "shinyBS"]
     },
     "FeatSeekR": {
       "name": "FeatSeekR",
-      "version": "1.4.0",
-      "sha256": "0r72wl0wjzfvh8wmpn6ppffsh6yrydkyni1pbxsw865j5rkiiyqd",
+      "version": "1.6.0",
+      "sha256": "0mcn5m18wn7h2j3zxq54h0lfzzv0vicj5pbvgv11bnxbnhan9vih",
       "depends": ["MASS", "SummarizedExperiment", "pheatmap", "pracma"]
     },
     "FilterFFPE": {
       "name": "FilterFFPE",
-      "version": "1.14.0",
-      "sha256": "1pjks7wadlyyhaz9lcrhxamjqjaq0nnyxkv6jxb4adrh5hwvgxfx",
+      "version": "1.16.0",
+      "sha256": "02haiwb1pl507b4vmzlzcrghp7qwfbhdjbq1zx60sxa25avgm5m7",
       "depends": ["GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "doParallel", "foreach"]
     },
     "FindIT2": {
       "name": "FindIT2",
-      "version": "1.10.0",
-      "sha256": "03bfmxln17lnvzmmsc3g64nk1vs6fg4bphlszqgxhdxwbjjg4nf2",
+      "version": "1.12.0",
+      "sha256": "067pv3q4is8rgkibnb4agc1cjgg6gsr9ssaahj931fdlcapl1j43",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "ggrepel", "glmnet", "patchwork", "progress", "purrr", "qvalue", "rlang", "rtracklayer", "stringr", "tibble", "tidyr", "withr"]
     },
     "FitHiC": {
       "name": "FitHiC",
-      "version": "1.30.0",
-      "sha256": "107hm9k9wfr34fradldmjym2bzxb6qx8109p4a7xrqkiya0hmwwa",
+      "version": "1.32.0",
+      "sha256": "166djgps0k8xb9rjx8i6sfh71a4cqkgpkw3dr25plprafj4qlxva",
       "depends": ["Rcpp", "data_table", "fdrtool"]
     },
     "FlowSOM": {
       "name": "FlowSOM",
-      "version": "2.12.0",
-      "sha256": "0xqrp184p00pvzzf6ddmp2r8lpg97bm0q6smjwcrfb8rn4msxmis",
+      "version": "2.14.0",
+      "sha256": "01dy2dxp1m6sx0wzy0q9axx2xrp30sqcjl4jhjnv8zxghk3m0frv",
       "depends": ["BiocGenerics", "ConsensusClusterPlus", "Rtsne", "XML", "colorRamps", "dplyr", "flowCore", "ggforce", "ggnewscale", "ggplot2", "ggpubr", "igraph", "magrittr", "rlang", "tidyr"]
     },
     "FuseSOM": {
       "name": "FuseSOM",
-      "version": "1.6.0",
-      "sha256": "1qbk2rdc7fdhkglwzhsyrysb51qwjsyjy9m6pgbbcwi14iwwhnf2",
+      "version": "1.8.0",
+      "sha256": "0mrh4lkk1gknfny50j240wcg2sf3l9fakb5xnwd58jfv31459w1w",
       "depends": ["FCPS", "Rcpp", "S4Vectors", "SummarizedExperiment", "analogue", "cluster", "coop", "diptest", "fastcluster", "fpc", "ggplot2", "ggplotify", "ggpubr", "pheatmap", "proxy", "psych", "stringr"]
     },
     "GA4GHclient": {
       "name": "GA4GHclient",
-      "version": "1.28.0",
-      "sha256": "1x5k9l2f4fw5da1aacwd0b7rn9kjpbzf8vl9h76n4d92fdh25jlh",
+      "version": "1.30.0",
+      "sha256": "02l9yrg7j9qm2890zxvc5ybizj3vcyghav9qnffdgblk47c2zghq",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "VariantAnnotation", "dplyr", "httr", "jsonlite"]
     },
     "GA4GHshiny": {
       "name": "GA4GHshiny",
-      "version": "1.26.0",
-      "sha256": "1vj0p1akcgzq2q43yir0g2klggjw8970chhzibw7yb5qxr2fz9ai",
+      "version": "1.28.0",
+      "sha256": "1df8ph0mkzggi9ph3bpg5barqwbvhrd5kb2xvpm9m2659si82944",
       "depends": ["AnnotationDbi", "BiocGenerics", "DT", "GA4GHclient", "GenomeInfoDb", "GenomicFeatures", "S4Vectors", "dplyr", "openxlsx", "purrr", "shiny", "shinyjs", "shinythemes", "tidyr"]
     },
     "GARS": {
       "name": "GARS",
-      "version": "1.24.0",
-      "sha256": "1wi56b6h1fi1rr4hrpbby6iwgax36q01h6hr2nm4bgb7cx6l3bii",
+      "version": "1.26.0",
+      "sha256": "16v1fi4gcqn1abq096fy45clv0i537ndgql38yl25ajlfi9w9j9p",
       "depends": ["DaMiRseq", "MLSeq", "SummarizedExperiment", "cluster", "ggplot2"]
     },
     "GAprediction": {
       "name": "GAprediction",
-      "version": "1.30.0",
-      "sha256": "0p38ivjzp0nsyr85a323xgjwb2amsmvr10ajq9m51z9acl4jzakx",
+      "version": "1.32.0",
+      "sha256": "12waqgv7lyp9p64x1k0kmj4kc1ahybhjyjz9f0achj2jh1m3iv2g",
       "depends": ["Matrix", "glmnet"]
     },
     "GBScleanR": {
       "name": "GBScleanR",
-      "version": "1.8.18",
-      "sha256": "1il1h9njfvhi4kxn30bhc31nkmr91b9imfafq68ccz947ckzhkpm",
+      "version": "2.0.2",
+      "sha256": "1x81vdg927zvgd20xnbjqnjjd1506caqdxm0ysrzy07xb1njwlb0",
       "depends": ["Rcpp", "RcppParallel", "SeqArray", "expm", "gdsfmt", "ggplot2", "tidyr"]
     },
     "GDCRNATools": {
       "name": "GDCRNATools",
-      "version": "1.24.0",
-      "sha256": "1grhgzl08f2infvvpd5084mvplvgqb0qa7d6afrfv6n5wigwnvbv",
+      "version": "1.26.0",
+      "sha256": "0mbkwh6rmhr2193qjrswsimxnl53jymsarjkbp9hr3mljm8caxr5",
       "depends": ["BiocParallel", "DESeq2", "DOSE", "DT", "GenomicDataCommons", "XML", "biomaRt", "clusterProfiler", "edgeR", "ggplot2", "gplots", "jsonlite", "limma", "org_Hs_eg_db", "pathview", "rjson", "shiny", "survival", "survminer"]
     },
     "GDSArray": {
       "name": "GDSArray",
-      "version": "1.24.2",
-      "sha256": "01sjx63m9affj46s6l3byj9m127bipid230jdlxnwans38x5jsxr",
+      "version": "1.26.0",
+      "sha256": "1wmx2q6q4glnjqghfc5iriv4hxkd55f0y4mpf5vkwkld8ha1rjm5",
       "depends": ["BiocGenerics", "DelayedArray", "S4Vectors", "SNPRelate", "SeqArray", "gdsfmt"]
     },
     "GEM": {
       "name": "GEM",
-      "version": "1.30.0",
-      "sha256": "1idp44h5szwwradv6i4bkgy055gaa04d5sxrv0r683h717pqagh5",
+      "version": "1.32.0",
+      "sha256": "014xqm0qzvz0vnnd2gvp6vm6cib6dg0cpjdr25favlzl8k89yci5",
       "depends": ["ggplot2"]
     },
     "GENESIS": {
       "name": "GENESIS",
-      "version": "2.34.0",
-      "sha256": "1jk0mw183v2nxabx58kwm8fwm6r2ikbc90ilxdmivfsxc7gx534r",
+      "version": "2.36.0",
+      "sha256": "0x5y2wvmnmdvj0swjax38bcl9isf3jbq7dllw7lv84yj7z250n79",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "GWASTools", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SNPRelate", "SeqArray", "SeqVarTools", "data_table", "gdsfmt", "igraph", "reshape2"]
     },
     "GENIE3": {
       "name": "GENIE3",
-      "version": "1.26.0",
-      "sha256": "0ijwyx42saqas52273c63c3yi948bh4pd4lifyqi3zjjs17bj1cg",
+      "version": "1.28.0",
+      "sha256": "0hc6vhlgd0p4f2cf2v2wbjfs068ag3ix1rrk91a25lj1mjnhh5ic",
       "depends": ["dplyr", "reshape2"]
     },
     "GEOexplorer": {
       "name": "GEOexplorer",
-      "version": "1.10.0",
-      "sha256": "0hb9hgkb5nc2mdri18y22s4qi5hdp3zclmpdz2q7hdvqhqg6kqzv",
-      "depends": ["Biobase", "DT", "GEOquery", "R_utils", "XML", "car", "edgeR", "enrichR", "factoextra", "ggplot2", "heatmaply", "htmltools", "httr", "impute", "knitr", "limma", "markdown", "pheatmap", "plotly", "readxl", "scales", "shiny", "shinyHeatmaply", "shinybusy", "shinycssloaders", "stringr", "sva", "umap", "xfun", "xml2"]
+      "version": "1.12.0",
+      "sha256": "1cd2flf1vlizmz1b5zsyr3zvjz69fhckrxzb257p9g7m07a9mswm",
+      "depends": ["Biobase", "DT", "GEOquery", "R_utils", "XML", "car", "edgeR", "factoextra", "ggplot2", "heatmaply", "htmltools", "httr", "impute", "knitr", "limma", "markdown", "pheatmap", "plotly", "readxl", "scales", "shiny", "shinyHeatmaply", "shinybusy", "shinycssloaders", "stringr", "sva", "umap", "xfun", "xml2"]
     },
     "GEOfastq": {
       "name": "GEOfastq",
-      "version": "1.12.0",
-      "sha256": "18wi24a6j04fflank3rw4z852j21zarca0by7g5kwq1ym2dy2xld",
+      "version": "1.14.0",
+      "sha256": "0fm08n9lnxh9ppm5afzydlq8r4hx369pi75imi77lzc57jx5iqlq",
       "depends": ["RCurl", "doParallel", "foreach", "plyr", "rvest", "stringr", "xml2"]
     },
     "GEOmetadb": {
       "name": "GEOmetadb",
-      "version": "1.66.0",
-      "sha256": "0yafdqcwkyv3sc3wcfbpciy04vqciqjfihsf0gyfcza75gjkqy0w",
-      "depends": ["GEOquery", "RSQLite"]
+      "version": "1.68.1",
+      "sha256": "17q9ab1jly5g0q0ijd6bm2j6xr097bk4n6kyp6g9zh6pcb76yhl8",
+      "depends": ["RSQLite", "R_utils"]
     },
     "GEOquery": {
       "name": "GEOquery",
-      "version": "2.72.0",
-      "sha256": "0rqyv95l8h3s68ywhv3r7hm7j1mbm8prql7p2rlvv4xg31yqmnpl",
-      "depends": ["Biobase", "R_utils", "curl", "data_table", "dplyr", "limma", "magrittr", "readr", "tidyr", "xml2"]
+      "version": "2.74.0",
+      "sha256": "0lwi8cxlzgnd59bcn5mxkxijb292y857phafyskfs9k7951lxznl",
+      "depends": ["Biobase", "R_utils", "S4Vectors", "SummarizedExperiment", "curl", "data_table", "dplyr", "httr2", "limma", "magrittr", "readr", "rentrez", "rvest", "stringr", "tidyr", "xml2"]
     },
     "GEOsubmission": {
       "name": "GEOsubmission",
-      "version": "1.56.0",
-      "sha256": "1kvk6v1pj6f252lzlvw79ffd7wadlc6kvpa174msi75ww5s2qfc0",
+      "version": "1.58.0",
+      "sha256": "0swqsm8l8vki7pcxpjh3p3k7rhbvkmlx794zlildb7nyh560ll02",
       "depends": ["Biobase", "affy"]
     },
     "GEWIST": {
       "name": "GEWIST",
-      "version": "1.48.0",
-      "sha256": "0q6rbx7qy8cmdafv4qabx6ppyq3x6658jr0139xv61nzgi8395v4",
+      "version": "1.50.0",
+      "sha256": "1hf9rbc9a0mas1ydd2j6448xhz4iqkxv2cxnd0zsbpqr07w75fs9",
       "depends": ["car"]
     },
     "GGPA": {
       "name": "GGPA",
-      "version": "1.16.0",
-      "sha256": "1lg62vxn4z6z3l9d18gmyvdr456hs76lczxfq8j2w509gflcrskb",
+      "version": "1.18.0",
+      "sha256": "0dbhgvkh7w8bi58ljjvv45d9m648dm8n62ps8b0l2j9kxdxh1cil",
       "depends": ["GGally", "Rcpp", "RcppArmadillo", "matrixStats", "network", "scales", "sna"]
     },
     "GIGSEA": {
       "name": "GIGSEA",
-      "version": "1.22.0",
-      "sha256": "1yhxpm1amm6anzcss31pkg5xzw4q1nq1hjb6rx5p7a5dh9h8hdna",
+      "version": "1.24.0",
+      "sha256": "158aypdf8qs3a3ravjd9cw16z64vrv5zpzljs7v5rxkxadbp75js",
       "depends": ["MASS", "Matrix", "locfdr"]
     },
     "GLAD": {
       "name": "GLAD",
-      "version": "2.68.0",
-      "sha256": "01qn4v7b7b633dz01njzmg48lga861pfqnys9f0fbk9damxc6rr1",
+      "version": "2.70.0",
+      "sha256": "05vn4zmazkkf0m3shm08dkwlb8whwqqw0vr5h27vlxlz3bcjnqcf",
       "depends": ["aws"]
     },
     "GMRP": {
       "name": "GMRP",
-      "version": "1.32.0",
-      "sha256": "0g2pmnngpv9k7gaz7bd5b0gn9i0i86q36fcapai93w76ml8ccvab",
+      "version": "1.34.0",
+      "sha256": "0xfgafsrmpp1iv2vkw00b9n57zh8azf0ak1s1nwby2870q5q11pv",
       "depends": ["GenomicRanges", "diagram", "plotrix"]
     },
     "GNET2": {
       "name": "GNET2",
-      "version": "1.20.0",
-      "sha256": "1hgzvl4k5q84ig9njmfvmdwc64h7nwsg0kcsi3da3mizxahaj780",
+      "version": "1.22.0",
+      "sha256": "0k9dcyl69vpm885mdk81aldcdw29vjc12vjrhcgs298w9g78azn3",
       "depends": ["DiagrammeR", "Rcpp", "SummarizedExperiment", "dplyr", "ggplot2", "igraph", "matrixStats", "reshape2", "xgboost"]
     },
     "GNOSIS": {
       "name": "GNOSIS",
-      "version": "1.2.0",
-      "sha256": "0m20w85kixxqydrrf5cbphr1hvzlc2wmwjf68s9rr0llcfv7gy3r",
+      "version": "1.4.0",
+      "sha256": "1g50a9ip2dlfzczjd8c6lx34cwkfzqgrcd3gbc53rimbmy7zrlgy",
       "depends": ["DT", "DescTools", "RColorBrewer", "cBioPortalData", "car", "compareGroups", "dashboardthemes", "fabricatr", "fontawesome", "maftools", "magrittr", "operator_tools", "partykit", "reshape2", "rpart", "rstatix", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "shinylogs", "shinymeta", "survival", "survminer", "tidyverse"]
     },
     "GOSemSim": {
       "name": "GOSemSim",
-      "version": "2.30.0",
-      "sha256": "0985w9b2iw7jbmpymfvqmpzshsy0lvqw7whc1djdnh58lwscnhcq",
-      "depends": ["AnnotationDbi", "GO_db", "Rcpp", "rlang", "yulab_utils"]
+      "version": "2.32.0",
+      "sha256": "0ql5mxaks11dpkykggylnpi2jymh467w1zqi6s6bp1gb4h399jly",
+      "depends": ["AnnotationDbi", "DBI", "GO_db", "R_utils", "Rcpp", "digest", "rlang", "yulab_utils"]
     },
     "GOTHiC": {
       "name": "GOTHiC",
-      "version": "1.40.0",
-      "sha256": "101mf3pkchz0il0czrwixx1pv8hq9cjh8m59nii00m2vwma3slrd",
+      "version": "1.42.0",
+      "sha256": "0cazfyrnxrl266yapy34hh4af1dkdzrb041idjapxjd7mdbnvv9w",
       "depends": ["BSgenome", "BiocGenerics", "BiocManager", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "data_table", "ggplot2", "rtracklayer"]
     },
     "GOexpress": {
       "name": "GOexpress",
-      "version": "1.38.0",
-      "sha256": "0hz01hmp4bf9njw79zqy08zx9q3c6qfs2xykz5x7xkngp65mzkxf",
+      "version": "1.40.0",
+      "sha256": "0ykaxs70sy4w5ymq7cfijasgz8l88b9yf03pd8f27pg0806dpmy7",
       "depends": ["Biobase", "RColorBrewer", "RCurl", "biomaRt", "ggplot2", "gplots", "randomForest", "stringr"]
     },
     "GOfuncR": {
       "name": "GOfuncR",
-      "version": "1.24.0",
-      "sha256": "1g3nppcmyj81ia3v9zvsr8jplk8kmvssspvxd94zxh6yb3wrrc6v",
+      "version": "1.26.0",
+      "sha256": "0s6dmfv2cd88crhmq1i5sp7r37l1zabdxwdspydz9mh3008mqrqp",
       "depends": ["AnnotationDbi", "GenomicRanges", "IRanges", "Rcpp", "gtools", "mapplots", "vioplot"]
     },
     "GOpro": {
       "name": "GOpro",
-      "version": "1.30.0",
-      "sha256": "0s8yyg5myxvw61zai54d3dhai1cm43i8s8wnpf0qc476q4v2xgzl",
+      "version": "1.32.0",
+      "sha256": "0vdp86h1af6jksij9dy3kv9r9lhhhh2nysb2572xwya43q6zwcq1",
       "depends": ["AnnotationDbi", "BH", "GO_db", "IRanges", "MultiAssayExperiment", "Rcpp", "S4Vectors", "dendextend", "doParallel", "foreach", "org_Hs_eg_db"]
     },
     "GOstats": {
       "name": "GOstats",
-      "version": "2.70.0",
-      "sha256": "1dygsr8nlqksfpk00lk67dhj4fcpjg1x4dbl2r4sfanlk4hq76cs",
+      "version": "2.72.0",
+      "sha256": "0zz2gmv2hg8cr0bxj4zb95p8cf8a19zx1v925cv5f4xh7m698bzj",
       "depends": ["AnnotationDbi", "AnnotationForge", "Biobase", "Category", "GO_db", "RBGL", "Rgraphviz", "annotate", "graph"]
     },
     "GPA": {
       "name": "GPA",
-      "version": "1.16.0",
-      "sha256": "1z97rwlqvahsjcrm1j00cz9lgnw1wym6lwhi7gf8g17avgk6s7g4",
+      "version": "1.18.0",
+      "sha256": "0f69vpza558rv6mzjjnb15sff0ksjly1mjz0ghhrqiqz7kp6qahz",
       "depends": ["DT", "Rcpp", "ggplot2", "ggrepel", "plyr", "shiny", "shinyBS", "vegan"]
     },
     "GRENITS": {
       "name": "GRENITS",
-      "version": "1.56.0",
-      "sha256": "04nbvr080s6syb2d981g4402ghl2gh6f2gwsiv41nnj4narvs752",
+      "version": "1.58.0",
+      "sha256": "1w1nlh4ic6h0bf8jw2ln39r02nxs8kcbap6js3h5ckrk9fyqrwi0",
       "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "reshape2"]
     },
     "GRaNIE": {
       "name": "GRaNIE",
-      "version": "1.8.0",
-      "sha256": "1zdi6h1kmnj3b23qv268jg0iqfvgvn0h17d5l17yx3si9czcr8qr",
+      "version": "1.10.0",
+      "sha256": "0q4l9iqz7mzvm523ya489yjnbcxl4zxx12q869c4npzd01x12pcn",
       "depends": ["AnnotationHub", "Biostrings", "ComplexHeatmap", "DESeq2", "GenomeInfoDb", "GenomicRanges", "Matrix", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "biomaRt", "checkmate", "circlize", "colorspace", "data_table", "dplyr", "ensembldb", "forcats", "futile_logger", "ggplot2", "gridExtra", "igraph", "limma", "magrittr", "matrixStats", "patchwork", "progress", "readr", "reshape2", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect", "topGO", "viridis"]
     },
     "GRmetrics": {
       "name": "GRmetrics",
-      "version": "1.30.0",
-      "sha256": "02dqb1n4q5zwhfhmdrynfa5djgnvry11x69r3z94rscxl94k9pan",
+      "version": "1.32.0",
+      "sha256": "1k0rpkg7w1zcmc99ar0j7hi0w8glp17017q799m36vlv5dcky52s",
       "depends": ["S4Vectors", "SummarizedExperiment", "drc", "ggplot2", "plotly"]
     },
     "GSALightning": {
       "name": "GSALightning",
-      "version": "1.32.0",
-      "sha256": "0cmp5c22fhykld7napzk2220lzzizslsx2zi0slmiifapcrjg9vy",
+      "version": "1.34.0",
+      "sha256": "10hk1hnkq1xm8sxym517pbpznbhlh3n8xsifz9if4sy7yi19nij6",
       "depends": ["Matrix", "data_table"]
     },
     "GSAR": {
       "name": "GSAR",
-      "version": "1.38.0",
-      "sha256": "0i3k977vv3ik9yjgwpv7r1wnd982a1m2vg5rawi99hkf703cjly6",
+      "version": "1.40.0",
+      "sha256": "19lbzxh7mzarr9xjyqjp3a5hvha2mh73pc3byafsysg2qrf5w1bn",
       "depends": ["igraph"]
     },
     "GSCA": {
       "name": "GSCA",
-      "version": "2.34.0",
-      "sha256": "1lycrigmlr8kcmc1svnxl3g8rzlhpk8kfmvspllyfp8cls35mypw",
+      "version": "2.36.0",
+      "sha256": "07nvhdwyiiznw5jlil02rxqq1v61drczv3a0bzbxhq5925ygvkdq",
       "depends": ["RColorBrewer", "ggplot2", "gplots", "reshape2", "rhdf5", "shiny", "sp"]
     },
     "GSEABase": {
       "name": "GSEABase",
-      "version": "1.66.0",
-      "sha256": "1pnd8rmpk7gm89cvrqa8qwk40dszkfkhyydxp3gl13zng9c5bq40",
+      "version": "1.68.0",
+      "sha256": "0zd37jpx2zy9gxl3b2vkr7m2fq8xm1pcxk352dw3mlv1gadhsz9n",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "XML", "annotate", "graph"]
     },
     "GSEABenchmarkeR": {
       "name": "GSEABenchmarkeR",
-      "version": "1.24.0",
-      "sha256": "11aczfpbc31wq9h2ri7gn17ki2f61s801zik2lkwgvly9627kfzi",
+      "version": "1.26.0",
+      "sha256": "1s0fsi4dxkaql53jdxi392bg1y9fmvvqvkcz00njhdw7zzh18m2y",
       "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocFileCache", "BiocParallel", "EnrichmentBrowser", "ExperimentHub", "KEGGandMetacoreDzPathwaysGEO", "KEGGdzPathwaysGEO", "S4Vectors", "SummarizedExperiment", "edgeR"]
     },
     "GSEAlm": {
       "name": "GSEAlm",
-      "version": "1.64.0",
-      "sha256": "0fh6fds2y7fsdg6r97ydbkayryxxlw2jrc9kq4knsvagj2jb72ph",
+      "version": "1.66.0",
+      "sha256": "1x4hfz3qsi08ffyfwgbl1b9mnnybp81911hhaqrk6v70vzcmcl35",
       "depends": ["Biobase"]
     },
     "GSEAmining": {
       "name": "GSEAmining",
-      "version": "1.14.0",
-      "sha256": "1qzvmji5qn25q3lgb06k0dsxcn65krsrsrh6n06azz8ybkja9sj6",
+      "version": "1.16.0",
+      "sha256": "1fdl487y72dpf8qibagi2nzr188vqfjhm9fn9wpm5w2cs7ds5qk5",
       "depends": ["dendextend", "dplyr", "ggplot2", "ggwordcloud", "gridExtra", "rlang", "stringr", "tibble", "tidytext"]
     },
     "GSRI": {
       "name": "GSRI",
-      "version": "2.52.0",
-      "sha256": "0b8r1cih0zn8aj9nbpmqwiiqfhk9a2f0bxcqyx77g5jlg9b504kq",
+      "version": "2.54.0",
+      "sha256": "1l00wmv1kqgswf6fsk5qxiwv5d8yj075dpzvq0g5cc2if5w843xw",
       "depends": ["Biobase", "GSEABase", "fdrtool", "genefilter", "les"]
     },
     "GSReg": {
       "name": "GSReg",
-      "version": "1.38.0",
-      "sha256": "1wfapjggz0qnaq9cg30d51c0zm5z6bhhf764qwgcbs9ngyjfwbvx",
+      "version": "1.40.0",
+      "sha256": "1j28j14f7v49miayaiwrbi9axhfn8cmv5kvj3qh6swsr70vdapap",
       "depends": ["AnnotationDbi", "GenomicFeatures", "Homo_sapiens", "org_Hs_eg_db"]
     },
     "GSVA": {
       "name": "GSVA",
-      "version": "1.52.3",
-      "sha256": "08nxg3q350n5gf975r6b0zq4cr7lchv2i811crc4xbb7q39kw8k4",
-      "depends": ["Biobase", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "GSEABase", "HDF5Array", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "sparseMatrixStats"]
+      "version": "2.0.4",
+      "sha256": "09xcz963yiajmzf2fsnb2zs6vjnh65yvcan4n1m14hrnal6bccak",
+      "depends": ["Biobase", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "GSEABase", "HDF5Array", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "sparseMatrixStats"]
     },
     "GSgalgoR": {
       "name": "GSgalgoR",
-      "version": "1.14.0",
-      "sha256": "0mr0gdn5zkikjn5i5clq73vgmbnirl2abp84bjyzm5pf5dknjpmh",
+      "version": "1.16.0",
+      "sha256": "0aj0843ny8j5v879kl5ahzljkzw79m4cfac6hcyc64vrqixzjxwa",
       "depends": ["cluster", "doParallel", "foreach", "matchingR", "nsga2R", "proxy", "survival"]
     },
     "GUIDEseq": {
       "name": "GUIDEseq",
-      "version": "1.34.0",
-      "sha256": "1xn44w1z1izzf2qr4xsmrvc468swjp6zmf4wxc33jbk5r9lv0n0x",
+      "version": "1.36.0",
+      "sha256": "077ig53g8nlzikybhn1cvhypi25sxssjjpd3919sic47sk23z7bk",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "CRISPRseek", "ChIPpeakAnno", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "data_table", "dplyr", "ggplot2", "hash", "limma", "matrixStats", "multtest", "openxlsx", "patchwork", "purrr", "pwalign", "rio", "rlang", "stringr", "tidyr"]
     },
     "GWAS_BAYES": {
       "name": "GWAS.BAYES",
-      "version": "1.14.0",
-      "sha256": "05fp1wrddk9a961cx2ps0cad9rzagsyrfyfck6h1v3xb5gmz03ik",
+      "version": "1.16.0",
+      "sha256": "0pl4p746fhc8794cxanh35gm9s28p0741ybaqgr6a2zd8fimi8hx",
       "depends": ["GA", "MASS", "Matrix", "caret", "limma", "memoise"]
     },
     "GWASTools": {
       "name": "GWASTools",
-      "version": "1.50.0",
-      "sha256": "013qv2wac90s1rv992bwzq4diqfq7r18qk7gcifmi22samplpnw4",
+      "version": "1.52.0",
+      "sha256": "12crhc552cypi8ffl12vskrf4qw5567ag6h84ngnrmbn2k1nvjy4",
       "depends": ["Biobase", "DBI", "DNAcopy", "GWASExactHW", "RSQLite", "data_table", "gdsfmt", "lmtest", "logistf", "quantsmooth", "sandwich", "survival"]
     },
     "GWENA": {
       "name": "GWENA",
-      "version": "1.14.0",
-      "sha256": "1vwc7n0kyza4w3p7fbfrji6vamn042nwz4wa51ymcwg62j5k6yxk",
+      "version": "1.16.0",
+      "sha256": "0ccrdb0c0mcyq4bnky3f2km1144gab5cf6xlzh2zcbdnh1iqzmh9",
       "depends": ["NetRep", "RColorBrewer", "SummarizedExperiment", "WGCNA", "cluster", "dplyr", "dynamicTreeCut", "ggplot2", "gprofiler2", "igraph", "magrittr", "matrixStats", "purrr", "rlist", "stringr", "tibble", "tidyr"]
     },
     "GateFinder": {
       "name": "GateFinder",
-      "version": "1.24.0",
-      "sha256": "1rcxjnjcgd3j8vm4kz97qcvgbwxs0jb66p8wzfqkcjh0p99j6a6q",
+      "version": "1.26.0",
+      "sha256": "02f5c6dsmjym1d0nkcmjsadsllfsqi4dlwvfx1zgwiz9cgnynh23",
       "depends": ["diptest", "flowCore", "flowFP", "mvoutlier", "splancs"]
     },
     "GeDi": {
       "name": "GeDi",
-      "version": "1.0.1",
-      "sha256": "0s0fln04m7ywvv33qpagcabsp90v804fdd1yjzpqfk67xdwa1svg",
-      "depends": ["BiocFileCache", "BiocNeighbors", "BiocParallel", "ComplexHeatmap", "DT", "GOSemSim", "GeneTonic", "Matrix", "RColorBrewer", "STRINGdb", "bs4Dash", "dplyr", "fontawesome", "ggdendro", "ggplot2", "igraph", "plotly", "readxl", "rintrojs", "scales", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "tm", "visNetwork", "wordcloud2"]
+      "version": "1.2.0",
+      "sha256": "0nczjz3z89c253akifs3v1p04gf10kvndi6w42zw56z81n96762r",
+      "depends": ["BiocFileCache", "BiocNeighbors", "BiocParallel", "ComplexHeatmap", "DT", "GOSemSim", "GeneTonic", "Matrix", "RColorBrewer", "STRINGdb", "bs4Dash", "circlize", "cluster", "dplyr", "fontawesome", "ggdendro", "ggplot2", "igraph", "plotly", "readxl", "rintrojs", "scales", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "tm", "visNetwork", "wordcloud2"]
     },
     "GenProSeq": {
       "name": "GenProSeq",
-      "version": "1.8.0",
-      "sha256": "0hpf03pjfi01l2afsm1wp5vc077adx06pb4ks602v5mxy9dm1x1y",
+      "version": "1.10.0",
+      "sha256": "1kky5mx6pscvqk1vkhyqrm8p41z8fmfqrmisxfm3d42plzsds6fc",
       "depends": ["CatEncoders", "DeepPINCS", "keras", "mclust", "reticulate", "tensorflow", "ttgsea", "word2vec"]
     },
     "GenVisR": {
       "name": "GenVisR",
-      "version": "1.36.0",
-      "sha256": "1xzzdy2mcy8as3szygly3kw6k7g5dp2vxmimcw6738fj37zbcd77",
+      "version": "1.38.0",
+      "sha256": "1blairc6n6z679f9c34572hk7z58kjwd6ysb6l4pnl9akbqf4bm5",
       "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "VariantAnnotation", "biomaRt", "data_table", "ggplot2", "gridExtra", "gtable", "gtools", "plyr", "reshape2", "scales", "viridis"]
     },
     "GeneBreak": {
       "name": "GeneBreak",
-      "version": "1.34.0",
-      "sha256": "0vgid513n8xra71nhabxdy0h6ffqr84sf9gzaccx27yiw2l1wg4s",
+      "version": "1.36.0",
+      "sha256": "12mb8zp9w8f9bg8whpr7y4nl8kdfnryxx24d6w2azrknrdypa1fm",
       "depends": ["CGHbase", "CGHcall", "GenomicRanges", "QDNAseq"]
     },
     "GeneExpressionSignature": {
       "name": "GeneExpressionSignature",
-      "version": "1.50.0",
-      "sha256": "0rflr71jfaiyhzymvr0x9cq4mcb153qq2m4x912jawc46wf4cj3x",
+      "version": "1.52.0",
+      "sha256": "0s2pzy667f00c7jwq51bl90hk1jjk972bjdw9jlwyvcj5873p15m",
       "depends": ["Biobase"]
     },
     "GeneGA": {
       "name": "GeneGA",
-      "version": "1.54.0",
-      "sha256": "1gw9bxdmaak4g6chpya4xrvazrzb49bwlq1jk952vvgkrgcvnas1",
+      "version": "1.56.0",
+      "sha256": "0vi6vy62gvf8y0aw5ygx5x6qqzjjmfwks7w9n3bpkqab3yli13dw",
       "depends": ["hash", "seqinr"]
     },
     "GeneGeneInteR": {
       "name": "GeneGeneInteR",
-      "version": "1.30.0",
-      "sha256": "05d9i4nz7gf6g0g1bp0zpn3kqqfzf1lcjy7y67m1z8s96svkal47",
+      "version": "1.32.0",
+      "sha256": "12cg3d5b5byx3ck1s11bwz6s0b1yc8y6csag38qihkql1qizgync",
       "depends": ["FactoMineR", "GenomicRanges", "IRanges", "Rsamtools", "data_table", "igraph", "kernlab", "mvtnorm", "snpStats"]
     },
     "GeneMeta": {
       "name": "GeneMeta",
-      "version": "1.76.0",
-      "sha256": "1x73k2xid41f25yrzah3s9pqk51r0nda758kvfvh5py04yxs9xf1",
+      "version": "1.78.0",
+      "sha256": "1iyhqjdwf17r8grb8q1kxsi1a5mv34q10bnyypvy7yc61mlp3d19",
       "depends": ["Biobase", "genefilter"]
     },
     "GeneNetworkBuilder": {
       "name": "GeneNetworkBuilder",
-      "version": "1.46.0",
-      "sha256": "1gjirjj809c1vc3y4k07j8md0m0bksjkfy68v1v8b2d9kfws5vwc",
-      "depends": ["Rcpp", "Rgraphviz", "XML", "graph", "htmlwidgets", "plyr", "rjson"]
+      "version": "1.48.0",
+      "sha256": "1sd83cxcx6wri80mlmhjj7j694cjg1z6zilwgjpbcirrv7n485gn",
+      "depends": ["RCy3", "Rcpp", "Rgraphviz", "XML", "graph", "htmlwidgets", "plyr", "rjson"]
     },
     "GeneOverlap": {
       "name": "GeneOverlap",
-      "version": "1.40.0",
-      "sha256": "0bfd4322m6g7dvas214i17k8sjsf62lza9darmhiwb4r8h30qmb2",
+      "version": "1.42.0",
+      "sha256": "05ca6g9qxkhb55b7bcr449xa0x4qdixxyx1y2d5kn0xj2zcy3lp9",
       "depends": ["RColorBrewer", "gplots"]
     },
     "GeneRegionScan": {
       "name": "GeneRegionScan",
-      "version": "1.60.0",
-      "sha256": "01vrw0k8s62i3mzk5f7mrnh7294i5smqgfz00bl0wjhy9yak5j34",
+      "version": "1.62.0",
+      "sha256": "15xn7ypg89ad4s4dg44dsyvr9191wd8van64gsbm1wbbx779sg3c",
       "depends": ["Biobase", "Biostrings", "RColorBrewer", "S4Vectors", "affxparser"]
     },
     "GeneSelectMMD": {
       "name": "GeneSelectMMD",
-      "version": "2.48.0",
-      "sha256": "044i85vnvr5l1c1sbsh6s777invnch9yjkx3ffki9m0xnilvv5al",
+      "version": "2.50.0",
+      "sha256": "0h32303901smny2sdkwgf5280fj6pjjakjlf738ii4pgnhkzvn8x",
       "depends": ["Biobase", "MASS", "limma"]
     },
     "GeneStructureTools": {
       "name": "GeneStructureTools",
-      "version": "1.24.0",
-      "sha256": "19inj0ds7hh4n5cq9mgi4ahx46cxpad2pfdmmhrzvlbm8ss4yw6x",
+      "version": "1.26.0",
+      "sha256": "1km7pi8mfplsywxnr2vidmb3d5k9fpjigvnnkkpqrw7civvlqdx4",
       "depends": ["BSgenome_Mmusculus_UCSC_mm10", "Biostrings", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "data_table", "plyr", "rtracklayer", "stringdist", "stringr"]
     },
     "GeneTonic": {
       "name": "GeneTonic",
-      "version": "2.8.0",
-      "sha256": "0f84sbqkhh74al1rn8fhkg4vmy0i06qadl7342gawqngxfcffzkn",
-      "depends": ["AnnotationDbi", "ComplexHeatmap", "ComplexUpset", "DESeq2", "DT", "GO_db", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "backbone", "bs4Dash", "circlize", "colorspace", "colourpicker", "dendextend", "dplyr", "dynamicTreeCut", "expm", "ggforce", "ggplot2", "ggrepel", "ggridges", "igraph", "matrixStats", "plotly", "rintrojs", "rlang", "rmarkdown", "scales", "shiny", "shinyAce", "shinyWidgets", "shinycssloaders", "tidyr", "tippy", "viridis", "visNetwork"]
+      "version": "3.0.0",
+      "sha256": "18qvz6gj7y6d46yj7y2yyfi3a7yb0950nx9w1w7fb6fv4qgb2pv7",
+      "depends": ["AnnotationDbi", "ComplexHeatmap", "ComplexUpset", "DESeq2", "DT", "GO_db", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "backbone", "bs4Dash", "circlize", "colorspace", "colourpicker", "dendextend", "dplyr", "dynamicTreeCut", "expm", "ggforce", "ggplot2", "ggrepel", "ggridges", "igraph", "matrixStats", "mosdef", "plotly", "rintrojs", "rlang", "rmarkdown", "scales", "shiny", "shinyAce", "shinyWidgets", "shinycssloaders", "tidyr", "tippy", "viridis", "visNetwork"]
     },
     "GeneticsPed": {
       "name": "GeneticsPed",
-      "version": "1.66.0",
-      "sha256": "0cm65szy3nmkaxsrmv1qhpk8jsxma6b4y0v2nxg6hdqjn7z4zk43",
+      "version": "1.68.0",
+      "sha256": "0345vir3x2jn1gkjyw2bphq3h1ic93van7p34wfamz7ryf2p2188",
       "depends": ["MASS", "gdata", "genetics"]
     },
     "GenomAutomorphism": {
       "name": "GenomAutomorphism",
-      "version": "1.6.0",
-      "sha256": "13hflp7aglv8xadf1zgla8d0j1h4m4rrk0lyy0i0mxfhihl0wba8",
+      "version": "1.8.0",
+      "sha256": "1dspdjks4ydw6x1cllq5lv83bb1br0dz542cjbbcvxr0ksn4pgrx",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "data_table", "doParallel", "dplyr", "foreach", "matrixStats", "numbers"]
     },
     "GenomeInfoDb": {
       "name": "GenomeInfoDb",
-      "version": "1.40.1",
-      "sha256": "155wj17pbdbixyg6mimv06wg3ylll8ysqh7rffjp65fw662jwhw0",
+      "version": "1.42.1",
+      "sha256": "1jlc8q3pmmicw1n1sfw5ia6kf3rndjzfd1c8a5mrnj0jzbjc5knv",
       "depends": ["BiocGenerics", "GenomeInfoDbData", "IRanges", "S4Vectors", "UCSC_utils"]
     },
     "GenomicAlignments": {
       "name": "GenomicAlignments",
-      "version": "1.40.0",
-      "sha256": "15jzdjna0r9n6ybvyw52v1d9f05vdsdxff0g8q0pa584a1sd2s7s",
+      "version": "1.42.0",
+      "sha256": "1ycawwp0b8gk9sccqdwklq4yh3rns9iw34qdx5ysw4nxksi4vf6y",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment"]
     },
     "GenomicDataCommons": {
       "name": "GenomicDataCommons",
-      "version": "1.28.0",
-      "sha256": "0jg4sa1lqn028y2ympb3x4s8yr7qa8ajrwqj2hhcl8zss3sx8gr2",
-      "depends": ["GenomicRanges", "IRanges", "dplyr", "httr", "jsonlite", "magrittr", "rappdirs", "readr", "rlang", "tibble", "tidyr", "xml2"]
+      "version": "1.30.0",
+      "sha256": "1vw4lsh3bkmghk4f5rqds0awvl0f5dkafz51iw3s6lqaviq5wkx3",
+      "depends": ["GenomicRanges", "IRanges", "dplyr", "httr", "jsonlite", "rappdirs", "readr", "rlang", "tibble", "tidyr", "xml2"]
     },
     "GenomicDistributions": {
       "name": "GenomicDistributions",
-      "version": "1.12.0",
-      "sha256": "0yicpl29qcwyzswaxqd50sa12lg8c9d5i7xgdf2m7jwskx6nx5hx",
+      "version": "1.14.0",
+      "sha256": "1jq2k7mzj8r9ah77icfh3y7kryqa4lmazlvb5smrlbzjl3lfav6p",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "broom", "data_table", "dplyr", "ggplot2", "plyr", "reshape2", "scales"]
     },
     "GenomicFeatures": {
       "name": "GenomicFeatures",
-      "version": "1.56.0",
-      "sha256": "1r1d9g5vq5y946v2z2xgmfb31k0576nj8i0yg6xfj9y2a0a6akc5",
+      "version": "1.58.0",
+      "sha256": "0ixc6hmfdh2dn985d92iwcmk2v5m1c2l3d27y76bzmw9whpd89i5",
       "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "rtracklayer"]
     },
     "GenomicFiles": {
       "name": "GenomicFiles",
-      "version": "1.40.0",
-      "sha256": "1b0n5aqvg6jb6rpikjzxndmcjxp31h6vhr1magzalqg7jmlvcv6i",
+      "version": "1.42.0",
+      "sha256": "0vfk4nxdgvh57swcf9p898cli7v3i8c6q4aw9qr5sjv01kxr51rg",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MatrixGenerics", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "rtracklayer"]
     },
     "GenomicInteractionNodes": {
       "name": "GenomicInteractionNodes",
-      "version": "1.8.0",
-      "sha256": "1xkrmpsgqqsd470f4dgnbs5zb62qfrbpmzw97jsarri57pmqxy7a",
+      "version": "1.10.0",
+      "sha256": "0gb5p6bsyzr0jpvdi1p8rwg4f5njfm06jfbvikh0lillhdr2n4lq",
       "depends": ["AnnotationDbi", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RBGL", "S4Vectors", "graph"]
     },
     "GenomicInteractions": {
       "name": "GenomicInteractions",
-      "version": "1.38.0",
-      "sha256": "16aaaa4nr1y5ng1hzw87q950clid28iqf4gkypcpihg3cz69axxg",
+      "version": "1.40.0",
+      "sha256": "1p3dcpm8bggxxiqzx238dvv3nyybg9agy6i1k7ngdvrxr6zlb0c8",
       "depends": ["Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Rsamtools", "S4Vectors", "data_table", "dplyr", "ggplot2", "gridExtra", "igraph", "rtracklayer", "stringr"]
     },
     "GenomicOZone": {
       "name": "GenomicOZone",
-      "version": "1.18.0",
-      "sha256": "0i130gwf2ifgm635dhshfmnj97jqlz5nkwb98jbgz4ciq7mpdwv8",
+      "version": "1.20.0",
+      "sha256": "1i9naq9dlfm5sldl0va2j0a1ajzd5qsmz4kp4v09v0c3yagp54zd",
       "depends": ["Ckmeans_1d_dp", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rdpack", "S4Vectors", "biomaRt", "ggbio", "ggplot2", "gridExtra", "lsr", "plyr"]
     },
     "GenomicPlot": {
       "name": "GenomicPlot",
-      "version": "1.2.4",
-      "sha256": "1r1fh28bmmpf7s7sm58xyxs7551d54avjafj2nq5d8gpfbwhy2js",
+      "version": "1.4.0",
+      "sha256": "07j12zsalha46pkwbkjn21l1n8rsa2bp2rf3gckqlb0cysvfyj4c",
       "depends": ["BiocGenerics", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCAS", "Rsamtools", "VennDiagram", "circlize", "cowplot", "dplyr", "edgeR", "genomation", "ggplot2", "ggplotify", "ggpubr", "ggsci", "ggsignif", "plyranges", "rtracklayer", "scales", "tidyr", "txdbmaker", "viridis"]
     },
     "GenomicRanges": {
       "name": "GenomicRanges",
-      "version": "1.56.1",
-      "sha256": "0g0ld9i58pdxw2pwxi9nzj82mkryag457pvh6cvbvhb28pfamkma",
+      "version": "1.58.0",
+      "sha256": "1iccjn5gb8k2l1hw7nhi30w3dnlpdf8mh3xwf3x3dky3mhxw3j0h",
       "depends": ["BiocGenerics", "GenomeInfoDb", "IRanges", "S4Vectors", "XVector"]
     },
     "GenomicScores": {
       "name": "GenomicScores",
-      "version": "2.16.0",
-      "sha256": "11sabicr2jm1cc9rdjr6vjqhf0gd9d7k04qlfhcdssvh02f957ia",
+      "version": "2.18.0",
+      "sha256": "1b9fzkch7xqn0f56psq0vnhq46ysl6nnd7f2hf2hxsm0w1z6q1z6",
       "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "BiocGenerics", "BiocManager", "Biostrings", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "XML", "httr", "rhdf5"]
     },
     "GenomicSuperSignature": {
       "name": "GenomicSuperSignature",
-      "version": "1.12.0",
-      "sha256": "0prplxp7l7hx6697a18kk2s5iyrdgpqwfh79n9lnala2h2q3vhs0",
+      "version": "1.14.0",
+      "sha256": "0y1lylj20qi5ca63ym771hvs3iw02p93sckbhs0qs07awjcyl8v2",
       "depends": ["Biobase", "BiocFileCache", "ComplexHeatmap", "S4Vectors", "SummarizedExperiment", "dplyr", "flextable", "ggplot2", "ggpubr", "irlba", "plotly"]
     },
     "GenomicTuples": {
       "name": "GenomicTuples",
-      "version": "1.38.0",
-      "sha256": "04inysn0aa2fmbnb01zk300x8qgz8bk4rhw68ka6ni7cbrn88ysa",
+      "version": "1.40.0",
+      "sha256": "0fqqlkc231qkvh58n1kg2wa1r4539xxx8kvmwdfdlvrqkg38yn0i",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors", "data_table"]
     },
     "GeoDiff": {
       "name": "GeoDiff",
-      "version": "1.10.0",
-      "sha256": "17mm22cgq0259r15d49gv07igr8dpasylrnhsycx6mjg75zvz6jp",
+      "version": "1.12.0",
+      "sha256": "1bn553qw8cyh4agm8mjhhrlarwy8qgfgy4pz64rhzipimk1rkyxv",
       "depends": ["Biobase", "GeomxTools", "Matrix", "NanoStringNCTools", "Rcpp", "RcppArmadillo", "lme4", "plyr", "robust", "roptim", "testthat", "withr"]
     },
     "GeoTcgaData": {
       "name": "GeoTcgaData",
-      "version": "2.4.0",
-      "sha256": "0hhhwnswjglxws75iqcn2sa66z9mr65n23p5i7c615n5qzrvcmw3",
+      "version": "2.6.0",
+      "sha256": "14a2p3im5v7hfvsb67wd6djvg8cm0xwb1l9k1j8m521j1v04ya9z",
       "depends": ["SummarizedExperiment", "cqn", "data_table", "plyr", "topconfects"]
     },
     "GeomxTools": {
       "name": "GeomxTools",
-      "version": "3.8.0",
-      "sha256": "093900a8himdfh752ah2wk9x5iczri0f3djsfi2mwzkb7frxpj0c",
+      "version": "3.10.0",
+      "sha256": "02zrn4zj3i20wgsfgpmhgyi05xhnw872h9dg1ig3hj97f70h5da4",
       "depends": ["Biobase", "BiocGenerics", "EnvStats", "GGally", "NanoStringNCTools", "S4Vectors", "SeuratObject", "data_table", "dplyr", "ggplot2", "lmerTest", "readxl", "reshape2", "rjson", "rlang", "stringr"]
     },
     "GladiaTOX": {
       "name": "GladiaTOX",
-      "version": "1.20.0",
-      "sha256": "0krgsih0w60sl0gw1rpff89piv3mf1sk86hmlqjxl6idag8n2jil",
+      "version": "1.22.0",
+      "sha256": "1aarqwk5wqq1d8mawi2bh01bcak6sq1cd3f5cwanyjybsdawp0ij",
       "depends": ["DBI", "RColorBrewer", "RCurl", "RJSONIO", "RMariaDB", "RSQLite", "XML", "brew", "data_table", "ggplot2", "ggrepel", "numDeriv", "stringr", "tidyr", "xtable"]
     },
     "Glimma": {
       "name": "Glimma",
-      "version": "2.14.0",
-      "sha256": "1d7rq3irp3n0fabfgjs2x2c9lscz70a38qf3wbxvi417qn7fpyla",
+      "version": "2.16.0",
+      "sha256": "0jqgk8bb7izblhfpjdqkf12jmhkmpwj8sv07429jrxvlj3c84k7a",
       "depends": ["DESeq2", "S4Vectors", "SummarizedExperiment", "edgeR", "htmlwidgets", "jsonlite", "limma"]
     },
     "GloScope": {
       "name": "GloScope",
-      "version": "1.2.1",
-      "sha256": "02in9nq84gap80nyawvm434aqcc09idkfd3ihgnd3v8g6vx9sv3a",
+      "version": "1.4.0",
+      "sha256": "19kanrm6fzkbgka89anr7z8fm58hmbksdqf77sq1x4dirnp52p9s",
       "depends": ["BiocParallel", "FNN", "MASS", "RANN", "SingleCellExperiment", "ggplot2", "mclust", "mvnfast", "rlang"]
     },
     "GlobalAncova": {
       "name": "GlobalAncova",
-      "version": "4.22.0",
-      "sha256": "0z71a5h4y740k0hx84aavfxl1kpshm4gqs7mh6zf895i2r761bqh",
+      "version": "4.24.0",
+      "sha256": "1hxggdicpqhwyai53sa20y63dmn48rlys56iyk1rwnxwd8dsmjn0",
       "depends": ["AnnotationDbi", "Biobase", "GSEABase", "VGAM", "annotate", "corpcor", "dendextend", "globaltest"]
     },
     "GmicR": {
       "name": "GmicR",
-      "version": "1.18.0",
-      "sha256": "19zn4n21rprfhx8zmpcl7n5jyfhdz450b9dgw1ayrnnr0w4bf67h",
+      "version": "1.20.0",
+      "sha256": "0h9sfx9rbg13mghbw6ks1kaprbdx1iq66cg0520pd6zx35kszx6q",
       "depends": ["AnnotationDbi", "Category", "DT", "GOstats", "GSEABase", "WGCNA", "ape", "bnlearn", "data_table", "doParallel", "foreach", "gRain", "gRbase", "org_Hs_eg_db", "org_Mm_eg_db", "reshape2", "shiny"]
     },
     "GrafGen": {
       "name": "GrafGen",
-      "version": "1.0.0",
-      "sha256": "180ag0wvbhmd1vsza5lfphdx8d2phcfa4lzisi5fbk6n4195g830",
+      "version": "1.2.0",
+      "sha256": "1m99q14g2c19ch54w3y828dyqkn19zivyhxdism3j2wx8yxs5wcr",
       "depends": ["GenomicRanges", "RColorBrewer", "cowplot", "dplyr", "ggplot2", "ggpubr", "plotly", "rlang", "scales", "shiny", "stringr", "zlibbioc"]
     },
     "GraphAT": {
       "name": "GraphAT",
-      "version": "1.76.0",
-      "sha256": "0mxsgd08qd7fb28gbbgx21vvd5sf3nn0ymrlshsdpsdya5vmmv3d",
+      "version": "1.78.0",
+      "sha256": "16nps59vwnrd4myhra3gilcr5n04b7mhg2hz7abxfy9am88pih1g",
       "depends": ["MCMCpack", "graph"]
     },
     "GraphAlignment": {
       "name": "GraphAlignment",
-      "version": "1.68.0",
-      "sha256": "0f8h0lhykjw2nwwvz4gics1nsv6vjzk6axsgj94zwf84j4igm9jd",
+      "version": "1.70.0",
+      "sha256": "0fvyq7dgzdy58njqwz2c2m7hpfch15hyr81v6lj0sd2rkqrdwdy8",
       "depends": []
     },
-    "GraphPAC": {
-      "name": "GraphPAC",
-      "version": "1.46.0",
-      "sha256": "0dy3yn6vhgbvn0ygrkznhaylhaslyrnmlw5kmq0inqvl9y2yl277",
-      "depends": ["RMallow", "TSP", "iPAC", "igraph"]
-    },
     "GreyListChIP": {
       "name": "GreyListChIP",
-      "version": "1.36.0",
-      "sha256": "0dj3pcycnjll8z1r61l6gnjvq74w2l0glrx6hqwcqvk5j7ixcdz7",
+      "version": "1.38.0",
+      "sha256": "0annhgzl4b5ykn0993zdqlcxppbrrn8rcxivfkjhdqmq41r4n4bm",
       "depends": ["BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "MASS", "Rsamtools", "SummarizedExperiment", "rtracklayer"]
     },
     "Guitar": {
       "name": "Guitar",
-      "version": "2.20.0",
-      "sha256": "1agr3n787dqly09wy274v9dg52vdb0n0z3gdh2zsbklkbmayqxqy",
+      "version": "2.22.0",
+      "sha256": "1hy17ajwrw1bvx6rsyxsv5h656z98ms3nj0v52xsy1ryi4iyqs49",
       "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "dplyr", "ggplot2", "knitr", "magrittr", "rtracklayer"]
     },
     "Gviz": {
       "name": "Gviz",
-      "version": "1.48.0",
-      "sha256": "07w37kq6zx99z980if4brwmw25vjgvxd8xj3l1893idbdf70py0p",
+      "version": "1.50.0",
+      "sha256": "17jb2y3sgmkfs08lzb4p2l45xy8c3bfzqq653r1a6bg6rgaxviah",
       "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "XVector", "biomaRt", "biovizBase", "digest", "ensembldb", "lattice", "latticeExtra", "matrixStats", "rtracklayer"]
     },
     "HDF5Array": {
       "name": "HDF5Array",
-      "version": "1.32.1",
-      "sha256": "1cfm15zwfp1gxgrkknyvdaqb5fm27s2nyjrhxwkrbn32yfdrgdnz",
-      "depends": ["BiocGenerics", "DelayedArray", "IRanges", "Matrix", "Rhdf5lib", "S4Arrays", "S4Vectors", "rhdf5", "rhdf5filters"]
+      "version": "1.34.0",
+      "sha256": "1jkrlmnsf5ncs4l77b29p8cjn6nmaadpvrsn5z1qixsw1axbqwi0",
+      "depends": ["BiocGenerics", "DelayedArray", "IRanges", "Matrix", "Rhdf5lib", "S4Arrays", "S4Vectors", "SparseArray", "rhdf5", "rhdf5filters"]
     },
     "HDTD": {
       "name": "HDTD",
-      "version": "1.38.0",
-      "sha256": "15lc2g6mcvgy0v0pjl9f1khhznpxc7ij8aimj20w2qaz1h6sqmpp",
+      "version": "1.40.0",
+      "sha256": "17gsmam37wki0a7db5i6vizz2q86y3waq1pjfl5cz10icycjjiwy",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "HELP": {
       "name": "HELP",
-      "version": "1.62.0",
-      "sha256": "08g9xivzgwla4qvsca015d2hr2xbgiga9wd2xm5xphhb64lgzass",
+      "version": "1.64.0",
+      "sha256": "075x2zylyc1ap5a3dd0k6hd93nr1vpwj2k5p502zrjza9cp9hkxa",
       "depends": ["Biobase"]
     },
     "HEM": {
       "name": "HEM",
-      "version": "1.76.0",
-      "sha256": "091axqfgm8alz4k76b7ap1dl2cx7cim4l43zyvf91wimr6a13pbx",
+      "version": "1.78.0",
+      "sha256": "1yk0jh1jrd6ix7jqgj12h46h05qjjw3z4dxjmvnzbwyyvn06ipn4",
       "depends": ["Biobase"]
     },
     "HERON": {
       "name": "HERON",
-      "version": "1.2.0",
-      "sha256": "0z8bsvsj1xa4r93y244381yckqk4mc39ij3pabcbn2mgbihcs94d",
+      "version": "1.4.0",
+      "sha256": "1mdjyk6di9fhyj1gxbvgxyzd77wy8xjqmx2fdbdf5m1r9xffzmkg",
       "depends": ["GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "cluster", "data_table", "harmonicmeanp", "limma", "matrixStats", "metap", "spdep"]
     },
     "HGC": {
       "name": "HGC",
-      "version": "1.12.0",
-      "sha256": "10g4lmhs8brfrci6n28iarzwm4dlvsbysssv2n25l1rp8wnl2sip",
+      "version": "1.14.0",
+      "sha256": "0qr55rf3sl5301q6sv24iq3ba417iifl5p4yrc3qxii9gs5jyn4s",
       "depends": ["Matrix", "RANN", "Rcpp", "RcppEigen", "ape", "dendextend", "dplyr", "ggplot2", "mclust", "patchwork"]
     },
     "HIBAG": {
       "name": "HIBAG",
-      "version": "1.40.0",
-      "sha256": "1q059hqx0k9nm9xgxlzxnl93f44hjhjpf4iql0f87v560xzy1pgk",
+      "version": "1.42.0",
+      "sha256": "1z9rn67fh2d79d15hp1cv6j6s9glnvf1nkwp7f6r2bh4m6g0h200",
       "depends": ["RcppParallel"]
     },
     "HIPPO": {
       "name": "HIPPO",
-      "version": "1.16.0",
-      "sha256": "1fp2jxi5xlf3archv3z8gnrc3rsh12vkprk6xhdffw9n2mqap56c",
+      "version": "1.18.0",
+      "sha256": "0y94sniglz5pm841fi6vq2km3n1hygng88hwj0kwapvpvjkdp6ar",
       "depends": ["Matrix", "Rtsne", "SingleCellExperiment", "dplyr", "ggplot2", "ggrepel", "gridExtra", "irlba", "magrittr", "reshape2", "rlang", "umap"]
     },
     "HIREewas": {
       "name": "HIREewas",
-      "version": "1.22.0",
-      "sha256": "1kdiqa1g34i5gmnaxm6xc4r2wfb8ypmglrxfgv8l39l81698lp04",
+      "version": "1.24.0",
+      "sha256": "1wsf015i68vbvqwy3d8h6nn7r7hqw2r8vvhpnbg7dxi1d5gbgrrr",
       "depends": ["gplots", "quadprog"]
     },
     "HMMcopy": {
       "name": "HMMcopy",
-      "version": "1.46.0",
-      "sha256": "1i2n4i4vkxqfgdcmwhz1vcbhxk716m1blc2drzh5449y6x3qd026",
+      "version": "1.48.0",
+      "sha256": "169hxg2cnhc48gfyz2rag1ahs2q1slp70v89bvzibkn00srclgk5",
       "depends": ["data_table"]
     },
     "HPAanalyze": {
       "name": "HPAanalyze",
-      "version": "1.22.0",
-      "sha256": "1cm88rg43mwi6qqp0p48698z89niygy8zr0g1fk0s6cd5z2i6qpy",
+      "version": "1.24.0",
+      "sha256": "1nad5qqa76b6ifzyz7awxh9p86kfjar0i5ljqbmhh14dsr6pmywy",
       "depends": ["dplyr", "ggplot2", "gridExtra", "openxlsx", "tibble", "xml2"]
     },
     "HPiP": {
       "name": "HPiP",
-      "version": "1.10.0",
-      "sha256": "1kjsa8q70zvmjqcvrpcijf7w6c5k21ysdd8pd8zsxwkvck174gih",
+      "version": "1.12.0",
+      "sha256": "161nnbkzwfsnswb9zp8kx9795ikmmyi2abz9fi8m7627aqwl3riy",
       "depends": ["MCL", "PRROC", "caret", "corrplot", "dplyr", "ggplot2", "httr", "igraph", "magrittr", "pROC", "protr", "purrr", "readr", "stringr", "tibble", "tidyr"]
     },
     "HTSFilter": {
       "name": "HTSFilter",
-      "version": "1.44.0",
-      "sha256": "11pqfg2msdxi57326slgp73j4dshj5r730sv1x0n9f7fd2187his",
+      "version": "1.46.0",
+      "sha256": "1wa2wmsln3ycan4lyy41rhn31mmbq0rpgr2s4yp7nimkdhh06fbl",
       "depends": ["Biobase", "BiocParallel", "DESeq2", "edgeR"]
     },
-    "HTSeqGenie": {
-      "name": "HTSeqGenie",
-      "version": "4.34.0",
-      "sha256": "1np04hiijz9jdxvlg1mk74w19ma32qrdjb9bc5cscrs1lgw78idh",
-      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "Cairo", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "VariantAnnotation", "VariantTools", "chipseq", "gmapR", "hwriter", "pwalign", "rtracklayer"]
-    },
     "Harman": {
       "name": "Harman",
-      "version": "1.32.0",
-      "sha256": "1b6w8wrlsvxpzbsp4vkrpfvx4icbvncl11q4j773knz5q0q9l6q0",
+      "version": "1.34.0",
+      "sha256": "1n2ipv53520acgvh577ip3gvdw0qlmkidyvqzcja5r76320y6287",
       "depends": ["Ckmeans_1d_dp", "Rcpp", "matrixStats"]
     },
     "HarmonizR": {
       "name": "HarmonizR",
-      "version": "1.2.0",
-      "sha256": "1bjyfxhlsslns7jiaaivld56w9j1gavdnrbciil6kiqs2q63fpj9",
+      "version": "1.4.0",
+      "sha256": "1cbhigwfx1354fvjfmmbafq09q2w4viy91n4k1w7kamg5svh56ld",
       "depends": ["SummarizedExperiment", "doParallel", "foreach", "janitor", "limma", "plyr", "seriation", "sva"]
     },
     "Harshlight": {
       "name": "Harshlight",
-      "version": "1.76.0",
-      "sha256": "1nqi2ad9hnm6j8hn8f6xp9zav6rsa5wlzb2z5fjnm9q4xbjblnjl",
+      "version": "1.78.0",
+      "sha256": "14fnbvrk7cdfnsdv47cv1k4krqlf9a8hiax0m7g8rw1y7qjkf0z4",
       "depends": ["Biobase", "affy", "altcdfenvs"]
     },
     "Heatplus": {
       "name": "Heatplus",
-      "version": "3.12.0",
-      "sha256": "1pc63hk0smcflq4903hvs4pp8r0kzlx08j0m1kxlh14cxwppamyb",
+      "version": "3.14.0",
+      "sha256": "1kfm07dcs4gvkr1ry57q8r564v2b73vd67ysy83riz9qvan5r63b",
       "depends": ["RColorBrewer"]
     },
     "HelloRanges": {
       "name": "HelloRanges",
-      "version": "1.30.0",
-      "sha256": "0idv6aravk0jj8p33kvc620p60ciyrkd293ba034g6j5921ym6gx",
+      "version": "1.32.0",
+      "sha256": "11hmnqvmhd7rn5dcm20wg109sp8cmaq5k06x0cyaimi0dmf1psxv",
       "depends": ["BSgenome", "BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "docopt", "rtracklayer"]
     },
     "Herper": {
       "name": "Herper",
-      "version": "1.14.0",
-      "sha256": "0aj9gskx02p986n29cd1z5hrzp4qp5cvwki25vyafb805wf7v69v",
+      "version": "1.16.0",
+      "sha256": "1nblfwfjfkhjj02a5g7yhhilxw7xvmjs4dd3fd71xzyd74mkz7m0",
       "depends": ["reticulate", "rjson", "withr"]
     },
     "HiCBricks": {
       "name": "HiCBricks",
-      "version": "1.22.0",
-      "sha256": "0hbmy7vhg63n6r2lv8gvrlsj4xgqbf8mvaci2i4kpc9327jny2nn",
+      "version": "1.24.0",
+      "sha256": "1xv8i6c40nbgd4cda6wy4q94l58m9l8sirl0bkhqagc1av42rq2c",
       "depends": ["BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "R6", "RColorBrewer", "R_utils", "S4Vectors", "curl", "data_table", "digest", "ggplot2", "jsonlite", "readr", "reshape2", "rhdf5", "scales", "stringr", "tibble", "viridis"]
     },
     "HiCDCPlus": {
       "name": "HiCDCPlus",
-      "version": "1.12.0",
-      "sha256": "0x95v5h1qjks87gmis7p0y4bmj7xalqbgny0qfkaw8s561fhx3j9",
+      "version": "1.14.0",
+      "sha256": "18knyy8r134hix90dpy6lgkz9a67gpdaw2lgbpppac7ls5hhdkbl",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicInteractions", "GenomicRanges", "IRanges", "InteractionSet", "MASS", "R_utils", "Rcpp", "S4Vectors", "bbmle", "data_table", "dplyr", "pscl", "rlang", "rtracklayer", "tibble", "tidyr"]
     },
     "HiCDOC": {
       "name": "HiCDOC",
-      "version": "1.6.0",
-      "sha256": "1p8n3yljzlk8ic47101nw8d6dmxgadacgfh6pknkpxgk6vlcq6kh",
+      "version": "1.8.0",
+      "sha256": "0vkkddsqwisl7n1wv0zlygv1g875h09mq0zj8hg1yv06pwq3b140",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "InteractionSet", "Rcpp", "S4Vectors", "SummarizedExperiment", "cowplot", "data_table", "ggplot2", "gridExtra", "gtools", "multiHiCcompare", "pbapply", "zlibbioc"]
     },
     "HiCExperiment": {
       "name": "HiCExperiment",
-      "version": "1.4.0",
-      "sha256": "0wz08jwljv8zc658xl55rwwsfvy3lc3qg9dw7d41cw37wh40dkw1",
+      "version": "1.6.0",
+      "sha256": "12276hl11s3z69197rplaq2ac4dhrpc74dh4174m3l5b6sq2gg0y",
       "depends": ["BiocGenerics", "BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "Matrix", "S4Vectors", "dplyr", "rhdf5", "strawr", "vroom"]
     },
     "HiCcompare": {
       "name": "HiCcompare",
-      "version": "1.26.0",
-      "sha256": "1rpdqij0lvs9cyl1z5lgw91332km1nb8053kk432bais9382jkxc",
+      "version": "1.28.0",
+      "sha256": "1ww5fhslanpgf54x7rshfznyyqd6knrf1njn9975v9hm6ya01sff",
       "depends": ["BiocParallel", "GenomicRanges", "IRanges", "InteractionSet", "KernSmooth", "S4Vectors", "data_table", "dplyr", "ggplot2", "gridExtra", "gtools", "mgcv", "pheatmap", "rhdf5"]
     },
     "HiContacts": {
       "name": "HiContacts",
-      "version": "1.6.0",
-      "sha256": "18rfv9z03dqdqifrxqv1l3m9s8nykygd9y6d7pya2sdfx8f0hgza",
+      "version": "1.8.0",
+      "sha256": "1jc138ailpk3x6jgijvszskj6rf10qv3wy89qwv9cxk3jhpprj6x",
       "depends": ["BiocGenerics", "BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "HiCExperiment", "IRanges", "InteractionSet", "Matrix", "RSpectra", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "ggrastr", "readr", "scales", "stringr", "tibble", "tidyr"]
     },
     "HiCool": {
       "name": "HiCool",
-      "version": "1.4.0",
-      "sha256": "06b26szb23mngcfx5xwdw6kz10gqjs69py0iz5piia4a7vppk8zk",
+      "version": "1.6.0",
+      "sha256": "1pkn0a1gh9hr6pwigjy8xf6zyzbjhprk2ni9jmxnffqp4w0i923k",
       "depends": ["BiocIO", "GenomicRanges", "HiCExperiment", "IRanges", "InteractionSet", "S4Vectors", "basilisk", "dplyr", "plotly", "reticulate", "rmarkdown", "rmdformats", "sessioninfo", "stringr", "vroom"]
     },
     "HiLDA": {
       "name": "HiLDA",
-      "version": "1.18.0",
-      "sha256": "1v5gvb84q09l8i7f1d4q7zpyxlzaq5bqifia706d60700wvfan29",
+      "version": "1.20.0",
+      "sha256": "0v3r6av7k5ifl4xplgy02f4w26si8ilfh5w6b5kjx045ga2yyczk",
       "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "GenomicFeatures", "GenomicRanges", "R2jags", "Rcpp", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "XVector", "abind", "cowplot", "forcats", "ggplot2", "stringr", "tidyr"]
     },
     "HiTC": {
       "name": "HiTC",
-      "version": "1.48.0",
-      "sha256": "0nxk3rdfw78bwyxjd3bbm093i8hqyk63rz0fvx3fi04qpa1fv39r",
+      "version": "1.50.0",
+      "sha256": "0y5qlr36pj7mrgs70v4zf9s19rpa11mzyagmpxs77n0pl9nrhgwj",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "rtracklayer"]
     },
     "HicAggR": {
       "name": "HicAggR",
-      "version": "1.0.2",
-      "sha256": "1lpf7m3rsm3ng0i6gqyl6l3jvawnl8wcfjl0gkxz604bwszjvhb3",
+      "version": "1.2.0",
+      "sha256": "1lw1jasa387rlngapcs4mb5bvwc855sxrb4rdyzkvsxphmi7gffc",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "Matrix", "S4Vectors", "checkmate", "data_table", "dplyr", "ggplot2", "gridExtra", "purrr", "reshape", "rhdf5", "rlang", "rtracklayer", "strawr", "stringr", "tibble", "tidyr", "withr"]
     },
     "HilbertCurve": {
       "name": "HilbertCurve",
-      "version": "1.34.0",
-      "sha256": "0kka2haa84kv2xwqny0ii0mfq0gjdh4vv1zkjk0lbqszqk1h6hab",
-      "depends": ["GenomicRanges", "HilbertVis", "IRanges", "circlize", "png", "polylabelr"]
+      "version": "2.0.0",
+      "sha256": "07cai4pd199wj58032cz3qmqi2zjnzl1an7s243m0lm0dkxgb623",
+      "depends": ["GenomicRanges", "IRanges", "Rcpp", "circlize", "png", "polylabelr"]
     },
     "HilbertVis": {
       "name": "HilbertVis",
-      "version": "1.62.0",
-      "sha256": "07ndnzqjpklr3k9bbnl9y7jpb91ng1wkssb4kqaxp5nsc2ixidpd",
+      "version": "1.64.0",
+      "sha256": "0zljdf0q41dgkm0ysqs4l1k4v3h3qd2asf8p85xvkcf5axfciipz",
       "depends": ["lattice"]
     },
     "HilbertVisGUI": {
       "name": "HilbertVisGUI",
-      "version": "1.62.0",
-      "sha256": "0mzb9yb9f5d6yr8889cn8n20br5mf07xg97q09hxxhxgy8pq33mf",
+      "version": "1.64.0",
+      "sha256": "1q96nzbdi3zgfclzzk8b8p68bb33g84h0v6hd7v75p8f2wsi5m24",
       "depends": ["HilbertVis"]
     },
+    "HoloFoodR": {
+      "name": "HoloFoodR",
+      "version": "1.0.0",
+      "sha256": "0civpc6r9prfx0gi5p7fz9nlphy3fgc0y4apnyz2sq29x6r6zyz1",
+      "depends": ["MultiAssayExperiment", "S4Vectors", "TreeSummarizedExperiment", "dplyr", "httr2", "jsonlite"]
+    },
+    "HuBMAPR": {
+      "name": "HuBMAPR",
+      "version": "1.0.4",
+      "sha256": "0bjz88i2dpg1pxmbfbwx60z47hy8f38xzidih6fs5hrmjl3pfah0",
+      "depends": ["dplyr", "httr2", "purrr", "rjsoncons", "rlang", "stringr", "tibble", "tidyr", "whisker"]
+    },
     "HubPub": {
       "name": "HubPub",
-      "version": "1.12.0",
-      "sha256": "02xqw3xkhzk2fxx4l1h5gl5v0diamssr1dw9x871glxjl4kw07xm",
+      "version": "1.14.0",
+      "sha256": "0qwh71mg69q568sslpcczcsyldx7dffzprvyzmm6b46vd4mkzzwb",
       "depends": ["BiocManager", "available", "aws_s3", "biocthis", "dplyr", "fs", "usethis"]
     },
-    "HumanTranscriptomeCompendium": {
-      "name": "HumanTranscriptomeCompendium",
-      "version": "1.20.0",
-      "sha256": "1y46zsl08k6sdih8psar85fyc5dfk2vraxmfry70zx57vbjbin92",
-      "depends": ["BiocManager", "S4Vectors", "SummarizedExperiment", "shiny", "ssrch"]
-    },
     "HybridExpress": {
       "name": "HybridExpress",
-      "version": "1.0.0",
-      "sha256": "1cpvw6ycbh60wn39ws0l6hrgy9x97glb56f87sn2qg9li6hxjshh",
+      "version": "1.2.0",
+      "sha256": "1glb2acxd0a703hn1455xnvm0i2pf3r39c5gg6qsmfsqrqd195r9",
       "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "RColorBrewer", "SummarizedExperiment", "ggplot2", "patchwork", "rlang"]
     },
     "HybridMTest": {
       "name": "HybridMTest",
-      "version": "1.48.0",
-      "sha256": "0fh0v29fpwzramqnbxmzpmgiziwswdx38734g2lx303b0blkbv7j",
+      "version": "1.50.0",
+      "sha256": "14i9pvs4fpiw6bv6lrj8v4sc4y848a566cn2ia3lpsfs0naf79gk",
       "depends": ["Biobase", "MASS", "fdrtool", "survival"]
     },
     "IFAA": {
       "name": "IFAA",
-      "version": "1.6.0",
-      "sha256": "1y2vsz14d5a22m21n7zmfm64ffvh8hq0hkwnr44ifysy4zfmjg0x",
+      "version": "1.8.0",
+      "sha256": "1s8l4hp38hk7psqpxn9sr5d3l93ivzzsad594ff2j28l9vl0pkz8",
       "depends": ["DescTools", "HDCI", "Matrix", "MatrixExtra", "S4Vectors", "SummarizedExperiment", "doParallel", "doRNG", "foreach", "glmnet", "mathjaxr", "parallelly", "stringr"]
     },
     "IHW": {
       "name": "IHW",
-      "version": "1.32.0",
-      "sha256": "0j7rfyhpzr8zzyvjyphlfviy07z30nzsqq6isi4l0r4qgaziy1s6",
+      "version": "1.34.0",
+      "sha256": "1dwzwv3y9shy2fxm8ni1ai0v86fh74g4fml6p4x38pwkbxcc6qn6",
       "depends": ["BiocGenerics", "fdrtool", "lpsymphony", "slam"]
     },
     "ILoReg": {
       "name": "ILoReg",
-      "version": "1.14.0",
-      "sha256": "1zw6m2a5jr77mbjbzc966v98pdfw2s0sg1sqssdf7qsb0izj10b0",
+      "version": "1.16.0",
+      "sha256": "1apwqrkja5z9ig0pmmi0kq4xx1m451h7s65h0kfd0a6i532bkhaa",
       "depends": ["DescTools", "LiblineaR", "Matrix", "RSpectra", "Rtsne", "S4Vectors", "SingleCellExperiment", "SparseM", "SummarizedExperiment", "aricode", "cluster", "cowplot", "dendextend", "doRNG", "doSNOW", "dplyr", "fastcluster", "foreach", "ggplot2", "parallelDist", "pheatmap", "plyr", "reshape2", "scales", "umap"]
     },
     "IMAS": {
       "name": "IMAS",
-      "version": "1.28.0",
-      "sha256": "1n55qs4v5x7clpbhlrby5dcz9xldqrsfp6g4k6g0s1g0lk2rplqm",
+      "version": "1.30.0",
+      "sha256": "09zrk9cw1sydg4fjvpmlzw20ik42f0j60h1b70aacjs3mkcsfq90",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "IVAS", "Matrix", "Rsamtools", "S4Vectors", "doParallel", "foreach", "ggfortify", "ggplot2", "gridExtra", "lattice", "lme4", "survival"]
     },
     "IMMAN": {
       "name": "IMMAN",
-      "version": "1.24.0",
-      "sha256": "1yn0p53ar9b9g5d2gfyd70cp7vm69fsgn8av9lvc6qyac18w9y5j",
+      "version": "1.26.0",
+      "sha256": "0wmdhvy506f86qy179i8dqf41p47jfcvcaipdlgn2asjhhvnzywr",
       "depends": ["STRINGdb", "igraph", "pwalign", "seqinr"]
     },
     "IMPCdata": {
       "name": "IMPCdata",
-      "version": "1.40.0",
-      "sha256": "0s0zap78lwgava7k3dng8hjpd1zifh9438iqfqghydq8scyr3akc",
+      "version": "1.42.0",
+      "sha256": "15b1wmwpi5kp4hbvasnvlqdj89m7g153ynkphlza6g4arzyi6fxg",
       "depends": ["rjson"]
     },
     "INDEED": {
       "name": "INDEED",
-      "version": "2.18.0",
-      "sha256": "0ky21l4igsfznzq8is8apjhiasxryn8sjhjqjnpp1z8m7q93a0sf",
+      "version": "2.20.0",
+      "sha256": "1654kzz5f7m0lh7rvhk1mbh0dglx11i0qsrpkdhzxr6m651i56x8",
       "depends": ["devtools", "glasso", "igraph", "visNetwork"]
     },
     "INPower": {
       "name": "INPower",
-      "version": "1.40.0",
-      "sha256": "1w3gjw1avjpvnqy5ladypkr862jqd910zi74ah8rdfzid4r79klm",
+      "version": "1.42.0",
+      "sha256": "1aq7pns8xihpwfaj5hrm7k8ljnqhfxc4sc0qcx4n7pqb7izhrpvl",
       "depends": ["mvtnorm"]
     },
     "INSPEcT": {
       "name": "INSPEcT",
-      "version": "1.34.0",
-      "sha256": "0147ss218d3dnqbdgfwsg24an63qln8l5kkv0y4hm56bncdrm1i0",
+      "version": "1.36.0",
+      "sha256": "1w5w5vcdf2i7dzss05z2h32fis9w3ivg1jixcviwsavk4k5bvwdb",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "KernSmooth", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TxDb_Mmusculus_UCSC_mm9_knownGene", "deSolve", "pROC", "plgem", "readxl", "rootSolve", "rtracklayer", "shiny"]
     },
     "INTACT": {
       "name": "INTACT",
-      "version": "1.4.0",
-      "sha256": "1r1v8cvms0dyjf0f5f9v6qp7hz0rfb2yfbckvvrkq26yjwfbmlaa",
-      "depends": ["SQUAREM", "bdsmatrix", "numDeriv", "tidyr"]
+      "version": "1.6.0",
+      "sha256": "0xjakmai4iy6xnhw3jvy2c7bg8hvk4yr42kzix98h6jpcwsf9ks6",
+      "depends": ["SQUAREM", "bdsmatrix", "ggplot2", "numDeriv", "tidyr"]
     },
     "IONiseR": {
       "name": "IONiseR",
-      "version": "2.28.0",
-      "sha256": "1ihski4akl70v6kq03di6w1pz63dx6rxgmyjkm0dv0nhgkmrza22",
+      "version": "2.30.0",
+      "sha256": "1jb540h8klzxywm9dndijx04fnvk0gih9kxi351l24fwk8vppiqb",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "ShortRead", "XVector", "bit64", "dplyr", "ggplot2", "magrittr", "rhdf5", "stringr", "tibble", "tidyr"]
     },
     "IPO": {
       "name": "IPO",
-      "version": "1.30.0",
-      "sha256": "0sh4ajra67j2v359022s4cm2vfc0i9wjagcjv8jh1jf5jq70dyfh",
+      "version": "1.32.0",
+      "sha256": "1429465ymnwh9ny8dzjmj6674yl8ki1d6sc7q660f13yd4v6s0qg",
       "depends": ["BiocParallel", "CAMERA", "rsm", "xcms"]
     },
     "IRanges": {
       "name": "IRanges",
-      "version": "2.38.1",
-      "sha256": "07q9j00rvgdbv582p01nxc99j0gfx4fsarpl1w1fjx5nb8y86k4v",
+      "version": "2.40.1",
+      "sha256": "1yn8j6n7w789ivcrmi670n4a861hnar1626hc4rmyx3g36pkpq4s",
       "depends": ["BiocGenerics", "S4Vectors"]
     },
     "ISAnalytics": {
       "name": "ISAnalytics",
-      "version": "1.14.0",
-      "sha256": "05khils483a1d64ikg4j5vl3rcwsjgik04b75a6rr3crkdba7fl4",
+      "version": "1.16.1",
+      "sha256": "1yigf51xmwr9481ag0xh7bcp5wkvxfjqv0w3sg8z7xnbkjb3zb57",
       "depends": ["DT", "bslib", "datamods", "dplyr", "forcats", "fs", "ggplot2", "ggrepel", "glue", "lifecycle", "lubridate", "purrr", "readr", "readxl", "rlang", "shiny", "shinyWidgets", "stringr", "tibble", "tidyr"]
     },
     "ISLET": {
       "name": "ISLET",
-      "version": "1.6.0",
-      "sha256": "0vhpxr0civdhcxiy39aycir8a68vgrydv3nx1p9rn4hhpw7dq7gi",
+      "version": "1.8.0",
+      "sha256": "0xx7qrv5mr7xj7az2fivi40vrhvzg7k7lqaq53fbpim9gq3yiq7z",
       "depends": ["BiocGenerics", "BiocParallel", "Matrix", "SummarizedExperiment", "abind", "lme4", "nnls", "purrr"]
     },
     "ISoLDE": {
       "name": "ISoLDE",
-      "version": "1.32.0",
-      "sha256": "1yq7h8jjapjr7j9f2p4ikkvxh46vz4y7pdwddsi4dx7xkfjhzxmm",
+      "version": "1.34.0",
+      "sha256": "1zwm6klhyxbv7licrdk4n0ww96n8j9ww6xqdiwi75zkizv6lkhiv",
       "depends": []
     },
     "ITALICS": {
       "name": "ITALICS",
-      "version": "2.64.0",
-      "sha256": "06h6iqrqzlcj4hyhj1ikl9isr3ls1pph49v5n7cp87czinr0nd3s",
+      "version": "2.66.0",
+      "sha256": "1wvyqp0fji0hhshr4y1fwqjy6vlqgdrnj7is9glbvvjb9505rzp1",
       "depends": ["DBI", "GLAD", "ITALICSData", "affxparser", "oligo", "oligoClasses", "pd_mapping50k_xba240"]
     },
     "IVAS": {
       "name": "IVAS",
-      "version": "2.24.0",
-      "sha256": "15l0qga9a4q79y1r3pwcv3c0m0qpyjay3fvv7b4zwx7hvmkjfy1b",
+      "version": "2.26.0",
+      "sha256": "0krbcq1spj5bagcjxc2vr4i3qc3c8376mpzndmg0f7kiyn272lzc",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "doParallel", "foreach", "ggfortify", "ggplot2", "lme4"]
     },
     "IWTomics": {
       "name": "IWTomics",
-      "version": "1.28.0",
-      "sha256": "0ksmpa6f5zlgdhma1vxsfd64g7jhisffg5sbnz2xhf7faz14gc08",
+      "version": "1.30.0",
+      "sha256": "1r5qg0pk4qib8b56hvfz520wn23f84ynypvpji2anr5cvg353q7n",
       "depends": ["GenomicRanges", "IRanges", "KernSmooth", "S4Vectors", "fda", "gtable"]
     },
     "Icens": {
       "name": "Icens",
-      "version": "1.76.0",
-      "sha256": "16bblkxp8pj7qaxfzmp30lfj8vy13d3q8cf5y0g40lk4rbldx3bz",
+      "version": "1.78.0",
+      "sha256": "0f07k20dg3hdwg4q67yg2n9q8carddz135g6p15admz2bmdx7lsy",
       "depends": ["survival"]
     },
     "IdeoViz": {
       "name": "IdeoViz",
-      "version": "1.40.0",
-      "sha256": "0mq8qdhi2ccfa66rygn83hpm0fsmwiahpmrh8q522yl618mkrjcs",
+      "version": "1.42.0",
+      "sha256": "0n4q519x6fndz68w7zd0naw7cdrricxsvd2cqwc6y05w11jk34f3",
       "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "rtracklayer"]
     },
     "IgGeneUsage": {
       "name": "IgGeneUsage",
-      "version": "1.18.0",
-      "sha256": "0b2bndc36yd0a4yi2z3870g1b9c1ddpwp44gl42ysk29qwis2yi6",
+      "version": "1.20.0",
+      "sha256": "1b3003yvzf89hqiqc5ikxw30mqr86xlvvb4djcypznyka2wqqw7g",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "SummarizedExperiment", "reshape2", "rstan", "rstantools", "tidyr"]
     },
     "InPAS": {
       "name": "InPAS",
-      "version": "2.12.0",
-      "sha256": "05hzd8rixqz5d86d4gv7wh68kfbiynbp2xij9r2nj0h90av0h95b",
+      "version": "2.14.1",
+      "sha256": "0xqw7aqbl86kg599m6pasy5w4jc8ma0za0ysbxh1iv10n5dka9ix",
       "depends": ["AnnotationDbi", "BSgenome", "Biobase", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "batchtools", "cleanUpdTSeq", "depmixS4", "dplyr", "flock", "future", "future_apply", "ggplot2", "limma", "magrittr", "parallelly", "plyranges", "preprocessCore", "readr", "reshape2"]
     },
     "InTAD": {
       "name": "InTAD",
-      "version": "1.24.0",
-      "sha256": "16npavms8qxccldpik27qbsv3w0drcjr132nz2ky2cvi01bcp4l2",
+      "version": "1.26.0",
+      "sha256": "11k9gn3vziwwfvvcw9sslyrxxsb4qwczbb1nyz2z2j1kjsdbidx5",
       "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "ggplot2", "ggpubr", "mclust", "qvalue", "rtracklayer"]
     },
     "Informeasure": {
       "name": "Informeasure",
-      "version": "1.14.0",
-      "sha256": "0v4wy0gyap9w38a505hhhv1apmixazd4la8wjspdx718az92igg3",
+      "version": "1.16.0",
+      "sha256": "0nj9c73d8qahi9ha7vh2w9m1z0gxl98l2wjln9bw7k865qzplsw6",
       "depends": ["entropy"]
     },
     "IntEREst": {
       "name": "IntEREst",
-      "version": "1.28.0",
-      "sha256": "0i6q422vhf94ka0v69hs5irg506wb467rwnnn12xvsfyq54ak4dm",
-      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DBI", "DESeq2", "DEXSeq", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "RMySQL", "Rsamtools", "S4Vectors", "SummarizedExperiment", "edgeR", "seqLogo", "seqinr", "txdbmaker"]
+      "version": "1.30.0",
+      "sha256": "1qpwh2xldsdrnrg2swi48c8ay4h4gkf8l0wrmaczw7ddxya4ppxs",
+      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DBI", "DESeq2", "DEXSeq", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "RMariaDB", "Rsamtools", "S4Vectors", "SummarizedExperiment", "edgeR", "seqLogo", "seqinr", "txdbmaker"]
     },
     "InterCellar": {
       "name": "InterCellar",
-      "version": "2.10.0",
-      "sha256": "020z08v199psgcl4z3kbwl1zgp10iwn5n60c4bq555fz6nbjb56n",
+      "version": "2.12.0",
+      "sha256": "1js69rr7np1q5km8dl8bjzn8qpsvvis3x3rfhq3wx4kf7h1hkxxk",
       "depends": ["ComplexHeatmap", "DT", "biomaRt", "circlize", "colorspace", "colourpicker", "config", "data_table", "dendextend", "dplyr", "factoextra", "fmsb", "fs", "ggplot2", "golem", "htmltools", "htmlwidgets", "igraph", "plotly", "plyr", "readxl", "rlang", "scales", "shiny", "shinyFeedback", "shinyFiles", "shinyalert", "shinycssloaders", "shinydashboard", "signal", "tibble", "tidyr", "umap", "visNetwork", "wordcloud2"]
     },
-    "InterMineR": {
-      "name": "InterMineR",
-      "version": "1.26.0",
-      "sha256": "0isw4rg89139xmrcfb9r7jc3z8jj1my4radhinah0vad2cwb36l0",
-      "depends": ["Biostrings", "GenomicRanges", "IRanges", "RCurl", "RJSONIO", "S4Vectors", "SummarizedExperiment", "XML", "httr", "igraph", "sqldf", "xml2"]
-    },
     "InteractionSet": {
       "name": "InteractionSet",
-      "version": "1.32.0",
-      "sha256": "0ikkmhz6grmhksmyypj9hqmblls4cgww0dx4kzg4cy5bpavsq1hs",
+      "version": "1.34.0",
+      "sha256": "15mvpd64hhgwc30m7ayd60bc1icmrgchpjp21dxpw2za5r4162kq",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "SummarizedExperiment"]
     },
     "InteractiveComplexHeatmap": {
       "name": "InteractiveComplexHeatmap",
-      "version": "1.12.0",
-      "sha256": "0sfhr3f7fdw9zgw2wn7dhk1zwmhn3k3iy8xa0j9dv7bpa2mcvw1b",
+      "version": "1.14.0",
+      "sha256": "1pk8gmkpa9ppxa96a4k2iklx3n1x8s197hpg5xi5vpsbywq8ivh2",
       "depends": ["ComplexHeatmap", "GetoptLong", "IRanges", "RColorBrewer", "S4Vectors", "clisymbols", "digest", "fontawesome", "htmltools", "jsonlite", "kableExtra", "shiny", "svglite"]
     },
     "IntramiRExploreR": {
       "name": "IntramiRExploreR",
-      "version": "1.26.0",
-      "sha256": "19q6znbmqj4i6k60c5f05y7s7rp9h3ra3081ra3fc5p2b74gb6cv",
+      "version": "1.28.0",
+      "sha256": "0dm47k0pkp01x8xchapww3jwgviawkdjvz8kg2ifb603ksr9ivh5",
       "depends": ["FGNet", "igraph", "knitr"]
     },
     "IsoBayes": {
       "name": "IsoBayes",
-      "version": "1.2.6",
-      "sha256": "146xkxzaxsaj6rdx15jrrm3k5n7k58x7jvx3cmyc03zvr25yssm7",
+      "version": "1.4.0",
+      "sha256": "1rmqrv7gjx4v9qwrs8gbdxr71y4hybbc75x2drv9k4cgg8j2xqzs",
       "depends": ["HDInterval", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "doParallel", "doRNG", "foreach", "ggplot2", "glue", "iterators"]
     },
     "IsoCorrectoR": {
       "name": "IsoCorrectoR",
-      "version": "1.22.0",
-      "sha256": "19h5wndzj3sgvhb7blx07pjammh05kwp5vwjv0drvlj829pqhkia",
+      "version": "1.24.0",
+      "sha256": "17hw6kphrb3cq7f9dclka8hvrwf3m2qmrndpr0i3la6kdgr7y8fx",
       "depends": ["WriteXLS", "dplyr", "magrittr", "pracma", "quadprog", "readr", "readxl", "stringr", "tibble"]
     },
     "IsoCorrectoRGUI": {
       "name": "IsoCorrectoRGUI",
-      "version": "1.20.0",
-      "sha256": "1zwnp50sargc3991v22sj7hg01c1ddqi487xmvj5in7yjccys2dm",
+      "version": "1.22.0",
+      "sha256": "1aqrc1spr9ppwc6q7qzgciikd24fzj4nfwp6rh66p3cqbygp6dj3",
       "depends": ["IsoCorrectoR", "readxl", "tcltk2"]
     },
     "IsoformSwitchAnalyzeR": {
       "name": "IsoformSwitchAnalyzeR",
-      "version": "2.4.0",
-      "sha256": "0mmxyq1r4kq1igj108pr0r9215hwmyph5svx0djd460knak24y6z",
+      "version": "2.6.0",
+      "sha256": "13vp30mgf0v604i4vxbklbq1fh0wwn15gk05dvm7lpf5zppaqvgd",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DBI", "DEXSeq", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RCurl", "S4Vectors", "SummarizedExperiment", "VennDiagram", "XVector", "dplyr", "edgeR", "futile_logger", "ggplot2", "gridExtra", "limma", "magrittr", "pfamAnalyzeR", "plyr", "pwalign", "readr", "reshape2", "rtracklayer", "satuRn", "stringr", "sva", "tibble", "tidyr", "tximeta", "tximport"]
     },
     "KBoost": {
       "name": "KBoost",
-      "version": "1.12.0",
-      "sha256": "0xmnfcfvlmwgs01k81dkksgia93dvyph6kdacn9gnpl3559q5ilg",
+      "version": "1.14.0",
+      "sha256": "1vk6r4fkf54xnmf2hcaicy9vwdbi97n5kr45xx6w0f89d9n3mixg",
       "depends": []
     },
     "KCsmart": {
       "name": "KCsmart",
-      "version": "2.62.0",
-      "sha256": "0qc8kp5y9dcq23wsqpbin9hds1j5jnq3w255rg3k0ni1iq95c6m4",
+      "version": "2.64.0",
+      "sha256": "06frvvlkq8fp60kb2071kjnw6ln265gzzwsvnp02qwbxcp8axvh5",
       "depends": ["BiocGenerics", "KernSmooth", "multtest", "siggenes"]
     },
     "KEGGREST": {
       "name": "KEGGREST",
-      "version": "1.44.1",
-      "sha256": "09qdsdbz5ha3b2fafwv80n6pdajjgsc5w52n1dy6ds41vxgf0jis",
+      "version": "1.46.0",
+      "sha256": "19jy6nl46krlspzyqgmyix0d53izrdy3yx69nlamzph4gwjf5m0f",
       "depends": ["Biostrings", "httr", "png"]
     },
     "KEGGgraph": {
       "name": "KEGGgraph",
-      "version": "1.64.0",
-      "sha256": "0lffqbvwmfjbw5ymxr969znvb53hbqfgq1zwffsc768rv3h4c6p7",
+      "version": "1.66.0",
+      "sha256": "08xk85p76dbywsxw5w0ckw31m0raar5frkz14qwz4x88ilwhrw25",
       "depends": ["RCurl", "Rgraphviz", "XML", "graph"]
     },
     "KEGGlincs": {
       "name": "KEGGlincs",
-      "version": "1.30.0",
-      "sha256": "0jxa42ax4r991vc2cqjdzyfwknf5929xyvlpimra3fbpgpp8sjpg",
+      "version": "1.32.0",
+      "sha256": "18jacz85kz05wrl4pjqrfjlfs9msrchmaid67v602zbnlvgiiqz6",
       "depends": ["AnnotationDbi", "KEGGREST", "KEGGgraph", "KOdata", "RJSONIO", "XML", "gtools", "hgu133a_db", "httr", "igraph", "org_Hs_eg_db", "plyr"]
     },
     "KinSwingR": {
       "name": "KinSwingR",
-      "version": "1.22.0",
-      "sha256": "0dlqwi2a9hbl4nh6kp4bxv3acvnvmgg5ssbymvf2k8ng4g1kxi3r",
+      "version": "1.24.0",
+      "sha256": "1w0l47p4dpcqx2abj0vinawb12v1zg3gsdgpg7rxjjgs268jd5xc",
       "depends": ["BiocParallel", "data_table", "sqldf"]
     },
     "KnowSeq": {
       "name": "KnowSeq",
-      "version": "1.18.0",
-      "sha256": "1iv6cghkq0qi0d2fsj9x74jzvf1zrrknc3kx1b1xpa7lc0x11ym4",
+      "version": "1.20.0",
+      "sha256": "187jqsb1xy239ghlsrgdvlgsxwi9q3n4b9s427fk1kqlc7pfcngr",
       "depends": ["Hmisc", "R_utils", "XML", "caret", "cqn", "e1071", "edgeR", "ggplot2", "gridExtra", "httr", "jsonlite", "kernlab", "limma", "praznik", "randomForest", "reshape2", "rlist", "rmarkdown", "stringr", "sva"]
     },
     "LACE": {
       "name": "LACE",
-      "version": "2.8.0",
-      "sha256": "07izkiljmq0rbrijsgv45qvpp4zmaw78qqavzbvaw729pl172haz",
+      "version": "2.10.0",
+      "sha256": "1x1h38qav4f5gndlq6xf9rcwsv5pjphcxz11jsykv2bg33fcqaj2",
       "depends": ["DT", "Matrix", "RColorBrewer", "Rfast", "SummarizedExperiment", "biomaRt", "bsplus", "callr", "configr", "curl", "data_table", "data_tree", "doParallel", "dplyr", "forcats", "foreach", "fs", "ggplot2", "htmltools", "htmlwidgets", "igraph", "jsonlite", "logr", "purrr", "readr", "shiny", "shinyBS", "shinyFiles", "shinydashboard", "shinyjs", "shinythemes", "shinyvalidate", "sortable", "stringi", "stringr", "svglite", "tidyr"]
     },
     "LBE": {
       "name": "LBE",
-      "version": "1.72.0",
-      "sha256": "03vmsblzh5vw8p8xdd39cbl714rq1nh4wqflprsmpnyd1gkn8p4z",
+      "version": "1.74.0",
+      "sha256": "0hjgq630m4yy8pd4sm2s0nbxcm7y1rqg6kbggrk3hbiqbrzlq0ay",
       "depends": []
     },
     "LEA": {
       "name": "LEA",
-      "version": "3.16.0",
-      "sha256": "0r6nj6ck77fhbmqifbx4srj1f3yr7haiinphcm0p4g8b7zn4a6fm",
+      "version": "3.18.0",
+      "sha256": "0ayc6gqw426ygdj6fsixqfyq8br3szz3ghmn85rq4bizdabnkjpg",
       "depends": []
     },
     "LOBSTAHS": {
       "name": "LOBSTAHS",
-      "version": "1.30.0",
-      "sha256": "0r5s92jfvavxg6amml14lfqv9azshdf6vq7pyf9izbd79whxr6wn",
+      "version": "1.32.0",
+      "sha256": "1pwzfclnna5f1a6sdcradf08i5a562m68ghrd216r8c38x7lg55k",
       "depends": ["CAMERA", "xcms"]
     },
     "LOLA": {
       "name": "LOLA",
-      "version": "1.34.0",
-      "sha256": "1i5axxzdwl6j1cgxfdfnaisv6bj4qbrhic5ba2k3wbhkgr144xcc",
+      "version": "1.36.0",
+      "sha256": "0gxz27jvhw64i7r9acn5kj95s1hr8n5kajig6wi2pqxkmasiafk1",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "data_table", "reshape2"]
     },
     "LPE": {
       "name": "LPE",
-      "version": "1.78.0",
-      "sha256": "1a2bgk3a1irf45rda1dnbq0gak8ldw328ibvhp10fcj2dyvd53rx",
+      "version": "1.80.0",
+      "sha256": "15bjkkb089kq9k9i7qmchs245lf1kgdpcilkym44fsviy08lqzlg",
       "depends": []
     },
     "LRBaseDbi": {
       "name": "LRBaseDbi",
-      "version": "2.14.0",
-      "sha256": "11h41iq3ivbyrd2xrhphryqkrfdyr8j8hjdyjbbfsxhq8b4pxz9a",
+      "version": "2.16.0",
+      "sha256": "0s2f2y2fzqz6fawc8rjpmiap5m9vzjwslvcgilb28cfzrz4azp6y",
       "depends": ["AnnotationDbi", "Biobase", "DBI", "RSQLite"]
     },
     "LRcell": {
       "name": "LRcell",
-      "version": "1.12.0",
-      "sha256": "129wwaa6ppayyirlyra720a2yhabvihy11yfbr3yddnk7jzgzm8a",
+      "version": "1.14.0",
+      "sha256": "0h8jl25kzy03igndb56ard1vngmpmyggcmhzw5m5chx11vz7548v",
       "depends": ["AnnotationHub", "BiocParallel", "ExperimentHub", "dplyr", "ggplot2", "ggrepel", "magrittr"]
     },
     "LedPred": {
       "name": "LedPred",
-      "version": "1.38.0",
-      "sha256": "1ziw6ya46s55gynlrl8dh6p3n0l1m01b0q6b9y6fc13pknjjbarh",
+      "version": "1.40.0",
+      "sha256": "0f8c69k9gmm1fak48xp3h2d4n6y71qgjff2ifmyfsl8k0y39jyb3",
       "depends": ["RCurl", "ROCR", "akima", "e1071", "ggplot2", "irr", "jsonlite", "plot3D", "plyr", "testthat"]
     },
     "LinTInd": {
       "name": "LinTInd",
-      "version": "1.8.0",
-      "sha256": "01ij93fylp7bch2rywz31bpbhdgi8cbsn8nngsp730pd3pyw8mpf",
+      "version": "1.10.0",
+      "sha256": "0yvfwwc81nf29wvdhpwzxbpd5wg3mdb30384pj9sx3hlbp8spnfn",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "S4Vectors", "ape", "cowplot", "data_tree", "dplyr", "ggnewscale", "ggplot2", "ggtree", "networkD3", "pheatmap", "purrr", "pwalign", "reshape2", "rlist", "stringdist", "stringr"]
     },
     "LinkHD": {
       "name": "LinkHD",
-      "version": "1.18.0",
-      "sha256": "00vfzs3121l4bqy3mb4pblfjcna5zaa4iqrzrz9pfkwm2wcf2zis",
+      "version": "1.20.0",
+      "sha256": "15db7s91qxj3vfnidrss03fklnv9z8g960vny7jmh3k4jr70wkva",
       "depends": ["MultiAssayExperiment", "cluster", "data_table", "emmeans", "ggplot2", "ggpubr", "gridExtra", "reshape2", "rio", "scales", "vegan"]
     },
     "Linnorm": {
       "name": "Linnorm",
-      "version": "2.28.0",
-      "sha256": "1la6fwaap7957rrb4cs6w48kjz4hqrw3h39lpps419d4cbnsp5jz",
+      "version": "2.30.0",
+      "sha256": "03prx6qzkk5cdr83x4i3m2irjsm9ay31bz581ms0ji27y5l7c0wh",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rtsne", "amap", "apcluster", "ellipse", "fastcluster", "fpc", "ggdendro", "ggplot2", "gmodels", "igraph", "limma", "mclust", "statmod", "vegan", "zoo"]
     },
     "LiquidAssociation": {
       "name": "LiquidAssociation",
-      "version": "1.58.0",
-      "sha256": "0hgr074a4q64cyw2dbc3ncm9rwkv0d2fs5wzlkacr956wv3zzxld",
+      "version": "1.60.0",
+      "sha256": "14l5z0wahdgirz0rxnbkgmhv636w57yp17z5gw220a7vk2w5v4lf",
       "depends": ["Biobase", "geepack", "org_Sc_sgd_db", "yeastCC"]
     },
     "LoomExperiment": {
       "name": "LoomExperiment",
-      "version": "1.22.0",
-      "sha256": "12xx78pbfdhh1iprm8vfbnwi3dm7slf47y5a6p78spnhsykb3ris",
+      "version": "1.24.0",
+      "sha256": "17cxi4f4bc65finx24bd6z15zpy9w19fwyzbi27iia022f28m5ya",
       "depends": ["BiocIO", "DelayedArray", "GenomicRanges", "HDF5Array", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "rhdf5", "stringr"]
     },
     "LymphoSeq": {
       "name": "LymphoSeq",
-      "version": "1.32.0",
-      "sha256": "0km3k6sbcb573mk0wb6hq1xqmbkksnvkv8mx5b9jqr4r840lh909",
+      "version": "1.34.0",
+      "sha256": "0ss46q1y07p17qgfir4vklpmqsx4ywgaa99rsdn8b41pdgcwxvy2",
       "depends": ["Biostrings", "LymphoSeqDB", "RColorBrewer", "UpSetR", "VennDiagram", "circlize", "data_table", "dplyr", "ggplot2", "ggtree", "ineq", "msa", "phangorn", "plyr", "reshape", "stringdist"]
     },
     "M3C": {
       "name": "M3C",
-      "version": "1.26.0",
-      "sha256": "1h3zxb3m68lq37g25zqxpmk2c9yrdhydyhh7ad2d30hif73qiacm",
+      "version": "1.28.0",
+      "sha256": "11ll6ry20qmiciw2ma5rqbmggd9ahxddk24sh7mqxkrw1c1im760",
       "depends": ["Matrix", "Rtsne", "cluster", "corpcor", "doParallel", "doSNOW", "foreach", "ggplot2", "matrixcalc", "umap"]
     },
     "M3Drop": {
       "name": "M3Drop",
-      "version": "1.30.0",
-      "sha256": "1ksdr7p517sidp99kl4bjy88i18c7hxgd7zlrj4h0zrvy3fjh1r4",
+      "version": "1.32.0",
+      "sha256": "1wqlkshzlq724n5r4c7bqlhvjz80fn74dd8kw5r290z9qicqxx6x",
       "depends": ["Hmisc", "Matrix", "RColorBrewer", "bbmle", "gplots", "irlba", "matrixStats", "numDeriv", "reldist", "scater", "statmod"]
     },
     "MACSQuantifyR": {
       "name": "MACSQuantifyR",
-      "version": "1.18.0",
-      "sha256": "0f46dgp5cjakc97zb7rz2fnx5bzb78qfbw2fdc30jv1c9zn849f1",
+      "version": "1.20.0",
+      "sha256": "1nmbj1xqmrnr9ig1dc2l94signj1azkrq3madcciw2rkixr426lf",
       "depends": ["ggplot2", "ggrepel", "gridExtra", "lattice", "latticeExtra", "png", "prettydoc", "readxl", "rmarkdown", "rvest", "xml2"]
     },
     "MACSr": {
       "name": "MACSr",
-      "version": "1.12.0",
-      "sha256": "04qra9rwj3f259k2f8h1v8g8cnkm2ryrr84rq6pmkr9ax0wbym63",
+      "version": "1.14.0",
+      "sha256": "1g6ibxy2ffwq5gb9jh37mrql1aq7ap14spcrx0mrcb684rgvyi5x",
       "depends": ["AnnotationHub", "ExperimentHub", "S4Vectors", "basilisk", "reticulate"]
     },
     "MADSEQ": {
       "name": "MADSEQ",
-      "version": "1.30.0",
-      "sha256": "0b15wg8nsavl2994clrv72rl6qn5b8pbxk1wqwqcrdab832pd4m7",
+      "version": "1.32.0",
+      "sha256": "14rxkzcz0q5h6f9inzl3chjk2jhph0y538k6pshgx54vw68rqzpm",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "VariantAnnotation", "coda", "preprocessCore", "rjags", "rtracklayer", "vcfR", "zlibbioc"]
     },
     "MAGAR": {
       "name": "MAGAR",
-      "version": "1.12.0",
-      "sha256": "10ki05dffrc9b4ghwjlcc51m9zviyffsldwp5w6m740y9gd0hjcg",
+      "version": "1.14.0",
+      "sha256": "1hx5wxkld3fk4hw5k7bgfg1sykid0wxsplxv2dz5cjqa83ki4lvl",
       "depends": ["HDF5Array", "RnBeads", "RnBeads_hg19", "RnBeads_hg38", "UpSetR", "argparse", "bigstatsr", "crlmm", "data_table", "doParallel", "ff", "igraph", "impute", "jsonlite", "plyr", "reshape2", "rjson", "snpStats"]
     },
     "MAGeCKFlute": {
       "name": "MAGeCKFlute",
-      "version": "2.8.0",
-      "sha256": "1fbwd1wi9z6fgq2whqazyqwm71j7h87dcv4vh3f23yzxm337qpiy",
+      "version": "2.9.0",
+      "sha256": "1m2yq73q9wwv5kfybgnkdb877dy539x9vpx713pr6xjpkqvksfiv",
       "depends": ["Biobase", "DOSE", "clusterProfiler", "depmap", "enrichplot", "ggplot2", "ggrepel", "gridExtra", "msigdbr", "pathview", "reshape2"]
     },
     "MAI": {
       "name": "MAI",
-      "version": "1.10.0",
-      "sha256": "0fj5q9bbwazicncyxn7940jxkka1m76327cgwl3skj8a1xr6nlfq",
+      "version": "1.12.0",
+      "sha256": "0l1g08x75phw2cbn6d4yydp2j1ca037mdgc8vx93fng1yi9nk88j",
       "depends": ["S4Vectors", "SummarizedExperiment", "caret", "doParallel", "e1071", "foreach", "future", "future_apply", "missForest", "pcaMethods", "tidyverse"]
     },
     "MAIT": {
       "name": "MAIT",
-      "version": "1.38.0",
-      "sha256": "0b33n6n3v88rad6ndpldsz3kb3l35fq7w6vqm5fzd9nxn9h5ayws",
+      "version": "1.40.0",
+      "sha256": "1fq2wz12h115pgi7gc5qvz9c64qb863409x60kc2clzc0ddc8xfg",
       "depends": ["CAMERA", "MASS", "Rcpp", "agricolae", "caret", "class", "e1071", "gplots", "pls", "plsgenomics", "xcms"]
     },
     "MANOR": {
       "name": "MANOR",
-      "version": "1.76.0",
-      "sha256": "0mlhv4gy4bxvdm0drwwrm4x48wy0mghzcqhvaw2rhw0h65rmy5ps",
+      "version": "1.78.0",
+      "sha256": "0v99f4pkjgz5qjj68xsabfh5prgkz0fjlqn8yn7f1d4sv8cigq6l",
       "depends": ["GLAD"]
     },
     "MAPFX": {
       "name": "MAPFX",
-      "version": "1.0.0",
-      "sha256": "16iqj70hhsgvnlb8g9z42xplfdsryzlc9cq4ndky01izmqi0ybvx",
+      "version": "1.2.0",
+      "sha256": "0cdmawbp6iz3wis4w848gcj3nvc598hyj1mycyw8gyifpfwg2yq7",
       "depends": ["Biobase", "ComplexHeatmap", "RColorBrewer", "Rfast", "circlize", "cowplot", "e1071", "flowCore", "ggplot2", "glmnetUtils", "gtools", "iCellR", "igraph", "pbapply", "reshape2", "stringr", "uwot", "xgboost"]
     },
     "MAST": {
       "name": "MAST",
-      "version": "1.30.0",
-      "sha256": "1k8an0ifcgx54lqzpim3q37y4rhv57i94i46dlpmdyfghqqw0fny",
+      "version": "1.32.0",
+      "sha256": "0fn50b4yxsslgvw8l6zfbxr4bl8hd9rb7p3dggw040hfm8gadgl9",
       "depends": ["Biobase", "BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "data_table", "ggplot2", "plyr", "progress", "reshape2", "stringr"]
     },
     "MBASED": {
       "name": "MBASED",
-      "version": "1.38.0",
-      "sha256": "1gh12y9l87g01s8f60g82k43pjm4i7zan0l1xnw042qiskz6x92h",
+      "version": "1.40.0",
+      "sha256": "0073j8fc2fqj2wg89b1p4h9v9hi4lrmyi01bsvd69mgsa3g843ka",
       "depends": ["BiocGenerics", "BiocParallel", "GenomicRanges", "RUnit", "SummarizedExperiment"]
     },
     "MBAmethyl": {
       "name": "MBAmethyl",
-      "version": "1.38.0",
-      "sha256": "05p05qp8g23l1c4i9vnkysq1srnzpiq8wc45zzg80hms3ab5qdzp",
+      "version": "1.40.0",
+      "sha256": "1fq2g3gf0hbl9c4rl6j506i37a022wvsvhfq3l0r032p1p43wvdb",
       "depends": []
     },
     "MBCB": {
       "name": "MBCB",
-      "version": "1.58.0",
-      "sha256": "17m8ajwffjl6ldzmlq79hj9s0nkjparpks685jjgmw8gx80q3ln1",
+      "version": "1.60.0",
+      "sha256": "0qyghk27d6qdj5xzgnh5k267h106cqq7287cmczbfgjjk3x63jn6",
       "depends": ["preprocessCore", "tcltk2"]
     },
     "MBECS": {
       "name": "MBECS",
-      "version": "1.8.0",
-      "sha256": "15nv5rbw158d071gscms6p42wzf6ibnabiqcq256rcz6j0r69b63",
+      "version": "1.10.0",
+      "sha256": "0b8apb9gybapl9dnc7h6f0kk4ra35wsypr9gr83hbjp85wwv8glc",
       "depends": ["Matrix", "cluster", "dplyr", "ggplot2", "gridExtra", "limma", "lme4", "lmerTest", "magrittr", "pheatmap", "phyloseq", "rmarkdown", "ruv", "sva", "tibble", "tidyr", "vegan"]
     },
     "MBQN": {
       "name": "MBQN",
-      "version": "2.16.0",
-      "sha256": "0c5knn15yiki5vi6ln5f0r4hkq3bnv8da5yqflgbgqwn7fn277cr",
+      "version": "2.18.0",
+      "sha256": "17wx2f25mk34j9wchl7ircpirdnq1d65vmlvjf86sjgdrcf1g9jk",
       "depends": ["BiocFileCache", "PairedData", "RCurl", "SummarizedExperiment", "ggplot2", "limma", "preprocessCore", "rappdirs", "rmarkdown", "xml2"]
     },
     "MBttest": {
       "name": "MBttest",
-      "version": "1.32.0",
-      "sha256": "0qfl0qaw99b1q8j7fq8f1vdkxsjjp6flrg3vwr3bksfi5z58hpzz",
+      "version": "1.34.0",
+      "sha256": "1x13z9f4jjpi9fhwwz69jd4cbqbrw6fk2k8jdflix8l1xmpqkxab",
       "depends": ["gplots", "gtools"]
     },
     "MCbiclust": {
       "name": "MCbiclust",
-      "version": "1.28.0",
-      "sha256": "1alz583dnmm9xvby1fcfkz2pxach6saj2ni5qma1r31ac4sx0b3l",
+      "version": "1.30.0",
+      "sha256": "1i99yxbnr43mmwq1w1r3pjf0yzrzbcqs8yq247kw3pzyg02jr33q",
       "depends": ["AnnotationDbi", "BiocParallel", "GGally", "GO_db", "WGCNA", "cluster", "ggplot2", "org_Hs_eg_db", "scales"]
     },
     "MDTS": {
       "name": "MDTS",
-      "version": "1.24.0",
-      "sha256": "16mm79gqqwpjfhmx0ppidg05gk7hbzw2d0hgxx9fzpfaixkx2k7p",
+      "version": "1.26.0",
+      "sha256": "0rjz1jmfihvg1ymyws8p0mibpa1yg1nh9l7h65620xmmk172xgv2",
       "depends": ["Biostrings", "DNAcopy", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "stringr"]
     },
     "MEAL": {
       "name": "MEAL",
-      "version": "1.34.0",
-      "sha256": "1njqd9546ggnncmnri8nm9h2cq1wrq075fpng86d994zpgvq2xn8",
+      "version": "1.36.0",
+      "sha256": "06wmhpa3xqff1fcb8v35ia7zgn0zwmb3spzl75fw0xxk37czv8li",
       "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "Gviz", "IRanges", "MultiDataSet", "S4Vectors", "SmartSVA", "SummarizedExperiment", "ggplot2", "isva", "limma", "matrixStats", "minfi", "missMethyl", "permute", "vegan"]
     },
     "MEAT": {
       "name": "MEAT",
-      "version": "1.16.0",
-      "sha256": "0qq5k0xc7vsc32nh6f1qw4cy960rh43a8caqpjprvkfgp9mbvxfg",
+      "version": "1.18.0",
+      "sha256": "0ia95li2xp1rf3c48gz5rjmds3r2sfrl0jpr3vqqj9mkrzxr7q84",
       "depends": ["RPMM", "SummarizedExperiment", "dplyr", "dynamicTreeCut", "glmnet", "impute", "minfi", "stringr", "tibble", "wateRmelon"]
     },
     "MEB": {
       "name": "MEB",
-      "version": "1.18.0",
-      "sha256": "18vhf7f0jx13b8vs4kgm2qli3xxinv9rcm4r8xfd9p1ldmmbh6bn",
+      "version": "1.20.0",
+      "sha256": "1b9rdbxwzkzxwpr0653q37wshhxfqhwllmciph06s0lzjinccxml",
       "depends": ["SingleCellExperiment", "SummarizedExperiment", "e1071", "edgeR", "scater", "wrswoR"]
     },
     "MEDIPS": {
       "name": "MEDIPS",
-      "version": "1.56.0",
-      "sha256": "0lv4x4ms3gabin47lv08rl2igddnr2r9d5xf3w1zaz8d2fj1k1wq",
+      "version": "1.58.0",
+      "sha256": "0jf572ripjnpksyjbpid26rw08529ybdjcz1sa33vxkarbgg2lgp",
       "depends": ["BSgenome", "Biostrings", "DNAcopy", "GenomicRanges", "IRanges", "Rsamtools", "biomaRt", "edgeR", "gtools", "preprocessCore", "rtracklayer"]
     },
     "MEDME": {
       "name": "MEDME",
-      "version": "1.64.0",
-      "sha256": "1zqqbb36qy1ad3fp2b29wm94g0qj95p8aj4jskkj7zca5j01jvzr",
+      "version": "1.66.0",
+      "sha256": "0awv9p388lkgk9cwj2plnpw0nv7v6rf76isdz5iwwklvvrlykylx",
       "depends": ["Biostrings", "MASS", "drc"]
     },
     "MEIGOR": {
       "name": "MEIGOR",
-      "version": "1.38.0",
-      "sha256": "05k3n6zr75hd76l7v19i88hp0y7x2k2x4nhdwx86ya9gp8xad069",
+      "version": "1.40.0",
+      "sha256": "0chwp09cys757cb7xzqcixyslsdp5909c91m0a8c75b0ld8qsra8",
       "depends": ["CNORode", "Rsolnp", "deSolve", "snowfall"]
     },
     "MGFM": {
       "name": "MGFM",
-      "version": "1.38.0",
-      "sha256": "0f6j2bq0zv2lfypd4wbbmapgs132k7yzjw11h9rs6c4llhlk5ns2",
+      "version": "1.40.0",
+      "sha256": "0fjhfpmhchx64hf3c1gwm2l15p12r7zfa5js1n5rj604pi2ibpmh",
       "depends": ["AnnotationDbi", "annotate"]
     },
     "MGFR": {
       "name": "MGFR",
-      "version": "1.30.0",
-      "sha256": "07g01scd15zprm6ygvj9pjrsj553vk073mjyqvnk6pxy97r7slfa",
+      "version": "1.32.0",
+      "sha256": "1ydgx34ixyzdlzz2ad8wb8srssqpzyi0vrh1xn5k3mqyz1s4zv4y",
       "depends": ["annotate", "biomaRt"]
     },
     "MGnifyR": {
       "name": "MGnifyR",
-      "version": "1.0.0",
-      "sha256": "0siqjril79bcbs90v7ng1j2rzrs4nl5y4wv1ih2cgp464n8agh6a",
+      "version": "1.2.0",
+      "sha256": "0ka9zlx035v65zdi2q7hni3768vgihaa91kwdg2l2dpmqzgq6ngk",
       "depends": ["BiocGenerics", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "dplyr", "httr", "mia", "plyr", "reshape2", "tidyjson", "urltools"]
     },
     "MICSQTL": {
       "name": "MICSQTL",
-      "version": "1.2.2",
-      "sha256": "141dgc7k28ig9yw6km7ahjp0zyshg4kp3f6bs0ixnv6566dlb4c9",
+      "version": "1.4.0",
+      "sha256": "0xka43qw13b00g6rmbs0ilhz5alw4z1wx6d1kmfaga74wf103y5n",
       "depends": ["BiocParallel", "S4Vectors", "SummarizedExperiment", "TCA", "TOAST", "dirmult", "ggplot2", "ggpubr", "ggridges", "glue", "magrittr", "nnls", "purrr"]
     },
     "MIRA": {
       "name": "MIRA",
-      "version": "1.26.0",
-      "sha256": "05s4wm7cnjyb1sg6zawp5rxj23ym5kkh95cj79k6cx6l0fb946c0",
+      "version": "1.28.0",
+      "sha256": "173nj8hmycrddjnbx2if1w04085sw4sxhkxs52k1ifhwza6iibp3",
       "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "bsseq", "data_table", "ggplot2"]
     },
     "MIRit": {
       "name": "MIRit",
-      "version": "1.0.0",
-      "sha256": "1c6zz24l2l362lkyha9ls7a990dpvpxskyzxz755zkf0q4cpdyn4",
-      "depends": ["AnnotationDbi", "BiocFileCache", "BiocParallel", "DESeq2", "MultiAssayExperiment", "Rcpp", "Rgraphviz", "edgeR", "fgsea", "genekitr", "geneset", "ggplot2", "ggpubr", "graph", "graphite", "httr", "limma", "readxl", "rlang"]
+      "version": "1.2.0",
+      "sha256": "11wwbm6qvg6gjngn3zk8lgmrfrgaycfmmlkzpka10w0k57xflhgv",
+      "depends": ["AnnotationDbi", "BiocFileCache", "BiocParallel", "DESeq2", "MultiAssayExperiment", "Rcpp", "Rgraphviz", "edgeR", "fgsea", "genekitr", "geneset", "ggplot2", "ggpubr", "graph", "graphite", "httr", "limma", "rlang"]
     },
     "MLInterfaces": {
       "name": "MLInterfaces",
-      "version": "1.84.0",
-      "sha256": "1m8clkb5rznzv2fwrl59csq8v0ibqwdm4fphq10b8pmyvj880qpn",
+      "version": "1.86.0",
+      "sha256": "1r00hcisp4i2q7nki9rkp753ms3g7biw9h9hxfwajfjqlwpb3l5y",
       "depends": ["Biobase", "BiocGenerics", "MASS", "RColorBrewer", "Rcpp", "SummarizedExperiment", "annotate", "cluster", "fpc", "gbm", "gdata", "genefilter", "ggvis", "hwriter", "magrittr", "mlbench", "pls", "rpart", "sfsmisc", "shiny", "threejs"]
     },
     "MLP": {
       "name": "MLP",
-      "version": "1.52.0",
-      "sha256": "0ij15mcpahgykaalaj954qhk21gd967sngn2ad4wh4h6p99n6902",
+      "version": "1.54.0",
+      "sha256": "0sqk5cyffhwp1gpds4jxx06iypg3ygz2d7zrk8n4s8zx06q3x1ng",
       "depends": ["AnnotationDbi", "gplots"]
     },
     "MLSeq": {
       "name": "MLSeq",
-      "version": "2.22.0",
-      "sha256": "0vm4giqqp2iq1w40nkn4bjc81ppdhqhbxq6w6ps3i2rdzwcq49ir",
+      "version": "2.24.0",
+      "sha256": "0h293r553nvkwr3kpp5l3jfkxpr699fvfp39d1k37gw9w7rn2r4k",
       "depends": ["Biobase", "DESeq2", "SummarizedExperiment", "VennDiagram", "caret", "edgeR", "foreach", "ggplot2", "limma", "pamr", "plyr", "sSeq", "testthat", "xtable"]
     },
     "MMDiff2": {
       "name": "MMDiff2",
-      "version": "1.32.0",
-      "sha256": "0yamcgjb5k77pkv1b0bja5f2i7aqw12wpyppf1mw9s8mqfx3cl0y",
+      "version": "1.34.0",
+      "sha256": "0n3a2ydxr36q02v6ndagm378zqa5sakz02zsk0d7z668wbjawn55",
       "depends": ["BSgenome", "Biobase", "Biostrings", "GenomicRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "ggplot2", "locfit", "shiny"]
     },
-    "MMUPHin": {
-      "name": "MMUPHin",
-      "version": "1.18.1",
-      "sha256": "0wh998bjbf8zkfrzmrnm8dmm7960w5dnaq1yyc1hl105al0j33aj",
-      "depends": ["Maaslin2", "cowplot", "dplyr", "fpc", "ggplot2", "igraph", "metafor", "stringr", "tidyr"]
-    },
     "MODA": {
       "name": "MODA",
-      "version": "1.30.0",
-      "sha256": "1cx3jz8hw1zm68cay84gkxq9wlfwfdm9ms70af6hck4fl2spxj66",
+      "version": "1.32.0",
+      "sha256": "198rpf9zcid6ipzshcr0ip26apjznz4p8wmp5qycyv0sp9k2gcf8",
       "depends": ["AMOUNTAIN", "RColorBrewer", "WGCNA", "cluster", "dynamicTreeCut", "igraph"]
     },
     "MOFA2": {
       "name": "MOFA2",
-      "version": "1.14.0",
-      "sha256": "0sf0vibw44ildxf5rdkqjhw85awl5iz9f62j9z660lf3f8h5v5qq",
+      "version": "1.16.0",
+      "sha256": "0m5xrphhlrzl16fg39m512rcmf0cnvjgw1pdmz43imyzh2339jrp",
       "depends": ["DelayedArray", "HDF5Array", "RColorBrewer", "Rtsne", "basilisk", "corrplot", "cowplot", "dplyr", "forcats", "ggplot2", "ggrepel", "magrittr", "pheatmap", "reshape2", "reticulate", "rhdf5", "stringi", "tidyr", "uwot"]
     },
     "MOGAMUN": {
       "name": "MOGAMUN",
-      "version": "1.14.0",
-      "sha256": "0l6pbn89a3pp157fbcwpkihmx869afi0qvm16yjac0mrhwspgbk8",
+      "version": "1.16.0",
+      "sha256": "15khhn3bvcnncc7mb4zvyxg1w3a5j90ywwqhdpj1h329pgnlzyfq",
       "depends": ["BiocParallel", "RCy3", "RUnit", "igraph", "stringr"]
     },
     "MOMA": {
       "name": "MOMA",
-      "version": "1.16.0",
-      "sha256": "1xbacfm9cikdhhb64l068hi4hcpqvh0g573cm8c3jxicxbgp3swv",
+      "version": "1.18.0",
+      "sha256": "0af1yplxrbdgmr3vqjizy147gv5f9gl2frix51gj0i70h157wlgh",
       "depends": ["ComplexHeatmap", "MKmisc", "MultiAssayExperiment", "RColorBrewer", "circlize", "cluster", "dplyr", "ggplot2", "magrittr", "qvalue", "readr", "reshape2", "rlang", "stringr", "tibble", "tidyr"]
     },
+    "MOSClip": {
+      "name": "MOSClip",
+      "version": "1.0.0",
+      "sha256": "16fscjhv7v4wq5kgm0snmjdykn1qam3rd424l0m2c94f3l8l60xf",
+      "depends": ["AnnotationDbi", "ComplexHeatmap", "FactoMineR", "Matrix", "MultiAssayExperiment", "NbClust", "RColorBrewer", "S4Vectors", "SuperExactTest", "checkmate", "circlize", "corpcor", "coxrobust", "elasticnet", "gRbase", "ggplot2", "ggplotify", "graph", "graphite", "gridExtra", "igraph", "org_Hs_eg_db", "pheatmap", "qpgraph", "reshape", "survival", "survminer"]
+    },
     "MOSim": {
       "name": "MOSim",
-      "version": "2.0.0",
-      "sha256": "0mj53b4m4f2bzspgypiymhk780dcmbrfdrdki46bqjnb124y0c2q",
+      "version": "2.2.0",
+      "sha256": "114hmlbk3schfbm6zwczs59bn9hki9iid5ap55akjaxls1s0rsca",
       "depends": ["HiddenMarkov", "IRanges", "Rcpp", "S4Vectors", "Seurat", "Signac", "cpp11", "dplyr", "edgeR", "ggplot2", "lazyeval", "matrixStats", "rlang", "scran", "stringi", "stringr", "zoo"]
     },
+    "MPAC": {
+      "name": "MPAC",
+      "version": "1.0.0",
+      "sha256": "0i6cmsxabmlsnp1z7ip2dk9w8q820n5b43jm8v7r0ckx70ii3b5h",
+      "depends": ["BiocParallel", "BiocSingular", "ComplexHeatmap", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bluster", "data_table", "fgsea", "fitdistrplus", "igraph", "scran"]
+    },
     "MPFE": {
       "name": "MPFE",
-      "version": "1.40.0",
-      "sha256": "15sj1r9wa0irkym5z527r7s3krk4y5shgffv9w3fcdj90gqclc23",
+      "version": "1.42.0",
+      "sha256": "0xvasm0fywkfdp8yq7vs35nkgjd2c2r5n472kbj1pw4wxbmbxaq3",
       "depends": []
     },
     "MPRAnalyze": {
       "name": "MPRAnalyze",
-      "version": "1.22.0",
-      "sha256": "1gswhf7k4y0g28wv3hjwcrg9ms1g4ky0rxdlzli1in8d4cly7154",
+      "version": "1.24.0",
+      "sha256": "0xmhmkcd79f33wnkjlxx70b5n406phc46cpc9vwy2yxjjls7az7f",
       "depends": ["BiocParallel", "SummarizedExperiment", "progress"]
     },
     "MSA2dist": {
       "name": "MSA2dist",
-      "version": "1.8.0",
-      "sha256": "0bb37mdw671cc7751wfdsslcaz04i3sbjdp3y11n7yl5pmkx1k6b",
+      "version": "1.10.1",
+      "sha256": "0wcnaappdikx7ma2g59k0wq299a1s2wkk50ck08jrc0ixnbr3jlf",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rcpp", "RcppThread", "ape", "doParallel", "dplyr", "foreach", "pwalign", "rlang", "seqinr", "stringi", "stringr", "tibble", "tidyr"]
     },
     "MSPrep": {
       "name": "MSPrep",
-      "version": "1.14.0",
-      "sha256": "0856s9a268sv2ablqb6s5gc98dl5z171xik1nk7jpx5vdx9iwj5b",
+      "version": "1.16.0",
+      "sha256": "0n10a75aj3f4pj7iw4dkzl24bywchfjrmsj37kj7ws3cwmhl6nna",
       "depends": ["S4Vectors", "SummarizedExperiment", "VIM", "crmn", "dplyr", "magrittr", "missForest", "pcaMethods", "preprocessCore", "rlang", "stringr", "sva", "tibble", "tidyr"]
     },
     "MSnID": {
       "name": "MSnID",
-      "version": "1.38.0",
-      "sha256": "0misrm4x4z5h8dfwcrwi24nhcjslqvbyk5n7qz6kf2zcgcwq8q44",
+      "version": "1.40.0",
+      "sha256": "1mdd7k71w8iiy9wkdaaq78y23547i7rcx5zn2rqzh09rgz68dnni",
       "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "BiocStyle", "Biostrings", "MSnbase", "ProtGenerics", "RUnit", "R_cache", "Rcpp", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "iterators", "msmsTests", "mzID", "mzR", "purrr", "reshape2", "rlang", "stringr", "tibble", "xtable"]
     },
     "MSnbase": {
       "name": "MSnbase",
-      "version": "2.30.1",
-      "sha256": "0cdvi2mjvhj0h8x2rh3kkzrdnmzhr7d9a41m21r6b843a0q7hp6f",
+      "version": "2.32.0",
+      "sha256": "0cykb5kk524i3ssps798c7wfpa3f8svdgxa8sfvc1pxm0fxypfgb",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "MALDIquant", "MASS", "MsCoreUtils", "PSMatch", "ProtGenerics", "Rcpp", "S4Vectors", "affy", "digest", "ggplot2", "impute", "lattice", "mzID", "mzR", "pcaMethods", "plyr", "scales", "vsn"]
     },
     "MSstats": {
       "name": "MSstats",
-      "version": "4.12.1",
-      "sha256": "10dsw777qiaj042mfsram39n4bq0sps18lfgl98wb9y0d67c8xaz",
+      "version": "4.14.0",
+      "sha256": "1zhgx2gm79wsl3gybnrsqqiyc5z2k59xra2lm7m75jlj5h651sch",
       "depends": ["MASS", "MSstatsConvert", "Rcpp", "RcppArmadillo", "checkmate", "data_table", "ggplot2", "ggrepel", "gplots", "htmltools", "limma", "lme4", "marray", "plotly", "preprocessCore", "statmod", "survival"]
     },
     "MSstatsBig": {
       "name": "MSstatsBig",
-      "version": "1.2.0",
-      "sha256": "1az35hsgij1cgpp6pl198dmlw26ddc1npdzaa5g8mwmdijwl3jz1",
+      "version": "1.4.0",
+      "sha256": "12x1nhq413wq6nd3c2y2iwbaii8kkxyn5pmnm8z0l4jabf0frdf5",
       "depends": ["DBI", "MSstats", "MSstatsConvert", "arrow", "dplyr", "readr", "sparklyr"]
     },
     "MSstatsConvert": {
       "name": "MSstatsConvert",
-      "version": "1.14.0",
-      "sha256": "1q2xwik74qdazqmbh5qqcy21s9nq77jjvrc9qhkh1f0iss0r6pzm",
+      "version": "1.16.1",
+      "sha256": "0rg721h3g68njkjz9rdfv99n5vslggiy96zc3grhbrlnq5x8ygzy",
       "depends": ["checkmate", "data_table", "log4r", "stringi"]
     },
     "MSstatsLOBD": {
       "name": "MSstatsLOBD",
-      "version": "1.12.0",
-      "sha256": "0jav2x8j07v4zmbwk89l85rycn7k9y0ifb07gzg64v0pkls4341s",
+      "version": "1.14.0",
+      "sha256": "11jxy1npwb3dswrkr4ynswwx6jpg58wz9b6scmp5zw9qyf17syng",
       "depends": ["Rcpp", "ggplot2", "minpack_lm"]
     },
     "MSstatsLiP": {
       "name": "MSstatsLiP",
-      "version": "1.10.0",
-      "sha256": "1kpfybpzav4bvy3jb2p3ws899mifjr564jqsdy9s4vbk5pphm9j0",
+      "version": "1.12.0",
+      "sha256": "1s72lnj2ghdc0zfvn7qkzwqj0vz2fl35dbmd52mqrbcgc02k4f7a",
       "depends": ["Biostrings", "MSstats", "MSstatsConvert", "MSstatsPTM", "Rcpp", "checkmate", "data_table", "dplyr", "factoextra", "ggplot2", "ggpubr", "gridExtra", "purrr", "scales", "stringr", "tibble", "tidyr", "tidyverse"]
     },
     "MSstatsPTM": {
       "name": "MSstatsPTM",
-      "version": "2.6.0",
-      "sha256": "0ivcxd2awrswih6n7is7zkcfrqiihk998g081krcp25i832xfqvh",
+      "version": "2.8.1",
+      "sha256": "1fna3fww9np5hgc197a2ld14fcaavq1a5w46y9ff1kvl8miayjw7",
       "depends": ["Biostrings", "MSstats", "MSstatsConvert", "MSstatsTMT", "Rcpp", "checkmate", "data_table", "dplyr", "ggplot2", "ggrepel", "gridExtra", "stringi", "stringr"]
     },
     "MSstatsQC": {
       "name": "MSstatsQC",
-      "version": "2.22.0",
-      "sha256": "0pp813mx6kwmxyyi67qsak09k012nn05pv60ndx8x6dq9ph8aghn",
+      "version": "2.24.0",
+      "sha256": "1h9k8k7080396h05cd4k2h100jv69c1rkscacs77kh200z8nb95g",
       "depends": ["MSnbase", "dplyr", "ggExtra", "ggplot2", "plotly", "qcmetrics"]
     },
     "MSstatsQCgui": {
       "name": "MSstatsQCgui",
-      "version": "1.24.0",
-      "sha256": "0kjidspplam63367yc09a17a3gq52rbmfrcnaxnxpiwkl7mphzz0",
+      "version": "1.26.0",
+      "sha256": "0hd2s8l4r52cpgc7apwhbzpnq14qjgvgkd2ykzrlvk71sq8vgwvk",
       "depends": ["MSstatsQC", "dplyr", "ggExtra", "gridExtra", "plotly", "shiny"]
     },
     "MSstatsShiny": {
       "name": "MSstatsShiny",
-      "version": "1.6.2",
-      "sha256": "0h79yy5b9n2kfpbc3fhfajfmrqdzghj3ycaparn1v1dzjmi87z9y",
+      "version": "1.8.0",
+      "sha256": "1kklcz24v3xdbz9lqypw28dzjlcfhvdnq5c6nn983ay1cf12kk5h",
       "depends": ["DT", "Hmisc", "MSstats", "MSstatsConvert", "MSstatsPTM", "MSstatsTMT", "data_table", "dplyr", "ggplot2", "ggrepel", "gplots", "htmltools", "marray", "mockery", "plotly", "readxl", "shiny", "shinyBS", "shinybusy", "shinyjs", "tidyr", "uuid"]
     },
     "MSstatsTMT": {
       "name": "MSstatsTMT",
-      "version": "2.12.1",
-      "sha256": "03nnwh5qbr3wd942yj5xa2gd2bk28ncxq2dri3my5gwsrlfxfxpn",
+      "version": "2.14.1",
+      "sha256": "1snqp1swramsc6bmmsnkq33vndmrfdc61vqm2mslgsh61p49mnmm",
       "depends": ["MSstats", "MSstatsConvert", "checkmate", "data_table", "ggplot2", "htmltools", "limma", "lme4", "lmerTest", "plotly"]
     },
     "MVCClass": {
       "name": "MVCClass",
-      "version": "1.78.0",
-      "sha256": "1wi6acw51q48v149l72b2pp0iyjrwq1bbmr53y3m609xfadg4qim",
+      "version": "1.80.0",
+      "sha256": "0y96dhsqg01vcr77p7p6z5449jrg9gypqdg5raspcvz90gxivc6x",
       "depends": []
     },
     "MWASTools": {
       "name": "MWASTools",
-      "version": "1.28.0",
-      "sha256": "1k72ycx0zlflcfpqapvh9m6mk3vc9wl0pbsi4jbcdigl6vx1zixv",
+      "version": "1.30.0",
+      "sha256": "1kv2pxhmn7lwd63al4qvgbwi2ffgf12cb55siwb62q6767b5gw77",
       "depends": ["ComplexHeatmap", "KEGGREST", "KEGGgraph", "RCurl", "SummarizedExperiment", "boot", "car", "ggplot2", "glm2", "gridExtra", "igraph", "ppcor", "qvalue"]
     },
-    "Maaslin2": {
-      "name": "Maaslin2",
-      "version": "1.18.0",
-      "sha256": "0dl6s4lcd40nd7v0d3k3zn0mkm5rlzb8kf2cjxz298mgdif63xqh",
-      "depends": ["MASS", "biglm", "car", "chemometrics", "cplm", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "hash", "lme4", "lmerTest", "logging", "metagenomeSeq", "optparse", "pbapply", "pcaPP", "pheatmap", "pscl", "robustbase", "tibble", "vegan"]
-    },
-    "Macarron": {
-      "name": "Macarron",
-      "version": "1.8.1",
-      "sha256": "0v1sn04vkrxl0rj8mkq6ibmpsaavplm8hxl94kj4lp6ka81f4sqj",
-      "depends": ["BiocParallel", "DelayedArray", "Maaslin2", "RJSONIO", "SummarizedExperiment", "WGCNA", "data_table", "dynamicTreeCut", "ff", "httr", "logging", "plyr", "psych", "xml2"]
-    },
     "MantelCorr": {
       "name": "MantelCorr",
-      "version": "1.74.0",
-      "sha256": "0h1abssaf0c00lsqqm3l4bg0rdsjh3i8famn6hlrigaha62cry7k",
+      "version": "1.76.0",
+      "sha256": "0bwxwn3g2s8zyik1j8m0x47a7p3mzh9lb9a38afc6n01xcgsmx28",
       "depends": []
     },
     "MassArray": {
       "name": "MassArray",
-      "version": "1.56.0",
-      "sha256": "0xhq3gqx8h7ijfvji66zwrv6fl87mhdwc228nr3x82zh351gd229",
+      "version": "1.58.0",
+      "sha256": "0z8xp1xiq2nns5hakg5ixx785v3j4asqi2br7y4hbddqw5bnf590",
       "depends": []
     },
     "MassSpecWavelet": {
       "name": "MassSpecWavelet",
-      "version": "1.70.0",
-      "sha256": "0ckvnah0ck5z6calgrwk0k3y1nxpcyn41y84kz5bypzr77x6ssj2",
+      "version": "1.72.1",
+      "sha256": "0na7zqp2xblz4pjchsgwcabhci15pxnmnzlyr6yihlavf83b53cg",
       "depends": []
     },
     "MatrixGenerics": {
       "name": "MatrixGenerics",
-      "version": "1.16.0",
-      "sha256": "1r7n5p89460h47mnfh190184dbcmrbj0j5d7dswkfwh6ixan3zyc",
+      "version": "1.18.0",
+      "sha256": "132cd7qw3rqnv20raf0n1bnjvmkfckg928p80iflj576wxhwcndk",
       "depends": ["matrixStats"]
     },
     "MatrixQCvis": {
       "name": "MatrixQCvis",
-      "version": "1.12.0",
-      "sha256": "0hghmns8i1yhycr18yxp7b7knbdnf1f705z1pic1ql5llzsi8jzj",
-      "depends": ["ComplexHeatmap", "ExperimentHub", "Hmisc", "MASS", "Rtsne", "SummarizedExperiment", "UpSetR", "dplyr", "ggplot2", "htmlwidgets", "impute", "imputeLCMD", "limma", "pcaMethods", "plotly", "proDA", "rlang", "rmarkdown", "shiny", "shinydashboard", "shinyhelper", "shinyjs", "tibble", "tidyr", "umap", "vsn"]
+      "version": "1.14.0",
+      "sha256": "1im4gg1is7nhqf34zqbcn7w5y48anaphy6p5n82qgmn4j81rkmqc",
+      "depends": ["ComplexHeatmap", "DT", "ExperimentHub", "Hmisc", "MASS", "Rtsne", "SummarizedExperiment", "UpSetR", "dplyr", "ggplot2", "htmlwidgets", "impute", "imputeLCMD", "limma", "pcaMethods", "plotly", "proDA", "rlang", "rmarkdown", "shiny", "shinydashboard", "shinyhelper", "shinyjs", "sva", "tibble", "tidyr", "umap", "vsn"]
     },
     "MatrixRider": {
       "name": "MatrixRider",
-      "version": "1.36.0",
-      "sha256": "1v1y4z79kb5a9g8sr1mwzc5i9nf7prk07dnyn88048ddd5il2xgw",
+      "version": "1.38.0",
+      "sha256": "1lklc14jri0x8b3irm5rzs14ill6jdh3rs9230kmb38ylc38kpr5",
       "depends": ["Biostrings", "IRanges", "S4Vectors", "TFBSTools", "XVector"]
     },
     "MeSHDbi": {
       "name": "MeSHDbi",
-      "version": "1.40.0",
-      "sha256": "0d56i63gcl523715idlm6irspkz3p4xdca0brfys1f56pr55skmw",
+      "version": "1.42.0",
+      "sha256": "0bzkpzjvlgapxnlsvbqqxhcwbxp7g4a98lwr7nv5jdx05j10fpng",
       "depends": ["AnnotationDbi", "Biobase", "RSQLite"]
     },
     "MeasurementError_cor": {
       "name": "MeasurementError.cor",
-      "version": "1.76.0",
-      "sha256": "034n9dfk4a5k4z9g2f90a08rlgk7qgi4i6spp54azlw9gmx4amfs",
+      "version": "1.78.0",
+      "sha256": "0wfi9a52vazl7zzp5rc47yar1yvmgp917pcq51zmrnvz90wvv1z4",
       "depends": []
     },
     "Melissa": {
       "name": "Melissa",
-      "version": "1.20.0",
-      "sha256": "0aswg1balk65rsnxnsdn65x5l5g1dya7z2n8yqr7agzigdw62pdf",
+      "version": "1.22.0",
+      "sha256": "1jn8x6qch151h3iwx6w76ab8n7l9qnq4ccvf43bcsyy461ymr4n1",
       "depends": ["BPRMeth", "BiocStyle", "GenomicRanges", "MCMCpack", "ROCR", "assertthat", "cowplot", "data_table", "doParallel", "foreach", "ggplot2", "magrittr", "matrixcalc", "mclust", "mvtnorm", "truncnorm"]
     },
     "Mergeomics": {
       "name": "Mergeomics",
-      "version": "1.32.0",
-      "sha256": "0n5mdnvqqixrrwn1ph89vah81l2afd7wsbsnh5mnhgmm50pjcg1b",
+      "version": "1.34.0",
+      "sha256": "0sg5wf2gm6sq9051mjsvlhnbbjbardypvw2nbn1wskdmkajy7afk",
       "depends": []
     },
     "MesKit": {
       "name": "MesKit",
-      "version": "1.14.0",
-      "sha256": "0r6a200zyp97vjdk78fch5xmvqbqjmhf9n7cc9y911ifll7md35a",
+      "version": "1.16.0",
+      "sha256": "1risccm9r8zlfx3zpzfmwhnarjc9903nmfd3bp9i2xp8iqxpws3r",
       "depends": ["AnnotationDbi", "Biostrings", "ComplexHeatmap", "IRanges", "RColorBrewer", "S4Vectors", "ape", "circlize", "cowplot", "data_table", "dplyr", "ggplot2", "ggrepel", "ggridges", "mclust", "phangorn", "pracma", "tidyr"]
     },
     "MetCirc": {
       "name": "MetCirc",
-      "version": "1.34.0",
-      "sha256": "1wkmhlxg3gxfxskhhxrm65y6vriggs34523adrsghx1ra0wgyjvf",
+      "version": "1.36.0",
+      "sha256": "1zgn54ssxmn7k2bdvw02wwsj6bddfyzngk3zanmmjmmfm3il28yy",
       "depends": ["MsCoreUtils", "S4Vectors", "Spectra", "amap", "circlize", "ggplot2", "scales", "shiny"]
     },
     "MetID": {
       "name": "MetID",
-      "version": "1.22.0",
-      "sha256": "0i6jpn1q0632klpa6817v9xs2kkdvsajhjv6h1p2f6jdx0smsd64",
+      "version": "1.24.0",
+      "sha256": "08ixkzhyqqkridjbms4x9f4ljmxbqidnb6habic24yjjb2qk1r8w",
       "depends": ["ChemmineR", "Matrix", "devtools", "igraph", "stringr"]
     },
+    "MetMashR": {
+      "name": "MetMashR",
+      "version": "1.0.0",
+      "sha256": "1dj9x41ar7y8a7iyljwpi3a9gx46xgjzds6axih5cfimiq967d0k",
+      "depends": ["cowplot", "dplyr", "ggplot2", "ggthemes", "httr", "rlang", "scales", "struct"]
+    },
     "MetNet": {
       "name": "MetNet",
-      "version": "1.22.0",
-      "sha256": "1dpp9z9h3dkbx9k0hxg5dr9178sbs095kyr2ka5sihxm2in0prrg",
+      "version": "1.24.0",
+      "sha256": "0dga9gqqy5qg4y6xpsq8x9391h04x6ipyniji27br5dz0qqgwff5",
       "depends": ["BiocParallel", "GENIE3", "GeneNet", "S4Vectors", "SummarizedExperiment", "bnlearn", "corpcor", "dplyr", "ggplot2", "parmigene", "psych", "rlang", "stabs", "tibble", "tidyr"]
     },
     "MetaCyto": {
       "name": "MetaCyto",
-      "version": "1.26.0",
-      "sha256": "15yd35ql64ca9ixv6rcq9v6gaaxis9nzx4q2jdij3facrb2ryyfk",
+      "version": "1.28.0",
+      "sha256": "02nwni5z5gkcgfk5fnhkyjq9qpyirvz00jq251g6b2qbx8hn28i9",
       "depends": ["FlowSOM", "cluster", "fastcluster", "flowCore", "ggplot2", "metafor", "tidyr"]
     },
     "MetaNeighbor": {
       "name": "MetaNeighbor",
-      "version": "1.24.0",
-      "sha256": "0sz15njb0y9vcmbv89k3x2sw4px8nmy3qhqkvyl69kxlcqdicgxi",
+      "version": "1.26.0",
+      "sha256": "1pmnxkf893zhvxyyihc10xfn18y742v82mxj538r6q3x08wp9gj8",
       "depends": ["Matrix", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "beanplot", "dplyr", "ggplot2", "gplots", "igraph", "matrixStats", "tibble", "tidyr"]
     },
     "MetaPhOR": {
       "name": "MetaPhOR",
-      "version": "1.6.0",
-      "sha256": "0r3zqb7rmw5fnwm6hkpy22gndpn4jd24471acqfsi3a894g0868p",
+      "version": "1.8.0",
+      "sha256": "0jj9c4d2qdbz193gad89cay1h2hl0hbj70m1kakriw1117hnhzk6",
       "depends": ["RCy3", "RecordLinkage", "clusterProfiler", "ggplot2", "ggrepel", "pheatmap", "stringr"]
     },
     "MetaboAnnotation": {
       "name": "MetaboAnnotation",
-      "version": "1.8.1",
-      "sha256": "0lsrhyyqsdz27mc6vl0aj78bdj3xh5i3h3dsg9smkhg2m22h3sdf",
+      "version": "1.10.1",
+      "sha256": "0qzhl68viam5h1f3ky21m7092fwvfr7bjkzsbbfskn259pj9g5bc",
       "depends": ["AnnotationHub", "BiocGenerics", "BiocParallel", "CompoundDb", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "QFeatures", "S4Vectors", "Spectra", "SummarizedExperiment"]
     },
     "MetaboCoreUtils": {
       "name": "MetaboCoreUtils",
-      "version": "1.12.0",
-      "sha256": "1y5lq1x60pcvxsl8dim5plzd3y4bqjkcam5hv9614xw0sr4h0r04",
+      "version": "1.14.0",
+      "sha256": "0gwghyc59cjp9arrwzm9j643a1nkl14mmcmadw55x7i9gyxvdils",
       "depends": ["BiocParallel", "MsCoreUtils"]
     },
     "MetaboSignal": {
       "name": "MetaboSignal",
-      "version": "1.34.0",
-      "sha256": "0ldi6qs0hfnwlpvwc0v0yn3j6gms4kgays8f5fap8vj8nw2gljbj",
+      "version": "1.36.0",
+      "sha256": "1wgqyc2vjs7xakv03k0sgsqdnbwi08aqcf6f1qj50vcn72klf0vf",
       "depends": ["AnnotationDbi", "EnsDb_Hsapiens_v75", "KEGGREST", "KEGGgraph", "MWASTools", "RCurl", "biomaRt", "hpar", "igraph", "mygene", "org_Hs_eg_db"]
     },
     "MethPed": {
       "name": "MethPed",
-      "version": "1.32.0",
-      "sha256": "13hwdxvmczzr77572pws58590lk09z6sda8144qxlljy4y5ii7zw",
+      "version": "1.34.0",
+      "sha256": "0bc5928i1jh9asn575gmqiykassilah94p78spfpr61yyzwgsw0f",
       "depends": ["Biobase", "randomForest"]
     },
-    "MethReg": {
-      "name": "MethReg",
-      "version": "1.14.0",
-      "sha256": "1fzbrp09d57s2zvxl7jsc8dqwchz43xl0vnxkj2r0q0knlpsbbr2",
-      "depends": ["AnnotationHub", "DelayedArray", "ExperimentHub", "GenomicRanges", "IRanges", "JASPAR2024", "MASS", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment", "TFBSTools", "dplyr", "ggplot2", "ggpubr", "openxlsx", "plyr", "progress", "pscl", "readr", "rlang", "sesame", "sesameData", "sfsmisc", "stringr", "tibble", "tidyr"]
-    },
     "MethTargetedNGS": {
       "name": "MethTargetedNGS",
-      "version": "1.36.0",
-      "sha256": "15bw9bxg99bfmwgfi45qgrp5dk15k44i0s6jp34kwnxkp18010ab",
+      "version": "1.38.0",
+      "sha256": "0kj0ib0p9jql74d5jp0vyjs8cip728lac403pr93z0nbdlngmjyv",
       "depends": ["Biostrings", "gplots", "pwalign", "seqinr", "stringr"]
     },
     "MethylAid": {
       "name": "MethylAid",
-      "version": "1.38.0",
-      "sha256": "084mnllaj6qp5ai5bmj6wgc90bs270qbzl60sch1f863x8fv9lzr",
+      "version": "1.40.0",
+      "sha256": "0iq4ba4hsf7zwb063gqf00al031lydpg0yhlxwx8aczmyly00a9q",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "RColorBrewer", "SummarizedExperiment", "ggplot2", "gridBase", "hexbin", "matrixStats", "minfi", "shiny"]
     },
     "MethylMix": {
       "name": "MethylMix",
-      "version": "2.34.0",
-      "sha256": "1mdhqqlbkh24bqz0bxvzih2cnl38nyacrfhsz8mq8ky2j5rsrbg0",
+      "version": "2.36.0",
+      "sha256": "0hkdn4930ic7cx16fixgi5bilv7plz910nv1skpjh2qi7xr95cnw",
       "depends": ["RColorBrewer", "RCurl", "RPMM", "R_matlab", "data_table", "digest", "foreach", "ggplot2", "impute", "limma"]
     },
     "MethylSeekR": {
       "name": "MethylSeekR",
-      "version": "1.44.0",
-      "sha256": "10b3m0d5z426p74x4hjg4imqg8iic0xjjnjcllwphy0ylk3cpzd5",
+      "version": "1.46.0",
+      "sha256": "0lsm8ic5g0pbdlm0b7yldrzdpj4mx41cjsbssp35k9xywq2bvs2r",
       "depends": ["BSgenome", "GenomicRanges", "IRanges", "geneplotter", "mhsmm", "rtracklayer"]
     },
     "Mfuzz": {
       "name": "Mfuzz",
-      "version": "2.64.0",
-      "sha256": "00sx63bg5qw22vw0yw3syhyl5ffjrqvf81b9ksgw2p0z3yiiss5h",
+      "version": "2.66.0",
+      "sha256": "1217hd20byymrldzydp3r9qmvssznzy1yggdsdm1hbcvrvrxmd4s",
       "depends": ["Biobase", "e1071", "tkWidgets"]
     },
     "MiChip": {
       "name": "MiChip",
-      "version": "1.58.0",
-      "sha256": "0mmb63h29l6xhwwxxlnz6a0p04wsxlskagih11rwmwnwm0blv68k",
+      "version": "1.60.0",
+      "sha256": "0xy1by5famnxbznplpma4bvp8fkn6a4fq4jj2359q8198vxrr4af",
       "depends": ["Biobase"]
     },
     "MiPP": {
       "name": "MiPP",
-      "version": "1.76.0",
-      "sha256": "12wk4kk7qbba3681ikldivs3np9qvvl0mivqds0dd6l52v1ngj9p",
+      "version": "1.78.0",
+      "sha256": "1r6cz4nz7xsmr1cylnsxzx0qdpmj3jzqlaypj33qfaz8vcpnaakj",
       "depends": ["Biobase", "MASS", "e1071"]
     },
     "MiRaGE": {
       "name": "MiRaGE",
-      "version": "1.46.0",
-      "sha256": "17c3rrq9h2mlhqjcjiyzg88d1giks9iq2vdlsvv6fg9cl4wqpvg1",
+      "version": "1.48.0",
+      "sha256": "00byplqc0bfgl4d0597z0as4p5k56xnxvydkvxx90gng6ikgl71m",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "S4Vectors"]
     },
     "MicrobiomeProfiler": {
       "name": "MicrobiomeProfiler",
-      "version": "1.10.0",
-      "sha256": "1xz2s2alz61s5hp5fq42m5n3bby89lyp5mr7pgav8xkyiglk471f",
-      "depends": ["DT", "clusterProfiler", "config", "enrichplot", "ggplot2", "golem", "gson", "htmltools", "magrittr", "shiny", "shinyWidgets", "shinycustomloader"]
+      "version": "1.12.0",
+      "sha256": "0ibs1m9lhp59wxr75n8w9q313kk2aggcnch6xx7kp5ljmxmpsrmd",
+      "depends": ["DT", "clusterProfiler", "config", "enrichplot", "ggplot2", "golem", "gson", "htmltools", "magrittr", "shiny", "shinyWidgets", "shinycustomloader", "yulab_utils"]
     },
     "MicrobiotaProcess": {
       "name": "MicrobiotaProcess",
-      "version": "1.16.1",
-      "sha256": "1x0yjxzdri6x1yin0d54r9wx48y3x2vy79wnkg37i070ira5hddw",
+      "version": "1.18.0",
+      "sha256": "0k12q5m8z6xfgnadkj4ckqgqai56i4wzz8gz1cd4yfqv8hcfdwwm",
       "depends": ["Biostrings", "MASS", "SummarizedExperiment", "ape", "cli", "coin", "data_table", "dplyr", "dtplyr", "foreach", "ggfun", "ggplot2", "ggrepel", "ggsignif", "ggstar", "ggtree", "ggtreeExtra", "magrittr", "patchwork", "pillar", "plyr", "rlang", "tibble", "tidyr", "tidyselect", "tidytree", "treeio", "vegan", "zoo"]
     },
     "MineICA": {
       "name": "MineICA",
-      "version": "1.44.0",
-      "sha256": "1qzqfnrf23lrlxmds8hjblj169sylq1m9h07vwlz5zik5mxj6y90",
+      "version": "1.46.0",
+      "sha256": "0piyklqddp5wqqv7yx47195827w61x9p0gzdyxlg6a322iv42sn7",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GOstats", "Hmisc", "JADE", "RColorBrewer", "Rgraphviz", "annotate", "biomaRt", "cluster", "colorspace", "fastICA", "foreach", "fpc", "ggplot2", "graph", "gtools", "igraph", "lumi", "lumiHumanAll_db", "marray", "mclust", "plyr", "scales", "xtable"]
     },
     "MinimumDistance": {
       "name": "MinimumDistance",
-      "version": "1.48.0",
-      "sha256": "1pqf2q5hxjb1dwg981aldl0sw10f86yszp6z511vzx1y70ca6j3h",
+      "version": "1.50.0",
+      "sha256": "0c80yrqg1l2iyfm50rhczbnlvy77psd4mzrx16xhyd65slb6mj2v",
       "depends": ["Biobase", "BiocGenerics", "DNAcopy", "GenomeInfoDb", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SummarizedExperiment", "VanillaICE", "data_table", "ff", "foreach", "lattice", "matrixStats", "oligoClasses"]
     },
     "ModCon": {
       "name": "ModCon",
-      "version": "1.12.0",
-      "sha256": "06v2ka7rhiqnjdgb7ky6ps2b90j29y1yqsvkk24a6nsd2q8gpkil",
+      "version": "1.14.0",
+      "sha256": "1iq1b68cz9fkwba0nbm464n7x9zzi90vvcskm95rinmm4mbzif7f",
       "depends": ["data_table"]
     },
     "Modstrings": {
       "name": "Modstrings",
-      "version": "1.20.0",
-      "sha256": "0yc8gsgxlww2g9z1m6jl02aqmama10fkr2mvibvdi01s5pqwdbky",
+      "version": "1.22.0",
+      "sha256": "1jffh3ril1lwggfva8k319mang0i75xrk6fkp0xk6kp1979qpyxz",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "XVector", "crayon", "stringi", "stringr"]
     },
     "MoleculeExperiment": {
       "name": "MoleculeExperiment",
-      "version": "1.4.1",
-      "sha256": "0w539058lm99z53lkjf9ljk1dr4fp150a9cwa9s9xrax90wpmy6j",
+      "version": "1.6.0",
+      "sha256": "07xys5p57k91mfxh1a2wcy5lj1c7v6k0wniqnk6v0sj8fmvkrf6z",
       "depends": ["BiocParallel", "EBImage", "Matrix", "S4Vectors", "SpatialExperiment", "cli", "data_table", "dplyr", "ggplot2", "magrittr", "purrr", "rhdf5", "rjson", "rlang", "terra"]
     },
     "Moonlight2R": {
       "name": "Moonlight2R",
-      "version": "1.2.0",
-      "sha256": "0ff37hjp3llf875z4wym60vanda6gbysqmcp90dcbl33bx0fynja",
+      "version": "1.4.0",
+      "sha256": "01na4bl43h0hxwhajsaaqzjr7hqxcf7rxix8xkm6mlwq987k1n47",
       "depends": ["AnnotationHub", "Biobase", "BiocGenerics", "ComplexHeatmap", "DOSE", "EpiMix", "ExperimentHub", "GEOquery", "GenomicRanges", "HiveR", "RColorBrewer", "RISmed", "circlize", "clusterProfiler", "doParallel", "dplyr", "easyPubMed", "foreach", "fuzzyjoin", "ggplot2", "gplots", "magrittr", "org_Hs_eg_db", "parmigene", "purrr", "qpdf", "randomForest", "readr", "rtracklayer", "seqminer", "stringr", "tibble", "tidyHeatmap", "tidyr"]
     },
     "MoonlightR": {
       "name": "MoonlightR",
-      "version": "1.30.0",
-      "sha256": "0jhc7y01qrz3cg2jnjqwgi5cgrh6616q9k3f3hldkq0x6z0z1vwn",
+      "version": "1.32.0",
+      "sha256": "1rva7ggqb2n303lc9kz3a94qxjxjcp2g597lb2zaqwwnclc2i2y9",
       "depends": ["Biobase", "DOSE", "GEOquery", "HiveR", "RColorBrewer", "RISmed", "SummarizedExperiment", "TCGAbiolinks", "circlize", "clusterProfiler", "doParallel", "foreach", "gplots", "limma", "parmigene", "randomForest"]
     },
     "Motif2Site": {
       "name": "Motif2Site",
-      "version": "1.8.0",
-      "sha256": "03rjhrxi016q0k7dzbfwr192sgc6z5kjyqdd6qzdajkpgq6dpi2m",
+      "version": "1.10.0",
+      "sha256": "1c88m338j6gh2lvdpx3n2s2sx42qka5j6bxdhh46dcbgb09f6kf4",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "edgeR", "mixtools"]
     },
     "MotifDb": {
       "name": "MotifDb",
-      "version": "1.46.0",
-      "sha256": "1m8y76gg80625xz9g9101mfq19glk37p792yzz46807f7g6m8zbh",
+      "version": "1.48.0",
+      "sha256": "0bgq927ch7b79sypr5fxgw6d2y5q0srny2k2ysxsyhcbagpl42b8",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer", "splitstackshape"]
     },
     "MouseFM": {
       "name": "MouseFM",
-      "version": "1.14.0",
-      "sha256": "0vwccf4fj664vbl0ggps51rac42j7xs5m33szhwdqpik6p2hyz7j",
+      "version": "1.16.0",
+      "sha256": "1i2rrd51757pdggx1ffv3rnv2d1z142ys4fbxl3vciy5i3rmgh4g",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "biomaRt", "curl", "data_table", "dplyr", "ggplot2", "gtools", "httr", "jsonlite", "reshape2", "rlist", "scales", "tidyr"]
     },
     "MsBackendMassbank": {
       "name": "MsBackendMassbank",
-      "version": "1.12.0",
-      "sha256": "0sj378b6jphfamr3850k8f5f22mr50i9r1d94jz2js7y1az10rim",
+      "version": "1.14.0",
+      "sha256": "001xnr19pg38g5cm4jxqbrwv135lyzhrhfdkbfwmq89imcw8inm4",
       "depends": ["BiocParallel", "DBI", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra"]
     },
+    "MsBackendMetaboLights": {
+      "name": "MsBackendMetaboLights",
+      "version": "1.0.0",
+      "sha256": "03np0c0b8hhv8axzcnxf3pxlbjvcxar7wyfj2jayrg8lzssv9q1n",
+      "depends": ["BiocFileCache", "ProtGenerics", "S4Vectors", "Spectra", "curl"]
+    },
     "MsBackendMgf": {
       "name": "MsBackendMgf",
-      "version": "1.12.0",
-      "sha256": "1rphxis1jxd6295sab0lyx96h3rflwmrz5x1iqzn6pfyzgcr67rz",
+      "version": "1.14.0",
+      "sha256": "0hr70d8kc27xfgvad23fyfkfh5mvld8z2xw8b2165b9f6gbwkrsi",
       "depends": ["BiocParallel", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra"]
     },
     "MsBackendMsp": {
       "name": "MsBackendMsp",
-      "version": "1.8.0",
-      "sha256": "1y80r12xsiw678mkjq5x9j9yp4l36w1hv9qxlac6bbhsp4kpbwi4",
+      "version": "1.10.0",
+      "sha256": "0d6v4i55k34hnvv71lb1s4yj13ssfjwlkpwk27xxwzpm5i6n4frd",
       "depends": ["BiocParallel", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra"]
     },
     "MsBackendRawFileReader": {
       "name": "MsBackendRawFileReader",
-      "version": "1.10.0",
-      "sha256": "17xnbhnvz28ksfw51aba9p9wl5q0y7wl88yxsdhjwc58f3h8a1rn",
+      "version": "1.12.0",
+      "sha256": "06j1m0amjksxr52j46bmyiakj208jn8c1alf1k3xgsnacm5mrd94",
       "depends": ["BiocParallel", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra", "rawrr"]
     },
     "MsBackendSql": {
       "name": "MsBackendSql",
-      "version": "1.4.0",
-      "sha256": "1ng4ns03a8lbb63rczcl1j9c780vqnhc3plj5v3602xmnrxpadrl",
+      "version": "1.6.0",
+      "sha256": "0hs4nh3bij5jzscdjjfkq2agcpysyy7ziv40713z7p7ai6wkppyj",
       "depends": ["BiocGenerics", "BiocParallel", "DBI", "IRanges", "MsCoreUtils", "ProtGenerics", "S4Vectors", "Spectra", "data_table", "progress"]
     },
     "MsCoreUtils": {
       "name": "MsCoreUtils",
-      "version": "1.16.1",
-      "sha256": "1fjc0drsdkl9cyrq5k2kskb70x63mazbhpmlk9q7v77769v64gxb",
+      "version": "1.18.0",
+      "sha256": "0d1n5mib93rw4x4iimz7scgxw1929m7g3cnbyfrj6iqxrp721an1",
       "depends": ["MASS", "Rcpp", "S4Vectors", "clue"]
     },
     "MsDataHub": {
       "name": "MsDataHub",
-      "version": "1.4.0",
-      "sha256": "1kxcf7pz8vfidzjqb0czc9znml5nj4bqrbiwrx2j13igrf5v6jnh",
+      "version": "1.6.0",
+      "sha256": "0cs37d0ba56mcig9gydx37gbgqfsqdgnawkcw18i06cladghprmw",
       "depends": ["ExperimentHub"]
     },
     "MsExperiment": {
       "name": "MsExperiment",
-      "version": "1.6.0",
-      "sha256": "0dxv3jw5aj1i73vqrp3c031pj26i7rp0q2zs4nq3x1vni349506d",
+      "version": "1.8.0",
+      "sha256": "15vxwvgimliyzj0rb06s7rpm3wrz3gc1n0wdgs0jd4flwp152g9h",
       "depends": ["BiocGenerics", "DBI", "IRanges", "ProtGenerics", "QFeatures", "S4Vectors", "Spectra", "SummarizedExperiment"]
     },
     "MsFeatures": {
       "name": "MsFeatures",
-      "version": "1.12.0",
-      "sha256": "1prn45vlacj69388psimy0w05a84y8sdry6678pz611sd0ks1gka",
+      "version": "1.14.0",
+      "sha256": "15bligvlwhdrzmw842a4kgnzciibh8ab3aw7m73l6zaqdn4isl02",
       "depends": ["MsCoreUtils", "ProtGenerics", "SummarizedExperiment"]
     },
     "MsQuality": {
       "name": "MsQuality",
-      "version": "1.4.0",
-      "sha256": "1khpjzzrrd2b7ngwq43y3sgndmrr6l8f504lyakr46xr1vyzppsl",
+      "version": "1.6.0",
+      "sha256": "02n8dg9pcb99m35l00s3izj1ypmdr5j1gm89z7bhcamlpfb7qq8b",
       "depends": ["BiocParallel", "MsExperiment", "ProtGenerics", "Spectra", "ggplot2", "htmlwidgets", "msdata", "plotly", "rlang", "rmzqc", "shiny", "shinydashboard", "stringr", "tibble", "tidyr"]
     },
     "MuData": {
       "name": "MuData",
-      "version": "1.8.0",
-      "sha256": "0kjin6cfw9aipghd0imi2play19czplwcz2gi5akv6gk9wy98k8x",
+      "version": "1.10.0",
+      "sha256": "0pppxgmplp7qf6flhzf27i58xajglcbhxabbf1y3bs60fsgbyw43",
       "depends": ["DelayedArray", "Matrix", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "rhdf5"]
     },
     "Mulcom": {
       "name": "Mulcom",
-      "version": "1.54.0",
-      "sha256": "1sb6g08k1wlnjiiw9a7hm34izbnh8ar1mh6vxc0jzkwk6522nva2",
+      "version": "1.56.0",
+      "sha256": "1cnzwyn7rsjj1l2fia9mh0gljpqd2fyq6bwxzdjii5apm21sswyp",
       "depends": ["Biobase", "fields"]
     },
     "MultiAssayExperiment": {
       "name": "MultiAssayExperiment",
-      "version": "1.30.3",
-      "sha256": "0spws2kawf5rqhp5h5wi46sa07c2yhhnjhdxpmxz8gkvqsvdjqkp",
+      "version": "1.32.0",
+      "sha256": "1lsnw4w0ln4596vwd4a69nnhmnf7z05brpisripjisjrgr374sgy",
       "depends": ["Biobase", "BiocBaseUtils", "BiocGenerics", "DelayedArray", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "tidyr"]
     },
     "MultiBaC": {
       "name": "MultiBaC",
-      "version": "1.14.0",
-      "sha256": "0m08620sii9181y0vlcrw9nbcnp4vnjjxvp96iqlgg5fsb23wbl7",
+      "version": "1.16.0",
+      "sha256": "0bg9jgkrb16g6xxvw1acqc0ydwljwk1zvx3zh597893jifsx0b45",
       "depends": ["Matrix", "MultiAssayExperiment", "ggplot2", "pcaMethods", "plotrix", "ropls"]
     },
     "MultiDataSet": {
       "name": "MultiDataSet",
-      "version": "1.32.0",
-      "sha256": "1y1j5svi52cvixjsn13122kvd0z0c7zfki3p6rr8wjd5w7riiyqw",
+      "version": "1.34.0",
+      "sha256": "048wnzw5qkfr0fhcz0i031zxz7xkvwyc451a1xbllkqpb9jsvi50",
       "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "ggplot2", "ggrepel", "limma", "qqman"]
     },
     "MultiMed": {
       "name": "MultiMed",
-      "version": "2.26.0",
-      "sha256": "03qcqzkh5jiy46613g29bs7dipgzzparwdcllw1lwssh4y8fvwc0",
+      "version": "2.28.0",
+      "sha256": "1cfgv405ywrdlaa421707z0k5yn0iair4nzgg0ykxnbapszwqlmz",
       "depends": []
     },
     "MultiRNAflow": {
       "name": "MultiRNAflow",
-      "version": "1.2.0",
-      "sha256": "0i7zs0gd8p927zcdsx85wdk3wi4ywg4s4y3ichqqidqs01hdxccd",
+      "version": "1.4.0",
+      "sha256": "12y734m5dnyyh1c8pdnh6v1xkjg0vm3c6c6zckgwl3rvwriq84ky",
       "depends": ["Biobase", "ComplexHeatmap", "DESeq2", "FactoMineR", "Mfuzz", "S4Vectors", "SummarizedExperiment", "UpSetR", "factoextra", "ggalluvial", "ggplot2", "ggplotify", "ggrepel", "gprofiler2", "plot3D", "plot3Drgl", "reshape2"]
     },
     "MultimodalExperiment": {
       "name": "MultimodalExperiment",
-      "version": "1.4.0",
-      "sha256": "0zik59sh26ycbsagcvwzhb9g4aqvkbygigpzy8d9i0gss0rvvljp",
+      "version": "1.6.0",
+      "sha256": "0a8ibx3xphay9lzg4g4f7pal805kd2mcsj8gxwfjxhvvdbdqz6cj",
       "depends": ["BiocGenerics", "IRanges", "MultiAssayExperiment", "S4Vectors"]
     },
     "MungeSumstats": {
       "name": "MungeSumstats",
-      "version": "1.12.2",
-      "sha256": "0qgcvdhb3z1380jfb3wl81kq9lgm90s6hnbkbrv3psn3bsgs78mi",
+      "version": "1.14.1",
+      "sha256": "1clkpvvwwxdb8c6xrxqc6bpz6q3r2vi7igq2yd5l5q93nlcnhff6",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RCurl", "R_utils", "VariantAnnotation", "data_table", "dplyr", "googleAuthR", "httr", "jsonlite", "magrittr", "rtracklayer", "stringr"]
     },
     "MutationalPatterns": {
       "name": "MutationalPatterns",
-      "version": "3.14.0",
-      "sha256": "0smf4l023ckwsm5ckrqqw7kjyi1awp378mzhab7v8nk9n5smsj61",
+      "version": "3.16.0",
+      "sha256": "16a5g9l025pj7xrl3g78nkqyrcnldj8y2025ibvsfg0921zyqiyp",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "RColorBrewer", "S4Vectors", "VariantAnnotation", "cowplot", "dplyr", "ggalluvial", "ggdendro", "ggplot2", "magrittr", "pracma", "purrr", "stringr", "tibble", "tidyr"]
     },
     "NADfinder": {
       "name": "NADfinder",
-      "version": "1.28.0",
-      "sha256": "18bq7jf7f89263s4f4ib3qzlpwxsp181zjjm0cblkhjs7lw8p2zh",
+      "version": "1.30.0",
+      "sha256": "1vn1q0jks8d30mg9icn8s71ax9ixk2n2jxmsgprimvd9qrpwg7hj",
       "depends": ["ATACseqQC", "BiocGenerics", "EmpiricalBrownsMethod", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "baseline", "corrplot", "csaw", "limma", "metap", "rtracklayer", "signal", "trackViewer"]
     },
     "NBAMSeq": {
       "name": "NBAMSeq",
-      "version": "1.20.0",
-      "sha256": "1iglbxv7wcgn7lwah8jd1q7gsrqjr3874nivl1msla35hkqw4v9a",
+      "version": "1.22.0",
+      "sha256": "0cd3vmkprf4klkg5m0ak0mmdhbvy6rgvi96rn8r2s1jp6chdvcxp",
       "depends": ["BiocParallel", "DESeq2", "S4Vectors", "SummarizedExperiment", "genefilter", "mgcv"]
     },
     "NCIgraph": {
       "name": "NCIgraph",
-      "version": "1.52.0",
-      "sha256": "16kkg568hdjsn4jq9hd9gl1n31wavshn79bpwhg5jxci288zgai0",
+      "version": "1.54.0",
+      "sha256": "1bh1bpsb9fgnbyrfpi9n54ffxf513dqdr9w1i7xfnbkpv1q1zkmn",
       "depends": ["KEGGgraph", "RBGL", "RCy3", "R_oo", "graph"]
     },
     "NOISeq": {
       "name": "NOISeq",
-      "version": "2.48.0",
-      "sha256": "1aph4phg58f4kpgavrxnn6dzh3lgms8sbjvip4f3gn8xs0p01mbz",
+      "version": "2.50.0",
+      "sha256": "0398hvwqr7cal7xnxbpv2dcbg3j5xhkv6n54h0niswrvd1d68fzy",
       "depends": ["Biobase", "Matrix"]
     },
     "NPARC": {
       "name": "NPARC",
-      "version": "1.16.0",
-      "sha256": "0giq5nxqnsqppz12adln7kvdb8lifch57wg6avdl88xrdzpl3vfw",
+      "version": "1.18.0",
+      "sha256": "1fic3ss8vnvz0gf8xfv0x995c0pw1s6qij3x3jyhwp0f4gn3h9mb",
       "depends": ["BiocParallel", "MASS", "broom", "dplyr", "magrittr", "rlang", "tidyr"]
     },
     "NTW": {
       "name": "NTW",
-      "version": "1.54.0",
-      "sha256": "1knkqrs3rlhl9qvp6670hc7qhgyi6pmcs47xcivpn2jk6ss00xhk",
+      "version": "1.56.0",
+      "sha256": "044ampz8mwvs5kqfy97pz8f50d39ssjmgr5j5s7lyijr4y4dkvlx",
       "depends": ["mvtnorm"]
     },
     "NanoMethViz": {
       "name": "NanoMethViz",
-      "version": "3.0.2",
-      "sha256": "0nlbkikmxdq08m24sch8cy10m63v33536p5rx1zy5c4f4pa86yrw",
-      "depends": ["AnnotationDbi", "BiocSingular", "Biostrings", "GenomicRanges", "IRanges", "R_utils", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "assertthat", "bsseq", "cli", "cpp11", "data_table", "dbscan", "dplyr", "e1071", "forcats", "fs", "ggplot2", "ggrastr", "glue", "limma", "patchwork", "purrr", "readr", "rlang", "scales", "scico", "stringr", "tibble", "tidyr", "withr", "zlibbioc"]
+      "version": "3.2.0",
+      "sha256": "17k55c7cr07ixnkas402jphjga5ixywmpiyd7bk8y6d5r5llxmgy",
+      "depends": ["AnnotationDbi", "BiocSingular", "Biostrings", "GenomicRanges", "IRanges", "R_utils", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "assertthat", "bsseq", "cli", "cpp11", "dbscan", "dplyr", "e1071", "forcats", "fs", "ggplot2", "ggrastr", "glue", "limma", "patchwork", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "withr", "zlibbioc"]
     },
     "NanoStringDiff": {
       "name": "NanoStringDiff",
-      "version": "1.34.0",
-      "sha256": "0rasmzc12xl6mh9l2989wgp9q30665iqqgxr1fy6r57j7hixwbc1",
+      "version": "1.36.0",
+      "sha256": "12nags3h5261k4qhr8lclyyjbk4ai3hmw9wixpf3pp4qfjqcrmrq",
       "depends": ["Biobase", "Rcpp", "matrixStats"]
     },
     "NanoStringNCTools": {
       "name": "NanoStringNCTools",
-      "version": "1.12.0",
-      "sha256": "1n1zc99v5xzd89q512v24wa7gmbgdp8g9aixvh6cjismah0vpgjr",
+      "version": "1.14.0",
+      "sha256": "0yxp14jyw9xmnji1wc377hq3wnw4jrkcjwp1rqbfa75bnqcpfivk",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "RColorBrewer", "S4Vectors", "ggbeeswarm", "ggiraph", "ggplot2", "ggthemes", "pheatmap"]
     },
     "NanoTube": {
       "name": "NanoTube",
-      "version": "1.10.0",
-      "sha256": "1i5fs2lkqmyl0hb1s6f56z3wmwhmvw2mkygl3ibn0qwfh460l4f1",
+      "version": "1.12.0",
+      "sha256": "0phdjxvikia3bx6l8v9b1r85kclrc5zi6s0jrsg2dvpdyhcyjwn0",
       "depends": ["Biobase", "fgsea", "ggplot2", "limma", "reshape"]
     },
     "Nebulosa": {
       "name": "Nebulosa",
-      "version": "1.14.0",
-      "sha256": "0m5z6rribsrk9mzcksjh0nmpf4d0x0hn8jd80h0hj0hj8sj1ifgv",
+      "version": "1.16.0",
+      "sha256": "15bdddc34y6i1j06fpi82p8xz07p4q07p2js657gssh4lwxkz5n1",
       "depends": ["Matrix", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggrastr", "ks", "patchwork"]
     },
     "NetActivity": {
       "name": "NetActivity",
-      "version": "1.6.0",
-      "sha256": "0hssxa9i5c090929mnjs7nqn56fmg7qhq0iknfrl9d0wvpibm3bh",
+      "version": "1.8.0",
+      "sha256": "0m0256dsfkbx5b7qba04dywyphpqlw7zyciyddx48wzmxkasrabd",
       "depends": ["DESeq2", "DelayedArray", "DelayedMatrixStats", "NetActivityData", "SummarizedExperiment", "airway"]
     },
     "NetPathMiner": {
       "name": "NetPathMiner",
-      "version": "1.40.0",
-      "sha256": "1fv4ijiksp2ff5sxjgp1bfzxfcqr853nrsdgfn0i8zqz9ba20a6p",
+      "version": "1.42.0",
+      "sha256": "0dh2wp4ljg5vw13cg8h4hdvhd6n5sj50xjj04h7zpp96a2rjcr1i",
       "depends": ["igraph"]
     },
     "NetSAM": {
       "name": "NetSAM",
-      "version": "1.44.0",
-      "sha256": "07l5cgl72mkh3j96lciwalsb0ps0bs7rfxzm78m5279palawf6vb",
+      "version": "1.46.0",
+      "sha256": "15c4z3fpk9kwqslkrds9jk8mf7gl618smi53dwgfbg3gi7vysgmp",
       "depends": ["AnnotationDbi", "DBI", "GO_db", "R2HTML", "WGCNA", "biomaRt", "doParallel", "foreach", "igraph", "seriation", "survival"]
     },
-    "NeuCA": {
-      "name": "NeuCA",
-      "version": "1.10.0",
-      "sha256": "0k5bqdrja3x238fyrd7dm5jm94igh25b0ipb2zj6scpa4m15n67l",
-      "depends": ["SingleCellExperiment", "e1071", "kableExtra", "keras", "limma"]
-    },
     "NewWave": {
       "name": "NewWave",
-      "version": "1.14.0",
-      "sha256": "03m6dd0p2d542k36jwvz9ik8cddw1q3dz9ghqy0w1dbf685r0kf0",
+      "version": "1.16.0",
+      "sha256": "14iwsgcl9pfljb0zvsfmm7wr38zrcvd5i9vpx4aira7b2l9c18rc",
       "depends": ["BiocSingular", "DelayedArray", "Matrix", "SharedObject", "SingleCellExperiment", "SummarizedExperiment", "irlba"]
     },
     "NoRCE": {
       "name": "NoRCE",
-      "version": "1.16.0",
-      "sha256": "0di23zmjfba4nmbbkcn2xhqamxxn4hfkhyh3skc46b66rl1yjy3n",
+      "version": "1.18.0",
+      "sha256": "0npl2x2d5jxjljwd6z3rdhw39psy1mdv2rb03ag4mj1zkxqjdzyf",
       "depends": ["AnnotationDbi", "DBI", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "KEGGREST", "RCurl", "RSQLite", "S4Vectors", "SummarizedExperiment", "biomaRt", "dbplyr", "dplyr", "ggplot2", "igraph", "png", "rWikiPathways", "reactome_db", "readr", "reshape2", "rtracklayer", "stringr", "tidyr", "zlibbioc"]
     },
     "NormalyzerDE": {
       "name": "NormalyzerDE",
-      "version": "1.22.0",
-      "sha256": "1kiwyf8fkdp7bml4b5f32schyl0s5c0b1ag4g826rakh487sb69b",
-      "depends": ["Biobase", "MASS", "SummarizedExperiment", "ape", "car", "ggforce", "ggplot2", "limma", "matrixStats", "preprocessCore", "vsn"]
+      "version": "1.24.0",
+      "sha256": "17f6224zl25vi2z2mf69i4273356bwrq8myr0dvqap63cmfilbbc",
+      "depends": ["MASS", "SummarizedExperiment", "ape", "car", "ggforce", "ggplot2", "limma", "matrixStats", "preprocessCore", "vsn"]
     },
     "NormqPCR": {
       "name": "NormqPCR",
-      "version": "1.50.0",
-      "sha256": "1fl7qm6qmzxvv41qd1y8ds3r6dqk39rqgh6sl8imbggmnpb27j9h",
+      "version": "1.52.0",
+      "sha256": "1ykpyv8wbz2lvw5b6bwi3b97sk084wdzafy0zrghbxhvpjdkaqiy",
       "depends": ["Biobase", "RColorBrewer", "ReadqPCR", "qpcR"]
     },
     "NuPoP": {
       "name": "NuPoP",
-      "version": "2.12.0",
-      "sha256": "1w6q7ms57wixw5w3fx74qc6l8mgcklysqq1s6jg69mipwgch62hm",
+      "version": "2.14.0",
+      "sha256": "1rrilv50pldi76sypxp42ibh676x9cp7d4cfcc9bh02220ai8zqv",
       "depends": []
     },
     "OCplus": {
       "name": "OCplus",
-      "version": "1.78.0",
-      "sha256": "0bqa1rml6vj6sw27pxlhjjsfx2cyi2lv6v4hykdcc8kgh8a1r8dm",
+      "version": "1.80.0",
+      "sha256": "13wl5zfxc6ls5m7x5v5dpi6f850x72pbixggyhklyg90440dzr2b",
       "depends": ["interp", "multtest"]
     },
     "OGRE": {
       "name": "OGRE",
-      "version": "1.8.0",
-      "sha256": "07xkprp1hjhavj9d360yhybpq9ghz0wxwaxlicpidm788nvksxqv",
+      "version": "1.10.0",
+      "sha256": "1hwc1wgaigjg1cikja7fa1asd2119nhq61mc7jg687bli44j1wy8",
       "depends": ["AnnotationHub", "DT", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "assertthat", "data_table", "ggplot2", "rtracklayer", "shiny", "shinyBS", "shinyFiles", "shinydashboard", "tidyr"]
     },
     "OLIN": {
       "name": "OLIN",
-      "version": "1.82.0",
-      "sha256": "05s28by46adrizrglfsr9m26jiygkyp0dabdr62nasjmqzidwf80",
+      "version": "1.84.0",
+      "sha256": "1vmpvkdzdks649xws45s144xjqynf845wffldgzhydib6lkwjm5j",
       "depends": ["limma", "locfit", "marray"]
     },
     "OLINgui": {
       "name": "OLINgui",
-      "version": "1.78.0",
-      "sha256": "0fcpy0g95l0h2id13dra46zyphyjdh2m7gw9i38i5jnr4arhy95z",
+      "version": "1.80.0",
+      "sha256": "0vcvxck7qpb1n5r0qli0z50h32c0pffc2qny3fmsklff5xi4c059",
       "depends": ["OLIN", "marray", "tkWidgets", "widgetTools"]
     },
     "OMICsPCA": {
       "name": "OMICsPCA",
-      "version": "1.22.0",
-      "sha256": "0m5b6msnkvvv0lpj8zm976yqa5pd2vzkhpgzx58f95dbcaxpxflq",
+      "version": "1.24.0",
+      "sha256": "01rh5f6ajyjd9nzxs2b3ykwrvfsaz4yn30m24rdlaz3qiw4zqjsk",
       "depends": ["FactoMineR", "GenomeInfoDb", "HelloRanges", "IRanges", "MASS", "MultiAssayExperiment", "NbClust", "OMICsPCAdata", "PerformanceAnalytics", "clValid", "cluster", "corrplot", "cowplot", "data_table", "factoextra", "fpc", "ggplot2", "kableExtra", "magick", "pdftools", "reshape2", "rgl", "rmarkdown", "rtracklayer", "tidyr"]
     },
     "OPWeight": {
       "name": "OPWeight",
-      "version": "1.26.0",
-      "sha256": "11lrks7wrvzi3i0f1hnky386x60j5vnz8i73dng1fzb64n41mla8",
+      "version": "1.28.0",
+      "sha256": "1z9j5glj8522f4ldixl40gx02rila171ksc136zddcyl7whz52bd",
       "depends": ["MASS", "qvalue", "tibble"]
     },
     "ORFhunteR": {
       "name": "ORFhunteR",
-      "version": "1.12.0",
-      "sha256": "0ahs8j1qlfxblkbvxfd9836l72icr8lqaywpih9s4slx6j38l53p",
+      "version": "1.14.0",
+      "sha256": "1rzk7rmjjlsnba6kjwyv8y208g8pm361nr84fvm5b7qnh17nndq8",
       "depends": ["BSgenome_Hsapiens_UCSC_hg38", "Biostrings", "Peptides", "Rcpp", "data_table", "randomForest", "rtracklayer", "stringr", "xfun"]
     },
     "ORFik": {
       "name": "ORFik",
-      "version": "1.24.0",
-      "sha256": "0cm1rb4l0kciw8h1555qbixh9krwdnbgbvrb4dq753yjc3wdizfx",
-      "depends": ["AnnotationDbi", "BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCurl", "R_utils", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "XML", "biomaRt", "biomartr", "cowplot", "curl", "data_table", "downloader", "fst", "ggplot2", "gridExtra", "httr", "jsonlite", "rtracklayer", "txdbmaker", "withr", "xml2"]
+      "version": "1.26.1",
+      "sha256": "0x07lzq3asifzc2r4yk2marcb4v3wkzdaf8xalfq0aab8x3gl0fn",
+      "depends": ["AnnotationDbi", "BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "XML", "biomaRt", "biomartr", "cowplot", "data_table", "fst", "ggplot2", "gridExtra", "httr", "jsonlite", "rtracklayer", "txdbmaker", "withr", "xml2"]
     },
     "OSAT": {
       "name": "OSAT",
-      "version": "1.52.0",
-      "sha256": "0bap6n61wzrkbl1cvlfwrnzgvdgkfzfa37fb5r22ynyv847jhl7n",
+      "version": "1.54.0",
+      "sha256": "078nnn7g497pci81wnxf166aidp41cb5vaj6bsbimhaxb75alyjk",
       "depends": []
     },
     "OTUbase": {
       "name": "OTUbase",
-      "version": "1.54.0",
-      "sha256": "02hbz9xhhmggbvkgc41s91fwd9xr7li0215mn1axbfcr7dxppziq",
+      "version": "1.56.0",
+      "sha256": "1mya1bg2a1dikbpq0yh7b6lwsal5aqzv1ifxxckfq3wf23snk5gl",
       "depends": ["Biobase", "Biostrings", "IRanges", "S4Vectors", "ShortRead", "vegan"]
     },
     "OUTRIDER": {
       "name": "OUTRIDER",
-      "version": "1.22.0",
-      "sha256": "1zdv48ms62sy6pv24xnx5jf0286dr68zglckl38na2gvqymn8zj4",
+      "version": "1.24.0",
+      "sha256": "0slpkq7smja67yrcz992jnr176324n6wan7q9lrs8j8cylz9zwsf",
       "depends": ["BBmisc", "BiocGenerics", "BiocParallel", "DESeq2", "GenomicFeatures", "GenomicRanges", "IRanges", "PRROC", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "SummarizedExperiment", "data_table", "generics", "ggplot2", "ggrepel", "heatmaply", "matrixStats", "pcaMethods", "pheatmap", "plotly", "plyr", "reshape2", "scales", "txdbmaker"]
     },
     "OVESEG": {
       "name": "OVESEG",
-      "version": "1.20.0",
-      "sha256": "0bj2d8i5b9y3zrcpm7qapdywd1s3zgqiikz4by1l7832z7r2imyx",
+      "version": "1.22.0",
+      "sha256": "1dad4bw2vnh9vkklrh1r0gmk1rrdnfgs85dirgh90zdcgzr6k5jz",
       "depends": ["BiocParallel", "Rcpp", "SummarizedExperiment", "fdrtool", "limma"]
     },
     "OmaDB": {
       "name": "OmaDB",
-      "version": "2.20.0",
-      "sha256": "093hqayqa0gb3m6yckqa75i9ha9laxlkpjj4y64nzgja1ny2g17b",
+      "version": "2.22.0",
+      "sha256": "1sz14v1cnxcfrynpra53dmwk5va9h20z2bhsqx91kril2k6yiyjk",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "ape", "httr", "jsonlite", "plyr", "topGO"]
     },
     "OmicCircos": {
       "name": "OmicCircos",
-      "version": "1.42.0",
-      "sha256": "0iqq9ds69vlm7fhhd72cvnj4pg07g6c2rkhvbbl6r1w8z33b26hs",
+      "version": "1.44.0",
+      "sha256": "0k56433qrlg3hd6kj7wpcapv2jpn0c1c5l924shlfpb7xbxhhq2r",
       "depends": ["GenomicRanges"]
     },
+    "OmicsMLRepoR": {
+      "name": "OmicsMLRepoR",
+      "version": "1.0.0",
+      "sha256": "0pvm7w1ca9mgamhad6rb16rm38xmcfxipnkj9xv0xskmzc7wg361",
+      "depends": ["BiocFileCache", "DiagrammeR", "data_tree", "dplyr", "jsonlite", "lubridate", "plyr", "readr", "rlang", "rols", "stringr", "tibble", "tidyr"]
+    },
     "Omixer": {
       "name": "Omixer",
-      "version": "1.14.0",
-      "sha256": "1y87kb08syq45amm8cxxp2sjfi24isl4f0cl8ik0qisbm9ycw09k",
+      "version": "1.16.0",
+      "sha256": "1s0kdf2hjjjwz77mcvk65y8vi9py2d8cbxxglkx1krvj2xb1j3zr",
       "depends": ["dplyr", "forcats", "ggplot2", "gridExtra", "magrittr", "readr", "stringr", "tibble", "tidyselect"]
     },
     "OmnipathR": {
       "name": "OmnipathR",
-      "version": "3.12.2",
-      "sha256": "0ya013p8lsmmkv21r68c0bh72qrq3a6rxsmqvcbzhr558sqgv9mb",
-      "depends": ["checkmate", "crayon", "curl", "digest", "dplyr", "httr", "igraph", "jsonlite", "later", "logger", "lubridate", "magrittr", "progress", "purrr", "rappdirs", "readr", "readxl", "rlang", "rmarkdown", "rvest", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "withr", "xml2", "yaml"]
+      "version": "3.14.0",
+      "sha256": "14fwdckmsilq7jj1y9rg0qj0z2xrryajwhib8k8wss0ys6sk7fzz",
+      "depends": ["RSQLite", "R_utils", "XML", "checkmate", "crayon", "curl", "digest", "dplyr", "httr", "igraph", "jsonlite", "later", "logger", "lubridate", "magrittr", "progress", "purrr", "rappdirs", "readr", "readxl", "rlang", "rmarkdown", "rvest", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "withr", "xml2", "yaml", "zip"]
     },
     "OncoScore": {
       "name": "OncoScore",
-      "version": "1.32.0",
-      "sha256": "1n7rlng6jqrxsas2zs94jfmgwgs6yaxavn14q112qinlmjxcdfxp",
+      "version": "1.34.0",
+      "sha256": "128a2vfgcvvqah7d90d023q874r65rg8bhvmiyvc26fp7sl8gjks",
       "depends": ["biomaRt"]
     },
     "OncoSimulR": {
       "name": "OncoSimulR",
-      "version": "4.6.0",
-      "sha256": "1j7d7ajlalhiwn12kpbagx8f0gnfsals4p5bkiik7a5ybwann33r",
+      "version": "4.8.0",
+      "sha256": "09060zpc9wyj1wixdg7ibahyhhmqnc0k95crwq8djb1f94vafzl7",
       "depends": ["RColorBrewer", "Rcpp", "Rgraphviz", "car", "data_table", "dplyr", "ggplot2", "ggrepel", "graph", "gtools", "igraph", "smatr", "stringr"]
     },
     "OpenStats": {
       "name": "OpenStats",
-      "version": "1.16.0",
-      "sha256": "1hxazy0rf0rvvr1ivw33fi72099x3blzzzwymckxhqskmsj52120",
+      "version": "1.18.0",
+      "sha256": "0mzg67y0wbd11cqizqha5hx51kii6zj1sylwd39bli8yk22rz7h8",
       "depends": ["AICcmodavg", "Hmisc", "MASS", "car", "jsonlite", "knitr", "nlme", "rlist", "summarytools"]
     },
     "OrderedList": {
       "name": "OrderedList",
-      "version": "1.76.0",
-      "sha256": "0g604sdjwz3p5r95slp98a87sb3clinpwj76xbrdmahbjcz1gm6s",
+      "version": "1.78.0",
+      "sha256": "17k3zyn7pcwnzpscmcyvz2z97gc1y0sdn48kkrjhjn3s5gyfq74v",
       "depends": ["Biobase", "twilight"]
     },
     "Organism_dplyr": {
       "name": "Organism.dplyr",
-      "version": "1.32.0",
-      "sha256": "03z5pyqbaxwyrq5m858c8k69fwvclq98ksr84dc4m7r8lzz2hfxx",
+      "version": "1.34.0",
+      "sha256": "0phm4vl879ak98rjffb7z3khwrsmjd814y86zidmfailwrzmp3xx",
       "depends": ["AnnotationDbi", "AnnotationFilter", "BiocFileCache", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "dbplyr", "dplyr", "rlang", "tibble"]
     },
     "OrganismDbi": {
       "name": "OrganismDbi",
-      "version": "1.46.0",
-      "sha256": "1cfh632rpmklmyd5cibwiy0i2pk2kk2m39g8mq5sxfwd2am4r0jk",
+      "version": "1.48.0",
+      "sha256": "1xbwvpxcn23yvibsf12g9irxcmz6ckp87991zzmk449xckayavrx",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "DBI", "GenomicFeatures", "GenomicRanges", "IRanges", "RBGL", "S4Vectors", "graph", "txdbmaker"]
     },
     "Oscope": {
       "name": "Oscope",
-      "version": "1.34.0",
-      "sha256": "16d2ngakdg73rdx0bf1pz3z1n8npjzl3b7dn94g9zbayw4vp3x5z",
+      "version": "1.36.0",
+      "sha256": "02ysp86ssx1w9vmm4yc674xlhnclksh3f25skb8c9z4axi5708hk",
       "depends": ["BiocParallel", "EBSeq", "cluster", "testthat"]
     },
     "OutSplice": {
       "name": "OutSplice",
-      "version": "1.4.0",
-      "sha256": "1kln52s2a0icvsna2ip08gsmggbbp8arj4mnpaj068ff6maa4hy6",
+      "version": "1.6.0",
+      "sha256": "1ashzh7g527dz0xq6qv0rsy0sw8rszbrr5z9rjs1kgagjrz42g9v",
       "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "org_Hs_eg_db"]
     },
     "PAA": {
       "name": "PAA",
-      "version": "1.38.0",
-      "sha256": "1afkvcb4d5iqzmn1nk51kn9xmwpbps00ymarsj3bc7zlf9aani4c",
+      "version": "1.40.0",
+      "sha256": "1nqhrvrl3h7wj7w1davfavcaknaq9dnhr91lr2l8g6hlzqi48q1k",
       "depends": ["MASS", "ROCR", "Rcpp", "e1071", "gplots", "gtools", "limma", "mRMRe", "randomForest", "sva"]
     },
     "PADOG": {
       "name": "PADOG",
-      "version": "1.46.0",
-      "sha256": "0rm8zyvgipb22z47nxyalfpdww8c7360zbmx4n7g3lnd2v8csgks",
+      "version": "1.48.0",
+      "sha256": "0sbsnizmfplkli7j88qgksphzn40567z126kpmrjlndfn04nlx6h",
       "depends": ["AnnotationDbi", "Biobase", "GSA", "KEGGREST", "KEGGdzPathwaysGEO", "doRNG", "foreach", "hgu133a_db", "hgu133plus2_db", "limma", "nlme"]
     },
     "PAIRADISE": {
       "name": "PAIRADISE",
-      "version": "1.20.0",
-      "sha256": "1dj5rx6jhcr3k9szhvaqc1savfbpqbm9q4i6n18mj23wzvvqhrp4",
+      "version": "1.22.0",
+      "sha256": "13qdac7gra6wm4c9wmm8qp5aawhyqplpl15kbjr466yh5ixqk15q",
       "depends": ["BiocParallel", "S4Vectors", "SummarizedExperiment", "abind", "nloptr"]
     },
     "PANR": {
       "name": "PANR",
-      "version": "1.50.0",
-      "sha256": "14s6ldpxvzkxh356s5i40sx4x286g81qjyfsd2ax4y32kk7qdb7r",
+      "version": "1.52.0",
+      "sha256": "1r76yr00f3xprxnvsffy2kyrbzkkq6r9cm5qy07kbq4k40kws8b3",
       "depends": ["MASS", "RedeR", "igraph", "pvclust"]
     },
     "PAST": {
       "name": "PAST",
-      "version": "1.20.0",
-      "sha256": "01d7lw7x0wfszpi9lnq9alpba3d54z6lcai4fpdn4y53diamaygy",
+      "version": "1.22.0",
+      "sha256": "1wvddpwdxmhvvczfgk5mnyqrrzglsi9s7cknv8j08sdhlqgqd82y",
       "depends": ["GenomicRanges", "S4Vectors", "doParallel", "dplyr", "foreach", "ggplot2", "iterators", "qvalue", "rlang", "rtracklayer"]
     },
     "PCAN": {
       "name": "PCAN",
-      "version": "1.32.0",
-      "sha256": "1iawwvvm55fkipmkfwq64s5lbzxk2l229x3idzb1gvvjrkqk9lb7",
+      "version": "1.34.0",
+      "sha256": "1g92h79fcy6sh6vbrk8as2pk16dxnmhb37g87h97bsrnpmwl2v8r",
       "depends": ["BiocParallel"]
     },
     "PCAtools": {
       "name": "PCAtools",
-      "version": "2.16.0",
-      "sha256": "04a1fvwgqxzf7992lyh9qzz2z2fgmfwfjvpw5xr21pcrpas57l2r",
+      "version": "2.18.0",
+      "sha256": "12w8jqadfcnvavhiksxs8sc8lg4k6053gl5czamdssqb2rqiy14l",
       "depends": ["BH", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "beachmat", "cowplot", "dqrng", "ggplot2", "ggrepel", "lattice", "reshape2"]
     },
-    "PDATK": {
-      "name": "PDATK",
-      "version": "1.12.0",
-      "sha256": "079gdwh9m90r5b0p0szqv222sgdmjr6s3sz19l5xz0435r7h53nv",
-      "depends": ["BiocGenerics", "BiocParallel", "ConsensusClusterPlus", "CoreGx", "MatrixGenerics", "MultiAssayExperiment", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "caret", "clusterRepro", "data_table", "dplyr", "genefu", "ggplot2", "ggplotify", "igraph", "matrixStats", "pROC", "piano", "plyr", "reportROC", "rlang", "scales", "survcomp", "survival", "survminer", "switchBox", "verification"]
-    },
     "PECA": {
       "name": "PECA",
-      "version": "1.40.0",
-      "sha256": "0vx17yhls9ccmp0mns7w89dq49d3alqnzxvq3kvhjrdxnhgdn5d1",
+      "version": "1.42.0",
+      "sha256": "1zz950pjaz6f202zihnjqpmx5vx7rzjlrd70v02y27agyfcsnf4a",
       "depends": ["ROTS", "affy", "aroma_affymetrix", "aroma_core", "genefilter", "limma", "preprocessCore"]
     },
     "PICS": {
       "name": "PICS",
-      "version": "2.48.0",
-      "sha256": "16vf27fjrvmhfjndn3d706w6a3fd10nsmg6zmj1cch13c863xr13",
+      "version": "2.50.0",
+      "sha256": "0189nsd3qx8dw414d0j3nfkn89i5vclgdmq2y3x3v2nva24whrka",
       "depends": ["GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools"]
     },
     "PING": {
       "name": "PING",
-      "version": "2.48.0",
-      "sha256": "1r09afnm6m9s9z7f0g6wsm677pc681j985psddzgqfmcdwbz75i3",
+      "version": "2.50.0",
+      "sha256": "0bw2w2f01brryz2x36qi82v4v47wwd7fk47bkhcs4yb3qm6xa5k0",
       "depends": ["BSgenome", "BiocGenerics", "GenomicRanges", "Gviz", "IRanges", "PICS", "S4Vectors", "fda"]
     },
     "PIPETS": {
       "name": "PIPETS",
-      "version": "1.0.3",
-      "sha256": "0argzw874689hn4dddips86rpvn4i176gxj18j3f2jx5z4j61y4a",
+      "version": "1.2.0",
+      "sha256": "1bysmh2ylmj18rabw6zk8wjqd2dg83pzf67awzvdkx55kr2gvadf",
       "depends": ["BiocGenerics", "GenomicRanges", "dplyr"]
     },
     "PIUMA": {
       "name": "PIUMA",
-      "version": "1.0.0",
-      "sha256": "10b8d8525pz7bl8kg5ga0ca2ngns7g9ik2grhvx920mza7pail46",
+      "version": "1.2.0",
+      "sha256": "1s1zwl0ny3s2b84fl2fwxfbcl078mxl20cdgx8ydnmxdv0197a41",
       "depends": ["Hmisc", "SummarizedExperiment", "cluster", "dbscan", "ggplot2", "igraph", "kernlab", "patchwork", "scales", "tsne", "umap", "vegan"]
     },
     "PLPE": {
       "name": "PLPE",
-      "version": "1.64.0",
-      "sha256": "06g8qrxmd29f8skzll3k5lz68j97466n1wpv7qd2ibpl4hi6zyg0",
+      "version": "1.66.0",
+      "sha256": "1jfmrxd878kyy129349rq8papf20mb1ji2p494y92x6vxcr8hhwa",
       "depends": ["Biobase", "LPE", "MASS"]
     },
     "PLSDAbatch": {
       "name": "PLSDAbatch",
-      "version": "1.0.0",
-      "sha256": "15zaxr8qv5rp04r8430bl8llkdx4vhwkjn8bl8a8sv6q39vvqvys",
+      "version": "1.2.0",
+      "sha256": "0nzrfz61lly9mmijdilm56cn6h86kb55hrirx71qlrf791ifzis1",
       "depends": ["Biobase", "BiocStyle", "Rdpack", "TreeSummarizedExperiment", "ggplot2", "ggpubr", "gridExtra", "lmerTest", "mixOmics", "performance", "pheatmap", "scales", "vegan"]
     },
     "POMA": {
       "name": "POMA",
-      "version": "1.14.0",
-      "sha256": "1g9xsmg3zv5h7l2wxk4zm4fsihzah8phg33p2hhqbinzkzk6pbkw",
-      "depends": ["ComplexHeatmap", "DESeq2", "FSA", "MASS", "RankProd", "SummarizedExperiment", "broom", "caret", "dbscan", "dplyr", "ggplot2", "ggrepel", "glmnet", "impute", "janitor", "limma", "lme4", "magrittr", "mixOmics", "randomForest", "rlang", "sva", "tibble", "tidyr", "uwot", "vegan"]
+      "version": "1.16.0",
+      "sha256": "0kw8sfk38qc547acg62hbarzml4cnwsnf8bgxhsnk3lh250m0als",
+      "depends": ["ComplexHeatmap", "DESeq2", "FSA", "MASS", "RankProd", "SummarizedExperiment", "broom", "caret", "dbscan", "dplyr", "fgsea", "ggcorrplot", "ggplot2", "ggrepel", "glmnet", "impute", "janitor", "limma", "lme4", "magrittr", "mixOmics", "msigdbr", "multcomp", "purrr", "randomForest", "rlang", "sva", "tibble", "tidyr", "uwot", "vegan"]
     },
     "POWSC": {
       "name": "POWSC",
-      "version": "1.12.0",
-      "sha256": "01jh4lhipkj5iga3vp0m42klpi8160mbzsqb5b029h7sil8n3w94",
+      "version": "1.14.0",
+      "sha256": "0il151al5jb5r7zp2j408v6cm7j8n9kwnwd4crsm5qv2hnc6vvhs",
       "depends": ["Biobase", "MAST", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "limma", "pheatmap"]
     },
     "PPInfer": {
       "name": "PPInfer",
-      "version": "1.30.0",
-      "sha256": "1b5x9z2w9vpnkbmgh05lxpg1pkjhxnsxaz86ma018czicarxqcx3",
+      "version": "1.32.0",
+      "sha256": "0a4xb82hf192ybhi6w78jdc2qpk12qp4zc1c4sy0ybyll27njkj9",
       "depends": ["STRINGdb", "biomaRt", "fgsea", "ggplot2", "httr", "igraph", "kernlab", "yeastExpData"]
     },
     "PREDA": {
       "name": "PREDA",
-      "version": "1.50.0",
-      "sha256": "17xcaw5spcl41dgilpx6cq9df1zzzrk4x6xaxpa5pmmfn7gfk4zv",
+      "version": "1.52.0",
+      "sha256": "0bhgdirz7spxph6wxg90rqbl2qqck95ys3688g77ls13ka371zry",
       "depends": ["Biobase", "annotate", "lokern", "multtest"]
     },
     "PROMISE": {
       "name": "PROMISE",
-      "version": "1.56.0",
-      "sha256": "1r9pcilq5vdq958gwcp29q2mc7w55l3xpn76acnnrh3xkg9gm8rf",
+      "version": "1.58.0",
+      "sha256": "182lf80d6hw2yisxndzn7zzqjl92zlrc7irzdfjncyipmng07x88",
       "depends": ["Biobase", "GSEABase"]
     },
+    "PRONE": {
+      "name": "PRONE",
+      "version": "1.0.0",
+      "sha256": "1p1yjf5r2zqy9rvlckxsd17ngg0zrhaj9mwrp0yaqn5gahww06h6",
+      "depends": ["Biobase", "ComplexHeatmap", "ComplexUpset", "DEqMS", "MASS", "MSnbase", "NormalyzerDE", "POMA", "RColorBrewer", "ROTS", "S4Vectors", "SummarizedExperiment", "UpSetR", "circlize", "data_table", "dendsort", "dplyr", "edgeR", "ggplot2", "ggtext", "gprofiler2", "gtools", "limma", "magrittr", "matrixStats", "plotROC", "preprocessCore", "purrr", "reshape2", "scales", "stringr", "tibble", "tidyr", "vsn"]
+    },
     "PROPER": {
       "name": "PROPER",
-      "version": "1.36.0",
-      "sha256": "1haqz50cdd3inmjw4ifj171rx1097bxw8mkgvx07kc7vx9ypn11s",
+      "version": "1.38.0",
+      "sha256": "1dxps7nqd764agzfdba23fcxnxqdb5d8v4mxhw2kiy0qspk30f3r",
       "depends": ["edgeR"]
     },
-    "PROPS": {
-      "name": "PROPS",
-      "version": "1.26.0",
-      "sha256": "10xzvw2m9i7h7y227xqkzc41d6ajpzqwciwn6dkg5mgagss42367",
-      "depends": ["Biobase", "bnlearn", "reshape2", "sva"]
-    },
     "PROcess": {
       "name": "PROcess",
-      "version": "1.80.0",
-      "sha256": "0ra9rjc6525df0hn7c09fzi6qnmnwcrycng49yy151l72yy8kiki",
+      "version": "1.82.0",
+      "sha256": "0pfx5jzykcb4ap1mh2ysg1brdf9mg10h775prnk3lc67rjps334r",
       "depends": ["Icens"]
     },
     "PSMatch": {
       "name": "PSMatch",
-      "version": "1.8.0",
-      "sha256": "13w145is3d95392qqdq6qh3mrlcixbj0jzz4r590xas1qjp5d03h",
+      "version": "1.10.0",
+      "sha256": "1aq6kdvw5n0d9c8pg7clfbpm5v52svx438sk5wphj4x0l3qvbdhh",
       "depends": ["BiocGenerics", "BiocParallel", "Matrix", "MsCoreUtils", "ProtGenerics", "QFeatures", "S4Vectors", "igraph"]
     },
     "PWMEnrich": {
       "name": "PWMEnrich",
-      "version": "4.40.0",
-      "sha256": "0fzmsm880w1vwbjcakc5mkljx41rpk8m71g49kwmjgb1z36173m2",
+      "version": "4.42.0",
+      "sha256": "1p5p6wp2p8nkbgd6v527g90wkz1184n29y7n3lx4v7nn0b7581k3",
       "depends": ["BiocGenerics", "Biostrings", "S4Vectors", "evd", "gdata", "seqLogo"]
     },
-    "PanViz": {
-      "name": "PanViz",
-      "version": "1.6.0",
-      "sha256": "1h4fxqxkaph5j3vkfhmmkhvmqa8czzdzxcg6f06v94hqf38i86i5",
-      "depends": ["RColorBrewer", "colorspace", "data_table", "dplyr", "easycsv", "futile_logger", "igraph", "magrittr", "rentrez", "rlang", "stringr", "tibble", "tidyr"]
-    },
     "PanomiR": {
       "name": "PanomiR",
-      "version": "1.8.0",
-      "sha256": "0hzhhrknspdw81dn48xqx532n27lj88k57ydsfxfm6rkix87pv96",
+      "version": "1.10.0",
+      "sha256": "0hnh8y428q1scnk7hw7y2inlwqxj887cv541mb4fvjxgxdhsdnsd",
       "depends": ["GSEABase", "RColorBrewer", "clusterProfiler", "dplyr", "forcats", "igraph", "limma", "metap", "org_Hs_eg_db", "preprocessCore", "rlang", "tibble", "withr"]
     },
     "Path2PPI": {
       "name": "Path2PPI",
-      "version": "1.34.0",
-      "sha256": "0ys63k4637pr9qv037vmvv39qwxpi94rpaqffj64r0z32hi34445",
+      "version": "1.36.0",
+      "sha256": "09pmdl9133cgjd1d30m2qhbwwd4ckql3d1hl58xz9fiif2f9sxrw",
       "depends": ["igraph"]
     },
     "PathNet": {
       "name": "PathNet",
-      "version": "1.44.0",
-      "sha256": "1ad0x8amp5kh4hync86w3kikhqx2j97hsgpb2qy81dn83kbfbdwd",
+      "version": "1.46.0",
+      "sha256": "0y60fw08i2kh15h2vh264yy7njyv6vvppxwic91631z992w3rw31",
       "depends": []
     },
     "PathoStat": {
       "name": "PathoStat",
-      "version": "1.30.0",
-      "sha256": "1y3gzv4nq9jykdl07mabw51m60g267hb5sjjn3p9g7r6ysasj8c2",
+      "version": "1.32.0",
+      "sha256": "1n855cc9wbshqg8zp6bg1c3dqx3hbqsgxx65wdgl8d0xr4jp0r3b",
       "depends": ["BiocStyle", "ComplexHeatmap", "DESeq2", "DT", "RColorBrewer", "ROCR", "XML", "ape", "corpcor", "devtools", "dplyr", "edgeR", "ggplot2", "glmnet", "gmodels", "knitr", "limma", "matrixStats", "phyloseq", "plotly", "plyr", "rentrez", "reshape2", "scales", "shiny", "shinyjs", "tidyr", "vegan", "webshot"]
     },
     "PeacoQC": {
       "name": "PeacoQC",
-      "version": "1.14.0",
-      "sha256": "1r354h8lmp0r2nlvr9xj45dm8gbqrsfhl2p3wc9gvldsllq7z3ix",
+      "version": "1.16.0",
+      "sha256": "05rq1l7wz92d6lc97f1yy5kyccp9rk75cqpyhxqjpcm6lqx40djk",
       "depends": ["ComplexHeatmap", "circlize", "flowCore", "flowWorkspace", "ggplot2", "gridExtra", "plyr"]
     },
     "Pedixplorer": {
       "name": "Pedixplorer",
+      "version": "1.2.0",
+      "sha256": "0krm6mhg6nywnmf481rbgj9s0ax5x6zf6vxqavl8s011yav5f2wr",
+      "depends": ["DT", "Matrix", "S4Vectors", "colourpicker", "data_table", "dplyr", "ggplot2", "gridExtra", "htmlwidgets", "plotly", "plyr", "quadprog", "readxl", "scales", "shiny", "shinyWidgets", "shinycssloaders", "shinytoastr", "stringr", "tidyr"]
+    },
+    "PepSetTest": {
+      "name": "PepSetTest",
       "version": "1.0.0",
-      "sha256": "0nkvypb1gh0b43p864c9rnfbvsdc9jb2jr3c0jrg33crxjf6rmr0",
-      "depends": ["Matrix", "S4Vectors", "dplyr", "ggplot2", "plyr", "quadprog", "stringr", "testthat", "tidyr"]
+      "sha256": "0d6q1nkn4rp1rpwjgi0xzk8x02dinzd2w6zjrf7k4xlkacysn1gy",
+      "depends": ["MASS", "SummarizedExperiment", "dplyr", "limma", "lme4", "matrixStats", "reshape2", "tibble"]
     },
     "PepsNMR": {
       "name": "PepsNMR",
-      "version": "1.22.0",
-      "sha256": "0z3kw8j972zmrcyikag5js20zpgc3l5bgkn5q31dzi1q7ynpkwhv",
+      "version": "1.24.0",
+      "sha256": "03sipcga9gmcypryq3c0lhvdp1dzgbjfzxldrrp2ycyjwzwr9wzn",
       "depends": ["Matrix", "ggplot2", "gridExtra", "matrixStats", "ptw", "reshape2"]
     },
     "PhIPData": {
       "name": "PhIPData",
-      "version": "1.12.0",
-      "sha256": "1ar7fdsxngdyikcvi7j230jqfhdvji4cvfrxkn606wy764mrpyrm",
+      "version": "1.14.0",
+      "sha256": "0y0jjnz107srnz4mhx8wy1mrn0g50nsjn8727hdyzn0hybq8inld",
       "depends": ["BiocFileCache", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "cli", "edgeR"]
     },
     "PharmacoGx": {
       "name": "PharmacoGx",
-      "version": "3.8.0",
-      "sha256": "098zg2c8xiw6v8fc072cnwlls5q762yjykaf6cjhyrz00bqxmvh1",
+      "version": "3.10.0",
+      "sha256": "1ay7v34h0lfqkpa8a27lyb6j8ayq7b79kc1jixl60i2wqi6x69ps",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "MultiAssayExperiment", "RColorBrewer", "Rcpp", "S4Vectors", "SummarizedExperiment", "boot", "caTools", "checkmate", "coop", "data_table", "downloader", "ggplot2", "jsonlite", "magicaxis", "reshape2"]
     },
     "PhenStat": {
       "name": "PhenStat",
-      "version": "2.40.0",
-      "sha256": "0dpnij94h808aab8pyvvk7lnfn00f1hkisaasv28blj14fml63s8",
+      "version": "2.42.0",
+      "sha256": "0jzgpmkk4ljz7kxqmjpp6kspw8a36yiprk8zyhqzb9rw2a5g85xj",
       "depends": ["MASS", "SmoothWin", "car", "corrplot", "ggplot2", "graph", "knitr", "lme4", "logistf", "msgps", "nlme", "nortest", "pingr", "reshape"]
     },
     "PhenoGeneRanker": {
       "name": "PhenoGeneRanker",
-      "version": "1.12.0",
-      "sha256": "1l85ibg1nm4dvwjc7b1gqmq6z5yrg3phfr24i23fzlddbwyx75hh",
+      "version": "1.14.0",
+      "sha256": "0np50456hvkwxcikpsz2d7ji392r6indzqrn9lyjyqvf5as6nw0y",
       "depends": ["Matrix", "doParallel", "dplyr", "foreach", "igraph"]
     },
     "PhosR": {
       "name": "PhosR",
-      "version": "1.14.0",
-      "sha256": "05lc2l65nl15250f39rw7pcsfxw74rcakb6gg5wcp515iv13li07",
+      "version": "1.16.0",
+      "sha256": "0m3gz1g8a0wvfdjyp2vcarizaxbvs9zqa9zaivq5ns2nhbs2wd5f",
       "depends": ["BiocGenerics", "GGally", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "circlize", "dendextend", "dplyr", "e1071", "ggdendro", "ggplot2", "ggpubr", "ggtext", "igraph", "limma", "network", "pcaMethods", "pheatmap", "preprocessCore", "reshape2", "rlang", "ruv", "stringi", "tidyr"]
     },
     "PhyloProfile": {
       "name": "PhyloProfile",
-      "version": "1.18.0",
-      "sha256": "04z6k0i28d48v1d7n7zgxkb9n1747k27h5b5zlj8id8w293ggcaa",
-      "depends": ["BiocStyle", "Biostrings", "DT", "ExperimentHub", "OmaDB", "RColorBrewer", "RCurl", "ape", "bioDist", "colourpicker", "data_table", "energy", "ggplot2", "gridExtra", "pbapply", "plyr", "shiny", "shinyBS", "shinyFiles", "shinycssloaders", "shinyjs", "stringr", "xml2", "yaml", "zoo"]
+      "version": "1.20.4",
+      "sha256": "0vv0a6vknjx3zh92ypmbvl4rcbrpfzsgnj1vmjx0y4p3vxkwvhx0",
+      "depends": ["BiocStyle", "Biostrings", "DT", "ExperimentHub", "RColorBrewer", "RCurl", "ape", "bioDist", "colourpicker", "data_table", "dplyr", "energy", "extrafont", "fastcluster", "ggplot2", "gridExtra", "pbapply", "plotly", "scattermore", "shiny", "shinyBS", "shinyFiles", "shinycssloaders", "shinyjs", "stringr", "tsne", "umap", "xml2", "yaml", "zoo"]
     },
     "Pigengene": {
       "name": "Pigengene",
-      "version": "1.30.0",
-      "sha256": "08jgn7cx3gvxsih8jp9xh1irf7f0j0yfw4srbc6ynffc0197papc",
+      "version": "1.32.0",
+      "sha256": "1r8m1pm7xnbzvjgyffp5izvb9gln1w4by97nnqnlk06hr027r5sw",
       "depends": ["BiocStyle", "C50", "DBI", "DOSE", "GO_db", "MASS", "ReactomePA", "Rgraphviz", "WGCNA", "bnlearn", "clusterProfiler", "dplyr", "gdata", "ggplot2", "graph", "impute", "matrixStats", "openxlsx", "partykit", "pheatmap", "preprocessCore"]
     },
+    "Pirat": {
+      "name": "Pirat",
+      "version": "1.0.1",
+      "sha256": "0zp90hnpfj1ycc2pvmdbqmgbf3hipyqkvyhmzm20wywbs6aqp2a4",
+      "depends": ["BiocManager", "MASS", "S4Vectors", "SummarizedExperiment", "basilisk", "ggplot2", "invgamma", "progress", "reticulate"]
+    },
     "PoDCall": {
       "name": "PoDCall",
-      "version": "1.12.0",
-      "sha256": "121clnkr598p7iy91s0dp76ammz853p2cds0zy15pjj8n21rc7lv",
+      "version": "1.14.0",
+      "sha256": "0j4bzkm6h8rhd9xf44n6cfscivi9y30nhacyb1zi79349vd8wiky",
       "depends": ["DT", "LaplacesDemon", "diptest", "ggplot2", "gridExtra", "mclust", "purrr", "readr", "rlist", "shiny", "shinyjs"]
     },
+    "PolySTest": {
+      "name": "PolySTest",
+      "version": "1.0.2",
+      "sha256": "04ib8irmfa0jf0a4gz96nk3k5cwb7fa0hv9f9jmbvc7pxyn6gmkw",
+      "depends": ["S4Vectors", "SummarizedExperiment", "UpSetR", "circlize", "fdrtool", "gplots", "heatmaply", "knitr", "limma", "matrixStats", "plotly", "qvalue", "shiny"]
+    },
     "PrInCE": {
       "name": "PrInCE",
-      "version": "1.20.0",
-      "sha256": "173vakwqjalh2spz1f7qq6ngw8hjkqpj4zf0rx6xsnycjn54jip0",
+      "version": "1.22.0",
+      "sha256": "1z4b75br68wghjky6x8mc522jw4cfa2v4490qdg7z75kpgdld8sw",
       "depends": ["Biobase", "Hmisc", "LiblineaR", "MSnbase", "Rdpack", "dplyr", "forecast", "magrittr", "naivebayes", "progress", "purrr", "ranger", "robustbase", "speedglm", "tester", "tidyr"]
     },
     "Prostar": {
       "name": "Prostar",
-      "version": "1.36.2",
-      "sha256": "140whr7klab1as5y8h9lbmlgn4f63kfdfhzjyxjp8pk3aq1xv53i",
+      "version": "1.38.1",
+      "sha256": "153s3na25nka2hxjswzdcbddr0hkglwjs489y6h3h7h03m9by8bw",
       "depends": ["Biobase", "DAPAR", "DAPARdata", "DT", "RColorBrewer", "R_utils", "XML", "colourpicker", "data_table", "future", "ggplot2", "gplots", "gtools", "highcharter", "htmlwidgets", "later", "markdown", "promises", "rclipboard", "rhandsontable", "sass", "shiny", "shinyAce", "shinyBS", "shinyTree", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs", "shinythemes", "tibble", "vioplot", "webshot"]
     },
     "ProtGenerics": {
       "name": "ProtGenerics",
-      "version": "1.36.0",
-      "sha256": "0h0i4dgsgvyhma5pfvycv6wyxv27vp0b2i8b6l8hj55z8cvmvfln",
+      "version": "1.38.0",
+      "sha256": "0pg7rqz0ixaiihqybynm94qvdc5y953xzxzxvwv5gbmxdk9s3lmk",
       "depends": []
     },
     "ProteoDisco": {
       "name": "ProteoDisco",
-      "version": "1.10.0",
-      "sha256": "10cdniinadihp4acdz22c0zjg3if3rqn9cy753f2x1nq539n3vql",
+      "version": "1.12.0",
+      "sha256": "07hbf2h31ff4adfp28f92823h387z29ygj8fdqkchsx8ras8a8fm",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "ParallelLogger", "S4Vectors", "VariantAnnotation", "XVector", "checkmate", "cleaver", "dplyr", "plyr", "rlang", "tibble", "tidyr"]
     },
     "ProteoMM": {
       "name": "ProteoMM",
-      "version": "1.22.0",
-      "sha256": "173nqg0nqdgy7z9qklxk88lxmhj7qf8jjcidpllf9hap9y1lk910",
+      "version": "1.24.0",
+      "sha256": "0z51pa8nmdl1895z3ky2zagxpgss2az58pcdnjmln9mbzdl3cvhi",
       "depends": ["biomaRt", "gdata", "ggplot2", "ggrepel", "gtools", "matrixStats"]
     },
     "PureCN": {
       "name": "PureCN",
-      "version": "2.10.0",
-      "sha256": "1vywvl90nvqlzbamn6g6iparn3b09zkz95sw13rgp8qlqc192nbf",
+      "version": "2.12.0",
+      "sha256": "0y24clqg7gs4696mwpsmxc4js7s17jlqmkrhkq8vard2hyh9vy0y",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "DNAcopy", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VGAM", "VariantAnnotation", "data_table", "futile_logger", "ggplot2", "gridExtra", "mclust", "rhdf5", "rtracklayer"]
     },
     "Pviz": {
       "name": "Pviz",
-      "version": "1.38.0",
-      "sha256": "1hshfgnidshwfka8l0fs4x4znpmmdi42wnkrrl6rhchj9dymjcnr",
+      "version": "1.40.0",
+      "sha256": "0w9zxdyyzg6c9wjf1jsyrqihhi30rv5lx94136rks9l3m5vzvlqb",
       "depends": ["Biostrings", "GenomicRanges", "Gviz", "IRanges", "biovizBase", "data_table"]
     },
     "QDNAseq": {
       "name": "QDNAseq",
-      "version": "1.40.0",
-      "sha256": "1myk6qgl45ya7qw6sx6xc98d8m5ffl2ghm3zvqmyh9r0sp6x184f",
+      "version": "1.42.0",
+      "sha256": "06ips85m2yrp7iwqm1l9hxkr3d5ny3myhjr8dkyhmw819gvdfhq8",
       "depends": ["Biobase", "CGHbase", "CGHcall", "DNAcopy", "GenomicRanges", "IRanges", "R_utils", "Rsamtools", "future_apply", "matrixStats"]
     },
     "QFeatures": {
       "name": "QFeatures",
-      "version": "1.14.2",
-      "sha256": "1vd1kvx2kr47czz58375msc2x8p155cn0zqr4w7i1v1ki951r3a4",
+      "version": "1.16.0",
+      "sha256": "0c3zv42vb792pn74k1s3hxfhi6vp78nzfvmq5fwa4950bvhfp9s0",
       "depends": ["AnnotationFilter", "Biobase", "BiocGenerics", "IRanges", "MsCoreUtils", "MultiAssayExperiment", "ProtGenerics", "S4Vectors", "SummarizedExperiment", "igraph", "lazyeval", "plotly", "reshape2", "tidyr", "tidyselect"]
     },
     "QSutils": {
       "name": "QSutils",
-      "version": "1.22.0",
-      "sha256": "10z7cmhaqn4cp2lw3xq1mhjcjbph2lsprdz8k9q3qkmxgzl3anik",
+      "version": "1.24.0",
+      "sha256": "1w02369xr15593nc0ri8ivp2p7j247nkjrqgy5ir590cx8yv2z1z",
       "depends": ["BiocGenerics", "Biostrings", "ape", "psych", "pwalign"]
     },
     "QTLExperiment": {
       "name": "QTLExperiment",
-      "version": "1.2.0",
-      "sha256": "1kns5kgfazfyg3bf19hvkqngq4n6xzqww5aya2h8bakl53bzk2sc",
+      "version": "1.4.0",
+      "sha256": "0kspdd7b2a9kkdmhgqwsh19pgv9s7h2vww53krf0azsdc72wddb2",
       "depends": ["BiocGenerics", "S4Vectors", "SummarizedExperiment", "ashr", "checkmate", "collapse", "dplyr", "rlang", "tibble", "tidyr", "vroom"]
     },
     "QUBIC": {
       "name": "QUBIC",
-      "version": "1.32.0",
-      "sha256": "1dqg7vdpmsjd5prswz7g223q0wzwih44k8fz2cy5a83cdc1c7xl2",
+      "version": "1.34.0",
+      "sha256": "130ymhsw0gq7r8f6f0835r1c6594di1f5x2a6f8hl15yi230n0lm",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "biclust"]
     },
     "Qtlizer": {
       "name": "Qtlizer",
-      "version": "1.18.0",
-      "sha256": "0m307wfjqg7rrgsxvphggy1vd3l9l58vknjqnc63j02qr0wsw43m",
+      "version": "1.20.0",
+      "sha256": "0pdk81ja3arvfb5g8h8ybjm6k8idy19mdkly9bl2g0ksn1z3inf3",
       "depends": ["GenomicRanges", "curl", "httr", "stringi"]
     },
-    "QuartPAC": {
-      "name": "QuartPAC",
-      "version": "1.36.0",
-      "sha256": "0ha8gv7a6ia4z2z2r7404hngc1sy269hrpj9gdxwhj7hl15nqs30",
-      "depends": ["Biostrings", "GraphPAC", "SpacePAC", "data_table", "iPAC", "pwalign"]
-    },
     "QuasR": {
       "name": "QuasR",
-      "version": "1.44.0",
-      "sha256": "116qnp7d7z4a56fv6n55yzrdlmma9gwrw234nmy8iapkn5ms3xky",
+      "version": "1.46.0",
+      "sha256": "14c923hhk9pn2a6kslcw5ai5xn50bba43fp9b5p9viaqikgr2nby",
       "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "Rbowtie", "Rhtslib", "Rsamtools", "S4Vectors", "ShortRead", "rtracklayer", "txdbmaker"]
     },
     "QuaternaryProd": {
       "name": "QuaternaryProd",
-      "version": "1.38.0",
-      "sha256": "0bpx4lliz75jh6d2ngrmjc21577aawrcs7lh1k5pwg94jmj03pmg",
+      "version": "1.40.0",
+      "sha256": "0ngxs9xxnwqgwgdv9pm90s8513cn73khjwrzfg8iv4m98bhkjx3l",
       "depends": ["Rcpp", "dplyr", "yaml"]
     },
     "R3CPET": {
       "name": "R3CPET",
-      "version": "1.36.0",
-      "sha256": "12gq5mj6vbkd49slhpgnmwfdl65hr4wip9xbqx3j72b0f0yabg1h",
+      "version": "1.38.0",
+      "sha256": "1f0sswwq2iqp29l3hb28aiyvdnx3nsczwi4hgy3nbj1y0x57v7x6",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Hmisc", "IRanges", "RCurl", "Rcpp", "S4Vectors", "clValid", "data_table", "ggbio", "ggplot2", "igraph", "pheatmap", "reshape2"]
     },
     "R453Plus1Toolbox": {
       "name": "R453Plus1Toolbox",
-      "version": "1.54.0",
-      "sha256": "0x5p028x13hygd1b2l4g2dclm9lnwj1hsh6x58hmkpbx27w68rb9",
+      "version": "1.56.0",
+      "sha256": "1nbfrj6r1xf9l16hl88z5g1fxbkasbwbmrs1zfsi1zw8yxhwly9j",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "R2HTML", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TeachingDemos", "VariantAnnotation", "XVector", "biomaRt", "pwalign", "xtable"]
     },
     "R4RNA": {
       "name": "R4RNA",
-      "version": "1.32.0",
-      "sha256": "0cpfngd11zlws756q8cnhy5451kj8hg5ckilvmhndfapkz4w93x1",
+      "version": "1.34.0",
+      "sha256": "0g0lrj5vs2dd3hgm5l0h91hrprzbg02cr5r3kyjqmmzfixr1rzqc",
       "depends": ["Biostrings"]
     },
     "RAIDS": {
       "name": "RAIDS",
-      "version": "1.2.0",
-      "sha256": "0frwaqmbd74gccqj8ibkgkyj1ii7q8qczzmkv9wgi4m0d9m2cy0v",
-      "depends": ["AnnotationDbi", "AnnotationFilter", "BSgenome", "GENESIS", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SNPRelate", "VariantAnnotation", "class", "ensembldb", "gdsfmt", "pROC", "rlang"]
+      "version": "1.4.0",
+      "sha256": "0qp0xhj5nv6991l3j9dkznjlg9dl6x0avwqgw7il30i81s8gjjid",
+      "depends": ["AnnotationDbi", "AnnotationFilter", "BSgenome", "GENESIS", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SNPRelate", "VariantAnnotation", "class", "ensembldb", "gdsfmt", "ggplot2", "pROC", "rlang", "stringr"]
     },
     "RAREsim": {
       "name": "RAREsim",
-      "version": "1.8.0",
-      "sha256": "1d55wfs6rg3mq7x1f2aalgln6vpcb2qfp8fq3yi1ki4ki5dzpb05",
+      "version": "1.10.0",
+      "sha256": "183qp2pnpsqv00v651x9vg4wf1zncx0207daxwxjypnkzs2zdsr3",
       "depends": ["nloptr"]
     },
     "RBGL": {
       "name": "RBGL",
-      "version": "1.80.0",
-      "sha256": "1n6rfrcvlgi6mzz36v9sniqr05xfjzvfdpv4xwsn1xq41326wdv3",
+      "version": "1.82.0",
+      "sha256": "04sy7kgsjvwlzr6r3lnyrk6l7d9jqfqqzlfcs0b90ciq8gldxlw8",
       "depends": ["BH", "graph"]
     },
     "RBM": {
       "name": "RBM",
-      "version": "1.36.0",
-      "sha256": "10q0b86jjpf5ch3xpax6vwkl8cd72djzvij0b6p53as7n8nqxz0p",
+      "version": "1.38.0",
+      "sha256": "19r1yfik2m5yppq9y5kpslbgfhfla6nhird6h7k2harmncc88k06",
       "depends": ["limma", "marray"]
     },
     "RBioFormats": {
       "name": "RBioFormats",
-      "version": "1.4.0",
-      "sha256": "1xwazjipv1yrxyx9mny7j7mmc7mvdlrmvjwy8v3i2hfmf137nlj1",
+      "version": "1.6.0",
+      "sha256": "0vqpr5g6v96gnfpznx09pwzcj4n2230hqh8hiip3m3pbnxicilnx",
       "depends": ["EBImage", "S4Vectors", "rJava"]
     },
     "RBioinf": {
       "name": "RBioinf",
-      "version": "1.64.0",
-      "sha256": "093gd1z1yqyhdqs8s7yyjb2ndf9izp0pnpbglp05599cf053zfnr",
+      "version": "1.66.0",
+      "sha256": "1zx9g3n60xzrrpbslwxi1cmp5rqk5hgj7902swbj5sqgicp23aic",
       "depends": ["graph"]
     },
     "RCAS": {
       "name": "RCAS",
-      "version": "1.30.0",
-      "sha256": "0ll0sj2zyazw0nxbpybq9frmxvmcjkgk3hwp3flnysjxg056dhxg",
+      "version": "1.32.0",
+      "sha256": "0sg3ngb7jwh8gyhmmm7fkxn9ixj590j47rfcfdcnbbk9pwd9y07p",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "cowplot", "data_table", "genomation", "ggplot2", "gprofiler2", "knitr", "pbapply", "pheatmap", "plotly", "plotrix", "proxy", "ranger", "rmarkdown", "rtracklayer", "seqLogo", "txdbmaker"]
     },
     "RCASPAR": {
       "name": "RCASPAR",
-      "version": "1.50.0",
-      "sha256": "1aw2sqq8hmll31aagd6nxndwszxj16plba0v85jk880ycxpnd0hr",
+      "version": "1.52.0",
+      "sha256": "17dzn7gjlkzqskmi6jq11zw419zydkfaw4k7rjm6mlhn5njqhypw",
       "depends": []
     },
     "RCM": {
       "name": "RCM",
-      "version": "1.20.0",
-      "sha256": "03f8gifzqhc5hdppk4lfybj7p3gkqb5jnpsxpf515dd7c5y210gy",
+      "version": "1.22.0",
+      "sha256": "0dgvad2f60l8l5jxgwm084qsh1dx619q641kagjxilg9abhwkzy3",
       "depends": ["DBI", "MASS", "RColorBrewer", "VGAM", "alabama", "edgeR", "ggplot2", "nleqslv", "phyloseq", "reshape2", "tensor", "tseries"]
     },
     "RCSL": {
       "name": "RCSL",
-      "version": "1.12.0",
-      "sha256": "1r103i9v8b5w74b3ad7fr25sgsd0xx5kjrxawbwks57dk9k8m272",
+      "version": "1.14.0",
+      "sha256": "180d278n17n21y1gyvh5dn0x32m8w36h9h9zd7rnxkvkpnv9pc84",
       "depends": ["MatrixGenerics", "NbClust", "Rcpp", "RcppAnnoy", "Rtsne", "SingleCellExperiment", "ggplot2", "igraph", "pracma", "umap"]
     },
     "RCX": {
       "name": "RCX",
-      "version": "1.8.0",
-      "sha256": "0vkh57hcz71h8v8ad1rffjakf4ax1pyh5vvfwfmfnkh19ywfln4i",
+      "version": "1.10.0",
+      "sha256": "1r5yx5w65mk5a9451jp4nqnfjmchf1q9kjqgkrs9blxy5m6dbs2y",
       "depends": ["igraph", "jsonlite", "plyr"]
     },
     "RCy3": {
       "name": "RCy3",
-      "version": "2.24.0",
-      "sha256": "03zmskcb8n87x6m5jlhsh2b0b2qjk91y16fdcj3kz5c1j7zfs18i",
+      "version": "2.26.0",
+      "sha256": "17bclz2bv7xzzx2rgpd89d19vlkkv0i67vcrva0v0gxm1cf4zvs1",
       "depends": ["BiocGenerics", "IRdisplay", "IRkernel", "RColorBrewer", "RCurl", "RJSONIO", "XML", "base64enc", "base64url", "fs", "glue", "gplots", "graph", "httr", "stringi", "uuid"]
     },
     "RCyjs": {
       "name": "RCyjs",
-      "version": "2.26.1",
-      "sha256": "0apqkpcrl7snsaldzranz1sk6zl6vc0rgrdg5h0srkzwdqnx10sh",
+      "version": "2.28.0",
+      "sha256": "139c6mw5hwhaw27n51psy9ygwb9wzd73vc9bdykwnmx7s4r9x63w",
       "depends": ["BiocGenerics", "BrowserViz", "base64enc", "graph", "httpuv"]
     },
     "RDRToolbox": {
       "name": "RDRToolbox",
-      "version": "1.54.0",
-      "sha256": "1lg7z6wy4903fyg1j7x5bjd9l550g05rhx0gc60ki9pwlm7q82hv",
+      "version": "1.56.0",
+      "sha256": "027s328kp3m9x5wgn17j7g944abxyhf9hm9dk9iqiy1m4zjwnfdz",
       "depends": ["MASS", "rgl"]
     },
     "REBET": {
       "name": "REBET",
-      "version": "1.22.0",
-      "sha256": "09wb77d7j1f59mlnqdl9q4nl1qn75a9qq3sfa9k6nvb7x721scl4",
+      "version": "1.24.0",
+      "sha256": "10am2gwl808phnamkd6a2wbsl6k257d73l2gcmshvi8ywziwy5mi",
       "depends": ["ASSET"]
     },
     "REDseq": {
       "name": "REDseq",
-      "version": "1.50.0",
-      "sha256": "15lx6sjw8rm0lrvyjfq3n4nq0r6rlgwvnm6bafd86a1dii934gf8",
+      "version": "1.52.0",
+      "sha256": "0z46k34dcp9k558k79mpl3jjg999j6294h6ly4gvhxa46f2fvxdy",
       "depends": ["AnnotationDbi", "BSgenome", "BSgenome_Celegans_UCSC_ce2", "BiocGenerics", "Biostrings", "ChIPpeakAnno", "IRanges", "multtest"]
     },
     "REMP": {
       "name": "REMP",
-      "version": "1.28.0",
-      "sha256": "1ss4170nxif8942095nk5lv1knqf082i4nlxsr3kyvf8ghqn2gmd",
+      "version": "1.30.0",
+      "sha256": "1fckxyhj3m808r8fqs84jachj1sb6s3dvhvrg1l6vm50yhmr8n51",
       "depends": ["AnnotationHub", "BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "caret", "doParallel", "foreach", "impute", "iterators", "kernlab", "minfi", "org_Hs_eg_db", "ranger", "readr", "rtracklayer", "settings"]
     },
     "RESOLVE": {
       "name": "RESOLVE",
-      "version": "1.6.0",
-      "sha256": "12ax0f3vasppwn5z10fr2mhhaaiyiii5qi3ll4yzsn7qmy02ya52",
-      "depends": ["BSgenome", "BSgenome_Hsapiens_1000genomes_hs37d5", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "MutationalPatterns", "S4Vectors", "data_table", "ggplot2", "glmnet", "gridExtra", "lsa", "nnls", "reshape2"]
-    },
-    "RGMQL": {
-      "name": "RGMQL",
-      "version": "1.24.0",
-      "sha256": "1p7s17i18ql3b8yvg6pmcz62ql18ncd3hqk0rganmahfbd91idby",
-      "depends": ["BiocGenerics", "GenomicRanges", "RGMQLlib", "S4Vectors", "data_table", "dplyr", "glue", "httr", "plyr", "rJava", "rtracklayer", "xml2"]
+      "version": "1.8.0",
+      "sha256": "1n4xz9pjydnm549b75dmygwxwi71r9xpcx2sh9r7zy0z5dzpa9zx",
+      "depends": ["BSgenome", "BSgenome_Hsapiens_1000genomes_hs37d5", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "MutationalPatterns", "RhpcBLASctl", "S4Vectors", "data_table", "ggplot2", "glmnet", "gridExtra", "lsa", "nnls", "reshape2"]
     },
     "RGSEA": {
       "name": "RGSEA",
-      "version": "1.38.0",
-      "sha256": "1jz3m6yvk1mybac5xyhpk9vvssnm9iq1mfk2aj32hv338q7cj8js",
+      "version": "1.40.0",
+      "sha256": "0g3qw2f5qcb0lsqji3f6mrp62gp5xcx1ibvrv0j4mg6pg2hjp6k2",
       "depends": ["BiocGenerics"]
     },
     "RGraph2js": {
       "name": "RGraph2js",
-      "version": "1.32.0",
-      "sha256": "1lb8kbqcimpivpzrxbcnlw8pdjzfq45nhhy7pdq7nvx9r5yrcks2",
+      "version": "1.34.0",
+      "sha256": "0x6isz3kxfrsig04wa8y3jvsjg9hcc9r7cv0sqfb0fpfa5hsp376",
       "depends": ["digest", "graph", "rjson", "whisker"]
     },
     "RITAN": {
       "name": "RITAN",
-      "version": "1.28.0",
-      "sha256": "1jvwvgdqgxlnccf8k2mc1ihg4nasdqbl0pnm7khw3px39b1bnlzl",
+      "version": "1.30.0",
+      "sha256": "0afnaiv3xvnazx94bzmsh4xny6ingbyvasdgdd25m11i5hnhvy0y",
       "depends": ["AnnotationFilter", "BgeeDB", "EnsDb_Hsapiens_v86", "GenomicFeatures", "MCL", "RColorBrewer", "RITANdata", "STRINGdb", "dynamicTreeCut", "ensembldb", "ggplot2", "gplots", "gridExtra", "gsubfn", "hash", "igraph", "knitr", "linkcomm", "plotrix", "png", "reshape2", "sqldf"]
     },
     "RIVER": {
       "name": "RIVER",
-      "version": "1.28.0",
-      "sha256": "0clqr2h7cf00lzj1y405hfyc9i1aadssrzhrzl4wp1r4774rpw4z",
+      "version": "1.30.0",
+      "sha256": "04fdsfi1j8wrxkh5h18jfhgcbl1rvm7igpzxas5j037mfmfl55cl",
       "depends": ["Biobase", "ggplot2", "glmnet", "pROC"]
     },
     "RImmPort": {
       "name": "RImmPort",
-      "version": "1.32.0",
-      "sha256": "0kvl9ivf0y7wjkaj7a5qbn9hv9ghbl00xm55i30p4vsvk8q32h3s",
+      "version": "1.34.0",
+      "sha256": "007klfjgnaimqrplps50r4hfw22b032ynsb032kdx9z2lp5k8a9i",
       "depends": ["DBI", "RSQLite", "data_table", "dplyr", "plyr", "reshape2", "sqldf"]
     },
     "RJMCMCNucleosomes": {
       "name": "RJMCMCNucleosomes",
-      "version": "1.28.0",
-      "sha256": "0w9d61zd6g3c8dp9i68nw8rmbnrf6lfa86m9a7ydkf54w7p33fsk",
+      "version": "1.30.0",
+      "sha256": "069nyidfr6466z8bzcjikhdgfyjxzrh4fh93wvz06rvrj9wb0sgc",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors", "consensusSeekeR"]
     },
     "RLMM": {
       "name": "RLMM",
-      "version": "1.66.0",
-      "sha256": "1ihqlag1gxw08rg1ii2mpxg8gnwsxyg3ggd3k8fjnlqd6zsbvdq9",
+      "version": "1.68.0",
+      "sha256": "00s9k5wylzkqb3256v4g0rnl7340a5fjb9a6m76p1fdhdr3bwcnv",
       "depends": ["MASS"]
     },
     "RLassoCox": {
       "name": "RLassoCox",
-      "version": "1.12.0",
-      "sha256": "14zw0xnssh17c6v4qy3b81qrv453r2ayjnq62d1ix695xl7q2g43",
+      "version": "1.14.0",
+      "sha256": "0n142f0p5z5723jbz52j8psq37xjc081fdqzm48gcwq85cz6gy7c",
       "depends": ["Matrix", "glmnet", "igraph", "survival"]
     },
     "RMassBank": {
       "name": "RMassBank",
-      "version": "3.14.0",
-      "sha256": "05ymkjk6hkilm4wn7qn6dh1gf4pxp3zk339fbi10jri8ar0ilbls",
-      "depends": ["Biobase", "ChemmineOB", "ChemmineR", "MSnbase", "R_utils", "Rcpp", "S4Vectors", "XML", "assertthat", "data_table", "digest", "enviPat", "glue", "httr", "logger", "mzR", "rcdk", "readJDX", "rjson", "webchem", "yaml"]
+      "version": "3.16.0",
+      "sha256": "13c4xd28zyvd903ix9x68684251yzyqpihzsjhr2s2d1dxpw8kga",
+      "depends": ["Biobase", "ChemmineR", "MSnbase", "R_utils", "Rcpp", "S4Vectors", "XML", "assertthat", "data_table", "digest", "dplyr", "enviPat", "glue", "httr", "httr2", "logger", "mzR", "purrr", "rcdk", "readJDX", "readr", "rjson", "tibble", "tidyselect", "webchem", "yaml"]
     },
     "RNAAgeCalc": {
       "name": "RNAAgeCalc",
-      "version": "1.16.0",
-      "sha256": "1h221flwa8b4dchw3b65cx7z11744cljzimqc2pv991dp21bvhnk",
+      "version": "1.18.0",
+      "sha256": "1f4vvx56jfs3ag0z1d815ysg54ff5p5l13cqq2gl9xfq2glqv6qn",
       "depends": ["AnnotationDbi", "SummarizedExperiment", "ggplot2", "impute", "org_Hs_eg_db", "recount"]
     },
     "RNASeqPower": {
       "name": "RNASeqPower",
-      "version": "1.44.0",
-      "sha256": "0jv1cm4j467gjx6j297h60yj7xd4ax71v2rgm65sibswbnxvbfa1",
+      "version": "1.46.0",
+      "sha256": "0990h7zkfspnxmkfb7lb6i4v7g63ja6yvxxr6k5dvg2pzqpd8bdb",
       "depends": []
     },
     "RNAdecay": {
       "name": "RNAdecay",
-      "version": "1.24.0",
-      "sha256": "1bf0mgj1n38wqapabbw9d74s5099sqlpkhb9yd9p8w48hwfdk4nc",
+      "version": "1.26.0",
+      "sha256": "0vqxlncsx686xzdkh5phdaniypb8f5xqf57192qpmw7cimlff729",
       "depends": ["TMB", "ggplot2", "gplots", "nloptr", "scales"]
     },
-    "RNAinteract": {
-      "name": "RNAinteract",
-      "version": "1.52.0",
-      "sha256": "18jxg1wxa4z8ik9g7q3rr6mijrl1vk4b7wnkxs5pll6qz97mh726",
-      "depends": ["Biobase", "ICS", "ICSNP", "RColorBrewer", "abind", "cellHTS2", "geneplotter", "gplots", "hwriter", "lattice", "latticeExtra", "limma", "locfit", "splots"]
-    },
     "RNAmodR": {
       "name": "RNAmodR",
-      "version": "1.18.0",
-      "sha256": "0c4ndc7r3rpk8gmd0n4n5q0x72cz3ja48sq4w3w9ahn05l9qql2v",
+      "version": "1.20.0",
+      "sha256": "01ghazxhl2vgbr215nah46wm5l25ksws69d0lkzbxqv3gbn55q5k",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Modstrings", "RColorBrewer", "ROCR", "Rsamtools", "S4Vectors", "colorRamps", "ggplot2", "matrixStats", "reshape2", "rtracklayer", "txdbmaker"]
     },
     "RNAmodR_AlkAnilineSeq": {
       "name": "RNAmodR.AlkAnilineSeq",
-      "version": "1.18.0",
-      "sha256": "1czaa3y8xzadrj1f8h1y4f0xvpb12s8l64k5lxhvp77s1gcxqcxm",
+      "version": "1.20.0",
+      "sha256": "19ibdmwns9489s42ydym30x0g8g2jhynvayplvw0g24r31q1hkv4",
       "depends": ["BiocGenerics", "GenomicRanges", "Gviz", "IRanges", "RNAmodR", "S4Vectors"]
     },
     "RNAmodR_ML": {
       "name": "RNAmodR.ML",
-      "version": "1.18.0",
-      "sha256": "1xcpjq8w81gw52fjb5ijdlf2k94qwqf6s6c8h6y6rja1csqpkn9i",
+      "version": "1.20.0",
+      "sha256": "10gc7wq2drdbgch09lwn3q1xwkf63z6wlr40kjr9cs3r1lggmn5h",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "RNAmodR", "S4Vectors", "ranger"]
     },
     "RNAmodR_RiboMethSeq": {
       "name": "RNAmodR.RiboMethSeq",
-      "version": "1.18.0",
-      "sha256": "0qcl95c22kwn0prhznk2s97aisapq0pldcvp2mvckh5wi2jqrbbp",
+      "version": "1.20.0",
+      "sha256": "0z2xaf6f5w9sdkvjf3w6yd01faw12wnppsw82770b56q56a16rvb",
       "depends": ["BiocGenerics", "GenomicRanges", "Gviz", "IRanges", "RNAmodR", "S4Vectors"]
     },
     "RNAsense": {
       "name": "RNAsense",
-      "version": "1.18.0",
-      "sha256": "1ynaylwxb1vcwx5g14sw1lz6sidnbhc0gb4z3i8gz1yr32mpnmgl",
+      "version": "1.20.0",
+      "sha256": "0n187h5sw9idzs897c9gvx2wfw9qzlzs2w5a0vkgphfd9jnk29r3",
       "depends": ["NBPSeq", "SummarizedExperiment", "ggplot2", "qvalue"]
     },
     "RNAseqCovarImpute": {
       "name": "RNAseqCovarImpute",
-      "version": "1.2.0",
-      "sha256": "1gy7kmhp7hzv75hi1n8lcgsqqwwr7nm6r50rccqmswky5g6wd9nb",
+      "version": "1.4.0",
+      "sha256": "1w5nzf21yagnzb8m3npf1za970fpnki2vfccziihwg24i8mr1klz",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "dplyr", "edgeR", "foreach", "limma", "magrittr", "mice", "rlang"]
     },
     "ROC": {
       "name": "ROC",
-      "version": "1.80.0",
-      "sha256": "074c6jg0dyr3hckizpg56f8ij8szj43cx6x5bbw7a01xdjdc70yb",
+      "version": "1.82.0",
+      "sha256": "1dmpi47pdxx0zfqvjc8najqr6qgqh6472qnsvycx44ldh5prl4lr",
       "depends": ["knitr"]
     },
     "ROCpAI": {
       "name": "ROCpAI",
-      "version": "1.16.0",
-      "sha256": "1nisrspdl4m6q9hpxhd49dxhfsi27znh4alcvc7gbhlqmbi0q9cs",
+      "version": "1.18.0",
+      "sha256": "0xsfcvc4n4yfyxnzp27jzmw3rlmcgz29aqvr262xf0g49p9j1fxv",
       "depends": ["SummarizedExperiment", "boot", "fission", "knitr"]
     },
     "ROSeq": {
       "name": "ROSeq",
-      "version": "1.16.0",
-      "sha256": "1rs3dfgsm7bznvjyajdkkvi3zdd84barkq78ma09vg02n7x6zkfc",
+      "version": "1.18.0",
+      "sha256": "0p2ws8i3yns98b3nq8w46kd005r994da7fkbnd0sic05af29piqx",
       "depends": ["edgeR", "limma", "pbmcapply"]
     },
     "ROTS": {
       "name": "ROTS",
-      "version": "1.32.0",
-      "sha256": "1s9hr64gpz08j638wlglcmk6c8yyj1hzrgddiphklkapc1asr320",
+      "version": "1.34.0",
+      "sha256": "16prf1kwkgqcal37jhk4s3hz6yzlklxwm2clsmw8jf74n0igp0x0",
       "depends": ["Biobase", "Rcpp"]
     },
     "ROntoTools": {
       "name": "ROntoTools",
-      "version": "2.32.0",
-      "sha256": "0idclyk1dwpmfksf9l9ms4nwpin1flw50bafxa0pqlh9fdj5bz0z",
+      "version": "2.34.0",
+      "sha256": "1yaidmivm4qhm6d1dqzl88wp637wp64pk2agbwykqgxah537j7rs",
       "depends": ["KEGGREST", "KEGGgraph", "Rgraphviz", "boot", "graph"]
     },
     "RPA": {
       "name": "RPA",
-      "version": "1.60.0",
-      "sha256": "0v1jkny311ba43fz7x4i94ddm5hq9281gfj6wkr3disdbxjqgj37",
+      "version": "1.62.0",
+      "sha256": "1xgz995kxw8ydrra7npwsxywy1darm45fhgmmf9hlrkq05cqpjqa",
       "depends": ["BiocGenerics", "BiocStyle", "affy", "phyloseq", "rmarkdown"]
     },
     "RProtoBufLib": {
       "name": "RProtoBufLib",
-      "version": "2.16.0",
-      "sha256": "1vhp43l2iknljy240kzgvckkzbg186nkfdd1m3la9fnf9sqr33z9",
+      "version": "2.18.0",
+      "sha256": "1r9462sx6qfxbvrzzngcahg6mh77giapfvl16qswddn19jh8yc2g",
       "depends": []
     },
     "RRHO": {
       "name": "RRHO",
-      "version": "1.44.0",
-      "sha256": "132mwv1qc32gbdjm8825aqd5l1f64hx78kqcbb6a347ch9c9pmwv",
+      "version": "1.46.0",
+      "sha256": "0hil5s0b1xfl0hh2vsgiw13kdn3qb6bx6wxqv60xx1qgy6sd33y6",
       "depends": ["VennDiagram"]
     },
     "RSVSim": {
       "name": "RSVSim",
-      "version": "1.44.0",
-      "sha256": "1w79dsv2z8i7m58pbih52sfh8adr9gl5j94j4k8vhaj4288jba0d",
+      "version": "1.46.0",
+      "sha256": "0pqzxk26wsnsw6a7nir1nkv3kbyjwc67hyfw829jlipgfbjb0pn5",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "ShortRead"]
     },
     "RSeqAn": {
       "name": "RSeqAn",
-      "version": "1.24.0",
-      "sha256": "0jc2abpjq2w7f22qj9izd98xckz7zsjx516g5ygdrik3r47hgh6x",
+      "version": "1.26.0",
+      "sha256": "14a20xi288c88m5m82qqarnsz6bj2kf20k2r6pxldc9w1y524l2j",
       "depends": ["Rcpp"]
     },
     "RTCA": {
       "name": "RTCA",
-      "version": "1.56.0",
-      "sha256": "078bh47vfkr5a0qvhnjadjzd0ph3pg32dv1r3ssvz9fq8qg4g0hy",
+      "version": "1.58.0",
+      "sha256": "1bvkpg1lj4cmqib3r3i6v477d0sl620g51ihl9ay409c7z3d09k2",
       "depends": ["Biobase", "RColorBrewer", "gtools"]
     },
     "RTCGA": {
       "name": "RTCGA",
-      "version": "1.34.0",
-      "sha256": "1a967id4anjzpdlbdd8a85fvb1z7mcr759pr91aashv12bzzhnk0",
+      "version": "1.36.0",
+      "sha256": "0x6fxfc75gkkvmp9ah7v0c0kg8v9m6jnysygvj76r62bkqziigr4",
       "depends": ["RCurl", "XML", "assertthat", "data_table", "dplyr", "ggplot2", "ggthemes", "htmltools", "knitr", "purrr", "rmarkdown", "rvest", "scales", "stringi", "survival", "survminer", "viridis", "xml2"]
     },
     "RTCGAToolbox": {
       "name": "RTCGAToolbox",
-      "version": "2.34.0",
-      "sha256": "0l4idk6gsrnm7laj1xkm6jwmyy5l90kphm21zk7y33cpnp2ryjwr",
+      "version": "2.36.0",
+      "sha256": "1824p551155qj7g85wb2spp6v77hjl37s86zy9n2zyfkwiwg321y",
       "depends": ["BiocGenerics", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "RCurl", "RJSONIO", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "TCGAutils", "data_table", "httr", "rvest", "stringr"]
     },
     "RTN": {
       "name": "RTN",
-      "version": "2.28.0",
-      "sha256": "09zd8z3wn26r7bamzq17slamydr73aqlx94zi0273npfggcwv4n1",
+      "version": "2.30.0",
+      "sha256": "05kn9lwcg5cmlsg6yi2f4ccp8slcmfgppikk80rp5cvqs9ymhcmm",
       "depends": ["IRanges", "RedeR", "S4Vectors", "SummarizedExperiment", "car", "data_table", "igraph", "limma", "minet", "mixtools", "pheatmap", "pwr", "snow", "viper"]
     },
     "RTNduals": {
       "name": "RTNduals",
-      "version": "1.28.0",
-      "sha256": "0idr55acbdi7bbcds9vp0sjv1px8dsmycll7z92f7l2xrk1mgyhp",
+      "version": "1.30.0",
+      "sha256": "18qzwzjzn97js7ms9pzyvxyj14axplzn4ji5lh2nfvk6biw06ir1",
       "depends": ["RTN"]
     },
     "RTNsurvival": {
       "name": "RTNsurvival",
-      "version": "1.28.0",
-      "sha256": "1545jbis4gpcggw320kkrh7s2dllw4rwpq0qc95zm9v9yjxzzzk6",
+      "version": "1.30.0",
+      "sha256": "02jixshfbk2jxhj1659fmr5bxjqmb71c3pfljl7yff6wsl33a2g6",
       "depends": ["RColorBrewer", "RTN", "RTNduals", "data_table", "dunn_test", "egg", "ggplot2", "pheatmap", "scales", "survival"]
     },
     "RTopper": {
       "name": "RTopper",
-      "version": "1.50.0",
-      "sha256": "14y4qvx5iyiqghw4cwn1k3sn7i788iakfzssl0gqal0r6npdh9ib",
+      "version": "1.52.0",
+      "sha256": "0qxbapwky27zc75sjsm2msqp0nrwvqfx4n386z7jlp4hqbj992wq",
       "depends": ["Biobase", "limma", "multtest"]
     },
     "RUVSeq": {
       "name": "RUVSeq",
-      "version": "1.38.0",
-      "sha256": "0i91kjwransy6l217rmxfzfchb43h1sjk8ygf0y8a3rv6rp7ylfd",
+      "version": "1.40.0",
+      "sha256": "0218z7g8c48lhpgd98kpsqph4pa4pdq35lkpwsbhh9l3bzn4db17",
       "depends": ["Biobase", "EDASeq", "MASS", "edgeR"]
     },
     "RUVcorr": {
       "name": "RUVcorr",
-      "version": "1.36.0",
-      "sha256": "05fga28l65h21b84pn6gn6vrgglnvpblmrz551qj2djrmzda3pn1",
+      "version": "1.38.0",
+      "sha256": "174h0dvm8xaqg7mikmzzc2870gwfnx9bcbbf5ys5ksnifzh8ihz8",
       "depends": ["BiocParallel", "MASS", "bladderbatch", "corrplot", "gridExtra", "lattice", "psych", "reshape2", "snowfall"]
     },
     "RUVnormalize": {
       "name": "RUVnormalize",
-      "version": "1.38.0",
-      "sha256": "109q8cywgzxyc31hzjx73arffdhasblg7wk5gfwqcqfv2120r99c",
+      "version": "1.40.0",
+      "sha256": "0ds9s7xlaz02jrk57gzn4dnalgs2l4gwx1s8rlk806la8zdj25dq",
       "depends": ["Biobase", "RUVnormalizeData"]
     },
     "RVS": {
       "name": "RVS",
-      "version": "1.26.0",
-      "sha256": "10j84lhap7c74scar3gmk983zi6lhl8zvawp9ap46qf8wrpnqp4k",
+      "version": "1.28.0",
+      "sha256": "13f9m4w9dy3j6ayqpysiahmsn8mf03mhrjjcq094g58nqxpqly8s",
       "depends": ["GENLIB", "R_utils", "gRain", "kinship2", "snpStats"]
     },
     "RadioGx": {
       "name": "RadioGx",
-      "version": "2.8.0",
-      "sha256": "0ykw5hm48fh6xqxdfgmjjbqdd5hp4dmhnykg3zkmb9wrcfp4zx7f",
+      "version": "2.10.0",
+      "sha256": "0lcsvbqcw7rf21d5gwis6n055r2j30qh0526j0im70vqyhp4928m",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "assertthat", "caTools", "data_table", "downloader", "magicaxis", "matrixStats", "reshape2", "scales"]
     },
     "RaggedExperiment": {
       "name": "RaggedExperiment",
-      "version": "1.28.1",
-      "sha256": "0xfg88r5nh0qswsfc3mm595jmf2w8s2dr032apd15b3kc40hjlr9",
+      "version": "1.30.0",
+      "sha256": "0np94bh1qxwwmllxsf2hf4vv7lnjmghrjfg1g07kcwfhnmm5n56l",
       "depends": ["BiocBaseUtils", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "S4Vectors", "SummarizedExperiment"]
     },
     "RankProd": {
       "name": "RankProd",
-      "version": "3.30.0",
-      "sha256": "0y9c833zn3l4492cl7b71x5g7q6kr81zh2f3v9x4l52q6mw6l5qh",
+      "version": "3.32.0",
+      "sha256": "0zmsg8cn20jcx8dk3dnn3477k6ncdml548qp4p4g5v17ijs04mym",
       "depends": ["Rmpfr", "gmp"]
     },
     "RareVariantVis": {
       "name": "RareVariantVis",
-      "version": "2.32.0",
-      "sha256": "08siw7yzx1jd3cgg2mirc27ycpk6wdvv4vcwzln1ps35nkhy52in",
+      "version": "2.34.0",
+      "sha256": "0984sk6hhkczvz9b6kkak2v1s1j695if6s321a47z6k0h20ddzpl",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GenomicScores", "IRanges", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "googleVis", "gtools", "phastCons100way_UCSC_hg19"]
     },
     "Rarr": {
       "name": "Rarr",
-      "version": "1.4.0",
-      "sha256": "0ks576wqzywlk07wlb116sjzs1b1103mwrd5410qya13mwq6yx62",
-      "depends": ["R_utils", "httr", "jsonlite", "paws_storage", "stringr"]
+      "version": "1.6.0",
+      "sha256": "0d9nnil8x010p7b96fnzigzs3za4dm8iq9f9j2vz02j0kmlk32x7",
+      "depends": ["BiocGenerics", "DelayedArray", "R_utils", "httr", "jsonlite", "paws_storage", "stringr"]
     },
     "RbcBook1": {
       "name": "RbcBook1",
-      "version": "1.72.0",
-      "sha256": "00y8lzfz7z9zmzrg9qyiwkwbcn2xsg6xiphzjvz02j34ghig43ng",
+      "version": "1.74.0",
+      "sha256": "1b3c8swhkrnf1j1smca8vp4g0kzxv2qrgvf9mm5wraxhnwycdm4q",
       "depends": ["Biobase", "graph", "rpart"]
     },
     "Rbec": {
       "name": "Rbec",
-      "version": "1.12.0",
-      "sha256": "1cf5g2q8ak45ipb0cvgnrqy4s131g9lnchzs6g7mfj7b6ynkgp6d",
+      "version": "1.14.0",
+      "sha256": "12lv7rwsvmxhxzq22d8rxc87xr2n325zz9vfsv5kqwh3cr6y4dnn",
       "depends": ["Rcpp", "dada2", "doParallel", "foreach", "ggplot2", "readr"]
     },
     "Rbowtie": {
       "name": "Rbowtie",
-      "version": "1.44.0",
-      "sha256": "1in3qani4xh5m5zpbny1nbsvh60ahs36bas8hplkdpd8hnhfla56",
+      "version": "1.46.0",
+      "sha256": "0cbdg469796ij1n8l42mp1c30y2r28j7as6q7add38rpfrmj57b7",
       "depends": []
     },
     "Rbowtie2": {
       "name": "Rbowtie2",
-      "version": "2.10.0",
-      "sha256": "1spwpbx1jjfjcxbwjkl64ccp9k8xs6lm828546qddsgp20y3bhgp",
+      "version": "2.12.0",
+      "sha256": "1jk0h0ms984bc5k36vb9z9mldpa70yibxl5ppf5i2q09py7higa7",
       "depends": ["Rsamtools", "magrittr"]
     },
     "Rbwa": {
       "name": "Rbwa",
-      "version": "1.8.0",
-      "sha256": "0qbipwgdfgzdkrlvwmx0nbi8v4frv0r2vl8hd2mypf205mv4qb8b",
+      "version": "1.10.0",
+      "sha256": "1v8l0srjgw29dnp5aln8n44hp4zvvngagz3498rs0930kx2fqrxk",
       "depends": []
     },
     "RcisTarget": {
       "name": "RcisTarget",
-      "version": "1.24.0",
-      "sha256": "1856jnvqacr12j5hnnl4w2abjjd7qvkz7cs8yhbnqpy1896wki0v",
+      "version": "1.26.0",
+      "sha256": "0iggn3p3i36xgl79dbs0nf9nv9cyiap7mlgg2s5q1fx9mni501xw",
       "depends": ["AUCell", "BiocGenerics", "GSEABase", "GenomeInfoDb", "GenomicRanges", "R_utils", "S4Vectors", "SummarizedExperiment", "arrow", "data_table", "dplyr", "tibble", "zoo"]
     },
     "Rcollectl": {
       "name": "Rcollectl",
-      "version": "1.4.0",
-      "sha256": "1i1a8imzdangilmww0r3l75npc19xbija9lj13nbwj1vnwb85cpa",
+      "version": "1.6.0",
+      "sha256": "01ghyjm47xrs1cgfn7kr57kcq9mhfsppc30fwaaw8j5hav0cpmm1",
       "depends": ["ggplot2", "lubridate", "processx"]
     },
     "Rcpi": {
       "name": "Rcpi",
-      "version": "1.40.1",
-      "sha256": "01p3z2ylkxvcyrzd9yizw2niw3fv3kn30is4cniy6r68qhm1msxy",
-      "depends": ["Biostrings", "GOSemSim", "curl", "doParallel", "foreach", "httr2", "rjson", "rlang"]
+      "version": "1.42.0",
+      "sha256": "15rq90391mgcdgjwas4a3kfjjnbazm9hmhffmsmyrhw9b3s3dhjj",
+      "depends": ["Biostrings", "GOSemSim", "curl", "doParallel", "foreach", "httr2", "jsonlite", "rlang"]
     },
     "Rcwl": {
       "name": "Rcwl",
-      "version": "1.20.0",
-      "sha256": "02pxjcf3bbvv4hh2vr796b3pyd8vxh5v4g2bkgicsc0jw40554rr",
+      "version": "1.22.0",
+      "sha256": "0z9wh5cgi4zx3qxr10ly02h8qg27fphjp0fid9wlxpicrvq13b9w",
       "depends": ["BiocParallel", "DiagrammeR", "R_utils", "S4Vectors", "basilisk", "batchtools", "codetools", "shiny", "yaml"]
     },
     "RcwlPipelines": {
       "name": "RcwlPipelines",
-      "version": "1.20.0",
-      "sha256": "1bivrgd9f431spg0gv1achs258rmyxcnggn7zh63z2nlskxx3pp1",
+      "version": "1.22.0",
+      "sha256": "1l9rn16cz9hl9n1h59zps4zn5gkc9l0cm8v15pcghqh1fnrsa0mg",
       "depends": ["BiocFileCache", "Rcwl", "S4Vectors", "git2r", "httr", "rappdirs"]
     },
     "Rdisop": {
       "name": "Rdisop",
-      "version": "1.64.0",
-      "sha256": "1gcg441mp6bdnzjkh4gg6zgjn4hnw5i8mdcvb1hfim4hsc7sdsxv",
+      "version": "1.66.0",
+      "sha256": "04w3cdk110n9cx6rzpgrxjz4dl6sghqpjj4hvh37axv7f8p52f02",
       "depends": ["Rcpp"]
     },
     "ReUseData": {
       "name": "ReUseData",
-      "version": "1.4.0",
-      "sha256": "1dai0mxsnjmr6gs465mljfnydai276i5zjjbgxphgas1z3iv9sz6",
+      "version": "1.6.0",
+      "sha256": "1jq1zyh0fy7cdjmiq4332gwfvh5c8s29x795jczgkjp7br4zaf5j",
       "depends": ["BiocFileCache", "Rcwl", "RcwlPipelines", "S4Vectors", "basilisk", "jsonlite", "yaml"]
     },
-    "ReactomeContentService4R": {
-      "name": "ReactomeContentService4R",
-      "version": "1.12.0",
-      "sha256": "1qqrkki9v3ggwqv88n7w3wp50y4gxvkixrg1sad23vl08jd0rkl6",
-      "depends": ["data_table", "doParallel", "foreach", "httr", "jsonlite", "magick"]
-    },
     "ReactomeGSA": {
       "name": "ReactomeGSA",
-      "version": "1.18.0",
-      "sha256": "188c0vrbq01gy4zhsf9wsg9amjf9434g0fzf3lnwzxdm0xzw2b33",
+      "version": "1.20.0",
+      "sha256": "11y40xxm6h35sjcmlmmlxkfxii3i4sa6zmbxd3zym2ra5hhaak8v",
       "depends": ["Biobase", "RColorBrewer", "dplyr", "ggplot2", "gplots", "httr", "jsonlite", "progress", "tidyr"]
     },
-    "ReactomeGraph4R": {
-      "name": "ReactomeGraph4R",
-      "version": "1.12.0",
-      "sha256": "17xkrqyp5wdsdd0gpplsk3qfsr8sgf1ap0vz6v34xlhbmzdq3rs8",
-      "depends": ["ReactomeContentService4R", "data_table", "doParallel", "foreach", "getPass", "jsonlite", "magrittr", "neo4r", "purrr", "rlang"]
-    },
     "ReactomePA": {
       "name": "ReactomePA",
-      "version": "1.48.0",
-      "sha256": "0i5jrdzg6zcs1jx0lryq8d467lxi1hvd1x6p74ywwxga88p46zk6",
-      "depends": ["AnnotationDbi", "DOSE", "enrichplot", "ggplot2", "ggraph", "graphite", "gson", "igraph", "reactome_db"]
+      "version": "1.50.0",
+      "sha256": "15l2j7jhwr3f024h3px18z9kgva3g0kghgwm8gy9dp5ljdz68d4w",
+      "depends": ["AnnotationDbi", "DOSE", "enrichplot", "ggplot2", "ggraph", "graphite", "gson", "igraph", "reactome_db", "yulab_utils"]
     },
     "ReadqPCR": {
       "name": "ReadqPCR",
-      "version": "1.50.0",
-      "sha256": "1bv65my3azx1v16qdcb5s0bycykdga6kfpvhj8av6g0cyrq6xj8y",
+      "version": "1.52.0",
+      "sha256": "0j0d65yp8z9mx6j1s66wj2cvj1ms8pwc2i3jjarhpbbvsg1lwsda",
       "depends": ["Biobase"]
     },
     "RedeR": {
       "name": "RedeR",
-      "version": "3.0.0",
-      "sha256": "1x4435mcm4f8w5a7y54269f3npwxz26347v77ngmnjj32nfch8l9",
+      "version": "3.2.0",
+      "sha256": "08zjh71si6dp2dmf03lbnxm1alq5yy5pkik06a0d2hsjp1jmikxl",
       "depends": ["igraph", "scales"]
     },
     "RedisParam": {
       "name": "RedisParam",
-      "version": "1.6.0",
-      "sha256": "1j4h509gl9grgy8npj2fxnvm2kx0q41bcfid26v7p91c6i33gzsj",
+      "version": "1.8.0",
+      "sha256": "1flb5r16x5n5c0y08gyr86apa2hn8jz0vd8kf7m6k412cy2sm8q3",
       "depends": ["BiocParallel", "futile_logger", "redux", "withr"]
     },
     "RegEnrich": {
       "name": "RegEnrich",
-      "version": "1.14.0",
-      "sha256": "1gma0xsw72pi3shxlnvx3ynkvys2hv3g95gx2x0whdsarxwki34h",
+      "version": "1.16.0",
+      "sha256": "0l419ymjwj2r8113xl3nr5njrch5wy9ny7rspikiy15w36xyy02x",
       "depends": ["BiocParallel", "BiocSet", "BiocStyle", "DESeq2", "DOSE", "S4Vectors", "SummarizedExperiment", "WGCNA", "dplyr", "fgsea", "ggplot2", "limma", "magrittr", "randomForest", "reshape2", "tibble"]
     },
     "RegionalST": {
       "name": "RegionalST",
-      "version": "1.2.0",
-      "sha256": "0gzc1m6ds6bnkq26bpq9i0mbpyw2biwnn07d30cdzipfsxbjdhlk",
-      "depends": ["BayesSpace", "RColorBrewer", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "TOAST", "assertthat", "colorspace", "dplyr", "fgsea", "ggplot2", "gridExtra", "magrittr", "scater", "shiny", "tibble"]
+      "version": "1.4.2",
+      "sha256": "1mc2gx8cf2d91cf7r71pmbim0wmfd38i9ldavwakajvq7j0s4pw4",
+      "depends": ["BayesSpace", "BiocStyle", "RColorBrewer", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "TOAST", "assertthat", "colorspace", "dplyr", "fgsea", "ggplot2", "gridExtra", "magrittr", "scater", "shiny", "tibble"]
     },
     "RepViz": {
       "name": "RepViz",
-      "version": "1.20.0",
-      "sha256": "1rww94wdpswy27i26zn25g8j2s1l14xmljhkz6fl45jmkfn4cqxa",
+      "version": "1.22.0",
+      "sha256": "1rysb9f8jqy5l7ywn4i7yg6323rri6a40rfibxj4a0il54h4a275",
       "depends": ["GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "biomaRt"]
     },
     "Repitools": {
       "name": "Repitools",
-      "version": "1.50.0",
-      "sha256": "1ypiiwi7kp5j8ayz3c9b1gzsy7kd1iw3zv35hrg7pb5fry63dg9g",
+      "version": "1.52.0",
+      "sha256": "0pbr9dj2v7nyv8c9synx6k5w3yj28k02m8jlfjc9yhly56qz95yr",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "DNAcopy", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Rsamtools", "Rsolnp", "S4Vectors", "cluster", "edgeR", "gplots", "gsmoothr", "rtracklayer"]
     },
     "ReportingTools": {
       "name": "ReportingTools",
-      "version": "2.44.0",
-      "sha256": "0vq46dj2v3imjmf6cw8mab6k9v4rrc5r2vh100jjlsm3z15gvl17",
+      "version": "2.46.0",
+      "sha256": "1w749cn04lkicdb5p9xw4zs2i7i6810m8wm10lpvcby66lja1d7l",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Category", "DESeq2", "GOstats", "GSEABase", "IRanges", "PFAM_db", "R_utils", "XML", "annotate", "edgeR", "ggbio", "ggplot2", "hwriter", "knitr", "lattice", "limma"]
     },
     "ResidualMatrix": {
       "name": "ResidualMatrix",
-      "version": "1.14.1",
-      "sha256": "1zq75i20kv0lgnh19zbhw5khxrag627ynqjvh3rj5kxbhj1l2z7c",
+      "version": "1.16.0",
+      "sha256": "0kxazkh6hz1x5jj1j2n3rww3jknb4nmgj8pjmj3jpqq0sb1gf292",
       "depends": ["DelayedArray", "Matrix", "S4Vectors"]
     },
     "Rfastp": {
       "name": "Rfastp",
-      "version": "1.14.0",
-      "sha256": "1zk2zm08nv8i9q39s7dbppd3pk5kxki17x00971wwsfvl261hnsy",
+      "version": "1.16.0",
+      "sha256": "1pa9qiix3bajxsdibkx6l0y8qq0livk86r91d4idm6pl6l1jxncb",
       "depends": ["Rcpp", "Rhtslib", "ggplot2", "reshape2", "rjson", "zlibbioc"]
     },
     "RgnTX": {
       "name": "RgnTX",
-      "version": "1.6.0",
-      "sha256": "15mw5j8wjbzygqj1v5pqh0dz6n37y55p08yi884hpw7sn9dwkfsw",
+      "version": "1.8.0",
+      "sha256": "0sps5c621k3vlq492ijly9w9450hsymdgg2hrnvk2ggw4i7zjq3m",
       "depends": ["GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "ggplot2", "regioneR"]
     },
     "Rgraphviz": {
       "name": "Rgraphviz",
-      "version": "2.48.0",
-      "sha256": "09i174a867vqyb6677sj88lk6bpfc4ajsmjgjkd7f7q66j46q655",
+      "version": "2.50.0",
+      "sha256": "0jljp88rxdq16b1976g77ix5x61ajr60fjf20wp9j17x4q9h2c1p",
       "depends": ["graph"]
     },
     "Rhdf5lib": {
       "name": "Rhdf5lib",
-      "version": "1.26.0",
-      "sha256": "0q4ix3nzr69pmwm6vdna51yxlqi8frch0xyv6wmiy35n67d4fcab",
+      "version": "1.28.0",
+      "sha256": "0l9hq7444azc72h3185qch053a9rvm89aagisrsn01k5c32jwk9r",
       "depends": []
     },
     "Rhisat2": {
       "name": "Rhisat2",
-      "version": "1.20.0",
-      "sha256": "0a7k9p08gq537275r7dfzh34ycxx8h4fmac74jimwhsa420793r5",
+      "version": "1.22.0",
+      "sha256": "1gmkr0k6qlp3cp4pkankasv098rf7bjrw5bm905w5m4mzw0r1sai",
       "depends": ["GenomicRanges", "SGSeq", "txdbmaker"]
     },
     "Rhtslib": {
       "name": "Rhtslib",
-      "version": "3.0.0",
-      "sha256": "0497b43wxcfqyr4k30f0xq7yillb4fz0gqiqxxp66gvnqv4wiv6v",
+      "version": "3.2.0",
+      "sha256": "099j1hmmqqs6v5gffxxvizv784ildadqg6kicfshb45ykc8kkvzm",
       "depends": ["zlibbioc"]
     },
     "RiboCrypt": {
       "name": "RiboCrypt",
-      "version": "1.10.0",
-      "sha256": "0ay8yl1fc4iizina4aqvyjr6iqpc7dr457l7w4p3849d3i160304",
+      "version": "1.12.0",
+      "sha256": "0in80q3b0h0ih2yjw990p3fy59bjf92aczywh9ari7s3qmjaickr",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "NGLVieweR", "ORFik", "RCurl", "bslib", "data_table", "dplyr", "ggplot2", "htmlwidgets", "httr", "jsonlite", "knitr", "markdown", "plotly", "rlang", "shiny", "shinycssloaders", "shinyhelper", "shinyjqui", "stringr"]
     },
     "RiboDiPA": {
       "name": "RiboDiPA",
-      "version": "1.12.0",
-      "sha256": "0an2hbjzi514kb0m4l8i46w4zyxp510vw2f3xdmldjdyv5yw4v1z",
+      "version": "1.14.0",
+      "sha256": "1p5d5z6g9yc060sp00kkkyi03b01gh463qyvbwhj7fcd0l6z2399",
       "depends": ["BiocFileCache", "BiocGenerics", "DESeq2", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "data_table", "doParallel", "elitism", "foreach", "ggplot2", "matrixStats", "qvalue", "reldist", "txdbmaker"]
     },
     "RiboProfiling": {
       "name": "RiboProfiling",
-      "version": "1.34.0",
-      "sha256": "0h0sxmg4knsarh7w7dnp539cs9sfxjw4413q1yyyz3gbi23bzww4",
+      "version": "1.36.0",
+      "sha256": "1lw88kw3wqzqb5ahq6p9zchqbkq7f2hm8djngq1r81ydjdmnih3p",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "data_table", "ggbio", "ggplot2", "plyr", "reshape2", "rtracklayer", "sqldf"]
     },
     "Rmagpie": {
       "name": "Rmagpie",
-      "version": "1.60.0",
-      "sha256": "146db5sz1kkgpwdarll8ca6ndb0l48hxnfi7cp39zllrhwfmwzdm",
+      "version": "1.62.0",
+      "sha256": "11qmda8w5na9hfjnhdgbycvpgvzwj956qav5i8l39r2p9vrajli9",
       "depends": ["Biobase", "e1071", "kernlab", "pamr"]
     },
     "Rmmquant": {
       "name": "Rmmquant",
-      "version": "1.22.0",
-      "sha256": "1jshnr4xph4glrk0pl3r8pklxnzg495m74yx25xjqg8avwahwvw4",
+      "version": "1.24.0",
+      "sha256": "1glgrwf1bb0lm31fsq0jil866b1xqd2gv75nc2fapnbmvkcc65gj",
       "depends": ["BiocStyle", "DESeq2", "GenomicRanges", "Rcpp", "S4Vectors", "SummarizedExperiment", "TBX20BamSubset", "TxDb_Mmusculus_UCSC_mm9_knownGene", "apeglm", "devtools", "org_Mm_eg_db"]
     },
     "RnBeads": {
       "name": "RnBeads",
-      "version": "2.22.0",
-      "sha256": "0v7dzmbyskq0vmja09dncg1g50dl3iycg883swb7lfvi4xzr42vj",
+      "version": "2.24.0",
+      "sha256": "006kmfg1lysa9z9cbc507l54xh1apslrxxk41w65zp7bqkhs2zj9",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "cluster", "ff", "fields", "ggplot2", "gplots", "gridExtra", "illuminaio", "limma", "matrixStats", "methylumi", "plyr"]
     },
     "RnaSeqSampleSize": {
       "name": "RnaSeqSampleSize",
-      "version": "2.14.0",
-      "sha256": "0zfmrpfnz8bka6z4408bl5mzv1yr7648qizy8b93qc903vx3zhvs",
+      "version": "2.16.0",
+      "sha256": "1lrcqpcclc1a77vbqpwlq31nv7v0x357rkwmw5ybfx8b5bwivqsw",
       "depends": ["KEGGREST", "Rcpp", "RnaSeqSampleSizeData", "SummarizedExperiment", "biomaRt", "dplyr", "edgeR", "ggplot2", "ggpubr", "heatmap3", "matlab", "recount", "tidyr", "tidyselect"]
     },
     "Rnits": {
       "name": "Rnits",
-      "version": "1.38.0",
-      "sha256": "1c4l6flfyamnjhb3givw4icx6cbl2pnrvscalrywyhxpqk64cirv",
+      "version": "1.40.0",
+      "sha256": "1s848gr4vmwhl74ar1fam260cwd5ffba2qj2ssfnbvzr9mp16ydg",
       "depends": ["Biobase", "affy", "boot", "ggplot2", "impute", "limma", "qvalue", "reshape2"]
     },
     "RolDE": {
       "name": "RolDE",
-      "version": "1.8.0",
-      "sha256": "11ishff55z086qgc28vxamc5blfxs95qn758f5cgvf9rfr8h64rz",
+      "version": "1.10.0",
+      "sha256": "1pc5lysp9diazskcw8sn969i5iibksbhwff2kfnxzjgxhw3h2c5s",
       "depends": ["ROTS", "SummarizedExperiment", "doParallel", "doRNG", "foreach", "matrixStats", "nlme", "qvalue", "rngtools"]
     },
     "Rqc": {
       "name": "Rqc",
-      "version": "1.38.0",
-      "sha256": "0szd5ygcvpaiwqss8galxzxpslpfh93rk42s865v0qpv0s9v9x0l",
+      "version": "1.40.0",
+      "sha256": "061nrck7d8499bc92m24fv7zyyb98lwjrqrbpmab0pa79vh2q1zz",
       "depends": ["BiocGenerics", "BiocParallel", "BiocStyle", "Biostrings", "GenomicAlignments", "GenomicFiles", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "ShortRead", "biovizBase", "ggplot2", "knitr", "markdown", "plyr", "reshape2", "shiny"]
     },
     "Rsamtools": {
       "name": "Rsamtools",
-      "version": "2.20.0",
-      "sha256": "04lz0dzwmgi8j9wyspbmjln6yb5fv4f538nqyrfd31d0g16937b8",
+      "version": "2.22.0",
+      "sha256": "0wqh1spqmf30cv3v0v5bawpjwfjrlnxz2n8cc0a11c2kbbdxrnr5",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rhtslib", "S4Vectors", "XVector", "bitops", "zlibbioc"]
     },
     "Rsubread": {
       "name": "Rsubread",
-      "version": "2.18.0",
-      "sha256": "0nd5b1k0dsxpf93wqx01fgbvk40jcfs7b7w692bsx620lm42ipfg",
+      "version": "2.20.0",
+      "sha256": "1n7pvx30sm6fxmydn33v2cr1nlrbdd8kqzg6pw9l78zaydqbl8r3",
       "depends": ["Matrix"]
     },
     "Rtpca": {
       "name": "Rtpca",
-      "version": "1.14.0",
-      "sha256": "1prrc1ys74pfr0cgn9qx2is9zzpybvapi34xp1yxnq1xcgynkrxv",
+      "version": "1.16.0",
+      "sha256": "1kznxx9l61gdcbdzxxckgmbf3m9gjcm416jbz78cqjvismbq07m3",
       "depends": ["Biobase", "dplyr", "fdrtool", "ggplot2", "pROC", "tibble", "tidyr"]
     },
     "Rtreemix": {
       "name": "Rtreemix",
-      "version": "1.66.0",
-      "sha256": "0rlhrzpyv95mm9wdqmn2wqqkgb3nm3irqrffba81ip7mn9fmdjsw",
+      "version": "1.68.0",
+      "sha256": "1n5wfwsj6x2rjq0b7ix8yhwsrxbmik55fnsk1681y7xd5krqprgh",
       "depends": ["Biobase", "Hmisc", "graph"]
     },
     "Rvisdiff": {
       "name": "Rvisdiff",
-      "version": "1.2.0",
-      "sha256": "1s4jhg79s2q71v2y5h6ihwr05giyv987kncr22g60frsdsav2hcm",
+      "version": "1.4.0",
+      "sha256": "0l90dykrhjqdww8667i825d0dik44q0bprxz8rwqyb4bc0pwqicq",
       "depends": ["edgeR"]
     },
     "S4Arrays": {
       "name": "S4Arrays",
-      "version": "1.4.1",
-      "sha256": "0wdzp1q6hyks4afm217yl2n770jsqaqxix71imni1r0qbxdfkdwl",
+      "version": "1.6.0",
+      "sha256": "0fjf1q9wlm8n1w8sb9n0yx6s1di33ngk4kanhychy5hqli73v3dh",
       "depends": ["BiocGenerics", "IRanges", "Matrix", "S4Vectors", "abind", "crayon"]
     },
     "S4Vectors": {
       "name": "S4Vectors",
-      "version": "0.42.1",
-      "sha256": "080fr8f4lqzvn73y50wgz19w0a0hvkd9ilwswmv5gi34sihp8795",
+      "version": "0.44.0",
+      "sha256": "0wic4nri42yiasshal96ykxj8skrya5szffnawqzs1kmq2b8zail",
       "depends": ["BiocGenerics"]
     },
     "SAIGEgds": {
       "name": "SAIGEgds",
-      "version": "2.4.1",
-      "sha256": "1nzr62hg99z0zzp0y74nis3xxgjsw2qc4w5xcm8p8j9kh9w7rwzk",
+      "version": "2.6.0",
+      "sha256": "04xvq25mrahqvdw8cvgyn5f81zg34h58gk3ydisc5c10za6hkida",
       "depends": ["CompQuadForm", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "SeqArray", "gdsfmt", "survey"]
     },
+    "SANTA": {
+      "name": "SANTA",
+      "version": "2.42.0",
+      "sha256": "1kkdd8q5ikw1abshg0r1cw7sbxdxvzwfq859g9n5f9j0d4k5ri6q",
+      "depends": ["Matrix", "igraph"]
+    },
     "SARC": {
       "name": "SARC",
-      "version": "1.2.0",
-      "sha256": "11hiz7lzhkp2459c92x0i9kia7yc8zbl7n7c3wd66g2pbzfjzv6f",
+      "version": "1.4.0",
+      "sha256": "0wrpsw5p82i1rwc3hm30x3nk3dhhix619sqskwdxwrzw1nxays9g",
       "depends": ["DescTools", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "RaggedExperiment", "data_table", "ggplot2", "gridExtra", "gtable", "metap", "multtest", "plotly", "plyranges", "reshape2", "scales", "tidyverse"]
     },
     "SBGNview": {
       "name": "SBGNview",
-      "version": "1.18.0",
-      "sha256": "1smxxwyc03m6bbw1l5bzfl6q2g2f93z53z8iyk42lwkfp26zv6i5",
+      "version": "1.20.0",
+      "sha256": "05c65npglqlxpxf20w523mgc1hmhf5w5nr7v30izwpa3vbs6b02n",
       "depends": ["AnnotationDbi", "KEGGREST", "Rdpack", "SBGNview_data", "SummarizedExperiment", "bookdown", "httr", "igraph", "knitr", "pathview", "rmarkdown", "rsvg", "xml2"]
     },
     "SBMLR": {
       "name": "SBMLR",
-      "version": "2.0.0",
-      "sha256": "1h0pwlq229hbvh6ab2sjv67zd24i15xn4jh7k8s64faw4gw8ji14",
+      "version": "2.2.0",
+      "sha256": "0w87dg2q96mhril91m8sksnq5304g4rpxi9y6v65kgz0b5yf7a55",
       "depends": ["XML", "deSolve"]
     },
     "SC3": {
       "name": "SC3",
-      "version": "1.32.0",
-      "sha256": "0ylpk7jjqmy7g1s5ah5zwrcmqplhjm0rpnw74kn5mdra3d7xdsnr",
+      "version": "1.34.0",
+      "sha256": "1lkaw29s6vmfhj39frkz55dzn5gnl4y1ww50jd5vh3xg5vvlljmi",
       "depends": ["BiocGenerics", "ROCR", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "WriteXLS", "cluster", "doParallel", "doRNG", "e1071", "foreach", "ggplot2", "pheatmap", "robustbase", "rrcov", "shiny"]
     },
     "SCAN_UPC": {
       "name": "SCAN.UPC",
-      "version": "2.46.0",
-      "sha256": "1awsy1xfsl90yxqc2qir7p51d34jddcqg5q02cc0925w6yqanaci",
+      "version": "2.48.0",
+      "sha256": "0qwbyg9lbmyy0c8h8fy5sh8w8jjwppzjhm13gq0vmbc37zqr4lmi",
       "depends": ["Biobase", "Biostrings", "GEOquery", "IRanges", "MASS", "affy", "affyio", "foreach", "oligo", "sva"]
     },
     "SCANVIS": {
       "name": "SCANVIS",
-      "version": "1.18.0",
-      "sha256": "0nywyi5bp3qgh9xaydhpsdh5nvq0ybfvjqhygrs7lypanj4n1k7p",
+      "version": "1.20.0",
+      "sha256": "0f5wvcrq671jsm0xpmc1d7v9i83v6ang2406hv3lz4qixsqmpb1p",
       "depends": ["IRanges", "RCurl", "plotrix", "rtracklayer"]
     },
     "SCArray": {
       "name": "SCArray",
-      "version": "1.12.0",
-      "sha256": "1a5343azhqfagkf2cbszaisn505aqc49hxki42qb92n5x3bgqbnb",
-      "depends": ["BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "gdsfmt"]
+      "version": "1.14.0",
+      "sha256": "1pf7pjz8zp8p24qnay5rd6pm1blswz8b1caghcv5ac6hq6iiqll0",
+      "depends": ["BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "gdsfmt"]
     },
     "SCArray_sat": {
       "name": "SCArray.sat",
-      "version": "1.4.0",
-      "sha256": "0y94f6rbjzn2jqkww808vysfdk6j3qw81v79w087d3adiywkl9xj",
+      "version": "1.6.0",
+      "sha256": "0hfqsmmdn7ik4mif0p65dvywbral1gx3sl889i3b8vp48fi0yx5n",
       "depends": ["BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "S4Vectors", "SCArray", "Seurat", "SeuratObject", "SummarizedExperiment", "gdsfmt"]
     },
     "SCBN": {
       "name": "SCBN",
-      "version": "1.22.0",
-      "sha256": "0bf18gc9ysi35x73ij4s4r3zmg0vys4hy4gy2x0hkxlrm4gpgx4r",
+      "version": "1.24.0",
+      "sha256": "0vq58kd9hgy5iw1v8nvbv3n5vr3sj8shqwph8f2pd3ihd531j2cx",
       "depends": []
     },
     "SCFA": {
       "name": "SCFA",
-      "version": "1.14.0",
-      "sha256": "1avbvkky6m5f5cbfbhabapidz6ypngddrkg2dss7y0a7gy48634x",
+      "version": "1.16.0",
+      "sha256": "15csa4sh3bj5ycxb03fyn664xqhbca5x2lnkj2gnrfg3xxh9rfpm",
       "depends": ["BiocParallel", "Matrix", "RhpcBLASctl", "cluster", "coro", "glmnet", "igraph", "matrixStats", "psych", "survival", "torch"]
     },
     "SCOPE": {
       "name": "SCOPE",
-      "version": "1.16.0",
-      "sha256": "1x7kad59rav9rrjkqkdfbziflx3bngclz4mwkfkf53yl8km62pw0",
+      "version": "1.18.0",
+      "sha256": "0adxphn2wb2njsxb37i3f5gnf0i0d9gfl053h8r98jg2vb0n2sax",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "DNAcopy", "DescTools", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "doParallel", "foreach", "gplots"]
     },
     "SCnorm": {
       "name": "SCnorm",
-      "version": "1.26.0",
-      "sha256": "11q8g6fmsib4ms2ks003v9qc8n4rzchbcd02xnbah97qgxrmicbm",
+      "version": "1.28.0",
+      "sha256": "04llc5x7m393l3if14a10pkyiagpc8hxb93yi16vpzbw81qyy7cq",
       "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cluster", "data_table", "forcats", "ggplot2", "moments", "quantreg"]
     },
     "SDAMS": {
       "name": "SDAMS",
-      "version": "1.24.0",
-      "sha256": "088k6bxdmkwv4zw8pvj2f4hl4b5jhrmlnvsh9mcqga7pmf5ir96b",
+      "version": "1.26.0",
+      "sha256": "04sq4cwvlv1s048bh4rhf5nhq96p811p07z7ikc77jxjq8g4hwrp",
       "depends": ["SummarizedExperiment", "qvalue", "trust"]
     },
     "SELEX": {
       "name": "SELEX",
-      "version": "1.36.0",
-      "sha256": "0j4y7mijxgkcj89q1qf0ab9rmsaxzmvbxlnpy0x29bam424vzc73",
+      "version": "1.38.0",
+      "sha256": "08swdg8z9qnav7qs8s295h18h0qprkyzs419c605yirhv1v41hhi",
       "depends": ["Biostrings", "rJava"]
     },
     "SEtools": {
       "name": "SEtools",
-      "version": "1.18.0",
-      "sha256": "0j4pn85icyf1jwcfjr8r9049lrhglp3s5ighmcp9hvsjws04scis",
+      "version": "1.20.0",
+      "sha256": "163q5a6i5qj30b97k7iqlm3zhs7r6ps8zvy4yj0a5x8vpq0gpir4",
       "depends": ["BiocParallel", "DESeq2", "Matrix", "S4Vectors", "SummarizedExperiment", "circlize", "data_table", "edgeR", "openxlsx", "pheatmap", "sechm", "sva"]
     },
     "SGCP": {
       "name": "SGCP",
-      "version": "1.4.1",
-      "sha256": "0l16002hzn3myadjkdyj1s7l7kql6f3gd8fjm8rklgs8x6pblk8c",
+      "version": "1.6.0",
+      "sha256": "1zz1az37gyw0mcidhfd5n6khdd0px23an6q6b1wzda452n52lk0y",
       "depends": ["DescTools", "GO_db", "GOstats", "RColorBrewer", "RSpectra", "Rgraphviz", "SummarizedExperiment", "annotate", "caret", "dplyr", "expm", "genefilter", "ggplot2", "ggridges", "graph", "openxlsx", "org_Hs_eg_db", "plyr", "reshape2", "xtable"]
     },
     "SGSeq": {
       "name": "SGSeq",
-      "version": "1.38.0",
-      "sha256": "1i3dg3fn648mzy49m15vbzr3wfnk91xyph5j4sc7ss978l25h17n",
+      "version": "1.40.0",
+      "sha256": "1xchrzd384wzm81vzrcixyzn3mgnd343cp544yvfzfn2vxr4y1ij",
       "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RUnit", "Rsamtools", "S4Vectors", "SummarizedExperiment", "igraph", "rtracklayer"]
     },
     "SIAMCAT": {
       "name": "SIAMCAT",
-      "version": "2.8.0",
-      "sha256": "00l9w395fg6r8p2jzz85x1djlj4h7y86dgs8x5xf14bn1am9q0sh",
+      "version": "2.10.0",
+      "sha256": "13zmjwcxsv3slx8bfy02dix691ajvyacpapkkcwsy7gswym9pirz",
       "depends": ["LiblineaR", "PRROC", "RColorBrewer", "beanplot", "corrplot", "glmnet", "gridBase", "gridExtra", "infotheo", "lgr", "lmerTest", "matrixStats", "mlr3", "mlr3learners", "mlr3tuning", "pROC", "paradox", "phyloseq", "progress", "scales", "stringr"]
     },
     "SICtools": {
       "name": "SICtools",
-      "version": "1.34.0",
-      "sha256": "0ymk18aj4r0526xqqkrvd75p4jrgrq2wshx7mqh2wj7nizjfn8fv",
+      "version": "1.36.0",
+      "sha256": "0jyycm82aw7xfx0h7ngd4nz4s8xfq7ky71nrvbj5m6jb3bkr4hjz",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rsamtools", "doParallel", "matrixStats", "plyr", "stringr"]
     },
     "SIM": {
       "name": "SIM",
-      "version": "1.74.0",
-      "sha256": "01mvdwhbpikpg8vfxr73nsshdr185ds80yjavzss53cwkv6zvp4h",
+      "version": "1.76.0",
+      "sha256": "07xp28qc6kibngc4b0xy20ghxgydj0ksgx7yb92m4rdhca6qfqxl",
       "depends": ["globaltest", "quantreg", "quantsmooth"]
     },
     "SIMAT": {
       "name": "SIMAT",
-      "version": "1.36.0",
-      "sha256": "1gwcr7lfsnzvlx0v93adlxmzdcx9rwfmhacpz3m8q26jm4vjmqib",
+      "version": "1.38.0",
+      "sha256": "1f4lw95sd0pm4mmnjc375cp6j3p630ixapg8jwy2mq9zakagbh9x",
       "depends": ["Rcpp", "ggplot2", "mzR", "reshape2"]
     },
     "SIMD": {
       "name": "SIMD",
-      "version": "1.22.0",
-      "sha256": "1sw7mw4nravw4v9mhfcppnz0867szaynjs10lhpjs2a0p6mll0px",
+      "version": "1.24.0",
+      "sha256": "0pndimzv1qx11djdplfwil6bzs2nhkk0d7gqypxfcnkigprsqpb2",
       "depends": ["edgeR", "methylMnM", "statmod"]
     },
     "SIMLR": {
       "name": "SIMLR",
-      "version": "1.30.0",
-      "sha256": "18mld0yvkmy1znsv3dkch6f8x9h9j20zm3qq84ggw0wsbgrrcm1z",
+      "version": "1.32.0",
+      "sha256": "1qk1wf7xya1b3xsir6xl5q46w2qlsgwdvlshk6v6q75h169gm03x",
       "depends": ["Matrix", "RSpectra", "Rcpp", "RcppAnnoy", "pracma"]
     },
     "SLqPCR": {
       "name": "SLqPCR",
-      "version": "1.70.0",
-      "sha256": "0xr0kjy2bn8cprj4p7c9bi7wsrvfx6bxymnvdz5c50s9hc35h2ky",
+      "version": "1.72.0",
+      "sha256": "0n1z1908p2p9xc44p6cjxvh0k181bzm7zgm8z4sgcahl1g8m5xmh",
       "depends": []
     },
     "SMAD": {
       "name": "SMAD",
-      "version": "1.20.0",
-      "sha256": "0rj4f38nlr3a5fmf0dqhqi7iln78lkvghv4w8yr2kcavnsl4lzar",
+      "version": "1.22.0",
+      "sha256": "0jxiv15z1a48m055rcqgdfyqj006c532zghnq0qg80bjyyw4h80z",
       "depends": ["Rcpp", "RcppAlgos", "dplyr", "magrittr", "tidyr"]
     },
     "SMITE": {
       "name": "SMITE",
-      "version": "1.32.0",
-      "sha256": "0dp4yas2gdwnvvbxdkid61j9c2a32cfcn3iw9nwijp6aqlv9rrv9",
+      "version": "1.34.0",
+      "sha256": "0yf6pr6ch2dlr2jfrhljcr9dzxwr6rkvrmx9dddw4s1vmp3ynymr",
       "depends": ["AnnotationDbi", "BioNet", "Biobase", "GenomicRanges", "Hmisc", "IRanges", "KEGGREST", "S4Vectors", "geneLenDataBase", "ggplot2", "goseq", "igraph", "org_Hs_eg_db", "plyr", "reactome_db", "scales"]
     },
     "SNAGEE": {
       "name": "SNAGEE",
-      "version": "1.44.0",
-      "sha256": "001afmi0hpjih8h8dl5w0llmccgd9g7lrz80fs7m2f3avz9hf2lc",
+      "version": "1.46.0",
+      "sha256": "170ailsf8rdgbixqhpq5g83fm13rshxlnq78z760jslcq8y68dnh",
       "depends": ["SNAGEEdata"]
     },
     "SNPRelate": {
       "name": "SNPRelate",
-      "version": "1.38.0",
-      "sha256": "0znk9vvnahkypmkrx82r1ryp41xr675b4ddpgx0nl3708xhncz5f",
+      "version": "1.40.0",
+      "sha256": "00zspm09zxp52kkivhv1pixndz7gfzb6p7rp5xvkq89qx7a9hsnn",
       "depends": ["gdsfmt"]
     },
     "SNPediaR": {
       "name": "SNPediaR",
-      "version": "1.30.0",
-      "sha256": "1p33fmjdpscc42wicx23xg1jbg2m18msf4rhg9pr52n6yzr42b8v",
+      "version": "1.32.0",
+      "sha256": "01ibz9qgc2v7325nzlmj0ppbqf2jx6lczjazigidr7zhjr48rhjx",
       "depends": ["RCurl", "jsonlite"]
     },
     "SNPhood": {
       "name": "SNPhood",
-      "version": "1.34.0",
-      "sha256": "1jniag2yq67y6s9cw8722a58k86i0nbksc2dxyv3pni2wwdka6r6",
+      "version": "1.36.0",
+      "sha256": "1nn3wdljx5zrsy4gp6pc7bk78fprd00fw599f9wlnb55yikj813c",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "checkmate", "cluster", "data_table", "ggplot2", "gridExtra", "lattice", "reshape2", "scales"]
     },
     "SOMNiBUS": {
       "name": "SOMNiBUS",
-      "version": "1.12.0",
-      "sha256": "0p33r1ibpnln2rn4ls23prg7nmxznki9x7jc7qg3gc5fxip5b9n6",
+      "version": "1.14.2",
+      "sha256": "1dfb7sy8b613agknmi1sa46f7dc701h714b633isx1lajkbmahm9",
       "depends": ["BiocManager", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "VGAM", "annotatr", "bsseq", "data_table", "ggplot2", "mgcv", "reshape2", "rtracklayer", "tidyr", "yaml"]
     },
     "SPEM": {
       "name": "SPEM",
-      "version": "1.44.0",
-      "sha256": "0ysgwvx8wlq3b1qyw5dlsxxglvrmbahf4r98g6shv6y8pj50yhg7",
+      "version": "1.46.0",
+      "sha256": "0y2jf2sfiw5zss6jvirmaib6061bx19pxlk619xz1lb91sxzh9ia",
       "depends": ["Biobase", "Rsolnp"]
     },
     "SPIA": {
       "name": "SPIA",
-      "version": "2.56.0",
-      "sha256": "0ank9y5p21whqfni56kx662cli8508s6l89d83c54nimyn1kqs48",
+      "version": "2.58.0",
+      "sha256": "152iskr8arssvnjzzpgmva03wz1vwadhgm5njl229d7mb2bg5nky",
       "depends": ["KEGGgraph"]
     },
     "SPIAT": {
       "name": "SPIAT",
-      "version": "1.6.2",
-      "sha256": "0if22cin355bq5bz8cn56041h8rszg2wf00sljzcac3mv2k1bgs5",
+      "version": "1.8.0",
+      "sha256": "1q4c7kpnfbkiw3fwg16f2dzf3ygl38jp48mvlh1iymprzlnw408q",
       "depends": ["RANN", "SpatialExperiment", "SummarizedExperiment", "apcluster", "dbscan", "dittoSeq", "dplyr", "ggplot2", "gridExtra", "gtools", "mmand", "pracma", "raster", "reshape2", "rlang", "sp", "spatstat_explore", "spatstat_geom", "tibble", "vroom"]
     },
     "SPLINTER": {
       "name": "SPLINTER",
-      "version": "1.30.0",
-      "sha256": "1x9lak4s7rhllnczr4n7a88haq4a36pmxbrgd2m7v69nyzxlab9w",
+      "version": "1.32.0",
+      "sha256": "06nrhx9xsv8i8xnd9gyk630hk0zxh21q8abb8h64857c20kfs4rg",
       "depends": ["BSgenome_Mmusculus_UCSC_mm9", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "biomaRt", "ggplot2", "googleVis", "plyr", "pwalign", "seqLogo", "stringr"]
     },
     "SPONGE": {
       "name": "SPONGE",
-      "version": "1.26.1",
-      "sha256": "01sfkdd01l78z4p494080pq5f6wa65lp2m9ny5zbls7ibz9jpl48",
+      "version": "1.28.0",
+      "sha256": "0kavc9anlcq62829vpc1ra57c7mgdcriqaypywrr28m4aavi56ji",
       "depends": ["Biobase", "ComplexHeatmap", "MASS", "MetBrewer", "biomaRt", "caret", "cvms", "data_table", "doRNG", "dplyr", "expm", "foreach", "gRbase", "ggplot2", "ggpubr", "ggridges", "glmnet", "igraph", "iterators", "logging", "ppcor", "randomForest", "rlang", "stringr", "tidyr", "tidyverse", "tnet"]
     },
     "SPOTlight": {
       "name": "SPOTlight",
-      "version": "1.8.0",
-      "sha256": "08cnlm6l34gp2spy2x08jr6abm58wrana1930jzwvvgm0mql9nzb",
+      "version": "1.10.0",
+      "sha256": "1cyxll0l1wdzyb9fxh7iagvd6kg7fx0iv7wjcqsczkqa221gqild",
       "depends": ["Matrix", "NMF", "SingleCellExperiment", "ggplot2", "matrixStats", "nnls", "sparseMatrixStats"]
     },
     "SPsimSeq": {
       "name": "SPsimSeq",
-      "version": "1.14.0",
-      "sha256": "09n39bgbx8xkngdc056lz1p20375w7fljmgnkg7vacjvp288y2pi",
+      "version": "1.16.0",
+      "sha256": "0z348rhx5qlhb6yifc71ir7l5pi6p0zmxx9zzxnp2rxm6c587ixm",
       "depends": ["Hmisc", "SingleCellExperiment", "WGCNA", "edgeR", "fitdistrplus", "limma", "mvtnorm", "phyloseq"]
     },
     "SQLDataFrame": {
       "name": "SQLDataFrame",
-      "version": "1.18.0",
-      "sha256": "1fdf6dvrkg5cjnlh9466dnmqjfg7dq7dj06qjc61zyshlvslxlwh",
+      "version": "1.20.0",
+      "sha256": "1j97d37fv43h1n4sxdfglriiivplp6i21q7qk27aphcccpchbyvf",
       "depends": ["BiocGenerics", "DBI", "DelayedArray", "RSQLite", "S4Vectors", "duckdb"]
     },
     "SRAdb": {
       "name": "SRAdb",
-      "version": "1.66.0",
-      "sha256": "0qvqixmn8am90a4n5ydva630kkxr735y6kdcikp1q0k8pxxvbm0j",
-      "depends": ["GEOquery", "RCurl", "RSQLite", "graph"]
+      "version": "1.68.1",
+      "sha256": "02g8vbvh5f7y943djz01p7w3cbj07qd59lmxl5s1642gycjbf801",
+      "depends": ["RCurl", "RSQLite", "R_utils", "graph"]
     },
     "STATegRa": {
       "name": "STATegRa",
-      "version": "1.40.0",
-      "sha256": "1m78hixyjavvryfcyd5g3f898r7hcn1cwdwbv3i2b9yj7z6r7knv",
+      "version": "1.42.0",
+      "sha256": "0bc8c38865i8ch562az4w43kha986x12i9jqn3qja0p539x7zzks",
       "depends": ["Biobase", "MASS", "affy", "calibrate", "edgeR", "foreach", "ggplot2", "gplots", "gridExtra", "limma"]
     },
     "STRINGdb": {
       "name": "STRINGdb",
-      "version": "2.16.4",
-      "sha256": "02fim09w9s38hvgp1g3fxqabd5r2fjysljlfrya2nr17drqkzqyx",
+      "version": "2.18.0",
+      "sha256": "118n30lq01xp7irdxffc5hmym7wini8pfsk2xszh8lwf9ii0l5z9",
       "depends": ["RColorBrewer", "gplots", "hash", "httr", "igraph", "plotrix", "plyr", "png", "sqldf"]
     },
-    "STdeconvolve": {
-      "name": "STdeconvolve",
-      "version": "1.8.0",
-      "sha256": "0pyyxmh4bnavsdw6riv72y5m8l53mfr0lpiy9mh0qn57rlmw5fr9",
-      "depends": ["BiocParallel", "Matrix", "clue", "ggplot2", "mgcv", "reshape2", "scatterpie", "slam", "topicmodels", "viridis"]
-    },
     "SUITOR": {
       "name": "SUITOR",
-      "version": "1.6.0",
-      "sha256": "0wricb7fi87lrmasljhz0l7ya22yq3a2c6654k4v3x11z9zb2pl6",
+      "version": "1.8.0",
+      "sha256": "0446b1jqsanw74qvla4ml10z6f1gdh4njbf58h98dc66lfg6s0x6",
       "depends": ["BiocParallel", "ggplot2"]
     },
     "SVMDO": {
       "name": "SVMDO",
-      "version": "1.4.0",
-      "sha256": "11cn7kffgssbjk307vxjr6i2cs94fn6hhz09dbx5qgg89m4gsdgi",
-      "depends": ["AnnotationDbi", "BSDA", "DOSE", "SummarizedExperiment", "caTools", "caret", "data_table", "dplyr", "e1071", "golem", "klaR", "nortest", "org_Hs_eg_db", "shiny", "shinyFiles", "shinytitle", "sjmisc", "survival"]
+      "version": "1.6.0",
+      "sha256": "1yxdz6hvdrf8i0wm1xa977gfrhwsnl4s750vr09ihm4xizpbh87a",
+      "depends": ["AnnotationDbi", "BSDA", "DOSE", "DT", "SummarizedExperiment", "caTools", "caret", "data_table", "dplyr", "e1071", "golem", "klaR", "nortest", "org_Hs_eg_db", "shiny", "shinyFiles", "shinytitle", "sjmisc", "survival"]
     },
     "SWATH2stats": {
       "name": "SWATH2stats",
-      "version": "1.34.0",
-      "sha256": "052nzh5rhq3sp6vyibbiz2li32lnd5c719kqkdhwjsc8y3pcir00",
+      "version": "1.36.0",
+      "sha256": "05fqp6h6zj65n58qm4irbk2lq5dm338378shzyk0lddlym2j18pb",
       "depends": ["biomaRt", "data_table", "ggplot2", "reshape2"]
     },
     "SamSPECTRAL": {
       "name": "SamSPECTRAL",
-      "version": "1.58.0",
-      "sha256": "05r3gl6ai9x0g8l2zl1p8fz7phklna82w0csvaiy8p5063p71gla",
+      "version": "1.60.0",
+      "sha256": "0hj36h61v5811ic4fgrxzavk8hli42aw4k58wccya1vz36ij65i6",
       "depends": []
     },
     "Scale4C": {
       "name": "Scale4C",
-      "version": "1.26.0",
-      "sha256": "1h2swrs0vj9nzcr748jbk8c4bpnyc0gcq8bn5cyhd8lbd2b9xhv0",
+      "version": "1.28.0",
+      "sha256": "0rkbcw3mqjh29hc06ifpq360kxgyyckgvcd8231nid6dkdahgq7a",
       "depends": ["GenomicRanges", "IRanges", "SummarizedExperiment", "smoothie"]
     },
     "ScaledMatrix": {
       "name": "ScaledMatrix",
-      "version": "1.12.0",
-      "sha256": "0c6sp5nps31ygrr7lxxc2gbg19qsk107v23x8f6acqk1xwlsfppi",
+      "version": "1.14.0",
+      "sha256": "1qkxwpxbcxqk2yifpbqgywrd1vsf53s8bckcfgj7zdh124xhwjwj",
       "depends": ["DelayedArray", "Matrix", "S4Vectors"]
     },
     "Sconify": {
       "name": "Sconify",
-      "version": "1.24.0",
-      "sha256": "07bz9bi71qxaipiw998jshm0wcwllhxfjmdxxxwg520rhmfs1g04",
+      "version": "1.26.0",
+      "sha256": "1ma0brb964z491mcm9x3d2ig51f4rvwvhffvcv18prbn927633f4",
       "depends": ["FNN", "Rtsne", "dplyr", "flowCore", "ggplot2", "magrittr", "readr", "tibble"]
     },
     "ScreenR": {
       "name": "ScreenR",
-      "version": "1.6.0",
-      "sha256": "00zaca403yk2dhsxhch51zcv5iwjgpnpz495ly98wv64hsm8b671",
+      "version": "1.8.0",
+      "sha256": "118m7skvky0nv8an65p79fxi5jwan15ggngs4qhw4kp3aqn3r8ny",
       "depends": ["dplyr", "edgeR", "ggplot2", "ggvenn", "limma", "magrittr", "patchwork", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "SemDist": {
       "name": "SemDist",
-      "version": "1.38.0",
-      "sha256": "03qzsrxwnsb8spfmnsyiyz83r8476lq17n3a8hrm6i13hxdqps29",
+      "version": "1.40.0",
+      "sha256": "11f2cy4n88gx7fc71s84rwly65ay3xpxjijzvknd6ly63l4ijqrw",
       "depends": ["AnnotationDbi", "GO_db", "annotate"]
     },
     "SeqArray": {
       "name": "SeqArray",
-      "version": "1.44.1",
-      "sha256": "0b0i17kwa8141y568k2asiv46hz4z0lwiqjz687d96j6kz3r3zgg",
+      "version": "1.46.0",
+      "sha256": "1a1vjkkr2bhzyjbark7n5wa8grxscwaaz8zpn0qlx7ybj66bvbgj",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "gdsfmt"]
     },
     "SeqGSEA": {
       "name": "SeqGSEA",
-      "version": "1.44.0",
-      "sha256": "0nxrl5ip289hqnp4g85njm55kpk81kr1l87la6r3r5h0qx5x01cy",
+      "version": "1.46.0",
+      "sha256": "13hmmk4s7ihdffq3ab4vxv0xq776b072hjhfag5kh7wv2z676l5x",
       "depends": ["Biobase", "DESeq2", "biomaRt", "doParallel"]
     },
     "SeqGate": {
       "name": "SeqGate",
-      "version": "1.14.0",
-      "sha256": "1qmrjqv9iky9bwq1d6bmmn4wnqlw8g352i154fjhgpwl8zvl75jk",
+      "version": "1.16.0",
+      "sha256": "0f2czbfyvmxb0bmybgwbazl3w9fr6rkkjm7q04dd9lrh0057zgii",
       "depends": ["BiocManager", "GenomicRanges", "S4Vectors", "SummarizedExperiment"]
     },
     "SeqSQC": {
       "name": "SeqSQC",
-      "version": "1.26.0",
-      "sha256": "0xsgr7wfy9qyjffb6spm0szknk3rbcx89k1ypdymybnjmndcslqf",
+      "version": "1.28.0",
+      "sha256": "1d8v0rhvnm41nhan1gsfamm21bkmhrawgkdhqpalcqimma9pkkqm",
       "depends": ["ExperimentHub", "GGally", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SNPRelate", "e1071", "gdsfmt", "ggplot2", "plotly", "reshape2", "rmarkdown"]
     },
     "SeqVarTools": {
       "name": "SeqVarTools",
-      "version": "1.42.0",
-      "sha256": "1mx3b21595n1v1fhy7lv67kdlxc2qdmkj0lm8gdnrs0l5f88jpgy",
+      "version": "1.44.0",
+      "sha256": "0ayxfblsd7739f3k7fs82w98bpx7v9zkgvwnrw42a0mi7923ssrn",
       "depends": ["Biobase", "BiocGenerics", "GWASExactHW", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SeqArray", "data_table", "gdsfmt", "logistf"]
     },
     "SharedObject": {
       "name": "SharedObject",
-      "version": "1.18.0",
-      "sha256": "133bn22q0lbyfr9dmsv462wajmh9v3108w42fc16q97lf9nf2023",
+      "version": "1.20.0",
+      "sha256": "1wmvlqmizas3n3a07v311g85rsglfdd43r7cxipvi3zksm26krfl",
       "depends": ["BH", "BiocGenerics", "Rcpp"]
     },
     "ShortRead": {
       "name": "ShortRead",
-      "version": "1.62.0",
-      "sha256": "0x5iqx2k2xs5rwjch0bpcb8pgc0nhb571991yahdr8hsxwbas3jm",
-      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rhtslib", "Rsamtools", "S4Vectors", "XVector", "hwriter", "lattice", "latticeExtra", "pwalign", "zlibbioc"]
+      "version": "1.64.0",
+      "sha256": "0zqk40r6cvmwqh7izwi57hy4z2fgpfl7crpcpxyvpn7zf82fd8f8",
+      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rhtslib", "Rsamtools", "S4Vectors", "XVector", "hwriter", "lattice", "latticeExtra", "pwalign"]
     },
     "SiPSiC": {
       "name": "SiPSiC",
-      "version": "1.4.3",
-      "sha256": "0h9bd5dcl53m482icwj1yiz3016dy9f54hmqvxn8qjzjhqy9xic2",
+      "version": "1.6.0",
+      "sha256": "13zvzlwksz9hb8pl2c3133nkayfdv74pxmk8sjpr9g6d60aca448",
       "depends": ["Matrix", "SingleCellExperiment"]
     },
     "SigCheck": {
       "name": "SigCheck",
-      "version": "2.36.0",
-      "sha256": "1bnvk2v1mh615xhqab6129bgvv24azq9h9r1n2b3msbadwd0by1d",
+      "version": "2.38.0",
+      "sha256": "0rwi2xx79bkys8pnws6bwmc94yhkyzmsvpw690q0q8k634kmyrf6",
       "depends": ["Biobase", "BiocParallel", "MLInterfaces", "e1071", "survival"]
     },
     "SigFuge": {
       "name": "SigFuge",
-      "version": "1.42.0",
-      "sha256": "1g262p2b0bapzvaknhnklxm6wvy1fdir631p34x433qvlwz9ss9i",
+      "version": "1.44.0",
+      "sha256": "1kxkrk37z2c021nz3jnr5w7pw7gjs8r1v921wcxxrnq838chg96v",
       "depends": ["GenomicRanges", "ggplot2", "matlab", "reshape", "sigclust"]
     },
     "SigsPack": {
       "name": "SigsPack",
-      "version": "1.18.0",
-      "sha256": "1dq3zqbbz5wbw2yf8w1sjgf1kd1nxap808ydvjr63zn10rm6m3vm",
+      "version": "1.20.0",
+      "sha256": "09gcbfab6b7sk3fvvf45r86pcdj76v7s8j5cgkxx60w68i715hqi",
       "depends": ["BSgenome", "Biobase", "Biostrings", "GenomeInfoDb", "GenomicRanges", "SummarizedExperiment", "VariantAnnotation", "quadprog", "rtracklayer"]
     },
     "SimBu": {
       "name": "SimBu",
-      "version": "1.6.0",
-      "sha256": "1may613jla4id0g9w4nxsfqm36ma82gmzykvnifi5hwa63jvi7pb",
+      "version": "1.8.0",
+      "sha256": "1k0yc90cx2h15rvwbq85bim70xcic7q4ww2h9yd0vlywnfs7l99q",
       "depends": ["BiocParallel", "Matrix", "RColorBrewer", "RCurl", "SummarizedExperiment", "basilisk", "data_table", "dplyr", "ggplot2", "phyloseq", "proxyC", "reticulate", "sparseMatrixStats", "tidyr"]
     },
     "SimFFPE": {
       "name": "SimFFPE",
-      "version": "1.16.0",
-      "sha256": "1ccdk4g16bh1j420dspnh6il98j6ck6w2vgmqi82mf6js3cakd2z",
+      "version": "1.18.0",
+      "sha256": "1jjn5nbscxzl4my2v7h0xfrh87bahmmnrczxz3snwq6fkwr6gd43",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rsamtools", "doParallel", "dplyr", "foreach", "truncnorm"]
     },
     "SingleCellAlleleExperiment": {
       "name": "SingleCellAlleleExperiment",
-      "version": "1.0.0",
-      "sha256": "02dp5xcp7h93cl5k65qpwgcd4ygimcv5im9s9zqzpzmsf3q8gd5l",
+      "version": "1.2.0",
+      "sha256": "1grzl7gl5a9gfl03cwq688vy4n1qiqz679q9klynh9mhc7xgnbqd",
       "depends": ["BiocParallel", "DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment"]
     },
     "SingleCellExperiment": {
       "name": "SingleCellExperiment",
-      "version": "1.26.0",
-      "sha256": "09sbk0r9g55x8fbvv5rbrygdw3km4bbrj9x0abqwld2nxnxq1q3n",
+      "version": "1.28.1",
+      "sha256": "1kaxlhfg2c2vdvd1bw24qrxh2ffzxrxmd51znrisrhpvjl7r53jx",
       "depends": ["BiocGenerics", "DelayedArray", "GenomicRanges", "S4Vectors", "SummarizedExperiment"]
     },
     "SingleCellSignalR": {
       "name": "SingleCellSignalR",
-      "version": "1.16.0",
-      "sha256": "0w7zj2fb45hzjx44kgn9qs3ab69v29vpl41nxvy931m32ndl5j04",
+      "version": "1.18.0",
+      "sha256": "1z7i7zxkgab00vqs4d5iwkman3y97805n1z75zxgm52c6fhms2gr",
       "depends": ["BiocManager", "Rtsne", "circlize", "data_table", "edgeR", "foreach", "gplots", "igraph", "limma", "multtest", "pheatmap", "scran", "stringr"]
     },
     "SingleMoleculeFootprinting": {
       "name": "SingleMoleculeFootprinting",
-      "version": "1.12.0",
-      "sha256": "1hyqnzz05f2i0r2b5qs1j58py3b042aiffyd6ns2hkrgnr62yldw",
-      "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "QuasR", "RColorBrewer", "data_table", "plyr"]
+      "version": "2.0.0",
+      "sha256": "1zg6cd7bd99v14sfxcd0j22fh86d33rjpkvcbds69gc6qmmhvgli",
+      "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "QuasR", "RColorBrewer", "S4Vectors", "dplyr", "ggplot2", "ggpointdensity", "ggrepel", "patchwork", "plyr", "plyranges", "rlang", "stringr", "tibble", "tidyr", "tidyverse", "viridis"]
     },
     "SingleR": {
       "name": "SingleR",
-      "version": "2.6.0",
-      "sha256": "0l33bsi1zfj7f4hzlivhh89phhx0qscrwd08c28mqvcyp91mhq16",
-      "depends": ["BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "S4Vectors", "SummarizedExperiment", "beachmat"]
+      "version": "2.8.0",
+      "sha256": "1dlawx0hxnbb955yhbq4ryxv5yi62hgzh5di9vrzx1pi14vnc5nk",
+      "depends": ["BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "S4Vectors", "SummarizedExperiment", "assorthead", "beachmat"]
     },
     "SomaticSignatures": {
       "name": "SomaticSignatures",
-      "version": "2.40.0",
-      "sha256": "0yvn2famnyxkxnw4r1vr0vma6ym9kb343vqgaqkvcp3zpm1fi0p8",
+      "version": "2.42.0",
+      "sha256": "0qvlfcsb4wwk1h0gi0gira7vknpd6jkyzil9z05mbgip9cyn543n",
       "depends": ["Biobase", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "S4Vectors", "VariantAnnotation", "ggbio", "ggplot2", "pcaMethods", "proxy", "reshape2"]
     },
+    "SpaNorm": {
+      "name": "SpaNorm",
+      "version": "1.0.0",
+      "sha256": "0imw7mmzh9yjihdfm74ziwm9fs47k343hz7xp1qvy7wi83vl1jv0",
+      "depends": ["Matrix", "S4Vectors", "SeuratObject", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "edgeR", "ggplot2", "matrixStats", "rlang", "scran"]
+    },
     "SpaceMarkers": {
       "name": "SpaceMarkers",
-      "version": "1.0.0",
-      "sha256": "02pb6jka0irzxmw0bzjns7jfc9jbbslg3c1xxjq1v9zf3s3is21a",
+      "version": "1.2.1",
+      "sha256": "0f9kfz2flhnmj74xjkkrpdg6p0r8lav59bj12lq2mc1jf7apm38q",
       "depends": ["Matrix", "ape", "hdf5r", "jsonlite", "matrixStats", "matrixTests", "qvalue", "rstatix", "spatstat_explore", "spatstat_geom"]
     },
-    "SpacePAC": {
-      "name": "SpacePAC",
-      "version": "1.42.0",
-      "sha256": "0a445gvv0x6c8765p5fjmd21i8ivnqr0jkzz6cczwkds7m0436az",
-      "depends": ["iPAC"]
-    },
     "Spaniel": {
       "name": "Spaniel",
-      "version": "1.18.0",
-      "sha256": "03iil9iyvv9sqmkpi3hn1vqx7a2187h1ng7bzfs302dj9dpcqfaj",
+      "version": "1.20.0",
+      "sha256": "1zhvydmcpnvwwrajmrdznskhln2p2bwlj9kh8v3v4hvz9rzrixpr",
       "depends": ["DropletUtils", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "igraph", "jpeg", "jsonlite", "magrittr", "png", "scater", "scran", "shiny"]
     },
     "SparseArray": {
       "name": "SparseArray",
-      "version": "1.4.8",
-      "sha256": "1ahwv6ih1700h1sccv9wh7hr5bhdif0ji5jbmsprnhjxfgn6xidm",
+      "version": "1.6.0",
+      "sha256": "0bd5f9p94w73c9vwbvlnkvpl11d8jg2c7l6b0pcx4zdxrqv4yi07",
       "depends": ["BiocGenerics", "IRanges", "Matrix", "MatrixGenerics", "S4Arrays", "S4Vectors", "XVector", "matrixStats"]
     },
     "SparseSignatures": {
       "name": "SparseSignatures",
-      "version": "2.14.0",
-      "sha256": "1wq1vs94pw2zb896pn6z1zk67adrqwlhrcy1sp3s3m9jw0yaiqbw",
-      "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "data_table", "ggplot2", "gridExtra", "nnlasso", "nnls", "reshape2"]
+      "version": "2.16.0",
+      "sha256": "1gnnn8vklh3ir7rb03gyh7r9dhr5y9mclsfnr4n9gngwl77glym3",
+      "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "NMF", "RhpcBLASctl", "data_table", "ggplot2", "gridExtra", "nnlasso", "nnls", "reshape2"]
     },
     "SpatialCPie": {
       "name": "SpatialCPie",
-      "version": "1.20.0",
-      "sha256": "0pj6m66a1qw3hi37qa4k7gpl1b8r731v9wflzr0q1yw9gwl99nh8",
+      "version": "1.22.0",
+      "sha256": "0k8sz39jkn1jb86w23xykqyh7zlw9bqqr06x29zwy4vgfb02ll3h",
       "depends": ["SummarizedExperiment", "colorspace", "data_table", "digest", "dplyr", "ggforce", "ggiraph", "ggplot2", "ggrepel", "igraph", "lpSolve", "purrr", "readr", "rlang", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "tibble", "tidyr", "tidyselect", "zeallot"]
     },
     "SpatialDecon": {
       "name": "SpatialDecon",
-      "version": "1.14.0",
-      "sha256": "0p49dwp380d642xkx92wlan70crb3jinsiawnkiif6i6ry7xdxjd",
+      "version": "1.16.0",
+      "sha256": "1kyl04k0cwg8193j22dynigp5m6s394w66j7nbmxlz0gn4sxf5f9",
       "depends": ["Biobase", "GeomxTools", "Matrix", "SeuratObject", "logNormReg", "repmis"]
     },
     "SpatialExperiment": {
       "name": "SpatialExperiment",
-      "version": "1.14.0",
-      "sha256": "0f04azs6wscibcpbmc1m21wjswmgr2b8gvd1n2yavya1li0xxm4r",
+      "version": "1.16.0",
+      "sha256": "02lsz2yag9h94ylwsdbqwvlsdgx6ijz9702hg5prz122jqv7x9l3",
       "depends": ["BiocFileCache", "BiocGenerics", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "magick", "rjson"]
     },
     "SpatialFeatureExperiment": {
       "name": "SpatialFeatureExperiment",
-      "version": "1.6.1",
-      "sha256": "0p7wqhn72p538wrlkd51mac87sjd5bh2k0k9vkvvvpfls02vfx01",
-      "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "DropletUtils", "EBImage", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "data_table", "lifecycle", "rjson", "rlang", "sf", "sfheaders", "spdep", "terra", "zeallot"]
+      "version": "1.8.4",
+      "sha256": "15rh84pd0i1m2i8nx010srgiaq8i7mg837459q7r429hjdciwcvn",
+      "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "DropletUtils", "EBImage", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "data_table", "lifecycle", "rjson", "rlang", "sf", "sfheaders", "spatialreg", "spdep", "terra", "zeallot"]
     },
     "SpatialOmicsOverlay": {
       "name": "SpatialOmicsOverlay",
-      "version": "1.4.0",
-      "sha256": "041kdamj3whw24c6075n0f1xxxba160s3c3kq2z7dqxwzks1k6rz",
+      "version": "1.6.0",
+      "sha256": "0pkfzmjcys257yrixscpzfll6vmr8jmvdc39346j87q5wg9m30gs",
       "depends": ["Biobase", "BiocFileCache", "EBImage", "GeomxTools", "RBioFormats", "S4Vectors", "XML", "base64enc", "data_table", "dplyr", "ggplot2", "ggtext", "magick", "pbapply", "plotrix", "readxl", "scattermore", "stringr"]
     },
     "SpeCond": {
       "name": "SpeCond",
-      "version": "1.58.0",
-      "sha256": "0gj9f0rycd4d8ixmivgy4ijs9pikjyhsj47k5hi8lgk9w7hnk8p4",
+      "version": "1.60.0",
+      "sha256": "1vfh1yyh3card0yap8d7qvbiiy3kyfrw51vpccr4n11lskb6zdbn",
       "depends": ["Biobase", "RColorBrewer", "fields", "hwriter", "mclust"]
     },
     "Spectra": {
       "name": "Spectra",
-      "version": "1.14.1",
-      "sha256": "0mvfndd7n7varrzmv9cd3ygwbdn97x5qcgmzcxc6hr76lnkwp8al",
+      "version": "1.16.0",
+      "sha256": "00jsmbkcwndm82aj6gc3qn0b48niajx8aymijy7cpq3vh6hlxpyr",
       "depends": ["BiocGenerics", "BiocParallel", "IRanges", "MetaboCoreUtils", "MsCoreUtils", "ProtGenerics", "S4Vectors", "fs"]
     },
+    "SpectraQL": {
+      "name": "SpectraQL",
+      "version": "1.0.0",
+      "sha256": "01znp2wmfvmavqw8jlyv2g1172z08by0dx2c9vz0xnzd7bf817kz",
+      "depends": ["MsCoreUtils", "ProtGenerics", "Spectra"]
+    },
     "SpectralTAD": {
       "name": "SpectralTAD",
-      "version": "1.20.0",
-      "sha256": "0rk15gs7bs5xhgl0k5qa0zyh0dcd2pr5qmqcrzvfh49bhbaylqbx",
+      "version": "1.22.0",
+      "sha256": "0kxxpf2yasip6r4dlsanv0j322isryc7j6g1i2lbxlwlsqicwh6d",
       "depends": ["BiocParallel", "GenomicRanges", "HiCcompare", "Matrix", "PRIMME", "cluster", "dplyr", "magrittr"]
     },
     "SpliceWiz": {
       "name": "SpliceWiz",
-      "version": "1.6.2",
-      "sha256": "1n1j7fd8s2jkfh2w9a7101ckib0nmc9303mvnqxsij9x1934182r",
-      "depends": ["AnnotationHub", "BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "NxtIRFdata", "RColorBrewer", "RSQLite", "R_utils", "Rcpp", "RcppProgress", "S4Vectors", "SummarizedExperiment", "data_table", "fst", "genefilter", "ggplot2", "heatmaply", "htmltools", "magrittr", "matrixStats", "ompBAM", "patchwork", "pheatmap", "plotly", "progress", "rhandsontable", "rhdf5", "rtracklayer", "rvest", "scales", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "stringi"]
+      "version": "1.8.0",
+      "sha256": "1givc70wna0r6zr0jx6pw4wwls0q2nn69gn5f2gc4l1nakcjsn0i",
+      "depends": ["AnnotationHub", "BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "NxtIRFdata", "RColorBrewer", "RSQLite", "R_utils", "Rcpp", "RcppProgress", "S4Vectors", "SummarizedExperiment", "data_table", "fst", "genefilter", "ggplot2", "heatmaply", "htmltools", "httr", "magrittr", "matrixStats", "ompBAM", "patchwork", "pheatmap", "plotly", "progress", "rhandsontable", "rhdf5", "rtracklayer", "rvest", "scales", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "stringi"]
     },
     "SplicingFactory": {
       "name": "SplicingFactory",
-      "version": "1.12.0",
-      "sha256": "1iwkkbxviain77a64x41hc97c9bl77ayjpbjpkvmhwjh4hfdl9b7",
+      "version": "1.14.0",
+      "sha256": "053yl2vdgp4hczbahqk290751c58r1ybirrdqfn0kxq64y7kpl5g",
       "depends": ["SummarizedExperiment"]
     },
     "SplicingGraphs": {
       "name": "SplicingGraphs",
-      "version": "1.44.0",
-      "sha256": "1k4j23i7ffw1q18y48jhhj7g5k3vjihq619np2y7p7xc9wv0d45g",
+      "version": "1.46.0",
+      "sha256": "1c9wdxsf54av0dlzah8jgbrxv3r2m2jd75qpfbl37gg6sim3732k",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rgraphviz", "Rsamtools", "S4Vectors", "graph", "igraph"]
     },
     "SpotClean": {
       "name": "SpotClean",
-      "version": "1.6.1",
-      "sha256": "1wq1igfyadmzszacnwx8rfhm82xslzqzjkvx6xigs1fng0c7yn61",
+      "version": "1.8.0",
+      "sha256": "0fiamnh5lx4fp7s75hm6scsgnyfccj3wm4gcgaha6i92d7dpw8ad",
       "depends": ["Matrix", "RColorBrewer", "S4Vectors", "Seurat", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "readbitmap", "rhdf5", "rjson", "rlang", "tibble", "viridis"]
     },
     "SpotSweeper": {
       "name": "SpotSweeper",
-      "version": "1.0.2",
-      "sha256": "058j58178k5c71ivwnb9l8japfldmdk6nqkzyxf9zmh3p9b7zkqz",
+      "version": "1.2.0",
+      "sha256": "1844jy1j6g80j94qn540gcxbwf2i4dwl7gyg2ffsy9hwnk54ws2j",
       "depends": ["BiocNeighbors", "MASS", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "escheR", "ggplot2", "spatialEco"]
     },
+    "StabMap": {
+      "name": "StabMap",
+      "version": "1.0.0",
+      "sha256": "0k9jmys7b80wq94dm6jdl5ss4kn4w5syhx0l1a7qjiqqm1jbmwqf",
+      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "MASS", "Matrix", "MatrixGenerics", "SummarizedExperiment", "abind", "igraph", "slam"]
+    },
     "Statial": {
       "name": "Statial",
-      "version": "1.6.0",
-      "sha256": "0lzr0vc4zl5ryhs17l866w261ya9kxm7hx86g6xv16wr6fbw3mgv",
-      "depends": ["BiocParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "concaveman", "data_table", "dplyr", "ggplot2", "limma", "magrittr", "plotly", "purrr", "ranger", "spatstat_explore", "spatstat_geom", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "1.8.0",
+      "sha256": "0k7iaxkd2q3bqb6jf4w9nwi71qlqczmfm92v9cl86l899acgv15d",
+      "depends": ["BiocParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cluster", "concaveman", "data_table", "dplyr", "ggplot2", "limma", "magrittr", "plotly", "purrr", "ranger", "spatstat_explore", "spatstat_geom", "stringr", "tibble", "tidyr", "tidyselect", "treekoR"]
     },
     "Streamer": {
       "name": "Streamer",
-      "version": "1.50.0",
-      "sha256": "0biizsjg9ysr2d1kyh962znikvgwli0zf0jn8khbs4prakjxmjyn",
+      "version": "1.52.0",
+      "sha256": "09ah00rmdlb914nag8hkvsvkx5k42l4apckdbzsq6cink5qg1yxs",
       "depends": ["BiocGenerics", "RBGL", "graph"]
     },
     "Structstrings": {
       "name": "Structstrings",
-      "version": "1.20.0",
-      "sha256": "1ka9kixhgc9vfar18fzd8vd5ydmdkqa2s6xsmhlh927zrijs3vz9",
+      "version": "1.22.1",
+      "sha256": "02nzkn5iwqqixj92vyfazdxsv7j6hpzkn005gznv11kfkagv9hwn",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "S4Vectors", "XVector", "crayon", "stringi", "stringr"]
     },
     "StructuralVariantAnnotation": {
       "name": "StructuralVariantAnnotation",
-      "version": "1.20.0",
-      "sha256": "0hnpa6ykfasp2hshqdny29dyw6y9dib4rsm379fm7n8iami1rjp1",
+      "version": "1.22.0",
+      "sha256": "1b96zv2ny4anlxpxkda86cg65v8z13mf8h241if6aiks8pq0z7kr",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "assertthat", "dplyr", "pwalign", "rlang", "rtracklayer", "stringr"]
     },
     "SubCellBarCode": {
       "name": "SubCellBarCode",
-      "version": "1.20.0",
-      "sha256": "1r4w6mbzfsgf6bd0x5g8chjqji7dll2vjdvzrlbzgdhb710hmil0",
+      "version": "1.22.0",
+      "sha256": "1akg68b2xs2wr9ry8dhjhksmidsaf66x47kv96ijr8b6klhayg9w",
       "depends": ["AnnotationDbi", "Rtsne", "caret", "e1071", "ggplot2", "ggrepel", "gridExtra", "networkD3", "org_Hs_eg_db", "scatterplot3d"]
     },
     "SummarizedExperiment": {
       "name": "SummarizedExperiment",
-      "version": "1.34.0",
-      "sha256": "02cvgq2vgg0gz1gxkc4vnr9jg4wkj32bl5a1qyv77wnw2b2v5hp0",
+      "version": "1.36.0",
+      "sha256": "1kfkdn57crg9l00bpd2z4ads14nd9c2lh1m1lqbc6kszbxpq9185",
       "depends": ["Biobase", "BiocGenerics", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "S4Arrays", "S4Vectors"]
     },
     "Summix": {
       "name": "Summix",
-      "version": "2.10.0",
-      "sha256": "01ri56flnhca5bkl2j5mc3siqpwhi0771h742xjwssbk1rmcp5im",
+      "version": "2.12.0",
+      "sha256": "0h2zvcbnm8zwaql0jn7zd8ffckgs9llgg4vzd1xjiqzx6kciy8di",
       "depends": ["BEDASSLE", "dplyr", "magrittr", "nloptr", "randomcoloR", "scales", "tibble", "tidyselect", "visNetwork"]
     },
     "SurfR": {
       "name": "SurfR",
-      "version": "1.0.0",
-      "sha256": "0qbvwjcrxkv0as18af6436fi1i19gbvyj22fgglxmbmckxfwv14b",
-      "depends": ["BiocFileCache", "BiocStyle", "DESeq2", "SPsimSeq", "SummarizedExperiment", "TCGAbiolinks", "assertr", "biomaRt", "dplyr", "edgeR", "enrichR", "ggplot2", "ggrepel", "gridExtra", "httr", "knitr", "magrittr", "metaRNASeq", "openxlsx", "rhdf5", "scales", "stringr", "tidyr", "venn"]
+      "version": "1.2.5",
+      "sha256": "0hv5d7s1id54x458bp4hjdy2cd4214ys28bhlx9ixsbzr6xci34i",
+      "depends": ["BiocFileCache", "BiocStyle", "DESeq2", "SPsimSeq", "SummarizedExperiment", "TCGAbiolinks", "assertr", "biomaRt", "dplyr", "edgeR", "ggplot2", "ggrepel", "gridExtra", "httr", "knitr", "magrittr", "metaRNASeq", "openxlsx", "rhdf5", "rjson", "scales", "stringr", "tidyr", "venn"]
     },
     "SwathXtend": {
       "name": "SwathXtend",
-      "version": "2.26.0",
-      "sha256": "11k6a5m73pj49ahync5773w4wbz5mb27nss531nbqj738lnfidv4",
+      "version": "2.28.0",
+      "sha256": "16c08r2vc4z5bwa66w04hskr0mssrk7q7ycnqzfzkybp4c62yrwh",
       "depends": ["VennDiagram", "e1071", "lattice", "openxlsx"]
     },
     "SynExtend": {
       "name": "SynExtend",
-      "version": "1.16.0",
-      "sha256": "1nikkhwyh61mhjxhrg4f1g402rzm9lc7jbaclcpp6v2rmd9dxqmw",
+      "version": "1.18.0",
+      "sha256": "0jhfa5l33kn6mb4ynm3976p9sz4dzr23fnlfazj6j6wsfs1l366r",
       "depends": ["Biostrings", "DBI", "DECIPHER", "IRanges", "RSQLite", "S4Vectors"]
     },
     "SynMut": {
       "name": "SynMut",
-      "version": "1.20.0",
-      "sha256": "075r77ih2k29hl7ccn3v6104fk4spk733ph6jp2zxjimffnj7rj5",
+      "version": "1.22.0",
+      "sha256": "04wcvbppyhrr1gw76gg1p1s1v60cll57rjz7567wqdjnjzzd3g75",
       "depends": ["BiocGenerics", "Biostrings", "seqinr", "stringr"]
     },
     "TADCompare": {
       "name": "TADCompare",
-      "version": "1.14.0",
-      "sha256": "1k80xwbc3h4994f8j5qr52rn2hk2l5qz1196r1kpn6m47h80fq6c",
+      "version": "1.16.0",
+      "sha256": "1svq0h9bwydghsqgmbr239i6df8pyvg26xqvbghv6rl8p12712n5",
       "depends": ["HiCcompare", "Matrix", "PRIMME", "RColorBrewer", "cluster", "cowplot", "dplyr", "ggplot2", "ggpubr", "magrittr", "reshape2", "tidyr"]
     },
     "TAPseq": {
       "name": "TAPseq",
-      "version": "1.16.0",
-      "sha256": "0nz70a68cn8is0hp8srp7clqwwnr045mpibz4yazskia7lhbm73i",
+      "version": "1.18.0",
+      "sha256": "030pcjdbdypj44w6m6byllcnr926psrckz4ycvfalfgx05dncdzs",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "dplyr", "tidyr"]
     },
-    "TBSignatureProfiler": {
-      "name": "TBSignatureProfiler",
-      "version": "1.16.0",
-      "sha256": "1vjd9dwnr6m867d1ax6kwj4w5qs5y81fzrnnjl6xkl2ch3g48jpk",
-      "depends": ["ASSIGN", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "GSVA", "RColorBrewer", "ROCit", "S4Vectors", "SummarizedExperiment", "edgeR", "gdata", "ggplot2", "magrittr", "reshape2", "rlang", "singscore"]
-    },
     "TCC": {
       "name": "TCC",
-      "version": "1.44.0",
-      "sha256": "0j9b6q7h3w7kcpwbc3f9aabj8jrh5hwpx8rnd415rq7fakq3ix6p",
+      "version": "1.46.0",
+      "sha256": "0g0kd1r4rx2418n4vw3wh3g918d5lbh3arxwg509g0a5w6clcaf3",
       "depends": ["DESeq2", "ROC", "edgeR"]
     },
     "TCGAbiolinks": {
       "name": "TCGAbiolinks",
-      "version": "2.32.0",
-      "sha256": "1br2dxi5rvl8z5myrnj4dnfh8xgksrqjyy0fsqh3vjspifvis4ih",
+      "version": "2.34.0",
+      "sha256": "0rrk97956kyd17apjm29fxnqjhbh5mllpfr3y4yf3a3ras9chgw4",
       "depends": ["GenomicRanges", "IRanges", "R_utils", "S4Vectors", "SummarizedExperiment", "TCGAbiolinksGUI_data", "XML", "biomaRt", "data_table", "downloader", "dplyr", "ggplot2", "httr", "jsonlite", "knitr", "plyr", "purrr", "readr", "rvest", "stringr", "tibble", "tidyr", "xml2"]
     },
     "TCGAutils": {
       "name": "TCGAutils",
-      "version": "1.24.0",
-      "sha256": "0fmz1lfpn8ws584q4xlicg897qs36wgr78crw0d9415ci6qqb4r8",
+      "version": "1.26.0",
+      "sha256": "0zspiaj7s9ij466dl25k5lrr1r2gpav2dwpmzhqpqpm0pg436xpg",
       "depends": ["AnnotationDbi", "BiocBaseUtils", "BiocGenerics", "GenomeInfoDb", "GenomicDataCommons", "GenomicFeatures", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "rvest", "stringr", "xml2"]
     },
     "TCseq": {
       "name": "TCseq",
-      "version": "1.28.0",
-      "sha256": "014al1b58rkfy1cqxwf3xgzrbdvqv2x3ac2clqmj1262ygrmiw5v",
+      "version": "1.30.0",
+      "sha256": "0djjsjx5yva9khxpr35a9qrvx1xbd3wbh7ybklgcc2fhhbsz1ir5",
       "depends": ["BiocGenerics", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "cluster", "e1071", "edgeR", "ggplot2", "locfit", "reshape2"]
     },
     "TDbasedUFE": {
       "name": "TDbasedUFE",
-      "version": "1.4.0",
-      "sha256": "1q1ljwwkhkqq2pbzm60kkhyqrqixljcw0vqajbpwk68gmc8sxwyz",
+      "version": "1.6.0",
+      "sha256": "0dl3b4pzmqm22pfvrkb6j2229r72y9j7jibcw1ycd5zvw71l0g60",
       "depends": ["GenomicRanges", "MOFAdata", "rTensor", "readr", "shiny", "tximport", "tximportData"]
     },
     "TDbasedUFEadv": {
       "name": "TDbasedUFEadv",
-      "version": "1.4.0",
-      "sha256": "1iiil5vn95bsldxigjlyqraivrnwlajkn18y0880qinrbfcwpidz",
-      "depends": ["Biobase", "DOSE", "GenomicRanges", "RTCGA", "STRINGdb", "TDbasedUFE", "enrichR", "enrichplot", "hash", "rTensor", "shiny"]
+      "version": "1.6.0",
+      "sha256": "0if9myqv4zkzafnr5h76wkyph63napwv1svg35h7zlih5kxy2i78",
+      "depends": ["Biobase", "DOSE", "GenomicRanges", "RTCGA", "STRINGdb", "TDbasedUFE", "enrichplot", "hash", "rTensor", "shiny"]
     },
     "TEKRABber": {
       "name": "TEKRABber",
-      "version": "1.8.0",
-      "sha256": "0ivbj063awdh41ldj6cl68ydx8y4jv8wzwwxr67iwhxdgpcwlwx8",
+      "version": "1.10.0",
+      "sha256": "0k004jncqvp3vcfmr8y56kj57rc5swqq369nq2zwyr3vacmdq6p8",
       "depends": ["DESeq2", "GenomeInfoDb", "Rcpp", "SCBN", "apeglm", "biomaRt", "doParallel", "dplyr", "foreach", "magrittr", "rtracklayer"]
     },
     "TENxIO": {
       "name": "TENxIO",
-      "version": "1.6.0",
-      "sha256": "1bghch637h2cckkb8czzjnvn4vlh4cjk8izy6079wq8p39zr10fx",
-      "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "GenomeInfoDb", "GenomicRanges", "Matrix", "MatrixGenerics", "RCurl", "R_utils", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "readr"]
+      "version": "1.8.2",
+      "sha256": "1hcs4ga5lmziq1lw19jjj04nhf97v319d8m7jx8llz7jwizri34m",
+      "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "Matrix", "MatrixGenerics", "RCurl", "R_utils", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "readr", "rhdf5"]
     },
     "TEQC": {
       "name": "TEQC",
-      "version": "4.26.0",
-      "sha256": "1cvc4lrnhkr5l5x0cpjmzxj449lmkw337a8gpan73yvj2p0r7axg",
+      "version": "4.28.0",
+      "sha256": "0025hm2m9hpbba1bdc60lb9ar8iij2k3p0hiyfzbvad8gwi7g4x2",
       "depends": ["Biobase", "BiocGenerics", "IRanges", "Rsamtools", "hwriter"]
     },
     "TFARM": {
       "name": "TFARM",
-      "version": "1.26.0",
-      "sha256": "1l2763lxgda628i6abl2hp5ghxzzw1lk3zmd15aibf8rfl9cghha",
+      "version": "1.28.0",
+      "sha256": "17n2mfanifq2h2pkw9qi97ghhhb0rh9y0vbf8wbhh10j056xq6vf",
       "depends": ["GenomicRanges", "arules", "fields", "gplots", "stringr"]
     },
     "TFBSTools": {
       "name": "TFBSTools",
-      "version": "1.42.0",
-      "sha256": "0bmmsgmx7159bdrflykkis0v4z1ixwlnmw1kx0y0kw15lw3cjnsh",
+      "version": "1.44.0",
+      "sha256": "129qkllv3i0pifigw255g3k4b6ki6sf8hql56x2nbm6h64bcfd9c",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "CNEr", "DBI", "DirichletMultinomial", "GenomeInfoDb", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "TFMPvalue", "XML", "XVector", "caTools", "gtools", "pwalign", "rtracklayer", "seqLogo"]
     },
     "TFEA_ChIP": {
       "name": "TFEA.ChIP",
-      "version": "1.24.0",
-      "sha256": "0xn176h7dfb3sbg913xzwj3c2ymzf7i0y2an19zjvynk49xq12ph",
+      "version": "1.26.0",
+      "sha256": "18s89xjzlrick8hln25n7xb3x0rl8c54z6zlpyfw3g2i47l5ya6m",
       "depends": ["GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "biomaRt", "dplyr", "org_Hs_eg_db"]
     },
     "TFHAZ": {
       "name": "TFHAZ",
-      "version": "1.26.0",
-      "sha256": "1d1b1ylrqkskxkmyfjh1334kdmn0j6h5wdwcafaly1rkr4kihpl0",
+      "version": "1.28.0",
+      "sha256": "1nrz1binbvkqmv3b276gs3isxrca7hm3asaqgdasvdbjqidcv96l",
       "depends": ["GenomicRanges", "IRanges", "ORFik", "S4Vectors"]
     },
     "TFutils": {
       "name": "TFutils",
-      "version": "1.24.0",
-      "sha256": "0n0szdh09zr7866pl6y5zps6izlylhh1n20zkv7xsaq91hsw9g52",
+      "version": "1.26.0",
+      "sha256": "1mxk7yf031x75ssxj2icc6ffm22617y6ca1m4why24qqr7yjlzdv",
       "depends": ["AnnotationDbi", "BiocFileCache", "DT", "GSEABase", "Rsamtools", "dplyr", "httr", "magrittr", "miniUI", "org_Hs_eg_db", "readxl", "rjson", "shiny"]
     },
     "TIN": {
       "name": "TIN",
-      "version": "1.36.0",
-      "sha256": "06dmy5yjskaisibbr4qlw7bdbwj8v1b09c28v4wzd86a2554hywp",
+      "version": "1.38.0",
+      "sha256": "1avwkbbl5k8zx526mjkxdqbxl7fz4qnis9v5rmnr2p0gz2jfdgqs",
       "depends": ["WGCNA", "aroma_affymetrix", "data_table", "impute", "squash", "stringr"]
     },
+    "TMSig": {
+      "name": "TMSig",
+      "version": "1.0.0",
+      "sha256": "0lcmkgclx7biydlgmwldgwlxfig4jvw6z04xk6f37983wgn7mr3j",
+      "depends": ["ComplexHeatmap", "GSEABase", "Matrix", "circlize", "data_table", "limma"]
+    },
     "TMixClust": {
       "name": "TMixClust",
-      "version": "1.26.0",
-      "sha256": "0p88kdl9v2q6wabr31v26q0612qcw1q5s71zbanamx0s2xsvyjgh",
+      "version": "1.28.0",
+      "sha256": "1ql8dliniyw0qwqb40z4s7hcz7kgnlmv3vr08czadi0xxjjddag7",
       "depends": ["Biobase", "BiocParallel", "SPEM", "cluster", "flexclust", "gss", "mvtnorm", "zoo"]
     },
     "TOAST": {
       "name": "TOAST",
-      "version": "1.18.0",
-      "sha256": "0srjx9z59a65nhrxbzxzxnkyn28zskc6z4p8drihq1lhw6mvdp4r",
+      "version": "1.20.0",
+      "sha256": "1iv9hfj9qijbvwcphm1l0syac8n7crb78sgb3b2pzvnzg5v71avn",
       "depends": ["EpiDISH", "GGally", "SummarizedExperiment", "corpcor", "doParallel", "ggplot2", "limma", "nnls", "quadprog", "tidyr"]
     },
     "TOP": {
       "name": "TOP",
-      "version": "1.4.0",
-      "sha256": "1lj7a9kry3ca2iz231si0vfxbnib5wqj5x4ldvb1l1wfjhdf4x2p",
+      "version": "1.6.0",
+      "sha256": "0a3vm3pms5vvq0q3b8ard7p057dfrlcjxf0cjhyhlis6gcwi48jk",
       "depends": ["ClassifyR", "Hmisc", "assertthat", "caret", "directPA", "doParallel", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggthemes", "glmnet", "igraph", "latex2exp", "limma", "magrittr", "pROC", "plotly", "purrr", "reshape2", "statmod", "stringr", "survival", "tibble", "tidygraph", "tidyr"]
     },
     "TPP": {
       "name": "TPP",
-      "version": "3.32.0",
-      "sha256": "1pfnk9zfd7d8ysiiawj1xbcq7vck5xs25jy2rz94mpwvgpxkvkif",
+      "version": "3.34.0",
+      "sha256": "0q0rs312bfq6nyri5j2dzzg7v9r38zdmn33zw6rg0id4ig0jb9i0",
       "depends": ["Biobase", "MASS", "RColorBrewer", "RCurl", "VGAM", "VennDiagram", "biobroom", "broom", "data_table", "doParallel", "dplyr", "foreach", "futile_logger", "ggplot2", "gridExtra", "knitr", "limma", "magrittr", "mefa", "nls2", "openxlsx", "plyr", "purrr", "reshape2", "rmarkdown", "stringr", "tibble", "tidyr"]
     },
     "TPP2D": {
       "name": "TPP2D",
-      "version": "1.20.0",
-      "sha256": "1r9fgxd6jx0py4727yzcn73hr3x7rjxmi5yli57wyd07hk0p3w0y",
+      "version": "1.22.0",
+      "sha256": "0h238hqq9p5n2s8jp7679yzvrn9szznmq6wkmfv5c8bsisvn9j0i",
       "depends": ["BiocParallel", "MASS", "RCurl", "doParallel", "dplyr", "foreach", "ggplot2", "limma", "openxlsx", "stringr", "tidyr"]
     },
     "TREG": {
       "name": "TREG",
-      "version": "1.8.0",
-      "sha256": "0yf2fmswkl01ymr1zy23d2xg8j8vb5q28grqb0r83b11rkxhfhqm",
+      "version": "1.10.0",
+      "sha256": "05hc0sishbv5psq7d1i4fqrwlp3lhc85gp6gxxckr8khcx3i8baf",
       "depends": ["Matrix", "SummarizedExperiment", "purrr", "rafalib"]
     },
     "TRESS": {
       "name": "TRESS",
-      "version": "1.10.0",
-      "sha256": "1dv6xr625gr7jf7rk7fxhfyxgkrkc71mdc3fvzi98r23sk1h62xq",
+      "version": "1.12.0",
+      "sha256": "13fs80zi8i408s6y59chkalbdz1jrkdwb3l0n1cr0s21w9rksxq1",
       "depends": ["AnnotationDbi", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "S4Vectors", "matrixStats", "rtracklayer"]
     },
     "TRONCO": {
       "name": "TRONCO",
-      "version": "2.36.0",
-      "sha256": "1dliwyjsvwr6cjf4cp3w7h46ac4fzd7hnfw4nsb330ajdr38ri0y",
+      "version": "2.38.0",
+      "sha256": "1qmhwdnvqz48jgzjhjyba6skmccz6n7rja1yscd1ckrx6c1dc41b",
       "depends": ["RColorBrewer", "R_matlab", "Rgraphviz", "bnlearn", "circlize", "doParallel", "foreach", "gridExtra", "gtable", "gtools", "igraph", "iterators", "scales", "xtable"]
     },
     "TSAR": {
       "name": "TSAR",
-      "version": "1.2.0",
-      "sha256": "1bnyrrc92m4v35ar640pnm1fb3cq3hlp8lpwicrzbv8dvyzsxw43",
+      "version": "1.4.0",
+      "sha256": "03lcgws6pzr7mcyq3gz0xprqr85s94ca1dkpbxnqzs0xr6r4mip3",
       "depends": ["dplyr", "ggplot2", "ggpubr", "jsonlite", "magrittr", "mgcv", "minpack_lm", "openxlsx", "plotly", "readxl", "rhandsontable", "shiny", "shinyWidgets", "shinyjs", "stringr", "tidyr"]
     },
     "TSCAN": {
       "name": "TSCAN",
-      "version": "1.42.0",
-      "sha256": "1s80n1yjmshy59ls607hp8hpq56hllbh0a4mbgvxd8bqh4njfc0j",
-      "depends": ["DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "combinat", "fastICA", "ggplot2", "gplots", "igraph", "mclust", "mgcv", "plyr", "shiny"]
+      "version": "1.44.0",
+      "sha256": "0kcmql4wgi4kwrq1z7mf3zihxx36al5rwnifa43dd6hffd333h8k",
+      "depends": ["DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "TrajectoryUtils", "combinat", "fastICA", "ggplot2", "gplots", "igraph", "mclust", "mgcv", "plyr", "shiny"]
     },
     "TTMap": {
       "name": "TTMap",
-      "version": "1.26.0",
-      "sha256": "0988hy3hr3cf7snj7k7d0gl0w4qg7ssk53pmvvng171b82m6szqw",
+      "version": "1.28.0",
+      "sha256": "1f2gpi15xy7489bwkldgm0ssg8mbigr4lcmmmqcphqdpzd4d4lsl",
       "depends": ["Biobase", "SummarizedExperiment", "colorRamps", "rgl"]
     },
     "TVTB": {
       "name": "TVTB",
-      "version": "1.30.1",
-      "sha256": "1dacdp9rkh47mc1bpz1y0xhrncdc3hwgvi2436wpahra5adcg1mh",
+      "version": "1.32.0",
+      "sha256": "1iksgp3adwa1w62bhim9i1ha31zr3mvlq5za4lw1rzh0fnxfsbjy",
       "depends": ["AnnotationFilter", "BiocGenerics", "BiocParallel", "Biostrings", "GGally", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ensembldb", "ggplot2", "limma", "reshape2"]
     },
     "TargetDecoy": {
       "name": "TargetDecoy",
-      "version": "1.10.0",
-      "sha256": "1gys5v5sb3ypip82q9gw21dg5whllqdhh8i9zy48qrg4mh2jby1s",
+      "version": "1.12.0",
+      "sha256": "0p1l812iip5gk99kcf5dk1p8nr5qwrwgq27jywkp149zwmdmb4xw",
       "depends": ["ggplot2", "ggpubr", "miniUI", "mzID", "mzR", "shiny"]
     },
     "TargetScore": {
       "name": "TargetScore",
-      "version": "1.42.0",
-      "sha256": "124fy7q7y37jxasvnlk8sfkw307qs1wyafxvs3fmb3f3impffxsz",
+      "version": "1.44.0",
+      "sha256": "17yd04dhwamxk5nlrkxpl6qc34ps83wazpsynj58rkbcs8wxgb8x",
       "depends": ["Matrix", "pracma"]
     },
     "TargetSearch": {
       "name": "TargetSearch",
-      "version": "2.6.2",
-      "sha256": "0l3prcqi80g9n823gm2bnpn30r95dbmg5yfvdqwsvd465kyah3hz",
+      "version": "2.8.0",
+      "sha256": "0xbb9vhs1s8am1g5ds7wrq3wrj3x5fg2siq7g4b7dj0785l6dlws",
       "depends": ["assertthat", "ncdf4"]
     },
     "TileDBArray": {
       "name": "TileDBArray",
-      "version": "1.14.0",
-      "sha256": "1hgwcxffg50nfjb3bpl00h7vhmfs1x15ly7sd0lpcnamk7f9c003",
-      "depends": ["DelayedArray", "Rcpp", "S4Vectors", "tiledb"]
+      "version": "1.16.0",
+      "sha256": "1zlbnyd7d8m1qyf6b85fnx68kdswnd9j8zqs3xgq6mxlq732wnw4",
+      "depends": ["DelayedArray", "S4Vectors", "SparseArray", "tiledb"]
     },
     "TissueEnrich": {
       "name": "TissueEnrich",
-      "version": "1.24.1",
-      "sha256": "02amlvaf5v30x2swxhi4na4c623v00gb3q1bvlcqias9gaaizzim",
+      "version": "1.26.0",
+      "sha256": "1jzncpyl6b7x6njndbwq8989l9a0rrjsbx9xap16mmdw7bfldz7c",
       "depends": ["GSEABase", "SummarizedExperiment", "dplyr", "ggplot2", "tidyr"]
     },
     "TitanCNA": {
       "name": "TitanCNA",
-      "version": "1.42.0",
-      "sha256": "18ihvqn07g677r3facf43m69bnjx4i0s6w41h4mdn82hal0pfsx0",
+      "version": "1.44.0",
+      "sha256": "0c4ynjbsaf9wjsmpq6byv427dcj04icqlqpzcv7z7mlmk1a25h61",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "VariantAnnotation", "data_table", "dplyr", "foreach"]
     },
+    "TnT": {
+      "name": "TnT",
+      "version": "1.28.0",
+      "sha256": "1mr1vknykycrgigdjb8alafb5pgk6j92djr7qi3cb8pqzmbhv979",
+      "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "data_table", "htmlwidgets", "jsonlite", "knitr"]
+    },
     "ToxicoGx": {
       "name": "ToxicoGx",
-      "version": "2.8.0",
-      "sha256": "0b34d5js6w50bm5cl5v8ppfc0lljsbm1zbrqlc5qifc8lcyliq8a",
+      "version": "2.10.0",
+      "sha256": "13rkrcd3c4gzkxs14m92sxcr6vliqxbyp8hvf16cjaz11hh8qrmv",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "CoreGx", "S4Vectors", "SummarizedExperiment", "assertthat", "caTools", "data_table", "downloader", "dplyr", "ggplot2", "jsonlite", "limma", "magrittr", "reshape2", "scales", "tibble", "tidyr"]
     },
     "TrajectoryGeometry": {
       "name": "TrajectoryGeometry",
-      "version": "1.12.0",
-      "sha256": "102mhg46s6s95j98wsy0r6327riqhb5jcdzmksiwphsdpsp9c16s",
+      "version": "1.14.0",
+      "sha256": "15jkk26mprs7pw8fy2dzssm6pgdvgm4n2074zhqgkdlsfhv3782b",
       "depends": ["ggplot2", "pracma", "rgl"]
     },
     "TrajectoryUtils": {
       "name": "TrajectoryUtils",
-      "version": "1.12.0",
-      "sha256": "15q1mq48nclf2lqc2v769q79frrbm2l65d54vcqg06b861q2wq9h",
+      "version": "1.14.0",
+      "sha256": "10ldajw1a3naxy58w4zf9ri5ql93fd6r06cdwg2dyagsb8qg3l20",
       "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "igraph"]
     },
-    "TransView": {
-      "name": "TransView",
-      "version": "1.48.0",
-      "sha256": "1bk4h1sh2xdm67mkzsg2l0kgg88m5z39hxmshh0j2bybyyy07jkp",
-      "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "Rhtslib", "S4Vectors", "gplots", "zlibbioc"]
-    },
     "TreeAndLeaf": {
       "name": "TreeAndLeaf",
-      "version": "1.16.0",
-      "sha256": "0fm1v6w73vs99smqk8i8b85pr38zlbpgyby6qh3s0xslxbyk6b32",
+      "version": "1.18.0",
+      "sha256": "03d47cyyc6nkhbqv24b92nppcmydbqmmaqbmg71vdj5d9wgb9c8i",
       "depends": ["RedeR", "ape", "igraph"]
     },
     "TreeSummarizedExperiment": {
       "name": "TreeSummarizedExperiment",
-      "version": "2.12.0",
-      "sha256": "0ygzw9nba5pxgrbib8sm7qwhzzm8m038banb0z7n42vkb1cb3d5i",
+      "version": "2.14.0",
+      "sha256": "187dbjb1w45v2gx510yk28hxvhc1bdjz5l853kmxdpr4wxs7nh4z",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "IRanges", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ape", "dplyr", "rlang", "treeio"]
     },
     "Trendy": {
       "name": "Trendy",
-      "version": "1.26.0",
-      "sha256": "172hcq9zxah3m55j3kzpg5hvr06d656j1s8j3jcvksc0f3l9r990",
+      "version": "1.28.0",
+      "sha256": "05qa0nzb6fzcvrn68s60adxyp5kbg7779s6qnp94ylmalwb04qvh",
       "depends": ["BiocParallel", "DT", "S4Vectors", "SummarizedExperiment", "gplots", "magrittr", "segmented", "shiny", "shinyFiles"]
     },
     "TurboNorm": {
       "name": "TurboNorm",
-      "version": "1.52.0",
-      "sha256": "13096cp69y6vkn0gm13ssyzgp7fhvqggnipigdfdrpmvf8gcl881",
+      "version": "1.54.0",
+      "sha256": "10rs5rwwnbwsq8by0gk7k5v51y6298k3qnhsy5xqylqygqff4dy5",
       "depends": ["affy", "convert", "lattice", "limma", "marray"]
     },
-    "TypeInfo": {
-      "name": "TypeInfo",
-      "version": "1.70.0",
-      "sha256": "0sx9z1wnlh6sj8gww0mxwavggkgj4zk23z8509pbch36acr6fgls",
-      "depends": []
-    },
     "UCSC_utils": {
       "name": "UCSC.utils",
-      "version": "1.0.0",
-      "sha256": "0w9f5xd6ryniapbpcrpczn8wimph2154w45cvdgqfa3dv5qy379l",
+      "version": "1.2.0",
+      "sha256": "14nyaqwz1mvaab5kj63j8h56f2n14v6dz5l1nl9zpp4icgx9hp64",
       "depends": ["S4Vectors", "httr", "jsonlite"]
     },
     "UCell": {
       "name": "UCell",
-      "version": "2.8.0",
-      "sha256": "09r64rrydwgvvvq8f5vzvn7dsh24l9sa1if21wcimrl28ci1g1mv",
+      "version": "2.10.1",
+      "sha256": "11fxdfyxnq6kvsp9iklb4wqywlplgi9s4nnz6qpr8ssbqqjlsm0c",
       "depends": ["BiocNeighbors", "BiocParallel", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "data_table"]
     },
     "UMI4Cats": {
       "name": "UMI4Cats",
-      "version": "1.14.0",
-      "sha256": "1cf2jsmhsmw6i381wxnb0zsyhkr2mjlxlzpjnlfxyf4kr6n8k797",
+      "version": "1.16.0",
+      "sha256": "192ns76kri831g8x6x63yvpiknhydvvby5gcfsn5rgbpfws7pwng",
       "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "R_utils", "Rbowtie2", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "annotate", "cowplot", "dplyr", "fda", "ggplot2", "magick", "magrittr", "org_Hs_eg_db", "rappdirs", "regioneR", "reshape2", "rlang", "scales", "stringr", "zoo"]
     },
     "UNDO": {
       "name": "UNDO",
-      "version": "1.46.0",
-      "sha256": "1h7bri3hkl99gll5vpamgp7x60afdmq8h1mqw4plr9ypxv2kljpj",
+      "version": "1.48.0",
+      "sha256": "0n7gsrzybjvji5pyglbjcx9fajf750hj4lff9gjxpaz605rvbn10",
       "depends": ["Biobase", "BiocGenerics", "MASS", "boot", "nnls"]
     },
     "UPDhmm": {
       "name": "UPDhmm",
-      "version": "1.0.0",
-      "sha256": "0qa6d3c2gvhfq5shgdpsgzrghx8jwpvx6an8rvidl5p7nzhhdjgi",
+      "version": "1.2.0",
+      "sha256": "01234ywkb6q04lk9xb6f68rq6b81q5wd0c3ra22cz1w84knqfgx0",
       "depends": ["GenomicRanges", "HMM", "IRanges", "S4Vectors", "VariantAnnotation"]
     },
     "Ularcirc": {
       "name": "Ularcirc",
-      "version": "1.22.0",
-      "sha256": "0qzkvwg3gd9v9cqf3hmmyh4gzdqs5m6nxjjbnhqsdp6wshccdv4p",
+      "version": "1.24.0",
+      "sha256": "1891x3127lfkjnhjcjqm2l38kslv5zmc0pg1cfy1p7jndqxw8lxi",
       "depends": ["AnnotationDbi", "AnnotationHub", "BSgenome", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomeInfoDbData", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Organism_dplyr", "R_utils", "S4Vectors", "data_table", "ggplot2", "ggrepel", "gsubfn", "mirbase_db", "moments", "plotgardener", "shiny", "shinyFiles", "shinydashboard", "shinyjs", "yaml"]
     },
     "UniProt_ws": {
       "name": "UniProt.ws",
-      "version": "2.44.0",
-      "sha256": "1vcbphksaanggig1yfmrihhw1a4fmy1cl7yq5w3z3lb6zik5rgx8",
+      "version": "2.46.1",
+      "sha256": "00z3fgwq9p664qm9c277b7fg26kza222ja7nhbyy37qjw9h8zscc",
       "depends": ["AnnotationDbi", "BiocBaseUtils", "BiocFileCache", "BiocGenerics", "RSQLite", "httpcache", "httr", "jsonlite", "progress", "rjsoncons"]
     },
     "Uniquorn": {
       "name": "Uniquorn",
-      "version": "2.24.0",
-      "sha256": "1f2hp395gfxnrf9mg8kqd6cjr9b651gzrj2bcfv5hx2qh0mh1z75",
+      "version": "2.26.0",
+      "sha256": "153bjmgr63y4c12bhrxi9dzyd5sqfwzp8ly7bx2d39lvk0yaakwy",
       "depends": ["GenomicRanges", "IRanges", "R_utils", "VariantAnnotation", "WriteXLS", "data_table", "doParallel", "foreach", "stringr"]
     },
     "VAExprs": {
       "name": "VAExprs",
-      "version": "1.10.0",
-      "sha256": "0mcdh0xsqjpc3nj1xfps3y2r62ayh8ykgpyblqxp2n52f781hcbx",
+      "version": "1.12.0",
+      "sha256": "0gzzjnc1ywdyx5j5cwcynnkmmf8x28w249bv1n0xvy4d86rrmd74",
       "depends": ["CatEncoders", "DeepPINCS", "DiagrammeR", "SingleCellExperiment", "SummarizedExperiment", "keras", "mclust", "purrr", "scater", "tensorflow"]
     },
     "VCFArray": {
       "name": "VCFArray",
-      "version": "1.20.0",
-      "sha256": "07z0zds9pqh7wi5zl8wsyxqrks5j182j0005c225y8n4qgwbmqk0",
+      "version": "1.22.0",
+      "sha256": "0mmjiq5rqzlg671sdvs9xlb78pblls9xg5db1ljgm1xcvaqajafd",
       "depends": ["BiocGenerics", "DelayedArray", "GenomicFiles", "GenomicRanges", "Rsamtools", "S4Vectors", "VariantAnnotation"]
     },
     "VDJdive": {
       "name": "VDJdive",
-      "version": "1.6.0",
-      "sha256": "1ml175pk27msai86pnm8jyy8li7f5rkkqqfw1a9m9d850n7ry37h",
+      "version": "1.8.0",
+      "sha256": "1ahw1rysr30rq8paqbabky9nzazcharghjn433r1sq821s9yfk3c",
       "depends": ["BiocParallel", "IRanges", "Matrix", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "ggplot2", "gridExtra"]
     },
     "VERSO": {
       "name": "VERSO",
-      "version": "1.14.0",
-      "sha256": "1yixhbwa2wi3rddmyd37b9nznw4c7s36wz0mnzwqvx1n9w0zpdk3",
+      "version": "1.16.0",
+      "sha256": "12q8m3gvjzsfqk81irwj59b0j1bls7xx1hsbzccxkcsi88y562kz",
       "depends": ["Rfast", "ape", "data_tree"]
     },
     "VaSP": {
       "name": "VaSP",
-      "version": "1.16.0",
-      "sha256": "1gh0mgci2jadv3g0wc3li6d9rlaaqybdx148gkzwnjf0bmhqxz34",
+      "version": "1.18.0",
+      "sha256": "13wvb9zqaihz4s5sz4j6nimcdji72x7dn1l78nwr1rryvl3l98zw",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ballgown", "cluster", "matrixStats"]
     },
     "VanillaICE": {
       "name": "VanillaICE",
-      "version": "1.66.0",
-      "sha256": "0a9yzlwnyq9840w25gqsc0ijydifq6kbr7z9bzq74s7zqxzxkkqv",
+      "version": "1.68.0",
+      "sha256": "19vqs0q7jyrwv6b2nin31dj72m1vnvgfqbva99vvni9y3c0s1yl1",
       "depends": ["BSgenome_Hsapiens_UCSC_hg18", "Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SummarizedExperiment", "crlmm", "data_table", "foreach", "lattice", "matrixStats", "oligoClasses"]
     },
     "VarCon": {
       "name": "VarCon",
-      "version": "1.12.0",
-      "sha256": "1ns5sxb2qrh0y6hdg6qn6s1hl4d64cvsipl6mcwqiyka9lrlmlhy",
+      "version": "1.14.0",
+      "sha256": "11n272q6chyy8zsgakmms6zghbvwl7rvhhmfs9dw44akfipj4z02",
       "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "ggplot2", "shiny", "shinyFiles", "shinycssloaders"]
     },
     "VariantAnnotation": {
       "name": "VariantAnnotation",
-      "version": "1.50.0",
-      "sha256": "0slvlhm65hkjspzlzs3gi04a6mlfwvda314z1nmzpdi3y5111fg7",
+      "version": "1.52.0",
+      "sha256": "0agkfdzs4nr2js94g1cnwxykc4f1678cfjx70r69gmy41s1ghybm",
       "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MatrixGenerics", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "XVector", "rtracklayer", "zlibbioc"]
     },
     "VariantExperiment": {
       "name": "VariantExperiment",
-      "version": "1.18.1",
-      "sha256": "0wxhfd92cfh9rg99jrw9rg7vfqk8lf2ylkpki2jf59hlx8zzs2z9",
+      "version": "1.20.0",
+      "sha256": "1i6821ll192ygvdkzhjix63wnrn4ch1i0ih7xq8gzv83my5w6r50",
       "depends": ["Biostrings", "DelayedArray", "DelayedDataFrame", "GDSArray", "GenomicRanges", "IRanges", "S4Vectors", "SNPRelate", "SeqArray", "SummarizedExperiment", "gdsfmt"]
     },
     "VariantFiltering": {
       "name": "VariantFiltering",
-      "version": "1.40.0",
-      "sha256": "14kxlzgy71s8h34galx93q8kalspr1m23brssbr3wha0hxb0ghgd",
+      "version": "1.42.0",
+      "sha256": "0839ljb4fh1qrjk1xm89q2hwnbbxi2slaw3l36dk8kmpifhqqi16",
       "depends": ["AnnotationDbi", "BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GenomicScores", "Gviz", "IRanges", "RBGL", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "XVector", "graph", "shiny", "shinyTree", "shinyjs", "shinythemes"]
     },
     "VariantTools": {
       "name": "VariantTools",
-      "version": "1.46.0",
-      "sha256": "1idil9vkd5risx9ahkagdacnj2g2a11gzsd7wmhg5gjmr77r53ww",
+      "version": "1.48.0",
+      "sha256": "1wv3xklgggn6ajjf7l068ybr1x38n6dv0kkkxna7d39y7q2dfqxc",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rsamtools", "S4Vectors", "VariantAnnotation", "rtracklayer"]
     },
     "VegaMC": {
       "name": "VegaMC",
-      "version": "3.42.0",
-      "sha256": "0jswscxb78g6j978361g4cmwlzlwfkyfx6i3p9fpny464i8gsfji",
+      "version": "3.44.0",
+      "sha256": "0q3lfc7q77zvg8ibjh7nfiznkqnj06kib5lwcslshb2blim96sjj",
       "depends": ["Biobase", "biomaRt"]
     },
     "VennDetail": {
       "name": "VennDetail",
-      "version": "1.20.0",
-      "sha256": "0987ljk70lsjhwzk3dxslg80ng8cnjhh02zr2raphyliys0msvxz",
+      "version": "1.22.0",
+      "sha256": "01s7vr42fwh624b3b69hvg3v4jmiv1fs815y69vwj1nx093y072a",
       "depends": ["UpSetR", "VennDiagram", "dplyr", "futile_logger", "ggplot2", "magrittr", "purrr", "tibble"]
     },
-    "ViSEAGO": {
-      "name": "ViSEAGO",
-      "version": "1.18.0",
-      "sha256": "06cqx88vndmgxb7vhn7w0kwkxrsn8hy3a3mz591pj48f3z0q9w16",
-      "depends": ["AnnotationDbi", "AnnotationForge", "DT", "DiagrammeR", "GOSemSim", "GO_db", "RColorBrewer", "R_utils", "UpSetR", "biomaRt", "data_table", "dendextend", "dynamicTreeCut", "fgsea", "ggplot2", "heatmaply", "htmlwidgets", "igraph", "plotly", "processx", "scales", "topGO"]
-    },
     "VisiumIO": {
       "name": "VisiumIO",
-      "version": "1.0.0",
-      "sha256": "01yvahz20fkvf2mj0zjl04w0dzs5jf4snlmry8d5a9y3smkspqyv",
-      "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "S4Vectors", "SpatialExperiment", "SummarizedExperiment", "TENxIO", "jsonlite"]
+      "version": "1.2.0",
+      "sha256": "07h20ajmlwj0wvnljfr2w10ggmdc5pillrf4sm9yc5p4amx5bsnj",
+      "depends": ["BiocBaseUtils", "BiocGenerics", "BiocIO", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "TENxIO", "jsonlite"]
     },
     "Voyager": {
       "name": "Voyager",
-      "version": "1.6.0",
-      "sha256": "0nvcp1wcrisiljj4w61ykz82a2l8c9vx8ixh209v2ih004wyy1y1",
-      "depends": ["BiocParallel", "Matrix", "RSpectra", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SpatialFeatureExperiment", "SummarizedExperiment", "bluster", "ggnewscale", "ggplot2", "lifecycle", "matrixStats", "memuse", "patchwork", "rlang", "scales", "scico", "sf", "spdep", "terra"]
+      "version": "1.8.1",
+      "sha256": "19y8ikmfk40sbdc4q8ryf1n9q7nszrycc02h8vrl7xskpb5ixlss",
+      "depends": ["BiocParallel", "DelayedArray", "Matrix", "RSpectra", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SpatialFeatureExperiment", "SummarizedExperiment", "bluster", "ggnewscale", "ggplot2", "lifecycle", "matrixStats", "memuse", "patchwork", "rlang", "scales", "scico", "sf", "spdep", "terra", "zeallot"]
     },
     "VplotR": {
       "name": "VplotR",
-      "version": "1.14.0",
-      "sha256": "1cg5ifl2k2134k5lhxfvsr4xm31w0bdg0rzy8yb5k77gldilb0il",
+      "version": "1.16.0",
+      "sha256": "0bbwxpmjfials3pqkzn54z7aspvh8il02f906by6dk4nr48p22qg",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "cowplot", "ggplot2", "magrittr", "reshape2", "zoo"]
     },
     "Wrench": {
       "name": "Wrench",
-      "version": "1.22.0",
-      "sha256": "1nwbqagpcs38c66r1arbby76if6pafa4snd6zbp18y71jj8rgvl7",
+      "version": "1.24.0",
+      "sha256": "151a4fnrdghayaj6fhkfxl2s1rjc1ph0gbf9hfkz4s5mxj92fc5a",
       "depends": ["limma", "locfit", "matrixStats"]
     },
     "XDE": {
       "name": "XDE",
-      "version": "2.50.0",
-      "sha256": "1f0aahpyrmkg5h3v6v5qw35gsjskh6dh16bgygkssa1qcafmqfv1",
+      "version": "2.52.0",
+      "sha256": "1smp38qmpd1khziccmyqxq3wc8l4aviclsb0srmyjligjchp6x3p",
       "depends": ["Biobase", "BiocGenerics", "GeneMeta", "RColorBrewer", "genefilter", "gtools", "mvtnorm", "siggenes"]
     },
     "XINA": {
       "name": "XINA",
-      "version": "1.22.0",
-      "sha256": "177yzqmkf3f2xgfrz1zpcw554yzm4njd2chhmvxi2vvijvnrgdf3",
+      "version": "1.24.0",
+      "sha256": "0x7gkx1ib6ggbr3dc97wxs52ph1chqcwqrn7xc4jmzs122gh52k0",
       "depends": ["STRINGdb", "alluvial", "ggplot2", "gridExtra", "igraph", "mclust", "plyr"]
     },
     "XNAString": {
       "name": "XNAString",
-      "version": "1.12.0",
-      "sha256": "0dgdaq8w7q32scdxragi40x7mkgpvvyzs2bwfb6c2yb4n2j40imi",
+      "version": "1.14.0",
+      "sha256": "05d6f2zlv7rs36vncz0ywn4g51kch7cps8gmyax9vxv3jsszq2r0",
       "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors", "data_table", "formattable", "future_apply", "pwalign", "stringi", "stringr"]
     },
     "XVector": {
       "name": "XVector",
-      "version": "0.44.0",
-      "sha256": "0fxv97m79w0ph4wbgp9drz6ahvnnzpv08grb11lr6a7laqq5x8s2",
+      "version": "0.46.0",
+      "sha256": "0dpnsvam6971b19xqlv1zniwjznya22jmffjpl4shz4sv8zin9nf",
       "depends": ["BiocGenerics", "IRanges", "S4Vectors", "zlibbioc"]
     },
     "Xeva": {
       "name": "Xeva",
-      "version": "1.20.0",
-      "sha256": "1n6bxj5gshr2rzcxw6dc5wcmj1ajssrqzp7a7b6rlnszk2h4vgys",
+      "version": "1.22.0",
+      "sha256": "13215sfszwqfpgr5glnsxhhg2qcxgq849hsyh25vln107ghq0w6d",
       "depends": ["BBmisc", "Biobase", "ComplexHeatmap", "PharmacoGx", "Rmisc", "doParallel", "downloader", "ggplot2", "nlme", "scales"]
     },
     "YAPSA": {
       "name": "YAPSA",
-      "version": "1.30.0",
-      "sha256": "0908hyji07br1i1zms21a99m3mvi707xj8zbd1w64gzackghabhl",
+      "version": "1.32.0",
+      "sha256": "1yc8j06v4ap5zvzvd40rfzc6fd9a295m7mwskis76qs4nhz29hz5",
       "depends": ["BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicRanges", "GetoptLong", "KEGGREST", "PMCMRplus", "SomaticSignatures", "VariantAnnotation", "circlize", "corrplot", "dendextend", "doParallel", "dplyr", "ggbeeswarm", "ggplot2", "gridExtra", "gtrellis", "limSolve", "magrittr", "pracma", "reshape2"]
     },
     "ZygosityPredictor": {
       "name": "ZygosityPredictor",
-      "version": "1.4.0",
-      "sha256": "03yxnrbkfzc1dqa8zin8gwi9iryw3ir2k5s80dzxclr1651zh5xd",
+      "version": "1.6.0",
+      "sha256": "0vi51s3mwrkmvz54jhzxhnklc1m19zv5mxgdzyxrcng6b0c277wh",
       "depends": ["DelayedArray", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "VariantAnnotation", "dplyr", "igraph", "knitr", "magrittr", "purrr", "readr", "rlang", "stringr", "tibble"]
     },
     "a4": {
       "name": "a4",
-      "version": "1.52.0",
-      "sha256": "1wzqpvz49wkbvqij48c3l6vqfvflgic8gzvjdigb1c6mr96l6vgg",
+      "version": "1.54.0",
+      "sha256": "0izl2b306lj9768p1lxi02sj6sbih5isa0f2k6g8igjq7z08mk8c",
       "depends": ["a4Base", "a4Classif", "a4Core", "a4Preproc", "a4Reporting"]
     },
     "a4Base": {
       "name": "a4Base",
-      "version": "1.52.0",
-      "sha256": "19vapjmyd3ly3s2gqa2xfg99gyc6n6lv3c6rpi0ch4hzb7wiinvm",
+      "version": "1.54.0",
+      "sha256": "1x62125rinav1g3s549f4s59z3ddcmzznnghlh8w54sabnz3i45d",
       "depends": ["Biobase", "a4Core", "a4Preproc", "annaffy", "genefilter", "glmnet", "gplots", "limma", "mpm", "multtest"]
     },
     "a4Classif": {
       "name": "a4Classif",
-      "version": "1.52.0",
-      "sha256": "15jcd66brvbjz0p3z2b43ac5k81s3vmcbkwmga0f7f5v53fp8qvw",
+      "version": "1.54.0",
+      "sha256": "0h6i6nxfq2nnla8559bjinydaywwc8lzg0xs8z2adj4cr52r6h74",
       "depends": ["Biobase", "ROCR", "a4Core", "a4Preproc", "glmnet", "pamr", "varSelRF"]
     },
     "a4Core": {
       "name": "a4Core",
-      "version": "1.52.0",
-      "sha256": "1jn2ikzijd282jl96i9hcvahkc6l2vsd79dxqiz7kwaqcp7hs5z9",
+      "version": "1.54.0",
+      "sha256": "0rc3aragscizy067qx46sc5w2d5cimdizkmcy41y771aj1kbpygh",
       "depends": ["Biobase", "glmnet"]
     },
     "a4Preproc": {
       "name": "a4Preproc",
-      "version": "1.52.0",
-      "sha256": "1yphs36pk2y4qajq24y443yzb2f55b08nl81ylpf65mvxlxd23w2",
+      "version": "1.54.0",
+      "sha256": "108ns2ln2j5bkaqmah0w8132b2p995wrcd4a98a1vnsgs806mwfp",
       "depends": ["Biobase", "BiocGenerics"]
     },
     "a4Reporting": {
       "name": "a4Reporting",
-      "version": "1.52.0",
-      "sha256": "08zlg74qryqm238mld876v15a6c71brkz2y1gnbj0rnl1l9f9rbh",
+      "version": "1.54.0",
+      "sha256": "11zpq6zk67m72qx09ng6g4h32206f6lzldndirwxzqbv0ix9yy1v",
       "depends": ["xtable"]
     },
     "aCGH": {
       "name": "aCGH",
-      "version": "1.82.0",
-      "sha256": "00dcx6kcqq5xcdy7rqgi51cvc20dsgrrki8aicbj1icx0m6601wa",
+      "version": "1.84.0",
+      "sha256": "1z9phvx461s64i251rvxwr9x62mm18pc0qlifzr8z4ybmlrbyazi",
       "depends": ["Biobase", "cluster", "multtest", "survival"]
     },
     "abseqR": {
       "name": "abseqR",
-      "version": "1.22.0",
-      "sha256": "0aj3kh4c8zk60n6yyh2jblbrvv77071r96m0mrcslqm71dwg9402",
+      "version": "1.24.0",
+      "sha256": "1d52aiix3pixhcr6pjmz48p4wkcik4cwpbq4fhngv48y1sgd5d8i",
       "depends": ["BiocParallel", "BiocStyle", "RColorBrewer", "VennDiagram", "circlize", "flexdashboard", "ggcorrplot", "ggdendro", "ggplot2", "gridExtra", "knitr", "plotly", "plyr", "png", "reshape2", "rmarkdown", "stringr", "vegan"]
     },
     "acde": {
       "name": "acde",
-      "version": "1.34.0",
-      "sha256": "1h3drjxdmd837hc7l1xk6b4ha39i7bqkb8862h4h6s5rfa7dcc50",
+      "version": "1.36.0",
+      "sha256": "0x49x7xyjwfw5zf4w4rchapnb40mr1c6shj5cdsg9cbwwdz971ws",
       "depends": ["boot"]
     },
     "adSplit": {
       "name": "adSplit",
-      "version": "1.74.0",
-      "sha256": "13rrkb0vxkknvqhb8pgx8d13sxzy3w0wbkhhj5lrlc1kb1yqcfbh",
+      "version": "1.76.0",
+      "sha256": "0x1n2k5pgn5gkfsr15h2vj7mzywxq0b02h6ivwahq2albhmb7ci4",
       "depends": ["AnnotationDbi", "Biobase", "GO_db", "KEGGREST", "cluster", "multtest"]
     },
     "adductomicsR": {
       "name": "adductomicsR",
-      "version": "1.20.0",
-      "sha256": "0800jbfm488i6ccz48k49gpxr9sf9104cxcghgy9c4lzm5d3wfbm",
+      "version": "1.22.0",
+      "sha256": "0946x9a2y7yrbgbcn7fmwhkm0caraahl9wcz09aj02gnm5zvlxxs",
       "depends": ["AnnotationHub", "DT", "ExperimentHub", "OrgMassSpecR", "RcppEigen", "adductData", "ade4", "bootstrap", "data_table", "doSNOW", "dplyr", "fastcluster", "foreach", "fpc", "mzR", "pastecs", "pracma", "reshape2", "rvest", "smoother", "zoo"]
     },
     "adverSCarial": {
       "name": "adverSCarial",
-      "version": "1.2.0",
-      "sha256": "1c8anqpxdrkc33pfm1phqjsb8kjdrfqxh93x8n2mpsywqg8q27pb",
+      "version": "1.4.0",
+      "sha256": "0lri1mc23f9mhg3gwq0hjq09vk8fhc2jpais5vy60dym1dz2nnn7",
       "depends": ["DelayedArray", "S4Vectors", "gtools"]
     },
     "affxparser": {
       "name": "affxparser",
-      "version": "1.76.0",
-      "sha256": "0qqc2sq331g2ml390nhjkrnldp6bi7r6xyz7rw77hnr3qpcrhqk2",
+      "version": "1.78.0",
+      "sha256": "1b68jnl1w9lk3z20774dlhj98fb4hfjkq3y8pv4gbz4kkgy44a6f",
       "depends": []
     },
     "affy": {
       "name": "affy",
-      "version": "1.82.0",
-      "sha256": "19z22c1yd3rkwk7dp8q8xv16n0qv92iz00vzid3pniy7zr80cxxy",
+      "version": "1.84.0",
+      "sha256": "1x27cbqsip5m7lzv5nvffdfjp46cdqh53qb1xvi2rf0wfdnd7763",
       "depends": ["Biobase", "BiocGenerics", "BiocManager", "affyio", "preprocessCore", "zlibbioc"]
     },
     "affyContam": {
       "name": "affyContam",
-      "version": "1.62.0",
-      "sha256": "0r4pqda9pv60b867c6yi328687kyxjglk5jmcal6xnlr75nf4w0y",
+      "version": "1.64.0",
+      "sha256": "0vsh2qazn8zjy9k7ha59krv4psmzl6cvka68h8gkz6xj38f9kxjw",
       "depends": ["Biobase", "affy", "affydata"]
     },
     "affyILM": {
       "name": "affyILM",
-      "version": "1.56.0",
-      "sha256": "185kdrnvcp2jw0k71q0v4yk7583gwgi31h0n281x25hirixf6rm3",
+      "version": "1.58.0",
+      "sha256": "0x56j63yzssq3brnacz23v02hxlmmki6s89mw09wwhawyia6pv2x",
       "depends": ["Biobase", "affxparser", "affy", "gcrma"]
     },
     "affyPLM": {
       "name": "affyPLM",
-      "version": "1.80.0",
-      "sha256": "1khknl7k45amyw58mcgw7kl511llyddw31qzwqc2l5c4j3bwnpz5",
+      "version": "1.82.0",
+      "sha256": "182zym9g8rzyrmj78yzpdh44av616x6228xzxwa45wz2spg9bj47",
       "depends": ["Biobase", "BiocGenerics", "affy", "gcrma", "preprocessCore", "zlibbioc"]
     },
     "affycomp": {
       "name": "affycomp",
-      "version": "1.80.0",
-      "sha256": "02n2v1iwkhmilv1bjfza2yrqj7rsr8v46bghajcb8wdyyaj759ib",
+      "version": "1.82.0",
+      "sha256": "10z63g0vj8c7gnzqi3dpx543idyp2fa6majs2ydv41jah6s10zs2",
       "depends": ["Biobase"]
     },
     "affycoretools": {
       "name": "affycoretools",
-      "version": "1.76.0",
-      "sha256": "0w138n3f68ndr0innk981vf8p5wb729m31p0d3f9qp08hmv58jfw",
+      "version": "1.78.0",
+      "sha256": "1xyanwj6psrqqj2m5rb0p3890m7kddkj7gnbllknbbib1jjh24rf",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GOstats", "Glimma", "RSQLite", "ReportingTools", "S4Vectors", "affy", "edgeR", "gcrma", "ggplot2", "gplots", "hwriter", "lattice", "limma", "oligoClasses", "xtable"]
     },
     "affyio": {
       "name": "affyio",
-      "version": "1.74.0",
-      "sha256": "156sijj9zy01p038m7yw58h1bw1ii0kd5q9kv3krh6bs67c3dv8h",
+      "version": "1.76.0",
+      "sha256": "01asrih2ish0l2yr0g6azbsn23cf8f3fc4ks8rn6w1rc054405ci",
       "depends": ["zlibbioc"]
     },
     "affylmGUI": {
       "name": "affylmGUI",
-      "version": "1.78.0",
-      "sha256": "1qilkr3dcl6driah24kgz7lrzamq08qp2z03inm2m4r5yx8811wc",
+      "version": "1.80.0",
+      "sha256": "11ihq29ydmx264vlgvf923rf3xdspckbgqcjwgwkwvdfa5i6scsp",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocManager", "R2HTML", "affy", "affyPLM", "affyio", "gcrma", "limma", "tkrplot", "xtable"]
     },
     "aggregateBioVar": {
       "name": "aggregateBioVar",
-      "version": "1.14.0",
-      "sha256": "0qag99chj7n7l0wbb8ar0f58xs6883rgddkgj7jnrrlj3acrm12v",
+      "version": "1.16.0",
+      "sha256": "00v0chcvisd735f9pyinwn3lg9dq0wdq9jpsm4kp2m45pf22n7p1",
       "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "rlang", "tibble"]
     },
     "agilp": {
       "name": "agilp",
-      "version": "3.36.0",
-      "sha256": "1mfi4xvx6ywkr7b7ma9ip6q2nsjvkri8qx48qyr98yyik7gg28d5",
+      "version": "3.38.0",
+      "sha256": "1gzfzbgxb07zmr66h38zy1c1hpb89qnsfg1wsr5p8qwlf76ynzz7",
       "depends": []
     },
     "airpart": {
       "name": "airpart",
-      "version": "1.12.0",
-      "sha256": "05l5rgjfjln3kip72wj4ll4cgak9yz60xg6dgxxj690pxs1pw7bg",
+      "version": "1.14.0",
+      "sha256": "0aggyvbx4vjg3sh4s7jsl2l612vqvgcb2wlymkdjzaj8hykaprvs",
       "depends": ["ComplexHeatmap", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "apeglm", "clue", "dplyr", "dynamicTreeCut", "emdbook", "forestplot", "ggplot2", "lpSolve", "matrixStats", "mclust", "pbapply", "plyr", "rlang", "scater", "smurf"]
     },
     "alabaster": {
       "name": "alabaster",
-      "version": "1.4.0",
-      "sha256": "0c8ryjn4a4py5439vlk23rskf96xc77blj51c6g6m9j812fsby3l",
+      "version": "1.6.0",
+      "sha256": "1jb7dh4kamr6ypfkjm306797jrbn6n37nk533k3h74ckhb06xf33",
       "depends": ["alabaster_base", "alabaster_bumpy", "alabaster_mae", "alabaster_matrix", "alabaster_ranges", "alabaster_sce", "alabaster_se", "alabaster_spatial", "alabaster_string", "alabaster_vcf"]
     },
     "alabaster_base": {
       "name": "alabaster.base",
-      "version": "1.4.2",
-      "sha256": "1yf4j6dwva1d16fb8ss5hrpmj71azwjk9aqpad9wpnfapaldjzhb",
+      "version": "1.6.1",
+      "sha256": "02bgq5z7p2di62d8167qd02drhrwyjk3c9iq38g7lbk89vbi1f1h",
       "depends": ["Rcpp", "Rhdf5lib", "S4Vectors", "alabaster_schemas", "jsonlite", "jsonvalidate", "rhdf5"]
     },
     "alabaster_bumpy": {
       "name": "alabaster.bumpy",
-      "version": "1.4.0",
-      "sha256": "16q433asljnnx04b7q2a4ajhbsrzrqa35m6mcx9apg6q24iw869x",
+      "version": "1.6.0",
+      "sha256": "0my4zqrvjnnrs85263rgxnvaq0a936zhq134hzq8c2lng3csir7d",
       "depends": ["BiocGenerics", "BumpyMatrix", "IRanges", "Matrix", "S4Vectors", "alabaster_base", "rhdf5"]
     },
     "alabaster_files": {
       "name": "alabaster.files",
-      "version": "1.2.0",
-      "sha256": "0mib4wix9ddgvhgff05gq2ijy6kyh884nv0j40rxzfkxqhp77gim",
+      "version": "1.4.0",
+      "sha256": "1d905lq0s1dd15qpj9drh14vk8xalgp2r6cdirjxyc44nyk6kfp5",
       "depends": ["BiocGenerics", "Rsamtools", "S4Vectors", "alabaster_base"]
     },
     "alabaster_mae": {
       "name": "alabaster.mae",
-      "version": "1.4.0",
-      "sha256": "07w4q6dm4asrcdqynhdlxyaaf29s3ca8ij8iblwjnpgp9p5pbj6v",
+      "version": "1.6.0",
+      "sha256": "150b2wcm7bq3ickwfz1vpw3s0h63gk0s57n1j58dn2ssni4y2z5r",
       "depends": ["MultiAssayExperiment", "S4Vectors", "alabaster_base", "alabaster_se", "jsonlite", "rhdf5"]
     },
     "alabaster_matrix": {
       "name": "alabaster.matrix",
-      "version": "1.4.2",
-      "sha256": "1b32qs2baq9s492a332vh1hpyxq62z16xj2w17m8wh8a4mcabry8",
+      "version": "1.6.1",
+      "sha256": "1cppp2p8gpynyngxlyyxmgzvd27650z4bi5akw8bzimqphxfap3f",
       "depends": ["BiocGenerics", "DelayedArray", "HDF5Array", "Matrix", "Rcpp", "S4Arrays", "S4Vectors", "SparseArray", "alabaster_base", "rhdf5"]
     },
     "alabaster_ranges": {
       "name": "alabaster.ranges",
-      "version": "1.4.2",
-      "sha256": "16r5wdlw2g9qnbvzpx5c5c04xa5dkwrmqlyc81iixkx6j98gsz2w",
+      "version": "1.6.0",
+      "sha256": "06xky6gdwhvz09v6yafwr65lq3bj4s8qz5iqpp120m9nncfzf1f4",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "alabaster_base", "rhdf5"]
     },
     "alabaster_sce": {
       "name": "alabaster.sce",
-      "version": "1.4.0",
-      "sha256": "1i9nmivsfrd7fbb8njmwihfx4xpj4p3h5bnlj9fvk5308bbj3qcg",
+      "version": "1.6.0",
+      "sha256": "0ddi6y2c8csxrzqv5h0lmxvhvhiz285f0hd01q8mpn9rs4n5cljs",
       "depends": ["SingleCellExperiment", "alabaster_base", "alabaster_se", "jsonlite"]
     },
     "alabaster_schemas": {
       "name": "alabaster.schemas",
-      "version": "1.4.0",
-      "sha256": "1cizlslxw0nhrfjsz3x90waa9w4n2v72a0cycbzvxqbbvkh3cp1l",
+      "version": "1.6.0",
+      "sha256": "0sqkm3f1vha1iw8az0giz7yj78b75dh4g9qkly0yd3bpmb9g3zd9",
       "depends": []
     },
     "alabaster_se": {
       "name": "alabaster.se",
-      "version": "1.4.1",
-      "sha256": "134r4pwaa4nsmdgqxs16w3adn482zl70lgyd4s96pmx7hqm9i1vx",
+      "version": "1.6.0",
+      "sha256": "01963yn5iyc0ksxr1nlwkddfll9259x2w3y1b82db36kjj3bac2y",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "alabaster_base", "alabaster_matrix", "alabaster_ranges", "jsonlite"]
     },
     "alabaster_spatial": {
       "name": "alabaster.spatial",
-      "version": "1.4.0",
-      "sha256": "11mgs6smyiv4r5cajzqpw0k7q0jsm6xch1b5c9w7scl7d9bq981k",
+      "version": "1.6.1",
+      "sha256": "15lswhfdxpg8mdhf1nqivvck9ncygk5m0mnx8px3xam3c5kc7lsd",
       "depends": ["S4Vectors", "SpatialExperiment", "alabaster_base", "alabaster_sce", "rhdf5"]
     },
     "alabaster_string": {
       "name": "alabaster.string",
-      "version": "1.4.0",
-      "sha256": "0p55dpfwjjikmgyq0vk9hmd6k0j3d2x4jjxd7wnabhga3vr4jg7q",
+      "version": "1.6.0",
+      "sha256": "18kbc1gc1bi9vp95adi5kxy2yg3ygdipdvf827vfnl36cn5imna3",
       "depends": ["Biostrings", "S4Vectors", "alabaster_base"]
     },
     "alabaster_vcf": {
       "name": "alabaster.vcf",
-      "version": "1.4.0",
-      "sha256": "1ry5gim6kkis8wy0v1afv44ay6nw8m9nd6jl89980z499pblf9j4",
+      "version": "1.6.0",
+      "sha256": "0f96s0wzmlzy7cchzf7lgbprc78k6vq03603h55l94z4bcn8n077",
       "depends": ["Rsamtools", "S4Vectors", "VariantAnnotation", "alabaster_base", "alabaster_se", "alabaster_string"]
     },
     "alevinQC": {
       "name": "alevinQC",
-      "version": "1.20.0",
-      "sha256": "1pq42lvgggysg28ngxipqb1l7jfj498nxpg40h02siz6nb6inbdw",
+      "version": "1.22.0",
+      "sha256": "01ywmi5k5y9x5ds743qhzjn975gc5h8k0csxs78pnrjng5ij2gh2",
       "depends": ["DT", "GGally", "Rcpp", "cowplot", "dplyr", "ggplot2", "rjson", "rlang", "rmarkdown", "shiny", "shinydashboard", "tximport"]
     },
     "altcdfenvs": {
       "name": "altcdfenvs",
-      "version": "2.66.0",
-      "sha256": "08k3j3dc93vg5c9ccw7mc4fri9xbdj7rdjyj0h6ig0s5866fqvlb",
+      "version": "2.68.0",
+      "sha256": "1fj22d7c8gid26x7383ihq82yfcnpyljl0qk4yh48p8qhgh3wysa",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "S4Vectors", "affy", "hypergraph", "makecdfenv"]
     },
     "amplican": {
       "name": "amplican",
-      "version": "1.26.0",
-      "sha256": "1nbyivd5020kqkmk5ngpaixhdxgmqpifaxnfgq6yc2njqizgbhxy",
+      "version": "1.28.0",
+      "sha256": "1xv392kxhzal2b8dp0kdjnny75311qm6vvbajx9hlb3k6v34dpqc",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "ShortRead", "cluster", "data_table", "dplyr", "ggplot2", "ggthemes", "gridExtra", "gtable", "knitr", "matrixStats", "pwalign", "rmarkdown", "stringr", "waffle"]
     },
     "animalcules": {
       "name": "animalcules",
-      "version": "1.20.0",
-      "sha256": "1g073n8nmckd388hy9gfiddil53wv692k69ywjc85jyp5jy2n265",
+      "version": "1.22.0",
+      "sha256": "02dbfx159b9ivlzgyhd1ikhw2ciq6q7f3b3sdq4hsp49yp6ps7nl",
       "depends": ["DESeq2", "DT", "GUniFrac", "Matrix", "MultiAssayExperiment", "ROCit", "S4Vectors", "SummarizedExperiment", "XML", "ape", "assertthat", "caret", "covr", "dplyr", "forcats", "ggforce", "ggplot2", "lattice", "limma", "magrittr", "plotly", "rentrez", "reshape2", "scales", "shiny", "shinyjs", "tibble", "tidyr", "tsne", "umap", "vegan"]
     },
     "annaffy": {
       "name": "annaffy",
-      "version": "1.76.0",
-      "sha256": "1298mn8yz4i0qqw1i8pd4ym5f65dmyb8wcmpyahzz11na4diybmj",
+      "version": "1.78.0",
+      "sha256": "0spsiywh2xxzi8xjg2gk08p4fpha01pc0x65z18gsps6lh1zj1gk",
       "depends": ["AnnotationDbi", "Biobase", "BiocManager", "DBI", "GO_db"]
     },
     "annmap": {
       "name": "annmap",
-      "version": "1.46.0",
-      "sha256": "1xijcm0c19wj2yknrlsz2ifm097z32rc58k608482686srj0bg2i",
+      "version": "1.48.0",
+      "sha256": "0rq8v5dfmmr43nyri3yr2q4wcq7p9c0ia3nfj4ry5xpkiyqj4n1x",
       "depends": ["Biobase", "BiocGenerics", "DBI", "GenomicRanges", "IRanges", "RMySQL", "Rsamtools", "digest", "genefilter", "lattice"]
     },
     "annotate": {
       "name": "annotate",
-      "version": "1.82.0",
-      "sha256": "1v4sq22lwrhl50whag0jil788wwvi4rpdaij03iwak93q998ls0f",
+      "version": "1.84.0",
+      "sha256": "1m7cc5hawzdvm0b1il4fcilipnsv1n94zqvwhkbr3041rklf7l7y",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "XML", "httr", "xtable"]
     },
     "annotationTools": {
       "name": "annotationTools",
-      "version": "1.78.0",
-      "sha256": "1hwawrp0pbrm9xf7fn65nj0q4s49qlnmxfjlmrv5fykyn3i1lhpq",
+      "version": "1.80.0",
+      "sha256": "03hqhq6xyaf24ryrnf9q3x00m8600kxhinzag8a9cvw1x0h2d1pz",
       "depends": ["Biobase"]
     },
     "annotatr": {
       "name": "annotatr",
-      "version": "1.30.0",
-      "sha256": "11cc3nknbckm0v5r7dzgqzw0137w4c08ab10s9svb1y02z45a0qz",
+      "version": "1.32.0",
+      "sha256": "11j633mhm4b0ndl6mbqqwgz7rsggb7gzr3yhvamrnvag7l4wzvss",
       "depends": ["AnnotationDbi", "AnnotationHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "dplyr", "ggplot2", "readr", "regioneR", "reshape2", "rtracklayer"]
     },
     "anota": {
       "name": "anota",
-      "version": "1.52.0",
-      "sha256": "1pg9p6982901k08iqpk0cdb9hii3k7bci9gq6an711r8a4iy3lmc",
+      "version": "1.54.0",
+      "sha256": "1y5gxm896la45f2psdc2792nw25a8mxd3b45i9kh68wni6d2drdr",
       "depends": ["multtest", "qvalue"]
     },
     "anota2seq": {
       "name": "anota2seq",
-      "version": "1.26.0",
-      "sha256": "140k37wswl4w2136pz9y0z82sphzxmgzgk3cr400kkm39wjn7vxm",
+      "version": "1.28.0",
+      "sha256": "0lzpp2pxbpza1wijmj9cz9ia94pyc5b5fknw2njy0qv8rcwxjwhh",
       "depends": ["DESeq2", "RColorBrewer", "SummarizedExperiment", "edgeR", "limma", "multtest", "qvalue"]
     },
     "antiProfiles": {
       "name": "antiProfiles",
-      "version": "1.44.0",
-      "sha256": "0p2fhxzgn877mic2yv1sgcidgm74z8hxa3hdaawgvhhvi2j6v8wa",
+      "version": "1.46.0",
+      "sha256": "0xg1kjb0g7cxkj6qv2979n9yfyfwgfllzi2zp9jaml6cw30ma0ya",
       "depends": ["locfit", "matrixStats"]
     },
     "apComplex": {
       "name": "apComplex",
-      "version": "2.70.0",
-      "sha256": "1fsqrds5r8bhdf7fbnw6rf3vqapl6xk1a5l6jjb98raxmjsrfyqs",
+      "version": "2.72.0",
+      "sha256": "0s8yg9rhi43v35l9hkp2fl7zk3rpn84rbwyn1l00l9fm3fr03qdm",
       "depends": ["RBGL", "Rgraphviz", "graph", "org_Sc_sgd_db"]
     },
     "apeglm": {
       "name": "apeglm",
-      "version": "1.26.1",
-      "sha256": "039my876v0k2mr50w90w3phj4cq55awf5ks07kr2fnm7w211gxvs",
+      "version": "1.28.0",
+      "sha256": "1xzh8p4ybal3m4rfpja5qnnqd8hqbszppkxfqf7rm4z2kz2ga25q",
       "depends": ["GenomicRanges", "Rcpp", "RcppEigen", "RcppNumerical", "SummarizedExperiment", "emdbook"]
     },
     "appreci8R": {
       "name": "appreci8R",
-      "version": "1.22.0",
-      "sha256": "1nwb7475lhclyd0jdwm0sp1wh2rgs2h16k4hin6z44axix5v7jhr",
+      "version": "1.24.0",
+      "sha256": "1kd2ds216620hrzaxjdccc1skwal575n5zz6qqyyq1jh2vwggy7x",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "COSMIC_67", "DT", "GenomicFeatures", "GenomicRanges", "GenomicScores", "Homo_sapiens", "IRanges", "MafDb_1Kgenomes_phase3_hs37d5", "MafDb_ExAC_r1_0_hs37d5", "MafDb_gnomADex_r2_1_hs37d5", "PolyPhen_Hsapiens_dbSNP131", "Rsamtools", "S4Vectors", "SIFT_Hsapiens_dbSNP137", "SNPlocs_Hsapiens_dbSNP144_GRCh37", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "XtraSNPlocs_Hsapiens_dbSNP144_GRCh37", "openxlsx", "rentrez", "seqinr", "shiny", "shinyjs", "stringr"]
     },
     "aroma_light": {
       "name": "aroma.light",
-      "version": "3.34.0",
-      "sha256": "1v24b43knsjpw44zkrzv8pvxjiw12rcz9wqp4ahd88dg23j7pvwz",
+      "version": "3.36.0",
+      "sha256": "0n92bmjm97kzv2lpkkc2d4lgs7nzqwrcijq2j4v53xawbcgdxcfd",
       "depends": ["R_methodsS3", "R_oo", "R_utils", "matrixStats"]
     },
     "arrayMvout": {
       "name": "arrayMvout",
-      "version": "1.62.0",
-      "sha256": "11v3s972nyahdswqdcab0fj9jb73vd5dnd5kfb09572y4z0hn5xw",
+      "version": "1.64.0",
+      "sha256": "0hfal4q9l8g0nfmp2835qagym4hx7xnbic0xh8653lxsy7sbimf0",
       "depends": ["Biobase", "affy", "affyContam", "lumi", "mdqc", "parody"]
     },
     "arrayQuality": {
       "name": "arrayQuality",
-      "version": "1.82.0",
-      "sha256": "0wmczy2wdxki9pam9q6ly5clvqbl018v1ar4zkdm8algjddyc2cp",
+      "version": "1.84.0",
+      "sha256": "0rsb1gxy34jyacmy6w5av9gisknb1pqi7irjqimgaqzyvq00hzal",
       "depends": ["RColorBrewer", "gridBase", "hexbin", "limma", "marray"]
     },
     "arrayQualityMetrics": {
       "name": "arrayQualityMetrics",
-      "version": "3.60.0",
-      "sha256": "04y1vbpxqhqn1vsyqmscikaxn6wshsk4krcqzf2baf9x4azbdjk1",
+      "version": "3.62.0",
+      "sha256": "04xc1kqz26l74hsrk6p5bj6c3i5pc19v7y1rwz46wszk40p1rln5",
       "depends": ["Biobase", "Hmisc", "RColorBrewer", "XML", "affy", "affyPLM", "beadarray", "genefilter", "gridSVG", "hwriter", "lattice", "latticeExtra", "limma", "setRNG", "svglite", "vsn"]
     },
     "artMS": {
       "name": "artMS",
-      "version": "1.22.0",
-      "sha256": "11a6igby8kz2r5wawrsisz22v4hak9004zr8y87v3pp92rnvb3ma",
+      "version": "1.24.0",
+      "sha256": "0r13816m50qc1w840sd0hx014fgx8bm98kfqh5s0i3rp93fdjsw3",
       "depends": ["AnnotationDbi", "MSstats", "RColorBrewer", "UpSetR", "VennDiagram", "bit64", "circlize", "cluster", "corrplot", "data_table", "dplyr", "getopt", "ggdendro", "ggplot2", "ggrepel", "gplots", "limma", "openxlsx", "org_Hs_eg_db", "pheatmap", "plotly", "plyr", "scales", "seqinr", "stringr", "tidyr", "yaml"]
     },
+    "assorthead": {
+      "name": "assorthead",
+      "version": "1.0.1",
+      "sha256": "1mcihw19fnja4n07bzhrmiw3rjzc5i0pxijvgh62pfv5j6v3bxcq",
+      "depends": []
+    },
     "atSNP": {
       "name": "atSNP",
-      "version": "1.20.0",
-      "sha256": "08pcbys8iy8wzqzzvlnwc3qw7m7cswkqa3x2x2x8m4ni1s4isd6z",
+      "version": "1.22.0",
+      "sha256": "04gawccjzgjbzrvb98djf9g07pb812rkdwwv3hhbr4sp02yr9hr1",
       "depends": ["BSgenome", "BiocFileCache", "BiocParallel", "Rcpp", "data_table", "ggplot2", "lifecycle", "motifStack", "rappdirs", "testthat"]
     },
     "atena": {
       "name": "atena",
-      "version": "1.10.0",
-      "sha256": "1y2v8mi9awgfbcawpcir01qglxn0bdgj6v2dsdqp6if25cizl3sr",
+      "version": "1.12.0",
+      "sha256": "15dvcymd9svp0mw6s0qrfnsc8zlnvxz1lmkzns0rm8ivflf36q1r",
       "depends": ["AnnotationHub", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "Rsamtools", "S4Vectors", "SQUAREM", "SummarizedExperiment", "cli", "matrixStats", "sparseMatrixStats"]
     },
     "attract": {
       "name": "attract",
-      "version": "1.56.0",
-      "sha256": "08l634sk6y06y2m78vsd0ld4w3h6qvx4hk6wkqflkl9jjyqpx8jy",
+      "version": "1.58.0",
+      "sha256": "1nlfnrf7brlqlb7dqzmzqyv6xca5axs1044j22m8lrgwjjpc5xry",
       "depends": ["AnnotationDbi", "Biobase", "GOstats", "KEGGREST", "cluster", "limma", "org_Hs_eg_db", "reactome_db"]
     },
     "autonomics": {
       "name": "autonomics",
-      "version": "1.12.1",
-      "sha256": "1fzzj0v6v4jvr3wh5bnjr6h2ny8zfm9pdlbhq5syaa2plvsbblpy",
-      "depends": ["BiocFileCache", "BiocGenerics", "MultiAssayExperiment", "RColorBrewer", "R_utils", "S4Vectors", "SummarizedExperiment", "abind", "bit64", "codingMatrices", "colorspace", "data_table", "dplyr", "edgeR", "ggforce", "ggplot2", "ggrepel", "gridExtra", "limma", "magrittr", "matrixStats", "readxl", "rlang", "scales", "stringi", "tidyr", "tidyselect", "vsn"]
+      "version": "1.14.6",
+      "sha256": "16z9hyzb7nj0b3wvcaa8r8gxpr3fcxigmpsdpy0l9a03l33z82n6",
+      "depends": ["BiocFileCache", "BiocGenerics", "MultiAssayExperiment", "RColorBrewer", "R_utils", "S4Vectors", "SummarizedExperiment", "abind", "bit64", "cluster", "codingMatrices", "colorspace", "data_table", "dplyr", "edgeR", "ggforce", "ggplot2", "ggrepel", "gridExtra", "limma", "magrittr", "matrixStats", "readxl", "rlang", "scales", "stringi", "tidyr", "tidyselect", "vsn"]
     },
     "awst": {
       "name": "awst",
-      "version": "1.12.0",
-      "sha256": "1iaakdjxrz4szl4lnjcszy47q5dsh2d7i3wrr3wwdhw6wjcd62hj",
+      "version": "1.14.0",
+      "sha256": "1l23vnp5xwl61ag4djvsg06dp543il8rv3an6hs1qi1wd1lk3llh",
       "depends": ["SummarizedExperiment"]
     },
     "bacon": {
       "name": "bacon",
-      "version": "1.32.0",
-      "sha256": "09lvjb0fa70kcl7mkp4agxv6jcm2ncmnrffav6zmz038imhmvdgm",
+      "version": "1.34.0",
+      "sha256": "1ihhxnz5b12r6mh9j4k9nzwxaiw9m3mgc740y4j6xz67csi0xih0",
       "depends": ["BiocParallel", "ellipse", "ggplot2"]
     },
     "ballgown": {
       "name": "ballgown",
-      "version": "2.36.0",
-      "sha256": "0x3avbqf0ipmb70szf2chhbdg14ba2hwhyyz0wd66c1qwfk6aj9v",
+      "version": "2.38.0",
+      "sha256": "1b49hxr5glxzpcy3ykk62fcn9kqyadlhwyl01rhz70wcnryhzzd8",
       "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "limma", "rtracklayer", "sva"]
     },
     "bambu": {
       "name": "bambu",
-      "version": "3.6.0",
-      "sha256": "1pn6a74nvcpn0xzfb8167hbc6pdma0ybhh7kjpqdl4hgjp446w5w",
+      "version": "3.8.0",
+      "sha256": "1jh1qvscwd2fkyb0vzj93kh27h3qssif5fh2z365yvp3pz4asy1j",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "tidyr", "xgboost"]
     },
     "bamsignals": {
       "name": "bamsignals",
-      "version": "1.36.0",
-      "sha256": "1jq993m6b0cv3ibgjrbzyka7svb653hvi6bvqhf8ir3lgjgs23dp",
+      "version": "1.38.0",
+      "sha256": "1cp4wh9w12vw7iq5cj3v4nh99md1bizrnw312sgib2r3x4p6vpf6",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "Rcpp", "Rhtslib", "zlibbioc"]
     },
     "bandle": {
       "name": "bandle",
-      "version": "1.8.0",
-      "sha256": "0lkmwr207s26kxmhfcsay4mb3fg70wjcrhhjj82g5yjrycmjidm9",
+      "version": "1.10.0",
+      "sha256": "0bq0wmsq4lv16d1hiqbqj6djv55zdnrz4zm7lhi4vxvn3rlywl4g",
       "depends": ["BH", "Biobase", "BiocParallel", "BiocStyle", "MSnbase", "Rcpp", "RcppArmadillo", "S4Vectors", "circlize", "dplyr", "ggalluvial", "ggplot2", "ggrepel", "knitr", "lbfgs", "pRoloc", "pRolocdata", "plyr", "rlang", "robustbase", "tidyr"]
     },
     "banocc": {
       "name": "banocc",
-      "version": "1.28.0",
-      "sha256": "12fysw9m3rrmyfq1j97rdklaln6vgjdmz7hj85vrh10haz9j23s2",
+      "version": "1.30.0",
+      "sha256": "1npmkj4a834k4kkaa6az94mzs17nhqq1i74zg7s81n3xi4ghd66k",
       "depends": ["coda", "mvtnorm", "rstan", "stringr"]
     },
     "barcodetrackR": {
       "name": "barcodetrackR",
-      "version": "1.12.0",
-      "sha256": "0x0fpa44lyww2l1rdc35pdlgczz4y1vxjbn0s1frlpaacmqcxrly",
+      "version": "1.14.0",
+      "sha256": "1vmfq5llvg7s8f919jafllip2v710sqsrpfxa8imjg30hr9h9fkl",
       "depends": ["RColorBrewer", "S4Vectors", "SummarizedExperiment", "circlize", "cowplot", "dplyr", "ggdendro", "ggplot2", "ggridges", "magrittr", "plyr", "proxy", "rlang", "scales", "shiny", "tibble", "tidyr", "vegan", "viridis"]
     },
     "basecallQC": {
       "name": "basecallQC",
-      "version": "1.28.0",
-      "sha256": "033agi9xcyr2mpryyqjzd1diinv3cnam6f13qw4xfg0fncn0rm83",
+      "version": "1.30.0",
+      "sha256": "020hnl1vkfxncfahgypg3ryzskmzcg68cpkh04kmiz16vdrpjv6d",
       "depends": ["DT", "ShortRead", "XML", "data_table", "dplyr", "ggplot2", "knitr", "lazyeval", "magrittr", "prettydoc", "raster", "rmarkdown", "stringr", "tidyr", "yaml"]
     },
     "basilisk": {
       "name": "basilisk",
-      "version": "1.16.0",
-      "sha256": "1jhaar524z4ly8d4c7nyjn094m4sgz4vhh8qljd2yvs30xxs0jin",
+      "version": "1.18.0",
+      "sha256": "0ziyxi6qcsvs2ks28vh0sdfp3xilh1kfzyhy0qwa2fwn7j7dnhr3",
       "depends": ["basilisk_utils", "dir_expiry", "reticulate"]
     },
     "basilisk_utils": {
       "name": "basilisk.utils",
-      "version": "1.16.0",
-      "sha256": "04amc13h4ghy1zr9wkdl42wgicxz5s2iwsspxvvi18acm06nzgfh",
+      "version": "1.18.0",
+      "sha256": "0vq0188f6wz0j4w0yqyki4dcp47z3d7w7m19diw7bfgy4yprqdgk",
       "depends": ["dir_expiry"]
     },
     "batchelor": {
       "name": "batchelor",
-      "version": "1.20.0",
-      "sha256": "1h70rm0h711ndj9kz3q10yd9f6npjiwvk9wmkg6w3pdgjni1nrl0",
-      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "ResidualMatrix", "S4Vectors", "ScaledMatrix", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "igraph", "scuttle"]
+      "version": "1.22.0",
+      "sha256": "0l63w2c2jl27rj47604lx80wlppsp7h1panbm0n89fvf4vbzgm22",
+      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "ResidualMatrix", "S4Vectors", "ScaledMatrix", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "beachmat", "igraph", "scuttle"]
     },
     "bayNorm": {
       "name": "bayNorm",
-      "version": "1.22.0",
-      "sha256": "0b05446vcqxr7smxyhmvl6rxlckzzgqhf5v1059657kihhscqr7s",
+      "version": "1.24.0",
+      "sha256": "1302l7j613psz19l7jshpd8aj4971qscdm7cgdr3knkfgk3dqnyz",
       "depends": ["BB", "BiocParallel", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "SingleCellExperiment", "SummarizedExperiment", "doSNOW", "fitdistrplus", "foreach", "iterators", "locfit"]
     },
     "baySeq": {
       "name": "baySeq",
-      "version": "2.38.0",
-      "sha256": "0nlkynzijxl6f8983vdpmcssvrpjf6s42zx3lxfwxwlhrvz1yg9l",
+      "version": "2.40.0",
+      "sha256": "0vhp9agxqkfm7fs07kkd9gqzp4v7936wdmbd2qc2gf4g3rw3akzm",
       "depends": ["GenomicRanges", "abind", "edgeR"]
     },
     "bcSeq": {
       "name": "bcSeq",
-      "version": "1.26.0",
-      "sha256": "0bbr46clvr1nlqk7lkdyvz5y0yfvw1rxsm29gsanfqbxa3akvxn6",
+      "version": "1.28.0",
+      "sha256": "1yjy87nsng26x03lvqdwm1wdclf9wk7v4dad1ki08xv9gl8fzsvk",
       "depends": ["Biostrings", "Matrix", "Rcpp"]
     },
     "beachmat": {
       "name": "beachmat",
-      "version": "2.20.0",
-      "sha256": "0gvxz9w2mi8scqyyhhnrasscs7hwvxxlqvh7j9m6akpi8qq91v6y",
-      "depends": ["BiocGenerics", "DelayedArray", "Matrix", "Rcpp", "SparseArray"]
+      "version": "2.22.0",
+      "sha256": "0w1abs9nwpn66zc81alnzvdrg5y5w0sl2qdqw6bx3hp0ry1sjfr5",
+      "depends": ["BiocGenerics", "DelayedArray", "Matrix", "Rcpp", "SparseArray", "assorthead"]
     },
     "beachmat_hdf5": {
       "name": "beachmat.hdf5",
-      "version": "1.2.0",
-      "sha256": "1qjib3vw0b0nvfx3j5nfgwikcmc5jq49ddahv05arhdabd40vmg4",
-      "depends": ["DelayedArray", "HDF5Array", "Rcpp", "Rhdf5lib", "beachmat"]
+      "version": "1.4.0",
+      "sha256": "0jla4by5y8qalswfam348p2459lk191x4p057w24jqgcf98gbbhg",
+      "depends": ["DelayedArray", "HDF5Array", "Rcpp", "Rhdf5lib", "assorthead", "beachmat"]
     },
     "beadarray": {
       "name": "beadarray",
-      "version": "2.54.0",
-      "sha256": "0yda6maj985k374bh6zkrs8qffw1jrz9gc3mja07ibyn4pvzkclq",
+      "version": "2.56.0",
+      "sha256": "1khlljv6q32y2jg17g3lf6hvjs36ld27nasv03vlq7mb61pgda7d",
       "depends": ["AnnotationDbi", "BeadDataPackR", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "ggplot2", "hexbin", "illuminaio", "limma", "reshape2"]
     },
     "beer": {
       "name": "beer",
-      "version": "1.8.0",
-      "sha256": "1b7pw7nwpryrdji14y9cbv03f8g8r8lzf1fd72ff2b69csp993ww",
-      "depends": ["BiocParallel", "PhIPData", "SummarizedExperiment", "cli", "edgeR", "progressr", "rjags"]
-    },
-    "benchdamic": {
-      "name": "benchdamic",
       "version": "1.10.0",
-      "sha256": "040lkmwz51za2biqlf3z3ai5j03rmw15kwz3i3v10rzq0322fsk3",
-      "depends": ["ALDEx2", "ANCOMBC", "BiocParallel", "DESeq2", "GUniFrac", "MAST", "MGLM", "Maaslin2", "MicrobiomeStat", "NOISeq", "RColorBrewer", "Seurat", "SummarizedExperiment", "TreeSummarizedExperiment", "corncob", "cowplot", "dearseq", "edgeR", "ggdendro", "ggplot2", "ggridges", "limma", "lme4", "metagenomeSeq", "mixOmics", "phyloseq", "plyr", "reshape2", "tidytext", "zinbwave"]
+      "sha256": "0mix24ny5g9b6lk1810f6288rbr7i3dlkw5ppxz1z03kzvisjpb0",
+      "depends": ["BiocParallel", "PhIPData", "SummarizedExperiment", "cli", "edgeR", "progressr", "rjags"]
     },
     "betaHMM": {
       "name": "betaHMM",
-      "version": "1.0.0",
-      "sha256": "1dwdjfvca22gaz0qjngf3fc32bpybz1dvvbwd91wgznzk7wjk6yq",
+      "version": "1.2.1",
+      "sha256": "06r5b8yw1rpi49chmzkrgbzrgdds2i16xb6mb7fdphzzr0q0v4ki",
       "depends": ["GenomicRanges", "S4Vectors", "SummarizedExperiment", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "pROC", "scales", "stringr", "tidyr", "tidyselect"]
     },
     "bettr": {
       "name": "bettr",
-      "version": "1.0.0",
-      "sha256": "19z7df9kmk4zfbljlq5ginl82zml37iyjnjm0fqinm2b9i1ww432",
+      "version": "1.2.0",
+      "sha256": "03jv8nfbnxi200dy9kslsx9pyfzmzy992f3bnmdghkxq8fd3wzqc",
       "depends": ["ComplexHeatmap", "DT", "Hmisc", "S4Vectors", "SummarizedExperiment", "bslib", "circlize", "cowplot", "dplyr", "ggplot2", "rlang", "scales", "shiny", "shinyjqui", "sortable", "tibble", "tidyr"]
     },
-    "bgx": {
-      "name": "bgx",
-      "version": "1.70.0",
-      "sha256": "0sglk8q12fvqk6m699v3lajwr1zb8wnrldfv2n8y7jjy2fqcvs19",
-      "depends": ["Biobase", "Rcpp", "affy", "gcrma"]
-    },
     "bigmelon": {
       "name": "bigmelon",
-      "version": "1.30.0",
-      "sha256": "0fa1dwbk6hdiwg6dmbks7hy4cg3ydyd2sv94cyl0003awhf00nn9",
+      "version": "1.32.0",
+      "sha256": "05l7kgjgjx4rk3vgffmmh5jrg8qx9bvr9bmq9f70w4bxx4kj6xry",
       "depends": ["Biobase", "BiocGenerics", "GEOquery", "gdsfmt", "illuminaio", "methylumi", "minfi", "wateRmelon"]
     },
     "bioCancer": {
       "name": "bioCancer",
-      "version": "1.32.0",
-      "sha256": "0mwmdavakmrfa7d7h0h14lkk6k7ps3g8hvbja1hq01nkdfy7imvp",
+      "version": "1.34.0",
+      "sha256": "1334qfqyi6cmyvf7x98v0hnbz2wfdqq5v0s1zp35k1r91g86dhrr",
       "depends": ["AlgDesign", "AnnotationDbi", "Biobase", "DOSE", "DT", "DiagrammeR", "GO_db", "R_methodsS3", "R_oo", "ReactomePA", "XML", "cBioPortalData", "clusterProfiler", "dplyr", "geNetClassifier", "htmlwidgets", "org_Bt_eg_db", "org_Hs_eg_db", "plyr", "r_import", "radiant_data", "reactome_db", "shiny", "shinythemes", "tibble", "tidyr", "visNetwork"]
     },
     "bioDist": {
       "name": "bioDist",
-      "version": "1.76.0",
-      "sha256": "1yxr5df1y8v5c9imh27j86s7g9wjvi51j2wyn8jgma875mad41hq",
+      "version": "1.78.0",
+      "sha256": "0c2dwb6znpfcfcz5nxjvi4scs4nhn4h42gb48jhnyz4p2i96rmqb",
       "depends": ["Biobase", "KernSmooth"]
     },
     "bioassayR": {
       "name": "bioassayR",
-      "version": "1.42.0",
-      "sha256": "0rckhgg73cgz0ppqaywc7nvbnp1is6cyjfa7dn2l32xxrcl57pq6",
+      "version": "1.44.0",
+      "sha256": "0zxrmxsq3hvim288w16029xazk3fksiwdl444f211yyfhwkb1n31",
       "depends": ["BiocGenerics", "ChemmineR", "DBI", "Matrix", "RSQLite", "XML", "rjson"]
     },
     "biobroom": {
       "name": "biobroom",
-      "version": "1.36.0",
-      "sha256": "0flj14d8aamr1fzcpd0k7jq5rs0j5dsijpahg066qrnapn5990d0",
+      "version": "1.38.0",
+      "sha256": "1ihzrx46320fxhbxvxk4c87bidvj2m2cy6qxya61n7p807qqq76q",
       "depends": ["Biobase", "broom", "dplyr", "tidyr"]
     },
     "biobtreeR": {
       "name": "biobtreeR",
-      "version": "1.16.0",
-      "sha256": "0660rc8b4vkic4dbf64wkky68f0hk92ip52x7gihvv203cj9fin4",
+      "version": "1.18.0",
+      "sha256": "1kzlssv731qlpjrqa4l72bw2fwjzdxc5045arydnggfvcksfr2q6",
       "depends": ["httpuv", "httr", "jsonlite", "stringi"]
     },
     "biocGraph": {
       "name": "biocGraph",
-      "version": "1.66.0",
-      "sha256": "0ji6pa8wfj57drpnp03vgas1pird84g15nnp6469jmx773izhfq0",
+      "version": "1.68.0",
+      "sha256": "13k619dazrrfh52pmq6jqx3q2sr3jx5jilbvkbn4yk55md6dxjcy",
       "depends": ["BiocGenerics", "Rgraphviz", "geneplotter", "graph"]
     },
     "biocViews": {
       "name": "biocViews",
-      "version": "1.72.0",
-      "sha256": "10j9s50ppfx8r752wkabls0n4gxp17z7dnaf352f3dcdbfa8ijh5",
+      "version": "1.74.0",
+      "sha256": "0y1i7sl76kczmkynb2lyd7v6mmz4gfp3j1qp4w4swn221q5p1cjr",
       "depends": ["Biobase", "BiocManager", "RBGL", "RCurl", "RUnit", "XML", "graph"]
     },
     "biocroxytest": {
       "name": "biocroxytest",
-      "version": "1.0.0",
-      "sha256": "0na0qbrqjfyq6wlxfnp6h6ljdmcxs5nq4spbifk6v74cxm7aqgni",
+      "version": "1.2.0",
+      "sha256": "0fh6h0isswnljvl8dqlcs6kka2834d3w2plx5prw7k7qhz99xcfg",
       "depends": ["cli", "glue", "roxygen2", "stringr"]
     },
     "biocthis": {
       "name": "biocthis",
-      "version": "1.14.0",
-      "sha256": "1f09vw5qjxyirz5xbvnnjlwxg7z0i0y8yry49d1gyx0spyhzl7sp",
+      "version": "1.16.0",
+      "sha256": "0ajwp3880fr0cn647wxsd1gcyq78d2mdqwsalijh0npbr1r3zjyk",
       "depends": ["BiocManager", "fs", "glue", "rlang", "styler", "usethis"]
     },
     "biodb": {
       "name": "biodb",
-      "version": "1.12.0",
-      "sha256": "0zkd6505q0myc5l9d69i1fvfhcrjqxkv208p84zr5p7xi8jmg3dw",
+      "version": "1.14.0",
+      "sha256": "1mkkj2x37n5j90g5ixh6jaz5gwd0fz35wqb4s1jlp4pvxhd8jyjj",
       "depends": ["BiocFileCache", "R6", "RCurl", "RSQLite", "Rcpp", "XML", "chk", "git2r", "jsonlite", "lgr", "lifecycle", "openssl", "plyr", "progress", "rappdirs", "stringr", "testthat", "withr", "yaml"]
     },
     "biodbChebi": {
       "name": "biodbChebi",
-      "version": "1.10.0",
-      "sha256": "1w3mnryv1x5a68llnpqfdsrkzwrwq2b7n6hm458gfkw6ql070109",
+      "version": "1.12.0",
+      "sha256": "10v1vl60jkc6168gnb08bl2j3fvj971xwy2i1az2mzkjjlz3csng",
       "depends": ["R6", "biodb"]
     },
-    "biodbExpasy": {
-      "name": "biodbExpasy",
-      "version": "1.8.1",
-      "sha256": "0n5avxhv5131122h18d3r2v9c64i3nb251hmz8hhc6chmk203fmj",
-      "depends": ["R6", "biodb", "chk", "stringr"]
-    },
     "biodbHmdb": {
       "name": "biodbHmdb",
-      "version": "1.10.1",
-      "sha256": "14g5c043rgwp259z5km4wvl5h9810fxpsja4wmk326plqpnqhcjr",
+      "version": "1.12.0",
+      "sha256": "1v1s7ivcdjlj6xqs36h151kd08q38sfpk2p4q5ffcyrw73ax5jnj",
       "depends": ["R6", "Rcpp", "biodb", "testthat", "zip"]
     },
-    "biodbKegg": {
-      "name": "biodbKegg",
-      "version": "1.10.2",
-      "sha256": "0rwxbg3ij5rg3agzsxib7f80b05ar40xnql2krl44c3n43yqkwyw",
-      "depends": ["R6", "biodb", "chk", "lifecycle"]
-    },
-    "biodbLipidmaps": {
-      "name": "biodbLipidmaps",
-      "version": "1.10.0",
-      "sha256": "1p181kwy9q8jj4m7flg71pqn7h6865hbwha4n6j2qki830vym6rv",
-      "depends": ["R6", "biodb", "lifecycle"]
-    },
     "biodbNcbi": {
       "name": "biodbNcbi",
-      "version": "1.8.0",
-      "sha256": "01v0lym2kldcjypqsx9b8k8hvxdmnr1rsczdzl87nsax22q6g9hc",
+      "version": "1.10.0",
+      "sha256": "0v3mbvjimy98d0a3j0238a5h7xi8qhxapjps9157qs7d7can7ivy",
       "depends": ["R6", "XML", "biodb", "chk"]
     },
     "biodbNci": {
       "name": "biodbNci",
-      "version": "1.8.0",
-      "sha256": "11xzf804v9dp25zw7kxwws2q386h22ybibrcplm3wrkrxj223kks",
+      "version": "1.10.0",
+      "sha256": "1jdqsfly751pyh3d3nsc615glg5ni4xv9y3bbg7hv95i1501krkz",
       "depends": ["R6", "Rcpp", "biodb", "chk", "testthat"]
     },
     "biodbUniprot": {
       "name": "biodbUniprot",
-      "version": "1.10.0",
-      "sha256": "1jwv6y9kaq2d7iswgz602yhwg35c9d9yqa9c87d454n0wrl6h6yg",
+      "version": "1.12.0",
+      "sha256": "1srh6m3q76f5wc0a58vf353rcish9ciak9l1fxwp342bafnb3w8l",
       "depends": ["R6", "biodb"]
     },
     "biomaRt": {
       "name": "biomaRt",
-      "version": "2.60.1",
-      "sha256": "0mzdxpagxwiwyznhd7h93cgy01a2j85rgb5dpnkzgp4sxw01n7rb",
-      "depends": ["AnnotationDbi", "BiocFileCache", "digest", "httr2", "progress", "rappdirs", "stringr", "xml2"]
+      "version": "2.62.0",
+      "sha256": "16xh2vj729sjg9660w1sw5jcz59sawbni3i2nf8rzawaqf0ks979",
+      "depends": ["AnnotationDbi", "BiocFileCache", "curl", "digest", "httr2", "progress", "rappdirs", "stringr", "xml2"]
     },
     "biomformat": {
       "name": "biomformat",
-      "version": "1.32.0",
-      "sha256": "0jys0nmp833ax96vfdh1adikpyapr5gkmldx5kvv5bqiqc8aipzb",
+      "version": "1.34.0",
+      "sha256": "0a0260rr13czrwfnzxmgq168jgiqd4app8rjdmywh9wg2w2xy7hf",
       "depends": ["Matrix", "jsonlite", "plyr", "rhdf5"]
     },
     "biomvRCNS": {
       "name": "biomvRCNS",
-      "version": "1.44.0",
-      "sha256": "1wk0qagx9s2lxykc1fp7l35kl6q17lqy6x4fl2c57v3wa11f47mi",
+      "version": "1.46.0",
+      "sha256": "14cvhm3r43g1b2wmjj63cfgafjbaf3zzxy0jlkp1bix4bs9fvgns",
       "depends": ["GenomicRanges", "Gviz", "IRanges", "mvtnorm"]
     },
     "biosigner": {
       "name": "biosigner",
-      "version": "1.32.0",
-      "sha256": "1c56s8lr5cdx27v0rdi4l4h680x6ga9wazf4dj1xkqyliqz65ps5",
+      "version": "1.34.0",
+      "sha256": "0d2prfx2w3kfja5gzp88q15cnhaswx2kg30l1zcb0bnsvzfblr8k",
       "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "SummarizedExperiment", "e1071", "randomForest", "ropls"]
     },
     "biotmle": {
       "name": "biotmle",
-      "version": "1.28.0",
-      "sha256": "06kixhzkrzxyic44kdmqrv19v2c4a7sri8cbhbvww8km4n5l39sf",
+      "version": "1.30.0",
+      "sha256": "06m79562baskma0vyj1632w2j669s2pymfniid5b8fyd3vqi4c6w",
       "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "drtmle", "ggplot2", "ggsci", "limma", "superheat", "tibble"]
     },
     "biovizBase": {
       "name": "biovizBase",
-      "version": "1.52.0",
-      "sha256": "1jbcnjjwdjy7zfy0ybgfy1y5ym7rygzkailr5bm4hnh9bn2837p7",
+      "version": "1.54.0",
+      "sha256": "0g4hh3ka9891yamf90y1964xn7qsgzqwnb3f0dsmqbmbryk8pyz6",
       "depends": ["AnnotationDbi", "AnnotationFilter", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "dichromat", "ensembldb", "rlang", "scales"]
     },
     "biscuiteer": {
       "name": "biscuiteer",
-      "version": "1.18.0",
-      "sha256": "15bisrcgyiv9ndfvgm0p4igyr4jwsf68ccis1nf1hi9x291k7m6y",
+      "version": "1.20.0",
+      "sha256": "1hdfhmfgg2chsk54vrrcazi26x5adrbchmzz5wyhqi7rb85cs804",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "Homo_sapiens", "IRanges", "Matrix", "Mus_musculus", "QDNAseq", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "biscuiteerData", "bsseq", "data_table", "dmrseq", "gtools", "impute", "matrixStats", "qualV", "readr", "rtracklayer"]
     },
     "blacksheepr": {
       "name": "blacksheepr",
-      "version": "1.18.0",
-      "sha256": "1avqq6m30x2bg3h32laxcpbd4f5s10548k3cj4xb1d25svnn8pax",
+      "version": "1.20.0",
+      "sha256": "0riggz2nx7w8cfacn7b2kx9gnh01jd50pa6xw4k3j5bxcj0zwpcs",
       "depends": ["ComplexHeatmap", "RColorBrewer", "SummarizedExperiment", "circlize", "pasilla", "viridis"]
     },
     "blima": {
       "name": "blima",
-      "version": "1.38.0",
-      "sha256": "1a5rzwgsvkwzl97p6pvbhi8dsvd7vbny0bajjp273czrm09yk8rc",
+      "version": "1.40.0",
+      "sha256": "1qk3kajfp5j4mk8g1hqijaxd5kihg12q67wa4aln25f6rsx55lsn",
       "depends": ["Biobase", "BiocGenerics", "Rcpp", "beadarray"]
     },
     "bluster": {
       "name": "bluster",
-      "version": "1.14.0",
-      "sha256": "1bj7wx2dnwbrv2gxcmqmq815vawfiqj2xy3624fjli11r8c1hywa",
-      "depends": ["BiocNeighbors", "BiocParallel", "Matrix", "Rcpp", "S4Vectors", "cluster", "igraph"]
+      "version": "1.16.0",
+      "sha256": "1k8aj5zj297l5yf15f3xak9adcrxr79ax7ifwhz2jq23ifd4dmfs",
+      "depends": ["BiocNeighbors", "BiocParallel", "Matrix", "Rcpp", "S4Vectors", "assorthead", "cluster", "igraph"]
     },
     "bnbc": {
       "name": "bnbc",
-      "version": "1.26.0",
-      "sha256": "09vy9igcnw927j0zb4znrbcknkaic69ly6w4syb1cwysr0rvmrdz",
+      "version": "1.28.0",
+      "sha256": "0fcnx7arvm520f0cj47dprlaxwbff4zx0md3yffrwyi9gs579jqk",
       "depends": ["BiocGenerics", "EBImage", "GenomeInfoDb", "GenomicRanges", "HiCBricks", "IRanges", "Rcpp", "S4Vectors", "SummarizedExperiment", "data_table", "matrixStats", "preprocessCore", "rhdf5", "sva"]
     },
     "bnem": {
       "name": "bnem",
-      "version": "1.12.0",
-      "sha256": "15jzsba3qdkj5y7gqxklgv69r5bq2li4irvjkhmbjnjlv0pv4wdg",
+      "version": "1.14.0",
+      "sha256": "08wkank5vg0liqzciafkivmpyqk3faznr2cq0dzkhwj249l7p5l0",
       "depends": ["Biobase", "CellNOptR", "RColorBrewer", "Rgraphviz", "affy", "binom", "cluster", "epiNEM", "flexclust", "graph", "limma", "matrixStats", "mnem", "rmarkdown", "snowfall", "sva", "vsn"]
     },
     "borealis": {
       "name": "borealis",
-      "version": "1.8.0",
-      "sha256": "1m7yq1sx4ivbcrjm1w3l5qsyhlv0jdkb5l91kxd5hvisakfdrfz9",
+      "version": "1.10.0",
+      "sha256": "0z5giwwm3sg6z437ais2pdkmp44lyg2zms53jqqyhxqz230dkax9",
       "depends": ["Biobase", "DSS", "GenomicRanges", "R_utils", "bsseq", "cowplot", "doParallel", "dplyr", "foreach", "gamlss", "gamlss_dist", "ggplot2", "plyr", "purrr", "rlang", "snow"]
     },
     "branchpointer": {
       "name": "branchpointer",
-      "version": "1.30.0",
-      "sha256": "034sa73ll152s24cgrz47br7kyswr7jn6c735mp6dvbhppmlj2xm",
+      "version": "1.32.0",
+      "sha256": "0r1qqdvwymhv7bw74bys2ns2i2l96amz7lmybih2n0vc3x7ndqzb",
       "depends": ["BSgenome_Hsapiens_UCSC_hg38", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "biomaRt", "caret", "cowplot", "data_table", "gbm", "ggplot2", "kernlab", "plyr", "rtracklayer", "stringr"]
     },
     "breakpointR": {
       "name": "breakpointR",
-      "version": "1.22.0",
-      "sha256": "0imbsqrslclvfyvc00sv6ngvl5hqlr6ian07v521m63ffpx6ll78",
+      "version": "1.24.0",
+      "sha256": "0x95r30dvkkpsbang8vj0xg4mc48ljc5ci318m55n92lk0lfzpa0",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "breakpointRdata", "cowplot", "doParallel", "foreach", "ggplot2", "gtools"]
     },
     "brendaDb": {
       "name": "brendaDb",
-      "version": "1.18.0",
-      "sha256": "1rhmd3v20y2cw70zpzykpz7bidf000dq904c2qlf58nqwclxj88l",
+      "version": "1.20.0",
+      "sha256": "15hqmpjci5kfv2gvrzjj3jxkmifjgx4h01w6alrrwhp09z729crm",
       "depends": ["BiocFileCache", "BiocParallel", "Rcpp", "crayon", "dplyr", "magrittr", "purrr", "rappdirs", "rlang", "stringr", "tibble", "tidyr"]
     },
+    "broadSeq": {
+      "name": "broadSeq",
+      "version": "1.0.0",
+      "sha256": "143x96pa2bsq1amcx434p937d1v4q03s95bnhrs5pv4bwm3w151g",
+      "depends": ["BiocStyle", "DELocal", "DESeq2", "EBSeq", "NOISeq", "SummarizedExperiment", "clusterProfiler", "dplyr", "edgeR", "forcats", "genefilter", "ggplot2", "ggplotify", "ggpubr", "pheatmap", "plyr", "purrr", "sechm", "stringr"]
+    },
     "bsseq": {
       "name": "bsseq",
-      "version": "1.40.0",
-      "sha256": "1b7a9ryl4lz6qy2pni3k9bk6hdf147s3m7fx0icg6fkgi0ymssyx",
+      "version": "1.42.0",
+      "sha256": "0gxjx1x2rw07615f7p9fixf4j3ph9x9b36mcb4vwg4h0avq5wfdx",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "R_utils", "Rcpp", "S4Vectors", "SummarizedExperiment", "beachmat", "data_table", "gtools", "limma", "locfit", "permute", "rhdf5", "scales"]
     },
     "bugsigdbr": {
       "name": "bugsigdbr",
-      "version": "1.10.0",
-      "sha256": "0fg7rk14jgpr07wm93i40wklxphag9yw56kr59rw1cfdfhqnmsv7",
+      "version": "1.12.0",
+      "sha256": "1rjmrdslx3ifbg268x57hiq189hjmj46w4vxrd79ism25lzqzp77",
       "depends": ["BiocFileCache", "vroom"]
     },
     "bumphunter": {
       "name": "bumphunter",
-      "version": "1.46.0",
-      "sha256": "08b5d0grmpk5pryffdh6gdafhp1brana353q2kmwhz7x55aq3w68",
+      "version": "1.48.0",
+      "sha256": "185kxkx7lcnylfwp6c9hnnxarwa3rrwb1q45c5z6hl3wj7d74154",
       "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "doRNG", "foreach", "iterators", "limma", "locfit", "matrixStats"]
     },
     "cBioPortalData": {
       "name": "cBioPortalData",
-      "version": "2.16.0",
-      "sha256": "0s1qy46z78hlk37lnvqh1zi36y90299f6ym82k2d60jbw8aw2jxa",
+      "version": "2.18.1",
+      "sha256": "192p8nw4963dwncwh1y4akfzlk1gcyjifann531hm0mk13qk2qfs",
       "depends": ["AnVIL", "BiocFileCache", "GenomeInfoDb", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RTCGAToolbox", "RaggedExperiment", "S4Vectors", "SummarizedExperiment", "TCGAutils", "digest", "dplyr", "httr", "readr", "tibble", "tidyr"]
     },
     "cTRAP": {
       "name": "cTRAP",
-      "version": "1.22.0",
-      "sha256": "119hnbv0p3mgr3zh9dff9pwllnsk790hm0ahypzpr08gwg2ml9lb",
+      "version": "1.24.0",
+      "sha256": "0rnmhz04vm141imi8dxn3fl6mf6gy0mk2jn0wi8qidrn0qmyjbz4",
       "depends": ["AnnotationDbi", "AnnotationHub", "DT", "R_utils", "binr", "cowplot", "data_table", "dplyr", "fastmatch", "fgsea", "ggplot2", "ggrepel", "highcharter", "htmltools", "httr", "limma", "pbapply", "purrr", "qs", "readxl", "reshape2", "rhdf5", "rlang", "scales", "shiny", "shinycssloaders", "tibble"]
     },
     "cageminer": {
       "name": "cageminer",
-      "version": "1.10.0",
-      "sha256": "0ijagv7yzlil4mdibip5css7asdrnzfr2lq3r9zq8fkf4fwr2mpx",
+      "version": "1.12.0",
+      "sha256": "124kja2p24b4zcshh85lyj6fg7agz2ga28r94ajp86d1nj6vi0pc",
       "depends": ["BioNERO", "GenomeInfoDb", "GenomicRanges", "IRanges", "ggbio", "ggplot2", "ggtext", "reshape2", "rlang"]
     },
     "calm": {
       "name": "calm",
-      "version": "1.18.0",
-      "sha256": "0sbl44747xc7m4jpf318gb7cb1hx6r2mw4bk81da7d5d8kpi9n9s",
+      "version": "1.20.0",
+      "sha256": "1hf7znmvgwkpxlwy1983fnnsk40brm9bc60g7bflid6ck3w38gsv",
       "depends": ["mgcv"]
     },
     "canceR": {
       "name": "canceR",
-      "version": "1.38.0",
-      "sha256": "1hmc4sw3w5wsix7ixr85lplpp6hxrd5xpf5apvr77hligw61dhvs",
+      "version": "1.40.0",
+      "sha256": "1lilpakq2fi4xynn6674xgp3a22732fd2zafz182q5086cn2xi3l",
       "depends": ["Biobase", "Formula", "GSEABase", "RUnit", "R_methodsS3", "R_oo", "cBioPortalData", "circlize", "dplyr", "geNetClassifier", "phenoTest", "plyr", "rpart", "survival", "tidyr", "tkrplot"]
     },
     "cancerclass": {
       "name": "cancerclass",
-      "version": "1.48.0",
-      "sha256": "00lin7likd0ffqk2nqx5ql8v3zpr82xprv36c1gzw0wkrgp3rgmw",
+      "version": "1.50.0",
+      "sha256": "0yap9vzd2ff7hzznvl87k1fy6vffv5a68l5601pw4i23r14j2dkq",
       "depends": ["Biobase", "binom"]
     },
     "cardelino": {
       "name": "cardelino",
-      "version": "1.6.0",
-      "sha256": "16mczwh41gf7ikbzxvggai7a8d64fn2k7q9w1yxf0sn6cwg3l0di",
+      "version": "1.8.0",
+      "sha256": "1zglflqc53izs5rh8cdld0y129mdvwlhmv9pgbgrl4clcnnbiwac",
       "depends": ["GenomeInfoDb", "GenomicRanges", "Matrix", "S4Vectors", "VariantAnnotation", "combinat", "ggplot2", "ggtree", "matrixStats", "pheatmap", "snpStats", "vcfR"]
     },
     "casper": {
       "name": "casper",
-      "version": "2.38.0",
-      "sha256": "0bwjnncm93j99m38mv99i1pw42cjmib4sqzw5nhb6p9mj39mm3zb",
+      "version": "2.40.0",
+      "sha256": "1f8gg39madycigcl5xqrb04sa4dy6a2z1a4f15jryaddf3s62q36",
       "depends": ["Biobase", "BiocGenerics", "EBarrays", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VGAM", "coda", "gaga", "gtools", "limma", "mgcv", "rtracklayer", "sqldf", "survival"]
     },
     "categoryCompare": {
       "name": "categoryCompare",
-      "version": "1.48.0",
-      "sha256": "0mfmv3wna7dddf4i3ckh2iin8vq05g4fjb1n2pvw0s9lz3da3rjf",
+      "version": "1.50.0",
+      "sha256": "1hpd5c21qvf0wh2rmcybcsm632lr6cp9069dyk3sccqyx1r6aw8v",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Category", "GOstats", "GSEABase", "RCy3", "annotate", "colorspace", "graph", "hwriter"]
     },
     "cbaf": {
       "name": "cbaf",
-      "version": "1.26.3",
-      "sha256": "1lpz3n288v32nbb0g4jb1mxmx79amm29m40w3sfkgllnjjdwsyd3",
-      "depends": ["BiocFileCache", "RColorBrewer", "cBioPortalData", "genefilter", "gplots", "openxlsx"]
+      "version": "1.28.0",
+      "sha256": "0cymffvrpf7zyb7jvkn6pvkxn8g12j8bh25sq6z23piwiqa0s3gw",
+      "depends": ["BiocFileCache", "RColorBrewer", "cBioPortalData", "genefilter", "gplots", "openxlsx", "zip"]
     },
     "cbpManager": {
       "name": "cbpManager",
-      "version": "1.12.0",
-      "sha256": "1idlxmnbyvc1nzshnvf3p4y9xdjb2kdcm05kpf3ihh993igddk14",
+      "version": "1.14.0",
+      "sha256": "13xdiga7s7izhx5jl4i6zrqmn21xb68q1r3qh5a96dlvmspfw30q",
       "depends": ["DT", "basilisk", "dplyr", "htmltools", "jsonlite", "magrittr", "markdown", "plyr", "rapportools", "reticulate", "rintrojs", "rlang", "shiny", "shinyBS", "shinycssloaders", "shinydashboard", "vroom"]
     },
     "ccImpute": {
       "name": "ccImpute",
-      "version": "1.6.1",
-      "sha256": "043lw1v8kkilki5gq6rjbfbyln39qlld55ch6wnz8qh2yv3k427i",
+      "version": "1.8.0",
+      "sha256": "1k3hy1bdvj5zm2y42n67zkzbkkm6s8qa93krs4kvxnfdzmbkf5l3",
       "depends": ["BiocParallel", "Matrix", "Rcpp", "RcppEigen", "SingleCellExperiment", "SummarizedExperiment", "irlba", "sparseMatrixStats"]
     },
     "ccfindR": {
       "name": "ccfindR",
-      "version": "1.24.0",
-      "sha256": "1n9dncj7d3ijk6h6fkgmh3a0c6xrfll2fifkl2bz26ndq9i4m1q9",
+      "version": "1.26.0",
+      "sha256": "1v8lrgs5rqf0pz5gg7g5hh9y7cj90s8k04bhimhlzr0iah27vhc5",
       "depends": ["Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "Rdpack", "Rmpi", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ape", "gtools", "irlba"]
     },
     "ccmap": {
       "name": "ccmap",
-      "version": "1.30.0",
-      "sha256": "16n0z3rvwaqzqgv59v73i29f66ywsabargywxwh6acv0xgnrn6w6",
+      "version": "1.32.0",
+      "sha256": "1g0r1vfbh2w21cb891wxqdcs06cnmc8vpkxs65pydqkxvbjbccji",
       "depends": ["AnnotationDbi", "BiocManager", "ccdata", "data_table", "doParallel", "foreach", "lsa", "xgboost"]
     },
     "ccrepe": {
       "name": "ccrepe",
-      "version": "1.40.0",
-      "sha256": "1232pfjv5qd776zckhyxnj1i36raad37z9xwap9m3chqh673a7wl",
+      "version": "1.42.0",
+      "sha256": "0xfk14wpldxfad3zr44i2jpi67didlfp3l6a040mv2i6xf3df3hc",
       "depends": ["infotheo"]
     },
     "ceRNAnetsim": {
       "name": "ceRNAnetsim",
-      "version": "1.16.0",
-      "sha256": "1zpdh9hdx3iayyrzvn67ids374pc891blag58gb28dv2xpzfqn9m",
+      "version": "1.18.0",
+      "sha256": "06yjjxfrpsb057x0l92d9l0sdpb53c4xk4psi7ng0r3plpbp5g5q",
       "depends": ["dplyr", "furrr", "future", "ggplot2", "ggraph", "igraph", "purrr", "rlang", "tibble", "tidygraph", "tidyr"]
     },
     "celaref": {
       "name": "celaref",
-      "version": "1.22.0",
-      "sha256": "1l2bf3fhapvpaq30qdrc6nd1chfa4yjish9w9cq7lbhl3xm9b82z",
+      "version": "1.24.0",
+      "sha256": "19qr4s74ppq07x1da3c65aaw4gmcky0n9pxfv8v5pl5k90mzyfp6",
       "depends": ["BiocGenerics", "DelayedArray", "MAST", "Matrix", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "tibble"]
     },
     "celda": {
       "name": "celda",
-      "version": "1.20.0",
-      "sha256": "0d2vmjgcz5d4nimi3rxk7smbl2ywrgayasjna7kaqvf726ab71qr",
-      "depends": ["ComplexHeatmap", "DelayedArray", "MCMCprecision", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "data_table", "dbscan", "digest", "doParallel", "enrichR", "foreach", "ggplot2", "ggrepel", "gridExtra", "gtable", "matrixStats", "plyr", "reshape2", "scales", "scater", "scran", "stringr", "uwot", "withr"]
-    },
-    "cellHTS2": {
-      "name": "cellHTS2",
-      "version": "2.68.0",
-      "sha256": "0iqsxs84dcr4d1y5pg4799vv3jpf5i1hhq4fhgdp05lanx5qqpsz",
-      "depends": ["Biobase", "BiocGenerics", "Category", "GSEABase", "RColorBrewer", "genefilter", "hwriter", "locfit", "splots", "vsn"]
+      "version": "1.22.0",
+      "sha256": "1iszciqfcd1g12g5vjl667s7dw82bz48fjls32d94av1n1pxxz8v",
+      "depends": ["ComplexHeatmap", "DelayedArray", "MCMCprecision", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "data_table", "dbscan", "digest", "doParallel", "foreach", "ggplot2", "ggrepel", "gridExtra", "gtable", "matrixStats", "plyr", "reshape2", "scales", "scater", "scran", "stringr", "uwot", "withr"]
     },
     "cellbaseR": {
       "name": "cellbaseR",
-      "version": "1.28.0",
-      "sha256": "1g2y7pgpc500vls62xp817n9arsw8dbj3c0d9dbvb1d014gzmbdw",
+      "version": "1.30.0",
+      "sha256": "1glaidjcr2iralq3vppvsri7mavdvnp5gizgd8qrpcqcdw7kgq24",
       "depends": ["BiocParallel", "R_utils", "Rsamtools", "data_table", "doParallel", "foreach", "httr", "jsonlite", "pbapply", "tidyr"]
     },
     "cellity": {
       "name": "cellity",
-      "version": "1.32.0",
-      "sha256": "0m79q1c2rvv24q593c5vwsh0dsi2ahfwvf9a5pf9r9wnk3am9r3n",
+      "version": "1.34.0",
+      "sha256": "0p6xwhzdlrwmzlvv518h1iyigq8if9clyhqi11vszih7y77n80w6",
       "depends": ["AnnotationDbi", "e1071", "ggplot2", "mvoutlier", "org_Hs_eg_db", "org_Mm_eg_db", "robustbase", "topGO"]
     },
     "cellmigRation": {
       "name": "cellmigRation",
-      "version": "1.12.0",
-      "sha256": "0ahml812f6hm05dxnlsd59bfspxbi4py205kvs0wlijygfqd1ajy",
+      "version": "1.14.0",
+      "sha256": "1vaxq1ysrsmavnv3nsbs3cl587zmdjjwapm7qkv6m75l5qzmjjg9",
       "depends": ["FME", "FactoMineR", "Hmisc", "SpatialTools", "doParallel", "foreach", "matrixStats", "reshape2", "sp", "tiff", "vioplot"]
     },
     "cellscape": {
       "name": "cellscape",
-      "version": "1.28.0",
-      "sha256": "158cbhpjakynvm4glvajvpc1qs2im7bkjgriyvxwd9rs7y4lbfn4",
+      "version": "1.30.0",
+      "sha256": "1x728l0jyn1w0phx44z39gaqhywahpra1qvbbsnngvz8brdh0bvw",
       "depends": ["dplyr", "gtools", "htmlwidgets", "jsonlite", "reshape2", "stringr"]
     },
     "cellxgenedp": {
       "name": "cellxgenedp",
-      "version": "1.8.0",
-      "sha256": "0p3x0sfp4gpp64gwrlr71bgfk84wxf1gg19w1dxgihc8gpaxgb23",
-      "depends": ["DT", "curl", "dplyr", "httr", "rjsoncons", "shiny"]
+      "version": "1.10.0",
+      "sha256": "17n0g2ch4ja8kibli6i2kfrsnx84nyn829hydl34byadf3b6arz7",
+      "depends": ["DT", "cli", "curl", "dplyr", "httr", "rjsoncons", "shiny"]
     },
     "censcyt": {
       "name": "censcyt",
-      "version": "1.12.0",
-      "sha256": "078s41rvlfwlxr2a651dff5sdbqb507qvicg84k99za6cb4707ry",
+      "version": "1.14.0",
+      "sha256": "1v176nzxh8ggc16ffv5rhql7165lmaysmdgih1rvw0k547ac3gzl",
       "depends": ["BiocParallel", "MASS", "S4Vectors", "SummarizedExperiment", "broom_mixed", "diffcyt", "dirmult", "dplyr", "edgeR", "fitdistrplus", "lme4", "magrittr", "mice", "multcomp", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"]
     },
     "cfDNAPro": {
       "name": "cfDNAPro",
-      "version": "1.10.0",
-      "sha256": "0nnqfhqq7702zc4hy05wj7rf83vgjqmnpvw90vkg4zrbc7y5fv3w",
+      "version": "1.12.0",
+      "sha256": "0aqwwabdw27wwq4a6is5cvrs6pr8mhmci5bamrrgap39hbmpjbjg",
       "depends": ["BSgenome_Hsapiens_NCBI_GRCh38", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "dplyr", "ggplot2", "magrittr", "plyranges", "quantmod", "rlang", "stringr", "tibble"]
     },
     "cfTools": {
       "name": "cfTools",
-      "version": "1.4.0",
-      "sha256": "0hi9j7a13l18fi2m4w5x8lil1f81izivg8p8hzh3wy8idbsc46m2",
+      "version": "1.6.0",
+      "sha256": "085nygijrdcf9fyw32i13wy4kjsp7nhwmjfk3149bvf38vln7n2z",
       "depends": ["BH", "GenomicRanges", "R_utils", "Rcpp", "basilisk", "cfToolsData"]
     },
     "cfdnakit": {
       "name": "cfdnakit",
-      "version": "1.2.0",
-      "sha256": "1yzhh76r8zlzdg8mpamsr6jvx4j18wkv4dg2mrgclbdmy10dxhwx",
+      "version": "1.4.0",
+      "sha256": "1mzqgazfy1srjxj54d7df5kpbkj58blqal8l8adi4f6jx2z426p2",
       "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "PSCBS", "QDNAseq", "Rsamtools", "S4Vectors", "dplyr", "ggplot2", "magrittr", "rlang"]
     },
     "cghMCR": {
       "name": "cghMCR",
-      "version": "1.62.0",
-      "sha256": "07pjh4i0j6wd51k7dyig5dg5vcp8bli50my6aibmqdvrjv0wj60w",
+      "version": "1.64.0",
+      "sha256": "1cdmmzvwwx8msvsc9inmm34ssc6psgpwwh13l0lf6mcirqj9ar2f",
       "depends": ["BiocGenerics", "CNTools", "DNAcopy", "limma"]
     },
     "chihaya": {
       "name": "chihaya",
-      "version": "1.4.0",
-      "sha256": "10j05n9grh9dzb87hiq06x855c2xhi2c09jryc2ixgxd8jx6g2wy",
+      "version": "1.6.0",
+      "sha256": "0k52ym2x489k1k4d52jyd6jy4wnr7gd2p9n1pwfqbca3b91cmaj0",
       "depends": ["DelayedArray", "HDF5Array", "Matrix", "Rcpp", "Rhdf5lib", "rhdf5"]
     },
     "chimeraviz": {
       "name": "chimeraviz",
-      "version": "1.30.0",
-      "sha256": "1nx258g96v7548a742201jf6yhjf537b6pkmcijhawchnzfn38vn",
+      "version": "1.32.0",
+      "sha256": "06ln5z1ckg573baxfmh33641i6a586j20ysr11jlklqp7151an05",
       "depends": ["AnnotationDbi", "AnnotationFilter", "BiocStyle", "Biostrings", "DT", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "Gviz", "IRanges", "RCircos", "RColorBrewer", "Rgraphviz", "Rsamtools", "S4Vectors", "checkmate", "data_table", "dplyr", "ensembldb", "graph", "gtools", "magick", "org_Hs_eg_db", "org_Mm_eg_db", "plyr", "rmarkdown"]
     },
     "chipenrich": {
       "name": "chipenrich",
-      "version": "2.28.0",
-      "sha256": "01sfl3ik12bha3a57gm34y5gnil0akz9f3qfcp9rxsg7zdj8q1mp",
+      "version": "2.30.0",
+      "sha256": "1546jnwc44l0ahg90cmz7s26lcnzrzvhbmz4qswgccz57jzfd3yp",
       "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "chipenrich_data", "lattice", "latticeExtra", "mgcv", "org_Dm_eg_db", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "plyr", "rms", "rtracklayer", "stringr"]
     },
     "chipseq": {
       "name": "chipseq",
-      "version": "1.54.0",
-      "sha256": "1rd56knaf0ar8d0nh0mcnrrg5jy0csixig1d4abn1b64vbzrvzpz",
+      "version": "1.56.0",
+      "sha256": "0s50i1dzbqwdxb6zn8v4ip2n6r3dmkgahx5kjixpi45s42d8yn31",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "ShortRead", "lattice"]
     },
     "chopsticks": {
       "name": "chopsticks",
-      "version": "1.70.0",
-      "sha256": "1lwl3fs7d2cja6n7wgpxvrplhnblabrrpqk83765aksmrk6sfk81",
+      "version": "1.72.0",
+      "sha256": "0d7mgrdabakzml9c7kqs4sa4jh5l9ivji5c64j432lcx6qpxr5ag",
       "depends": ["survival"]
     },
     "chromDraw": {
       "name": "chromDraw",
-      "version": "2.34.0",
-      "sha256": "1r733k8hkdhvapbwbp02ias1fjkr0pxi6m7gk2l9q3m6szydpil8",
+      "version": "2.36.0",
+      "sha256": "0j8ilcn0dcqn9vcd256rb39pv1ql239xk2pqjzf293pfq8vs6wab",
       "depends": ["GenomicRanges", "Rcpp"]
     },
     "chromPlot": {
       "name": "chromPlot",
-      "version": "1.32.0",
-      "sha256": "187w8qm0kf8297yb5yzkd5rxzx6j03hysgpdm41dc247q50nv046",
+      "version": "1.34.0",
+      "sha256": "1x39p5lczqgri9cvb0r56x5klgj52aimv7qm9mm57g64a9kwf06w",
       "depends": ["GenomicRanges", "biomaRt"]
     },
     "chromVAR": {
       "name": "chromVAR",
-      "version": "1.26.0",
-      "sha256": "092y1x1sbqvjrwmr7sv2r5216wbwwc4lk6kwn57fnvvdnc0hc3sv",
+      "version": "1.28.0",
+      "sha256": "0mv8bfjr80k3nmmy0vsvjsrb4hi7n4adazmzgf6xi3hiiyajiv87",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "Rcpp", "RcppArmadillo", "Rsamtools", "Rtsne", "S4Vectors", "SummarizedExperiment", "TFBSTools", "ggplot2", "miniUI", "nabor", "plotly", "shiny"]
     },
     "chromstaR": {
       "name": "chromstaR",
-      "version": "1.30.0",
-      "sha256": "0swkjq50p3ak0ddyg7pqg37fivdpr3v5jpakn38sk5i5ycn3qf3g",
+      "version": "1.32.0",
+      "sha256": "071aipwk1awr71hvzflps49dzp83p12zm1pbyx4l8d2v3wbj0dlz",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "bamsignals", "chromstaRData", "doParallel", "foreach", "ggplot2", "mvtnorm", "reshape2"]
     },
     "cicero": {
       "name": "cicero",
-      "version": "1.22.0",
-      "sha256": "0x5ly5hkqli5b67hiaa6ha02damyps7vb4l51p0az1j5fxl39n8r",
+      "version": "1.24.0",
+      "sha256": "12j1j553pg5rd1ndg3xfjk9jgv2i72cck9pg74kylfhj5z2a1mfp",
       "depends": ["Biobase", "BiocGenerics", "FNN", "GenomicRanges", "Gviz", "IRanges", "Matrix", "S4Vectors", "VGAM", "assertthat", "data_table", "dplyr", "ggplot2", "glasso", "igraph", "monocle", "plyr", "reshape2", "stringi", "stringr", "tibble", "tidyr"]
     },
     "circRNAprofiler": {
       "name": "circRNAprofiler",
-      "version": "1.18.0",
-      "sha256": "0gjnx4645kd7qag7dzs5dp9lhsv6zg5xn6jna3bap4mginl1jvxi",
+      "version": "1.20.0",
+      "sha256": "0yszs0mzh9bdzaak1sqfypr05xn4nxy78g2b9m6rszxrf1g7k56b",
       "depends": ["AnnotationHub", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "IRanges", "R_utils", "S4Vectors", "dplyr", "edgeR", "ggplot2", "gwascat", "magrittr", "readr", "reshape2", "rlang", "rtracklayer", "seqinr", "stringi", "stringr", "universalmotif"]
     },
     "cisPath": {
       "name": "cisPath",
-      "version": "1.44.0",
-      "sha256": "1r1h5sklm6n9spxgj9rww2ib1f75lyz657awdm5ig3sdsk8f1lpn",
+      "version": "1.46.0",
+      "sha256": "05vcrqanf4q3d8lqy04lch06zd6rdm58953sf9vprscd1ng49hcs",
       "depends": []
     },
     "cleanUpdTSeq": {
       "name": "cleanUpdTSeq",
-      "version": "1.42.0",
-      "sha256": "0fc7lwglp9asssh7yvrqr3wrgdcdapi5zh0fkqmddc1w1n83053r",
+      "version": "1.44.0",
+      "sha256": "0xhkhxdz9233yykzw32kipm86qysg7cgxrwf92320xay5y50hr4k",
       "depends": ["BSgenome", "BSgenome_Drerio_UCSC_danRer7", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "e1071", "seqinr", "stringr"]
     },
     "cleaver": {
       "name": "cleaver",
-      "version": "1.42.0",
-      "sha256": "15v5jk916lfxjnkmjkm9fgza2pdr02hzgyzny29mkjd6ycj2xfa6",
+      "version": "1.44.0",
+      "sha256": "00za5jx7zdarcvrz822ivvp13l0jvfhwzlknwqc6260gym8j4hxy",
       "depends": ["Biostrings", "IRanges", "S4Vectors"]
     },
     "clevRvis": {
       "name": "clevRvis",
-      "version": "1.4.0",
-      "sha256": "08qmhyhd9z5cpgkccz8jbk81ni51xd4rkv18clzwfk85vbkmjywn",
+      "version": "1.6.0",
+      "sha256": "03sjrls4prn76svxmz901v00yljnd8h201s853am6mrkx8ir9p4p",
       "depends": ["DT", "R_utils", "colorspace", "colourpicker", "cowplot", "dplyr", "ggiraph", "ggnewscale", "ggplot2", "ggraph", "htmlwidgets", "igraph", "magrittr", "patchwork", "purrr", "readr", "readxl", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyhelper", "tibble"]
     },
     "cliProfiler": {
       "name": "cliProfiler",
-      "version": "1.10.0",
-      "sha256": "10ikijimbhwijlq19xc8x730ihix19c5z15mq138jj9p85zrqcin",
+      "version": "1.12.0",
+      "sha256": "183wlk9xq051n7i44g01xgapyzn0csdkbd767glvda2n7ap92chi",
       "depends": ["BSgenome", "Biostrings", "GenomicRanges", "S4Vectors", "dplyr", "ggplot2", "rtracklayer"]
     },
     "clippda": {
       "name": "clippda",
-      "version": "1.54.0",
-      "sha256": "1pfzshvrhqjazmzhznwn1ml8lgrfhwmb6q285bbs3vksgjqyxczw",
+      "version": "1.56.0",
+      "sha256": "1c9ms94xfzq5954jphn11j2fc00kfbgg3ssv2pprij1qkmvs0i9y",
       "depends": ["Biobase", "lattice", "limma", "rgl", "scatterplot3d", "statmod"]
     },
     "clipper": {
       "name": "clipper",
-      "version": "1.44.0",
-      "sha256": "1jaf3xsl37jpwpiq9r3w13fa069jmq6b6j2inmfzdy7jx8vbfm0k",
+      "version": "1.46.0",
+      "sha256": "1pfah7a461lgzrp7chxmddjyvzjh65drm5614b7g5graas62mx45",
       "depends": ["Biobase", "KEGGgraph", "Matrix", "Rcpp", "corpcor", "gRbase", "graph", "igraph", "qpgraph"]
     },
     "cliqueMS": {
       "name": "cliqueMS",
-      "version": "1.18.1",
-      "sha256": "1k51j9q2s8065sxb04ywdh6kwh1y6w4kslk9iww9vmq0p1dwsdb7",
+      "version": "1.20.0",
+      "sha256": "01n3yvih4dwvwhv2rw0yv9bain0lbkws1pccnfv00prakhgli2f2",
       "depends": ["BH", "MSnbase", "Rcpp", "RcppArmadillo", "coop", "igraph", "matrixStats", "slam", "xcms"]
     },
     "clst": {
       "name": "clst",
-      "version": "1.52.0",
-      "sha256": "0ng8zmqrnjpavl7mz4sh0qfa3bvxd12vh1568f9brm80avypp02j",
+      "version": "1.54.0",
+      "sha256": "0is27v6yx7nr95i268f4qx7jphki1hcwkzc02q3bzyf3za57f2kq",
       "depends": ["ROC", "lattice"]
     },
     "clstutils": {
       "name": "clstutils",
-      "version": "1.52.0",
-      "sha256": "0ry1b3gq2mbdir84pipk8z0dkf0g1mph9yflx3snjdc4izgviasx",
+      "version": "1.54.0",
+      "sha256": "05iv8zbma9r0fz7116xjv4nj76imfl3kdmp0vks8hwhdp18g3wi6",
       "depends": ["RSQLite", "ape", "clst", "lattice", "rjson"]
     },
     "clustComp": {
       "name": "clustComp",
-      "version": "1.32.0",
-      "sha256": "0dv55dhljb05jk0bqc72f0chkzmlf64wilfxfyric9gb9ksi49kq",
+      "version": "1.34.0",
+      "sha256": "14fslhpqslxhckanf6qv5lrzd6k3qxlfpm005yrvdl6vp8fqclgg",
       "depends": ["sm"]
     },
     "clusterExperiment": {
       "name": "clusterExperiment",
-      "version": "2.24.0",
-      "sha256": "0pi6qnchh89fhfr50fk4hrrkz1r8gfwjcd7254pgiaxcazv2380a",
+      "version": "2.26.0",
+      "sha256": "1csj6xn5kldfrrzl5qhd5dh59c0inmabx5pbbjq0zb2rad5scqj9",
       "depends": ["BiocGenerics", "BiocSingular", "DelayedArray", "HDF5Array", "Matrix", "NMF", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ape", "cluster", "edgeR", "kernlab", "limma", "locfdr", "matrixStats", "mbkmeans", "phylobase", "pracma", "scales", "stringr", "zinbwave"]
     },
     "clusterProfiler": {
       "name": "clusterProfiler",
-      "version": "4.12.3",
-      "sha256": "1lcgbhrs32cdkph11p3xrhy5ic5d52zfajddvynqnzc9zhxmbgcf",
-      "depends": ["AnnotationDbi", "DOSE", "GOSemSim", "GO_db", "downloader", "dplyr", "enrichplot", "gson", "httr", "igraph", "magrittr", "plyr", "qvalue", "rlang", "tidyr", "yulab_utils"]
+      "version": "4.14.4",
+      "sha256": "0vmjhzxq59zdxywyyqa31fcsasckq8qfpbjp70ml1vcxnvkr49ck",
+      "depends": ["AnnotationDbi", "DOSE", "GOSemSim", "GO_db", "dplyr", "enrichplot", "gson", "httr", "igraph", "magrittr", "plyr", "qvalue", "rlang", "tidyr", "yulab_utils"]
     },
     "clusterSeq": {
       "name": "clusterSeq",
-      "version": "1.28.0",
-      "sha256": "0spf8kv15dchr852apzmwpq27a7gflxvah0yrdyaq7kgqv3107l9",
+      "version": "1.30.0",
+      "sha256": "12pzjfazagfx3k4dvc2hcljr50skyrshpzp9n0rlavgcq5x0b4c8",
       "depends": ["BiocGenerics", "BiocParallel", "baySeq"]
     },
     "clusterStab": {
       "name": "clusterStab",
-      "version": "1.76.0",
-      "sha256": "193lwy85202hd5fiqmwi9sd9vcbvm3zlg4grm0xvvaj2np0b3svi",
+      "version": "1.78.0",
+      "sha256": "1mdxjbc3ygnfm86vcbkrbj7z7g0yx4z3caah4v0b9d1v7ckc33gh",
       "depends": ["Biobase"]
     },
     "clustifyr": {
       "name": "clustifyr",
-      "version": "1.16.0",
-      "sha256": "14c7jr4q0zij2zqpcm6jihy0ch80yfp67lvhxiakcg33xq1jvmzv",
+      "version": "1.18.0",
+      "sha256": "1lx9ikdd1m2lgkwx68h4myy3vf0xsws05s3kkdsan30rq760d2vd",
       "depends": ["Matrix", "S4Vectors", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "entropy", "fgsea", "ggplot2", "httr", "matrixStats", "proxy", "rlang", "scales", "stringr", "tibble", "tidyr"]
     },
     "cmapR": {
       "name": "cmapR",
-      "version": "1.16.0",
-      "sha256": "0gj0s6l7r5dln7h9z5y03bjxj3w73cy4x83ik1cp5nmffabypzm9",
+      "version": "1.18.0",
+      "sha256": "18wl5ncdjg8mvh33n3fwi41mi66gj4xmldjy8hvhh8ch0j7yj6dl",
       "depends": ["SummarizedExperiment", "data_table", "flowCore", "matrixStats", "rhdf5"]
     },
     "cn_farms": {
       "name": "cn.farms",
-      "version": "1.52.0",
-      "sha256": "098p6bhibg14ahx2gn2jbqaf537w00428a8mqvzghy9519pwmsqd",
+      "version": "1.54.0",
+      "sha256": "1wcx1040z5b0x4ram1y2kllrm91sax2g7s76ww2nfrwx6m3bai6f",
       "depends": ["Biobase", "DBI", "DNAcopy", "affxparser", "ff", "lattice", "oligo", "oligoClasses", "preprocessCore", "snow"]
     },
     "cn_mops": {
       "name": "cn.mops",
-      "version": "1.50.0",
-      "sha256": "1zf2j36g97i7ija5h2pchlvh24h2s8k3nl9k9iwlh2jxax3hnr97",
+      "version": "1.52.0",
+      "sha256": "12dcxdvj7n8a24vmambb8ghk7mmgzbzjq1ssdx26znxz5g8149yr",
       "depends": ["Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors"]
     },
     "cnvGSA": {
       "name": "cnvGSA",
-      "version": "1.48.0",
-      "sha256": "1njb31i1fsvisgjjczjbc9qb7w6bz8dh4856gghkb4f9gscn06rk",
+      "version": "1.50.0",
+      "sha256": "1i86r9zfwqzpbxfxwdf0c7k1qnbmw37l74ysii03x625jjy33225",
       "depends": ["GenomicRanges", "brglm", "doParallel", "foreach", "splitstackshape"]
     },
     "coGPS": {
       "name": "coGPS",
-      "version": "1.48.0",
-      "sha256": "07skpib02914bak5zz5rlwp61kkls9pl83yc5d5kalsqpa1sb63m",
+      "version": "1.50.0",
+      "sha256": "1wkhxp4682l3204v4pxidvjlxjc1iz45sz66cjyivl8ipizvf8zq",
       "depends": []
     },
     "coMethDMR": {
       "name": "coMethDMR",
-      "version": "1.8.0",
-      "sha256": "1a0f0r11jdcf47b9nzswi9j1axhibij09lava57cv48a23hzrj6z",
+      "version": "1.10.0",
+      "sha256": "0wmrfrw5ivyqnkqi6phzzb7jmqnpqx111ssrvlyd8gczd688ngx1",
       "depends": ["AnnotationHub", "BiocParallel", "ExperimentHub", "GenomicRanges", "IRanges", "bumphunter", "lmerTest"]
     },
     "coRdon": {
       "name": "coRdon",
-      "version": "1.22.0",
-      "sha256": "0zspxfivvc87s3mnyr8rz3a0dhjsmksvpjn4wba2zqc9hig0pkw6",
+      "version": "1.24.0",
+      "sha256": "04pprr15b9bss6nh2gd83iyzk30m6ma1vpn5qp3c5h5mi7bbk4x8",
       "depends": ["Biobase", "Biostrings", "data_table", "dplyr", "ggplot2", "purrr", "stringr"]
     },
     "codelink": {
       "name": "codelink",
-      "version": "1.72.0",
-      "sha256": "0maag5ns0j2c7l4pnrgb724108fmp4a2xj8nffk1kw4ag39k9xqc",
+      "version": "1.74.0",
+      "sha256": "129avd4i14ym06nd1yw2njrlzjd8k8vc04g23f61z6g44al3faiv",
       "depends": ["Biobase", "BiocGenerics", "annotate", "limma"]
     },
     "cogena": {
       "name": "cogena",
-      "version": "1.38.0",
-      "sha256": "0w41i4mvv085pvm0ars31qy0m6alb96kni3k6lcsikqch9nqiv3z",
+      "version": "1.40.0",
+      "sha256": "0wjpahn90lrcg64iglbfqbnwc7xk005dn101kqa75xpvmmv51fqc",
       "depends": ["Biobase", "amap", "apcluster", "biwt", "class", "cluster", "corrplot", "devtools", "doParallel", "dplyr", "fastcluster", "foreach", "ggplot2", "gplots", "kohonen", "mclust", "reshape2", "stringr", "tibble", "tidyr"]
     },
     "cogeqc": {
       "name": "cogeqc",
-      "version": "1.8.0",
-      "sha256": "056zj1hlfvzdj22p79nd567fpzlmmk12nyy1w41ymhwfy9azdhha",
+      "version": "1.10.0",
+      "sha256": "1iw4rjpl9prrhw52radd119phkafvqcsq3in691c0pp3bzv3fkr0",
       "depends": ["Biostrings", "ggbeeswarm", "ggplot2", "ggtree", "igraph", "jsonlite", "patchwork", "reshape2", "rlang", "scales"]
     },
     "cola": {
       "name": "cola",
-      "version": "2.10.0",
-      "sha256": "014yx4r5as34f6g1xf4amqwkq0xqa66rv8g45r4cd4fp4dv9szzg",
+      "version": "2.12.0",
+      "sha256": "03w1rmk8b2lpjngad0jb7lk2yr28n2ss2lk0scis5c2i61flq6g4",
       "depends": ["BiocGenerics", "ComplexHeatmap", "GetoptLong", "GlobalOptions", "RColorBrewer", "Rcpp", "brew", "circlize", "clue", "cluster", "crayon", "digest", "doParallel", "doRNG", "eulerr", "foreach", "httr", "impute", "irlba", "knitr", "markdown", "matrixStats", "mclust", "microbenchmark", "png", "skmeans", "xml2"]
     },
     "comapr": {
       "name": "comapr",
-      "version": "1.8.0",
-      "sha256": "007r7q7p97w5rh8pvgrajlyv09m6h9q8zs0mb8xs1qw3jlkac5z4",
+      "version": "1.10.0",
+      "sha256": "0zfdylcwa4bcx65y6q04ya1v79l3dhajzbrybqz1nxi0lz9lgx5p",
       "depends": ["BiocParallel", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "Matrix", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "circlize", "dplyr", "foreach", "ggplot2", "gridExtra", "plotly", "plyr", "reshape2", "rlang", "scales", "tidyr"]
     },
     "combi": {
       "name": "combi",
-      "version": "1.16.0",
-      "sha256": "1s6nxigvmxq5c2y347k87by0krda63lwynvbgagvg9h2lhb588kv",
+      "version": "1.18.0",
+      "sha256": "1i0x0w2ri80vm92wnxq5wvs7paq02k4h36f8nqw9mjk8gfqbp9ir",
       "depends": ["BB", "Biobase", "DBI", "Matrix", "SummarizedExperiment", "alabama", "cobs", "ggplot2", "limma", "nleqslv", "phyloseq", "reshape2", "tensor", "vegan"]
     },
     "compEpiTools": {
       "name": "compEpiTools",
-      "version": "1.38.0",
-      "sha256": "04yhfihszw5s61195435cczk801rb8n29zrh8rqknf0rdyccxb2q",
+      "version": "1.40.0",
+      "sha256": "1kbz2y5p6rv9nn8c91isns4ah9mpvhncxjwb0950x60mg3jys0s6",
       "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "XVector", "gplots", "methylPipe", "topGO"]
     },
     "compSPOT": {
       "name": "compSPOT",
-      "version": "1.2.0",
-      "sha256": "1gai411y4dcc2ip73wjb56az8kjh0d34z3xij7hdhs72qg4k6955",
+      "version": "1.4.0",
+      "sha256": "1p8xv3wyqdbrhhyan1ydz9nqfc4j31bay6fhbp6sannbz48kr9xc",
       "depends": ["data_table", "ggplot2", "ggpubr", "gridExtra", "magrittr", "plotly"]
     },
     "compcodeR": {
       "name": "compcodeR",
-      "version": "1.40.0",
-      "sha256": "0szixwgk85qpyag2i8spn0shpl8r6j5xjg90js3rgrx1b8saaqbm",
+      "version": "1.42.0",
+      "sha256": "17l3ax2b0rapdi4p12vy5fzy14img2dij0sq8szvadvqgsgzd4p2",
       "depends": ["KernSmooth", "MASS", "ROCR", "ape", "caTools", "edgeR", "ggplot2", "gplots", "gtools", "knitr", "lattice", "limma", "markdown", "matrixStats", "modeest", "phylolm", "rmarkdown", "shiny", "shinydashboard", "sm", "stringr", "vioplot"]
     },
     "concordexR": {
       "name": "concordexR",
-      "version": "1.4.0",
-      "sha256": "0z8h4gr8lj6kpffi1zha4683ha46n5nrlc3yvyrwbf2gflzvdf3y",
-      "depends": ["BiocParallel", "DelayedArray", "Matrix", "cli", "ggplot2", "pheatmap", "rlang", "scales"]
+      "version": "1.6.0",
+      "sha256": "0zkydxybif94p5ka8wrbwbgbbp01n3c15lff62nraldz0yhvs5jn",
+      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "DelayedArray", "Matrix", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "bluster", "cli", "purrr", "rlang", "sparseMatrixStats"]
     },
     "condiments": {
       "name": "condiments",
-      "version": "1.12.0",
-      "sha256": "0wifi5npnzmwdvh6g2xa998ccl902jka1mfs4xxgrpdbc0rxny8r",
+      "version": "1.14.0",
+      "sha256": "0zcvb4893yq35wfqr29bqm40lqmdcp5gc39y9cly8nqhya8jbq4k",
       "depends": ["BiocParallel", "Ecume", "RANN", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "distinct", "dplyr", "igraph", "magrittr", "matrixStats", "mgcv", "pbapply", "slingshot"]
     },
     "consICA": {
       "name": "consICA",
-      "version": "2.2.0",
-      "sha256": "061v9v4gpxxmb5yn6dhh1r2x52y3ik68v1y59sfaazhlp3kg970x",
+      "version": "2.4.0",
+      "sha256": "0r5qqd4a6h08ah1vj5wbmwhdsg5q7piia03y7nq6qd6l6shbvd8z",
       "depends": ["BiocParallel", "GO_db", "Rfast", "SummarizedExperiment", "fastICA", "ggplot2", "graph", "org_Hs_eg_db", "pheatmap", "sm", "survival", "topGO"]
     },
     "consensus": {
       "name": "consensus",
-      "version": "1.22.0",
-      "sha256": "09g6qmvalbnyskvv6zb49h3ph4xv3rz71y6gdfayh5jmh82nw9fd",
+      "version": "1.24.0",
+      "sha256": "0c2wy2ci2zxswjh2hckx4j1ym1wjgb9lhs2ws8zpcmam4h9cy1zh",
       "depends": ["RColorBrewer", "gplots", "matrixStats"]
     },
     "consensusDE": {
       "name": "consensusDE",
-      "version": "1.22.0",
-      "sha256": "051rcanakn1kmlybhc57cp80rxdgvpd0grldsw014ss8s938nz8z",
+      "version": "1.24.0",
+      "sha256": "0vqr72v6mfdzhwhlg2v9q25s8i5qimaqn7rjd1wjp8cnccvg47mj",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "EDASeq", "EnsDb_Hsapiens_v86", "GenomicAlignments", "GenomicFeatures", "RColorBrewer", "RUVSeq", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TxDb_Dmelanogaster_UCSC_dm3_ensGene", "airway", "data_table", "dendextend", "edgeR", "ensembldb", "limma", "org_Hs_eg_db", "pcaMethods"]
     },
-    "consensusOV": {
-      "name": "consensusOV",
-      "version": "1.26.0",
-      "sha256": "0a2qrjid6a5yndkhd47km40qv2c3321xypr5mwlwsq5qp48x7vvq",
-      "depends": ["Biobase", "BiocParallel", "GSVA", "gdata", "genefu", "limma", "matrixStats", "randomForest"]
-    },
     "consensusSeekeR": {
       "name": "consensusSeekeR",
-      "version": "1.32.0",
-      "sha256": "0da6k6i372iqh1gnd4g6ifg75hkx2rrlp2bpwf1ai3g31n8ashiw",
+      "version": "1.34.0",
+      "sha256": "1wpy08a2mr5rxqbmb5kw1kidmmfk2ybx0jin5gd2ywc1gsf98pn7",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer", "stringr"]
     },
     "conumee": {
       "name": "conumee",
-      "version": "1.38.0",
-      "sha256": "0ys8z4xgnmbg4dq81mr59imbz3p9j5ymi9y1dk030xrdh5iwi0am",
+      "version": "1.40.0",
+      "sha256": "1jy68njrqvjv4l4zh3f8wh93qr2mw65i4nrf51fh1xhjas1jj7g0",
       "depends": ["DNAcopy", "GenomeInfoDb", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "minfi", "rtracklayer"]
     },
     "convert": {
       "name": "convert",
-      "version": "1.80.0",
-      "sha256": "0i4gdd4vhbhkhzij85w4891p9fnqkchxcdqwqqs76ipg1vgrf98v",
+      "version": "1.82.0",
+      "sha256": "0ghbsfc62bqxy8cz71ld59m0a0r7wb5fn9lj8kxwgpvgfiflcq7d",
       "depends": ["Biobase", "limma", "marray"]
     },
     "copa": {
       "name": "copa",
-      "version": "1.72.0",
-      "sha256": "1v8xz09ylcja9d4gq3icm6y8k8jkavicnj22iidjnj0c2r03jwg6",
+      "version": "1.74.0",
+      "sha256": "1nb4q4jmksbsnfjbhfygxz34hnxfm0dl2f21gakbr8iq3vg2ns5q",
       "depends": ["Biobase"]
     },
     "corral": {
       "name": "corral",
-      "version": "1.14.0",
-      "sha256": "14zf8ya8yrr2bbxg8iiwxn3l7qvii0bmiwwdmypgv1qi32hx9ckp",
+      "version": "1.16.0",
+      "sha256": "1g6lhyj2fr6dwfgsammmnyh2krswl0zhicbpcjcbdjqp2042zf1n",
       "depends": ["Matrix", "MultiAssayExperiment", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggthemes", "gridExtra", "irlba", "pals", "reshape2", "transport"]
     },
     "coseq": {
       "name": "coseq",
-      "version": "1.28.0",
-      "sha256": "0g24q3wb15qnj3igbj93k0rlw1s6ylgzhi8106qfmpybnq3rcry5",
+      "version": "1.30.0",
+      "sha256": "0x3z4zci7s89c8h19a52r5czr052jng5sqifj4flm8lwigh8kxz3",
       "depends": ["BiocParallel", "DESeq2", "HTSCluster", "HTSFilter", "Rmixmod", "S4Vectors", "SummarizedExperiment", "capushe", "compositions", "corrplot", "e1071", "edgeR", "ggplot2", "mvtnorm", "scales"]
     },
     "cosmiq": {
       "name": "cosmiq",
-      "version": "1.38.0",
-      "sha256": "0rvayjwg9f3ns8mv657sww9azjjbavxfxcshazn48j7rvr4bqx8z",
+      "version": "1.40.0",
+      "sha256": "038xn54vskc155yilqblz91fjmk6qd1r7yb0ga7szrqa1lm10l1v",
       "depends": ["MassSpecWavelet", "Rcpp", "faahKO", "pracma", "xcms"]
     },
     "cosmosR": {
       "name": "cosmosR",
-      "version": "1.12.0",
-      "sha256": "0rpy6dysf5p892dcad4z45i607km23pah4iq448g5mbzypsjkqsw",
+      "version": "1.14.0",
+      "sha256": "17rd4d5ssz0l0v48wyff1j3ffhia02qqxcivgbj1iaqyr5dxf2f5",
       "depends": ["CARNIVAL", "GSEABase", "decoupleR", "dorothea", "dplyr", "igraph", "progress", "purrr", "rlang", "stringr", "visNetwork"]
     },
     "countsimQC": {
       "name": "countsimQC",
-      "version": "1.22.0",
-      "sha256": "0zrxi7zvdiv1xx3hiy15a3wjgqvywikixx8lq3qx85dw2kz3nfpf",
+      "version": "1.24.0",
+      "sha256": "1abbp6hdbmxf7j005anl2l63g8kyxv3l87ds5k7m3r7rx87j5y51",
       "depends": ["DESeq2", "DT", "GenomeInfoDbData", "SummarizedExperiment", "caTools", "dplyr", "edgeR", "genefilter", "ggplot2", "ragg", "randtests", "rmarkdown", "tidyr"]
     },
     "covEB": {
       "name": "covEB",
-      "version": "1.30.0",
-      "sha256": "15yz54dhjwz6iafmvq33l43z3w887a6b7i150rqi23rzs9mabixa",
+      "version": "1.32.0",
+      "sha256": "02yxd4amnahgib8dgkn3pydjmbgd9lz53ydcib3ls6qfbxd3pk8q",
       "depends": ["Biobase", "LaplacesDemon", "Matrix", "gsl", "igraph", "mvtnorm"]
     },
     "covRNA": {
       "name": "covRNA",
-      "version": "1.30.0",
-      "sha256": "12j69j73fkfn3s20jcyixp71a5j37m405962mxa2pihlqsrh7sxl",
+      "version": "1.32.0",
+      "sha256": "1lspmjr1ih985wakhi3bsq94zmpzvzk0cxh2msvqb4cdx39s4mii",
       "depends": ["Biobase", "ade4", "genefilter"]
     },
     "cpvSNP": {
       "name": "cpvSNP",
-      "version": "1.36.0",
-      "sha256": "0kn65jzx9cif1w3hqyfjkxdcpnlk9b8msv3rk0ahdsln1d0mnyw6",
+      "version": "1.38.0",
+      "sha256": "0qqakgpj35jzqpslh5b53f3jhq3gdhvdwfwfgsla84lprmjy2fla",
       "depends": ["BiocParallel", "GSEABase", "GenomicFeatures", "corpcor", "ggplot2", "plyr"]
     },
     "cqn": {
       "name": "cqn",
-      "version": "1.50.0",
-      "sha256": "1gjfpz696lpvbbm38ni8b8xxkjik6zb4drhc5gd559ccp3ddy8kn",
-      "depends": ["mclust", "nor1mix", "preprocessCore", "quantreg"]
+      "version": "1.52.0",
+      "sha256": "1iqpfav92psi1v6yz0q1kl1pjpyf4fwf2b6iviggykz54kachva9",
+      "depends": ["mclust", "nor1mix", "quantreg"]
     },
     "crisprBase": {
       "name": "crisprBase",
-      "version": "1.8.0",
-      "sha256": "1zw4syj12agcvjzjn3ffsd50vffsdgya7yfz62dy73wj4m2l2whq",
+      "version": "1.10.0",
+      "sha256": "0azk53vdrwhkb3ipybgz5g5x31wjiz1w0x6k0rx4gwir8wjq60g3",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "stringr"]
     },
     "crisprBowtie": {
       "name": "crisprBowtie",
-      "version": "1.8.0",
-      "sha256": "0fyihnmrl92nl1r85axz9bck6l9clvc5a6px0214i064w8dn1njj",
+      "version": "1.10.0",
+      "sha256": "0li9m4r3xwp3djyrqx0x7x1mai1x638djimnqzfnicc9d404z66c",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rbowtie", "crisprBase", "readr", "stringr"]
     },
     "crisprBwa": {
       "name": "crisprBwa",
-      "version": "1.8.0",
-      "sha256": "1vz99b632fzxdlpw5n2z2mbx7sb9hng58np1ra7gqc2wypk0sa8x",
+      "version": "1.10.0",
+      "sha256": "0891ll8zjydb1cf37msy6d49fbs28fp7ba33m6ljix1m021rsk1v",
       "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "Rbwa", "crisprBase", "readr", "stringr"]
     },
     "crisprDesign": {
       "name": "crisprDesign",
-      "version": "1.6.0",
-      "sha256": "1zv8cc52r13b47r44qph892fhbgy1xp8xz4xf1hfyqgd7ywcl9kb",
+      "version": "1.8.0",
+      "sha256": "01qzfpjvsc478zax5hvl1ffjw6wjj6qdja076pqf2y3ax5z34c9y",
       "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "MatrixGenerics", "S4Vectors", "VariantAnnotation", "crisprBase", "crisprBowtie", "crisprScore", "rtracklayer", "txdbmaker"]
     },
     "crisprScore": {
       "name": "crisprScore",
-      "version": "1.8.0",
-      "sha256": "1czg5l4bvi5j3afip74qgl1kqgcllb5s1gz6sy7qk1cbf1fmvril",
+      "version": "1.10.0",
+      "sha256": "1gwklmhxvazsm79gy21zk54zj13qxvv6kq27rfxz35rddys69ljk",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "XVector", "basilisk", "basilisk_utils", "crisprScoreData", "randomForest", "reticulate", "stringr"]
     },
     "crisprShiny": {
       "name": "crisprShiny",
-      "version": "1.0.0",
-      "sha256": "0fmp0gi70cv3g4c00l6g58kww9cg9rvpkhg8lsii9j8p8fj6hsjd",
+      "version": "1.2.0",
+      "sha256": "0qpawfgqvckvf9b0qi14ci9mcjmx8hwb4sn6k348da5hyvh0q1gp",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "S4Vectors", "crisprBase", "crisprDesign", "crisprScore", "crisprViz", "htmlwidgets", "pwalign", "shiny", "shinyBS", "shinyjs", "waiter"]
     },
     "crisprVerse": {
       "name": "crisprVerse",
-      "version": "1.6.0",
-      "sha256": "0f81bf65xz5z5yj9iyyk3h8asyd5hg3hv3157w0kq4ablz8jr7iq",
+      "version": "1.8.0",
+      "sha256": "188ilq0c8cgn70g2sahymdpfm1kdy89ayzlr6471aw05nlrfsh1i",
       "depends": ["BiocManager", "cli", "crisprBase", "crisprBowtie", "crisprDesign", "crisprScore", "crisprScoreData", "crisprViz", "rlang"]
     },
     "crisprViz": {
       "name": "crisprViz",
-      "version": "1.6.0",
-      "sha256": "1bbawsmah9h12kxwcq97q1mjbkniivfafm95k299bb93baqillih",
+      "version": "1.8.0",
+      "sha256": "08rsn3cf1r5w8k58slxv73gg1dgclf3i0yywp06l53yv9i5mf3id",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "S4Vectors", "crisprBase", "crisprDesign", "txdbmaker"]
     },
     "crlmm": {
       "name": "crlmm",
-      "version": "1.62.0",
-      "sha256": "0b0zwawxm07iy5g9z17057dsifrwyyl5rkgn09k7vh8rkfxbdydx",
+      "version": "1.64.0",
+      "sha256": "0fc87gn7k7i60sy5acg6dfs8bxamnch9riaxmzwpp7l20g5v6hd5",
       "depends": ["Biobase", "BiocGenerics", "RcppEigen", "VGAM", "affyio", "beanplot", "ellipse", "ff", "foreach", "illuminaio", "lattice", "limma", "matrixStats", "mvtnorm", "oligoClasses", "preprocessCore"]
     },
-    "crossmeta": {
-      "name": "crossmeta",
-      "version": "1.30.0",
-      "sha256": "1ghgfby1rl3phldyipli550f0i289yanb0v4nzn5l1xnpkxaj6fa",
-      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "DBI", "DT", "GEOquery", "RCurl", "RSQLite", "XML", "affxparser", "affy", "data_table", "edgeR", "fdrtool", "limma", "matrixStats", "metaMA", "miniUI", "oligo", "reader", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "shinypanel", "stringr", "sva", "tibble"]
-    },
     "csaw": {
       "name": "csaw",
-      "version": "1.38.0",
-      "sha256": "0a870z480an3wwbp6z4qy034kvk6bvrydgk2if7x4q9k3qvknsz0",
+      "version": "1.40.0",
+      "sha256": "02ajgkpwz5s7i72swnlix1djmnv8zmp7yl2ppwq4m60rs23d06wg",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "edgeR", "limma", "metapod", "zlibbioc"]
     },
     "csdR": {
       "name": "csdR",
-      "version": "1.10.0",
-      "sha256": "13g6rq95888l4ach0yrw6nrfvyxnw3b5ni01v875gfk5jl9jcllv",
+      "version": "1.12.0",
+      "sha256": "0r51n7vlddgg1rxxrpm9pfhq5nm4467933crvzln5dz9qsx34vs6",
       "depends": ["Rcpp", "RhpcBLASctl", "WGCNA", "glue", "matrixStats"]
     },
     "ctc": {
       "name": "ctc",
-      "version": "1.78.0",
-      "sha256": "09whaam2r30dq8y9r6vvc0r4sisz78c921bgx7wj6cmn2nvpgf9q",
+      "version": "1.80.0",
+      "sha256": "1k2s1kjcbj4gkpj3fbb1gk2apg8b4anybgdhaw4s0w5ximy69mp7",
       "depends": ["amap"]
     },
     "ctsGE": {
       "name": "ctsGE",
-      "version": "1.30.0",
-      "sha256": "1pqww9r71zjq4qcssffs94q2fx177jlv9n6vkm3qm9j943r1cy58",
+      "version": "1.32.0",
+      "sha256": "0n8v12cijvna1078abfbbdqp5wpdi8blac7k7xzn3wql1p3z3awv",
       "depends": ["ccaPP", "ggplot2", "limma", "reshape2", "shiny", "stringr"]
     },
     "cummeRbund": {
       "name": "cummeRbund",
-      "version": "2.46.0",
-      "sha256": "0hdm2214waz02ybr264xis48kj2anpad80jk640p49v9r17iia9l",
+      "version": "2.48.0",
+      "sha256": "13505rlzwczgqzqs9fcfgij8558iwzhcn29ai4xl96qqz4qwx00k",
       "depends": ["Biobase", "BiocGenerics", "Gviz", "RSQLite", "S4Vectors", "fastcluster", "ggplot2", "plyr", "reshape2", "rtracklayer"]
     },
     "customCMPdb": {
       "name": "customCMPdb",
-      "version": "1.14.0",
-      "sha256": "1j56542mp1gimnbbakbilkmb59jngvx8w47ycnaj8c1j1yhar9ll",
+      "version": "1.16.0",
+      "sha256": "14fsg60j8kcqq13qm0k5vbqgr6kvz1055f0pv7pzmssih4v610yb",
       "depends": ["AnnotationHub", "BiocFileCache", "ChemmineR", "RSQLite", "XML", "rappdirs"]
     },
     "customProDB": {
       "name": "customProDB",
-      "version": "1.44.0",
-      "sha256": "1pxn9nq84h9xgn2g0jzigbw7pbv4sjvf4jkzalp7l3yjax5llq3i",
+      "version": "1.46.0",
+      "sha256": "15q4mia5xh5s6kccaqj6wankp9bm5vzc0nwlbiy5s1qi9pj9x2hw",
       "depends": ["AhoCorasickTrie", "AnnotationDbi", "Biostrings", "DBI", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RCurl", "RSQLite", "Rsamtools", "S4Vectors", "VariantAnnotation", "biomaRt", "plyr", "rtracklayer", "stringr", "txdbmaker"]
     },
     "cyanoFilter": {
       "name": "cyanoFilter",
-      "version": "1.12.0",
-      "sha256": "1nymq5qiw5s2nfa67mccv0jn6gxy5y6sx483cw87j5pbmvg579rx",
+      "version": "1.14.0",
+      "sha256": "1mlfwk1rfhxj6ky6vg62ahhxycj31jlsb8hqnkzh9i3xcvr2lgv2",
       "depends": ["Biobase", "GGally", "cytometree", "flowClust", "flowCore", "flowDensity", "ggplot2", "mrfDepth"]
     },
     "cycle": {
       "name": "cycle",
-      "version": "1.58.0",
-      "sha256": "0jhjjnxyx5byjdf7rh1ci1gdf8djgi4ksm17rrrrnwyrcg6y3dyb",
+      "version": "1.60.0",
+      "sha256": "1f70fi3acbm403j0fh7c6n42ppn2ibhi1avzvj9brylagmrrzjzb",
       "depends": ["Biobase", "Mfuzz"]
     },
     "cydar": {
       "name": "cydar",
-      "version": "1.28.0",
-      "sha256": "16lr3sry647wns2ycv3b604fmsma3a944g85c4ik7xk7ij1ady47",
+      "version": "1.30.0",
+      "sha256": "0xbf5dibvdb7h4y0anwi0574ypv4is9x62k7lnmq4jhvg6fjxmnv",
       "depends": ["Biobase", "BiocGenerics", "BiocNeighbors", "BiocParallel", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "flowCore", "shiny", "viridis"]
     },
     "cypress": {
       "name": "cypress",
-      "version": "1.0.0",
-      "sha256": "0dyywkg41ihff6f2f6p7854qkgx3lav1rviicrik2nlxg4scl034",
+      "version": "1.2.0",
+      "sha256": "1cqhm5nir8bcpb6jnd41wy4aw72lcwhv37q50jahla9n841p2gq6",
       "depends": ["BiocParallel", "DESeq2", "MASS", "PROPER", "RColorBrewer", "SummarizedExperiment", "TCA", "TOAST", "abind", "checkmate", "dplyr", "e1071", "edgeR", "mvtnorm", "preprocessCore", "rlang", "sirt", "tibble"]
     },
     "cytoKernel": {
       "name": "cytoKernel",
-      "version": "1.10.0",
-      "sha256": "0pzcsxshc60myzhq57gxyzrfd590ggydj2nq0byca7vyzxc6z3y6",
+      "version": "1.12.0",
+      "sha256": "0l1yxnjg3hvaya77vk5gl9sx9bpbb68ydapj7mpk5fqnflkw4f9s",
       "depends": ["BiocParallel", "ComplexHeatmap", "Rcpp", "S4Vectors", "SummarizedExperiment", "ashr", "circlize", "data_table", "dplyr", "magrittr", "rlang"]
     },
     "cytoMEM": {
       "name": "cytoMEM",
-      "version": "1.8.0",
-      "sha256": "1dxam2ycwpjmk4z3jgz90swach8k2skjsq4nlh2hj694iqs4f6zj",
+      "version": "1.10.0",
+      "sha256": "149ifhc28s844xyaa53yrcqp8yvfkbkddj3dxipc7xpyxkxi1ggp",
       "depends": ["flowCore", "gplots", "matrixStats"]
     },
     "cytofQC": {
       "name": "cytofQC",
-      "version": "1.4.0",
-      "sha256": "1gn383vchgxs62z9p5h7b0wnakwmwclsk46px6ah1cagykrfgas3",
+      "version": "1.6.0",
+      "sha256": "026v0j1jig4gm4gv3b382cvc2k69i811y9rqyk9cp3xrgmx5qld5",
       "depends": ["CATALYST", "EZtune", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "e1071", "flowCore", "gbm", "ggplot2", "hrbrthemes", "matrixStats", "randomForest", "rmarkdown", "ssc"]
     },
     "cytolib": {
       "name": "cytolib",
-      "version": "2.16.0",
-      "sha256": "0nrj892jihi4fv58si3il42s0vyz3gm4gmb65kidkky63gmsy6iq",
+      "version": "2.18.0",
+      "sha256": "1fbsdpm2v9mzb4n5r5lf9z6v3gzmxd0x5dqs863p0ll1b8a6w7qv",
       "depends": ["BH", "RProtoBufLib", "Rhdf5lib"]
     },
     "cytomapper": {
       "name": "cytomapper",
-      "version": "1.16.0",
-      "sha256": "1njdhhnzy639v4w07wvgj2gygsipzkfzhbrw63fvxfpf4r1xjzix",
+      "version": "1.18.0",
+      "sha256": "0yadjkam643a99synnl2vx7nyfhc6x98qyhf972v5c3f8qj8jy08",
       "depends": ["BiocParallel", "DelayedArray", "EBImage", "HDF5Array", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "ggbeeswarm", "ggplot2", "matrixStats", "nnls", "raster", "rhdf5", "shiny", "shinydashboard", "svgPanZoom", "svglite", "viridis"]
     },
     "cytoviewer": {
       "name": "cytoviewer",
-      "version": "1.4.0",
-      "sha256": "0s7jnr3z7p6v6x17a9a6cv9vbqgfk8snamcw8qkjpfd613gwk43r",
+      "version": "1.6.0",
+      "sha256": "11pn93r5sdzkd31jbyaajsmjx825yvhliadbzbnpw9v56l3gndxb",
       "depends": ["EBImage", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "archive", "colourpicker", "cytomapper", "shiny", "shinycssloaders", "shinydashboard", "svgPanZoom", "svglite", "viridis"]
     },
     "dStruct": {
       "name": "dStruct",
-      "version": "1.10.0",
-      "sha256": "144hyris6fsbs28pz4643njnpjfb0n9w6pm220q5hid4zvhn7dh7",
+      "version": "1.12.0",
+      "sha256": "0xa4lx5fj8w8biqnnfj2ks744bf7vprv8swa3lkds1nr8ydg1xzx",
       "depends": ["IRanges", "S4Vectors", "ggplot2", "purrr", "reshape2", "rlang", "zoo"]
     },
     "daMA": {
       "name": "daMA",
-      "version": "1.76.0",
-      "sha256": "1hv43r6rymp09fl7vgr8jf6naixkrgl282ggf6nva0jxf1jnfmb3",
+      "version": "1.78.0",
+      "sha256": "1gxh344z7jjisb5s8w3q1ky87ryn2n55ayadpwxdimqh2acbz9r5",
       "depends": ["MASS"]
     },
     "dada2": {
       "name": "dada2",
-      "version": "1.32.0",
-      "sha256": "1ac0nb5bcmzmqpi3vjdmns6xqq3ar61dks6qb3c0k48c78w88b7b",
+      "version": "1.34.0",
+      "sha256": "0vdvxr5s36wgkd4dry2m3ab3w4mcqhmf6y4phwg6vwmg4qrhdy0r",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "Rcpp", "RcppParallel", "ShortRead", "XVector", "ggplot2", "reshape2"]
     },
     "dagLogo": {
       "name": "dagLogo",
-      "version": "1.42.0",
-      "sha256": "1qaa63ymsirwdvy9z82c81kknhqcpip7bry4b9d8xan48m5f63xl",
+      "version": "1.44.0",
+      "sha256": "00x7abg5hrfd72lw70vqdvfbfdy49h3b7wzmd7c42nl26ryx1rm0",
       "depends": ["BiocGenerics", "Biostrings", "UniProt_ws", "biomaRt", "httr", "motifStack", "pheatmap"]
     },
     "dar": {
       "name": "dar",
-      "version": "1.0.0",
-      "sha256": "0l5hjx86n34k3b4cdlndl5gh62f3jxps1iq2ir3fzacpxqsimkjw",
+      "version": "1.2.0",
+      "sha256": "0j8ss3qc1m1klm83i8fpdsc1j66sb6wlw6b8fgcdgyvgd1ixj1yy",
       "depends": ["ComplexHeatmap", "UpSetR", "cli", "crayon", "dplyr", "generics", "ggplot2", "glue", "gplots", "heatmaply", "magrittr", "mia", "phyloseq", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "waldo"]
     },
     "dcGSA": {
       "name": "dcGSA",
-      "version": "1.32.0",
-      "sha256": "0203pdlv1f9s4zyh6hn2jls6b1pc8rzagrdyvsg50dk187qfvjja",
+      "version": "1.34.0",
+      "sha256": "1bdw0g3ccx6rcqmjadrqi8j83hnyx9x2pk2w65mfnk7s9fhj23wp",
       "depends": ["BiocParallel", "Matrix"]
     },
     "dcanr": {
       "name": "dcanr",
-      "version": "1.20.0",
-      "sha256": "15way811xnlhb3qafvfibvqsvx72h8hr0jbwxvqd2dzc2gmkq2ib",
+      "version": "1.22.0",
+      "sha256": "1ddxvxsikfpq95bj5lrbf5a3gchal0idhksjj8mvxqjmxp7zclsr",
       "depends": ["Matrix", "RColorBrewer", "circlize", "doRNG", "foreach", "igraph", "plyr", "reshape2", "stringr"]
     },
     "dce": {
       "name": "dce",
-      "version": "1.12.0",
-      "sha256": "1fxcbf21i8k5zydv4qqm41pm3lawkc66ic2rxhlgiwlh7c49awam",
+      "version": "1.13.0",
+      "sha256": "02gnlskfgn38fcf5mchp6ippcd2rj4cl4w7r08igaqyl02zy2x80",
       "depends": ["MASS", "Matrix", "Rgraphviz", "assertthat", "dplyr", "edgeR", "epiNEM", "expm", "ggplot2", "ggraph", "glm2", "glue", "graph", "graphite", "harmonicmeanp", "igraph", "logger", "magrittr", "metap", "mnem", "naturalsort", "org_Hs_eg_db", "pcalg", "ppcor", "purrr", "reshape2", "rlang", "shadowtext", "tidygraph", "tidyverse"]
     },
     "ddCt": {
       "name": "ddCt",
-      "version": "1.60.0",
-      "sha256": "1q2j80wn5x0lkhpd0krsnw99rrn3kqn09d8xdi778cmvsgqxpahg",
+      "version": "1.62.0",
+      "sha256": "0j0p3c977ih7ha6wdb0p6xxv1q10invqzjf4yqc3bc29m9zxivbc",
       "depends": ["Biobase", "BiocGenerics", "RColorBrewer", "lattice", "xtable"]
     },
     "ddPCRclust": {
       "name": "ddPCRclust",
-      "version": "1.24.0",
-      "sha256": "0nmnhykwzbyf2y9i3fi5hgwvc7m7bcikyr3c3nxyaw95f8cc52dp",
+      "version": "1.26.0",
+      "sha256": "0zybz0lllg21w2h9a9yi8cinfcfgjamdgax2nciq17fhh3ngbfrd",
       "depends": ["R_utils", "SamSPECTRAL", "clue", "flowCore", "flowDensity", "flowPeaks", "ggplot2", "openxlsx", "plotrix"]
     },
     "dearseq": {
       "name": "dearseq",
-      "version": "1.16.0",
-      "sha256": "0hy8cnqyvp2mrhj5wi1shh1cba79c5z8f17mfw764s2d6ivsfzz6",
+      "version": "1.18.0",
+      "sha256": "0mk8flxgifwg8ckf41abiqqjmqi1217rrxqwg2xk26s4dk81m4pp",
       "depends": ["CompQuadForm", "KernSmooth", "dplyr", "ggplot2", "magrittr", "matrixStats", "patchwork", "pbapply", "reshape2", "rlang", "scattermore", "statmod", "survey", "tibble", "viridisLite"]
     },
     "debCAM": {
       "name": "debCAM",
-      "version": "1.22.0",
-      "sha256": "1lbgwv7009fpwqw6kl94gmm44xypn60r8kcm3fjzgbjbwijriwgq",
+      "version": "1.24.0",
+      "sha256": "0wx6dvi5rihxlzm6wn67r5wni3dmk12fih2s0dw9qnwm56zk96a5",
       "depends": ["Biobase", "BiocParallel", "DMwR2", "NMF", "SummarizedExperiment", "apcluster", "corpcor", "geometry", "nnls", "pcaPP", "rJava"]
     },
     "debrowser": {
       "name": "debrowser",
-      "version": "1.32.0",
-      "sha256": "0qgnx44j6lxw48wlpslagjq71mfx09vrfjq528z7vzn4phrax0by",
+      "version": "1.34.0",
+      "sha256": "13hw6w6ac4wk2vcj7yscdfjf9aqxi667911adq28gsgrdl0jjfkm",
       "depends": ["AnnotationDbi", "DESeq2", "DOSE", "DT", "GenomicRanges", "Harman", "IRanges", "RColorBrewer", "RCurl", "S4Vectors", "SummarizedExperiment", "annotate", "apeglm", "ashr", "clusterProfiler", "colourpicker", "edgeR", "enrichplot", "ggplot2", "gplots", "heatmaply", "igraph", "jsonlite", "limma", "org_Hs_eg_db", "org_Mm_eg_db", "pathview", "plotly", "reshape2", "shiny", "shinyBS", "shinydashboard", "shinyjs", "stringi", "sva"]
     },
     "decompTumor2Sig": {
       "name": "decompTumor2Sig",
-      "version": "2.20.0",
-      "sha256": "1pnxnxz9zsxqs7cbxgkjapr57k2m1d57w5hak0dwcy5zcxjzmai8",
+      "version": "2.22.0",
+      "sha256": "1ixasxw98ymj793sd2crm0jdg73jmy535xhss5dws156mhzl4y0f",
       "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "data_table", "ggplot2", "ggseqlogo", "gridExtra", "plyr", "quadprog", "readxl"]
     },
     "decontX": {
       "name": "decontX",
-      "version": "1.2.0",
-      "sha256": "0bxpzc9fib47c5prnshzykfd5a3mcik9n1ayd7jxygxy36icgqcj",
+      "version": "1.4.0",
+      "sha256": "0fjnqpa8g2kz8myjk9xp4gi20r48ikn3fa5rvs1wisx819l3flhr",
       "depends": ["BH", "DelayedArray", "MCMCprecision", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "S4Vectors", "Seurat", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "celda", "dbscan", "ggplot2", "patchwork", "plyr", "reshape2", "rstan", "rstantools", "scater", "withr"]
     },
     "decontam": {
       "name": "decontam",
-      "version": "1.24.0",
-      "sha256": "1xjd9jzxlj6gfd6fnygzm21q1wy5x5pl031sq1q0svq3jlnzvgb7",
+      "version": "1.26.0",
+      "sha256": "0incm0dadkyn9n1k53cs19zgs3qc7y8hvfyq75vhqg670h4zyxkz",
       "depends": ["ggplot2", "reshape2"]
     },
     "deconvR": {
       "name": "deconvR",
-      "version": "1.10.0",
-      "sha256": "181dxjj8bzy1b9xq9hd3m3ak1698w7j0sf8h9g0bhf3blzlj4pmi",
+      "version": "1.12.0",
+      "sha256": "1vl22cxrgfwixbrz40f0kq81ppybpv73fl8v14mfv6dp49pdkmml",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "assertthat", "data_table", "dplyr", "e1071", "foreach", "magrittr", "matrixStats", "methylKit", "minfi", "nnls", "quadprog", "rsq", "tidyr"]
     },
     "decoupleR": {
       "name": "decoupleR",
-      "version": "2.10.0",
-      "sha256": "060ww5hlzk0dvh7a52i1nrz1s2xq5mmlw70rxpcs6d4j08k1cmic",
+      "version": "2.12.0",
+      "sha256": "0m7rmx64lhxg1l4qnx3ajp8w97nabp62r5mi4rfy0gh40n7z34i7",
       "depends": ["BiocParallel", "Matrix", "broom", "dplyr", "magrittr", "parallelly", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "withr"]
     },
     "deepSNV": {
       "name": "deepSNV",
-      "version": "1.50.0",
-      "sha256": "1rcq2bg4z6z7czqi662w5gsdc1vd4p8vb353hqayhciv31dz51fr",
+      "version": "1.52.0",
+      "sha256": "1prxiffyj2b7b7q5h2cc0w7ibzclm2wldqn0kcd66hqrmmcs7ypa",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "Rhtslib", "SummarizedExperiment", "VGAM", "VariantAnnotation"]
     },
     "deltaCaptureC": {
       "name": "deltaCaptureC",
-      "version": "1.18.0",
-      "sha256": "019c6rlsl4glc4vkbz3kfcn9d9rh3vnfw0xbcsi33hk51z89qc78",
+      "version": "1.20.0",
+      "sha256": "1dqn95480qb8imr85110z0x4chnx8kj0h78971dnvfckvldq1xqc",
       "depends": ["DESeq2", "GenomicRanges", "IRanges", "SummarizedExperiment", "ggplot2", "tictoc"]
     },
     "deltaGseg": {
       "name": "deltaGseg",
-      "version": "1.44.0",
-      "sha256": "0jdlcsajpksr58nj551r6biwir20k67ysa42bcingcrgii740yyk",
+      "version": "1.46.0",
+      "sha256": "0lnz9vd7ji2b1lnrmanhj3nkra8hbbrs4w5pnkqhzx7p7al376mx",
       "depends": ["changepoint", "fBasics", "ggplot2", "pvclust", "reshape", "scales", "tseries", "wavethresh"]
     },
     "demuxSNP": {
       "name": "demuxSNP",
-      "version": "1.2.0",
-      "sha256": "0inswz7w97wdy7bhl6p87cyr11z77ipf1rsmri9c2nra8s3ix51d",
+      "version": "1.4.0",
+      "sha256": "0m8cry13chq7m80jhzxkv5gp1j48zc79ya1npdssr33iswj5jscs",
       "depends": ["BiocGenerics", "GenomeInfoDb", "IRanges", "KernelKnn", "Matrix", "MatrixGenerics", "SingleCellExperiment", "SummarizedExperiment", "VariantAnnotation", "class", "demuxmix", "dplyr", "ensembldb"]
     },
     "demuxmix": {
       "name": "demuxmix",
-      "version": "1.6.0",
-      "sha256": "18wn36rs7iif2cxz0iz17i0dba0llk2zkw7c81bi9v4c7lsijbcb",
+      "version": "1.8.0",
+      "sha256": "06ln32h5jaqi3g0xs1crmbpyqbb6ycikr1ghszvwxsrgwx8sa1g7",
       "depends": ["MASS", "Matrix", "ggplot2", "gridExtra"]
     },
     "densvis": {
       "name": "densvis",
-      "version": "1.14.0",
-      "sha256": "1xsafzcg6psb4ld7nk4wgdaa3xhy8i2v86asasf8h3mi1ms7lcv0",
+      "version": "1.16.0",
+      "sha256": "0acqdhi13ihv9bxr2n5gh8ysk0ciak273pj495qr3s1pd8qz8772",
       "depends": ["Rcpp", "Rtsne", "assertthat", "basilisk", "irlba", "reticulate"]
     },
     "derfinder": {
       "name": "derfinder",
-      "version": "1.38.0",
-      "sha256": "1i4m20wb08zncksz415jl8bd5r4gdygk7324cp6xhijrc1pfzl1i",
+      "version": "1.40.0",
+      "sha256": "0qg1klbb4g8nw7v50xb0p022barlspwaisdymyk12a04vd9q4i79",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "Hmisc", "IRanges", "Rsamtools", "S4Vectors", "bumphunter", "derfinderHelper", "qvalue", "rtracklayer"]
     },
     "derfinderHelper": {
       "name": "derfinderHelper",
-      "version": "1.38.0",
-      "sha256": "0186wjrszf6c5amibmdblabx3cfvq7p7k6kza38gahw0p7ibwv21",
+      "version": "1.40.0",
+      "sha256": "0cs0m5ng6m932qsdzmi8rv2p3wc0d6hx17n75srgjbm4cdq70q8h",
       "depends": ["IRanges", "Matrix", "S4Vectors"]
     },
     "derfinderPlot": {
       "name": "derfinderPlot",
-      "version": "1.38.0",
-      "sha256": "177j7bl552n80p2rip0zxjn72yf3pv6xg6g1hi312vapfvymcfbl",
+      "version": "1.40.0",
+      "sha256": "08bzrciqs32gjz1js2505lp11bhvbclaj96js1v5h9454ab7zkw4",
       "depends": ["GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "derfinder", "ggbio", "ggplot2", "limma", "plyr", "reshape2", "scales"]
     },
     "destiny": {
       "name": "destiny",
-      "version": "3.18.0",
-      "sha256": "0w7j6xh0gzhahk1r8w2wgnylq5v476jzz0g14yjmszfkzm10va3h",
+      "version": "3.20.0",
+      "sha256": "15avvn8mfr899j18pahn2w3wlgj7g8jy6plnxabrch81bv79rva3",
       "depends": ["Biobase", "BiocGenerics", "Matrix", "RSpectra", "Rcpp", "RcppEigen", "RcppHNSW", "SingleCellExperiment", "SummarizedExperiment", "VIM", "ggplot2", "ggplot_multistats", "ggthemes", "irlba", "knn_covertree", "pcaMethods", "proxy", "rlang", "scales", "scatterplot3d", "smoother", "tidyr", "tidyselect"]
     },
     "diffGeneAnalysis": {
       "name": "diffGeneAnalysis",
-      "version": "1.86.0",
-      "sha256": "1zhgsr2xs2dk45r7msy0qrrsjk21gk622d1wayflhbxsg2s9jlb1",
+      "version": "1.88.0",
+      "sha256": "13rgdp2pycin7f1818yzc6a2ns9i5cj41g0dp0kg72qz9fjq685g",
       "depends": ["minpack_lm"]
     },
     "diffHic": {
       "name": "diffHic",
-      "version": "1.36.1",
-      "sha256": "1wzlzmmrxmnwgqkxqwga73x0kpj7d968c7jgrln9xfilhhn4fkyy",
+      "version": "1.38.0",
+      "sha256": "095fpc8llijrbv51qp7gq5pniwwm5ggypipzgr9lnzbrlpi17qp8",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "csaw", "edgeR", "limma", "locfit", "rhdf5", "rtracklayer", "zlibbioc"]
     },
     "diffUTR": {
       "name": "diffUTR",
-      "version": "1.12.0",
-      "sha256": "1rh3ndi8z6j4zr63w7nyvf5knrknzpl9525h3v9pc8m7gbk0jwk2",
+      "version": "1.14.0",
+      "sha256": "1grga6078841abgchq6baks0i0rc108b12jn8j9f7k0v8a4kmcvx",
       "depends": ["ComplexHeatmap", "DEXSeq", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsubread", "S4Vectors", "SummarizedExperiment", "dplyr", "edgeR", "ensembldb", "ggplot2", "ggrepel", "limma", "matrixStats", "rtracklayer", "stringi", "viridisLite"]
     },
     "diffcoexp": {
       "name": "diffcoexp",
-      "version": "1.24.0",
-      "sha256": "1cana6v3k7qab0x0fngl4abvh4nrznjwqhaq9m6qwn75ils3bh3f",
+      "version": "1.26.0",
+      "sha256": "1wwpjw7vxz3572h2yy26cfinc314x10zcsjx7am0cynkzb16cidx",
       "depends": ["BiocGenerics", "DiffCorr", "SummarizedExperiment", "WGCNA", "igraph", "psych"]
     },
     "diffcyt": {
       "name": "diffcyt",
-      "version": "1.24.0",
-      "sha256": "1iyqvang5j55s19skd44c1zsxkphn3qqbl4sjhsw1y820ylws5r1",
+      "version": "1.26.0",
+      "sha256": "0vjd0c9zql6w9iyp8fsr3rqwx4lybn8yfk421p8wgg29nlpg8zk6",
       "depends": ["ComplexHeatmap", "FlowSOM", "S4Vectors", "SummarizedExperiment", "circlize", "dplyr", "edgeR", "flowCore", "limma", "lme4", "magrittr", "multcomp", "reshape2", "tidyr"]
     },
     "diffuStats": {
       "name": "diffuStats",
-      "version": "1.24.0",
-      "sha256": "1d46rly5y4xc7hgjhvz2wlx6193jzpw3j8kkjvybr57d9vkl7x8s",
+      "version": "1.26.0",
+      "sha256": "1kl5nirs0n8x51p2x3yggn483hxwrgm2a301lky418fm1jvd0kv3",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "checkmate", "expm", "igraph", "plyr", "precrec"]
     },
     "diggit": {
       "name": "diggit",
-      "version": "1.36.0",
-      "sha256": "1fmz15jrdk9395a5wapwkld33xkmvr44xy2qmg8r3l21ayr7j63g",
+      "version": "1.38.0",
+      "sha256": "1x5pk95nwcz17gjrjj7vxyn2ci75qmjq054sj6p23ax2lplsvnir",
       "depends": ["Biobase", "ks", "viper"]
     },
     "dinoR": {
       "name": "dinoR",
-      "version": "1.0.0",
-      "sha256": "10fmj0f3fgga26rs39c9z69w0lnb4i2i00vq354s1qh0ciya6xpc",
+      "version": "1.2.0",
+      "sha256": "19q0223jqj7ag04r6gz6may5y66j01r6lv15dppqhv49icqnnd4a",
       "depends": ["BiocGenerics", "ComplexHeatmap", "GenomicRanges", "Matrix", "SummarizedExperiment", "circlize", "cowplot", "dplyr", "edgeR", "ggplot2", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "dir_expiry": {
       "name": "dir.expiry",
-      "version": "1.12.0",
-      "sha256": "03958xwwywsl5ql6ss1rbkklk49ksgvbp4nqcmmqhn1hiwwn8rvi",
+      "version": "1.14.0",
+      "sha256": "1907n8q1y57qvrl754r888zb0vgrc0pdpvgxxki26h1x6x1y3nf8",
       "depends": ["filelock"]
     },
     "discordant": {
       "name": "discordant",
-      "version": "1.28.0",
-      "sha256": "034nxwm0z3r0cbjpg8l6cwc6f4jnlj8v9q7r9c9ha9xk6xbah0yr",
+      "version": "1.30.0",
+      "sha256": "1404g5g1gvqym6xqpq03j5v9wfhkb822mdjk6mf4kxyh4ii1xr5d",
       "depends": ["Biobase", "MASS", "Rcpp", "biwt", "dplyr", "gtools"]
     },
     "distinct": {
       "name": "distinct",
-      "version": "1.16.0",
-      "sha256": "19xpnll4fksbw5hbk3g7a8m34p7jqj31vm7jxapwxxkmng17cpka",
+      "version": "1.18.0",
+      "sha256": "13f711z8yqv23565qi7qh5p5b5dpaicrkqg4xdd1iw7aly5wshyv",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "doParallel", "doRNG", "foreach", "ggplot2", "limma", "scater"]
     },
     "dittoSeq": {
       "name": "dittoSeq",
-      "version": "1.16.0",
-      "sha256": "15p01f3yaan9x7y6ld1kx40jnbcn6vjjm5n6ir7cicdvv4w5ln49",
+      "version": "1.18.0",
+      "sha256": "0c38wq57kpm7pjsca2kpyr2rmk37wak66d57mxsd6bwxmqzsys2r",
       "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "colorspace", "cowplot", "ggplot2", "ggrepel", "ggridges", "gridExtra", "pheatmap", "reshape2"]
     },
     "divergence": {
       "name": "divergence",
-      "version": "1.20.0",
-      "sha256": "0gm9p5lnxyfww5djgar1kp1lfmi2a30w2xbmh456a2808xdygdgf",
+      "version": "1.22.0",
+      "sha256": "0qfs95j5541bfqb88lkvyk5nd96m68jiz3y54ifrdrfbp15hcrrs",
       "depends": ["SummarizedExperiment"]
     },
     "dks": {
       "name": "dks",
-      "version": "1.50.0",
-      "sha256": "1j7xbdxk5ghh76fys6vnhnxf627xl70h4b7jn2mladgjw0cszklk",
+      "version": "1.52.0",
+      "sha256": "04m3klghrwjc3pbpv4i5d0sfq8i3ypj3jb42w8pwlx5am7jacmjy",
       "depends": ["cubature"]
     },
     "dmrseq": {
       "name": "dmrseq",
-      "version": "1.24.1",
-      "sha256": "0x7gwdzpn1ziq5vm80fs1fcyknapwjs8zfbjszw66zs36nqnqgw4",
+      "version": "1.26.0",
+      "sha256": "1glhz06hl5x7326lp3b8wz79vmvx855yy691cm4qzmgyxi16pdxy",
       "depends": ["AnnotationHub", "BiocParallel", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "annotatr", "bsseq", "bumphunter", "ggplot2", "locfit", "matrixStats", "nlme", "outliers", "rtracklayer"]
     },
+    "dominoSignal": {
+      "name": "dominoSignal",
+      "version": "1.0.0",
+      "sha256": "0lkd7w5j68ilzfzlgm275ic6ispiqbjmk6zjrjgggpb0nq7i67lm",
+      "depends": ["ComplexHeatmap", "Matrix", "biomaRt", "circlize", "ggpubr", "igraph", "plyr"]
+    },
     "doppelgangR": {
       "name": "doppelgangR",
-      "version": "1.32.0",
-      "sha256": "1kxw5x1fwdn2hzzf6ckxz0k8qqghvr0qdx3fgx31jdla0zc9z1zm",
+      "version": "1.34.0",
+      "sha256": "1hhb6cbpx1w4g8m5f6gxghvnlizsmc91hz75jb75h3rgqrr6j1ns",
       "depends": ["Biobase", "BiocParallel", "SummarizedExperiment", "digest", "impute", "mnormt", "sva"]
     },
     "doseR": {
       "name": "doseR",
-      "version": "1.20.0",
-      "sha256": "09zr2r1vk1azrjwgx2bklv5sdypl3dba0szvh21nw1ndqyk9lwic",
+      "version": "1.22.0",
+      "sha256": "1knc4gzblakcngg77gbwickr5rj665wqayqwc1wvc5yhgdp7k04q",
       "depends": ["RUnit", "S4Vectors", "SummarizedExperiment", "digest", "edgeR", "lme4", "matrixStats", "mclust"]
     },
     "doubletrouble": {
       "name": "doubletrouble",
-      "version": "1.4.1",
-      "sha256": "057l5qirwyh7swcyavyqd9d3qy9qxs8rasjzyglbz266sw3z5p36",
+      "version": "1.6.0",
+      "sha256": "09bzjfw199pp7dlcmpa0r7jnan8dhbx96n7yk5lfq160nwycq472",
       "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "GenomicRanges", "MSA2dist", "ggplot2", "mclust", "rlang", "syntenet"]
     },
     "drawProteins": {
       "name": "drawProteins",
-      "version": "1.24.0",
-      "sha256": "1ap2lclwpr532pzapz61pd6lclq3d3idvq4462x19jaivnhf6mr5",
+      "version": "1.26.0",
+      "sha256": "1kzjni6nyacjyjvrwqrr3pnh93cjhxzylrwm38wfpnmp1ng94mgl",
       "depends": ["dplyr", "ggplot2", "httr", "readr", "tidyr"]
     },
     "dreamlet": {
       "name": "dreamlet",
-      "version": "1.2.1",
-      "sha256": "06mpmwjxp7zs9fsggf2b3qc5vgmx6l5s7prl6l7b753zfq5gvjbg",
-      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GSEABase", "IRanges", "MASS", "Matrix", "MatrixGenerics", "Rcpp", "Rdpack", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ashr", "beachmat", "broom", "data_table", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggrepel", "gtools", "irlba", "limma", "lme4", "mashr", "metafor", "purrr", "remaCor", "reshape2", "rlang", "scattermore", "sparseMatrixStats", "tidyr", "variancePartition", "zenith"]
+      "version": "1.4.1",
+      "sha256": "0vbmqlv9ab5zqcwliszr6rxqac3fafdd0jdm9ggp6hl334rwc3m8",
+      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GSEABase", "IRanges", "MASS", "Matrix", "MatrixGenerics", "Rcpp", "Rdpack", "S4Arrays", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "ashr", "beachmat", "broom", "data_table", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggrepel", "gtools", "irlba", "limma", "lme4", "mashr", "metafor", "purrr", "remaCor", "reshape2", "rlang", "scattermore", "sparseMatrixStats", "tidyr", "variancePartition", "zenith"]
     },
     "drugTargetInteractions": {
       "name": "drugTargetInteractions",
-      "version": "1.12.0",
-      "sha256": "079qy3mmv9skiybzh9ls3082wqb3r9x6fn50rgcwziapixlx2rh4",
+      "version": "1.14.0",
+      "sha256": "0vlxc360k0qz1sljw9nxx5bw0y9kzyxpr28fj13a2psdr6zmgmjp",
       "depends": ["AnnotationFilter", "BiocFileCache", "RSQLite", "S4Vectors", "UniProt_ws", "biomaRt", "dplyr", "ensembldb", "rappdirs"]
     },
     "dupRadar": {
       "name": "dupRadar",
-      "version": "1.34.0",
-      "sha256": "0wd03v3qqmprv1n8018w0qqaw0majhx2i33qam7vf4rm2ng1gcxj",
+      "version": "1.36.0",
+      "sha256": "0pwp43w4w2xsbc8kq1x8svz35s3p116jwr3a4z895d0fizlyhahn",
       "depends": ["KernSmooth", "Rsubread"]
     },
     "dyebias": {
       "name": "dyebias",
-      "version": "1.64.0",
-      "sha256": "1k676kx37f6gdlrld2z7pygdf2cgin0d2cqgas83xizcq07ngnld",
+      "version": "1.66.0",
+      "sha256": "0fgm33jshsxidrba1kqsnkkhzsfl8a2jwrwf69nljj36f6nn264l",
       "depends": ["Biobase", "marray"]
     },
     "easier": {
       "name": "easier",
-      "version": "1.10.0",
-      "sha256": "00c0dssv41brpwsh09zh23b7r3y7vax16viwc33nniig3f724id2",
+      "version": "1.12.0",
+      "sha256": "1p2134xi5d9miwfng1z04035ysb7vy9w6037sgky944dk1y6j0m2",
       "depends": ["BiocParallel", "DESeq2", "ROCR", "coin", "decoupleR", "dorothea", "dplyr", "easierData", "ggplot2", "ggpubr", "ggrepel", "magrittr", "matrixStats", "progeny", "quantiseqr", "reshape2", "rlang", "rstatix", "tibble", "tidyr"]
     },
     "easyRNASeq": {
       "name": "easyRNASeq",
-      "version": "2.40.1",
-      "sha256": "1j36g6nyzbsaqz798q6yvgqx2vpjnzsi7b2pvldfpzkx1734isbx",
+      "version": "2.42.0",
+      "sha256": "1yjcha2mj736jl838g4km5zsbjilzdcrzcwf8ivwm1yap0jbsd3d",
       "depends": ["Biobase", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "LSD", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "biomaRt", "edgeR", "genomeIntervals", "rappdirs"]
     },
     "easylift": {
       "name": "easylift",
-      "version": "1.2.0",
-      "sha256": "17kc61n79iiwvwm4zpdh1a7a7q196fjs289kd95z6b7m4sp78l4b",
+      "version": "1.4.0",
+      "sha256": "05mfqwl2fxm487f3hal4ydv308dysd4kiwvnj4nk1ibfsh3hzxqf",
       "depends": ["BiocFileCache", "GenomeInfoDb", "GenomicRanges", "R_utils", "rtracklayer"]
     },
     "easyreporting": {
       "name": "easyreporting",
-      "version": "1.16.0",
-      "sha256": "0nlywvb35w8x90rx1b8535sls3n4kbfzkxrkm5g1ismsdxjs16cj",
+      "version": "1.18.0",
+      "sha256": "0b2ykgdipnpm77hw6k3f29lphw9y3c3ld6cb5m0hr43pjzvgiczm",
       "depends": ["rlang", "rmarkdown", "shiny"]
     },
     "ecolitk": {
       "name": "ecolitk",
-      "version": "1.76.0",
-      "sha256": "1knnvzxlf8gsn3r0sfadlsb4ln2csjizc1i0yffpv75yxrqa0ycd",
+      "version": "1.78.0",
+      "sha256": "1pj09s8jk5h7qwjlgvsmw97qmsjm7pw857ijswhy90gf3xv8h0s4",
       "depends": ["Biobase"]
     },
     "edge": {
       "name": "edge",
-      "version": "2.36.0",
-      "sha256": "10ddfwnvbh71q4aplb8ykahk8jmd80v0agny9mskmgkry35bi89s",
+      "version": "2.38.0",
+      "sha256": "1qr8mq8isr2sw4b9y0r7vb567001r6pj7l950f4r9xlb440ravvk",
       "depends": ["Biobase", "MASS", "qvalue", "sva"]
     },
     "edgeR": {
       "name": "edgeR",
-      "version": "4.2.1",
-      "sha256": "0c9r4gcsaf6fqkc4r49vj8az6wplqsbkd423pb4fvrv5lka9aqi9",
-      "depends": ["Rcpp", "limma", "locfit"]
+      "version": "4.4.1",
+      "sha256": "0hdg3lnis3vs4fmykg128nhsr0xj5v7ak46bn5i90l3gm5v8xvv5",
+      "depends": ["limma", "locfit"]
     },
     "eds": {
       "name": "eds",
-      "version": "1.6.0",
-      "sha256": "006d5gx7hz51v2icq6bi1hy8r9g5qgxrf7xf3s72asny2vdn3qw4",
+      "version": "1.8.0",
+      "sha256": "0ba57wg345970l2j780ipjxy8h803jnwxk7p81qdd887045kykqj",
       "depends": ["Matrix", "Rcpp"]
     },
     "eiR": {
       "name": "eiR",
-      "version": "1.44.0",
-      "sha256": "1ia8ygj2sashjwign28xfilj7j0a4r03nmgq6qzfsyw679wq4m2v",
+      "version": "1.46.0",
+      "sha256": "1p5q54axwz23chgmay11w3vbnrji6gfz6w6prmpr24lpw5m3f9dr",
       "depends": ["BiocGenerics", "ChemmineR", "DBI", "RCurl", "RUnit", "RcppAnnoy", "digest", "snow", "snowfall"]
     },
     "eisaR": {
       "name": "eisaR",
-      "version": "1.16.0",
-      "sha256": "0in6bkakplpqvfr8zya850sdl0jr4h1qdsw1shvd9wjr3yxdmsad",
+      "version": "1.18.0",
+      "sha256": "1778r9f11kmmp278lflfja9nk4rpijq295s9nz1w6bzfgccchvwf",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "edgeR", "limma"]
     },
     "enhancerHomologSearch": {
       "name": "enhancerHomologSearch",
-      "version": "1.10.0",
-      "sha256": "00hm42zvkgz0r3s0k4ljfcbwfkysd1sw6k3zm00fxglgigvfs8r3",
+      "version": "1.12.0",
+      "sha256": "0yzs9z3bwz5pkkwx26pqxgl3mkjq3cgpwfvbsf0l4p5r86nf4rv7",
       "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "httr", "jsonlite", "motifmatchr", "pwalign", "rtracklayer"]
     },
     "enrichViewNet": {
       "name": "enrichViewNet",
-      "version": "1.2.0",
-      "sha256": "1xnxkcy0ifhf3d5qfngh5vrxz3699azjjigr17qm4zmq7qdsp7h2",
+      "version": "1.4.0",
+      "sha256": "06acbr0nmwf8q0cpwhdzd68900d5793p8gg0ljz35d2kcskpd017",
       "depends": ["DOSE", "RCy3", "enrichplot", "gprofiler2", "jsonlite", "strex", "stringr"]
     },
     "enrichplot": {
       "name": "enrichplot",
-      "version": "1.24.2",
-      "sha256": "03p0a1vyaznk405xpkp57f22wg8x7lxiipjh101p7dq97rbzr4r7",
-      "depends": ["DOSE", "GOSemSim", "RColorBrewer", "aplot", "ggfun", "ggnewscale", "ggplot2", "ggraph", "ggtree", "igraph", "magrittr", "plyr", "purrr", "reshape2", "rlang", "scatterpie", "shadowtext", "yulab_utils"]
-    },
-    "ensemblVEP": {
-      "name": "ensemblVEP",
-      "version": "1.46.0",
-      "sha256": "10lq13v2qww8d251digx4g50y3vab6sg9kmxkdy00q40ncn042g6",
-      "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation"]
+      "version": "1.26.5",
+      "sha256": "0s75ra75w3vanzilq5rr5r8jy0p3bgmd04bapngzf937p8ixj7ha",
+      "depends": ["DOSE", "GOSemSim", "RColorBrewer", "aplot", "ggfun", "ggnewscale", "ggplot2", "ggrepel", "ggtangle", "ggtree", "igraph", "magrittr", "plyr", "purrr", "reshape2", "rlang", "scatterpie", "yulab_utils"]
     },
     "ensembldb": {
       "name": "ensembldb",
-      "version": "2.28.0",
-      "sha256": "10h3ngwq99y0d3ksf0303qjw263ard1zsawpq1pw5n9r5g7xll47",
+      "version": "2.30.0",
+      "sha256": "1p7hlhyzirzcq1g0i62hr3l4k60fm4y04qb4k04lls8wynfxhy0a",
       "depends": ["AnnotationDbi", "AnnotationFilter", "Biobase", "BiocGenerics", "Biostrings", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "ProtGenerics", "RSQLite", "Rsamtools", "S4Vectors", "curl", "rtracklayer"]
     },
     "epiNEM": {
       "name": "epiNEM",
-      "version": "1.28.0",
-      "sha256": "156qj9r121j6c9vr6fh2zi9aaq3kq9gabjxg4l5wj47vj1d427az",
-      "depends": ["BoolNet", "RColorBrewer", "e1071", "graph", "gtools", "igraph", "latex2exp", "lattice", "latticeExtra", "minet", "mnem", "pcalg"]
+      "version": "1.30.0",
+      "sha256": "0q8akbj67kra03fryi5b4lnlbkr0gcqrvf0gd6qmxn28fhsg3ph9",
+      "depends": ["BoolNet", "BoutrosLab_plotting_general", "RColorBrewer", "e1071", "graph", "gtools", "igraph", "latex2exp", "lattice", "latticeExtra", "minet", "mnem", "pcalg"]
     },
     "epialleleR": {
       "name": "epialleleR",
-      "version": "1.12.0",
-      "sha256": "1jdhzcs6l3v4765dxlqc7gn2yxy9fvzk94aixl5bqxmn4v4hyasq",
-      "depends": ["BH", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Rcpp", "Rhtslib", "SummarizedExperiment", "VariantAnnotation", "data_table", "zlibbioc"]
+      "version": "1.14.0",
+      "sha256": "0zdas9qb4palfakwrahlk2l4qj2nz371iqlqphs2nclmr6dbhj5w",
+      "depends": ["BH", "BiocGenerics", "GenomicRanges", "Rcpp", "Rhtslib", "data_table"]
     },
     "epidecodeR": {
       "name": "epidecodeR",
-      "version": "1.12.0",
-      "sha256": "0gmdmjvl93zgsi9yclscw94y1caspb2pnjawxhv3yqmnhjq3dzhz",
+      "version": "1.14.0",
+      "sha256": "0iy6ffyar28miyg8k0y1grri0kf9sr51ik7xlllhj4hdra8dffk3",
       "depends": ["EnvStats", "GenomicRanges", "IRanges", "dplyr", "ggplot2", "ggpubr", "rstatix", "rtracklayer"]
     },
     "epigenomix": {
       "name": "epigenomix",
-      "version": "1.44.0",
-      "sha256": "1c1lwz5lbq69anpk1q7dhlfrvb66g8vrfyw7130x1c6y5yryk23k",
+      "version": "1.46.0",
+      "sha256": "12dbs4gyypkykaswpwiyx3sfyrxsp3g44ngxgk0yp8nas76m8c4x",
       "depends": ["Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MCMCpack", "Rsamtools", "S4Vectors", "SummarizedExperiment", "beadarray"]
     },
     "epigraHMM": {
       "name": "epigraHMM",
-      "version": "1.12.0",
-      "sha256": "1zkb81jd2gsj92yzlxhshaw4csap9b06gyy5gl1qi3k3qkx69dq9",
+      "version": "1.14.0",
+      "sha256": "1cj9mypj3kbns4n4k4gm5d7g4zdhm4sddg8brv0yap94hpyj1lnp",
       "depends": ["GenomeInfoDb", "GenomicRanges", "GreyListChIP", "IRanges", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rhdf5lib", "Rsamtools", "S4Vectors", "SummarizedExperiment", "bamsignals", "csaw", "data_table", "ggplot2", "ggpubr", "limma", "magrittr", "pheatmap", "rhdf5", "rtracklayer", "scales"]
     },
     "epimutacions": {
       "name": "epimutacions",
-      "version": "1.8.0",
-      "sha256": "15lrkz7fqmjg5d2l77xbiqwdd3f2jnbw9nc6l4k6wglw3za3prr1",
+      "version": "1.10.0",
+      "sha256": "1qpdmir7fi4pq1rh1bf35yak1snb8xcppj8kd42z17cjxqcr6f1h",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "BiocParallel", "ExperimentHub", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "Homo_sapiens", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b2_hg19", "IlluminaHumanMethylationEPICmanifest", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "biomaRt", "bumphunter", "ensembldb", "epimutacionsData", "ggplot2", "ggrepel", "gridExtra", "isotree", "matrixStats", "minfi", "purrr", "reshape2", "robustbase", "rtracklayer", "tibble"]
     },
     "epiregulon": {
       "name": "epiregulon",
-      "version": "1.0.1",
-      "sha256": "0zhnra2kl1r2kh9g21fx3nqyb5sksnf7j81dzhjnwjvmlr52xp8w",
-      "depends": ["AUCell", "AnnotationHub", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BiocParallel", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "bluster", "checkmate", "entropy", "lifecycle", "motifmatchr", "scMultiome", "scran", "scuttle"]
+      "version": "1.2.0",
+      "sha256": "0vjr1fhvl6q796n30kh7cssxskq2gmp9kqr27yny1ldj9dd4g0av",
+      "depends": ["AUCell", "AnnotationHub", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BiocParallel", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "assorthead", "beachmat", "bluster", "checkmate", "entropy", "lifecycle", "motifmatchr", "scMultiome", "scran", "scuttle"]
     },
     "epiregulon_extra": {
       "name": "epiregulon.extra",
-      "version": "1.0.1",
-      "sha256": "0wfslvp85vz792dacirqzmfqp1phs91v6lcmly9m14vw892651pn",
+      "version": "1.2.0",
+      "sha256": "0kqdmc0csfyn7hw998pdsz45x3d7iwji1qdmhsmj8vr8gxm63gsk",
       "depends": ["ComplexHeatmap", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "circlize", "clusterProfiler", "ggplot2", "ggraph", "igraph", "lifecycle", "patchwork", "reshape2", "scales", "scater", "scran"]
     },
     "epistack": {
       "name": "epistack",
-      "version": "1.10.0",
-      "sha256": "1kfviv9k43n6hy66x5r5hc2f7vb3y3v81qk1m9549nqvdii7ph5q",
+      "version": "1.12.0",
+      "sha256": "0yr9b4wgp7j23hqwd64vc5mwqz1lgis1rpfam67n95kwi6i516ca",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "plotrix"]
     },
     "epistasisGA": {
       "name": "epistasisGA",
-      "version": "1.6.0",
-      "sha256": "1rq1jgd95zamg3fsyj8nbvg95chjaf9d30xlg8d6rr071ya9f03v",
+      "version": "1.8.0",
+      "sha256": "1fknmbw91mg0aczpywl09d8kqzl9lzibf336v13p12cikzra6wph",
       "depends": ["BH", "BiocParallel", "Rcpp", "RcppArmadillo", "batchtools", "bigmemory", "data_table", "ggplot2", "igraph", "matrixStats", "qgraph", "survival"]
     },
     "epivizr": {
       "name": "epivizr",
-      "version": "2.34.0",
-      "sha256": "07y6h9dk0mz5nh1ivbrf1l2smlw7y0ygdmh9k1fn50lc6120dq37",
+      "version": "2.36.0",
+      "sha256": "110zlfs8m3jz5hg2x60njh9cljnaxzzqdivdvdvwsbfs4lj8pmd6",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bumphunter", "epivizrData", "epivizrServer"]
     },
     "epivizrChart": {
       "name": "epivizrChart",
-      "version": "1.26.0",
-      "sha256": "0yq0mqkzvvp5mva24ky7sqa6107rcaxlircw0wg8bsalcxynvgzw",
+      "version": "1.28.0",
+      "sha256": "1i7icadcidw7xpg81irk7415806v9ijhjchilldv03rka7qrrc98",
       "depends": ["BiocGenerics", "epivizrData", "epivizrServer", "htmltools", "rjson"]
     },
     "epivizrData": {
       "name": "epivizrData",
-      "version": "1.32.0",
-      "sha256": "11x47w0rvn109brah7140nn5844vvmdpbgdc2c3q2ycxm40fl6rq",
+      "version": "1.34.0",
+      "sha256": "19rlgvhbh13wgvj9dy7h4r0ik1fdvhwsjnbvxd0hkiylrlfzklbk",
       "depends": ["Biobase", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "OrganismDbi", "S4Vectors", "SummarizedExperiment", "ensembldb", "epivizrServer"]
     },
     "epivizrServer": {
       "name": "epivizrServer",
-      "version": "1.32.0",
-      "sha256": "11ba652yhnl7xi7fgw3s32siwd38mrsxsklm0n6f5v081g3a7g3s",
+      "version": "1.34.0",
+      "sha256": "0fyxkrjq125x8jkrx23c6k10p4fnjdmhs7lkh1kf54dwg0h3f2p3",
       "depends": ["R6", "httpuv", "mime", "rjson"]
     },
     "epivizrStandalone": {
       "name": "epivizrStandalone",
-      "version": "1.32.0",
-      "sha256": "0qrngsga0qfadbijjikfzgpl6i0vnvkcssnf1z3y1fm8mkq35b4z",
+      "version": "1.34.0",
+      "sha256": "02ighlzlb9j29ix2x1z18qxx5lizacpj0pna6qz0c4yh54gss7rb",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "S4Vectors", "epivizr", "epivizrServer", "git2r"]
     },
     "erccdashboard": {
       "name": "erccdashboard",
-      "version": "1.38.0",
-      "sha256": "0cghksf9gkgkcak8493s4pixq2nd3a7zc91vqq158g5na6ca24n7",
-      "depends": ["MASS", "ROCR", "edgeR", "ggplot2", "gplots", "gridExtra", "gtools", "limma", "locfit", "plyr", "qvalue", "reshape2", "scales", "stringr"]
+      "version": "1.40.0",
+      "sha256": "06vsfzxxxkd34r2mz689p160h0cabg1y7zn48h2w7fs9isyy1kcm",
+      "depends": ["MASS", "ROCR", "edgeR", "ggplot2", "gplots", "gridExtra", "gtools", "knitr", "limma", "locfit", "plyr", "qvalue", "reshape2", "scales", "stringr"]
     },
     "erma": {
       "name": "erma",
-      "version": "1.20.0",
-      "sha256": "0f4y0szdqhg63vaw7f1lmgzb72bhfpz20g9naq84s8bq2xsf8cy6",
+      "version": "1.22.0",
+      "sha256": "15vkr4afhszlnj4171fjj78sprgd7rcafzj2lnbrgy3r443yfn66",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicFiles", "GenomicRanges", "Homo_sapiens", "IRanges", "S4Vectors", "SummarizedExperiment", "ggplot2", "rtracklayer", "shiny"]
     },
     "esATAC": {
       "name": "esATAC",
-      "version": "1.26.0",
-      "sha256": "0gfil57zc5bzhk29cw16bv02kng7hqs5ry1kakly1kvcfafcn87s",
+      "version": "1.28.0",
+      "sha256": "06jc5nhqylyqmfz7650n538vw5k4n0lz74d9dnr2sm6dg0cjy1ll",
       "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "BiocManager", "Biostrings", "ChIPseeker", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "JASPAR2018", "R_utils", "Rbowtie2", "Rcpp", "Rsamtools", "S4Vectors", "ShortRead", "TFBSTools", "VennDiagram", "clusterProfiler", "corrplot", "digest", "ggplot2", "igraph", "knitr", "magrittr", "motifmatchr", "pipeFrame", "rJava", "rmarkdown", "rtracklayer"]
     },
     "escape": {
       "name": "escape",
-      "version": "2.0.0",
-      "sha256": "03wbrxd7kjyl3d4s418ql5fv7bmwdfyfp10jd8knr0xis7vxmz2x",
-      "depends": ["AUCell", "BiocParallel", "GSEABase", "GSVA", "MatrixGenerics", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "UCell", "dplyr", "ggdist", "ggplot2", "ggpointdensity", "ggridges", "msigdbr", "patchwork", "reshape2", "stringr"]
+      "version": "2.2.2",
+      "sha256": "041s1xgywscxhxfkdaf3bhi3f53qyfccnkbkl3460qladxs421f6",
+      "depends": ["AUCell", "BiocParallel", "GSEABase", "GSVA", "Matrix", "MatrixGenerics", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "UCell", "dplyr", "ggdist", "ggplot2", "ggpointdensity", "ggridges", "msigdbr", "patchwork", "reshape2", "stringr"]
     },
     "escheR": {
       "name": "escheR",
-      "version": "1.4.0",
-      "sha256": "16sqxsvpvb9idb7crbr3kq5xcifpzdw29lcxvrn2kxq003n7hbqw",
+      "version": "1.6.0",
+      "sha256": "0p12baf4aqll216w04w9li2p3pwrrsjz9gqip0lzwirddxrf6ij7",
       "depends": ["SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "ggplot2", "rlang"]
     },
     "esetVis": {
       "name": "esetVis",
-      "version": "1.30.0",
-      "sha256": "1b51cv3bl11jymjwnd8150lw5ab7bpa4jj09ssisn3qnb5nym7lj",
+      "version": "1.32.0",
+      "sha256": "0diabzn14yygpd8ddhnrvi4zh4paqdk2qzc0lqsbpl11spfhbgxl",
       "depends": ["Biobase", "MASS", "MLP", "Rtsne", "hexbin", "mpm"]
     },
     "eudysbiome": {
       "name": "eudysbiome",
-      "version": "1.34.0",
-      "sha256": "12kbk17rfh1icxdj5kkz66d72p9rq4bw9nh52bvah5i3bq7wi5zn",
+      "version": "1.36.0",
+      "sha256": "1f0r5xlkymr717ww8hp8anav8ss225li87jcr6n9a2wwimawhwfz",
       "depends": ["Biostrings", "R_utils", "Rsamtools", "plyr"]
     },
     "evaluomeR": {
       "name": "evaluomeR",
-      "version": "1.20.5",
-      "sha256": "18hp7j6m7fpnaa4l9clqff1xg0lmvwsh0s26c5gq75r1d6k05m4p",
+      "version": "1.22.0",
+      "sha256": "07gycpis82lfsp5m477i2lgr4pa2w8psm9c64hpbxxq0ygybc94h",
       "depends": ["MASS", "MultiAssayExperiment", "RSKC", "Rdpack", "SummarizedExperiment", "class", "cluster", "corrplot", "dendextend", "dplyr", "flexmix", "fpc", "ggdendro", "ggplot2", "kableExtra", "matrixStats", "mclust", "plotrix", "prabclus", "randomForest", "reshape2", "sparcl"]
     },
     "extraChIPs": {
       "name": "extraChIPs",
-      "version": "1.8.5",
-      "sha256": "1cznznlr2w8p5wjc4i6vcmxv9lhvgf7xglxd75gm9s60w8hi31yj",
-      "depends": ["BiocIO", "BiocParallel", "ComplexUpset", "GenomeInfoDb", "GenomicInteractions", "GenomicRanges", "IRanges", "InteractionSet", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "broom", "csaw", "dplyr", "edgeR", "forcats", "ggforce", "ggplot2", "ggrepel", "ggside", "glue", "matrixStats", "patchwork", "rlang", "rtracklayer", "scales", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
+      "version": "1.10.0",
+      "sha256": "1d3jg7zrx96hm9d1gg24z1iwdpiy1lm2arix5y7kwa2mpbqfv010",
+      "depends": ["BiocIO", "BiocParallel", "ComplexUpset", "GenomeInfoDb", "GenomicAlignments", "GenomicInteractions", "GenomicRanges", "IRanges", "InteractionSet", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "broom", "csaw", "dplyr", "edgeR", "forcats", "ggforce", "ggplot2", "ggrepel", "ggside", "glue", "matrixStats", "patchwork", "rlang", "rtracklayer", "scales", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "fCCAC": {
       "name": "fCCAC",
-      "version": "1.30.0",
-      "sha256": "0qvwsqvv1g4fcjhy88kq2z5nzlhhvx6p6ffaqis70wbgvr5p4aw0",
+      "version": "1.32.0",
+      "sha256": "1l4v760ggpzyk22rf8qirandpxlzll2in7c7n2aii13mz51n1cla",
       "depends": ["ComplexHeatmap", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "fda", "genomation", "ggplot2"]
     },
     "fCI": {
       "name": "fCI",
-      "version": "1.34.0",
-      "sha256": "0szrdyw57k6wa8zr80gyxidfhcc1v88gj6bjank3dc478f1kn9d0",
+      "version": "1.36.0",
+      "sha256": "167sr70gd7ci9lc9y1pxr1bk5b67r4hvnv1k2y4hg01mbpl96dws",
       "depends": ["FNN", "VennDiagram", "gtools", "psych", "rgl", "zoo"]
     },
     "fabia": {
       "name": "fabia",
-      "version": "2.50.0",
-      "sha256": "06zlhacfs1mad26pni3fkh3ijh7ca75cr1v2gd62igsw7cf4wdli",
+      "version": "2.52.0",
+      "sha256": "1mzcc807viyl8gnvx65f1jm2nhm8s5h8sn2bm2x0nb7ywj37lfr2",
       "depends": ["Biobase"]
     },
     "factDesign": {
       "name": "factDesign",
-      "version": "1.80.0",
-      "sha256": "1g7vjb3lrx4a5ks9nsr7z7nrbf8d7f83c37b2fwacx56fbps7f51",
+      "version": "1.82.0",
+      "sha256": "0r4rjr9v6v6262sp82sghv478my4fvjpiw8rnw2z3g9kfj8ri5r2",
       "depends": ["Biobase"]
     },
     "factR": {
       "name": "factR",
-      "version": "1.6.0",
-      "sha256": "1y19wd0j9rlbfi2rqk73gcyszbg4p4cl2w3zqckyvv9969i9rjid",
+      "version": "1.8.0",
+      "sha256": "0wlf0yrjmv55dr92s777g57zq85bhwn89gdb9dy4wkf1xg6sc25x",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RCurl", "S4Vectors", "XML", "crayon", "data_table", "dplyr", "drawProteins", "ggplot2", "pbapply", "purrr", "rlang", "rtracklayer", "stringr", "tibble", "tidyr", "wiggleplotr"]
     },
     "faers": {
       "name": "faers",
-      "version": "1.0.3",
-      "sha256": "09cha2kzc3bjgd4yww9pymvk7d1wnw3qh70vl1sra52vz89hif4j",
+      "version": "1.2.0",
+      "sha256": "12qgmbdmlal1s6hy2rca2jxvviy22hdb2ls0gw9m6yicwrw0zqjg",
       "depends": ["BiocParallel", "MCMCpack", "brio", "cli", "curl", "data_table", "httr2", "openEBGM", "rlang", "rvest", "vroom", "xml2"]
     },
     "famat": {
       "name": "famat",
-      "version": "1.14.0",
-      "sha256": "099l12m27ys5glbigi9q9hr7941yy9jxrzsbxf993gs71qajlsgh",
+      "version": "1.16.0",
+      "sha256": "0zj32n5niaaiq9m7rln3a0jwrs4fiprvdwvqfn7vb518k77x80xa",
       "depends": ["BiasedUrn", "DT", "GO_db", "KEGGREST", "clusterProfiler", "dplyr", "gprofiler2", "magrittr", "mgcv", "ontologyIndex", "org_Hs_eg_db", "plotly", "rWikiPathways", "reactome_db", "shiny", "shinyBS", "shinydashboard", "stringr", "tidyr"]
     },
     "fastLiquidAssociation": {
       "name": "fastLiquidAssociation",
-      "version": "1.40.0",
-      "sha256": "0nhr2w0b491xh6bc2j9mc9a87yblr3l4kmnm8gxlnc27fav3jzj8",
+      "version": "1.42.0",
+      "sha256": "1gzypl0p6l559hjldkp2hh2798gw24b0s8r4zmz0ril3j8lv5ram",
       "depends": ["Hmisc", "LiquidAssociation", "WGCNA", "doParallel", "impute", "preprocessCore"]
     },
     "fastreeR": {
       "name": "fastreeR",
-      "version": "1.8.0",
-      "sha256": "0r1xngxdblgshgkr4l762kgxqaq9s79g4f3lirlkd9bb248pzfvc",
+      "version": "1.10.0",
+      "sha256": "0yqn2dxzp7rqrbv56mif0fdfn4slx8ncy5dwwdq3bd1gdpcl4mlw",
       "depends": ["R_utils", "ape", "data_table", "dynamicTreeCut", "rJava", "stringr"]
     },
     "fastseg": {
       "name": "fastseg",
-      "version": "1.50.0",
-      "sha256": "03gl7z7q90jy47q57gfbj5fkv5n8hi43jbbrl53bdyp71f26ry2d",
+      "version": "1.52.0",
+      "sha256": "1yjpn8qi3q7cc7hqrqpa5nnjd7r0nrahnqgxv2kzk85klkpiyq5f",
       "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors"]
     },
     "fcScan": {
       "name": "fcScan",
-      "version": "1.18.0",
-      "sha256": "1gb15zrv44yn65wns7dk24rp54qv7wafqxgk1q8jnbkq9lp5wj2y",
+      "version": "1.20.0",
+      "sha256": "0llrp1q8py5rz9zd497yv3l0ranhdn6jmrwxam2byih2j35w8gbx",
       "depends": ["GenomicRanges", "IRanges", "SummarizedExperiment", "VariantAnnotation", "doParallel", "foreach", "plyr", "rtracklayer"]
     },
     "fdrame": {
       "name": "fdrame",
-      "version": "1.76.0",
-      "sha256": "0a28pw2wi3l8a3x5sxq8aa52fagb678q6wbaajqznx7yflk2s88v",
+      "version": "1.78.0",
+      "sha256": "1pmnm7rjdwx609bzgmnwa0ahv85yl6kkmd75dxalrj7clrp2r77q",
       "depends": []
     },
     "fedup": {
       "name": "fedup",
-      "version": "1.12.0",
-      "sha256": "0q1bvx8zv5c1pzi82v8yxgdxb85l7nzan8k6xwsr1xmdy224lpgf",
+      "version": "1.14.0",
+      "sha256": "04cw7a221bz9w8yw4yz8r9nqqn8l2lqzqi8g2s1vgzzq92xlpsnm",
       "depends": ["RColorBrewer", "RCy3", "data_table", "dplyr", "forcats", "ggplot2", "ggthemes", "openxlsx", "tibble"]
     },
     "fenr": {
       "name": "fenr",
-      "version": "1.2.1",
-      "sha256": "19hhdvfmml8njsw86ny1hp9x8pn7hdcqbbyd6qygr8z0lqpfpb9d",
+      "version": "1.4.0",
+      "sha256": "0ha6dqvyf9m40d09xkaj2imvpwpm5wjrcc95vw7xhbvfz61xg3yb",
       "depends": ["BiocFileCache", "assertthat", "dplyr", "ggplot2", "httr2", "progress", "purrr", "readr", "rlang", "rvest", "shiny", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "ffpe": {
       "name": "ffpe",
-      "version": "1.48.0",
-      "sha256": "1y769nnwbc9rjjpwxqgfw0v58ym4g9qy695adcyswl8z955yhjax",
+      "version": "1.50.0",
+      "sha256": "1zy51274rxkpxj1xfgj3c4nnd581mhimqj6q4jdq1zf271fscglm",
       "depends": ["Biobase", "BiocGenerics", "TTR", "affy", "lumi", "methylumi", "sfsmisc"]
     },
     "fgga": {
       "name": "fgga",
-      "version": "1.12.0",
-      "sha256": "18bvf1qjdzd66sf479ghf3pg4cnwpwmzkhcvi6zriqd7mvsll8fr",
+      "version": "1.14.0",
+      "sha256": "1arda97raf7if9xi8hn7ifb1d558kkhh4wsd5vl0rjkjmhilap72",
       "depends": ["BiocFileCache", "RBGL", "curl", "e1071", "gRbase", "graph", "igraph", "jsonlite"]
     },
     "fgsea": {
       "name": "fgsea",
-      "version": "1.30.0",
-      "sha256": "0nnvqsyrj24h5y8qw8llk9f4jgy0v734k37kcksfcpja17frdyjy",
+      "version": "1.32.2",
+      "sha256": "191iy8pzc2j44675gwwa7q17mr9882h8a78jxfhs6nxg03xizd1f",
       "depends": ["BH", "BiocParallel", "Matrix", "Rcpp", "cowplot", "data_table", "fastmatch", "ggplot2", "scales"]
     },
     "findIPs": {
       "name": "findIPs",
-      "version": "1.0.0",
-      "sha256": "08vf1i2j9h1174q5sx58hjfa62cbb6ylwzmj4bwkcibazdac5n60",
+      "version": "1.2.0",
+      "sha256": "18984ndycgcg0kr15z7kll5r8h5ybqbb5sxxb9b2c05mc9dx2ibv",
       "depends": ["Biobase", "BiocParallel", "SummarizedExperiment", "survival"]
     },
     "fishpond": {
       "name": "fishpond",
-      "version": "2.10.0",
-      "sha256": "02lzx8whxd3z4k0saf0vaq4np8lag00nkp3hd6da1w91vczs1kjl",
+      "version": "2.12.0",
+      "sha256": "07qzplkpq1zbh671b44c1qa1k47jqqmyrrrdyixjz0fqj0ikw6ya",
       "depends": ["GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "gtools", "jsonlite", "matrixStats", "qvalue", "svMisc"]
     },
     "flagme": {
       "name": "flagme",
-      "version": "1.60.0",
-      "sha256": "0gi2hwd13q4rdmzf45xcbmdpr3b3hbqabv6csmjfiqqqj4cl3wy9",
+      "version": "1.62.0",
+      "sha256": "10ykp64pkkdfygbfrwrjmqgbq18j8ys3gi8k4g47b89sn6cnzr6z",
       "depends": ["CAMERA", "MASS", "SparseM", "gcspikelite", "gplots", "xcms"]
     },
     "flowAI": {
       "name": "flowAI",
-      "version": "1.34.0",
-      "sha256": "1siqza92iak5lz38hbfznqndrmq995ihp6sbam0n2d3mj8vwv9qa",
+      "version": "1.36.0",
+      "sha256": "1g2bjfdrmglxb2b3h3j2d37nq7k4hy2ff3qp5jy1arjrblq45qfm",
       "depends": ["RColorBrewer", "changepoint", "flowCore", "ggplot2", "knitr", "plyr", "reshape2", "rmarkdown", "scales"]
     },
     "flowBeads": {
       "name": "flowBeads",
-      "version": "1.42.0",
-      "sha256": "12zj4w37l760a5j3pwd27yjlfx6ywkcw1rxmp83pgmfwkh8jhvj1",
+      "version": "1.44.0",
+      "sha256": "151pcq3dbsrzvclcfknlmqh7xhnxsckxk6z48yxjc607qkbp1hry",
       "depends": ["Biobase", "flowCore", "knitr", "rrcov", "xtable"]
     },
     "flowBin": {
       "name": "flowBin",
-      "version": "1.40.0",
-      "sha256": "0g0kxxq4c2zm4yvi2yx1czyiiwhvmlfwvqnkyap4kbid05zy1q1i",
+      "version": "1.42.0",
+      "sha256": "01raylkvy6jnh30f2c7rjxlnw280ay1n1mz78r6h6nvjs2mb9jx5",
       "depends": ["BiocGenerics", "class", "flowCore", "flowFP", "limma", "snow"]
     },
     "flowCHIC": {
       "name": "flowCHIC",
-      "version": "1.38.0",
-      "sha256": "0zia2gsi53vbmqijljdgxmglssqfmhiqa0bzr5zr03l32aglcp4y",
+      "version": "1.40.0",
+      "sha256": "03z8jd1z3nbfjv16q0b57g99gqxwwjabmj4wbnhxsagcpzz7gf02",
       "depends": ["EBImage", "flowCore", "ggplot2", "hexbin", "vegan"]
     },
     "flowClean": {
       "name": "flowClean",
-      "version": "1.42.0",
-      "sha256": "1a588wx63q10lpx7w3f0120ngiprgadr66fl3jvwi4g2yhkwpjsr",
+      "version": "1.44.0",
+      "sha256": "0rgqih8vvl2mbmb4l6vhw8algn4x5iikmv9cksxvpm0iq1p6m5rf",
       "depends": ["bit", "changepoint", "flowCore", "sfsmisc"]
     },
     "flowClust": {
       "name": "flowClust",
-      "version": "3.42.0",
-      "sha256": "1zjjzn10nvbj7lhg9kvp8gr7m2m294pa3zdmajq65ffdynaaavnd",
+      "version": "3.44.0",
+      "sha256": "0li9vcgk82vn5wqzmz6hbn04vqa5l0mwsb6vyb537mkcg45dhcr3",
       "depends": ["Biobase", "BiocGenerics", "flowCore", "graph"]
     },
     "flowCore": {
       "name": "flowCore",
-      "version": "2.16.0",
-      "sha256": "1zq3qypmzk9ld48r50fmygfdqwwyykii8l0l6gh5bdrdan760bfn",
+      "version": "2.18.0",
+      "sha256": "0zbxlwij9nc2fpsx5hg2q9inn1g5c0i34bmvbn6n56y3i0vzm8xj",
       "depends": ["BH", "Biobase", "BiocGenerics", "RProtoBufLib", "Rcpp", "S4Vectors", "cpp11", "cytolib", "matrixStats"]
     },
     "flowCut": {
       "name": "flowCut",
-      "version": "1.14.0",
-      "sha256": "0mhdkkv8n1650wmnasprbpr5wm31s5s2in1n60rcsbb78hl7d278",
+      "version": "1.16.0",
+      "sha256": "0ib8agini4cij81z0prhv11m6qmrp8l9sg2piwp05cqd67r3h81x",
       "depends": ["Cairo", "e1071", "flowCore", "flowDensity"]
     },
     "flowCyBar": {
       "name": "flowCyBar",
-      "version": "1.40.0",
-      "sha256": "0cf7b6wqs3wr274fwj8z346432mziv43dgs2qmx2qs6zlq6p2vya",
+      "version": "1.42.0",
+      "sha256": "1vc1zlxp07jaf5z0p761x0jmyrfmczsj23pq8p24h3wip6kd8yl3",
       "depends": ["gplots", "vegan"]
     },
     "flowDensity": {
       "name": "flowDensity",
-      "version": "1.38.0",
-      "sha256": "17v43jsrgg09ww0ga2dvryvzz4j2skzyhx51vn2lfm13fjbprhcc",
+      "version": "1.40.0",
+      "sha256": "0fwfppwn0jxp8lvwyfpgmkizsfp3i6n3jaccc7m9fkmad3cd2yxv",
       "depends": ["car", "flowCore", "flowViz", "gplots", "polyclip"]
     },
     "flowFP": {
       "name": "flowFP",
-      "version": "1.62.0",
-      "sha256": "1rpmqk4w4ab6wn0gygpyzzxbgs3ds66pa2lr2sy48b4gxalpr3hc",
+      "version": "1.64.0",
+      "sha256": "109184ad3nwbzlkj22ha753lk7z382gwi2dbna6s4wjngr7rbavf",
       "depends": ["Biobase", "BiocGenerics", "flowCore", "flowViz"]
     },
     "flowGate": {
       "name": "flowGate",
-      "version": "1.4.0",
-      "sha256": "1jag6h8inizjmfi69ybs39y4f0zqhc0rb4rrq5yzgy1s5z4ba9fi",
+      "version": "1.6.0",
+      "sha256": "086nc8rjafhnqdzf00n342pxsdh2x4ysnkymihngj7s43xvppvjd",
       "depends": ["BiocManager", "dplyr", "flowCore", "flowWorkspace", "ggcyto", "ggplot2", "purrr", "rlang", "shiny", "tibble"]
     },
     "flowGraph": {
       "name": "flowGraph",
-      "version": "1.12.0",
-      "sha256": "1zxpiz8nm3awzkf7wqql73b9kgydgza72yp2kv59gyf1lcsli0ns",
+      "version": "1.14.0",
+      "sha256": "0r7svnyqmf45mdr9v3bpqbv9352yfdkrvj2syisrhdhg7mbvhpcn",
       "depends": ["Matrix", "Rdpack", "data_table", "effsize", "furrr", "future", "ggiraph", "ggplot2", "ggrepel", "gridExtra", "htmlwidgets", "igraph", "matrixStats", "purrr", "stringi", "stringr", "visNetwork"]
     },
     "flowMatch": {
       "name": "flowMatch",
-      "version": "1.40.0",
-      "sha256": "0k83702b9k5nsng67awr7mz3jq9yxs4dkvvg2hcn29m1s42a2i63",
+      "version": "1.42.0",
+      "sha256": "1v0l5974bynyiv4aw5az2x90jzi2qa383njifg8dxx6061qr1s3s",
       "depends": ["Biobase", "Rcpp", "flowCore"]
     },
     "flowMeans": {
       "name": "flowMeans",
-      "version": "1.64.0",
-      "sha256": "0bkp3q71qj1r2bwfpfriflqklvcqpvh760as7sr489sb18y1xlms",
+      "version": "1.66.0",
+      "sha256": "1sgk1x1cm2srrdv2bn312lvj1pcc8r9gaqlvr1fnngp98dhw5pb1",
       "depends": ["Biobase", "feature", "flowCore", "rrcov"]
     },
     "flowMerge": {
       "name": "flowMerge",
-      "version": "2.52.0",
-      "sha256": "1z675mj3jsi0n9x03nbw12z001c8jz9pm64ypvb1g6f51bnq1fyx",
+      "version": "2.54.0",
+      "sha256": "0jxi9zpq3vvz1mpqq9c7l9c4pvrjvgvcmma1v4w52gflrp1nxj7w",
       "depends": ["Rgraphviz", "feature", "flowClust", "flowCore", "foreach", "graph", "rrcov", "snow"]
     },
     "flowPeaks": {
       "name": "flowPeaks",
-      "version": "1.50.0",
-      "sha256": "065nkldia602w36bks394qdf96330ahnrz9jpks2gv8r91pk7pf5",
+      "version": "1.52.0",
+      "sha256": "0sgxzywbzwz0y4c8ja2803ny3l3gywn90jil76r96s37ddn376ii",
       "depends": []
     },
     "flowPloidy": {
       "name": "flowPloidy",
-      "version": "1.30.0",
-      "sha256": "06grhvskia03xakfcs776fiz7i3i04crysykrmnyz1jxbaa2irba",
+      "version": "1.32.0",
+      "sha256": "1cxppkg0knjadwbafmyyy5lx8jg9rjx58rfgzl7vn7bk0rrj253z",
       "depends": ["caTools", "car", "flowCore", "knitr", "minpack_lm", "rmarkdown", "shiny"]
     },
     "flowPlots": {
       "name": "flowPlots",
-      "version": "1.52.0",
-      "sha256": "03kpsfdfr3hwlqjbyq787dnhixg1zs22chi2y1776zjpvxp94ixf",
+      "version": "1.54.0",
+      "sha256": "0db5k4s6w7p3k3n4618w5wk9zl48lyr590s47wpbzi69m201jqfn",
       "depends": []
     },
     "flowSpecs": {
       "name": "flowSpecs",
-      "version": "1.18.0",
-      "sha256": "1774h2sgabnynhc8xlc3ngnkspvs544hhb5ijk3xm2p4ah2md0w1",
+      "version": "1.20.0",
+      "sha256": "0l1ray2p5mzp5w0x6r70g1dv5zgl171259a942mvy7szd4b2h2an",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "flowCore", "ggplot2", "reshape2", "zoo"]
     },
     "flowStats": {
       "name": "flowStats",
-      "version": "4.16.0",
-      "sha256": "0q8g3sqmbhinfrb63yhv4lsczjz7pqwhwwsdlz2cg7s8yhp0cj6v",
+      "version": "4.18.0",
+      "sha256": "0lp8wmfgav47c7lqga9hykv5spwysv84dhvj4hvv13l0a10dd61a",
       "depends": ["Biobase", "BiocGenerics", "KernSmooth", "MASS", "RColorBrewer", "clue", "cluster", "corpcor", "fda", "flowCore", "flowViz", "flowWorkspace", "ks", "lattice", "mnormt", "ncdfFlow", "rrcov"]
     },
     "flowTime": {
       "name": "flowTime",
-      "version": "1.28.0",
-      "sha256": "1z7djyka5cpaa3bfgz9q8kwv50k6k5fd666415szfiq5vnlpvn4y",
+      "version": "1.30.0",
+      "sha256": "0x1bq9w0ggj27lig1n9hamag9qxvrmi20v2hnmi7ijjmg9z59yhd",
       "depends": ["dplyr", "flowCore", "magrittr", "plyr", "rlang", "tibble"]
     },
     "flowTrans": {
       "name": "flowTrans",
-      "version": "1.56.0",
-      "sha256": "0i8rr5qrfszh03j5ch90nqf4ayqamh2kk2c7g1brxbi31qvkm9ag",
+      "version": "1.58.0",
+      "sha256": "0axc678vq221808b1diw2whhnl2hgp9ddixy6fc8xny16vbg3wln",
       "depends": ["flowClust", "flowCore", "flowViz"]
     },
     "flowVS": {
       "name": "flowVS",
-      "version": "1.36.0",
-      "sha256": "1k7rhy3lqc52r4hg68r4rw0l31v37bsp2f8k8palia4bqzmqy375",
+      "version": "1.38.0",
+      "sha256": "13d6inmsqamlg23p5ah2skbprad9sqkz04dxc2c3ws8p8dqk9qmp",
       "depends": ["flowCore", "flowStats", "flowViz"]
     },
     "flowViz": {
       "name": "flowViz",
-      "version": "1.68.0",
-      "sha256": "1iz4skfs68jg2a59kfaxllf19mp9pk9mpfc2jh3vyas14c3l3zzj",
+      "version": "1.70.0",
+      "sha256": "1ymqx5zasrr5snmg71p58hk526yxpvs4d78df2hgxfah5w6vxd6w",
       "depends": ["Biobase", "IDPmisc", "KernSmooth", "MASS", "RColorBrewer", "flowCore", "hexbin", "lattice", "latticeExtra"]
     },
     "flowWorkspace": {
       "name": "flowWorkspace",
-      "version": "4.16.0",
-      "sha256": "0k22hifg4sv0xiw983gf1d6y7zkn9072famwj72x47w8vag4i0xz",
+      "version": "4.18.0",
+      "sha256": "0mjf3kzsmrrlg5asam96kjj8kqv12wn9xqbmf9pywgr5k6c045i7",
       "depends": ["BH", "Biobase", "BiocGenerics", "DelayedArray", "RBGL", "RProtoBufLib", "Rgraphviz", "Rhdf5lib", "S4Vectors", "XML", "cpp11", "cytolib", "data_table", "dplyr", "flowCore", "ggplot2", "graph", "matrixStats", "ncdfFlow", "scales"]
     },
     "flowcatchR": {
       "name": "flowcatchR",
-      "version": "1.38.0",
-      "sha256": "0g9jza9gs526ch5sa9m91yrmf6n8l73052n41r2zvdwamzh9a6r9",
+      "version": "1.40.0",
+      "sha256": "1czl7cccxd27y5cxwikdqkd79i1qd17lyb225ryhygpjbl6b84b3",
       "depends": ["BiocParallel", "EBImage", "abind", "colorRamps", "plotly", "shiny"]
     },
     "fmcsR": {
       "name": "fmcsR",
-      "version": "1.46.0",
-      "sha256": "080src34jwkvbk98pa4ri530l9gi4ibr5mwxib1681np0cfal54g",
+      "version": "1.48.0",
+      "sha256": "1zd5frijcxyv9k3v5irzrzx7wvhlwx6c395r2pai37pxzdxr1m4a",
       "depends": ["BiocGenerics", "ChemmineR", "RUnit"]
     },
     "fmrs": {
       "name": "fmrs",
-      "version": "1.14.0",
-      "sha256": "0vwj90snn2mjai762426c62m5rmmkywpvnjjgv9cns4azzbjqq4y",
+      "version": "1.16.0",
+      "sha256": "0b6sm1k3ancnzjhnd2gmwfmi5jq4g9ai63prn3364dmbmgkwp894",
       "depends": ["survival"]
     },
     "fobitools": {
       "name": "fobitools",
-      "version": "1.12.0",
-      "sha256": "0n9zckl2zx7hcqz94xa32frra7v11y4gss1wdcdicj2sm40k9hgq",
+      "version": "1.14.0",
+      "sha256": "11s02q3jj8z66jkx4v4c48656vkiaiwqb9064y07kiajj28ckvpy",
       "depends": ["RecordLinkage", "clisymbols", "crayon", "dplyr", "fgsea", "ggplot2", "ggraph", "magrittr", "ontologyIndex", "purrr", "stringr", "textclean", "tictoc", "tidygraph", "tidyr", "vroom"]
     },
     "frenchFISH": {
       "name": "frenchFISH",
-      "version": "1.16.0",
-      "sha256": "0lchnhchabj69ccw9pi1nz6l4k39kwin7cdyg9j5zq54i5lwzgg3",
+      "version": "1.18.0",
+      "sha256": "11cmb0fp7mj73rbqmh8qfm0zmdr1jz1w1wy5w670p6hxc882qmih",
       "depends": ["MCMCpack", "NHPoisson"]
     },
     "frma": {
       "name": "frma",
-      "version": "1.56.0",
-      "sha256": "0gg6hybrysqsd04dv3z7p1wx7zb35zk10f76c3yfhxg1wzv0f4wr",
+      "version": "1.58.0",
+      "sha256": "14x36pgq4w76whg8c3gzkrmyn5b0rav7gqrlz8j2673j5gijkqq6",
       "depends": ["Biobase", "BiocGenerics", "DBI", "MASS", "affy", "oligo", "oligoClasses", "preprocessCore"]
     },
     "frmaTools": {
       "name": "frmaTools",
-      "version": "1.56.0",
-      "sha256": "0ksnk253vvxrfql6wgbzmm64173fqv2lcls83iv4lgihix978x5x",
+      "version": "1.58.0",
+      "sha256": "0fszdna6n3nhdqzvxarby7zrcwv3c61p3cvw8sjr18v7qmwxahic",
       "depends": ["Biobase", "DBI", "affy", "preprocessCore"]
     },
+    "funOmics": {
+      "name": "funOmics",
+      "version": "1.0.0",
+      "sha256": "0xybpr3iclpazyjf405y5qvvg18n038rmmg3v4234cym9gymf8c6",
+      "depends": ["AnnotationDbi", "KEGGREST", "NMF", "dplyr", "org_Hs_eg_db", "pathifier", "stringr"]
+    },
     "funtooNorm": {
       "name": "funtooNorm",
-      "version": "1.28.0",
-      "sha256": "1immis03wkcgzfpb4jbb9zz58707g06mbrq15ls04fmf6mkjj8im",
+      "version": "1.30.0",
+      "sha256": "13qz1icxpkdk0kssdh9svk71r850crrf2x7lc3sxiphcg71x83jz",
       "depends": ["GenomeInfoDb", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "matrixStats", "minfi", "pls"]
     },
     "gCrisprTools": {
       "name": "gCrisprTools",
-      "version": "2.10.0",
-      "sha256": "1h7qx8j46sqhkrdln7mbw38w7p3n6c8sw1311kk2pady0bw14hqh",
+      "version": "2.12.0",
+      "sha256": "08kd2p1mvh69ayk11xrv4vz1wsmvav7yhqpshda14sg2sdmhb9ac",
       "depends": ["Biobase", "ComplexHeatmap", "RobustRankAggreg", "SummarizedExperiment", "ggplot2", "limma", "rmarkdown"]
     },
     "gDNAx": {
       "name": "gDNAx",
-      "version": "1.2.1",
-      "sha256": "1fr5kyy2jhn2qia9wqd505kp9w5ad6d7bxvi5073m6rw1b7x6231",
+      "version": "1.4.0",
+      "sha256": "0b3msd0ll0w5mpmv9153xj6byza8mhhl4naf7qp160l00as6wr0w",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicFiles", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "SummarizedExperiment", "bitops", "cli", "matrixStats", "plotrix"]
     },
     "gDR": {
       "name": "gDR",
-      "version": "1.2.0",
-      "sha256": "0jhsnaabp8amljw8g64ly15nc10rjfsk5vd1pxpqq1fzyh72s1xa",
+      "version": "1.4.0",
+      "sha256": "1i2cpr7kp06p91dszap7lh3pdblv5j230n4zqxbgpqb9ylb8fsqa",
       "depends": ["gDRcore", "gDRimport", "gDRutils"]
     },
     "gDRcore": {
       "name": "gDRcore",
-      "version": "1.2.0",
-      "sha256": "14hnmym7pzgfm4gmvq0dc0bym3kpr769fcdpspvqyzgq3b5swbva",
+      "version": "1.4.0",
+      "sha256": "0zni9r0v9nw8cr9cf0x6fzhay4ll12zkaqfhhbfwsjfkpw53pnz4",
       "depends": ["BiocParallel", "BumpyMatrix", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "checkmate", "data_table", "futile_logger", "gDRutils", "purrr", "stringr"]
     },
     "gDRimport": {
       "name": "gDRimport",
-      "version": "1.2.0",
-      "sha256": "1jfp3vgy2r0kmakn063bp1nrnwjfx2xxz0drkry5ghdmjig0g25y",
+      "version": "1.4.0",
+      "sha256": "19qc2n44hxli2ganbc8mljjkn6k9397zmvhw1xh90v1kq2r8ax46",
       "depends": ["BumpyMatrix", "CoreGx", "MultiAssayExperiment", "PharmacoGx", "S4Vectors", "SummarizedExperiment", "XML", "assertthat", "checkmate", "data_table", "futile_logger", "gDRutils", "magrittr", "openxlsx", "readxl", "rio", "stringi", "tibble", "yaml"]
     },
     "gDRstyle": {
       "name": "gDRstyle",
-      "version": "1.2.0",
-      "sha256": "0khl0h07ixcsdn984f60d7fshhbs755c6bcxqwk3rzl54xb9cmj8",
+      "version": "1.4.0",
+      "sha256": "02978mf93d0wjwm480xjgc9fn6dgbmypx6zfa4lcz2bb55nkppxg",
       "depends": ["BiocCheck", "BiocManager", "checkmate", "desc", "git2r", "lintr", "pkgbuild", "rcmdcheck", "remotes", "rjson", "withr", "yaml"]
     },
     "gDRutils": {
       "name": "gDRutils",
-      "version": "1.2.0",
-      "sha256": "0ql75k7aysf5kphjkajp2sshg953vx3nskg6qzhd8cc4lvldx9kq",
+      "version": "1.4.0",
+      "sha256": "1frjy19fvd638vpczz5mxcv172rwvnrjyikbs4rsdr1q904cl3zh",
       "depends": ["BiocParallel", "BumpyMatrix", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "checkmate", "data_table", "drc", "jsonlite", "jsonvalidate", "stringr"]
     },
     "gINTomics": {
       "name": "gINTomics",
-      "version": "1.0.0",
-      "sha256": "0dscrxy846v5nv1fc0wfd5v7axwdhwpxhh0y9dwq25sdyfzknl8g",
+      "version": "1.2.0",
+      "sha256": "03p2xym6b5wk06dby3s7hzd1gkmqygdm50mk9hs3na5qnqfjg57y",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "ComplexHeatmap", "DT", "GenomicFeatures", "GenomicRanges", "InteractiveComplexHeatmap", "MASS", "MultiAssayExperiment", "OmnipathR", "RColorBrewer", "ReactomePA", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "biomaRt", "callr", "circlize", "clusterProfiler", "dplyr", "edgeR", "ggplot2", "ggridges", "ggtree", "ggvenn", "gtools", "limma", "org_Hs_eg_db", "org_Mm_eg_db", "plotly", "plyr", "randomForest", "reshape2", "shiny", "shiny_gosling", "shinydashboard", "stringi", "stringr", "visNetwork"]
     },
     "gaga": {
       "name": "gaga",
-      "version": "2.50.0",
-      "sha256": "10qckg06yf44x1giisglw978l63c4p9bdlrfh8q0i7cb19zihbnf",
+      "version": "2.52.0",
+      "sha256": "12p2bnazsl2nvr5i6nmh5rr3kycmbzfc5wvbx9lwl327qsfvmdfd",
       "depends": ["Biobase", "EBarrays", "coda", "mgcv"]
     },
     "gage": {
       "name": "gage",
-      "version": "2.54.0",
-      "sha256": "0iwdv9y5x0na38arjqacz00s7plk7aqc1h2ynhlpbyl3nz0a0kyq",
+      "version": "2.56.0",
+      "sha256": "06kd8cklhqp8w2iqli427k072wg0z2hd08y8c61ds5rkqhk7m13d",
       "depends": ["AnnotationDbi", "GO_db", "KEGGREST", "graph"]
     },
     "garfield": {
       "name": "garfield",
-      "version": "1.32.0",
-      "sha256": "0lcfqsv4ffsgnpsxdij5graaryvxqkyvsx7n6bkglclg1syr32dw",
+      "version": "1.34.0",
+      "sha256": "177xjy55abf4jgzy22k72lkwcsql3vfrb0znn6ajg8v562aa18f7",
       "depends": []
     },
     "gatom": {
       "name": "gatom",
-      "version": "1.2.0",
-      "sha256": "1cmhlhr2gkfgpgncr9dy3qq0q764vhr5c7zgpbnnvp5qg95y6n6g",
-      "depends": ["BioNet", "GGally", "XML", "data_table", "ggplot2", "htmltools", "htmlwidgets", "igraph", "intergraph", "network", "plyr", "pryr", "shinyCyJS", "sna"]
+      "version": "1.4.0",
+      "sha256": "1gqnb7s4z5h5yyzlq8yw3jcksr0nw28hz9ciq9yzs7zfqpwc3ib3",
+      "depends": ["BioNet", "GGally", "XML", "data_table", "ggplot2", "htmltools", "htmlwidgets", "igraph", "intergraph", "mwcsr", "network", "plyr", "pryr", "shinyCyJS", "sna"]
     },
     "gcapc": {
       "name": "gcapc",
-      "version": "1.28.0",
-      "sha256": "0k6k73i1mv6pxkpy2mq3xr0rfpn8rqa5wj1hjx3r3dqpw4rv8izl",
+      "version": "1.30.0",
+      "sha256": "0ylxnb4k86dv3pbp0w9rs2h9nvzlg19hrryxvk1j9qn08d5rf3gm",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Rsamtools", "S4Vectors", "matrixStats"]
     },
     "gcatest": {
       "name": "gcatest",
-      "version": "2.4.0",
-      "sha256": "1jdbiv0mh0kfxn05k349h192b32rzs65l7xjkiw1rpzca649fldn",
+      "version": "2.6.0",
+      "sha256": "0nnd2gwankxha19j98h9bm558pi15vmanw0n1hzypch70z0kf2xd",
       "depends": ["lfa"]
     },
     "gcrma": {
       "name": "gcrma",
-      "version": "2.76.0",
-      "sha256": "01b9b4v19yh42552awl21yyx9vhf9yh9r3l8849x4zwjpnf6anp3",
+      "version": "2.78.0",
+      "sha256": "0v397nmmm6zy5pipzgz81fhkygg4hz173dvm28cm4813pjrq7gsa",
       "depends": ["Biobase", "BiocManager", "Biostrings", "XVector", "affy", "affyio"]
     },
     "gdsfmt": {
       "name": "gdsfmt",
-      "version": "1.40.0",
-      "sha256": "1ska6q1800mmsxi6jilpnq4f6cy3vk0nb98gz3ik94lmbv2ram97",
+      "version": "1.42.0",
+      "sha256": "0snq2n202gfzx4mk7h2nkmz48nralq3hr20qgarxmk6kcw97zav4",
       "depends": []
     },
     "geNetClassifier": {
       "name": "geNetClassifier",
-      "version": "1.44.0",
-      "sha256": "0jfczma8sh9dza105v306xr371f8mndndm6kw3ydgqlxd8zk3a6l",
+      "version": "1.46.0",
+      "sha256": "1qfakvirq5k5ypia1dfq4fwfmp9p9294bqp3s5w2a73z6ypincp2",
       "depends": ["Biobase", "EBarrays", "e1071", "minet"]
     },
     "gemini": {
       "name": "gemini",
-      "version": "1.18.0",
-      "sha256": "1yfizm9hk7ak1lgf89zn7r768n82dzbiyd6fqrybhl1m4k5a8zh4",
+      "version": "1.20.0",
+      "sha256": "1r2kfavdiizhl6ah2mmrrh20daswygr24viw5kig0hvrjc3c74hl",
       "depends": ["dplyr", "ggplot2", "magrittr", "mixtools", "pbmcapply", "scales"]
     },
     "gemma_R": {
       "name": "gemma.R",
-      "version": "3.0.14",
-      "sha256": "1psiag87wbg7g0jjpd6hy1b4jcr8hx6hflqa5p0nnkw6zxp5cxkk",
-      "depends": ["Biobase", "R_utils", "S4Vectors", "SummarizedExperiment", "assertthat", "base64enc", "bit64", "data_table", "digest", "glue", "httr", "jsonlite", "lubridate", "magrittr", "memoise", "rappdirs", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "3.2.1",
+      "sha256": "1c3b838b6i8bg9lspgwvhlg1xwfazk3nszdc7v0cgjx2jg9rnwnh",
+      "depends": ["Biobase", "R_utils", "S4Vectors", "SummarizedExperiment", "assertthat", "base64enc", "bit64", "data_table", "digest", "glue", "httr", "jsonlite", "kableExtra", "lubridate", "magrittr", "memoise", "rappdirs", "rlang", "stringr", "tibble", "tidyr"]
     },
     "genArise": {
       "name": "genArise",
-      "version": "1.80.0",
-      "sha256": "0r5d1nw2bqvh3yivx73l2ln3y78kqsrvx3xm4sw61m48gszb69x5",
+      "version": "1.82.0",
+      "sha256": "0hj3ar1c8v66lib42bbs0y4w9spihhzklnn4fbbhx4xpgi015p1q",
       "depends": ["locfit", "tkrplot", "xtable"]
     },
     "geneAttribution": {
       "name": "geneAttribution",
-      "version": "1.30.0",
-      "sha256": "0qzp9d1v88qamahl4knnv6adx863jpnhc5w0v9fpqliw04gqnczn",
+      "version": "1.32.0",
+      "sha256": "012prq4mlx2knpf8z811fgqcwk2fvjn2cgnashs5ql457c9aw4x1",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "org_Hs_eg_db", "rtracklayer"]
     },
     "geneClassifiers": {
       "name": "geneClassifiers",
-      "version": "1.28.0",
-      "sha256": "0zsjb7a30jvkskpg2awxxzdq2rnrpy2nrv89qrqq51h5blln4l2r",
+      "version": "1.30.0",
+      "sha256": "0vdpvf70i3svb12kd9caa64nkpsszcx48xj3l4rxcfi1vz90473q",
       "depends": ["Biobase", "BiocGenerics"]
     },
     "geneRecommender": {
       "name": "geneRecommender",
-      "version": "1.76.0",
-      "sha256": "1vd04lqrqzfzjz2xpm0gd2gg38rvfz7c8ikz5ypr82mcbq3v7gfl",
+      "version": "1.78.0",
+      "sha256": "1g7imxpswf6gnp37jp8llh2mh3r93915s2z21766bhsj6mm40cik",
       "depends": ["Biobase"]
     },
     "geneRxCluster": {
       "name": "geneRxCluster",
-      "version": "1.40.0",
-      "sha256": "109ghiv5j33g35d7l71z8s7nc2vb997j5i6vh43nrrygsgc53ywm",
+      "version": "1.42.0",
+      "sha256": "1x7ir32fa8ykgrvq2ssmbxc052npzmyp6lzgz9m2kmaka1mikgh7",
       "depends": ["GenomicRanges", "IRanges"]
     },
     "geneXtendeR": {
       "name": "geneXtendeR",
-      "version": "1.30.0",
-      "sha256": "06rmxlahnf0xiwvyfl6h9727g8cm24zk6p27j5bb4vln4phb81x7",
+      "version": "1.32.0",
+      "sha256": "1wns3qgp0vj22azl9pd4y8yvld84180mjha15h50ayflz6mx7xna",
       "depends": ["AnnotationDbi", "BiocStyle", "GO_db", "RColorBrewer", "SnowballC", "data_table", "dplyr", "networkD3", "org_Rn_eg_db", "rtracklayer", "tm", "wordcloud"]
     },
     "genefilter": {
       "name": "genefilter",
-      "version": "1.86.0",
-      "sha256": "0jp7jvgzb1bs0p76j9k8lhgliipjnif6bng7hdn5wi744jb5fmpr",
+      "version": "1.88.0",
+      "sha256": "1c5mi7g5l501x8l0cd27cvqpwfki740yxj9598sgvgmd8v8aczyd",
       "depends": ["AnnotationDbi", "Biobase", "MatrixGenerics", "annotate", "survival"]
     },
-    "genefu": {
-      "name": "genefu",
-      "version": "2.36.0",
-      "sha256": "032xfs2vp0n0r3sz79fs0v8q28n2sqbnazfwkc3p9dwh4s7nqfwx",
-      "depends": ["AIMS", "amap", "biomaRt", "iC10", "impute", "limma", "mclust", "survcomp"]
-    },
     "geneplast": {
       "name": "geneplast",
-      "version": "1.30.0",
-      "sha256": "1z76dpa7cmzidw3512ynphrrqcqvbrp1bbl8bzcf3jsjdshy7mm7",
+      "version": "1.32.0",
+      "sha256": "0ad0wc844vamzlwllizs783pbgr4r0jywhrgsxnd9h3l3fka4qnv",
       "depends": ["ape", "data_table", "igraph", "snow"]
     },
     "geneplotter": {
       "name": "geneplotter",
-      "version": "1.82.0",
-      "sha256": "19znr3vwp20x84jiwy0im7s6vd8a71yng8w2ji88ffzq0xdkyyjm",
+      "version": "1.84.0",
+      "sha256": "1yvq6wa27q6r6m5zi9m9qqzqgxrndwybgz056yc5gpbngp1c2va7",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "RColorBrewer", "annotate", "lattice"]
     },
     "genoCN": {
       "name": "genoCN",
-      "version": "1.56.0",
-      "sha256": "1nqxp99g3maxjip9mvpkdm2n6v5vmw7dnkni3nfv2azd12cl9ka1",
+      "version": "1.58.0",
+      "sha256": "0ij9pjsw8p083vkvvjck849iixxvilcw8mkjfdr2inqh1lwdd46l",
       "depends": []
     },
     "genomation": {
       "name": "genomation",
-      "version": "1.36.0",
-      "sha256": "1bfy46kka77q93s42hsbxpiynfkin5mh7cz3w592smw2dzkh01j4",
+      "version": "1.38.0",
+      "sha256": "17vwkw85936hdxw503gjd4l7js5pzv9zvcscvmhaasnfck1l9y48",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "data_table", "ggplot2", "gridBase", "impute", "matrixStats", "plotrix", "plyr", "readr", "reshape2", "rtracklayer", "seqPattern"]
     },
     "genomeIntervals": {
       "name": "genomeIntervals",
-      "version": "1.60.0",
-      "sha256": "1gyp2aa335gljb4igwg8c92m4rwwxwsv49dlj341gqphbx8b1vbr",
+      "version": "1.62.0",
+      "sha256": "022ka0hjq05659i4xzibqdnj9fahxmgpfqiw4z03xibc3vdz6fsw",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "intervals"]
     },
     "genomes": {
       "name": "genomes",
-      "version": "3.34.0",
-      "sha256": "1qb4bpyz7z6yqz4xlrx7gq9afdpqdk0ax4aas5pzx1cqxq31yii9",
+      "version": "3.36.0",
+      "sha256": "146rap0lbv8kwm8kpqkd6gp8qm7fl6dps0fyx3xpm4fbmynrsq5v",
       "depends": ["curl", "readr"]
     },
     "genomicInstability": {
       "name": "genomicInstability",
-      "version": "1.10.0",
-      "sha256": "08clvnj3pfxr0y8n2bh55x7aqs8pa6kjy5w8si78r5k2ywwxxl5y",
+      "version": "1.12.0",
+      "sha256": "1rxmvgy5dwi4hqzva42v1f4nlfn91svzsxqc67rldlx9avp7nqj1",
       "depends": ["SummarizedExperiment", "checkmate", "mixtools"]
     },
+    "geomeTriD": {
+      "name": "geomeTriD",
+      "version": "1.0.0",
+      "sha256": "1nazp7gj89kpab1zw5j0bn87ar53dy95h8phvjz57kagx1vj5p34",
+      "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "MASS", "Matrix", "S4Vectors", "htmlwidgets", "igraph", "plotrix", "rgl", "rjson", "scales", "trackViewer"]
+    },
     "gep2pep": {
       "name": "gep2pep",
-      "version": "1.24.0",
-      "sha256": "1i8m3k7l5ymx6c0d6hrl6c1yn2fjvvrrpsf08r64ksl750cvab87",
+      "version": "1.26.0",
+      "sha256": "1nfj8x2py6xi06lchbykp26gwx0114x31wb5q7g1vzc34hkmf2f4",
       "depends": ["Biobase", "GSEABase", "XML", "digest", "foreach", "iterators", "repo", "rhdf5"]
     },
-    "gespeR": {
-      "name": "gespeR",
-      "version": "1.36.0",
-      "sha256": "1c7pimggz4px7455frmg4fjbajl9pnw1wdi480wf0hcjfakk1i9h",
-      "depends": ["Biobase", "Matrix", "biomaRt", "cellHTS2", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "reshape2"]
-    },
     "getDEE2": {
       "name": "getDEE2",
-      "version": "1.14.0",
-      "sha256": "1hkxyic2pjpxj5mbdf2lmkk7jm8ycmcjwychhy62qlvvcg58cd21",
+      "version": "1.16.0",
+      "sha256": "012dgvbk85z91jg3cy2hf9px5qzpmw82yp2qh9rygyv5gnd116li",
       "depends": ["SummarizedExperiment", "htm2txt"]
     },
     "geva": {
       "name": "geva",
-      "version": "1.12.0",
-      "sha256": "1wbw8dqimfl6g57v9ix0c8hmyy0kkc33pwvi2ifrfsfcmr6gkv1x",
+      "version": "1.14.0",
+      "sha256": "0qas6mlfm84b9w8s9gg7pp4wmv4sqpvg2kyrapjj1si8a337rs5l",
       "depends": ["dbscan", "fastcluster", "matrixStats"]
     },
     "gg4way": {
       "name": "gg4way",
-      "version": "1.2.0",
-      "sha256": "12hv274gsiym6ph83q3qphnl7bdh1j5af4g2hz8jvqrj1nbm34h8",
+      "version": "1.4.0",
+      "sha256": "0is9ff59bb97y52s6ivm83cmpm7gvbr6s4z9phbxv8c6zkcbdfr6",
       "depends": ["DESeq2", "dplyr", "edgeR", "ggplot2", "ggrepel", "glue", "janitor", "limma", "magrittr", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr"]
     },
     "ggbio": {
       "name": "ggbio",
-      "version": "1.52.0",
-      "sha256": "0g6h1h8azy79pzm0g8967f58gp33nl8866b285ybq6501nj8pb1p",
+      "version": "1.54.0",
+      "sha256": "1p9ja262rnvdf5gmbspkrkwvbdv4la0321m92c0l78wj3mc9y1zh",
       "depends": ["AnnotationDbi", "AnnotationFilter", "BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GGally", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "OrganismDbi", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "biovizBase", "ensembldb", "ggplot2", "gridExtra", "gtable", "reshape2", "rlang", "rtracklayer", "scales"]
     },
     "ggcyto": {
       "name": "ggcyto",
-      "version": "1.32.0",
-      "sha256": "0z4cfpylj2y3jcljzg15fpjnrhrpzgw49kcprq5sg4cxr96ia2rm",
+      "version": "1.34.0",
+      "sha256": "0a74lb36482djxfr77akyqqa7wnj9y3g4fkn8ain2gsbb3l6kcbk",
       "depends": ["RColorBrewer", "data_table", "flowCore", "flowWorkspace", "ggplot2", "gridExtra", "hexbin", "ncdfFlow", "plyr", "rlang", "scales"]
     },
     "ggkegg": {
       "name": "ggkegg",
-      "version": "1.2.2",
-      "sha256": "0j77l3bzddmkf45v66zvhypramhv9fprv4rxz5r6vkjhabgyjdfb",
-      "depends": ["AnnotationDbi", "BiocFileCache", "GetoptLong", "XML", "data_table", "dplyr", "ggplot2", "ggraph", "gtable", "igraph", "magick", "org_Hs_eg_db", "patchwork", "shadowtext", "stringr", "tibble", "tidygraph"]
+      "version": "1.4.0",
+      "sha256": "1h3v8p8j2rvmzdzg3pc4lnsy3dncrgdw5zr40bwknn9w7linaysz",
+      "depends": ["BiocFileCache", "GetoptLong", "XML", "data_table", "dplyr", "ggplot2", "ggraph", "gtable", "igraph", "magick", "patchwork", "shadowtext", "stringr", "tibble", "tidygraph"]
     },
     "ggmanh": {
       "name": "ggmanh",
-      "version": "1.8.0",
-      "sha256": "0h7idg7s2s51gcd4fjbpad0kaq13xa5jxv34fwrw02285rl7zw7b",
-      "depends": ["RColorBrewer", "SeqArray", "gdsfmt", "ggplot2", "ggrepel", "rlang", "scales"]
+      "version": "1.10.0",
+      "sha256": "1dd0k2b84m4nn67a5vpd6s25dfqi6dw6dxll5l0snhc84czn59d3",
+      "depends": ["RColorBrewer", "SeqArray", "dplyr", "gdsfmt", "ggplot2", "ggrepel", "magrittr", "paletteer", "pals", "rlang", "scales", "tidyr"]
     },
     "ggmsa": {
       "name": "ggmsa",
-      "version": "1.10.0",
-      "sha256": "0pmy9aakp503aa3d9g96ajms153kphyr0shlnap5axxy6s99s2ak",
+      "version": "1.12.0",
+      "sha256": "1bs81d3ml0nyi1sh5s3p2pm96hgqxm3cayndid0z6wzwig3wkqhg",
       "depends": ["Biostrings", "R4RNA", "RColorBrewer", "aplot", "dplyr", "ggalt", "ggforce", "ggplot2", "ggtree", "magrittr", "seqmagick", "statebins", "tidyr"]
     },
     "ggsc": {
       "name": "ggsc",
-      "version": "1.2.0",
-      "sha256": "1869xwlc4hqyzankrx3m7jara9am86pc8cw5lfdqfvf2ndp6ijdv",
+      "version": "1.4.0",
+      "sha256": "15r13xg9kpa3sazw8hcbanaadzzq1lq69vam2ccq703vrrwjj89d",
       "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppParallel", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "cli", "dplyr", "ggfun", "ggplot2", "rlang", "scales", "scattermore", "tibble", "tidydr", "tidyr", "yulab_utils"]
     },
+    "ggseqalign": {
+      "name": "ggseqalign",
+      "version": "1.0.0",
+      "sha256": "0v0cssd2g7zn7d30z7w5lkcb2hk5kxfj7x3b9hw0c1mf545qn7bv",
+      "depends": ["dplyr", "ggplot2", "pwalign"]
+    },
     "ggspavis": {
       "name": "ggspavis",
-      "version": "1.10.0",
-      "sha256": "0acbsbqnkl1xw9i3pgz1bibgzyvv52jzmyvnmggn5ag92ldd459c",
+      "version": "1.12.0",
+      "sha256": "0plm5g24inm82akwni2rjiixyihr9f6p5mlc5xg4hx2s721y9j1k",
       "depends": ["RColorBrewer", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "ggplot2", "ggrepel", "ggside", "scales"]
     },
     "ggtree": {
       "name": "ggtree",
-      "version": "3.12.0",
-      "sha256": "1bm7c46k8qbajjvl8475b7fcd0dvg9s1bir8313qgm466qm6immh",
+      "version": "3.14.0",
+      "sha256": "0ki9cap34jbf2xa9xkddfmaj8lmf5vc6b3a0w03q3z8c465v06g5",
       "depends": ["ape", "aplot", "cli", "dplyr", "ggfun", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr", "tidytree", "treeio", "yulab_utils"]
     },
     "ggtreeDendro": {
       "name": "ggtreeDendro",
-      "version": "1.6.0",
-      "sha256": "1p7gxcaadlvh54y5j82yqarwz6jfhlzi6k6p0zmxxi17s70202x6",
+      "version": "1.8.0",
+      "sha256": "08q7nn819wsynm18nm8azl123j7fbwj05r9qch3igc5bcvzbwsf5",
       "depends": ["ggplot2", "ggtree", "tidytree"]
     },
     "ggtreeExtra": {
       "name": "ggtreeExtra",
-      "version": "1.14.0",
-      "sha256": "1wy229rnp356hi144flm9fvhv414jxmxc967f7pyqwl4abiwlmzm",
+      "version": "1.16.0",
+      "sha256": "1xlwz45zcr51r7n2yc2ffxz0p4xgwhnka868crg17f9d9g6phhdr",
       "depends": ["cli", "ggnewscale", "ggplot2", "ggtree", "magrittr", "rlang", "tidytree"]
     },
     "ggtreeSpace": {
       "name": "ggtreeSpace",
-      "version": "1.0.0",
-      "sha256": "0ny22m469mnr70ipwy6brch1g5vklk5i0qkbgbpwrsdvi6vkibsr",
+      "version": "1.2.0",
+      "sha256": "0maahk7h4pxrxy9p7gxv8nqng98sl67j6869s78bqqc832wa1z7c",
       "depends": ["GGally", "ape", "dplyr", "ggplot2", "ggtree", "interp", "phytools", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "ginmappeR": {
       "name": "ginmappeR",
-      "version": "1.0.4",
-      "sha256": "0s13z3naarspmdp9v82xjxqqhxygcsvw5vq6l1lmhj070fg8b9nz",
+      "version": "1.2.3",
+      "sha256": "0h6zzrxs3fd65a2qwbm1yiw7niwaa51avgy4fvcsbrlz8jd4vh0q",
       "depends": ["KEGGREST", "UniProt_ws", "XML", "cachem", "httr", "jsonlite", "memoise", "rentrez", "rvest"]
     },
     "girafe": {
       "name": "girafe",
-      "version": "1.56.0",
-      "sha256": "17ma5xfqzy19cigim0bqkqvwln3qji2f5x4qwb74i40j2lbqn9qi",
+      "version": "1.58.0",
+      "sha256": "0mzd11zdm11nhv80sz6hgs8m4z30vmfc4l0ryr2za78v8f16yd0q",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "genomeIntervals", "intervals", "pwalign"]
     },
     "glmGamPoi": {
       "name": "glmGamPoi",
-      "version": "1.16.0",
-      "sha256": "1my8v0zx5xsxjf8dj2yw92b8zp725hxhb2vrl5ccgz2w9xkn0dkj",
-      "depends": ["BiocGenerics", "DelayedArray", "DelayedMatrixStats", "HDF5Array", "MatrixGenerics", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "matrixStats", "rlang", "vctrs"]
+      "version": "1.18.0",
+      "sha256": "141drlbgld05npk1bay7pcng7xmm43y26559qs8mxy9432cpzx9n",
+      "depends": ["BiocGenerics", "DelayedArray", "DelayedMatrixStats", "HDF5Array", "MatrixGenerics", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "beachmat", "matrixStats", "rlang", "vctrs"]
     },
     "glmSparseNet": {
       "name": "glmSparseNet",
-      "version": "1.22.0",
-      "sha256": "1yyl2i3f5s1l5q17471zwlj9cksbsnkv227qdlsgvzl0i9sh4m2h",
+      "version": "1.24.0",
+      "sha256": "0ph7q1b80kmyjgb7kwi6mnjxrychaljsjlb1ab6bnbjwnrwm7d18",
       "depends": ["Matrix", "MultiAssayExperiment", "SummarizedExperiment", "TCGAutils", "biomaRt", "checkmate", "dplyr", "forcats", "futile_logger", "ggplot2", "glmnet", "glue", "httr", "lifecycle", "readr", "rlang", "survminer"]
     },
     "globalSeq": {
       "name": "globalSeq",
-      "version": "1.32.0",
-      "sha256": "0jqi2jld7s4krvk0i3rzc7m5h4rvja8zbjvdjw0ck425p180m3wb",
+      "version": "1.34.0",
+      "sha256": "1vv34jsrnifma9x2yds0ndmg43y50jh6gm8ax2lsasyzjpixkqmx",
       "depends": []
     },
     "globaltest": {
       "name": "globaltest",
-      "version": "5.58.0",
-      "sha256": "1cpvs1jcp9ibis06pkbqvhhksy6cis0zynx774d0hqdbb9ljl945",
+      "version": "5.60.0",
+      "sha256": "1gi62ynkyvrzi6m691206wrlprid028h1rj1p725k4myi5fh06jr",
       "depends": ["AnnotationDbi", "Biobase", "annotate", "survival"]
     },
     "gmapR": {
       "name": "gmapR",
-      "version": "1.46.0",
-      "sha256": "0zmn3gj5aamrkx0pa15fd2n2l7i0z8fkr4i2b9i50qgp7b46yv03",
+      "version": "1.48.0",
+      "sha256": "08ws3xifis7gchasbpcmvwz2nwi8any532vgyfh2wxg4wibzd0c9",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "rtracklayer"]
     },
     "gmoviz": {
       "name": "gmoviz",
-      "version": "1.16.0",
-      "sha256": "01znh8vfhqyls6f1y0zl3hnp67j4q6gzf6fjv3dx214ks6h3vk47",
+      "version": "1.18.0",
+      "sha256": "025i9lsq0bjd8dwx4h8izg3pfbb1bxbdsfpfi5gkkzcvlbgcvc9q",
       "depends": ["BiocGenerics", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "circlize", "colorspace", "gridBase", "pracma", "rtracklayer"]
     },
     "goProfiles": {
       "name": "goProfiles",
-      "version": "1.66.0",
-      "sha256": "1yj9002d99rpsqgxj4wibzmykjpl5091g1aymshkgxqcf456pq14",
+      "version": "1.68.0",
+      "sha256": "1lqsr1gqs8ikzspbi0g1smllkrm2ydlfi50in6ymyizkk3s8cz3g",
       "depends": ["AnnotationDbi", "Biobase", "CompQuadForm", "GO_db", "stringr"]
     },
     "goSTAG": {
       "name": "goSTAG",
-      "version": "1.28.0",
-      "sha256": "195vdjaxq8xwyz5ib9csk0a1fw6l9pzkpji78l3pbh9p5clw5592",
+      "version": "1.30.0",
+      "sha256": "1wr5w1y41xqh6xsr3bf0cgz5lnlslcc1cqc4w01jh1j12hd6r7m7",
       "depends": ["AnnotationDbi", "GO_db", "biomaRt", "memoise"]
     },
     "goSorensen": {
       "name": "goSorensen",
-      "version": "1.6.0",
-      "sha256": "1n0i9xmdxnh52lg60klblgi6bzfa910p4ajavir725p84hbqxdjh",
-      "depends": ["GO_db", "clusterProfiler", "goProfiles", "org_Hs_eg_db", "stringr"]
+      "version": "1.8.0",
+      "sha256": "0gv7wls9xg6lbbhz29rdlfwvh1d90xzls0cnz6s2bi3f55vz7pwg",
+      "depends": ["clusterProfiler", "goProfiles", "org_Hs_eg_db", "stringr"]
     },
     "goTools": {
       "name": "goTools",
-      "version": "1.78.0",
-      "sha256": "17xpmlsy35a72mbk5c3am85ihgdbwzzaspkb2cfnww9gcnsk6is5",
+      "version": "1.80.0",
+      "sha256": "0f3079d1hb6rr8iyp53dvbl9vx8iznqrjczgbfwz0jq4csyfiv05",
       "depends": ["AnnotationDbi", "GO_db"]
     },
     "goseq": {
       "name": "goseq",
-      "version": "1.56.0",
-      "sha256": "0bc7dcpz0agbc42f8agf05amyhpavz55fdp622if5af5dn1ww6pr",
-      "depends": ["AnnotationDbi", "BiasedUrn", "BiocGenerics", "GO_db", "geneLenDataBase", "mgcv"]
+      "version": "1.58.0",
+      "sha256": "1paya44vvzvbv0mr0vky4sjvmaqx8y4n5p457vxy2b8b3l086p45",
+      "depends": ["AnnotationDbi", "BiasedUrn", "BiocGenerics", "GO_db", "GenomeInfoDb", "GenomicFeatures", "geneLenDataBase", "mgcv", "rtracklayer"]
     },
     "gpls": {
       "name": "gpls",
-      "version": "1.76.0",
-      "sha256": "0n2m4himkdzazshiwvxybp5rr1d6jsg60lc5dbsk40grra3w2g4m",
+      "version": "1.78.0",
+      "sha256": "1h8n4h8c0yax6295acxsiwnawhw495jlfn7wcw8d04za2xf9r0np",
       "depends": []
     },
     "gpuMagic": {
       "name": "gpuMagic",
-      "version": "1.20.0",
-      "sha256": "06ga6xkk95kgnzgy95kzysz8nim9v9aq2s6742hhknjndhy59n28",
+      "version": "1.22.0",
+      "sha256": "0h2fl3i4p1v4vnq481np8vfh0rzqxgip1xla3mmbv4s973761fh6",
       "depends": ["BiocGenerics", "Deriv", "DescTools", "Rcpp", "digest", "pryr", "stringr"]
     },
     "granulator": {
       "name": "granulator",
-      "version": "1.12.0",
-      "sha256": "0757xhxn3156687nz8dksqqs0ifafrdwz0am532pw3xf5hirdz81",
+      "version": "1.14.0",
+      "sha256": "038v9vg77czlm31lb6fs4g4yghlhs0c8vqkqdfmdj82i8jq66bcm",
       "depends": ["MASS", "cowplot", "dplyr", "dtangle", "e1071", "epiR", "ggplot2", "ggplotify", "limSolve", "magrittr", "nnls", "pheatmap", "purrr", "rlang", "tibble", "tidyr"]
     },
     "graper": {
       "name": "graper",
-      "version": "1.20.0",
-      "sha256": "1hczvcv3kxzbxigbcxmsiwadxbwldipsv7slmsyznrkpwws4liwi",
+      "version": "1.22.0",
+      "sha256": "18y2g6df4c22fbcw3x7yjj6qiy94pxc42x25bg93rqs42bg3n9qn",
       "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "cowplot", "ggplot2", "matrixStats"]
     },
     "graph": {
       "name": "graph",
-      "version": "1.82.0",
-      "sha256": "1wa10s9a8p6lajim1lbw4rxyc4fz7y6fpymrh0c0ip85971cd9hv",
+      "version": "1.84.0",
+      "sha256": "0fq7nbbcpmyhzhahgxdz8dx2bbzzv5cidd6gs7sr5i5184iyq2wp",
       "depends": ["BiocGenerics"]
     },
     "graphite": {
       "name": "graphite",
-      "version": "1.50.0",
-      "sha256": "1xymgghgj4r1k9i73zqgava79l0djz945jnl5ad193flv13fpdgs",
+      "version": "1.52.0",
+      "sha256": "0ayqhz94qri62m0rs1x7q59s7wl4winqlahrwwd0k8qylgz9yx6b",
       "depends": ["AnnotationDbi", "graph", "httr", "purrr", "rappdirs", "rlang"]
     },
     "groHMM": {
       "name": "groHMM",
-      "version": "1.38.0",
-      "sha256": "1vmck9ridjjk22477sv8wx0x7n5irrsaf6nsh9lm3krk4i3iv715",
+      "version": "1.40.3",
+      "sha256": "0zx9xlrqaq11bnfcrchcg0kdbq4dcw8sx7zbxq2g715h89zihp1c",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "rtracklayer"]
     },
     "gscreend": {
       "name": "gscreend",
-      "version": "1.18.0",
-      "sha256": "1y41rai3hhp290ga0ddcgs0jyri4aavcbyycs8z887h787sbihrn",
+      "version": "1.20.0",
+      "sha256": "07li76fv4zkmnbfm1ifzark65fj395bzsqsjdknhxyqpzcy6dyq9",
       "depends": ["BiocParallel", "SummarizedExperiment", "fGarch", "nloptr"]
     },
     "gsean": {
       "name": "gsean",
-      "version": "1.24.0",
-      "sha256": "14b4fg51j995af4i8lx84908jnlhw1y7j01871iy80s13d8nnz9b",
+      "version": "1.26.0",
+      "sha256": "0n8x95ii0pykh887mr3a6780qqsjyxwpc23y4paz4pdn9y0wppk6",
       "depends": ["PPInfer", "fgsea"]
     },
     "gtrellis": {
       "name": "gtrellis",
-      "version": "1.36.0",
-      "sha256": "1qlsjpjxcw96qhrqjlbbinpry9yagn50jc3dnz459dbfvnywr82q",
+      "version": "1.38.0",
+      "sha256": "1cf98aric80hz6jqriyk8m1cr4d9pxsjv7pixss2qsp797qvf87z",
       "depends": ["GenomicRanges", "GetoptLong", "IRanges", "circlize"]
     },
     "gwascat": {
       "name": "gwascat",
-      "version": "2.36.0",
-      "sha256": "08b70drlasws3h9d8iznaxxp0qf4n1fi943m4yngy1c65h3a30rc",
+      "version": "2.38.0",
+      "sha256": "1dh9av1b7df88l08y682aqmmmq5adrsh6bfc7a9rb4f6rcdzpadc",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "VariantAnnotation", "readr", "snpStats"]
     },
     "gwasurvivr": {
       "name": "gwasurvivr",
-      "version": "1.22.0",
-      "sha256": "0d9a9lrdpizh0bayq5yhqrssarbk90afn9s3cbkdxjrjgvlcair7",
+      "version": "1.24.0",
+      "sha256": "1qj5w4a4vc3pmzwh6jmv5g7wv31h4zn1j2p33gav9379lm5ys3z6",
       "depends": ["GWASTools", "SNPRelate", "SummarizedExperiment", "VariantAnnotation", "matrixStats", "survival"]
     },
     "gypsum": {
       "name": "gypsum",
-      "version": "1.0.1",
-      "sha256": "1zrmxmlnbiifc2p5mn10y3vpmyzqjimd2hvc3s9c0j0iv6ryxjv0",
-      "depends": ["filelock", "httr2", "jsonlite"]
+      "version": "1.2.0",
+      "sha256": "1qyb90r5qji9r0hy986891dyjqmryyszjp2v27q054mimwbgwskk",
+      "depends": ["filelock", "httr2", "jsonlite", "rappdirs"]
     },
     "h5vc": {
       "name": "h5vc",
-      "version": "2.38.0",
-      "sha256": "0nv6x14adjwz7izsfyirnr13k9aa5kh34nqq9p4lawxa76d0bv4p",
+      "version": "2.40.0",
+      "sha256": "16378qin0929m3pl4pqma37xsrd841fq29z19lzjycw190y757j9",
       "depends": ["BatchJobs", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rhtslib", "Rsamtools", "S4Vectors", "abind", "ggplot2", "gridExtra", "h5vcData", "reshape", "rhdf5"]
     },
     "hapFabia": {
       "name": "hapFabia",
-      "version": "1.46.0",
-      "sha256": "0vqfljpdlsdnq0ms98ar2niy5yrlmixlwvaq5ynfvsrpr8hj4wwq",
+      "version": "1.48.0",
+      "sha256": "0l4i555mbv4bq95j7c6zqzg8f9v8165a96jdaplgp5f60zmvsik6",
       "depends": ["Biobase", "fabia"]
     },
     "hca": {
       "name": "hca",
-      "version": "1.12.0",
-      "sha256": "143np5y93b3ik5lrjiz7hhwwp89hq8h9ygvprydwcvn6k530111r",
+      "version": "1.14.0",
+      "sha256": "0vjsgqlhhkiyvfqnfmw9sc05p3dvj7z662wg81p4q6sp8gylh156",
       "depends": ["BiocFileCache", "DT", "digest", "dplyr", "httr", "jsonlite", "miniUI", "readr", "shiny", "tibble", "tidyr"]
     },
     "hdxmsqc": {
       "name": "hdxmsqc",
-      "version": "1.0.1",
-      "sha256": "1ynjkwzfa84p2hg56nimbhfpw9ayah23lw8nb0mhkkqvb50nar19",
+      "version": "1.2.0",
+      "sha256": "0f2qjywgs843y3mdl7kh3pf3fy88b03yjbkgrn1m1rwmpbnh8jkg",
       "depends": ["BiocStyle", "MsCoreUtils", "QFeatures", "S4Vectors", "Spectra", "dplyr", "ggplot2", "knitr", "tidyr"]
     },
     "heatmaps": {
       "name": "heatmaps",
-      "version": "1.28.0",
-      "sha256": "0295lsiicwcdsnm1annyix7na6xipmvany8qpqwi4d87i5z2imhw",
+      "version": "1.30.0",
+      "sha256": "0xq6dbl4mylvlr0hcgmw8qnbvpxvvdczdyw7iw1mcmj4rn5yyblb",
       "depends": ["BiocGenerics", "Biostrings", "EBImage", "GenomeInfoDb", "GenomicRanges", "IRanges", "KernSmooth", "Matrix", "RColorBrewer", "plotrix"]
     },
     "hermes": {
       "name": "hermes",
-      "version": "1.8.1",
-      "sha256": "0mm9lvpgzbpcdbwks3ly7q4pl3w596jcin1c23mkvsj7gfh6r4nl",
+      "version": "1.10.0",
+      "sha256": "00aprldg8xb1340f06rcliwic1dlnksmb4l9yxd3lmwq944flbdy",
       "depends": ["Biobase", "BiocGenerics", "ComplexHeatmap", "DESeq2", "EnvStats", "GenomicRanges", "IRanges", "MultiAssayExperiment", "R6", "Rdpack", "S4Vectors", "SummarizedExperiment", "assertthat", "biomaRt", "checkmate", "circlize", "dplyr", "edgeR", "forcats", "ggfortify", "ggplot2", "ggrepel", "lifecycle", "limma", "magrittr", "matrixStats", "purrr", "rlang", "tidyr"]
     },
     "hiAnnotator": {
       "name": "hiAnnotator",
-      "version": "1.38.0",
-      "sha256": "1mi15zpqbsf1x2bdagnd7mwspz7pdiq8v7s6a44zwxl0sas2qdmi",
+      "version": "1.40.0",
+      "sha256": "1imvh4gmczpx8agd2iq1aincjnp27pglchf9jcy9nslv6rxlvzlc",
       "depends": ["BSgenome", "GenomicRanges", "dplyr", "foreach", "ggplot2", "iterators", "rtracklayer", "scales"]
     },
     "hiReadsProcessor": {
       "name": "hiReadsProcessor",
-      "version": "1.40.0",
-      "sha256": "11hiz5ymjyjmsr78060602xi07lbjsq7gs4nh0pknjph2mzx9nqi",
+      "version": "1.42.0",
+      "sha256": "05jmkwnfq89yrf6vx26chblbaisnqyhpbfa8x32hmdvjva70pb7p",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomicAlignments", "GenomicRanges", "dplyr", "hiAnnotator", "pwalign", "readxl", "sonicLength"]
     },
     "hicVennDiagram": {
       "name": "hicVennDiagram",
-      "version": "1.2.0",
-      "sha256": "02ym5qiz38viddsrxmn3v6q791gwrc36hi505vcaar1fj2kblx2w",
+      "version": "1.4.0",
+      "sha256": "0k9i0ax6y2a9d408r9ppm9v6xnyzhvy1bvyk02mw7rm7xb4ygbbs",
       "depends": ["ComplexUpset", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "eulerr", "ggplot2", "htmlwidgets", "reshape2", "rtracklayer", "svglite"]
     },
     "hierGWAS": {
       "name": "hierGWAS",
-      "version": "1.34.0",
-      "sha256": "140s7wvl1yl66yymq4vsiq0zb44nzjkip4x7l720lywmsj62v9zp",
+      "version": "1.36.0",
+      "sha256": "1x2nk77g0ypgs9ba61s7wgsymn15pl1jcyc905zz7np30gmw3hg5",
       "depends": ["fastcluster", "fmsb", "glmnet"]
     },
     "hierinf": {
       "name": "hierinf",
-      "version": "1.22.0",
-      "sha256": "1x5piwk5y2z9nxfwnvcp60sqg9l0vi2q6rxhxr4r439c9vqgfm4w",
+      "version": "1.24.0",
+      "sha256": "1f3ph3n94kqgddlhc8vnmxm1a67avq2nvf6vmic8mxkkpkqrj6vz",
       "depends": ["fmsb", "glmnet"]
     },
     "hipathia": {
       "name": "hipathia",
-      "version": "3.4.0",
-      "sha256": "140ihldl1m7b249d184f717w9pycrsrx13gzjhamjvpdrn96hra4",
+      "version": "3.6.0",
+      "sha256": "0h7c1jvfvxglxjrwhl8a6psw53wchc49vxb8j1qj7gzvkw8s849a",
       "depends": ["AnnotationHub", "DelayedArray", "MetBrewer", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "coin", "dplyr", "ggplot2", "ggpubr", "igraph", "limma", "matrixStats", "preprocessCore", "reshape2", "servr", "tibble", "visNetwork"]
     },
     "hmdbQuery": {
       "name": "hmdbQuery",
-      "version": "1.24.0",
-      "sha256": "16mx6xhpxgajyglayzhgyv15m5mwggc141rkz4694l5923p3xzg8",
+      "version": "1.26.0",
+      "sha256": "02kmb7gsmc1m5rfp1423m788f4l4013nk7zdckn2ydmp9385c9ga",
       "depends": ["S4Vectors", "XML"]
     },
     "hoodscanR": {
       "name": "hoodscanR",
-      "version": "1.2.0",
-      "sha256": "1dqmj5nisrndkldsa2qhy50a2bckvvyf96hcya6yqcvz6hb3w7d0",
+      "version": "1.4.0",
+      "sha256": "12882rrmz407m3pz86jp6576pj0739nvgcdjc1db46y9lqwvmmmn",
       "depends": ["ComplexHeatmap", "RANN", "Rcpp", "SpatialExperiment", "SummarizedExperiment", "circlize", "ggplot2", "knitr", "rlang", "rmarkdown", "scico"]
     },
     "hopach": {
       "name": "hopach",
-      "version": "2.64.0",
-      "sha256": "0i0p73arx8fyxq76plvpk61hpmwbmwm62ninkmx1dlbr2jzvzysx",
+      "version": "2.66.0",
+      "sha256": "15brfhyavqdfdpippy0pl93rpppxsmmmi1j5xxkl3ynhz3s0lcj1",
       "depends": ["Biobase", "BiocGenerics", "cluster"]
     },
     "hpar": {
       "name": "hpar",
-      "version": "1.46.0",
-      "sha256": "1qqa0p8k3h8pbbgfz9d1k08zml5i5r9iwi2xqqj1hg84n2saqkzp",
+      "version": "1.48.0",
+      "sha256": "0b3m2krlmvfjcwb0f6y5gxwdi55hizzps1cp7imgx1mqgsv5gjya",
       "depends": ["ExperimentHub"]
     },
     "hummingbird": {
       "name": "hummingbird",
-      "version": "1.14.0",
-      "sha256": "1l8i7mhagysjxsnl4lhr31hi2v6xi4rxam5dhd24hrz8m867199p",
+      "version": "1.16.0",
+      "sha256": "1scwjab7cc522rqs24633bxg1nl3vg2f2i60kcvzyard2n6j5f92",
       "depends": ["GenomicRanges", "IRanges", "Rcpp", "SummarizedExperiment"]
     },
     "hypeR": {
       "name": "hypeR",
-      "version": "2.2.0",
-      "sha256": "0qsz1fklbwlzlm6fk1xr27gv7ynvqgpzd3s8657pv79q2f7wkljf",
+      "version": "2.4.0",
+      "sha256": "129lmbq271q45ggafa6c69vybssnv61a3789hj7caq0fax4ds8zv",
       "depends": ["BiocStyle", "R6", "dplyr", "ggforce", "ggplot2", "htmltools", "httr", "igraph", "kableExtra", "magrittr", "msigdbr", "openxlsx", "purrr", "reactable", "reshape2", "rlang", "rmarkdown", "scales", "shiny", "stringr", "visNetwork"]
     },
     "hyperdraw": {
       "name": "hyperdraw",
-      "version": "1.56.0",
-      "sha256": "104xwij9vq5gwq4ml7fnhsp4apcldbgxmhppwklg6zqdfixpmig5",
+      "version": "1.58.0",
+      "sha256": "0p98gicscijllmhb302jca1z04xvm9rcrsnz429c3d8rckz3asr9",
       "depends": ["Rgraphviz", "graph", "hypergraph"]
     },
     "hypergraph": {
       "name": "hypergraph",
-      "version": "1.76.0",
-      "sha256": "12g33rw1qy1ij32k87qrw04pak20p8z04mch9lxjy5yrj5k5x812",
+      "version": "1.78.0",
+      "sha256": "1928iia8l2sanirzb22i67n71zsnbps0qbdsf6ll7zpvs2vcmd5c",
       "depends": ["graph"]
     },
     "iASeq": {
       "name": "iASeq",
-      "version": "1.48.0",
-      "sha256": "0jaa4y13c6ra5axfw07g9pvmzybmyf3l2f6jya4cg9inqxvircv6",
+      "version": "1.50.0",
+      "sha256": "0wfd04xx7ma4qb4n71dx3svs02r0zjhaidz6943m7i1zm4qd1wzx",
       "depends": []
     },
     "iBBiG": {
       "name": "iBBiG",
-      "version": "1.48.0",
-      "sha256": "1vysyhayxls2vpll48gskw82aizjhyqbf234j1say13kjnnn8fb3",
+      "version": "1.50.0",
+      "sha256": "0fcgcnb07m7llyngsmnnrw0337j4aijmwyqxiszxcyzrvmg6w6wf",
       "depends": ["ade4", "biclust", "xtable"]
     },
     "iBMQ": {
       "name": "iBMQ",
-      "version": "1.44.0",
-      "sha256": "11i8fzf2i84x36xmq3dwndhvqgbrcj48p3ambn643r9pp27vmpdm",
+      "version": "1.46.0",
+      "sha256": "1miw0yrl29hmv7887achjjhibi6fsqgkmixacj3g7m9h6skj2zcl",
       "depends": ["Biobase", "ggplot2"]
     },
     "iCARE": {
       "name": "iCARE",
-      "version": "1.32.0",
-      "sha256": "0m6cfcpviw1fxcg73zzjv1s8ynx47x2mfdpydsnkwfvc3r536xca",
+      "version": "1.34.0",
+      "sha256": "0a92sahiv5ccwdiqswx9fjry7gnspp8z4msiq1kc9hfys3cyb9wq",
       "depends": ["Hmisc", "gtools", "plotrix"]
     },
     "iCNV": {
       "name": "iCNV",
-      "version": "1.24.0",
-      "sha256": "08kqlpzkjd8m87n9yjdw0jmxdv7d90rh8s2rbmpywcs74qcrdq62",
+      "version": "1.26.0",
+      "sha256": "117ppsh2d7ziml9avyw6kjrb3rvl2ddbsv2l44bng0hfr7qwmbif",
       "depends": ["CODEX", "data_table", "dplyr", "fields", "ggplot2", "rlang", "tidyr", "truncnorm"]
     },
     "iCOBRA": {
       "name": "iCOBRA",
-      "version": "1.32.0",
-      "sha256": "1m3awsz8h3gbi82an73kbxcsch2gl737zaanckl1vq2ghymqykrp",
+      "version": "1.34.0",
+      "sha256": "0fhvzrp6q4kcx9xjy96iyra2z1yc4c2vagmnymzbj1gli4sl2idx",
       "depends": ["DT", "ROCR", "UpSetR", "dplyr", "ggplot2", "limma", "markdown", "reshape2", "rlang", "scales", "shiny", "shinyBS", "shinydashboard"]
     },
     "iCheck": {
       "name": "iCheck",
-      "version": "1.34.0",
-      "sha256": "1yz4f8cs8vna8rq3064md37mgidg4nzn2204zzbbpnwsx23mz1mc",
+      "version": "1.36.0",
+      "sha256": "10pqglc77gj9adbzad9rljr723nnaf57ylqvnjzhl193c7k8j1d4",
       "depends": ["Biobase", "GeneSelectMMD", "MASS", "affy", "gplots", "limma", "lmtest", "lumi", "preprocessCore", "randomForest", "rgl", "scatterplot3d"]
     },
     "iChip": {
       "name": "iChip",
-      "version": "1.58.0",
-      "sha256": "13qzd4f3iskf8g0l3d7bi22kp0mp5hpfidjvyxzi5zyx787vpaw2",
+      "version": "1.60.0",
+      "sha256": "1xbbrsdynwrs9p271siw7dvvyzvhlm1jrkfbgbkhp42kzg9ljx7q",
       "depends": ["limma"]
     },
     "iClusterPlus": {
       "name": "iClusterPlus",
-      "version": "1.40.0",
-      "sha256": "01rf4w2p1qw4hk9shsdaffyz9g91vffcn4qi1dllsrn3m8pyd1gm",
+      "version": "1.42.0",
+      "sha256": "0ir2xshq4qmzyli9v14cmlk262px47ng5gd23r4sf6p065xnws6m",
       "depends": []
     },
     "iGC": {
       "name": "iGC",
-      "version": "1.34.0",
-      "sha256": "1xn04rv4p5aqvb4f696kfpcpyn4iqvryhgc84a8pk29yfx1hk38p",
+      "version": "1.36.0",
+      "sha256": "1j2v2hv5j1xwbcm7z35l2mml2l2iwzl3dhda3590c33vmihl1dza",
       "depends": ["data_table", "plyr"]
     },
     "iNETgrate": {
       "name": "iNETgrate",
-      "version": "1.2.0",
-      "sha256": "1lsj5lwwfr4h1n1nlgnbncrgsy4mzhj5lzygcb691fkvk84ki09p",
+      "version": "1.4.0",
+      "sha256": "1bb33ijrdjkyrzp0ws96rcbbyk8fl19l3x8h4xir6s7an1510bdj",
       "depends": ["BiocStyle", "GenomicRanges", "Homo_sapiens", "Pigengene", "Rfast", "SummarizedExperiment", "WGCNA", "caret", "glmnet", "gplots", "igraph", "matrixStats", "minfi", "survival", "tidyr", "tidyselect"]
     },
-    "iPAC": {
-      "name": "iPAC",
-      "version": "1.48.0",
-      "sha256": "083lnwvc9b0w0gv21z2pcf4xvplz9alp6whv7ls1h8bgill4vc2a",
-      "depends": ["Biostrings", "gdata", "multtest", "pwalign", "scatterplot3d"]
-    },
     "iPath": {
       "name": "iPath",
-      "version": "1.10.0",
-      "sha256": "0dh57yif0wcapr54ba9ln45s9s9m52rzfgapz429i40dqbbc518v",
+      "version": "1.12.0",
+      "sha256": "003yyin2jh08p2n9miiq7kyvvxjzknj7r6gb4x8dvadn7w664mm1",
       "depends": ["BiocParallel", "Rcpp", "RcppArmadillo", "ggplot2", "ggpubr", "matrixStats", "mclust", "survival", "survminer"]
     },
     "iSEE": {
       "name": "iSEE",
-      "version": "2.16.0",
-      "sha256": "0rkk8n0hwmbqlnmjcdcljbsqqmbgw4x5cyjl5fndvzjs6xls4fal",
+      "version": "2.18.0",
+      "sha256": "1rc3yfnvqn7qm4sia9fgfx9pdsa795c64ns1gcxc0893mcx2vilx",
       "depends": ["BiocGenerics", "ComplexHeatmap", "DT", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circlize", "colourpicker", "ggplot2", "ggrepel", "igraph", "listviewer", "mgcv", "rintrojs", "shiny", "shinyAce", "shinyWidgets", "shinydashboard", "shinyjs", "vipor", "viridisLite"]
     },
     "iSEEde": {
       "name": "iSEEde",
-      "version": "1.2.0",
-      "sha256": "1fm7nav15kh2sn8lcgnywacsnv5z9mirv3vjvkk298141gdvnyiv",
+      "version": "1.4.0",
+      "sha256": "0v45nrjr856zq5a811zmbwsdg3ym0jnyq6nv5npbpwb646qzaxhv",
       "depends": ["DESeq2", "S4Vectors", "SummarizedExperiment", "edgeR", "iSEE", "shiny"]
     },
     "iSEEfier": {
       "name": "iSEEfier",
-      "version": "1.0.0",
-      "sha256": "0qg64qp2b3c5l11xa1hb8whvshv9xdi27da2j447jxa81r42xgyh",
+      "version": "1.2.0",
+      "sha256": "1wfvbf6hka8ngah64sqrdkvi2vbshg0jcv3gz48mrk02xfm5lfrz",
       "depends": ["BiocBaseUtils", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "iSEE", "iSEEu", "igraph", "rlang", "visNetwork"]
     },
     "iSEEhex": {
       "name": "iSEEhex",
-      "version": "1.6.0",
-      "sha256": "0lwifv4bpb8hp0y5d2fphzclf3c223x015bc7jj92kmpzl0hg41h",
+      "version": "1.8.0",
+      "sha256": "11w03h5b2j3qyql2ljxpllh60kk1dgizhihnamlr5cs903qwmw5c",
       "depends": ["SummarizedExperiment", "ggplot2", "hexbin", "iSEE", "shiny"]
     },
     "iSEEhub": {
       "name": "iSEEhub",
-      "version": "1.6.0",
-      "sha256": "0pwplhddy3nyszzbkjrv79kypc50pxr7jckfjdd0qy10v16314id",
+      "version": "1.8.0",
+      "sha256": "0bc9b3vd9h5hvpqf4pffifd8cqnh21dckkpgjsv8k7w7y694r5n8",
       "depends": ["AnnotationHub", "BiocManager", "DT", "ExperimentHub", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "iSEE", "rintrojs", "shiny", "shinydashboard", "shinyjs"]
     },
     "iSEEindex": {
       "name": "iSEEindex",
-      "version": "1.2.0",
-      "sha256": "0v8fww0rbldg6hdqyg9cfrsisahpwmc7q6pk156gz497av8gz250",
+      "version": "1.4.0",
+      "sha256": "08q6sal4vszdnrpz9zyqsfqi2ipha4qldlbknlvmxlpbx4icdb7j",
       "depends": ["BiocFileCache", "DT", "SingleCellExperiment", "SummarizedExperiment", "iSEE", "paws_storage", "rintrojs", "shiny", "shinydashboard", "shinyjs", "stringr", "urltools"]
     },
     "iSEEpathways": {
       "name": "iSEEpathways",
-      "version": "1.2.0",
-      "sha256": "168abrcfrrcnaz50lgkfqvap30xq63fjp61v365ar5zsh7qvys41",
+      "version": "1.4.0",
+      "sha256": "0p1vrz196kdq8z8wq5vvz7d5kghxkz6ahgdh8w1kycah5iq2plrq",
       "depends": ["S4Vectors", "SummarizedExperiment", "ggplot2", "iSEE", "shiny", "shinyWidgets"]
     },
+    "iSEEtree": {
+      "name": "iSEEtree",
+      "version": "1.0.0",
+      "sha256": "0zwpdzwsxaa4j6ds8qpai6q5mhcfdi3pg3lgy28v52pnvys0l9ah",
+      "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "iSEE", "mia", "miaViz", "shiny", "shinyWidgets"]
+    },
     "iSEEu": {
       "name": "iSEEu",
-      "version": "1.16.0",
-      "sha256": "10l539zk0xha45h58j5y9sl0fmpr7vxy30n6xa54lbs3fs324jyv",
+      "version": "1.18.0",
+      "sha256": "0dqws1y7is0ic5bc1rfkcsvmknkcg8nb9kxjfn3nlpiicv0g4411",
       "depends": ["DT", "IRanges", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "colourpicker", "ggplot2", "iSEE", "iSEEhex", "shiny", "shinyAce"]
     },
     "iSeq": {
       "name": "iSeq",
-      "version": "1.56.0",
-      "sha256": "1jjp852ajk37m9rp1j1c3jlng450az54dx8ayl0whjcsr2ljw7hn",
+      "version": "1.58.0",
+      "sha256": "00r776j1klf96f0qdj0b9h5fi2gnf0iscbnvbshiblla7cmirvky",
       "depends": []
     },
     "iasva": {
       "name": "iasva",
-      "version": "1.22.0",
-      "sha256": "14p159ffi41lg56kjc2yafrxd8d0miqnavdnbspaal8l6r4qr10y",
+      "version": "1.24.0",
+      "sha256": "1bfhlljnnb3m42k9v75a66d46w1lg4lma3l6ldksimvx1g49yv5w",
       "depends": ["BiocParallel", "SummarizedExperiment", "cluster", "irlba"]
     },
     "ibh": {
       "name": "ibh",
-      "version": "1.52.0",
-      "sha256": "1xwcvj5zaax3z7c8nnlrmg1bj1wjrrpx5fg5zknhfkv96ycvbk5s",
+      "version": "1.54.0",
+      "sha256": "19vqg4qsxdg0l5v93yqr2fgjjpjzmp4971a2x3jpvnbdbxfrlpw4",
       "depends": ["simpIntLists"]
     },
     "icetea": {
       "name": "icetea",
-      "version": "1.22.0",
-      "sha256": "0l204ak1br5xhlmp21v4qxc5fzrpg74ylaac63dvvhpkhphl51iz",
+      "version": "1.24.0",
+      "sha256": "1iykvznc7x3j035advjaxb72clp16pymc9hy6gl88v1z6i52l36b",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "TxDb_Dmelanogaster_UCSC_dm6_ensGene", "VariantAnnotation", "csaw", "edgeR", "ggplot2", "limma", "rtracklayer"]
     },
     "ideal": {
       "name": "ideal",
-      "version": "1.28.0",
-      "sha256": "1fmqawzlg7dzhb6imsq9wjb3i4qr91f6aj4n4akpkrky7djdn3p2",
-      "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "DT", "GO_db", "GOstats", "GenomicRanges", "IHW", "IRanges", "S4Vectors", "SummarizedExperiment", "UpSetR", "base64enc", "dplyr", "ggplot2", "ggrepel", "goseq", "gplots", "heatmaply", "knitr", "limma", "pcaExplorer", "pheatmap", "plotly", "rentrez", "rintrojs", "rlang", "rmarkdown", "shiny", "shinyAce", "shinyBS", "shinydashboard", "stringr", "topGO"]
+      "version": "2.0.0",
+      "sha256": "0dlyhlyw7n8ncf1qzbcs28yy266ijfqdg27x6x2wsa794dpxm6fv",
+      "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "DT", "GO_db", "GOstats", "GenomicRanges", "IHW", "IRanges", "S4Vectors", "SummarizedExperiment", "UpSetR", "base64enc", "dplyr", "ggplot2", "ggrepel", "goseq", "gplots", "heatmaply", "knitr", "limma", "mosdef", "pheatmap", "plotly", "rentrez", "rintrojs", "rlang", "rmarkdown", "shiny", "shinyAce", "shinyBS", "shinydashboard", "stringr", "topGO"]
     },
     "idiogram": {
       "name": "idiogram",
-      "version": "1.80.0",
-      "sha256": "0hhgxsc4lk2lpi7ih1z72n4ly8kh8pj9j3w79x7nn0jha5krjv48",
+      "version": "1.82.0",
+      "sha256": "1ilsid362bwh1jqqhwfvn0qwpwc5l2hq2npcg2skq4p3bn9ds52w",
       "depends": ["Biobase", "annotate", "plotrix"]
     },
     "idpr": {
       "name": "idpr",
-      "version": "1.14.0",
-      "sha256": "1g6g1265ncwlz4qz3w2v66jimx68pwmlzn8yw94pm242c2ikyn78",
+      "version": "1.16.0",
+      "sha256": "1qq56ggp4wlydzi35fckp0mfb29hmy4lmxl5kdz7vfyfagr0r319",
       "depends": ["Biostrings", "dplyr", "ggplot2", "jsonlite", "magrittr", "plyr", "rlang"]
     },
     "idr2d": {
       "name": "idr2d",
-      "version": "1.18.0",
-      "sha256": "1c1x9nazmapdk820i3k2b4b956zy5ym333y2fjxg9nqfsvq153mn",
+      "version": "1.20.0",
+      "sha256": "0yz86bx0pvgj4rnjfj6ha08kjr0gg7l739w92xqdr7gz1qc94c8s",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "dplyr", "futile_logger", "ggplot2", "idr", "magrittr", "reticulate", "scales", "stringr"]
     },
     "igvR": {
       "name": "igvR",
-      "version": "1.24.0",
-      "sha256": "0rkps3zj1zg8rksyrnp94xvasgrlvwnq4fqgkrhr8wn0jcqkpna1",
+      "version": "1.26.0",
+      "sha256": "172a6mmqs7vbjirpy8i88pnwmh0qi401wf9x7rbmfzz8jkakmpz3",
       "depends": ["BiocGenerics", "BrowserViz", "GenomicAlignments", "GenomicRanges", "RColorBrewer", "VariantAnnotation", "httpuv", "httr", "rtracklayer"]
     },
     "igvShiny": {
       "name": "igvShiny",
-      "version": "1.0.1",
-      "sha256": "02n15bi9qxs5q1ripnvhjk4m9k9rwahi1dbwh4ym85aqjzxqpqks",
-      "depends": ["BiocGenerics", "GenomeInfoDbData", "GenomicRanges", "RCurl", "checkmate", "futile_logger", "htmlwidgets", "httr", "jsonlite", "randomcoloR", "shiny"]
+      "version": "1.2.0",
+      "sha256": "0149knb7ff1ny4g15hk1h49ryfmxs7dfkfza41dqj25iknzza31y",
+      "depends": ["BiocGenerics", "GenomeInfoDbData", "GenomicRanges", "checkmate", "futile_logger", "htmlwidgets", "httr", "jsonlite", "randomcoloR", "shiny"]
     },
     "illuminaio": {
       "name": "illuminaio",
-      "version": "0.46.0",
-      "sha256": "0l3n1plz5nvday0a1bm8173mikpfjbzrb1bp8yfvafy7lav4dsyv",
+      "version": "0.48.0",
+      "sha256": "1czvan67l4ib0xw76a9qgcwa0x2vswv752nrslj9k9mhdav6syms",
       "depends": ["base64"]
     },
     "imcRtools": {
       "name": "imcRtools",
-      "version": "1.10.0",
-      "sha256": "0wp5f0lrxi2f7kvdqqjl6gdhybcipppg3mr25r9zsfbaxf5d0160",
+      "version": "1.12.0",
+      "sha256": "0p474plzgf2ngy877fi9d81mj7zla44wqzwan4y9znkp6vlmsikl",
       "depends": ["BiocNeighbors", "BiocParallel", "DT", "EBImage", "MatrixGenerics", "RTriangle", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "abind", "concaveman", "cytomapper", "data_table", "distances", "dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "pheatmap", "readr", "rlang", "scuttle", "sf", "stringr", "tidygraph", "tidyselect", "viridis", "vroom"]
     },
+    "immApex": {
+      "name": "immApex",
+      "version": "1.0.4",
+      "sha256": "0ygw7wa1qg5dqc4rnhv6fc9bqfgnqqpnmpinsgj5awryqna8fqd2",
+      "depends": ["SingleCellExperiment", "hash", "httr", "keras3", "magrittr", "matrixStats", "reticulate", "rvest", "stringi", "stringr", "tensorflow"]
+    },
     "immunoClust": {
       "name": "immunoClust",
-      "version": "1.36.0",
-      "sha256": "00bshq0plfnh20117q9020gsyr65z1sfvmki8nbcz3ay6hq3rpm3",
+      "version": "1.38.0",
+      "sha256": "1v6flzlf6xblinn072dayvnzbdjk5fqvzji05vh8gffy6xgsjf8k",
       "depends": ["flowCore", "lattice"]
     },
+    "immunogenViewer": {
+      "name": "immunogenViewer",
+      "version": "1.0.0",
+      "sha256": "1mczzpcbsbxs2f9zc0qg22kvh7c0lz4l8jsfk57g2867i9mng3xf",
+      "depends": ["UniProt_ws", "ggplot2", "httr", "jsonlite", "patchwork"]
+    },
     "immunotation": {
       "name": "immunotation",
-      "version": "1.12.0",
-      "sha256": "0g9yfm8kbcbfmb0xf1sqqv15h4ji0hya7p8j3czr2bc0gvmmka6q",
+      "version": "1.14.0",
+      "sha256": "0v7ffiv3wzb2kbmd6raxacg7i26gimry6xpzzzr0agi8zjj8pfis",
       "depends": ["curl", "ggplot2", "maps", "ontologyIndex", "readr", "rlang", "rvest", "stringr", "tidyr", "xml2"]
     },
     "impute": {
       "name": "impute",
-      "version": "1.78.0",
-      "sha256": "1g0m9298srkhjnq3mc5rd7krr9y3cy74yvg9k0j7ypc9nmgcqabr",
+      "version": "1.80.0",
+      "sha256": "19w88r5c9c522jafl4bdxravphpxady3n8bkd17vngxvla9m257z",
       "depends": []
     },
     "infercnv": {
       "name": "infercnv",
-      "version": "1.20.0",
-      "sha256": "1fi89fqzzb9n2c9jchkkgy3yq2fvisjcdavh9r455vmy0xqsyyyd",
+      "version": "1.22.0",
+      "sha256": "04ccxn2nzwjmcpbsxrksavrhjgbwv1zpc9i9dkyjsf0sirhn1mkf",
       "depends": ["BiocGenerics", "HiddenMarkov", "Matrix", "RANN", "RColorBrewer", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "ape", "argparse", "caTools", "coda", "coin", "digest", "doParallel", "dplyr", "edgeR", "fastcluster", "fitdistrplus", "foreach", "futile_logger", "future", "ggplot2", "gplots", "gridExtra", "igraph", "parallelDist", "phyclust", "reshape2", "rjags", "tidyr"]
     },
     "infinityFlow": {
       "name": "infinityFlow",
-      "version": "1.14.0",
-      "sha256": "112pnwg13wq9cw0lyl170pfby2kaaz2nm22gfwclf7hccnd9a46z",
+      "version": "1.16.0",
+      "sha256": "1rfpw99hpry453k453m5ib9lvjcd25n1bqrsmc74a5s7xcc2gviv",
       "depends": ["Biobase", "flowCore", "generics", "gtools", "matlab", "pbapply", "png", "raster", "uwot", "xgboost"]
     },
     "intansv": {
       "name": "intansv",
-      "version": "1.44.0",
-      "sha256": "1njvcyk4gdk2bxvs6zbz7dypcbmfismxpv8afxn02i2lz3ykdyzd",
+      "version": "1.46.0",
+      "sha256": "021mjg4ahfmivq6y6xxh9a745i52jjrwl2qhb2dr2k2fnn7k8f92",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "ggbio", "plyr"]
     },
     "interacCircos": {
       "name": "interacCircos",
-      "version": "1.14.0",
-      "sha256": "084136v9ghzgqgqv3k523416q2wl4qb6ix862fagjgwmkzdmr5s8",
+      "version": "1.16.0",
+      "sha256": "0abaa8m0pjsifhx0wnr5zz5vfi297wlp8h6gxq87z26k0djg2085",
       "depends": ["RColorBrewer", "htmlwidgets", "plyr"]
     },
     "interactiveDisplay": {
       "name": "interactiveDisplay",
-      "version": "1.42.0",
-      "sha256": "14k1j8bmpbrldx61fbvn20f7l2lc50bj9iy01a5jf0ddcbi27x5g",
+      "version": "1.44.0",
+      "sha256": "1gqn93j7ysa34qgwv1166a51n817zm1pcghx7i7wjaiazbs9rlv9",
       "depends": ["AnnotationDbi", "BiocGenerics", "Category", "RColorBrewer", "XML", "ggplot2", "gridSVG", "interactiveDisplayBase", "plyr", "reshape2", "shiny"]
     },
     "interactiveDisplayBase": {
       "name": "interactiveDisplayBase",
-      "version": "1.42.0",
-      "sha256": "0ih9b6n81gr84vhmwcq49knrbmkwbh50gy5hrap654nicb3j3jzb",
+      "version": "1.44.0",
+      "sha256": "1w39vn00armnka9sbgczc0madwc3hmcn4awcyl1xbq86q8danx11",
       "depends": ["BiocGenerics", "DT", "shiny"]
     },
     "ipdDb": {
       "name": "ipdDb",
-      "version": "1.22.0",
-      "sha256": "10pk87w4yd6kgsbg79ci6csmk3izpxc8kwhn5f0jywmjdci7k3nq",
+      "version": "1.24.0",
+      "sha256": "1xgzb184p9qn58ivd5jmbnxhyas18pzs8c8igkgyhn3dw4jd1a2z",
       "depends": ["AnnotationDbi", "AnnotationHub", "Biostrings", "DBI", "GenomicRanges", "IRanges", "RSQLite", "assertthat"]
     },
     "isobar": {
       "name": "isobar",
-      "version": "1.50.0",
-      "sha256": "0vqiw5bwk4mivj8b1a96qglqsmsfi4p6vd40x0rxafifb46i83h3",
+      "version": "1.52.0",
+      "sha256": "0qw837cil704zlr0h5rip57fk29d1kikfh21pf84i8860j3170hq",
       "depends": ["Biobase", "biomaRt", "distr", "ggplot2", "plyr"]
     },
     "isomiRs": {
       "name": "isomiRs",
-      "version": "1.32.1",
-      "sha256": "020ij0byr9pnzxp083yyjscn3iwv7yq7v2zsdalqs4bzn6z7mzq8",
+      "version": "1.34.0",
+      "sha256": "0yx5n6k0x7brjwrjin4ilir8ly11qpbdm0fyv9zqjalqdfdx6czw",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DEGreport", "DESeq2", "GGally", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "broom", "cluster", "cowplot", "dplyr", "ggplot2", "gplots", "gridExtra", "gtools", "limma", "readr", "reshape", "rlang", "stringr", "tibble", "tidyr"]
     },
     "iterativeBMA": {
       "name": "iterativeBMA",
-      "version": "1.62.0",
-      "sha256": "1h2nz7pfagd4ncm64b7zfqawp3gd88kvz8920wmk5s732490x522",
+      "version": "1.64.0",
+      "sha256": "1pjcnzgs8dpysbma0wbnxzzs9vwwnzkkg30qsg1b1ra34b3b27ii",
       "depends": ["BMA", "Biobase", "leaps"]
     },
     "iterativeBMAsurv": {
       "name": "iterativeBMAsurv",
-      "version": "1.62.0",
-      "sha256": "1g0bg1cbk95pg1zf1xqk5dxii3cwfkwzx5ys1mzzab6b9i740las",
+      "version": "1.64.0",
+      "sha256": "13q2zk47wnnnmddc15apdn343cll9bj3ya8lgpn14hnqz00a0av4",
       "depends": ["BMA", "leaps", "survival"]
     },
     "ivygapSE": {
       "name": "ivygapSE",
-      "version": "1.26.0",
-      "sha256": "00i91a1r3xk7czcv5f7kxppgzjsvalxmzwyqj6mg5m3z4l77m17n",
+      "version": "1.28.0",
+      "sha256": "0s44x3cbc60rg9i0v2ilizimfghncs8d4pck173klvxknipadik8",
       "depends": ["S4Vectors", "SummarizedExperiment", "UpSetR", "ggplot2", "hwriter", "plotly", "shiny", "survival", "survminer"]
     },
     "karyoploteR": {
       "name": "karyoploteR",
-      "version": "1.30.0",
-      "sha256": "1g4pms5dcr4cdb47gr9kw3mc06v890b38zrsapd4x1cqhgfbgjyg",
+      "version": "1.32.0",
+      "sha256": "0cr1lb6na4s3ggh5516sclg08n74kvifgb5yyy1mijzryf9yrzcl",
       "depends": ["AnnotationDbi", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "bamsignals", "bezier", "biovizBase", "digest", "memoise", "regioneR", "rtracklayer"]
     },
     "katdetectr": {
       "name": "katdetectr",
-      "version": "1.6.0",
-      "sha256": "1hc3795f26cz1xml01zac83gmam15pvxd0pl2i9q4mardnkj9w7s",
+      "version": "1.8.0",
+      "sha256": "1dslvwfqgpd3wahr1kkf02dan6kyy3xyr47k1zqj1shrkiva6rlm",
       "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "Biobase", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rdpack", "S4Vectors", "VariantAnnotation", "changepoint", "changepoint_np", "checkmate", "dplyr", "ggplot2", "ggtext", "maftools", "plyranges", "rlang", "scales", "tibble", "tidyr"]
     },
     "kebabs": {
       "name": "kebabs",
-      "version": "1.38.0",
-      "sha256": "0v4sgxvyhi3lzr3jw82w00ffdg0w55vi78ia9i805kqy77sq0677",
+      "version": "1.40.0",
+      "sha256": "0i8jj2wjcpv02h8wrj7sbr5s4kgyvxq7yjc506w391am9z1qzai4",
       "depends": ["Biostrings", "IRanges", "LiblineaR", "Matrix", "Rcpp", "S4Vectors", "XVector", "apcluster", "e1071", "kernlab"]
     },
     "keggorthology": {
       "name": "keggorthology",
-      "version": "2.56.0",
-      "sha256": "14sywfqfwbi3xanc202d07hb9yzahd94xqg9mx9djgin5b4islz3",
+      "version": "2.58.0",
+      "sha256": "0ca72gql95s5k6wk5yf1nnfwp29sqa4i1p4y5qwmpda5ikisi6hv",
       "depends": ["AnnotationDbi", "DBI", "graph", "hgu95av2_db"]
     },
     "kissDE": {
       "name": "kissDE",
-      "version": "1.24.0",
-      "sha256": "1700shil37hsij9h4q3zr2cq3wav9bpbm74d7spbyv0l1fnl8fx9",
+      "version": "1.26.0",
+      "sha256": "1wccjy66gn1yivz52bgcfbs7f4vg12bav0n35ajcy0yz5pqw46xj",
       "depends": ["Biobase", "DESeq2", "DSS", "DT", "ade4", "aods3", "doParallel", "factoextra", "foreach", "ggplot2", "gplots", "matrixStats", "shiny", "shinycssloaders"]
     },
+    "kmcut": {
+      "name": "kmcut",
+      "version": "1.0.0",
+      "sha256": "00gjb7vrmww3yxlmpbjgbmacxl5nms8qfdibpnhs68wmshxnhlim",
+      "depends": ["S4Vectors", "SummarizedExperiment", "doParallel", "foreach", "pracma", "survival"]
+    },
     "knowYourCG": {
       "name": "knowYourCG",
-      "version": "1.0.0",
-      "sha256": "1nxg81p67d66bzy2fw6dsj02zh33pas02rai1prpsyjs7699bcqf",
+      "version": "1.2.1",
+      "sha256": "1ks52kmffzy0scr7rxvdn41zx40incblmqk7rsrrk7d094kg7xgk",
       "depends": ["GenomicRanges", "IRanges", "S4Vectors", "dplyr", "reshape2", "rlang", "sesameData", "stringr"]
     },
+    "koinar": {
+      "name": "koinar",
+      "version": "1.0.0",
+      "sha256": "1b2xb6bi7b6mvzni5shx8cxvyiqw0gplixn76asrrlpj9zh194g7",
+      "depends": ["httr", "jsonlite"]
+    },
     "lapmix": {
       "name": "lapmix",
-      "version": "1.70.0",
-      "sha256": "1s2f28v21yjxi8rx08cdhd8g76wxm9wq48lq0c6kd7w4iklwwxd1",
+      "version": "1.72.0",
+      "sha256": "19bhb7654h8pivsf3qxv518zp02ijbvlhkb4d93nyanns3g7zqas",
       "depends": ["Biobase"]
     },
     "ldblock": {
       "name": "ldblock",
-      "version": "1.34.0",
-      "sha256": "1l4l35bpz4j1iliy9dj09qq8r4nimd9pcm0gm4g3sb4325z6cd5h",
+      "version": "1.36.0",
+      "sha256": "016ly2iz42a2shfj5vm270np77cgbl92jnkjrrswk1sgghyxxi9y",
       "depends": ["BiocGenerics", "Matrix", "httr", "rlang"]
     },
     "lefser": {
       "name": "lefser",
-      "version": "1.14.0",
-      "sha256": "1qi4q3vijys4q1gfnflvvz8ws3j6f65rpprpgmrkqgiwfn7dvi6g",
-      "depends": ["MASS", "S4Vectors", "SummarizedExperiment", "coin", "dplyr", "ggplot2"]
+      "version": "1.16.0",
+      "sha256": "1kq64150kjcqfqrnj1vpn83345xpvnxw3kddg5c36hwww3bh2mpj",
+      "depends": ["MASS", "S4Vectors", "SummarizedExperiment", "coin", "dplyr", "forcats", "ggplot2", "ggtree", "stringr", "testthat", "tibble", "tidyr"]
     },
     "lemur": {
       "name": "lemur",
-      "version": "1.2.0",
-      "sha256": "1hwnf8x9prqv96j66i5756510jviibbrchyizalhrlg8f427i5my",
+      "version": "1.4.0",
+      "sha256": "0gdfp0yyjzgs5qmzzpi2gm4jyyc96hvl85hl61g676rc87in07cv",
       "depends": ["BiocGenerics", "BiocNeighbors", "DelayedMatrixStats", "HDF5Array", "Matrix", "MatrixGenerics", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "glmGamPoi", "harmony", "irlba", "limma", "matrixStats", "rlang", "vctrs"]
     },
     "les": {
       "name": "les",
-      "version": "1.54.0",
-      "sha256": "1dsdrdv06ab7rxpvmbgq1b6dhajjaw7zgvi9nshadm5gg28i60x3",
+      "version": "1.56.0",
+      "sha256": "06xvl0kzp7sc7dyskcq2cfanz1jinxxa6m2npl2nmxwq1pfgm90h",
       "depends": ["RColorBrewer", "boot", "fdrtool", "gplots"]
     },
     "levi": {
       "name": "levi",
-      "version": "1.22.0",
-      "sha256": "0rknsfa5fbr4smxzj4p589sxxbypb2s1wvn33p9qj69mfcx7rmi3",
+      "version": "1.24.0",
+      "sha256": "1mqriv4rf23kx173gd51w3bxjl09bs8n1nl6ps8ki2s63lan4l43",
       "depends": ["DT", "RColorBrewer", "Rcpp", "colorspace", "dplyr", "ggplot2", "httr", "igraph", "knitr", "reshape2", "rmarkdown", "shiny", "shinydashboard", "shinyjs", "testthat", "xml2"]
     },
     "lfa": {
       "name": "lfa",
-      "version": "2.4.0",
-      "sha256": "1sbgr6h2kpfpzw3fkqd1075wrmbblb97pdywmvl8xv52vg0wqxz3",
+      "version": "2.6.0",
+      "sha256": "00lrspaayb03dq7j786ph52s1yp6chdzcvz9b62izycsvsfpy8z1",
       "depends": ["RSpectra", "corpcor"]
     },
     "limma": {
       "name": "limma",
-      "version": "3.60.4",
-      "sha256": "123z062fc0qf43zplmw5svzpdmpgxagyl1gi1bxa34426s1hfv6m",
+      "version": "3.62.1",
+      "sha256": "02744ahl5nbmj5gif20vyqqra2fldv3dskg2m6r1yqi830s0957f",
       "depends": ["statmod"]
     },
     "limmaGUI": {
       "name": "limmaGUI",
-      "version": "1.80.0",
-      "sha256": "12ryq8l3jkxi5znzhb9bqp53sba7rk2fszsxp1dkwmyrdl12l4ns",
+      "version": "1.82.0",
+      "sha256": "1zqdm1hh4vh10shvdx2nrxp6dshicd1w5a0qblhjfy4wdba18jgz",
       "depends": ["R2HTML", "limma", "tkrplot", "xtable"]
     },
     "limpca": {
       "name": "limpca",
-      "version": "1.0.0",
-      "sha256": "1id38g2s7g0shcqz37i03zhhypilny8z2dwf74anj8yj4d1isdfr",
+      "version": "1.2.0",
+      "sha256": "04cl6b2086azwri44ij266v6865xpld3v54nhjkm67bm89z5bcas",
       "depends": ["S4Vectors", "SummarizedExperiment", "doParallel", "dplyr", "ggplot2", "ggrepel", "ggsci", "plyr", "reshape2", "stringr", "tibble", "tidyr", "tidyverse"]
     },
     "lineagespot": {
       "name": "lineagespot",
-      "version": "1.8.0",
-      "sha256": "0rjf4liq6lr6i3b2a0cn22qc1xisscsvn7zi11vq8wq0ym15pj6c",
+      "version": "1.10.0",
+      "sha256": "1yll19q8fmajpv56zwrdcc9sp3yjvymqdsbmbhysp7fkd3cpxkmm",
       "depends": ["MatrixGenerics", "SummarizedExperiment", "VariantAnnotation", "data_table", "httr", "stringr"]
     },
     "lionessR": {
       "name": "lionessR",
-      "version": "1.18.0",
-      "sha256": "1rv9daa45if6nm3yh1sbpnywmdpdi0kmga25pwzfjwv26f9kyd6q",
+      "version": "1.20.0",
+      "sha256": "06shxn831j06qr96fdw9m0s5ng5r2gd2g3105g0cj0vz0d3plxaj",
       "depends": ["S4Vectors", "SummarizedExperiment"]
     },
     "lipidr": {
       "name": "lipidr",
-      "version": "2.18.0",
-      "sha256": "037xy9ci3h0913df5iy5xnciz26zr9frqfpk8krbx7qfzk4d0rk2",
+      "version": "2.20.0",
+      "sha256": "03k22sk8scxnb070p2ildp9fx2i1birhjfiqkspshzwwp8nsq0ij",
       "depends": ["S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "fgsea", "forcats", "ggplot2", "imputeLCMD", "limma", "magrittr", "rlang", "ropls", "tidyr"]
     },
     "lisaClust": {
       "name": "lisaClust",
-      "version": "1.12.3",
-      "sha256": "19zb7h7k6yn2hjq204w49kz97r2fhflnw87b6qsmavhrpva6g9a1",
-      "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "class", "concaveman", "data_table", "dplyr", "ggplot2", "pheatmap", "purrr", "spatstat_explore", "spatstat_geom", "spatstat_random", "spicyR", "tidyr"]
+      "version": "1.14.4",
+      "sha256": "11aqjzkchy1zmajgkw85yq2qx0ff2r803rk3a32wfkj8h5nbs02z",
+      "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "class", "concaveman", "data_table", "dplyr", "ggplot2", "pheatmap", "purrr", "spatstat_explore", "spatstat_geom", "spatstat_random", "spicyR", "testthat", "tidyr"]
     },
     "lmdme": {
       "name": "lmdme",
-      "version": "1.46.0",
-      "sha256": "19rplb4ik9jpxqghmglqhv42plbgz01i4pdw7pr063cdc2n3n18g",
+      "version": "1.48.0",
+      "sha256": "1sg0kvgg33hkpv1fxbibpz0p1126c1izw9jq4133i932pzl5gx5s",
       "depends": ["limma", "pls", "stemHypoxia"]
     },
     "loci2path": {
       "name": "loci2path",
-      "version": "1.24.0",
-      "sha256": "0igamscdyblh7ymj62qimwr48qfvpqld4ami0m3bnlzkkds6xm2n",
+      "version": "1.26.0",
+      "sha256": "02g25ipim6v6xl6cpdrard9rbp3yz52yvkb0jrisjmxpr0ab07mn",
       "depends": ["BiocParallel", "GenomicRanges", "RColorBrewer", "S4Vectors", "data_table", "pheatmap", "wordcloud"]
     },
     "logicFS": {
       "name": "logicFS",
-      "version": "2.24.0",
-      "sha256": "1dbc8zwgixjjcdhy3fgln08c0kycrzbcd46vqjb4l479pdrj2r0l",
+      "version": "2.26.0",
+      "sha256": "07sh012j904pv8hgs4h1kknwg76bympv5g2dhal86xmnllzn2sqr",
       "depends": ["LogicReg", "mcbiopi", "survival"]
     },
     "lpNet": {
       "name": "lpNet",
-      "version": "2.36.0",
-      "sha256": "14b7d942k15bjadakfvac8s9zhdhqw59pvpmal527rwm5z6avfvl",
+      "version": "2.38.0",
+      "sha256": "1c23mc2dswzvgmnnlk3vxlg5qzhj6jbi49dyn87nh6ywb5zcm51c",
       "depends": ["KEGGgraph", "lpSolve"]
     },
     "lpsymphony": {
       "name": "lpsymphony",
-      "version": "1.32.0",
-      "sha256": "1wcjmw655k389ph61v3gxjv7gk2q70h25zmdzvd4ggbxg8vh2mp1",
+      "version": "1.34.0",
+      "sha256": "0w4rwj2vprpayijjwlqrximxlr8dnc1zs9pmr2wil7r76zvxlf94",
       "depends": []
     },
     "lumi": {
       "name": "lumi",
-      "version": "2.56.0",
-      "sha256": "04r7dw00yvjrxs0h6mwh79lwp55f5v8s4pgmzcy2fnpb2cdslpzy",
+      "version": "2.58.0",
+      "sha256": "14bmwkbv9zppwql085g01m1q2wncmnb4q8gid5mwgdpr2gnkfwib",
       "depends": ["AnnotationDbi", "Biobase", "DBI", "GenomicFeatures", "GenomicRanges", "KernSmooth", "MASS", "RSQLite", "affy", "annotate", "lattice", "methylumi", "mgcv", "nleqslv", "preprocessCore"]
     },
     "lute": {
       "name": "lute",
-      "version": "1.0.0",
-      "sha256": "02hqwxmqld3fkvs7c7l8hz39wksxgbcnckgvkzgpaknsb2fdmml0",
+      "version": "1.2.0",
+      "sha256": "019cm45ahhqrrbj8bi8qdiajzp5238rc4ak8qlpnz1gf6y8zsbzm",
       "depends": ["Biobase", "BiocGenerics", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "scran"]
     },
     "m6Aboost": {
       "name": "m6Aboost",
-      "version": "1.10.0",
-      "sha256": "141jrx1ngwb70pl769ablzvxcd4f4dfgzi0jdsmqgmhb3kb3qvg2",
+      "version": "1.12.0",
+      "sha256": "1r16yiq2banqks4jxvn9x8cfcsm1g8gr3hgjx0wzsy1cmwfw20x1",
       "depends": ["BSgenome", "Biostrings", "ExperimentHub", "GenomicRanges", "IRanges", "S4Vectors", "adabag", "dplyr", "rtracklayer"]
     },
     "mBPCR": {
       "name": "mBPCR",
-      "version": "1.58.0",
-      "sha256": "182qbhzpj5h0qcyiph0k38bvlspc8i7g3bg27vkak5p8685hwrk8",
+      "version": "1.60.0",
+      "sha256": "1yrvavhhi2nc6g6arzcxy92dxywsmi4smg3hksyjp9yc0pajdv4j",
       "depends": ["Biobase", "GWASTools", "oligoClasses"]
     },
     "mCSEA": {
       "name": "mCSEA",
-      "version": "1.24.0",
-      "sha256": "11mx1250kvdmkriznzp0a05jvf9paizj7qsgq7wzlvgz9f6nfwyw",
+      "version": "1.26.2",
+      "sha256": "1y6ppaahz9v73xniq3p0y4vphgx71nn6mz214v51560rsahgyhdq",
       "depends": ["GenomicFeatures", "GenomicRanges", "Gviz", "Homo_sapiens", "IRanges", "S4Vectors", "SummarizedExperiment", "biomaRt", "fgsea", "ggplot2", "limma", "mCSEAdata"]
     },
     "maCorrPlot": {
       "name": "maCorrPlot",
-      "version": "1.74.0",
-      "sha256": "0z4ilr1r9231f3h2zq6ac2spd3dcaa4j48hkih7nrqrgr9x1127d",
+      "version": "1.76.0",
+      "sha256": "1nqxjgcp038b8qwbssd25ca40rzq769psrsvllwlmlns1gf8ml3z",
       "depends": ["lattice"]
     },
     "maPredictDSC": {
       "name": "maPredictDSC",
-      "version": "1.42.0",
-      "sha256": "015zp1ijl4sjqvrnaf0fzwzynvwjgphxba4q29m821hyvq1rjmx4",
+      "version": "1.44.0",
+      "sha256": "1xrigbg2np1c54jny5897d2g85js2ckbccqhz5frh1a6ai3cmpjj",
       "depends": ["AnnotationDbi", "LungCancerACvsSCCGEO", "MASS", "ROC", "ROCR", "affy", "caret", "class", "e1071", "gcrma", "hgu133plus2_db", "limma"]
     },
     "maSigPro": {
       "name": "maSigPro",
-      "version": "1.76.0",
-      "sha256": "1kb5xjg84jbri3ds5kvr30nypg2picz483nwwjamk8px6d3anmry",
+      "version": "1.78.0",
+      "sha256": "134s42mmxy6563fplc9kn5ca1cbki9mnx0v3qms8jnrycglqw6yg",
       "depends": ["Biobase", "MASS", "mclust", "venn"]
     },
     "made4": {
       "name": "made4",
-      "version": "1.78.0",
-      "sha256": "0x96lhkz0fwp3qis8k2lllmi520b887bz26jcq3zlk1kjhbg91a8",
+      "version": "1.80.0",
+      "sha256": "0z40f2bxnakplq3xx221fk51m830dixc7nfll4xw1r3g2pg1iraq",
       "depends": ["Biobase", "RColorBrewer", "SummarizedExperiment", "ade4", "gplots", "scatterplot3d"]
     },
     "maftools": {
       "name": "maftools",
-      "version": "2.20.0",
-      "sha256": "0c2sf8l1wfgz3nh9ccm10y9wwh7rv55r09awavqlrr9glcbblp32",
-      "depends": ["DNAcopy", "RColorBrewer", "Rhtslib", "data_table", "survival", "zlibbioc"]
+      "version": "2.22.0",
+      "sha256": "0vdqasrb4j7cvp66df2fvjbdi65480zrdzbbv057nlkvq1h4m3p3",
+      "depends": ["DNAcopy", "RColorBrewer", "Rhtslib", "data_table", "pheatmap", "survival", "zlibbioc"]
     },
     "magpie": {
       "name": "magpie",
-      "version": "1.4.0",
-      "sha256": "1m5xnbcyhglkg843fhfvynlinag8vv8sxg1ghzpwi0q9ki65kq9d",
+      "version": "1.6.0",
+      "sha256": "1zvkh41sis8w22xca1vn4ip15s98al1jfkg125idxbdj03y2lvzy",
       "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "RColorBrewer", "Rsamtools", "S4Vectors", "TRESS", "aod", "matrixStats", "openxlsx", "reshape2", "rtracklayer"]
     },
     "magrene": {
       "name": "magrene",
-      "version": "1.6.0",
-      "sha256": "1nqklrz4l2g062ipff6znzl9lm4ws69qplrdb0r5fsfahpb8s25z",
+      "version": "1.8.0",
+      "sha256": "17pasmfbp0vby6a27gqbj7c563ms4x6c7q3j4mlijmv894ldqvzn",
       "depends": ["BiocParallel"]
     },
     "makecdfenv": {
       "name": "makecdfenv",
-      "version": "1.80.0",
-      "sha256": "0c1ks5f2rc0mwbfji6iicvypbmm46mq8yckmdpwiyp22l7l05aqz",
+      "version": "1.82.0",
+      "sha256": "08d33iqbgczw4w63s5nrjzwy059mqzgcr9s1g59irgplr9szjiar",
       "depends": ["Biobase", "affy", "affyio", "zlibbioc"]
     },
     "mapscape": {
       "name": "mapscape",
-      "version": "1.28.0",
-      "sha256": "1xg3nm9r115fzykq8m31xcr7anaqyqm91qnsmib89zvf0hfgrlac",
+      "version": "1.30.0",
+      "sha256": "0lc0an3lag8jjcvqkqaws28j5qs40rbx1fhxs4xmcyi268971xdy",
       "depends": ["base64enc", "htmlwidgets", "jsonlite", "stringr"]
     },
     "mariner": {
       "name": "mariner",
-      "version": "1.4.0",
-      "sha256": "1ndinmzzzpy154jmndnqf5xj3wz35jjijszg88ga4j19w2cxmnfp",
+      "version": "1.6.0",
+      "sha256": "1nasspyjsd8r11l2jsnrdxlr507b4zjzfv0sq8rf2j1mfn7ygn9m",
       "depends": ["BiocGenerics", "BiocManager", "BiocParallel", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "InteractionSet", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "abind", "assertthat", "colourvalues", "data_table", "dbscan", "glue", "magrittr", "plotgardener", "plyranges", "progress", "purrr", "rhdf5", "rlang", "strawr"]
     },
     "marr": {
       "name": "marr",
-      "version": "1.14.0",
-      "sha256": "1670fr6fcclrhgz6aqg0ph9iln0vjq3zgyp215na07ngwrzjw5nb",
+      "version": "1.16.0",
+      "sha256": "132dh34w5lh56mmzb055l59wjchf2yvlbcw1jvs065q8i0aldgfy",
       "depends": ["Rcpp", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "rlang"]
     },
     "marray": {
       "name": "marray",
-      "version": "1.82.0",
-      "sha256": "1h96aq92bad69ycrmrvxwdz8dg9rk44925gj83gxzqypw88j2x0y",
+      "version": "1.84.0",
+      "sha256": "0j4hib9x4zr40k6gs911vvj766b7f46n15jpq8p2lv89jrh8wa99",
       "depends": ["limma"]
     },
     "martini": {
       "name": "martini",
-      "version": "1.24.0",
-      "sha256": "07d1cyj2ms8mnglqzqs45gz32pdsqkfac00a118fahs1rw8j408f",
+      "version": "1.26.0",
+      "sha256": "1qfqd7f1zjha7rjs3cdbbhwys0z0v1lhbi79qyqphdp7ipdjzz00",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "igraph", "memoise", "snpStats"]
     },
     "maser": {
       "name": "maser",
-      "version": "1.22.0",
-      "sha256": "0w62dl65ysgcwixgmmb70qp6f85vhfnqjsww5snkjd48ypwx65ca",
+      "version": "1.24.0",
+      "sha256": "0vpi1qdkscnxxbfx3py8szw9429wc4vkwls9b4w1zq1zrvvzbaig",
       "depends": ["BiocGenerics", "DT", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "data_table", "dplyr", "ggplot2", "reshape2", "rtracklayer"]
     },
     "maskBAD": {
       "name": "maskBAD",
-      "version": "1.48.0",
-      "sha256": "198637aq9pjwx2p22iyy1nzy76pys2cmvfpdrghslh10l1b5pdjl",
+      "version": "1.50.0",
+      "sha256": "0h89xfw4747iszxhcfh9j428z49p869vhgj77a3ahjzgq1z7gd9k",
       "depends": ["affy", "gcrma"]
     },
     "massiR": {
       "name": "massiR",
-      "version": "1.40.0",
-      "sha256": "169gpddm1q3brj49sm3sp4ifyby37i41ydxjizwpa9aml90zc0y8",
+      "version": "1.42.0",
+      "sha256": "0bm8qbaxlpm5gb3asx9gc06civnvf4ljkg0vnldikriiyi3dhl22",
       "depends": ["Biobase", "cluster", "diptest", "gplots"]
     },
     "mastR": {
       "name": "mastR",
-      "version": "1.4.0",
-      "sha256": "1717hyil3x4c6jqv4zv6fwppwq1lc74kd8hg8z8yj8qqp92093f8",
+      "version": "1.6.0",
+      "sha256": "1a0z450vdsf00ccrrrd04l9ndp9arf8vszn5ammscqcj409vaz3i",
       "depends": ["AnnotationDbi", "Biobase", "GSEABase", "Matrix", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "edgeR", "ggplot2", "ggpubr", "limma", "msigdb", "org_Hs_eg_db", "patchwork", "tidyr"]
     },
     "matchBox": {
       "name": "matchBox",
-      "version": "1.46.0",
-      "sha256": "015gdqbwdl02mwr7hcymdkz8pvbxjh4qv4agswh3d8qd3mmj04y6",
+      "version": "1.48.0",
+      "sha256": "1yz90l4grhvvx6m3cpcxkdxmgs6paa355qgf3ad4j5g8nym318pn",
       "depends": []
     },
     "matter": {
       "name": "matter",
-      "version": "2.6.3",
-      "sha256": "17903fjwxa77llwcf1r783ca3nh10l4lpxd2q65s1jnvk9sjcn65",
-      "depends": ["BiocGenerics", "BiocParallel", "Matrix", "ProtGenerics", "biglm", "digest", "irlba"]
-    },
-    "mbQTL": {
-      "name": "mbQTL",
-      "version": "1.4.0",
-      "sha256": "04ml4rv1hngr8lm9z9pcg7szb1cmla1m1vypwjk9bkkfy879ribf",
-      "depends": ["MatrixEQTL", "broom", "dplyr", "ggplot2", "metagenomeSeq", "pheatmap", "readxl", "stringr", "tidyr"]
+      "version": "2.8.0",
+      "sha256": "1bycdzggnbrhi34w733s6jxlshxsny8qmy4h1ad2p7css14g2xkk",
+      "depends": ["BH", "BiocGenerics", "BiocParallel", "Matrix", "ProtGenerics", "digest", "irlba"]
     },
     "mbkmeans": {
       "name": "mbkmeans",
-      "version": "1.20.0",
-      "sha256": "0fnf6ymbcfchhlcbwpwlcq1jc3lfzh9f8mf76xfy7vrpwngds1fs",
+      "version": "1.22.0",
+      "sha256": "0alm36lj0p541wyrk85ddyk8g4sscip54532i8pkb6a8mclp9cp3",
       "depends": ["BiocParallel", "ClusterR", "DelayedArray", "Matrix", "Rcpp", "RcppArmadillo", "Rhdf5lib", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "benchmarkme"]
     },
     "mdp": {
       "name": "mdp",
-      "version": "1.24.0",
-      "sha256": "08x2ghj5a91rdqq48xjsq4m22qk2ys92jhb6flaqzqgm1s6806lw",
+      "version": "1.26.0",
+      "sha256": "1v01qhl9hk8bwar5ghfd11rwl8wpwcqm8phjxblxf963cgzxycry",
       "depends": ["ggplot2", "gridExtra"]
     },
     "mdqc": {
       "name": "mdqc",
-      "version": "1.66.0",
-      "sha256": "1frn6s43j6sbwnb5h2hykccvi7cwbasp8l37rc3nkxpc6szvsby6",
+      "version": "1.68.0",
+      "sha256": "0vxplgmfhp0g8v080h0rwvkzhq3gq1956p4jngkrz4nmpynzdfd7",
       "depends": ["MASS", "cluster"]
     },
     "megadepth": {
       "name": "megadepth",
-      "version": "1.14.0",
-      "sha256": "0394x1x81hgibvqb1dbrm8h3y72xfv9xi9fgqghjgnrw6farrkdk",
+      "version": "1.16.0",
+      "sha256": "1cay30y7cc6lpikcp4ncx69zjg4kyn152z5b8fhw159n6cb1z19n",
       "depends": ["GenomicRanges", "cmdfun", "dplyr", "fs", "magrittr", "readr", "xfun"]
     },
     "memes": {
       "name": "memes",
-      "version": "1.12.0",
-      "sha256": "03hrhydlgk57z9hzmwdgihlhsjyhhzw5vb5ql07ks169z15nix4h",
+      "version": "1.14.0",
+      "sha256": "0g1dpyyn5lnzy13h65m6wfnp4bsf7qs1jlc62qmjfq7aifw0hpxq",
       "depends": ["Biostrings", "GenomicRanges", "cmdfun", "dplyr", "ggplot2", "ggseqlogo", "magrittr", "matrixStats", "patchwork", "processx", "purrr", "readr", "rlang", "tibble", "tidyr", "universalmotif", "usethis", "xml2"]
     },
     "meshes": {
       "name": "meshes",
-      "version": "1.30.0",
-      "sha256": "0yc1drx7rbaxasj9p05hn4wa1nz0frymv7i9aw55ma59jjik8gi6",
+      "version": "1.32.0",
+      "sha256": "0kjdwydkrnf0sbigwjp017350b432d151m2jg5ghwmrdw9a5fa2b",
       "depends": ["AnnotationDbi", "AnnotationHub", "DOSE", "GOSemSim", "MeSHDbi", "enrichplot", "yulab_utils"]
     },
     "meshr": {
       "name": "meshr",
-      "version": "2.10.0",
-      "sha256": "1cbxlypw937bafmzlz8v0g1bf16pmlqdc1jkisj8zmaj9xabbik9",
+      "version": "2.12.0",
+      "sha256": "0mwcir939fqbydx5wf8aiiyrw69n5bcsaw1md9m61q9xfz99p9cl",
       "depends": ["BiocGenerics", "BiocStyle", "Category", "MeSHDbi", "RSQLite", "S4Vectors", "fdrtool", "knitr", "markdown", "rmarkdown"]
     },
     "messina": {
       "name": "messina",
-      "version": "1.40.0",
-      "sha256": "0xcc5y4zqz0hn7bm0lgyb8dlnhhq5nz1pghq53lvdmgr5zcp8yqz",
+      "version": "1.42.0",
+      "sha256": "0341hblfhgnz18j0jlkwvkvapyvybs0sap8hgmvl3zh1yd7mff3l",
       "depends": ["Rcpp", "foreach", "ggplot2", "plyr", "survival"]
     },
     "metaCCA": {
       "name": "metaCCA",
-      "version": "1.32.0",
-      "sha256": "1m35p9r3v2qzk3y1046p1n1j84rw6a1hsfsij58p4byi34hrfc1a",
+      "version": "1.34.0",
+      "sha256": "173g1my2b3p6q2hixwpc6p9wgqz1hph6m5k0d2fs8s9mg90f9p90",
       "depends": []
     },
     "metaMS": {
       "name": "metaMS",
-      "version": "1.40.0",
-      "sha256": "0fj111vs9s1j754jhqzna89jnibiff6pahbn1vibh7gsx310ri0s",
+      "version": "1.42.0",
+      "sha256": "1fw4381jsfniwifrljwb2hfxfi537ial1a5x66gcc8xnr9cfzgls",
       "depends": ["BiocGenerics", "CAMERA", "Matrix", "robustbase", "xcms"]
     },
     "metaSeq": {
       "name": "metaSeq",
-      "version": "1.44.0",
-      "sha256": "0n5s8kssvawcdi7sqhgpbrdwi39j22clgprcj9psd8i6g2n7iwc8",
+      "version": "1.46.0",
+      "sha256": "0ivmzci7gpkz9linwcm57c5kw08kd3k8gi826r5x6a65rnznqqpg",
       "depends": ["NOISeq", "Rcpp", "snow"]
     },
     "metabCombiner": {
       "name": "metabCombiner",
-      "version": "1.14.0",
-      "sha256": "0jp39qz7z3v7ndnxhc4lsjwf1mfhjq5nsg926s1x1i7w5x203fzd",
+      "version": "1.16.0",
+      "sha256": "1vn41x25kxzcam5r43ik4q2xdy6h2j3rkqryr8hslbassbn0yq2h",
       "depends": ["S4Vectors", "caret", "dplyr", "matrixStats", "mgcv", "rlang", "tidyr"]
     },
     "metabinR": {
       "name": "metabinR",
-      "version": "1.6.0",
-      "sha256": "158lwd9l5yszlh28zsfn2ddmq6p8hlknvzy8k1spxmqdddqhp9zy",
+      "version": "1.8.0",
+      "sha256": "0q79qmrfa4yhnv45nqlx2nd94lj4992kmrj3w8sx2s8j3qfqf0c8",
       "depends": ["rJava"]
     },
     "metabolomicsWorkbenchR": {
       "name": "metabolomicsWorkbenchR",
-      "version": "1.14.2",
-      "sha256": "1aj3b9zpnvmb0h5bbmd7nsvfg50a834nwrgvqw6707ncyw1p7vgi",
+      "version": "1.16.0",
+      "sha256": "0qajw2lpmp8b8j24m0cp88c39k6v1y10d5q1zl27gx4cqklgrijc",
       "depends": ["MultiAssayExperiment", "SummarizedExperiment", "data_table", "httr", "jsonlite", "struct"]
     },
     "metabomxtr": {
       "name": "metabomxtr",
-      "version": "1.38.0",
-      "sha256": "1jfhz28q4bxib3k2wvdcqsrqj699bxy0lzqqi7m0xivrjp27jw9h",
+      "version": "1.40.0",
+      "sha256": "0pl0ilcx32njxdv4i9gly5gfvna1wndv6jnz2c72q60w8ayak7rv",
       "depends": ["Biobase", "BiocParallel", "Formula", "ggplot2", "multtest", "optimx", "plyr"]
     },
     "metagene2": {
       "name": "metagene2",
-      "version": "1.20.0",
-      "sha256": "1j5jl0xczj2g03k0lwq9h5snv4kpwqga836dkshnmf789gn2pzy3",
+      "version": "1.22.0",
+      "sha256": "14nrzk9d94sl4k67kx79wlk5kd4vd7c1lyzjlps7lpqv2717hylz",
       "depends": ["BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "R6", "Rsamtools", "data_table", "dplyr", "ggplot2", "magrittr", "purrr", "reshape2", "rtracklayer"]
     },
-    "metagenomeSeq": {
-      "name": "metagenomeSeq",
-      "version": "1.46.0",
-      "sha256": "0bjbiwbgs0lv0j6gjv5rhqhmqk0p7f80lfig4n24i4bqwkd2j26k",
-      "depends": ["Biobase", "Matrix", "RColorBrewer", "Wrench", "foreach", "glmnet", "gplots", "limma", "matrixStats"]
-    },
     "metahdep": {
       "name": "metahdep",
-      "version": "1.62.0",
-      "sha256": "1h888yl95xnr07ybz5hrfpslcc7xh0nggnl57lcw8ikqj8wgcnc2",
+      "version": "1.64.0",
+      "sha256": "01cyv9n0d3p7silkxdyqqfdkww22hfw138bpxfh1sqgbyi9iwk8r",
       "depends": []
     },
     "metapod": {
       "name": "metapod",
-      "version": "1.12.0",
-      "sha256": "100wsg2y7069r7xk5bsk5n4n8dqvpbk297w5ishnijrvxhbs9f8n",
+      "version": "1.14.0",
+      "sha256": "1ysdgnyzn5n2fazmx2az5kk30n10xla3l9xhrik3mmmif0ix0p8l",
       "depends": ["Rcpp"]
     },
     "metapone": {
       "name": "metapone",
-      "version": "1.10.0",
-      "sha256": "0x5lrpf5554h2i521ikxgadpwj4233ib4n5p9qpass7y3z0kpxh7",
+      "version": "1.12.0",
+      "sha256": "1mhs96j6mwkdlf4h1g068fn2m3p2dif6m026k1wafhips24pindh",
       "depends": ["BiocParallel", "fdrtool", "fgsea", "fields", "ggplot2", "ggrepel", "markdown"]
     },
     "metaseqR2": {
       "name": "metaseqR2",
-      "version": "1.16.0",
-      "sha256": "1rkaacb0jkfzhdd7q7v38by7wwmk4m4kfa01ky8yn2fady0sx3hm",
+      "version": "1.18.0",
+      "sha256": "0h5zkjck6l6dxf80flsnln525ykvxsalmmdzgbpcn22yd9fkj3zl",
       "depends": ["ABSSeq", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DESeq2", "DSS", "DT", "EDASeq", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Matrix", "NBPSeq", "RSQLite", "Rsamtools", "S4Vectors", "SummarizedExperiment", "VennDiagram", "biomaRt", "corrplot", "edgeR", "genefilter", "gplots", "harmonicmeanp", "heatmaply", "htmltools", "httr", "jsonlite", "lattice", "limma", "locfit", "log4r", "magrittr", "pander", "qvalue", "rmarkdown", "rmdformats", "rtracklayer", "stringr", "survcomp", "txdbmaker", "vsn", "yaml", "zoo"]
     },
     "methInheritSim": {
       "name": "methInheritSim",
-      "version": "1.26.0",
-      "sha256": "0c94sbqa0aiskrl8rxyiyj38a5n4vw1l2b51c2v0ryvjqk0zg93n",
+      "version": "1.28.0",
+      "sha256": "1bj7kk0lz1gq62l5mr4m3zzpdpxjs32h6znpa2f68h78mjp5r3hl",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "methylKit", "msm"]
     },
     "methimpute": {
       "name": "methimpute",
-      "version": "1.26.0",
-      "sha256": "1k9nasdfvrynvk2jsvxpbbp9zdqh516c41m654yfsdi5cl2y3jyd",
+      "version": "1.28.0",
+      "sha256": "09pgfwsga5whqhdp898h35zfwway8x3y7dbv2aaf2ad3d4k5rqly",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "data_table", "ggplot2", "minpack_lm", "reshape2"]
     },
-    "methodical": {
-      "name": "methodical",
-      "version": "1.0.0",
-      "sha256": "13m75hf5dq36l20idp9alcikhhqa2qy5jwfnpkv2yp1ra6c9pq7j",
-      "depends": ["BSgenome", "BiocParallel", "Biostrings", "DelayedArray", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "R_utils", "RcppRoll", "S4Vectors", "SummarizedExperiment", "cowplot", "data_table", "dplyr", "foreach", "ggplot2", "rhdf5", "rtracklayer", "scales", "tibble", "tidyr"]
-    },
     "methrix": {
       "name": "methrix",
-      "version": "1.18.0",
-      "sha256": "0976y3aswyv7dk60ix9vvcvd6dgc0sy8qnakq3pdrl505znxsshi",
+      "version": "1.20.0",
+      "sha256": "08rr73ns82chcds25xihqj1cz44wicmvqlcij6agv1rd4gv2wqgf",
       "depends": ["BSgenome", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "HDF5Array", "IRanges", "S4Vectors", "SummarizedExperiment", "data_table", "ggplot2", "matrixStats", "rtracklayer"]
     },
     "methyLImp2": {
       "name": "methyLImp2",
-      "version": "1.0.0",
-      "sha256": "1f86951l7gjqj48hxdm6ppc7bp84dm9fnlh0xhhl12fbdp2id94m",
+      "version": "1.2.0",
+      "sha256": "0drbwi9xdz32cm8pzaknm76mrwqc1m720gm8l44cnsh0ph9g7ilg",
       "depends": ["BiocParallel", "ChAMPdata", "SummarizedExperiment", "corpcor"]
     },
     "methylCC": {
       "name": "methylCC",
-      "version": "1.18.0",
-      "sha256": "16i4yjx36pdbxf9vqnnr568lqcnql1pw3f5f1hlnq66kaai9hx34",
+      "version": "1.20.0",
+      "sha256": "082ybsdqg5nhpkkw93b39ac1p5k6hkk62kbrl49xfna0qw7hqdaj",
       "depends": ["Biobase", "FlowSorted_Blood_450k", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "S4Vectors", "bsseq", "bumphunter", "dplyr", "genefilter", "magrittr", "minfi", "plyranges", "quadprog"]
     },
     "methylGSA": {
       "name": "methylGSA",
-      "version": "1.22.0",
-      "sha256": "0myii2c782my1lmqziaxdlrsfxgh194n58m1ydaqbxnhgkwvh10s",
+      "version": "1.24.0",
+      "sha256": "1cb9sl3cgn726iq6p0ki02vpypmpazcb0bxcnvd2f6bkyr7xigq7",
       "depends": ["AnnotationDbi", "BiocParallel", "GO_db", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "RobustRankAggreg", "clusterProfiler", "ggplot2", "missMethyl", "org_Hs_eg_db", "reactome_db", "shiny", "stringr"]
     },
     "methylInheritance": {
       "name": "methylInheritance",
-      "version": "1.28.0",
-      "sha256": "1pqd9ydgm071pa5lld1mn39yymkaghzx931ghlkshhh9dsrjqhg4",
+      "version": "1.30.0",
+      "sha256": "01vigk36bv2pzqj0pf2m99wvq1jlpg4vgxhy9vaz29xxyi4y47bc",
       "depends": ["BiocParallel", "GenomicRanges", "IRanges", "S4Vectors", "ggplot2", "gridExtra", "methylKit", "rebus"]
     },
     "methylKit": {
       "name": "methylKit",
-      "version": "1.30.0",
-      "sha256": "000dvi63cjikjbq3q83hlspd7y62rpswzg6hs5z1z1pj6a8rifdj",
+      "version": "1.32.0",
+      "sha256": "1niblg067819p8mldnlkf7xd8g3k89q6wcj095idlkcna06xj3d1",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "KernSmooth", "R_utils", "Rcpp", "Rhtslib", "Rsamtools", "S4Vectors", "data_table", "emdbook", "fastseg", "gtools", "limma", "mclust", "mgcv", "qvalue", "rtracklayer", "zlibbioc"]
     },
     "methylMnM": {
       "name": "methylMnM",
-      "version": "1.42.0",
-      "sha256": "0f1mc3v1zr55irlqfxkp7s7cv2c1crwr60hj4ff1ld14ds91q9pr",
+      "version": "1.44.0",
+      "sha256": "1zqc7vkad0pma2hngaanxv0g3hzfy8hjgq4bp65mrjd34skr3r6q",
       "depends": ["edgeR", "statmod"]
     },
     "methylPipe": {
       "name": "methylPipe",
-      "version": "1.38.0",
-      "sha256": "1v2qp5rp19d80aai8i5y32b62kynkkdkp3hqfvsk82ckwxvk2k60",
+      "version": "1.40.0",
+      "sha256": "0dn2fb216y8f1mklrl6fhbkb6df9qr9ild92rdh9k0fzga8n6xhk",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "Gviz", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "gplots", "marray"]
     },
     "methylSig": {
       "name": "methylSig",
-      "version": "1.16.0",
-      "sha256": "03ghyx1xj2d06fj5kckrw810x92s8ndsq3wpj1kcjkf1v22vr0ln",
+      "version": "1.18.0",
+      "sha256": "0fa43yblryn765v32l3i9imlshailip0vgdh9rzp3hhadfs9yaq3",
       "depends": ["DSS", "DelayedArray", "DelayedMatrixStats", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bsseq"]
     },
     "methylclock": {
       "name": "methylclock",
-      "version": "1.10.0",
-      "sha256": "193ck7a501804424yqvg2c8zixzj56p3d8468sdisx577hhshhhm",
+      "version": "1.12.0",
+      "sha256": "0853l4wpvjp2a86mjww4gwpb07i0v4j4m3j5y79nvi8iximz5kmp",
       "depends": ["Biobase", "ExperimentHub", "PerformanceAnalytics", "RPMM", "Rcpp", "devtools", "dplyr", "dynamicTreeCut", "ggplot2", "ggpmisc", "ggpubr", "gridExtra", "impute", "methylclockData", "minfi", "planet", "preprocessCore", "quadprog", "tibble", "tidyr", "tidyverse"]
     },
     "methylscaper": {
       "name": "methylscaper",
-      "version": "1.12.0",
-      "sha256": "19xpagmx9rn840acbm2cj3vkvhjzr1rslsjmjgvgcm4fip1yrskp",
+      "version": "1.14.0",
+      "sha256": "1sp73xyy48jr9m41j743srvqif07lh5km8svb28357lng2pdp3ym",
       "depends": ["BiocParallel", "Biostrings", "Rfast", "SummarizedExperiment", "data_table", "pwalign", "seqinr", "seriation", "shiny", "shinyFiles", "shinyjs"]
     },
     "methylumi": {
       "name": "methylumi",
-      "version": "2.50.0",
-      "sha256": "1ms3w43yvy810mr6dml9hqp3kw5jlpr9153kd62gvhjsgikaj3ja",
+      "version": "2.52.0",
+      "sha256": "15lc81qdvjk6mr74h59gr2bxq9alj1wjady2h0j7rhq0p7rim754",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "FDb_InfiniumMethylation_hg19", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "annotate", "genefilter", "ggplot2", "illuminaio", "lattice", "matrixStats", "minfi", "reshape2", "scales"]
     },
     "mfa": {
       "name": "mfa",
-      "version": "1.26.0",
-      "sha256": "1vqmpxsl9dfq0h9cirip578crfnqxpabbwpzlglcm0qqwymh6ilr",
+      "version": "1.28.0",
+      "sha256": "196yxm19imkraph1l7yp2pras7hi0yvlxk0xlxr08ikn6pszks2f",
       "depends": ["Biobase", "MCMCglmm", "MCMCpack", "Rcpp", "coda", "dplyr", "ggmcmc", "ggplot2", "magrittr", "tibble"]
     },
     "mgsa": {
       "name": "mgsa",
-      "version": "1.52.0",
-      "sha256": "00404pglk2f7hq8pfb3i8zigwzal74m0kk39by2rigyigdcq4sq9",
+      "version": "1.54.0",
+      "sha256": "0jdv22xdkq2qgm17m8fsazshgpf0mvf44a46694qwn0y6pqm6rpy",
       "depends": ["gplots"]
     },
     "miQC": {
       "name": "miQC",
-      "version": "1.12.0",
-      "sha256": "04f7jza631y04mhy23yvipd88rywgpqw5jm9ff54hhfhmscdaczn",
+      "version": "1.14.0",
+      "sha256": "1mm5529h0xzj2lr61n49gl1x9hvrnwx10jlwgbb95cknyazn1dm6",
       "depends": ["SingleCellExperiment", "flexmix", "ggplot2"]
     },
+    "miRBaseConverter": {
+      "name": "miRBaseConverter",
+      "version": "1.30.0",
+      "sha256": "0nf24hkziq25xn1sikcgj4wfmggl51ndyfq3dxn9sdizdc5a087g",
+      "depends": []
+    },
     "miRLAB": {
       "name": "miRLAB",
-      "version": "1.34.0",
-      "sha256": "1r18s6d94csqqbkjis5dh5q4rbw1qvj61x8wmzw7jgyvrsyd5jqc",
+      "version": "1.36.0",
+      "sha256": "0rw6rav765b9slw9p4ghjxp1b6x4s7f47q01nz6sav39193139gc",
       "depends": ["Category", "GOstats", "Hmisc", "InvariantCausalPrediction", "RCurl", "SummarizedExperiment", "TCGAbiolinks", "ctc", "dplyr", "energy", "entropy", "glmnet", "gplots", "httr", "impute", "limma", "org_Hs_eg_db", "pcalg", "stringr"]
     },
     "miRNAmeConverter": {
       "name": "miRNAmeConverter",
-      "version": "1.32.0",
-      "sha256": "0sqar3llyj10kmix9vb870nra5n735m9897qyf0zic9n21gmmbsp",
+      "version": "1.34.0",
+      "sha256": "15cyqd9vskx9ik0rc43s4cga8svlfqjil2mnj39gfd4sn4j9mxm6",
       "depends": ["AnnotationDbi", "DBI", "miRBaseVersions_db", "reshape2"]
     },
     "miRNApath": {
       "name": "miRNApath",
-      "version": "1.64.0",
-      "sha256": "0zhgh9qls59kn6gd977gawvwh0pqdwwasla1gbvbiakhw3i1jw9r",
+      "version": "1.66.0",
+      "sha256": "0mkhwyw2xg4b2bh2mnqwnl5qgm3iywwlf3imvczk2w9lkd9ld60j",
       "depends": []
     },
     "miRNAtap": {
       "name": "miRNAtap",
-      "version": "1.38.0",
-      "sha256": "07sff3h9hidw5xr11fx6n4ngajvsvbz4a1gkavd32wh6j8jccpyx",
+      "version": "1.40.0",
+      "sha256": "0cigbnhd7025dnbnrjygxi494rdway499kg33mc62smxh39l1l8m",
       "depends": ["AnnotationDbi", "DBI", "RSQLite", "plyr", "sqldf", "stringr"]
     },
     "miRSM": {
       "name": "miRSM",
-      "version": "2.0.0",
-      "sha256": "0wxwz00fsv8jf291zlfjim89vhsbqwlc9klq0szzl1p7msrs7vga",
+      "version": "2.2.0",
+      "sha256": "1zxsjm7yv1rndz709x6irdv29qjhi9h2g3c9b1y3hbh83yl1fcwx",
       "depends": ["BiBitR", "BicARE", "Biobase", "DOSE", "GFA", "GSEABase", "MCL", "MatrixCorrelation", "NMF", "PMA", "Rcpp", "ReactomePA", "SOMbrero", "SummarizedExperiment", "WGCNA", "biclust", "clusterProfiler", "dbscan", "dynamicTreeCut", "energy", "fabia", "flashClust", "iBBiG", "igraph", "isa2", "linkcomm", "mclust", "org_Hs_eg_db", "ppclust", "rqubic", "s4vd", "subspace"]
     },
     "miRcomp": {
       "name": "miRcomp",
-      "version": "1.34.0",
-      "sha256": "1gm8s0mprb5ybc1hb92w1z84qrj4vzfizd0ws4ppzj9k6fb12nn9",
+      "version": "1.36.0",
+      "sha256": "0nvjyiixk934hlmr33agw0crhs3kds981pzzfn4k1jy01hzgqc62",
       "depends": ["Biobase", "KernSmooth", "miRcompData"]
     },
     "miRspongeR": {
       "name": "miRspongeR",
-      "version": "2.8.0",
-      "sha256": "0i7j33lwj5kw09dla7967f5z8zp8ls25db432m0ch2n8ialz0anc",
+      "version": "2.10.0",
+      "sha256": "10r1rh2nvzwpz0wj2qr2mzzq4yqda6svhqq09ic7bhzzxxfk3qlp",
       "depends": ["DOSE", "MCL", "Rcpp", "ReactomePA", "SPONGE", "clusterProfiler", "corpcor", "doParallel", "foreach", "igraph", "linkcomm", "org_Hs_eg_db", "survival"]
     },
     "mia": {
       "name": "mia",
-      "version": "1.12.0",
-      "sha256": "1wn2lb7hn4zqqcs2jwavpsbk5kw8d78kxg2yv4jjpikpdz7haa2i",
-      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DECIPHER", "DelayedArray", "DelayedMatrixStats", "DirichletMultinomial", "IRanges", "MASS", "MatrixGenerics", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "bluster", "decontam", "dplyr", "rlang", "scater", "scuttle", "tibble", "tidyr", "vegan"]
+      "version": "1.14.0",
+      "sha256": "1qf7dd9s66xmxsfv422cikrimyqiaqz71qc6yav119a9mbp8arpd",
+      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "DECIPHER", "DelayedArray", "DelayedMatrixStats", "DirichletMultinomial", "IRanges", "MASS", "MatrixGenerics", "MultiAssayExperiment", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "bluster", "decontam", "dplyr", "mediation", "rbiom", "rlang", "scater", "scuttle", "tibble", "tidyr", "vegan"]
     },
     "miaSim": {
       "name": "miaSim",
-      "version": "1.10.0",
-      "sha256": "1grlkynbjkfndx8j44yd6sfr3yzy0fwmakjw4mg8flllqs9yqnmw",
+      "version": "1.12.0",
+      "sha256": "1kaa09xanmgbyljjc1c0w2ckm6r73sn4ynqm3fr38zmss1wjsawg",
       "depends": ["MatrixGenerics", "S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "deSolve", "poweRlaw"]
     },
     "miaViz": {
       "name": "miaViz",
-      "version": "1.12.0",
-      "sha256": "1dpvqvh9sg6visf4bbjd9x4wag2dzj2b5mylbxbqwcm8lic7gy03",
-      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DirichletMultinomial", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggtree", "mia", "purrr", "rlang", "scater", "tibble", "tidygraph", "tidyr", "tidytree", "viridis"]
+      "version": "1.14.0",
+      "sha256": "1g4zbcl4158wjqwjbnw64l832k7jhy5x7z3jza8xvgsv6jzrfz91",
+      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DirichletMultinomial", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "dplyr", "ggnewscale", "ggplot2", "ggraph", "ggrepel", "ggtree", "mia", "purrr", "rlang", "scater", "tibble", "tidygraph", "tidyr", "tidytext", "tidytree", "viridis"]
     },
     "microRNA": {
       "name": "microRNA",
-      "version": "1.62.0",
-      "sha256": "0jw6g5y9pgvwh10fxpr55nkq8yf6p079kvsx986sgz78y0kkm6zh",
+      "version": "1.64.0",
+      "sha256": "1c9lqmrl7lmzr7r3174mw0dz070x3crlbay4rgnpml5jiqz0w6fm",
       "depends": ["Biostrings"]
     },
     "microSTASIS": {
       "name": "microSTASIS",
-      "version": "1.4.0",
-      "sha256": "1gf37nqcif6blpwrlq694gl78l2g1alx13wjdxay6qfg2iaf2dln",
+      "version": "1.6.0",
+      "sha256": "1wvlx8w8ispcl2nsfjc3wl3fjy4gi9dqyikh3swi7vj9wzbkqn3y",
       "depends": ["BiocParallel", "TreeSummarizedExperiment", "ggplot2", "ggside", "rlang", "stringr"]
     },
     "microbiome": {
       "name": "microbiome",
-      "version": "1.26.0",
-      "sha256": "1azxfydcrxi46j6lykspzchwcj0dpghjia7vfb2bppz9gh8nvk37",
+      "version": "1.28.0",
+      "sha256": "1q78d71gpczgphv9adh8lz6lx1q0wbiv4pl59aqz6cvagx0kcza6",
       "depends": ["Biostrings", "Rtsne", "compositions", "dplyr", "ggplot2", "phyloseq", "reshape2", "scales", "tibble", "tidyr", "vegan"]
     },
-    "microbiomeDASim": {
-      "name": "microbiomeDASim",
-      "version": "1.18.0",
-      "sha256": "123viwwyc4yjwkc1l7r9als4bvi2sb7yxmyfidqwamw8f2vwsfcz",
-      "depends": ["Biobase", "MASS", "Matrix", "ggplot2", "metagenomeSeq", "mvtnorm", "pbapply", "phyloseq", "tmvtnorm"]
-    },
-    "microbiomeExplorer": {
-      "name": "microbiomeExplorer",
-      "version": "1.14.0",
-      "sha256": "0p15wp3n2v74rfsmap0331b3xkswfyaq8a4h2xrcn3v60m5qfmzq",
-      "depends": ["Biobase", "DESeq2", "DT", "RColorBrewer", "biomformat", "broom", "car", "dplyr", "forcats", "heatmaply", "knitr", "limma", "lubridate", "magrittr", "matrixStats", "metagenomeSeq", "plotly", "purrr", "readr", "reshape2", "rlang", "rmarkdown", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr", "vegan"]
-    },
-    "microbiomeMarker": {
-      "name": "microbiomeMarker",
-      "version": "1.10.0",
-      "sha256": "07w77cm7fjkqnc1rkj9dj6nashpkwbq43nwp6bsq5wp8k4y26gjn",
-      "depends": ["ALDEx2", "ANCOMBC", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "ComplexHeatmap", "DESeq2", "IRanges", "MASS", "S4Vectors", "biomformat", "caret", "coin", "dplyr", "edgeR", "ggplot2", "ggsignif", "ggtree", "limma", "magrittr", "metagenomeSeq", "multtest", "pROC", "patchwork", "phyloseq", "plotROC", "purrr", "rlang", "tibble", "tidyr", "tidytree", "vegan", "yaml"]
-    },
     "midasHLA": {
       "name": "midasHLA",
-      "version": "1.12.0",
-      "sha256": "0d7zpv88mfs8bgym72ljbr0wammnppc5q0pcf5970z2zapxqmczy",
+      "version": "1.14.0",
+      "sha256": "0yva9n4sg93g3skxaqv1156ccjflz8yg0xl896d661in2gxcr400",
       "depends": ["HardyWeinberg", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment", "assertthat", "broom", "dplyr", "formattable", "kableExtra", "knitr", "magrittr", "qdapTools", "rlang", "stringi", "tibble"]
     },
     "miloR": {
       "name": "miloR",
-      "version": "2.0.0",
-      "sha256": "1cb5iw90h6raflgmypd2wc8y4mbsv9g8alshh30k1kjm8vlsw92y",
-      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "Matrix", "MatrixGenerics", "RColorBrewer", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggraph", "ggrepel", "gtools", "igraph", "irlba", "limma", "matrixStats", "numDeriv", "patchwork", "stringr", "tibble", "tidyr"]
+      "version": "2.2.0",
+      "sha256": "1x7p6zjbif8wc4z8wqc472z69j3wbrbqbfq9sldj7v6cgfcflifd",
+      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "Matrix", "MatrixGenerics", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppML", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cowplot", "dplyr", "edgeR", "ggbeeswarm", "ggplot2", "ggraph", "ggrepel", "gtools", "igraph", "irlba", "limma", "matrixStats", "numDeriv", "patchwork", "pracma", "stringr", "tibble", "tidyr"]
     },
     "mimager": {
       "name": "mimager",
-      "version": "1.28.0",
-      "sha256": "0n535az50yvdvbjwy0rixy4lnlc0psb454xdzqp6rh718jh5yqrf",
+      "version": "1.30.0",
+      "sha256": "151rkn9rz89x15xh01dn6x48wvdx1wy4hgrwfancpjhq3vlbz0a2",
       "depends": ["Biobase", "BiocGenerics", "DBI", "S4Vectors", "affy", "affyPLM", "gtable", "oligo", "oligoClasses", "preprocessCore", "scales"]
     },
     "mina": {
       "name": "mina",
-      "version": "1.12.0",
-      "sha256": "0fkc6cf267fcz7gqaf2grvd9dl1azvymsahszkb6w0rp289nbbn6",
+      "version": "1.14.0",
+      "sha256": "04a0sdif70v0136vzq5p7dhd4z4sjmvnz2fd0bkhcpz7s566w2gp",
       "depends": ["Hmisc", "MCL", "RSpectra", "Rcpp", "RcppArmadillo", "RcppParallel", "apcluster", "biganalytics", "bigmemory", "foreach", "ggplot2", "parallelDist", "plyr", "reshape2", "stringr"]
     },
     "minet": {
       "name": "minet",
-      "version": "3.62.0",
-      "sha256": "1627gqqk8v3sx5kgm7z3wkimbz7dpf37ljrmvwbd4z6ag2yiirbj",
+      "version": "3.64.0",
+      "sha256": "0laq82zi3ij8rdgv4cw6kcsbf0hrwy6v3hqr3v5x66lv8vnykp4p",
       "depends": ["infotheo"]
     },
     "minfi": {
       "name": "minfi",
-      "version": "1.50.0",
-      "sha256": "1hk44wddcygh4j7jmj1b0p40hf5qdy1m78x14j19h7z9aq4azdij",
+      "version": "1.52.1",
+      "sha256": "13bajbcsm0rkw92c8pz1pxn07af5nf51qfff5p0n9chdi01k78dk",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "DelayedArray", "DelayedMatrixStats", "GEOquery", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "MASS", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "beanplot", "bumphunter", "data_table", "genefilter", "illuminaio", "lattice", "limma", "mclust", "nlme", "nor1mix", "preprocessCore", "quadprog", "reshape", "siggenes"]
     },
     "mirIntegrator": {
       "name": "mirIntegrator",
-      "version": "1.34.0",
-      "sha256": "1saj71y2h3zczq16ypvmvy17z95klxawiifrlrxw3b61pnf7lpn0",
+      "version": "1.36.0",
+      "sha256": "0nzd6y95jlbal60axkfdrillghbzxa7vhwqb86hmb0g87hfzjmkw",
       "depends": ["AnnotationDbi", "ROntoTools", "Rgraphviz", "ggplot2", "graph", "org_Hs_eg_db"]
     },
     "mirTarRnaSeq": {
       "name": "mirTarRnaSeq",
-      "version": "1.12.0",
-      "sha256": "1wn27pnmax2ay13a6mms6wrhskvqlwmg45jifbfhna1d5ly18rqh",
+      "version": "1.14.0",
+      "sha256": "1yww4mx117bh6xkdmxnvxsyy5rxy8p679qm1gha3vxd7fnxca4zf",
       "depends": ["MASS", "R_utils", "assertthat", "caTools", "corrplot", "data_table", "dplyr", "ggplot2", "pheatmap", "pscl", "purrr", "reshape2", "viridis"]
     },
     "missMethyl": {
       "name": "missMethyl",
-      "version": "1.38.0",
-      "sha256": "0fnqa7v6lgld4pdqnvgdzly73aj4a4cn8sgszicxsyn1damxsjiw",
-      "depends": ["AnnotationDbi", "BiasedUrn", "Biobase", "BiocGenerics", "GO_db", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "S4Vectors", "SummarizedExperiment", "limma", "methylumi", "minfi", "org_Hs_eg_db", "ruv", "statmod", "stringr"]
+      "version": "1.40.0",
+      "sha256": "1q149myhwhxnrnk5s9r3yx6dchzm70kkika4k12vm5plaxv29di9",
+      "depends": ["AnnotationDbi", "BiasedUrn", "Biobase", "BiocGenerics", "GO_db", "GenomicRanges", "IRanges", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylation450kmanifest", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "IlluminaHumanMethylationEPICmanifest", "IlluminaHumanMethylationEPICv2anno_20a1_hg38", "IlluminaHumanMethylationEPICv2manifest", "S4Vectors", "SummarizedExperiment", "limma", "methylumi", "minfi", "org_Hs_eg_db", "ruv", "statmod", "stringr"]
     },
     "missRows": {
       "name": "missRows",
-      "version": "1.24.0",
-      "sha256": "0p51nnfxhz5lqxm4vbqhxczaa774g13sh65czj1kkrrzp1g65wm5",
+      "version": "1.26.0",
+      "sha256": "09vjmb9p6xwxkz4y6mrzzvw4q8kc72rw9dwivafd55hn8l8410j5",
       "depends": ["MultiAssayExperiment", "S4Vectors", "ggplot2", "gtools", "plyr"]
     },
     "mistyR": {
       "name": "mistyR",
-      "version": "1.12.0",
-      "sha256": "0w0ij222749pv89y0gq9c01cgsasw1lb3g0bx3sf6j62gdlf1gdp",
+      "version": "1.14.0",
+      "sha256": "14jvn05faj2w344rn4297vc23y3q523rvqnkqg48c6sa3dw4gwp5",
       "depends": ["R_utils", "assertthat", "caret", "deldir", "digest", "distances", "dplyr", "filelock", "furrr", "ggplot2", "purrr", "ranger", "readr", "ridge", "rlang", "rlist", "stringr", "tibble", "tidyr", "tidyselect", "withr"]
     },
     "mitch": {
       "name": "mitch",
-      "version": "1.16.0",
-      "sha256": "1x65vxjbbd7vswv9lpa0fx5l1m629n0iayb54s3xhidn3xylizsb",
+      "version": "1.18.4",
+      "sha256": "1w75lsa5ygzr67mr5kfj36z40qzyb2q04mbvwgsyappkqdkscd15",
       "depends": ["GGally", "MASS", "beeswarm", "echarts4r", "ggplot2", "gplots", "gridExtra", "kableExtra", "knitr", "plyr", "reshape2", "rmarkdown"]
     },
     "mitoClone2": {
       "name": "mitoClone2",
-      "version": "1.10.0",
-      "sha256": "1vmbyraranbfywk1mmr2arbzw8fsxkyqh5nkzd2w92vpahp7vn2d",
+      "version": "1.12.0",
+      "sha256": "0jsjjjgqnn380fg6v5336dvrcgkfjc4h1cv4y40srhx008f5g63y",
       "depends": ["GenomicRanges", "Rhtslib", "S4Vectors", "deepSNV", "ggplot2", "pheatmap", "reshape2"]
     },
     "mixOmics": {
       "name": "mixOmics",
-      "version": "6.28.0",
-      "sha256": "03pdg2hz4wnyigqakb9098ak9ww8fhwypzn006hfad0s042p9wvj",
-      "depends": ["BiocParallel", "MASS", "RColorBrewer", "corpcor", "dplyr", "ellipse", "ggplot2", "ggrepel", "gridExtra", "igraph", "lattice", "matrixStats", "rARPACK", "reshape2", "tidyr"]
+      "version": "6.30.0",
+      "sha256": "0bjwwjhcgbx27sm6ki3aag7jngmdsp3hr3hn58wkm492xa2hsimf",
+      "depends": ["BiocParallel", "MASS", "RColorBrewer", "corpcor", "dplyr", "ellipse", "ggplot2", "ggrepel", "gridExtra", "gsignal", "igraph", "lattice", "matrixStats", "rARPACK", "reshape2", "rgl", "tidyr"]
     },
     "mnem": {
       "name": "mnem",
-      "version": "1.20.0",
-      "sha256": "0i93fnqpf8m90bkyvgzccj2x4phg9k1wb6k8fs04qsid0b9ksnpd",
+      "version": "1.22.0",
+      "sha256": "0accy11xhqai777zb5c1b49k5fm8drng0jrwf467x7nvzwgkpfw9",
       "depends": ["Linnorm", "Rcpp", "RcppEigen", "Rgraphviz", "cluster", "data_table", "e1071", "flexclust", "ggplot2", "graph", "lattice", "matrixStats", "naturalsort", "snowfall", "tsne", "wesanderson"]
     },
     "moanin": {
       "name": "moanin",
-      "version": "1.12.0",
-      "sha256": "15agfggzbdgpx974yvixh8c8mv8wklg6zfzzr7ywpv2cixxazhwq",
+      "version": "1.14.0",
+      "sha256": "0ppcjynl9mplsz3fwyj47lni6dv53y4avaqsavf885bp33dn85gb",
       "depends": ["ClusterR", "MASS", "NMI", "S4Vectors", "SummarizedExperiment", "edgeR", "limma", "matrixStats", "reshape2", "topGO", "viridis", "zoo"]
     },
     "mobileRNA": {
       "name": "mobileRNA",
-      "version": "1.0.11",
-      "sha256": "10p37qr8wz6chh44fh1nri2db5qqghbbzbpjm02safxdx7h88081",
+      "version": "1.2.0",
+      "sha256": "0f4g54fyjwiqcwfrsrfgb7414x9mk4mcxpsyd6j0bx704qjr743v",
       "depends": ["BiocGenerics", "Biostrings", "DESeq2", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SimDesign", "SummarizedExperiment", "bioseq", "data_table", "dplyr", "edgeR", "ggplot2", "ggrepel", "pheatmap", "progress", "reticulate", "rlang", "rtracklayer", "scales", "tidyr", "tidyselect"]
     },
     "mogsa": {
       "name": "mogsa",
-      "version": "1.38.0",
-      "sha256": "01hr97j5i20qwpck6nfr79wx31y7igz1wzr2m1zdivggb4jg94x7",
+      "version": "1.40.0",
+      "sha256": "131l0xs5gvjkih18h4jckmwmsz4r90cnrrxqnyfrrk9kbdcsb8jw",
       "depends": ["Biobase", "BiocGenerics", "GSEABase", "cluster", "corpcor", "genefilter", "gplots", "graphite", "svd"]
     },
     "monaLisa": {
       "name": "monaLisa",
-      "version": "1.10.1",
-      "sha256": "1pa7q4jr21yx4qf17bs7pjk21fjp4fdlij95gw9ffc5a98513m7b",
+      "version": "1.12.0",
+      "sha256": "0pylick07qkv421l068z6pdjgms0cmns49fh9m9lz9g4r4b9w31y",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "SummarizedExperiment", "TFBSTools", "XVector", "circlize", "glmnet", "stabs", "vioplot"]
     },
     "monocle": {
       "name": "monocle",
-      "version": "2.32.0",
-      "sha256": "0b09mf9fph0mb0zing0prc757d223858q9lj4j3kfpfjpd3jffai",
+      "version": "2.34.0",
+      "sha256": "1qxf83zblihxm3fs5zrzf1spzhnm332n6nbzbzaid69l7xmgl5x0",
       "depends": ["Biobase", "BiocGenerics", "DDRTree", "HSMMSingleCell", "MASS", "Matrix", "RANN", "Rcpp", "Rtsne", "VGAM", "biocViews", "cluster", "combinat", "dplyr", "fastICA", "ggplot2", "igraph", "irlba", "leidenbase", "limma", "matrixStats", "pheatmap", "plyr", "proxy", "reshape2", "slam", "stringr", "tibble", "viridis"]
     },
     "mosaics": {
       "name": "mosaics",
-      "version": "2.42.0",
-      "sha256": "000bwz1z8nwzgyaz69z6krr4ksggpsq48ni9rzl25m1bc27skldj",
+      "version": "2.44.0",
+      "sha256": "0f2qnqzm76hhcq113bag4p2g2li8rf2afdskj4hki8n0mnzgqgnc",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Rcpp", "Rsamtools", "S4Vectors", "lattice"]
     },
     "mosbi": {
       "name": "mosbi",
-      "version": "1.10.0",
-      "sha256": "0kvwsiwqvsphgjcflr1zjhp91k867bqg6x6gj72kl6x9an3rxpri",
+      "version": "1.12.0",
+      "sha256": "09dp77ryr0cg1c8gj67a38s9y0pa7dlxrwjrvsi8vnkbn27ys712",
       "depends": ["BH", "QUBIC", "RColorBrewer", "Rcpp", "RcppParallel", "akmbiclust", "biclust", "fabia", "igraph", "isa2", "xml2"]
     },
     "mosdef": {
       "name": "mosdef",
-      "version": "1.0.0",
-      "sha256": "14zv9mgiqcj2s34hg8wfdij1gss324rkq42clg8f3ancambj74vp",
+      "version": "1.2.0",
+      "sha256": "0y2hniyb1y5hxlsm339059kb4n3l21fzb3xx112igsbk7zd0r258",
       "depends": ["AnnotationDbi", "DESeq2", "DT", "GO_db", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "clusterProfiler", "ggforce", "ggplot2", "ggrepel", "goseq", "htmltools", "rlang", "scales", "topGO"]
     },
     "motifStack": {
       "name": "motifStack",
-      "version": "1.48.0",
-      "sha256": "15v4z1a0kg4ic411aprzc9b7i2l6c456sfj3jaxy95anw3j3iskj",
+      "version": "1.50.0",
+      "sha256": "0wkv0gjvk7p491c4zsg1hh61r3lhmjnif6nd2s63xwqm2qw6a4nx",
       "depends": ["Biostrings", "TFBSTools", "XML", "ade4", "ggplot2", "htmlwidgets"]
     },
     "motifTestR": {
       "name": "motifTestR",
-      "version": "1.0.3",
-      "sha256": "19m8y69cd1x79cqwgwf6360mv7kn0a2gv3lphy2i60p6vlq99s8j",
+      "version": "1.2.1",
+      "sha256": "1ysqk2xsxry9jm78qzph8myyl0f1bab1lfwwazga8513ffxnn4xn",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "ggplot2", "harmonicmeanp", "matrixStats", "patchwork", "rlang", "universalmotif"]
     },
     "motifbreakR": {
       "name": "motifbreakR",
-      "version": "2.18.0",
-      "sha256": "1mxs83l8yrbcx353h0wpc0lczn1jc0y5vg59y9g9dabk41csib47",
-      "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "MotifDb", "S4Vectors", "SummarizedExperiment", "TFMPvalue", "VariantAnnotation", "matrixStats", "motifStack", "pwalign", "rtracklayer", "stringr"]
+      "version": "2.20.0",
+      "sha256": "0308wqrcjzdfm38p9lqphz5h82k2zdzknvhviqzrvcqinzqjqy26",
+      "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "MotifDb", "S4Vectors", "SummarizedExperiment", "TFMPvalue", "VariantAnnotation", "biomaRt", "bsicons", "bslib", "matrixStats", "motifStack", "pwalign", "rtracklayer", "shiny", "stringr", "vroom"]
     },
     "motifcounter": {
       "name": "motifcounter",
-      "version": "1.28.0",
-      "sha256": "1h6wbqn2xbj5ggx0sgp09cvrkcafq7i70mbskg2y9l9nryb38g2z",
+      "version": "1.30.0",
+      "sha256": "1babir5nypi3h2rbqfgkawsv1mbhqkkx8q583cszpwyivyird1x1",
       "depends": ["Biostrings"]
     },
     "motifmatchr": {
       "name": "motifmatchr",
-      "version": "1.26.0",
-      "sha256": "1wpvdg5x51cbzpqa4s2s0zl9h7fsrsp87mxxlhxs65zx6yyfj2xl",
+      "version": "1.28.0",
+      "sha256": "0a2hd7fld7q22kpllpq6zb79ivpfrrq1vz1v4fariar18800fjc2",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TFBSTools"]
     },
     "mpra": {
       "name": "mpra",
-      "version": "1.26.2",
-      "sha256": "061pji88qrzclq7wyklba3492k133zzqsalx377n42fxrw0593z9",
+      "version": "1.28.0",
+      "sha256": "04bbx660bq3fx27dzf5cl33plsg6ndyxv31pa0ind3ma4zzxa47m",
       "depends": ["BiocGenerics", "S4Vectors", "SummarizedExperiment", "limma", "scales", "statmod"]
     },
     "msImpute": {
       "name": "msImpute",
-      "version": "1.14.0",
-      "sha256": "1qjkaa5ksd67izfw5jgg1l843jn6d7h0asp99sd340wbqcdfnyix",
+      "version": "1.16.0",
+      "sha256": "0jizwv0jsc9kq22dm4df8fr50d1d4avx9syrj39fixmvajgk8x9a",
       "depends": ["FNN", "data_table", "dplyr", "limma", "matrixStats", "mvtnorm", "pdist", "reticulate", "scran", "softImpute", "tidyr"]
     },
     "msPurity": {
       "name": "msPurity",
-      "version": "1.30.1",
-      "sha256": "03h492l2x8isd1h4zmr5k6xykswimqfcxfgd67xpjjr0anrc8yl0",
+      "version": "1.32.0",
+      "sha256": "0pnb415v401l98brl61bnzxdl4d89psl1jr4cx4imdp7brixfhbl",
       "depends": ["DBI", "RSQLite", "Rcpp", "dbplyr", "doSNOW", "dplyr", "fastcluster", "foreach", "ggplot2", "magrittr", "mzR", "plyr", "reshape2", "stringr"]
     },
     "msa": {
       "name": "msa",
-      "version": "1.36.1",
-      "sha256": "16ixhinhcbf2nvdmqria231s4qhr8lzhr7yqr7ljrnnwiqadfr67",
+      "version": "1.38.0",
+      "sha256": "0v65pfhl19zi0dc2avzpxq7dygknlr2y44wkir6wmvn8m7jppjlg",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "Rcpp", "S4Vectors"]
     },
     "msgbsR": {
       "name": "msgbsR",
-      "version": "1.28.0",
-      "sha256": "06nbcb1nkci83kjl9l05d3vyfz4w21y0s51wg344bzjra1ycb9gl",
+      "version": "1.30.0",
+      "sha256": "08g8xv3l6a0hxirrgrdsjrgdcrkinraws7bg9yv6dv43a1yabpqp",
       "depends": ["BSgenome", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment", "easyRNASeq", "edgeR", "ggbio", "ggplot2", "plyr"]
     },
     "mslp": {
       "name": "mslp",
-      "version": "1.6.0",
-      "sha256": "0qafwb6rp0r0h5iazj13q703yvld5s1si93vn4gcxk66pgg9fm3w",
+      "version": "1.8.0",
+      "sha256": "0z7igxk2rswznilvsbgxvy6ga7g8fd7i7schgg21bcfy1c0jly4f",
       "depends": ["RankProd", "data_table", "doRNG", "fmsb", "foreach", "magrittr", "org_Hs_eg_db", "pROC", "randomForest"]
     },
     "msmsEDA": {
       "name": "msmsEDA",
-      "version": "1.42.0",
-      "sha256": "1fzw36181rw7z62qggq7j22qhq8zrblpmv8qkqlfg140ywvwv08a",
+      "version": "1.44.0",
+      "sha256": "0i3ivq14jjc2v9d8v536s55w211bh67v39qzl2prringrwncq418",
       "depends": ["MASS", "MSnbase", "RColorBrewer", "gplots"]
     },
     "msmsTests": {
       "name": "msmsTests",
-      "version": "1.42.0",
-      "sha256": "0fadwss9z4bfgkhrrqv322j8x40l5cl4ib85057h4fn03qdijqhq",
+      "version": "1.44.0",
+      "sha256": "0pwz1hzrniqdgcxbd361w4rf5brjgb4wwz5jlny2vfnigb6v1mmd",
       "depends": ["MSnbase", "edgeR", "msmsEDA", "qvalue"]
     },
     "msqrob2": {
       "name": "msqrob2",
-      "version": "1.12.0",
-      "sha256": "1mg4a9mjvzj4y6jw5qpz53wg1h7z6a5l2b20ibp0wr67rns5xkix",
+      "version": "1.14.1",
+      "sha256": "0kwfvmcngwzxm38837lp1jpd20k4cag638q4p7gz9c98qff1rkln",
       "depends": ["BiocParallel", "MASS", "Matrix", "MultiAssayExperiment", "QFeatures", "SummarizedExperiment", "codetools", "limma", "lme4", "purrr"]
     },
     "multiClust": {
       "name": "multiClust",
-      "version": "1.34.0",
-      "sha256": "1md8zli6fhcb5ccy6yksl6c62vfqc2ifznxvpvzch2j1h2fswx84",
+      "version": "1.36.0",
+      "sha256": "0l1a9kajam5zl95j5yvjkjiblmg8wcsvna562drw5nh4lanldsk5",
       "depends": ["amap", "cluster", "ctc", "dendextend", "mclust", "survival"]
     },
     "multiGSEA": {
       "name": "multiGSEA",
-      "version": "1.14.0",
-      "sha256": "14mn8r3n1r9mrpng3b6hl20mmwxz3ns122qnx59lsja7danl9w0w",
+      "version": "1.16.2",
+      "sha256": "1d7l7mlw03sq5yj5dhxanm31m0gy7ix7ddbzq2kv3lpr56rdgqjx",
       "depends": ["AnnotationDbi", "dplyr", "fgsea", "graphite", "magrittr", "metaboliteIDmapping", "metap", "rappdirs", "rlang"]
     },
     "multiHiCcompare": {
       "name": "multiHiCcompare",
-      "version": "1.22.0",
-      "sha256": "0h5b8yaqxy0gpm1kndv0dyz6pvacdy7vh3mbdkbz04q4ng1jnk12",
+      "version": "1.24.0",
+      "sha256": "19z0f0dihfdvdw063a5728hm7wgh2brxp9hvv8b7y04q07ywd1cc",
       "depends": ["BiocParallel", "GenomeInfoDb", "GenomeInfoDbData", "GenomicRanges", "HiCcompare", "aggregation", "data_table", "dplyr", "edgeR", "pbapply", "pheatmap", "qqman"]
     },
     "multiMiR": {
       "name": "multiMiR",
-      "version": "1.26.0",
-      "sha256": "0pzifw4b61v1wrfy6lsb5i4xxpmhl3g6sml09akfdy0skfx5lam8",
+      "version": "1.28.0",
+      "sha256": "0ihj8zlw6g5hv6amrqqkzln8kd7lvhny4z15y4nc2rz7bf5kcsyy",
       "depends": ["AnnotationDbi", "BiocGenerics", "RCurl", "XML", "dplyr", "purrr", "tibble"]
     },
     "multiWGCNA": {
       "name": "multiWGCNA",
-      "version": "1.2.0",
-      "sha256": "1y2rwwy5q2ak861hg8nm5f13rmf2b9dmhsmjwvxc75nzdjg9yqcz",
+      "version": "1.4.0",
+      "sha256": "0lv1hxd23iglmk952y4lf75i50fp5jmb6iwbd3k617i4q3gxam8v",
       "depends": ["SummarizedExperiment", "WGCNA", "cowplot", "data_table", "dcanr", "dplyr", "flashClust", "ggalluvial", "ggplot2", "ggrepel", "igraph", "patchwork", "readr", "reshape2", "scales", "stringr"]
     },
     "multicrispr": {
       "name": "multicrispr",
-      "version": "1.14.0",
-      "sha256": "1625pqby6b0k67vn1h90j5899q5rhc815b64nywnvxlaia7hjvpm",
+      "version": "1.16.1",
+      "sha256": "0kyvmas6kni5x51pwfin7z6m67bg9lhaisqyxf0mcsgwiwz263n8",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "CRISPRseek", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Rbowtie", "data_table", "ggplot2", "karyoploteR", "magrittr", "plyranges", "reticulate", "rtracklayer", "stringi", "tidyr", "tidyselect"]
     },
     "multiscan": {
       "name": "multiscan",
-      "version": "1.64.0",
-      "sha256": "0cp2fy4hl5cdgrii9nl53cd22h87hxsdixhpdi9is914v9s42rkr",
+      "version": "1.66.0",
+      "sha256": "11vkd45kvxkrahkzwrl1xfhy4rhqdr5kmnnf82rzk40mi1j70dyf",
       "depends": ["Biobase"]
     },
     "multistateQTL": {
       "name": "multistateQTL",
-      "version": "1.0.0",
-      "sha256": "1y983wj9awz29rv2fg8ryyindza8gjn54dn775p00zqs7qjnny3m",
+      "version": "1.2.0",
+      "sha256": "1ylh3lf3r22h4hqsp3z1ay3rab6l4ks6j1n0np0dgzsd2dcg0qkr",
       "depends": ["ComplexHeatmap", "QTLExperiment", "S4Vectors", "SummarizedExperiment", "circlize", "collapse", "data_table", "dplyr", "fitdistrplus", "ggplot2", "mashr", "matrixStats", "tidyr", "viridis"]
     },
     "multtest": {
       "name": "multtest",
-      "version": "2.60.0",
-      "sha256": "04dv5rcqwpv0im7j3hvcj8hjybgs4a384zgnjyqbcipcicd2rjz4",
+      "version": "2.62.0",
+      "sha256": "00gs0mb371x5aj9wa8infwfpmg3iqyz0bgmn6gk9mcfl9rf6xkfk",
       "depends": ["Biobase", "BiocGenerics", "MASS", "survival"]
     },
     "mumosa": {
       "name": "mumosa",
-      "version": "1.12.0",
-      "sha256": "1r3i19q5i2pfs8xaag4qcb64hxwkz49msbvv454n5cb2zp1nafvd",
+      "version": "1.14.0",
+      "sha256": "0m7l0sn5npsvwcvpnsl61w8sgbnyanqdrz76chifzd9j7ydwwxqi",
       "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "IRanges", "Matrix", "S4Vectors", "ScaledMatrix", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "beachmat", "igraph", "metapod", "scran", "scuttle", "uwot"]
     },
     "muscat": {
       "name": "muscat",
-      "version": "1.18.0",
-      "sha256": "1gafcq3p693f28gz3p8hk8mlxd9zja95h8953sr56n7krfffy1gi",
-      "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "blme", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "limma", "lme4", "lmerTest", "matrixStats", "progress", "purrr", "scales", "scater", "sctransform", "scuttle", "variancePartition", "viridis"]
+      "version": "1.20.0",
+      "sha256": "04kni9lv04dsnam71dw3ib2jmjfrrndj9432igf5aj22l4wlxbc3",
+      "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "blme", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "limma", "lme4", "lmerTest", "matrixStats", "progress", "purrr", "rlang", "scales", "scater", "sctransform", "scuttle", "variancePartition", "viridis"]
     },
     "muscle": {
       "name": "muscle",
-      "version": "3.46.0",
-      "sha256": "1jx71gzjd9jnr1xa0c0zzjg5a8qhf8czrh4mwbvnclr7g1l21cdq",
+      "version": "3.48.0",
+      "sha256": "0q172f0bwpr5cc1madba8rj258kbjdw32s171y01gkb9jgqn60n3",
       "depends": ["Biostrings"]
     },
     "musicatk": {
       "name": "musicatk",
-      "version": "1.14.1",
-      "sha256": "1bz303lmxjvj24pb03mc64pv0595snhn6g99q3a40w73sqlxh14c",
-      "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BSgenome_Mmusculus_UCSC_mm9", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "MCMCprecision", "Matrix", "NMF", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "VariantAnnotation", "cluster", "data_table", "decompTumor2Sig", "dplyr", "factoextra", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "gtools", "maftools", "magrittr", "matrixTests", "philentropy", "plotly", "rlang", "shiny", "stringi", "stringr", "tibble", "tidyr", "tidyverse", "topicmodels", "uwot"]
+      "version": "2.0.0",
+      "sha256": "173dzy60b3avndz9hywqfm22hpgsq14gdxkxm2glna9qd5sqw2al",
+      "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "BSgenome_Mmusculus_UCSC_mm9", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "MCMCprecision", "Matrix", "NMF", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "VariantAnnotation", "cluster", "conclust", "data_table", "decompTumor2Sig", "dplyr", "factoextra", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "gtools", "maftools", "magrittr", "matrixTests", "philentropy", "plotly", "rlang", "scales", "shiny", "stringi", "stringr", "tibble", "tidyr", "tidyverse", "topicmodels", "uwot"]
     },
     "mygene": {
       "name": "mygene",
-      "version": "1.40.0",
-      "sha256": "0ybvabgdjm63yvvkpkldqddvdcfsncr25rnsw17kbdachar29shj",
+      "version": "1.42.0",
+      "sha256": "0a60g3i4f6mprd4rf9pw093lr9qlnr067pipncl9chabsy9fzkhl",
       "depends": ["GenomicFeatures", "Hmisc", "S4Vectors", "httr", "jsonlite", "plyr", "sqldf", "txdbmaker"]
     },
     "myvariant": {
       "name": "myvariant",
-      "version": "1.34.0",
-      "sha256": "1f82x3vahbsccvyg5gvi34llanzscpvp0pbqhm1ki9frx9hqwysz",
+      "version": "1.36.0",
+      "sha256": "1vmmlkqx4cjhsx126lq4ax8s4qwfl5jqwiwm12i5aqxp9k28586z",
       "depends": ["GenomeInfoDb", "Hmisc", "S4Vectors", "VariantAnnotation", "httr", "jsonlite", "magrittr", "plyr"]
     },
     "mzID": {
       "name": "mzID",
-      "version": "1.42.0",
-      "sha256": "0kh9swzh3hvi6qi64cgr13f22s1mgvz2rid5psb1gy4l3biwadj5",
+      "version": "1.44.0",
+      "sha256": "0lf7w65v01mc7cawlsbjagbrhlh6jpy6ah7pbjgyvy5s0axlzgp2",
       "depends": ["ProtGenerics", "XML", "doParallel", "foreach", "iterators", "plyr"]
     },
     "mzR": {
       "name": "mzR",
-      "version": "2.38.0",
-      "sha256": "02dz23xns9ryz98nip1w68h9q5ckxpyl1zvzklsp4j7p9z2400dk",
+      "version": "2.40.0",
+      "sha256": "1vqd9arlhvhw58jk2r343x6dqbv85ckgzjk04hi3pb6w5z0yvks4",
       "depends": ["Biobase", "BiocGenerics", "ProtGenerics", "Rcpp", "Rhdf5lib", "ncdf4"]
     },
     "ncGTW": {
       "name": "ncGTW",
-      "version": "1.18.0",
-      "sha256": "1x9q4c3xkz984nz33bbh753181qx655zkl46i00h7a9khnab9cdv",
+      "version": "1.20.0",
+      "sha256": "1y1sc6qv5s2x0zg4wpvjflvzzi6zy4h0kvwds1j1kd9wm0ck9z6c",
       "depends": ["BiocParallel", "Rcpp", "xcms"]
     },
     "ncRNAtools": {
       "name": "ncRNAtools",
-      "version": "1.14.0",
-      "sha256": "151s12kg88x4nymzvpzwlfil7rvrbaa99agfxzz03r8dyjnqrqlq",
+      "version": "1.16.0",
+      "sha256": "07kcwcf94vnm7byagnb4dkn1xpdimkp73vnglxh8d12s46vdpvcl",
       "depends": ["GenomicRanges", "IRanges", "S4Vectors", "ggplot2", "httr", "xml2"]
     },
     "ncdfFlow": {
       "name": "ncdfFlow",
-      "version": "2.50.0",
-      "sha256": "1mbq3190nxlzhfb58i7s2f5f9fngda1icnihmyplagh64savlpcn",
+      "version": "2.52.0",
+      "sha256": "16djrka94dhj041sd52ni9r5283fpnj5h5ljzzjqfik10fc9k5z5",
       "depends": ["BH", "Biobase", "BiocGenerics", "Rhdf5lib", "cpp11", "flowCore", "zlibbioc"]
     },
     "ndexr": {
       "name": "ndexr",
-      "version": "1.26.0",
-      "sha256": "1jl7z4a1rdsivc774k15v3q40isgp1ly3lsmgflfkq7jsx62xl5j",
+      "version": "1.28.0",
+      "sha256": "0m6hzx0nk2bq9l40mnjil1vjqys9lvgflifp8gnk3skiw2ddjrsm",
       "depends": ["RCX", "httr", "jsonlite", "plyr", "tidyr"]
     },
     "nearBynding": {
       "name": "nearBynding",
-      "version": "1.14.0",
-      "sha256": "0ni6mipdbwzc0gi8mws1d1b8ylj0pjlvi81kv9r3pm93psr67pj3",
+      "version": "1.16.0",
+      "sha256": "0q5bpfvrb8qvklwc6zhvdrj0rq58p0gpqc08j7cgxhllkmiacisw",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "R_utils", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "dplyr", "ggplot2", "gplots", "magrittr", "matrixStats", "plyranges", "rlang", "rtracklayer", "transport"]
     },
     "nempi": {
       "name": "nempi",
-      "version": "1.12.0",
-      "sha256": "069b7kmpz38s7240ac8iw8m80w62lrly01khfl8b3kikhlr82jcq",
+      "version": "1.14.0",
+      "sha256": "16abvgv4vjbppkh41fsbjscxqjjfi0g8mqb8jf7k0psrvvfs0wg4",
       "depends": ["e1071", "epiNEM", "matrixStats", "mnem", "naturalsort", "nnet", "randomForest"]
     },
-    "netDx": {
-      "name": "netDx",
-      "version": "1.16.0",
-      "sha256": "00ghcj5hzb06pi9aj2rdnasyqgqnvr9qjb0m6b0476yv2mx5x24k",
-      "depends": ["BiocFileCache", "GenomeInfoDb", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RColorBrewer", "ROCR", "Rtsne", "S4Vectors", "bigmemory", "combinat", "doParallel", "foreach", "ggplot2", "glmnet", "httr", "igraph", "plotrix", "pracma", "rappdirs", "reshape2"]
-    },
     "netSmooth": {
       "name": "netSmooth",
-      "version": "1.24.0",
-      "sha256": "0nry64lvqwwq672c6callfjfa0y14igvqpvrvfs2hm0qj8qmg2q8",
+      "version": "1.26.0",
+      "sha256": "0pwnzapfv4c39zggzfylxp7lz7hid3483qq1wdphz99nf796x3hm",
       "depends": ["DelayedArray", "HDF5Array", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "cluster", "clusterExperiment", "data_table", "entropy", "scater"]
     },
     "netZooR": {
       "name": "netZooR",
-      "version": "1.8.0",
-      "sha256": "0z1wi0csnpjz70q5pl5wmdfgqnq66yk9gysxxid8rmkagqxvbg73",
+      "version": "1.10.0",
+      "sha256": "11rq1lhxhwij6wik087wmnzk8aswhmmf3yzcpiljxbk8szsm8np7",
       "depends": ["AnnotationDbi", "Biobase", "GO_db", "GOstats", "MASS", "Matrix", "RCy3", "STRINGdb", "assertthat", "data_table", "doParallel", "dplyr", "foreach", "ggdendro", "ggplot2", "gplots", "igraph", "matrixStats", "matrixcalc", "nnet", "org_Hs_eg_db", "pandaR", "penalized", "reshape", "reshape2", "reticulate", "tidyr", "vegan", "viridisLite", "yarn"]
     },
     "netboost": {
       "name": "netboost",
-      "version": "2.12.0",
-      "sha256": "0xirmys108qhxg7073vm90463a7qs6z557516ff1yczhldaq4psy",
+      "version": "2.14.0",
+      "sha256": "036n93rrcv1b892xmijdvg6slla6h6hmf28rq1cr5fabcjzx6vf5",
       "depends": ["BiocStyle", "R_utils", "Rcpp", "RcppParallel", "WGCNA", "colorspace", "dynamicTreeCut", "impute"]
     },
     "nethet": {
       "name": "nethet",
-      "version": "1.36.0",
-      "sha256": "1mr42pdm2sjpbmiiwjpqd0pvbnc5imlgmg14swc2pp66dl60g7b3",
+      "version": "1.38.0",
+      "sha256": "11kyawxhzwda4n14h1hgvbvzbxl1khxn3ssrwhncdd3fmlkd67hx",
       "depends": ["CompQuadForm", "GSA", "GeneNet", "ICSNP", "ggm", "ggplot2", "glasso", "glmnet", "huge", "limma", "mclust", "multtest", "mvtnorm", "network"]
     },
     "netprioR": {
       "name": "netprioR",
-      "version": "1.30.0",
-      "sha256": "0kgsgjc2q4wvdwbqfx79ql85k6xc60165zair7nwc89wn07rnswy",
+      "version": "1.32.0",
+      "sha256": "15v33ckc58r9yars5wpbm32pvlsdwnc5a6wnalkg72xjr5s1vqjy",
       "depends": ["Matrix", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "pROC", "sparseMVN"]
     },
     "netresponse": {
       "name": "netresponse",
-      "version": "1.64.0",
-      "sha256": "13lynfqsbv8cp6hd452bky4mkf029jwvryx8mzdcx15r4hwsqh5r",
+      "version": "1.66.0",
+      "sha256": "0xaikq96ip8g7xhsljr0z849aqj30sfdh4zdqxvabwbkh0ygxl8k",
       "depends": ["BiocStyle", "RColorBrewer", "Rgraphviz", "ggplot2", "graph", "igraph", "mclust", "minet", "plyr", "qvalue", "reshape2", "rmarkdown"]
     },
     "ngsReports": {
       "name": "ngsReports",
-      "version": "2.6.1",
-      "sha256": "13dmy1g822h8w9f2ylvs40zn810zxamy9jr7vncsbbk6cr87h9lg",
+      "version": "2.8.0",
+      "sha256": "01mgah5b8741y9pqrww9ikwmw823xr5i00jsjbazmhr82h2ksm4z",
       "depends": ["BiocGenerics", "Biostrings", "checkmate", "dplyr", "forcats", "ggdendro", "ggplot2", "jsonlite", "lifecycle", "lubridate", "patchwork", "plotly", "reshape2", "rlang", "rmarkdown", "scales", "stringr", "tibble", "tidyr", "tidyselect", "zoo"]
     },
     "nipalsMCIA": {
       "name": "nipalsMCIA",
-      "version": "1.2.0",
-      "sha256": "0r14hmglxlrwryc6qwn20vfrmy5k2pk7l73d3fz5bmfja06ms6n5",
+      "version": "1.4.2",
+      "sha256": "16n0y9qvm2gb0n6ww1nxxhihgwq39qjpcl3nz0lzwhh0d32841l8",
       "depends": ["ComplexHeatmap", "MultiAssayExperiment", "RSpectra", "SummarizedExperiment", "dplyr", "fgsea", "ggplot2", "pracma", "rlang", "scales"]
     },
     "nnNorm": {
       "name": "nnNorm",
-      "version": "2.68.0",
-      "sha256": "1r3klap7yazz73jh7dja1wlgg9ladfw1aaljirbiq1dvlb1q1i8f",
+      "version": "2.70.0",
+      "sha256": "1cr3ddbrfjhlqxjm43knmmmw8xzx9j2j1kkkxd1cj1nh86v3hn5n",
       "depends": ["marray", "nnet"]
     },
     "nnSVG": {
       "name": "nnSVG",
-      "version": "1.8.0",
-      "sha256": "00346z7i5hgljylv00l5pcmj3y769mqnhac0f4l7jhiww3xswfbs",
+      "version": "1.10.0",
+      "sha256": "0gvrazxcw7v9ylcvm73npgqsc0knyy8vrdf6ypkbiyjz5n9vw27b",
       "depends": ["BRISC", "BiocParallel", "Matrix", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "matrixStats"]
     },
     "normalize450K": {
       "name": "normalize450K",
-      "version": "1.32.0",
-      "sha256": "0iavswwgv0qhnwlf99nxrpmswbd5m9ihi7i68gby07hmsl5gci2a",
+      "version": "1.34.0",
+      "sha256": "1hlj8habzbsmxdia5aw3khpl12v4zchchs8nk4mmvvhwa81lr326",
       "depends": ["Biobase", "illuminaio", "quadprog"]
     },
     "normr": {
       "name": "normr",
-      "version": "1.30.0",
-      "sha256": "1lkh4a6c499g4wicj4khkyhz361k4q0aydk4gc122vn4877z14c6",
+      "version": "1.32.0",
+      "sha256": "00rng96zpa0bp2j39ysvh6wf87pbbkxkaby651h8a3pl20bfs3s1",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rcpp", "bamsignals", "qvalue", "rtracklayer"]
     },
     "npGSEA": {
       "name": "npGSEA",
-      "version": "1.40.0",
-      "sha256": "1d9q7jy6axmh62xs4m1lxfh8j7vwq4k995l28hcfwh7qk38k4gqr",
+      "version": "1.42.0",
+      "sha256": "17gn5axgplx935s9f4y1m21nxagkpdd29rvmrxc0qya6a8zfriy3",
       "depends": ["Biobase", "BiocGenerics", "GSEABase"]
     },
     "nuCpos": {
       "name": "nuCpos",
-      "version": "1.22.0",
-      "sha256": "03qv4p5mvwbnm2grfnrszphv3c0k2lwja5cbq27cv6il7bnz8m0m",
+      "version": "1.24.0",
+      "sha256": "0wsxwdwjf6fm2p92jnd1fs99mxchfdqpm1qa7q61g1l2xjsmjhpw",
       "depends": []
     },
     "nucleR": {
       "name": "nucleR",
-      "version": "2.36.0",
-      "sha256": "1gbn4rpgil579xkrwd78wc7h6h0f8j1kjz0vvlijy63i6g380wfk",
+      "version": "2.38.0",
+      "sha256": "0y63jh1d3ms4jpgvig64af64gandbn632fzibfjpyj015zyaamg8",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "dplyr", "ggplot2", "magrittr"]
     },
     "nucleoSim": {
       "name": "nucleoSim",
-      "version": "1.32.0",
-      "sha256": "0f64601jm3bvcdpls3d5njpparkb5h5v6zvhb1jf46fdvyg4xcss",
+      "version": "1.34.0",
+      "sha256": "02fv54fb9qqmicyr8hkrr6rd9gg74wdg05v2k6gdmp9cph37dcqb",
       "depends": ["IRanges", "S4Vectors"]
     },
     "nullranges": {
       "name": "nullranges",
-      "version": "1.10.0",
-      "sha256": "0a20aqqja5nkp39v7mxjnc98in63zhl00mnhsm952ja7v1l2xfsw",
+      "version": "1.12.0",
+      "sha256": "0kv1jgdsaj65g1j848clszbnf0zwlpq75sxm4xal5ai4llx16206",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "data_table", "ggplot2", "ggridges", "plyranges", "progress", "rlang", "scales"]
     },
     "occugene": {
       "name": "occugene",
-      "version": "1.64.0",
-      "sha256": "01dgpbz3w5bbbhiz67fripxw1pwdd1iinnywvm9xgzjkdhr3g18y",
+      "version": "1.66.0",
+      "sha256": "1igpk8prnczlfvmcypn5n619lw18bx2bhbqdjwdfsm11j95sgp07",
       "depends": []
     },
     "octad": {
       "name": "octad",
-      "version": "1.6.0",
-      "sha256": "1nlad40c9mzs74zrc82smmmyknw4dr88c6zm0ywm62v0wb8l22n7",
+      "version": "1.8.0",
+      "sha256": "1ns496avsxifmar9v3056gsxav3dlmdhmnzf4kclqlkkb78r21nb",
       "depends": ["AnnotationHub", "Biobase", "DESeq2", "EDASeq", "ExperimentHub", "GSVA", "RUVSeq", "Rfast", "S4Vectors", "data_table", "dplyr", "edgeR", "foreach", "ggplot2", "htmlwidgets", "httr", "limma", "magrittr", "octad_db", "plotly", "qpdf", "reshape2", "rhdf5"]
     },
     "odseq": {
       "name": "odseq",
-      "version": "1.32.0",
-      "sha256": "03bhlarifh5r13ii7a5kd6gj9w0zdgjz9p89pj0lhgx2lglh2nm8",
+      "version": "1.34.0",
+      "sha256": "1z8zxjfyq3v0rb1p4m1jrl1x0lcjmchyl6a7g08cn4a5n7wkhdr0",
       "depends": ["kebabs", "mclust", "msa"]
     },
     "oligo": {
       "name": "oligo",
-      "version": "1.68.2",
-      "sha256": "0ch6b4rg5v6fj0fgniqiigx1gnnqgwji90bxqngllman388bx867",
+      "version": "1.70.0",
+      "sha256": "0z7y8sicap04alkqrzqdjiq7jnmk5mf9h1ki4622hw5wf0gjiark",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "DBI", "RSQLite", "affxparser", "affyio", "ff", "oligoClasses", "preprocessCore", "zlibbioc"]
     },
     "oligoClasses": {
       "name": "oligoClasses",
-      "version": "1.66.0",
-      "sha256": "15icfcmpwrnjpyahc4v168fpcbsml6x7h4drmsyh9l8d1284yb4n",
+      "version": "1.68.0",
+      "sha256": "01zcbrk1yxv6jzainw4hc2c20mzg4ji8l8svbyncch39f3n6agb7",
       "depends": ["Biobase", "BiocGenerics", "BiocManager", "Biostrings", "DBI", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "SummarizedExperiment", "affyio", "ff", "foreach"]
     },
+    "omXplore": {
+      "name": "omXplore",
+      "version": "1.0.0",
+      "sha256": "05wamijib8f8i2kljcfrkkqaxaz3n71sprmr58wadpgfwh0j2zqw",
+      "depends": ["DT", "FactoMineR", "MSnbase", "MultiAssayExperiment", "PSMatch", "RColorBrewer", "SummarizedExperiment", "dendextend", "dplyr", "factoextra", "gplots", "highcharter", "htmlwidgets", "shiny", "shinyBS", "shinyjqui", "shinyjs", "tibble", "tidyr", "vioplot", "visNetwork"]
+    },
     "omada": {
       "name": "omada",
-      "version": "1.6.0",
-      "sha256": "1by6im4frl724yif9pjgcmp016hahj5xj35h1zqa4k5g8nw54f9s",
+      "version": "1.8.0",
+      "sha256": "1zxhp0yikp27ni020m1i6h10wkczwq03szi88rkjz2zb24bm8gf3",
       "depends": ["Rcpp", "clValid", "diceR", "dplyr", "fpc", "genieclust", "ggplot2", "glmnet", "kernlab", "pdfCluster", "reshape"]
     },
     "omicRexposome": {
       "name": "omicRexposome",
-      "version": "1.26.0",
-      "sha256": "0p3x3pp3337nvmqqssrbfh6zn2fp260ss8wjc2c90b0gr4c4h6wc",
+      "version": "1.28.0",
+      "sha256": "18iagcd6ylqh6x6kc32m3lzhb0q164a7ylj8fhbjcn4h5qx04c70",
       "depends": ["Biobase", "MultiDataSet", "PMA", "SmartSVA", "SummarizedExperiment", "ggplot2", "ggrepel", "gridExtra", "isva", "limma", "omicade4", "rexposome", "stringr", "sva"]
     },
     "omicade4": {
       "name": "omicade4",
-      "version": "1.44.0",
-      "sha256": "18gp8qpmnbc5yjqyvvwvmrdybvm6zddc0r8bfglxz5wg4a91h4wk",
+      "version": "1.46.0",
+      "sha256": "0c9ga5pg521w15zakwa0pw52yahj80x59lq5ziq294mj05fjmx32",
       "depends": ["Biobase", "ade4", "made4"]
     },
     "omicplotR": {
       "name": "omicplotR",
-      "version": "1.24.0",
-      "sha256": "1zb4xik2rvznbigfh42k97mlfc4ls997cyv4ixd34qp0z3929djc",
+      "version": "1.26.0",
+      "sha256": "08v57k5bdssz2p4bqxk62fg2wvaviflnzmsas4izzas4zagnabci",
       "depends": ["ALDEx2", "DT", "compositions", "jsonlite", "knitr", "matrixStats", "rmarkdown", "shiny", "vegan", "zCompositions"]
     },
     "omicsPrint": {
       "name": "omicsPrint",
-      "version": "1.24.0",
-      "sha256": "0b5mccw1vpcw1i38lcy6cjr6im0iw17a3z8vwfs7f2z7nj72p8cf",
+      "version": "1.26.0",
+      "sha256": "0a7k75gylzmbrlzvafa4iv48krn239980x02jp32plm6vf0r3iac",
       "depends": ["MASS", "MultiAssayExperiment", "RaggedExperiment", "SummarizedExperiment", "matrixStats"]
     },
     "omicsViewer": {
       "name": "omicsViewer",
-      "version": "1.8.0",
-      "sha256": "0ij7slf4y708gdw06nmm2w7p3svcadvc9s44rzkgjb66is4h375g",
+      "version": "1.10.0",
+      "sha256": "06sf3h3ajzyp572fkc7nhc5cha6djsfk86jfbclbpyn7q1mkqfim",
       "depends": ["Biobase", "DT", "Matrix", "RColorBrewer", "ROCR", "RSQLite", "S4Vectors", "SummarizedExperiment", "beeswarm", "curl", "drc", "fastmatch", "fgsea", "flatxml", "ggplot2", "ggseqlogo", "htmlwidgets", "httr", "matrixStats", "networkD3", "openxlsx", "plotly", "psych", "reshape2", "shiny", "shinyWidgets", "shinybusy", "shinycssloaders", "shinyjs", "shinythemes", "stringr", "survival", "survminer"]
     },
     "ompBAM": {
       "name": "ompBAM",
-      "version": "1.8.0",
-      "sha256": "12r57wgqszwlm4agfbs0gfakhh87y8jpaalv2rq38nif479hpmyz",
-      "depends": ["Rcpp", "zlibbioc"]
+      "version": "1.10.0",
+      "sha256": "124i599k1ikxhz3xlzlz82rikmfff6f0c73cldi8cgy6qsqkwwf1",
+      "depends": ["Rcpp"]
     },
     "oncomix": {
       "name": "oncomix",
-      "version": "1.26.0",
-      "sha256": "01ap90pyj3xdnhryiywa57pl0d8lj4q7qxxvf8ahhbr0a2hy8py0",
+      "version": "1.28.0",
+      "sha256": "1w311rrnvpx8fkvdyhjvjdcyfslwfah840ci9cq54m934rjxajgg",
       "depends": ["RColorBrewer", "SummarizedExperiment", "ggplot2", "ggrepel", "mclust"]
     },
     "oncoscanR": {
       "name": "oncoscanR",
-      "version": "1.6.0",
-      "sha256": "1n5rcnbb06pl3b27wkzzmz0l7g3hgfjpi7v7anbhscr2i1hy46b9",
+      "version": "1.8.0",
+      "sha256": "0n7x3m52xigafl4hj3szl5p592c8j90snkyz9gvfg4xa150n6hmj",
       "depends": ["GenomicRanges", "IRanges", "S4Vectors", "magrittr", "readr"]
     },
     "onlineFDR": {
       "name": "onlineFDR",
-      "version": "2.12.0",
-      "sha256": "1sivrkb21dmb7wgdxd0q3nmjlvaqrh21c20s4lq8azn685frlznh",
+      "version": "2.14.0",
+      "sha256": "0kajxc6ggw61n6yfg6vfimqwkd1djp4bb5azd2a097mz1d5wyrmq",
       "depends": ["Rcpp", "RcppProgress", "progress"]
     },
     "ontoProc": {
       "name": "ontoProc",
-      "version": "1.26.4",
-      "sha256": "0d3fypwwnb9qjdfkhd6w0ppy3hdp7ipds78300kq9yp0a6v7a9w2",
-      "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "DT", "R_utils", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "dplyr", "graph", "httr", "igraph", "magrittr", "ontologyIndex", "ontologyPlot", "reticulate", "shiny"]
+      "version": "2.0.0",
+      "sha256": "0vxya3p8gzb74z4jiniidibbhwcjpjpl4rarhgj40zj2fh25873r",
+      "depends": ["AnnotationHub", "Biobase", "BiocFileCache", "DT", "R_utils", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "basilisk", "dplyr", "graph", "httr", "igraph", "magrittr", "ontologyIndex", "ontologyPlot", "reticulate", "shiny"]
     },
     "openCyto": {
       "name": "openCyto",
-      "version": "2.16.1",
-      "sha256": "13ndjvm3l5pl1jgv7bqp78didqq3rx6br4p1ncqqp68mm048f2ll",
+      "version": "2.18.0",
+      "sha256": "07n5vv5jl34lc0l7ix952vararf6zwz3f64w1p32xnnkzvszpmiw",
       "depends": ["BH", "Biobase", "BiocGenerics", "RBGL", "RColorBrewer", "cpp11", "data_table", "flowClust", "flowCore", "flowViz", "flowWorkspace", "graph", "ncdfFlow"]
     },
     "openPrimeR": {
       "name": "openPrimeR",
-      "version": "1.26.0",
-      "sha256": "1wcwg0hpnmfzzbxsqggmgim15f4zky0xx3ynyypykyh1c5i3f4yi",
+      "version": "1.28.0",
+      "sha256": "18axx1r9vfwy5mwb1cg5l2hpghqwlx50qgqgvhplkg5khg7388ns",
       "depends": ["BiocGenerics", "Biostrings", "DECIPHER", "GenomicRanges", "Hmisc", "IRanges", "RColorBrewer", "S4Vectors", "XML", "ape", "digest", "dplyr", "foreach", "ggplot2", "lpSolveAPI", "magrittr", "openxlsx", "plyr", "pwalign", "reshape2", "scales", "seqinr", "stringdist", "stringr", "uniqtag"]
     },
-    "openPrimeRui": {
-      "name": "openPrimeRui",
-      "version": "1.26.0",
-      "sha256": "0w00ya6xb70am000hybrxgcq8bpd950w36n01v4l0pfmfcvqd9fa",
-      "depends": ["DT", "openPrimeR", "rmarkdown", "shiny", "shinyBS", "shinyjs"]
-    },
     "oposSOM": {
       "name": "oposSOM",
-      "version": "2.22.0",
-      "sha256": "1i6jkhnb7b420zacxxiv4c0il1n7yrvg5v4qnd465d1s2wifwndn",
+      "version": "2.24.0",
+      "sha256": "00m15lqyb1w84zbhg11imw2ji0adaflwimxdfrgnr7acjw5mic9x",
       "depends": ["Biobase", "RCurl", "Rcpp", "RcppParallel", "XML", "ape", "biomaRt", "fastICA", "fdrtool", "graph", "igraph", "pixmap", "png", "scatterplot3d", "tsne"]
     },
     "oppar": {
       "name": "oppar",
-      "version": "1.32.0",
-      "sha256": "1bdcddyw1m51x6fs928j8qmcfdkw21hi7xvgih97nyddnnl5ad5x",
+      "version": "1.34.0",
+      "sha256": "1h7i524lmhddbhj99jyn7a1m352r8s39pqxyc0gl285vajag2r0d",
       "depends": ["Biobase", "GSEABase", "GSVA"]
     },
     "oppti": {
       "name": "oppti",
-      "version": "1.18.0",
-      "sha256": "1lmjvncp8h3p9vb4979v5spw2yp7w2mj4w60b728njhp9cxh8k6g",
+      "version": "1.20.0",
+      "sha256": "09cjf0vzgixklmppsf8r9hplq7m8njrw81yhgy07ygwk78mx0glq",
       "depends": ["RColorBrewer", "devtools", "ggplot2", "knitr", "limma", "parallelDist", "pheatmap", "reshape"]
     },
     "optimalFlow": {
       "name": "optimalFlow",
-      "version": "1.16.0",
-      "sha256": "1b7a7xca1fb7732hwzcgz79p5pp6xsy0z5az5inv6g8z7a2wpngn",
+      "version": "1.18.0",
+      "sha256": "07rws3yrqk6v7i7abq3gv55zhbnrncw6012g51p0n0k87klhwlsi",
       "depends": ["Rfast", "dbscan", "doParallel", "dplyr", "ellipse", "flowMeans", "foreach", "optimalFlowData", "randomForest", "rgl", "rlang", "robustbase", "transport"]
     },
     "orthogene": {
       "name": "orthogene",
-      "version": "1.10.0",
-      "sha256": "12rf9xjziziw7r02assnpa4ncryyqkfibj3bhbrq8vp7ygvbn64a",
+      "version": "1.12.0",
+      "sha256": "0jwf7ylw6i25xv4b01lz6k993hnln3v81rqqnqf5n4mi76ifk0yg",
       "depends": ["DelayedArray", "Matrix", "babelgene", "data_table", "dplyr", "ggplot2", "ggpubr", "ggtree", "gprofiler2", "grr", "homologene", "jsonlite", "patchwork", "repmis"]
     },
     "orthos": {
       "name": "orthos",
-      "version": "1.2.0",
-      "sha256": "0y5q9dmn6qwq8psgclwzca3bpfiyi7xh325hxj328h3fis1sm9xb",
+      "version": "1.4.0",
+      "sha256": "13z4f1h5niaclmd0zn6lq3y1j2nnq4kb1l5kxak2kabhqj13ap2n",
       "depends": ["AnnotationHub", "BiocParallel", "DelayedArray", "ExperimentHub", "HDF5Array", "S4Vectors", "SummarizedExperiment", "basilisk", "colorspace", "cowplot", "dplyr", "ggplot2", "ggpubr", "ggrepel", "ggsci", "keras", "orthosData", "plyr", "reticulate", "rlang", "tensorflow", "tidyr"]
     },
     "pRoloc": {
       "name": "pRoloc",
-      "version": "1.44.1",
-      "sha256": "09vm0308qzc5hrvck2ksyn5f4zgdg9jpgcxg4zzrczs4ygp5jpzz",
+      "version": "1.46.0",
+      "sha256": "01rympyipv68yq6wsbyygcc9886cxb1rfj7s0x036g671pgnjxg4",
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "FNN", "LaplacesDemon", "MASS", "MLInterfaces", "MSnbase", "RColorBrewer", "Rcpp", "RcppArmadillo", "biomaRt", "caret", "class", "coda", "dendextend", "e1071", "ggplot2", "gtools", "hexbin", "kernlab", "knitr", "lattice", "mclust", "mixtools", "mvtnorm", "nnet", "plyr", "proxy", "randomForest", "sampling", "scales"]
     },
     "pRolocGUI": {
       "name": "pRolocGUI",
-      "version": "2.14.0",
-      "sha256": "0lxnvh2hx7zayfmdfiqhlwp3gmpx0bsz3ds67zalhvf1xmn2cn88",
+      "version": "2.16.0",
+      "sha256": "0yfc1sz2scdwpisbvqlg3amnhbzn9kqbir3hcib7w96m5raxlg5l",
       "depends": ["Biobase", "BiocGenerics", "DT", "MSnbase", "colorspace", "colourpicker", "dplyr", "ggplot2", "pRoloc", "scales", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "shinyhelper", "shinyjs"]
     },
     "packFinder": {
       "name": "packFinder",
-      "version": "1.16.0",
-      "sha256": "0y8sw0vyfry6vfn4k9w81m9s4a98bhc5h2a4nvy666qjganhfm8i",
+      "version": "1.18.0",
+      "sha256": "0ll3849za23jrq9hly8b05dlx664l62x0yk7775yh7k8i76cmp5p",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "ape", "kmer"]
     },
     "padma": {
       "name": "padma",
-      "version": "1.14.1",
-      "sha256": "0h0hhdq1hxvysf7hrk0jpy1jb1b7zq8gh6k905glhqykmdzm0p25",
+      "version": "1.16.0",
+      "sha256": "0v9jnrqc93779gf1znbd9yx97k2v6098xhzxn3qf4z1j13p4r4xf",
       "depends": ["FactoMineR", "MultiAssayExperiment", "S4Vectors", "SummarizedExperiment"]
     },
     "pageRank": {
       "name": "pageRank",
-      "version": "1.14.0",
-      "sha256": "0d7mgxssyc7bbcjhhrlj4y7v4xgw16y499c0k6wcrh3y4f24xwna",
+      "version": "1.16.0",
+      "sha256": "1mhpr1m95351a6r1sfb2alraf6i9jxmyas1i69l5vx5ccgc8322m",
       "depends": ["GenomicRanges", "igraph", "motifmatchr"]
     },
     "paircompviz": {
       "name": "paircompviz",
-      "version": "1.42.0",
-      "sha256": "13znncas7s3ihjvv401fjbsg80iliv4afqw9w4jyazz4vdwgp400",
+      "version": "1.44.0",
+      "sha256": "05qq1jxlb86ry5xyfcv3yjas98v8qsxwz53p5gqgxygxzk1lings",
       "depends": ["Rgraphviz"]
     },
     "pairedGSEA": {
       "name": "pairedGSEA",
-      "version": "1.4.0",
-      "sha256": "181x2r7af4243b2jmsc71gi8jlq80d4gzkcprr0dk0sis9bh1pqj",
+      "version": "1.6.0",
+      "sha256": "16kf9jahdb234gf8n83q623nsni67l4zmqh12mfir970l3galkzr",
       "depends": ["BiocParallel", "DESeq2", "DEXSeq", "S4Vectors", "SummarizedExperiment", "aggregation", "fgsea", "ggplot2", "limma", "sva"]
     },
     "pairkat": {
       "name": "pairkat",
-      "version": "1.10.0",
-      "sha256": "1rxwf8nlmc18h6zi95v4xhs5hqaygpba15wsc06msslzr905s6id",
+      "version": "1.12.0",
+      "sha256": "1y1zjhh90kwlmdkzrbv63n0m0j3pl7nvsjzrrbhrz9lyiigrzw7v",
       "depends": ["CompQuadForm", "KEGGREST", "SummarizedExperiment", "data_table", "igraph", "magrittr", "tibble"]
     },
     "pandaR": {
       "name": "pandaR",
-      "version": "1.36.0",
-      "sha256": "1cgy9sx5nk94d43baxsm25lh64fmmmznxd832r2wnj6a7p07bbj2",
+      "version": "1.38.0",
+      "sha256": "07w702788cxq26fk7jj346nqa58mc4pncs3fcv5sx8p6z5a785kz",
       "depends": ["Biobase", "BiocGenerics", "RUnit", "ggplot2", "hexbin", "igraph", "matrixStats", "plyr", "reshape"]
     },
     "panelcn_mops": {
       "name": "panelcn.mops",
-      "version": "1.26.0",
-      "sha256": "1fmb1zixg909nqdf34z2aq0llzzsrf4pd73pc8xyachivyx73p4a",
+      "version": "1.28.0",
+      "sha256": "10zqj21k8k4qz4f83cy4xfdkdk672i8jjrj16plnhlx67xl520qa",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "cn_mops"]
     },
     "panp": {
       "name": "panp",
-      "version": "1.74.0",
-      "sha256": "0w5hbjpdwy6g3x38c64r29106s1smyakzpm1qb50f6g8mf99lsvy",
+      "version": "1.76.0",
+      "sha256": "03shbp9izf8q7fvdcb6fyi9ybgbmjxmmzvyvl8acgvx2r6gsmqjp",
       "depends": ["Biobase", "affy"]
     },
-    "pareg": {
-      "name": "pareg",
-      "version": "1.8.0",
-      "sha256": "1b9vvn1ppw1vbfmkzkbd6b01pkqnsknbrjv1js983dpjv23x6xlb",
-      "depends": ["DOSE", "Matrix", "basilisk", "devtools", "doFuture", "doRNG", "dplyr", "foreach", "future", "ggplot2", "ggraph", "ggrepel", "glue", "hms", "igraph", "keras", "logger", "magrittr", "nloptr", "progress", "proxy", "purrr", "reticulate", "rlang", "stringr", "tensorflow", "tfprobability", "tibble", "tidygraph", "tidyr"]
-    },
     "parglms": {
       "name": "parglms",
-      "version": "1.36.0",
-      "sha256": "1b63nkd50pn1mgr8l0svi3h8rplb5g50a2xvkxa7j26w6ss8302v",
+      "version": "1.38.0",
+      "sha256": "1gmrfbd4rha4zrxi8bskai1i32ccjn1ws315camb8qfpxr3wfb4n",
       "depends": ["BatchJobs", "BiocGenerics", "doParallel", "foreach"]
     },
     "parody": {
       "name": "parody",
-      "version": "1.62.0",
-      "sha256": "0k2gc8p9dk7j21n6hxdqjna09m6cggx47spkmxkqvwqm97mwqzrp",
+      "version": "1.64.0",
+      "sha256": "08vaqnrgkqxb99xjmgja3hs6r7n0z9chmykw6kjv6fgg914qlf2d",
       "depends": []
     },
     "partCNV": {
       "name": "partCNV",
-      "version": "1.2.0",
-      "sha256": "0f632ih6fy46923a4cf7njkgaqwkmgbwz74djbd2awsnk02afbbw",
-      "depends": ["AnnotationHub", "GenomicRanges", "Seurat", "SingleCellExperiment", "data_table", "depmixS4", "magrittr"]
+      "version": "1.4.0",
+      "sha256": "196h4h4mr3ikp5rh3h3jcny7zda06hmx7ckwcbvildskhpyisarc",
+      "depends": ["AnnotationHub", "BiocStyle", "GenomicRanges", "Seurat", "SingleCellExperiment", "data_table", "depmixS4", "magrittr"]
     },
     "pathRender": {
       "name": "pathRender",
-      "version": "1.72.0",
-      "sha256": "0dcds0agwphriqc0d8rw7yycqvxzhv7jj4xs2lvwhzwqrkxicpf1",
+      "version": "1.74.0",
+      "sha256": "00nmvykh3s5lq6n7ggjbz4qisbpbf9lj76fbzabkblnb5xcbsvx4",
       "depends": ["AnnotationDbi", "RColorBrewer", "Rgraphviz", "cMAP", "graph"]
     },
     "pathifier": {
       "name": "pathifier",
-      "version": "1.42.0",
-      "sha256": "1m21713zj4i5iygrj0ygc5zwcrw6038hb486l6c5nvykhzc5w64p",
+      "version": "1.44.0",
+      "sha256": "16y1630jkl20zh5p13zr1h8aygmkbx60p9z9rxdci6dalv6b3yrb",
       "depends": ["R_oo", "princurve"]
     },
     "pathlinkR": {
       "name": "pathlinkR",
-      "version": "1.0.1",
-      "sha256": "1zwcrxi926m6zyhv3na7jv8cj61m93a3mg7zz6rqblvxrg218gmg",
-      "depends": ["ComplexHeatmap", "circlize", "clusterProfiler", "dplyr", "ggforce", "ggplot2", "ggpubr", "ggraph", "ggrepel", "igraph", "purrr", "sigora", "stringr", "tibble", "tidygraph", "tidyr", "vegan", "visNetwork"]
+      "version": "1.2.0",
+      "sha256": "0jmxmwfdz7gvqgvanr5pxp9da2y9jpaq1n7gxyfgy5g5d0bfbahq",
+      "depends": ["ComplexHeatmap", "circlize", "clusterProfiler", "dplyr", "fgsea", "ggforce", "ggplot2", "ggpubr", "ggraph", "ggrepel", "igraph", "purrr", "sigora", "stringr", "tibble", "tidygraph", "tidyr", "vegan", "visNetwork"]
     },
     "pathview": {
       "name": "pathview",
-      "version": "1.44.0",
-      "sha256": "1papw23dhhkqmm864dc3xm028xm0ywc6sjcm7xk93f2j7yj65x0v",
+      "version": "1.46.0",
+      "sha256": "0j7r239qvcb36025if4lqqjzxajfdjggp3cdy0h7yqziijz12kq8",
       "depends": ["AnnotationDbi", "KEGGREST", "KEGGgraph", "Rgraphviz", "XML", "graph", "org_Hs_eg_db", "png"]
     },
     "pathwayPCA": {
       "name": "pathwayPCA",
-      "version": "1.20.0",
-      "sha256": "055jqyzi6lq056ibdyzxy5mzcs5f93im2fbiz73a33bqndpc9s5i",
+      "version": "1.22.0",
+      "sha256": "0r345sxbxak67f3qgv78vnrcky8lv0fypr2cppqa3bc9sybqvg00",
       "depends": ["lars", "survival"]
     },
-    "paxtoolsr": {
-      "name": "paxtoolsr",
-      "version": "1.38.0",
-      "sha256": "0m3r8ynqkhksgj0d3si3wcnk5a801g1qklin8zm81cr1nlfx67gw",
-      "depends": ["R_utils", "XML", "httr", "igraph", "jsonlite", "plyr", "rJava", "rappdirs", "readr", "rjson"]
-    },
     "pcaExplorer": {
       "name": "pcaExplorer",
-      "version": "2.30.0",
-      "sha256": "1szl2gyhw55ad4phcb7qn14amjb6xg65l3p4hnjzp6rda2cy9437",
-      "depends": ["AnnotationDbi", "DESeq2", "DT", "GO_db", "GOstats", "GenomicRanges", "IRanges", "NMF", "S4Vectors", "SummarizedExperiment", "base64enc", "biomaRt", "genefilter", "ggplot2", "ggrepel", "heatmaply", "knitr", "limma", "pheatmap", "plotly", "plyr", "rmarkdown", "scales", "shiny", "shinyAce", "shinyBS", "shinydashboard", "threejs", "tidyr", "topGO"]
+      "version": "3.0.0",
+      "sha256": "1i5qzbwdgi59izgppz63mvddiph7qv48h75243capxqfhbcqkq1g",
+      "depends": ["AnnotationDbi", "DESeq2", "DT", "GO_db", "GOstats", "GenomicRanges", "IRanges", "NMF", "S4Vectors", "SummarizedExperiment", "base64enc", "biomaRt", "genefilter", "ggplot2", "ggrepel", "heatmaply", "knitr", "limma", "mosdef", "pheatmap", "plotly", "plyr", "rmarkdown", "scales", "shiny", "shinyAce", "shinyBS", "shinydashboard", "threejs", "tidyr", "topGO"]
     },
     "pcaMethods": {
       "name": "pcaMethods",
-      "version": "1.96.0",
-      "sha256": "1hrq0xmpr1l95hyi6ls9r86ahwf2rcbvr8m7cpg6ra0gsfyn4mpi",
+      "version": "1.98.0",
+      "sha256": "02p9ax76wm4rfkz9hmrf95xvq91ckha689qkg6lpwgb8f81wga7j",
       "depends": ["Biobase", "BiocGenerics", "MASS", "Rcpp"]
     },
-    "pcxn": {
-      "name": "pcxn",
-      "version": "2.26.0",
-      "sha256": "13gahdsvz7ss3chcvqmdyrnw31rcgiplqg7awrn930drwljlimqk",
-      "depends": ["pcxnData", "pheatmap"]
-    },
     "pdInfoBuilder": {
       "name": "pdInfoBuilder",
-      "version": "1.68.0",
-      "sha256": "1dcd0lscvywy5y5xfhfmn39n2iypjr4fjldfgmx8qa80b1d0xcbi",
+      "version": "1.70.0",
+      "sha256": "0jg5hlib0i46mgkza9rhj95assii6h7gcyl7mgknxyki2bhiz7dc",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "DBI", "IRanges", "RSQLite", "S4Vectors", "affxparser", "oligo", "oligoClasses"]
     },
     "peakPantheR": {
       "name": "peakPantheR",
-      "version": "1.18.0",
-      "sha256": "0rr8kmk6d4m7aipmz2pi2rzwxhxc600bk9r24fdgsw4kbh17fman",
+      "version": "1.20.0",
+      "sha256": "14pi3qjkikd35nfz3pmpljjr7yxv6136vwv6bhbd05jk37r6dia6",
       "depends": ["DT", "MSnbase", "XML", "bslib", "doParallel", "foreach", "ggplot2", "gridExtra", "lubridate", "minpack_lm", "mzR", "pracma", "scales", "shiny", "shinycssloaders", "stringr", "svglite"]
     },
     "peco": {
       "name": "peco",
-      "version": "1.16.0",
-      "sha256": "1w3yf77lk5whdhicq6rzp61cpivvkc0jj5wsasjxaqvl7lf1k6fs",
+      "version": "1.18.0",
+      "sha256": "1fir0w1w7x3789gckjyw096vylg61vafhgf34nvq1l4nl0ddai0h",
       "depends": ["SingleCellExperiment", "SummarizedExperiment", "assertthat", "circular", "conicfit", "doParallel", "foreach", "genlasso", "scater"]
     },
     "pengls": {
       "name": "pengls",
-      "version": "1.10.0",
-      "sha256": "0i3v91a3y5gyns5pnjnx7kmfwbp66kllj4gynzfjlgpf57y4qhk4",
+      "version": "1.12.0",
+      "sha256": "0b75c4l4j9pw2bjfnnln8bwxq5k7ah3bans9pn8yf4gf71j1vls6",
       "depends": ["BiocParallel", "glmnet", "nlme"]
     },
     "pepStat": {
       "name": "pepStat",
-      "version": "1.38.0",
-      "sha256": "1k4nf5jlpcf7bgrv08mgd575gkp08sw9w7nzab7idizdz4pvqvj4",
+      "version": "1.40.0",
+      "sha256": "14rc4kdjazx99665fj10wj5cmbcmg8m4rmaq09xbvbz65rcjsd5j",
       "depends": ["Biobase", "GenomicRanges", "IRanges", "data_table", "fields", "ggplot2", "limma", "plyr"]
     },
     "pepXMLTab": {
       "name": "pepXMLTab",
-      "version": "1.38.0",
-      "sha256": "1y4c4cfc8s87rdmr2z2n3p3k6mann9ywragdl0v4rizss5rj35dl",
+      "version": "1.40.0",
+      "sha256": "124h7pfi4da2svl9mxard32cpc3nz6fqdj776vv1q9mdz23wppq7",
       "depends": ["XML"]
     },
     "periodicDNA": {
       "name": "periodicDNA",
-      "version": "1.14.0",
-      "sha256": "1fx7kvgl9znzpz6i33zl6019m0r4jcwsvsycjwhqaz8g3b5k4z8q",
+      "version": "1.16.0",
+      "sha256": "1i581w88yd3qr4hp8m0dhbasxr3qgd2yz01mxdhiydrkf06hckd4",
       "depends": ["BSgenome", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "cowplot", "ggplot2", "magrittr", "rtracklayer", "zoo"]
     },
     "pfamAnalyzeR": {
       "name": "pfamAnalyzeR",
-      "version": "1.4.0",
-      "sha256": "06bp5nghgrj8qyzqp1v869vck1j10093r9dp67w0kav4x4srkyyl",
+      "version": "1.6.0",
+      "sha256": "1d14nhi4gndg8gr4fk4yvfnjcvin9rndram0xhnjrkia166p1msx",
       "depends": ["dplyr", "magrittr", "readr", "stringr", "tibble"]
     },
     "pgca": {
       "name": "pgca",
-      "version": "1.28.0",
-      "sha256": "0yj7vcx3qyy3296k1lzi3qfgwcf0h08x784ygh5wkfa4y23azj0b",
+      "version": "1.30.0",
+      "sha256": "0d0y609cjys6m754r8vnnxwf19c8yd9ngrasv4nyzjxknzii71k9",
       "depends": []
     },
     "pgxRpi": {
       "name": "pgxRpi",
-      "version": "1.0.3",
-      "sha256": "18c5xpfyqjjj5vc3nnajwq5sq1w24lqqs4ik91vjw5qg41rbspy3",
-      "depends": ["GenomicRanges", "S4Vectors", "SummarizedExperiment", "attempt", "circlize", "dplyr", "ggplot2", "httr", "lubridate", "parallelly", "plyr", "survival", "survminer"]
+      "version": "1.2.0",
+      "sha256": "17fa4gcjb1r985kvln3npdgqsa38rv9vzgs6m4mal453ij58fk3w",
+      "depends": ["GenomicRanges", "S4Vectors", "SummarizedExperiment", "attempt", "circlize", "dplyr", "future", "future_apply", "ggplot2", "httr", "lubridate", "survival", "survminer", "yaml"]
     },
     "phantasus": {
       "name": "phantasus",
-      "version": "1.24.0",
-      "sha256": "0gw7d8n4nb3rjari1zrdqqhdz0ca0mgw40yr56r3x3gsyqpjlzxa",
-      "depends": ["AnnotationDbi", "Biobase", "DESeq2", "GEOquery", "Matrix", "Rook", "XML", "assertthat", "ccaPP", "config", "curl", "data_table", "edgeR", "fgsea", "fs", "ggplot2", "gtable", "htmltools", "httpuv", "httr", "jsonlite", "limma", "opencpu", "phantasusLite", "pheatmap", "protolite", "rhdf5", "rhdf5client", "scales", "stringr", "svglite", "yaml"]
+      "version": "1.26.0",
+      "sha256": "01z7vr54ji89wbwv1cc1icscw06x8lxxnhiyjls0rslccwiprr1g",
+      "depends": ["AnnotationDbi", "Biobase", "DESeq2", "GEOquery", "Matrix", "Rook", "XML", "apeglm", "assertthat", "ccaPP", "config", "curl", "data_table", "edgeR", "fgsea", "fs", "ggplot2", "gtable", "htmltools", "httpuv", "httr", "jsonlite", "limma", "opencpu", "phantasusLite", "pheatmap", "protolite", "rhdf5", "rhdf5client", "scales", "stringr", "svglite", "tidyr", "yaml"]
     },
     "phantasusLite": {
       "name": "phantasusLite",
-      "version": "1.2.0",
-      "sha256": "1adr0z6gg72dhcfa98b5sfs1lsyypbs882wckzjgmjv16v56na4r",
+      "version": "1.4.0",
+      "sha256": "13nnsm7bkpirakyn5k9pz730jjj9ddiwppmk9x0rmfbqchnj8n1g",
       "depends": ["Biobase", "data_table", "httr", "rhdf5client", "stringr"]
     },
     "phenoTest": {
       "name": "phenoTest",
-      "version": "1.52.0",
-      "sha256": "1l5r19gksrbqsdl9v8r2f4hrsbsxbkircbp3rxiis5x6y17ca9hy",
+      "version": "1.54.0",
+      "sha256": "111qdiqkzrmcy1lw2961icm55hfgfb6x5h2vddswk4pvj7ylwhqr",
       "depends": ["AnnotationDbi", "BMA", "Biobase", "Category", "GSEABase", "Heatplus", "Hmisc", "annotate", "biomaRt", "ellipse", "genefilter", "ggplot2", "gplots", "hgu133a_db", "hopach", "limma", "mgcv", "survival", "xtable"]
     },
     "phenomis": {
       "name": "phenomis",
-      "version": "1.6.2",
-      "sha256": "06bwkhp503mqf8yyzqkl1sym8p6vl20sbb3ms9d5p81gnm87wg6q",
+      "version": "1.8.0",
+      "sha256": "02pdhaawhiyzhf89b0xgvh85kr8ih31zqm3158v45f5fim4k6ach",
       "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "PMCMRplus", "RColorBrewer", "SummarizedExperiment", "VennDiagram", "biodb", "biodbChebi", "data_table", "futile_logger", "ggplot2", "ggrepel", "htmlwidgets", "igraph", "limma", "plotly", "ranger", "ropls", "tibble", "tidyr"]
     },
     "phenopath": {
       "name": "phenopath",
-      "version": "1.28.0",
-      "sha256": "073v6sxf3k10257npbmxxh6bvdjwnvk3zh1zq2yvm9jzg2n34i99",
+      "version": "1.30.0",
+      "sha256": "1kg4x01xp7j3klpqz24fihzhi9sy9dz4i4073zijwb4rvy661jf3",
       "depends": ["Rcpp", "SummarizedExperiment", "dplyr", "ggplot2", "tibble", "tidyr"]
     },
     "philr": {
       "name": "philr",
-      "version": "1.30.0",
-      "sha256": "1j6lq7rprvqs8azj13l9qd5xylcmqgw6687cqn0rbsdhgiaqlh5h",
+      "version": "1.32.0",
+      "sha256": "1ian38y69ng5xi928msp57maf0gr5bb57wnbfifpjdyvz7sinp8q",
       "depends": ["ape", "ggplot2", "ggtree", "phangorn", "tidyr"]
     },
     "phosphonormalizer": {
       "name": "phosphonormalizer",
-      "version": "1.28.0",
-      "sha256": "1l58dv15fffmji7yzw96gg6221b895kaxjpxphx6ixl203m5gz03",
+      "version": "1.30.0",
+      "sha256": "1lpnfvw5krfipz2k96mfdg848d3xyjj71qzzlgnh6xmxiaimabbc",
       "depends": ["matrixStats", "plyr"]
     },
     "phyloseq": {
       "name": "phyloseq",
-      "version": "1.48.0",
-      "sha256": "0a8q4wcqcxs7933bxg9bg03ps6hnybvcpqmlpz1pjy3affzghcbi",
+      "version": "1.50.0",
+      "sha256": "0s64xz2svqrdypi5nkf3yilvv66a3g6yq6321c4sk23qm6341b5n",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "ade4", "ape", "biomformat", "cluster", "data_table", "foreach", "ggplot2", "igraph", "multtest", "plyr", "reshape2", "scales", "vegan"]
     },
     "piano": {
       "name": "piano",
-      "version": "2.20.0",
-      "sha256": "0v168wkwxzh70h2c08ad4dzlgklbgvx1fzwrzw2mqq0fyczj0diw",
+      "version": "2.22.0",
+      "sha256": "037xgsb57gc1ysb0p1nsb9mhfv7lgry3anza0znyhb3wbnjzz1q4",
       "depends": ["Biobase", "BiocGenerics", "DT", "fgsea", "gplots", "htmlwidgets", "igraph", "marray", "relations", "scales", "shiny", "shinydashboard", "shinyjs", "visNetwork"]
     },
     "pickgene": {
       "name": "pickgene",
-      "version": "1.76.0",
-      "sha256": "1a13p8n75bnz3dyxvp83vpxp23i85dq22mwn9mada9i8dixy49mc",
+      "version": "1.78.0",
+      "sha256": "1h3wih2rs05hx4h1iccj14cj6nw2xlc1dqcfqm3inn040qvr9ig3",
       "depends": ["MASS"]
     },
     "pipeComp": {
       "name": "pipeComp",
-      "version": "1.14.0",
-      "sha256": "1wq7b5f5hdxg2q6av782dm2gmzzdx58ss7ns9vizyxli3k926p5n",
+      "version": "1.16.0",
+      "sha256": "1hmi2fbnzd1pzilm4ca3gzmfnv0dbil77ml9a8x7hf3bqac398ww",
       "depends": ["BiocParallel", "ComplexHeatmap", "Matrix", "RColorBrewer", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "aricode", "circlize", "clue", "cluster", "cowplot", "dplyr", "ggplot2", "intrinsicDimension", "knitr", "matrixStats", "randomcoloR", "reshape2", "scales", "scater", "scran", "uwot", "viridisLite"]
     },
     "pipeFrame": {
       "name": "pipeFrame",
-      "version": "1.20.0",
-      "sha256": "12wi520dylsjmf3vzwsdqqfqgcz5g4znfs2n5sd9b4805smc8k8l",
+      "version": "1.22.0",
+      "sha256": "089vbqwk6i5zg3bdkqr63ndkgj3sd8ac999423bqpkc2cfg9p6cm",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "digest", "magrittr", "rmarkdown", "visNetwork"]
     },
     "planet": {
       "name": "planet",
-      "version": "1.12.0",
-      "sha256": "0qfvddm5hnhplhni8xwwivc87n4gvvwxslxhrmvx10zsppn536g4",
+      "version": "1.14.0",
+      "sha256": "1vnz03gppcklywix2mkyxqz8ivx71kkl8kdn72da7720jp45hb86",
       "depends": ["dplyr", "magrittr", "tibble"]
     },
     "planttfhunter": {
       "name": "planttfhunter",
-      "version": "1.4.0",
-      "sha256": "1sz19ryxdlsm30by416bi6icnkcd5znim31x9w7f4x762fv6ffvp",
+      "version": "1.6.0",
+      "sha256": "0r0s1lys5nqdnl38xkkf1ir1pczmqb14ciy2irabbs4d2ni43bdl",
       "depends": ["Biostrings", "SummarizedExperiment"]
     },
     "plasmut": {
       "name": "plasmut",
-      "version": "1.2.0",
-      "sha256": "0k8mjvs8vwgx98m19zk2ckyz5maf72px68kr0wniclmkapls3l0a",
+      "version": "1.4.0",
+      "sha256": "1jah13a4mgvqg6p3jw9f9jz6rgjwga9nfg0yilcmc933iv8zri2k",
       "depends": ["dplyr", "tibble"]
     },
     "plgem": {
       "name": "plgem",
-      "version": "1.76.0",
-      "sha256": "0my4jpxw3xy9n40cqvdaz6ay7gpwshn2iqxr43knrk0ckpyxx2cr",
+      "version": "1.78.0",
+      "sha256": "1d2v7wqcdabr2903pi36il0hhkq1fr2fw0b8gznn89yyfgwq9k4a",
       "depends": ["Biobase", "MASS"]
     },
     "plier": {
       "name": "plier",
-      "version": "1.74.0",
-      "sha256": "0svk8p4h212l3igfmrxhqi90xz74jicr5y780556k9bcj3jwqg5c",
+      "version": "1.76.0",
+      "sha256": "0jcr8drnnscrimdn81qh7gmv7p4f62wzji2yb0s2v83526ly7xjy",
       "depends": ["Biobase", "affy"]
     },
     "plotGrouper": {
       "name": "plotGrouper",
-      "version": "1.22.0",
-      "sha256": "169786jrqbcf8qhysar22cb5am2zh6j7w601k9784b4ywhxh3ac0",
+      "version": "1.24.0",
+      "sha256": "10mbgk8klsmm8dwhi27kqgx2jqdb7wrh1xqczq31da461nk1pb85",
       "depends": ["Hmisc", "colourpicker", "dplyr", "egg", "ggplot2", "ggpubr", "gridExtra", "gtable", "magrittr", "readr", "readxl", "rlang", "scales", "shiny", "shinythemes", "stringr", "tibble", "tidyr"]
     },
     "plotgardener": {
       "name": "plotgardener",
-      "version": "1.10.2",
-      "sha256": "115j3fh9abdrlgf2dsd9jx4lja1pjfg0fh0if3vwg1gfv7qnzfrn",
-      "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rcpp", "curl", "data_table", "dplyr", "ggplotify", "plyranges", "purrr", "rlang", "strawr", "withr"]
+      "version": "1.12.0",
+      "sha256": "0vfw431z7plqlxnmaxgy61gg499b4p38bbb61axaipppldvf87rl",
+      "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rcpp", "curl", "data_table", "dplyr", "ggplotify", "glue", "plyranges", "purrr", "rhdf5", "rlang", "strawr", "withr"]
     },
     "plyinteractions": {
       "name": "plyinteractions",
-      "version": "1.2.0",
-      "sha256": "095sb616r5xwcbqsgw4b7kiywl6lbwp6rbs80qymglpqkbywwp7j",
+      "version": "1.4.0",
+      "sha256": "0mw7kbsy21fxbhi0biq8x84i0lvlads0f84mvqg5ycsl641484sp",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "dplyr", "plyranges", "rlang", "tibble", "tidyselect"]
     },
     "plyranges": {
       "name": "plyranges",
-      "version": "1.24.0",
-      "sha256": "0rh5l6bd80nhffqpnnc2c00mvp8p32ykld05h94c3y8c9mvmsl58",
+      "version": "1.26.0",
+      "sha256": "0ai6p7q4iva420wnm0008p1vivd72gc1anwhzzsmy14bxr52rwbx",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "dplyr", "magrittr", "rlang", "rtracklayer", "tidyselect"]
     },
+    "plyxp": {
+      "name": "plyxp",
+      "version": "1.0.0",
+      "sha256": "1q8hidnqrw3b6is2ngld5m3idz4ibkwjfqjdm90slqdsbr79bx8l",
+      "depends": ["S4Vectors", "S7", "SummarizedExperiment", "cli", "dplyr", "glue", "pillar", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"]
+    },
     "pmm": {
       "name": "pmm",
-      "version": "1.36.0",
-      "sha256": "1qsv7mrz1w5msxkiqp1rvxy5cgfjkwm432c12rr3gm4z3jy1ma5h",
+      "version": "1.38.0",
+      "sha256": "0nrp23hnk74il7m9v5nv1fn6ihfryghq5h3p9j86zyllxp08jvda",
       "depends": ["lme4"]
     },
     "pmp": {
       "name": "pmp",
-      "version": "1.16.0",
-      "sha256": "0ryjv1g63nzipym1ijln6nv2w5flv15030b9jp09ddi5p3hn5h1j",
+      "version": "1.18.0",
+      "sha256": "0kk0fn0q844xl5z4kjx2yygwrckkqw45zvkg84kxc0pn8ab77dq0",
       "depends": ["S4Vectors", "SummarizedExperiment", "ggplot2", "impute", "matrixStats", "missForest", "pcaMethods", "reshape2"]
     },
     "podkat": {
       "name": "podkat",
-      "version": "1.36.0",
-      "sha256": "0bjan7w0mxylabvaf3c2nqv5yifddslhd4dh360il193qs07g72c",
+      "version": "1.38.0",
+      "sha256": "14rfw680n8jlmppm657wiwv4axrqsyhc7w5mkk2yl7qcw5c84ii5",
       "depends": ["BSgenome", "Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "Rhtslib", "Rsamtools"]
     },
     "pogos": {
       "name": "pogos",
-      "version": "1.24.0",
-      "sha256": "1i5cmz5icgmd2xd9r19i6xr9v4nydqpydbf84c8ann07p0qyg5b3",
+      "version": "1.26.0",
+      "sha256": "02mkx2p8l6nh05bcayl0klv8zy7zys0bpf0bq80nz1cs7509ggz0",
       "depends": ["S4Vectors", "ggplot2", "httr", "ontoProc", "rjson", "shiny"]
     },
-    "polyester": {
-      "name": "polyester",
-      "version": "1.39.0",
-      "sha256": "0fw0qhmbygjq4ryspyqikb8rxfn33ks000j7sshgfg8hf2rmqg3x",
-      "depends": ["Biostrings", "IRanges", "S4Vectors", "limma", "logspline", "zlibbioc"]
-    },
     "powerTCR": {
       "name": "powerTCR",
-      "version": "1.24.0",
-      "sha256": "04w6jhpc1vkqrm3dr5igp1iwkammmi53mqafjz694n379hamxrhg",
+      "version": "1.26.0",
+      "sha256": "0xkqzh0bkji5acca3xcc68xqryyxvizgka5nabbw5w14zhrnymx5",
       "depends": ["VGAM", "cubature", "doParallel", "evmix", "foreach", "magrittr", "purrr", "truncdist", "vegan"]
     },
     "ppcseq": {
       "name": "ppcseq",
-      "version": "1.12.0",
-      "sha256": "0b8s29zhw3s3nbxf57fa9cixfdwx0q4d3g4b6bi35fsr0r90a44q",
+      "version": "1.14.0",
+      "sha256": "0f5vrp3q5vj4hvm6gm1452biq6dbpg7pkcw8s3gy6dv0ixizinzy",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "benchmarkme", "dplyr", "edgeR", "foreach", "ggplot2", "lifecycle", "magrittr", "purrr", "rlang", "rstan", "rstantools", "tibble", "tidybayes", "tidyr"]
     },
     "pqsfinder": {
       "name": "pqsfinder",
-      "version": "2.20.0",
-      "sha256": "0v2skn7c1vy7s8hbl92v9mq3ckp3xnyq0ijvmihzm5z8yz9bclx6",
+      "version": "2.22.0",
+      "sha256": "0rxz4zg7lmn9q9mxi1h2wf9w4f05lg3889nbq2dip5xzs75p7fa4",
       "depends": ["BH", "Biostrings", "GenomicRanges", "IRanges", "Rcpp", "S4Vectors"]
     },
     "pram": {
       "name": "pram",
-      "version": "1.20.0",
-      "sha256": "0cc74whwnjgf8svfps2i0c9n243rzq15ffdwdwdd986mwn6v5kvv",
+      "version": "1.22.0",
+      "sha256": "0j74w5z2nnbacjq50x9v8qp0k078a0qy7n2wwy9j3wh0sr3j6k17",
       "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "data_table", "rtracklayer"]
     },
     "prebs": {
       "name": "prebs",
-      "version": "1.44.0",
-      "sha256": "0mzy2w5jq08370nl53ms2xadr46lc0hvlgv2kkw5ikjf58rsfgx7",
+      "version": "1.46.0",
+      "sha256": "11b5fzagvd935bi0j6415qq1gp4jmk471h2g78skya2004r5fkwr",
       "depends": ["Biobase", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RPA", "S4Vectors", "affy"]
     },
     "preciseTAD": {
       "name": "preciseTAD",
-      "version": "1.14.0",
-      "sha256": "0gxq07q8nv2h0j20vsjgbah8121l79sxjhjg9rf79r73pmm1733f",
+      "version": "1.16.0",
+      "sha256": "1brn1813nrgh5l3np7lfsdn02r1aw0xrjmxaly2cwbrblycnp41f",
       "depends": ["GenomicRanges", "IRanges", "ModelMetrics", "PRROC", "S4Vectors", "caret", "cluster", "dbscan", "doSNOW", "e1071", "foreach", "gtools", "pROC", "pbapply", "rCGH", "randomForest"]
     },
     "preprocessCore": {
       "name": "preprocessCore",
-      "version": "1.66.0",
-      "sha256": "1cd91iakbpf2hjysc44sqqrah63cgq4fz3n8j81virfwl3ir95xm",
+      "version": "1.68.0",
+      "sha256": "0qpvyg5wjgf1bf1h2mripbsn03by3nap0561kk8qsxg4q71bdnah",
       "depends": []
     },
     "primirTSS": {
       "name": "primirTSS",
-      "version": "1.22.0",
-      "sha256": "1c932ynp5rsymz6z7m9v38fwm30gja7z60yq3xjwj6gxw1rf7sy5",
+      "version": "1.24.0",
+      "sha256": "07s212lh2mjfr91zh7w5avwdb3fjb4fkrm5kc8x55rcf84qm30db",
       "depends": ["BSgenome_Hsapiens_UCSC_hg38", "BiocGenerics", "Biostrings", "GenomicRanges", "GenomicScores", "Gviz", "IRanges", "JASPAR2018", "R_utils", "S4Vectors", "TFBSTools", "dplyr", "phastCons100way_UCSC_hg38", "purrr", "rtracklayer", "shiny", "stringr", "tibble", "tidyr"]
     },
     "proActiv": {
       "name": "proActiv",
-      "version": "1.14.0",
-      "sha256": "1x70jjym4220vkwzhr2cn4hjxvxdh2mhwfyd8rp3wp6gh7d9q87a",
+      "version": "1.16.0",
+      "sha256": "1mpq6mjwyfng339m9nq6n68h7llj0483wjqqmss7vbnhfgj2q84w",
       "depends": ["AnnotationDbi", "BiocParallel", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "gplots", "rlang", "scales", "tibble", "txdbmaker"]
     },
     "proBAMr": {
       "name": "proBAMr",
-      "version": "1.38.0",
-      "sha256": "183wf1045s9ckkcwns33ps237cdip67kv9csx499h2aghhwwvf3y",
+      "version": "1.40.0",
+      "sha256": "15fl3691hipzxm1zxjnjif9z7brnbq71dq6vc8zdr4w458m1zngj",
       "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "rtracklayer", "txdbmaker"]
     },
     "proDA": {
       "name": "proDA",
-      "version": "1.18.0",
-      "sha256": "1h3695q4al7pr3q1vj1qfiig6c5lhljxlvxpfbv6k0h987ha1fiw",
+      "version": "1.20.0",
+      "sha256": "1l1wz66dnyv9kpfkw529641ixz8j2b3ynqj5b883nc8ch850ppba",
       "depends": ["BiocGenerics", "S4Vectors", "SummarizedExperiment", "extraDistr"]
     },
     "procoil": {
       "name": "procoil",
-      "version": "2.32.0",
-      "sha256": "02p8dy3gi86zp5z842sjx3rcy8a7kvji8mg4xw5krzz4pkzjjk8y",
+      "version": "2.34.0",
+      "sha256": "0wfmh3fn87c1cl2cqc92202xbbw6as5r4x0i8k4cz7nac11lfiz6",
       "depends": ["Biostrings", "S4Vectors", "kebabs"]
     },
     "profileScoreDist": {
       "name": "profileScoreDist",
-      "version": "1.32.0",
-      "sha256": "0sf2k2iccvfidy0sf2p4xi3bp5gd67izbr2075w302d8085rw1i7",
+      "version": "1.34.0",
+      "sha256": "19qyxazgxix3llaxl5nvypwsazgkacg9svplzlnl031gqf0qg6ya",
       "depends": ["BiocGenerics", "Rcpp"]
     },
     "profileplyr": {
       "name": "profileplyr",
-      "version": "1.20.0",
-      "sha256": "1gpjmkn1s509smaal15rg3629y69vnxifhyfd8xa65x7m9v1fvbc",
+      "version": "1.22.0",
+      "sha256": "0ahwxyic7b39sc09zfhany8zg64n83izkwyqj95krdzdfr823m5c",
       "depends": ["BiocGenerics", "BiocParallel", "ChIPseeker", "ComplexHeatmap", "EnrichedHeatmap", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "R_utils", "Rsamtools", "S4Vectors", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "TxDb_Mmusculus_UCSC_mm10_knownGene", "TxDb_Mmusculus_UCSC_mm9_knownGene", "circlize", "dplyr", "ggplot2", "magrittr", "org_Hs_eg_db", "org_Mm_eg_db", "pheatmap", "rGREAT", "rjson", "rlang", "rtracklayer", "soGGi", "tidyr", "tiff"]
     },
     "progeny": {
       "name": "progeny",
-      "version": "1.26.0",
-      "sha256": "1f5y1sza9vm7wqd4mp5g7sypc9kbf9zpl015rbl41wz4y3ai21sb",
+      "version": "1.28.0",
+      "sha256": "0ysxjady2cc3rijc3m2izd48zwm039scbk1h51z0926hyqg56h9c",
       "depends": ["Biobase", "decoupleR", "dplyr", "ggplot2", "ggrepel", "gridExtra", "reshape2", "tidyr"]
     },
     "projectR": {
       "name": "projectR",
-      "version": "1.20.0",
-      "sha256": "1c9v4iw8s4hm7wjdv3ir6df0yskz95b0wnpljiph4zv4h22q32ac",
+      "version": "1.22.0",
+      "sha256": "0z16qahb2rvxad99y9lychlz2am4w4alpa2ypjmd1f7x2c46skj4",
       "depends": ["Matrix", "MatrixModels", "NMF", "RColorBrewer", "ROCR", "cluster", "cowplot", "dplyr", "fgsea", "ggalluvial", "ggplot2", "ggrepel", "limma", "msigdbr", "reshape2", "scales", "tsne", "umap", "viridis"]
     },
     "protGear": {
       "name": "protGear",
-      "version": "1.8.0",
-      "sha256": "1wbdp7f55lbn0gcxgnp9xk0y5npn7jmk9vp7yq9v76j7f396vj2f",
+      "version": "1.10.0",
+      "sha256": "0nhx40i7mh5y0yd2crlshxq0844yfvjakpdgd86w9y3c7879bs69",
       "depends": ["Biobase", "FactoMineR", "GGally", "Kendall", "MASS", "data_table", "dplyr", "factoextra", "flexdashboard", "genefilter", "ggplot2", "ggpubr", "gtools", "htmltools", "knitr", "limma", "magrittr", "pheatmap", "plotly", "plyr", "purrr", "readr", "remotes", "rlang", "rmarkdown", "shiny", "shinydashboard", "styler", "tibble", "tidyr", "vsn"]
     },
     "proteinProfiles": {
       "name": "proteinProfiles",
-      "version": "1.44.0",
-      "sha256": "1dmy2cmjxclnml8bci6ihw5ak4ibgah4r17yzy9ypas0y457ff5c",
+      "version": "1.46.0",
+      "sha256": "192qhqlxln53zwcc1i1x3fg0brngphm183j6nx8bjgxhx0vqky40",
       "depends": []
     },
     "psichomics": {
       "name": "psichomics",
-      "version": "1.30.0",
-      "sha256": "0nwfaw1a4mxdzqk0zqadxispdasx75nlb19zla753nmydxlpavj0",
+      "version": "1.32.0",
+      "sha256": "1792pbwypd8v8dfqfc5n1s21k2kqky3j9gvzldnxsd20y8wfha2s",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "DT", "R_utils", "Rcpp", "Rfast", "SummarizedExperiment", "XML", "cluster", "colourpicker", "data_table", "digest", "dplyr", "edgeR", "fastICA", "fastmatch", "ggplot2", "ggrepel", "highcharter", "htmltools", "httr", "jsonlite", "limma", "pairsD3", "plyr", "purrr", "recount", "reshape2", "shiny", "shinyBS", "shinyjs", "stringr", "survival", "xtable"]
     },
-    "psygenet2r": {
-      "name": "psygenet2r",
-      "version": "1.36.0",
-      "sha256": "1khjid5lkkn5qpnk9adw1in4km41q067mj5r5yqs2iz5hv4vx6xv",
-      "depends": ["BgeeDB", "Biobase", "GO_db", "RCurl", "biomaRt", "ggplot2", "igraph", "labeling", "reshape2", "stringr", "topGO"]
-    },
     "ptairMS": {
       "name": "ptairMS",
-      "version": "1.12.0",
-      "sha256": "0r0h4mdvhbrr3j78qzdcfw7q5q492wx9v78rg2xzw59ynqbyv3gg",
+      "version": "1.14.0",
+      "sha256": "0q445dmspnyzvk1a8ygwdap3s0lmii6arcmg7bfjz111bcsfkgqn",
       "depends": ["Biobase", "DT", "Hmisc", "MSnbase", "Rcpp", "bit64", "chron", "data_table", "doParallel", "enviPat", "foreach", "ggplot2", "ggpubr", "gridExtra", "minpack_lm", "plotly", "rhdf5", "rlang", "scales", "shiny", "shinyscreenshot", "signal"]
     },
     "puma": {
       "name": "puma",
-      "version": "3.46.0",
-      "sha256": "1l6xvj6l9f5kmff3a5q7vzf2sssyhkqpa4im46g53jhkindbqwg6",
+      "version": "3.48.0",
+      "sha256": "0wpfiza6cr2pvf098gyls19r3q72dah30knrg4n4pwnl55p8mvdl",
       "depends": ["Biobase", "affy", "affyio", "mclust", "oligo", "oligoClasses"]
     },
     "pvac": {
       "name": "pvac",
-      "version": "1.52.0",
-      "sha256": "132hvlnp3cfxazvf0wq1q5v00q5x79fg60r7vsx07wi1vkjba3wg",
+      "version": "1.54.0",
+      "sha256": "0c77rmpr3x9sjjmq3wwb1azms5a7dgjlvvrwmmd0i1bp928ksl6v",
       "depends": ["Biobase", "affy"]
     },
     "pvca": {
       "name": "pvca",
-      "version": "1.44.0",
-      "sha256": "0bk1nrjhn78wcbcawz8bx2lm3y45mhfv22yrrlxrz91sah9jjw27",
+      "version": "1.46.0",
+      "sha256": "1n3gn0bdbpgwkgkbcp5655sx9k8rw7a6pr7z7hfxx6nd7i5gnzg2",
       "depends": ["Biobase", "Matrix", "lme4", "vsn"]
     },
-    "pwOmics": {
-      "name": "pwOmics",
-      "version": "1.36.0",
-      "sha256": "00c198vm7zzsq2a43c6iar5937556s65183wk1k7wy1zl8vqi8vg",
-      "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "GenomicRanges", "STRINGdb", "biomaRt", "data_table", "gplots", "graph", "igraph", "rBiopaxParser"]
-    },
     "pwalign": {
       "name": "pwalign",
-      "version": "1.0.0",
-      "sha256": "1m0j1m5jif5spd9fkpzz3z3c9s8vwiy8xvpx8rz8igxj89rwrwb7",
+      "version": "1.2.0",
+      "sha256": "1i01xhg8sjz9gx5pqaq8wam9r13l8m9n9pf1aiavjif20gd0rz3b",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "S4Vectors", "XVector"]
     },
     "qPLEXanalyzer": {
       "name": "qPLEXanalyzer",
-      "version": "1.22.0",
-      "sha256": "15cmfrp1hilqqkkxphd4lbqmk4mgv3s8ky76bnidfv58qc5pa940",
+      "version": "1.24.0",
+      "sha256": "03n1mq5jgbhy6jnw65l9j6dy22s2wx4djnygc002fylzh9vglp9p",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "MSnbase", "RColorBrewer", "assertthat", "dplyr", "ggdendro", "ggplot2", "limma", "magrittr", "preprocessCore", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "qckitfastq": {
       "name": "qckitfastq",
-      "version": "1.20.0",
-      "sha256": "0wb6r4mdh3zf3hic88cn9s22s0dn7h65gl4djwrcl5sm5b1a6sxm",
+      "version": "1.22.0",
+      "sha256": "0hpixpb4xxpdwh7v3x2hapri137mavzcq020qfhclrlf5a0gwhjc",
       "depends": ["RSeqAn", "Rcpp", "data_table", "dplyr", "ggplot2", "magrittr", "reshape2", "rlang", "seqTools", "zlibbioc"]
     },
     "qcmetrics": {
       "name": "qcmetrics",
-      "version": "1.42.0",
-      "sha256": "0r7c67bjf9j7r9yciljx2sgnarrjaf1gazf6n8rjjar2jfmrsmrm",
+      "version": "1.44.0",
+      "sha256": "1bh9kr91r2svnrpcdyars8k2fsf35s5iqdzgmx1k8h0vyw0gs11j",
       "depends": ["Biobase", "S4Vectors", "knitr", "pander", "xtable"]
     },
     "qmtools": {
       "name": "qmtools",
-      "version": "1.8.0",
-      "sha256": "1w0kd1kawf0w4rmlz8pfnabagrjvnyql2bcs2f7nl7sp6q7sfvni",
+      "version": "1.10.0",
+      "sha256": "00d1cmcpin1j922ly5x1zwmfnss0psjq6i1mxkxmsqm5rjzrnw2a",
       "depends": ["MsCoreUtils", "SummarizedExperiment", "VIM", "ggplot2", "heatmaply", "igraph", "limma", "patchwork", "rlang", "scales"]
     },
     "qpcrNorm": {
       "name": "qpcrNorm",
-      "version": "1.62.0",
-      "sha256": "1rcs9p5y50ynwmpxqwhigh9qxgs54shrglzjnakq08j24hxkyd2h",
+      "version": "1.64.0",
+      "sha256": "1m558ncz36qjsjd0l2zagr8i43f0fhjabkk2kcnil4n7b0hh13l5",
       "depends": ["Biobase", "affy", "limma"]
     },
     "qpgraph": {
       "name": "qpgraph",
-      "version": "2.38.0",
-      "sha256": "040haanlhmd11isghcrdidf2nal4195kskp0q8965x41fbdvsx37",
+      "version": "2.40.0",
+      "sha256": "1ydrja6rmvk57gamasgda86mjkk0c6yrhny4762m56xfwd6y9qs0",
       "depends": ["AnnotationDbi", "Biobase", "BiocParallel", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rgraphviz", "S4Vectors", "annotate", "graph", "mvtnorm", "qtl"]
     },
     "qsea": {
       "name": "qsea",
-      "version": "1.30.0",
-      "sha256": "141fi7zk9czr4j1d0y1hk1hz33nq3k79cdkawp0x92nvja1n9njd",
+      "version": "1.32.0",
+      "sha256": "1ph05lavgy8xnz6dimbxy26bp23dw3bqf1kp0bkyxn94zvavwmy4",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "HMMcopy", "IRanges", "Rsamtools", "S4Vectors", "gtools", "limma", "rtracklayer", "zoo"]
     },
     "qsmooth": {
       "name": "qsmooth",
-      "version": "1.20.0",
-      "sha256": "16c7xjmgrqcklpirnwlqg92v4lj7f599ddl1w36xs8fmq7svz1lj",
+      "version": "1.22.0",
+      "sha256": "1lky4adrz3iwn8f558hpikgk87b6d7zf018mf90mnarngpfn1d15",
       "depends": ["Hmisc", "SummarizedExperiment", "sva"]
     },
     "qsvaR": {
       "name": "qsvaR",
-      "version": "1.8.0",
-      "sha256": "1ijmh0mby6j50icwlcfhn416x0cjj5y0v3qqjmcn4hx6395m90ma",
-      "depends": ["SummarizedExperiment", "ggplot2", "sva"]
+      "version": "1.10.0",
+      "sha256": "05xx7kpwwyhx6b67q9pzm1wa7hcks2zf985gma5vw96maxf51mzk",
+      "depends": ["SummarizedExperiment", "ggplot2", "rlang", "sva", "tidyverse"]
     },
     "quantiseqr": {
       "name": "quantiseqr",
-      "version": "1.12.0",
-      "sha256": "0d1afsz7hv4ixpicskzw564cq593jcfkix7rryq5lbj27rz5da3c",
+      "version": "1.14.0",
+      "sha256": "0iqxmiq7klpxnf3ih0qgpz666pjlhwmz9764amx7sx980fhra2xv",
       "depends": ["Biobase", "MASS", "SummarizedExperiment", "ggplot2", "limSolve", "preprocessCore", "rlang", "tidyr"]
     },
     "quantro": {
       "name": "quantro",
-      "version": "1.38.0",
-      "sha256": "0b8afvnczkhmbdg5zna2h5v42zdyvk1zybn9cwcbw22rijiysq99",
+      "version": "1.40.0",
+      "sha256": "0hkrpg2x7w8kgw8hblw0q178h5kb09yir1rg4jji1irbl4g1drck",
       "depends": ["Biobase", "RColorBrewer", "doParallel", "foreach", "ggplot2", "iterators", "minfi"]
     },
     "quantsmooth": {
       "name": "quantsmooth",
-      "version": "1.70.0",
-      "sha256": "1mgdrhq0j4b29l3y49h00ccwkz6vhs6hjb1236blmlzdf590q7gc",
+      "version": "1.72.0",
+      "sha256": "0nrlkp5gqmhxq7n2cjg7nxkdnc7rbb4cl79dfham0ky97pwisi4p",
       "depends": ["quantreg"]
     },
     "qusage": {
       "name": "qusage",
-      "version": "2.38.0",
-      "sha256": "06hj1nvp5j4zdqj9v0gc42fd3403phb4gibra4fc1sxzrhi9nq92",
+      "version": "2.40.0",
+      "sha256": "184ap7844dnhwfxx69ifvglyh2zk56zcdw9jl0izxqqgxinrw7ss",
       "depends": ["Biobase", "emmeans", "fftw", "limma", "nlme"]
     },
     "qvalue": {
       "name": "qvalue",
-      "version": "2.36.0",
-      "sha256": "1hgkrvbs1rf8db105ik9ar54zdx49v25hn71jgw7j5r43zngfg2a",
+      "version": "2.38.0",
+      "sha256": "0q9iafir09xnk2qgdaqhryd3y5kzcxcw9l0la1pnpanxdz2hl3i1",
       "depends": ["ggplot2", "reshape2"]
     },
     "r3Cseq": {
       "name": "r3Cseq",
-      "version": "1.50.0",
-      "sha256": "02dc6milwymwj90x24fip8av84ik9dp69sg9g7l300kwyk0hcrb7",
+      "version": "1.52.0",
+      "sha256": "0siicyjr5zb9z1ymlasrnrvggcrnrpf9194s5qfhybasgai6a5jm",
       "depends": ["Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "VGAM", "data_table", "qvalue", "rtracklayer", "sqldf"]
     },
     "rBLAST": {
       "name": "rBLAST",
-      "version": "1.0.0",
-      "sha256": "1yhj08p6iyz2760j2z3v78mc4rzafd0lzfqprq3wd1v1bm34v3qb",
+      "version": "1.2.0",
+      "sha256": "0249l734d0cky7wzbz3i9paz5aalrz7wmqa00prp1vj1drb73mig",
       "depends": ["BiocFileCache", "Biostrings"]
     },
     "rBiopaxParser": {
       "name": "rBiopaxParser",
-      "version": "2.44.0",
-      "sha256": "0hzs6i7l8n1hifj3b91n1f6z3l40jdcl1jlnz8z5qczk84266lx2",
+      "version": "2.46.0",
+      "sha256": "0q9jsf5znfxs1647xp10f1mqam5k0jwfh9aniznfnymk2byhms90",
       "depends": ["XML", "data_table"]
     },
     "rCGH": {
       "name": "rCGH",
-      "version": "1.34.0",
-      "sha256": "0241nrg1kcc6vxj1p6pp5gyjff7k3mdsr764bn3zxvh1wqjnvfrm",
+      "version": "1.36.0",
+      "sha256": "07k2lw0a81flf3lx8dfzkrfysjmfj6xrjc3f6f7v526m3nip18xr",
       "depends": ["AnnotationDbi", "DNAcopy", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "TxDb_Hsapiens_UCSC_hg18_knownGene", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "aCGH", "affy", "ggplot2", "lattice", "limma", "mclust", "org_Hs_eg_db", "plyr", "shiny"]
     },
-    "rDGIdb": {
-      "name": "rDGIdb",
-      "version": "1.30.0",
-      "sha256": "1v96nj1ffmg1678p7rspcqsnqvwcssv96jcyqqbb8v8sryflwmi5",
-      "depends": ["httr", "jsonlite"]
-    },
     "rGADEM": {
       "name": "rGADEM",
-      "version": "2.52.0",
-      "sha256": "1d1vfnxj1p4y1074ybmkxv4x3v0i3sn5w3k4bddzlrqbzyb9kkna",
+      "version": "2.54.0",
+      "sha256": "0lcsw14n3acxljx6zsrfh0hp3s6y0638jzzrh2f2p0jc9mj29b8y",
       "depends": ["BSgenome", "Biostrings", "GenomicRanges", "IRanges", "seqLogo"]
     },
     "rGREAT": {
       "name": "rGREAT",
-      "version": "2.6.0",
-      "sha256": "0sszyfnnzzn5xhs39zgkzr7f3da820nxr6qaw68wknblgmyyddi8",
+      "version": "2.8.0",
+      "sha256": "0rrnsfbbxxz6j1glp7bmffc4gwf0wwk5bw5lfy3rv8mwq2szgks9",
       "depends": ["AnnotationDbi", "DT", "GO_db", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "GetoptLong", "GlobalOptions", "IRanges", "RColorBrewer", "RCurl", "Rcpp", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "circlize", "digest", "doParallel", "foreach", "org_Hs_eg_db", "progress", "rjson", "shiny"]
     },
     "rGenomeTracks": {
       "name": "rGenomeTracks",
-      "version": "1.10.0",
-      "sha256": "0a34xdmpj1872vxhd9a2k1rbzgvsmhisyy2pknbz606924k13xnz",
+      "version": "1.12.0",
+      "sha256": "0fgib559zfjqwbgv42721pqrzbkgv88mzyf0a565rnymbzqg4azn",
       "depends": ["imager", "rGenomeTracksData", "reticulate"]
     },
     "rRDP": {
       "name": "rRDP",
-      "version": "1.38.0",
-      "sha256": "00r8cii5gnnzd909alq7cn94b3df66w6bcd7pld1jvdphxwgvp3l",
+      "version": "1.40.0",
+      "sha256": "0al6yq0fcpc6b97wyz5qgbrbw4q78cvdkxzprmf0f3x4c9yw3f96",
       "depends": ["Biostrings", "rJava"]
     },
     "rSWeeP": {
       "name": "rSWeeP",
-      "version": "1.16.0",
-      "sha256": "0l9qpmbgq7pp0g3m2df881zif42d6dbbgkiri97zklndgyi035jp",
-      "depends": ["pracma"]
+      "version": "1.18.0",
+      "sha256": "0lm61fxpfbcnbl15yk9nlnxv9lg3vmj05makcn3ljwwyr5xh60ng",
+      "depends": ["Biostrings", "doParallel", "foreach", "stringi"]
     },
     "rScudo": {
       "name": "rScudo",
-      "version": "1.20.0",
-      "sha256": "0mhhv5p1z334qn92bql4rsd8p0xpnhd26kzahwi4wqkkb6yqbn8y",
+      "version": "1.22.0",
+      "sha256": "1vid2j7i3cq4b357mx57j840gc59wbg3yl5f748vjjsqkmj812gf",
       "depends": ["Biobase", "BiocGenerics", "S4Vectors", "SummarizedExperiment", "igraph", "stringr"]
     },
     "rTRM": {
       "name": "rTRM",
-      "version": "1.42.0",
-      "sha256": "016vhij3rc6sbhi7caxxnpps4w0w2n28x4hqwdxkxk6r0f6kkvla",
+      "version": "1.44.0",
+      "sha256": "1fqfb0nzh9nil8x7q1w08i156qx45f82y99hs9ndfq8rmcfiqw8j",
       "depends": ["AnnotationDbi", "DBI", "RSQLite", "igraph"]
     },
     "rTRMui": {
       "name": "rTRMui",
-      "version": "1.42.0",
-      "sha256": "0d5gxjiddy57cbryjdihqyf7nkd35apk41wkl1izp467il40mb75",
+      "version": "1.44.0",
+      "sha256": "1dlivwfhzhdzn3gclg75pabswrydn1wap6izw0agdqj5pza5a9mp",
       "depends": ["MotifDb", "org_Hs_eg_db", "org_Mm_eg_db", "rTRM", "shiny"]
     },
     "rWikiPathways": {
       "name": "rWikiPathways",
-      "version": "1.24.0",
-      "sha256": "1m6djs70h58xs4323vp65j33i8mzql2sps9l04pgp28cs17yr4mc",
+      "version": "1.26.0",
+      "sha256": "025dd7w0fy6lbg56y5h2xqhax47p3kzsa90sac4fak3skaivg248",
       "depends": ["RCurl", "XML", "data_table", "dplyr", "httr", "lubridate", "purrr", "readr", "rjson", "stringr", "tidyr"]
     },
     "raer": {
       "name": "raer",
-      "version": "1.2.0",
-      "sha256": "0fxc1i3p1ha0yn6s5c334q2bv7mfwjd3yvlvss6whi16vi63kbwj",
+      "version": "1.4.0",
+      "sha256": "07lsflgim5sd42lqczklzq22q1s14lsxsmjprkhq35kjp241f4wm",
       "depends": ["BSgenome", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "Rhtslib", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cli", "rtracklayer"]
     },
     "rain": {
       "name": "rain",
-      "version": "1.38.0",
-      "sha256": "0wah5qiciwfcvdrii885dvsgbmq7lnjdpgdvzddprf6jwdsgq8w0",
+      "version": "1.40.0",
+      "sha256": "0656nmwz2v4vivgyw2yghsz513rz8xpb537z87hd3bsrcgbp9d7w",
       "depends": ["gmp", "multtest"]
     },
     "ramr": {
       "name": "ramr",
-      "version": "1.12.0",
-      "sha256": "096rxydr9qilg4lcczab1xlzv5ff2lq9r5l6bdzyhprm07mglc80",
+      "version": "1.14.0",
+      "sha256": "0m2y2d28gqn1s4wv15m210i84p3c82vqbzayf5a92czfkzdm8w1z",
       "depends": ["BiocGenerics", "EnvStats", "ExtDist", "GenomicRanges", "IRanges", "S4Vectors", "doParallel", "doRNG", "foreach", "ggplot2", "matrixStats", "reshape2"]
     },
     "ramwas": {
       "name": "ramwas",
-      "version": "1.28.0",
-      "sha256": "0azf24qvjy2dfizi0wp7lkrhjdm2xwwk6hmkg31ly501cjd4pn9s",
+      "version": "1.30.0",
+      "sha256": "0xz8np6rmjpm9al67nnvi7999m2znai7fvvgy9w40vqzzwrhi20i",
       "depends": ["BiocGenerics", "Biostrings", "GenomicAlignments", "KernSmooth", "Rsamtools", "biomaRt", "digest", "filematrix", "glmnet"]
     },
     "randPack": {
       "name": "randPack",
-      "version": "1.50.0",
-      "sha256": "0byix4ipmd9wnknbzm4pjqp09yh9fa4cjky94p3l1gnbmg8kw48j",
+      "version": "1.52.0",
+      "sha256": "087n4h5l11z067i1zd6s2xhbxrp202yvazaj4rk2fyn52hq1vr5q",
       "depends": ["Biobase"]
     },
     "randRotation": {
       "name": "randRotation",
-      "version": "1.16.0",
-      "sha256": "1wi9i8ssan3pfjikbjj5m3rs8lv52jdih0pxfk0rzahqak8m82db",
+      "version": "1.18.0",
+      "sha256": "1km777q9nlsmalv5m9vi9yw4y2q88g1f6b8f34sfgg80q9j3r2k5",
       "depends": ["Rdpack"]
     },
     "rawDiag": {
       "name": "rawDiag",
-      "version": "1.0.0",
-      "sha256": "1rdccg67gkcxj7jgg0by1244x3794kz4s60l5ps54j41iy3zs0v2",
+      "version": "1.2.0",
+      "sha256": "0lzvd9wnhxanjajbwzm8wdan4gcnz9sxdya5p9gg4kpnvvvn0wx2",
       "depends": ["BiocManager", "BiocParallel", "dplyr", "ggplot2", "hexbin", "htmltools", "rawrr", "reshape2", "rlang", "scales", "shiny"]
     },
     "rawrr": {
       "name": "rawrr",
-      "version": "1.12.0",
-      "sha256": "1h8q9j8qiqrmk41j567dq53i1mbm89c9gcj9p8qjqcrjcvykg89f",
+      "version": "1.14.0",
+      "sha256": "0lnwz3m7m5h27vqp6mirc26sxjx2px7dnym9b5v0vmmp181vz189",
       "depends": []
     },
     "rbsurv": {
       "name": "rbsurv",
-      "version": "2.62.0",
-      "sha256": "1hj569n72bds094dfnr8bpfx1ca0sn4bax8lnjz03yz08kmrv8a6",
+      "version": "2.64.0",
+      "sha256": "195fw54b1j4bi2436dzpwkzpk4qw9dyvajx9lbrid5wji0rvvhjk",
       "depends": ["Biobase", "survival"]
     },
     "rcellminer": {
       "name": "rcellminer",
-      "version": "2.26.0",
-      "sha256": "0dxg050rw9p88hdv55v60fg2ijjl1dnzxq47xy60nrzpijcb3770",
+      "version": "2.28.0",
+      "sha256": "17h9c33rfi10rf3klkwna91i0kd131gcasnszy5mi7hcpjapykn2",
       "depends": ["Biobase", "ggplot2", "gplots", "rcellminerData", "shiny", "stringr"]
     },
     "rebook": {
       "name": "rebook",
-      "version": "1.14.0",
-      "sha256": "0v59wr8862phlv4byy3j3l0spm7450vz218xffgwlkwixzw3hnnk",
+      "version": "1.16.0",
+      "sha256": "1pl7pwdrccqzajb0n59sgxwy8z33hyp8p6qzsh3k6vl2ligw75sj",
       "depends": ["BiocStyle", "CodeDepends", "dir_expiry", "filelock", "knitr", "rmarkdown"]
     },
     "receptLoss": {
       "name": "receptLoss",
-      "version": "1.16.0",
-      "sha256": "1c110rpfbi6rgl97659qx5qyj6wp6sqzddpnjg3bir21nh6902fl",
+      "version": "1.18.0",
+      "sha256": "1x0mwckvavl7p245qgx33a2n6zd7m6nzrsvp65hmzsqzcl8xc0fz",
       "depends": ["SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "tidyr"]
     },
     "reconsi": {
       "name": "reconsi",
-      "version": "1.16.0",
-      "sha256": "13xviw2qn8sk7ka6qskb39dsv9qz4vkfdydpzzvm14y6iy62zgzr",
+      "version": "1.18.0",
+      "sha256": "0221pxka1dcnf85ix3kp9k1izc73vgfwl42aqkl74hhkv14bk2d8",
       "depends": ["Matrix", "ggplot2", "ks", "matrixStats", "phyloseq", "reshape2"]
     },
     "recount": {
       "name": "recount",
-      "version": "1.30.2",
-      "sha256": "0fdnp0ilvxkzyzwblbchf6ns1v6fah32zyg3y68pz88ir5nwg49b",
+      "version": "1.32.0",
+      "sha256": "0i512z370hrpgyddvgfd9mvcd0lhldbcs047q39brcf436a6glgs",
       "depends": ["BiocParallel", "GEOquery", "GenomeInfoDb", "GenomicRanges", "IRanges", "RCurl", "S4Vectors", "SummarizedExperiment", "derfinder", "downloader", "rentrez", "rtracklayer"]
     },
     "recount3": {
       "name": "recount3",
-      "version": "1.14.0",
-      "sha256": "1dmc5s5mw95caq2pqpgik5z5nggy5mnas1dawssiyhr10wivnjd0",
+      "version": "1.16.0",
+      "sha256": "01xz4cgrwq3h15ikpl17f0103cqyx0p6vhlazahsn7k5dklp5ipr",
       "depends": ["BiocFileCache", "GenomicRanges", "Matrix", "R_utils", "S4Vectors", "SummarizedExperiment", "data_table", "httr", "rtracklayer", "sessioninfo"]
     },
     "recountmethylation": {
       "name": "recountmethylation",
-      "version": "1.14.0",
-      "sha256": "0cbp1cz6h1djwgrv2achgypmxiracrjm8y8sj1f9iqy6i1fgq8jl",
+      "version": "1.16.0",
+      "sha256": "0idgifc0kywjvv6z6safga3168yz5837qsfjbakp23502zdkl904",
       "depends": ["BiocFileCache", "DelayedMatrixStats", "HDF5Array", "RCurl", "R_utils", "S4Vectors", "basilisk", "minfi", "reticulate", "rhdf5"]
     },
     "recoup": {
       "name": "recoup",
-      "version": "1.32.0",
-      "sha256": "07313l0b78x0m0vp8ipngzv069v7vjgr8q7vv4j9kbr33kql3bp6",
+      "version": "1.34.0",
+      "sha256": "1fadqn6ddyvpl3a6115ixh8ikwz188pwph6i6j6y3nxaai97rmkm",
       "depends": ["BiocGenerics", "Biostrings", "ComplexHeatmap", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "S4Vectors", "biomaRt", "circlize", "ggplot2", "httr", "rtracklayer", "stringr", "txdbmaker"]
     },
     "regionReport": {
       "name": "regionReport",
-      "version": "1.38.0",
-      "sha256": "1nxs0slhhnxpjg220irf0a6hsh1zp0xh54ffpvl25lzgy422xwpp",
+      "version": "1.40.0",
+      "sha256": "0h13903lwxjdzm4mjid214z5pn9c1zqqsn3my1vr0xqzv3k4yiar",
       "depends": ["BiocStyle", "DEFormats", "DESeq2", "GenomeInfoDb", "GenomicRanges", "RefManageR", "S4Vectors", "SummarizedExperiment", "derfinder", "knitr", "knitrBootstrap", "rmarkdown"]
     },
     "regionalpcs": {
       "name": "regionalpcs",
-      "version": "1.2.0",
-      "sha256": "1hrmxb2ag0d823kn3ya07rwgfv931x2shqzdq3q310rw9jllcwgd",
+      "version": "1.4.0",
+      "sha256": "000wygnnjw1x2jb73zrwgifc1w08vqwabhndzpk16aqc1wmv2nng",
       "depends": ["GenomicRanges", "PCAtools", "dplyr", "tibble"]
     },
     "regioneR": {
       "name": "regioneR",
-      "version": "1.36.0",
-      "sha256": "1ygdlqvhf165mqd247783pi1yzidqap8b913444vrs881n62xvrb",
+      "version": "1.38.0",
+      "sha256": "1226wljfndqs11p61a79b0rm66jzwljzzi8w9lhx9g165jy3xxay",
       "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "memoise", "rtracklayer"]
     },
     "regioneReloaded": {
       "name": "regioneReloaded",
-      "version": "1.6.0",
-      "sha256": "1yi97sarqljayqm5lwci0z768qk0vzqiazpx8j6lvpsqhrsgmcry",
+      "version": "1.8.0",
+      "sha256": "1jhfh6pgq6yq8czvx6razzswacb7m06pfci6apj86izal54zj8jj",
       "depends": ["RColorBrewer", "Rtsne", "cluster", "ggplot2", "ggrepel", "regioneR", "reshape2", "scales", "umap"]
     },
     "regsplice": {
       "name": "regsplice",
-      "version": "1.30.0",
-      "sha256": "0cmqigb2klpq7nqvhmvmyf9xzgjfvw22zpgpcjnlv24ga30sacak",
+      "version": "1.32.0",
+      "sha256": "0jzmxl837wq7cf0jrff2py144qdk7mmypl2a93g6862k1zcgc9dk",
       "depends": ["S4Vectors", "SummarizedExperiment", "edgeR", "glmnet", "limma", "pbapply"]
     },
     "regutools": {
       "name": "regutools",
-      "version": "1.16.0",
-      "sha256": "1ypy9nrafnr7ri4a2cz5akm78cdq0qahlmbcs8ylr97bimkdandk",
+      "version": "1.18.0",
+      "sha256": "1whamihnl3kamsjv9cqfdwvnzy8w6rxdc5xj6hv1g4w5x2sr7zvp",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "DBI", "GenomicRanges", "Gviz", "IRanges", "RCy3", "RSQLite", "S4Vectors"]
     },
     "retrofit": {
       "name": "retrofit",
-      "version": "1.4.0",
-      "sha256": "1dx2yfz7f18sknl75igmfzk3nfrp28pjkbkpn1w6zx1sbj6dbxsl",
+      "version": "1.6.0",
+      "sha256": "0f8asr7573ra4vxp1s1fs1zr31r7sphzj7xpzk614llwacjyasvi",
       "depends": ["Rcpp"]
     },
     "rexposome": {
       "name": "rexposome",
-      "version": "1.26.0",
-      "sha256": "13ivwypcw58bmlrps16anhxf0dxk8v16wyadwz4wds4rd0ihjvcz",
+      "version": "1.28.0",
+      "sha256": "0hhhdfjlqfrq7ginxy0rj2ih5m4wd1msgnrl4bangp7mm1d3m73r",
       "depends": ["Biobase", "FactoMineR", "Hmisc", "S4Vectors", "circlize", "corrplot", "ggplot2", "ggrepel", "ggridges", "glmnet", "gplots", "gridExtra", "gtools", "imputeLCMD", "lme4", "lsr", "mice", "pryr", "reshape2", "scales", "scatterplot3d", "stringr"]
     },
     "rfPred": {
       "name": "rfPred",
-      "version": "1.42.0",
-      "sha256": "02clazsix7n4nnz1kn7hkk48fggxp2bqf97xbzngnljskvlhnakb",
+      "version": "1.44.0",
+      "sha256": "10zr6ik6q1dxmczfh1kf12jydhk8lbcxc79m7j0334vdmd0szv45",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "data_table"]
     },
     "rfaRm": {
       "name": "rfaRm",
-      "version": "1.16.0",
-      "sha256": "1c8kpcbwkz33cbc8xqfd5cqj1n979a9ijbj06nfgylkm71ma1682",
+      "version": "1.18.0",
+      "sha256": "0d7f9jkiq6ddybkkysmrfrp8hll4nrxpk0hv6hgdjxrpx5wpw839",
       "depends": ["Biostrings", "IRanges", "S4Vectors", "data_table", "httr", "jsonlite", "magick", "rsvg", "rvest", "stringi", "xml2"]
     },
     "rgoslin": {
       "name": "rgoslin",
-      "version": "1.8.0",
-      "sha256": "0saxw5kppcw0hwjykgzx8873izbl509hq1ga8w9qg2c5zx5xahk9",
+      "version": "1.10.0",
+      "sha256": "02c4kci5zyn1vdlg99pwq4skgivlp34ghj0ww4wxc94sc36kv0l5",
       "depends": ["Rcpp", "dplyr"]
     },
     "rgsepd": {
       "name": "rgsepd",
-      "version": "1.36.0",
-      "sha256": "18r2naxir299k0gcd9j3a5rvdma590m06v38j8wiligsgw5cmkfg",
+      "version": "1.38.0",
+      "sha256": "11bs950drnwkan1mvhk9smx18gliwgkiw88dk7v21cg7qyh455aw",
       "depends": ["AnnotationDbi", "DESeq2", "GO_db", "SummarizedExperiment", "biomaRt", "goseq", "gplots", "org_Hs_eg_db"]
     },
     "rhdf5": {
       "name": "rhdf5",
-      "version": "2.48.0",
-      "sha256": "086bnwzmlwq3z9a4kb1rnzb2wnchhi4gvzpijhladgd83nqyb0wn",
+      "version": "2.50.1",
+      "sha256": "1l1ri82sg0aklacj4a1shk75n6qq1d23xnf7bpp7r1zr5g7678fc",
       "depends": ["Rhdf5lib", "rhdf5filters"]
     },
     "rhdf5client": {
       "name": "rhdf5client",
-      "version": "1.26.0",
-      "sha256": "17c8r361za3760lkik2b88c3m8zska33qam2iwbl5hw9yhkrl6ck",
+      "version": "1.28.0",
+      "sha256": "15dnba73sabvv8p5kdx53g289s3dssy3nsq72c726nsikba8dqgq",
       "depends": ["DelayedArray", "data_table", "httr", "rjson"]
     },
     "rhdf5filters": {
       "name": "rhdf5filters",
-      "version": "1.16.0",
-      "sha256": "0fsfp34pfb5k030j7nfx9b9vsil02y85sv1dd1y0bfdxchi4bw8x",
+      "version": "1.18.0",
+      "sha256": "1kf8w5bq20gwmry2dj46zhnbidpf94ldwpaix3arr4mjkxb7s9va",
       "depends": ["Rhdf5lib"]
     },
+    "rhinotypeR": {
+      "name": "rhinotypeR",
+      "version": "1.0.0",
+      "sha256": "1ahag3dcal6mbfzy1kf2x1rj5znnpwl5107jz2xp8azcw18jidzw",
+      "depends": ["Biostrings"]
+    },
     "riboSeqR": {
       "name": "riboSeqR",
-      "version": "1.38.0",
-      "sha256": "0p0q28n8hlai80pxxns9pzzg552pbwlxlph8zjf78bwbjagrfbz5",
+      "version": "1.40.0",
+      "sha256": "1xxar40bqmawz07h3l6r8m03cq65yymmcc9vyyk66c28yfr46crw",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "abind", "baySeq", "seqLogo"]
     },
     "ribor": {
       "name": "ribor",
-      "version": "1.16.0",
-      "sha256": "0kymbmm96a7ccl0dz46sk0lzgf3n55qvdkywkj91kh0ddrsji0vi",
+      "version": "1.18.0",
+      "sha256": "1153d770sw74xgrx9wd7d0a6yk8dhf16q1ck0d42gldkp2asrh83",
       "depends": ["S4Vectors", "dplyr", "ggplot2", "hash", "rhdf5", "rlang", "tidyr", "yaml"]
     },
     "ribosomeProfilingQC": {
       "name": "ribosomeProfilingQC",
-      "version": "1.16.0",
-      "sha256": "0bblk7ncxdrbgmgcjvif9zgd1ynlh4205vlmgr42jbg5p1i7p3in",
+      "version": "1.18.0",
+      "sha256": "1845ra8zsdrf0z457n5vfhknyv7g591rrj9mw7f2bxqbgrijgqpm",
       "depends": ["AnnotationDbi", "BSgenome", "BiocGenerics", "Biostrings", "EDASeq", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "RUVSeq", "Rsamtools", "Rsubread", "S4Vectors", "XVector", "cluster", "ggExtra", "ggfittext", "ggplot2", "ggrepel", "motifStack", "rtracklayer", "scales", "txdbmaker"]
     },
     "rifi": {
       "name": "rifi",
-      "version": "1.8.0",
-      "sha256": "0yajsqm27zy5imb719x8knsrn9rk85q98wc65xqmvj9bkqkjfvdl",
+      "version": "1.10.0",
+      "sha256": "1apal2763n8bybcyrngd8zvxmkcp8sxgjj1dm4cn1jdaa51syzlq",
       "depends": ["S4Vectors", "SummarizedExperiment", "car", "cowplot", "doMC", "dplyr", "egg", "foreach", "ggplot2", "nls2", "nnet", "reshape2", "rlang", "rtracklayer", "scales", "stringr", "tibble"]
     },
     "rifiComparative": {
       "name": "rifiComparative",
-      "version": "1.4.0",
-      "sha256": "0isgcbmk7c99xhlasaaa2gyjf9827zfdq1vyf4xc21lyhv9q5j51",
+      "version": "1.6.0",
+      "sha256": "06l3lvif5c0vl4hr2iiqmhaxp5c0fwvcy5g0jjynjb9w25b5nakb",
       "depends": ["DTA", "LSD", "S4Vectors", "SummarizedExperiment", "cowplot", "devtools", "doMC", "dplyr", "egg", "foreach", "ggplot2", "ggrepel", "nnet", "reshape2", "rlang", "rtracklayer", "scales", "stringr", "tibble", "writexl"]
     },
     "rmelting": {
       "name": "rmelting",
-      "version": "1.20.0",
-      "sha256": "1rk27wg4j8hldmrzcjymw3hhaq9cm4bjz5fqwjzx8kdrs94wwrid",
+      "version": "1.22.0",
+      "sha256": "08maaxhahqxfal1pdbsg665l7qzqiz9w6989ll45y3gx9zz1z3ql",
       "depends": ["Rdpack", "rJava"]
     },
     "rmspc": {
       "name": "rmspc",
-      "version": "1.10.0",
-      "sha256": "0f9l8gbbd81ac871fbpknyxsjwy9l1xz3nfbvnic012gg33n6j4y",
+      "version": "1.12.0",
+      "sha256": "0vqpkfa2lq8f484ihis283gdmda4x492m5hygfvz9y83lwb5syrm",
       "depends": ["BiocManager", "GenomicRanges", "processx", "rtracklayer", "stringr"]
     },
     "rnaEditr": {
       "name": "rnaEditr",
-      "version": "1.14.0",
-      "sha256": "1jghirl1iz11wm4sq8qvw2fvgha7q6ili6bddgpdfcn07abbkcsm",
+      "version": "1.16.0",
+      "sha256": "165n04bh3g1sb15sfng9ax7bjb6zwy43xhdk9sgijrm7aj6p3cna",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "bumphunter", "corrplot", "logistf", "plyr", "survival"]
     },
     "rnaseqcomp": {
       "name": "rnaseqcomp",
-      "version": "1.34.0",
-      "sha256": "00lv24xxf9644gikb76wwk9bijfa3frpwb4n0cbq5fsx0b1288rs",
+      "version": "1.36.0",
+      "sha256": "01jx6vk334gfblz5a8dic12a8bi1fm2ybmzijk9cm0ny4d66n5sf",
       "depends": ["RColorBrewer"]
     },
     "roar": {
       "name": "roar",
-      "version": "1.40.0",
-      "sha256": "06d1w5kknm2mb6v6glmyd97n1a33529kgqkkyfbk277ikn45hi9f",
+      "version": "1.42.0",
+      "sha256": "0mvb1vgjy6d3q9wh5a7a0s4cmy3hx15fl9fvh74yv5ywggp99n82",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "rtracklayer"]
     },
     "roastgsa": {
       "name": "roastgsa",
-      "version": "1.2.0",
-      "sha256": "00rxmlx94y03mkz5jbwqx4px1cwv63nblhj2yxidy2k5374fk7fy",
+      "version": "1.4.0",
+      "sha256": "0jy7psw93cdb23rspqmvc389nff8g90c9s1qamv5q8j477a51p2l",
       "depends": ["Biobase", "RColorBrewer", "ggplot2", "gplots", "limma"]
     },
     "rols": {
       "name": "rols",
-      "version": "3.0.0",
-      "sha256": "04kpfb0vavlkxirl9hgl6wdqhy6kw6ly3fyk0jr85kdzdb8ss1xd",
+      "version": "3.2.0",
+      "sha256": "1shaxlh620l9p1bkmf6ps62xs81ksx6vvv3ynxlljcr7kgwgdjyn",
       "depends": ["Biobase", "BiocGenerics", "httr2", "jsonlite"]
     },
     "ropls": {
       "name": "ropls",
-      "version": "1.36.0",
-      "sha256": "0cdkwzrbr6h1dfi3qdh629hi2jlm1hxgq4dvx4z3vc2r6w0c6m11",
+      "version": "1.38.0",
+      "sha256": "0f1qbpndil49d9friavzyhbfrp5176w2hrx79wp6b94afggil26h",
       "depends": ["Biobase", "MultiAssayExperiment", "MultiDataSet", "SummarizedExperiment", "ggplot2", "plotly"]
     },
     "rprimer": {
       "name": "rprimer",
-      "version": "1.8.0",
-      "sha256": "04maldspcfzszvbgvzq4fmaf62639kb2rs2dqm9r9miqqxqndkr3",
+      "version": "1.10.0",
+      "sha256": "13mcw4wxffz1jcx1sbijdxx9qdd592b6frv728av1vk6rdqhycx3",
       "depends": ["Biostrings", "DT", "IRanges", "S4Vectors", "bslib", "ggplot2", "mathjaxr", "patchwork", "reshape2", "shiny", "shinyFeedback", "shinycssloaders"]
     },
     "rpx": {
       "name": "rpx",
-      "version": "2.12.0",
-      "sha256": "1a3rh2f9wwgcgadgb5ryj8vs9kcyhqwz7wdnykv2pl3pgm8ba2zp",
+      "version": "2.14.0",
+      "sha256": "0w2nxcd2v8rc3spi0rb96d3r7hp2dh7f7k50n0mik626fy1i0yc5",
       "depends": ["BiocFileCache", "RCurl", "curl", "jsonlite", "xml2"]
     },
+    "rqt": {
+      "name": "rqt",
+      "version": "1.32.0",
+      "sha256": "02c197p0al9ifc5l21p9f1dkk4cxaj3a4ml82l4rkc2s86ia8fin",
+      "depends": ["CompQuadForm", "Matrix", "RUnit", "SummarizedExperiment", "car", "glmnet", "metap", "pls", "ropls"]
+    },
     "rqubic": {
       "name": "rqubic",
-      "version": "1.50.0",
-      "sha256": "1hr0i7f8987x79ir34yg65bzkd7lij03rkfmw6dr289d8kjclap2",
+      "version": "1.52.0",
+      "sha256": "18yx1nva368pvg1r02j5zxvjnqabsavcbr0v1gqbf6iklbm80mhg",
       "depends": ["Biobase", "BiocGenerics", "biclust"]
     },
     "rrvgo": {
       "name": "rrvgo",
-      "version": "1.16.0",
-      "sha256": "1339cxx5sizbdhhya1kxq9x31m2qvdl993abr4pn07hs3awya63p",
+      "version": "1.18.0",
+      "sha256": "19y5cn3lp57p3biz442ml8i4fqpyjsv92a7zb5liwmcazbv7bgcq",
       "depends": ["AnnotationDbi", "GOSemSim", "GO_db", "ggplot2", "ggrepel", "pheatmap", "shiny", "tm", "treemap", "umap", "wordcloud"]
     },
     "rsbml": {
       "name": "rsbml",
-      "version": "2.62.0",
-      "sha256": "02pmxg0ppy1asjscp13kmqyj2phw4q138fj2b3xgmcagwxqzb4bs",
+      "version": "2.64.0",
+      "sha256": "0ygjcg7z0shajswp5bfavslq2b4hdxy30d7bb5i5a11kzxymwg3h",
       "depends": ["BiocGenerics", "graph"]
     },
     "rsemmed": {
       "name": "rsemmed",
-      "version": "1.14.0",
-      "sha256": "12m771wipjr823k88f38waqsm1nq7qig7200969g2dz8fiaaxjxx",
+      "version": "1.16.0",
+      "sha256": "0f964j7q3xz5mmghvx5pinyrrgwgnddadzpsqb72nkz8vqaasbz3",
       "depends": ["dplyr", "igraph", "magrittr", "stringr"]
     },
     "rtracklayer": {
       "name": "rtracklayer",
-      "version": "1.64.0",
-      "sha256": "0h2cqr1jqqqxvkmqpngfl8ppm1p65vvlb1wgfwl9r4f99b8vz33g",
+      "version": "1.66.0",
+      "sha256": "0gh91rxahdh3ablngm094mnyrdrklm70cjlhwjwz2rydbr3a6dbg",
       "depends": ["BiocGenerics", "BiocIO", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "XML", "XVector", "curl", "httr", "restfulr", "zlibbioc"]
     },
     "runibic": {
       "name": "runibic",
-      "version": "1.26.0",
-      "sha256": "0q25b2dfgp82p156l37zzl5a842ah3hzq60f9gkcv4vqkns99z64",
+      "version": "1.28.0",
+      "sha256": "1gqv3bkz9ngfdgg639xa6zg1ysmzkxm5pr78s86an4f3bs63xppr",
       "depends": ["Rcpp", "SummarizedExperiment", "biclust", "testthat"]
     },
     "sRACIPE": {
       "name": "sRACIPE",
-      "version": "1.20.0",
-      "sha256": "0kkfci9mifhb905c88cyfvwy6yacb1ar0ai6lcxhyx60bwnv6x7i",
+      "version": "1.22.0",
+      "sha256": "08aghppkc3ndrchqyw89zwi3524cr8ns35cm56ja48h7mby62chs",
       "depends": ["BiocGenerics", "MASS", "RColorBrewer", "Rcpp", "S4Vectors", "SummarizedExperiment", "ggplot2", "gplots", "gridExtra", "htmlwidgets", "reshape2", "umap", "visNetwork"]
     },
     "sSNAPPY": {
       "name": "sSNAPPY",
-      "version": "1.8.0",
-      "sha256": "0ij3f7xax92jihzhf6axx7sq36jcnvyjfhgan1m1mcsaandb4d4k",
+      "version": "1.10.0",
+      "sha256": "0gx89n2h9b4gw8v37ipd55m4xzm7jfmymmpg7bgjlkjr5zp0ws2p",
       "depends": ["SummarizedExperiment", "dplyr", "edgeR", "ggforce", "ggplot2", "ggraph", "graphite", "gtools", "igraph", "magrittr", "org_Hs_eg_db", "pheatmap", "reshape2", "rlang", "stringr", "tibble", "tidyr"]
     },
     "sSeq": {
       "name": "sSeq",
-      "version": "1.42.0",
-      "sha256": "08wjz54qsgdwbf3rscb8mzqx2ffm62dm589zj4hflb1ayhgza2ai",
+      "version": "1.44.0",
+      "sha256": "01q56h660akb7zs22cqc63z39fsldpgqd1gmn90qjwc6i6xafrcy",
       "depends": ["RColorBrewer", "caTools"]
     },
     "safe": {
       "name": "safe",
-      "version": "3.44.0",
-      "sha256": "1kxl9rqqpnihz5rhgv07q0vgqxpams4iyf2w11ffv59b2gi1brrr",
+      "version": "3.46.0",
+      "sha256": "1rl8bxsbzqjb6kxrka2h6ggk1jkvnvlh2f7dkqmgkvv413anv6pb",
       "depends": ["AnnotationDbi", "Biobase", "SparseM"]
     },
     "sagenhaft": {
       "name": "sagenhaft",
-      "version": "1.74.0",
-      "sha256": "1gqil6dqjrqlxnj8sfhwi2izmqcj9i6id3wfskvkn3xw12hk3cnp",
+      "version": "1.76.0",
+      "sha256": "0xpppp1mjdkcdh8qj81a3b4cbv9hfr292rh7fnz3hnhiwv8xhvz7",
       "depends": ["SparseM"]
     },
     "sampleClassifier": {
       "name": "sampleClassifier",
-      "version": "1.28.0",
-      "sha256": "12c8di5xw7q3a78z75labq3qzwsnk7s1xr5c75xsy8k2f04npn0z",
+      "version": "1.30.0",
+      "sha256": "0wg21fbhzsqdpfkg5mjsybfawms7cji3yvx9h1yqf5ql1yqy1vq3",
       "depends": ["MGFM", "MGFR", "annotate", "e1071", "ggplot2"]
     },
     "sangeranalyseR": {
       "name": "sangeranalyseR",
-      "version": "1.14.0",
-      "sha256": "1l5capnvhd78lzaiv44q9qiw9vdlnygmflmrqyv3ck3qk59hwsaw",
+      "version": "1.16.0",
+      "sha256": "0v39n8hj83dqy0nlf06wffka7qyy80fkgzf7p3bpd90j8y9j8cyn",
       "depends": ["BiocStyle", "Biostrings", "DECIPHER", "DT", "ape", "data_table", "excelR", "ggdendro", "gridExtra", "knitr", "logger", "openxlsx", "plotly", "pwalign", "reshape2", "rmarkdown", "sangerseqR", "seqinr", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "zeallot"]
     },
     "sangerseqR": {
       "name": "sangerseqR",
-      "version": "1.40.0",
-      "sha256": "01z2b7950yxhv8p73rfmq84bscrlpl956ihfyarnzdq9v9ljzzd9",
+      "version": "1.42.0",
+      "sha256": "1xvwlnyrs5w3aiapbiiq8dx71hf7803fywbqhg7nvqkdbls5iljd",
       "depends": ["Biostrings", "pwalign", "shiny", "stringr"]
     },
     "sarks": {
       "name": "sarks",
-      "version": "1.16.0",
-      "sha256": "1ayfxfgk1zwmychdlhbq3can76swa127z5r587frs3c23zbm8qi2",
+      "version": "1.18.0",
+      "sha256": "1cj0z5y54bkh06smc26r60mig8lgrdz4rcc7m5ji8f9jfvaqjshj",
       "depends": ["Biostrings", "IRanges", "binom", "cluster", "rJava"]
     },
     "saseR": {
       "name": "saseR",
-      "version": "1.0.0",
-      "sha256": "1ibr75zm09h9cwzizljlv33s09y2jz2fasnblhmm59xdb8gwl7vg",
+      "version": "1.2.0",
+      "sha256": "0k1n6rjpmrzwmrli5i97czm2vgz76i4dvrqnazqb6j6xpd5975il",
       "depends": ["ASpli", "BiocGenerics", "BiocParallel", "DESeq2", "DEXSeq", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "MatrixGenerics", "PRROC", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "edgeR", "igraph", "knitr", "limma", "pracma", "precrec", "rrcov"]
     },
     "satuRn": {
       "name": "satuRn",
-      "version": "1.12.0",
-      "sha256": "03mlb4j219w8760zm5hnryjwxns3qz9y3wl6zaqdfnl94bwyl9r8",
+      "version": "1.14.0",
+      "sha256": "0rfh0zprl1gibcanjwp4sncjv5k660lhylbiaqwgri7n62jz7k9m",
       "depends": ["BiocParallel", "Matrix", "SummarizedExperiment", "boot", "ggplot2", "limma", "locfdr", "pbapply"]
     },
     "scAnnotatR": {
       "name": "scAnnotatR",
-      "version": "1.10.0",
-      "sha256": "1gzssp7im1d9pp2mbar27k854fcc3rqyza5d77flmhshq88xrskv",
+      "version": "1.12.0",
+      "sha256": "0gra749fgcify2625gg1nbnqw328ddf98pplv8yaq4hn37a1s76j",
       "depends": ["AnnotationHub", "ROCR", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "ape", "caret", "data_tree", "dplyr", "e1071", "ggplot2", "kernlab", "pROC"]
     },
     "scBFA": {
       "name": "scBFA",
-      "version": "1.18.0",
-      "sha256": "0zq4xnvzlprhlv2n7d41ikms6cmwvm51sn3f61841ch6hdfai7my",
+      "version": "1.20.0",
+      "sha256": "1gvr2rg8sacfg2lypiqkb6gd0qy7jy7aw9hypphq81pznmd1in27",
       "depends": ["DESeq2", "MASS", "Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "copula", "ggplot2", "zinbwave"]
     },
     "scBubbletree": {
       "name": "scBubbletree",
-      "version": "1.6.0",
-      "sha256": "0adzmw4bzs1a857bwwq63niwgn5wm3mdqxbqhily49h7yxnf3rv7",
-      "depends": ["Seurat", "ape", "future", "future_apply", "ggplot2", "ggtree", "patchwork", "proxy", "reshape2", "scales"]
+      "version": "1.8.0",
+      "sha256": "1ym6zdxb6nkgb16y2caw432hx24kc10d0bdqq7fdmwj5lmdcwmhy",
+      "depends": ["BiocParallel", "Seurat", "ape", "dplyr", "ggplot2", "ggtree", "patchwork", "proxy", "reshape2", "scales"]
     },
     "scCB2": {
       "name": "scCB2",
-      "version": "1.14.0",
-      "sha256": "1iwcx1wra4f3lnqsmbs5m0agd6ffmpmdwn767n8q0qgvy8sdjaw0",
+      "version": "1.16.0",
+      "sha256": "060ayarwf8aijppxw52h1kxrx8w06ws8ivdsr3645s26mri859p5",
       "depends": ["DropletUtils", "Matrix", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "doParallel", "edgeR", "foreach", "iterators", "rhdf5"]
     },
     "scClassify": {
       "name": "scClassify",
-      "version": "1.16.0",
-      "sha256": "1ymrxm5xmhiaj5vzv2xy35pxn0jxjjjdzclx7f3qznbxyfkd35nm",
+      "version": "1.18.0",
+      "sha256": "1c32lm6bgsqn16yzpzz70q7ypgqybv5w6cgqy99953zv18fgar05",
       "depends": ["BiocParallel", "Cepo", "Matrix", "S4Vectors", "cluster", "diptest", "ggplot2", "ggraph", "hopach", "igraph", "limma", "mgcv", "minpack_lm", "mixtools", "proxy", "proxyC", "statmod"]
     },
     "scDD": {
       "name": "scDD",
-      "version": "1.28.0",
-      "sha256": "106hawmyln6xj9m2npibb4lkd8qvz60lwjabhn3cpx3908x88ryb",
+      "version": "1.30.0",
+      "sha256": "1l47w55b1qlj589c84g9jmxah8bf8gspw30bl9mpppyjh2nihg8p",
       "depends": ["BiocParallel", "EBSeq", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "arm", "fields", "ggplot2", "mclust", "outliers", "scran"]
     },
     "scDDboost": {
       "name": "scDDboost",
-      "version": "1.6.0",
-      "sha256": "0q4vrrcnnhwb3r9jn13d1wsjn9mxai39pxaa9lf6zmg1v17aqmhg",
+      "version": "1.8.0",
+      "sha256": "0lp4ficgglm7dfrnwhfvwn7ahmjrazszpb8yh61r90vhq7qq7cx3",
       "depends": ["BH", "BiocParallel", "EBSeq", "Oscope", "Rcpp", "RcppEigen", "SingleCellExperiment", "SummarizedExperiment", "cluster", "ggplot2", "mclust"]
     },
     "scDataviz": {
       "name": "scDataviz",
-      "version": "1.14.0",
-      "sha256": "1njm8ym44ml51sbz001niclmkl4q78yid8ik76j9xnwldd9cb2c8",
+      "version": "1.16.0",
+      "sha256": "1ykvrk51w8bwyg4785r7mf4pjzs5aaks1dka1q1knx6hfybs8mjj",
       "depends": ["MASS", "RColorBrewer", "S4Vectors", "Seurat", "SingleCellExperiment", "corrplot", "flowCore", "ggplot2", "ggrepel", "matrixStats", "reshape2", "scales", "umap"]
     },
     "scDblFinder": {
       "name": "scDblFinder",
-      "version": "1.18.0",
-      "sha256": "1np3arhjxxgif68i0wi0nqqbrwavy14dh9vy2g9mw4408k7789w0",
+      "version": "1.20.0",
+      "sha256": "0cfv1bi0vm217bhwqplp89i6j10di41pg1k22qp1n9q6ah41wada",
       "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "Matrix", "Rsamtools", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "bluster", "igraph", "rtracklayer", "scater", "scran", "scuttle", "xgboost"]
     },
     "scDesign3": {
       "name": "scDesign3",
-      "version": "1.2.0",
-      "sha256": "0jf8g5llkcashxsjsm39fivdqpyjx40gn362yzpwcfh81f4x95x1",
+      "version": "1.4.0",
+      "sha256": "1mnwy3gficv3vkxv3anp3208mpxl67pay36bp7m8v9llaxd16kww",
       "depends": ["BiocParallel", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "coop", "dplyr", "gamlss", "gamlss_dist", "ggplot2", "irlba", "matrixStats", "mclust", "mgcv", "mvtnorm", "pbmcapply", "rvinecopulib", "sparseMVN", "tibble", "umap", "viridis"]
     },
+    "scDiagnostics": {
+      "name": "scDiagnostics",
+      "version": "1.0.0",
+      "sha256": "1b8hx5qvcmgx5n9asyqhr9lzx591cnd8i9cf3h5rg0ias2cy2bad",
+      "depends": ["SingleCellExperiment", "SummarizedExperiment", "bluster", "cramer", "ggplot2", "ggridges", "isotree", "patchwork", "ranger", "rlang", "speedglm", "transport"]
+    },
+    "scDotPlot": {
+      "name": "scDotPlot",
+      "version": "1.0.0",
+      "sha256": "013kng1z74akhffddh3dx6w28572nwl7zqi768w58czz44skzrj5",
+      "depends": ["BiocGenerics", "Seurat", "SingleCellExperiment", "aplot", "cli", "dplyr", "ggplot2", "ggsci", "ggtree", "magrittr", "purrr", "rlang", "scales", "scater", "stringr", "tibble", "tidyr"]
+    },
     "scFeatureFilter": {
       "name": "scFeatureFilter",
-      "version": "1.24.0",
-      "sha256": "1lxgk9dki9l4qjgm3myqrjg59a4avd2h6phaibxk28rsh7agzw5h",
+      "version": "1.26.0",
+      "sha256": "0r137q81z2cdxid3f2wfljhj71dm9f8fawajz8fsb6pk8cc962hi",
       "depends": ["dplyr", "ggplot2", "magrittr", "rlang", "tibble"]
     },
     "scFeatures": {
       "name": "scFeatures",
-      "version": "1.4.0",
-      "sha256": "178xpi6r1avbp4g9v5yd46jhnra6md47mljpn9y8a5991wh0rc4i",
+      "version": "1.6.0",
+      "sha256": "0rr5isjjvram7s0am3vvqvywnvsqb1lfccjfny60sy2k3mslv79m",
       "depends": ["AUCell", "BiocParallel", "DT", "DelayedArray", "DelayedMatrixStats", "EnsDb_Hsapiens_v79", "EnsDb_Mmusculus_v79", "GSVA", "MatrixGenerics", "Seurat", "SingleCellSignalR", "ape", "cli", "dplyr", "ensembldb", "glue", "gtools", "msigdbr", "proxyC", "reshape2", "rmarkdown", "spatstat_explore", "spatstat_geom", "tidyr"]
     },
     "scGPS": {
       "name": "scGPS",
-      "version": "1.18.0",
-      "sha256": "1l4rn2amrgih6fi3dshxdjgmvimv93qfan6asy77lgaf8vwa7rlh",
+      "version": "1.20.0",
+      "sha256": "06hm6cckb78vr67rh39g32ys2phch99d5fw7iia0fm3014slfmfw",
       "depends": ["DESeq2", "Rcpp", "RcppArmadillo", "RcppParallel", "SingleCellExperiment", "SummarizedExperiment", "caret", "dplyr", "dynamicTreeCut", "fastcluster", "ggplot2", "glmnet", "locfit"]
     },
     "scHOT": {
       "name": "scHOT",
-      "version": "1.16.0",
-      "sha256": "07sk0yn5ji2avhmdwyzdl466pqncvij1zf0yicw5lpb62f1ac446",
+      "version": "1.18.0",
+      "sha256": "03q9f2xg9va4pqpz0xva8mz8czlkn3r8z5vb33hz6agzncyp0pgf",
       "depends": ["BiocParallel", "IRanges", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ggforce", "ggplot2", "igraph", "reshape"]
     },
     "scMET": {
       "name": "scMET",
-      "version": "1.6.0",
-      "sha256": "1v0x40720npv2c468mhydycrhff9bz2c8m35n3j4y7bja05qaazx",
+      "version": "1.8.0",
+      "sha256": "07i2f9wf6nhnh288i66z846lcbb1n1j6gild64axxq48n1d0c2cm",
       "depends": ["BH", "BiocStyle", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "S4Vectors", "SingleCellExperiment", "StanHeaders", "SummarizedExperiment", "VGAM", "assertthat", "coda", "cowplot", "data_table", "dplyr", "ggplot2", "logitnorm", "matrixStats", "rstan", "rstantools", "viridis"]
     },
     "scMerge": {
       "name": "scMerge",
-      "version": "1.20.0",
-      "sha256": "0v344a2r7hw0x3b3192796sa922sc3jgi7z7pzbx6pcn4c5c9zw4",
+      "version": "1.22.0",
+      "sha256": "1hyh3lv2fxgf9hdf7d1vqcp4w613614pfi64hb9am77k1znsb8sg",
       "depends": ["BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "M3Drop", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "batchelor", "cluster", "cvTools", "distr", "igraph", "proxyC", "ruv", "scater", "scran"]
     },
     "scMitoMut": {
       "name": "scMitoMut",
-      "version": "1.0.0",
-      "sha256": "143h22x71pgmzky1z6g6qvqq1qcb1852341sfsv4dwj2w5j00njm",
+      "version": "1.2.0",
+      "sha256": "15fpbp9fk7xif8m63xsr1ddjac1lm1kq6qjs65a1a7gpfd7nxxnq",
       "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "data_table", "ggplot2", "magrittr", "pheatmap", "plyr", "readr", "rhdf5", "stringr", "zlibbioc"]
     },
     "scMultiSim": {
       "name": "scMultiSim",
-      "version": "1.0.0",
-      "sha256": "16kdxksszq0zhl7z1xavsr5s5fq9259g86pfbg2bqdwqhl1xgf70",
-      "depends": ["KernelKnn", "MASS", "Rtsne", "SummarizedExperiment", "ape", "assertthat", "crayon", "dplyr", "foreach", "ggplot2", "gplots", "igraph", "markdown", "matrixStats", "phytools", "rlang", "zeallot"]
+      "version": "1.2.0",
+      "sha256": "0lhhz45sdkx5s73dwg5zq098g232cr83xp4d80dszh9va21vxp8m",
+      "depends": ["BiocParallel", "KernelKnn", "MASS", "Rtsne", "SummarizedExperiment", "ape", "assertthat", "crayon", "dplyr", "foreach", "ggplot2", "gplots", "igraph", "markdown", "matrixStats", "phytools", "rlang", "zeallot"]
     },
     "scPCA": {
       "name": "scPCA",
-      "version": "1.18.0",
-      "sha256": "00lfwv1l9w9wjqqpgy9hx2sxb7lps7av3lpr5670c2ncf30jm68m",
+      "version": "1.20.0",
+      "sha256": "1mx4dhwhz5rr1qalspd74p88cp6bnn63bmvz4agi6xyzxbx0spnr",
       "depends": ["BiocParallel", "DelayedArray", "Matrix", "MatrixGenerics", "RSpectra", "Rdpack", "ScaledMatrix", "assertthat", "cluster", "coop", "dplyr", "elasticnet", "kernlab", "matrixStats", "origami", "purrr", "sparsepca", "stringr", "tibble"]
     },
     "scPipe": {
       "name": "scPipe",
-      "version": "2.4.0",
-      "sha256": "0n786qxxkfiag88fi4bsf9vgmvx179cxfah6sld5ij34vq224809",
+      "version": "2.6.0",
+      "sha256": "08laknxbzkxr2nqwwv8mi8390rsjj9pc9s4kcy11lvr8fqwpckc7",
       "depends": ["AnnotationDbi", "BiocGenerics", "Biostrings", "DropletUtils", "GGally", "GenomicAlignments", "GenomicRanges", "IRanges", "MASS", "Matrix", "MultiAssayExperiment", "Rcpp", "Rhtslib", "Rsamtools", "Rsubread", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "biomaRt", "data_table", "dplyr", "flexmix", "ggplot2", "glue", "hash", "magrittr", "mclust", "org_Hs_eg_db", "org_Mm_eg_db", "purrr", "reshape", "reticulate", "rlang", "robustbase", "rtracklayer", "scales", "stringr", "testthat", "tibble", "tidyr", "vctrs", "zlibbioc"]
     },
     "scRNAseqApp": {
       "name": "scRNAseqApp",
-      "version": "1.4.0",
-      "sha256": "19wwsmslhya3m5qmqyg6pmm510r0zrh8480h1z8b7jcmkkhyla81",
-      "depends": ["ComplexHeatmap", "DBI", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RSQLite", "RefManageR", "Rsamtools", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "bibtex", "bslib", "circlize", "data_table", "ggdendro", "ggforce", "ggplot2", "ggrepel", "ggridges", "gridExtra", "htmltools", "jsonlite", "magrittr", "patchwork", "plotly", "rhdf5", "rtracklayer", "scales", "scrypt", "shiny", "shinyhelper", "shinymanager", "slingshot", "sortable", "xfun", "xml2"]
+      "version": "1.6.0",
+      "sha256": "108jj1rgs4995wbwk2f4g9bv53d1ywmgzxzxidy6a8ygwaj9zwqz",
+      "depends": ["ComplexHeatmap", "DBI", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RSQLite", "RefManageR", "Rsamtools", "S4Vectors", "Seurat", "SeuratObject", "SingleCellExperiment", "bibtex", "bslib", "circlize", "colourpicker", "data_table", "ggdendro", "ggforce", "ggplot2", "ggrepel", "ggridges", "gridExtra", "htmltools", "jsonlite", "magrittr", "patchwork", "plotly", "rhdf5", "rtracklayer", "scales", "scrypt", "shiny", "shinyhelper", "shinymanager", "slingshot", "sortable", "xfun", "xml2"]
     },
     "scReClassify": {
       "name": "scReClassify",
-      "version": "1.10.0",
-      "sha256": "1m7l19kyfnwzk2wcmc9v5xmssfx1nm4v00z986s4xx7mhhx05dki",
+      "version": "1.12.0",
+      "sha256": "0c95lijjd9775vrgg55wwms8wivivlwmqnia8vf0lsl6bi21a0yr",
       "depends": ["SingleCellExperiment", "SummarizedExperiment", "e1071", "randomForest"]
     },
     "scRecover": {
       "name": "scRecover",
-      "version": "1.20.0",
-      "sha256": "0nxxsgm7sr4mlskgflbf3xi322j67zfdvbk6vxwwp5bxil2r0m13",
+      "version": "1.22.0",
+      "sha256": "020zgypbfx0dznkxisak4wgiww331hvr58a1fcn05mwl6f40aqri",
       "depends": ["BiocParallel", "MASS", "Matrix", "SAVER", "bbmle", "doParallel", "foreach", "gamlss", "kernlab", "penalized", "preseqR", "pscl", "rsvd"]
     },
     "scRepertoire": {
       "name": "scRepertoire",
-      "version": "2.0.0",
-      "sha256": "1ifnyfzswisacvxxf041l1snfv1b8x30pjg2pwampg804c56f1wj",
-      "depends": ["Rcpp", "S4Vectors", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "VGAM", "cubature", "dplyr", "evmix", "ggalluvial", "ggdendro", "ggplot2", "ggraph", "hash", "iNEXT", "igraph", "plyr", "quantreg", "reshape2", "rjson", "rlang", "stringdist", "stringr", "tidygraph", "truncdist"]
+      "version": "2.2.1",
+      "sha256": "0id62pkjyk48jxica8mfzb2mzwc5f1ijb7d5200grxzn453zsihm",
+      "depends": ["Rcpp", "S4Vectors", "SeuratObject", "SingleCellExperiment", "SummarizedExperiment", "VGAM", "assertthat", "cubature", "dplyr", "evmix", "ggalluvial", "ggdendro", "ggplot2", "ggraph", "hash", "iNEXT", "igraph", "lifecycle", "plyr", "purrr", "quantreg", "reshape2", "rjson", "rlang", "stringdist", "stringr", "tidygraph", "truncdist"]
     },
     "scShapes": {
       "name": "scShapes",
-      "version": "1.10.0",
-      "sha256": "003948wggm6hss2yl9hizil0jv78yd3jipvrs9js8c93fp78cbrw",
+      "version": "1.12.0",
+      "sha256": "1a6rrbb4zg0x6sg0p15p8xa6kj3k506kx4zrh8vwa98iv04ni7sy",
       "depends": ["BiocParallel", "MASS", "Matrix", "VGAM", "dgof", "emdbook", "magrittr", "pscl"]
     },
     "scTGIF": {
       "name": "scTGIF",
-      "version": "1.18.0",
-      "sha256": "13sj8gqmjaq2qcap7dh8gb2di4v59qw3g7l7ryc7crfmj7c9wipd",
+      "version": "1.20.0",
+      "sha256": "12kr33gbhd3xljyfi8jv1pyhk09i6p2ykcqvyb5r4g3b2k7drk77",
       "depends": ["Biobase", "BiocStyle", "GSEABase", "RColorBrewer", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "igraph", "knitr", "msigdbr", "nnTensor", "plotly", "rmarkdown", "scales", "schex", "tagcloud", "tibble"]
     },
     "scTHI": {
       "name": "scTHI",
-      "version": "1.16.0",
-      "sha256": "0p9k1fh4k2gqv326vfxshmcwsqpyz5zhsr0xnzw9iz7rykpf7m81",
+      "version": "1.18.0",
+      "sha256": "173rlfl7cjcp9jhqkzl02rg9nynbgnc2ps0sxy4yrfpkw6272fb1",
       "depends": ["BiocParallel", "Rtsne"]
     },
     "scTensor": {
       "name": "scTensor",
-      "version": "2.14.0",
-      "sha256": "1s4ayn2wx63zfqj6vh2zmnb6a3khwfwq5s7jsllgdwcxq8039i11",
+      "version": "2.16.0",
+      "sha256": "0h91dxmsl6lsgbv0qaskl7nzk6n575p7di35m69n5abp5bb2r0ac",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocManager", "BiocStyle", "Category", "DOSE", "GOstats", "MeSHDbi", "RSQLite", "ReactomePA", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "abind", "ccTensor", "checkmate", "crayon", "ggplot2", "heatmaply", "igraph", "knitr", "meshr", "nnTensor", "outliers", "plotly", "plotrix", "rTensor", "reactome_db", "rmarkdown", "schex", "tagcloud", "visNetwork"]
     },
     "scTreeViz": {
       "name": "scTreeViz",
-      "version": "1.10.0",
-      "sha256": "1vmqd4bml6ikpbbd90kqrrfhi1bkv9vdjlxcai588807vcckg54a",
+      "version": "1.12.0",
+      "sha256": "1imsjlhpflqjqi89gpbw76s4vd04l3spas0hzpaznpypq3wkzglz",
       "depends": ["Matrix", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "clustree", "data_table", "digest", "epivizr", "epivizrData", "epivizrServer", "ggplot2", "ggraph", "httr", "igraph", "scater", "scran", "sys"]
     },
     "scanMiR": {
       "name": "scanMiR",
-      "version": "1.10.0",
-      "sha256": "1nmkfpkvq3qbgnql8c7glmxjyszwqp546v1ah78crnn3lnqkdchx",
+      "version": "1.12.0",
+      "sha256": "1qg9j82acg5ncx032pdh7ikwss0q4aa7ax64id3fyfqs3fi5z133",
       "depends": ["BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "cowplot", "data_table", "ggplot2", "pwalign", "seqLogo", "stringi"]
     },
     "scanMiRApp": {
       "name": "scanMiRApp",
-      "version": "1.10.0",
-      "sha256": "12id6sla58gk1xj56vh7aamkrplx85f2am58brq3p384z5inx9kj",
+      "version": "1.12.0",
+      "sha256": "00lxgnf00pjzjzy9z447afg94cxxvb5yghh0s4sxi60q8xcvdsd7",
       "depends": ["AnnotationDbi", "AnnotationFilter", "AnnotationHub", "BiocParallel", "Biostrings", "DT", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "data_table", "digest", "ensembldb", "fst", "ggplot2", "htmlwidgets", "plotly", "rintrojs", "rtracklayer", "scanMiR", "scanMiRData", "shiny", "shinycssloaders", "shinydashboard", "shinyjqui", "txdbmaker", "waiter"]
     },
     "scater": {
       "name": "scater",
-      "version": "1.32.1",
-      "sha256": "1052jlflk596q8dbzhwx150ql53lhz109lljc011ni42a5zvjnbm",
-      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "MatrixGenerics", "RColorBrewer", "RcppML", "Rtsne", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "ggbeeswarm", "ggplot2", "ggrastr", "ggrepel", "pheatmap", "rlang", "scuttle", "uwot", "viridis"]
+      "version": "1.34.0",
+      "sha256": "1b4sc5gi2wjcrfm78y0w7df2bb5sw6spjswhsss47shxy6m2vhh1",
+      "depends": ["BiocGenerics", "BiocNeighbors", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "MatrixGenerics", "RColorBrewer", "RcppML", "Rtsne", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "beachmat", "ggbeeswarm", "ggplot2", "ggrastr", "ggrepel", "pheatmap", "rlang", "scuttle", "uwot", "viridis"]
     },
     "scatterHatch": {
       "name": "scatterHatch",
-      "version": "1.10.0",
-      "sha256": "1pxax6kyh5izn00g3vp1b94zcsm1qg7sq2f307zg8v3i53sajl54",
+      "version": "1.12.0",
+      "sha256": "0l1lbr9nsb9mmh8n67p39lqmis4l1jb6x39xzlfcyw65sayq73pk",
       "depends": ["ggplot2", "plyr", "spatstat_geom"]
     },
     "sccomp": {
       "name": "sccomp",
-      "version": "1.8.0",
-      "sha256": "1dgv5pyf765p84i070fwdmhj1878rcimzjd6n3kx8j5r7mv10ff5",
-      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "SeuratObject", "SingleCellExperiment", "StanHeaders", "boot", "dplyr", "forcats", "ggplot2", "ggrepel", "glue", "lifecycle", "magrittr", "patchwork", "purrr", "readr", "rlang", "rstan", "rstantools", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "1.10.0",
+      "sha256": "1011rh6bx8vysgljj6z68d833gvprmd4slib1hdapscqhad01zp3",
+      "depends": ["SeuratObject", "SingleCellExperiment", "boot", "callr", "digest", "dplyr", "forcats", "fs", "ggplot2", "ggrepel", "glue", "instantiate", "lifecycle", "magrittr", "patchwork", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect", "withr"]
     },
     "scde": {
       "name": "scde",
-      "version": "2.32.0",
-      "sha256": "0s54h3p8kvlk7imv8w8m1gwslyahn6jrggpkbgga5z7mqakvag6c",
+      "version": "2.34.0",
+      "sha256": "1chpic6rjp3vswbqjag11f202lfj3mf2ramqahl8fnzlfjzkb51y",
       "depends": ["BiocParallel", "Cairo", "MASS", "RColorBrewer", "RMTstat", "Rcpp", "RcppArmadillo", "Rook", "edgeR", "extRemes", "flexmix", "mgcv", "nnet", "pcaMethods", "quantreg", "rjson"]
     },
     "scds": {
       "name": "scds",
-      "version": "1.20.0",
-      "sha256": "19xma4kmx8s6m6dvqyw461ahqyfqb7z3n5dz4ppab4xcpmqvx0vh",
+      "version": "1.22.0",
+      "sha256": "18k3665pndd4vgn5a67kmwxc9jkbngspl20qgdxn3y1hph8mbjw5",
       "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "pROC", "xgboost"]
     },
     "schex": {
       "name": "schex",
-      "version": "1.18.0",
-      "sha256": "1wb3sksxvj08zqg34scwg1xrzj3hdk2jmyqswd03cjppyjy3ysq6",
+      "version": "1.20.0",
+      "sha256": "01zlax3kx2zvab5bn2wdd5nilsagfrwhd15yzhyqpy2w2x6d00nw",
       "depends": ["SingleCellExperiment", "cluster", "concaveman", "dplyr", "entropy", "ggforce", "ggplot2", "hexbin", "rlang"]
     },
     "scider": {
       "name": "scider",
-      "version": "1.2.0",
-      "sha256": "0i1p5pf6jc2f39cfmi5d8ifc7lb5n7m7k0lkgif5vhm2z4nfhrnf",
+      "version": "1.4.0",
+      "sha256": "0mldyb2rwcq2lf73lrkgmc8bg5hamp6r9zw9c0gdrq6fs3lwhk0a",
       "depends": ["S4Vectors", "SpatialExperiment", "SummarizedExperiment", "ggplot2", "igraph", "isoband", "janitor", "knitr", "lwgeom", "pheatmap", "plotly", "rlang", "sf", "shiny", "spatstat_explore", "spatstat_geom"]
     },
     "scifer": {
       "name": "scifer",
-      "version": "1.6.0",
-      "sha256": "022dn1492hjiyxxq0mqhvs299lgzg26jik7y5brh0i0ajj1j63fv",
-      "depends": ["Biostrings", "DECIPHER", "data_table", "dplyr", "flowCore", "ggplot2", "gridExtra", "kableExtra", "knitr", "plyr", "rlang", "rmarkdown", "sangerseqR", "scales", "stringr", "tibble"]
+      "version": "1.8.1",
+      "sha256": "1f5s4hma2p4fvpspldrs52ry2kvy22gmylbyslid15cy4slx1knh",
+      "depends": ["Biostrings", "DECIPHER", "basilisk", "basilisk_utils", "data_table", "dplyr", "flowCore", "ggplot2", "gridExtra", "here", "kableExtra", "knitr", "plyr", "reticulate", "rlang", "rmarkdown", "sangerseqR", "scales", "stringr", "tibble"]
     },
     "scmap": {
       "name": "scmap",
-      "version": "1.26.0",
-      "sha256": "0acy3sg4j36znsfxpkb190wbawbngx15cr5x2lhgrjivvw3637x1",
+      "version": "1.28.0",
+      "sha256": "16ajd19p8ybllm80sr7p6zv8jxs8y4r9cblgzy9f12bby2l71fbz",
       "depends": ["Biobase", "BiocGenerics", "Rcpp", "RcppArmadillo", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "e1071", "ggplot2", "googleVis", "matrixStats", "proxy", "randomForest", "reshape2"]
     },
     "scmeth": {
       "name": "scmeth",
-      "version": "1.24.0",
-      "sha256": "1yrww6b0lnh4831iw9adjimdazfa3f1w66pypzi99ywdcbdyksg8",
+      "version": "1.26.0",
+      "sha256": "1fcxmb4wnj9108xswdkxq40a7g6whmizxkw9k4dr0ikdp7d24cwd",
       "depends": ["AnnotationHub", "BSgenome", "Biostrings", "DT", "DelayedArray", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "SummarizedExperiment", "annotatr", "bsseq", "knitr", "reshape2", "rmarkdown"]
     },
     "scone": {
       "name": "scone",
-      "version": "1.28.0",
-      "sha256": "1qvnc6cds3avxh1k4z47vb2fih7q8a5b9hccnyrpfks5c0sd6yi0",
-      "depends": ["BiocParallel", "MatrixGenerics", "RColorBrewer", "RUVSeq", "SingleCellExperiment", "SummarizedExperiment", "aroma_light", "boot", "class", "cluster", "compositions", "diptest", "edgeR", "fpc", "gplots", "hexbin", "limma", "matrixStats", "mixtools", "rARPACK", "rhdf5"]
+      "version": "1.30.0",
+      "sha256": "0cmjyxkszidsjzhs6rqw5m7afmy4gw2rvajrm5wagnisk73bvz6i",
+      "depends": ["BiocParallel", "DelayedMatrixStats", "MatrixGenerics", "RColorBrewer", "RUVSeq", "SingleCellExperiment", "SummarizedExperiment", "aroma_light", "boot", "class", "cluster", "compositions", "diptest", "edgeR", "fpc", "gplots", "hexbin", "limma", "matrixStats", "mixtools", "rARPACK", "rhdf5", "sparseMatrixStats"]
     },
     "scoreInvHap": {
       "name": "scoreInvHap",
-      "version": "1.26.0",
-      "sha256": "0sdawb2xsrwyqsk18rfzpk7f5ryl3pznawz3b6v5s143vg3d7s84",
+      "version": "1.28.0",
+      "sha256": "1awp2l4xfxnk36qcgig1fms39klk9ry5p3r4n5iqvs1qi7v5yma1",
       "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "SummarizedExperiment", "VariantAnnotation", "snpStats"]
     },
+    "scoup": {
+      "name": "scoup",
+      "version": "1.0.0",
+      "sha256": "10ajsp3pngwmy5php86cn6q2xf5nnrl44kqjmg17l9vn5jms5ybl",
+      "depends": ["Biostrings", "Matrix"]
+    },
     "scp": {
       "name": "scp",
-      "version": "1.14.0",
-      "sha256": "1b8hfvjpvni672qz6y53sy2wxbrn8anpanjd9qnixxisg94c66qj",
-      "depends": ["IHW", "MsCoreUtils", "MultiAssayExperiment", "QFeatures", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggrepel", "matrixStats", "metapod", "nipals"]
+      "version": "1.16.0",
+      "sha256": "0ld32imgw2qhc6gnjxbhd8q1nx5c9yvab3rqkgd48sm3kz43h3yh",
+      "depends": ["IHW", "MsCoreUtils", "MultiAssayExperiment", "QFeatures", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "ggrepel", "matrixStats", "metapod", "nipals"]
     },
     "scran": {
       "name": "scran",
-      "version": "1.32.0",
-      "sha256": "0s1y2q4v596wxh8p5sr43mk9cnsc4kg36ld7vx71hbn3hwscqaa1",
-      "depends": ["BH", "BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "DelayedMatrixStats", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "bluster", "dqrng", "edgeR", "igraph", "limma", "metapod", "scuttle", "statmod"]
+      "version": "1.34.0",
+      "sha256": "1gi5sv5bb7y8r95sr7cc01cy01j1ymc9piyjmriz0ybyh8flwyrv",
+      "depends": ["BH", "BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "MatrixGenerics", "Rcpp", "S4Arrays", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat", "bluster", "dqrng", "edgeR", "igraph", "limma", "metapod", "scuttle", "statmod"]
+    },
+    "scrapper": {
+      "name": "scrapper",
+      "version": "1.0.3",
+      "sha256": "0gvivdlrkbv3s8maz4iaxws3rmk1j80fjcgr7mkhnwxh1cavw0ai",
+      "depends": ["BiocNeighbors", "DelayedArray", "Rcpp", "assorthead", "beachmat", "igraph"]
     },
     "screenCounter": {
       "name": "screenCounter",
-      "version": "1.4.0",
-      "sha256": "0xq6ay76lnbbdibvyvkfk0nb8i8hxmvnxb4gfi2sj4ggsrz49rcz",
+      "version": "1.6.0",
+      "sha256": "0mnd2f5i41sx1qy96v5mf93bc5m4cwwc2kwn2q6hkbzxkb0rd5na",
       "depends": ["BiocParallel", "Rcpp", "S4Vectors", "SummarizedExperiment", "zlibbioc"]
     },
     "scruff": {
       "name": "scruff",
-      "version": "1.22.0",
-      "sha256": "0gw8xj4agiz1j5lwp5zpa6m5k9wkkzrvcyzrrnqva1768v8123vb",
+      "version": "1.24.0",
+      "sha256": "1wnr7dqhc8ddss5nh3jdhqgzqnn44kfmy89mgdks8a6nbn1drvyr",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Rsamtools", "Rsubread", "S4Vectors", "ShortRead", "SingleCellExperiment", "SummarizedExperiment", "data_table", "ggbio", "ggplot2", "ggthemes", "parallelly", "plyr", "rtracklayer", "scales", "stringdist", "txdbmaker"]
     },
     "scry": {
       "name": "scry",
-      "version": "1.16.0",
-      "sha256": "16489ff1nc798nfcmqvqaczm7hqffkhpad1dfgr7dxlahd8sbnw9",
+      "version": "1.18.0",
+      "sha256": "09l8w1b2n8kwhmn8373hfddj38gdddar0jfq0cz80kqb98xh3d37",
       "depends": ["BiocSingular", "DelayedArray", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "glmpca"]
     },
     "scuttle": {
       "name": "scuttle",
-      "version": "1.14.0",
-      "sha256": "1cja56k5y5vi1x0jdxaxvh13fc2lzh8g30gp294pz6p61prrf3ws",
-      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "DelayedMatrixStats", "GenomicRanges", "Matrix", "Rcpp", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "beachmat"]
+      "version": "1.16.0",
+      "sha256": "0h13a9pgsm3w324622qlp9nqpvq6gsjwcyd44d6w5yzrl9jcsliv",
+      "depends": ["BiocGenerics", "BiocParallel", "DelayedArray", "GenomicRanges", "Matrix", "MatrixGenerics", "Rcpp", "S4Arrays", "S4Vectors", "SingleCellExperiment", "SparseArray", "SummarizedExperiment", "beachmat"]
     },
     "scviR": {
       "name": "scviR",
-      "version": "1.4.0",
-      "sha256": "0691v3kyhazmhzr2nqzc1inbc7i1kdjv4y94wl96fd20d48ypqhp",
+      "version": "1.6.0",
+      "sha256": "0ylpvvfb5dvrh1bf9my8d24af1v3g5c50hvpmh9p54gazqpcqjwf",
       "depends": ["BiocFileCache", "MatrixGenerics", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "limma", "pheatmap", "reticulate", "scater", "shiny"]
     },
+    "seahtrue": {
+      "name": "seahtrue",
+      "version": "1.0.0",
+      "sha256": "1awprkfzqhp77rc6l432rm7ay7vx5ywgcw1am4xg7rgxlnm7yfz6",
+      "depends": ["RColorBrewer", "cli", "colorspace", "dplyr", "forcats", "ggplot2", "ggridges", "glue", "janitor", "logger", "lubridate", "purrr", "readr", "readxl", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyxl", "validate"]
+    },
     "sechm": {
       "name": "sechm",
-      "version": "1.12.0",
-      "sha256": "0ig46ikddqqd9sclbxrv1gffc6snz0h7pindfw06cdk2i4dsan30",
+      "version": "1.14.0",
+      "sha256": "15xlssacx8cv6pn1kzv7zj0i9jqw2zi98h0vhqkj5iqyz30m6m65",
       "depends": ["ComplexHeatmap", "S4Vectors", "SummarizedExperiment", "circlize", "matrixStats", "randomcoloR", "seriation"]
     },
     "segmentSeq": {
       "name": "segmentSeq",
-      "version": "2.38.0",
-      "sha256": "114sv9k2zlgsg82z57wwnp74hmq8p22gy5dg8my91xb3rzv3h8xw",
+      "version": "2.40.0",
+      "sha256": "08qk47m8yz467678qcjb7gvdpc7lksrgv14k3f1riwbjz4s2js1k",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "abind", "baySeq"]
     },
     "segmenter": {
       "name": "segmenter",
-      "version": "1.10.0",
-      "sha256": "0s4iphqgwdr0shg71gr273s20q9vrzhxq3nfqqv494z7raycf1qy",
+      "version": "1.12.0",
+      "sha256": "0sgagbabps2zh0wh5asw5r3yjlhh0ygs5cy5pqxh23p7v5yk9wsx",
       "depends": ["ChIPseeker", "ComplexHeatmap", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "bamsignals", "chromhmmData"]
     },
     "selectKSigs": {
       "name": "selectKSigs",
-      "version": "1.16.0",
-      "sha256": "16cq4pg402a64vp0r1k9m91jqbdzij3la9gbzqqjc2vyr742yl14",
+      "version": "1.18.0",
+      "sha256": "0c4b4fk1nqas2chjllqds2a1iv2879c4vsg053m9hq8schv5x5dx",
       "depends": ["HiLDA", "Rcpp", "gtools", "magrittr"]
     },
     "semisup": {
       "name": "semisup",
-      "version": "1.28.0",
-      "sha256": "0pmbjlgaqs9mbmyzg1d85ifp8pbjicyqs23jw8nnhlsrmpjgcywx",
+      "version": "1.30.0",
+      "sha256": "1c0i163xsf0g0bsfjgcbj7vgw8jr55fxv1bcd4hn026sh4j5vkn9",
       "depends": ["VGAM"]
     },
     "seq_hotSPOT": {
       "name": "seq.hotSPOT",
-      "version": "1.4.0",
-      "sha256": "0wyl4z54w1rk54c5sf3wvjg1sjpin0pj6j8j42g4a2zjkvvi5bva",
+      "version": "1.6.0",
+      "sha256": "02mcwi2rp4dvvhz28gi50lr4anp7mxk8af1ivxkfbvpd2pj3xp4z",
       "depends": ["R_utils", "hash"]
     },
     "seq2pathway": {
       "name": "seq2pathway",
-      "version": "1.36.0",
-      "sha256": "0l1a53m4gjbgf6f53nndzdxldvi0j7xawd7m05wr23v64qd8a0ng",
+      "version": "1.38.0",
+      "sha256": "1mq03f63qy9g2905wjmgdkf5c4m1b8a22yv2pnhqiqg9p7i3p0j8",
       "depends": ["GSA", "GenomicRanges", "WGCNA", "biomaRt", "nnet", "seq2pathway_data"]
     },
     "seqArchR": {
       "name": "seqArchR",
-      "version": "1.8.0",
-      "sha256": "0q0ip73hvjq2j39mznd980fyvbwm9yb4ihk8yihv97i8h559ml9w",
+      "version": "1.10.0",
+      "sha256": "1gw9qclal1ibiy09pbpz89m3ccgan24zi8m347zjc36zqwk9x51n",
       "depends": ["BiocParallel", "Biostrings", "MASS", "Matrix", "cli", "cluster", "cvTools", "fpc", "ggplot2", "ggseqlogo", "matrixStats", "prettyunits", "reshape2", "reticulate"]
     },
     "seqArchRplus": {
       "name": "seqArchRplus",
-      "version": "1.4.0",
-      "sha256": "0wk87l3346v6fm77pywrwcfhwbvswkrxv79809c0wycn84qlqd0p",
+      "version": "1.6.0",
+      "sha256": "1i3v3w3hg09f8anz39d0pd124ymj1l1qd6bxyvgwmh8hfbcn5rcp",
       "depends": ["BSgenome", "BiocParallel", "Biostrings", "ChIPseeker", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "cli", "clusterProfiler", "cowplot", "factoextra", "ggimage", "ggplot2", "gridExtra", "heatmaps", "magick", "scales", "seqArchR", "seqPattern"]
     },
     "seqCAT": {
       "name": "seqCAT",
-      "version": "1.26.0",
-      "sha256": "1b9y45src6yfz8fmiihp6p2s76gz1nva5swnf8fbar4mranfwi73",
+      "version": "1.28.0",
+      "sha256": "1k8850fzxl36hjjc9zmmby1vajhajicq3682d3cagssby2ha7mx1",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "dplyr", "ggplot2", "rlang", "rtracklayer", "scales", "tidyr"]
     },
     "seqLogo": {
       "name": "seqLogo",
-      "version": "1.70.0",
-      "sha256": "154c3g4i6snsi8vkwjw4d8lyr3372d6vyw237nslw1y5n837yzir",
+      "version": "1.72.0",
+      "sha256": "0a5qndfdlsz38kwiijcshilwp6xiwlx0aqfx9ysw09a2kcb7hwww",
       "depends": []
     },
     "seqPattern": {
       "name": "seqPattern",
-      "version": "1.36.0",
-      "sha256": "0iv0dhs1z8i0jglh1iw6ypzh6qslnn5xly2kjfxaxk9cggnjb5h6",
+      "version": "1.38.0",
+      "sha256": "01dslqflyk7i30wlb2455xqq2zpyz91fg44q4fq6bbp9kj1npazm",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "KernSmooth", "plotrix"]
     },
     "seqTools": {
       "name": "seqTools",
-      "version": "1.38.0",
-      "sha256": "0sc2siflk12dnmmqsb0gfbncyh5w6cv58dba304ig7rg3vsk3277",
+      "version": "1.40.0",
+      "sha256": "1in7dhcm08rnhsnp8hfcaviq821p97mj8dhjvggs1vf4w42s3l2l",
       "depends": ["zlibbioc"]
     },
     "seqcombo": {
       "name": "seqcombo",
-      "version": "1.26.0",
-      "sha256": "119wpz4rl5fyhc60myaw9d498n19pshnwwrmxkqx8pnqz9g6jjpq",
+      "version": "1.28.0",
+      "sha256": "09icq28w4lz3kvhhjx7kgf47y7bn60w39n3lwililzq3hr0arfhh",
       "depends": ["ggplot2", "igraph", "yulab_utils"]
     },
     "seqsetvis": {
       "name": "seqsetvis",
-      "version": "1.24.0",
-      "sha256": "1aazar9k36hwlx9fq6iyd7f6g764nih9f0phl0sla7gizrmpwsms",
+      "version": "1.26.0",
+      "sha256": "1kwww3kfx36ssvp4ynk11ls43rldc1yxflaiqp73rlbhs1r2sz2v",
       "depends": ["GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "S4Vectors", "UpSetR", "cowplot", "data_table", "eulerr", "ggplot2", "ggplotify", "limma", "pbapply", "pbmcapply", "png", "rtracklayer", "scales"]
     },
     "sesame": {
       "name": "sesame",
-      "version": "1.22.2",
-      "sha256": "1d2vjglpbhmr4fjp3zwipf0nwj5pms4l9q1xngyxrsbr26x7jp1d",
+      "version": "1.24.0",
+      "sha256": "0s7vybr0nd5wx1qjkmfqjkff4wp9qv5ibk2fckzpwlsd2jv3pzng",
       "depends": ["BiocFileCache", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "preprocessCore", "readr", "reshape2", "sesameData", "stringr", "tibble", "wheatmap"]
     },
     "sevenC": {
       "name": "sevenC",
-      "version": "1.24.0",
-      "sha256": "0x1r6zbwl6shhzf2xc7lp06dvlhqhgh70i71fwn25lndwyhkw280",
+      "version": "1.26.0",
+      "sha256": "1lci7mcmcgxly9izynrqs9dnam96ab2v4k95pqb6hh9dnllfa4xp",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "InteractionSet", "S4Vectors", "boot", "data_table", "purrr", "readr", "rtracklayer"]
     },
     "sevenbridges": {
       "name": "sevenbridges",
-      "version": "1.34.0",
-      "sha256": "0vy7vz87z371q2plhxkp5src6la6hj1w7bd4xkqbm3nmym2p32pb",
+      "version": "1.36.0",
+      "sha256": "0ahg7dyp21k9hknlrbmb6njaikbwwpwsnncrjzni0zgwwqn57j8h",
       "depends": ["S4Vectors", "curl", "data_table", "docopt", "httr", "jsonlite", "objectProperties", "stringr", "uuid", "yaml"]
     },
     "shiny_gosling": {
       "name": "shiny.gosling",
-      "version": "1.0.1",
-      "sha256": "1dig8hv7pw3p6ra1z76mg7sfbvdrdaprsix9i60503sriqs3arv2",
+      "version": "1.2.0",
+      "sha256": "1kak3dk8hra17xwsx35wqm8x40kp6lv6hwbpfxq9bd272v72rzkd",
       "depends": ["digest", "fs", "htmltools", "jsonlite", "rjson", "rlang", "shiny", "shiny_react"]
     },
     "shinyMethyl": {
       "name": "shinyMethyl",
-      "version": "1.40.0",
-      "sha256": "15r9x1fqladjviyisbhr8zff0a6g9kvbvx72xcp3bfadp3wpygds",
+      "version": "1.42.0",
+      "sha256": "1gbqyn55y1ybk4y67mj9vms6nzjhdx93ckrfyjkmispwra6drkmg",
       "depends": ["Biobase", "BiocGenerics", "MatrixGenerics", "RColorBrewer", "htmltools", "minfi", "shiny"]
     },
     "shinyepico": {
       "name": "shinyepico",
-      "version": "1.12.0",
-      "sha256": "0k6h2n8dy66k1vl5mrag45z5knhgn9xbim5b0nbrzh9pwi687nc1",
+      "version": "1.14.0",
+      "sha256": "0sm09gd6bvpy88c4zc4mm5iibk2s7bf3v7r98c54ap9bgh8g04zv",
       "depends": ["DT", "GenomicRanges", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "gplots", "heatmaply", "limma", "minfi", "plotly", "reshape2", "rlang", "rmarkdown", "rtracklayer", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "shinythemes", "statmod", "tidyr", "zip"]
     },
     "sigFeature": {
       "name": "sigFeature",
-      "version": "1.22.0",
-      "sha256": "0hgdzjlxxsxmrjrdlzabssdisn1rmi6h9nd37gid4dbr8xd1ibyh",
+      "version": "1.24.0",
+      "sha256": "1qpfv23ji0616afv5vdkw61q2li7gw0b9axsj6mrid6qakhv598r",
       "depends": ["BiocParallel", "Matrix", "RColorBrewer", "SparseM", "SummarizedExperiment", "biocViews", "e1071", "nlme", "openxlsx", "pheatmap"]
     },
     "siggenes": {
       "name": "siggenes",
-      "version": "1.78.0",
-      "sha256": "0j4nhdq82dzr19x5w4w4l97clra0z1kk6n24x56hrrj0xlm2cgnm",
+      "version": "1.80.0",
+      "sha256": "0d9yy4mgljgwfv1p57zqwxp7csvmbqzfp46kay0rfmrdad3qzrq7",
       "depends": ["Biobase", "multtest", "scrime"]
     },
     "sights": {
       "name": "sights",
-      "version": "1.30.0",
-      "sha256": "0kr52ng79wz6rh0rhk5kmjskn04xr89h14bdhryyzkhq80v0c2k8",
+      "version": "1.32.0",
+      "sha256": "007rgyj5gpqvb12lb941kqpg80pk9nawqam80n225ilp1wpifylm",
       "depends": ["MASS", "ggplot2", "lattice", "qvalue", "reshape2"]
     },
     "signatureSearch": {
       "name": "signatureSearch",
-      "version": "1.18.0",
-      "sha256": "1b32n67f5c804xxbpwxpykjhakixzf5zd1zbgwj976lvdb2adl34",
+      "version": "1.20.0",
+      "sha256": "11khc6aa7wcbk83z4d5n064pg246n18wrwlwhk51w4199nab01ih",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "DOSE", "DelayedArray", "ExperimentHub", "GSEABase", "HDF5Array", "Matrix", "RSQLite", "Rcpp", "SummarizedExperiment", "clusterProfiler", "data_table", "dplyr", "fastmatch", "fgsea", "ggplot2", "magrittr", "org_Hs_eg_db", "qvalue", "reactome_db", "readr", "reshape2", "rhdf5", "scales", "tibble", "visNetwork"]
     },
     "signeR": {
       "name": "signeR",
-      "version": "2.6.0",
-      "sha256": "0jc9z48sgzjgxdidp9qhn4ccnx7jjlj0xnfrwajh0xq0ai1vnqb6",
+      "version": "2.8.0",
+      "sha256": "1zxrszphm6c7xspwpknfq09qykx7kq5rr1xmkqblsw4xqp7lf8cs",
       "depends": ["BSgenome", "BiocFileCache", "BiocGenerics", "Biostrings", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS", "NMF", "PMCMRplus", "RColorBrewer", "Rcpp", "RcppArmadillo", "VGAM", "VariantAnnotation", "ada", "bsplus", "class", "clue", "cowplot", "dplyr", "e1071", "future", "future_apply", "ggplot2", "ggpubr", "glmnet", "kknn", "listenv", "magrittr", "maxstat", "nloptr", "pROC", "pheatmap", "ppclust", "proxy", "pvclust", "randomForest", "readr", "reshape2", "rtracklayer", "scales", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "survival", "survivalAnalysis", "survminer", "tibble", "tidyr"]
     },
-    "signifinder": {
-      "name": "signifinder",
-      "version": "1.6.0",
-      "sha256": "0r6acaqk7zaryy8ddpfischw08b6sml3cydrw8v9wys0rfv207pb",
-      "depends": ["AnnotationDbi", "BiocGenerics", "ComplexHeatmap", "DGEobj_utils", "GSVA", "IRanges", "RColorBrewer", "SpatialExperiment", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "consensusOV", "cowplot", "dplyr", "ensembldb", "ggplot2", "ggridges", "magrittr", "matrixStats", "maxstat", "openair", "org_Hs_eg_db", "patchwork", "sparrow", "survival", "survminer", "viridis"]
-    },
     "sigsquared": {
       "name": "sigsquared",
-      "version": "1.36.0",
-      "sha256": "19z9jfiacm4idh4638vk358jrl8zkg6jay7r07hkqpc3m6i0ysa0",
+      "version": "1.38.0",
+      "sha256": "1206vfsv77vhq8l6wigajk3w1k39gyn4rkjdxn7a4hb64s9lyhci",
       "depends": ["Biobase", "survival"]
     },
     "simPIC": {
       "name": "simPIC",
-      "version": "1.0.0",
-      "sha256": "0qspzkpdfpya2hkj1lry68cybcsscw9xj5ycpg87xg38n3jyqcbm",
+      "version": "1.2.0",
+      "sha256": "0hxvqr2ycjdldbsas4vnrnqkhb3lp4q0sdbrh96i40kvlqyf27fl",
       "depends": ["BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "actuar", "checkmate", "fitdistrplus", "matrixStats", "rlang", "scales", "scuttle"]
     },
     "similaRpeak": {
       "name": "similaRpeak",
-      "version": "1.36.0",
-      "sha256": "12im06jfjy3b00bga1sskxn15b1bsbhybsqi8lw9pgwx2hmrf4hb",
+      "version": "1.38.0",
+      "sha256": "121ljckgdfd46f0ir1rsrwjxaxnygj22h9jj1nhz5iijk5v70rs5",
       "depends": ["R6"]
     },
     "simona": {
       "name": "simona",
-      "version": "1.2.0",
-      "sha256": "04ynhnkb9qnniyvavfylg010pyry843362pjcw94kw9bwnklscy5",
+      "version": "1.4.0",
+      "sha256": "13qkca6ch7ppdf1clgzgnygh9zb05163bm5a402pya7wbq2vkdzx",
       "depends": ["ComplexHeatmap", "GetoptLong", "GlobalOptions", "Polychrome", "Rcpp", "S4Vectors", "circlize", "igraph", "matrixStats", "shiny", "xml2"]
     },
     "simpleSeg": {
       "name": "simpleSeg",
-      "version": "1.6.1",
-      "sha256": "0rmd9kclh6x9gxqncw25563c4vh2xk206iia0qc058w9lbzqyp5f",
+      "version": "1.8.0",
+      "sha256": "0brm61896vaq7fhaqnnxdqhfc0qyihajbqvmakr8pfp8jhgbxzbh",
       "depends": ["BiocParallel", "EBImage", "S4Vectors", "SummarizedExperiment", "cytomapper", "spatstat_geom", "terra"]
     },
     "simplifyEnrichment": {
       "name": "simplifyEnrichment",
-      "version": "1.14.0",
-      "sha256": "1031rkl2gcgx4k1biz4bc38hfq7r6diqk48769jhii0r06ablrhi",
-      "depends": ["AnnotationDbi", "BiocGenerics", "ComplexHeatmap", "GOSemSim", "GO_db", "GetoptLong", "GlobalOptions", "Matrix", "circlize", "clue", "cluster", "colorspace", "digest", "org_Hs_eg_db", "proxyC", "slam", "tm"]
+      "version": "2.0.0",
+      "sha256": "04ww535snhd6j6syqfabhi5yrphzlv9ydmvvvxpx5f8x2cai1cp9",
+      "depends": ["AnnotationDbi", "ComplexHeatmap", "GO_db", "GetoptLong", "GlobalOptions", "circlize", "clue", "cluster", "colorspace", "digest", "simona", "slam", "tm"]
     },
     "sincell": {
       "name": "sincell",
-      "version": "1.36.0",
-      "sha256": "1028mdjjxbnw5fzsdyjjgy7v6yhslhhm7053q3889yqamw0l82fg",
+      "version": "1.38.0",
+      "sha256": "1h4pbk42dhsqkim5r3nm1kd4qcfj2ab3yjrsy77hc0zwycsmkmr5",
       "depends": ["MASS", "Rcpp", "Rtsne", "TSP", "cluster", "entropy", "fastICA", "fields", "ggplot2", "igraph", "proxy", "reshape2", "scatterplot3d", "statmod"]
     },
-    "single": {
-      "name": "single",
-      "version": "1.7.0",
-      "sha256": "0h7h9m4xr65nayr707jvjnbic1q4z0hsghw5i3pfpz2n6p9pb8s8",
-      "depends": ["BiocGenerics", "Biostrings", "GenomicAlignments", "IRanges", "Rsamtools", "dplyr", "reshape2", "rlang", "stringr", "tidyr"]
-    },
     "singleCellTK": {
       "name": "singleCellTK",
-      "version": "2.14.0",
-      "sha256": "06qpdl1k5c94rsnbnb4vkml1sahvav3pkr71hfkqikyscbydnay4",
-      "depends": ["AnnotationHub", "Biobase", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "DelayedArray", "DelayedMatrixStats", "DropletUtils", "ExperimentHub", "GSEABase", "GSVA", "GSVAdata", "KernSmooth", "MAST", "Matrix", "ROCR", "R_utils", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SingleR", "SoupX", "SummarizedExperiment", "TENxPBMCData", "TSCAN", "TrajectoryUtils", "VAM", "anndata", "ape", "batchelor", "celda", "celldex", "circlize", "cluster", "colorspace", "colourpicker", "cowplot", "data_table", "dplyr", "eds", "enrichR", "ensembldb", "fields", "ggplot2", "ggplotify", "ggrepel", "ggtree", "gridExtra", "igraph", "limma", "magrittr", "matrixStats", "metap", "msigdbr", "multtest", "plotly", "plyr", "reshape2", "reticulate", "rlang", "rmarkdown", "scDblFinder", "scMerge", "scRNAseq", "scater", "scds", "scran", "scuttle", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "sva", "tibble", "tximport", "withr", "yaml", "zellkonverter", "zinbwave"]
+      "version": "2.16.0",
+      "sha256": "1mw5mxr9n0g6gq3k7ar4y8clgnbp4749x0n17w734c3cwcpxvspb",
+      "depends": ["AnnotationHub", "Biobase", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "DelayedArray", "DelayedMatrixStats", "DropletUtils", "ExperimentHub", "GSEABase", "GSVA", "GSVAdata", "KernSmooth", "MAST", "Matrix", "ROCR", "R_utils", "Rtsne", "S4Vectors", "Seurat", "SingleCellExperiment", "SingleR", "SoupX", "SummarizedExperiment", "TENxPBMCData", "TSCAN", "TrajectoryUtils", "VAM", "anndata", "ape", "batchelor", "celda", "celldex", "circlize", "cluster", "colorspace", "colourpicker", "cowplot", "data_table", "dplyr", "eds", "ensembldb", "fields", "ggplot2", "ggplotify", "ggrepel", "ggtree", "gridExtra", "igraph", "limma", "magrittr", "matrixStats", "metap", "msigdbr", "multtest", "plotly", "plyr", "reshape2", "reticulate", "rlang", "rmarkdown", "scDblFinder", "scMerge", "scRNAseq", "scater", "scds", "scran", "scuttle", "shiny", "shinyalert", "shinycssloaders", "shinyjs", "stringr", "sva", "tibble", "tidyr", "tximport", "withr", "yaml", "zellkonverter", "zinbwave"]
     },
     "singscore": {
       "name": "singscore",
-      "version": "1.24.0",
-      "sha256": "12avzrc16mxz7v8jp4rxz5ia6008rjcja1h3hd0n60z644w9cng2",
+      "version": "1.26.0",
+      "sha256": "1yzpmchvkyaca18bybbmf29amh8pilf213gnl8in6cc3nr50f3hv",
       "depends": ["Biobase", "BiocParallel", "GSEABase", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "edgeR", "ggplot2", "ggrepel", "magrittr", "matrixStats", "plotly", "plyr", "reshape", "reshape2", "tidyr"]
     },
     "sitadela": {
       "name": "sitadela",
-      "version": "1.12.0",
-      "sha256": "1ynq19116z228cakznkpxd7msqxbvbgax2k6rk0wh9xksi6qzkpg",
+      "version": "1.14.0",
+      "sha256": "0yr90jz4hibzwi29gji5f6jgi8hks6kah2zgij8y2kqv606a6by1",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "Rsamtools", "S4Vectors", "biomaRt", "rtracklayer", "txdbmaker"]
     },
     "sitePath": {
       "name": "sitePath",
-      "version": "1.20.0",
-      "sha256": "10g25has168cj7xjpn0q3da9rm7dxg6n2ysb8yc974gxqkabhzjh",
+      "version": "1.22.0",
+      "sha256": "1qpprf9pppdzhvfh75m9bsa1vwrwv0w6vhj090nx80r8agq3qrhv",
       "depends": ["RColorBrewer", "Rcpp", "ape", "aplot", "ggplot2", "ggrepel", "ggtree", "gridExtra", "seqinr", "tidytree"]
     },
     "sizepower": {
       "name": "sizepower",
-      "version": "1.74.0",
-      "sha256": "0qqxvyd3kya0rjip4l41cmv3b9q7a2nb4l5hny591qr703vx31bq",
+      "version": "1.76.0",
+      "sha256": "1rkfg22a1css9wx2jx3pd8sq82dzyrgdr15kcdmx891p6g4bj1bp",
       "depends": []
     },
     "sketchR": {
       "name": "sketchR",
-      "version": "1.0.0",
-      "sha256": "0jsv2rizfh72hrk9jrlhgl36cksa97858h7w57fkihq2hq155n67",
+      "version": "1.2.0",
+      "sha256": "1p3m4bwj3fdm1bmj2q24figjch4j9xrjjqxg9i8a82hx6wiml0j2",
       "depends": ["Biobase", "DelayedArray", "basilisk", "dplyr", "ggplot2", "reticulate", "rlang", "scales"]
     },
     "skewr": {
       "name": "skewr",
-      "version": "1.36.0",
-      "sha256": "1hh0519pqv6lq21plph7sy88918np12g7aw542sfblm81ma4p4qv",
+      "version": "1.38.0",
+      "sha256": "1mhfjnai7lnpz2jhcwi2d4iiidzg6mbp0m73g1b2wibvni25r5p2",
       "depends": ["IlluminaHumanMethylation450kmanifest", "RColorBrewer", "S4Vectors", "methylumi", "minfi", "mixsmsn", "wateRmelon"]
     },
     "slalom": {
       "name": "slalom",
-      "version": "1.26.0",
-      "sha256": "0km062qb7k7g18zz03nr6m7nigzpbxkasgirc4igslz4sfcldd9x",
+      "version": "1.28.0",
+      "sha256": "10x92jv5vfygc6pl1j7mq31k6cic2mxsakqk05s59dvrpka3j960",
       "depends": ["BH", "GSEABase", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "rsvd"]
     },
     "slingshot": {
       "name": "slingshot",
-      "version": "2.12.0",
-      "sha256": "055dylajbn94khi0829qhxx0lbn1pvh30xw09gjn1jvxsgzj49nc",
+      "version": "2.14.0",
+      "sha256": "0r9hhc23a3x9rm1ippx39llxfcagwbv70zn67wnyzvfyn93gbi3c",
       "depends": ["S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "igraph", "matrixStats", "princurve"]
     },
     "smartid": {
       "name": "smartid",
-      "version": "1.0.2",
-      "sha256": "1bm8g8n3xifc2dg1d9vpw79vpwssa9q6ssvzyf77gp24zp2r734i",
+      "version": "1.2.0",
+      "sha256": "194h397rggyc5pvdcy3kfbmjvkiginirdrqm9sn4h0j0v7j0lzs4",
       "depends": ["Matrix", "SummarizedExperiment", "dplyr", "ggplot2", "mclust", "mixtools", "sparseMatrixStats", "tidyr"]
     },
     "smoothclust": {
       "name": "smoothclust",
-      "version": "1.0.0",
-      "sha256": "17mcfjxsgdvignrx576v97iwapmkfc4my8pvm6b2y1w7pibilx65",
+      "version": "1.2.0",
+      "sha256": "09s025p5cz9nrfx8kq838labsda57fk4scb8rvv856wrqf4qrccb",
       "depends": ["SpatialExperiment", "SummarizedExperiment", "sparseMatrixStats", "spdep"]
     },
     "snapcount": {
       "name": "snapcount",
-      "version": "1.16.0",
-      "sha256": "1hjd6xdwgz2qal6scpldwpdqlrbgap45bq2h599df6hgvrdym3l7",
+      "version": "1.18.0",
+      "sha256": "1nfkrgkn64vzf169zsw9dyhrdz72gd9sybjhvcc0xfa7mmlr4vwg",
       "depends": ["GenomicRanges", "IRanges", "Matrix", "R6", "SummarizedExperiment", "assertthat", "data_table", "httr", "jsonlite", "magrittr", "purrr", "rlang", "stringr"]
     },
     "snifter": {
       "name": "snifter",
-      "version": "1.14.0",
-      "sha256": "1rmg6dq7sm7aisjrli8ya1wx2b0y0vngf5zksy1x77v6c5mk4b72",
+      "version": "1.16.0",
+      "sha256": "0yy4a5hs1hk7a1vkm6kl4xsqa9a4669h527906r4inaia57mivwv",
       "depends": ["assertthat", "basilisk", "irlba", "reticulate"]
     },
     "snm": {
       "name": "snm",
-      "version": "1.52.0",
-      "sha256": "1xihnp2kvgj4lkdbf8l0km2s06j0zqpf91946riirbyk6iq3igrn",
+      "version": "1.54.0",
+      "sha256": "0ybp8yn6ng2hm751811sq5dm6siyx36khl5gc4qm9prwsi5hpp47",
       "depends": ["corpcor", "lme4"]
     },
     "snpStats": {
       "name": "snpStats",
-      "version": "1.54.0",
-      "sha256": "160pl3dy7v89i90x262hxqgipas4pyim600l6m50g3c03vm5in03",
+      "version": "1.56.0",
+      "sha256": "01nijl7cnzbv7pk803nv1fgqgikamlzqcah98s7051bn9xbdn2j8",
       "depends": ["BiocGenerics", "Matrix", "survival", "zlibbioc"]
     },
     "soGGi": {
       "name": "soGGi",
-      "version": "1.36.0",
-      "sha256": "0z995iyffzglc26pava4icxl315b077983lxvaldz5xkyhgvgpz7",
+      "version": "1.38.0",
+      "sha256": "1f9r588dbm063lvxhs2sm5ig1nx5lh93pm8l08jinh999yscnvx6",
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SummarizedExperiment", "chipseq", "ggplot2", "preprocessCore", "reshape2", "rtracklayer"]
     },
     "spaSim": {
       "name": "spaSim",
-      "version": "1.6.0",
-      "sha256": "1lac621ss7qhfrabyn3nsmgiif4bcgwrgzs1xvbvf4lvwcy7ychm",
+      "version": "1.8.0",
+      "sha256": "03irk00qhzd0cja6sfq5xwi2b66az7y5mm7yny5r439c0kvq2mg3",
       "depends": ["RANN", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "spatstat_geom", "spatstat_random"]
     },
     "sparrow": {
       "name": "sparrow",
-      "version": "1.10.1",
-      "sha256": "0vd18ws47zhx87bi35lmbh9wkp6s6d5nd9x77gd7fh24ni5z338s",
+      "version": "1.12.0",
+      "sha256": "1ihw3anhjvqsgw41jfb8x6l9i64kr6z5gf4bzchy90x7vhjrfwrd",
       "depends": ["BiocGenerics", "BiocParallel", "BiocSet", "ComplexHeatmap", "DelayedMatrixStats", "GSEABase", "Matrix", "babelgene", "checkmate", "circlize", "data_table", "edgeR", "ggplot2", "irlba", "limma", "plotly", "viridis"]
     },
     "sparseMatrixStats": {
       "name": "sparseMatrixStats",
-      "version": "1.16.0",
-      "sha256": "04hk9r6sh83dyxm2j7jdcj0m4g74ln218j21rs71c2gg6mrkmlgf",
+      "version": "1.18.0",
+      "sha256": "0gmp2pwypl1bx0584xy2rv65fkk907g12k71jc76n94mk6lr1q75",
       "depends": ["Matrix", "MatrixGenerics", "Rcpp", "matrixStats"]
     },
     "sparsenetgls": {
       "name": "sparsenetgls",
-      "version": "1.22.0",
-      "sha256": "1x8qzqsr2rzx6683lmzw5ia21853l7gj3m5jkx0r8azmjk4r6kqb",
+      "version": "1.24.0",
+      "sha256": "0pga6x9farq59j7kz2ha0vmgkcqjrq8315m9f5xniic00ln7i2xd",
       "depends": ["MASS", "Matrix", "glmnet", "huge"]
     },
     "spatialDE": {
       "name": "spatialDE",
-      "version": "1.10.0",
-      "sha256": "02npzs4vmjgc7bmv4rmmnz82slqcyrsq4y7wqapm30m7slhzm11g",
+      "version": "1.12.0",
+      "sha256": "0646sipx74dflil3rgypsi1rhjcx096zgaxm6a2xwr00vcz6r120",
       "depends": ["Matrix", "SpatialExperiment", "SummarizedExperiment", "basilisk", "checkmate", "ggplot2", "ggrepel", "gridExtra", "reticulate", "scales"]
     },
     "spatialHeatmap": {
       "name": "spatialHeatmap",
-      "version": "2.10.2",
-      "sha256": "0arr3v3simkkq3wpf32jgm35s7mwbmpgn17g2y3glam37w8yc7gd",
-      "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "data_table", "dplyr", "edgeR", "genefilter", "ggplot2", "ggplotify", "gplots", "grImport", "gridExtra", "igraph", "reshape2", "rsvg", "scater", "scran", "scuttle", "shiny", "shinydashboard", "spsComps", "tibble", "xml2"]
+      "version": "2.12.1",
+      "sha256": "0wyrg7lq4dbc3r4mvlphjfd4zif5r4yrnl9rxra028bwha4y0iva",
+      "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "data_table", "dplyr", "edgeR", "genefilter", "ggplot2", "ggplotify", "grImport", "gridExtra", "igraph", "reshape2", "rsvg", "shiny", "shinydashboard", "spsComps", "tibble", "xml2"]
+    },
+    "spatialSimGP": {
+      "name": "spatialSimGP",
+      "version": "1.0.0",
+      "sha256": "0j0csb2vdd0m96fyb334zc1j3lzhgyx1p6pimnmq0hqhb7m4pq8f",
+      "depends": ["MASS", "SpatialExperiment", "SummarizedExperiment"]
     },
     "spatzie": {
       "name": "spatzie",
-      "version": "1.10.0",
-      "sha256": "1jii3viq7ck1clkr59yafnh5a4pblskd77i1i3gxs7fpvl8ab7qb",
+      "version": "1.12.0",
+      "sha256": "1qvahba366b6gbmr3ljvzk6jx2i35k92gdxkk1az797r2igcxmpd",
       "depends": ["BSgenome", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicInteractions", "GenomicRanges", "IRanges", "MatrixGenerics", "S4Vectors", "SummarizedExperiment", "TFBSTools", "ggplot2", "matrixStats", "motifmatchr"]
     },
     "specL": {
       "name": "specL",
-      "version": "1.38.0",
-      "sha256": "0klg19h1ijwd9f7pary77zn52mp8ryzvhv6g3h5xg8yjv1kl9m7r",
+      "version": "1.40.0",
+      "sha256": "0hkrr48idq7id198vya047bqi5p52rla3ll8y3xgxmddnaprqm0k",
       "depends": ["DBI", "RSQLite", "protViz", "seqinr"]
     },
     "speckle": {
       "name": "speckle",
-      "version": "1.4.0",
-      "sha256": "1m7fl9l20f65w5il3jhj930i71kb1bvsz0iqb7yi1nczjx1b6hcw",
+      "version": "1.6.0",
+      "sha256": "1ir9k3ik32mvpzmwn6x6lv3dc03djm1sjpv9xhyygy320s00mh9p",
       "depends": ["Seurat", "SingleCellExperiment", "edgeR", "ggplot2", "limma"]
     },
     "spicyR": {
       "name": "spicyR",
-      "version": "1.16.3",
-      "sha256": "0xy964xx99wklh44m41h3066hndxv04i1jh623612sidhj4viih3",
-      "depends": ["BiocParallel", "ClassifyR", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "concaveman", "data_table", "dplyr", "ggforce", "ggplot2", "lmerTest", "magrittr", "pheatmap", "rlang", "scam", "spatstat_explore", "spatstat_geom", "tibble", "tidyr"]
+      "version": "1.18.0",
+      "sha256": "1afi2m2cxk9axdips4vk1d3rs3ws8d784b40ix9m8l1c5p8v1qa4",
+      "depends": ["BiocParallel", "ClassifyR", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "concaveman", "coxme", "data_table", "dplyr", "ggforce", "ggh4x", "ggnewscale", "ggplot2", "ggthemes", "lmerTest", "magrittr", "pheatmap", "rlang", "scam", "spatstat_explore", "spatstat_geom", "survival", "tibble", "tidyr"]
     },
     "spikeLI": {
       "name": "spikeLI",
-      "version": "2.64.0",
-      "sha256": "1n8dbfaraal941djg1a065zdqsw6dacw92kj0615mq520wviwwqi",
+      "version": "2.66.0",
+      "sha256": "1p5cz31l99j7fkxfgjdk7fz4i27dy8bb5w5rqn0d01qvh70xq6cf",
       "depends": []
     },
     "spiky": {
       "name": "spiky",
-      "version": "1.10.0",
-      "sha256": "1cwvdqa4zy17nk6d04kg6rrsd6rk4f5nrg58pf882jn44rjfl49i",
+      "version": "1.12.0",
+      "sha256": "1kdjnkyh9f2paikhbhz46yzjqwz4390hw8al7m484ihvqwm961cq",
       "depends": ["BSgenome", "Biostrings", "BlandAltmanLeh", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "bamlss", "ggplot2", "scales"]
     },
     "spillR": {
       "name": "spillR",
-      "version": "1.0.1",
-      "sha256": "18194i0zz2cz2wc69gpifk2s6h58acp57adlkp5ciwv68h2af5dd",
+      "version": "1.2.0",
+      "sha256": "1vx4l5ip98brm45bxrp9xwnb6h4gybkvrlz6c50yrqr85jrsih15",
       "depends": ["CATALYST", "S4Vectors", "SummarizedExperiment", "dplyr", "ggplot2", "spatstat_univar", "tibble", "tidyr", "tidyselect"]
     },
     "spkTools": {
       "name": "spkTools",
-      "version": "1.60.0",
-      "sha256": "1q6vhhdfh5xwpkwfcbjlbv9s8rd5mzn98xqcns7ix5d3rcqk5ixk",
+      "version": "1.62.0",
+      "sha256": "02n77lqw47hzcysqd5pyq4gmcns5jxn68ph9l639m6lxrsbgisj8",
       "depends": ["Biobase", "RColorBrewer", "gtools"]
     },
     "splatter": {
       "name": "splatter",
-      "version": "1.28.0",
-      "sha256": "1drifr04nd8x40z6v0ig60l2zcm289kmxlmdy8siczn90xzy8cm7",
+      "version": "1.30.0",
+      "sha256": "07klw1g0ww6fhxbl5a9kgbp7yck08s0fpyjrxkz5rdq5clvb08jk",
       "depends": ["BiocGenerics", "BiocParallel", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "checkmate", "crayon", "edgeR", "fitdistrplus", "locfit", "matrixStats", "rlang", "scuttle", "withr"]
     },
     "splineTimeR": {
       "name": "splineTimeR",
-      "version": "1.32.0",
-      "sha256": "0y4sydqmwpj5jwalhbf1zs6mqk447c7f22a5qy9pj8sqblh042rn",
+      "version": "1.34.0",
+      "sha256": "0dqdm6f7hv6dvc0ha4014j0isng2fpwnfca6b6gk860ap7ayj79h",
       "depends": ["Biobase", "FIs", "GSEABase", "GeneNet", "gtools", "igraph", "limma", "longitudinal"]
     },
     "splots": {
       "name": "splots",
-      "version": "1.70.0",
-      "sha256": "0dr0d1c5v45vmfdpm6hkg4dbjx6c4y9hadpra8ym5bcmlsb14xaa",
+      "version": "1.72.0",
+      "sha256": "1byvkfrm05l1sjpjypd9z56in940nbj6r38gh3rhvz0fz61g520m",
       "depends": ["RColorBrewer"]
     },
     "spoon": {
       "name": "spoon",
-      "version": "1.0.0",
-      "sha256": "1ygrb534nlsxckbc61y5s3rjc4cpmf265y5a48charjv9y3ahw19",
+      "version": "1.2.0",
+      "sha256": "0rw8rcnlyj4hg997kj66yjdqcnv6m0fsa3jc3fgzi4z1icgw06fp",
       "depends": ["BRISC", "BiocParallel", "Matrix", "SpatialExperiment", "SummarizedExperiment", "nnSVG", "scuttle"]
     },
     "spqn": {
       "name": "spqn",
-      "version": "1.16.0",
-      "sha256": "0477rs2wq9319zj1pm7j96inhd38sqs85wvj06r47g2k77blcz87",
+      "version": "1.18.0",
+      "sha256": "1h93jr20r8pn1jym7hcf8z6c19aa6hcxzmksfmzvv6pd6plqh4x4",
       "depends": ["BiocGenerics", "SummarizedExperiment", "ggplot2", "ggridges", "matrixStats"]
     },
-    "srnadiff": {
-      "name": "srnadiff",
-      "version": "1.24.0",
-      "sha256": "0gr754qb5gc0lh1r513yrfrys7q13a0kmbzmbx5m0p7wwp508mdg",
-      "depends": ["BiocManager", "BiocParallel", "BiocStyle", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "devtools", "edgeR", "rtracklayer"]
+    "squallms": {
+      "name": "squallms",
+      "version": "1.0.0",
+      "sha256": "1b08zp9jnbljhxdw079rlis9pqh9bi3cg3rb0c282rs04b2g5cdv",
+      "depends": ["MSnbase", "MsExperiment", "RaMS", "caret", "data_table", "dplyr", "ggplot2", "keys", "plotly", "shiny", "tibble", "tidyr", "xcms"]
     },
     "ssPATHS": {
       "name": "ssPATHS",
-      "version": "1.18.0",
-      "sha256": "0h2hs6snnh9kzqna94ndp3gk4bkldsxrg67fy6gx7d15agjl9y2s",
+      "version": "1.20.0",
+      "sha256": "0gxf2snqgrlr90v7y6bcbjj4qcxda0pj77d7a9i4ihfy2alclfc6",
       "depends": ["MESS", "ROCR", "SummarizedExperiment", "dml"]
     },
     "sscu": {
       "name": "sscu",
-      "version": "2.34.0",
-      "sha256": "0ym9c6r2ny5j9lzcccllq29jl4g1021n5n0l8z51lgkypaq5zlik",
+      "version": "2.36.0",
+      "sha256": "10igm6i7fry1iravil16a6nnb426xs2kz5gp96c0x1r6ii2s7v8z",
       "depends": ["BiocGenerics", "Biostrings", "seqinr"]
     },
     "ssize": {
       "name": "ssize",
-      "version": "1.78.0",
-      "sha256": "078mw9mb39liw4jalivgm1giib7pizizxyzmy4gzq8wb35psb39m",
+      "version": "1.80.0",
+      "sha256": "18xprihcfxka323x9d1ny7rgxv37cwjjvmyn72f8l15p0041231s",
       "depends": ["gdata", "xtable"]
     },
     "ssrch": {
       "name": "ssrch",
-      "version": "1.20.0",
-      "sha256": "16pc861c3ljrnagjc02pksymv24kp18380afqhz2isif0za8kl6d",
+      "version": "1.22.0",
+      "sha256": "1sbmjg48h06910vbcbwnwbwqvnjvpkyzi2ps8aj16ahpc0a62vi3",
       "depends": ["DT", "shiny"]
     },
     "ssviz": {
       "name": "ssviz",
-      "version": "1.38.0",
-      "sha256": "0m5jh45v58f92m4ib7b1fy7gpixpvgm65gx2sw1qmx1qihp4hkrb",
+      "version": "1.40.0",
+      "sha256": "093jriz8i2faswzyyckrg8069469l4r845p8amhz7n0mybnck4rz",
       "depends": ["Biostrings", "RColorBrewer", "Rsamtools", "ggplot2", "reshape"]
     },
     "stJoincount": {
       "name": "stJoincount",
-      "version": "1.6.0",
-      "sha256": "1i8bkygxxl3cq8zjpfslakib1knivyc4wfil1sa4s0jcj4iyhlhx",
+      "version": "1.8.0",
+      "sha256": "1b101gsnw704agif9k15b1lyrpj59i0gwl9inwqgqjc867sh4qgq",
       "depends": ["Seurat", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "magrittr", "pheatmap", "raster", "sp", "spdep"]
     },
-    "staRank": {
-      "name": "staRank",
-      "version": "1.46.0",
-      "sha256": "13z24si93h17hdiagjg26kv07bzyfl54iymb1jd7yn47924dr3n3",
-      "depends": ["cellHTS2"]
-    },
     "stageR": {
       "name": "stageR",
-      "version": "1.26.0",
-      "sha256": "0ayjwv2i9q8dzq5pzhyzkxzkz9ycka2v6ccvq5y9cg7x0mw4qvbh",
+      "version": "1.28.0",
+      "sha256": "1rab6hcr8nwbpdlfy7c43dy66rwpj7vm0vvm95iislqrfjsc5pqi",
       "depends": ["SummarizedExperiment"]
     },
     "standR": {
       "name": "standR",
-      "version": "1.8.0",
-      "sha256": "0lnggcppcgd5k07yx5ig7gjyj7bkwk7mvs9l785mlr1wgmqz4vm0",
+      "version": "1.10.0",
+      "sha256": "1j8vwh7vycryfnbdwrrayl2ddi93ss7z6nlrdd0r3qmvixwf7i3m",
       "depends": ["Biobase", "BiocGenerics", "RUVSeq", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "dplyr", "edgeR", "ggalluvial", "ggplot2", "limma", "mclustcomp", "patchwork", "readr", "rlang", "ruv", "tibble", "tidyr"]
     },
     "statTarget": {
       "name": "statTarget",
-      "version": "1.34.0",
-      "sha256": "0p89j6isdyy7zlniqd42s7y50sjyd7a9fpg3hwi92ssvv77zdd4c",
+      "version": "1.36.0",
+      "sha256": "13kl9jm2wiq7mii30p9qnl07v3j046819fq6692px9spciw20dvi",
       "depends": ["ROC", "impute", "pdist", "pls", "plyr", "randomForest", "rrcov"]
     },
     "stepNorm": {
       "name": "stepNorm",
-      "version": "1.76.0",
-      "sha256": "18v5hqcwnbzw8kwq9ahia36ikr3fd1cgwvx0rj32qbs66kr9phhz",
+      "version": "1.78.0",
+      "sha256": "1lbb790ih363g1gjgly7xfwq1jlz9623mz5ylls07imhb2g647kq",
       "depends": ["MASS", "marray"]
     },
     "strandCheckR": {
       "name": "strandCheckR",
-      "version": "1.22.0",
-      "sha256": "05r9d87y158pbnakqcli94nbwfvl72bsl1wbmbjyhk3cp9r1si2d",
+      "version": "1.24.0",
+      "sha256": "1iwf1wa6skk9k8j6wl7fdyxrsnv22fr4qjgarpy0qdr32njqc6f5",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg38_knownGene", "dplyr", "ggplot2", "gridExtra", "magrittr", "reshape2", "rmarkdown", "stringr"]
     },
     "struct": {
       "name": "struct",
-      "version": "1.16.0",
-      "sha256": "086fjmhmywi8ciycnz29fgkjwmxws2d130fvgwmx504gf7l841lk",
+      "version": "1.18.0",
+      "sha256": "0wfv371waxvggy54mibr86n970mipf7nlyci147ainxbw7vbyzi0",
       "depends": ["S4Vectors", "SummarizedExperiment", "knitr", "ontologyIndex", "rols"]
     },
     "structToolbox": {
       "name": "structToolbox",
-      "version": "1.16.0",
-      "sha256": "0a9hvwj6cgbs61m9vjfm704kp42mj05shjxnr79j8irfbx87q8w4",
+      "version": "1.18.0",
+      "sha256": "174lbh1vnxxphfh9c62xixm2rgzvxlyk6qzzbfmxw2jwgndn2qvl",
       "depends": ["ggplot2", "ggthemes", "gridExtra", "scales", "sp", "struct"]
     },
     "subSeq": {
       "name": "subSeq",
-      "version": "1.34.0",
-      "sha256": "1pdjw0balc7lx92azfxxl80h2lkqhk5sx94cfzgw3cwb8s2abwka",
+      "version": "1.36.0",
+      "sha256": "1vyfcph16ld4n8nvk1f05s8nfhzp55864950zr7g0q27mzblrdsw",
       "depends": ["Biobase", "data_table", "digest", "dplyr", "ggplot2", "magrittr", "qvalue", "tidyr"]
     },
     "supersigs": {
       "name": "supersigs",
-      "version": "1.12.0",
-      "sha256": "00rnd7h7xrbpr5jqz7l03pk6rlyqfcmkyrxpjwayz9gj2yc87lk3",
+      "version": "1.14.0",
+      "sha256": "1yan41y4z6ngi8aiaszvdc7l579468129i3a18r5ww0xc09s0xjb",
       "depends": ["Biostrings", "SummarizedExperiment", "assertthat", "caret", "dplyr", "rlang", "rsample", "tidyr"]
     },
-    "supraHex": {
-      "name": "supraHex",
-      "version": "1.42.0",
-      "sha256": "10qfvwbz5cbxvxbdmbc29jfp6apza4z70p4b9nfwgs4y95c11p7l",
-      "depends": ["MASS", "ape", "dplyr", "hexbin", "igraph", "magrittr", "purrr", "readr", "stringr", "tibble", "tidyr"]
-    },
     "surfaltr": {
       "name": "surfaltr",
-      "version": "1.10.0",
-      "sha256": "1i7ssmnnv81x5nb63sbk07mkirb99bsn9kyy59n8ib03akygv2mz",
+      "version": "1.12.0",
+      "sha256": "0dk1j6933lpzjy4h80rrqjxfjlbrmjk0yf5lf5k55daxxa7lfdl6",
       "depends": ["Biostrings", "biomaRt", "dplyr", "ggplot2", "httr", "msa", "protr", "readr", "seqinr", "stringr", "testthat", "xml2"]
     },
+    "survClust": {
+      "name": "survClust",
+      "version": "1.0.0",
+      "sha256": "19311dcc82fm3a40bmaj2bsgckhrb164w542i17nvin48la9ha54",
+      "depends": ["MultiAssayExperiment", "Rcpp", "pdist", "survival"]
+    },
     "survcomp": {
       "name": "survcomp",
-      "version": "1.54.0",
-      "sha256": "090dl580cwicn3px1khkhcix25snig0k7phb7z3nzmrbxmp82ygc",
+      "version": "1.56.0",
+      "sha256": "10dia4ys97kka23jrdkaih9sm6azqnbnks1inmw4gr8q8h9jy9x8",
       "depends": ["KernSmooth", "SuppDists", "bootstrap", "ipred", "prodlim", "rmeta", "survival", "survivalROC"]
     },
     "survtype": {
       "name": "survtype",
-      "version": "1.20.0",
-      "sha256": "0pyyzkxqaa8xbrap1d2ppd4g4i4zxr8frjw0mlq8hw9gf1n94k0l",
+      "version": "1.22.0",
+      "sha256": "0b0nf19r3zg9abzb3blzj368l67zl3hkbyzhnwl8fqlankh30yj4",
       "depends": ["SummarizedExperiment", "clustvarsel", "pheatmap", "survival", "survminer"]
     },
     "sva": {
       "name": "sva",
-      "version": "3.52.0",
-      "sha256": "07iq894mf5d66cxjl283pcvj1frj56pb15z984d4svk6f5cacg3z",
+      "version": "3.54.0",
+      "sha256": "0syq6jsb6f2i3x47xr34n0k09bm1184sx0wnkh46v6jrfgbsh0qd",
       "depends": ["BiocParallel", "edgeR", "genefilter", "limma", "matrixStats", "mgcv"]
     },
     "svaNUMT": {
       "name": "svaNUMT",
-      "version": "1.10.0",
-      "sha256": "15159bxq26w80nc160rk5k48435h6snxmsmynfjiaq3kzv5143pd",
+      "version": "1.12.0",
+      "sha256": "1w355djqi9wzrk2b26hn23vn7kyszx261wsw02h85yl9gy16b4m9",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "StructuralVariantAnnotation", "VariantAnnotation", "assertthat", "dplyr", "pwalign", "rlang", "rtracklayer", "stringr"]
     },
     "svaRetro": {
       "name": "svaRetro",
-      "version": "1.10.0",
-      "sha256": "03scsdy5pypir0jqgj38y5hnj82sh21gip5xd8dbqjk9ryb75ays",
+      "version": "1.12.0",
+      "sha256": "0k338zl5znhdw3dnal3603k5qqk4mhhpcama497zr9bpf9ccmqvh",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "S4Vectors", "StructuralVariantAnnotation", "VariantAnnotation", "assertthat", "dplyr", "rlang", "rtracklayer", "stringr"]
     },
     "swfdr": {
       "name": "swfdr",
-      "version": "1.30.0",
-      "sha256": "0ld015l7sxl1rmn1p6wi7k8wk3p8y7qad7klb47y23mhwfwhn7cs",
+      "version": "1.32.0",
+      "sha256": "10xjrdwja9mc1111jrkhlq76g7zx29gcnly27rhfd27vm5qpd2s5",
       "depends": []
     },
     "switchBox": {
       "name": "switchBox",
-      "version": "1.40.0",
-      "sha256": "03535j0hgdgpdks9hc10zkq7kyr4zp8xdp963qny5c4aa4naz7pi",
+      "version": "1.42.0",
+      "sha256": "0czwps5dp1nk490nq3q3bm5ml934xaxil1c42cr61cvb15lv9giw",
       "depends": ["gplots", "pROC"]
     },
     "switchde": {
       "name": "switchde",
-      "version": "1.30.0",
-      "sha256": "033xpkivywvk4rg1gqr0drrhwgp58nlgr3in65c0fxlwd1jd6kpj",
+      "version": "1.32.0",
+      "sha256": "1k4fzbrbgb1zim2pwiccb73hd4nsk2gk9lp1zqb4kw0hcab0yl1a",
       "depends": ["SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2"]
     },
     "synapsis": {
       "name": "synapsis",
-      "version": "1.10.0",
-      "sha256": "0w2pagkvnipz6wmz9yhpysiy7ydc7w8cqjifsqzdh771b3ccw0kl",
+      "version": "1.12.0",
+      "sha256": "08hn4a73yw8vkdn122pdixa0q88py05lj0jryisn8yyw5ycsyk76",
       "depends": ["EBImage"]
     },
     "synapter": {
       "name": "synapter",
-      "version": "2.28.0",
-      "sha256": "1imhap1ny0x687qh9s1q9m978hwhhkci0j8i3qfwrvn3ykijlsa7",
+      "version": "2.30.0",
+      "sha256": "1av9q8b0rp7l5y8mb8c385q0x91bfym679fm3zj35bwr0y615fqx",
       "depends": ["Biobase", "Biostrings", "MSnbase", "RColorBrewer", "cleaver", "lattice", "multtest", "qvalue", "readr", "rmarkdown"]
     },
     "synergyfinder": {
       "name": "synergyfinder",
-      "version": "3.12.0",
-      "sha256": "02d9615k8fl9bb7hd6f5vz11k9aard8zs880siac2s23pwzivjwn",
+      "version": "3.14.0",
+      "sha256": "0yj28q0z99y6lrjq73rpz4p5s1pqyq8wf9gbdy4xh62f9g3ji23k",
       "depends": ["SpatialExtremes", "dplyr", "drc", "furrr", "future", "ggforce", "ggplot2", "ggrepel", "gstat", "kriging", "lattice", "magrittr", "metR", "mice", "nleqslv", "pbapply", "plotly", "purrr", "reshape2", "sp", "stringr", "tidyr", "tidyverse", "vegan"]
     },
     "synlet": {
       "name": "synlet",
-      "version": "2.4.0",
-      "sha256": "0nfqm2qfavn71k5dhz6x2958yplasnbvjc6mqzh4i237x03184g4",
+      "version": "2.6.0",
+      "sha256": "1li47g72g2naxx5vcx0h4amc7j07wn759id1w91xbamrh35s21cr",
       "depends": ["RColorBrewer", "RankProd", "data_table", "ggplot2", "magrittr", "patchwork"]
     },
     "syntenet": {
       "name": "syntenet",
-      "version": "1.6.0",
-      "sha256": "1220hbkmg10ly0i5m6wnqnsa6m2f2xgs85798y9mlcqwxrp5ih35",
-      "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "RColorBrewer", "Rcpp", "ggnetwork", "ggplot2", "igraph", "intergraph", "networkD3", "pheatmap", "rlang", "rtracklayer", "testthat"]
+      "version": "1.8.1",
+      "sha256": "18bx1zaj4vdaw6hvxfnfqj78ssmdc4rcsm89bz4yl5vjqfljbam8",
+      "depends": ["BiocParallel", "Biostrings", "GenomicRanges", "RColorBrewer", "Rcpp", "ggnetwork", "ggplot2", "igraph", "intergraph", "pheatmap", "rlang", "rtracklayer", "testthat"]
     },
     "systemPipeR": {
       "name": "systemPipeR",
-      "version": "2.10.0",
-      "sha256": "13xxcqy5hhy45zglv6gc86ndmisfkjq4dg55x2j1kw3jqha1brnx",
+      "version": "2.12.0",
+      "sha256": "1f27vb03x1vmhi9nmizfzrvkyczhgrsgmc5fcf5xnyfmmhs97cnr",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "Rsamtools", "S4Vectors", "ShortRead", "SummarizedExperiment", "crayon", "ggplot2", "htmlwidgets", "magrittr", "stringr", "yaml"]
     },
     "systemPipeShiny": {
       "name": "systemPipeShiny",
-      "version": "1.14.0",
-      "sha256": "14wgamxg2jpj3xjlna9x5rd3kpndhxs20gh84acix3pa3ppr8xgf",
+      "version": "1.16.0",
+      "sha256": "0a7d5qnb8brk4qh16ycn0p0qf5r96amfg0dg2da4g27i916rh1hy",
       "depends": ["DT", "R6", "RSQLite", "assertthat", "bsplus", "crayon", "dplyr", "drawer", "ggplot2", "glue", "htmltools", "magrittr", "openssl", "plotly", "rlang", "rstudioapi", "shiny", "shinyAce", "shinyFiles", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "shinyjqui", "shinyjs", "shinytoastr", "spsComps", "spsUtil", "stringr", "styler", "tibble", "vroom", "yaml"]
     },
     "systemPipeTools": {
       "name": "systemPipeTools",
-      "version": "1.12.0",
-      "sha256": "08r0dglqpr638pbssr3l3xcly7mhj0jsq5rrzdnqh5sg4wz11gyj",
+      "version": "1.14.0",
+      "sha256": "0bhj2vwngcika347bqyg4z9mghb7bc6d2h8ickdywlym8pzskvxc",
       "depends": ["DESeq2", "DT", "GGally", "Rtsne", "SummarizedExperiment", "ape", "dplyr", "ggplot2", "ggrepel", "ggtree", "glmpca", "magrittr", "pheatmap", "plotly", "tibble"]
     },
     "tLOH": {
       "name": "tLOH",
-      "version": "1.12.0",
-      "sha256": "0r8a0srff8y5ap2zz4kk6302gkb69bgylxggnz704zi3yzvyklv1",
+      "version": "1.14.0",
+      "sha256": "1dkhjhxfpll8gjxjzbpqpjh1pxy029i3pgpz3940a03kxrydpczg",
       "depends": ["GenomicRanges", "MatrixGenerics", "VariantAnnotation", "bestNormalize", "data_table", "depmixS4", "dplyr", "ggplot2", "naniar", "purrr", "scales", "stringr"]
     },
     "tRNA": {
       "name": "tRNA",
-      "version": "1.22.0",
-      "sha256": "0dg4s5kxsdh2j8smqi8vm7yncy9kb79sj8xlvf4wgf3aljarms21",
+      "version": "1.24.0",
+      "sha256": "1s8gqk8fcdxk4cg4l3p2h8hlw5bxwr793p5kjjax8n1gdywxzkhr",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "IRanges", "Modstrings", "S4Vectors", "Structstrings", "XVector", "ggplot2", "scales", "stringr"]
     },
     "tRNAdbImport": {
       "name": "tRNAdbImport",
-      "version": "1.22.0",
-      "sha256": "0yvgxxf5d5mh91cmbba66krj6jz5gl1qkgjck9310k4mk7pjfww3",
+      "version": "1.24.0",
+      "sha256": "10w0grspgd0781z84fpiam6h92j1mvlplpg9arrhlax1fkk4xbyj",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "Modstrings", "S4Vectors", "Structstrings", "httr2", "stringr", "tRNA", "xml2"]
     },
     "tRNAscanImport": {
       "name": "tRNAscanImport",
-      "version": "1.24.0",
-      "sha256": "12wn5sdq1miimn31ismzs2w06q3l66l774dbfndw8bx3awhrf7g1",
+      "version": "1.26.0",
+      "sha256": "0751bzxn418vdpz6jblazw9wiwxmsgmp7b2n9h1c6hm26qvj3jb7",
       "depends": ["BSgenome", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "Structstrings", "XVector", "rtracklayer", "stringr", "tRNA"]
     },
     "tRanslatome": {
       "name": "tRanslatome",
-      "version": "1.42.0",
-      "sha256": "0xnr7a7cm7lcvyipjj6p4347yqykpfghz37qxyam5ixplfwlh1cg",
+      "version": "1.44.0",
+      "sha256": "0ns6ki18zzq58k78xc8f5qy2hciin2xjylgs6kq7z1hrf2a2ajfh",
       "depends": ["Biobase", "DESeq2", "GOSemSim", "Heatplus", "RankProd", "anota", "edgeR", "gplots", "limma", "org_Hs_eg_db", "plotrix", "topGO"]
     },
     "tadar": {
       "name": "tadar",
-      "version": "1.2.1",
-      "sha256": "19f9qzz2hg4j75v6xzma9va0wr3iq8la3dv0qj0aky81ncam4b8z",
+      "version": "1.4.0",
+      "sha256": "1swf778qa0cd6mvxybg26yhlfpagqjnw4c07ww3az08nqlyj9qnc",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "MatrixGenerics", "Rsamtools", "S4Vectors", "VariantAnnotation", "ggplot2", "rlang"]
     },
     "tanggle": {
       "name": "tanggle",
-      "version": "1.10.0",
-      "sha256": "0dcy2bvim02x9wqd6fxs7562nl8849h13n2q16pcbc67ljhss27m",
+      "version": "1.12.0",
+      "sha256": "0wa5lnj9fl1arpwadavclqqad1nqzlr6dwljyfijda9v5pjxb068",
       "depends": ["ape", "ggplot2", "ggtree", "phangorn"]
     },
     "target": {
       "name": "target",
-      "version": "1.18.0",
-      "sha256": "1crqxj8wk66h2jvxnmw5rhdsdfhkd59d2pxw1lf05w7dkd495zfr",
+      "version": "1.20.0",
+      "sha256": "1y628h6d886pxwvz6b1lpwk8r0yg45rpdnajsblq9lhyc0386hdd",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "matrixStats", "shiny"]
     },
     "tenXplore": {
       "name": "tenXplore",
-      "version": "1.26.2",
-      "sha256": "088vs1pcq92qgismxz886nmciharsvdnj0h2pbs40n391icbp7if",
+      "version": "1.28.0",
+      "sha256": "1xngd89im7pbf3v6lbca9c8y781lqwbf6pbnjy427yi54g65qwm0",
       "depends": ["AnnotationDbi", "BiocFileCache", "SummarizedExperiment", "matrixStats", "ontoProc", "org_Mm_eg_db", "shiny"]
     },
     "ternarynet": {
       "name": "ternarynet",
-      "version": "1.48.0",
-      "sha256": "1f431kkyhazw4kxnfhhk0jb9gkfp7llpm054rv44if328bbi931h",
+      "version": "1.50.0",
+      "sha256": "0vasijm4m2v6px0vrh2vkddaxkmszappr2pahbbhd6fnbghr0dj4",
       "depends": ["BiocParallel", "igraph"]
     },
     "terraTCGAdata": {
       "name": "terraTCGAdata",
-      "version": "1.8.0",
-      "sha256": "18i933ndja1pa4iql96fvx2brjmcvvirlp048hjxvkapm0bhsm19",
-      "depends": ["AnVIL", "BiocFileCache", "GenomicRanges", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "TCGAutils", "dplyr", "readr", "tidyr"]
+      "version": "1.10.0",
+      "sha256": "1zzlqrs630q47kfv6jd5mdm3c1zrv7sd68dd3l4qd1w2nn44pccq",
+      "depends": ["AnVIL", "AnVILGCP", "BiocFileCache", "GenomicRanges", "MultiAssayExperiment", "RaggedExperiment", "S4Vectors", "TCGAutils", "dplyr", "readr", "tidyr"]
     },
     "tidyCoverage": {
       "name": "tidyCoverage",
+      "version": "1.2.0",
+      "sha256": "0aapvyrrqvnv1gdj63a5lzzprv9d14a6i07ggz1zjiw4yxdd86h8",
+      "depends": ["BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "cli", "dplyr", "fansi", "ggplot2", "pillar", "purrr", "rlang", "rtracklayer", "scales", "tidyr", "vctrs"]
+    },
+    "tidyFlowCore": {
+      "name": "tidyFlowCore",
       "version": "1.0.0",
-      "sha256": "150q5qwifni2d2jvx1k3c0cq5n2k1s33yps8v5d6ksa3qs510p4s",
-      "depends": ["BiocIO", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "cli", "dplyr", "fansi", "pillar", "purrr", "rlang", "rtracklayer", "tidyr", "vctrs"]
+      "sha256": "0cp3a6ws5lngx1436viznbacr82jgwn7jrpcc4nj6jvx65sp34a3",
+      "depends": ["Biobase", "dplyr", "flowCore", "ggplot2", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "tidySingleCellExperiment": {
       "name": "tidySingleCellExperiment",
-      "version": "1.14.0",
-      "sha256": "1rvc0576ajxx7njyiyh2ql85an4dn9v8v4q7g8gfdgd9jg5v4hmz",
+      "version": "1.16.0",
+      "sha256": "1kj4a5dknx0a25w3z4rk8mjh68xd569p0mxx4jhms1pz517l5lc2",
       "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"]
     },
     "tidySpatialExperiment": {
       "name": "tidySpatialExperiment",
-      "version": "1.0.0",
-      "sha256": "0a2bramm53dvl7qib18z7s8zrfjprkrg6zzj5q7z4jf5smj7szzf",
-      "depends": ["BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "dplyr", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "stringr", "tibble", "tidySingleCellExperiment", "tidyr", "tidyselect", "ttservice", "vctrs"]
+      "version": "1.2.0",
+      "sha256": "04hyxlhyg4yfrybla3ibnsmy4cjvk1sb35s2c9xfbiq6qbphz6lw",
+      "depends": ["BiocGenerics", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "cli", "dplyr", "fansi", "ggplot2", "lifecycle", "magick", "pillar", "pkgconfig", "plotly", "purrr", "rlang", "shiny", "stringr", "tibble", "tidySingleCellExperiment", "tidygate", "tidyr", "tidyselect", "ttservice", "vctrs"]
     },
     "tidySummarizedExperiment": {
       "name": "tidySummarizedExperiment",
-      "version": "1.14.0",
-      "sha256": "0bcvna28shr27pdzi1n2g6bldqrakkwn0wh7ld39wbn439awshr9",
+      "version": "1.16.0",
+      "sha256": "0hjjjdsa6y7zl132403r442h946h012n8s2bv40sq6jsk8nkzcc7",
       "depends": ["S4Vectors", "SummarizedExperiment", "cli", "dplyr", "ellipsis", "fansi", "ggplot2", "lifecycle", "magrittr", "pillar", "pkgconfig", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "ttservice", "vctrs"]
     },
     "tidybulk": {
       "name": "tidybulk",
-      "version": "1.16.0",
-      "sha256": "1ij4x2fqcpdkdl62kwjhk3w19m7vwq8m3bglhsxz7pkzy49cfifx",
+      "version": "1.18.0",
+      "sha256": "1l1d3jvafc5mqwfsrkmvckhd47b8728mpxl6s02hy9jx2kwzscas",
       "depends": ["GenomicRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "crayon", "dplyr", "lifecycle", "magrittr", "preprocessCore", "purrr", "readr", "rlang", "scales", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "ttservice"]
     },
     "tidyomics": {
       "name": "tidyomics",
-      "version": "1.0.0",
-      "sha256": "08d2bkaqya090y93wg8cj36bbqbiy62p9swiz9ci9z4055sv900y",
+      "version": "1.2.0",
+      "sha256": "0x891j8p75icd9y4dv7k7gd8w12wpmrhp59lkf89wbsivprz0mkf",
       "depends": ["cli", "nullranges", "plyranges", "purrr", "rlang", "stringr", "tidySingleCellExperiment", "tidySummarizedExperiment", "tidybulk", "tidyseurat"]
     },
+    "tidysbml": {
+      "name": "tidysbml",
+      "version": "1.0.0",
+      "sha256": "1xi7mjsxcp7i655g9zxhvr1174xcqrhcn2b74p5xhhhf3i8cpza0",
+      "depends": ["xml2"]
+    },
+    "tidytof": {
+      "name": "tidytof",
+      "version": "1.0.0",
+      "sha256": "1yw4gz0y5yljj8rhnpmdsa02jg7v2rvag0syb1vmf1i43clq3zn3",
+      "depends": ["Rcpp", "RcppHNSW", "doParallel", "dplyr", "flowCore", "foreach", "ggplot2", "ggraph", "glmnet", "purrr", "readr", "recipes", "rlang", "stringr", "survival", "tibble", "tidygraph", "tidyr", "tidyselect", "yardstick"]
+    },
     "tigre": {
       "name": "tigre",
-      "version": "1.58.0",
-      "sha256": "1gdfiga7m4zdsr8vj8anlkj1jfdrlzhsik36jdgi4f92pyyllgwx",
+      "version": "1.60.0",
+      "sha256": "0l0rarssqqk3nn00nxwvhrwi0fsx3gw1pqqiyhvhn37x3c5svhgf",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "RSQLite", "annotate", "gplots"]
     },
     "tilingArray": {
       "name": "tilingArray",
-      "version": "1.82.0",
-      "sha256": "1408275gvfilc2k8sfsja8bm5fdgnblf2sf5wdd3if51qi61clb0",
+      "version": "1.84.0",
+      "sha256": "13n4myj46zfb7y42phqqy7rmavr8793qg4l8wr04b0634b3dv4jf",
       "depends": ["Biobase", "RColorBrewer", "affy", "genefilter", "pixmap", "strucchange", "vsn"]
     },
     "timeOmics": {
       "name": "timeOmics",
-      "version": "1.16.0",
-      "sha256": "12qxipaqmkvfb6lvbl40v9fb0vink4jgxlx9kg9kg2sd9kb7qrav",
+      "version": "1.18.0",
+      "sha256": "03q44x7nkc0ap78nliqzigsnb383r0hg38k9xmra7jbdsp55aqvi",
       "depends": ["checkmate", "dplyr", "ggplot2", "ggrepel", "lmtest", "magrittr", "mixOmics", "plyr", "purrr", "stringr", "tibble", "tidyr"]
     },
     "timecourse": {
       "name": "timecourse",
-      "version": "1.76.0",
-      "sha256": "05q6vw76hhi4frpf4vivq1jxkh99xq44vw2p5gz4zgcinsc58yql",
+      "version": "1.78.0",
+      "sha256": "109pz2gm1jnm1lyqr2zjf82g1i0kdipr1h0j3pvlw4w47ccbrxbb",
       "depends": ["Biobase", "MASS", "limma", "marray"]
     },
     "timescape": {
       "name": "timescape",
-      "version": "1.28.0",
-      "sha256": "1xcdx61gv0vvzdl04nfp7kbp6qxbkfmh88pvdz47jmkcy9ap8zmm",
+      "version": "1.30.0",
+      "sha256": "0y7fdjp00jm0grhjvpvcfgs0ky18s31k8d450d2idf7qf3ac1592",
       "depends": ["dplyr", "gtools", "htmlwidgets", "jsonlite", "stringr"]
     },
     "tkWidgets": {
       "name": "tkWidgets",
-      "version": "1.82.0",
-      "sha256": "0k1d5r306mbry0h7yqp246i13adxlmxl2vhwdsfgh29v8qkg1szl",
+      "version": "1.84.0",
+      "sha256": "0s43wv4hg6g1x6li1w5zn4nvcyvhp013nh9p8b4b36mpij188lbj",
       "depends": ["DynDoc", "widgetTools"]
     },
     "tomoda": {
       "name": "tomoda",
-      "version": "1.14.0",
-      "sha256": "0cx4153sknl0prpdm12y6n44kg10ib8b7qk3102pvgv9mz4xgrbv",
+      "version": "1.16.0",
+      "sha256": "03zfagn6bgcmwj55hbszxm9r5g2dcv971f5mr211jxkyiqsgs11c",
       "depends": ["RColorBrewer", "Rtsne", "SummarizedExperiment", "ggplot2", "ggrepel", "reshape2", "umap"]
     },
     "tomoseqr": {
       "name": "tomoseqr",
-      "version": "1.8.0",
-      "sha256": "14x665zaljr448gdb84d0y1hlqih7n9z2dy052y4ay22l10f8886",
+      "version": "1.10.0",
+      "sha256": "12brpr736165b323y7ysgajvab7y2cmfnpxvyh7fn2fa4hxvn43c",
       "depends": ["BiocFileCache", "animation", "dplyr", "ggplot2", "plotly", "purrr", "readr", "shiny", "stringr", "tibble"]
     },
     "topGO": {
       "name": "topGO",
-      "version": "2.56.0",
-      "sha256": "0ly4rai3na88dnfizsi60r6py0qmf0pw95b0hprfkvzpjyd72p75",
+      "version": "2.58.0",
+      "sha256": "1468m14b4hvabg2h14cbaayw34v4zmscn3fmmm37r4abamk7nh0m",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "DBI", "GO_db", "SparseM", "graph", "lattice", "matrixStats"]
     },
     "topconfects": {
       "name": "topconfects",
-      "version": "1.20.0",
-      "sha256": "1jcmnxf5sazw7xg8r39m059z2vai03nr0kadd8dfcvn6cfaqmvbg",
+      "version": "1.22.0",
+      "sha256": "186cyl0in6xrc3pmy4n0pihmsmg4a3q7xvk58iprmbcbymaws75c",
       "depends": ["assertthat", "ggplot2"]
     },
     "topdownr": {
       "name": "topdownr",
-      "version": "1.26.0",
-      "sha256": "1axqyjlp6386shcw95mg0ljj12683ix03yk5bcxr2bqd36csfa6y",
+      "version": "1.28.0",
+      "sha256": "053s94yzw96vgs062v376spayr5k9m6nz05p0l5pszi7y4p2rfhb",
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "MSnbase", "Matrix", "PSMatch", "ProtGenerics", "S4Vectors", "ggplot2", "mzR"]
     },
     "tpSVG": {
       "name": "tpSVG",
-      "version": "1.0.0",
-      "sha256": "135w2w6j3cgfrkfkzmmy40ii10zp32r7xjc0pg07h2gm0hdz5yj0",
+      "version": "1.2.0",
+      "sha256": "0kbfsi54y3pnk6pyy18pn5ra7ryyvqlala2vqjp2x7h71914pv9c",
       "depends": ["BiocParallel", "MatrixGenerics", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "mgcv"]
     },
     "trackViewer": {
       "name": "trackViewer",
-      "version": "1.40.0",
-      "sha256": "01m0jwig3l6dfhd3w5aq4sx2krsipjg5jjxa78kalfrzrm6k05s4",
-      "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Rsamtools", "S4Vectors", "grImport", "htmlwidgets", "igraph", "plotrix", "rhdf5", "rtracklayer", "scales", "strawr", "txdbmaker"]
+      "version": "1.42.0",
+      "sha256": "0qvan15w36ysby5688iz4kdimri2k16w318jgkynijiyg42i8y71",
+      "depends": ["AnnotationDbi", "BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "InteractionSet", "Rsamtools", "S4Vectors", "grImport", "htmlwidgets", "rhdf5", "rtracklayer", "scales", "strawr", "txdbmaker"]
     },
     "tracktables": {
       "name": "tracktables",
-      "version": "1.38.0",
-      "sha256": "1rfpb13sd2rqhxkywif58fm2l8ch664ga149y1nxwf409hbqb81w",
+      "version": "1.40.0",
+      "sha256": "1d43526h9bwm0lb2d1x4r94s023syykj7g2kkkij5qmxkzx5kwcn",
       "depends": ["GenomicRanges", "IRanges", "RColorBrewer", "Rsamtools", "XML", "XVector", "stringr", "tractor_base"]
     },
     "tradeSeq": {
       "name": "tradeSeq",
-      "version": "1.18.0",
-      "sha256": "1kgvvvwvj3dgb2wik3y8j44ynda94bi05vvmiwlayrypqprwi1c1",
+      "version": "1.20.0",
+      "sha256": "1wfq76g6mqf0gkqi9jxqb5va8v59k4ivbdm8d3plmpb6rd23n2ha",
       "depends": ["Biobase", "BiocParallel", "MASS", "Matrix", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "TrajectoryUtils", "edgeR", "ggplot2", "igraph", "magrittr", "matrixStats", "mgcv", "pbapply", "princurve", "slingshot", "tibble", "viridis"]
     },
     "transcriptR": {
       "name": "transcriptR",
-      "version": "1.32.0",
-      "sha256": "1lx11dyr8q4yd57l7rj0788488amhiiahfml2m69554hk94cd46i",
+      "version": "1.34.0",
+      "sha256": "00b4wgfvn8785l01vyx6n05l5lpngpk4gp5y2hpkcxrh49q19b45",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "caret", "chipseq", "e1071", "ggplot2", "pROC", "reshape2", "rtracklayer"]
     },
     "transcriptogramer": {
       "name": "transcriptogramer",
-      "version": "1.26.0",
-      "sha256": "0n44im93a72sihivlxn5x2k3s412b91ixqamc0wlk57vw0ppycm6",
+      "version": "1.28.0",
+      "sha256": "047jiznbbdf436qampa9h1njmx1r76r26djmxd8p7sqi1md0gzpm",
       "depends": ["RedeR", "biomaRt", "data_table", "doSNOW", "foreach", "ggplot2", "igraph", "limma", "progress", "snow", "tidyr", "topGO"]
     },
     "transformGamPoi": {
       "name": "transformGamPoi",
-      "version": "1.10.0",
-      "sha256": "09z5d72zk6lnhjvfffpylgkk6w73wrlcasr8agy7ydy1b80cj36c",
+      "version": "1.12.0",
+      "sha256": "0grd27xy0gq6375yxpb9pi6kjlkhbv9rwh5g7j90kb9r2jlfvx9m",
       "depends": ["DelayedArray", "HDF5Array", "Matrix", "MatrixGenerics", "Rcpp", "SummarizedExperiment", "glmGamPoi"]
     },
     "transite": {
       "name": "transite",
-      "version": "1.22.0",
-      "sha256": "15r8q0j7475ccq592fiqvcxkggb8zkg6lq3zmz65jljfdggj6kn4",
+      "version": "1.24.0",
+      "sha256": "17hxrw042dv8x7s1xx44awqcwvkmz5kpxz1yd9smlql6awc4wmda",
       "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "Rcpp", "TFMPvalue", "dplyr", "ggplot2", "gridExtra", "scales"]
     },
     "transmogR": {
       "name": "transmogR",
-      "version": "1.0.0",
-      "sha256": "1531h4i6jn25r451ndf7jjscfbzs1k7477v0cn0rrr5hay8i2z3s",
-      "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "ggplot2", "rlang", "scales"]
+      "version": "1.2.0",
+      "sha256": "0aqlbf95k4cdsn0q0jahhmw0g64ydq5mgnlvpcd0z2qyrm842q1h",
+      "depends": ["BSgenome", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "dplyr", "ggplot2", "jsonlite", "matrixStats", "rlang", "scales", "vroom"]
     },
     "transomics2cytoscape": {
       "name": "transomics2cytoscape",
-      "version": "1.14.0",
-      "sha256": "1f7qdymlgqh4la1rhlk5s580ka8p4f8ravm19i02ndx50jlnq12q",
+      "version": "1.16.0",
+      "sha256": "1rpxqyabn8jsaldabycqq0r3j51il4rn58jvhszj03fjjqmpjxvy",
       "depends": ["KEGGREST", "RCy3", "dplyr", "pbapply", "purrr", "tibble"]
     },
     "traseR": {
       "name": "traseR",
-      "version": "1.34.0",
-      "sha256": "0v1w73s4b5zs863mdb6pwr2h9wq3wsbwqxbihig3sl6vc7i5v7da",
+      "version": "1.36.0",
+      "sha256": "1dbmrn078swhdcdkhjljvwq8qaznpmcjah9vs3irpm483xzs8ykm",
       "depends": ["BSgenome_Hsapiens_UCSC_hg19", "GenomicRanges", "IRanges"]
     },
-    "traviz": {
-      "name": "traviz",
-      "version": "1.10.0",
-      "sha256": "1jjdfl8xvzlr31w74j12s5pdg5b1yylg1i30n804p9mqyx11g5sc",
-      "depends": ["Biobase", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "mgcv", "princurve", "rgl", "slingshot", "viridis"]
-    },
     "treeclimbR": {
       "name": "treeclimbR",
-      "version": "1.0.0",
-      "sha256": "1ynrc06f1dh1vaa24j25naydvj4lvygcv89ssz5gv0xpmr0ydlc1",
+      "version": "1.2.0",
+      "sha256": "19xwifrc3lml4250hqkzxq8cjkxyl4y179qvcpr3p2grlz5scm1g",
       "depends": ["S4Vectors", "SummarizedExperiment", "TreeSummarizedExperiment", "ape", "diffcyt", "dirmult", "dplyr", "edgeR", "ggnewscale", "ggplot2", "ggtree", "rlang", "tibble", "tidyr", "viridis"]
     },
     "treeio": {
       "name": "treeio",
-      "version": "1.28.0",
-      "sha256": "0xfjq13yirfz7dzzlf2m60lk8xb3qh6k5hr66ygvjnm716x3vyh1",
+      "version": "1.30.0",
+      "sha256": "0x1fd3422icp56ac01dn5nk5y04724sv80pb24fd993d426jj1xj",
       "depends": ["ape", "dplyr", "jsonlite", "magrittr", "rlang", "tibble", "tidytree", "yulab_utils"]
     },
     "treekoR": {
       "name": "treekoR",
-      "version": "1.12.0",
-      "sha256": "02mzd9ay9fij2qr9dkrg72h7yw9jpjmqx4gz0hsjpb03akc1npqw",
+      "version": "1.14.0",
+      "sha256": "1xp7h3fmaryalnn8z7drlx4id1crmcw12cflcz40vvy86slwzvi6",
       "depends": ["SingleCellExperiment", "ape", "data_table", "diffcyt", "dplyr", "edgeR", "ggiraph", "ggplot2", "ggtree", "hopach", "lme4", "multcomp", "patchwork", "tidyr"]
     },
     "tricycle": {
       "name": "tricycle",
-      "version": "1.12.0",
-      "sha256": "11928pcd8xzmll28m0ihi3rasc4w1i0fshn4bh9n2lyigkr5ayi4",
+      "version": "1.14.0",
+      "sha256": "1q9vn0gq67kkg6f4jyq05cg56qmwzl3xhiyhkgpvi1flrj9f8cpd",
       "depends": ["AnnotationDbi", "GenomicRanges", "IRanges", "RColorBrewer", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "circular", "dplyr", "ggnewscale", "ggplot2", "scater", "scattermore"]
     },
     "trigger": {
       "name": "trigger",
-      "version": "1.50.0",
-      "sha256": "1l3ln40r45rhbw8abk8l5xqighpfy3qk17830wk34ip0jzvvshqi",
+      "version": "1.52.0",
+      "sha256": "0wi37i7p8mah6hwb2fbpl8x5vnn11xkxq4rlvd8a96ni2gkwvdrn",
       "depends": ["corpcor", "qtl", "qvalue", "sva"]
     },
     "trio": {
       "name": "trio",
-      "version": "3.42.0",
-      "sha256": "166pnyzjrahcx0zhmclxdawyhpvr8am0da8il3wm1bs6clp7af94",
+      "version": "3.44.0",
+      "sha256": "17clz4c8jc6gbj1ry3i1bwfcxljlgr1f29cycnz9294nq9cc7qkv",
       "depends": ["LogicReg", "siggenes", "survival"]
     },
     "triplex": {
       "name": "triplex",
-      "version": "1.44.0",
-      "sha256": "19xvhdwik9crz6w5cjfwsvwn42wkari3d360lmjms128qn266hbx",
+      "version": "1.46.0",
+      "sha256": "1jxdzcpk5mssxii5y3x89myv762n0yirqlk52biifmfygwxjx10g",
       "depends": ["Biostrings", "GenomicRanges", "IRanges", "S4Vectors", "XVector"]
     },
     "tripr": {
       "name": "tripr",
-      "version": "1.10.0",
-      "sha256": "0lh2qlqi6rxq4v5cw4qr2syyjig7iy6z3pc0d6gpr4lbhwcm50d5",
-      "depends": ["DT", "RColorBrewer", "config", "data_table", "dplyr", "golem", "gridExtra", "plot3D", "plotly", "plyr", "shiny", "shinyBS", "shinyFiles", "shinyjs", "stringdist", "stringr"]
+      "version": "1.12.0",
+      "sha256": "1dar4z6fs83rlipx0di144paghavwg10jrldffdhiqb4flfpvk4x",
+      "depends": ["DT", "RColorBrewer", "config", "data_table", "dplyr", "golem", "gridExtra", "plot3D", "plotly", "plyr", "shiny", "shinyBS", "shinyFiles", "shinyjs", "stringdist", "stringr", "vegan"]
     },
     "ttgsea": {
       "name": "ttgsea",
-      "version": "1.12.0",
-      "sha256": "1j09ircbzpvx661yrsnz7b6hxgsc0snm3q6gi72hcyjc9xgx46zs",
+      "version": "1.14.0",
+      "sha256": "08a8rll0vr6k0yl9l52b4a2qmh1xdiwfjnnmma845ymn83q8yjxb",
       "depends": ["DiagrammeR", "data_table", "keras", "purrr", "stopwords", "text2vec", "textstem", "tm", "tokenizers"]
     },
     "tweeDEseq": {
       "name": "tweeDEseq",
-      "version": "1.50.0",
-      "sha256": "0mmrp0x64k1cd0n7qqrpr191n57hciq75aw3gvfrplcfi75xb7q3",
+      "version": "1.52.0",
+      "sha256": "0av6qnv13aw6r5mp8wwgzssm3c5rbvdgbdxkfi7mxn2nyflvxi74",
       "depends": ["MASS", "Rcpp", "cqn", "edgeR", "limma"]
     },
     "twilight": {
       "name": "twilight",
-      "version": "1.80.0",
-      "sha256": "0r5nfr5r88xyvcrlzv8cmlnq5gcf98nqn3p028zc8dffslm6cbsq",
+      "version": "1.82.0",
+      "sha256": "08f8krw8jj5dz6acyz4qc7xvg863qaqllscp6989g6hh4k31pbzk",
       "depends": ["Biobase"]
     },
     "twoddpcr": {
       "name": "twoddpcr",
-      "version": "1.28.0",
-      "sha256": "13if809c4nxf5cprps9p9w6z1r3xxjq556315wbkyh0pw724nki0",
+      "version": "1.30.0",
+      "sha256": "0g3m3wj7vl54s3c2mdaz174s1hxl53x943v7nvm5h7sslnm3ns47",
       "depends": ["RColorBrewer", "S4Vectors", "class", "ggplot2", "hexbin", "scales", "shiny"]
     },
     "txcutr": {
       "name": "txcutr",
-      "version": "1.10.0",
-      "sha256": "165yfhmw8j91bx0x7kasxyiwdiy7yxzzjg4vlyic0bf2f3xvyn1g",
+      "version": "1.12.0",
+      "sha256": "1dxza2lk7r84sxvl917fgsasfiny0smyrmbn5sp2m92j2y186rnl",
       "depends": ["AnnotationDbi", "BiocGenerics", "BiocParallel", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "rtracklayer", "txdbmaker"]
     },
     "txdbmaker": {
       "name": "txdbmaker",
-      "version": "1.0.1",
-      "sha256": "1nl7lr0x0kicd44gvwrdslcnnlmqaf57rgp1gb22yvz3lfzjziqi",
+      "version": "1.2.1",
+      "sha256": "09ix8lzc7rgkxnrk8s53ql0jd96h89wbqvqqpax1i7d5jw15lja6",
       "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocIO", "DBI", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "RSQLite", "S4Vectors", "UCSC_utils", "biomaRt", "httr", "rjson", "rtracklayer"]
     },
     "tximeta": {
       "name": "tximeta",
-      "version": "1.22.1",
-      "sha256": "0lmkxl7zlp6z4i32jyy914kiwacnz89jnd2kqma81mq81r389p06",
+      "version": "1.24.0",
+      "sha256": "0s978mzq8pw1gj5j4j9yil0z1w5zx0msip11gkiq8wjyiipa6qg1",
       "depends": ["AnnotationDbi", "AnnotationHub", "BiocFileCache", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "ensembldb", "jsonlite", "tibble", "txdbmaker", "tximport"]
     },
     "tximport": {
       "name": "tximport",
-      "version": "1.32.0",
-      "sha256": "0wayib05k976wivf9xgbfz5mfvi5hmxj3wm6zw031bj4w8dkc1v6",
+      "version": "1.34.0",
+      "sha256": "1rrnldicisjf2cjkvnynlsr91illi6v6wfyqn20xb10p947cyckl",
       "depends": []
     },
     "uSORT": {
       "name": "uSORT",
-      "version": "1.30.0",
-      "sha256": "04k0763dykakv03gxvlwsp6qlg6lpzd5512p5rdq2v5dk19scvm1",
+      "version": "1.32.0",
+      "sha256": "1qcww8jc5zgv92bwa4w6lqpzppmp0j46riz5dqv8cssqnqx48zwb",
       "depends": ["Biobase", "BiocGenerics", "Matrix", "RANN", "RSpectra", "VGAM", "cluster", "fpc", "gplots", "igraph", "monocle", "plyr"]
     },
     "uncoverappLib": {
       "name": "uncoverappLib",
-      "version": "1.14.0",
-      "sha256": "17p2aqpg3q6yqplw2haazm1hhr6s0nwhghcvn3j9128n5pg2j58x",
+      "version": "1.16.0",
+      "sha256": "1i28jakbyafa20a7lwbfwks55n7r58caz8c6lzcz63zb5rxijwi9",
       "depends": ["BiocFileCache", "DT", "EnsDb_Hsapiens_v75", "EnsDb_Hsapiens_v86", "GenomicRanges", "Gviz", "Homo_sapiens", "OrganismDbi", "Rsamtools", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "condformat", "markdown", "openxlsx", "org_Hs_eg_db", "processx", "rappdirs", "rlist", "shiny", "shinyBS", "shinyWidgets", "shinycssloaders", "shinyjs", "stringr"]
     },
+    "unifiedWMWqPCR": {
+      "name": "unifiedWMWqPCR",
+      "version": "1.42.0",
+      "sha256": "174dj0vkccabi89jf3ld39ksl6gds9q5kadyrqvvmnp5ic9h59wj",
+      "depends": ["BiocGenerics", "limma"]
+    },
     "universalmotif": {
       "name": "universalmotif",
-      "version": "1.22.1",
-      "sha256": "0nb2xc0rw9k6nr7bgf4ip33g2cs5vnhy55ms6zkwsnd30hi69wyy",
+      "version": "1.24.2",
+      "sha256": "03wjwi3h6agdvp552cd8mlrlvjjb1wwi0z02yclh0jcxbrd7a90z",
       "depends": ["BiocGenerics", "Biostrings", "IRanges", "MASS", "MatrixGenerics", "Rcpp", "RcppThread", "S4Vectors", "ggplot2", "rlang", "yaml"]
     },
     "updateObject": {
       "name": "updateObject",
-      "version": "1.8.0",
-      "sha256": "151nma7yyhk8s67bqim6jn86p85zdq7hj0xvvpnsl78bacncca8c",
+      "version": "1.10.0",
+      "sha256": "1r195p39gcnlmcnp5x9mfkb8j53y1yh8rvh527xk54jd6wfd4w4w",
       "depends": ["BiocGenerics", "S4Vectors", "digest"]
     },
     "variancePartition": {
       "name": "variancePartition",
-      "version": "1.34.0",
-      "sha256": "00hrizpx05jfh7yrab6na10zkahm8ibrbxy4pa4dcldw65klqmn9",
+      "version": "1.36.2",
+      "sha256": "1k6xcvwam6rzzj9inrz9qwqarh734ray2hfjzljah653nznnmbdi",
       "depends": ["Biobase", "BiocParallel", "MASS", "Matrix", "Rdpack", "RhpcBLASctl", "aod", "corpcor", "fANCOVA", "ggplot2", "gplots", "iterators", "limma", "lme4", "lmerTest", "matrixStats", "pbkrtest", "remaCor", "reshape2", "rlang", "scales"]
     },
     "vbmp": {
       "name": "vbmp",
-      "version": "1.72.0",
-      "sha256": "0a21jpvg6jjv28gx30yrvm7wsc194jsdsxh0vhgk8j9rjlmlfp2y",
+      "version": "1.74.0",
+      "sha256": "09ib5j0cv5n6w8rvhj45hr0piwigszpjmi6kb81m2k8z7029sz28",
       "depends": []
     },
     "velociraptor": {
       "name": "velociraptor",
-      "version": "1.14.3",
-      "sha256": "0i8kzj79qszqaq6ynij006r80g2jacm4pmjkvv1h36mxp3a6z559",
+      "version": "1.16.0",
+      "sha256": "1mp5sm5n2z3xkr3ivky4ask1ssncxfg6l30j7d0zd8amd5f7n8s0",
       "depends": ["BiocGenerics", "BiocParallel", "BiocSingular", "DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "reticulate", "scuttle", "zellkonverter"]
     },
     "veloviz": {
       "name": "veloviz",
-      "version": "1.10.0",
-      "sha256": "0bni9ykffsa4zazycaki74xxwps40ngsrvq32bdr4anyhya2nk1v",
+      "version": "1.12.0",
+      "sha256": "1r7qgppq3dp985z46bsfs5dhxa93m5dlpxd7r6r2aiz5j9aw3agr",
       "depends": ["Matrix", "RSpectra", "Rcpp", "igraph", "mgcv"]
     },
     "vidger": {
       "name": "vidger",
-      "version": "1.24.0",
-      "sha256": "1ladsgxqmmff7rw6w3x8jyxba4mdk7bb4f4wgimwfgvyjmygsaqr",
+      "version": "1.26.0",
+      "sha256": "1n2d8awihp1hc6y0xa5gdplv2qbp5460lm4ylikvj2z6cyhfsxhh",
       "depends": ["Biobase", "DESeq2", "GGally", "RColorBrewer", "SummarizedExperiment", "edgeR", "ggplot2", "ggrepel", "knitr", "rmarkdown", "scales", "tidyr"]
     },
     "viper": {
       "name": "viper",
-      "version": "1.38.0",
-      "sha256": "00cl6lbi56dbd8dilg0iczca87wr3572vq7i352mgfdinlw7fcyk",
+      "version": "1.40.0",
+      "sha256": "0ms0v6hwwyy4n8l452zzdjzim3yiv22p0m6a36pipap976y2n0b7",
       "depends": ["Biobase", "KernSmooth", "e1071", "mixtools"]
     },
     "vissE": {
       "name": "vissE",
-      "version": "1.12.0",
-      "sha256": "1bw74vjag4g90d2s29w5j51dd30xqp6k6x6vwb0ihrxfvadns5dx",
+      "version": "1.14.0",
+      "sha256": "0xlv8qgjvl2wrqs4livkbysyj8bfg0fqdjvwvrbv4rrkggppbd35",
       "depends": ["GSEABase", "RColorBrewer", "ggforce", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "igraph", "msigdb", "plyr", "reshape2", "scales", "scico", "textstem", "tidygraph", "tm"]
     },
     "vsclust": {
       "name": "vsclust",
-      "version": "1.6.0",
-      "sha256": "0kb63am4aa6gmlpbczdbmxc7vwnmnnkd78ql6nizd9sfixdmiqm5",
+      "version": "1.8.0",
+      "sha256": "0yi3ij0bphvmrshrf3m922ixw1xdgj2y0cj43dfaih9qf8jdw2fx",
       "depends": ["MultiAssayExperiment", "Rcpp", "limma", "matrixStats", "qvalue", "shiny"]
     },
     "vsn": {
       "name": "vsn",
-      "version": "3.72.0",
-      "sha256": "1r6cd92d4xlx4zdyy1sfaxicjf4q3arflmswpdkckkc4h9c6zf8m",
+      "version": "3.74.0",
+      "sha256": "0i0fghcrdgivm5amyx2clzqqx4yb3fq7s24v85jmclbsr8fnzm5q",
       "depends": ["Biobase", "affy", "ggplot2", "lattice", "limma"]
     },
     "vtpnet": {
       "name": "vtpnet",
-      "version": "0.44.0",
-      "sha256": "1fi4yjh7nvrq9fzba771i32p6qhq3cl7c9sil1hpc9l4k9bxfdfp",
+      "version": "0.46.0",
+      "sha256": "0n353il4ip0v1khfvg9rljlghlgrgq3f4fdgr5rzzvcaxhfdghik",
       "depends": ["GenomicRanges", "doParallel", "foreach", "graph", "gwascat"]
     },
     "vulcan": {
       "name": "vulcan",
-      "version": "1.26.0",
-      "sha256": "1fimj4rbrw6wy1kl6is49v33y6c1s3n9nkanpqibkgk4g3cljxfa",
+      "version": "1.28.0",
+      "sha256": "0pbfbmk009765m8bqlb27hwz7hrgbi6af5gffwm5ljk6zcg7d8hm",
       "depends": ["Biobase", "ChIPpeakAnno", "DESeq2", "DiffBind", "GenomicRanges", "S4Vectors", "TxDb_Hsapiens_UCSC_hg19_knownGene", "caTools", "csaw", "gplots", "locfit", "viper", "wordcloud", "zoo"]
     },
     "waddR": {
       "name": "waddR",
-      "version": "1.18.0",
-      "sha256": "160v6qqcx3fn657p7blq261nqclww2wic3gp0k855d3kx4i12i5l",
+      "version": "1.20.0",
+      "sha256": "01w57p09mm7fbx9w7swfy6zvryx31gpmj5jsp9mklij7ivd7wp4c",
       "depends": ["BiocFileCache", "BiocParallel", "Rcpp", "RcppArmadillo", "SingleCellExperiment", "arm", "eva"]
     },
     "wateRmelon": {
       "name": "wateRmelon",
-      "version": "2.10.0",
-      "sha256": "19zlv9aglllsjq3jcnlw994bkanjdq0ib46k7wjsig04cx4apz1v",
+      "version": "2.12.0",
+      "sha256": "0806qbnkxzmyhx80x5ib7qkggqvcpvsm51n9s1cfplzsd7d5jb7i",
       "depends": ["Biobase", "IlluminaHumanMethylation450kanno_ilmn12_hg19", "ROC", "illuminaio", "limma", "lumi", "matrixStats", "methylumi"]
     },
     "wavClusteR": {
       "name": "wavClusteR",
-      "version": "2.38.0",
-      "sha256": "0yr4jfaxs253xg5q0kds8fm97kqacx67pw1c80yx2w79v7nqskgv",
+      "version": "2.40.0",
+      "sha256": "0sgnp5s5lgvkpypcbypls6lnav81d10r3kzyw61bva5xn236vwyx",
       "depends": ["BiocGenerics", "Biostrings", "GenomicFeatures", "GenomicRanges", "Hmisc", "IRanges", "Rsamtools", "S4Vectors", "foreach", "ggplot2", "mclust", "rtracklayer", "seqinr", "stringr"]
     },
     "weaver": {
       "name": "weaver",
-      "version": "1.70.0",
-      "sha256": "08k5pkd16n9jyf45y8wh8lzk7dwkkpiai87fnrxg440qjb91pzsm",
+      "version": "1.72.0",
+      "sha256": "0vqnrwv204mavggps48pjhazkz2hk4wj2hhjny88m5h3f1amb3hb",
       "depends": ["codetools", "digest"]
     },
     "webbioc": {
       "name": "webbioc",
-      "version": "1.76.0",
-      "sha256": "1ws4w2kf514adk50sjadgasm7z1xvklcb8s243m12fvlg63dia9i",
+      "version": "1.78.0",
+      "sha256": "0wvkbma50q6ibckhsimarc0qb0rr65ph85amxq2lihvc9w69b7p8",
       "depends": ["Biobase", "BiocManager", "affy", "annaffy", "gcrma", "multtest", "qvalue", "vsn"]
     },
     "weitrix": {
       "name": "weitrix",
-      "version": "1.16.0",
-      "sha256": "01jp94k2qlxbci1kidx4lnxkz0bf4vaj5p31c4brcmgrzv0a1pz4",
+      "version": "1.18.0",
+      "sha256": "0lvd6wf4bm5yxz9097hz18amx4kx5mm4lcj6nk8508qpnffz8pqs",
       "depends": ["BiocGenerics", "BiocParallel", "Ckmeans_1d_dp", "DelayedArray", "DelayedMatrixStats", "RhpcBLASctl", "S4Vectors", "SummarizedExperiment", "assertthat", "dplyr", "ggplot2", "glm2", "limma", "purrr", "reshape2", "rlang", "scales", "topconfects"]
     },
     "widgetTools": {
       "name": "widgetTools",
-      "version": "1.82.0",
-      "sha256": "0knszrfapndnjzv5948qbfsjamlf7g04yry7yx294l8iwvwip6qv",
+      "version": "1.84.0",
+      "sha256": "0mi8xnwwlcdh3vj58fg69xbqv12k8xp5jbbd2kkrhcpcvkw0lnxb",
       "depends": []
     },
     "wiggleplotr": {
       "name": "wiggleplotr",
-      "version": "1.28.0",
-      "sha256": "1px7rgvaj6kks6fp7yqsqjwy4knlzgllzxsiimv8nikmbd57dmi0",
+      "version": "1.30.0",
+      "sha256": "1p0x3zrp5hvrfh7cyxdxgniij3yjawrsm1pnz0sw75ps00kw3kpn",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "assertthat", "cowplot", "dplyr", "ggplot2", "purrr", "rtracklayer"]
     },
     "wpm": {
       "name": "wpm",
-      "version": "1.14.0",
-      "sha256": "1623q58fjxnx1632fn5c5rhx0zpglbjpp7zqp15f2gch01ac0xdy",
+      "version": "1.16.0",
+      "sha256": "0iax3qncywjfjyqhhj6m9wcfycaqk8yaywg29js387bjwscr2irc",
       "depends": ["Biobase", "DT", "RColorBrewer", "SummarizedExperiment", "cli", "config", "dplyr", "ggplot2", "golem", "logging", "rlang", "shiny", "shinyWidgets", "shinycustomloader", "shinydashboard", "stringr"]
     },
     "wppi": {
       "name": "wppi",
-      "version": "1.12.0",
-      "sha256": "1mvr5bpsng87yl1bhd22h45830vw3sla1ysnr29px13if2q5ylmy",
+      "version": "1.14.0",
+      "sha256": "0vd90v88k1p5ljbdyd0s2qhsr4b2ja16w610ab41rxwpf62vmxgz",
       "depends": ["Matrix", "OmnipathR", "RCurl", "dplyr", "igraph", "logger", "magrittr", "progress", "purrr", "rlang", "tibble", "tidyr"]
     },
     "xcms": {
       "name": "xcms",
-      "version": "4.2.2",
-      "sha256": "1zk9l4ll3047fj0rngvjka2hkg2by26n2h3xm1iyvfiw5068y74y",
-      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "MSnbase", "MassSpecWavelet", "MetaboCoreUtils", "MsCoreUtils", "MsExperiment", "MsFeatures", "ProtGenerics", "RColorBrewer", "S4Vectors", "Spectra", "SummarizedExperiment", "jsonlite", "lattice", "mzR", "progress"]
+      "version": "4.4.0",
+      "sha256": "1i9xiilrwvnzkdbzrdnbsw0sbwplfaklbsk3wz8kzv87ivipybh5",
+      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "IRanges", "MSnbase", "MassSpecWavelet", "MetaboCoreUtils", "MsCoreUtils", "MsExperiment", "MsFeatures", "ProtGenerics", "RColorBrewer", "S4Vectors", "Spectra", "SummarizedExperiment", "lattice", "mzR", "progress"]
     },
     "xcore": {
       "name": "xcore",
-      "version": "1.8.0",
-      "sha256": "04156svl1cjbhy51d7fbgdilp832wfifg37yr9civ829iyi79fha",
+      "version": "1.10.0",
+      "sha256": "11pam90f6q6f1lvjl54jdg8p9rd47pybdcl1xy7g0q1gyygdl6qs",
       "depends": ["DelayedArray", "GenomicRanges", "IRanges", "Matrix", "MultiAssayExperiment", "S4Vectors", "edgeR", "foreach", "glmnet", "iterators", "magrittr"]
     },
+    "xenLite": {
+      "name": "xenLite",
+      "version": "1.0.0",
+      "sha256": "18nkq56gnb50i5a0wjqrlmdkp29qf5va5bkyjlvaz01gxrbx445g",
+      "depends": ["BiocFileCache", "EBImage", "HDF5Array", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "TENxIO", "arrow", "dplyr", "ggplot2", "shiny"]
+    },
     "xmapbridge": {
       "name": "xmapbridge",
-      "version": "1.62.0",
-      "sha256": "0laahd3v5m313q1iq259aikgqf7zlmpxyxhws2pr7vg97g37bbhs",
+      "version": "1.64.0",
+      "sha256": "1r4n5lnps47qrl90m5mm0i3530l0r31hd7hsp2d004sgbmyak304",
       "depends": []
     },
     "yamss": {
       "name": "yamss",
-      "version": "1.30.0",
-      "sha256": "0l9wqijwlq1gwybj2fy6jwgq6ja1mvx8yfdv174g5mjflx8nmc06",
+      "version": "1.32.0",
+      "sha256": "1rdqx69x4qqq6lnsk54rha8am51likxvlyqj4lk7rx5gg2390d5q",
       "depends": ["BiocGenerics", "EBImage", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "data_table", "limma", "mzR"]
     },
     "yarn": {
       "name": "yarn",
-      "version": "1.30.0",
-      "sha256": "1r0dj65i8xg1yb6x7ggb3s40hvzbh596k2g9bxblsbl18z867ydp",
+      "version": "1.32.0",
+      "sha256": "0iy130bkx549jn9ki7zgmxw78md9l6rr98rwmv9jzv2a09bddl2c",
       "depends": ["Biobase", "RColorBrewer", "biomaRt", "downloader", "edgeR", "gplots", "limma", "matrixStats", "preprocessCore", "quantro", "readr"]
     },
     "zFPKM": {
       "name": "zFPKM",
-      "version": "1.26.0",
-      "sha256": "1pgmw41xdq9gd2shc6kawgxz9sw1ydlgs0p35k99k2v50f86r2wy",
+      "version": "1.28.0",
+      "sha256": "1hhlx7xqjlnm90j8hk5qypk225n4w38qsn2v4vdaar96z6lm2rnq",
       "depends": ["SummarizedExperiment", "checkmate", "dplyr", "ggplot2", "tidyr"]
     },
     "zellkonverter": {
       "name": "zellkonverter",
-      "version": "1.14.1",
-      "sha256": "1fyy3v1papg46cclk5fg8iqmg0671ccr82alvv41hk5d85ck04aq",
+      "version": "1.16.0",
+      "sha256": "1y1z2vjw04aq139a9f43s4kwl8zbx734s593cm15g0yxjsdpcgxv",
       "depends": ["DelayedArray", "Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "basilisk", "cli", "reticulate"]
     },
     "zenith": {
       "name": "zenith",
-      "version": "1.6.0",
-      "sha256": "14mj5flig4f0s3qgny26wj8l50d5f8bdp66gnh83wsqnln784x8m",
+      "version": "1.8.0",
+      "sha256": "1bxbnd8yv4n47g5y2dkk4rgaaqbkmzplh2f9drrjzcy3bmwmvlxx",
       "depends": ["EnrichmentBrowser", "GSEABase", "Rdpack", "Rfast", "ggplot2", "limma", "msigdbr", "progress", "reshape2", "tidyr", "variancePartition"]
     },
     "zinbwave": {
       "name": "zinbwave",
-      "version": "1.26.0",
-      "sha256": "07zlvzfs1c4gcj9hwgqbjhgbrffi301620chrf5lvzly4v7hafwi",
+      "version": "1.28.0",
+      "sha256": "0z0414h470674g0w6y11i1mc06vrc075zdcyjjhsj1i8npwqym60",
       "depends": ["BiocParallel", "Matrix", "SingleCellExperiment", "SummarizedExperiment", "edgeR", "genefilter", "softImpute"]
     },
+    "zitools": {
+      "name": "zitools",
+      "version": "1.0.0",
+      "sha256": "0cw83gm6q1d9jd20j8yk8k4vcx7q968winmvpf3pia4hyrc773pf",
+      "depends": ["BiocGenerics", "DESeq2", "MatrixGenerics", "RColorBrewer", "SummarizedExperiment", "VGAM", "dplyr", "ggplot2", "magrittr", "matrixStats", "phyloseq", "pscl", "reshape2", "tibble", "tidyr"]
+    },
     "zlibbioc": {
       "name": "zlibbioc",
-      "version": "1.50.0",
-      "sha256": "155q6983xjdjpq445lpg5n9gzf8gr18nll6dmjk7jwdq7fdxb602",
+      "version": "1.52.0",
+      "sha256": "0nz17g5dvj57c72csnpnfvylsq3z3c0qxvgsp7l2lcns9xc9rdnz",
       "depends": []
     },
     "ABAEnrichment": {
       "name": "ABAEnrichment",
-      "version": "1.24.0",
-      "sha256": "1sp3f72rzlr822dxx42bswynrwwfx6f520hdhfdikqp13p2y4044",
-      "depends": ["ABAData", "data_table", "GOfuncR", "gplots", "gtools", "Rcpp"],
+      "version": "1.2.2",
+      "sha256": "0hmxxp12w67lp1g1djzlxffwlx32mnd1wbmz1hmv7y7z6h6ichvq",
+      "depends": ["ABAData", "Rcpp", "gplots"],
       "broken": true
     },
     "ALPS": {
@@ -13362,18 +13350,74 @@
       "depends": ["BiocParallel", "biomaRt", "dplyr", "DRaWR", "e1071", "fgsea", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "Gviz", "igraph", "IRanges", "IVAS", "limma", "Matrix", "reshape2", "ROCR", "Rsamtools", "rtracklayer", "S4Vectors", "scales", "SummarizedExperiment"],
       "broken": true
     },
+    "ATACCoGAPS": {
+      "name": "ATACCoGAPS",
+      "version": "1.6.0",
+      "sha256": "09h32q9y7z65ck33rwqzw2wkl8l6016s0sdkhf2g094yxhkz26rh",
+      "depends": ["BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Mmusculus_UCSC_mm10", "CoGAPS", "GeneOverlap", "GenomicFeatures", "GenomicRanges", "Homo_sapiens", "IRanges", "JASPAR2016", "Mus_musculus", "TFBSTools", "chromVAR", "dplyr", "fgsea", "gplots", "gtools", "motifmatchr", "msigdbr", "projectR", "rGREAT", "stringr", "tidyverse"],
+      "broken": true
+    },
     "AffyCompatible": {
       "name": "AffyCompatible",
-      "version": "1.58.0",
-      "sha256": "1bg7iqasvfsgd9x3ykgpblqnz1q06g3ifmzj4jf2kn8kxj63wfbl",
+      "version": "1.30.0",
+      "sha256": "1qw741j4d9b7bczjz3s72a9d0dcxbh5a2raak3ggwmz72p53axfz",
       "depends": ["Biostrings", "RCurl", "XML"],
       "broken": true
     },
+    "AffyExpress": {
+      "name": "AffyExpress",
+      "version": "1.36.0",
+      "sha256": "186gc8c3bj070zvwyy4vz44wx1r85bbmil78b6m9kvwp6q1856d7",
+      "depends": ["affy", "limma"],
+      "broken": true
+    },
+    "AffyTiling": {
+      "name": "AffyTiling",
+      "version": "1.28.0",
+      "sha256": "08n1w64yk1pxb9d8dpa86y3mqxrsvyq0gsfzlsqg6fz8jz497fhr",
+      "depends": ["affxparser", "affy", "preprocessCore"],
+      "broken": true
+    },
+    "AnalysisPageServer": {
+      "name": "AnalysisPageServer",
+      "version": "1.4.1",
+      "sha256": "0zq0h9abswvhkpgb6f966rhgj7lh02aykq88fphxfv9zzkjfxbjp",
+      "depends": ["Biobase", "graph", "log4r", "rjson"],
+      "broken": true
+    },
+    "AnnotationFuncs": {
+      "name": "AnnotationFuncs",
+      "version": "1.20.0",
+      "sha256": "03rznpbsgq3pdh0id35vp8984f57ws2jpb0cww1qxglf967gy028",
+      "depends": ["AnnotationDbi"],
+      "broken": true
+    },
     "ArrayExpressHTS": {
       "name": "ArrayExpressHTS",
-      "version": "1.47.0",
-      "sha256": "0fndc7xifzj2wq8si8q8zjjkly5ckgr28jrm3m887s7kivbvjzvv",
-      "depends": ["Biobase", "BiocGenerics", "biomaRt", "Biostrings", "bitops", "edgeR", "GenomicRanges", "Hmisc", "IRanges", "R2HTML", "RColorBrewer", "Rhtslib", "rJava", "Rsamtools", "sampling", "sendmailR", "ShortRead", "snow", "svMisc", "XML"],
+      "version": "1.20.0",
+      "sha256": "00a5h3nwwhi9phrys2gj0ba8a24iqxk09licb0jn1qzdz9mrfxmq",
+      "depends": ["Biobase", "BiocGenerics", "Biostrings", "DESeq", "GenomicRanges", "Hmisc", "IRanges", "R2HTML", "RColorBrewer", "Rsamtools", "ShortRead", "XML", "biomaRt", "bitops", "edgeR", "rJava", "sampling", "sendmailR", "snow", "svMisc"],
+      "broken": true
+    },
+    "ArrayTV": {
+      "name": "ArrayTV",
+      "version": "1.8.0",
+      "sha256": "0ny5x2w0n3di5wzywfngsfdxaciczs24cnbvk75mv6hf4bdwfp74",
+      "depends": ["DNAcopy", "foreach", "oligoClasses"],
+      "broken": true
+    },
+    "ArrayTools": {
+      "name": "ArrayTools",
+      "version": "1.30.0",
+      "sha256": "168llqk8w1b54xy0ijg0m8mzcwggawkdr4s7abi2fv4q5007s1jv",
+      "depends": ["Biobase", "affy", "limma", "xtable"],
+      "broken": true
+    },
+    "AtlasRDF": {
+      "name": "AtlasRDF",
+      "version": "1.6.0",
+      "sha256": "16hgw47px7ig6hrm90y5nzy3dgdfm5my58bli20aj6dhnh2yvhxd",
+      "depends": ["hash"],
       "broken": true
     },
     "Autotuner": {
@@ -13385,8 +13429,8 @@
     },
     "BAC": {
       "name": "BAC",
-      "version": "1.58.0",
-      "sha256": "00dkhns9n1x4wmlxjcw75h7iwwk37zlv1c2fi0g1mmsw1xvdjzp6",
+      "version": "1.30.0",
+      "sha256": "1yrw01m8fd54v352pcb7904f8wi3il83nx8ywf6m968x33y2npxn",
       "depends": [],
       "broken": true
     },
@@ -13397,13 +13441,27 @@
       "depends": ["ape", "ellipse", "ggplot2", "Rcpp", "RcppArmadillo", "RcppEigen", "SummarizedExperiment", "vegan"],
       "broken": true
     },
+    "BEARscc": {
+      "name": "BEARscc",
+      "version": "1.24.0",
+      "sha256": "0f66pbhf4fz66021k7f6rlwzxdikznbhjqqpxwrj07yg65q5sd1l",
+      "depends": ["SingleCellExperiment", "data_table", "ggplot2"],
+      "broken": true
+    },
     "BGmix": {
       "name": "BGmix",
-      "version": "1.59.0",
-      "sha256": "16fzgxcy4sk0kd67vzdxqz81s84dvh4bqss9cbl9bn6vhpfsnfyf",
+      "version": "1.30.0",
+      "sha256": "1ii0cvqpz7ai779r4hx8yimsx69ln1f7qlw7jvp3k606z52kqkp2",
       "depends": ["KernSmooth"],
       "broken": true
     },
+    "BHC": {
+      "name": "BHC",
+      "version": "1.22.0",
+      "sha256": "0m8w4b3ihnmvccy32nwvgzwn7k9i018ydw8iz19b6kz5r5c89q17",
+      "depends": [],
+      "broken": true
+    },
     "BRGenomics": {
       "name": "BRGenomics",
       "version": "1.14.1",
@@ -13411,6 +13469,13 @@
       "depends": ["DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment"],
       "broken": true
     },
+    "BayesPeak": {
+      "name": "BayesPeak",
+      "version": "1.22.0",
+      "sha256": "1jmn8p461rmgjarf4rlhyqzrjg8xkpq56rlrk6964kqxp6jkh8bi",
+      "depends": ["IRanges"],
+      "broken": true
+    },
     "BioMM": {
       "name": "BioMM",
       "version": "1.15.0",
@@ -13432,11 +13497,18 @@
       "depends": ["BiocFileCache", "GenomeInfoDb", "GenomicRanges", "GEOquery", "graph", "SummarizedExperiment"],
       "broken": true
     },
-    "BioTIP": {
-      "name": "BioTIP",
-      "version": "1.16.0",
-      "sha256": "1bbjfv3bi20xlk8h7r5ipav6mfs27lmj0zjb5mk1gmp071dmnk0y",
-      "depends": ["cluster", "GenomicRanges", "igraph", "MASS", "psych", "scran", "stringr"],
+    "BioSeqClass": {
+      "name": "BioSeqClass",
+      "version": "1.28.0",
+      "sha256": "0pv63d57hck04dpha20pzyzz7przzvi536nmgnsig5zw16lis4f2",
+      "depends": ["Biobase", "Biostrings", "class", "e1071", "foreign", "ipred", "klaR", "nnet", "party", "randomForest", "rpart", "scatterplot3d", "tree"],
+      "broken": true
+    },
+    "BiocCaseStudies": {
+      "name": "BiocCaseStudies",
+      "version": "1.32.0",
+      "sha256": "0wn3a01l6d62prrncmy22dx4nqsgzq3lw24ybf676ghrmjaygmyc",
+      "depends": ["Biobase"],
       "broken": true
     },
     "BiocDockerManager": {
@@ -13446,11 +13518,32 @@
       "depends": ["dplyr", "httr", "memoise", "readr", "whisker"],
       "broken": true
     },
+    "BiocHail": {
+      "name": "BiocHail",
+      "version": "1.4.0",
+      "sha256": "1p8wkl31c7snv8l8zkmg2hf9pb2p0gif4gfgjia0npi91y2h5hfp",
+      "depends": ["BiocFileCache", "BiocGenerics", "basilisk", "dplyr", "reticulate"],
+      "broken": true
+    },
+    "BiocInstaller": {
+      "name": "BiocInstaller",
+      "version": "1.20.3",
+      "sha256": "0hjfhzbpxr7sfxac46ihklq0l7gkglrp7qi48vcp1s7xapnikblr",
+      "depends": [],
+      "broken": true
+    },
+    "BiocOncoTK": {
+      "name": "BiocOncoTK",
+      "version": "1.24.0",
+      "sha256": "0h4cr7lrmbyx7kdj81s7ff75svr01rvzn54svqi93vjilawmpbm3",
+      "depends": ["ComplexHeatmap", "DBI", "DT", "GenomicFeatures", "GenomicRanges", "IRanges", "MASS", "Rgraphviz", "S4Vectors", "SummarizedExperiment", "bigrquery", "car", "curatedTCGAData", "dplyr", "ggplot2", "ggpubr", "graph", "httr", "magrittr", "plyr", "rjson", "scales", "shiny"],
+      "broken": true
+    },
     "BitSeq": {
       "name": "BitSeq",
-      "version": "1.41.0",
-      "sha256": "185cssrvaw2x0r3y5fqnfqm31924ccwg33qpj3v8ywrh3x7qn22p",
-      "depends": ["IRanges", "Rhtslib", "Rsamtools", "S4Vectors"],
+      "version": "1.14.0",
+      "sha256": "1q58za8jd96bk2wxy7np0b7lar3v0pk6ll833k10x1b260rvpgbp",
+      "depends": ["IRanges", "Rsamtools", "S4Vectors", "zlibbioc"],
       "broken": true
     },
     "BrainSABER": {
@@ -13460,13 +13553,41 @@
       "depends": ["BiocFileCache", "biomaRt", "data_table", "lsa", "S4Vectors", "shiny", "SummarizedExperiment"],
       "broken": true
     },
+    "BrainStars": {
+      "name": "BrainStars",
+      "version": "1.14.0",
+      "sha256": "0r6jd6h48c15sg655079lwr9v1gl79wk8773w2q9fyfmakhj15vx",
+      "depends": ["Biobase", "RCurl", "RJSONIO"],
+      "broken": true
+    },
+    "BrowserVizDemo": {
+      "name": "BrowserVizDemo",
+      "version": "1.2.3",
+      "sha256": "1pj9b0nhkrc3bcs36dpm2hy9lsfp2xwnrlf99b9v6n96ijki8bg9",
+      "depends": ["BiocGenerics", "BrowserViz", "httpuv", "jsonlite"],
+      "broken": true
+    },
+    "CALIB": {
+      "name": "CALIB",
+      "version": "1.36.0",
+      "sha256": "1b21f0zg4czhk4pbd3c3vbl0p4qpw0l4wg17lm1gw4b6d6ml7jsb",
+      "depends": ["limma"],
+      "broken": true
+    },
     "CAnD": {
       "name": "CAnD",
-      "version": "1.27.0",
-      "sha256": "14x0m5iv7dm1iii5zsny9wnf4j5ddh0kij2jm658r3i4wnc99mkb",
+      "version": "1.2.1",
+      "sha256": "0ncpa81ac6dzkhqnr56i4nzzipsmzy44n71z6sdhpa39rgdar2a7",
       "depends": ["ggplot2", "reshape"],
       "broken": true
     },
+    "CNPBayes": {
+      "name": "CNPBayes",
+      "version": "1.0.0",
+      "sha256": "06jw9xi0q5slh1xghgj1js5bn1gsmpag0w84cxa7qf5ls1bw4xp6",
+      "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "Rcpp", "S4Vectors", "combinat", "foreach", "gtools", "matrixStats", "oligoClasses"],
+      "broken": true
+    },
     "CNVgears": {
       "name": "CNVgears",
       "version": "1.8.0",
@@ -13474,24 +13595,31 @@
       "depends": ["data_table", "ggplot2"],
       "broken": true
     },
+    "CNVtools": {
+      "name": "CNVtools",
+      "version": "1.64.0",
+      "sha256": "1sm28sl7ghcfrgjd0d741zfy21r6vxkhj8cn510z95aa49icpd8j",
+      "depends": ["survival"],
+      "broken": true
+    },
     "COHCAP": {
       "name": "COHCAP",
-      "version": "1.48.0",
-      "sha256": "1czbmjmrldp4xwf2pi542aqxxgjg34bvky716fjf5y3zxp4j5pnd",
-      "depends": ["BH", "COHCAPanno", "gplots", "RColorBrewer", "Rcpp", "RcppArmadillo", "WriteXLS"],
+      "version": "1.8.0",
+      "sha256": "1lak57k8b8jcd21wajr1ivi1sml73fsvb6jbdz6nxgjbq7al1hgk",
+      "depends": ["COHCAPanno", "WriteXLS"],
       "broken": true
     },
     "CORREP": {
       "name": "CORREP",
-      "version": "1.68.0",
-      "sha256": "1ida60gpbkr5iyn74y6df8gd0znjkzbidyi7sz4my47fw4j8wrin",
+      "version": "1.36.0",
+      "sha256": "0hjkwl2mf173mfdrziiadf5hacz6j67skizch44rxc2kfj7sbhyb",
       "depends": ["e1071"],
       "broken": true
     },
     "CSSP": {
       "name": "CSSP",
-      "version": "1.37.0",
-      "sha256": "08l8ag82n9hdrj31m37f4fm9kvxjx7xyprdlbi20aqrzsrd227gr",
+      "version": "1.8.0",
+      "sha256": "05x0agbcpns8s3vmbs7ygdny249vcahzk7sqv50nz39ap2c7i309",
       "depends": [],
       "broken": true
     },
@@ -13502,6 +13630,13 @@
       "depends": ["BH", "Rcpp"],
       "broken": true
     },
+    "CancerMutationAnalysis": {
+      "name": "CancerMutationAnalysis",
+      "version": "1.13.0",
+      "sha256": "0c3yjscd1jlgfl869vnv37qdb0y5gicnja1why9ws95qqgmij6zl",
+      "depends": ["AnnotationDbi", "limma", "qvalue"],
+      "broken": true
+    },
     "CancerSubtypes": {
       "name": "CancerSubtypes",
       "version": "1.26.0",
@@ -13525,37 +13660,44 @@
     },
     "Clonality": {
       "name": "Clonality",
-      "version": "1.47.0",
-      "sha256": "0yxwwc0sl3impvzr0bmjmdn65z6qx6lf5pwik2p8wxxgaybvff9r",
+      "version": "1.18.0",
+      "sha256": "0rx3k8c55q831dhfh5dpkl3px8jj6glx6i3la80r9krx68mbp947",
       "depends": ["DNAcopy"],
       "broken": true
     },
     "CoRegNet": {
       "name": "CoRegNet",
-      "version": "1.38.0",
-      "sha256": "19df43l35dkf36dhq8fx8a9gm1grxymrmpcix0b4qmxrzwjp0s8k",
+      "version": "1.6.0",
+      "sha256": "0ynizawrygpka2isldbfmnlz1zqczx2fv1kbvz1lbm9qwbpj7rn4",
       "depends": ["arules", "igraph", "shiny"],
       "broken": true
     },
-    "CoSIA": {
-      "name": "CoSIA",
-      "version": "1.2.0",
-      "sha256": "14d7l88346wkh4fj9y4f2lywfqbawz60z86f6wm2r2vh8zhcbk8i",
-      "depends": ["AnnotationDbi", "annotationTools", "biomaRt", "dplyr", "ExperimentHub", "ggplot2", "homologene", "magrittr", "org_Ce_eg_db", "org_Dm_eg_db", "org_Dr_eg_db", "org_Hs_eg_db", "org_Mm_eg_db", "org_Rn_eg_db", "plotly", "RColorBrewer", "readr", "stringr", "tibble", "tidyr", "tidyselect"],
-      "broken": true
-    },
     "CompGO": {
       "name": "CompGO",
-      "version": "1.28.0",
-      "sha256": "16nlrk9wbxj51y8s7s58mdhpi70ghfacxi283406gwya3cm79f0n",
-      "depends": ["GenomicFeatures", "ggplot2", "pathview", "pcaMethods", "reshape2", "Rgraphviz", "rtracklayer", "TxDb_Mmusculus_UCSC_mm9_knownGene"],
+      "version": "1.6.0",
+      "sha256": "0n84z3mhg6zb3yafz0803g6cggzpbw31fn933q9bg7pybij0nf1p",
+      "depends": ["GenomicFeatures", "RDAVIDWebService", "Rgraphviz", "TxDb_Mmusculus_UCSC_mm9_knownGene", "ggplot2", "pathview", "pcaMethods", "reshape2", "rtracklayer"],
+      "broken": true
+    },
+    "CopyNumber450k": {
+      "name": "CopyNumber450k",
+      "version": "1.6.0",
+      "sha256": "0z4v6x140gzaxf06a73d2qd6dp8gvq62l8xb7bii21r7n089m14i",
+      "depends": ["Biobase", "BiocGenerics", "DNAcopy", "minfi", "preprocessCore"],
       "broken": true
     },
     "CopywriteR": {
       "name": "CopywriteR",
-      "version": "2.29.0",
-      "sha256": "1h4cyrjwdazgk49yzi9lvya8bfz9r4cpq19hyzikvc81ia8zdxs6",
-      "depends": ["BiocParallel", "chipseq", "CopyhelpeR", "data_table", "DNAcopy", "futile_logger", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "gtools", "IRanges", "matrixStats", "Rsamtools", "S4Vectors"],
+      "version": "2.2.0",
+      "sha256": "0hmww433hyg4wgi2hx49mwrd4y65myyi00akys3mhdsxn3s0al13",
+      "depends": ["BiocParallel", "CopyhelpeR", "DNAcopy", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "chipseq", "data_table", "futile_logger", "gtools", "matrixStats"],
+      "broken": true
+    },
+    "CorMut": {
+      "name": "CorMut",
+      "version": "1.12.0",
+      "sha256": "0ldqw4g15i4r1nv74msn97c75wcr1nvwk1ffnkafvnc8bwcfzfmy",
+      "depends": ["igraph", "seqinr"],
       "broken": true
     },
     "CountClust": {
@@ -13565,6 +13707,13 @@
       "depends": ["cowplot", "flexmix", "ggplot2", "gtools", "limma", "maptpx", "picante", "plyr", "reshape2", "slam", "SQUAREM"],
       "broken": true
     },
+    "CyTOFpower": {
+      "name": "CyTOFpower",
+      "version": "1.10.0",
+      "sha256": "158ixl91yfhzik2d22xijarllirbxg33783i5pxixcdz3amp1z56",
+      "depends": ["CytoGLMM", "DT", "SummarizedExperiment", "diffcyt", "dplyr", "ggplot2", "magrittr", "rlang", "shiny", "shinyFeedback", "shinyMatrix", "shinyjs", "tibble", "tidyr"],
+      "broken": true
+    },
     "CytoTree": {
       "name": "CytoTree",
       "version": "1.6.0",
@@ -13572,6 +13721,34 @@
       "depends": ["Biobase", "BiocNeighbors", "cluster", "destiny", "flowCore", "FlowSOM", "flowUtils", "ggplot2", "gmodels", "igraph", "limma", "Matrix", "matrixStats", "mclust", "pheatmap", "prettydoc", "RANN", "Rcpp", "Rtsne", "scatterpie", "scatterplot3d", "stringr", "sva", "umap"],
       "broken": true
     },
+    "DASiR": {
+      "name": "DASiR",
+      "version": "1.10.0",
+      "sha256": "1by2655qvskzynvbh47vydm6nl2cmnfqqs25453k29n672a6yyw4",
+      "depends": ["Biostrings", "GenomicRanges", "IRanges", "XML"],
+      "broken": true
+    },
+    "DAVIDQuery": {
+      "name": "DAVIDQuery",
+      "version": "1.29.0",
+      "sha256": "0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2",
+      "depends": ["RCurl"],
+      "broken": true
+    },
+    "DBChIP": {
+      "name": "DBChIP",
+      "version": "1.14.0",
+      "sha256": "1x876cv2j0bdb7jflm663bp7xk32rsxpf9jwwskbl8r4r1ffsapa",
+      "depends": ["DESeq", "edgeR"],
+      "broken": true
+    },
+    "DChIPRep": {
+      "name": "DChIPRep",
+      "version": "1.0.4",
+      "sha256": "0cwggkpbza25r2yssyhs9zkwzncmxkd406k2sn2y0rq1kdi08hj2",
+      "depends": ["DESeq2", "GenomicRanges", "S4Vectors", "assertthat", "fdrtool", "ggplot2", "plyr", "reshape2", "smoothmest", "tidyr"],
+      "broken": true
+    },
     "DEComplexDisease": {
       "name": "DEComplexDisease",
       "version": "1.18.0",
@@ -13579,13 +13756,48 @@
       "depends": ["BiocParallel", "ComplexHeatmap", "DESeq2", "edgeR", "Rcpp", "SummarizedExperiment"],
       "broken": true
     },
+    "DEDS": {
+      "name": "DEDS",
+      "version": "1.44.0",
+      "sha256": "079c3in183ybp0c46hqh99grqmbshsnrcax3qz08z5xbc394azna",
+      "depends": [],
+      "broken": true
+    },
+    "DESeq": {
+      "name": "DESeq",
+      "version": "1.22.1",
+      "sha256": "14rc1zcn4a7hkm43ca9js5ffhcm3awjrpl5bx66fj3szibjnnzcb",
+      "depends": ["Biobase", "BiocGenerics", "MASS", "RColorBrewer", "genefilter", "geneplotter", "lattice", "locfit"],
+      "broken": true
+    },
+    "DIAlignR": {
+      "name": "DIAlignR",
+      "version": "2.12.0",
+      "sha256": "19zgjnd9sjxx09pcf50fl3w4fmd1gj8g765x114l0cqcpk9qfmm5",
+      "depends": ["DBI", "RMSNumpress", "RSQLite", "Rcpp", "RcppEigen", "ape", "bit64", "data_table", "dplyr", "ggplot2", "magrittr", "mzR", "phangorn", "pracma", "reticulate", "rlang", "signal", "tidyr", "zoo"],
+      "broken": true
+    },
     "DMRforPairs": {
       "name": "DMRforPairs",
-      "version": "1.35.0",
-      "sha256": "1fdj2kk4hy1cy7lvxdcdigzvjsggsrchff10mccwwpycc4h115dj",
+      "version": "1.6.0",
+      "sha256": "0b5mkhb5gkvfccvpgvklb3ksnq9gv6napcvxzcrph46nmm11i8zc",
       "depends": ["GenomicRanges", "Gviz", "R2HTML"],
       "broken": true
     },
+    "DOQTL": {
+      "name": "DOQTL",
+      "version": "1.6.0",
+      "sha256": "0sl7a1hhszrfxn52iw7cz6sl38y7mwk4giw3a7kqj22f1p6bhc6y",
+      "depends": ["BSgenome_Mmusculus_UCSC_mm10", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "QTLRel", "RUnit", "Rsamtools", "VariantAnnotation", "XML", "annotate", "annotationTools", "biomaRt", "corpcor", "doParallel", "foreach", "fpc", "hwriter", "iterators", "mclust", "regress", "rhdf5"],
+      "broken": true
+    },
+    "DeProViR": {
+      "name": "DeProViR",
+      "version": "1.0.0",
+      "sha256": "0m1nhzq5kl6jyi3d8fzb77iplzc4p85v7lj5q7i7125kjv6bycsm",
+      "depends": ["BiocFileCache", "PRROC", "caret", "data_table", "dplyr", "fmsb", "ggplot2", "keras", "pROC", "readr"],
+      "broken": true
+    },
     "DeepBlueR": {
       "name": "DeepBlueR",
       "version": "1.27.0",
@@ -13593,25 +13805,60 @@
       "depends": ["data_table", "diffr", "dplyr", "filehash", "foreach", "GenomeInfoDb", "GenomicRanges", "R_utils", "RCurl", "rjson", "rtracklayer", "settings", "stringr", "withr", "XML"],
       "broken": true
     },
+    "DupChecker": {
+      "name": "DupChecker",
+      "version": "1.8.0",
+      "sha256": "0p75kq178mls765q2v22bj7a727hb1v5rj4wkcagxavcls92vg0p",
+      "depends": ["RCurl", "R_utils"],
+      "broken": true
+    },
     "EBSeqHMM": {
       "name": "EBSeqHMM",
-      "version": "1.35.0",
-      "sha256": "1vgpda6h9caq67iqdd88mrhq8502jc056zf8fgwfgd8z9cayhsdn",
+      "version": "1.4.0",
+      "sha256": "02ba8famhbp4nxkg8jkwzs63qkfi7hi03h6w1igl2xn2343fnla3",
       "depends": ["EBSeq"],
       "broken": true
     },
+    "EDDA": {
+      "name": "EDDA",
+      "version": "1.8.0",
+      "sha256": "0gqgq57a11k7iygjyf3bszx8gm90a8frabmzib7kk84k3wrvynqg",
+      "depends": ["DESeq", "ROCR", "Rcpp", "baySeq", "edgeR", "snow"],
+      "broken": true
+    },
+    "ELBOW": {
+      "name": "ELBOW",
+      "version": "1.6.0",
+      "sha256": "1kpprsv1s08qks10raqdh82c9w8dg0saxa1ahhnk1a2whzxj0n3m",
+      "depends": [],
+      "broken": true
+    },
+    "ENCODExplorer": {
+      "name": "ENCODExplorer",
+      "version": "1.2.4",
+      "sha256": "0vx4q628g0h1wdcp4hibs44h8avnyin0ccxijrdk94s5n2f91pc2",
+      "depends": ["RSQLite", "jsonlite"],
+      "broken": true
+    },
+    "ENVISIONQuery": {
+      "name": "ENVISIONQuery",
+      "version": "1.18.0",
+      "sha256": "1fyp6qyvw5cbapnpjx1s86pss2xhv98s4lqxfxwrsng6p1jh5z89",
+      "depends": ["XML", "rJava"],
+      "broken": true
+    },
     "EasyqpcR": {
       "name": "EasyqpcR",
-      "version": "1.31.0",
-      "sha256": "0lb2px789668fr1gxghycy7lbdkpwmippv6xmmwws6rbanvfd6v4",
+      "version": "1.12.0",
+      "sha256": "0s0ir8bpj3fwg79mzqz57c0crkqqq7hywiwyihcz2cykhsm1r11g",
       "depends": ["matrixStats", "plotrix", "plyr"],
       "broken": true
     },
-    "EpiCompare": {
-      "name": "EpiCompare",
-      "version": "1.6.7",
-      "sha256": "1vaxxikfvmi5n8s80df7sb2jqdvc8q66ybw8hshp79f98aiczfgc",
-      "depends": ["AnnotationHub", "BiocGenerics", "BRGenomics", "ChIPseeker", "data_table", "downloadthis", "genomation", "GenomeInfoDb", "GenomicRanges", "ggplot2", "htmltools", "IRanges", "plotly", "reshape2", "rmarkdown", "rtracklayer", "stringr"],
+    "ExpressionView": {
+      "name": "ExpressionView",
+      "version": "1.22.0",
+      "sha256": "1gwhz8q5kyi01jwlwpd39dp292pc6k4v1w0al4653151qb5m55ja",
+      "depends": ["AnnotationDbi", "GO_db", "KEGG_db", "bitops", "caTools", "eisa", "isa2"],
       "broken": true
     },
     "FCBF": {
@@ -13621,6 +13868,13 @@
       "depends": ["ggplot2", "gridExtra", "mclust", "pbapply", "SummarizedExperiment"],
       "broken": true
     },
+    "FEM": {
+      "name": "FEM",
+      "version": "2.6.0",
+      "sha256": "1pwbn2igwrd50wn8402f3zwd22h4c8anjmbrls2i6h86ardl046f",
+      "depends": ["AnnotationDbi", "BiocGenerics", "Matrix", "corrplot", "graph", "igraph", "impute", "limma", "marray", "org_Hs_eg_db"],
+      "broken": true
+    },
     "FScanR": {
       "name": "FScanR",
       "version": "1.10.0",
@@ -13630,16 +13884,16 @@
     },
     "FindMyFriends": {
       "name": "FindMyFriends",
-      "version": "1.23.0",
-      "sha256": "0xbhl6ljxb522r5062vv6xdziaaqkkwylmvlymvc5f1grjz0a4z9",
-      "depends": ["Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "digest", "dplyr", "filehash", "ggdendro", "ggplot2", "gtable", "igraph", "IRanges", "kebabs", "Matrix", "Rcpp", "reshape2", "S4Vectors"],
+      "version": "1.0.7",
+      "sha256": "0ga0iwscbcczysldizgp8g19gsyszfw4vgbgs45q9px95603z0cg",
+      "depends": ["Biobase", "BiocParallel", "Biostrings", "IRanges", "Matrix", "Rcpp", "S4Vectors", "digest", "dplyr", "filehash", "ggdendro", "ggplot2", "gtable", "igraph", "kebabs", "reshape2"],
       "broken": true
     },
     "FlowRepositoryR": {
       "name": "FlowRepositoryR",
-      "version": "1.23.0",
-      "sha256": "04lk2cahf6zqnhpzh0zwas4vmvaz4kcik9ri65bs9d9ximzjam91",
-      "depends": ["jsonlite", "RCurl", "XML"],
+      "version": "1.2.0",
+      "sha256": "1y1y7g9111z55cwi2ph44yqib41234g77xwsybk6irlq1anizz7p",
+      "depends": ["RCurl", "XML"],
       "broken": true
     },
     "FoldGO": {
@@ -13649,6 +13903,13 @@
       "depends": ["ggplot2", "tidyr", "topGO"],
       "broken": true
     },
+    "FourCSeq": {
+      "name": "FourCSeq",
+      "version": "1.4.0",
+      "sha256": "1xh0l90hp6jy9j0xkh78dm9kyk90zzlg04yfrzd4v12mwljs8r19",
+      "depends": ["Biobase", "Biostrings", "DESeq2", "GenomicAlignments", "GenomicRanges", "LSD", "Matrix", "Rsamtools", "SummarizedExperiment", "fda", "ggbio", "ggplot2", "gtools", "reshape2", "rtracklayer"],
+      "broken": true
+    },
     "FunChIP": {
       "name": "FunChIP",
       "version": "1.28.0",
@@ -13656,6 +13917,13 @@
       "depends": ["doParallel", "fda", "foreach", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "RColorBrewer", "Rcpp", "Rsamtools", "shiny"],
       "broken": true
     },
+    "FunciSNP": {
+      "name": "FunciSNP",
+      "version": "1.12.0",
+      "sha256": "1125ismkp2sprshv4b39l6bycdlry3933jaliva17c0bgjr27jhm",
+      "depends": ["AnnotationDbi", "ChIPpeakAnno", "FunciSNP_data", "GenomicRanges", "IRanges", "Rsamtools", "TxDb_Hsapiens_UCSC_hg19_knownGene", "VariantAnnotation", "ggplot2", "org_Hs_eg_db", "plyr", "reshape", "rtracklayer", "scales", "snpStats"],
+      "broken": true
+    },
     "GAPGOM": {
       "name": "GAPGOM",
       "version": "1.11.0",
@@ -13684,6 +13952,34 @@
       "depends": ["affxparser", "Biobase", "BiocManager", "data_table", "devtools", "dplR", "RSQLite", "stringr"],
       "broken": true
     },
+    "GENE_E": {
+      "name": "GENE.E",
+      "version": "1.10.0",
+      "sha256": "1czm1j144i842d7lf01c9gmyifikp4a66sq49i7rgpzbiz3pndkf",
+      "depends": ["RCurl", "rhdf5"],
+      "broken": true
+    },
+    "GEOsearch": {
+      "name": "GEOsearch",
+      "version": "1.0.1",
+      "sha256": "1zag3rg2cfs0zfh092rzwhshnkncrv2p88flz9hy2n350k1xnyc4",
+      "depends": ["org_Hs_eg_db", "org_Mm_eg_db"],
+      "broken": true
+    },
+    "GGBase": {
+      "name": "GGBase",
+      "version": "3.32.0",
+      "sha256": "15vvwigv9xy87dl2c795c3abpnrzr364m4sbslmns403rg8dpsiw",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GenomicRanges", "IRanges", "Matrix", "S4Vectors", "SummarizedExperiment", "digest", "genefilter", "limma", "snpStats"],
+      "broken": true
+    },
+    "GGtools": {
+      "name": "GGtools",
+      "version": "5.6.0",
+      "sha256": "1ndvlyfzjn519z9zh6kf5sdjaz3ckracgyf2lxp23nchm2311lf0",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Biostrings", "GGBase", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "ROCR", "Rsamtools", "S4Vectors", "VariantAnnotation", "biglm", "bit", "data_table", "ff", "ggplot2", "hexbin", "iterators", "reshape2", "rtracklayer", "snpStats"],
+      "broken": true
+    },
     "GISPA": {
       "name": "GISPA",
       "version": "1.26.0",
@@ -13691,18 +13987,25 @@
       "depends": ["Biobase", "changepoint", "data_table", "genefilter", "GSEABase", "HH", "lattice", "latticeExtra", "plyr", "scatterplot3d"],
       "broken": true
     },
+    "GOFunction": {
+      "name": "GOFunction",
+      "version": "1.18.0",
+      "sha256": "00pdxf24sxdnh31h69c5zjhl1j2jv1ag91ay3a9w62p07bcg82l6",
+      "depends": ["AnnotationDbi", "Biobase", "GO_db", "Rgraphviz", "SparseM", "graph"],
+      "broken": true
+    },
     "GOSim": {
       "name": "GOSim",
-      "version": "1.40.0",
-      "sha256": "1izsjs3li1qcp2nfy7zk3zbf3hh7kq75r78ijbn5yln9fgs6mbv1",
-      "depends": ["annotate", "AnnotationDbi", "cluster", "corpcor", "flexmix", "GO_db", "graph", "Matrix", "org_Hs_eg_db", "RBGL", "Rcpp", "topGO"],
+      "version": "1.8.0",
+      "sha256": "14dyazr7p9p7h1cckbmd5yjj76718lqgfnqbcrrz52qyk0dqz6wx",
+      "depends": ["AnnotationDbi", "GO_db", "Matrix", "RBGL", "Rcpp", "annotate", "cluster", "corpcor", "flexmix", "graph", "org_Hs_eg_db", "topGO"],
       "broken": true
     },
     "GOsummaries": {
       "name": "GOsummaries",
-      "version": "2.37.0",
-      "sha256": "1r2a1bym6hwhah4gq47j7983znwsl3fwbhx9lw9j1nxm4ip0d7nr",
-      "depends": ["ggplot2", "gProfileR", "gtable", "limma", "plyr", "Rcpp", "reshape2"],
+      "version": "2.4.7",
+      "sha256": "0kl77jqd2bdbp8v2rrjp21j265r05fnagpz8jwj8m9scgrd5hwh4",
+      "depends": ["Rcpp", "gProfileR", "ggplot2", "gtable", "limma", "plyr", "reshape2"],
       "broken": true
     },
     "GRridge": {
@@ -13721,9 +14024,23 @@
     },
     "GeneAnswers": {
       "name": "GeneAnswers",
-      "version": "2.36.0",
-      "sha256": "1f8q3hi913khyy1cc3yp2635gaik47alsqmhi0mi24cy340faplz",
-      "depends": ["annotate", "Biobase", "downloader", "Heatplus", "igraph", "KEGGREST", "MASS", "RBGL", "RColorBrewer", "RCurl", "RSQLite", "XML"],
+      "version": "2.12.0",
+      "sha256": "1gacvc1vd0sl6jn0r14w4n37hsrmx6m5k1l7d2a5m3qssyk6l6n3",
+      "depends": ["Biobase", "Heatplus", "MASS", "RBGL", "RColorBrewer", "RCurl", "RSQLite", "XML", "annotate", "downloader", "igraph"],
+      "broken": true
+    },
+    "GeneSelector": {
+      "name": "GeneSelector",
+      "version": "2.20.0",
+      "sha256": "179mjqk9w4zm33mhja7hmwphpnxsv32mh60avs2mqmq9fi9z6pdh",
+      "depends": ["Biobase", "limma", "multtest", "samr", "siggenes"],
+      "broken": true
+    },
+    "GeneticsDesign": {
+      "name": "GeneticsDesign",
+      "version": "1.38.0",
+      "sha256": "1yh8s40fr0yqbch7ix9y4p22ih0008xpjy5nn5x37y575l41hhwh",
+      "depends": ["gmodels", "gtools", "mvtnorm"],
       "broken": true
     },
     "GenoGAM": {
@@ -13733,6 +14050,48 @@
       "depends": ["BiocParallel", "Biostrings", "data_table", "DelayedArray", "DESeq2", "futile_logger", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "HDF5Array", "IRanges", "Matrix", "Rcpp", "RcppArmadillo", "rhdf5", "Rsamtools", "S4Vectors", "sparseinv", "SummarizedExperiment"],
       "broken": true
     },
+    "GenoView": {
+      "name": "GenoView",
+      "version": "1.3.0",
+      "sha256": "09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v",
+      "depends": ["GenomicRanges", "biovizBase", "ggbio", "ggplot2", "gridExtra"],
+      "broken": true
+    },
+    "GenomeGraphs": {
+      "name": "GenomeGraphs",
+      "version": "1.30.0",
+      "sha256": "1wkjcg6w95wlrdgaskc3xndl0azmxhxnsipf9qrj057gf2rpx7zf",
+      "depends": ["biomaRt"],
+      "broken": true
+    },
+    "Genominator": {
+      "name": "Genominator",
+      "version": "1.24.0",
+      "sha256": "1rqzxbji5wh6dshjsprj1mzps08l07gxmjir9naj6lsj2q0xhn9p",
+      "depends": ["BiocGenerics", "DBI", "GenomeGraphs", "IRanges", "RSQLite"],
+      "broken": true
+    },
+    "GoogleGenomics": {
+      "name": "GoogleGenomics",
+      "version": "1.2.0",
+      "sha256": "1z87jmd5vzg5v93bv9k3998wqhnk5p2v9d2qr9g0xxjvxw2q78fm",
+      "depends": ["Biostrings", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "VariantAnnotation", "httr", "rjson"],
+      "broken": true
+    },
+    "GraphPAC": {
+      "name": "GraphPAC",
+      "version": "1.12.1",
+      "sha256": "1fa64jam3cl1khv8jspwjb9myifmgx0kwg0b601bia578bjcdj7d",
+      "depends": ["RMallow", "TSP", "iPAC", "igraph"],
+      "broken": true
+    },
+    "HCsnip": {
+      "name": "HCsnip",
+      "version": "1.10.0",
+      "sha256": "0x4lpx13bhr2w5yhrcsc89g0x4q1dy0j588h210ziizgh67qqcrs",
+      "depends": ["Biobase", "clusterRepro", "coin", "fpc", "impute", "randomForestSRC", "sigaR", "sm", "survival"],
+      "broken": true
+    },
     "HPAStainR": {
       "name": "HPAStainR",
       "version": "1.9.0",
@@ -13740,11 +14099,39 @@
       "depends": ["data_table", "dplyr", "scales", "shiny", "stringr", "tibble", "tidyr"],
       "broken": true
     },
+    "HTSanalyzeR": {
+      "name": "HTSanalyzeR",
+      "version": "2.22.0",
+      "sha256": "01mb273v1i9k0d2gbl9mpmr4rrnx49s3srv0yh1znvmwx0hmfyq2",
+      "depends": ["AnnotationDbi", "BioNet", "GSEABase", "RankProd", "biomaRt", "cellHTS2", "graph", "igraph"],
+      "broken": true
+    },
+    "HTSeqGenie": {
+      "name": "HTSeqGenie",
+      "version": "3.20.1",
+      "sha256": "0bg86jiv45899gw9x4hhvqf525vfwkzj2b5jk7026cq5vmjc0k5j",
+      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "Cairo", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "ShortRead", "VariantAnnotation", "VariantTools", "chipseq", "gmapR", "hwriter", "rtracklayer"],
+      "broken": true
+    },
     "HTqPCR": {
       "name": "HTqPCR",
-      "version": "1.56.0",
-      "sha256": "14cff36ikbqhd5xizihpxzsv9jimcpbgnd381jd154pgi60bil0m",
-      "depends": ["affy", "Biobase", "gplots", "limma", "RColorBrewer"],
+      "version": "1.24.0",
+      "sha256": "1bjnirp3ha5ymnv1xyh02d77w7gp36qk62gjfzkbsnhwbwajpdkx",
+      "depends": ["Biobase", "RColorBrewer", "affy", "gplots", "limma"],
+      "broken": true
+    },
+    "HumanTranscriptomeCompendium": {
+      "name": "HumanTranscriptomeCompendium",
+      "version": "1.20.0",
+      "sha256": "1y46zsl08k6sdih8psar85fyc5dfk2vraxmfry70zx57vbjbin92",
+      "depends": ["BiocManager", "S4Vectors", "SummarizedExperiment", "shiny", "ssrch"],
+      "broken": true
+    },
+    "IPPD": {
+      "name": "IPPD",
+      "version": "1.18.0",
+      "sha256": "1kl4rx6rdmpkm7bd2w8ncvz4sb8x6wljvxkif2l17yflsp1wjvp2",
+      "depends": ["MASS", "Matrix", "XML", "bitops", "digest"],
       "broken": true
     },
     "IRISFGM": {
@@ -13754,6 +14141,27 @@
       "depends": ["AdaptGauss", "AnnotationDbi", "anocva", "clusterProfiler", "colorspace", "DEsingle", "DrImpute", "ggplot2", "ggpubr", "ggraph", "igraph", "knitr", "Matrix", "MCL", "mixtools", "org_Hs_eg_db", "org_Mm_eg_db", "pheatmap", "Polychrome", "RColorBrewer", "Rcpp", "scater", "scran", "Seurat", "SingleCellExperiment"],
       "broken": true
     },
+    "IdMappingAnalysis": {
+      "name": "IdMappingAnalysis",
+      "version": "1.14.0",
+      "sha256": "11rn1b6665b64h3a4mb8qkg5kp5l9ha6aa14f512k7lzs1vcczpm",
+      "depends": ["Biobase", "RColorBrewer", "R_oo", "boot", "mclust", "rChoiceDialogs"],
+      "broken": true
+    },
+    "IdMappingRetrieval": {
+      "name": "IdMappingRetrieval",
+      "version": "1.18.2",
+      "sha256": "0wl2ybv23z84rlq2szk46kvcdm0bmqy0mjga9n33wz1c04br2bxj",
+      "depends": ["AffyCompatible", "ENVISIONQuery", "RCurl", "R_methodsS3", "R_oo", "XML", "biomaRt", "rChoiceDialogs"],
+      "broken": true
+    },
+    "Imetagene": {
+      "name": "Imetagene",
+      "version": "1.0.0",
+      "sha256": "1di9nx5ad0wd17byn740azx9yb6hd12dzvlfl8s5iyas4z9qzwya",
+      "depends": ["ggplot2", "metagene", "shiny", "shinyBS", "shinyFiles", "shinythemes"],
+      "broken": true
+    },
     "ImmuneSpaceR": {
       "name": "ImmuneSpaceR",
       "version": "1.30.0",
@@ -13768,20 +14176,48 @@
       "depends": ["bestNormalize", "bnlearn", "bnstruct", "cowplot", "ggplot2", "ggraph", "gplots", "igraph", "matrixStats", "numbers", "RColorBrewer", "rlang", "SummarizedExperiment"],
       "broken": true
     },
+    "InterMineR": {
+      "name": "InterMineR",
+      "version": "1.26.0",
+      "sha256": "0isw4rg89139xmrcfb9r7jc3z8jj1my4radhinah0vad2cwb36l0",
+      "depends": ["Biostrings", "GenomicRanges", "IRanges", "RCurl", "RJSONIO", "S4Vectors", "SummarizedExperiment", "XML", "httr", "igraph", "sqldf", "xml2"],
+      "broken": true
+    },
     "IsoGeneGUI": {
       "name": "IsoGeneGUI",
-      "version": "2.31.0",
-      "sha256": "1w7zxsvmcrz8cj8g8xa1vqbzfycdhgsclhcjmkqjw1hwz6fp3xgn",
-      "depends": ["Biobase", "ff", "geneplotter", "goric", "Iso", "IsoGene", "jpeg", "multtest", "ORCME", "ORIClust", "RColorBrewer", "Rcpp", "relimp", "tkrplot", "xlsx"],
+      "version": "2.6.0",
+      "sha256": "1b7my9ri3kwi4rbdymcnwdjzv88pgdfjf2ax4gls0v4460hwg5az",
+      "depends": ["Biobase", "Iso", "ORCME", "ORIClust", "RColorBrewer", "Rcpp", "ff", "geneplotter", "goric", "jpeg", "multtest", "relimp", "tkrplot", "xlsx"],
+      "broken": true
+    },
+    "KEGGprofile": {
+      "name": "KEGGprofile",
+      "version": "1.12.0",
+      "sha256": "08yg0vn7d0yyamwj8s9bg9130y1dag34w5j9dhi00x7381jnrxwr",
+      "depends": ["AnnotationDbi", "KEGGREST", "KEGG_db", "TeachingDemos", "XML", "biomaRt", "png"],
+      "broken": true
+    },
+    "LMGene": {
+      "name": "LMGene",
+      "version": "2.26.0",
+      "sha256": "0mfs8kpirwkv8salg6aacy0hr0zwmmxr7pzh88sxj3x71k2dclzi",
+      "depends": ["Biobase", "affy", "multtest", "survival"],
       "broken": true
     },
     "LPEadj": {
       "name": "LPEadj",
-      "version": "1.62.0",
-      "sha256": "17m5lclr2rwb2z0i230gsxkccysmpcvsp4kxjpdjhvnikfm46ssp",
+      "version": "1.30.0",
+      "sha256": "0ll9n3wkaink16laj2y98hb0kx5dglz776zlwdfkw54l1fjvvj5h",
       "depends": ["LPE"],
       "broken": true
     },
+    "LVSmiRNA": {
+      "name": "LVSmiRNA",
+      "version": "1.20.0",
+      "sha256": "1q43harvk7q5wb8yjffhvzs4dxl8h5vp60ngym5vcvapxr8iym3w",
+      "depends": ["Biobase", "BiocGenerics", "MASS", "SparseM", "affy", "limma", "quantreg", "vsn", "zlibbioc"],
+      "broken": true
+    },
     "LineagePulse": {
       "name": "LineagePulse",
       "version": "1.21.0",
@@ -13791,9 +14227,16 @@
     },
     "LowMACA": {
       "name": "LowMACA",
-      "version": "1.28.0",
-      "sha256": "0j5233xziszwak65rypd9f8lsp25sdr4j5nm5kanj4d4wd0zsdqv",
-      "depends": ["BiocParallel", "Biostrings", "cBioPortalData", "data_table", "gridBase", "httr", "LowMACAAnnotation", "motifStack", "plyr", "RColorBrewer", "reshape2", "stringr"],
+      "version": "1.2.0",
+      "sha256": "12jm8psg7rnrsxydcqzfgiryy6lk5mxyximfzn7hnqqvxbs3wc55",
+      "depends": ["BiocParallel", "Biostrings", "LowMACAAnnotation", "RColorBrewer", "data_table", "motifStack", "reshape2", "stringr"],
+      "broken": true
+    },
+    "M3D": {
+      "name": "M3D",
+      "version": "1.4.0",
+      "sha256": "088ghd9r5jr51179cj9hbk1dpj4f9fkrbgyghlq29w2bbgzc57xx",
+      "depends": ["BiSeq", "GenomicRanges", "IRanges"],
       "broken": true
     },
     "MACPET": {
@@ -13803,6 +14246,13 @@
       "depends": ["BH", "bigmemory", "BiocParallel", "Biostrings", "futile_logger", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "GEOquery", "gtools", "InteractionSet", "intervals", "IRanges", "knitr", "plyr", "Rbowtie", "Rcpp", "Rsamtools", "rtracklayer", "S4Vectors", "ShortRead"],
       "broken": true
     },
+    "MCRestimate": {
+      "name": "MCRestimate",
+      "version": "2.26.0",
+      "sha256": "1igfffsgz6m4rl2a5fnkb92r5x4qjr2yl8gaj3ws8478q3aq0bgd",
+      "depends": ["Biobase", "RColorBrewer", "e1071", "golubEsets", "pamr", "randomForest"],
+      "broken": true
+    },
     "MIGSA": {
       "name": "MIGSA",
       "version": "1.21.0",
@@ -13812,9 +14262,9 @@
     },
     "MIMOSA": {
       "name": "MIMOSA",
-      "version": "1.37.0",
-      "sha256": "0dpz0r1kswdb4wzkpj5798gs627vzvvbwbkild2fc1gvmh9p8lwc",
-      "depends": ["Biobase", "coda", "data_table", "dplyr", "Formula", "ggplot2", "MASS", "MCMCpack", "modeest", "plyr", "pracma", "Rcpp", "RcppArmadillo", "reshape", "rlang", "scales", "testthat", "tidyr"],
+      "version": "1.8.1",
+      "sha256": "1mkxp83gwxw581gz13vb8lbl2pff7al75lhjcvwxv6gxb1k272xi",
+      "depends": ["Biobase", "Formula", "MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "data_table", "ggplot2", "modeest", "plyr", "pracma", "reshape", "scales", "testthat"],
       "broken": true
     },
     "MMAPPR2": {
@@ -13824,6 +14274,20 @@
       "depends": ["Biobase", "BiocGenerics", "BiocParallel", "data_table", "dplyr", "ensemblVEP", "GenomeInfoDb", "GenomicRanges", "gmapR", "IRanges", "magrittr", "Rsamtools", "S4Vectors", "stringr", "tidyr", "VariantAnnotation", "VariantTools"],
       "broken": true
     },
+    "MMDiff": {
+      "name": "MMDiff",
+      "version": "1.10.0",
+      "sha256": "0v000a87ciw83xj6p2443k1zs1w98ax38nzaf643wqmb8szwr6vf",
+      "depends": ["Biobase", "DiffBind", "GenomicRanges", "IRanges", "Rsamtools"],
+      "broken": true
+    },
+    "MMUPHin": {
+      "name": "MMUPHin",
+      "version": "1.18.1",
+      "sha256": "0wh998bjbf8zkfrzmrnm8dmm7960w5dnaq1yyc1hl105al0j33aj",
+      "depends": ["Maaslin2", "cowplot", "dplyr", "fpc", "ggplot2", "igraph", "metafor", "stringr", "tidyr"],
+      "broken": true
+    },
     "MQmetrics": {
       "name": "MQmetrics",
       "version": "1.10.0",
@@ -13840,16 +14304,16 @@
     },
     "MSGFgui": {
       "name": "MSGFgui",
-      "version": "1.28.0",
-      "sha256": "0dkj2nbv5xv4v4bbmf91av0ryh9pxdfp7fmbqlma4xyf1r7zmx4c",
+      "version": "1.4.0",
+      "sha256": "0pb9i81pqnz05jrwqh9myz5zchdn8ng5nrsv3cmdg4713yskqpcw",
       "depends": ["MSGFplus", "mzID", "mzR", "shiny", "shinyFiles", "xlsx"],
       "broken": true
     },
     "MSGFplus": {
       "name": "MSGFplus",
-      "version": "1.28.0",
-      "sha256": "1k0qm049gk4gjhd88zhxxrpc944r7ndq8dys08ai2kbaqignvb7y",
-      "depends": ["mzID", "ProtGenerics"],
+      "version": "1.4.0",
+      "sha256": "1hw40kyhkxm0iy60n3y1cw2k52q5vjl47k4z5x34syq5d14iplva",
+      "depends": ["mzID"],
       "broken": true
     },
     "MSstatsSampleSize": {
@@ -13866,6 +14330,34 @@
       "depends": ["dplyr", "ggplot2", "gridExtra", "MSstatsTMT", "Rcpp", "reshape2", "stringr"],
       "broken": true
     },
+    "Maaslin2": {
+      "name": "Maaslin2",
+      "version": "1.18.0",
+      "sha256": "0dl6s4lcd40nd7v0d3k3zn0mkm5rlzb8kf2cjxz298mgdif63xqh",
+      "depends": ["MASS", "biglm", "car", "chemometrics", "cplm", "data_table", "dplyr", "edgeR", "ggplot2", "glmmTMB", "hash", "lme4", "lmerTest", "logging", "metagenomeSeq", "optparse", "pbapply", "pcaPP", "pheatmap", "pscl", "robustbase", "tibble", "vegan"],
+      "broken": true
+    },
+    "Macarron": {
+      "name": "Macarron",
+      "version": "1.8.1",
+      "sha256": "0v1sn04vkrxl0rj8mkq6ibmpsaavplm8hxl94kj4lp6ka81f4sqj",
+      "depends": ["BiocParallel", "DelayedArray", "Maaslin2", "RJSONIO", "SummarizedExperiment", "WGCNA", "data_table", "dynamicTreeCut", "ff", "httr", "logging", "plyr", "psych", "xml2"],
+      "broken": true
+    },
+    "MeSHSim": {
+      "name": "MeSHSim",
+      "version": "1.2.0",
+      "sha256": "1wgc2s1080sm2dn9ny4c1kpbcmbv4gv91h7jmgya9p8lk224aasr",
+      "depends": ["RCurl", "XML"],
+      "broken": true
+    },
+    "MergeMaid": {
+      "name": "MergeMaid",
+      "version": "2.42.0",
+      "sha256": "1ajmrcpvzfjk0bkm2v3yklry91w5cxpjhgjr9hfszzldfhh5sfw4",
+      "depends": ["Biobase", "MASS", "survival"],
+      "broken": true
+    },
     "MetaVolcanoR": {
       "name": "MetaVolcanoR",
       "version": "1.14.0",
@@ -13875,8 +14367,8 @@
     },
     "Metab": {
       "name": "Metab",
-      "version": "1.33.0",
-      "sha256": "0fid4b3yk56z2sm6hxfp0z30nqjsky9sv4x49x912bw61amvrwky",
+      "version": "1.4.1",
+      "sha256": "0wi45k7lx7f7y8bfpa4d1lggnkxlwwyjgzw22xyfw9yj40ma5x9g",
       "depends": ["pander", "svDialogs", "xcms"],
       "broken": true
     },
@@ -13887,6 +14379,34 @@
       "depends": ["BiocParallel", "bsseq", "DNAcopy", "DSS", "GenomeInfoDb", "GenomicRanges", "IRanges", "methylKit", "S4Vectors"],
       "broken": true
     },
+    "MethReg": {
+      "name": "MethReg",
+      "version": "1.14.0",
+      "sha256": "1fzbrp09d57s2zvxl7jsc8dqwchz43xl0vnxkj2r0q0knlpsbbr2",
+      "depends": ["AnnotationHub", "DelayedArray", "ExperimentHub", "GenomicRanges", "IRanges", "JASPAR2024", "MASS", "Matrix", "RSQLite", "S4Vectors", "SummarizedExperiment", "TFBSTools", "dplyr", "ggplot2", "ggpubr", "openxlsx", "plyr", "progress", "pscl", "readr", "rlang", "sesame", "sesameData", "sfsmisc", "stringr", "tibble", "tidyr"],
+      "broken": true
+    },
+    "Mirsynergy": {
+      "name": "Mirsynergy",
+      "version": "1.6.0",
+      "sha256": "0wb257fi5wygky6iqaxdhp8n3pxzknv1vy44ay55y0bal1nbkzwa",
+      "depends": ["Matrix", "RColorBrewer", "ggplot2", "gridExtra", "igraph", "reshape", "scales"],
+      "broken": true
+    },
+    "MmPalateMiRNA": {
+      "name": "MmPalateMiRNA",
+      "version": "1.20.0",
+      "sha256": "1salsb4askcv6xgzfwcwxkrr8qx7pjzqgljbw3ips2f4n6vqvyzj",
+      "depends": ["Biobase", "lattice", "limma", "statmod", "vsn", "xtable"],
+      "broken": true
+    },
+    "MoPS": {
+      "name": "MoPS",
+      "version": "1.4.0",
+      "sha256": "07bylvhv1wnzj3z2ycw4rb29mlz34sbpksl0sdk47q9f5cjgvlnf",
+      "depends": ["Biobase"],
+      "broken": true
+    },
     "MobilityTransformR": {
       "name": "MobilityTransformR",
       "version": "1.6.0",
@@ -13894,6 +14414,13 @@
       "depends": ["MetaboCoreUtils", "MSnbase", "Spectra", "xcms"],
       "broken": true
     },
+    "MotIV": {
+      "name": "MotIV",
+      "version": "1.26.0",
+      "sha256": "0s26dklw8kav8lz0245as7y9znj4yfiknpmcgrdmm62rq04c11mp",
+      "depends": ["BiocGenerics", "Biostrings", "IRanges", "S4Vectors", "lattice", "rGADEM"],
+      "broken": true
+    },
     "NBSplice": {
       "name": "NBSplice",
       "version": "1.15.0",
@@ -13901,11 +14428,25 @@
       "depends": ["BiocParallel", "car", "edgeR", "ggplot2", "MASS", "reshape2"],
       "broken": true
     },
+    "NGScopy": {
+      "name": "NGScopy",
+      "version": "1.4.0",
+      "sha256": "1vs7mi0lb8jcm9yc0jz7rvdnj95fr06cf1jkb9p84pnm9vpn63d6",
+      "depends": ["changepoint"],
+      "broken": true
+    },
     "NanoStringQCPro": {
       "name": "NanoStringQCPro",
-      "version": "1.32.0",
-      "sha256": "0k2sgs6d25ryjlm9c17nxqqcdi3q04j3y9qb1rig23jimfvs3xs9",
-      "depends": ["AnnotationDbi", "Biobase", "knitr", "NMF", "org_Hs_eg_db", "png", "RColorBrewer"],
+      "version": "1.2.0",
+      "sha256": "1cbja0bi4sw3n4f1wkgbvmwh1hr49hhrybqxc6a7f8lvq11s28rf",
+      "depends": ["AnnotationDbi", "Biobase", "NMF", "RColorBrewer", "knitr", "org_Hs_eg_db", "png"],
+      "broken": true
+    },
+    "NarrowPeaks": {
+      "name": "NarrowPeaks",
+      "version": "1.14.0",
+      "sha256": "08nhw2ira3amjs9zl134afjqwi0hniq0g3mgmljjp1l0277b8acg",
+      "depends": ["BiocGenerics", "CSAR", "GenomeInfoDb", "GenomicRanges", "ICSNP", "IRanges", "S4Vectors", "fda"],
       "broken": true
     },
     "NeighborNet": {
@@ -13915,6 +14456,13 @@
       "depends": ["graph"],
       "broken": true
     },
+    "NeuCA": {
+      "name": "NeuCA",
+      "version": "1.10.0",
+      "sha256": "0k5bqdrja3x238fyrd7dm5jm94igh25b0ipb2zj6scpa4m15n67l",
+      "depends": ["SingleCellExperiment", "e1071", "kableExtra", "keras", "limma"],
+      "broken": true
+    },
     "NxtIRFcore": {
       "name": "NxtIRFcore",
       "version": "1.6.0",
@@ -13929,6 +14477,13 @@
       "depends": ["BiocFileCache", "BiocGenerics", "dasper", "data_table", "derfinder", "dplyr", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggpubr", "ggrepel", "IRanges", "magrittr", "megadepth", "plyr", "purrr", "rtracklayer", "S4Vectors", "stringr", "tibble"],
       "broken": true
     },
+    "OGSA": {
+      "name": "OGSA",
+      "version": "1.0.0",
+      "sha256": "058lfd60w905jvhq99dsdcvl1q6h9dnwhqdqn942yr54jlkc7fjy",
+      "depends": ["Biobase", "gplots", "limma"],
+      "broken": true
+    },
     "OmicsLonDA": {
       "name": "OmicsLonDA",
       "version": "1.15.0",
@@ -13936,6 +14491,55 @@
       "depends": ["BiocGenerics", "BiocParallel", "ggplot2", "gss", "plyr", "pracma", "SummarizedExperiment", "zoo"],
       "broken": true
     },
+    "OmicsMarkeR": {
+      "name": "OmicsMarkeR",
+      "version": "1.2.0",
+      "sha256": "1r4qn2p5fxyi6r9l7zgbga1n5wcy18whcvyx0cwrr7lawbzjn6yg",
+      "depends": ["caTools", "caret", "data_table", "e1071", "foreach", "gbm", "glmnet", "pamr", "permute", "plyr", "randomForest"],
+      "broken": true
+    },
+    "OperaMate": {
+      "name": "OperaMate",
+      "version": "1.2.3",
+      "sha256": "1zgqf2ywazrxc66l2x8280izrzanan51b8vz5jwy8i7gnrm4gaa0",
+      "depends": ["fBasics", "gProfileR", "ggplot2", "gridExtra", "pheatmap", "reshape2", "stabledist"],
+      "broken": true
+    },
+    "OutlierD": {
+      "name": "OutlierD",
+      "version": "1.34.0",
+      "sha256": "19wrakxv833r5jqcrk627kgn6pissna9xdfnhn389a0j50xb02is",
+      "depends": ["Biobase", "quantreg"],
+      "broken": true
+    },
+    "PAPi": {
+      "name": "PAPi",
+      "version": "1.10.0",
+      "sha256": "0q90yi4s3jln713cpylgan7fzw7c536kw7bqlnkkaw6rjj1k6vvg",
+      "depends": ["KEGGREST", "svDialogs"],
+      "broken": true
+    },
+    "PAnnBuilder": {
+      "name": "PAnnBuilder",
+      "version": "1.34.0",
+      "sha256": "086hgqx9svn1pfzcz6affj2p9kvjk5k4viqkmwknlk9smw53l40l",
+      "depends": ["AnnotationDbi", "Biobase", "DBI", "RSQLite"],
+      "broken": true
+    },
+    "PCpheno": {
+      "name": "PCpheno",
+      "version": "1.32.0",
+      "sha256": "023dkbi3r1bs9wiihx3rcdc1dx5w21pfmk0n3n7zan4k5jkz4rwx",
+      "depends": ["AnnotationDbi", "Biobase", "Category", "GO_db", "GSEABase", "KEGG_db", "SLGI", "ScISI", "annotate", "graph", "ppiData", "ppiStats"],
+      "broken": true
+    },
+    "PDATK": {
+      "name": "PDATK",
+      "version": "1.12.0",
+      "sha256": "079gdwh9m90r5b0p0szqv222sgdmjr6s3sz19l5xz0435r7h53nv",
+      "depends": ["BiocGenerics", "BiocParallel", "ConsensusClusterPlus", "CoreGx", "MatrixGenerics", "MultiAssayExperiment", "RColorBrewer", "S4Vectors", "SummarizedExperiment", "caret", "clusterRepro", "data_table", "dplyr", "genefu", "ggplot2", "ggplotify", "igraph", "matrixStats", "pROC", "piano", "plyr", "reportROC", "rlang", "scales", "survcomp", "survival", "survminer", "switchBox", "verification"],
+      "broken": true
+    },
     "PERFect": {
       "name": "PERFect",
       "version": "1.14.0",
@@ -13950,18 +14554,46 @@
       "depends": ["clusterProfiler", "ggplot2", "graph", "igraph", "KEGGgraph", "magrittr", "plyr", "tidyr"],
       "broken": true
     },
+    "PGA": {
+      "name": "PGA",
+      "version": "1.0.0",
+      "sha256": "1s4ddjlnxh1waw1sm428lnaq655qfzlmabcjgdm95fi2cg66vs86",
+      "depends": ["AnnotationDbi", "Biostrings", "GenomicFeatures", "GenomicRanges", "IRanges", "Nozzle_R1", "RCurl", "RSQLite", "Rsamtools", "VariantAnnotation", "biomaRt", "customProDB", "data_table", "ggplot2", "pheatmap", "rTANDEM", "rtracklayer", "stringr"],
+      "broken": true
+    },
+    "PGSEA": {
+      "name": "PGSEA",
+      "version": "1.44.0",
+      "sha256": "0cfz479nlmbal4bs5ah12q6jpp7989xic59rml87i19bcbhz8z26",
+      "depends": ["AnnotationDbi", "Biobase", "GO_db", "KEGG_db", "annaffy"],
+      "broken": true
+    },
+    "PROPS": {
+      "name": "PROPS",
+      "version": "1.26.0",
+      "sha256": "10xzvw2m9i7h7y227xqkzc41d6ajpzqwciwn6dkg5mgagss42367",
+      "depends": ["Biobase", "bnlearn", "reshape2", "sva"],
+      "broken": true
+    },
     "PSEA": {
       "name": "PSEA",
-      "version": "1.36.0",
-      "sha256": "02gnxacnpzz74bk4y4nkd6pd8y8abi0988zf03x1mcgnn7hk1s2y",
+      "version": "1.4.0",
+      "sha256": "1df2v472s2g4qcylvg9y5gahgjzq0m753j65736c8lc7g2zbpacp",
       "depends": ["Biobase", "MASS"],
       "broken": true
     },
     "PSICQUIC": {
       "name": "PSICQUIC",
-      "version": "1.34.0",
-      "sha256": "0gkkxxbc2a7cin92qwn1masqfigyz9s4fhyy2daa17r3ckk4ccgx",
-      "depends": ["BiocGenerics", "biomaRt", "httr", "IRanges", "plyr", "RCurl"],
+      "version": "1.8.3",
+      "sha256": "1g3xkbgr3by0gd8ngiavxyy14ixdhrwcf5ka329k3129d816425p",
+      "depends": ["BiocGenerics", "IRanges", "RCurl", "biomaRt", "httr", "plyr"],
+      "broken": true
+    },
+    "PanViz": {
+      "name": "PanViz",
+      "version": "1.6.0",
+      "sha256": "1h4fxqxkaph5j3vkfhmmkhvmqa8czzdzxcg6f06v94hqf38i86i5",
+      "depends": ["RColorBrewer", "colorspace", "data_table", "dplyr", "easycsv", "futile_logger", "igraph", "magrittr", "rentrez", "rlang", "stringr", "tibble", "tidyr"],
       "broken": true
     },
     "PanVizGenerator": {
@@ -13971,6 +14603,13 @@
       "depends": ["igraph", "jsonlite", "pcaMethods", "shiny"],
       "broken": true
     },
+    "Pbase": {
+      "name": "Pbase",
+      "version": "0.10.0",
+      "sha256": "02b2vw63gwssy6bz8v6dvfmz2ak5pa7wzz341nrbr3mwv0k27j4q",
+      "depends": ["Biobase", "BiocGenerics", "Biostrings", "GenomicRanges", "Gviz", "IRanges", "MSnbase", "Pviz", "Rcpp", "S4Vectors", "biomaRt", "cleaver", "mzID", "mzR", "rtracklayer"],
+      "broken": true
+    },
     "Pi": {
       "name": "Pi",
       "version": "2.14.0",
@@ -13992,6 +14631,13 @@
       "depends": ["BiocGenerics", "graph", "graphite", "igraph", "org_Hs_eg_db"],
       "broken": true
     },
+    "Polyfit": {
+      "name": "Polyfit",
+      "version": "1.4.0",
+      "sha256": "0rhs81hclz59nqirpp9y5n7qmg343s260n1gv8ma3c8j2jicb333",
+      "depends": ["DESeq"],
+      "broken": true
+    },
     "PrecisionTrialDrawer": {
       "name": "PrecisionTrialDrawer",
       "version": "1.11.0",
@@ -13999,11 +14645,25 @@
       "depends": ["BiocParallel", "biomaRt", "brglm", "data_table", "DT", "GenomicRanges", "ggplot2", "ggrepel", "googleVis", "httr", "IRanges", "jsonlite", "LowMACAAnnotation", "magrittr", "matrixStats", "RColorBrewer", "reshape2", "S4Vectors", "shiny", "shinyBS", "stringr", "XML"],
       "broken": true
     },
+    "Prize": {
+      "name": "Prize",
+      "version": "1.0.0",
+      "sha256": "1a9hvhpa29ns7lhzmdqjlasp6rwrzng8klaw9cz54vdvc7al49wn",
+      "depends": ["diagram", "ggplot2", "gplots", "matrixcalc", "reshape2", "stringr"],
+      "broken": true
+    },
+    "ProCoNA": {
+      "name": "ProCoNA",
+      "version": "1.8.0",
+      "sha256": "0j0ld484cd98304fncyixi86qnxh72m8s83xxyk8c81kf7lzvhw1",
+      "depends": ["BiocGenerics", "GOstats", "MSnbase", "WGCNA", "flashClust"],
+      "broken": true
+    },
     "ProteomicsAnnotationHubData": {
       "name": "ProteomicsAnnotationHubData",
-      "version": "1.24.0",
-      "sha256": "0qs5hbx7pww7qxxaimp2xqvs3lwcd41ndls0xcvvlk7pnp4i4sk8",
-      "depends": ["AnnotationHub", "AnnotationHubData", "Biobase", "BiocManager", "Biostrings", "GenomeInfoDb", "MSnbase", "mzR", "RCurl"],
+      "version": "1.0.1",
+      "sha256": "1wxx6mq1xs7l24p82rs0wsmfxhrjx6nv1m7wf73i33vrcy83g2i6",
+      "depends": ["AnnotationHub", "AnnotationHubData", "Biobase", "BiocInstaller", "Biostrings", "GenomeInfoDb", "MSnbase", "RCurl", "mzR"],
       "broken": true
     },
     "PubScore": {
@@ -14013,11 +14673,46 @@
       "depends": ["dplyr", "ggplot2", "ggrepel", "igraph", "intergraph", "network", "progress", "rentrez", "sna"],
       "broken": true
     },
+    "QUALIFIER": {
+      "name": "QUALIFIER",
+      "version": "1.14.1",
+      "sha256": "1h87y2q8x4ri6sv7nbppzpqa96m99mijq1739h8cfab5wmi0bcl5",
+      "depends": ["Biobase", "MASS", "XML", "data_table", "flowCore", "flowViz", "flowWorkspace", "hwriter", "lattice", "latticeExtra", "ncdfFlow", "reshape"],
+      "broken": true
+    },
+    "QuartPAC": {
+      "name": "QuartPAC",
+      "version": "1.2.0",
+      "sha256": "0nx3a9jsp2rq61jszm6kgpbqi9m5jkqfvk94npp7nk3qwhfi00j8",
+      "depends": ["GraphPAC", "SpacePAC", "data_table", "iPAC"],
+      "broken": true
+    },
+    "RCytoscape": {
+      "name": "RCytoscape",
+      "version": "1.20.1",
+      "sha256": "1ymbj8xlny9bsbcxyvg9si7v2rlc7bw3sq0424bsfc92l3as0rjj",
+      "depends": ["BiocGenerics", "graph"],
+      "broken": true
+    },
+    "RDAVIDWebService": {
+      "name": "RDAVIDWebService",
+      "version": "1.8.0",
+      "sha256": "1f92a80zksp90wlj2iymdf20hqkbp1aw7mdb7w5r19zckskcrg1m",
+      "depends": ["Category", "GO_db", "GOstats", "RBGL", "ggplot2", "graph", "rJava"],
+      "broken": true
+    },
+    "RGMQL": {
+      "name": "RGMQL",
+      "version": "1.24.0",
+      "sha256": "1p7s17i18ql3b8yvg6pmcz62ql18ncd3hqk0rganmahfbd91idby",
+      "depends": ["BiocGenerics", "GenomicRanges", "RGMQLlib", "S4Vectors", "data_table", "dplyr", "glue", "httr", "plyr", "rJava", "rtracklayer", "xml2"],
+      "broken": true
+    },
     "RGalaxy": {
       "name": "RGalaxy",
-      "version": "1.38.0",
-      "sha256": "0vfsn8cj5c8n58ra1qz85gwmm1747lm3xdz17m20f73g8q78nymd",
-      "depends": ["Biobase", "BiocGenerics", "optparse", "roxygen2", "XML"],
+      "version": "1.14.0",
+      "sha256": "1g63kmfywmnjammifjkqiy8cnqvb77d2x4yff8bgz2ib60gyqm14",
+      "depends": ["Biobase", "BiocGenerics", "XML", "digest", "optparse", "roxygen2"],
       "broken": true
     },
     "RIPAT": {
@@ -14027,6 +14722,13 @@
       "depends": ["biomaRt", "GenomicRanges", "ggplot2", "IRanges", "karyoploteR", "openxlsx", "plyr", "regioneR", "rtracklayer", "stringr"],
       "broken": true
     },
+    "RIPSeeker": {
+      "name": "RIPSeeker",
+      "version": "1.10.0",
+      "sha256": "09pr25pf488vdim3k6mvbvqqyxhl2dfs4y699x8xyhym34c74xcj",
+      "depends": ["GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "SummarizedExperiment", "rtracklayer"],
+      "broken": true
+    },
     "RLSeq": {
       "name": "RLSeq",
       "version": "1.5.2",
@@ -14041,6 +14743,41 @@
       "depends": ["ballgown", "Biostrings", "clusterProfiler", "corrplot", "DESeq2", "DOSE", "edgeR", "factoextra", "FactoMineR", "ggplot2", "gridExtra", "org_Hs_eg_db", "org_Sc_sgd_db", "pathview", "PerformanceAnalytics", "pheatmap", "rafalib", "reshape2", "reticulate", "Rsamtools", "stringr", "systemPipeR", "systemPipeRdata"],
       "broken": true
     },
+    "RNAinteract": {
+      "name": "RNAinteract",
+      "version": "1.18.0",
+      "sha256": "0v7hz20nsc2dkb4xjzdhib2rj8k9zkn2c71rhg46b6hy3jxrm7m1",
+      "depends": ["Biobase", "ICS", "ICSNP", "RColorBrewer", "abind", "cellHTS2", "geneplotter", "gplots", "hwriter", "lattice", "latticeExtra", "limma", "locfit", "splots"],
+      "broken": true
+    },
+    "RNAither": {
+      "name": "RNAither",
+      "version": "2.18.7",
+      "sha256": "1mgm6y5ijlw3rpfi0vkdlw0zrfd4ciz3qmmp42vykmm8c5jsjc0x",
+      "depends": ["RankProd", "biomaRt", "car", "geneplotter", "limma", "prada", "splots", "topGO"],
+      "broken": true
+    },
+    "RNAprobR": {
+      "name": "RNAprobR",
+      "version": "1.2.0",
+      "sha256": "017sc7ba5kw55rc74acv3i5i0mg7h5hblaqxy4j2ln6iqm1h38fi",
+      "depends": ["BiocGenerics", "Biostrings", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Rsamtools", "plyr", "rtracklayer"],
+      "broken": true
+    },
+    "RWebServices": {
+      "name": "RWebServices",
+      "version": "1.34.0",
+      "sha256": "05czankzfvgsfrs2am8dkglzcix22s7gc4bgci0a66x8z31dlkx0",
+      "depends": ["RCurl", "SJava", "TypeInfo"],
+      "broken": true
+    },
+    "RamiGO": {
+      "name": "RamiGO",
+      "version": "1.16.0",
+      "sha256": "12mwfcljw323aqpzc4z5hl2h5qy51bpi5z59x4hx8inw3vc3n55y",
+      "depends": ["RCurl", "RCytoscape", "graph", "gsubfn", "igraph", "png"],
+      "broken": true
+    },
     "RandomWalkRestartMH": {
       "name": "RandomWalkRestartMH",
       "version": "1.22.0",
@@ -14048,25 +14785,67 @@
       "depends": ["igraph", "Matrix"],
       "broken": true
     },
+    "Rariant": {
+      "name": "Rariant",
+      "version": "1.6.2",
+      "sha256": "1jf8p5i6jqlniwrmsk6ajcrf6j637cx267nvb2742yd1jzfm5yy3",
+      "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "SomaticSignatures", "VGAM", "VariantAnnotation", "dplyr", "exomeCopy", "ggbio", "ggplot2", "reshape2", "shiny"],
+      "broken": true
+    },
     "Rcade": {
       "name": "Rcade",
-      "version": "1.39.1",
-      "sha256": "05cli4h96xcsf6xas9z5ma8bzh10grlwkfgmz4a115ykblwyaj4r",
-      "depends": ["baySeq", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "IRanges", "plotrix", "rgl", "Rsamtools", "S4Vectors"],
+      "version": "1.12.0",
+      "sha256": "08q62agkyb810b0hfvs9vb9rh0ls8zrz83558xprijjizrkg9cg2",
+      "depends": ["GenomicRanges", "Rsamtools", "S4Vectors", "baySeq", "plotrix", "rgl"],
+      "broken": true
+    },
+    "Rchemcpp": {
+      "name": "Rchemcpp",
+      "version": "2.8.0",
+      "sha256": "0zz9s3zvxgs6mpiq085zy20sqajyx1645cz3848h2l0w1w5m6lga",
+      "depends": ["ChemmineR", "Rcpp"],
+      "broken": true
+    },
+    "RchyOptimyx": {
+      "name": "RchyOptimyx",
+      "version": "2.10.0",
+      "sha256": "0cmyjyr3dn8df9ss4zhhm6y1lhf68msl5br070x01i8kgh4dagky",
+      "depends": ["Rgraphviz", "flowType", "graph", "sfsmisc"],
       "broken": true
     },
     "ReQON": {
       "name": "ReQON",
-      "version": "1.48.0",
-      "sha256": "0w28b3ma8r8rshijdm5jj1z64v91my7hcvw18r9pdwjprh05bw0g",
-      "depends": ["rJava", "Rsamtools", "seqbias"],
+      "version": "1.16.0",
+      "sha256": "1j79vmhk34argysbjyxcsmfjsplkxq4cn8gprm6min1v08xzryg0",
+      "depends": ["Rsamtools", "rJava", "seqbias"],
+      "broken": true
+    },
+    "ReactomeContentService4R": {
+      "name": "ReactomeContentService4R",
+      "version": "1.12.0",
+      "sha256": "1qqrkki9v3ggwqv88n7w3wp50y4gxvkixrg1sad23vl08jd0rkl6",
+      "depends": ["data_table", "doParallel", "foreach", "httr", "jsonlite", "magick"],
+      "broken": true
+    },
+    "ReactomeGraph4R": {
+      "name": "ReactomeGraph4R",
+      "version": "1.12.0",
+      "sha256": "17xkrqyp5wdsdd0gpplsk3qfsr8sgf1ap0vz6v34xlhbmzdq3rs8",
+      "depends": ["ReactomeContentService4R", "data_table", "doParallel", "foreach", "getPass", "jsonlite", "magrittr", "neo4r", "purrr", "rlang"],
+      "broken": true
+    },
+    "RefNet": {
+      "name": "RefNet",
+      "version": "1.6.1",
+      "sha256": "0l0krjjk1jld7z5zy6k3z6m2qkqd86yj92xfck75q3bq3jm96h0j",
+      "depends": ["AnnotationHub", "BiocGenerics", "IRanges", "PSICQUIC", "RCurl", "shiny"],
       "broken": true
     },
     "RefPlus": {
       "name": "RefPlus",
-      "version": "1.70.0",
-      "sha256": "0ii4pki0gqsfcjlfwq5hx67yf0id2krrgs8qnss4gijj27m8h86m",
-      "depends": ["affy", "affyPLM", "Biobase", "preprocessCore"],
+      "version": "1.40.0",
+      "sha256": "13qlm4smaafx1x78wn959wc1rm4wns7l6qgdmh1lg5khkrrh3x19",
+      "depends": ["Biobase", "affy", "affyPLM", "preprocessCore"],
       "broken": true
     },
     "Rgin": {
@@ -14078,37 +14857,51 @@
     },
     "Ringo": {
       "name": "Ringo",
-      "version": "1.66.0",
-      "sha256": "1ch0akd4k1i4401jwxll5awlq7g12pw7x0kidarn5zva08jgiixd",
-      "depends": ["Biobase", "BiocGenerics", "genefilter", "lattice", "limma", "Matrix", "RColorBrewer", "vsn"],
+      "version": "1.34.0",
+      "sha256": "0r549n840sq9whaz8nk7rz3wardxc8jvwdni4bd5f7zzrhj0ynhl",
+      "depends": ["Biobase", "BiocGenerics", "Matrix", "RColorBrewer", "genefilter", "lattice", "limma", "vsn"],
       "broken": true
     },
     "Risa": {
       "name": "Risa",
-      "version": "1.44.0",
-      "sha256": "140q4x4sl7mffpglwy7hx0z5la2rkq0p1j22k36a4h1073wcpc2q",
-      "depends": ["affy", "Biobase", "biocViews", "Rcpp", "xcms"],
+      "version": "1.12.0",
+      "sha256": "0s23fbdk1v1cg0c67vhkz53wava1swjig8fz8jsv8av0pqb0rg17",
+      "depends": ["Biobase", "Rcpp", "affy", "biocViews", "xcms"],
       "broken": true
     },
     "RmiR": {
       "name": "RmiR",
-      "version": "1.49.0",
-      "sha256": "16nwh4a97qvyicm4f102xs52lx8cld0b80fykgil86kkd6v8zlja",
+      "version": "1.26.0",
+      "sha256": "1nnpr5jp5anbqbgyg53qqjhi49bibymc0l3yj6ar5d6csavrympb",
       "depends": ["DBI", "RmiR_Hs_miRNA"],
       "broken": true
     },
+    "Roleswitch": {
+      "name": "Roleswitch",
+      "version": "1.8.0",
+      "sha256": "0libkpp9scrbakhzp030bx86f4np6ijn01r8xzn02f5106h23gz7",
+      "depends": ["Biobase", "Biostrings", "DBI", "biomaRt", "microRNA", "plotrix", "pracma", "reshape"],
+      "broken": true
+    },
+    "Rolexa": {
+      "name": "Rolexa",
+      "version": "1.26.0",
+      "sha256": "184v27zycmqnj4fpjgrxl3vcxxfxwkbfqdzm6wsyxixm93rmz7v4",
+      "depends": ["Biostrings", "IRanges", "ShortRead", "mclust"],
+      "broken": true
+    },
     "RpsiXML": {
       "name": "RpsiXML",
-      "version": "2.38.0",
-      "sha256": "0x4nph4xss4piq4fgijjjj33yrqqfdbsgn9wvqy17nglvz5gi7bi",
-      "depends": ["annotate", "AnnotationDbi", "Biobase", "graph", "hypergraph", "RBGL", "XML"],
+      "version": "2.12.0",
+      "sha256": "0zlcr1f5sf98bwxakbmq33kniwlpxcc32z5fz7vqsasyv5vbz1ks",
+      "depends": ["AnnotationDbi", "Biobase", "RBGL", "XML", "annotate", "graph", "hypergraph"],
       "broken": true
     },
-    "SANTA": {
-      "name": "SANTA",
-      "version": "2.38.0",
-      "sha256": "0gm9i0pj3c9sir8pmh12b62ah6x1gvy1lrp9hc6hg9rkh4gpyr0y",
-      "depends": ["igraph", "Matrix"],
+    "SAGx": {
+      "name": "SAGx",
+      "version": "1.44.0",
+      "sha256": "0rrw1y80ybpskwvcdbyqq8m4d17sz07bv9gpa27rvfq2sy4znsk6",
+      "depends": ["Biobase", "multtest"],
       "broken": true
     },
     "SCATE": {
@@ -14118,6 +14911,13 @@
       "depends": ["GenomicAlignments", "GenomicRanges", "mclust", "preprocessCore", "Rtsne", "SCATEData", "splines2", "xgboost"],
       "broken": true
     },
+    "SEPA": {
+      "name": "SEPA",
+      "version": "1.0.0",
+      "sha256": "1hvkz3pyp8qkq1mjw9wl426db6n3ay05bx2djkdpvpbai4fjwgvc",
+      "depends": ["ggplot2", "org_Hs_eg_db", "org_Mm_eg_db", "reshape2", "segmented", "shiny", "topGO"],
+      "broken": true
+    },
     "SEPIRA": {
       "name": "SEPIRA",
       "version": "1.20.0",
@@ -14127,37 +14927,58 @@
     },
     "SISPA": {
       "name": "SISPA",
-      "version": "1.30.0",
-      "sha256": "0glqk2p06brw9a9prccil02z82nhq2izh2sgfrlmi1kpf8mgszl3",
-      "depends": ["changepoint", "data_table", "genefilter", "ggplot2", "GSVA", "plyr"],
+      "version": "1.0.0",
+      "sha256": "01kf83hlc7qyyxr4dx86m9vc16cydrkw4sajs2ikpn2fnrqkx6z1",
+      "depends": ["GSVA", "changepoint", "data_table", "ggplot2", "plyr"],
+      "broken": true
+    },
+    "SJava": {
+      "name": "SJava",
+      "version": "0.96.0",
+      "sha256": "17qvrd8n0vrn9fn9p31s2bhzf6064hnf89c54hbx3flzki73waaz",
+      "depends": [],
       "broken": true
     },
     "SLGI": {
       "name": "SLGI",
-      "version": "1.54.0",
-      "sha256": "03jwdq4k44rys3f773c6l985a6v1bacbdghw97p0qpwspmzra8rs",
-      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GO_db", "lattice"],
+      "version": "1.30.0",
+      "sha256": "1pardqmvmi4877q09n3379wq57pyqla53s8gxvygrqny2drb5crj",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GO_db", "ScISI", "lattice"],
       "broken": true
     },
     "SMAP": {
       "name": "SMAP",
-      "version": "1.66.0",
-      "sha256": "0m6jvb3jpnk36cv8grj1s3af6nm9xnn3x0mxkrwfbpgzvcn5735n",
+      "version": "1.34.0",
+      "sha256": "07mdnmirsbz8m5zky169q2mqdn1sdh1nlx8qsgdf8h0n0vcs2h3z",
       "depends": [],
       "broken": true
     },
+    "SNPchip": {
+      "name": "SNPchip",
+      "version": "2.16.0",
+      "sha256": "1fxskvkzn0mfcg2zjs2r2fr0pifrha54a15vbxxcawy4pggf7fdv",
+      "depends": ["Biobase", "GenomeInfoDb", "GenomicRanges", "IRanges", "SummarizedExperiment", "foreach", "lattice", "oligoClasses"],
+      "broken": true
+    },
     "SQUADD": {
       "name": "SQUADD",
-      "version": "1.52.0",
-      "sha256": "0vg7mhx2aldk53jdgy4k8yk3jyjwklmp13mxch7cxinr8bzbyjh6",
+      "version": "1.20.0",
+      "sha256": "1nxf68waqnm9jaj0r8z1499kw5c6l1sykj38wikcc39bsyy23kxm",
       "depends": ["RColorBrewer"],
       "broken": true
     },
+    "SSPA": {
+      "name": "SSPA",
+      "version": "2.10.0",
+      "sha256": "1835g6chjrl1kz5zc710jy0lx04b84khk2kx981ga6rmlihn5xyc",
+      "depends": ["lattice", "limma", "qvalue"],
+      "broken": true
+    },
     "STAN": {
       "name": "STAN",
-      "version": "2.26.2",
-      "sha256": "0dd4hb2iabvnr6v0ys4jslj7611z1hii8hxkdvwrjbz4nn678wkv",
-      "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "Gviz", "IRanges", "poilog", "Rsolnp", "S4Vectors"],
+      "version": "1.4.0",
+      "sha256": "0phrznzv3n9nvjbxb172ywxcc6dfjz2gw21w4nzxiwcjaf3kg841",
+      "depends": ["Rsolnp"],
       "broken": true
     },
     "STROMA4": {
@@ -14167,18 +14988,46 @@
       "depends": ["Biobase", "BiocParallel", "cluster", "matrixStats"],
       "broken": true
     },
+    "STdeconvolve": {
+      "name": "STdeconvolve",
+      "version": "1.8.0",
+      "sha256": "0pyyxmh4bnavsdw6riv72y5m8l53mfr0lpiy9mh0qn57rlmw5fr9",
+      "depends": ["BiocParallel", "Matrix", "clue", "ggplot2", "mgcv", "reshape2", "scatterpie", "slam", "topicmodels", "viridis"],
+      "broken": true
+    },
+    "SVM2CRM": {
+      "name": "SVM2CRM",
+      "version": "1.2.0",
+      "sha256": "06jhyvq3j35skvkf57iqfphypsv43k12i0wybhhvx4wjsdrrhmwq",
+      "depends": ["AnnotationDbi", "GenomicRanges", "IRanges", "LiblineaR", "ROCR", "SVM2CRMdata", "mclust", "pls", "rtracklayer", "squash", "verification", "zoo"],
+      "broken": true
+    },
     "ScISI": {
       "name": "ScISI",
-      "version": "1.65.0",
-      "sha256": "0q3bbfsink5d8xslhp129qwvlq5mdzw8zkv9msd0q8qmkclsbiz1",
-      "depends": ["annotate", "AnnotationDbi", "apComplex", "GO_db", "org_Sc_sgd_db", "RpsiXML"],
+      "version": "1.42.0",
+      "sha256": "0bmpl2zaalwxhhc9vj9v3x8ig6hbj4lrbfl2dxmivgsh1hqvbcli",
+      "depends": ["AnnotationDbi", "GO_db", "RpsiXML", "annotate", "apComplex", "org_Sc_sgd_db"],
       "broken": true
     },
     "SimBindProfiles": {
       "name": "SimBindProfiles",
-      "version": "1.40.0",
-      "sha256": "0adcyw4x7yw4v20bwx4fzrhqd7g1r9fhpr1nqqnwkg44b51rdm6z",
-      "depends": ["Biobase", "limma", "mclust", "Ringo"],
+      "version": "1.8.0",
+      "sha256": "1cyqlzb6vykxndslwvmj9sn7hzrq3lqjwsmvkvl7ivfigrslg142",
+      "depends": ["Biobase", "Ringo", "limma", "mclust"],
+      "broken": true
+    },
+    "SomatiCA": {
+      "name": "SomatiCA",
+      "version": "2.1.0",
+      "sha256": "1a4c8hnl93mnqmm9abc2njcqrlynzbsf39im2gi3ypyjnzabs7m8",
+      "depends": ["DNAcopy", "GenomicRanges", "IRanges", "doParallel", "foreach", "lars", "mvtnorm", "rebmix", "sn"],
+      "broken": true
+    },
+    "SpacePAC": {
+      "name": "SpacePAC",
+      "version": "1.8.0",
+      "sha256": "11szjavnv8b3sdqdzda3vsx3rbzmnzdimm4b37lm3rfqzrs14qhc",
+      "depends": ["iPAC"],
       "broken": true
     },
     "SpidermiR": {
@@ -14195,6 +15044,13 @@
       "depends": ["AnnotationDbi", "e1071", "ggplot2", "graphite", "igraph", "MLmetrics", "reshape2", "ROCR", "SpidermiR"],
       "broken": true
     },
+    "Starr": {
+      "name": "Starr",
+      "version": "1.26.0",
+      "sha256": "0ra9x1kzr0r2wa1ihapzmldq0fdr91rfbbglmzjnq92wrw6rvkd2",
+      "depends": ["MASS", "Ringo", "affxparser", "affy", "pspline", "zlibbioc"],
+      "broken": true
+    },
     "SummarizedBenchmark": {
       "name": "SummarizedBenchmark",
       "version": "2.20.0",
@@ -14204,16 +15060,23 @@
     },
     "Sushi": {
       "name": "Sushi",
-      "version": "1.34.0",
-      "sha256": "0adswrbzd93rhy3q56ypwkrk6155vd4zxapvznswyjlxp8ha813q",
+      "version": "1.8.0",
+      "sha256": "1ldvv1028chnh8ng85534k924cgdmzqb3i18z6xpacsjgg5k7s7l",
       "depends": ["biomaRt", "zoo"],
       "broken": true
     },
     "SwimR": {
       "name": "SwimR",
-      "version": "1.29.0",
-      "sha256": "0n58x3i4k3icvhg8z60zlhpszv8bb9pain07nl9rszyvmpi71vg2",
-      "depends": ["gplots", "R2HTML", "signal"],
+      "version": "1.8.0",
+      "sha256": "0vwjrpm4qbhc8afv0zj0al3rv06izp649kz8h3pb1yixw4bwrxg8",
+      "depends": ["R2HTML", "gplots", "signal"],
+      "broken": true
+    },
+    "TBSignatureProfiler": {
+      "name": "TBSignatureProfiler",
+      "version": "1.16.0",
+      "sha256": "1vjd9dwnr6m867d1ax6kwj4w5qs5y81fzrnnjl6xkl2ch3g48jpk",
+      "depends": ["ASSIGN", "BiocParallel", "ComplexHeatmap", "DESeq2", "DT", "GSVA", "RColorBrewer", "ROCit", "S4Vectors", "SummarizedExperiment", "edgeR", "gdata", "ggplot2", "magrittr", "reshape2", "rlang", "singscore"],
       "broken": true
     },
     "TCGAbiolinksGUI": {
@@ -14225,8 +15088,8 @@
     },
     "TDARACNE": {
       "name": "TDARACNE",
-      "version": "1.47.0",
-      "sha256": "19zf7x2wcfnij1nlh623kim63d6wb3p42mwsn35msds778jvcbxq",
+      "version": "1.20.0",
+      "sha256": "0jf89s2bnz8psd7vqh3l29ch5mb2ilky2jmv8db4kcqaw9157kn8",
       "depends": ["Biobase", "Rgraphviz"],
       "broken": true
     },
@@ -14244,11 +15107,18 @@
       "depends": ["AnnotationHub", "BiocGenerics", "BiocParallel", "dplyr", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "gtools", "IRanges", "readxl", "Rsamtools", "rtracklayer", "S4Vectors", "SummarizedExperiment"],
       "broken": true
     },
+    "TSSi": {
+      "name": "TSSi",
+      "version": "1.16.2",
+      "sha256": "0lvvzhm0npm9hc7n9rw9ipqgp7kgyvciapai0y8l4r3c07wh8nbs",
+      "depends": ["Biobase", "BiocGenerics", "Hmisc", "IRanges", "S4Vectors", "minqa", "plyr"],
+      "broken": true
+    },
     "TarSeqQC": {
       "name": "TarSeqQC",
-      "version": "1.28.0",
-      "sha256": "14ima8ymdb91lpkhdnsg6q7ajxs5p1xzzcsjfhixxkm341k45j35",
-      "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "cowplot", "GenomeInfoDb", "GenomicAlignments", "GenomicRanges", "ggplot2", "Hmisc", "IRanges", "openxlsx", "plyr", "reshape2", "Rsamtools", "S4Vectors"],
+      "version": "1.0.3",
+      "sha256": "06a9kvyx73ysllid9mafgyp1czhyf06gxma1b6bkyksingpgnb68",
+      "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools", "S4Vectors", "cowplot", "ggplot2", "openxlsx", "plyr", "reshape2"],
       "broken": true
     },
     "TimeSeriesExperiment": {
@@ -14265,11 +15135,11 @@
       "depends": ["biomaRt", "clusterProfiler", "dplyr", "FreqProf", "ggdendro", "gghighlight", "ggplot2", "gplots", "gtools", "igraph", "Mfuzz", "MultiAssayExperiment", "RCy3", "readxl", "reshape2", "rWikiPathways", "scales", "stringr", "tidyr"],
       "broken": true
     },
-    "TnT": {
-      "name": "TnT",
-      "version": "1.24.0",
-      "sha256": "1y4v2rphdils0rvkjsyfynncvmn1js1n5d5qhqmc2v8rhh1wjyv5",
-      "depends": ["Biobase", "data_table", "GenomeInfoDb", "GenomicRanges", "htmlwidgets", "IRanges", "jsonlite", "knitr", "S4Vectors"],
+    "ToPASeq": {
+      "name": "ToPASeq",
+      "version": "1.4.0",
+      "sha256": "18fwifmih7x4wr7s3nr8qwvxbp0a33qj39sfwkvhr97jqdggb78j",
+      "depends": ["AnnotationDbi", "Biobase", "DESeq", "DESeq2", "GenomicRanges", "KEGGgraph", "RBGL", "R_utils", "Rcpp", "Rgraphviz", "TeachingDemos", "clipper", "doParallel", "edgeR", "fields", "gRbase", "graph", "graphite", "limma", "locfit", "qpgraph"],
       "broken": true
     },
     "TraRe": {
@@ -14279,6 +15149,13 @@
       "depends": ["BiocParallel", "dqrng", "ggplot2", "glmnet", "gplots", "gtools", "hash", "igraph", "matrixStats", "pvclust", "R_utils", "SummarizedExperiment"],
       "broken": true
     },
+    "TransView": {
+      "name": "TransView",
+      "version": "1.14.0",
+      "sha256": "02as66pzhgls2papji5mqpaczvdfpi6af0mafip8i9hj06z41wci",
+      "depends": ["GenomicRanges", "IRanges", "Rsamtools", "gplots", "zlibbioc"],
+      "broken": true
+    },
     "Travel": {
       "name": "Travel",
       "version": "1.6.0",
@@ -14286,6 +15163,34 @@
       "depends": ["Rcpp"],
       "broken": true
     },
+    "TypeInfo": {
+      "name": "TypeInfo",
+      "version": "1.36.0",
+      "sha256": "0f0cllsf0pw2bgvq9fhfksqsxb2820js5y125vhcr0ns5kcvi07y",
+      "depends": [],
+      "broken": true
+    },
+    "Vega": {
+      "name": "Vega",
+      "version": "1.18.0",
+      "sha256": "0f7rzzckd69xbnism0v7jl0dly55lwj30nla7yj88qqalnb7ajzs",
+      "depends": [],
+      "broken": true
+    },
+    "ViSEAGO": {
+      "name": "ViSEAGO",
+      "version": "1.18.0",
+      "sha256": "06cqx88vndmgxb7vhn7w0kwkxrsn8hy3a3mz591pj48f3z0q9w16",
+      "depends": ["AnnotationDbi", "AnnotationForge", "DT", "DiagrammeR", "GOSemSim", "GO_db", "RColorBrewer", "R_utils", "UpSetR", "biomaRt", "data_table", "dendextend", "dynamicTreeCut", "fgsea", "ggplot2", "heatmaply", "htmlwidgets", "igraph", "plotly", "processx", "scales", "topGO"],
+      "broken": true
+    },
+    "XBSeq": {
+      "name": "XBSeq",
+      "version": "1.0.2",
+      "sha256": "01h3hj4mm7dr16vwbra5iazrgar9nbh2gs2gklyx0wqjfzm3gj49",
+      "depends": ["Biobase", "DESeq2", "Delaporte", "dplyr", "ggplot2", "locfit", "magrittr", "matrixStats", "pracma"],
+      "broken": true
+    },
     "XCIR": {
       "name": "XCIR",
       "version": "1.7.0",
@@ -14295,11 +15200,25 @@
     },
     "affyPara": {
       "name": "affyPara",
-      "version": "1.51.0",
-      "sha256": "01165f84snc3ksk0ghw631i2l5jklp4n826jwy5926wvxy3zlwz0",
+      "version": "1.30.0",
+      "sha256": "14g7xrzsqqsr2h20nv000dd3v71wq18bq78r345w29fs53kipxxd",
       "depends": ["affy", "affyio", "aplpack", "snow", "vsn"],
       "broken": true
     },
+    "affyQCReport": {
+      "name": "affyQCReport",
+      "version": "1.48.0",
+      "sha256": "0cw6z8idar5qa9y3svrm5fdimdamb2xjjj59d107h2in7bvgni7j",
+      "depends": ["Biobase", "RColorBrewer", "affy", "affyPLM", "genefilter", "lattice", "simpleaffy", "xtable"],
+      "broken": true
+    },
+    "affypdnn": {
+      "name": "affypdnn",
+      "version": "1.44.0",
+      "sha256": "1av7a8w86wcslbl3q2zbnga8rww3n7dmwdywq4fm86pbmwh1jz9v",
+      "depends": ["affy"],
+      "broken": true
+    },
     "alpine": {
       "name": "alpine",
       "version": "1.26.0",
@@ -14309,18 +15228,53 @@
     },
     "alsace": {
       "name": "alsace",
-      "version": "1.30.0",
-      "sha256": "17adr64g3l2syj0shi57nrvx105w7wrkiqm0qp3hwlk1ivmnadzn",
+      "version": "1.6.0",
+      "sha256": "1vrwi2rkccgiwgshz5rxyr55dl7awbh1drbhhsrbpjsbzxwmiv4a",
       "depends": ["ALS", "ptw"],
       "broken": true
     },
+    "ampliQueso": {
+      "name": "ampliQueso",
+      "version": "1.8.0",
+      "sha256": "0v21y2nd0qwnag0n6h0krr9c0vpv6ig89d0jsi58x3pi5m0mypip",
+      "depends": ["DESeq", "VariantAnnotation", "doParallel", "edgeR", "foreach", "genefilter", "ggplot2", "gplots", "knitr", "rgl", "rnaSeqMap", "samr", "statmod", "xtable"],
+      "broken": true
+    },
     "beadarraySNP": {
       "name": "beadarraySNP",
-      "version": "1.68.0",
-      "sha256": "1vrizh7fpzv1w2gki0qxhphrfj1jj6m6bjsjsbw0b4n4invybzps",
+      "version": "1.36.0",
+      "sha256": "1dj5zi9lkyq5lgrcmr08cjdv3ysfa6p9zc8jza8mm6vy14qsl5ah",
       "depends": ["Biobase", "quantsmooth"],
       "broken": true
     },
+    "benchdamic": {
+      "name": "benchdamic",
+      "version": "1.10.0",
+      "sha256": "040lkmwz51za2biqlf3z3ai5j03rmw15kwz3i3v10rzq0322fsk3",
+      "depends": ["ALDEx2", "ANCOMBC", "BiocParallel", "DESeq2", "GUniFrac", "MAST", "MGLM", "Maaslin2", "MicrobiomeStat", "NOISeq", "RColorBrewer", "Seurat", "SummarizedExperiment", "TreeSummarizedExperiment", "corncob", "cowplot", "dearseq", "edgeR", "ggdendro", "ggplot2", "ggridges", "limma", "lme4", "metagenomeSeq", "mixOmics", "phyloseq", "plyr", "reshape2", "tidytext", "zinbwave"],
+      "broken": true
+    },
+    "betr": {
+      "name": "betr",
+      "version": "1.26.0",
+      "sha256": "1rs2xajrac3a4sk88i7zq3v849969iw0k8wmpbc0ihw9m4ljb0sx",
+      "depends": ["Biobase", "limma", "mvtnorm"],
+      "broken": true
+    },
+    "bgafun": {
+      "name": "bgafun",
+      "version": "1.32.0",
+      "sha256": "1wakjjdcgzl9snsa9i1f7kk0ppwiccxmznd93yawvjk74gqwnkp3",
+      "depends": ["ade4", "made4", "seqinr"],
+      "broken": true
+    },
+    "bgx": {
+      "name": "bgx",
+      "version": "1.36.0",
+      "sha256": "1x0i4llp6yrfybp7lwqwc7kb1s12dl8a0nwymhjd3fkfv5lslfbx",
+      "depends": ["Biobase", "affy", "gcrma"],
+      "broken": true
+    },
     "bigPint": {
       "name": "bigPint",
       "version": "1.15.0",
@@ -14328,6 +15282,34 @@
       "depends": ["DelayedArray", "dplyr", "GGally", "ggplot2", "gridExtra", "hexbin", "Hmisc", "htmlwidgets", "plotly", "plyr", "RColorBrewer", "reshape", "shiny", "shinycssloaders", "shinydashboard", "stringr", "SummarizedExperiment", "tidyr"],
       "broken": true
     },
+    "bigmemoryExtras": {
+      "name": "bigmemoryExtras",
+      "version": "1.14.2",
+      "sha256": "05ksk3phvh4wc3vgfj5bl1jfxhndia90bkq9s91wfjzcfkrd41q8",
+      "depends": ["Biobase", "bigmemory"],
+      "broken": true
+    },
+    "biodbExpasy": {
+      "name": "biodbExpasy",
+      "version": "1.8.1",
+      "sha256": "0n5avxhv5131122h18d3r2v9c64i3nb251hmz8hhc6chmk203fmj",
+      "depends": ["R6", "biodb", "chk", "stringr"],
+      "broken": true
+    },
+    "biodbKegg": {
+      "name": "biodbKegg",
+      "version": "1.10.2",
+      "sha256": "0rwxbg3ij5rg3agzsxib7f80b05ar40xnql2krl44c3n43yqkwyw",
+      "depends": ["R6", "biodb", "chk", "lifecycle"],
+      "broken": true
+    },
+    "biodbLipidmaps": {
+      "name": "biodbLipidmaps",
+      "version": "1.10.0",
+      "sha256": "1p181kwy9q8jj4m7flg71pqn7h6865hbwha4n6j2qki830vym6rv",
+      "depends": ["R6", "biodb", "lifecycle"],
+      "broken": true
+    },
     "biodbMirbase": {
       "name": "biodbMirbase",
       "version": "1.5.0",
@@ -14335,6 +15317,27 @@
       "depends": ["biodb", "chk", "R6", "stringr"],
       "broken": true
     },
+    "biosvd": {
+      "name": "biosvd",
+      "version": "2.6.0",
+      "sha256": "0mjkan7drib9v49dk3rnrkydm1dxfqimk5gk4jm9qv8kdfcjk0zh",
+      "depends": ["Biobase", "BiocGenerics", "NMF"],
+      "broken": true
+    },
+    "birta": {
+      "name": "birta",
+      "version": "1.14.0",
+      "sha256": "1pszpvmvjp1r0bwj7w9ws0y8xmb3yfmq5gifj9jwvgw2p7y718zr",
+      "depends": ["Biobase", "MASS", "limma"],
+      "broken": true
+    },
+    "birte": {
+      "name": "birte",
+      "version": "1.6.1",
+      "sha256": "08jkjlkjswz3x4sxw80xr9ck6277ag1gzv5y1dxh7aa6i644w48p",
+      "depends": ["Biobase", "MASS", "Rcpp", "RcppArmadillo", "glmnet", "limma", "nem"],
+      "broken": true
+    },
     "brainflowprobes": {
       "name": "brainflowprobes",
       "version": "1.16.0",
@@ -14344,18 +15347,39 @@
     },
     "bridge": {
       "name": "bridge",
-      "version": "1.62.0",
-      "sha256": "02rf15f3r1kazxml8mk9mi1zxgglsdfrpbg7ny9w0s65f413grg8",
+      "version": "1.34.0",
+      "sha256": "08lfbczaj7hkgqfsm060z56anx1yvsfwknzw40gq919k0zm9vfcf",
       "depends": ["rama"],
       "broken": true
     },
     "caOmicsV": {
       "name": "caOmicsV",
-      "version": "1.25.0",
-      "sha256": "10i4imjihmssdwfys21fsqng8zfp7sxzkc58m8qmnh6s5sccb3sz",
+      "version": "1.0.0",
+      "sha256": "0162h17szpr98g4lgz5nypcrslk4103hdn5qdxfxv6frssn9l9g3",
       "depends": ["bc3net", "igraph"],
       "broken": true
     },
+    "cellGrowth": {
+      "name": "cellGrowth",
+      "version": "1.14.0",
+      "sha256": "0d40kll2rkzijyk0d0xb9rzyck5r0hkybv0j1ba72g9kk2mdmz7z",
+      "depends": ["lattice", "locfit"],
+      "broken": true
+    },
+    "cellHTS": {
+      "name": "cellHTS",
+      "version": "1.40.2",
+      "sha256": "1cdzrmqr3fwxylc3m7g72bmc5iml266355i0mfdavp2q9y28kc85",
+      "depends": ["Biobase", "RColorBrewer", "genefilter", "prada"],
+      "broken": true
+    },
+    "cellHTS2": {
+      "name": "cellHTS2",
+      "version": "2.34.1",
+      "sha256": "068lqpxhy04fhpma8cbd79jwg0cifvg8qhav5a4p22dgmalvajw1",
+      "depends": ["Biobase", "Category", "GSEABase", "RColorBrewer", "genefilter", "hwriter", "locfit", "prada", "splots", "vsn"],
+      "broken": true
+    },
     "cellTree": {
       "name": "cellTree",
       "version": "1.27.0",
@@ -14363,6 +15387,27 @@
       "depends": ["gplots", "igraph", "maptpx", "slam", "topGO", "topicmodels", "xtable"],
       "broken": true
     },
+    "charm": {
+      "name": "charm",
+      "version": "2.16.1",
+      "sha256": "00bvgpj705v9jb43skj5iljjf131dnz90n2rc1yww6s2kh4qqppm",
+      "depends": ["BSgenome", "Biobase", "Biostrings", "IRanges", "RColorBrewer", "SQN", "ff", "fields", "genefilter", "gtools", "limma", "nor1mix", "oligo", "oligoClasses", "preprocessCore", "siggenes", "sva"],
+      "broken": true
+    },
+    "chimera": {
+      "name": "chimera",
+      "version": "1.12.0",
+      "sha256": "11arbg6c76rx4zyylp6ga8ygx8890h0pkg4ciwhy4xc8x1smmq7r",
+      "depends": ["AnnotationDbi", "BSgenome_Hsapiens_UCSC_hg19", "Biobase", "GenomicAlignments", "GenomicRanges", "Homo_sapiens", "Rsamtools", "TxDb_Hsapiens_UCSC_hg19_knownGene"],
+      "broken": true
+    },
+    "chroGPS": {
+      "name": "chroGPS",
+      "version": "1.14.0",
+      "sha256": "0i0hrf38sjsay6r6zh69cy6xki17cjw427szq4h7770jlphiq8n1",
+      "depends": ["Biobase", "ICSNP", "IRanges", "MASS", "changepoint", "cluster"],
+      "broken": true
+    },
     "chromswitch": {
       "name": "chromswitch",
       "version": "1.22.0",
@@ -14372,16 +15417,30 @@
     },
     "clonotypeR": {
       "name": "clonotypeR",
-      "version": "1.34.0",
-      "sha256": "15nnj6c23bcnln1xsmxs7f13m13lvn6did7lvp7ij8gcb0vg2g6q",
+      "version": "1.8.0",
+      "sha256": "1fj00hrxijkn002ixa7kn07jq94mlsgz99xr3sapzg0jqacgp9q0",
       "depends": [],
       "broken": true
     },
     "coMET": {
       "name": "coMET",
-      "version": "1.34.0",
-      "sha256": "1pkhnfcvrbj9y88qbbvly4arbz22x8zkx0jsvsmn5klg4xp11fdz",
-      "depends": ["biomaRt", "corrplot", "GenomicRanges", "gridExtra", "Gviz", "hash", "IRanges", "psych", "rtracklayer", "S4Vectors"],
+      "version": "1.2.1",
+      "sha256": "017sjx9wamyg6jglnbw1ynkbnp9idj9142jhkqvy8xji6kqh5xpk",
+      "depends": ["GenomicRanges", "Gviz", "IRanges", "S4Vectors", "biomaRt", "corrplot", "ggbio", "ggplot2", "gridExtra", "hash", "psych", "rtracklayer", "trackViewer"],
+      "broken": true
+    },
+    "coRNAi": {
+      "name": "coRNAi",
+      "version": "1.20.0",
+      "sha256": "05jv85jbb5lz0x0cmg52sn6gnsscyq939yyk6ll9061bx51as7cv",
+      "depends": ["MASS", "cellHTS2", "gplots", "lattice", "limma", "locfit"],
+      "broken": true
+    },
+    "cobindR": {
+      "name": "cobindR",
+      "version": "1.8.0",
+      "sha256": "06nckxm5hz6c336p5fvfmccfzdri68qcmagkyjg7nnfsyl66fri1",
+      "depends": ["BSgenome", "BiocGenerics", "Biostrings", "IRanges", "biomaRt", "gmp", "gplots", "mclust", "seqinr", "yaml"],
       "broken": true
     },
     "coexnet": {
@@ -14405,6 +15464,13 @@
       "depends": ["AnnotationDbi", "Biobase", "BiocFileCache", "biomaRt", "clusterProfiler", "dbscan", "doParallel", "dplyr", "factoextra", "foreach", "fpc", "GEOquery", "ggplot2", "gridExtra", "org_Hs_eg_db", "org_Mm_eg_db", "pheatmap", "rlang", "Rtsne", "scales", "scater", "scran", "SingleCellExperiment", "stringr", "SummarizedExperiment"],
       "broken": true
     },
+    "consensusOV": {
+      "name": "consensusOV",
+      "version": "1.26.0",
+      "sha256": "0a2qrjid6a5yndkhd47km40qv2c3321xypr5mwlwsq5qp48x7vvq",
+      "depends": ["Biobase", "BiocParallel", "GSVA", "gdata", "genefu", "limma", "matrixStats", "randomForest"],
+      "broken": true
+    },
     "contiBAIT": {
       "name": "contiBAIT",
       "version": "1.30.0",
@@ -14414,8 +15480,8 @@
     },
     "copynumber": {
       "name": "copynumber",
-      "version": "1.38.0",
-      "sha256": "1a664bllaq9pbb5cpd01j919qirylvnm8qd49lwlz89jvqjdri19",
+      "version": "1.10.0",
+      "sha256": "1g03cy5inbhzhl5hj8vma34xm8lixilhalavjysp93bwg4dfskv6",
       "depends": ["BiocGenerics", "GenomicRanges", "IRanges", "S4Vectors"],
       "broken": true
     },
@@ -14426,6 +15492,13 @@
       "depends": ["AnnotationDbi", "BiocManager", "BSgenome", "CRISPRseek", "DT", "GenomicFeatures", "GenomicRanges", "GUIDEseq", "hash", "shiny", "shinyjs"],
       "broken": true
     },
+    "crossmeta": {
+      "name": "crossmeta",
+      "version": "1.30.0",
+      "sha256": "1ghgfby1rl3phldyipli550f0i289yanb0v4nzn5l1xnpkxaj6fa",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "BiocManager", "DBI", "DT", "GEOquery", "RCurl", "RSQLite", "XML", "affxparser", "affy", "data_table", "edgeR", "fdrtool", "limma", "matrixStats", "metaMA", "miniUI", "oligo", "reader", "readxl", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "shinypanel", "stringr", "sva", "tibble"],
+      "broken": true
+    },
     "ctgGEM": {
       "name": "ctgGEM",
       "version": "1.7.0",
@@ -14433,6 +15506,13 @@
       "depends": ["Biobase", "BiocGenerics", "igraph", "Matrix", "monocle", "sincell", "SummarizedExperiment", "TSCAN"],
       "broken": true
     },
+    "cytofkit": {
+      "name": "cytofkit",
+      "version": "1.2.4",
+      "sha256": "1pgaw18m4z3az3b0d5d2wlvfq0ha80k5bc0vyjd9grlbwcpvs6nr",
+      "depends": ["Biobase", "RANN", "Rcpp", "Rtsne", "VGAM", "doParallel", "e1071", "flowCore", "ggplot2", "gplots", "igraph", "pdist", "plyr", "reshape", "reshape2", "shiny", "vegan"],
+      "broken": true
+    },
     "dasper": {
       "name": "dasper",
       "version": "1.9.0",
@@ -14440,6 +15520,13 @@
       "depends": ["basilisk", "BiocFileCache", "BiocParallel", "data_table", "dplyr", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "ggplot2", "ggpubr", "ggrepel", "IRanges", "magrittr", "megadepth", "plyranges", "readr", "reticulate", "rtracklayer", "S4Vectors", "stringr", "SummarizedExperiment", "tidyr"],
       "broken": true
     },
+    "ddgraph": {
+      "name": "ddgraph",
+      "version": "1.14.0",
+      "sha256": "0nmrz9cy7l31vym3fcc9m3dmgmbnd5r91p3fxpziaarphi27zszl",
+      "depends": ["MASS", "RColorBrewer", "Rcpp", "bnlearn", "graph", "gtools", "pcalg", "plotrix"],
+      "broken": true
+    },
     "deco": {
       "name": "deco",
       "version": "1.13.0",
@@ -14447,6 +15534,13 @@
       "depends": ["ade4", "AnnotationDbi", "Biobase", "BiocParallel", "BiocStyle", "cluster", "foreign", "gdata", "ggplot2", "gplots", "gridExtra", "limma", "locfit", "made4", "RColorBrewer", "reshape2", "scatterplot3d", "sfsmisc", "SummarizedExperiment"],
       "broken": true
     },
+    "dexus": {
+      "name": "dexus",
+      "version": "1.10.0",
+      "sha256": "0hc28mkmnr37fmw6xw2cywla946gm0cxa8k4hi32d12cm9c24xqx",
+      "depends": ["BiocGenerics"],
+      "broken": true
+    },
     "diffloop": {
       "name": "diffloop",
       "version": "1.24.0",
@@ -14454,6 +15548,13 @@
       "depends": ["Biobase", "biomaRt", "data_table", "dplyr", "edgeR", "foreach", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "limma", "locfit", "matrixStats", "pbapply", "plyr", "readr", "reshape2", "rtracklayer", "S4Vectors", "statmod", "Sushi"],
       "broken": true
     },
+    "domainsignatures": {
+      "name": "domainsignatures",
+      "version": "1.30.0",
+      "sha256": "0rr5d57cjkp46qp2908vh3wyfdgiyaikdgbcxipizcv5a00nq0rx",
+      "depends": ["AnnotationDbi", "KEGG_db", "biomaRt", "prada"],
+      "broken": true
+    },
     "dpeak": {
       "name": "dpeak",
       "version": "1.12.0",
@@ -14463,9 +15564,9 @@
     },
     "dualKS": {
       "name": "dualKS",
-      "version": "1.53.0",
-      "sha256": "16cfcylmmcj8x2808529lbpm7qbbrxygic0jkaglhqcdxgrqw3rw",
-      "depends": ["affy", "Biobase"],
+      "version": "1.30.0",
+      "sha256": "02j9l73brxa4fgsp9cbd3w7dxllvj744rby21dkfnw2c42rcxpvz",
+      "depends": ["Biobase", "affy"],
       "broken": true
     },
     "eegc": {
@@ -14475,6 +15576,13 @@
       "depends": ["AnnotationDbi", "clusterProfiler", "DESeq2", "DOSE", "edgeR", "ggplot2", "gplots", "igraph", "limma", "org_Hs_eg_db", "org_Mm_eg_db", "pheatmap", "R_utils", "S4Vectors", "sna", "wordcloud"],
       "broken": true
     },
+    "eisa": {
+      "name": "eisa",
+      "version": "1.22.0",
+      "sha256": "0p3s6z7s4d165h4w5g1h273626h5j255c0hyjv5dlrdhr4ign7v6",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "Category", "DBI", "genefilter", "isa2"],
+      "broken": true
+    },
     "enrichTF": {
       "name": "enrichTF",
       "version": "1.18.0",
@@ -14482,6 +15590,13 @@
       "depends": ["BiocGenerics", "BSgenome", "clusterProfiler", "GenomeInfoDb", "GenomicRanges", "ggplot2", "ggpubr", "heatmap3", "IRanges", "JASPAR2018", "magrittr", "motifmatchr", "pipeFrame", "R_utils", "rmarkdown", "rtracklayer", "S4Vectors", "TFBSTools"],
       "broken": true
     },
+    "ensemblVEP": {
+      "name": "ensemblVEP",
+      "version": "1.10.3",
+      "sha256": "1q9bzs9zqk2xv10jnq7571f8wgyi2l6zk6sgd4sja6fw82lrnmsy",
+      "depends": ["BiocGenerics", "Biostrings", "GenomicRanges", "VariantAnnotation"],
+      "broken": true
+    },
     "epihet": {
       "name": "epihet",
       "version": "1.13.0",
@@ -14491,11 +15606,18 @@
     },
     "exomeCopy": {
       "name": "exomeCopy",
-      "version": "1.48.0",
-      "sha256": "1d3qkr05q8nl3fj0y4qib0q37pwjh004p746nnzk8fmms75l1p11",
+      "version": "1.16.0",
+      "sha256": "09awyyfgs0k639nqrcrbq1k875qlyac1146w4ay6nxgijqy7iv82",
       "depends": ["GenomeInfoDb", "GenomicRanges", "IRanges", "Rsamtools"],
       "broken": true
     },
+    "exomePeak": {
+      "name": "exomePeak",
+      "version": "2.2.2",
+      "sha256": "03xj0h1cgxzbp2fk830l771jmmcll1bq81xips8hjgng3ywz5m1a",
+      "depends": ["GenomicAlignments", "GenomicFeatures", "Rsamtools", "rtracklayer"],
+      "broken": true
+    },
     "exomePeak2": {
       "name": "exomePeak2",
       "version": "1.14.3",
@@ -14503,11 +15625,25 @@
       "depends": ["BiocGenerics", "BiocParallel", "Biostrings", "BSgenome", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "IRanges", "magrittr", "mclust", "Rsamtools", "rtracklayer", "S4Vectors", "speedglm", "SummarizedExperiment"],
       "broken": true
     },
+    "explorase": {
+      "name": "explorase",
+      "version": "1.34.0",
+      "sha256": "108p864qq8zh4x7p765ygrdkj4r0vm3s2fmi3scswkhcv3vjcjg3",
+      "depends": ["limma"],
+      "broken": true
+    },
+    "facopy": {
+      "name": "facopy",
+      "version": "1.4.1",
+      "sha256": "07ggz86c48rz8asqvfglrvsimnzh3ii43kzpm8ji6sd43i141650",
+      "depends": ["DOSE", "FactoMineR", "GO_db", "GOstats", "IRanges", "MASS", "Rgraphviz", "annotate", "coin", "data_table", "facopy_annot", "ggplot2", "graphite", "gridExtra", "igraph", "nnet", "reshape2", "scales"],
+      "broken": true
+    },
     "farms": {
       "name": "farms",
-      "version": "1.52.0",
-      "sha256": "1w1bw8bglcmjsz83vc8s5wl1c58x2bvd365k984pxaw3xl9fj92j",
-      "depends": ["affy", "Biobase", "MASS"],
+      "version": "1.22.0",
+      "sha256": "1jmx5rajm6fkhx5gfpwh8nsqw0plhfzy1bibvkdf83arxjjr6s59",
+      "depends": ["Biobase", "MASS", "affy"],
       "broken": true
     },
     "fcoex": {
@@ -14517,41 +15653,125 @@
       "depends": ["clusterProfiler", "data_table", "dplyr", "FCBF", "ggplot2", "ggrepel", "igraph", "intergraph", "Matrix", "network", "pathwayPCA", "progress", "scales", "SingleCellExperiment", "sna", "stringr"],
       "broken": true
     },
+    "flipflop": {
+      "name": "flipflop",
+      "version": "1.8.2",
+      "sha256": "1v4ihrmw0vphz0k0f37qy5k8zwa5g5cnj4agccjl4mqbvwiq4awh",
+      "depends": ["GenomicRanges", "IRanges", "Matrix"],
+      "broken": true
+    },
     "flowCL": {
       "name": "flowCL",
-      "version": "1.35.0",
-      "sha256": "1jxr0zn3fgm5nqishssxh332mmxfz3fc9zgshn0lbq4avxc2x128",
-      "depends": ["graph", "Rgraphviz"],
+      "version": "1.8.0",
+      "sha256": "064946w944gw7l0hizw974i21cahzvfj1xza8f7ay9rx2baz28sh",
+      "depends": ["Rgraphviz"],
+      "broken": true
+    },
+    "flowFit": {
+      "name": "flowFit",
+      "version": "1.8.0",
+      "sha256": "1fja1d5irh71a3rqdsbw5sb14ss2xmird6vxcps96r6s6rz2bra3",
+      "depends": ["flowCore", "flowViz", "gplots", "kza", "minpack_lm"],
       "broken": true
     },
     "flowMap": {
       "name": "flowMap",
-      "version": "1.38.0",
-      "sha256": "1mjv55cg5q6gx32sn6h5aqzrpjb5awb6489j8dya56fbivjs7zxj",
-      "depends": ["abind", "ade4", "doParallel", "Matrix", "reshape2", "scales"],
+      "version": "1.8.0",
+      "sha256": "0rkdspl9lnasc8axlsx076g14pkgwrlz9nbxy0f1z67w991d823p",
+      "depends": ["Matrix", "abind", "ade4", "doParallel", "reshape2", "scales"],
+      "broken": true
+    },
+    "flowQ": {
+      "name": "flowQ",
+      "version": "1.30.0",
+      "sha256": "1yz0w0bpv98l319y8dw82qaykg6w70sxpzmhxdckwdqjpixq5sf5",
+      "depends": ["BiocGenerics", "IRanges", "RColorBrewer", "bioDist", "flowCore", "flowViz", "geneplotter", "lattice", "latticeExtra", "mvoutlier", "outliers", "parody"],
+      "broken": true
+    },
+    "flowQB": {
+      "name": "flowQB",
+      "version": "1.14.0",
+      "sha256": "1swsdqra8w8z27p2mv1q37ydak7rjifxm78h5x6mhv1vfq4faz12",
+      "depends": ["Biobase", "MASS", "flowCore"],
+      "broken": true
+    },
+    "flowType": {
+      "name": "flowType",
+      "version": "2.8.2",
+      "sha256": "0q7bk8pn71zyzc1m16rqimlyldnfj178k64vg0kw4yiwdjxlgdr4",
+      "depends": ["BH", "Biobase", "Rcpp", "flowClust", "flowCore", "flowMeans", "flowMerge", "rrcov", "sfsmisc"],
       "broken": true
     },
     "flowUtils": {
       "name": "flowUtils",
-      "version": "1.59.0",
-      "sha256": "11x362dqb9mjlsbq6g1qkb8hhnkvm22z5s3wkgmpyy9kyifjkm26",
-      "depends": ["Biobase", "corpcor", "flowCore", "graph", "RUnit", "XML"],
+      "version": "1.34.0",
+      "sha256": "0qba66cfsy8facvdpnl5jf71xwaqs3w6j2z0ph7c39zyng0nibwp",
+      "depends": ["Biobase", "RUnit", "XML", "corpcor", "flowCore", "flowViz", "graph"],
+      "broken": true
+    },
+    "focalCall": {
+      "name": "focalCall",
+      "version": "1.4.0",
+      "sha256": "1dqk0lda24lkhfsid15c6n121s63zbk6658za5qxqkxdd82z7axf",
+      "depends": ["CGHcall"],
+      "broken": true
+    },
+    "gCMAP": {
+      "name": "gCMAP",
+      "version": "1.14.0",
+      "sha256": "09dcaq0763kb399wh232n6r1s8qkj0c4zcmpjp6cz08w6n7lchgx",
+      "depends": ["AnnotationDbi", "Biobase", "Category", "DESeq", "GSEABase", "GSEAlm", "Matrix", "annotate", "genefilter", "limma"],
+      "broken": true
+    },
+    "gCMAPWeb": {
+      "name": "gCMAPWeb",
+      "version": "1.10.0",
+      "sha256": "00qx90gycqqca8b3brkl0bkckn7saqz9z38vinhjxlyaanc9v6ml",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GSEABase", "Rook", "annotate", "brew", "gCMAP", "hwriter", "yaml"],
+      "broken": true
+    },
+    "gQTLBase": {
+      "name": "gQTLBase",
+      "version": "1.2.1",
+      "sha256": "1a1ndjjp2zn1lsfahpvi3xhkdgwl5wk0bdm7kc92aidq50a2db42",
+      "depends": ["BBmisc", "BatchJobs", "BiocGenerics", "GenomicFiles", "GenomicRanges", "S4Vectors", "bit", "doParallel", "ff", "foreach", "rtracklayer"],
+      "broken": true
+    },
+    "gQTLstats": {
+      "name": "gQTLstats",
+      "version": "1.2.0",
+      "sha256": "1cwri36z85zyyr48dkkl7qkgbx9fpv7y38mbbm470adc7ac56zbv",
+      "depends": ["AnnotationDbi", "BatchJobs", "Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment", "VariantAnnotation", "doParallel", "dplyr", "foreach", "gQTLBase", "gam", "ggplot2", "limma", "reshape2", "snpStats"],
       "broken": true
     },
     "gaggle": {
       "name": "gaggle",
-      "version": "1.70.0",
-      "sha256": "16jajl03nf8fk29vd4bkj4f1156258skkw3p884ad946ifvabznd",
-      "depends": ["graph", "rJava", "RUnit"],
+      "version": "1.38.0",
+      "sha256": "0bl60nca27rkij061h6g16ddlkq29rb1wh5pr2hz87y74pmb8m2w",
+      "depends": ["RUnit", "graph", "rJava"],
       "broken": true
     },
     "gaia": {
       "name": "gaia",
-      "version": "2.39.0",
-      "sha256": "023mw2dy6dni7h7a1ild1y6l741kp9bmjzzfyi70jipji1jig4pa",
+      "version": "2.14.0",
+      "sha256": "099imzsa7pghp7qbxjjnfrqc8zkn25wm5xj9jn40m9as11zxdrsx",
       "depends": [],
       "broken": true
     },
+    "gaucho": {
+      "name": "gaucho",
+      "version": "1.6.0",
+      "sha256": "1c1aaidhdv9rr2v3q6832q0ajc3g7l4gfx1rhf27kv4pn1j5s23s",
+      "depends": ["GA", "Rgraphviz", "graph", "png"],
+      "broken": true
+    },
+    "geecc": {
+      "name": "geecc",
+      "version": "1.4.0",
+      "sha256": "00dkp4ldnpadvw6fdva0gg0m843j7i667r0i33c9dsrjfc7k7z8q",
+      "depends": ["MASS", "gplots"],
+      "broken": true
+    },
     "genbankr": {
       "name": "genbankr",
       "version": "1.27.0",
@@ -14559,11 +15779,25 @@
       "depends": ["Biobase", "BiocGenerics", "Biostrings", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "IRanges", "rtracklayer", "S4Vectors", "VariantAnnotation"],
       "broken": true
     },
+    "genefu": {
+      "name": "genefu",
+      "version": "2.2.0",
+      "sha256": "0q49hnxz59hack7j28haazia6qd5pkmgyq5jaypvaa3jnvcsfij7",
+      "depends": ["AIMS", "amap", "biomaRt", "iC10", "mclust", "survcomp"],
+      "broken": true
+    },
+    "genoset": {
+      "name": "genoset",
+      "version": "1.24.0",
+      "sha256": "0xxh23sdb5qjfh97a2psp70zb54zx40x8501bpp7gzgqbfn1wf7w",
+      "depends": ["Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "S4Vectors", "SummarizedExperiment"],
+      "broken": true
+    },
     "genotypeeval": {
       "name": "genotypeeval",
-      "version": "1.30.0",
-      "sha256": "0mi1d86i4v8gafwszy978n61s5pszrsmbh1in4nggdqwvwnvkqnl",
-      "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "ggplot2", "IRanges", "rtracklayer", "VariantAnnotation"],
+      "version": "1.0.0",
+      "sha256": "1clljhqy57yy0ss9700zfnsgnby3dism8z2682xjhzzprg049cx4",
+      "depends": ["BiocGenerics", "BiocParallel", "GenomeInfoDb", "GenomicRanges", "IRanges", "VariantAnnotation", "ggplot2", "rtracklayer"],
       "broken": true
     },
     "genphen": {
@@ -14573,6 +15807,13 @@
       "depends": ["Biostrings", "doParallel", "e1071", "foreach", "ranger", "Rcpp", "rPref", "rstan"],
       "broken": true
     },
+    "gespeR": {
+      "name": "gespeR",
+      "version": "1.2.0",
+      "sha256": "0s8lndwwqkkkiyqzi8xpqz6clzjrkmkkrh2f1ch80hvfj83rb89d",
+      "depends": ["Biobase", "Matrix", "biomaRt", "cellHTS2", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "reshape2"],
+      "broken": true
+    },
     "gpart": {
       "name": "gpart",
       "version": "1.13.0",
@@ -14582,25 +15823,60 @@
     },
     "gprege": {
       "name": "gprege",
-      "version": "1.39.0",
-      "sha256": "12yjyb7a7jc86hdi3a3cavqxfzkhmds1m2vigzw5ihhx6028pa78",
+      "version": "1.14.0",
+      "sha256": "0mc8x8faj8pf8zb3mywjscn2rzs7bc0ws507a32r7zl5j8p9rzag",
       "depends": [],
       "broken": true
     },
+    "htSeqTools": {
+      "name": "htSeqTools",
+      "version": "1.16.0",
+      "sha256": "1bjbagx6s66fiia71n7ljg5rfc2v22bbp2sk718mf1i9i38c58lm",
+      "depends": ["BSgenome", "Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "MASS"],
+      "broken": true
+    },
+    "iPAC": {
+      "name": "iPAC",
+      "version": "1.14.0",
+      "sha256": "1gzxv6jkn7crylklmnvhm86gczmsr80dmw1a7flaisiiy40k128g",
+      "depends": ["Biostrings", "gdata", "multtest", "scatterplot3d"],
+      "broken": true
+    },
     "imageHTS": {
       "name": "imageHTS",
-      "version": "1.48.0",
-      "sha256": "124pksw08b88bj7l8pckzvgk6sf54d633cnbq2r5il7a09i4caim",
-      "depends": ["Biobase", "cellHTS2", "e1071", "EBImage", "hwriter", "vsn"],
+      "version": "1.20.0",
+      "sha256": "1dg8cmrnzlv2qm5lf9771fiir5l0cql6pmfmv0l3037wisdgz1jw",
+      "depends": ["Biobase", "EBImage", "cellHTS2", "e1071", "hwriter", "vsn"],
+      "broken": true
+    },
+    "inSilicoDb": {
+      "name": "inSilicoDb",
+      "version": "2.6.0",
+      "sha256": "1avxm8qm9rblck94v0aq0na70jfl2cyr9xmbbk27n5hgp1cnaizf",
+      "depends": ["Biobase", "RCurl", "rjson"],
+      "broken": true
+    },
+    "inSilicoMerging": {
+      "name": "inSilicoMerging",
+      "version": "1.14.0",
+      "sha256": "1xiq66b0vjrcxf4nbmk5mmn1dlxbpa879z04f00w3yz1k7rx6782",
+      "depends": ["Biobase"],
       "broken": true
     },
     "inveRsion": {
       "name": "inveRsion",
-      "version": "1.43.0",
-      "sha256": "0h2q10xf4x22hy7780w4pvq488921wzjngly8qcc97sa8iacssk3",
+      "version": "1.18.0",
+      "sha256": "05jwxwjyvkilfmygf16k3d55ma7s1ya7lyxh8v4pd8gql7v3kllq",
       "depends": ["haplo_stats"],
       "broken": true
     },
+    "iontree": {
+      "name": "iontree",
+      "version": "1.16.0",
+      "sha256": "1pamgkg85qi3iqqws7a3l8lph428alz1dzf08x309njqz8cbzw91",
+      "depends": ["RSQLite", "XML", "rJava"],
+      "broken": true
+    },
     "iterClust": {
       "name": "iterClust",
       "version": "1.24.0",
@@ -14615,41 +15891,76 @@
       "depends": ["GenomicRanges", "ggplot2", "magrittr", "SummarizedExperiment"],
       "broken": true
     },
+    "jmosaics": {
+      "name": "jmosaics",
+      "version": "1.10.0",
+      "sha256": "1q67ylrgc2abny2wxgsl1cni225inar1dhim0psrbrf5ik77kgmk",
+      "depends": ["mosaics"],
+      "broken": true
+    },
+    "joda": {
+      "name": "joda",
+      "version": "1.18.0",
+      "sha256": "0fjbxczwkn8f4p0h8dgi3vfn4qf9a650wmp01q20j7f0jsmmb06x",
+      "depends": ["RBGL", "bgmm"],
+      "broken": true
+    },
     "logitT": {
       "name": "logitT",
-      "version": "1.58.0",
-      "sha256": "0wd26k2n29i58iz9nr50xjsvc2s5ynbca0y2y4j9xqbvvpfjzk3v",
+      "version": "1.28.0",
+      "sha256": "1qbimjjl5xv5h30r74bd86dg10djajb01qav6gp95l6f59fx2j1q",
       "depends": ["affy"],
       "broken": true
     },
+    "lol": {
+      "name": "lol",
+      "version": "1.18.0",
+      "sha256": "0dc3ga7yalzfngh3y33sa4bchhbxgndkls3vdxh4yzcsdvk60i1f",
+      "depends": ["Matrix", "penalized"],
+      "broken": true
+    },
     "mAPKL": {
       "name": "mAPKL",
-      "version": "1.28.0",
-      "sha256": "0nj2r54djps19lar2sp6bhdi5nkid195xyaqzzam2r7piwr8xv8s",
-      "depends": ["AnnotationDbi", "apcluster", "Biobase", "clusterSim", "e1071", "igraph", "limma", "multtest", "parmigene", "reactome_db"],
+      "version": "1.2.0",
+      "sha256": "1k1yxxj6371sagiy63fl1dh8d71cqg6gvx8pkjy3ahp1hbh45b6l",
+      "depends": ["AnnotationDbi", "Biobase", "apcluster", "clusterSim", "e1071", "igraph", "limma", "multtest", "parmigene", "reactome_db"],
+      "broken": true
+    },
+    "mQTL_NMR": {
+      "name": "mQTL.NMR",
+      "version": "1.4.0",
+      "sha256": "0flb1lqsq7ldicidag20icnhmds2qr85yrbjsv4h06klggq2vjvg",
+      "depends": ["MASS", "outliers", "qtl"],
       "broken": true
     },
     "maanova": {
       "name": "maanova",
-      "version": "1.68.2",
-      "sha256": "1rcxvv0vcvksswjd3vry68nmvrbh05p5pica48bwcar93jh70bx9",
+      "version": "1.40.0",
+      "sha256": "112hbyfw18dshshsmbaylwra169w6bbwwqql3d96s0in1fl20mdl",
       "depends": ["Biobase"],
       "broken": true
     },
     "macat": {
       "name": "macat",
-      "version": "1.76.0",
-      "sha256": "1xmlh1bnhaxp2zjimrhyzz0ldl2sv4j0lrrvqdhlk8jbm5j4hzy8",
-      "depends": ["annotate", "Biobase"],
+      "version": "1.44.1",
+      "sha256": "061y6a1q7c9r9a01hy6l86wc085f530y7hjw7asx506cf91ifwdk",
+      "depends": ["Biobase", "annotate"],
       "broken": true
     },
     "maigesPack": {
       "name": "maigesPack",
-      "version": "1.64.0",
-      "sha256": "106idgazh2wkv2z63wrbn6f4gaxzkmn95i8583a99f6mqnfbhcqx",
+      "version": "1.34.0",
+      "sha256": "08pszyq03f1vjgirq0zcv31m4c0acdbfh622qiw0x0w1gz6plm0g",
       "depends": ["convert", "graph", "limma", "marray"],
       "broken": true
     },
+    "manta": {
+      "name": "manta",
+      "version": "1.16.0",
+      "sha256": "0j6zll7b1qqdnydg59hywargw6bivry3cx5m2wpj79wn673kib3c",
+      "depends": ["Hmisc", "caroline", "edgeR"],
+      "broken": true
+    },
     "mbOmic": {
       "name": "mbOmic",
       "version": "1.3.0",
@@ -14657,11 +15968,67 @@
       "depends": ["cluster", "clusterSim", "data_table", "doParallel", "igraph", "psych", "visNetwork", "WGCNA"],
       "broken": true
     },
+    "mbQTL": {
+      "name": "mbQTL",
+      "version": "1.4.0",
+      "sha256": "04ml4rv1hngr8lm9z9pcg7szb1cmla1m1vypwjk9bkkfy879ribf",
+      "depends": ["MatrixEQTL", "broom", "dplyr", "ggplot2", "metagenomeSeq", "pheatmap", "readxl", "stringr", "tidyr"],
+      "broken": true
+    },
+    "mcaGUI": {
+      "name": "mcaGUI",
+      "version": "1.18.0",
+      "sha256": "0rxhs059z0l6lal33m78hkp73k46c2pdy0nn5lxwxr590fglvh0f",
+      "depends": ["MASS", "OTUbase", "bpca", "foreign", "lattice", "proto", "vegan"],
+      "broken": true
+    },
+    "mdgsa": {
+      "name": "mdgsa",
+      "version": "1.2.0",
+      "sha256": "05lqj7d4464z976w4rvnzpv1abihq1fpxhcl2zyg5izwqpq6ga9r",
+      "depends": ["AnnotationDbi", "DBI", "GO_db", "KEGG_db", "Matrix", "cluster"],
+      "broken": true
+    },
+    "metaArray": {
+      "name": "metaArray",
+      "version": "1.48.0",
+      "sha256": "1zx9ymjqh851r33jv7fpyy4319fqi2kgjgxxbgpq1xl6cfkglr4h",
+      "depends": ["Biobase", "MergeMaid"],
+      "broken": true
+    },
+    "metaX": {
+      "name": "metaX",
+      "version": "1.0.3",
+      "sha256": "1v4519spcgvc2kc1cah5gmfjnx09zlam8p8d8m6wkw0ba600vv7b",
+      "depends": ["BBmisc", "CAMERA", "DiffCorr", "Nozzle_R1", "RColorBrewer", "RCurl", "SSPA", "VennDiagram", "ape", "boot", "bootstrap", "caret", "data_table", "doParallel", "dplyr", "faahKO", "ggplot2", "igraph", "impute", "lattice", "missForest", "pROC", "pcaMethods", "pheatmap", "pls", "plyr", "preprocessCore", "reshape2", "scatterplot3d", "stringr", "vsn", "xcms"],
+      "broken": true
+    },
     "metagene": {
       "name": "metagene",
-      "version": "2.31.0",
-      "sha256": "0kydqb2g1xbkwk5g738f1pyx1hcfmym3z101vawvcjmmgld3kcp8",
-      "depends": ["BiocParallel", "data_table", "EnsDb_Hsapiens_v86", "ensembldb", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "ggplot2", "gplots", "IRanges", "magrittr", "matrixStats", "purrr", "R6", "Rsamtools", "rtracklayer", "stringr"],
+      "version": "2.2.1",
+      "sha256": "1l0zfhk4gnm3gvy24igismpb3j3m6vh4mb4q41cfrpkmxn2zlvaq",
+      "depends": ["BiocParallel", "DBChIP", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "IRanges", "R6", "Rsamtools", "ggplot2", "gplots", "rtracklayer"],
+      "broken": true
+    },
+    "metagenomeFeatures": {
+      "name": "metagenomeFeatures",
+      "version": "1.0.0",
+      "sha256": "1lbb505s976j2jxxi7snhd1yahcs0ca9qnicq12b5jmp3ki1br9k",
+      "depends": ["Biobase", "Biostrings", "RSQLite", "ShortRead", "dplyr", "lattice", "lazyeval", "magrittr", "stringr"],
+      "broken": true
+    },
+    "metagenomeSeq": {
+      "name": "metagenomeSeq",
+      "version": "1.12.1",
+      "sha256": "11m8lkk2iz030cz8yx6b5jwy8cv3255gx489iw5xnv4y0657s5gv",
+      "depends": ["Biobase", "Matrix", "RColorBrewer", "foreach", "glmnet", "gplots", "limma", "matrixStats"],
+      "broken": true
+    },
+    "metaseqR": {
+      "name": "metaseqR",
+      "version": "1.10.0",
+      "sha256": "1gy5ywrxqwd8lizbj9lk6qck6zwk670j5y2f0ayz6xvkki4vab97",
+      "depends": ["DESeq", "EDASeq", "NBPSeq", "NOISeq", "baySeq", "biomaRt", "brew", "corrplot", "edgeR", "gplots", "limma", "log4r", "qvalue", "rjson", "vsn"],
       "broken": true
     },
     "metavizr": {
@@ -14671,18 +16038,25 @@
       "depends": ["Biobase", "data_table", "digest", "epivizr", "epivizrData", "epivizrServer", "epivizrStandalone", "GenomeInfoDb", "httr", "metagenomeSeq", "phyloseq", "vegan"],
       "broken": true
     },
-    "methyAnalysis": {
-      "name": "methyAnalysis",
-      "version": "1.34.0",
-      "sha256": "05k3n7iy5ijidbnblbqqas8dsj8drwzbhyrbs8wl1ypkg51havi0",
-      "depends": ["annotate", "AnnotationDbi", "Biobase", "BiocGenerics", "biomaRt", "genefilter", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "lumi", "methylumi", "org_Hs_eg_db", "rtracklayer", "SummarizedExperiment", "VariantAnnotation"],
+    "methVisual": {
+      "name": "methVisual",
+      "version": "1.22.0",
+      "sha256": "1kcqhlv0lmr7wlkxjl9qqv2676pwna3i4w5xpm4inwgcb892zgjm",
+      "depends": ["Biostrings", "IRanges", "ca", "gridBase", "gsubfn", "plotrix", "sqldf"],
       "broken": true
     },
-    "miRBaseConverter": {
-      "name": "miRBaseConverter",
-      "version": "1.24.0",
-      "sha256": "04yjfi670lqk4c254isadzaj1mp514i4ns9h7mwdyvagfq6vhsvw",
-      "depends": [],
+    "methodical": {
+      "name": "methodical",
+      "version": "1.0.0",
+      "sha256": "13m75hf5dq36l20idp9alcikhhqa2qy5jwfnpkv2yp1ra6c9pq7j",
+      "depends": ["BSgenome", "BiocParallel", "Biostrings", "DelayedArray", "ExperimentHub", "GenomeInfoDb", "GenomicRanges", "HDF5Array", "IRanges", "R_utils", "RcppRoll", "S4Vectors", "SummarizedExperiment", "cowplot", "data_table", "dplyr", "foreach", "ggplot2", "rhdf5", "rtracklayer", "scales", "tibble", "tidyr"],
+      "broken": true
+    },
+    "methyAnalysis": {
+      "name": "methyAnalysis",
+      "version": "1.12.2",
+      "sha256": "0m4qx7q1zm3g4m8kwjz7nvf93891bmbvac0n8wpgniap669af0yk",
+      "depends": ["AnnotationDbi", "Biobase", "BiocGenerics", "GenomeInfoDb", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "VariantAnnotation", "annotate", "biomaRt", "genefilter", "genoset", "lumi", "methylumi", "org_Hs_eg_db", "rtracklayer"],
       "broken": true
     },
     "miRmine": {
@@ -14692,6 +16066,48 @@
       "depends": ["SummarizedExperiment"],
       "broken": true
     },
+    "microbiomeDASim": {
+      "name": "microbiomeDASim",
+      "version": "1.18.0",
+      "sha256": "123viwwyc4yjwkc1l7r9als4bvi2sb7yxmyfidqwamw8f2vwsfcz",
+      "depends": ["Biobase", "MASS", "Matrix", "ggplot2", "metagenomeSeq", "mvtnorm", "pbapply", "phyloseq", "tmvtnorm"],
+      "broken": true
+    },
+    "microbiomeExplorer": {
+      "name": "microbiomeExplorer",
+      "version": "1.14.0",
+      "sha256": "0p15wp3n2v74rfsmap0331b3xkswfyaq8a4h2xrcn3v60m5qfmzq",
+      "depends": ["Biobase", "DESeq2", "DT", "RColorBrewer", "biomformat", "broom", "car", "dplyr", "forcats", "heatmaply", "knitr", "limma", "lubridate", "magrittr", "matrixStats", "metagenomeSeq", "plotly", "purrr", "readr", "reshape2", "rlang", "rmarkdown", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinyjs", "stringr", "tibble", "tidyr", "vegan"],
+      "broken": true
+    },
+    "microbiomeMarker": {
+      "name": "microbiomeMarker",
+      "version": "1.10.0",
+      "sha256": "07w77cm7fjkqnc1rkj9dj6nashpkwbq43nwp6bsq5wp8k4y26gjn",
+      "depends": ["ALDEx2", "ANCOMBC", "Biobase", "BiocGenerics", "BiocParallel", "Biostrings", "ComplexHeatmap", "DESeq2", "IRanges", "MASS", "S4Vectors", "biomformat", "caret", "coin", "dplyr", "edgeR", "ggplot2", "ggsignif", "ggtree", "limma", "magrittr", "metagenomeSeq", "multtest", "pROC", "patchwork", "phyloseq", "plotROC", "purrr", "rlang", "tibble", "tidyr", "tidytree", "vegan", "yaml"],
+      "broken": true
+    },
+    "mitoODE": {
+      "name": "mitoODE",
+      "version": "1.8.0",
+      "sha256": "1rbxppzwmlrfyzcsa5b0biqm79qyv9662dh16zzp3frz56325kzy",
+      "depends": ["KernSmooth", "MASS", "minpack_lm", "mitoODEdata"],
+      "broken": true
+    },
+    "mmnet": {
+      "name": "mmnet",
+      "version": "1.8.1",
+      "sha256": "0ppcy11xnn593xig8gwz79vsbkdi3f5aai58zdhr59w52y2dafia",
+      "depends": ["Biobase", "KEGGREST", "Matrix", "RCurl", "RJSONIO", "XML", "flexmix", "ggplot2", "igraph", "plyr", "reshape2", "stringr"],
+      "broken": true
+    },
+    "motifRG": {
+      "name": "motifRG",
+      "version": "1.14.0",
+      "sha256": "1v9zm5629k2lcqbbgw8bwflvbircyxkfavbkvmbd212kgwcng8vn",
+      "depends": ["BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "Biostrings", "IRanges", "XVector", "seqLogo"],
+      "broken": true
+    },
     "multiOmicsViz": {
       "name": "multiOmicsViz",
       "version": "1.24.0",
@@ -14706,6 +16122,13 @@
       "depends": ["anyLib", "biosigner", "caret", "clusterProfiler", "config", "DESeq2", "dplyr", "DT", "easyPubMed", "enrichplot", "ggnewscale", "golem", "htmltools", "igraph", "infotheo", "metap", "mixOmics", "networkD3", "ppcor", "R6", "ReactomePA", "rmarkdown", "rWikiPathways", "shiny", "shinydashboard", "stringr"],
       "broken": true
     },
+    "mvGST": {
+      "name": "mvGST",
+      "version": "1.4.0",
+      "sha256": "1yi8558lkqfrmxgighb5v8q12gwqlbs2ds610fgf8ggrdn84bzq8",
+      "depends": ["AnnotationDbi", "GO_db", "GOstats", "Rgraphviz", "annotate", "gProfileR", "graph", "stringr", "topGO"],
+      "broken": true
+    },
     "nanotatoR": {
       "name": "nanotatoR",
       "version": "1.18.0",
@@ -14713,6 +16136,27 @@
       "depends": ["AnnotationDbi", "curl", "dplyr", "GenomicRanges", "hash", "httr", "knitr", "openxlsx", "org_Hs_eg_db", "rentrez", "rlang", "stringr", "testthat", "tidyverse", "XML"],
       "broken": true
     },
+    "neaGUI": {
+      "name": "neaGUI",
+      "version": "1.8.0",
+      "sha256": "1xms5k8zzbk31sj0f92rsqjv40vcqy89pmy8z3j0336iascqbx9l",
+      "depends": ["hwriter"],
+      "broken": true
+    },
+    "nem": {
+      "name": "nem",
+      "version": "2.44.0",
+      "sha256": "1bkq622jyrfn0v4wyw5ycxmri8kyils4wznsz26ki3awff34lq3h",
+      "depends": ["RBGL", "RColorBrewer", "Rgraphviz", "boot", "e1071", "graph", "limma", "plotrix", "statmod"],
+      "broken": true
+    },
+    "netDx": {
+      "name": "netDx",
+      "version": "1.16.0",
+      "sha256": "00ghcj5hzb06pi9aj2rdnasyqgqnvr9qjb0m6b0476yv2mx5x24k",
+      "depends": ["BiocFileCache", "GenomeInfoDb", "GenomicRanges", "IRanges", "MultiAssayExperiment", "RColorBrewer", "ROCR", "Rtsne", "S4Vectors", "bigmemory", "combinat", "doParallel", "foreach", "ggplot2", "glmnet", "httr", "igraph", "plotrix", "pracma", "rappdirs", "reshape2"],
+      "broken": true
+    },
     "netOmics": {
       "name": "netOmics",
       "version": "1.8.0",
@@ -14720,10 +16164,17 @@
       "depends": ["AnnotationDbi", "dplyr", "ggplot2", "GO_db", "gprofiler2", "igraph", "magrittr", "minet", "purrr", "RandomWalkRestartMH", "tibble", "tidyr"],
       "broken": true
     },
+    "netbenchmark": {
+      "name": "netbenchmark",
+      "version": "1.2.0",
+      "sha256": "10s8xsisjp9sj9dl67bgn94ipm6a6kpqli3pvjdpxkmvjkg400kg",
+      "depends": ["GeneNet", "Matrix", "Rcpp", "c3net", "corpcor", "fdrtool", "grndata", "minet", "pracma", "randomForest"],
+      "broken": true
+    },
     "netbiov": {
       "name": "netbiov",
-      "version": "1.36.0",
-      "sha256": "0igqb3wdxvjrbh4w664934yycac3qwcyfhmsz4cf2h5rif23xagf",
+      "version": "1.4.0",
+      "sha256": "1h3986kfi516xlw675cq901ls9v7rj5rr0ls5lny21wd439n2avf",
       "depends": ["igraph"],
       "broken": true
     },
@@ -14736,16 +16187,30 @@
     },
     "networkBMA": {
       "name": "networkBMA",
-      "version": "2.35.0",
-      "sha256": "0xa0b977apbr6p9kqk38582af635kp99csj32bsn2bf8pjsmd4d2",
-      "depends": ["BH", "BMA", "leaps", "Rcpp", "RcppArmadillo", "RcppEigen"],
+      "version": "1.12.0",
+      "sha256": "0zkf10iqiabsln1jxq0sypr43mrw6k82l3pdp5bg9kcv0bqqqy5k",
+      "depends": ["BMA", "Rcpp", "RcppArmadillo", "RcppEigen"],
       "broken": true
     },
     "nondetects": {
       "name": "nondetects",
-      "version": "2.32.0",
-      "sha256": "0302mg5pbvbzp9rhm6wg4lfa7c7lkndysx35x8b1zskc4b1v76cv",
-      "depends": ["arm", "Biobase", "HTqPCR", "limma", "mvtnorm"],
+      "version": "2.0.0",
+      "sha256": "0cyp7f90w9vcgwkg0mxrrpv28wihsgbynhq5kjk5hng9qfqjcyxg",
+      "depends": ["Biobase", "HTqPCR", "limma", "mvtnorm"],
+      "broken": true
+    },
+    "nudge": {
+      "name": "nudge",
+      "version": "1.36.0",
+      "sha256": "1px6hnda7hp7yx9imkl8xq8m772csd2qic0kq5bqwshk5qdvfhw7",
+      "depends": [],
+      "broken": true
+    },
+    "oneChannelGUI": {
+      "name": "oneChannelGUI",
+      "version": "1.36.0",
+      "sha256": "0r5y531y4niy9gh64n7nk8a0xcj8lyg36axhcjx116ycsqa00x5h",
+      "depends": ["Biobase", "Biostrings", "IRanges", "Rsamtools", "affylmGUI", "chimera", "siggenes", "tkWidgets", "tkrplot"],
       "broken": true
     },
     "oneSENSE": {
@@ -14755,11 +16220,67 @@
       "depends": ["flowCore", "gplots", "plotly", "Rtsne", "scatterplot3d", "shiny", "shinyFiles", "webshot"],
       "broken": true
     },
+    "ontoCAT": {
+      "name": "ontoCAT",
+      "version": "1.22.0",
+      "sha256": "03vy4210m31jzhhhbhw3ixhm1lji4qil2zp0ckmyh3xb8m8s8fzl",
+      "depends": ["rJava"],
+      "broken": true
+    },
+    "openPrimeRui": {
+      "name": "openPrimeRui",
+      "version": "1.26.0",
+      "sha256": "0w00ya6xb70am000hybrxgcq8bpd950w36n01v4l0pfmfcvqd9fa",
+      "depends": ["DT", "openPrimeR", "rmarkdown", "shiny", "shinyBS", "shinyjs"],
+      "broken": true
+    },
+    "pareg": {
+      "name": "pareg",
+      "version": "1.8.0",
+      "sha256": "1b9vvn1ppw1vbfmkzkbd6b01pkqnsknbrjv1js983dpjv23x6xlb",
+      "depends": ["DOSE", "Matrix", "basilisk", "devtools", "doFuture", "doRNG", "dplyr", "foreach", "future", "ggplot2", "ggraph", "ggrepel", "glue", "hms", "igraph", "keras", "logger", "magrittr", "nloptr", "progress", "proxy", "purrr", "reticulate", "rlang", "stringr", "tensorflow", "tfprobability", "tibble", "tidygraph", "tidyr"],
+      "broken": true
+    },
     "pathVar": {
       "name": "pathVar",
-      "version": "1.30.0",
-      "sha256": "1q0m4yb4jvi61f3hl7mpbnl9y0y4pqhspi1gn3wp5lf86j8c40jp",
-      "depends": ["data_table", "EMT", "ggplot2", "gridExtra", "Matching", "mclust"],
+      "version": "1.0.1",
+      "sha256": "1ixraifr8d86m9rdg38d6kfzmgghjxasgi3abb1i8knjyfwrc05v",
+      "depends": ["EMT", "Matching", "data_table", "ggplot2", "gridExtra", "mclust"],
+      "broken": true
+    },
+    "paxtoolsr": {
+      "name": "paxtoolsr",
+      "version": "1.4.6",
+      "sha256": "170gm5qxlsz2dv249q16shpj0xm9y7rp3rpn9ij6r2c5d3xn8i21",
+      "depends": ["R_utils", "XML", "data_table", "httr", "igraph", "plyr", "rJava", "rjson"],
+      "broken": true
+    },
+    "pcaGoPromoter": {
+      "name": "pcaGoPromoter",
+      "version": "1.14.0",
+      "sha256": "1w0cpakxlm8dx6z3j844xmkz3dawiaschrjcjlkqjv9ay8vfkhz8",
+      "depends": ["AnnotationDbi", "Biostrings", "ellipse"],
+      "broken": true
+    },
+    "pcot2": {
+      "name": "pcot2",
+      "version": "1.38.0",
+      "sha256": "1ycsbry5srf1msq4vcvv0q34lgzkwadh7k1pgwv963i567i4lx3b",
+      "depends": ["Biobase", "amap"],
+      "broken": true
+    },
+    "pcxn": {
+      "name": "pcxn",
+      "version": "2.26.0",
+      "sha256": "13gahdsvz7ss3chcvqmdyrnw31rcgiplqg7awrn930drwljlimqk",
+      "depends": ["pcxnData", "pheatmap"],
+      "broken": true
+    },
+    "pdmclass": {
+      "name": "pdmclass",
+      "version": "1.42.0",
+      "sha256": "1f4zrxbyk49hm0cxp0g1786cwc7g1k5z6v3hn2z66m7rbapz8afy",
+      "depends": ["Biobase", "fibroEset", "mda"],
       "broken": true
     },
     "perturbatr": {
@@ -14776,32 +16297,81 @@
       "depends": ["Biobase", "BiocGenerics", "cluster", "cowplot", "destiny", "ggplot2", "igraph", "maptree", "monocle", "phateR", "pheatmap", "pracma", "RANN", "RColorBrewer", "reticulate", "Rtsne", "S4Vectors", "scatterplot3d", "Seurat", "SingleCellExperiment", "SummarizedExperiment", "transport", "VGAM"],
       "broken": true
     },
+    "phenoDist": {
+      "name": "phenoDist",
+      "version": "1.18.0",
+      "sha256": "0kjsdgvr5kmrnn7mjzphk5r6irgjv5cfgmrd4yddprbmmln39avn",
+      "depends": ["e1071", "imageHTS"],
+      "broken": true
+    },
+    "pint": {
+      "name": "pint",
+      "version": "1.20.0",
+      "sha256": "19q21b3zdn4adx49zn88z69xz3mqza58xdhig3zicn9s0g21bfz4",
+      "depends": ["Matrix", "mvtnorm"],
+      "broken": true
+    },
     "pkgDepTools": {
       "name": "pkgDepTools",
-      "version": "1.63.0",
-      "sha256": "10q0z1ps073py82zqii4sfdhnpvcyj4sx1yx3lzy5c41l8py6lag",
-      "depends": ["graph", "RBGL"],
+      "version": "1.36.0",
+      "sha256": "1v2fsax49wklwdmgxp9pjyp18cbj2rsg7yd68mwr2amlihgvmsp1",
+      "depends": ["RBGL", "graph"],
+      "broken": true
+    },
+    "plateCore": {
+      "name": "plateCore",
+      "version": "1.28.0",
+      "sha256": "1v7shvjnav930grswbixj8fyabmamsgry5g5is3sf9ymp9r8gh5x",
+      "depends": ["Biobase", "MASS", "flowCore", "flowStats", "flowViz", "lattice", "latticeExtra", "robustbase"],
       "broken": true
     },
     "plethy": {
       "name": "plethy",
-      "version": "1.36.0",
-      "sha256": "09929w6rd84hvz6fiydd5v0php9gvbvxgvsnxvkzwyxfmmmx1dzr",
-      "depends": ["Biobase", "BiocGenerics", "DBI", "ggplot2", "IRanges", "plyr", "RColorBrewer", "reshape2", "RSQLite", "S4Vectors", "Streamer"],
+      "version": "1.8.0",
+      "sha256": "1skaqws1yb8n8li4daprq4x8vrbyykm3fk6pzwx7iyr3nf2r2zz5",
+      "depends": ["Biobase", "BiocGenerics", "DBI", "IRanges", "RColorBrewer", "RSQLite", "S4Vectors", "Streamer", "ggplot2", "plyr", "reshape2"],
+      "broken": true
+    },
+    "plrs": {
+      "name": "plrs",
+      "version": "1.10.0",
+      "sha256": "1f2dlgcbpfrn5za2z7nf1y8jzrcb5hzb3gix18nyqmz9syg57zha",
+      "depends": ["Biobase", "BiocGenerics", "CGHbase", "Rcsdp", "ic_infer", "marray", "quadprog"],
+      "broken": true
+    },
+    "plw": {
+      "name": "plw",
+      "version": "1.30.0",
+      "sha256": "190bccvxhdgp3ah9vzdpjddb33ck38r5x4gw1f8vwxh0mw79vf9c",
+      "depends": ["MASS", "affy"],
+      "broken": true
+    },
+    "polyester": {
+      "name": "polyester",
+      "version": "1.6.0",
+      "sha256": "0if2rbgbfc3ghz5mnmpmpv6rq63qjm3l16gmlr493vfrpxdzclnv",
+      "depends": ["Biostrings", "IRanges", "S4Vectors", "limma", "logspline"],
       "broken": true
     },
     "ppiStats": {
       "name": "ppiStats",
-      "version": "1.62.0",
-      "sha256": "0w5gkfah2y50x4wj5fn8i6ycx1x013mn9w4bs8r2vfqabpws1a81",
-      "depends": ["Biobase", "Category", "graph", "lattice", "RColorBrewer"],
+      "version": "1.36.0",
+      "sha256": "1s5xv565w924g71qaxgmhfszrkqs3arzi8l0vzcz446r2pgm6d32",
+      "depends": ["Biobase", "Category", "RColorBrewer", "ScISI", "graph", "lattice", "ppiData"],
+      "broken": true
+    },
+    "prada": {
+      "name": "prada",
+      "version": "1.46.0",
+      "sha256": "0ak21586bbkbpwji1pcbr44dlwyhslscrqm2y172310xbxm0sqbg",
+      "depends": ["Biobase", "BiocGenerics", "MASS", "RColorBrewer", "rrcov"],
       "broken": true
     },
     "predictionet": {
       "name": "predictionet",
-      "version": "1.40.0",
-      "sha256": "1f3ghlcfnls9mx2hbs923rdz7kn0wdhy2csp1y1286c5q5dybrgh",
-      "depends": ["catnet", "igraph", "MASS", "penalized", "RBGL"],
+      "version": "1.16.0",
+      "sha256": "1q7nl11kvh2rl5rzb4qnq5ckdrdkna0arfnjmki35lr8hyh65id0",
+      "depends": ["MASS", "RBGL", "igraph", "penalized"],
       "broken": true
     },
     "proBatch": {
@@ -14818,6 +16388,13 @@
       "depends": ["Biobase", "BiocParallel", "minpack_lm", "missForest", "pracma", "ropls", "xcms"],
       "broken": true
     },
+    "prot2D": {
+      "name": "prot2D",
+      "version": "1.8.0",
+      "sha256": "0pmsl550wvxnqx5zbj8b6lhvlb2bcmvi3xxx66x8r1sz3cdy3l7h",
+      "depends": ["Biobase", "MASS", "Mulcom", "fdrtool", "impute", "limma", "qvalue", "samr", "st"],
+      "broken": true
+    },
     "proteasy": {
       "name": "proteasy",
       "version": "1.2.0",
@@ -14825,6 +16402,20 @@
       "depends": ["AnnotationFilter", "data_table", "EnsDb_Hsapiens_v86", "EnsDb_Mmusculus_v79", "EnsDb_Rnorvegicus_v79", "ensembldb", "Rcpi", "stringr"],
       "broken": true
     },
+    "proteoQC": {
+      "name": "proteoQC",
+      "version": "1.6.0",
+      "sha256": "15raykmw19k4yn4jppw4lqwgarr8b7sfsvhcif49xvw7k1dwj5ys",
+      "depends": ["MSnbase", "Nozzle_R1", "Rcpp", "VennDiagram", "XML", "ggplot2", "plyr", "rTANDEM", "reshape2", "seqinr"],
+      "broken": true
+    },
+    "psygenet2r": {
+      "name": "psygenet2r",
+      "version": "1.36.0",
+      "sha256": "1khjid5lkkn5qpnk9adw1in4km41q067mj5r5yqs2iz5hv4vx6xv",
+      "depends": ["BgeeDB", "Biobase", "GO_db", "RCurl", "biomaRt", "ggplot2", "igraph", "labeling", "reshape2", "stringr", "topGO"],
+      "broken": true
+    },
     "pulsedSilac": {
       "name": "pulsedSilac",
       "version": "1.9.1",
@@ -14832,6 +16423,13 @@
       "depends": ["cowplot", "ggplot2", "ggridges", "MuMIn", "R_utils", "robustbase", "S4Vectors", "SummarizedExperiment", "UpSetR"],
       "broken": true
     },
+    "pwOmics": {
+      "name": "pwOmics",
+      "version": "1.2.0",
+      "sha256": "0vlr71mhch716xl2i0366pxjkawci0g2imvfhsqinv5gd92m6hpq",
+      "depends": ["AnnotationDbi", "AnnotationHub", "Biobase", "BiocGenerics", "GenomicRanges", "STRINGdb", "biomaRt", "data_table", "gplots", "igraph", "rBiopaxParser"],
+      "broken": true
+    },
     "pwrEWAS": {
       "name": "pwrEWAS",
       "version": "1.14.0",
@@ -14841,18 +16439,60 @@
     },
     "qrqc": {
       "name": "qrqc",
-      "version": "1.52.0",
-      "sha256": "0411477y7nazlwbz3pfszr1wfas6qd0g0iz0p9pmq16dw8pzkgg6",
-      "depends": ["Biostrings", "biovizBase", "brew", "ggplot2", "plyr", "reshape", "Rhtslib", "testthat", "xtable"],
+      "version": "1.24.0",
+      "sha256": "0850frx6fg9py2laav0yqavl9ckbn6y475xm9r6gxvyzp63smzdg",
+      "depends": ["Biostrings", "Rsamtools", "biovizBase", "brew", "ggplot2", "plyr", "reshape", "testthat", "xtable"],
+      "broken": true
+    },
+    "rDGIdb": {
+      "name": "rDGIdb",
+      "version": "1.30.0",
+      "sha256": "1v96nj1ffmg1678p7rspcqsnqvwcssv96jcyqqbb8v8sryflwmi5",
+      "depends": ["httr", "jsonlite"],
+      "broken": true
+    },
+    "rHVDM": {
+      "name": "rHVDM",
+      "version": "1.36.0",
+      "sha256": "0k1gccnac59q54y2nypzgip2srs5yg3v2hhrz86ps50p2lx4pqd2",
+      "depends": ["Biobase", "R2HTML", "affy", "minpack_lm"],
+      "broken": true
+    },
+    "rMAT": {
+      "name": "rMAT",
+      "version": "3.20.0",
+      "sha256": "0dq4ipz1j6qai8q8z038hjb5j0w67gp7449vj8psgca2854gxa7s",
+      "depends": ["Biobase", "BiocGenerics", "IRanges", "affxparser"],
+      "broken": true
+    },
+    "rSFFreader": {
+      "name": "rSFFreader",
+      "version": "0.18.0",
+      "sha256": "0z2lkjbs3svx1b9zr4smjwrcd9xzxhfp98428vzaqq0k79h1v666",
+      "depends": ["Biostrings", "IRanges", "S4Vectors", "ShortRead", "XVector"],
+      "broken": true
+    },
+    "rTANDEM": {
+      "name": "rTANDEM",
+      "version": "1.10.0",
+      "sha256": "1dmaqdjfmjkkrddf666hpp95s7s6x0ssinx9aybl6952ylfjgcd1",
+      "depends": ["Rcpp", "XML", "data_table"],
       "broken": true
     },
     "rama": {
       "name": "rama",
-      "version": "1.72.0",
-      "sha256": "0i6crxnzhwxnc55xh2rv36jfwh4bd30alw1f05ixdrxwqwsslbpy",
+      "version": "1.44.0",
+      "sha256": "0nka6a2dk7jn4lk0i2p91hxwdgpny6y3j4dz709crrxlz3xjqflm",
       "depends": [],
       "broken": true
     },
+    "reb": {
+      "name": "reb",
+      "version": "1.48.0",
+      "sha256": "1bxijf91vdr6088459r29kvy691bjbscy170pc0739iqbg7z80zm",
+      "depends": ["Biobase", "idiogram"],
+      "broken": true
+    },
     "restfulSE": {
       "name": "restfulSE",
       "version": "1.24.0",
@@ -14860,18 +16500,46 @@
       "depends": ["AnnotationDbi", "AnnotationHub", "bigrquery", "Biobase", "DBI", "DelayedArray", "dplyr", "ExperimentHub", "GO_db", "magrittr", "reshape2", "rhdf5client", "rlang", "S4Vectors", "SummarizedExperiment"],
       "broken": true
     },
-    "rqt": {
-      "name": "rqt",
-      "version": "1.28.0",
-      "sha256": "02yvwp68c0xx1wa41hfwmq5zjskqk3jg6z1hvivi6x3l5g2xfwah",
-      "depends": ["car", "CompQuadForm", "glmnet", "Matrix", "metap", "pls", "ropls", "RUnit", "SummarizedExperiment"],
+    "rnaSeqMap": {
+      "name": "rnaSeqMap",
+      "version": "2.28.0",
+      "sha256": "0mfcy7l31g5z5yv12sv9imaf19p9vawnk7cqcm50x2sm032r8n7f",
+      "depends": ["Biobase", "DBI", "DESeq", "GenomicAlignments", "GenomicRanges", "IRanges", "Rsamtools", "edgeR"],
+      "broken": true
+    },
+    "sRAP": {
+      "name": "sRAP",
+      "version": "1.10.0",
+      "sha256": "080s88l3a2fbgqnc8sy41kwzkm6skjazkirqini7n6xqcsqb9lih",
+      "depends": ["ROCR", "WriteXLS", "gplots", "pls", "qvalue"],
+      "broken": true
+    },
+    "sapFinder": {
+      "name": "sapFinder",
+      "version": "1.8.0",
+      "sha256": "12a0wcjxcz77b06bymhqcj5wxzm478mlj9vcvbbqhdfvj7214hy9",
+      "depends": ["Rcpp", "pheatmap", "rTANDEM"],
+      "broken": true
+    },
+    "saps": {
+      "name": "saps",
+      "version": "2.2.0",
+      "sha256": "11v7nxlcnkslxl0giv3y2naxpfsmqmrj6b4y2g6zbp48zml45jgl",
+      "depends": ["piano", "reshape2", "survcomp", "survival"],
       "broken": true
     },
     "savR": {
       "name": "savR",
-      "version": "1.37.0",
-      "sha256": "13wiw7isdmpwhynxjrhimy9yglcz1108k7nwa98vq9czq49zpada",
-      "depends": ["ggplot2", "gridExtra", "reshape2", "scales", "XML"],
+      "version": "1.8.0",
+      "sha256": "1vxxmzr8k6fn9fqr0pbfvccqq30d8w3fwjcr5x0bh1d77mzgf9n1",
+      "depends": ["XML", "ggplot2", "gridExtra", "reshape2", "scales"],
+      "broken": true
+    },
+    "sbgr": {
+      "name": "sbgr",
+      "version": "1.0.0",
+      "sha256": "0bvvxd0c4k4mmwkcb9w02i2kb6vwlq84w8vfqiamnwjy2vgjgka9",
+      "depends": ["httr", "jsonlite", "objectProperties"],
       "broken": true
     },
     "scAlign": {
@@ -14895,27 +16563,83 @@
       "depends": ["ggplot2", "Seurat"],
       "broken": true
     },
+    "scsR": {
+      "name": "scsR",
+      "version": "1.6.0",
+      "sha256": "0g1vgx8wrdwbhlzmf0a11fg5jnbkvz402h8qj48vj4bq8j202bc1",
+      "depends": ["BiocGenerics", "Biostrings", "IRanges", "RColorBrewer", "STRINGdb", "ggplot2", "hash", "plyr", "sqldf"],
+      "broken": true
+    },
     "seqCNA": {
       "name": "seqCNA",
-      "version": "1.48.0",
-      "sha256": "0qqkpgpjj2rywr1y1qj3ffjlxak7fg15jkznz62r7k6r794z45ma",
-      "depends": ["adehabitatLT", "doSNOW", "GLAD", "seqCNA_annot"],
+      "version": "1.16.0",
+      "sha256": "1wq92wszv0x99l52lm3k0zc2ffin1sp78xlyfabxpwi1v0yrkifl",
+      "depends": ["GLAD", "adehabitatLT", "doSNOW", "seqCNA_annot"],
       "broken": true
     },
     "seqbias": {
       "name": "seqbias",
-      "version": "1.50.0",
-      "sha256": "18pdpi855y1hhka96xc5886nqffjn1jhz9jr9p305iikdrsvmjp1",
-      "depends": ["Biostrings", "GenomicRanges", "Rhtslib", "zlibbioc"],
+      "version": "1.18.0",
+      "sha256": "1wwskcbl3wd8gl63jl4wl0xwzj8kbwbc8xhp12z3xximngkk7dgd",
+      "depends": ["Biostrings", "GenomicRanges", "Rsamtools", "zlibbioc"],
+      "broken": true
+    },
+    "seqplots": {
+      "name": "seqplots",
+      "version": "1.8.1",
+      "sha256": "0anv2048m5zp2ijfzk79avcwzp662gw0y58j7nafha21j5s2qyhm",
+      "depends": ["BSgenome", "Biostrings", "DBI", "DT", "GenomeInfoDb", "GenomicRanges", "IRanges", "RColorBrewer", "RSQLite", "S4Vectors", "class", "digest", "fields", "ggplot2", "gridExtra", "jsonlite", "kohonen", "plotrix", "reshape2", "rtracklayer", "shiny"],
+      "broken": true
+    },
+    "shinyTANDEM": {
+      "name": "shinyTANDEM",
+      "version": "1.8.0",
+      "sha256": "0dkgwfynznpq2q55d83w4x0nmal3dkgzxi1jpdcsasqlhsyqvmvx",
+      "depends": ["mixtools", "rTANDEM", "shiny", "xtable"],
       "broken": true
     },
     "sigPathway": {
       "name": "sigPathway",
-      "version": "1.66.2",
-      "sha256": "0k86hlz7zbbw7559bd2sl59pr441kihgwvg8nr75mj8d50n783sy",
+      "version": "1.38.0",
+      "sha256": "126cyw88d6rxp3bzdqsmm2v0kvhn650qmi4zcs9v50n0hhwyrxrf",
       "depends": [],
       "broken": true
     },
+    "sigaR": {
+      "name": "sigaR",
+      "version": "1.14.0",
+      "sha256": "07ip468liyg9b6q9izd1wdp29p9f2icfs01nf0il4gc76h6d0rr5",
+      "depends": ["Biobase", "CGHbase", "MASS", "corpcor", "igraph", "marray", "mvtnorm", "penalized", "quadprog", "snowfall"],
+      "broken": true
+    },
+    "signifinder": {
+      "name": "signifinder",
+      "version": "1.6.0",
+      "sha256": "0r6acaqk7zaryy8ddpfischw08b6sml3cydrw8v9wys0rfv207pb",
+      "depends": ["AnnotationDbi", "BiocGenerics", "ComplexHeatmap", "DGEobj_utils", "GSVA", "IRanges", "RColorBrewer", "SpatialExperiment", "SummarizedExperiment", "TxDb_Hsapiens_UCSC_hg19_knownGene", "TxDb_Hsapiens_UCSC_hg38_knownGene", "consensusOV", "cowplot", "dplyr", "ensembldb", "ggplot2", "ggridges", "magrittr", "matrixStats", "maxstat", "openair", "org_Hs_eg_db", "patchwork", "sparrow", "survival", "survminer", "viridis"],
+      "broken": true
+    },
+    "simpleaffy": {
+      "name": "simpleaffy",
+      "version": "2.46.0",
+      "sha256": "1x3f7hm7w44yarq4irv791330zfamhsqqwnqz8xfwrpvjrkv6avn",
+      "depends": ["Biobase", "BiocGenerics", "affy", "gcrma", "genefilter"],
+      "broken": true
+    },
+    "simulatorZ": {
+      "name": "simulatorZ",
+      "version": "1.4.0",
+      "sha256": "1sypvrwq6ay7lzmb9cmpix1zgzafzryvf4my5jky846bcpam91qj",
+      "depends": ["Biobase", "BiocGenerics", "GenomicRanges", "Hmisc", "IRanges", "S4Vectors", "SummarizedExperiment", "gbm", "survival"],
+      "broken": true
+    },
+    "single": {
+      "name": "single",
+      "version": "1.7.0",
+      "sha256": "0h7h9m4xr65nayr707jvjnbic1q4z0hsghw5i3pfpz2n6p9pb8s8",
+      "depends": ["BiocGenerics", "Biostrings", "GenomicAlignments", "IRanges", "Rsamtools", "dplyr", "reshape2", "rlang", "stringr", "tidyr"],
+      "broken": true
+    },
     "slinky": {
       "name": "slinky",
       "version": "1.12.0",
@@ -14925,9 +16649,9 @@
     },
     "snapCGH": {
       "name": "snapCGH",
-      "version": "1.72.0",
-      "sha256": "0knjspxzc3z5dhx0a6kx9rkic85w65l84vy552x5bv8jzxkcwrsj",
-      "depends": ["aCGH", "cluster", "DNAcopy", "GLAD", "limma", "tilingArray"],
+      "version": "1.40.0",
+      "sha256": "0fjqp0qhwk041pgwqp3av5ihkf4xb9li6zy6gmvk24hlj8sm600z",
+      "depends": ["DNAcopy", "GLAD", "aCGH", "cluster", "limma", "tilingArray"],
       "broken": true
     },
     "sojourner": {
@@ -14937,6 +16661,13 @@
       "depends": ["dplyr", "EBImage", "fitdistrplus", "ggplot2", "gridExtra", "lattice", "MASS", "mclust", "minpack_lm", "mixtools", "mltools", "nls2", "pixmap", "plyr", "R_matlab", "Rcpp", "reshape2", "rlang", "scales", "shiny", "shinyjs", "sp", "truncnorm"],
       "broken": true
     },
+    "spade": {
+      "name": "spade",
+      "version": "1.18.2",
+      "sha256": "0m2784x2ysp4mc7m8n8scpr1h38m3p9glcc5jd6cix55bh3yzykk",
+      "depends": ["Biobase", "flowCore", "igraph"],
+      "broken": true
+    },
     "sparseDOSSA": {
       "name": "sparseDOSSA",
       "version": "1.24.0",
@@ -14944,13 +16675,69 @@
       "depends": ["MASS", "MCMCpack", "optparse", "tmvtnorm"],
       "broken": true
     },
+    "spliceR": {
+      "name": "spliceR",
+      "version": "1.12.0",
+      "sha256": "0r5j0ibl2ccsxb7rr2fxw4b07wbdiyfndxkl4pgd9h0ks4qyhyjy",
+      "depends": ["GenomicRanges", "IRanges", "RColorBrewer", "VennDiagram", "cummeRbund", "plyr", "rtracklayer"],
+      "broken": true
+    },
+    "spliceSites": {
+      "name": "spliceSites",
+      "version": "1.8.3",
+      "sha256": "1jifh0nbqjhrc07jfc50hfk4wn1hv3a863rbr3fnqlg9rwg044w7",
+      "depends": ["Biobase", "BiocGenerics", "Biostrings", "IRanges", "doBy", "seqLogo"],
+      "broken": true
+    },
+    "splicegear": {
+      "name": "splicegear",
+      "version": "1.42.0",
+      "sha256": "1g2fqql1wqzwz1vx5cq03ckld0gccqk6rv9l99xsaa8mhf0rn1qa",
+      "depends": ["Biobase", "XML", "annotate"],
+      "broken": true
+    },
+    "spotSegmentation": {
+      "name": "spotSegmentation",
+      "version": "1.44.0",
+      "sha256": "074nzh18pj6dpk9bqh8id0j2vpaxvhi2ddrz6hnza381wzdgxdr3",
+      "depends": ["mclust"],
+      "broken": true
+    },
+    "srnadiff": {
+      "name": "srnadiff",
+      "version": "1.24.0",
+      "sha256": "0gr754qb5gc0lh1r513yrfrys7q13a0kmbzmbx5m0p7wwp508mdg",
+      "depends": ["BiocManager", "BiocParallel", "BiocStyle", "DESeq2", "GenomeInfoDb", "GenomicAlignments", "GenomicFeatures", "GenomicRanges", "Gviz", "IRanges", "Rcpp", "Rsamtools", "S4Vectors", "SummarizedExperiment", "devtools", "edgeR", "rtracklayer"],
+      "broken": true
+    },
     "sscore": {
       "name": "sscore",
-      "version": "1.72.0",
-      "sha256": "02y684iaryms7099k9idrvw0my52jj3d4hl949ai1jknaa19hmil",
+      "version": "1.42.0",
+      "sha256": "0h86crb241vmaczp76wz4zv9ni1snmlkrdi1md3hgq1hqxnn9gzs",
       "depends": ["affy", "affyio"],
       "broken": true
     },
+    "staRank": {
+      "name": "staRank",
+      "version": "1.12.0",
+      "sha256": "1vgc3mhxyhrgwkapnqx4061l9l0nyc012508hma14xbxml3f76sg",
+      "depends": ["cellHTS2"],
+      "broken": true
+    },
+    "stepwiseCM": {
+      "name": "stepwiseCM",
+      "version": "1.16.0",
+      "sha256": "1ss79yr75kw7fsd8ihpivj9k5v32zxr3ymkl6prba0nyxdj5wyz9",
+      "depends": ["Biobase", "e1071", "glmpath", "pamr", "penalized", "randomForest", "snowfall", "tspair"],
+      "broken": true
+    },
+    "supraHex": {
+      "name": "supraHex",
+      "version": "1.8.0",
+      "sha256": "1g2zcarzi805y2933pyjdgg7l9imbhdf4pjhyr8bir0149li98cy",
+      "depends": ["MASS", "ape", "hexbin"],
+      "broken": true
+    },
     "tofsims": {
       "name": "tofsims",
       "version": "1.22.0",
@@ -14958,6 +16745,13 @@
       "depends": ["ALS", "alsace", "KernSmooth", "ProtGenerics", "Rcpp", "RcppArmadillo", "signal"],
       "broken": true
     },
+    "traviz": {
+      "name": "traviz",
+      "version": "1.10.0",
+      "sha256": "1jjdfl8xvzlr31w74j12s5pdg5b1yylg1i30n804p9mqyx11g5sc",
+      "depends": ["Biobase", "RColorBrewer", "SingleCellExperiment", "SummarizedExperiment", "ggplot2", "mgcv", "princurve", "rgl", "slingshot", "viridis"],
+      "broken": true
+    },
     "trena": {
       "name": "trena",
       "version": "1.22.2",
@@ -14965,6 +16759,13 @@
       "depends": ["AnnotationDbi", "biomaRt", "Biostrings", "BSgenome", "BSgenome_Hsapiens_UCSC_hg19", "BSgenome_Hsapiens_UCSC_hg38", "BSgenome_Mmusculus_UCSC_mm10", "DBI", "GenomicRanges", "glmnet", "lassopv", "MotifDb", "org_Hs_eg_db", "randomForest", "RMySQL", "RPostgreSQL", "RSQLite", "SNPlocs_Hsapiens_dbSNP150_GRCh38", "WGCNA", "xgboost"],
       "broken": true
     },
+    "triform": {
+      "name": "triform",
+      "version": "1.12.0",
+      "sha256": "0pqfz6msalr2264iwi2hzam2sv8yl4fy1ri72pff5gh14rbxgiml",
+      "depends": ["BiocGenerics", "IRanges", "yaml"],
+      "broken": true
+    },
     "tscR": {
       "name": "tscR",
       "version": "1.11.0",
@@ -14974,16 +16775,30 @@
     },
     "tspair": {
       "name": "tspair",
-      "version": "1.53.0",
-      "sha256": "04xxrm313mnknhc38vl1sx6hic2g1x1xaa5772qlc7ip957hz85k",
+      "version": "1.28.0",
+      "sha256": "0m083g5z77n7dd4lnbhvbwjkykh7a4pl4v8j7ipr5w7f9dhdjk33",
       "depends": ["Biobase"],
       "broken": true
     },
-    "unifiedWMWqPCR": {
-      "name": "unifiedWMWqPCR",
-      "version": "1.38.0",
-      "sha256": "0v3jpnm3nq66xvckmc8447xl7wngfhhiwq6vjx54wgc6f586vmgd",
-      "depends": ["BiocGenerics", "HTqPCR"],
+    "waveTiling": {
+      "name": "waveTiling",
+      "version": "1.12.0",
+      "sha256": "0j866mgxj44mv4wp0yqnav83w8pfb47lmjhp1y0qqvxc6q9k80g8",
+      "depends": ["Biobase", "Biostrings", "GenomeGraphs", "GenomicRanges", "IRanges", "affy", "oligo", "oligoClasses", "preprocessCore", "waveslim"],
+      "broken": true
+    },
+    "xps": {
+      "name": "xps",
+      "version": "1.30.0",
+      "sha256": "0wh98fsj3j368bxk4wa7rjd3acwl04r1dfiy13a89zv1fzv3wvky",
+      "depends": [],
+      "broken": true
+    },
+    "yaqcaffy": {
+      "name": "yaqcaffy",
+      "version": "1.30.0",
+      "sha256": "1pj2ksqbj7dlc76s6qagi7iq35wa83gx5cp0hm42w3bj7mxprjbi",
+      "depends": ["simpleaffy"],
       "broken": true
     }
   }
diff --git a/pkgs/development/r-modules/cran-packages.json b/pkgs/development/r-modules/cran-packages.json
index 5ab76e95d392..f55c720e0182 100644
--- a/pkgs/development/r-modules/cran-packages.json
+++ b/pkgs/development/r-modules/cran-packages.json
@@ -61,6 +61,12 @@
       "sha256": "0n3f66nmfi5v94il1mxy026mi84w01ph2aljk60vn3mrz8kwf2ll",
       "depends": ["kernlab"]
     },
+    "ABRSQOL": {
+      "name": "ABRSQOL",
+      "version": "1.0.0",
+      "sha256": "1r3jd109ykcmwvpqs7l85r9ka7718iag21vsygjg0j8nmdbsicdz",
+      "depends": []
+    },
     "ABSurvTDC": {
       "name": "ABSurvTDC",
       "version": "0.1.0",
@@ -217,6 +223,12 @@
       "sha256": "0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1",
       "depends": ["cluster", "dplyr", "fields", "knitr"]
     },
+    "ADSIHT": {
+      "name": "ADSIHT",
+      "version": "0.1.0",
+      "sha256": "0jakh6fn682pshk7kgn92hbmvgp30fp5g12vh76y2ylmn2m4jyv1",
+      "depends": ["Matrix", "Rcpp", "RcppEigen", "mvnfast"]
+    },
     "ADTSA": {
       "name": "ADTSA",
       "version": "1.0.1",
@@ -243,8 +255,8 @@
     },
     "AER": {
       "name": "AER",
-      "version": "1.2-12",
-      "sha256": "11pas7lglcw1h5649bgab13g8xlnx109pc2aqphwc3fdgvqv1ism",
+      "version": "1.2-14",
+      "sha256": "06l7h1gdyc007hx5xavkb879mgqnskcq2zrbr0xbm88rv1b63a26",
       "depends": ["Formula", "car", "lmtest", "sandwich", "survival", "zoo"]
     },
     "AEenrich": {
@@ -273,9 +285,9 @@
     },
     "AFR": {
       "name": "AFR",
-      "version": "0.3.5",
-      "sha256": "0ismghsl2qi2q81c5ipgdxs6s6rw3kk8sz9yx16g6scnbyisa41y",
-      "depends": ["car", "cli", "forecast", "ggplot2", "goftest", "gridExtra", "lmtest", "nlme", "nortest", "olsrr", "rlang", "tseries", "xts", "zoo"]
+      "version": "0.3.6",
+      "sha256": "07i6slw5ksw6s1n0i9p2x6898k4fqx5n13qycshfllczrp0pwwyf",
+      "depends": ["car", "cli", "forecast", "ggplot2", "goftest", "gridExtra", "lmtest", "mFilter", "nlme", "nortest", "olsrr", "regclass", "rlang", "tseries", "writexl", "xts", "zoo"]
     },
     "AFheritability": {
       "name": "AFheritability",
@@ -309,9 +321,9 @@
     },
     "AHMbook": {
       "name": "AHMbook",
-      "version": "0.2.9",
-      "sha256": "06qc5fkvrjmalr4sxqn0y75fk0pcy68qx41w2d2sz0xjp4j9v9nd",
-      "depends": ["coda", "fields", "mvtnorm", "plotrix", "raster", "sp", "spdep", "unmarked"]
+      "version": "0.2.10",
+      "sha256": "02hfwd9jyml2z05nkjvs1vwpdcbj3jqscgvpfc1hhrv4819vsf2d",
+      "depends": ["mvtnorm", "unmarked"]
     },
     "AHPGaussian": {
       "name": "AHPGaussian",
@@ -357,10 +369,16 @@
     },
     "AID": {
       "name": "AID",
-      "version": "2.9",
-      "sha256": "0s7020vh93rnyhcfsmsn1swffrbg1fx3pqq2bd043m4b90yrlzpc",
+      "version": "3.0",
+      "sha256": "0a3mw6m8saqqnmh500xgn975hp44bn3wn07nw30k3i22l4byyhix",
       "depends": ["MASS", "ggplot2", "meta", "nortest", "psych", "stringr", "tseries"]
     },
+    "AIFFtools": {
+      "name": "AIFFtools",
+      "version": "1.0",
+      "sha256": "0r3ksaag7xpfzi1v944fhv89ygp9ikhyw6kfspihcnxw767iz70i",
+      "depends": ["R_utils", "tuneR"]
+    },
     "AIPW": {
       "name": "AIPW",
       "version": "0.6.3.2",
@@ -373,6 +391,12 @@
       "sha256": "0bbqckp0s9f9ljp0b8z65pzfh3hhfp910ca7hsivwi9j7vr61jaz",
       "depends": ["SuperGauss", "fftwtools", "plot3D"]
     },
+    "AIscreenR": {
+      "name": "AIscreenR",
+      "version": "0.1.1",
+      "sha256": "16rbkncjy6gcf9q6qxmar2z1l46wgj43bkg4bdd38495rjh8nsmk",
+      "depends": ["askpass", "curl", "dplyr", "furrr", "httr2", "jsonlite", "lifecycle", "purrr", "stringr", "tibble", "tictoc", "tidyr"]
+    },
     "ALDqr": {
       "name": "ALDqr",
       "version": "1.0",
@@ -387,10 +411,16 @@
     },
     "ALFAM2": {
       "name": "ALFAM2",
-      "version": "4.1.3",
-      "sha256": "1l2l792zv8njg7iii7yzr8fksfijmp6r45a421bamg5r1wa3v1rx",
+      "version": "4.2",
+      "sha256": "15m4lqh40ylfgxb92v1ch3m2f7m15k90416w34x68i0i0fvx81nn",
       "depends": ["Rcpp"]
     },
+    "ALLSPICER": {
+      "name": "ALLSPICER",
+      "version": "0.1.9",
+      "sha256": "1cx8l03333jzzb2h1ai222j0qn69x6hdjpqy7pibwv5c3fdx3z0g",
+      "depends": ["dplyr", "magrittr", "mvtnorm", "readr"]
+    },
     "ALS": {
       "name": "ALS",
       "version": "0.0.7",
@@ -507,8 +537,8 @@
     },
     "ANSM5": {
       "name": "ANSM5",
-      "version": "1.1.0",
-      "sha256": "10drc2199ffnl70ja6512wdwhb14ky73j0fvbhvhqxjhka1gfiwi",
+      "version": "1.1.1",
+      "sha256": "13b3rv0z11whbvwhikvk16raxn7qvgwxs85h104f7bd3xzdddqzm",
       "depends": []
     },
     "AOV1R": {
@@ -517,16 +547,22 @@
       "sha256": "0dv7k0mifybkarpwqyla5j6cvw9dcch09wvdq09ra9bsf4vyk652",
       "depends": ["cellranger", "data_table", "lazyeval", "purrr"]
     },
+    "AOboot": {
+      "name": "AOboot",
+      "version": "0.1.1",
+      "sha256": "159iy0c6hc0l4kp9zdy3s87d8xplva0y2b9xpwfx056dlc5rvnkw",
+      "depends": ["afex", "carData", "emmeans", "lsr"]
+    },
     "APCI": {
       "name": "APCI",
-      "version": "1.0.7",
-      "sha256": "1a3ghbxsvlq3z8nk6xr5jvmpxala9axfm3wd8i6mhjbsfyq8ijv6",
+      "version": "1.0.8",
+      "sha256": "0d1blmybqp1srgnjn2n3v9i4rz0k7r4p0mcg35kjqsny2firignl",
       "depends": ["data_table", "dplyr", "gee", "ggplot2", "ggpubr", "magrittr", "stringr", "survey"]
     },
     "APCalign": {
       "name": "APCalign",
-      "version": "1.0.2",
-      "sha256": "1zd50bhq0amrpk53r2hgfzawb2fqinck02vnfglnwgdbkddx6vn3",
+      "version": "1.1.0",
+      "sha256": "0g59k5hr9rj25xqawrnhdxjh1qfwbc1gzgzp56hbpp04n7dy4xwl",
       "depends": ["arrow", "crayon", "curl", "dplyr", "httr", "jsonlite", "purrr", "readr", "rlang", "stringdist", "stringi", "stringr"]
     },
     "APCanalysis": {
@@ -549,8 +585,8 @@
     },
     "APIS": {
       "name": "APIS",
-      "version": "2.0.4",
-      "sha256": "02s7cpzsp53wk3k4cm6l3hpkc3f191zhg22vwbf8va7dni3d24rq",
+      "version": "2.0.8",
+      "sha256": "041bxpnbds64x8jq1i50pj1bzfn9hix21xg85ffh00y0szhq3w49",
       "depends": ["DT", "cowplot", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "htmltools", "plotly", "rlang", "shiny", "shinyBS", "shinythemes"]
     },
     "APPEstimation": {
@@ -561,9 +597,9 @@
     },
     "APackOfTheClones": {
       "name": "APackOfTheClones",
-      "version": "1.2.0",
-      "sha256": "1wirzf37n5xl0y3g9n9ic6vyaiyzmx9sip1qg4bilaqn7nazmq90",
-      "depends": ["Rcpp", "Seurat", "SeuratObject", "dplyr", "ggforce", "ggplot2", "hash", "lifecycle", "magrittr", "rlang"]
+      "version": "1.2.4",
+      "sha256": "16c99d404ppzhgkj7g816h24fpfpfyqis21gdsbi6wcizh6w90qz",
+      "depends": ["Rcpp", "Seurat", "SeuratObject", "assertthat", "dplyr", "ggforce", "ggplot2", "hash", "lifecycle", "rlang"]
     },
     "APtools": {
       "name": "APtools",
@@ -613,6 +649,12 @@
       "sha256": "0pk0y0gsw681py0vwizxvh1jqjnapzqfr0mbdpli1sray55xbjr2",
       "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "ggplot2", "mvtnorm"]
     },
+    "ARDECO": {
+      "name": "ARDECO",
+      "version": "2.1.0",
+      "sha256": "0y6npim17k8vy05ix06j6kwza8n7149zz93cvcjrshjqlwkxd0w8",
+      "depends": ["dplyr", "ghql", "httr", "jsonlite", "stringr", "tidyr"]
+    },
     "ARDL": {
       "name": "ARDL",
       "version": "0.2.4",
@@ -651,8 +693,8 @@
     },
     "ARPALData": {
       "name": "ARPALData",
-      "version": "1.5.2",
-      "sha256": "066d2n9l6k1zg5d48dj7936ppz9d5fkspz20sdylxmy8568dzv9n",
+      "version": "1.6.0",
+      "sha256": "1mkaryyrzj7mkd7lam122nkq5r02wylhaiyl5r4q7hk8jw3cxpxk",
       "depends": ["archive", "aweek", "curl", "dplyr", "eurostat", "future", "future_apply", "ggplot2", "lubridate", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect", "tm"]
     },
     "ARPobservation": {
@@ -679,10 +721,16 @@
       "sha256": "16awxcncyhry0ygk8gdvlff787837rr8qsyg1pxd11w4v1llrqrf",
       "depends": ["car", "dplyr", "emmeans", "lme4", "magrittr", "plyr"]
     },
+    "ARTtransfer": {
+      "name": "ARTtransfer",
+      "version": "1.0.0",
+      "sha256": "0n0xz64kff7inc9b9jlrka0rpn3amrls12635wvfycdxf9p0ymx9",
+      "depends": ["gbm", "glmnet", "nnet", "randomForest"]
+    },
     "ARUtools": {
       "name": "ARUtools",
-      "version": "0.6.2",
-      "sha256": "0qgx1flyxqaqrd7idfwaaf9y58qmkw6967a0n6m9y4p21n5zsck9",
+      "version": "0.7.1",
+      "sha256": "1c5l6ykn7zrk9j2lgsxphs5kn113rjax5qdi65wga7cvdixrkxab",
       "depends": ["dplyr", "fs", "glue", "here", "hms", "lifecycle", "lubridate", "lutz", "parzer", "purrr", "readr", "rlang", "seewave", "sf", "spsurvey", "stringr", "suncalc", "tidyr", "units", "withr"]
     },
     "ARpLMEC": {
@@ -699,8 +747,8 @@
     },
     "ASMap": {
       "name": "ASMap",
-      "version": "1.0-7",
-      "sha256": "04byjdz3dzgf06bmmpvslihya23lanl8dmjbq22vvwlhi82f88im",
+      "version": "1.0-8",
+      "sha256": "1v8gcs5vykmxjanh4s4pxmv7qx7nmn182ygpffiq23jfdqgzqjag",
       "depends": ["RColorBrewer", "fields", "gtools", "lattice", "qtl"]
     },
     "ASMbook": {
@@ -745,6 +793,12 @@
       "sha256": "0q21dg4p9xw28r3q0ayf2bvwwyccilw93849x4c7k82xpyfnwvpb",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "TSA", "forecast", "seasonal", "stR", "stlplus", "timeSeries", "tseries", "xts"]
     },
+    "ATE_ERROR": {
+      "name": "ATE.ERROR",
+      "version": "1.0.0",
+      "sha256": "137ajc4khzljpszj2cgylirmjyq0fiw1fh0vgrkpaah0g78plr28",
+      "depends": ["MASS", "ggplot2", "mvtnorm", "rlang"]
+    },
     "ATNr": {
       "name": "ATNr",
       "version": "1.1.0",
@@ -825,8 +879,8 @@
     },
     "AccelStab": {
       "name": "AccelStab",
-      "version": "2.0.1",
-      "sha256": "072wm4421bir8ij1g5zj0rn26h28vz7np6glmvapv18q4kfz1x88",
+      "version": "2.0.2",
+      "sha256": "1abnydhn86g5vg5fpv711887a4nr1xzlrqi45bgy00gfag00pqih",
       "depends": ["dplyr", "ggplot2", "minpack_lm", "mvtnorm", "scales"]
     },
     "AcceptReject": {
@@ -973,6 +1027,12 @@
       "sha256": "0wwqnijhz2sa3pcf8mjidw7m4awqgbsn4sgly93zyspb5fv7yblk",
       "depends": []
     },
+    "AdverseEvents": {
+      "name": "AdverseEvents",
+      "version": "0.0.4",
+      "sha256": "0qmwjrl57r6l7424x5nhncm4gc9xi87czp64d0yb7l7qzr571q7s",
+      "depends": ["DT", "ggnewscale", "ggplot2", "ggpubr", "ggrepel", "janitor", "lubridate", "rio", "shiny", "shinycssloaders", "shinyjs", "shinythemes", "skimr", "survival", "survminer", "tidyverse"]
+    },
     "AeRobiology": {
       "name": "AeRobiology",
       "version": "2.0.1",
@@ -1021,10 +1081,16 @@
       "sha256": "0zh3y5jd8m0xbj6lqr01zvwj9qd1xr3iq7vd6sgr3g3qh4kqm5pq",
       "depends": ["Rcpp"]
     },
+    "AirExposure": {
+      "name": "AirExposure",
+      "version": "1.0",
+      "sha256": "0x2wpwynm03azz04dksgk4rri46dvbpkah3d39v7b53inrwb9i8h",
+      "depends": ["dplyr", "htmltools", "htmlwidgets", "httr", "jsonlite", "leaflet", "lubridate", "sf"]
+    },
     "AirMonitor": {
       "name": "AirMonitor",
-      "version": "0.4.0",
-      "sha256": "1lxdnplv06g5j5lwiydgx3yimrpkm85i88cxq7yrpv2gcffalj4p",
+      "version": "0.4.2",
+      "sha256": "0plnxpxr5b1bsnbnqahfcqg7w11hc2ndxhmb9328c5n3cd2nyyrb",
       "depends": ["MazamaCoreUtils", "MazamaRollUtils", "MazamaTimeSeries", "dplyr", "dygraphs", "leaflet", "lubridate", "magrittr", "readr", "rlang", "stringr", "tidyselect", "xts"]
     },
     "Ake": {
@@ -1035,8 +1101,8 @@
     },
     "AlgDesign": {
       "name": "AlgDesign",
-      "version": "1.2.1",
-      "sha256": "01cx63wqr6yvgl5ml1lj6gh9p1sn42b6qcnsppcw7mvba9n652ar",
+      "version": "1.2.1.1",
+      "sha256": "0m6c09pwr536wr3qlq7x15f49hj5y750lh60c3m8xf7yhrpfzjpn",
       "depends": []
     },
     "AlgebraicHaploPackage": {
@@ -1045,6 +1111,12 @@
       "sha256": "1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07",
       "depends": []
     },
+    "AlignLV": {
+      "name": "AlignLV",
+      "version": "0.1.0.0",
+      "sha256": "1sxa6jhml1wb7p7hpdy1w8zlirynfdd9z8s5xw7mr1g5m71hhdcg",
+      "depends": ["abind", "dplyr", "lavaan", "magrittr", "mirt", "purrr", "rlang", "tibble", "tidyr"]
+    },
     "AllMetrics": {
       "name": "AllMetrics",
       "version": "0.2.1",
@@ -1065,9 +1137,9 @@
     },
     "AllelicSeries": {
       "name": "AllelicSeries",
-      "version": "0.0.4.1",
-      "sha256": "1i9p2hzi61mvl5gxcs7rlavcl70pvjscnqjlxms35n4ziq3hzrk0",
-      "depends": ["RNOmni", "Rcpp", "RcppArmadillo", "SKAT"]
+      "version": "0.1.1.2",
+      "sha256": "08kvj731m0jvdh8ay7hgnijdj5bzhk5jzwz52gg8s69cilsql410",
+      "depends": ["CompQuadForm", "RNOmni", "Rcpp", "RcppArmadillo", "SKAT", "glue"]
     },
     "Allspice": {
       "name": "Allspice",
@@ -1083,8 +1155,8 @@
     },
     "AlphaSimR": {
       "name": "AlphaSimR",
-      "version": "1.6.0",
-      "sha256": "02cz2kppvw9ccx99r0i5afhqcprv1qsdbjq14r9v6b3pcpvsdvia",
+      "version": "1.6.1",
+      "sha256": "1ca9n5hfxiapy9nhcapsca4w4qxc8nwjdlysfjc8r68fgbm4m1aq",
       "depends": ["BH", "R6", "Rcpp", "RcppArmadillo", "Rdpack"]
     },
     "AlteredPQR": {
@@ -1095,8 +1167,8 @@
     },
     "Amelia": {
       "name": "Amelia",
-      "version": "1.8.2",
-      "sha256": "0gpw6aki06ji6yszp7n9mfy8zbxvdwv1xwjlx11aj2x2ghj4mcjg",
+      "version": "1.8.3",
+      "sha256": "0zwnaqis7dx07q1iinpqgrclmwp3xj2r3ihfmmhbvnp9ldf4b6bn",
       "depends": ["Rcpp", "RcppArmadillo", "foreign", "rlang"]
     },
     "AmesHousing": {
@@ -1179,8 +1251,8 @@
     },
     "Andromeda": {
       "name": "Andromeda",
-      "version": "0.6.6",
-      "sha256": "0k7w9jk9aw6pays5lg1spzac5kpka0i9vc2v5sxn2r4shbxr9yf9",
+      "version": "0.6.7",
+      "sha256": "1v3pg8vskr079yv8yg2lby8agvcc1jhkbr7nnvgz26fgb2nwfq3c",
       "depends": ["DBI", "RSQLite", "cli", "dbplyr", "dplyr", "hms", "pillar", "rlang", "tidyselect", "zip"]
     },
     "AnglerCreelSurveySimulation": {
@@ -1195,6 +1267,12 @@
       "sha256": "1bhqypkiw5v9w26jbdmhndqj5hjfmf7zwivrq2hgs0zcjxwa8gfn",
       "depends": ["ggplot2", "igraph"]
     },
+    "AnimalSequences": {
+      "name": "AnimalSequences",
+      "version": "0.2.0",
+      "sha256": "0aw51hailpv07qwsb1wjqnbn409l2w250naxic2zm0k670jam3m2",
+      "depends": ["apcluster", "dbscan", "dplyr", "fpc", "ggplot2", "ggraph", "igraph", "kernlab", "magrittr", "mclust", "naivebayes", "ranger", "rlang", "stringr", "tibble", "tidyr", "tidytext"]
+    },
     "AnnoProbe": {
       "name": "AnnoProbe",
       "version": "0.1.7",
@@ -1213,6 +1291,12 @@
       "sha256": "0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9",
       "depends": ["EnvStats", "actuar", "fitdistrplus", "mc2d", "tseries"]
     },
+    "AnomalyScore": {
+      "name": "AnomalyScore",
+      "version": "0.1",
+      "sha256": "0nxfl0fhkbz0cix82b5ial6cibrh22by4liqcnxgq8hillhfvnaf",
+      "depends": ["MASS", "RANN", "TSA", "astsa", "class", "dtw", "marima", "mvLSW", "transport"]
+    },
     "AntAngioCOOL": {
       "name": "AntAngioCOOL",
       "version": "1.2",
@@ -1285,11 +1369,17 @@
       "sha256": "1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh",
       "depends": ["CORElearn", "MASS", "ellipse", "lattice", "plyr", "reshape2"]
     },
+    "AquaAnalytix": {
+      "name": "AquaAnalytix",
+      "version": "0.1.0",
+      "sha256": "0basx8alcbzxwgizkgnwaii4g8j6jzbybnf9fq4dz573kjqb9285",
+      "depends": []
+    },
     "AquaBEHER": {
       "name": "AquaBEHER",
-      "version": "0.1.0",
-      "sha256": "0rgkwy1sfdkcjk69cncxd2zxlkn9kyvq8iwmz83d2gwzdzfbjqdd",
-      "depends": ["dplyr", "ggplot2", "lubridate", "raster", "sp"]
+      "version": "1.4.0",
+      "sha256": "0dq5dsd043lhifwwi9b052yxp5xlzvcc39jhbc84l6n78nhj01h2",
+      "depends": ["dplyr", "lubridate", "magrittr", "rlang", "sp", "terra", "zoo"]
     },
     "AquaEnv": {
       "name": "AquaEnv",
@@ -1333,6 +1423,12 @@
       "sha256": "0yffzc9jmyiil3p0bvf0fpq64mn55swcnizi3bgsl44d4j93y68q",
       "depends": []
     },
+    "Argentum": {
+      "name": "Argentum",
+      "version": "0.5.1",
+      "sha256": "0f0d69hrx5a1wf6cx3m11q9cq8igmd28rc9gl1c1x9n8ys0gv2f0",
+      "depends": ["httr", "readr", "sf", "xml2"]
+    },
     "AriGaMyANNSVR": {
       "name": "AriGaMyANNSVR",
       "version": "0.1.0",
@@ -1377,8 +1473,8 @@
     },
     "AssocBin": {
       "name": "AssocBin",
-      "version": "1.0-0",
-      "sha256": "16pl18b2jd45ys2cc4h74k2llc5daw8b727nmby4qdrja3qnifbr",
+      "version": "1.0-2",
+      "sha256": "0ral2sxq9y5basagx0ipk0ix2hnj9jkcc76fwjlg1v065bhci066",
       "depends": []
     },
     "AssocTests": {
@@ -1425,8 +1521,8 @@
     },
     "AtmChile": {
       "name": "AtmChile",
-      "version": "1.0.1",
-      "sha256": "0r8js8racs93vxbq62b44qj9m1vsp24dv81bmsg0a3smpk67zd46",
+      "version": "1.0.2",
+      "sha256": "1swcbxjk18qib7dshwr4x41l75fh72m9bnnll1x6nk1c5vwc5y36",
       "depends": ["DT", "data_table", "lubridate", "openair", "plotly", "shiny", "shinycssloaders"]
     },
     "AurieLSHGaussian": {
@@ -1449,8 +1545,8 @@
     },
     "AutoDeskR": {
       "name": "AutoDeskR",
-      "version": "0.1.3",
-      "sha256": "1n7c8ris8b517bs1wahpvrhwfbvn2q4jbq01kgiv9lfmkjckzfkc",
+      "version": "0.1.5",
+      "sha256": "06rpcs9qpqrydqvbawsrnxjvkrbhd525f89i3y5l518yyk2ldpcj",
       "depends": ["httr", "jsonlite", "shiny"]
     },
     "AutoPipe": {
@@ -1483,6 +1579,12 @@
       "sha256": "1kqdzz719r2bp37b6fn21njgbiyn7rrpms7jcjl8i0znwxkspd82",
       "depends": ["VGAM", "matlab2r", "moments"]
     },
+    "AutoWMM": {
+      "name": "AutoWMM",
+      "version": "1.0.1",
+      "sha256": "1ci2j65nzgckf70qp500xw943s7xgv18qiw2c9w3cfrg9ay1xnrs",
+      "depends": ["DiagrammeR", "MASS", "data_tree", "dplyr", "gtools", "magrittr", "rlang", "tidyselect"]
+    },
     "AutoWeatherIndices": {
       "name": "AutoWeatherIndices",
       "version": "0.1.0",
@@ -1507,6 +1609,12 @@
       "sha256": "0xr3sjfccvp8h18jqxzajb2pfn4nm8q9maic6k9zzr15fxvphiy5",
       "depends": []
     },
+    "AuxSurvey": {
+      "name": "AuxSurvey",
+      "version": "1.0",
+      "sha256": "1qg75i5gv2z2yv944ngjnayq946v0n09ixc3p54hw3vjy8hs6z2b",
+      "depends": ["BART", "coda", "dplyr", "gridExtra", "gtools", "mgcv", "rlang", "rstanarm", "stringr", "survey"]
+    },
     "AvInertia": {
       "name": "AvInertia",
       "version": "0.0.2",
@@ -1635,20 +1743,20 @@
     },
     "BAMBI": {
       "name": "BAMBI",
-      "version": "2.3.5",
-      "sha256": "16pb04n30y8sl6m6qgrdxk7sck98233cravpbzw4fzl2j8h0mm3r",
+      "version": "2.3.6",
+      "sha256": "1w6jhh9f336cmwjvchc0j05pn1q716644rr654937x5ify0l8y6i",
       "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "bridgesampling", "coda", "future_apply", "gtools", "label_switching", "lattice", "loo", "mvtnorm", "numDeriv", "qrng", "scales"]
     },
     "BAMMtools": {
       "name": "BAMMtools",
-      "version": "2.1.11",
-      "sha256": "0ymb1vwrzwg7gs4n3zjikg10ajk75r18j5rlgs25n4ab4fp6sibp",
+      "version": "2.1.12",
+      "sha256": "0hijnx2rlfhwxm2jvyam6nzfcxyff9fq69nz7cnnw2wald8y6s7y",
       "depends": ["Rcpp", "ape", "gplots"]
     },
     "BANAM": {
       "name": "BANAM",
-      "version": "0.2.1",
-      "sha256": "0jiw42icj0zzxpf51fxjbgqzjlp5s90nd8pgav4nlq70h4y64g2n",
+      "version": "0.2.2",
+      "sha256": "0mwvnqpcmsdwxrhm87r0k8yaq9fbjqpwva3a7pixcrcdmggqlb9j",
       "depends": ["BFpack", "Matrix", "bain", "extraDistr", "matrixcalc", "mvtnorm", "psych", "rARPACK", "sna", "tmvtnorm"]
     },
     "BANOVA": {
@@ -1663,6 +1771,12 @@
       "sha256": "0bcq6lvijq1vxri2dbhnqcn46f799h3ag974zgcdpx4c5apph04w",
       "depends": []
     },
+    "BAREB": {
+      "name": "BAREB",
+      "version": "0.1.2",
+      "sha256": "1h6lpgqk3q6fbx6zxnvfs7sfs7glsaiba97z494vpiiysfdwih8d",
+      "depends": ["Rcpp", "RcppArmadillo"]
+    },
     "BART": {
       "name": "BART",
       "version": "2.9.9",
@@ -1671,8 +1785,8 @@
     },
     "BAS": {
       "name": "BAS",
-      "version": "1.7.1",
-      "sha256": "1j76r9wl2limr7adlyr05n22q75sk8n03ar5bblpckcyrrqvpgr8",
+      "version": "1.7.5",
+      "sha256": "1h11lllvk9dhj63kzaibr71jvrlf944sy39grbg997r1z81g245g",
       "depends": []
     },
     "BASS": {
@@ -1701,8 +1815,8 @@
     },
     "BATSS": {
       "name": "BATSS",
-      "version": "0.7.14",
-      "sha256": "1252hxqdplbk12m6ri9fh4p4zy8q561n8ix6m2qy404idggklnxc",
+      "version": "1.0.0",
+      "sha256": "1rkzw4sz3qn09ihjwnwj35gafh196gcnl75xqjjimga5bd7y7m7s",
       "depends": ["R_utils", "abind", "cli", "plyr", "rlang"]
     },
     "BAYSTAR": {
@@ -1735,12 +1849,6 @@
       "sha256": "167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn",
       "depends": ["vegan"]
     },
-    "BBSSL": {
-      "name": "BBSSL",
-      "version": "0.1.0",
-      "sha256": "0vb3afbx8p3frliy92sf2wlmx32rasxj39i8d023m2dvsblbh50x",
-      "depends": ["Matrix", "glmnet", "greybox", "mvnfast", "rmutil", "statmod", "svMisc", "truncnorm"]
-    },
     "BBmisc": {
       "name": "BBmisc",
       "version": "1.13",
@@ -1857,8 +1965,8 @@
     },
     "BDgraph": {
       "name": "BDgraph",
-      "version": "2.72",
-      "sha256": "1kc3icd7glivbjlhl9fbmxqza5w2x000w0w8ii8np9gjrhdwrybw",
+      "version": "2.73",
+      "sha256": "0bf1y35rc96l09pb4fyb693wkl20pyvmqav1rw2h3h8pyyvqkalh",
       "depends": ["ggplot2", "igraph", "pROC"]
     },
     "BE": {
@@ -1881,8 +1989,8 @@
     },
     "BED": {
       "name": "BED",
-      "version": "1.5.2",
-      "sha256": "0js227vn6mvn7zk2q0vw9w9cp2ayjzqja6mrmpw9wnx82fp0amcg",
+      "version": "1.6.0",
+      "sha256": "0hma6wmrb6vqzhfsx5qgbsyw2kawpl80mmjac89xvfy1kmaz18qj",
       "depends": ["DT", "dplyr", "miniUI", "neo2R", "readr", "rstudioapi", "shiny", "stringr", "visNetwork"]
     },
     "BEDASSLE": {
@@ -1893,14 +2001,14 @@
     },
     "BEDMatrix": {
       "name": "BEDMatrix",
-      "version": "2.0.3",
-      "sha256": "1pq333x1shxw3wcqgcb4gqg6rwa0hyc24rib235q4zg10r2gyrbm",
+      "version": "2.0.4",
+      "sha256": "0dxkhag4jxjlbv8vx59l30rc9vc2m1szalapsxgm4mqd56llp52k",
       "depends": ["crochet"]
     },
     "BEKKs": {
       "name": "BEKKs",
-      "version": "1.4.4",
-      "sha256": "1ai475d1ya8j8kl4w6qdpdmsarz74p1799fc9hl0if2r3gv211vn",
+      "version": "1.4.5",
+      "sha256": "1gcbpmdbx9mq8nssl3bv4985v68j7p1d4ly21kg4fs2yy8z51m4x",
       "depends": ["GAS", "Rcpp", "RcppArmadillo", "future", "future_apply", "ggfortify", "ggplot2", "gridExtra", "ks", "lubridate", "mathjaxr", "moments", "numDeriv", "pbapply", "reshape2", "xts"]
     },
     "BEND": {
@@ -1909,12 +2017,6 @@
       "sha256": "1d4pl73q9dr0r3albxb5mvx84smn3fffi1c5cs7f5slfaigza0mx",
       "depends": ["coda", "label_switching", "rjags"]
     },
-    "BENMMI": {
-      "name": "BENMMI",
-      "version": "4.3-7",
-      "sha256": "1v96g4l1zkpvvx8jdifnafyaz4ml8v1bxbl97r1n5n6mgw88gk77",
-      "depends": ["benthos", "dplyr", "ggplot2", "jsonlite", "knitr", "markdown", "purrr", "readr", "tidyr", "xtable"]
-    },
     "BESTree": {
       "name": "BESTree",
       "version": "0.5.2",
@@ -1923,8 +2025,8 @@
     },
     "BET": {
       "name": "BET",
-      "version": "0.5.3",
-      "sha256": "1c2zz1nfjvaq6skk81hidimlbgajcl3zp5cnl3innh3yrl818wbl",
+      "version": "0.5.4",
+      "sha256": "13yc78idgdxp2sadx3pl8c8dffxinr0aywygbfmbz35zvwl7qa4r",
       "depends": ["Rcpp"]
     },
     "BETS": {
@@ -1953,15 +2055,15 @@
     },
     "BFS": {
       "name": "BFS",
-      "version": "0.5.8",
-      "sha256": "0s3q9v61msb5cn7pjbkppdf6bcfn6r40jjr8d289m95q1rr5wkn5",
-      "depends": ["curl", "dplyr", "fs", "httr2", "janitor", "lifecycle", "magrittr", "purrr", "pxweb", "rstac", "rvest", "sf", "tibble", "tidyRSS", "xml2", "zip"]
+      "version": "0.5.12",
+      "sha256": "1n5bw68sf03apji46p3dk702zhbach5f2qqfb5ija3w3zn7wma18",
+      "depends": ["curl", "dplyr", "fs", "httr2", "janitor", "lifecycle", "magrittr", "purrr", "pxweb", "rstac", "rvest", "sf", "tibble", "xml2", "zip"]
     },
     "BFpack": {
       "name": "BFpack",
-      "version": "1.3.0",
-      "sha256": "1ddcqcd8wzc1mc8d27kwv1xand8f4asvdirjbgncl5vs4akr924m",
-      "depends": ["Bergm", "MASS", "QRM", "bain", "ergm", "extraDistr", "lme4", "mvtnorm", "pracma", "sandwich"]
+      "version": "1.4.0",
+      "sha256": "0rdzkxcnv5nq78ic8hi5w3ci4r29b1a251hdka5drl7i2z2m590a",
+      "depends": ["Bergm", "MASS", "QRM", "bain", "coda", "ergm", "extraDistr", "lme4", "metaBMA", "mvtnorm", "pracma", "sandwich"]
     },
     "BGData": {
       "name": "BGData",
@@ -1983,14 +2085,14 @@
     },
     "BGGM": {
       "name": "BGGM",
-      "version": "2.1.3",
-      "sha256": "15yqbifnxlpwk25ki1yxfylkyb061375cxwq7dbid2381lvnslih",
+      "version": "2.1.5",
+      "sha256": "1n9dslghpaqki18v64is04zbrrlq08hg4b8s598n06019aqs5nzy",
       "depends": ["BFpack", "GGally", "MASS", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "Rdpack", "ggplot2", "ggridges", "mvnfast", "network", "reshape", "sna"]
     },
     "BGLR": {
       "name": "BGLR",
-      "version": "1.1.2",
-      "sha256": "0942navssynfjl6ka7ii1khv1y7idvl5sbcy6xd911mx74vnyirr",
+      "version": "1.1.3",
+      "sha256": "0850mzfbdbrhaahl4gv9rgw2lsbarhz783q15m18ws2a17v918p9",
       "depends": ["MASS", "truncnorm"]
     },
     "BGPhazard": {
@@ -2001,8 +2103,8 @@
     },
     "BGVAR": {
       "name": "BGVAR",
-      "version": "2.5.7",
-      "sha256": "1djccjwknghq33kzdyisfk0gxcqd54fmwad59kadgp39fah9hz9k",
+      "version": "2.5.8",
+      "sha256": "124vy9dx91sa42z6x4g4drai0gxz2l36p0nn4ng2r0hxj6z2m34x",
       "depends": ["GIGrvg", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "RcppProgress", "abind", "bayesm", "coda", "knitr", "readxl", "stochvol", "xts", "zoo"]
     },
     "BGmisc": {
@@ -2013,8 +2115,8 @@
     },
     "BH": {
       "name": "BH",
-      "version": "1.84.0-0",
-      "sha256": "1b7igvvy9f13l969a26j2bdzib2laq3m4w1x0xsxjb2pbxsn1dkg",
+      "version": "1.87.0-1",
+      "sha256": "14q3wq9aix8fsbd09dj3nbhh89wpbxzn2l8wk8l26apl6pk9m0jr",
       "depends": []
     },
     "BHAI": {
@@ -2175,8 +2277,8 @@
     },
     "BMA": {
       "name": "BMA",
-      "version": "3.18.17",
-      "sha256": "1xfsfyjwsk5bp2j50qfhfm1yla4fl2l53d85466a9y3rl57m333d",
+      "version": "3.18.19",
+      "sha256": "0hldrbl7bcf5rchc5vl8v1y679yjbxq8pca79pgc3g607pnddsh9",
       "depends": ["inline", "leaps", "robustbase", "rrcov", "survival"]
     },
     "BMAmevt": {
@@ -2275,12 +2377,6 @@
       "sha256": "1x9lz01fjdk0aybs6zsbbq2xfjvh99qiimmnrkbcd6sj880vn3a3",
       "depends": ["dplyr", "readr", "rvest", "tidyr", "tidyselect", "xml2"]
     },
-    "BOSO": {
-      "name": "BOSO",
-      "version": "1.0.4",
-      "sha256": "1g7277xw9bgq575x7fhjwpja6sfbg51di7hawxhmc57kvvmpx032",
-      "depends": ["MASS", "Matrix"]
-    },
     "BOSSreg": {
       "name": "BOSSreg",
       "version": "0.2.0",
@@ -2325,9 +2421,9 @@
     },
     "BREADR": {
       "name": "BREADR",
-      "version": "1.0.1",
-      "sha256": "1bvi3zvsqrin3jl2dwvrw18k9bbrhzcjhnr18sz9pmbgkfkjs4wk",
-      "depends": ["data_table", "dplyr", "forcats", "ggplot2", "ggpubr", "magrittr", "matrixStats", "purrr", "readr", "stringr", "tibble"]
+      "version": "1.0.2",
+      "sha256": "1hbjwf86575hqxbz3lz89r0sbzfr5cyy8jmid2jx4yj9f9lqc8h5",
+      "depends": ["MASS", "data_table", "dplyr", "forcats", "ggplot2", "ggpubr", "magrittr", "matrixStats", "purrr", "readr", "stringr", "tibble"]
     },
     "BRETIGEA": {
       "name": "BRETIGEA",
@@ -2343,8 +2439,8 @@
     },
     "BRISC": {
       "name": "BRISC",
-      "version": "1.0.5",
-      "sha256": "06ppm03clgnsqj6r9qq6fmz609sbigz35iw1qp1lijc4yvwlpr49",
+      "version": "1.0.6",
+      "sha256": "1pmi34xfiij053pqr04r13679khrilqmhw7jj527hbqdwnk53gjr",
       "depends": ["RANN", "matrixStats", "pbapply", "rdist"]
     },
     "BRL": {
@@ -2361,9 +2457,9 @@
     },
     "BRcal": {
       "name": "BRcal",
-      "version": "0.0.4",
-      "sha256": "0i24bgmj3px40j86yqp9rdx1s2xjbxckfbr8qsclbkzh6xl73ra0",
-      "depends": ["fields", "ggplot2", "nloptr"]
+      "version": "1.0.1",
+      "sha256": "1z8mr76rj8xdqsgny6hskbs3czgy23xqrjrhw9006y4mdhd39hbr",
+      "depends": ["fields", "ggplot2", "lifecycle", "nloptr"]
     },
     "BRugs": {
       "name": "BRugs",
@@ -2425,6 +2521,12 @@
       "sha256": "0dkhx8vx9kg902i6nzkzbighf2szq12l0p8iwinlpb2qdf526lk6",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "BSTZINB": {
+      "name": "BSTZINB",
+      "version": "1.0.1",
+      "sha256": "1zjvwvbldmr02lc3lyq1gggqfp62z6153za4rq18p45bj7r555vg",
+      "depends": ["BayesLogit", "MCMCpack", "boot", "coda", "dplyr", "ggplot2", "gt", "gtsummary", "maps", "matrixcalc", "msm", "reshape", "spam", "viridis"]
+    },
     "BSW": {
       "name": "BSW",
       "version": "0.1.1",
@@ -2457,8 +2559,8 @@
     },
     "BTSPAS": {
       "name": "BTSPAS",
-      "version": "2024.5.9",
-      "sha256": "0gc0ik2257zk6bjhwc78z53jg9a34s32wbwdqk25a6m5wvjp2qlj",
+      "version": "2024.11.1",
+      "sha256": "105hpyja93rjpfhxdr80fyx7nrsli0l113fr7nfwqbmsdyr96cgl",
       "depends": ["R2jags", "actuar", "coda", "data_table", "ggforce", "ggplot2", "gridExtra", "plyr", "reshape2", "scales"]
     },
     "BTSR": {
@@ -2467,6 +2569,12 @@
       "sha256": "0kqgy61ijalpclrm20xwjbvbb5pkhkbgsbdbsz0mrb4v30a05dh4",
       "depends": []
     },
+    "BTTL": {
+      "name": "BTTL",
+      "version": "1.0.0",
+      "sha256": "0vkp85mmdzch26l1y28ngd1mq5d7disha5jp01r2ranpb5whqjmr",
+      "depends": []
+    },
     "BTYD": {
       "name": "BTYD",
       "version": "2.4.3",
@@ -2487,8 +2595,8 @@
     },
     "BTtest": {
       "name": "BTtest",
-      "version": "0.10.2",
-      "sha256": "1p32i8fynjh3dkp1jk92v8wa3x9hw4hr9rjvsj6gz7cp79596fb3",
+      "version": "0.10.3",
+      "sha256": "1bp7x9j3ckndsga8q8j1k0vlz0pfsw6n6nmqwl2zzm9v2inc3jvi",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "BUCSS": {
@@ -2553,8 +2661,8 @@
     },
     "BalancedSampling": {
       "name": "BalancedSampling",
-      "version": "2.0.6",
-      "sha256": "1qkbsihk776h5na7dv68kab6qqbymfci9yvq0pnrlb5zb92fw32b",
+      "version": "2.1.1",
+      "sha256": "19a4fb2jnd2h6234radcylgbvmf6mf40hkqn9r2nmrmydvw883hq",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "Ball": {
@@ -2679,8 +2787,8 @@
     },
     "BayesCVI": {
       "name": "BayesCVI",
-      "version": "1.0.0",
-      "sha256": "1vm3nkgq7nc3d8zpxhb6p62yf4bhk2xdqkivdw94ml0npd4xsppb",
+      "version": "1.0.1",
+      "sha256": "0j2kaq0ssbs9d0y17kmj8p89g7gh8dpaa8wrf6ylm3jy27g8b48j",
       "depends": ["UniversalCVI", "e1071", "ggplot2", "mclust"]
     },
     "BayesCombo": {
@@ -2733,8 +2841,8 @@
     },
     "BayesFBHborrow": {
       "name": "BayesFBHborrow",
-      "version": "2.0.1",
-      "sha256": "1s291ins320iqfbrqixxaxvizc8ili27xqp0syy21cjc8y6yl2nn",
+      "version": "2.0.2",
+      "sha256": "0kaw4pmy2mjawsfs8s0h2m32p0cvg8wg33vfznpzvc40xymy2g4l",
       "depends": ["checkmate", "dplyr", "ggplot2", "invgamma", "magrittr", "mvtnorm", "survival"]
     },
     "BayesFM": {
@@ -2761,6 +2869,12 @@
       "sha256": "17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i",
       "depends": ["Bolstad2", "VGAM", "nleqslv", "orthopolynom"]
     },
+    "BayesGP": {
+      "name": "BayesGP",
+      "version": "0.1.3",
+      "sha256": "10nhb5dc5y2hkr06rvdddchanbglz2qvjzqsfvk1kxhxciy7bb0a",
+      "depends": ["LaplacesDemon", "Matrix", "RcppEigen", "TMB", "aghq", "fda", "numDeriv", "rstan", "sfsmisc", "tmbstan"]
+    },
     "BayesGPfit": {
       "name": "BayesGPfit",
       "version": "1.1.0",
@@ -2815,12 +2929,6 @@
       "sha256": "1jgv654k0qkspardlma2z7a854zw7zxk4fflc027wf7mlvs29b4h",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "ggplot2", "relations", "rlang", "sets", "testthat"]
     },
-    "BayesMassBal": {
-      "name": "BayesMassBal",
-      "version": "1.1.0",
-      "sha256": "1cgcx8kvn0bmn8kmq8ri3k98yx085d2qndislbwhn833ws6vkl88",
-      "depends": ["HDInterval", "LaplacesDemon", "Matrix", "Rdpack", "coda", "pracma", "tmvtnorm"]
-    },
     "BayesMixSurv": {
       "name": "BayesMixSurv",
       "version": "0.9.1",
@@ -2841,8 +2949,8 @@
     },
     "BayesMultiMode": {
       "name": "BayesMultiMode",
-      "version": "0.7.1",
-      "sha256": "0ij1igdnbk3wy01mdimk9k5ajxmx2plla0ykvsmijzz5mcmqyrii",
+      "version": "0.7.3",
+      "sha256": "10bvfhb5jrxhl5y6yqic6kh0mjfi5biy5f1x7cg4zlraqaj56f72",
       "depends": ["MCMCglmm", "Rdpack", "assertthat", "bayesplot", "dplyr", "ggplot2", "ggpubr", "gtools", "magrittr", "mvtnorm", "posterior", "sn", "stringr", "tidyr"]
     },
     "BayesNSGP": {
@@ -3009,10 +3117,16 @@
     },
     "BayesianFactorZoo": {
       "name": "BayesianFactorZoo",
-      "version": "0.0.0.2",
-      "sha256": "1w06hizaj4vxrhxv4jgr0s5ak1w0rr3j2zcdz7cf0mnrbg600dfd",
+      "version": "0.0.0.3",
+      "sha256": "026mfyfx8dzj1y97v7gi0kx3iq2fnrlyjd3pcszz1324fi87rpa5",
       "depends": ["MASS", "MCMCpack", "Matrix", "Rdpack", "coda", "ggplot2", "matrixcalc", "mvtnorm", "nse", "reshape2", "timeSeries"]
     },
+    "BayesianFitForecast": {
+      "name": "BayesianFitForecast",
+      "version": "1.0.0",
+      "sha256": "1z4mlr0ki2sy8p3qrc4qavmxiffcma9kpga7s8wc1f5k6frlv8mq",
+      "depends": ["bayesplot", "dplyr", "ggplot2", "openxlsx", "readxl", "rstan"]
+    },
     "BayesianGLasso": {
       "name": "BayesianGLasso",
       "version": "0.2.0",
@@ -3117,15 +3231,15 @@
     },
     "BeeBDC": {
       "name": "BeeBDC",
-      "version": "1.2.0",
-      "sha256": "1x2inx2rvlskzpjgivw0wndihsbbbw85nm0avg2csfk8388qwx9c",
+      "version": "1.2.1",
+      "sha256": "10gqj889m931m80ir5m5qz7mh2j5g8d2yc4yxakvjq4ipncvjvkm",
       "depends": ["CoordinateCleaner", "circlize", "cowplot", "dplyr", "forcats", "ggplot2", "ggspatial", "here", "igraph", "lubridate", "mgsub", "openxlsx", "paletteer", "readr", "rnaturalearth", "sf", "stringr", "tidyselect"]
     },
     "BeeGUTS": {
       "name": "BeeGUTS",
-      "version": "1.1.3",
-      "sha256": "1880bsgwal06i7q3la1f8alrhj43mnsim6n8inrnaqcbqgi69v3n",
-      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "odeGUTS", "rstan", "rstantools", "tidyr"]
+      "version": "1.3.0",
+      "sha256": "0sdd5k10hq6winh2jhlh87ramryfkrp608nhrhm6pc871g2fmg2r",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "gridExtra", "magrittr", "odeGUTS", "rstan", "rstantools", "tidyr"]
     },
     "Benchmarking": {
       "name": "Benchmarking",
@@ -3243,8 +3357,8 @@
     },
     "BiasCorrector": {
       "name": "BiasCorrector",
-      "version": "0.2.2",
-      "sha256": "0a6iiy4iw8w8s4kbjf6r0gji6izf1zdb99r8vfbvgzzwg2pxx4h4",
+      "version": "0.2.3",
+      "sha256": "1ligmx7c44faqpzfvcwp841wqbrbwwyh2xdr0hgp7g30qmlb5m1y",
       "depends": ["DT", "data_table", "magrittr", "rBiasCorrection", "shiny", "shinydashboard", "shinyjs"]
     },
     "BiasedUrn": {
@@ -3265,6 +3379,12 @@
       "sha256": "1vnwksw0j4lc2knlcmm5748pf4d7r44sn34s1mrv9p50hlnkk85p",
       "depends": ["MplusAutomation", "lavaan", "mirt", "mnormt", "tidyr"]
     },
+    "BigDataPE": {
+      "name": "BigDataPE",
+      "version": "0.0.9",
+      "sha256": "1m5hm221yib22dkzxb4fm7ngla642fjncksfdp7swzx0wla7p92n",
+      "depends": ["dplyr", "httr2", "keyring", "tibble"]
+    },
     "BigQuic": {
       "name": "BigQuic",
       "version": "1.1-13",
@@ -3285,8 +3405,8 @@
     },
     "BinGSD": {
       "name": "BinGSD",
-      "version": "0.0.1",
-      "sha256": "0ygr5na7s82xa6vv9f3j6ns5sfhdacyykl1fg422lpkwbss39dnn",
+      "version": "1.1",
+      "sha256": "0986203jjszha7sm7n63lwi9zlfwrla9g8mi1fm84dzjn9bc9dgi",
       "depends": ["mvtnorm"]
     },
     "BinMat": {
@@ -3369,8 +3489,8 @@
     },
     "BioM2": {
       "name": "BioM2",
-      "version": "1.0.9",
-      "sha256": "1x2d0y6jbwvdb8ixpi918g4apcmf018rk18s0h81qzbfp61l9yl3",
+      "version": "1.1.0",
+      "sha256": "0p0gzmb3kdfpa3w48f1g5s71z14w1g3m000ka7p9ifilajy9hrnh",
       "depends": ["CMplot", "ROCR", "WGCNA", "caret", "ggforce", "ggnetwork", "ggplot2", "ggpubr", "ggsci", "ggstatsplot", "ggthemes", "htmlwidgets", "igraph", "jiebaR", "mlr3", "mlr3verse", "uwot", "viridis", "webshot", "wordcloud2"]
     },
     "BioMark": {
@@ -3393,8 +3513,8 @@
     },
     "BioPred": {
       "name": "BioPred",
-      "version": "1.0.1",
-      "sha256": "04v38zsg5n5pzg817pkz2jg8sgg1ckd909ckrapbdncyh3wsawan",
+      "version": "1.0.2",
+      "sha256": "077pll9a224mi2g5za3l6a01h4azmw3ikp0pp9yig1lmrrc8c7lq",
       "depends": ["PropCIs", "car", "ggplot2", "mgcv", "onewaytests", "pROC", "survival", "survminer", "xgboost"]
     },
     "BioProbability": {
@@ -3427,10 +3547,16 @@
       "sha256": "0nwqfb65vhr2246w17nv27v186gzl5n3jxnqx7r9rq525qvyx0rg",
       "depends": ["biomaRt", "plotrix", "svglite"]
     },
+    "BioVizSeq": {
+      "name": "BioVizSeq",
+      "version": "1.0.0",
+      "sha256": "006b5pqqc685b7266i21zhyyv867cr0kdg031fg1lq5jgi03a5q1",
+      "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggtree", "httr", "magrittr", "seqinr", "shiny", "stringr", "tidyr", "treeio"]
+    },
     "BiocManager": {
       "name": "BiocManager",
-      "version": "1.30.23",
-      "sha256": "0k7kv06wksy3lkp37yf0kfnsbwf6fbac2vmrqip2wyy996y5vd7p",
+      "version": "1.30.25",
+      "sha256": "058ym2j400xj8v4k02b6r3wy3lrs1nk909f6x3hhydf7vibqpvw3",
       "depends": []
     },
     "Biodem": {
@@ -3451,6 +3577,12 @@
       "sha256": "1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib",
       "depends": ["Rcpp", "assertthat", "dplyr", "igraph"]
     },
+    "Bios2cor": {
+      "name": "Bios2cor",
+      "version": "2.2.2",
+      "sha256": "0y61g3l3g9918sa51imsk4kidyyrg7k1n3rdisrld1g6ckfarz62",
+      "depends": ["bigmemory", "bio3d", "circular", "igraph"]
+    },
     "Biostatistics": {
       "name": "Biostatistics",
       "version": "1.0.4",
@@ -3459,8 +3591,8 @@
     },
     "BiostatsUHNplus": {
       "name": "BiostatsUHNplus",
-      "version": "0.0.10",
-      "sha256": "0wrppamh4m47zczci3csqfijf2hyz4lb5ks2z8h2ybn8lcnbjxgp",
+      "version": "1.0.1",
+      "sha256": "1kyali61sgx3b5h9wi7n5v0lrs9i5vrbl3ncrhq8jacz70i75mq7",
       "depends": ["MCMCglmm", "afex", "coda", "cowplot", "dplyr", "forcats", "ggh4x", "ggplot2", "lifecycle", "modeest", "openxlsx", "plyr", "purrr", "reportRmd", "rlang", "rstatix", "stringi", "stringr", "tibble"]
     },
     "BipartiteModularityMaximization": {
@@ -3523,6 +3655,12 @@
       "sha256": "11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm",
       "depends": []
     },
+    "Blend": {
+      "name": "Blend",
+      "version": "0.1.0",
+      "sha256": "18dib7pb44z9kacmhsypvzpn3345m9wy042pf5vlli7wms5fz9zz",
+      "depends": ["Rcpp", "RcppArmadillo", "ggplot2"]
+    },
     "Blendstat": {
       "name": "Blendstat",
       "version": "1.0.5",
@@ -3573,8 +3711,8 @@
     },
     "Bolstad": {
       "name": "Bolstad",
-      "version": "0.2-41",
-      "sha256": "0rrx254wmr4i57h097ahba151chm8l2287qfg01p1lg47znld21h",
+      "version": "0.2.42",
+      "sha256": "0ldy6w911lcf8z0rckdbsn9246wlwiq8mnmqiq2pb8j5is6rqvn9",
       "depends": ["mvtnorm"]
     },
     "Bolstad2": {
@@ -3603,8 +3741,8 @@
     },
     "BoneProfileR": {
       "name": "BoneProfileR",
-      "version": "2.5",
-      "sha256": "0fmqzfqv08f0vpiwvl2gdix0fvk6w1jkpcv8jb9wgsq63fij0ly9",
+      "version": "3.1",
+      "sha256": "0r9fmrb2v0jlbp9f2c644v17hbdfz91dl6j87mgxwkpc472iz9w8",
       "depends": ["HelpersMG", "imager", "knitr", "rmarkdown", "shiny"]
     },
     "BoolFilter": {
@@ -3687,14 +3825,14 @@
     },
     "BoundaryStats": {
       "name": "BoundaryStats",
-      "version": "2.1.1",
-      "sha256": "06kz1d5fwiilqidiz2iry0fg7c5265fc40yrdgddd0aia75cf9jv",
-      "depends": ["fields", "ggplot2", "igraph", "magrittr", "pdqr", "rgeoda", "scales", "sf", "terra", "tibble"]
+      "version": "2.2.0",
+      "sha256": "0dwigyi25y93jb3hisx9d4rrfy202mia6wvbhgnh47ia6l7cdsis",
+      "depends": ["dplyr", "fields", "ggplot2", "igraph", "magrittr", "pdqr", "scales", "sf", "terra", "tibble"]
     },
     "BoutrosLab_plotting_general": {
       "name": "BoutrosLab.plotting.general",
-      "version": "7.1.0",
-      "sha256": "1rmd050sla0d3m2q4cadw84v7p9v05v0ifcbzind771sibr3vcji",
+      "version": "7.1.2",
+      "sha256": "0q5l0w0nlclz3k13mxwqd2j4q8hqy9lhywz6d7jx5lk3jq72gf5i",
       "depends": ["MASS", "cluster", "e1071", "gridExtra", "gtable", "hexbin", "lattice", "latticeExtra"]
     },
     "BradleyTerry2": {
@@ -3717,8 +3855,8 @@
     },
     "BranchGLM": {
       "name": "BranchGLM",
-      "version": "2.1.6",
-      "sha256": "05q9w2qq7pl9zw0nxnlvmj79cb8sc9r3w4d3n355vzhf9qnzbqk4",
+      "version": "3.0.1",
+      "sha256": "1d0cqrfh4p5wfljys3xm8brpmvycl6ix28qwillq1zyvbik9r1js",
       "depends": ["BH", "Rcpp", "RcppArmadillo"]
     },
     "Branching": {
@@ -3729,8 +3867,8 @@
     },
     "BrazilCrime": {
       "name": "BrazilCrime",
-      "version": "0.2",
-      "sha256": "17p8fgv7pqdx19fpgjax95bl90918w34qxfnhw6xy2wsmp28y6fn",
+      "version": "0.2.1",
+      "sha256": "194ckp3b6yini9z6nh953n7x0yp6x1zwvxg42z6pq5wsd07g76n5",
       "depends": ["dplyr", "geobr", "janitor", "openxlsx", "tidyr"]
     },
     "BrazilMet": {
@@ -3807,8 +3945,8 @@
     },
     "BuyseTest": {
       "name": "BuyseTest",
-      "version": "3.0.4",
-      "sha256": "17nf1wy5dyxigr7w2bfj34kx94y7qdh60ra2j6f4kkpy7q0awl3y",
+      "version": "3.0.5",
+      "sha256": "0lv9yj7r9sj1i67zfca6wagjjvxcvf8vv2i7475aaf9w5rlxpd9r",
       "depends": ["Rcpp", "RcppArmadillo", "data_table", "doSNOW", "foreach", "ggplot2", "lava", "prodlim", "riskRegression", "rlang", "scales"]
     },
     "Bvalue": {
@@ -3853,12 +3991,24 @@
       "sha256": "0fdi2ls0j10fky3jygqx93h8m1957cdbn1vxdi69bq08xf2c5n5h",
       "depends": ["ROCR", "Seurat", "dplyr", "pbapply", "pheatmap", "psych", "reshape2", "viridisLite"]
     },
+    "CADF": {
+      "name": "CADF",
+      "version": "0.1",
+      "sha256": "19wf16hcqrfrx595fzl6s3xx3chzyfwahqnzmkss803zz9sdxavw",
+      "depends": ["R6"]
+    },
     "CADFtest": {
       "name": "CADFtest",
       "version": "0.3-3",
       "sha256": "06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm",
       "depends": ["dynlm", "sandwich", "tseries", "urca"]
     },
+    "CAESAR_Suite": {
+      "name": "CAESAR.Suite",
+      "version": "0.1.0",
+      "sha256": "1ijyza7i7pw2mpqlg502crd7kmk0xg8ksbj0d9dnsddi87d7wy0y",
+      "depends": ["DescTools", "Matrix", "ProFAST", "Rcpp", "RcppArmadillo", "Seurat", "ade4", "furrr", "future", "ggplot2", "ggrepel", "irlba", "pbapply", "progress", "scater"]
+    },
     "CAGR": {
       "name": "CAGR",
       "version": "1.1.0",
@@ -3873,9 +4023,9 @@
     },
     "CALANGO": {
       "name": "CALANGO",
-      "version": "1.0.16",
-      "sha256": "1rs992i6xmisx180yyc6z7qlig9a4kj7r3vr5ysf6kcgycj72nj1",
-      "depends": ["BiocManager", "DT", "ape", "assertthat", "dendextend", "ggplot2", "heatmaply", "htmltools", "htmlwidgets", "knitr", "nlme", "pbmcapply", "pkgdown", "plotly", "rmarkdown", "taxize"]
+      "version": "1.0.20",
+      "sha256": "1fh42my2fs142qzq5b1q5b2zr8pbw12h1pp8c53z0ii0g5pz075h",
+      "depends": ["BiocManager", "DT", "ape", "assertthat", "dendextend", "ggplot2", "heatmaply", "htmltools", "htmlwidgets", "knitr", "nlme", "pbmcapply", "pkgdown", "plotly", "rmarkdown"]
     },
     "CALF": {
       "name": "CALF",
@@ -3889,12 +4039,6 @@
       "sha256": "1fspn6wgr0kc7j4ixx24c706kzrgjhi1b1w28izpfxm4r89zk08s",
       "depends": ["mice", "mvtnorm", "randomForest"]
     },
-    "CAMAN": {
-      "name": "CAMAN",
-      "version": "0.78",
-      "sha256": "10llppi2k3jq36mpig2djaf5kdx3ils2i1zvcypdry8xpkz80h9l",
-      "depends": ["mvtnorm", "sp"]
-    },
     "CAMML": {
       "name": "CAMML",
       "version": "1.0.0",
@@ -4021,6 +4165,12 @@
       "sha256": "0bdkx7phi58200jgijqmv5d7v2kiksj07sxx2sjmkd1dcjdy13zd",
       "depends": ["MASS", "MatchIt", "glmnet", "nnet", "numDeriv"]
     },
+    "CBRT": {
+      "name": "CBRT",
+      "version": "0.1.1",
+      "sha256": "1jrb71ri2am3pa8cy78ddliysrzi1m7yf5zsic8xaxisdh5yg8ch",
+      "depends": ["curl", "data_table"]
+    },
     "CBSr": {
       "name": "CBSr",
       "version": "1.0.5",
@@ -4053,9 +4203,9 @@
     },
     "CCAMLRGIS": {
       "name": "CCAMLRGIS",
-      "version": "4.1.1",
-      "sha256": "0ldgmkfjw16ncrjc1jglvq63zs7iwc67b9c4wxbrw8na344mvk94",
-      "depends": ["bezier", "dplyr", "lwgeom", "magrittr", "sf", "stars", "terra"]
+      "version": "4.2.0",
+      "sha256": "1yx589sfc3amwgq68cwbs4p4n3nn1i1kgd1hakvmpv10zn2v8fqa",
+      "depends": ["bezier", "dplyr", "isoband", "lwgeom", "magrittr", "sf", "terra"]
     },
     "CCM": {
       "name": "CCM",
@@ -4065,9 +4215,9 @@
     },
     "CCMMR": {
       "name": "CCMMR",
-      "version": "0.2",
-      "sha256": "0y1lfjicyw0gs2r5nrqhkzyzkdbs6brdrzgc98k5fam79nj7kcbv",
-      "depends": ["RANN", "Rcpp", "RcppEigen", "r2r"]
+      "version": "0.2.1",
+      "sha256": "02dd0qc3i2y7ir39wardzq6y9cdhwigiqbr9xpm8la5csyc0w3kh",
+      "depends": ["RANN", "Rcpp", "RcppEigen"]
     },
     "CCP": {
       "name": "CCP",
@@ -4075,6 +4225,12 @@
       "sha256": "067nf1gag3ya7v9vzcpvallga5dr243q0q07fd370k0zynmhcfby",
       "depends": []
     },
+    "CCSRfind": {
+      "name": "CCSRfind",
+      "version": "0.1.0",
+      "sha256": "0h1nr91d3b8hwl7b8djhrmcf7bbxdl2y6krbqd31zfm5ly1bd7cc",
+      "depends": ["knitr"]
+    },
     "CCTpack": {
       "name": "CCTpack",
       "version": "1.5.2",
@@ -4087,11 +4243,17 @@
       "sha256": "0in3pl1n48jal6f7kiyw60by11vbga8vr45x0wywghd7dz60ppfv",
       "depends": ["DT", "bs4Dash", "dplyr", "fresh", "magrittr", "plotly", "readr", "readxl", "rmarkdown", "shiny"]
     },
+    "CCd": {
+      "name": "CCd",
+      "version": "1.1",
+      "sha256": "0mkhh4nj6bzxxn5v8lrvznkpkk9qm5byk36dr486zrls6vy1qkqa",
+      "depends": ["Rfast"]
+    },
     "CDCPLACES": {
       "name": "CDCPLACES",
-      "version": "1.1.6",
-      "sha256": "0dhdh5k9wy62285mz2g02rl38r5nzpdhrbsa3l05z30ca459rh08",
-      "depends": ["curl", "dplyr", "httr", "httr2", "sf", "tidyr", "tigris", "usa", "yyjsonr", "zctaCrosswalk"]
+      "version": "1.1.8",
+      "sha256": "1hy6x2qicf1k7p00hpagm03h79xvw1d2wk04v74c4hlxxczyz29n",
+      "depends": ["curl", "sf", "tigris", "yyjsonr", "zctaCrosswalk"]
     },
     "CDFt": {
       "name": "CDFt",
@@ -4101,8 +4263,8 @@
     },
     "CDGHMM": {
       "name": "CDGHMM",
-      "version": "0.1.0",
-      "sha256": "18gf8p5h006h125dfygghxbkdbg26p77k632l2plhrpcgd3iszbw",
+      "version": "0.1.1",
+      "sha256": "0c43gfxgx2izs7hx2lkn4kws1nm94409258as72zdg123nf52hp8",
       "depends": ["MASS", "cluster", "mvtnorm", "ramify"]
     },
     "CDM": {
@@ -4113,14 +4275,14 @@
     },
     "CDMConnector": {
       "name": "CDMConnector",
-      "version": "1.5.0",
-      "sha256": "1ma5hjldcnsw6h007s1yyzv5iix8z8vz5yfxx5g3z74kwlpa4jjy",
-      "depends": ["DBI", "checkmate", "cli", "dbplyr", "dplyr", "fs", "generics", "glue", "jsonlite", "lifecycle", "omopgenerics", "purrr", "readr", "rlang", "stringi", "stringr", "tidyr", "tidyselect", "waldo", "withr"]
+      "version": "1.7.0",
+      "sha256": "18c5cqg47s2kql8i0p9p3ajvcsmq6bka5pr7yhy0krsl1c7y4267",
+      "depends": ["DBI", "checkmate", "cli", "dbplyr", "dplyr", "generics", "glue", "jsonlite", "lifecycle", "omopgenerics", "purrr", "readr", "rlang", "stringi", "stringr", "tidyr", "tidyselect", "withr"]
     },
     "CDSE": {
       "name": "CDSE",
-      "version": "0.2.0",
-      "sha256": "1ygjmx1snfcj0h7p733v3n2lrzwxr2iqlqrx44dxsz9iaffx5xzk",
+      "version": "0.2.1",
+      "sha256": "02hrgp5ir4sihfa9hzv1bnavzpmf6fzdz4w9bbq3cxqmn1wbm4i2",
       "depends": ["geojsonsf", "httr2", "jsonlite", "lubridate", "lutz", "sf", "terra"]
     },
     "CDSS": {
@@ -4147,10 +4309,16 @@
       "sha256": "1qzfxz72zpxi48djqhypqlmajk6rx91m0i997vsr0zry0dp2zrzb",
       "depends": ["Formula", "Matrix", "Rcpp", "RcppArmadillo", "RcppDist", "RcppEigen", "RcppNumerical", "RcppProgress", "ddpcr", "doParallel", "doRNG", "foreach", "formula_tools", "matrixcalc"]
     },
+    "CDsampling": {
+      "name": "CDsampling",
+      "version": "0.1.2",
+      "sha256": "1gv3yxakhj3qxl19fyf5xdgxr81fn7m3vcz0nff6kzpp1vhs2m1a",
+      "depends": ["Rglpk", "lpSolve"]
+    },
     "CEC": {
       "name": "CEC",
-      "version": "0.11.1",
-      "sha256": "02jk68lxx1gszpi7awi6c1qvc4bsjz8bjxq4rdka9fxj7ql27raf",
+      "version": "0.11.2",
+      "sha256": "17s3npc7bm18f95rcly6sp15f8bjvf5zsjcms6wdrlcybx7pn42v",
       "depends": []
     },
     "CEDA": {
@@ -4209,20 +4377,20 @@
     },
     "CFO": {
       "name": "CFO",
-      "version": "1.3.1",
-      "sha256": "0zm55sdj8z1lq5aar891pxrvww6dk42sz21i5ij2gk0gis820773",
-      "depends": ["Iso", "dplyr", "ggplot2", "pbapply", "survival"]
+      "version": "2.2.0",
+      "sha256": "1pkswzqpkh9x72h2i6a3i6d55awq2qknq7gd0k6l6gdn70g0x3df",
+      "depends": ["Iso", "RColorBrewer", "dplyr", "ggplot2", "pbapply", "scales", "survival"]
     },
     "CFilt": {
       "name": "CFilt",
-      "version": "0.2.1",
-      "sha256": "1iah41s0pd8s4vmg7r6npsgmfr6mvyp5wfnyimx51fqr2f3narwf",
+      "version": "0.3.0",
+      "sha256": "0gngc6z9ssrniycn1p2apjdhlz78ykbv51nxxr85rvqiiz1lx515",
       "depends": []
     },
     "CFtime": {
       "name": "CFtime",
-      "version": "1.4.0",
-      "sha256": "0sl7rccd2kgfv8y46x0mpg1m28y2lgn1mjar8shrg68m9lszwzj5",
+      "version": "1.4.1",
+      "sha256": "171xbi6jb2d88i15gian5p4lfjhrsyp3j99mbcrg3196dw1dfrjq",
       "depends": []
     },
     "CGE": {
@@ -4323,8 +4491,8 @@
     },
     "CICI": {
       "name": "CICI",
-      "version": "0.9.1",
-      "sha256": "0dd152f3ffasmwrhjgkd4i480cp2jkp2qy7w22xbzjm3c22mpbvz",
+      "version": "0.9.4",
+      "sha256": "171yxkmsvbcca4j4658v3cgkxgdf1psz4c9fvvwjvxad407vylfp",
       "depends": ["doParallel", "doRNG", "foreach", "ggplot2", "glmnet", "mgcv", "rngtools"]
     },
     "CIEE": {
@@ -4339,6 +4507,12 @@
       "sha256": "02l8rspiiv6vj6k0q6wpiazny3f2s4dsivsm7zb9cm90qh1rv2d7",
       "depends": []
     },
+    "CIMPLE": {
+      "name": "CIMPLE",
+      "version": "0.1.0",
+      "sha256": "0dd3p7p8zqyxvrwdy8yb15fgixi84k89wxbfcnjygcxws3a8kvjj",
+      "depends": ["JMbayes2", "dplyr", "lme4", "mice", "nleqslv", "nlme", "statmod", "survival"]
+    },
     "CIMTx": {
       "name": "CIMTx",
       "version": "1.2.0",
@@ -4389,8 +4563,8 @@
     },
     "CITMIC": {
       "name": "CITMIC",
-      "version": "0.1.0",
-      "sha256": "1dr8i1hpc5hq8jbv59frh8yxa8nykkwfi4hpa9rmlycqwwy9xp16",
+      "version": "0.1.2",
+      "sha256": "1vshnwbskhfz9kz041k5awwg8f3l1hpcnw57j1hnjw1jkidrbayr",
       "depends": ["fastmatch", "igraph"]
     },
     "CIfinder": {
@@ -4405,6 +4579,12 @@
       "sha256": "0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f",
       "depends": ["MASS", "multcomp"]
     },
+    "CIpostSelect": {
+      "name": "CIpostSelect",
+      "version": "0.2.1",
+      "sha256": "1fmkdjgnkqmm369n1lg7zbm3ccpq9cv105m18418q1qp4zdjfz8a",
+      "depends": ["MASS", "doParallel", "foreach", "ggplot2", "glmnet", "magrittr", "mlbench", "tictoc"]
+    },
     "CJAMP": {
       "name": "CJAMP",
       "version": "0.1.1",
@@ -4473,8 +4653,8 @@
     },
     "CLVTools": {
       "name": "CLVTools",
-      "version": "0.11.0",
-      "sha256": "102r2p8y9pr03gj3s7pn0chy56300gxffmnadm0qfklwl0mlv63g",
+      "version": "0.11.2",
+      "sha256": "0xfnsc7ma3sc21512ifkrrqh9s6fp5cjcbfxwly0d17vwax6w9zn",
       "depends": ["Formula", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppGSL", "data_table", "digest", "ggplot2", "lubridate", "numDeriv", "optimx", "testthat"]
     },
     "CLimd": {
@@ -4623,8 +4803,8 @@
     },
     "COMBO": {
       "name": "COMBO",
-      "version": "1.1.0",
-      "sha256": "0073cwbggmqgm13nmg8b6lq3gb5qid73nhh0jb0ldmabwn1bw3hk",
+      "version": "1.2.0",
+      "sha256": "1wvbiva8bvvfi6ph0lcfsf8g91kxa8qgzjpgkrra1sc8wi5sjjh9",
       "depends": ["Matrix", "SAMBA", "dplyr", "rjags", "tidyr", "turboEM"]
     },
     "COMIX": {
@@ -4635,9 +4815,9 @@
     },
     "COMMA": {
       "name": "COMMA",
-      "version": "1.0.0",
-      "sha256": "1yaac6kgx3912l8iac4ybhm9drs7hy5x4wxiyc4w35clkg6r76vc",
-      "depends": ["Matrix", "turboEM"]
+      "version": "1.1.1",
+      "sha256": "125dazk7s8p2g67dvm4zyfsgqcqmrr4vbf30xvgdldsambly5nmy",
+      "depends": ["Matrix", "doParallel", "dplyr", "foreach", "turboEM"]
     },
     "COMPoissonReg": {
       "name": "COMPoissonReg",
@@ -4653,8 +4833,8 @@
     },
     "COR": {
       "name": "COR",
-      "version": "0.0.1",
-      "sha256": "0flir1mwqqs418hwcwdg72a1r89hamf6zd8jaf8g7hm4lp3i1cgf",
+      "version": "0.2.0",
+      "sha256": "1w20csdyq3lzjyqz3cqz52vj82idq8qjrryqdzc87q97gxv0wlsy",
       "depends": []
     },
     "CORE": {
@@ -4665,8 +4845,8 @@
     },
     "CORElearn": {
       "name": "CORElearn",
-      "version": "1.57.3",
-      "sha256": "1kgnjl8g2njrc4xnsvz76mjzp2z93klps6k1msni1fsjbg0vvl05",
+      "version": "1.57.3.1",
+      "sha256": "1w7x6fc130df1sj5jymahdnzc457iajjz75cv00gr5nj6as4bfpf",
       "depends": ["cluster", "nnet", "plotrix", "rpart_plot"]
     },
     "COST": {
@@ -4693,6 +4873,12 @@
       "sha256": "1clbqpaz9awkhsglwbv84j277hh92141sla67dlzrs6j5iv4zkcs",
       "depends": ["RCurl", "dplyr", "httr", "magrittr", "projmgr", "readr", "readxl", "survey", "tibble", "timeDate"]
     },
+    "COveR": {
+      "name": "COveR",
+      "version": "1.1.0",
+      "sha256": "1didrpz284xdsq55j8sfg6ibx1g4k9m3dgfvx1798hgcr0n44hn0",
+      "depends": []
+    },
     "CP": {
       "name": "CP",
       "version": "1.8",
@@ -4785,8 +4971,8 @@
     },
     "CRE": {
       "name": "CRE",
-      "version": "0.2.6",
-      "sha256": "19clbz7x4sf8jxj0s77ym9k1k5hgd64myvvn5f3m6pxpnx7hskhl",
+      "version": "0.2.7",
+      "sha256": "0pbdbzxwgc3k03ki1kdzr3n57p0g0dd2c819bzwcg3i18h4ssc04",
       "depends": ["MASS", "RRF", "SuperLearner", "arules", "bartCause", "data_table", "gbm", "ggplot2", "glmnet", "logger", "magrittr", "randomForest", "stabs", "stringr", "xgboost", "xtable"]
     },
     "CREAM": {
@@ -4801,12 +4987,6 @@
       "sha256": "1llgxsmpk13gq75y2r3qiwwjcl87bknkryaw5dq0ndf17rj31mw8",
       "depends": ["MASS"]
     },
-    "CRF": {
-      "name": "CRF",
-      "version": "0.4-3",
-      "sha256": "0jlcc1ffd2z7sz1szbi4vrp5rihmcp18bsw27x02ivi6l21nyivf",
-      "depends": ["Matrix"]
-    },
     "CRM": {
       "name": "CRM",
       "version": "1.2.4",
@@ -4815,8 +4995,8 @@
     },
     "CRMetrics": {
       "name": "CRMetrics",
-      "version": "0.3.0",
-      "sha256": "1abrbkhhn5s3h4dam2pgmvqpqw0bpqzhj0521p7v48gsyfg224bw",
+      "version": "0.3.2",
+      "sha256": "1y70wpd553f75hq5hdv9y2hnb1p30bmsmmrf9vklrqwjj5q98fxg",
       "depends": ["Matrix", "R6", "cowplot", "dplyr", "ggbeeswarm", "ggplot2", "ggpmisc", "ggpubr", "ggrepel", "magrittr", "scales", "sccore", "sparseMatrixStats", "tibble", "tidyr"]
     },
     "CRTConjoint": {
@@ -4891,6 +5071,12 @@
       "sha256": "1p8wsl9h1f44a7kkj660h1k1v26pp6q1h13rw9l6pikniwdks84c",
       "depends": ["ROCR", "caTools", "data_table", "mco", "rpart", "zoo"]
     },
+    "CSTE": {
+      "name": "CSTE",
+      "version": "3.0.0",
+      "sha256": "1wjw81sval74wndiz178fr759qgl673clv69kjyvra2hrq902ayf",
+      "depends": ["Rcpp", "dfoptim", "fda", "locpol", "survival"]
+    },
     "CSTools": {
       "name": "CSTools",
       "version": "5.2.0",
@@ -4933,6 +5119,12 @@
       "sha256": "078h48y42skjdknamyznnl2g7jl3vicdggmx7w7rd3wc1lnm7l8f",
       "depends": ["stringi", "stringr"]
     },
+    "CTRing": {
+      "name": "CTRing",
+      "version": "0.1.0",
+      "sha256": "1gi8xmd7hs23war2ixxgbmmkairrmbjdfmlkrzbaqlbwl3pgz5r9",
+      "depends": ["functional", "oro_dicom", "xRing"]
+    },
     "CTShiny": {
       "name": "CTShiny",
       "version": "0.1.0",
@@ -4963,6 +5155,18 @@
       "sha256": "1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7",
       "depends": ["CTT", "foreign", "shiny"]
     },
+    "CTTvis": {
+      "name": "CTTvis",
+      "version": "0.1.1",
+      "sha256": "1mi0rj496wv7iqpf0m4l18x1hjv0g8qmklkbgrx28293dc30x9q4",
+      "depends": ["CTT"]
+    },
+    "CTxCC": {
+      "name": "CTxCC",
+      "version": "0.2.0",
+      "sha256": "0igh3lrvsbgw8xjwf6nkypshasq0i4mh78x4i5k2m2k227bxak7k",
+      "depends": ["CompQuadForm", "combinat", "expm", "matrixcalc", "mvtnorm"]
+    },
     "CUB": {
       "name": "CUB",
       "version": "1.1.5",
@@ -5013,9 +5217,9 @@
     },
     "CVXR": {
       "name": "CVXR",
-      "version": "1.0-14",
-      "sha256": "1nvwym5fwkyqkw8dpar571kr5695w7yrih6w9vnhswikp717q0jd",
-      "depends": ["ECOSolveR", "Matrix", "R6", "Rcpp", "RcppEigen", "Rmpfr", "bit64", "clarabel", "gmp", "osqp", "scs"]
+      "version": "1.0-15",
+      "sha256": "13435gwqgdaw7xxxza5k9p10z2wjlw9x5d1znj03h44k6wm1jfy1",
+      "depends": ["ECOSolveR", "Matrix", "Rcpp", "RcppEigen", "Rmpfr", "bit64", "cli", "gmp", "osqp", "scs"]
     },
     "CVglasso": {
       "name": "CVglasso",
@@ -5119,6 +5323,12 @@
       "sha256": "0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd",
       "depends": ["ape", "fields", "pheatmap", "scatterplot3d"]
     },
+    "CareDensity": {
+      "name": "CareDensity",
+      "version": "0.1.0",
+      "sha256": "1pgjb2qr0d7zlrr1iay4dn348snf607jf75m09p6kfdkihpiflqv",
+      "depends": ["MatrixExtra", "data_table", "igraph"]
+    },
     "CarletonStats": {
       "name": "CarletonStats",
       "version": "2.2",
@@ -5151,8 +5361,8 @@
     },
     "CaseCohortCoxSurvival": {
       "name": "CaseCohortCoxSurvival",
-      "version": "0.0.34",
-      "sha256": "0qb9sqqycdqk89qxm4cch0x62d004ybsxrrv6q0yzg6bc581jx0j",
+      "version": "0.0.36",
+      "sha256": "13qb83x566m41kqy7jql6pfha2p9sr26bxqmkga7nwx6ddl7270p",
       "depends": ["nnet", "survival"]
     },
     "CatDataAnalysis": {
@@ -5241,9 +5451,9 @@
     },
     "CausalQueries": {
       "name": "CausalQueries",
-      "version": "1.1.1",
-      "sha256": "0bivanhgimfnw1dn16ggyj6yjjq1j3jv05xwixqcg96zdnw5va4z",
-      "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppEigen", "StanHeaders", "dagitty", "dirmult", "dplyr", "ggdag", "ggplot2", "knitr", "latex2exp", "lifecycle", "rlang", "rstan", "rstantools", "stringr"]
+      "version": "1.3.1",
+      "sha256": "0cvagjv4nqa42wcwnhp9jlpzvqlpr6wipwxmlamwdbfb0bb64lk7",
+      "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppEigen", "StanHeaders", "dirmult", "dplyr", "ggplot2", "ggraph", "knitr", "latex2exp", "lifecycle", "rlang", "rstan", "rstantools", "stringr"]
     },
     "CautiousLearning": {
       "name": "CautiousLearning",
@@ -5253,8 +5463,8 @@
     },
     "CePa": {
       "name": "CePa",
-      "version": "0.8.0",
-      "sha256": "1wjm6nyjaz3z0g2dxk1k82va86qxx2xsgx02y9ipyzf1ldxclm1s",
+      "version": "0.8.1",
+      "sha256": "1nhcr9pyn2swv8jmqm26gl9plxr7qln3mjylmyawc94ayhnj45g0",
       "depends": ["Rgraphviz", "graph", "igraph"]
     },
     "CeRNASeek": {
@@ -5295,8 +5505,8 @@
     },
     "Certara_NLME8": {
       "name": "Certara.NLME8",
-      "version": "1.2.4",
-      "sha256": "10zmzfx2aqxj5gpingl6hkq6vb7q0shhkzar2jr30br7nzfll1sd",
+      "version": "3.0.1",
+      "sha256": "0ddwlrkb1cxjkpq12fy7ig3vp1wyxgvfa6lsvdbm111r6xbwz79j",
       "depends": ["batchtools", "data_table", "reshape", "xml2"]
     },
     "Certara_R": {
@@ -5305,6 +5515,24 @@
       "sha256": "07k7dj37zywkfbrx85gnl6cvc0a0n1xyvmac0lg74nzqb6qb3i1z",
       "depends": ["DT", "batchtools", "data_table", "dplyr", "ggplot2", "htmltools", "jsonlite", "magrittr", "plotly", "remotes", "reshape", "rlang", "shiny", "shinyWidgets", "shinyjqui", "shinyjs", "shinymaterial", "sortable", "ssh", "xml2"]
     },
+    "Certara_RsNLME": {
+      "name": "Certara.RsNLME",
+      "version": "3.0.1",
+      "sha256": "1b531ilcmlz4h538a3jp3lywmsp2ibdfhrwpxms8wrpmpfwvkpdx",
+      "depends": ["Certara_NLME8", "assertthat", "data_table", "jsonlite", "ssh", "xml2"]
+    },
+    "Certara_RsNLME_ModelBuilder": {
+      "name": "Certara.RsNLME.ModelBuilder",
+      "version": "3.0.1",
+      "sha256": "0bdgkrmlyyjrj97zrydfh0d8662wn9ayvnj9bqs561y0zy871fmr",
+      "depends": ["Certara_RsNLME", "DT", "bslib", "data_table", "fs", "ggforce", "ggplot2", "htmltools", "htmlwidgets", "magrittr", "shiny", "shinyAce", "shinyWidgets", "shinyjs", "shinymeta"]
+    },
+    "Certara_VPCResults": {
+      "name": "Certara.VPCResults",
+      "version": "3.0.2",
+      "sha256": "1jlqcg7g0ppmynk70rcnv78mcxm6y5zjmzznf8zv0hlzinvv3h3f",
+      "depends": ["DT", "bslib", "colourpicker", "data_table", "dplyr", "ggplot2", "htmltools", "plotly", "rlang", "scales", "shiny", "shinyAce", "shinyWidgets", "shinycssloaders", "shinyjqui", "shinyjs", "shinymeta", "sortable", "tidyvpc"]
+    },
     "ChainLadder": {
       "name": "ChainLadder",
       "version": "0.2.19",
@@ -5377,6 +5605,18 @@
       "sha256": "0jyi0l29wqzrzgdlp3cbp8sdvi70rqzicy1wvb73anxa5r9pvjlf",
       "depends": ["gsl"]
     },
+    "ChessGmooG": {
+      "name": "ChessGmooG",
+      "version": "0.1.0",
+      "sha256": "00szz48avd3cnis5xbvgqj3fkvcy5w0v57i8pbd8ga4jl59308zg",
+      "depends": []
+    },
+    "ChestVolume": {
+      "name": "ChestVolume",
+      "version": "1.0.0",
+      "sha256": "01mg1a3cbsajdp5qnlswx89skq036p76racz5lmjpd5s9bwlclax",
+      "depends": ["dplyr", "geometry", "ggplot2", "plotly", "readxl", "tidyr"]
+    },
     "ChillModels": {
       "name": "ChillModels",
       "version": "1.0.2",
@@ -5397,14 +5637,14 @@
     },
     "ChoiceModelR": {
       "name": "ChoiceModelR",
-      "version": "1.3.0",
-      "sha256": "1i8025av3k24zv1ll98l1526v2pdkzda23gjy6c30vknvyrcxkc0",
+      "version": "1.3.1",
+      "sha256": "0kn64wa2da0kimg92nn9hw96yr6li69k309b7kh5g1dsz9p30bki",
       "depends": []
     },
     "CholWishart": {
       "name": "CholWishart",
-      "version": "1.1.2",
-      "sha256": "0lms6bnd0czb25ir4ls0lxv4d2ygqiq8ampnv9j7l6hj28xmqyjj",
+      "version": "1.1.4",
+      "sha256": "1rnd0f2vx43fi6x4xqgaxlyl64s8l474zv1wj1wqvkfg0njglzb2",
       "depends": []
     },
     "CircMLE": {
@@ -5475,9 +5715,9 @@
     },
     "Claddis": {
       "name": "Claddis",
-      "version": "0.6.3",
-      "sha256": "0wq34n6vj5sdc22yf9p4g9iy8ssgr4kkrsr2ak4sqahadwgngl8i",
-      "depends": ["ape", "clipr", "geoscale", "phytools", "strap"]
+      "version": "0.7.0",
+      "sha256": "1a5zfqv94bfk24g99r4yaqsydny0sl638zhm4k175xc250yraj7p",
+      "depends": ["ape", "clipr", "geoscale", "multicool", "partitions", "phytools", "strap"]
     },
     "ClaimsProblems": {
       "name": "ClaimsProblems",
@@ -5509,6 +5749,12 @@
       "sha256": "1ijybrl1x2rb70x6q07bbyv5mm0gw927wnf94mhz199z4s37iv4g",
       "depends": ["Biostrings", "pwalign"]
     },
+    "Cleanet": {
+      "name": "Cleanet",
+      "version": "1.0.0",
+      "sha256": "1vv1x8g3nwinic6ksqyrxkip1xb1sim9fjrj9h28rrcrasg3f561",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppHNSW", "dplyr", "ggplot2", "magrittr", "readr", "reshape2", "tibble", "tidyr"]
+    },
     "CleaningValidation": {
       "name": "CleaningValidation",
       "version": "1.0",
@@ -5569,6 +5815,12 @@
       "sha256": "0vyn1j4qfxgh65jrq7wmm8nfw78vqllmrsdbzspl7hgf5zh477k1",
       "depends": []
     },
+    "ClinTrialPredict": {
+      "name": "ClinTrialPredict",
+      "version": "0.0.4",
+      "sha256": "0ib70qbggng1l7dflllggm1xpg3fglyd308apdc27mmk2pm29rr6",
+      "depends": []
+    },
     "ClinicalTrialSummary": {
       "name": "ClinicalTrialSummary",
       "version": "1.1.1",
@@ -5671,6 +5923,12 @@
       "sha256": "0ss7zsnamh8ir2wpgy6swxck93yr4dd7g7hvyzc1cv6g3k28fb49",
       "depends": ["ClusterR", "copula", "dplyr", "ggplot2", "knitr", "magrittr", "rlang", "tidyr"]
     },
+    "ClustMC": {
+      "name": "ClustMC",
+      "version": "0.1.1",
+      "sha256": "1b7l5b9h93qyfh8bbk70a0cyrv4d37vm2d141y743d3vyr711l8y",
+      "depends": ["cli", "dplyr", "lifecycle", "magrittr", "procs", "psych", "usedist"]
+    },
     "ClustOfVar": {
       "name": "ClustOfVar",
       "version": "1.1",
@@ -5715,8 +5973,8 @@
     },
     "ClusterVAR": {
       "name": "ClusterVAR",
-      "version": "0.0.7",
-      "sha256": "1596imfnk0kfygw3p7pcn3wkcppkq15rqvm1sdn3kfykwcb794jr",
+      "version": "0.0.8",
+      "sha256": "1h8m0kpkdg975a9xhydr35rj9vkl2adldwshi68plk7k8dpa4azq",
       "depends": ["MASS", "doParallel", "fastDummies", "foreach", "iterators", "mvtnorm", "parabar", "scales"]
     },
     "ClusteredMutations": {
@@ -5757,8 +6015,8 @@
     },
     "CoImp": {
       "name": "CoImp",
-      "version": "2.0.0",
-      "sha256": "0g6fd0rzab5wn19iljr5zjbffrgs9nyljjccwb0fnarmp48lfrwk",
+      "version": "2.0.2",
+      "sha256": "1bd3y4aqmjgk5894rc2vp7z245gshmlyralyywghyrg3dhnhsd8z",
       "depends": ["cluster", "copula", "gtools", "locfit", "nnet"]
     },
     "CoMiRe": {
@@ -5817,14 +6075,14 @@
     },
     "CodelistGenerator": {
       "name": "CodelistGenerator",
-      "version": "3.1.0",
-      "sha256": "045jkffcyawk72w7x1gxh6i0y8aigj59g2cn6qflr0x8jpxwg4x9",
-      "depends": ["DBI", "PatientProfiles", "RJSONIO", "checkmate", "cli", "dplyr", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "tidyselect", "vctrs", "visOmopResults"]
+      "version": "3.3.1",
+      "sha256": "1kd0d0jn6x3837va4ndd6k5ni1ikyhzn2vmnzgf08da8wyb8ni66",
+      "depends": ["DBI", "PatientProfiles", "RJSONIO", "checkmate", "cli", "dplyr", "glue", "lubridate", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "tidyselect", "vctrs", "visOmopResults"]
     },
     "CohensdpLibrary": {
       "name": "CohensdpLibrary",
-      "version": "0.5.10",
-      "sha256": "1d3nk3wr23skmzskglw7n8vpj9ja6ak4q9db9xlmf1j3plsx5g98",
+      "version": "0.5.11",
+      "sha256": "16zsjc6n05ffk35qrdslgvzdva9cwq7by1vsjr3y35zv4wcvnxd8",
       "depends": ["Rdpack"]
     },
     "CohortAlgebra": {
@@ -5835,15 +6093,15 @@
     },
     "CohortCharacteristics": {
       "name": "CohortCharacteristics",
-      "version": "0.2.2",
-      "sha256": "11cg3shf62njzpqh6wahgpg2c1ymqf4xkn6ip6ymab7dvq2w12wh",
-      "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "dplyr", "magrittr", "omopgenerics", "rlang", "snakecase", "stringr", "tidyr", "visOmopResults"]
+      "version": "0.4.0",
+      "sha256": "04b3y7ar8wgjhzqs4dx0sdlqs2zfhcyhdpk4m6g09c4vx110vs6s",
+      "depends": ["CDMConnector", "PatientProfiles", "cli", "dplyr", "lifecycle", "omopgenerics", "purrr", "rlang", "snakecase", "stringr", "tidyr", "visOmopResults"]
     },
     "CohortConstructor": {
       "name": "CohortConstructor",
-      "version": "0.2.2",
-      "sha256": "0wpfawsvdbllbr7vm83agyzcw64fjn4pwl1hzqm966iim118ch7n",
-      "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "dbplyr", "dplyr", "glue", "magrittr", "omopgenerics", "purrr", "rlang", "tidyr"]
+      "version": "0.3.3",
+      "sha256": "1cwwznd4si0ch50mplzycc33m5zcic7r0psvggds0wrhc6b4dqnq",
+      "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "magrittr", "omopgenerics", "purrr", "rlang", "tidyr"]
     },
     "CohortExplorer": {
       "name": "CohortExplorer",
@@ -5851,6 +6109,12 @@
       "sha256": "1jskxg72g7n5n3zg2kmkhykcrbf30q0h919273n6lm6nw0pzn44d",
       "depends": ["DatabaseConnector", "ParallelLogger", "checkmate", "dplyr", "lifecycle", "rlang"]
     },
+    "CohortGenerator": {
+      "name": "CohortGenerator",
+      "version": "0.11.2",
+      "sha256": "02fsdwswdpgv0cf2naqj9p0fv8qxvcsani68dl05hcnsj7qrhgs6",
+      "depends": ["DatabaseConnector", "ParallelLogger", "R6", "RJSONIO", "ResultModelManager", "SqlRender", "checkmate", "digest", "dplyr", "jsonlite", "lubridate", "readr", "rlang", "stringi", "tibble"]
+    },
     "CohortPlat": {
       "name": "CohortPlat",
       "version": "1.0.5",
@@ -5859,15 +6123,15 @@
     },
     "CohortSurvival": {
       "name": "CohortSurvival",
-      "version": "0.5.2",
-      "sha256": "02p0n7nhwa50z3w3q20nx2pp6sdkbyqwmk7ix7s2cc8i7qxxhlfl",
-      "depends": ["CDMConnector", "DBI", "PatientProfiles", "broom", "checkmate", "cli", "dbplyr", "dplyr", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "scales", "stringr", "survival", "tibble", "tidyr", "visOmopResults"]
+      "version": "0.6.1",
+      "sha256": "1x6pnji3x7wflrgc4yspwib53fa9mf4q00cbd6zq4yka8gx0jj8v",
+      "depends": ["CDMConnector", "DBI", "PatientProfiles", "broom", "checkmate", "cli", "dbplyr", "dplyr", "lifecycle", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"]
     },
     "CohortSymmetry": {
       "name": "CohortSymmetry",
-      "version": "0.1.2",
-      "sha256": "13qv4fa673lnq3jyp97bbrcax0sw0lk2w2xxy8vyb8jnf5ajlydr",
-      "depends": ["CDMConnector", "CodelistGenerator", "DrugUtilisation", "PatientProfiles", "dplyr", "duckdb", "flextable", "ggplot2", "gt", "here", "magrittr", "omock", "omopgenerics", "rlang", "stringr", "tibble", "tidyr", "visOmopResults"]
+      "version": "0.2.0",
+      "sha256": "09q5vgxppba5hfhcs1dhybc89xh3pb5wlq5a6d76a7gnybxhmmyq",
+      "depends": ["CDMConnector", "CodelistGenerator", "DrugUtilisation", "PatientProfiles", "dplyr", "duckdb", "here", "omock", "omopgenerics", "rlang", "tibble", "tidyr", "visOmopResults"]
     },
     "Coinprofile": {
       "name": "Coinprofile",
@@ -5875,6 +6139,12 @@
       "sha256": "1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0",
       "depends": ["Rdpack", "coin", "exactRankTests", "ggplot2", "plyr", "zoo"]
     },
+    "ColOpenData": {
+      "name": "ColOpenData",
+      "version": "0.3.1",
+      "sha256": "1432552jj0mszpmm5n21a4phf5i54v8g5wvh1wzyn6svq480hisj",
+      "depends": ["checkmate", "config", "dplyr", "magrittr", "rlang", "sf", "stringdist", "tidyr"]
+    },
     "CollapseLevels": {
       "name": "CollapseLevels",
       "version": "0.3.0",
@@ -5883,8 +6153,8 @@
     },
     "CollocInfer": {
       "name": "CollocInfer",
-      "version": "1.0.4",
-      "sha256": "1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj",
+      "version": "1.0.5",
+      "sha256": "1yfaslk2p1fzfsqbd71y40iahcf1vj5zwmsbiiw4abnx7lly4a3i",
       "depends": ["MASS", "Matrix", "deSolve", "fda", "spam"]
     },
     "ColorNameR": {
@@ -5895,8 +6165,8 @@
     },
     "Colossus": {
       "name": "Colossus",
-      "version": "1.1.1",
-      "sha256": "01mra2ai88p10qwmsc1ph4kpgyvd4f3crk2gl5w782qggfgfabv8",
+      "version": "1.1.4.2",
+      "sha256": "1544qyqxwyw3hdqx0prpp79lla8h9h05r8ypvkcvh1gdwxh9cr3x",
       "depends": ["Rcpp", "RcppEigen", "callr", "data_table", "processx", "rlang", "stringr", "testthat"]
     },
     "ComICS": {
@@ -5937,8 +6207,8 @@
     },
     "CommonDataModel": {
       "name": "CommonDataModel",
-      "version": "0.2.0",
-      "sha256": "1yxksxv9dma2f6l3asg165f6hn9f6w4ws04xfprnb100sm0zq1z0",
+      "version": "1.0.1",
+      "sha256": "01q9z1pmji87pk0bcign3p9fj8f5zvx1b2whpxv8mkh01zw28wdm",
       "depends": ["DBI", "DatabaseConnector", "SqlRender", "dplyr", "rJava", "readr", "rmarkdown", "stringr"]
     },
     "CommonJavaJars": {
@@ -5973,8 +6243,8 @@
     },
     "CompExpDes": {
       "name": "CompExpDes",
-      "version": "1.0.1",
-      "sha256": "1nx2ndv42vxaxv3g2cfd7n0xsdb0kdcaa2b43rf2yazyc8a5hdw1",
+      "version": "1.0.6",
+      "sha256": "0m2a0yw07aq89ji5gif3dxp9lbn594igbqmmc2dn9dbwwj3czhyh",
       "depends": []
     },
     "CompGR": {
@@ -6027,8 +6297,8 @@
     },
     "CompareTests": {
       "name": "CompareTests",
-      "version": "1.2",
-      "sha256": "1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi",
+      "version": "1.3",
+      "sha256": "076hk4af6klmf4r4zbpkcaalv3b80d0mk7fkambziwcnh0hicc5j",
       "depends": []
     },
     "ComparisonSurv": {
@@ -6057,9 +6327,9 @@
     },
     "Compositional": {
       "name": "Compositional",
-      "version": "6.9",
-      "sha256": "09xv3r9g5bkn2ra11zswvly1x9bj7xq1z39fd2kl0w3vxg9mjih1",
-      "depends": ["MASS", "Matrix", "Rfast", "Rfast2", "Rnanoflann", "cluster", "doParallel", "emplik", "energy", "foreach", "glmnet", "mda", "minpack_lm", "mixture", "mvhtests", "nnet", "quadprog", "quantreg", "regda", "sn"]
+      "version": "7.2",
+      "sha256": "0n9hg8vpzj8ckbkkfk48rlmkh7k3kv7q355qz96cr4cfdj2ilzj5",
+      "depends": ["MASS", "Matrix", "Rfast", "Rfast2", "Rnanoflann", "bigstatsr", "cluster", "doParallel", "emplik", "energy", "foreach", "glmnet", "mda", "minpack_lm", "mixture", "nnet", "quadprog", "quantreg", "sn"]
     },
     "CompositionalML": {
       "name": "CompositionalML",
@@ -6067,12 +6337,24 @@
       "sha256": "1gnr8iqgwx461gm0ff1gvi6j8rw19a1lhz560hcq7sgymzp66l5r",
       "depends": ["Boruta", "Compositional", "Rfast", "Rfast2", "doParallel", "e1071", "foreach", "ranger"]
     },
+    "CompositionalRF": {
+      "name": "CompositionalRF",
+      "version": "1.0",
+      "sha256": "0brm03d9ypdc9k1klwmwb818gj7b1jr2z3968gs1qnnd8r8sr0bn",
+      "depends": ["Compositional", "MultivariateRandomForest", "Rfast", "doParallel", "foreach"]
+    },
     "CompoundEvents": {
       "name": "CompoundEvents",
       "version": "0.3.0",
       "sha256": "184dqy6dw6mrw1xpim335fmfnv0a8gmn2siqb4d5fa2rn5vghmcn",
       "depends": []
     },
+    "ComradesM": {
+      "name": "ComradesM",
+      "version": "0.1.1",
+      "sha256": "0z1fxmsbswd6cnv4r557g55a8lsiwwv13v6i5kw8yayg9xh43knx",
+      "depends": []
+    },
     "ConConPiWiFun": {
       "name": "ConConPiWiFun",
       "version": "0.4.6.1",
@@ -6111,8 +6393,8 @@
     },
     "CondCopulas": {
       "name": "CondCopulas",
-      "version": "0.1.3",
-      "sha256": "0yfph755iwdmkf453jkcf71i25z1v604swh7ggbbdv2awsb4isd9",
+      "version": "0.1.4.1",
+      "sha256": "0ad7yapm0vv681d17wqrsvms5nma1wk6hl2ashhrpfzwlndadw0v",
       "depends": ["VineCopula", "data_tree", "glmnet", "nnet", "ordinalNet", "pbapply", "statmod", "tree", "wdm"]
     },
     "CondIndTests": {
@@ -6139,6 +6421,12 @@
       "sha256": "0xm3vh3vmf16faa3934100rnrg4rvlqkgjlsqa2smzcvy5vb86z4",
       "depends": []
     },
+    "ConfMatrix": {
+      "name": "ConfMatrix",
+      "version": "0.1.0",
+      "sha256": "0f7wk0sdfqbrbnyjdjx0vssmf03ddp9b64jl7scmv5lfvy2y6zk2",
+      "depends": ["R6", "Rdpack", "ggplot2", "gridExtra"]
+    },
     "ConfZIC": {
       "name": "ConfZIC",
       "version": "1.0.1",
@@ -6169,6 +6457,12 @@
       "sha256": "1qyw4shzgaaqmcn6yb52xaxrfwrji980j87baz4ngzckd60n77fi",
       "depends": ["caret", "dplyr", "furrr", "magrittr", "purrr", "tidyr"]
     },
+    "CongressData": {
+      "name": "CongressData",
+      "version": "1.5.4",
+      "sha256": "0hbsbszcwj81p2jnsh9k3ggnn2l0xvj0yk0c9fvqnlqhm07zm3l1",
+      "depends": ["curl", "dplyr", "fst", "rlang", "stringr", "tidyselect"]
+    },
     "CongreveLamsdell2016": {
       "name": "CongreveLamsdell2016",
       "version": "1.0.3",
@@ -6181,18 +6475,18 @@
       "sha256": "02nvk5ya9gr06ai8qnjw0xq6hfbrr91b6lx9gq08dbrnmpbmyvqz",
       "depends": ["dplyr", "ggplot2", "miceadds", "mitools", "ppcor", "stringdist", "stringr"]
     },
+    "ConjointChecks": {
+      "name": "ConjointChecks",
+      "version": "0.2.0",
+      "sha256": "0z995ns8253qv1nfwsgbmzgxy3mwb5yckdqr0i61y3fcl6vl51bk",
+      "depends": ["Rcpp"]
+    },
     "ConnMatTools": {
       "name": "ConnMatTools",
       "version": "0.3.5",
       "sha256": "082y4xxnp42xa7db5hnbc9qlvkb50wwb3wzi0my04l55a9s0ril7",
       "depends": []
     },
-    "ConnectednessApproach": {
-      "name": "ConnectednessApproach",
-      "version": "1.0.3",
-      "sha256": "1vbnj2r4x8pfzdagky33xz9kpb23d7vz5ddgms8fp15zjilsz2nw",
-      "depends": ["L1pack", "MASS", "PerformanceAnalytics", "car", "frequencyConnectedness", "glmnet", "igraph", "moments", "progress", "quantreg", "riskParityPortfolio", "rmgarch", "rugarch", "urca", "xts", "zoo"]
-    },
     "ConsRank": {
       "name": "ConsRank",
       "version": "2.1.4",
@@ -6237,9 +6531,9 @@
     },
     "ContourFunctions": {
       "name": "ContourFunctions",
-      "version": "0.1.1",
-      "sha256": "00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s",
-      "depends": []
+      "version": "0.1.2",
+      "sha256": "0p18zd9fq7p130b47wsbpqhgqximfmrf5pvhbzscrz2ji7rhsnmr",
+      "depends": ["ggplot2", "lhs", "rlang", "rmarkdown"]
     },
     "ConvergenceClubs": {
       "name": "ConvergenceClubs",
@@ -6303,15 +6597,15 @@
     },
     "CopernicusDEM": {
       "name": "CopernicusDEM",
-      "version": "1.0.4",
-      "sha256": "00rpdfspyd94jr2ahw7dc661wdgxnxzcxgg40yn48c1v6hxjhfhp",
+      "version": "1.0.5",
+      "sha256": "16j3r7b0rhyhrll2l62g4hphzczryb23j6maxd8vvcscbljg9i3b",
       "depends": ["doParallel", "foreach", "glue", "sf"]
     },
     "CopernicusMarine": {
       "name": "CopernicusMarine",
-      "version": "0.2.3",
-      "sha256": "09kv2c7lkbnpzfs0i48dp3gvx6mwn89q0y3f4hbmm9iiyksrdw2i",
-      "depends": ["crayon", "dplyr", "httr2", "leaflet", "purrr", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "xml2"]
+      "version": "0.2.4",
+      "sha256": "06jx1lq3f2w1iyw500q8da9i8vbwqj5cqjb6i9cnm0syvcsqpixc",
+      "depends": ["crayon", "dplyr", "httr2", "leaflet", "purrr", "rlang", "sf", "stringr", "tidyr", "xml2"]
     },
     "Copula_Markov": {
       "name": "Copula.Markov",
@@ -6327,14 +6621,14 @@
     },
     "Copula_surv": {
       "name": "Copula.surv",
-      "version": "1.6",
-      "sha256": "177m79nc9gwnfxai0gdw7id0212rxp34rpcp0b7j79r3zncwnb6i",
-      "depends": []
+      "version": "1.7",
+      "sha256": "1qmgbizmrjsprimlx2d32fx2w51xy021jq62fl9r7nwxfjgr3rak",
+      "depends": ["MASS"]
     },
     "CopulaCenR": {
       "name": "CopulaCenR",
-      "version": "1.2.3",
-      "sha256": "1z1a9hrb5v784j46yc2dsbizbis8pb5zdbc4cky8yws7swiax5m1",
+      "version": "1.2.4",
+      "sha256": "107d49bsym7jwfikrq6i6r35nsbfxf3fcdga3aqag7p22nw0nvps",
       "depends": ["VineCopula", "boot", "caret", "copBasic", "copula", "corpcor", "flexsurv", "foreach", "icenReg", "magrittr", "plotly", "pracma", "survival"]
     },
     "CopulaGAMM": {
@@ -6351,8 +6645,8 @@
     },
     "CopulaREMADA": {
       "name": "CopulaREMADA",
-      "version": "1.6.2",
-      "sha256": "101ys5mqr51cj1rcvqc2mzanxil3z3pb4m1y3kwlzw3jz4cygrmk",
+      "version": "1.7.3",
+      "sha256": "1kfw3q3i5nzha6bn74m3xvbv67d24w0m43mhad402wdcyx6rvh8v",
       "depends": ["matlab", "mc2d", "statmod", "tensor"]
     },
     "CorBin": {
@@ -6363,15 +6657,9 @@
     },
     "CorMID": {
       "name": "CorMID",
-      "version": "0.1.9",
-      "sha256": "08dr6c3pvich7arbq0ak9s356s29ynw4v6s1mz5bw9kddrrlswlq",
-      "depends": ["Rdisop", "plyr"]
-    },
-    "Corbi": {
-      "name": "Corbi",
-      "version": "0.6-2",
-      "sha256": "13lbh6fcfrpgz459mjdnfkd8kys2350s8j0vv9ps18092264gh42",
-      "depends": ["CRF", "MASS", "Matrix", "igraph"]
+      "version": "0.2.1",
+      "sha256": "1hj5sr9ig3qaqvc0ah8bqizyjrmwn9c8lm6b9hpamfnm1m9llcy8",
+      "depends": []
     },
     "CoreMicrobiomeR": {
       "name": "CoreMicrobiomeR",
@@ -6385,17 +6673,11 @@
       "sha256": "04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5",
       "depends": ["SpatialTools", "checkmate", "data_table", "minpack_lm", "ranger", "vcd"]
     },
-    "CoronaNetR": {
-      "name": "CoronaNetR",
-      "version": "0.3.0",
-      "sha256": "1qqlkcbwmr9g8rnsgb7dd1npd09sva11y6fy1g7l4wdvmpw07ymh",
-      "depends": ["R_utils", "httr", "readr"]
-    },
     "CorrBin": {
       "name": "CorrBin",
-      "version": "1.6.1",
-      "sha256": "07nxara80zjpvaqjfjpwi2aw909wp1jj0v42dd0s06w00v502438",
-      "depends": ["boot", "combinat", "dirmult", "geepack", "mvtnorm"]
+      "version": "1.6.2",
+      "sha256": "0dzd25a43rr22si9jpscgwglmf5s8q6gg5hch69xcbh3rarxqcd4",
+      "depends": ["boot", "combinat", "dirmult", "mvtnorm"]
     },
     "CorrMixed": {
       "name": "CorrMixed",
@@ -6549,9 +6831,15 @@
     },
     "Cronbach": {
       "name": "Cronbach",
-      "version": "0.1",
-      "sha256": "1gkapi7pgf1mwidhgdf3y5cm4bz5igzb7mdflz560aa67asp1qyf",
-      "depends": ["boot"]
+      "version": "0.2",
+      "sha256": "0c9lc6w9lba0j530n3kyrsvr9gn75gddbc6igns5friaz5j6jrla",
+      "depends": ["Rfast", "boot"]
+    },
+    "CropBreeding": {
+      "name": "CropBreeding",
+      "version": "0.1.0",
+      "sha256": "053jml7sp39gm2kgiaydvhbn0a7jr0hz27x53m8sj4fx979mc5md",
+      "depends": ["dplyr", "metan", "rlang"]
     },
     "CropScapeR": {
       "name": "CropScapeR",
@@ -6567,9 +6855,9 @@
     },
     "CrossCarry": {
       "name": "CrossCarry",
-      "version": "0.2.0",
-      "sha256": "0l65mxajhzdxwwx31mlfx38fsgkwd9iziyn8a6cca9pjhkf7qldg",
-      "depends": ["dplyr", "gee", "geepack", "ggplot2"]
+      "version": "0.4.0",
+      "sha256": "1nls5knpjfdbzwg8mapkinmmpafs4lpk6x0fayh16f6g5yvk2dr8",
+      "depends": ["MASS", "dplyr", "gee", "ggplot2"]
     },
     "CrossClustering": {
       "name": "CrossClustering",
@@ -6669,14 +6957,14 @@
     },
     "CvmortalityMult": {
       "name": "CvmortalityMult",
-      "version": "1.0.3",
-      "sha256": "04ad10sgmhy4n3c76l46sn5j1k62yfh4ipldln1kfkygl3zis1xf",
+      "version": "1.0.7",
+      "sha256": "0khfgzs0disnh089pyca04660gj5h3ycm49pndchcwpc7kp8yz80",
       "depends": ["StMoMo", "forecast", "gnm", "sf", "tmap"]
     },
     "Cyclops": {
       "name": "Cyclops",
-      "version": "3.4.1",
-      "sha256": "1zz6jgzsjswzafya43fabqcgfhwn65sk8lx023hhn33vw844sv5p",
+      "version": "3.5.0",
+      "sha256": "01kr39m0z1jmc08klvyzqzm6ja682rgxb4ahliy3v66c1243ixfg",
       "depends": ["Andromeda", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "bit64", "dplyr", "rlang", "survival"]
     },
     "CytOpT": {
@@ -6723,9 +7011,9 @@
     },
     "D4TAlink_light": {
       "name": "D4TAlink.light",
-      "version": "2.1.14",
-      "sha256": "1cpvi5jzlyvwygyzv4smi3qcr3gx85s7bfjspsfkz9011aqb1aci",
-      "depends": ["jsonlite", "openssl", "rmarkdown"]
+      "version": "2.1.17",
+      "sha256": "1qpsc9wqz427ym9p577xyzqfnsmfs4v20jmp9hvk2m2gbck32zwv",
+      "depends": ["Biobase", "feather", "getPass", "jsonlite", "officedown", "openssl", "openxlsx", "reticulate", "rmarkdown"]
     },
     "DA": {
       "name": "DA",
@@ -6765,8 +7053,8 @@
     },
     "DAISIEprep": {
       "name": "DAISIEprep",
-      "version": "0.4.0",
-      "sha256": "0ch3mc725lip67fpbk405rv3bai44w13vvjlspv8y6jzmb5jg6bp",
+      "version": "1.0.0",
+      "sha256": "0blm4nprjms5ylmxcl90qim9qv27l59bgl5fz6wy1j7pn6zgkgxs",
       "depends": ["DAISIE", "ape", "castor", "ggplot2", "ggtree", "phylobase", "rlang", "scales", "tibble"]
     },
     "DAKS": {
@@ -6837,8 +7125,8 @@
     },
     "DBItest": {
       "name": "DBItest",
-      "version": "1.8.1",
-      "sha256": "0vj7989s9qip3mxjzffrm7prh0xxpp467y9m4ls7dz7m3b7inpxl",
+      "version": "1.8.2",
+      "sha256": "1zm3y5fsmsyz4bi3fqvl3zp13jjbi029i21xi4l81h7wxrc8p5y5",
       "depends": ["DBI", "blob", "callr", "desc", "hms", "lubridate", "magrittr", "nanoarrow", "palmerpenguins", "rlang", "testthat", "withr"]
     },
     "DBModelSelect": {
@@ -6975,14 +7263,14 @@
     },
     "DDHFm": {
       "name": "DDHFm",
-      "version": "1.1.3",
-      "sha256": "1xkjbhqipz6kqd6kw9682q5sbrvbpq4jn8nms3cv63b8x9nl1k55",
+      "version": "1.1.4",
+      "sha256": "0cjwig5hr2y59csfwcmlinpp2qfvngwbb5anj7iyydp4j0ywdgqk",
       "depends": ["lokern", "wavethresh"]
     },
     "DDIwR": {
       "name": "DDIwR",
-      "version": "0.18",
-      "sha256": "1gwyp4pwy6hs4hwpl5w106mrk0f9sfl8lgcqxr8f3l1hl9hc31sl",
+      "version": "0.19",
+      "sha256": "1mwdprr1qkp1s6cb8zkaqg1jwj9jahmb9valvrdq0i11rip3a49n",
       "depends": ["admisc", "base64enc", "declared", "digest", "haven", "readxl", "writexl", "xml2"]
     },
     "DDL": {
@@ -7051,6 +7339,12 @@
       "sha256": "040hfpvqwl8r0iazwpnq7fmkydsxqc7mck7wbjqf6c19cw3zziz7",
       "depends": ["car", "dplyr", "foreach", "ggplot2", "ggpubr", "ggrepel", "glmmTMB", "parglm", "tibble"]
     },
+    "DEHOGT": {
+      "name": "DEHOGT",
+      "version": "0.99.0",
+      "sha256": "01r45xzy1bhh3fprcqnnibhlmn5nhv08l897js137k4gnb1jc5mn",
+      "depends": ["MASS", "doParallel", "foreach"]
+    },
     "DELTD": {
       "name": "DELTD",
       "version": "2.6.8",
@@ -7071,8 +7365,8 @@
     },
     "DEPONS2R": {
       "name": "DEPONS2R",
-      "version": "1.2.3",
-      "sha256": "1l09nl6dvm0h005m7wpic95d710qv0v7q4ac67cr5zsr2l0prj1z",
+      "version": "1.2.4",
+      "sha256": "0nzjjc62z6szy2wi1bzackd0ij66msfbjg7kaa79za96k71hvhxg",
       "depends": ["jsonlite", "raster", "sf", "sp", "terra", "xml2"]
     },
     "DES": {
@@ -7081,6 +7375,12 @@
       "sha256": "16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31",
       "depends": []
     },
+    "DEXiR": {
+      "name": "DEXiR",
+      "version": "1.0.2",
+      "sha256": "1a1z5pcw6mcm04fww498mbxxv677wk00dv9xhgniixasnnsmmysl",
+      "depends": ["stringr", "xml2"]
+    },
     "DEoptim": {
       "name": "DEoptim",
       "version": "2.2-8",
@@ -7089,10 +7389,22 @@
     },
     "DEoptimR": {
       "name": "DEoptimR",
-      "version": "1.1-3",
-      "sha256": "1526g3fzii8kcy29gy6gjvaw4k9cxxidq8bh7m4j485h0wdsdn4d",
+      "version": "1.1-3-1",
+      "sha256": "18kjq2gcqnicmbdpg5pkzsa4wvy20fprqdkh115k34l6pm176ssq",
       "depends": []
     },
+    "DEploid": {
+      "name": "DEploid",
+      "version": "0.5.6",
+      "sha256": "1mm83kia4jp6r8dqbav76kapdmz0nzx685815f3aybpqgpj3hnxf",
+      "depends": ["DEploid_utils", "Rcpp", "htmlwidgets", "magrittr", "plotly", "rmarkdown", "scales"]
+    },
+    "DEploid_utils": {
+      "name": "DEploid.utils",
+      "version": "0.0.1",
+      "sha256": "1b2ky80sdcym8pzn7awr5s9c93sfqwr2yr6vvqncmwlwmx10chyq",
+      "depends": ["Rcpp", "combinat", "magrittr", "scales"]
+    },
     "DFA": {
       "name": "DFA",
       "version": "1.0.0",
@@ -7101,9 +7413,9 @@
     },
     "DFA_CANCOR": {
       "name": "DFA.CANCOR",
-      "version": "0.2.8",
-      "sha256": "1i0bf9w4f0djwqsmwjiyfxnvsj220bmk4vfvz3l4l0wmdxil9cda",
-      "depends": ["BayesFactor", "MVN"]
+      "version": "0.3.6",
+      "sha256": "0fvrzsj1drc08bnfi2n636ps6wq09hniz457fvhhj3siagafd7ls",
+      "depends": ["BayesFactor", "MASS", "MVN", "mvoutlier"]
     },
     "DFBA": {
       "name": "DFBA",
@@ -7113,9 +7425,9 @@
     },
     "DFD": {
       "name": "DFD",
-      "version": "0.1.0",
-      "sha256": "1msyfzcxrqz9wq675ml00sigsyg94wl36yw4759fkr1q99iggxcc",
-      "depends": ["gprofiler2", "signatureSearch", "signatureSearchData", "stringr"]
+      "version": "0.2.0",
+      "sha256": "11nqhhngxhb2zk63zychkxi55jqrxr28yz4l9vin29hd391wqwzd",
+      "depends": ["ggplot2", "ggpubr", "gprofiler2", "gridExtra", "scales", "signatureSearch", "signatureSearchData", "stringr"]
     },
     "DFIT": {
       "name": "DFIT",
@@ -7161,8 +7473,8 @@
     },
     "DHARMa": {
       "name": "DHARMa",
-      "version": "0.4.6",
-      "sha256": "0wsb59w6z8mwag2wfiqs8237sk5rf2w7z7araxa6pzslsdf3vz9j",
+      "version": "0.4.7",
+      "sha256": "0mfywr4pshnd13xs2zdhd8xvbc43qxaj075jhy8lrlg1agmc6gya",
       "depends": ["Matrix", "ape", "gap", "lme4", "lmtest", "qgam"]
     },
     "DHBins": {
@@ -7177,6 +7489,12 @@
       "sha256": "1j4jgwi5skjr4h8gyphkfjxhx80f0x6bhqb81711bhq5zp3bl59l",
       "depends": ["crayon", "dplyr", "haven", "matrixStats", "reshape", "rlang", "survey"]
     },
+    "DICEM": {
+      "name": "DICEM",
+      "version": "0.1.0",
+      "sha256": "099z5ns939az3nkajw179cc02ldagpwyvb9bhbvkvaxz5cpfn3j0",
+      "depends": ["Matrix", "doc2concrete", "politeness", "quanteda", "stringr", "vader", "xgboost"]
+    },
     "DICOMread": {
       "name": "DICOMread",
       "version": "0.0.0.3",
@@ -7197,9 +7515,9 @@
     },
     "DIDmultiplegtDYN": {
       "name": "DIDmultiplegtDYN",
-      "version": "1.0.15",
-      "sha256": "050cjc66ydidqc633kyw5l7s7jlcpjj8nyaqkcwkgcxx349rag5m",
-      "depends": ["car", "cowplot", "data_table", "dplyr", "ggplot2", "haven", "lmtest", "magrittr", "matlib", "plm", "rlang", "rnames", "sandwich", "xlsx"]
+      "version": "2.0.0",
+      "sha256": "0mcvac2p0sd0prxaj1ajigil4k9k9bm3y68lxxbrmhjrcn8n5n18",
+      "depends": ["car", "cowplot", "data_table", "dplyr", "ggplot2", "haven", "lmtest", "matlib", "plm", "rnames", "sandwich", "xlsx"]
     },
     "DIFM": {
       "name": "DIFM",
@@ -7261,6 +7579,12 @@
       "sha256": "0868918aa0nxhgmczpbpf9i06x9ik18vff51cdb4i9q405mal6sj",
       "depends": []
     },
+    "DIRMR": {
+      "name": "DIRMR",
+      "version": "0.5.0",
+      "sha256": "0j089k7ylyfyw9xrimhkkc79xafkcfv0bcz6albc1i6xnq5fqhpa",
+      "depends": ["MASS", "lava", "mvtnorm"]
+    },
     "DISTRIB": {
       "name": "DISTRIB",
       "version": "1.0",
@@ -7275,9 +7599,9 @@
     },
     "DIZutils": {
       "name": "DIZutils",
-      "version": "0.1.2",
-      "sha256": "1kra2b1qbbs6yf5aqlianszqbybni4iqzks0gxg5hdmdzphzb0hb",
-      "depends": ["DBI", "DIZtools", "Hmisc", "RJDBC", "RJSONIO", "RPostgres", "data_table", "psych", "xml2"]
+      "version": "0.1.3",
+      "sha256": "18rdv0qzlk93p0pdngqbj58bjsgy68n114fnl6nzc56x89570vx7",
+      "depends": ["DBI", "DIZtools", "Hmisc", "RJDBC", "RJSONIO", "RPostgres", "RPresto", "data_table", "httr", "psych", "xml2"]
     },
     "DIconvex": {
       "name": "DIconvex",
@@ -7345,6 +7669,12 @@
       "sha256": "1fjpkn32rx8m18k6pr2cf180wqr01f9kviqibwsghnkrhbzcgpiy",
       "depends": []
     },
+    "DMCfun": {
+      "name": "DMCfun",
+      "version": "4.0.1",
+      "sha256": "0r68ax8yic138wwy5ndf72vfsjlw12f3v5afyn748is86s6vnj76",
+      "depends": ["BH", "DEoptim", "Rcpp", "dplyr", "pbapply", "tidyr"]
+    },
     "DMMF": {
       "name": "DMMF",
       "version": "0.5.2.0",
@@ -7389,8 +7719,8 @@
     },
     "DNAmotif": {
       "name": "DNAmotif",
-      "version": "0.1.0",
-      "sha256": "0w7fzvssnvymrpx3444svawkags6bvcbajasvk5n0fvyyx1i1jhz",
+      "version": "0.1.1",
+      "sha256": "1cdbickgjdf766m4cka9vl3x4zdw071w54ycj3l60xhcd8gxn8b1",
       "depends": ["Biostrings", "Rcpp"]
     },
     "DNAseqtest": {
@@ -7473,9 +7803,9 @@
     },
     "DOYPAColors": {
       "name": "DOYPAColors",
-      "version": "0.0.1",
-      "sha256": "0d8xsnl910hmcvd38mqbdnl7nvx3y9f065y90dqq36pcqvrd57h1",
-      "depends": ["ggplot2"]
+      "version": "0.0.2",
+      "sha256": "0ranqbczq65gdqm0csanmphcnnqxkxm8jiw61f1z1cz3rb7bhd5n",
+      "depends": ["ggplot2", "gridExtra"]
     },
     "DOvalidation": {
       "name": "DOvalidation",
@@ -7497,26 +7827,26 @@
     },
     "DPQ": {
       "name": "DPQ",
-      "version": "0.5-8",
-      "sha256": "0wdhx937dp2lmcqzf64jrbg7a20r6rjvdjrpyzn072r94zn2r4dz",
+      "version": "0.5-9",
+      "sha256": "04bmsqp4mkrf4y1s161ql77f2zpqi66cyqyz9xpzgdf0dizsvn50",
       "depends": ["sfsmisc"]
     },
     "DPQmpfr": {
       "name": "DPQmpfr",
-      "version": "0.3-2",
-      "sha256": "0inj9i876bx2d9pvbazl0q1x2anc4raknay4y9iqkqskm72pwkvp",
+      "version": "0.3-3",
+      "sha256": "0m0dyiy0mj1rg59lk90kk7lnhvgxs2k9ycbpc8sxwx3raf20gdy6",
       "depends": ["DPQ", "Rmpfr", "gmp", "sfsmisc"]
     },
     "DPTM": {
       "name": "DPTM",
-      "version": "1.5.0",
-      "sha256": "1qjk6q4kx7mlzmp15gz468ky6jia3pf16jxyzjhf857z4yi5szl6",
+      "version": "1.6.0",
+      "sha256": "058b9sm41ns1393r0j9n932qc5bk32ddzlidzv7brrxyrz4zpd37",
       "depends": ["BayesianTools", "MASS", "Rcpp", "RcppEigen", "coda", "parabar", "purrr"]
     },
     "DPpack": {
       "name": "DPpack",
-      "version": "0.1.0",
-      "sha256": "1kip6n4pxpk5byjdn5m6l8s5l49dvkh78wn6n85dri0c2snkvs17",
+      "version": "0.2.2",
+      "sha256": "0nyxdy2h6d7r8s1pl9wqzxr8zwjyl3ry0aqys708b5hxvcd7naxf",
       "depends": ["MASS", "R6", "Rdpack", "dplyr", "e1071", "ggplot2", "nloptr", "rmutil"]
     },
     "DPtree": {
@@ -7527,14 +7857,14 @@
     },
     "DQAgui": {
       "name": "DQAgui",
-      "version": "0.2.4",
-      "sha256": "05qik0zm7ghrn75msrkfi20lxdk9bqjvwwf765ajpfaph5wmmxk5",
+      "version": "0.2.5",
+      "sha256": "0b2qy3h01k8v3l3bbnhij9ibr9gyzh8lnihqwmwnwqvrdgnypv6l",
       "depends": ["DIZtools", "DIZutils", "DQAstats", "DT", "data_table", "daterangepicker", "jsonlite", "knitr", "lubridate", "magrittr", "parsedate", "shiny", "shinyFiles", "shinyWidgets", "shinyalert", "shinydashboard", "shinyjs", "waiter"]
     },
     "DQAstats": {
       "name": "DQAstats",
-      "version": "0.3.5",
-      "sha256": "0slp3kq2g4djdfxqx40afxcycyncmdxw757pyrm8anfnpxx4rdvz",
+      "version": "0.3.6",
+      "sha256": "163xjysvh8h06qc0yz4z21xf2w8angj05i50kfzsi4mwyiai8qd9",
       "depends": ["DIZtools", "DIZutils", "data_table", "future", "future_apply", "jsonlite", "kableExtra", "knitr", "magrittr", "parsedate", "quarto", "tinytex"]
     },
     "DR_SC": {
@@ -7551,9 +7881,9 @@
     },
     "DRDID": {
       "name": "DRDID",
-      "version": "1.0.7",
-      "sha256": "0a4hp5ngwjgdfphphdpp09g08wrfx130wdqngaza468kv8zp7prf",
-      "depends": ["BMisc", "Rcpp", "trust"]
+      "version": "1.2.0",
+      "sha256": "0sjjg4i9lq48na3xwsk0jv8s2jh5b70052ymlkxgha4hpvg9kh4y",
+      "depends": ["BMisc", "Rcpp", "fastglm", "trust"]
     },
     "DRDRtest": {
       "name": "DRDRtest",
@@ -7575,8 +7905,8 @@
     },
     "DRIP": {
       "name": "DRIP",
-      "version": "2.0",
-      "sha256": "18cais2n8kx1hpb66kqpjlvjx750rhgfvx4h4jjixmb8aqnf7p48",
+      "version": "2.3",
+      "sha256": "0g1qx77zwazg2109nmxm12bsma9nvacydxl5g8rq23dvl2khpkx3",
       "depends": []
     },
     "DRR": {
@@ -7593,8 +7923,8 @@
     },
     "DRomics": {
       "name": "DRomics",
-      "version": "2.5-2",
-      "sha256": "0nzxrsgid7w63ybya389nqn8bqkbp29fiz2g6v3nhk5l2hr001p6",
+      "version": "2.6-2",
+      "sha256": "0bhs89hwzylg6w86s89i96l36k8z3k496w2nq38bri1b7vy22hbi",
       "depends": ["DESeq2", "SummarizedExperiment", "ggfortify", "ggplot2", "limma", "rlang"]
     },
     "DRquality": {
@@ -7635,9 +7965,9 @@
     },
     "DSI": {
       "name": "DSI",
-      "version": "1.6.0",
-      "sha256": "0i8035zw2a8d8l9qm4zcm73102k89sifma3pdk3q6mdm1iqgxjxg",
-      "depends": ["R6", "progress"]
+      "version": "1.7.1",
+      "sha256": "1jd6pa5k3dwh51ysg68rk2n9gxxc2c7malb7n2j0vllzy1casm1s",
+      "depends": ["R6", "cli", "progress"]
     },
     "DSL": {
       "name": "DSL",
@@ -7719,9 +8049,9 @@
     },
     "DTComPair": {
       "name": "DTComPair",
-      "version": "1.2.4",
-      "sha256": "1p1s0fslylykhmvwc962jcifkbb77ah0lxah596akvxlyrqkjpqk",
-      "depends": ["PropCIs", "ellipse", "gee"]
+      "version": "1.2.6",
+      "sha256": "1ajmzap56vpfxn0x57alb6h2g94z132i96jsmczjl6zajm5yr6y4",
+      "depends": ["PropCIs", "assertthat", "ellipse", "gee"]
     },
     "DTDA": {
       "name": "DTDA",
@@ -7771,6 +8101,12 @@
       "sha256": "1f1di9ypq6f0929pq15xncf7zw16wlqap4rchbia27n39cv15dni",
       "depends": ["BiocParallel", "dplyr", "fgsea", "igraph", "magrittr", "stringr", "tibble", "tidyr"]
     },
+    "DTSR": {
+      "name": "DTSR",
+      "version": "0.1.0",
+      "sha256": "0im249drx2d2jpiswmv9dx42drfzcqd82fb10gxqady128ndkcxx",
+      "depends": ["DMwR2", "MASS", "cluster", "mvdalab"]
+    },
     "DTSg": {
       "name": "DTSg",
       "version": "1.1.3",
@@ -7809,9 +8145,9 @@
     },
     "DWDLargeR": {
       "name": "DWDLargeR",
-      "version": "0.1-0",
-      "sha256": "1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy",
-      "depends": ["Matrix", "SparseM"]
+      "version": "0.2-0",
+      "sha256": "03i3gycbmxpikqqqhchprm2qji5dgjbvm3ggvmgyc1vh5ap075by",
+      "depends": ["Matrix"]
     },
     "DWLS": {
       "name": "DWLS",
@@ -7819,12 +8155,6 @@
       "sha256": "02fd5q91shwjzc6bxqv4m8al7q1vl0mah6niymij37p69wlixy42",
       "depends": ["MAST", "ROCR", "Seurat", "SummarizedExperiment", "dplyr", "e1071", "quadprog", "reshape", "varhandle"]
     },
-    "DWLasso": {
-      "name": "DWLasso",
-      "version": "1.1",
-      "sha256": "1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z",
-      "depends": ["Matrix", "glmnet", "hglasso"]
-    },
     "DWreg": {
       "name": "DWreg",
       "version": "2.0",
@@ -7857,9 +8187,9 @@
     },
     "DanielBiostatistics10th": {
       "name": "DanielBiostatistics10th",
-      "version": "0.2.2",
-      "sha256": "08wrhzsv8w7ivvxzrmnwic3yzywls6kx1gg1lxsg1s7mqrxzx9w8",
-      "depends": ["e1071", "pracma"]
+      "version": "0.2.6",
+      "sha256": "0qgakqybrg7knpgvl5v0126h9mpah5a392hl1sm7hprwvqm4xg5f",
+      "depends": ["cli", "e1071", "pracma", "vcd"]
     },
     "Dark": {
       "name": "Dark",
@@ -7929,15 +8259,15 @@
     },
     "DataMetProcess": {
       "name": "DataMetProcess",
-      "version": "1.0.2",
-      "sha256": "1hkp0gldpqrfjnw6cwvrmgs034kdk7igy170640zkwhcsvd6hr4a",
+      "version": "1.0.3",
+      "sha256": "0xg0g6rj46m99gkk3xp7h0la96hzp2ykli2pq7aim9fdjgzqyz05",
       "depends": ["dplyr", "lubridate", "rlang", "shiny", "tidyr"]
     },
     "DataPackageR": {
       "name": "DataPackageR",
-      "version": "0.16.0",
-      "sha256": "0sm3b5xjj6dx4ckjdzklxr5j386iaiczx6xass4azkjwvj2y5bvb",
-      "depends": ["crayon", "desc", "digest", "futile_logger", "knitr", "pkgbuild", "pkgload", "rmarkdown", "roxygen2", "rprojroot", "usethis", "yaml"]
+      "version": "0.16.1",
+      "sha256": "0hq45yyfcw87p93qrivyx341hsamfx4m3bs1ii97h35mb4926k86",
+      "depends": ["cli", "desc", "digest", "futile_logger", "knitr", "pkgbuild", "pkgload", "rmarkdown", "roxygen2", "rprojroot", "usethis", "yaml"]
     },
     "DataSetsUni": {
       "name": "DataSetsUni",
@@ -7951,6 +8281,12 @@
       "sha256": "1asrslqmk4sjj99x8pb01yfrw57p64zc6klrk2ghz4g44fr9d0pq",
       "depends": ["R6", "Rlabkey", "assertthat", "curl", "data_table", "digest", "httr", "jsonlite"]
     },
+    "DataSum": {
+      "name": "DataSum",
+      "version": "0.1.0",
+      "sha256": "0afz60zy1fn34hf2awizv3k0da4k2rchj2z20cy8n2g1k80sspcd",
+      "depends": ["dplyr", "moments", "nortest"]
+    },
     "DataVisualizations": {
       "name": "DataVisualizations",
       "version": "1.3.2",
@@ -7983,8 +8319,8 @@
     },
     "DatastreamDSWS2R": {
       "name": "DatastreamDSWS2R",
-      "version": "1.9.7",
-      "sha256": "117ahby12i6w93rk41f4cg0v179nk3gr73729v1iclkagizi8hpp",
+      "version": "1.9.10",
+      "sha256": "0qyd4mml2j6gk4nsy59lm7317n6g975rb9k2a1h71d7kbbh5801b",
       "depends": ["dplyr", "foreach", "httr", "jsonlite", "stringi", "stringr", "xts", "zoo"]
     },
     "DatastreamR": {
@@ -8055,9 +8391,9 @@
     },
     "DeductiveR": {
       "name": "DeductiveR",
-      "version": "1.0.0",
-      "sha256": "0bx1ad2gw0pf03z0im31mzaa26jxwws6fkbcj319kd8b4s4wp92y",
-      "depends": ["dplyr", "ggplot2", "moments", "reshape2"]
+      "version": "1.1.0",
+      "sha256": "1ra5vyh1mzr4215sa1ryx7cxa0f2rwmpr5asl7zy0lzghhxk5ffh",
+      "depends": ["dplyr", "ggplot2", "ggpubr", "lmomco", "moments", "reshape2"]
     },
     "DeepLearningCausal": {
       "name": "DeepLearningCausal",
@@ -8091,9 +8427,9 @@
     },
     "DemoDecomp": {
       "name": "DemoDecomp",
-      "version": "1.0.1",
-      "sha256": "0m24ld8s3ph8qcbkqma5y5k5nv0d0vgb7wz8q20gxnfbj2kbcvjv",
-      "depends": ["Rdpack"]
+      "version": "1.14.1",
+      "sha256": "1ks0lqnq811gkx6k1440v5wkh9pjrbpdkw5c5hc0iclx3lfs6g7n",
+      "depends": ["Rdpack", "numDeriv"]
     },
     "DemoKin": {
       "name": "DemoKin",
@@ -8109,9 +8445,9 @@
     },
     "DemographicTable": {
       "name": "DemographicTable",
-      "version": "0.1.8",
-      "sha256": "1nsq0hcb5s6garwjnknnab92fn5w5z721m3ai4j91nbwcs08jwqj",
-      "depends": ["e1071", "flextable", "xtable"]
+      "version": "0.1.10",
+      "sha256": "0wyhgmgv94xwgsmsvk08c7kjfyppb0lmpy0nybgsaah8n1zlfgkv",
+      "depends": ["flextable", "officer", "scales"]
     },
     "DendSer": {
       "name": "DendSer",
@@ -8151,20 +8487,20 @@
     },
     "Deriv": {
       "name": "Deriv",
-      "version": "4.1.3",
-      "sha256": "130g3mv0z9sqs6y23a0a94512iiw05yr6fp378vhdxxbignzbnyv",
+      "version": "4.1.6",
+      "sha256": "0wmslhggdhamvzfa0nvj6j5bc8jhiy3n5q0p5ha9bcsyvi92mf01",
       "depends": []
     },
     "DescTools": {
       "name": "DescTools",
-      "version": "0.99.55",
-      "sha256": "07dgif06kl2p2qzcg827y05al1k1qy21a5gkz24jbd6xds161mg5",
-      "depends": ["Exact", "MASS", "Rcpp", "boot", "cli", "data_table", "expm", "gld", "httr", "mvtnorm", "readxl", "rstudioapi", "withr"]
+      "version": "0.99.58",
+      "sha256": "1d784zw6r29pnd93s7skaq4w095cvj0y7w4hd7py9vykqi9pg432",
+      "depends": ["Exact", "MASS", "Rcpp", "boot", "cli", "data_table", "expm", "gld", "haven", "httr", "mvtnorm", "readxl", "rstudioapi", "withr"]
     },
     "DescToolsAddIns": {
       "name": "DescToolsAddIns",
-      "version": "1.11",
-      "sha256": "160xd95njj1pk11grdrs2mzx1h98q8fin46yg8jiyi16rlyvxm4l",
+      "version": "1.12",
+      "sha256": "0jav7xwhrlhlkya5avp4zcnqr5glci67np2dyxmjsancjks1fxbx",
       "depends": ["DescTools", "foreign", "manipulate", "rstudioapi", "writexl"]
     },
     "DescrTab2": {
@@ -8313,8 +8649,8 @@
     },
     "DiallelAnalysisR": {
       "name": "DiallelAnalysisR",
-      "version": "0.5.0",
-      "sha256": "0w053vqp23hqixgn32g5d8a0l9hcxp6w2fm1sx3ysxr4p0yz7g14",
+      "version": "0.6.0",
+      "sha256": "042i84pxm3gy59r94m0pk7gb04kxl9l8w43b9h7g70dyxi6hf89x",
       "depends": ["ggplot2"]
     },
     "DiceDesign": {
@@ -8343,8 +8679,8 @@
     },
     "DiceView": {
       "name": "DiceView",
-      "version": "2.2-0",
-      "sha256": "1a7jlj7nmj41zfmpb54iwi8c9g44d376cc353ybr8dq8vkyq0vss",
+      "version": "3.1-0",
+      "sha256": "1zrb3n3jd072am52whfm2ahrgvjwhgaadj2alxn39r1c5i3a4my1",
       "depends": ["DiceDesign", "R_cache", "foreach", "geometry", "scatterplot3d"]
     },
     "Dict": {
@@ -8367,8 +8703,8 @@
     },
     "DiffCorr": {
       "name": "DiffCorr",
-      "version": "0.4.3",
-      "sha256": "1wzk5lfkrz12xxmyapmq6midb6ld6p624i8qzf299dlfsz5i3n5h",
+      "version": "0.4.4",
+      "sha256": "05rvyfgr9f5x0dcgwcsvnpcmgmg5hcsgyxspjzxkmbyfk8wzwaf7",
       "depends": ["fdrtool", "igraph", "multtest", "pcaMethods"]
     },
     "DiffNet": {
@@ -8397,9 +8733,9 @@
     },
     "DirectEffects": {
       "name": "DirectEffects",
-      "version": "0.2.1",
-      "sha256": "0cjqp4gam1psd11d6h99pi3ramnaybp6bij86wbgqji2icqlvghg",
-      "depends": ["Formula", "glue", "sandwich"]
+      "version": "0.3",
+      "sha256": "181m5xhlgrpmj4c9zdr70sn8gwxlpd54cc5yjngyx5j0l9mfi5a3",
+      "depends": ["Formula", "Matching", "broom", "generics", "glue", "rlang"]
     },
     "DirectStandardisation": {
       "name": "DirectStandardisation",
@@ -8409,14 +8745,14 @@
     },
     "DirectedClustering": {
       "name": "DirectedClustering",
-      "version": "0.1.1",
-      "sha256": "1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2",
-      "depends": ["igraph"]
+      "version": "1.0.0",
+      "sha256": "0ac5dn0mi8j6jvl7zsv9k9mbanfs2h65haqy2lyqzh5s6vw61i2y",
+      "depends": []
     },
     "Directional": {
       "name": "Directional",
-      "version": "6.7",
-      "sha256": "1i9dwk1r44b47insw5iz5vgk7g9zi78wlix2cv2g02phcrz5wqa2",
+      "version": "7.0",
+      "sha256": "0193cfnazfvxf522g541v7smp2c1ag86l3crmz91vpflm6bbaaz0",
       "depends": ["Rfast", "Rfast2", "Rnanoflann", "bigstatsr", "doParallel", "foreach", "ggplot2", "magrittr", "rgl", "rnaturalearth", "sf"]
     },
     "DirichletReg": {
@@ -8439,8 +8775,8 @@
     },
     "DisaggregateTS": {
       "name": "DisaggregateTS",
-      "version": "2.0.0",
-      "sha256": "17d9mvznxysyybmnl5yz0sx15dxxry4vxpafp35s3sdlarg5jv39",
+      "version": "3.0.1",
+      "sha256": "1wd6jxdi1ib24hpkn2ghrv91gyi0qmpgvvhdscmx58w6vxlk1rsz",
       "depends": ["Matrix", "Rdpack", "lars", "withr", "zoo"]
     },
     "DiscreteDatasets": {
@@ -8449,12 +8785,30 @@
       "sha256": "0jpjky99cfb7h3i244n16llmgkrkbavbmyhz181fxiaiwzs7z66c",
       "depends": ["checkmate"]
     },
+    "DiscreteDists": {
+      "name": "DiscreteDists",
+      "version": "1.0.0",
+      "sha256": "1cag5z4ag1n21ya2fiwrxvflnn4fnqgqfqxgg48r68jvmzdglhbn",
+      "depends": ["Rcpp", "Rdpack", "gamlss", "gamlss_dist", "pracma"]
+    },
     "DiscreteFDR": {
       "name": "DiscreteFDR",
-      "version": "2.0.0",
-      "sha256": "02yj9pfxh1f4fgij4gq29aijd42im9b6npyhw4jirdpl7zkh0j8i",
+      "version": "2.1.0",
+      "sha256": "1p52b54fhmn15dd0666i5hn4smj8vi8qyvm06clarfaldknbai68",
       "depends": ["DiscreteDatasets", "DiscreteTests", "Rcpp", "RcppArmadillo", "checkmate", "lifecycle"]
     },
+    "DiscreteFWER": {
+      "name": "DiscreteFWER",
+      "version": "1.0.0",
+      "sha256": "0iixxn96qcma3ky9sy5l0p8dk5nvrknlrr6zk6dg7xvwm22ala3b",
+      "depends": ["DiscreteFDR", "Rcpp", "RcppArmadillo", "checkmate"]
+    },
+    "DiscreteGapStatistic": {
+      "name": "DiscreteGapStatistic",
+      "version": "1.0.0",
+      "sha256": "0y6xcpsf5frm74id9mksk8gg10jjny0b4m8fhgy74avrw8yd5iv8",
+      "depends": ["ComplexHeatmap", "Polychrome", "RColorBrewer", "cluster", "cultevo", "dplyr", "ggplot2", "magrittr", "pheatmap", "reshape2", "tidyr"]
+    },
     "DiscreteInverseWeibull": {
       "name": "DiscreteInverseWeibull",
       "version": "1.0.2",
@@ -8475,8 +8829,8 @@
     },
     "DiscreteTests": {
       "name": "DiscreteTests",
-      "version": "0.2.0",
-      "sha256": "18257srwfz99531wks60isi1dg95yv1xvpb4hhxh9qw9wijw08sp",
+      "version": "0.2.1",
+      "sha256": "1ii0jqq2k0in11dhmw1mzhwbxijnd6inhwfi0j43cpxzddnbg8bs",
       "depends": ["R6", "checkmate", "lifecycle"]
     },
     "DiscreteWeibull": {
@@ -8499,8 +8853,8 @@
     },
     "Distance": {
       "name": "Distance",
-      "version": "1.0.9",
-      "sha256": "05krzbk1dzlsx00vaghz1ny0wf00giglwvdy29c3xa9353pfgyix",
+      "version": "2.0.0",
+      "sha256": "1q3xv5wvpmck19ziq7md8q274br7dbwm3xizbdgj5rq18n1yfcsr",
       "depends": ["dplyr", "mrds", "rlang"]
     },
     "DistatisR": {
@@ -8589,8 +8943,8 @@
     },
     "DoseFinding": {
       "name": "DoseFinding",
-      "version": "1.1-1",
-      "sha256": "052ic1d7qlcvcglzskdv97v7dnbi2lh8xpkbxf9srqn3sgs812n3",
+      "version": "1.2-1",
+      "sha256": "0chy4xl7faflp3cf27sf2ayzkvay13vf2cgdxmihsrbxkib2f01f",
       "depends": ["ggplot2", "lattice", "mvtnorm"]
     },
     "DoubleCone": {
@@ -8661,9 +9015,9 @@
     },
     "DrugExposureDiagnostics": {
       "name": "DrugExposureDiagnostics",
-      "version": "1.0.7",
-      "sha256": "0m3mfnavqnx53i8p723j4mc0r20b3c21i1svrg7dclx0f2c8np8n",
-      "depends": ["CDMConnector", "DrugUtilisation", "checkmate", "dplyr", "glue", "magrittr", "omopgenerics", "rlang", "tidyr", "tidyselect"]
+      "version": "1.1.0",
+      "sha256": "1g3207j1hh8f8ppc2ix7k1nzgrvccrl1j8clgrha57i146wz7b1s",
+      "depends": ["CDMConnector", "DrugUtilisation", "checkmate", "dplyr", "glue", "magrittr", "omopgenerics", "rlang", "shiny", "tidyr", "tidyselect"]
     },
     "DrugSim2DR": {
       "name": "DrugSim2DR",
@@ -8673,9 +9027,9 @@
     },
     "DrugUtilisation": {
       "name": "DrugUtilisation",
-      "version": "0.7.0",
-      "sha256": "09wvw1cv0l3vcsarwiwsiyyakd2i9iw3kj13f2w4lwgw5d225cdc",
-      "depends": ["CDMConnector", "CodelistGenerator", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "visOmopResults"]
+      "version": "0.8.1",
+      "sha256": "0lb1yy0z5g1iqgjy1h6hkamskyrdaw5xgmv81124qcv13bgc2qjc",
+      "depends": ["CDMConnector", "CodelistGenerator", "PatientProfiles", "cli", "clock", "dplyr", "glue", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "DstarM": {
       "name": "DstarM",
@@ -8727,9 +9081,9 @@
     },
     "DynForest": {
       "name": "DynForest",
-      "version": "1.1.3",
-      "sha256": "0x78gbgzl4dad5g6w27cdfpngsykanv3lz3xffpqndd971wkzhiy",
-      "depends": ["DescTools", "cmprsk", "doParallel", "doRNG", "foreach", "ggplot2", "lcmm", "pbapply", "pec", "prodlim", "stringr", "survival", "zoo"]
+      "version": "1.2.0",
+      "sha256": "0yj7s5z8vnwpcspan77ywxj3zgwfc6afmhgk10h0yd2bisric49r",
+      "depends": ["DescTools", "cli", "cmprsk", "doParallel", "doRNG", "foreach", "ggplot2", "lcmm", "pbapply", "pec", "prodlim", "stringr", "survival", "zoo"]
     },
     "DynNom": {
       "name": "DynNom",
@@ -8749,17 +9103,11 @@
       "sha256": "1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm",
       "depends": ["dplyr", "rlang"]
     },
-    "DynamicGP": {
-      "name": "DynamicGP",
-      "version": "1.1-9",
-      "sha256": "00hf3r39b9xid129kzgdnwdfrwrspxkz7dydgna3c5lrl7670paz",
-      "depends": ["lhs"]
-    },
     "DynareR": {
       "name": "DynareR",
-      "version": "0.1.4",
-      "sha256": "0ph57kwinv9nqla82glg0bj1iaqrnw2y8a8invq1qy9yabldl798",
-      "depends": ["knitr", "magrittr"]
+      "version": "0.1.5",
+      "sha256": "1m3zpj9jalgw3hs93m3hyhwr25fp1cqrzbwr84z5mafd55zsn1mz",
+      "depends": ["knitr", "magick", "magrittr"]
     },
     "DysPIA": {
       "name": "DysPIA",
@@ -8793,9 +9141,9 @@
     },
     "EBASE": {
       "name": "EBASE",
-      "version": "1.0.2",
-      "sha256": "0y36xsh639chsrzb3r6kla6mi34klrqb4x05ixhk4kh4jx2rb63i",
-      "depends": ["R2jags", "dplyr", "foreach", "ggplot2", "lubridate", "rjags", "tidyr", "truncnorm", "zoo"]
+      "version": "1.1.0",
+      "sha256": "0g9hhkbld6f5iasj56d539q9px6s6pb2mwhzl337bbvxcd7pf59w",
+      "depends": ["R2jags", "doParallel", "dplyr", "foreach", "ggplot2", "lubridate", "rjags", "tidyr", "truncnorm", "zoo"]
     },
     "EBCHS": {
       "name": "EBCHS",
@@ -8805,8 +9153,8 @@
     },
     "EBEN": {
       "name": "EBEN",
-      "version": "5.1",
-      "sha256": "13cvdx2mg1jhymvq49wm2rm1pajsd4ji274r7zaklcwy4lw5bml4",
+      "version": "5.2",
+      "sha256": "1lkq9zdqpyjr59bij0ajpw69r0qdlpk29ps8pkhvvci84f5sd0bi",
       "depends": []
     },
     "EBMAforecast": {
@@ -8821,11 +9169,11 @@
       "sha256": "14wal81cai08xr26fpc2w4ramr5jyv7vwfyqb5hzw3kqxx76y9xx",
       "depends": ["BEDMatrix", "ROCR", "data_table"]
     },
-    "EBglmnet": {
-      "name": "EBglmnet",
-      "version": "6.0",
-      "sha256": "014rpci2lcrqaldir2ds1fvzbvkj6n00n9xzl5m0f60zzg9cckjm",
-      "depends": []
+    "EBcoBART": {
+      "name": "EBcoBART",
+      "version": "1.1.0",
+      "sha256": "1vys4wb35pgh03331glbbiiw4kyis04d2ygyqng9l7h9jjh7d5xj",
+      "depends": ["dbarts", "extraDistr", "loo", "posterior", "univariateML"]
     },
     "EBrank": {
       "name": "EBrank",
@@ -8833,10 +9181,16 @@
       "sha256": "1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632",
       "depends": []
     },
+    "ECG": {
+      "name": "ECG",
+      "version": "0.5.2",
+      "sha256": "00gxjsy20clwab19h982hnwz2xiqi619wkfc0w3s9c8vy8215x1n",
+      "depends": ["MASS"]
+    },
     "ECGofTestDx": {
       "name": "ECGofTestDx",
-      "version": "0.4",
-      "sha256": "0y8bw1k9spwxyzc7vsi2iblnmjsidxbybjrzzh2j6frjmv3rk4g1",
+      "version": "0.5",
+      "sha256": "0mg5snwnlwy2vdkj8zdy0ji790ws6fvy4yr9918mridr43pn77ap",
       "depends": ["bootstrap", "orthopolynom"]
     },
     "ECLRMC": {
@@ -8853,8 +9207,8 @@
     },
     "ECOTOXr": {
       "name": "ECOTOXr",
-      "version": "1.0.9",
-      "sha256": "0n5vfzg2drffw7yrbvi1rkhkydsmyd8v0scqqrx0cdx84y21l5fl",
+      "version": "1.1.1",
+      "sha256": "0saxpf51wszrk42dv45lv905dia7llrvwkpasdkr15gygasfcfq2",
       "depends": ["RSQLite", "crayon", "dbplyr", "dplyr", "httr2", "jsonlite", "lifecycle", "purrr", "rappdirs", "readr", "readxl", "rlang", "rvest", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "ECTSVR": {
@@ -8881,17 +9235,11 @@
       "sha256": "02j4yl6hi83f6m529r6n0gaz8wsy2pi0ncy2g95fjhs8ib0kfn4f",
       "depends": ["FNN", "MASS", "cluster", "e1071", "igraph"]
     },
-    "EDA": {
-      "name": "EDA",
-      "version": "1.3",
-      "sha256": "08zqykvga7w07iy00c94q03mrxmjv649ggk7lmksjzy5j3wgyb6d",
-      "depends": ["ggplot2"]
-    },
     "EDCimport": {
       "name": "EDCimport",
-      "version": "0.4.1",
-      "sha256": "1s1i7dxbr64487nwrwz65vvyb21fz1gbqa51jdqz8spbim328jvp",
-      "depends": ["cli", "dplyr", "forcats", "ggplot2", "glue", "haven", "labelled", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "0.5.2",
+      "sha256": "1c000mmy5krlq5203xjhhnwi44isqbph627cbg2j38ygw5ilvp50",
+      "depends": ["cli", "dplyr", "forcats", "fs", "ggplot2", "glue", "haven", "lifecycle", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "EDFtest": {
       "name": "EDFtest",
@@ -8911,12 +9259,6 @@
       "sha256": "1rgk2bpfb98nd0zv4kabskm0zk9dz52swwf95h46vc2yb0kwapkw",
       "depends": ["curl", "httr", "jsonlite", "xml2"]
     },
-    "EDMeasure": {
-      "name": "EDMeasure",
-      "version": "1.2.0",
-      "sha256": "1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv",
-      "depends": ["dHSIC", "energy", "rBayesianOptimization"]
-    },
     "EDNE_EQ": {
       "name": "EDNE.EQ",
       "version": "1.0",
@@ -8935,12 +9277,6 @@
       "sha256": "0qyg9gcpdh9fchn3ylww1cmb4x1zrrapy9n26gqxncc728526gn7",
       "depends": ["ABCanalysis", "opGMMassessment"]
     },
-    "EEAaq": {
-      "name": "EEAaq",
-      "version": "0.0.3",
-      "sha256": "0qs6sqiqwl33bjz9k8hlfsqaawq3cc0ygm73pc8h200c5jwdk94n",
-      "depends": ["aweek", "curl", "dplyr", "ggplot2", "ggpubr", "gifski", "gstat", "htmlwidgets", "leaflet", "lubridate", "mondate", "raster", "readr", "sf", "stringr", "tibble", "tictoc", "tidyr"]
-    },
     "EEM": {
       "name": "EEM",
       "version": "1.1.1",
@@ -8989,10 +9325,16 @@
       "sha256": "0zc2zby69c70g6qkama27b9lnk5dbrrrpp5w5r2xxk2wfg1lx8nn",
       "depends": ["EFAtools", "GPArotation", "mirt", "polycor", "psych"]
     },
+    "EFAfactors": {
+      "name": "EFAfactors",
+      "version": "1.1.1",
+      "sha256": "073fy8fnr8546i5bjq4aap6bhhkns77mgggw6r5jkvfpmz6g5av8",
+      "depends": ["BBmisc", "MASS", "Matrix", "ParamHelpers", "Rcpp", "RcppArmadillo", "SimCorMultRes", "ddpcr", "ineq", "mlr", "proxy", "psych", "ranger", "reticulate", "xgboost"]
+    },
     "EFAtools": {
       "name": "EFAtools",
-      "version": "0.4.4",
-      "sha256": "1fzkmvadkcd88d81420lw9mhpmxbjymp4jada2c79bxq1h6b3mw2",
+      "version": "0.4.5",
+      "sha256": "18jp2dyh22a1i3r0xawz851620lb1g6zbbb6h1a30ihkgbw1mcx9",
       "depends": ["GPArotation", "Rcpp", "RcppArmadillo", "checkmate", "cli", "crayon", "dplyr", "future", "future_apply", "ggplot2", "lavaan", "magrittr", "progress", "progressr", "psych", "rlang", "stringr", "tibble", "tidyr", "viridisLite"]
     },
     "EFAutilities": {
@@ -9015,8 +9357,8 @@
     },
     "EGAnet": {
       "name": "EGAnet",
-      "version": "2.0.6",
-      "sha256": "1mdnbxmpghk95wm3vy3m1yb0w39ym5v15cjznnyg17w7fy48mk3y",
+      "version": "2.1.0",
+      "sha256": "0pmd672h96ddh955ia85dsm74f5ksa0wxl4cll1jnfnjva623f9y",
       "depends": ["GGally", "GPArotation", "Matrix", "dendextend", "fungible", "future", "future_apply", "ggplot2", "ggpubr", "glasso", "igraph", "lavaan", "network", "progressr", "qgraph", "semPlot", "sna"]
     },
     "EGM": {
@@ -9027,8 +9369,8 @@
     },
     "EGRET": {
       "name": "EGRET",
-      "version": "3.0.9",
-      "sha256": "1if22yq5wyfd0sx5b38xw3fbj8qlmbnkikjq77ihxd3pzfjpdl14",
+      "version": "3.0.10",
+      "sha256": "04apfhwczdwh6kq0ww4hbbfd4ymkvxzbm0r0kk97x96i5nvrk5fs",
       "depends": ["MASS", "dataRetrieval", "fields", "foreach", "survival", "truncnorm"]
     },
     "EGRETci": {
@@ -9063,8 +9405,8 @@
     },
     "EIEntropy": {
       "name": "EIEntropy",
-      "version": "0.0.1.1",
-      "sha256": "1vw7y3i3qpxaj4m7s8yxi0c4bzipm5ggp2b1f0251xzlhffiisb7",
+      "version": "0.0.1.3",
+      "sha256": "13lxw10lx440301rms7fwqm875smc10gy1r5sz8yqnnvgwc56slg",
       "depends": ["dplyr", "magrittr"]
     },
     "EIX": {
@@ -9081,9 +9423,9 @@
     },
     "EL": {
       "name": "EL",
-      "version": "1.2",
-      "sha256": "1ygvb8m33szf2xl6fcvyqhgpj7ppn4kc9wd1fcaq4ppbvv6c17ka",
-      "depends": []
+      "version": "1.3",
+      "sha256": "1ci1nb9ajw2qgirmi66r06dlsmhkzjw0kgvyvgys6c286i2sad05",
+      "depends": ["ggplot2", "nleqslv"]
     },
     "EL2Surv": {
       "name": "EL2Surv",
@@ -9139,10 +9481,16 @@
       "sha256": "07y15nbym69iwdy9c5gcdalign7g8qw8hkcy1v29z6j2di6qzn84",
       "depends": ["IlluminaHumanMethylation450kanno_ilmn12_hg19", "IlluminaHumanMethylationEPICanno_ilm10b4_hg19", "ggplot2", "lavaan", "mediation", "minfi", "multilevel", "qqman"]
     },
+    "EMC2": {
+      "name": "EMC2",
+      "version": "2.1.0",
+      "sha256": "1rv2m7v8mhbwfrl3cwipnaxm1yxcs1mycp2vvhz5k9fbn9c0nwqk",
+      "depends": ["Brobdingnag", "MASS", "Matrix", "Rcpp", "WienR", "abind", "coda", "colorspace", "corpcor", "corrplot", "lpSolve", "magic", "matrixcalc", "msm", "mvtnorm", "psych"]
+    },
     "EMCluster": {
       "name": "EMCluster",
-      "version": "0.2-15",
-      "sha256": "1p8zfavx9waz3n4nkz8f6cd5hlcjb53r4wiwnrll5dx8zpfjj8g2",
+      "version": "0.2-16",
+      "sha256": "1hy2w7i367id0s6vl8m87d1s275638y767fx39xim9jrz6dwdzvx",
       "depends": ["MASS", "Matrix"]
     },
     "EMD": {
@@ -9307,6 +9655,18 @@
       "sha256": "0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m",
       "depends": ["lattice", "ttutils"]
     },
+    "EQUALSTATS": {
+      "name": "EQUALSTATS",
+      "version": "0.5.0",
+      "sha256": "0vv2p4757sqjf9k2iynbigsa4n4pzd1wkrli3gbgnx6rk8b0r77b",
+      "depends": ["DescTools", "MASS", "MuMIn", "ThresholdROC", "boot", "cowplot", "coxme", "ggcorrplot", "ggplot2", "ggsurvfit", "lme4", "lmtest", "mclogit", "nnet", "ordinal", "pROC", "pwr", "shiny", "stringr", "survival", "zip"]
+    },
+    "EQUALrepeat": {
+      "name": "EQUALrepeat",
+      "version": "0.4.0",
+      "sha256": "0djrdakdz9fhd7gvz80ky9wsjdvpv3j834arfnc9djnzmizg9732",
+      "depends": ["DescTools", "cowplot", "forecast", "ggplot2", "irr", "rstatix", "stringr", "tseries", "urca", "vars", "viridisLite", "zip"]
+    },
     "EQUIVNONINF": {
       "name": "EQUIVNONINF",
       "version": "1.0.2",
@@ -9369,8 +9729,8 @@
     },
     "ETAS": {
       "name": "ETAS",
-      "version": "0.6.1",
-      "sha256": "1ivnv05cfbrrmglz319202nssghaq15h6l35k1pbal9gg7izd7xm",
+      "version": "0.6.1.1",
+      "sha256": "09nmajzjdrbmq5bh5zg53vmvv9580gi8v8g92ipzzih7a1xvrcgh",
       "depends": ["Rcpp", "fields", "goftest", "lattice", "maps", "spatstat_explore", "spatstat_geom", "spatstat_random"]
     },
     "ETASbootstrap": {
@@ -9391,6 +9751,12 @@
       "sha256": "0s0q4f3wzpdd87l3pnzysa8aq7zgz29589xnm65a6xfy9znbpzs3",
       "depends": ["bit", "ff"]
     },
+    "ETRep": {
+      "name": "ETRep",
+      "version": "1.1.0",
+      "sha256": "1m422fj0pnskb3ag0vacfpiydjj7h9hxb6vny51xp19wbfd8a0ja",
+      "depends": ["Matrix", "Morpho", "RSpincalc", "RiemBase", "Rvcg", "SphericalCubature", "dplyr", "fields", "ggplot2", "matlib", "pracma", "ptinpoly", "reshape2", "rgl", "rotations", "shapes", "truncnorm"]
+    },
     "EUfootball": {
       "name": "EUfootball",
       "version": "0.0.1",
@@ -9507,9 +9873,9 @@
     },
     "Ecfun": {
       "name": "Ecfun",
-      "version": "0.3-2",
-      "sha256": "1q0mx70hy18rabpabxghaixkb3r1432cxln844cac4dqxhvzcqgy",
-      "depends": ["BMA", "MASS", "TeachingDemos", "fda", "jpeg", "mvtnorm", "rvest", "stringi", "tis", "xml2"]
+      "version": "0.3-6",
+      "sha256": "0651vbb040y17sizh927vq4jfidpxilmwdgkhmr7z8p24yb588rc",
+      "depends": ["BMA", "MASS", "fda", "jpeg", "mvtnorm", "readr", "rvest", "rworldmap", "stringi", "tis", "xml2"]
     },
     "EcoDiet": {
       "name": "EcoDiet",
@@ -9519,8 +9885,8 @@
     },
     "EcoEnsemble": {
       "name": "EcoEnsemble",
-      "version": "1.0.5",
-      "sha256": "0d5kha5i49p7fd8g4f1i999sag4jz8if6yashshr9hp6jr6mibpc",
+      "version": "1.1.0",
+      "sha256": "0yzd38nwn4qdkqnm9hkyck1n1pscbca7payqp4gq5glwnipjg7iq",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cowplot", "dplyr", "ggplot2", "matrixcalc", "reshape2", "rstan", "rstantools", "tibble"]
     },
     "EcoIndR": {
@@ -9591,9 +9957,9 @@
     },
     "EffectLiteR": {
       "name": "EffectLiteR",
-      "version": "0.4-6",
-      "sha256": "0h8cbpcnwxll5asjfay06zzh7imzqxbiv5b8iv4wbdkzwh68830r",
-      "depends": ["car", "foreign", "ggplot2", "lavaan", "nnet", "shiny"]
+      "version": "0.5-1",
+      "sha256": "1axjjhlhvbwg7w2a4p92l36ps1zqhx6zvn82mpaxdfkhs15pd322",
+      "depends": ["DT", "car", "foreign", "ggplot2", "ic_infer", "lavaan", "nnet", "numDeriv", "restriktor", "shiny"]
     },
     "EffectStars": {
       "name": "EffectStars",
@@ -9645,8 +10011,8 @@
     },
     "ElevDistr": {
       "name": "ElevDistr",
-      "version": "1.0.8",
-      "sha256": "119r06ijd72z2f9asydlcy6i7sqgzfapy02wn13x5zf1cp459n8a",
+      "version": "1.0.9",
+      "sha256": "1cr6pgr1b5aqf78b053v96nr511yz7r25bvfd3z21a8bvqlnq7bi",
       "depends": ["RANN", "ggmap", "ggplot2", "terra"]
     },
     "Elja": {
@@ -9657,9 +10023,9 @@
     },
     "ElliptCopulas": {
       "name": "ElliptCopulas",
-      "version": "0.1.3",
-      "sha256": "1hnkhd9hw2550kzjyycl1hzm9pk9j11n96hka59z8x74vrz980qp",
-      "depends": ["Matrix", "Rmpfr", "Runuran", "pbapply", "wdm"]
+      "version": "0.1.4.1",
+      "sha256": "0arrvcs3ylh849bw76wl98qj40w7w3r6f1yqszphqf7nnw0i6x9n",
+      "depends": ["Matrix", "Runuran", "kStatistics", "pbapply", "wdm"]
     },
     "EloChoice": {
       "name": "EloChoice",
@@ -9705,14 +10071,14 @@
     },
     "EmissV": {
       "name": "EmissV",
-      "version": "0.665.6.6",
-      "sha256": "184992191pk82q9yd0wb00r94rw7f23di7ckb86gbsr1pr1dkabl",
+      "version": "0.665.8.0",
+      "sha256": "090xjvb5n05nd1rapqp2jaa23k3jzmys004bzfpn4nckb5nfs2nc",
       "depends": ["data_table", "ncdf4", "raster", "sf", "units"]
     },
     "EmpiricalCalibration": {
       "name": "EmpiricalCalibration",
-      "version": "3.1.2",
-      "sha256": "013k43mwsjr5sgrvcp9dqcpylls0qm3ppn7xbgw7l46w22yik5hi",
+      "version": "3.1.3",
+      "sha256": "1lw7wvf0v73wm84x9amymxy2jnzrqndby1k4b580qwvcq7sz49x9",
       "depends": ["Rcpp", "ggplot2", "gridExtra", "rlang"]
     },
     "EncDNA": {
@@ -9789,8 +10155,8 @@
     },
     "EntropyEstimation": {
       "name": "EntropyEstimation",
-      "version": "1.2",
-      "sha256": "13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy",
+      "version": "1.2.1",
+      "sha256": "1cvbmd745fv3xlxx81zbjf14qlf9avr7wia5r3ish05z7yhv9g2r",
       "depends": []
     },
     "EntropyMCMC": {
@@ -9819,8 +10185,8 @@
     },
     "EnvStats": {
       "name": "EnvStats",
-      "version": "2.8.1",
-      "sha256": "19nnab201yalxbgpvpp5lkgqs0m17b5plsswmaxbvdv4mag2p58j",
+      "version": "3.0.0",
+      "sha256": "0j6jikxf28ryh6jn7d3lag6sl2jjdzbszd2ll94ia9dk8hyyq4q4",
       "depends": ["MASS", "ggplot2", "nortest"]
     },
     "EnviroPRA2": {
@@ -9831,14 +10197,14 @@
     },
     "Epi": {
       "name": "Epi",
-      "version": "2.53",
-      "sha256": "1ndyvj24j7b85l5rdldnb6ngkyv7x08jnc11nbjsbh5mn7swg4qi",
+      "version": "2.58",
+      "sha256": "0z84v9w9n1ghjm9hg2if2p11cl27v3p9nbn683gxwvg0zdsdp88c",
       "depends": ["MASS", "Matrix", "cmprsk", "data_table", "dplyr", "etm", "magrittr", "mgcv", "numDeriv", "plyr", "survival", "zoo"]
     },
     "EpiContactTrace": {
       "name": "EpiContactTrace",
-      "version": "0.17.0",
-      "sha256": "0s3mfv1djrq1kp75f94z4fhrx3jha4vvil30daxkw5b0iy3mvf5q",
+      "version": "0.18.0",
+      "sha256": "1qi60w26yr0aixdjhlsn3rp8vp22wjnz4ch8q9i9r84wmyvsmc6r",
       "depends": []
     },
     "EpiCurve": {
@@ -9891,15 +10257,15 @@
     },
     "EpiModel": {
       "name": "EpiModel",
-      "version": "2.4.0",
-      "sha256": "0bwi7rkiv2cg1srmzbyly89w6p9xppk90vjmbw6h5k9481gn097h",
-      "depends": ["RColorBrewer", "Rcpp", "ape", "coda", "deSolve", "doParallel", "dplyr", "egor", "ergm", "ergm_ego", "foreach", "ggplot2", "lazyeval", "network", "networkDynamic", "networkLite", "rlang", "statnet_common", "tergm", "tibble"]
+      "version": "2.5.0",
+      "sha256": "0sybpf1bzrw2n1gl23kp1frzzlglgnmldwfz7lckv0nykr4wsh6g",
+      "depends": ["RColorBrewer", "Rcpp", "ape", "coda", "collections", "deSolve", "doParallel", "dplyr", "ergm", "foreach", "ggplot2", "lazyeval", "network", "networkDynamic", "networkLite", "rlang", "statnet_common", "tergm", "tibble"]
     },
     "EpiNow2": {
       "name": "EpiNow2",
-      "version": "1.5.2",
-      "sha256": "0nqa7dvp04ysqgdd5cjzfcd5vshk7jca251ljn8j55va186frmn5",
-      "depends": ["BH", "R_utils", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "checkmate", "data_table", "futile_logger", "future", "future_apply", "ggplot2", "lifecycle", "lubridate", "patchwork", "posterior", "progressr", "purrr", "rlang", "rstan", "rstantools", "runner", "scales", "truncnorm"]
+      "version": "1.6.1",
+      "sha256": "1061438cjx36kvvqv3s7s02y2zzp913wi4f30j1ss6gcx4s5dzsq",
+      "depends": ["BH", "R_utils", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "checkmate", "cli", "data_table", "futile_logger", "ggplot2", "lifecycle", "lubridate", "patchwork", "posterior", "purrr", "rlang", "rstan", "rstantools", "runner", "scales", "truncnorm"]
     },
     "EpiReport": {
       "name": "EpiReport",
@@ -9939,8 +10305,8 @@
     },
     "Equalden_HD": {
       "name": "Equalden.HD",
-      "version": "1.2",
-      "sha256": "1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb",
+      "version": "1.2.1",
+      "sha256": "17rv3ccnki6s31s2f31m1cshbsd1zim55zi5l9f66lycj1svcym4",
       "depends": []
     },
     "EquiSurv": {
@@ -9949,6 +10315,18 @@
       "sha256": "1yml5s3rswayxlxqsqknpwa2i55pj9q1p233kj9xsm8f1zmzk1mf",
       "depends": ["eha", "survival"]
     },
+    "EquiTrends": {
+      "name": "EquiTrends",
+      "version": "1.0.0",
+      "sha256": "1gdmaqm18mk93bfcf6qm247v7j61hi0lssmskcrlblk1snnli49l",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "VGAM", "clubSandwich", "dplyr", "nloptr", "plm", "rlang"]
+    },
+    "ErlangC": {
+      "name": "ErlangC",
+      "version": "0.1.0",
+      "sha256": "101f54qvac4qffyhf875ra9p58ididdh3j0a363r45gb5dbjac3n",
+      "depends": ["DT", "bsicons", "bslib", "gmp", "lubridate", "shiny", "tidyr"]
+    },
     "EstCRM": {
       "name": "EstCRM",
       "version": "1.6",
@@ -9993,8 +10371,8 @@
     },
     "Euclimatch": {
       "name": "Euclimatch",
-      "version": "1.0.1",
-      "sha256": "09nydlqdxpfcvfaznpjchw3zlz05a03n7picn419ivvjmf6hrx8x",
+      "version": "1.0.2",
+      "sha256": "0n0vxhl2d8in0z67sn4xm9gjmjyn9a7vhkwnjsf3s5vw775dllfr",
       "depends": ["RColorBrewer", "Rcpp", "RcppParallel", "doParallel", "foreach", "terra"]
     },
     "Eunomia": {
@@ -10003,12 +10381,6 @@
       "sha256": "1ma5xsfyj6f1dd6n7k4fqxil3xbgj2d79vb7b4zjqf7cb14vljlg",
       "depends": ["CommonDataModel", "DBI", "RSQLite", "arrow", "readr", "rlang"]
     },
-    "EurosarcBayes": {
-      "name": "EurosarcBayes",
-      "version": "1.1",
-      "sha256": "12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm",
-      "depends": ["VGAM", "clinfun", "data_table", "plyr", "shiny"]
-    },
     "EvCombR": {
       "name": "EvCombR",
       "version": "0.1-4",
@@ -10257,8 +10629,8 @@
     },
     "ExposR": {
       "name": "ExposR",
-      "version": "1.1",
-      "sha256": "0vsjq1l1kjzhqmixdqsv960riqglc0sg5lp7y27j0k54frnkbxik",
+      "version": "1.2",
+      "sha256": "01nkysl3igjhv73s9n90kf8zbrgw92aa105h91ivnlxhgcx4abbs",
       "depends": ["terra"]
     },
     "ExtDist": {
@@ -10287,9 +10659,9 @@
     },
     "ExtremalDep": {
       "name": "ExtremalDep",
-      "version": "0.0.4-1",
-      "sha256": "141pf0yvcfds2a0lzcmw99rzb1v75bsgapxppjcdnr66fb0bsqh1",
-      "depends": ["copula", "doParallel", "evd", "fda", "foreach", "gtools", "mvtnorm", "nloptr", "numDeriv", "quadprog", "sn"]
+      "version": "0.0.4-4",
+      "sha256": "1k0b7i14vib00z79wymxk5jh413acqb3pp8bz4m0iv0xsmf38l2n",
+      "depends": ["cluster", "copula", "doParallel", "evd", "fda", "foreach", "gtools", "mvtnorm", "nloptr", "numDeriv", "quadprog", "sn"]
     },
     "ExtremeBounds": {
       "name": "ExtremeBounds",
@@ -10399,6 +10771,12 @@
       "sha256": "0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik",
       "depends": []
     },
+    "FAVA": {
+      "name": "FAVA",
+      "version": "1.0.7",
+      "sha256": "07p0dbd33pqrfdp6vwi69yxqkc1snwn90m399zbmy7gi28vcxdy8",
+      "depends": ["dplyr", "ggplot2", "rlang", "stringr", "tidyr"]
+    },
     "FAVAR": {
       "name": "FAVAR",
       "version": "0.1.3",
@@ -10503,9 +10881,9 @@
     },
     "FDX": {
       "name": "FDX",
-      "version": "1.0.6",
-      "sha256": "16d2gwdiqv3i37ad33mvad8hsni0i7zf3y85z9sgxvabhs5igva1",
-      "depends": ["DiscreteFDR", "PoissonBinomial", "Rcpp", "pracma"]
+      "version": "2.0.2",
+      "sha256": "18z1fnqkqbrkcn0qmdaicvp8vm9q57bzqmca7xk4ckrll8zfcvq8",
+      "depends": ["DiscreteFDR", "PoissonBinomial", "Rcpp", "RcppArmadillo", "checkmate", "lifecycle", "pracma"]
     },
     "FDboost": {
       "name": "FDboost",
@@ -10567,6 +10945,12 @@
       "sha256": "15pj2dmgbjbx4xi585rqggnp05xzpg9pn2iy76ibgkdvjqknkwii",
       "depends": ["Rcpp", "RcppArmadillo", "foreach", "glmnet", "splines2"]
     },
+    "FGRepo": {
+      "name": "FGRepo",
+      "version": "1.3.2.0",
+      "sha256": "04wflncns7dr07j29inrfbn4c6wy0y3c6v7nzk7raj52c2pchha5",
+      "depends": []
+    },
     "FGalgorithm": {
       "name": "FGalgorithm",
       "version": "1.0",
@@ -10623,14 +11007,14 @@
     },
     "FKF": {
       "name": "FKF",
-      "version": "0.2.5",
-      "sha256": "0mfz03yv8h7nfw3xqy88j49yj035px9z88w7kjjqwkpkb9lib92w",
+      "version": "0.2.6",
+      "sha256": "0wv8g6f5y0qdpzd3x8xmfs9s9czwa39xdiy2llbz0lf00awyyzkk",
       "depends": []
     },
     "FKF_SP": {
       "name": "FKF.SP",
-      "version": "0.3.1",
-      "sha256": "01vwb274nxnaljqw187vdf4w2j7m2b2ns3d47k0a2fg2v73abyjz",
+      "version": "0.3.3",
+      "sha256": "0jv08qqcqqqs73gzj3v7wd45zfhf12qn3ahnb9a39h9rs3ipc15l",
       "depends": ["mathjaxr"]
     },
     "FKSUM": {
@@ -10645,12 +11029,6 @@
       "sha256": "013kxp6zjw8qzdq3750x109rhbmjn10q32wgxsh7ajiflwhj3f1i",
       "depends": ["glmnet", "gmp"]
     },
-    "FLLat": {
-      "name": "FLLat",
-      "version": "1.2-1",
-      "sha256": "0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1",
-      "depends": ["gplots"]
-    },
     "FLOPART": {
       "name": "FLOPART",
       "version": "2024.6.19",
@@ -10659,9 +11037,9 @@
     },
     "FLORAL": {
       "name": "FLORAL",
-      "version": "0.2.0",
-      "sha256": "1a1jnvbfk2fyqs5jw3y04wxln4hxsahv4yiwrhdgdbk4az3yxp9p",
-      "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "caret", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "glmnet", "mvtnorm", "reshape", "survcomp", "survival"]
+      "version": "0.3.0",
+      "sha256": "13gqy0c3zz3rs9lv6r5qrl9mzmg4zvaimxirr1p5bvmvwbaa256r",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "ast2ast", "caret", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "glmnet", "msm", "mvtnorm", "reshape", "survcomp", "survival"]
     },
     "FLR": {
       "name": "FLR",
@@ -10669,6 +11047,12 @@
       "sha256": "0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n",
       "depends": ["combinat"]
     },
+    "FLSSS": {
+      "name": "FLSSS",
+      "version": "9.1.8",
+      "sha256": "1ld0lrzwjj47gb95zii7v9qbp1dbiwww6hxq7vc82l6jlllsw3f6",
+      "depends": ["Rcpp", "RcppParallel"]
+    },
     "FLightR": {
       "name": "FLightR",
       "version": "0.5.5",
@@ -10737,8 +11121,8 @@
     },
     "FNN": {
       "name": "FNN",
-      "version": "1.1.4",
-      "sha256": "09zwlblkb7wkyk6azq2iizv3kj2wdqmjhg0r8zjiy1f692ivakfv",
+      "version": "1.1.4.1",
+      "sha256": "0m5q1jkyxynjgzakzn48aqxr5cc92sgl7z9j1zlqmb1yzn3p9nbk",
       "depends": []
     },
     "FOCI": {
@@ -10767,8 +11151,8 @@
     },
     "FPDclustering": {
       "name": "FPDclustering",
-      "version": "2.3.1",
-      "sha256": "04m75z320x9bxa3qi3yi60pl6b8fb1lxvx83q81iv42qw4998kd0",
+      "version": "2.3.2",
+      "sha256": "1ybicjbi7zrpk27abkcidch4ifb3ns0qh12hnhgvgvk89bks1iry",
       "depends": ["ExPosition", "GGally", "MASS", "ThreeWay", "cluster", "ggeasy", "ggplot2", "klaR", "mvtnorm", "rootSolve"]
     },
     "FPLdata": {
@@ -10795,6 +11179,12 @@
       "sha256": "0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq",
       "depends": ["Rglpk", "cccp", "timeSeries"]
     },
+    "FRB": {
+      "name": "FRB",
+      "version": "2.0-1",
+      "sha256": "0j8qf0m2rdyy2zmwgaba7n3a0xxrhi879fd7wwwcg1ay9g62sz0j",
+      "depends": ["corpcor", "rrcov"]
+    },
     "FRCC": {
       "name": "FRCC",
       "version": "1.1.0",
@@ -10893,10 +11283,16 @@
     },
     "FSelectorRcpp": {
       "name": "FSelectorRcpp",
-      "version": "0.3.11",
-      "sha256": "008zc270injmjhr2zqs0jw21f7vrmmclzjnin9xsx8drfk8bhdvn",
+      "version": "0.3.13",
+      "sha256": "0129zzwfxn5dib5v27g2227wd5nkkwy0hxqj8ljc5gsia05m7klx",
       "depends": ["BH", "Rcpp", "RcppArmadillo", "foreach", "iterators", "testthat"]
     },
+    "FTSgof": {
+      "name": "FTSgof",
+      "version": "1.0.0",
+      "sha256": "0rirhr1d6qmwch5ia7z1bipbvgr99b4cxgj7ix3jl996lmvyc2rj",
+      "depends": ["MASS", "fda", "nloptr", "rgl", "sde", "sfsmisc"]
+    },
     "FUNTA": {
       "name": "FUNTA",
       "version": "0.1.0",
@@ -10923,8 +11319,8 @@
     },
     "FaaSr": {
       "name": "FaaSr",
-      "version": "1.3.0",
-      "sha256": "093m5mrxckgl1g3ipab4v77g4129pmb5z9z1fbk2kj9jsb8gznlk",
+      "version": "1.4.3",
+      "sha256": "1g75nkxj66wridz9lxy94w28fv89lk23q40n4m1id45fvs9bl2sk",
       "depends": ["askpass", "base64enc", "cli", "httr", "jsonlite", "jsonvalidate", "paws_application_integration", "paws_compute", "paws_security_identity", "paws_storage", "sodium", "uuid"]
     },
     "FactoClass": {
@@ -11121,8 +11517,8 @@
     },
     "FeatureExtraction": {
       "name": "FeatureExtraction",
-      "version": "3.6.0",
-      "sha256": "0d4r65aacxz9pzsxlzavl95j7v6qc2i86bc89439fdh2iwc4lyz9",
+      "version": "3.7.2",
+      "sha256": "166czf41pnv3s0sw4sag2lnnnai7fzhkx5l10g3dnmv8rqhppvrk",
       "depends": ["Andromeda", "DBI", "DatabaseConnector", "ParallelLogger", "RSQLite", "SqlRender", "checkmate", "cli", "dplyr", "jsonlite", "pillar", "rJava", "readr", "rlang"]
     },
     "FeatureHashing": {
@@ -11145,14 +11541,14 @@
     },
     "FedData": {
       "name": "FedData",
-      "version": "4.0.1",
-      "sha256": "0shpkv2v5bc09dwqb89xv3df069wgiz3g8y3if2f7kg58ghgg5kn",
-      "depends": ["arcgislayers", "curl", "dplyr", "httr", "igraph", "lifecycle", "lubridate", "magrittr", "progress", "purrr", "readr", "sf", "stringr", "terra", "tibble", "tidyr", "xml2"]
+      "version": "4.2.0",
+      "sha256": "0lq3mrbqhkhdn6r97yc5il11hqv3nryns84rr75hcc5m2y9xj30c",
+      "depends": ["curl", "dplyr", "ggplot2", "glue", "httr", "igraph", "jsonlite", "lifecycle", "lubridate", "magrittr", "progress", "purrr", "readr", "sf", "stringr", "terra", "tibble", "tidyr", "xml2"]
     },
     "FedIRT": {
       "name": "FedIRT",
-      "version": "0.1.0",
-      "sha256": "0qihs2m1qdp9kfw8f7a76r6cppfi9bxlj2mk4670v4ds2mqyq7xw",
+      "version": "1.1.0",
+      "sha256": "0h7xmzqyd8brnii3xr1njwg5psw3cpn5jqmn59fqaa4xm7mx242r",
       "depends": ["DT", "callr", "ggplot2", "httr", "pracma", "purrr", "shiny", "shinyjs"]
     },
     "FeedbackTS": {
@@ -11199,9 +11595,9 @@
     },
     "FieldSimR": {
       "name": "FieldSimR",
-      "version": "1.3.0",
-      "sha256": "1yhys0zb6rzd3xx8lwxg6n9dak15nlhyg8a0bkgjfad8ljihlkyj",
-      "depends": ["cluster", "ggplot2", "interp", "lattice", "mbend"]
+      "version": "1.4.0",
+      "sha256": "0y59lymyz3a8ricpf7cyk9a5h4wdh4wsbv599857wkgbqan56nk3",
+      "depends": ["Matrix", "RColorBrewer", "cluster", "ggplot2", "interp", "lattice", "mbend"]
     },
     "FilmsGmooG": {
       "name": "FilmsGmooG",
@@ -11229,9 +11625,9 @@
     },
     "FinNet": {
       "name": "FinNet",
-      "version": "0.1.2",
-      "sha256": "1pfzdxprjh7nz2p7gvlss9hbkxb50l9v9z37hmf6xx4983a62z9z",
-      "depends": ["Matrix"]
+      "version": "0.2.1",
+      "sha256": "1rnmb072f40sp7cdib5afb02xh0r3293vxwqrab17917nrbjdg0q",
+      "depends": ["Matrix", "Rcpp"]
     },
     "FinTS": {
       "name": "FinTS",
@@ -11281,10 +11677,16 @@
       "sha256": "1q1kh999nx0hmgvnzxls95y7q501n0pqic0ylvrwq25ba2qwmcsg",
       "depends": ["ape", "fishtree", "geiger", "knitr", "phytools", "progress", "rfishbase", "rmarkdown"]
     },
+    "FishProxCompAnalyzer": {
+      "name": "FishProxCompAnalyzer",
+      "version": "0.1.0",
+      "sha256": "0f0w6dq0dag3msi7r9snpizmg24d7gxx4q7pgqhca6gihl3rr9nq",
+      "depends": []
+    },
     "FishResp": {
       "name": "FishResp",
-      "version": "1.1.1",
-      "sha256": "16my9pyzxyz3l087hq2r60fm08rgah3pg4arlqrwk1nn423cbr5v",
+      "version": "1.1.2",
+      "sha256": "1vgpv8jr9j6mj7qxd8glj6b6yrdk8qny06c07grq8mfzkr93s9k1",
       "depends": ["chron", "lattice", "mclust", "rMR", "respirometry"]
     },
     "FisherEM": {
@@ -11319,8 +11721,8 @@
     },
     "FjordLight": {
       "name": "FjordLight",
-      "version": "1.0.0",
-      "sha256": "07rb1x5b6wywla4jg6vb5s50c7a0m4bwgchxj4bnbcx53swrh2sf",
+      "version": "1.0.1",
+      "sha256": "1hb80nwa13rqxqbm2xfw0cf7b1ywbiip74djil89nqmwa8gfjpjq",
       "depends": ["curl", "ncdf4", "raster"]
     },
     "FlexDir": {
@@ -11341,6 +11743,12 @@
       "sha256": "0p0c949cdb05r6xnjc7k1i47z809g4mda1l94q7f4dikpnl1h2zd",
       "depends": ["nlme"]
     },
+    "FlexRL": {
+      "name": "FlexRL",
+      "version": "0.1.0",
+      "sha256": "00rcvx9cmj1jz4msjmr05x38410w9sy220y5w90hg1s5qvjgqqml",
+      "depends": ["Matrix", "Rcpp", "progress", "testit"]
+    },
     "FlexReg": {
       "name": "FlexReg",
       "version": "1.3.0",
@@ -11415,9 +11823,9 @@
     },
     "FoReco": {
       "name": "FoReco",
-      "version": "0.2.6",
-      "sha256": "07ivfjs836g3k13kfv188lxv300n43vczmkcapxnwiii643y1kw8",
-      "depends": ["Matrix", "cli", "corpcor", "mathjaxr", "osqp"]
+      "version": "1.0.0",
+      "sha256": "1spzhiijpbrhlxassilnbrbdbghfr6sz8m43q756c7mikan9wag7",
+      "depends": ["Matrix", "cli", "osqp"]
     },
     "ForIT": {
       "name": "ForIT",
@@ -11467,6 +11875,12 @@
       "sha256": "1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk",
       "depends": ["moments", "nloptr", "randomForest"]
     },
+    "ForestElementsR": {
+      "name": "ForestElementsR",
+      "version": "2.0.1",
+      "sha256": "1yjazlx7qxf5g30ikzrn4wk9hd4gpngxdmr1xdq6bj8xk9k3qajx",
+      "depends": ["Rdpack", "doBy", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
+    },
     "ForestFit": {
       "name": "ForestFit",
       "version": "2.2.3",
@@ -11505,9 +11919,9 @@
     },
     "FossilSim": {
       "name": "FossilSim",
-      "version": "2.3.3",
-      "sha256": "011lvhvlqwra6fzdszd6pq82h9r5fsx98d9afcc1z1ksa87md8vq",
-      "depends": ["ape"]
+      "version": "2.4.1",
+      "sha256": "0k5rs7p85pcwzjv9gkgrg1dp24ri1shcyr9p1r0xd7axvzpmpj4w",
+      "depends": ["ape", "ggfun", "ggplot2", "ggtree", "rlang", "tidytree"]
     },
     "FossilSimShiny": {
       "name": "FossilSimShiny",
@@ -11665,6 +12079,12 @@
       "sha256": "1a974s5j03caifcypk1c7la96754gh6n20xak7qaf9hrbm5i7vr9",
       "depends": ["R6", "checkmate", "data_table", "dbscan", "ggplot2"]
     },
+    "FuzzyImputationTest": {
+      "name": "FuzzyImputationTest",
+      "version": "0.3.8",
+      "sha256": "02lm2lq9mxwcah6ah1pbls1y05dwj7l1mka0mmpaz13zpsmi6cf2",
+      "depends": ["FuzzyNumbers", "FuzzySimRes", "VIM", "miceRanger", "missForest"]
+    },
     "FuzzyLP": {
       "name": "FuzzyLP",
       "version": "0.1-7",
@@ -11691,9 +12111,9 @@
     },
     "FuzzyPovertyR": {
       "name": "FuzzyPovertyR",
-      "version": "2.1.0",
-      "sha256": "0nqjiz8f0vqcmlcqva5zr971rrcfbw6gak22y2wqbila0za6asfv",
-      "depends": ["dplyr", "ecp", "ggplot2", "tidyr"]
+      "version": "3.0.2",
+      "sha256": "1wrh869wisqjwb8saj0gakrivwsslwvvxxbkwfrr5jpqkdrh43dk",
+      "depends": ["dplyr", "ecp", "ggplot2", "sampling", "tidyr"]
     },
     "FuzzyQ": {
       "name": "FuzzyQ",
@@ -11709,8 +12129,8 @@
     },
     "FuzzyResampling": {
       "name": "FuzzyResampling",
-      "version": "0.6.3",
-      "sha256": "1gic7la5ks7v37f3h4azazz4sv650sp6pl199wk4021blkah5r56",
+      "version": "0.6.4",
+      "sha256": "0j5ypz93p7scvww69qgjsazj2zw1v2c4h6lmzb2rsfglb6873mqk",
       "depends": []
     },
     "FuzzySTs": {
@@ -11721,8 +12141,8 @@
     },
     "FuzzySimRes": {
       "name": "FuzzySimRes",
-      "version": "0.4.0",
-      "sha256": "0zhzzjr28c7byx4vkh8y8a6b6v9isa2wyhwldpzsml2mxg0f3300",
+      "version": "0.4.3",
+      "sha256": "1my73zaykbnak8bhhcg74fksxzdcnf4rldzy8yjs5lwc2p1a5r32",
       "depends": ["FuzzyNumbers", "palasso"]
     },
     "FuzzyStatProb": {
@@ -11737,12 +12157,6 @@
       "sha256": "1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00",
       "depends": []
     },
-    "FuzzyStatTraEOO": {
-      "name": "FuzzyStatTraEOO",
-      "version": "1.0",
-      "sha256": "0jxjnmsznab0nf6nrjvdcy2gjmzn7fa0va993f7ylasr2pjawgsd",
-      "depends": ["R6"]
-    },
     "G2Sd": {
       "name": "G2Sd",
       "version": "2.1.5",
@@ -11841,8 +12255,8 @@
     },
     "GAS": {
       "name": "GAS",
-      "version": "0.3.4",
-      "sha256": "014b2y9qrv44j5v559bnw7yiacs9aarsgpbrj3clxm4n0srhv843",
+      "version": "0.3.4.1",
+      "sha256": "16348wz41silrrp7vb5qscydf9di8zrbydyvhpkv7dl003c9x0rp",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rsolnp", "cubature", "numDeriv", "xts", "zoo"]
     },
     "GAparsimony": {
@@ -11919,8 +12333,8 @@
     },
     "GD": {
       "name": "GD",
-      "version": "10.3",
-      "sha256": "1qgkwqszc90b5aygqh28gfasqbsxy08inj9vm9b2id9z1rg69p8m",
+      "version": "10.8",
+      "sha256": "102y9q8lpmvad0ih82r3pqg8qy7sq61j5wzd6lj6b6dp6pnv8s2r",
       "depends": ["BAMMtools"]
     },
     "GDAdata": {
@@ -11947,6 +12361,12 @@
       "sha256": "1gq2snfbmzfddh3bnga26p37ywahqxq5mnnmr3in8an3x5fdpw2v",
       "depends": ["MASS", "corpcor", "mvtnorm", "ngspatial", "numDeriv", "psych"]
     },
+    "GDILM_SEIRS": {
+      "name": "GDILM.SEIRS",
+      "version": "0.0.2",
+      "sha256": "12vmpav9hbx50nxb6gah31yh78q92p1wzjm4ka1xpj67lx75sm51",
+      "depends": ["MASS", "mvtnorm", "ngspatial"]
+    },
     "GDILM_SIR": {
       "name": "GDILM.SIR",
       "version": "1.2.1",
@@ -11961,8 +12381,8 @@
     },
     "GDPuc": {
       "name": "GDPuc",
-      "version": "1.0.0",
-      "sha256": "0in9nywf4nq8ivr142z15srf71rwm5mxnf8s7dp9fxl6axmizjs1",
+      "version": "1.0.4",
+      "sha256": "0g3s6jhn8ndx7jy97kmfzmxcc2b40k9j47rx703g61la1mm0a4fg",
       "depends": ["cli", "crayon", "dplyr", "glue", "lifecycle", "magrittr", "rlang", "tibble", "tidyr", "tidyselect", "withr"]
     },
     "GDSARM": {
@@ -11983,6 +12403,12 @@
       "sha256": "1kcczyih3lg1cc6nppxbpz1zkq9priy8xwapd6kvkzmyw8npback",
       "depends": ["mistr"]
     },
+    "GECal": {
+      "name": "GECal",
+      "version": "0.1.5",
+      "sha256": "0i5l15v3g0mpr3byhg55pib5x84fjhp7yxwzm3hb04dfn1dx07lj",
+      "depends": ["nleqslv"]
+    },
     "GEEaSPU": {
       "name": "GEEaSPU",
       "version": "1.0.2",
@@ -12045,8 +12471,8 @@
     },
     "GET": {
       "name": "GET",
-      "version": "1.0-2",
-      "sha256": "0z977w3chrwr9bxlx7l45qqc7nj2z5gx886ybjxclh6s5zgc2d9f",
+      "version": "1.0-4",
+      "sha256": "1648dg7vhvy4yljq0m0y0a4b67n81d34nygmqr1kci9f5avcgjjr",
       "depends": ["cluster", "ggplot2", "gridExtra", "viridisLite"]
     },
     "GETdesigns": {
@@ -12093,10 +12519,16 @@
     },
     "GFDrmst": {
       "name": "GFDrmst",
-      "version": "0.1.0",
-      "sha256": "1qas9dj65mqjfzslxxljy17370vc0v6fwypgv971kvk9wx1a2a00",
+      "version": "0.1.1",
+      "sha256": "0d1cfy97qclymycq03i8gqnivm1x2slqmbv4zlyxk8frg7j4wb57",
       "depends": ["GFDmcv", "MASS", "lpSolve", "mvtnorm", "plyr", "shiny", "shinyMatrix", "shinyWidgets", "shinyjs", "shinythemes", "tippy"]
     },
+    "GFDrmtl": {
+      "name": "GFDrmtl",
+      "version": "0.1.0",
+      "sha256": "1kdfgz8y0bfnq40ab083z4ra8f7sv2s2ng94mfa3fcjh6ixk2fvj",
+      "depends": ["GFDmcv", "GFDrmst", "MASS", "lpSolve", "mvtnorm", "plyr", "shiny", "shinyMatrix", "shinyWidgets", "shinyjs", "shinythemes", "tippy"]
+    },
     "GFDsurv": {
       "name": "GFDsurv",
       "version": "0.1.1",
@@ -12141,15 +12573,15 @@
     },
     "GGIR": {
       "name": "GGIR",
-      "version": "3.1-2",
-      "sha256": "1vy57qbnav1kl71wwznb0kl3s06csqm0sx5k90hzwqjignxnc223",
+      "version": "3.1-5",
+      "sha256": "1shcm0v3mjscf5kc2lhn9y2vwdffsx3kgawh7ddpklrgf250vzpx",
       "depends": ["ActCR", "GGIRread", "data_table", "doParallel", "foreach", "ineq", "irr", "lubridate", "psych", "read_gt3x", "signal", "unisensR", "zoo"]
     },
     "GGIRread": {
       "name": "GGIRread",
-      "version": "1.0.1",
-      "sha256": "0kad21xqwb2c4phg4mq7480qvki5frn2c2slfbcfj9paxxl4ha16",
-      "depends": ["Rcpp", "bitops", "matlab"]
+      "version": "1.0.2",
+      "sha256": "0qd13y9hg63qabn4z8z8qxqj34gwf763wvw7zdfq2df0ik5ipg55",
+      "depends": ["Rcpp", "bitops", "data_table", "jsonlite", "matlab", "readxl"]
     },
     "GGMncv": {
       "name": "GGMncv",
@@ -12171,8 +12603,8 @@
     },
     "GGMselect": {
       "name": "GGMselect",
-      "version": "0.1-12.7",
-      "sha256": "1l90viinjfbjwl7229aqbzv72d0jgjbcidv0ll770qsd1hc1p70r",
+      "version": "0.1-12.7.1",
+      "sha256": "0zv2g8vdwz02hkw199zj95bsdp93nbwkc6zdkbsvcqnanqr4akx6",
       "depends": ["gtools", "lars", "mvtnorm"]
     },
     "GGRidge": {
@@ -12199,6 +12631,12 @@
       "sha256": "18ass4fxdsvcn9j103dixar0grrh5w3nh6icydh1w5myrd455z9l",
       "depends": ["FastKNN", "RColorBrewer", "cowplot", "doParallel", "foreach", "ggforce", "ggplot2", "rlang", "rnaturalearth", "scales", "sf", "tidyr"]
     },
+    "GHCNr": {
+      "name": "GHCNr",
+      "version": "1.0.0",
+      "sha256": "09k0fdyc9mqa299bhchhz7gcq9vka138dhd50kkfq5rcazqprvhf",
+      "depends": ["curl", "dplyr", "httr2", "readr", "rlang", "terra", "tibble", "tidyr", "tidyselect"]
+    },
     "GHS": {
       "name": "GHS",
       "version": "0.1",
@@ -12219,8 +12657,8 @@
     },
     "GIFT": {
       "name": "GIFT",
-      "version": "1.3.2",
-      "sha256": "0ngrci818f0k21aiy7dnzpip33sikjf2kp7j9l3r7mwp35h6q2qd",
+      "version": "1.3.3",
+      "sha256": "0znnpc1mf92p4biwh4d1i80avnjky2ixmjd52fxak5jxyyqjgfw1",
       "depends": ["ape", "curl", "dplyr", "httr2", "jsonlite", "phytools", "purrr", "sf", "tidyr"]
     },
     "GIFTr": {
@@ -12253,6 +12691,12 @@
       "sha256": "0clhch4xvklrmk7h6b7vz83zzlj5r1lzrszy73agmpdbs5cax5sy",
       "depends": ["RCurl", "cppRouting", "dplyr", "here", "httr", "igraph", "leaflet", "magrittr", "nabor", "purrr", "reshape2", "rlang", "sf", "stringr", "tibble", "tidygraph", "tidyselect"]
     },
+    "GISTools": {
+      "name": "GISTools",
+      "version": "1.0-2",
+      "sha256": "024ngx3r0c38ss9qzali6nw55sgl2jqksspjz6v2drgaadkxczlz",
+      "depends": ["MASS", "RColorBrewer", "sf", "sp"]
+    },
     "GInSARCorW": {
       "name": "GInSARCorW",
       "version": "1.15.8",
@@ -12267,9 +12711,9 @@
     },
     "GJRM": {
       "name": "GJRM",
-      "version": "0.2-6.5",
-      "sha256": "0j69lh8hbdcmgj6bwg67s1mlgffcmc045z6sm6p3jifcg8ri18sw",
-      "depends": ["Rmpfr", "VGAM", "VineCopula", "copula", "evd", "gamlss_dist", "ggplot2", "ismev", "magic", "matrixStats", "mgcv", "mnormt", "numDeriv", "psych", "scam", "survey", "survival", "trust"]
+      "version": "0.2-6.7",
+      "sha256": "1zzbjss0xfnmf8q445wfrkvpgp4x33nmcnfxm2wizpfj7jgxprqg",
+      "depends": ["Rmpfr", "VGAM", "VineCopula", "copula", "distrEx", "evd", "gamlss_dist", "ggplot2", "ismev", "magic", "matrixStats", "mgcv", "mnormt", "numDeriv", "psych", "scam", "survey", "survival", "trust"]
     },
     "GK2011": {
       "name": "GK2011",
@@ -12279,8 +12723,8 @@
     },
     "GLCMTextures": {
       "name": "GLCMTextures",
-      "version": "0.4.1",
-      "sha256": "1bh5kw46fpgawxgfif3m6vsr2zcngb7n1ass9cdx0cdkb525n7xi",
+      "version": "0.4.2",
+      "sha256": "0sfa05nm2riv8mnldq9hf7p0rcwwycc627ccwjkgh9a754fzxhcv",
       "depends": ["Rcpp", "RcppArmadillo", "raster", "terra"]
     },
     "GLDEX": {
@@ -12295,12 +12739,6 @@
       "sha256": "1cp5mgbvq0g9ss2cv5yincfjvs8jmciz0h3g5jrr8gda1gvf357i",
       "depends": ["GLDEX", "ddst"]
     },
-    "GLIDE": {
-      "name": "GLIDE",
-      "version": "1.0.5",
-      "sha256": "01164gh0j4g0hambiq92bxrd3j3z2psg19faj32mvhmn4c3k2m8i",
-      "depends": ["MASS", "doParallel", "foreach"]
-    },
     "GLMMRR": {
       "name": "GLMMRR",
       "version": "0.5.0",
@@ -12315,8 +12753,8 @@
     },
     "GLMMcosinor": {
       "name": "GLMMcosinor",
-      "version": "0.2.0",
-      "sha256": "098r9l5m26ld8frxjzc6rr7ahw2z22njnskn06kqchxjqxv6amqw",
+      "version": "0.2.1",
+      "sha256": "1s631xl56ix0xah8kq55lxw6273f5bc1md3zw7y5gvismfdlicwm",
       "depends": ["assertthat", "cowplot", "ggforce", "ggplot2", "glmmTMB", "lme4", "rlang", "scales"]
     },
     "GLMMselect": {
@@ -12333,9 +12771,9 @@
     },
     "GLMcat": {
       "name": "GLMcat",
-      "version": "0.2.6",
-      "sha256": "0izxa3ifwpqyyzy69hhhzf379ns1hswfa36ky2izawpyqk5h15ci",
-      "depends": ["BH", "Rcpp", "RcppEigen", "ordinal", "stringr"]
+      "version": "0.2.7",
+      "sha256": "0a9gvnrzrhpywmy4zzm0pyah6dflim4zfg4hqj8kh1ks0wynmjbr",
+      "depends": ["BH", "Rcpp", "RcppEigen", "stringr"]
     },
     "GLMpack": {
       "name": "GLMpack",
@@ -12423,14 +12861,14 @@
     },
     "GNAR": {
       "name": "GNAR",
-      "version": "1.1.3",
-      "sha256": "1kffr4yxfl7af5vc06nx3zw1zcwbj3mxcsn44zgdz9yfvw3ppcjq",
+      "version": "1.1.4",
+      "sha256": "0ma7cp0ikpihmjmi3m8h51pg897287xbkwiinpairrsmiz0l711i",
       "depends": ["ggforce", "ggplot2", "ggpubr", "igraph", "matrixcalc", "rlang", "viridis", "wordcloud"]
     },
     "GNE": {
       "name": "GNE",
-      "version": "0.99-5",
-      "sha256": "0a796zppqvjgymh03xh7wdb26m0ir2gsavm37278liaj3nzk2jkz",
+      "version": "0.99-6",
+      "sha256": "163jhkz2gxzq8ji3fgk1337rhnjhmwz55ai5mhgsbyyrgd5dayii",
       "depends": ["BB", "SQUAREM", "alabama", "nleqslv"]
     },
     "GNRS": {
@@ -12457,6 +12895,12 @@
       "sha256": "04m08d9w8qqbql86c18qpnwym7agry8wspfwrnbbyp52h2pn2gxb",
       "depends": ["rhandsontable", "rmarkdown", "shiny"]
     },
+    "GOLDprice": {
+      "name": "GOLDprice",
+      "version": "0.1.0",
+      "sha256": "0mr132l59xg91zcr1681xkkrp5r63irm89vh3yvxc7kdx7dxjs83",
+      "depends": ["readxl"]
+    },
     "GORCure": {
       "name": "GORCure",
       "version": "2.0",
@@ -12505,6 +12949,18 @@
       "sha256": "0hlhm780xyila4idk5r87pw046xi3lxhhpr0a22smhf4klvnlfgc",
       "depends": ["Rcpp", "RcppArmadillo", "TeachingDemos", "caret", "cubature", "ltm", "mirt", "mvtnorm", "statmod"]
     },
+    "GPCsign": {
+      "name": "GPCsign",
+      "version": "0.1.0",
+      "sha256": "0qijvdk6l8gjmikvq8bgglj5kp83b1qv7d860hrd2kw22s0gv0l7",
+      "depends": ["DiceKriging", "TruncatedNormal", "future", "future_apply", "tmvtnorm"]
+    },
+    "GPEMR": {
+      "name": "GPEMR",
+      "version": "0.1.0",
+      "sha256": "174zhr0nj6z4myvy24j1dx6j44fn30nwbjcpl95wpsz9rsrl41rm",
+      "depends": ["mvtnorm"]
+    },
     "GPFDA": {
       "name": "GPFDA",
       "version": "3.1.3",
@@ -12517,12 +12973,6 @@
       "sha256": "1xxilr1ify9ip3vs000jawxplcbf1vqli40frhnwwjqf01kj8jq5",
       "depends": ["DiceDesign", "DiceKriging", "GPareto", "KrigInv", "MASS", "Rcpp", "matrixStats", "mnormt", "mvtnorm"]
     },
-    "GPIC": {
-      "name": "GPIC",
-      "version": "0.1.0",
-      "sha256": "1v44hkzf3wh09j5pcfmsc8h5jzmqa501bwkmdwwjb7pz64976r23",
-      "depends": []
-    },
     "GPL2025": {
       "name": "GPL2025",
       "version": "1.0.1",
@@ -12565,6 +13015,12 @@
       "sha256": "0bs6swzj2zh2dgyiwxirimz5gdk7vfssb7ga0cqmr9s5ckvgh8ir",
       "depends": ["geosphere", "htmlwidgets", "leaflet", "leaflet_extras", "plyr", "purrr", "sf", "sp", "suncalc"]
     },
+    "GPTreeO": {
+      "name": "GPTreeO",
+      "version": "1.0.1",
+      "sha256": "0526qy3d067nh5753rqyfgmylz7fc27hc0nfvzxisx8kifmjbzcv",
+      "depends": ["DiceKriging", "R6", "hash", "mlegp"]
+    },
     "GPUmatrix": {
       "name": "GPUmatrix",
       "version": "1.0.2",
@@ -12591,9 +13047,9 @@
     },
     "GPvam": {
       "name": "GPvam",
-      "version": "3.1-0",
-      "sha256": "0mmwg5m85rzaaj8wdxsdn1yqpl08pr3ydmxpfwmm2f7xw0k2k29g",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "numDeriv"]
+      "version": "3.2-0",
+      "sha256": "03s8yl56rl2hpjfhfmbkckfjhxiz6ac6qcqsq75m0ajlyvzicvhl",
+      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "ggplot2", "numDeriv", "patchwork", "rlang"]
     },
     "GPvecchia": {
       "name": "GPvecchia",
@@ -12643,6 +13099,12 @@
       "sha256": "0d8zibd27z0krn564ba906zlvnb1fx4mfvhpii7pxr0pzjir2a9c",
       "depends": ["Rsolnp", "evmix", "fields", "ggplot2", "limSolve", "pracma", "reshape2"]
     },
+    "GRIN2": {
+      "name": "GRIN2",
+      "version": "1.0",
+      "sha256": "17q26vwz8mmdq649pmb6n4q210912f8q7qcc2imq10ri9ssaw295",
+      "depends": ["ComplexHeatmap", "EnsDb_Hsapiens_v75", "GenomeInfoDb", "Gviz", "biomaRt", "circlize", "data_table", "dplyr", "ensembldb", "forcats", "ggplot2", "gridGraphics", "magrittr", "stringr", "survival", "tibble", "tidyselect", "writexl"]
+    },
     "GRNNs": {
       "name": "GRNNs",
       "version": "0.1.0",
@@ -12733,6 +13195,12 @@
       "sha256": "1k8axyzk55d8idn65qj3gxqjsk27n2r0q78v7524mg8n3fhxs0wj",
       "depends": ["R_utils", "memoise", "rootSolve", "survival"]
     },
+    "GSEMA": {
+      "name": "GSEMA",
+      "version": "0.99.3",
+      "sha256": "1ynbjm61v1j3m06ixbzil0rxcmvfxpz27dcfiif8bkk9g5mkfs2d",
+      "depends": ["Biobase", "BiocParallel", "GSVA", "RColorBrewer", "Rdpack", "doParallel", "impute", "limma", "metafor", "pbapply", "pheatmap", "plyr", "progress", "scales", "singscore"]
+    },
     "GSM": {
       "name": "GSM",
       "version": "1.3.2",
@@ -12747,9 +13215,9 @@
     },
     "GSODR": {
       "name": "GSODR",
-      "version": "4.1.1",
-      "sha256": "1q4jpv38x4z7bdqy49iaxgsfvy0iiicfvc4w8mpj0qjm9cj81gym",
-      "depends": ["R_utils", "countrycode", "curl", "data_table"]
+      "version": "4.1.3",
+      "sha256": "0zqc0md2h2r0f0h9k8q70kdjnx35lvn8dnmzpxq0vwlkd0vzfyrn",
+      "depends": ["R_utils", "countrycode", "curl", "data_table", "withr"]
     },
     "GSSE": {
       "name": "GSSE",
@@ -12781,6 +13249,18 @@
       "sha256": "1dryw7d9qnsa3wibk9kgkldwb660arzdw024p62a123v7i932jz0",
       "depends": ["survival"]
     },
+    "GTFSwizard": {
+      "name": "GTFSwizard",
+      "version": "1.0.0",
+      "sha256": "01gklymwqzq32xkmbsds9vlqzhs4x9237grn96bj70kl567zjyvw",
+      "depends": ["checkmate", "crayon", "data_table", "dplyr", "forcats", "geosphere", "ggplot2", "glue", "gtfsio", "gtfstools", "hms", "hrbrthemes", "leaflet", "leaflet_extras", "lubridate", "plotly", "purrr", "rlang", "sf", "sfnetworks", "shiny", "stplanr", "stringr", "tibble", "tidyr", "tidytransit"]
+    },
+    "GTbasedIM": {
+      "name": "GTbasedIM",
+      "version": "1.0.0",
+      "sha256": "0im2s0n08kah2g9yg3f4l8y75jq1674liy6mffkd9xg7z6ad25q5",
+      "depends": ["CoopGame", "RWeka"]
+    },
     "GUD": {
       "name": "GUD",
       "version": "1.0.2",
@@ -12793,12 +13273,6 @@
       "sha256": "045cb9k99mrnx8c6xrshsca6dlyw3wqj57i5j34cjz39g4bmwxl6",
       "depends": ["GGally", "XICOR", "network"]
     },
-    "GUIDE": {
-      "name": "GUIDE",
-      "version": "1.2.7",
-      "sha256": "0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v",
-      "depends": ["rpanel", "tkrplot"]
-    },
     "GUILDS": {
       "name": "GUILDS",
       "version": "1.4.6",
@@ -12829,6 +13303,12 @@
       "sha256": "0hafmq8m2pszmmj9yldrbab8670pfrm62x79g8lzac9rmhlz76w2",
       "depends": ["lmtest", "lubridate", "sandwich", "strucchange", "tsDyn", "urca", "vars", "xts"]
     },
+    "GVS": {
+      "name": "GVS",
+      "version": "0.0.1",
+      "sha256": "1ss6ddsvm41mh29h30wmcgn1mdh0ilf3l9ssdp6x6a422a0d0zli",
+      "depends": ["httr", "jsonlite"]
+    },
     "GWASExactHW": {
       "name": "GWASExactHW",
       "version": "1.2",
@@ -12843,8 +13323,8 @@
     },
     "GWASinlps": {
       "name": "GWASinlps",
-      "version": "2.2",
-      "sha256": "1q5gaam554r2wxwsdgxjx6hngs2q850hbrkz8y5248i46pz16pcc",
+      "version": "2.3",
+      "sha256": "06bd6cyjvihcj166f20wdycww6b2xqb9nvh078sys52fi9nwzwcc",
       "depends": ["Rcpp", "RcppArmadillo", "fastglm", "horseshoe", "mombf", "survival"]
     },
     "GWASinspector": {
@@ -12891,14 +13371,20 @@
     },
     "GWalkR": {
       "name": "GWalkR",
-      "version": "0.1.4",
-      "sha256": "0c5nzqw4q1gn36h7pz43imbbirpwg7snszg9qqn6hzfzgcnqshay",
-      "depends": ["htmlwidgets", "jsonlite", "openssl", "shiny"]
+      "version": "0.2.0",
+      "sha256": "0d6f1br5g28z6qbi41y3sfglci941lzs38hm9cjr1vlxg65dnzav",
+      "depends": ["DBI", "duckdb", "htmlwidgets", "jsonlite", "openssl", "shiny", "shinycssloaders"]
+    },
+    "GWlasso": {
+      "name": "GWlasso",
+      "version": "1.0.1",
+      "sha256": "1cpxaqk6z55fydd1b18pc90796fdig1ax0llvip60sn0wwbqhqpp",
+      "depends": ["GWmodel", "dplyr", "ggplot2", "ggside", "glmnet", "lifecycle", "magrittr", "progress", "rlang", "sf", "tidyr"]
     },
     "GWmodel": {
       "name": "GWmodel",
-      "version": "2.3-3",
-      "sha256": "0g6kd8yic2dlm192429ii2rbvjsz1gndbfmg3lglkfpzsw0d0saz",
+      "version": "2.4-1",
+      "sha256": "1mlgcmr1s8gn52q32jxj2hfrymrc033w56bx0cm40m0mi657p3fb",
       "depends": ["FNN", "Rcpp", "RcppArmadillo", "RcppEigen", "robustbase", "sf", "sp", "spacetime", "spatialreg", "spdep"]
     },
     "GWnnegPCA": {
@@ -12919,12 +13405,6 @@
       "sha256": "0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2",
       "depends": []
     },
-    "GaMaBioMD": {
-      "name": "GaMaBioMD",
-      "version": "0.2.0",
-      "sha256": "15rx6xycnxldaxyjhcgysfz7zj6cjwlfkjjm6jyhxxvw4h2nw75m",
-      "depends": ["Biostrings", "ape", "dendextend", "dplyr", "ggplot2", "heatmaply", "magrittr", "reshape2", "traits"]
-    },
     "GaSP": {
       "name": "GaSP",
       "version": "1.0.6",
@@ -12951,14 +13431,14 @@
     },
     "GauPro": {
       "name": "GauPro",
-      "version": "0.2.12",
-      "sha256": "03v4bhm5c32gql2s0ysxd4r12yjv28ar7nmap55rc38kj66pgzwx",
-      "depends": ["R6", "Rcpp", "RcppArmadillo", "lbfgs"]
+      "version": "0.2.13",
+      "sha256": "0l1sizyzrmxl9svdx1hhfg4aq00g1ss9ply3i2ll344nd9j54fvz",
+      "depends": ["R6", "Rcpp", "RcppArmadillo", "ggplot2", "lbfgs", "mixopt", "numDeriv", "rmarkdown", "tidyr"]
     },
     "GaussSuppression": {
       "name": "GaussSuppression",
-      "version": "0.8.8",
-      "sha256": "0alfkb9bbixs1h7i2b0vdmkx8g8ncv9wsdkfb6hx9yl4vj9033ra",
+      "version": "0.9.2",
+      "sha256": "07a2xv55y153xhn8irvz40sjkkz7514s7j210mzl22ibaq2hc28g",
       "depends": ["Matrix", "RegSDC", "SSBtools"]
     },
     "GaussianHMM1d": {
@@ -12969,9 +13449,9 @@
     },
     "GeDS": {
       "name": "GeDS",
-      "version": "0.2.3",
-      "sha256": "01zi5q78chcd6a3v3506nhnm5nlnpgglaazsf2cr1zdi7xrxgnyr",
-      "depends": ["MASS", "Matrix", "Rcpp", "Rmpfr", "TH_data", "doFuture", "doParallel", "doRNG", "foreach", "future", "mboost", "plot3D"]
+      "version": "0.2.4",
+      "sha256": "02c3hrpgp2y2il1db1da73zi3jikzihaaafp8snsdfw516q0a1pc",
+      "depends": ["MASS", "Matrix", "Rcpp", "Rmpfr", "TH_data", "doFuture", "doParallel", "doRNG", "foreach", "future", "mboost", "mi", "plot3D"]
     },
     "GeNetIt": {
       "name": "GeNetIt",
@@ -12979,6 +13459,12 @@
       "sha256": "1ay40ym6khs016bs7ljcn7krqn9bmj2csd7p4nhzapbhp4g45wsc",
       "depends": ["dplyr", "exactextractr", "igraph", "nlme", "sf", "sfnetworks", "spdep", "terra", "tidygraph"]
     },
+    "GeRnika": {
+      "name": "GeRnika",
+      "version": "1.0.0",
+      "sha256": "0d61vx33rxlmjk5kazji0a6wli6cfcardn308wzbjqpvixsqy2vl",
+      "depends": ["DiagrammeR", "colorspace", "data_tree", "dplyr", "magrittr", "purrr", "reshape2", "vctrs"]
+    },
     "GenAI": {
       "name": "GenAI",
       "version": "0.2.0",
@@ -13017,8 +13503,8 @@
     },
     "GenSA": {
       "name": "GenSA",
-      "version": "1.1.14",
-      "sha256": "0dv83fm31ksbf7q1rbg9kz7v8h4zp34xv7adz15c1lv61sxmbr36",
+      "version": "1.1.14.1",
+      "sha256": "0zrprs5gb0pwl249gnvs675ph5f59z2dhis562xfmjbhsv5m9p9g",
       "depends": []
     },
     "GenTag": {
@@ -13059,9 +13545,9 @@
     },
     "GeneNMF": {
       "name": "GeneNMF",
-      "version": "0.6.0",
-      "sha256": "1szmkfijy84dl0zbr08cw7likqmziwm85dhvhzqvhybd17g9ahlj",
-      "depends": ["Matrix", "RcppML", "Seurat", "cluster", "irlba", "lsa", "pheatmap", "viridis"]
+      "version": "0.6.2",
+      "sha256": "1955d39fbqnqp7j2878v7qd4wm9pjp315mgigsk3g4pnivgml2a4",
+      "depends": ["Matrix", "RcppML", "Seurat", "cluster", "dendextend", "irlba", "lsa", "pheatmap", "viridis"]
     },
     "GeneNet": {
       "name": "GeneNet",
@@ -13075,6 +13561,12 @@
       "sha256": "1yjz9bc5qy46z6ha9c7khx6mgzyqqbx3aq5w7nqw5zfym1zkfiaq",
       "depends": ["MASS", "corpcor"]
     },
+    "GeneScoreR": {
+      "name": "GeneScoreR",
+      "version": "0.1.1",
+      "sha256": "1zf1imf9q85qazn176lzgxfgim4rni4hpzbsaiaqgh70i0g74qrl",
+      "depends": []
+    },
     "GeneSelectR": {
       "name": "GeneSelectR",
       "version": "1.0.1",
@@ -13123,6 +13615,12 @@
       "sha256": "0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars",
       "depends": []
     },
+    "GenoPop": {
+      "name": "GenoPop",
+      "version": "1.0.0",
+      "sha256": "1fn1ai67xwxrriiildqbd6hr63qxg1ykma1q50c07i1k8bbyzpbq",
+      "depends": ["GenomicRanges", "IRanges", "Rsamtools", "doParallel", "foreach", "missForest"]
+    },
     "GenoScan": {
       "name": "GenoScan",
       "version": "0.1",
@@ -13131,8 +13629,8 @@
     },
     "GenoTriplo": {
       "name": "GenoTriplo",
-      "version": "1.1.0",
-      "sha256": "04v1llw3ppzx9s9cm8wp78n5hpm65bpmkmsliczlp33l91cbspp8",
+      "version": "1.1.2",
+      "sha256": "1ri88zwn438m33fkqgcb1a2wmmvy9x1r5q3mnax6yg42bq8iz8zv",
       "depends": ["DT", "Rmixmod", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "htmltools", "processx", "rlang", "shiny", "shinyBS", "shinythemes", "tidyr"]
     },
     "GenomeAdmixR": {
@@ -13141,6 +13639,12 @@
       "sha256": "14qnabg1pj8sg2bvd3k4m467bh1q2zfjr0ljxn1ny031sqwis4cy",
       "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "ggridges", "hierfstat", "rlang", "stringr", "tibble", "vcfR"]
     },
+    "GenomicSig": {
+      "name": "GenomicSig",
+      "version": "0.1.0",
+      "sha256": "0l4sl2f90c4vgz24fn805jcqk1llzhqlf5qj4dpdls3zfdmcd9qq",
+      "depends": ["Biostrings", "entropy", "kaos", "seqinr"]
+    },
     "GenomicTools_fileHandler": {
       "name": "GenomicTools.fileHandler",
       "version": "0.1.5.9",
@@ -13153,11 +13657,17 @@
       "sha256": "0251672j2vl9jck31zfcqzsyw8pphzs934j8ljjmnw9qqd3gzd2p",
       "depends": ["Matrix", "RcppEigen", "SUMMER", "TMB", "fields", "fmesher", "ggplot2", "sf", "terra"]
     },
+    "GeoFIS": {
+      "name": "GeoFIS",
+      "version": "1.1.1",
+      "sha256": "0p47qj2qrc2a30im7mff137g0ffxrl7jpzwpzs3ac01xnrayar7y",
+      "depends": ["BH", "FisPro", "R6", "Rcpp", "Rdpack", "data_tree", "foreach", "itertools", "magrittr", "nnls", "purrr", "sf", "sp"]
+    },
     "GeoModels": {
       "name": "GeoModels",
-      "version": "2.0.4",
-      "sha256": "0hqj4ddil9qf15vi65lrs6qk4y9v4mdj70iajm734skm95pi1l0l",
-      "depends": ["FastGP", "VGAM", "codetools", "data_table", "doFuture", "dotCall64", "fields", "foreach", "future", "hypergeo", "lamW", "mapproj", "nabor", "pbivnorm", "plotrix", "pracma", "progressr", "scatterplot3d", "shape", "sn", "sp", "spam", "zipfR"]
+      "version": "2.0.8",
+      "sha256": "0bkwbkkmwdxw8l4sgxdhk1i2ichn86z01jk0ma9mi2rrxxdaclv6",
+      "depends": ["FastGP", "VGAM", "codetools", "doFuture", "dotCall64", "fields", "foreach", "future", "hypergeo", "lamW", "mapproj", "minqa", "nabor", "pbivnorm", "plotrix", "pracma", "progressr", "scatterplot3d", "shape", "sn", "sp", "spam", "zipfR"]
     },
     "GeoMongo": {
       "name": "GeoMongo",
@@ -13171,6 +13681,18 @@
       "sha256": "0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3",
       "depends": ["moments", "proj4", "raster", "sp", "velociraptr"]
     },
+    "GeoThinneR": {
+      "name": "GeoThinneR",
+      "version": "1.1.0",
+      "sha256": "0fsiik19cck9pmfk4nwwfy3vyj19s1x0m2y9a14jlrqy40v98lza",
+      "depends": ["Rcpp", "data_table", "fields", "matrixStats", "nabor", "terra"]
+    },
+    "GeoTox": {
+      "name": "GeoTox",
+      "version": "0.2.0",
+      "sha256": "0q4jkcj7zmh1hsn9izv09p0wzb4amsxfqc22lr28jw2df17r0ym6",
+      "depends": ["dplyr", "ggplot2", "ggridges", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect", "truncnorm"]
+    },
     "GeoWeightedModel": {
       "name": "GeoWeightedModel",
       "version": "1.0.3",
@@ -13185,8 +13707,8 @@
     },
     "GeomArchetypal": {
       "name": "GeomArchetypal",
-      "version": "1.0.2",
-      "sha256": "072llxc2chj5acbpyg5h9hyi9mrwr0s7xg508bs2sxjx4s77kf5l",
+      "version": "1.0.3",
+      "sha256": "1v3jgwv45bzyya578z6hqjj6jzwgh1gsbin67sqf1i735c0lms05",
       "depends": ["Matrix", "abind", "archetypal", "distances", "doParallel", "dplyr", "geometry", "magrittr", "mirai", "plot3D", "rlang", "scales"]
     },
     "GeomComb": {
@@ -13195,6 +13717,12 @@
       "sha256": "05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r",
       "depends": ["ForecastCombinations", "Matrix", "forecast", "ggplot2", "mtsdi", "psych"]
     },
+    "GephiForR": {
+      "name": "GephiForR",
+      "version": "0.1.0",
+      "sha256": "0g1aq1k25pipnkm1xbsb7f9nx4j86ra2a39h9nrq9jzh40vd3ldr",
+      "depends": ["Rdpack", "igraph"]
+    },
     "GerminaR": {
       "name": "GerminaR",
       "version": "2.1.4",
@@ -13239,8 +13767,8 @@
     },
     "GetTDData": {
       "name": "GetTDData",
-      "version": "1.5.5",
-      "sha256": "085rsqqrmda6mzb7n7kq00hpim62qqa85qk8kx8x5ch4j1qdhwi0",
+      "version": "1.5.6",
+      "sha256": "1l2kc85sxnwmccyyjf18d8npg40pa3kgsvd73lj6b8pxwrsg9wj7",
       "depends": ["bizdays", "cli", "curl", "dplyr", "fs", "humanize", "jsonlite", "purrr", "readxl", "rvest", "stringr", "tibble", "tidyr", "xml2"]
     },
     "GetoptLong": {
@@ -13267,6 +13795,12 @@
       "sha256": "0vp9f8k31yclxvmcjgzkg6xl3rdv49anjmwdhcrhcxv8x9f3bdrj",
       "depends": ["CVXR", "Matrix", "RSpectra", "Rdsdp", "corpcor", "gtools", "seqminer"]
     },
+    "GiANT": {
+      "name": "GiANT",
+      "version": "1.3.4",
+      "sha256": "01gvaian8a1dnlfvvbbxshfvfwr50dl9l1d41cq1nmy37gilj0pk",
+      "depends": []
+    },
     "GiNA": {
       "name": "GiNA",
       "version": "1.0.1",
@@ -13311,8 +13845,8 @@
     },
     "GiniDecompLY": {
       "name": "GiniDecompLY",
-      "version": "1.0.0",
-      "sha256": "0fvsj9z8hhaayi6k9rmcym9vda6vc0hfn59fmvk3qjj8ga8bsxaq",
+      "version": "1.0.1",
+      "sha256": "03nhqx5z5m918dw277hx390w66mrfb33kmijd7724blfgikgpfpa",
       "depends": ["dplyr", "magrittr", "tidyr"]
     },
     "GiniDistance": {
@@ -13321,6 +13855,12 @@
       "sha256": "1x9a59x60a2jdnql3wn4za510rv9qp84j6b9m6la81j3mmy92vzz",
       "depends": ["Rcpp", "RcppArmadillo", "energy", "randomForest", "readxl"]
     },
+    "GitStats": {
+      "name": "GitStats",
+      "version": "2.1.2",
+      "sha256": "1wh5vz2vy1b1fqqjz20mdv9fckdxx1076bs4a74lddjn4q7m6xif",
+      "depends": ["R6", "cli", "dplyr", "glue", "httr2", "lubridate", "magrittr", "purrr", "rlang", "stringr"]
+    },
     "GlarmaVarSel": {
       "name": "GlarmaVarSel",
       "version": "1.0",
@@ -13357,6 +13897,12 @@
       "sha256": "1s8gkqg54622xhsmhl7n5pff2b6xfij111m7h3i4inzfjfmziq43",
       "depends": ["Hmisc", "Rcpp", "XML", "abind", "checkmate", "forestplot", "glue", "htmlTable", "knitr", "lattice", "lubridate", "magrittr", "rlang", "rmarkdown", "stringr", "yaml"]
     },
+    "GmooG": {
+      "name": "GmooG",
+      "version": "0.7",
+      "sha256": "019vxm1vwlsjkw6zgvmkg87bhnikl0i3mqhwqzm94vr4p406dgaz",
+      "depends": []
+    },
     "GmptzCurve": {
       "name": "GmptzCurve",
       "version": "0.1.0",
@@ -13365,15 +13911,15 @@
     },
     "GoFKernel": {
       "name": "GoFKernel",
-      "version": "2.1-1",
-      "sha256": "0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3",
+      "version": "2.1-3",
+      "sha256": "0ny34fq4y6xdnh222qb24d8qcfvh99v73v7lf3xd87rlr24x5z7r",
       "depends": ["KernSmooth"]
     },
     "GofCens": {
       "name": "GofCens",
-      "version": "1.1",
-      "sha256": "1xixv05wlwlyga5br9jzrg68rhc71ibhfbyjkmiy0dh9xwyrygsy",
-      "depends": ["actuar", "boot", "fitdistrplus", "ggplot2", "gridExtra", "survival", "survminer"]
+      "version": "1.2.1",
+      "sha256": "1svkizyw1rc9mllax4swgjlp079wq5vr5zrx33ir8hsg1vl9jnjl",
+      "depends": ["actuar", "boot", "fitdistrplus", "ggplot2", "gridExtra", "survival"]
     },
     "GofKmt": {
       "name": "GofKmt",
@@ -13405,6 +13951,12 @@
       "sha256": "1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h",
       "depends": ["classInt", "corrplot"]
     },
+    "Goodreader": {
+      "name": "Goodreader",
+      "version": "0.1.2",
+      "sha256": "1zcsfhp8h1qk67y421ayj7nm5lz03cm5zax9zilyy6pin2azqzpv",
+      "depends": ["cld2", "dplyr", "ggplot2", "httr", "lubridate", "magrittr", "purrr", "rlang", "rvest", "stringr", "tidyr", "tidytext", "tm", "topicmodels", "wordcloud2"]
+    },
     "GoogleImage2Array": {
       "name": "GoogleImage2Array",
       "version": "0.99.2",
@@ -13419,14 +13971,14 @@
     },
     "GpGp": {
       "name": "GpGp",
-      "version": "0.5.0",
-      "sha256": "0rx22sc911s2wkqapsgzwmspmxshm84rrwp70rlpczgvylyvzh53",
+      "version": "0.5.1",
+      "sha256": "13hkni4w39rkb6ki03i9nfz2cgz8yr7kxcha3n8ivz834gsfzj77",
       "depends": ["BH", "FNN", "Rcpp", "RcppArmadillo"]
     },
     "GrFA": {
       "name": "GrFA",
-      "version": "0.1.1",
-      "sha256": "1gbvcv8al6zay4zr3vcfiycywk7j191srkzfkllwm79bqwh55lmp",
+      "version": "0.2.1",
+      "sha256": "11fwfzzq8biqrlyh4pd5gbssj52k6c1kk526zv9mmwb3vjqajr5v",
       "depends": ["mvtnorm"]
     },
     "GrabSVG": {
@@ -13489,6 +14041,12 @@
       "sha256": "0vxl4kgihcyl96qiz6sz5icznaa1jpsqqbn1irwmzyngwsh1qvzw",
       "depends": []
     },
+    "GreyZones": {
+      "name": "GreyZones",
+      "version": "0.0.5",
+      "sha256": "1mjnfiqc4zj08n8j899zqxkvxd6ryp6sg1n46isy0ni7ghbng38w",
+      "depends": ["irrCAC"]
+    },
     "Greymodels": {
       "name": "Greymodels",
       "version": "2.0.1",
@@ -13537,6 +14095,12 @@
       "sha256": "0wmzgd76adwq2gm8p1cxgy1kj1vl83bfsx4d9afk7wh3dxgq4c7l",
       "depends": ["clusterProfiler", "dplyr", "limma", "org_Mm_eg_db", "pheatmap", "stringr"]
     },
+    "GrowthCurveME": {
+      "name": "GrowthCurveME",
+      "version": "0.1.0",
+      "sha256": "1awrfr71rfimmm57v5pvs583hr5v7rbbcvz2igd6j0iyyih99a4g",
+      "depends": ["dplyr", "flextable", "ggplot2", "investr", "knitr", "magrittr", "minpack_lm", "moments", "patchwork", "rlang", "saemix", "stringr", "tibble", "tidyr", "viridis"]
+    },
     "GrpString": {
       "name": "GrpString",
       "version": "0.3.2",
@@ -13581,8 +14145,8 @@
     },
     "HAC": {
       "name": "HAC",
-      "version": "1.1-0",
-      "sha256": "1k19qrirhzl8qaa4svf7qa90r7gphbbvm9m0977z9gd704n8b62a",
+      "version": "1.1-1",
+      "sha256": "041nlm48c69kv20hsvnrwljbr2yh7d7v209iqvd26x2i0fmnx3zn",
       "depends": ["copula"]
     },
     "HACSim": {
@@ -13639,6 +14203,12 @@
       "sha256": "0jchr8ncjpl2ljwf09cmpv679vdla11r1vkylhqaacdp1zdb93w6",
       "depends": ["ggplot2", "mvtnorm", "survival"]
     },
+    "HDANOVA": {
+      "name": "HDANOVA",
+      "version": "0.8.1",
+      "sha256": "1w6c2pwngx1f55zzxsvxnmg2bv5i0ywirchvdncl3iy7mpcsm6vm",
+      "depends": ["RSpectra", "car", "lme4", "mixlm", "pls", "pracma", "progress"]
+    },
     "HDBRR": {
       "name": "HDBRR",
       "version": "1.1.4",
@@ -13713,8 +14283,8 @@
     },
     "HDNRA": {
       "name": "HDNRA",
-      "version": "1.0.0",
-      "sha256": "17c2bck5s68kn7b67g5pgxd14n13313899waynn79vnkl319czq9",
+      "version": "2.0.1",
+      "sha256": "1yjgms82419v073ahi381nhrppmwrlncjqwl42ahlf7agp1pv48m",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "expm", "readr"]
     },
     "HDOMDesign": {
@@ -13737,8 +14307,8 @@
     },
     "HDSinRdata": {
       "name": "HDSinRdata",
-      "version": "0.1.2",
-      "sha256": "1wkhy6xf5ahj12sg9s32k53j7z2zpqj7rq0ficngdbyfzs2y6w48",
+      "version": "0.1.3",
+      "sha256": "1fvvzmqnqwxql6ny5zq0hv8w8sv5k0canzww9bc8w8vaxdpv47x7",
       "depends": []
     },
     "HDSpatialScan": {
@@ -13755,14 +14325,14 @@
     },
     "HDTSA": {
       "name": "HDTSA",
-      "version": "1.0.3",
-      "sha256": "1syrqygfdr12sd32wq2ab0gibwbljlbrwzzkfnmhgh8js9dxv6j8",
-      "depends": ["MASS", "Rcpp", "RcppEigen", "clime", "geigen", "jointDiag", "sandwich"]
+      "version": "1.0.5",
+      "sha256": "1p4mka4m2ladlxgd6ljqw181lky8bynh6vf9cfsgf21qq3pals1z",
+      "depends": ["MASS", "Rcpp", "RcppEigen", "clime", "forecast", "geigen", "jointDiag", "sandwich", "vars"]
     },
     "HDXBoxeR": {
       "name": "HDXBoxeR",
-      "version": "0.0.1",
-      "sha256": "10p41sawddrdpj5sji1jzp63hr6v6hvihb4n3yzci5wvh2a2lx9c",
+      "version": "0.0.2",
+      "sha256": "1blfqm1h54gq551g0gvprsyd66r9pbirh8f1d0grchv8b7mnydml",
       "depends": ["RColorBrewer", "dplyr", "stringr", "tidyr", "wrapr"]
     },
     "HDclassif": {
@@ -13773,8 +14343,8 @@
     },
     "HDclust": {
       "name": "HDclust",
-      "version": "1.0.3",
-      "sha256": "18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y",
+      "version": "1.0.4",
+      "sha256": "1v8q8xf9nlxq0x8m5xlnrp3f3hdzlxraxf8g22cadi1162d6vfg1",
       "depends": ["Rcpp", "RcppProgress", "Rtsne"]
     },
     "HDcpDetect": {
@@ -13833,8 +14403,8 @@
     },
     "HGNChelper": {
       "name": "HGNChelper",
-      "version": "0.8.14",
-      "sha256": "0rhqpzq6z57wzydwcz0ry61al68l3mll79s5hz8by7hy61izj5k5",
+      "version": "0.8.15",
+      "sha256": "063m8vyndfzbnxnbmlz772icj5y9j8gdbggss1ch1mypq9ds3y3n",
       "depends": ["splitstackshape"]
     },
     "HGSL": {
@@ -13857,8 +14427,8 @@
     },
     "HIMA": {
       "name": "HIMA",
-      "version": "2.2.1",
-      "sha256": "0r9dr3dvav8m8sxk84fm6m8y7fvsbd6dfblma17vizvslxpi5vwm",
+      "version": "2.3.0",
+      "sha256": "0cvzbcwavhb38ab603wqbgmbhhgwh9jh7gx6lkps3js3rbc58f4y",
       "depends": ["HDMT", "MASS", "conquer", "doParallel", "foreach", "glmnet", "hdi", "hommel", "iterators", "ncvreg", "quantreg", "survival"]
     },
     "HK80": {
@@ -13873,16 +14443,10 @@
       "sha256": "1bhyhv72c8afyzwx7h6p33mgfvhgqfh5c5f85gj803p6ai60h544",
       "depends": ["DT", "MASS", "formatR", "highlight", "scatterplot3d", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus"]
     },
-    "HKprocess": {
-      "name": "HKprocess",
-      "version": "0.1-1",
-      "sha256": "0kn84ccaypknxymynp6lnr8asd85rlzbk073z7511rriyz96hyj7",
-      "depends": ["MCMCpack", "gtools"]
-    },
     "HLAtools": {
       "name": "HLAtools",
-      "version": "1.1.1",
-      "sha256": "0nx2vd2xa5bz5b5pl6vx798ma0109rxyl6gjx5iw12ylh02k9bgq",
+      "version": "1.3.0",
+      "sha256": "0k2hj0cqwsjbkgb98zm11c1ng278zi8gpk6yndi93fkcq3lmqdkj",
       "depends": ["DescTools", "dplyr", "fmsb", "stringr", "tibble", "xfun"]
     },
     "HLMdiag": {
@@ -13921,6 +14485,18 @@
       "sha256": "0msin7rq3npz221mvrw3zcs6bwz439six99iblx5p3hkp1n1ljf3",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack"]
     },
+    "HMMRel": {
+      "name": "HMMRel",
+      "version": "0.1.1",
+      "sha256": "07s4h9b5msk5pv1cbqmny0xqjh4d3cq094wmpy3b4dm1s630w04a",
+      "depends": []
+    },
+    "HMMcopula": {
+      "name": "HMMcopula",
+      "version": "1.1.0",
+      "sha256": "0ja2lyviswy327713hlrdwx7m9h2fbcv46f4sln0baqgglx739pj",
+      "depends": ["copula", "doParallel", "foreach", "mvtnorm"]
+    },
     "HMMextra0s": {
       "name": "HMMextra0s",
       "version": "1.1.0",
@@ -13977,9 +14553,9 @@
     },
     "HQM": {
       "name": "HQM",
-      "version": "0.1.0",
-      "sha256": "1q959qdakwzf07zbyxkvrslyc4kgd47g4wij2fgm7l4w3xm34lwz",
-      "depends": []
+      "version": "0.1.4",
+      "sha256": "0wxmhbpi5j3pixq8zqr0h3icnwajng52x45zv82ckfg5lvf76fb7",
+      "depends": ["JM", "nlme", "pec", "survival", "timeROC"]
     },
     "HRW": {
       "name": "HRW",
@@ -13987,11 +14563,11 @@
       "sha256": "08fh9504cck1ffrwim27nkrm9y1in6jl1s7zs8h8x3ik54p9jb0k",
       "depends": ["KernSmooth"]
     },
-    "HS": {
-      "name": "HS",
-      "version": "1.1",
-      "sha256": "1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp",
-      "depends": ["data_table", "ggplot2", "ggpubr", "partitions", "reshape2", "tidyr", "zoo"]
+    "HSAR": {
+      "name": "HSAR",
+      "version": "0.6.0",
+      "sha256": "12817y630208nkhv3q69xdqq520ajnh8djrygh4k7vswp9rgyrxm",
+      "depends": ["Rcpp", "RcppArmadillo", "spatialreg", "spdep"]
     },
     "HSAUR": {
       "name": "HSAUR",
@@ -14053,18 +14629,18 @@
       "sha256": "0x9shhyla9bldkkh367gfdmf0k72l1ppixb8gzsa6nf8jx8qdpbp",
       "depends": ["capushe", "edgeR", "plotrix"]
     },
-    "HTSSIP": {
-      "name": "HTSSIP",
-      "version": "1.4.1",
-      "sha256": "1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3",
-      "depends": ["DESeq2", "ape", "coenocliner", "dplyr", "ggplot2", "igraph", "lazyeval", "magrittr", "phyloseq", "plyr", "stringr", "tidyr", "vegan"]
-    },
     "HTSeed": {
       "name": "HTSeed",
       "version": "0.1.0",
       "sha256": "01h9lm2ljp67qfcl7vlh804r7q15arqx103jb9pvk2wx1c27qy3x",
       "depends": ["dplyr"]
     },
+    "HTSeedGLM": {
+      "name": "HTSeedGLM",
+      "version": "0.1.0",
+      "sha256": "0nrd53rbd09jz3q54qa6r9gl5xv46n5c4fnmjq7gda4vdchcnah9",
+      "depends": []
+    },
     "HTT": {
       "name": "HTT",
       "version": "0.1.2",
@@ -14079,9 +14655,9 @@
     },
     "HVT": {
       "name": "HVT",
-      "version": "24.5.2",
-      "sha256": "18a4gr2v2qn2n9z9w89pjq1plzdggzlyprh249srf3sbqw1pn1qq",
-      "depends": ["MASS", "cluster", "conf_design", "data_table", "deldir", "dplyr", "gganimate", "ggforce", "ggplot2", "gifski", "magrittr", "markovchain", "plyr", "polyclip", "purrr", "reshape2", "rlang", "scales", "splancs", "tidyr"]
+      "version": "24.9.1",
+      "sha256": "00awnlswkwki1fjjf7rq6s6k4vahb3vyzbzj2wbbhc3ihbv354jf",
+      "depends": ["FNN", "MASS", "NbClust", "Rtsne", "cluster", "dplyr", "gganimate", "ggforce", "ggplot2", "gifski", "magrittr", "markovchain", "plyr", "purrr", "reshape2", "rlang", "scales", "splancs", "tidyr", "umap"]
     },
     "HWEintrinsic": {
       "name": "HWEintrinsic",
@@ -14097,8 +14673,8 @@
     },
     "HYPEtools": {
       "name": "HYPEtools",
-      "version": "1.6.2",
-      "sha256": "0g6gb3ig3qrqi9p8i35lxdgcz92ibjg2qdldnl1b3j1b6assza71",
+      "version": "1.6.4",
+      "sha256": "0p8ph11rsj8j5b3khisza48kj1b2qiyd2wxhcdv2vvk5a8mrc6bw",
       "depends": ["clipr", "colorspace", "data_table", "dplyr", "ggplot2", "ggpubr", "ggrepel", "lubridate", "ncdf4", "patchwork", "pbapply", "purrr", "rlang", "scales", "stringr", "tidyr", "tidyselect", "zoo"]
     },
     "HaDeX": {
@@ -14109,8 +14685,8 @@
     },
     "HadIBDs": {
       "name": "HadIBDs",
-      "version": "1.0.0",
-      "sha256": "1mj6a4cp51kpsw93hz67smz9vc17ss5675wnalbq84wj89p2ma3l",
+      "version": "1.0.1",
+      "sha256": "1k3p3mpzs235inrxnqx0q75ckam629d3pcp176mf2m6c0y4f7iri",
       "depends": []
     },
     "HadamardR": {
@@ -14139,8 +14715,8 @@
     },
     "Haplin": {
       "name": "Haplin",
-      "version": "7.3.1",
-      "sha256": "0vyykbq2f5w4h7nai8w8krpax8q6v2hx76rr6xqy938rza5rfm79",
+      "version": "7.3.2",
+      "sha256": "0igijgzcs2bkh2yg58jzyixnxhg6d8rb4yvvwyqf0czi0rv1kzyl",
       "depends": ["MASS", "ff", "mgcv", "rlang"]
     },
     "HaploCatcher": {
@@ -14205,8 +14781,8 @@
     },
     "HelpersMG": {
       "name": "HelpersMG",
-      "version": "6.1",
-      "sha256": "1cggzna2gdl8pxdj2s0swlbwxs9qzz276x43inr87i9yxfqwv5q8",
+      "version": "6.3",
+      "sha256": "1qv127pa1zki42a4riw2lb05sajwp1mdschxlalvf5hfdhrq7i3g",
       "depends": ["MASS", "Matrix", "coda", "ggplot2", "rlang"]
     },
     "HeritSeq": {
@@ -14247,10 +14823,16 @@
     },
     "HiDimDA": {
       "name": "HiDimDA",
-      "version": "0.2-6",
-      "sha256": "1128xf7jf2jwbkpczc9d56kzkn41m9hvqys4qawv3z80hpm91is5",
+      "version": "0.2-7",
+      "sha256": "0133bvj3a9ab8frl8r1xrgdpwc6rp2nfyfa2pnabd62sdvp0axvn",
       "depends": []
     },
+    "HiGarrote": {
+      "name": "HiGarrote",
+      "version": "1.0",
+      "sha256": "0v7dd9sd9dkqylb53vx5f0npwpcyh0fd9b39havn99l1bzyl1cx5",
+      "depends": ["Matrix", "MaxPro", "Rcpp", "RcppArmadillo", "nloptr", "purrr", "quadprog", "rlist", "scales", "stringr"]
+    },
     "HiResTEC": {
       "name": "HiResTEC",
       "version": "0.62.3",
@@ -14301,8 +14883,8 @@
     },
     "Hmisc": {
       "name": "Hmisc",
-      "version": "5.1-3",
-      "sha256": "1sq5qvlr9swhdvf3l420y9fxq5s1qw8aiyl9a62sb357ywppfq9w",
+      "version": "5.2-1",
+      "sha256": "1vmwp80906mpl5bjsbz0jqpwpkd3f2n2wi93qyvk41bgd7wrwckp",
       "depends": ["Formula", "base64enc", "cluster", "colorspace", "data_table", "foreign", "ggplot2", "gridExtra", "gtable", "htmlTable", "htmltools", "knitr", "nnet", "rmarkdown", "rpart", "viridis"]
     },
     "Hmsc": {
@@ -14349,8 +14931,8 @@
     },
     "HospitalNetwork": {
       "name": "HospitalNetwork",
-      "version": "0.9.3",
-      "sha256": "183nb9h9b1z1ifpnzcxa8wh3xm2id6fnq9vqd4vkbxzw7wlyd86b",
+      "version": "0.9.4",
+      "sha256": "1vjiny64s71wfr7vzav9mx8dgpvidl04i4yrcwzkqf4wh2n77p6h",
       "depends": ["R6", "checkmate", "data_table", "ggplot2", "ggraph", "igraph", "lubridate"]
     },
     "Hotelling": {
@@ -14379,8 +14961,8 @@
     },
     "HyMETT": {
       "name": "HyMETT",
-      "version": "1.1.2",
-      "sha256": "0f1gismhkwi8ynnxlbsvpal15ab2d2j4arrvah25bchybwffhqqg",
+      "version": "1.1.3",
+      "sha256": "0j613j7p80sa5rp5qdzri51wjsl1zmzk3acrhb0df62d8fxnlzl2",
       "depends": ["EnvStats", "checkmate", "dplyr", "lmomco", "lubridate", "plyr", "rlang", "tibble", "zoo"]
     },
     "HyRiM": {
@@ -14415,8 +14997,8 @@
     },
     "HydroPortailStats": {
       "name": "HydroPortailStats",
-      "version": "1.0.3",
-      "sha256": "1f5h9xqn4vn9wbnvlshbc8r200vx1pwm9ic7sdzsv4z0j7z7wl1j",
+      "version": "1.1.0",
+      "sha256": "05fa03j0x0639langkhp40ds3d8j9a1i2f05m1svq6iysx2r0dmy",
       "depends": ["evd", "mvtnorm", "numDeriv"]
     },
     "HyperG": {
@@ -14469,14 +15051,14 @@
     },
     "IATScore": {
       "name": "IATScore",
-      "version": "0.1.1",
-      "sha256": "0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz",
+      "version": "0.2.0",
+      "sha256": "1jz7l1g53lqnkab66fcdwpvj9ibabwmlhqshg6crjwfy4m4hgbrb",
       "depends": []
     },
     "IATanalytics": {
       "name": "IATanalytics",
-      "version": "0.1.1",
-      "sha256": "10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9",
+      "version": "0.2.0",
+      "sha256": "199wgn2n6gwn0k996f8c47wmfpg6aqr400k1jrvqpmf2lpi1q7dv",
       "depends": []
     },
     "IATscores": {
@@ -14511,8 +15093,8 @@
     },
     "IBMPopSim": {
       "name": "IBMPopSim",
-      "version": "1.0.0",
-      "sha256": "0dxw3ibvfnqva3f0nk5w9q8y2sx0hla619f6yq6b31apxnbxp72p",
+      "version": "1.1.0",
+      "sha256": "1n2zxk6i1xk7ksc1qnhwb63f1plj6jyagf0qdahym8chai9igv6w",
       "depends": ["Rcpp", "checkmate", "dplyr", "ggplot2", "readr", "rlang"]
     },
     "IBRtools": {
@@ -14743,6 +15325,12 @@
       "sha256": "19mg7a83badb3wqnrmx5ric0nlfdb33wcxfmq9457s8019ghvpvv",
       "depends": ["RcppRoll", "evd", "fastmatch", "ismev", "pbapply"]
     },
+    "IDLFM": {
+      "name": "IDLFM",
+      "version": "0.0.2",
+      "sha256": "10a3c5522rlwy3fvhqmrsqba26l8qak539qzj3spplfd0lfk22nd",
+      "depends": ["SparseArray"]
+    },
     "IDMIR": {
       "name": "IDMIR",
       "version": "0.1.0",
@@ -14761,12 +15349,6 @@
       "sha256": "1308z4i2glr1260zjjymm19g3d7nk8djhdwdfbh7ipvkgsp9b2s7",
       "depends": ["lattice"]
     },
-    "IDSA": {
-      "name": "IDSA",
-      "version": "2.1",
-      "sha256": "0ld2359ksnw9jrjicnqikh5r321mfy2i7vzlhh9phm60k0qf5j98",
-      "depends": ["GD", "ggplot2", "kableExtra", "reshape2"]
-    },
     "IDSL_CSA": {
       "name": "IDSL.CSA",
       "version": "1.2",
@@ -14863,6 +15445,12 @@
       "sha256": "066wz6bjqcvq22gjg2wcmglp798f87rsc8yhm13p0dic3arb5ph6",
       "depends": ["coda", "haplo_stats"]
     },
+    "IGC_CSM": {
+      "name": "IGC.CSM",
+      "version": "0.2.0",
+      "sha256": "0wv19hqsdx264m7wxh63krrw10ccv3axz44zfbk02m53p5v5vh58",
+      "depends": []
+    },
     "IGCities": {
       "name": "IGCities",
       "version": "0.2.0",
@@ -14899,12 +15487,30 @@
       "sha256": "15361j8b60jj3bh8cjxs39d9bir1aywy9bd254s5w94cakhy0ld5",
       "depends": ["R2jags", "lavaan"]
     },
+    "IJSE": {
+      "name": "IJSE",
+      "version": "0.1.1",
+      "sha256": "1xnip7c4q2czcbpz488b6n26n3yvsvannjicd1v2h23hl7578ga8",
+      "depends": ["brms", "posterior"]
+    },
+    "ILRCM": {
+      "name": "ILRCM",
+      "version": "0.1.0",
+      "sha256": "0sx8bcxb8xzbb9r4fgjyr4qd21bpfv1sj29sk058xsnzwibrsg6m",
+      "depends": ["ggplot2", "scales"]
+    },
     "ILS": {
       "name": "ILS",
       "version": "0.3",
       "sha256": "0l4rrl1j72lqg87nzw4xap054gl2h3m90g8sl5bzg3jc7c290rd7",
       "depends": ["MASS", "depthTools", "fda_usc", "lattice", "multcomp"]
     },
+    "ILSAmerge": {
+      "name": "ILSAmerge",
+      "version": "1.3.0",
+      "sha256": "14r2wrn617dii8pdvpab73bi6akmvgv06rnrkf1bd0823kaispdr",
+      "depends": ["haven"]
+    },
     "ILSE": {
       "name": "ILSE",
       "version": "1.1.7",
@@ -14913,8 +15519,8 @@
     },
     "ILSM": {
       "name": "ILSM",
-      "version": "1.0.3.1",
-      "sha256": "0x9khrli414qg4i5kqcspz44w9vjcl13qadgf90rgmkcwqqmw3dn",
+      "version": "1.0.3.2",
+      "sha256": "1wqw33yg3r6bdwhhczaxhkdpzpmxjd58ns2j9q55lx5vvk4q97dh",
       "depends": ["Matrix", "igraph"]
     },
     "IMD": {
@@ -14977,6 +15583,12 @@
       "sha256": "1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs",
       "depends": ["RankProd", "genefilter", "limma", "multtest", "siggenes"]
     },
+    "INFOSET": {
+      "name": "INFOSET",
+      "version": "4.1",
+      "sha256": "1bybcjyvpn7rvvyccs99xzak5j5mm2ycb715pmkp0kszsrl8y3fc",
+      "depends": ["Matrix", "colorspace", "dendextend", "mixtools", "quadprog"]
+    },
     "INLABMA": {
       "name": "INLABMA",
       "version": "0.1-12",
@@ -14991,8 +15603,8 @@
     },
     "INLAspacetime": {
       "name": "INLAspacetime",
-      "version": "0.1.8",
-      "sha256": "0yyhcizaj90qqvirrk74whynxf7zvv09w79k4j61i4n84hm0njdm",
+      "version": "0.1.10",
+      "sha256": "0kdcpy6dzzkp1j5x6b4shfd8xn248ryh6mq7j522i3a1vn1v3pjc",
       "depends": ["Matrix", "fmesher", "sf", "sp", "terra"]
     },
     "INQC": {
@@ -15039,8 +15651,8 @@
     },
     "IP": {
       "name": "IP",
-      "version": "0.1.3",
-      "sha256": "155nrx5ika5vl1gxfqa13fr3w05449vgijm8xdqd68982bsvcp10",
+      "version": "0.1.4",
+      "sha256": "0m2xmash5371iaw1mdf6245702mwaahv2ds5995f9q8ys3h4kspj",
       "depends": ["stringi"]
     },
     "IPCAPS": {
@@ -15055,12 +15667,6 @@
       "sha256": "0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23",
       "depends": ["MASS", "survival"]
     },
-    "IPDFileCheck": {
-      "name": "IPDFileCheck",
-      "version": "0.8.1",
-      "sha256": "0xab1z8fj7clz00bk230krlmfmywwv4bwdvn2w8b4l0hgh9b9a8z",
-      "depends": ["dplyr", "eeptools", "effsize", "gtsummary", "hash", "kableExtra", "lubridate", "stringr", "testthat", "tidyselect"]
-    },
     "IPDfromKM": {
       "name": "IPDfromKM",
       "version": "0.1.10",
@@ -15081,9 +15687,9 @@
     },
     "IPEDSuploadables": {
       "name": "IPEDSuploadables",
-      "version": "2.8.7",
-      "sha256": "0v168v83b5aj86rahlz80ggb7x99npq8gx30szcp0vxicz8a0nyk",
-      "depends": ["dplyr", "lubridate", "magrittr", "purrr", "rlang", "stringr", "svDialogs", "tidyr"]
+      "version": "2.10.0",
+      "sha256": "06dnq83rjbzbz9js6d7mk0syl613dm0pcl03mkmq33f3x8amy54v",
+      "depends": ["dplyr", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "svDialogs", "tidyr"]
     },
     "IPLGP": {
       "name": "IPLGP",
@@ -15129,14 +15735,14 @@
     },
     "IRISMustangMetrics": {
       "name": "IRISMustangMetrics",
-      "version": "2.4.6",
-      "sha256": "08p1xg4mqi36647nzmlmmmvdgzc9xgz4sf4lh2lrlma99f7y8kzd",
+      "version": "2.4.7",
+      "sha256": "1v034hmb3v8kaw1i7xpjd43wb0hz2ir5m7f6g8n4kq61di64cs7m",
       "depends": ["IRISSeismic", "RCurl", "XML", "dplyr", "pracma", "seismicRoll", "signal", "stringr"]
     },
     "IRISSeismic": {
       "name": "IRISSeismic",
-      "version": "1.6.6",
-      "sha256": "0da4bh5kvlp3dchsz0dyddwpwdvss7aij2xsi2kkppi3hrfwja7j",
+      "version": "1.6.7",
+      "sha256": "1xh8r8qky8m2i5h1y41jycaygvb93lmj1b92ax71b1lg5p245j5d",
       "depends": ["RCurl", "XML", "pracma", "seismicRoll", "signal", "stringr"]
     },
     "IRR2FPR": {
@@ -15159,8 +15765,8 @@
     },
     "IRTest": {
       "name": "IRTest",
-      "version": "2.0.0",
-      "sha256": "0fnz98kn463cqp7yp63w1zasp131a448pr4hmkp1y3dpgclfdcva",
+      "version": "2.1.0",
+      "sha256": "1rnpdba06104kqild065w01jr188dmp3v7vs4zkakqpgrf1lf7jj",
       "depends": ["betafunctions", "dcurver", "ggplot2", "usethis"]
     },
     "IRdisplay": {
@@ -15199,6 +15805,12 @@
       "sha256": "0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg",
       "depends": ["gtools", "stringr"]
     },
+    "ISCA": {
+      "name": "ISCA",
+      "version": "0.1.0",
+      "sha256": "1n0p009r1296354vd7k8xg9yiy8a8xzqa1a2y4d2ig5wyhnypnzx",
+      "depends": ["Hmisc", "broom", "data_table", "dplyr", "e1071", "magrittr", "plyr", "stringr", "tibble", "tidyselect"]
+    },
     "ISCO08ConveRsions": {
       "name": "ISCO08ConveRsions",
       "version": "0.2.0",
@@ -15273,8 +15885,8 @@
     },
     "ISwR": {
       "name": "ISwR",
-      "version": "2.0-8",
-      "sha256": "1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza",
+      "version": "2.0-9",
+      "sha256": "1yc7awlmmsbddpdyz1gdfwyr2k3qmjfbblzr5bza8im7wahh75j2",
       "depends": []
     },
     "ITNr": {
@@ -15301,6 +15913,12 @@
       "sha256": "0ckqjbn0xc894dc23gbaqzr6z6rl5h0k8gc5gjhbhwvrc2zlyfsp",
       "depends": []
     },
+    "IgorR": {
+      "name": "IgorR",
+      "version": "0.9.0",
+      "sha256": "1xdkbl6w9vwjgplygm527gl5y7bqd0dbn8nb9szyc6438hpswmb2",
+      "depends": ["bitops", "timechange"]
+    },
     "ImCluster": {
       "name": "ImCluster",
       "version": "0.1.0",
@@ -15411,9 +16029,9 @@
     },
     "IncidencePrevalence": {
       "name": "IncidencePrevalence",
-      "version": "0.7.4",
-      "sha256": "172difb7qikd8390zyn5cgl6m598wyn1bh8wpra9gih3f3kg40j7",
-      "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "lifecycle", "lubridate", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "visOmopResults"]
+      "version": "0.9.0",
+      "sha256": "196kghflwndvd8mnki2z8ai14758cl50r86gm9pq32qir8482vmm",
+      "depends": ["CDMConnector", "PatientProfiles", "checkmate", "cli", "clock", "dbplyr", "dplyr", "glue", "lifecycle", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "IncomPair": {
       "name": "IncomPair",
@@ -15465,8 +16083,8 @@
     },
     "Indicator": {
       "name": "Indicator",
-      "version": "0.1.2",
-      "sha256": "0dwrg23qaqj39vvzhk20plr64br1y5dn61w9xk1arl22qlc2b011",
+      "version": "0.1.3",
+      "sha256": "16z7kxr0lpszkdx47d5985prljmr6sqvqnc5mmyq2an64b42fwrr",
       "depends": ["FactoMineR", "missMethods", "norm"]
     },
     "InferenceSMR": {
@@ -15513,9 +16131,9 @@
     },
     "Infusion": {
       "name": "Infusion",
-      "version": "2.1.0",
-      "sha256": "0dmbqwgavbfp54l47p6zdy75k9wi9zw3ai18q4gy8l4ag5vldzhi",
-      "depends": ["blackbox", "foreach", "matrixStats", "mvtnorm", "numDeriv", "pbapply", "proxy", "ranger", "spaMM", "viridis"]
+      "version": "2.2.0",
+      "sha256": "13jj8ivxigk8k6fl8m2dbniv08vfd87ry8vbpzcj9mxk7kg9p75l",
+      "depends": ["blackbox", "boot", "cli", "foreach", "geometry", "matrixStats", "mvtnorm", "nloptr", "numDeriv", "pbapply", "proxy", "ranger", "spaMM", "viridisLite"]
     },
     "InjurySeverityScore": {
       "name": "InjurySeverityScore",
@@ -15535,6 +16153,12 @@
       "sha256": "084ji77z0dnbjrhy6z40kjbblsgk3z00z256pfknkqxd3v7sawvc",
       "depends": ["MASS"]
     },
+    "InspectionPlanner": {
+      "name": "InspectionPlanner",
+      "version": "1.2",
+      "sha256": "0fk4s7qgp1v29kfa0v8q8j2rb3j9cjz1mmd4i3qgw1gf0dwz9cki",
+      "depends": ["htmltools", "rmarkdown", "shiny"]
+    },
     "InsuSensCalc": {
       "name": "InsuSensCalc",
       "version": "0.0.1",
@@ -15675,9 +16299,9 @@
     },
     "IrregLong": {
       "name": "IrregLong",
-      "version": "0.3.4",
-      "sha256": "0gavbvmn9m1kamlyg9sb5zxpwq9gc32xcz14m6aqqrdps2xyv3kn",
-      "depends": ["data_table", "geepack", "survival"]
+      "version": "0.4.0",
+      "sha256": "1ppvdan5dm5sv7p2afmlc8nm3lgn29ssvabv5ask0ilh36rbrmn7",
+      "depends": ["data_table", "geeM", "survival"]
     },
     "Iscores": {
       "name": "Iscores",
@@ -15717,9 +16341,9 @@
     },
     "IsoCor": {
       "name": "IsoCor",
-      "version": "0.1.40",
-      "sha256": "191y51mg6kii4x99c7437888kkacml0ch53qh1gbwv10gl2c4w8z",
-      "depends": ["DT", "MALDIquant", "bsplus", "golem", "htmltools", "markdown", "plyr", "rmarkdown", "shiny", "shinyalert", "shinyjs"]
+      "version": "0.2.8",
+      "sha256": "0bphylk5d0rvx8cjkvr85xr0jfwy9kpkkn210g4cag5mxdxjlxhm",
+      "depends": ["DT", "MALDIquant", "bslib", "config", "golem", "markdown", "plyr", "shiny", "shinyalert", "shinyjs"]
     },
     "IsoMemo": {
       "name": "IsoMemo",
@@ -15735,20 +16359,20 @@
     },
     "IsoplotR": {
       "name": "IsoplotR",
-      "version": "6.2",
-      "sha256": "0n4xlxs4swl5b11b9ks9f4g2m8cpnb2gdq7zbvjvgsx5d6fw9m29",
+      "version": "6.4",
+      "sha256": "0rba6zfw2ilkm0l9pcr35dv8cfvnnvpirhla9pnc4hg1bza5mgcn",
       "depends": ["MASS"]
     },
     "IsoplotRgui": {
       "name": "IsoplotRgui",
-      "version": "6.2",
-      "sha256": "12mrfpij1sv6631lx32p1l9dc7g279zw21s13m6b0q4ic1cjsv9v",
+      "version": "6.4",
+      "sha256": "0pkj5ai1c2j15kfk41f3pri5vsw9qrq8viihnbdfib3yq5nin0s6",
       "depends": ["IsoplotR", "shinylight"]
     },
     "IsoriX": {
       "name": "IsoriX",
-      "version": "0.9.2",
-      "sha256": "1izpxibyz4wwpdr01z4a4zw1r1c528ydznvwrc064j9c55fiz4s2",
+      "version": "0.9.3",
+      "sha256": "1z86qgl68l9mpyf0ym1szvwv416mx7gqkr15gs5i0jlw4zafc1jc",
       "depends": ["lattice", "latticeExtra", "numDeriv", "rasterVis", "spaMM", "terra", "viridisLite"]
     },
     "IsotopeR": {
@@ -15775,6 +16399,18 @@
       "sha256": "0m90rnhr5vkdv1xswr5c0j06ngzvmg73nd0kmg9m9r6a6ddddcyl",
       "depends": ["clue"]
     },
+    "JAGStree": {
+      "name": "JAGStree",
+      "version": "1.0.1",
+      "sha256": "1ybdbmvkxgk159ajfdxsf1i5rq56z1p5kx4ibgvns1s7gdadncrc",
+      "depends": ["AutoWMM", "DiagrammeR", "R2jags", "data_tree", "gtools", "mcmcplots", "tidyverse"]
+    },
+    "JANE": {
+      "name": "JANE",
+      "version": "0.2.1",
+      "sha256": "142qxlc1lxcg6v8wnzpyv2s42z96x1sz1ik08xl8f91rk3mlg7qr",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "aricode", "extraDistr", "future", "future_apply", "igraph", "mclust", "progress", "progressr", "rlang", "scales", "stringdist"]
+    },
     "JATSdecoder": {
       "name": "JATSdecoder",
       "version": "1.2.0",
@@ -15795,9 +16431,9 @@
     },
     "JDCruncheR": {
       "name": "JDCruncheR",
-      "version": "0.2.4",
-      "sha256": "08289a1pvhdx1bp76il18z6xr4nfk1pffbbjcwdvr2km147yfvmz",
-      "depends": ["XLConnect"]
+      "version": "0.3.1",
+      "sha256": "1bizsg3j29zf79qngxs17pvm0z2ivf664xlg89snzfnq6vcgkcxl",
+      "depends": ["openxlsx"]
     },
     "JFE": {
       "name": "JFE",
@@ -15903,8 +16539,8 @@
     },
     "JSDNE": {
       "name": "JSDNE",
-      "version": "4.3.4",
-      "sha256": "04vaalcwixzi1si814zmh6w9rfircj9rd5y3gx64d5l4f5illsn5",
+      "version": "4.4.4",
+      "sha256": "1sw5bdf3mmnp3wqbnlifxh6ppb62rv6x46l5nfnxadmcv503c0f2",
       "depends": ["MASS", "Rvcg", "dplyr", "molaR", "nnet"]
     },
     "JSM": {
@@ -15955,6 +16591,12 @@
       "sha256": "1jm63w2jn89pk725x3d9myq010mb0g5ir8vhv29mkiwgrqig6iw1",
       "depends": ["Rcpp"]
     },
+    "Jacquard": {
+      "name": "Jacquard",
+      "version": "1.0.2",
+      "sha256": "12v7vpis5gw9gqainmk15gkk15fqp7wak20bzcjx1rnshg5xngrp",
+      "depends": ["Rsolnp"]
+    },
     "JamendoR": {
       "name": "JamendoR",
       "version": "0.1.1",
@@ -15969,9 +16611,15 @@
     },
     "Jaya": {
       "name": "Jaya",
-      "version": "0.1.9",
-      "sha256": "0b23l7xp4waxjy1vkk09xaali5axr5900v9hkki4f75wh4gb1l53",
-      "depends": ["GA"]
+      "version": "1.0.3",
+      "sha256": "0qyszpw9bvz29dgf3wqx61h4rzpp0v7y63k214dz53jbrcd2wak0",
+      "depends": []
+    },
+    "Jcvrisk": {
+      "name": "Jcvrisk",
+      "version": "0.1.0",
+      "sha256": "0n4lb1y3h4lwslrfb8shaaxfr4yb5b9b1045aplnirl31wvap5wq",
+      "depends": []
     },
     "Jdmbs": {
       "name": "Jdmbs",
@@ -16017,14 +16665,14 @@
     },
     "JuliaCall": {
       "name": "JuliaCall",
-      "version": "0.17.5",
-      "sha256": "036rxp2lygvpxpykpxx2lqyyzidzzi95lv6g30n70hzy0agjym4j",
+      "version": "0.17.6",
+      "sha256": "0qws98k7byqk3cq041pbnnhxywf35vy4ldv9v5zyykfgq2g0v061",
       "depends": ["Rcpp", "knitr", "rjson"]
     },
     "JuliaConnectoR": {
       "name": "JuliaConnectoR",
-      "version": "1.1.3",
-      "sha256": "005l0i06whz6q7vx79pr9p6xbc01h9mngdr01gkkwrz78vi9xns9",
+      "version": "1.1.4",
+      "sha256": "1f1bh6acf88gxlkx3mzv0lrxz1ys4a55lbjw8aivqx8yvgk9ymb9",
       "depends": []
     },
     "JuliaFormulae": {
@@ -16101,8 +16749,8 @@
     },
     "KLINK": {
       "name": "KLINK",
-      "version": "1.0.0",
-      "sha256": "0gx8kvpyv149g1vk17ym8zfyv0wg4qgmp314vsfv140a9mj2f051",
+      "version": "1.0.2",
+      "sha256": "100rfisd3srj3j3d1pqxcz45gd21ibclf873ccnb0n3pch8a8lbp",
       "depends": ["forrel", "gt", "openxlsx", "pedFamilias", "pedmut", "pedprobr", "pedtools", "shiny", "shinydashboard", "shinyjs", "verbalisr", "xml2"]
     },
     "KLexp": {
@@ -16149,8 +16797,8 @@
     },
     "KODAMA": {
       "name": "KODAMA",
-      "version": "2.4",
-      "sha256": "1rw5xjv5sblhj5mr31hgv472gial5bl4f288db07ysgkjqsymwkq",
+      "version": "2.4.1",
+      "sha256": "09wn4giikxpw6phks3nyd69zs7v4zw3rw6xqlwvdcy2gd3vinasz",
       "depends": ["Rcpp", "RcppArmadillo", "Rtsne", "minerva", "umap"]
     },
     "KOGMWU": {
@@ -16285,6 +16933,12 @@
       "sha256": "1xmk95l4i3kj9jn0xh1chi2rj322k29jq14ra5pa7316gwf9vx2m",
       "depends": ["boot"]
     },
+    "Keng": {
+      "name": "Keng",
+      "version": "2024.12.15",
+      "sha256": "1cgb56p6hhrnajhplh4dambidikza4h7v67g0vz5szfnwsh1h0mh",
+      "depends": []
+    },
     "KernSmooth": {
       "name": "KernSmooth",
       "version": "2.23-24",
@@ -16315,10 +16969,16 @@
       "sha256": "1yfcn1r0zngc1nlj5axqps8an66p1q1qmxwagxq2q15d9qipb5wh",
       "depends": ["Iso", "Rcpp", "ggplot2"]
     },
+    "Kifidi": {
+      "name": "Kifidi",
+      "version": "0.1.0",
+      "sha256": "059yi549ab580ph0r8nj0igkhdlsy40qrzqnszyf9s969p2x493l",
+      "depends": []
+    },
     "KinMixLite": {
       "name": "KinMixLite",
-      "version": "2.1.0",
-      "sha256": "17kjb12r35b42ghkv6mp0jk115gn2dlwc8cdf92cm9jjn4k9am9a",
+      "version": "2.1.1",
+      "sha256": "1yq7wkim0cm6p1nm49km5izabkp1cid9z8df7wndnx048kb37qv4",
       "depends": ["DNAmixturesLite", "Matrix", "Rsolnp", "gRaven", "gRbase", "numDeriv", "pedtools", "ribd", "statnet_common"]
     },
     "KingCountyHouses": {
@@ -16329,8 +16989,8 @@
     },
     "Kira": {
       "name": "Kira",
-      "version": "1.0.5",
-      "sha256": "1ynf31wy93agwn5apaskyj3whdzgb83r4j4h0b455f2j7h5yac49",
+      "version": "1.0.6",
+      "sha256": "1m5a551vlvd7ndmphqs182kmva7qyyh2rqxkmck7vjcil0qw11bk",
       "depends": ["MASS"]
     },
     "Kmedians": {
@@ -16377,9 +17037,9 @@
     },
     "KoboconnectR": {
       "name": "KoboconnectR",
-      "version": "1.2.2",
-      "sha256": "09cg03hd8wp458d487qbx6giqqw6lc0gavx8isn067wqyfsscg16",
-      "depends": ["R6", "curl", "dplyr", "httr", "jsonlite", "mime", "openssl", "purrr", "readxl", "rlang"]
+      "version": "2.0.0",
+      "sha256": "082yh0hfygg1favnxa2yxi96w44r11a033ypzvddzgvf0i9fd5dw",
+      "depends": ["R6", "curl", "dplyr", "httr2", "jsonlite", "mime", "openssl", "purrr", "readxl", "rlang"]
     },
     "KoulMde": {
       "name": "KoulMde",
@@ -16393,6 +17053,12 @@
       "sha256": "02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2",
       "depends": ["leaps"]
     },
+    "KrakenR": {
+      "name": "KrakenR",
+      "version": "1.0.0",
+      "sha256": "1h384z16iknccpfvaz6ybzfbr8nkfcmcxrwhi2fxgxgnbp19lpf9",
+      "depends": ["anytime", "dplyr", "jsonlite", "magrittr", "rlang", "tidyr"]
+    },
     "KraljicMatrix": {
       "name": "KraljicMatrix",
       "version": "0.2.1",
@@ -16419,14 +17085,14 @@
     },
     "L1centrality": {
       "name": "L1centrality",
-      "version": "0.1.1",
-      "sha256": "1qjvyplkc957mhcyd4fly6il93mm5bj2v6azmr4vqc31lpx7j295",
+      "version": "0.3.0",
+      "sha256": "19kbq768r5zcnqlqw00llalsa1mwkq2x9ds54k2jxiqgpqi5m697",
       "depends": ["Rcpp", "igraph", "withr"]
     },
     "L1pack": {
       "name": "L1pack",
-      "version": "0.41-245",
-      "sha256": "1frhma6ipycgiq23fsbcnii2rqw53xpd202d7sjpqhi8xpvkawsc",
+      "version": "0.50",
+      "sha256": "1ipyx70y83295a6shjzgzmk1zipx4xbv9pnibjh2pxl01vc7myhx",
       "depends": ["fastmatrix"]
     },
     "L2DensityGoFtest": {
@@ -16503,8 +17169,8 @@
     },
     "LBI": {
       "name": "LBI",
-      "version": "0.1.3",
-      "sha256": "1fh121dl4d3i67blgibq087zs5li8zg7j284xgcgk5i789a80ksh",
+      "version": "0.2.1",
+      "sha256": "0ackpjc253j0bbrqzxhl09fs55qb7agl99zx7carr2l1213vplfg",
       "depends": []
     },
     "LBPG": {
@@ -16539,8 +17205,8 @@
     },
     "LCCR": {
       "name": "LCCR",
-      "version": "1.3",
-      "sha256": "07hrbras7721rb2q9c8qd9k6cn3ba16i06b30xnyjzq6my1wzpd5",
+      "version": "2.0",
+      "sha256": "0rls4l6z2x52crs046x8dbbk9ij7jr0d669lmr4pkzr8kpa72jlm",
       "depends": ["MASS"]
     },
     "LCF": {
@@ -16587,9 +17253,9 @@
     },
     "LDATree": {
       "name": "LDATree",
-      "version": "0.1.2",
-      "sha256": "1cn1b6wbfmgg1agjl2jwwshfdg1nmg8y46z00ascnp5myxylcga1",
-      "depends": ["ggplot2", "lifecycle", "magrittr", "scales", "visNetwork"]
+      "version": "0.2.0",
+      "sha256": "0y3jc7xflhz4b6fhjmi7zqdd5j3bzmrgrrw6f7v7r7ap4d737lcz",
+      "depends": ["folda", "ggplot2", "magrittr", "visNetwork"]
     },
     "LDAandLDAS": {
       "name": "LDAandLDAS",
@@ -16609,12 +17275,6 @@
       "sha256": "1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg",
       "depends": ["RJSONIO", "proxy"]
     },
-    "LDLcalc": {
-      "name": "LDLcalc",
-      "version": "2.1",
-      "sha256": "0bw0a7dh8j215y09n17w1zvnx72s9i5pv509wayl46wl2v6zz4rx",
-      "depends": ["RColorBrewer", "caret", "caretEnsemble", "corrplot", "data_table", "ggplot2", "janitor", "lares", "lattice", "moments", "philentropy", "resample"]
-    },
     "LDM": {
       "name": "LDM",
       "version": "6.0.1",
@@ -16675,6 +17335,12 @@
       "sha256": "1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b",
       "depends": ["R6", "matrixStats"]
     },
+    "LFM": {
+      "name": "LFM",
+      "version": "0.1.0",
+      "sha256": "1lnwwh0v2a8qzx2nql9993a3qh4bqcy2mfkg5f3rlpcca44wzkip",
+      "depends": ["FarmTest", "LaplacesDemon", "MASS", "SOPC", "matrixcalc", "relliptical"]
+    },
     "LGDtoolkit": {
       "name": "LGDtoolkit",
       "version": "0.2.0",
@@ -16695,8 +17361,8 @@
     },
     "LHD": {
       "name": "LHD",
-      "version": "1.3.3",
-      "sha256": "0wqjf0wl0l3kq7i030qjzdavsn75jmghjvzk76b9d22fhk356yh8",
+      "version": "1.4.0",
+      "sha256": "106563435lycw1z7bd54k6sjlkwhh3di5cjgl9ndgig37dw9fhns",
       "depends": ["numbers"]
     },
     "LIC": {
@@ -16729,12 +17395,24 @@
       "sha256": "163vg974x7bav5fc6sd8pnnrkwcwy6kqdd66k8zg89m8jmy9iffp",
       "depends": ["HDInterval", "LiblineaR", "Matrix", "SparseM", "cluster", "crayon", "data_table", "glmnet", "glmnetUtils", "lme4", "pROC"]
     },
+    "LLIC": {
+      "name": "LLIC",
+      "version": "3.0.0",
+      "sha256": "0nvzhwv4g0vicv082vp7fl63gkn3zphggzpim2rvnkps9msygqs3",
+      "depends": ["LaplacesDemon", "VGAM", "dplyr", "ggplot2", "relliptical", "rlang"]
+    },
     "LLM": {
       "name": "LLM",
       "version": "1.1.0",
       "sha256": "0kxppzaim7cmjawg5rjih4dsz8adq0asairgq3vx5lyjppb2cybx",
       "depends": ["RWeka", "partykit", "reghelper", "scales", "stringr", "survey"]
     },
+    "LLMR": {
+      "name": "LLMR",
+      "version": "0.1.1",
+      "sha256": "0ydsh92lcp3vd3b81j59flqwi4y7y4d12p8978dv8ach2ip9djgp",
+      "depends": ["httr2", "purrr", "rlang"]
+    },
     "LLSR": {
       "name": "LLSR",
       "version": "0.0.3.1",
@@ -16761,8 +17439,8 @@
     },
     "LMMsolver": {
       "name": "LMMsolver",
-      "version": "1.0.7",
-      "sha256": "0vzgbq2hpj65c7y1gkxz80smrl693basffkvv9gb7l29ifp10gs5",
+      "version": "1.0.8",
+      "sha256": "07klvcs24niwj04x298ljhiszf5g2n66112r3zn57wbmj0n8yssq",
       "depends": ["Matrix", "Rcpp", "agridat", "ggplot2", "maps", "sf", "spam"]
     },
     "LMMstar": {
@@ -16785,8 +17463,8 @@
     },
     "LMest": {
       "name": "LMest",
-      "version": "3.1.2",
-      "sha256": "0a9lch9bylhy5r4v865lwzzz9qqi98na8bfnr5ga8kzy7akbnza0",
+      "version": "3.2.4",
+      "sha256": "0hhjkdlmp198bvs5cmj9qpqxppwjwah2yh5vzgkrz0ysr8wis91g",
       "depends": ["Formula", "MASS", "MultiLCIRT", "diagram", "mclust", "mix", "mvtnorm", "scatterplot3d"]
     },
     "LMfilteR": {
@@ -16825,17 +17503,11 @@
       "sha256": "0fjcmfzmjgnks6a8x5v7lmqxpswljzrb9b881qjvyy7hi8asx7gy",
       "depends": ["dplyr", "foreign", "ggplot2", "magrittr", "modules", "pander", "psych", "rlang", "stringr"]
     },
-    "LOGANTree": {
-      "name": "LOGANTree",
-      "version": "0.1.1",
-      "sha256": "0zbll6bb9c3zrmnw8ccknfi6my4pkv0pq4hq742w393nni3dlahq",
-      "depends": ["ROCR", "caret", "caretEnsemble", "dplyr", "gbm", "ggplot2", "rpart_plot", "tibble"]
-    },
     "LOMAR": {
       "name": "LOMAR",
-      "version": "0.4.0",
-      "sha256": "148n4fmz3j0i042kc6jmf839ylsgxapfx9zx8999mlg77scwmdzi",
-      "depends": ["BH", "EBImage", "FNN", "RANN", "Rcpp", "alphashape3d", "aws", "data_table", "dbscan", "doParallel", "ff", "foreach", "mclust", "pracma", "proxy", "reshape2", "rhdf5", "transport"]
+      "version": "0.5.0",
+      "sha256": "18hj7f5gmkikahb7v120n79qg01zk9a58isdz4z8gr1ba1y31zlj",
+      "depends": ["BH", "EBImage", "FNN", "RANN", "Rcpp", "abind", "alphashape3d", "data_table", "dbscan", "doParallel", "ff", "foreach", "mclust", "pracma", "proxy", "reshape2", "rhdf5", "transport"]
     },
     "LOPART": {
       "name": "LOPART",
@@ -16857,10 +17529,16 @@
     },
     "LPCM": {
       "name": "LPCM",
-      "version": "0.47-4",
-      "sha256": "0vjdnrc4jcp8l12x57qdj21k325n98wrr1x7f76z3s5fwk2s1kwg",
+      "version": "0.47-6",
+      "sha256": "0876211qxadwzaqgxpvm10mymqwjx1k9jay0nwhrz7w377mi3zni",
       "depends": []
     },
+    "LPDynR": {
+      "name": "LPDynR",
+      "version": "1.0.5",
+      "sha256": "1p74wwcs1h6sy9x8naag76xw5ichwwd9103f3smp31pckrzqbb3x",
+      "depends": ["data_table", "dplyr", "magrittr", "terra", "virtualspecies"]
+    },
     "LPGraph": {
       "name": "LPGraph",
       "version": "2.1",
@@ -16929,9 +17607,9 @@
     },
     "LRTesteR": {
       "name": "LRTesteR",
-      "version": "1.1.1",
-      "sha256": "00p9mnlnj2md14c7vhhfs6bq0f2dwhb7r4dxjv6d1b62vfr2v4iv",
-      "depends": ["rlang", "statmod"]
+      "version": "1.2.1",
+      "sha256": "0xrx9q2jnfjy4d8aqx7y1ycl2wn61riap7kaw78ng33xks8l6b93",
+      "depends": ["EnvStats", "rlang", "statmod", "stringr"]
     },
     "LRcontrast": {
       "name": "LRcontrast",
@@ -16983,9 +17661,9 @@
     },
     "LSDsensitivity": {
       "name": "LSDsensitivity",
-      "version": "1.2.3",
-      "sha256": "1qq19f7k6klq7xpa1iq6spm8kbiy229r2wbwkng6rkn7jj2kcd70",
-      "depends": ["DiceKriging", "LSDinterface", "abind", "car", "diptest", "kSamples", "lawstat", "randtoolbox", "rgenoud", "sensitivity", "tseries"]
+      "version": "1.3.0",
+      "sha256": "0r308ja0nd239bwfz537qz6q4a1y8iirb0fmg9qq6s6hdfzwhz80",
+      "depends": ["DiceKriging", "LSDinterface", "XML", "abind", "car", "diptest", "kSamples", "lawstat", "randtoolbox", "rgenoud", "sensitivity", "tseries"]
     },
     "LSE": {
       "name": "LSE",
@@ -17025,9 +17703,9 @@
     },
     "LST": {
       "name": "LST",
-      "version": "1.1.0",
-      "sha256": "0vmdd4mvpm1mkb2qffkjpzwsg7xiw8sr2q4a69694bsy59vk43cd",
-      "depends": ["raster"]
+      "version": "2.0.0",
+      "sha256": "16fgbj8i2j87b5r2qrq75r0l6gk56zy62i5g0jx7h078kan5vvvp",
+      "depends": ["terra"]
     },
     "LSTS": {
       "name": "LSTS",
@@ -17037,8 +17715,8 @@
     },
     "LSTbook": {
       "name": "LSTbook",
-      "version": "0.5.0",
-      "sha256": "140b0zd8zqlx5qqyq39nq0dhnamvh92lgix0zx4x57x46bzp5rs9",
+      "version": "0.6",
+      "sha256": "11zr03frp2wg33c3y828m8rmzj4kl0k43dxlfvr35by99kbkal0f",
       "depends": ["MASS", "broom", "dplyr", "ggplot2", "glue", "rlang", "stringi", "tibble"]
     },
     "LSVAR": {
@@ -17067,8 +17745,8 @@
     },
     "LTASR": {
       "name": "LTASR",
-      "version": "0.1.3",
-      "sha256": "1dab18np0jkb9s8lkrmsk52h0f714ry851kvbnqs2kdl3zrsrl2f",
+      "version": "0.1.4",
+      "sha256": "07vkdk5pfhxw4xw5m46bqhdkgyqwjjfd7jw9g4m2vmj5dr648gyk",
       "depends": ["XML", "dplyr", "knitr", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringr", "tidyr", "zoo"]
     },
     "LTCDM": {
@@ -17079,8 +17757,8 @@
     },
     "LTFHPlus": {
       "name": "LTFHPlus",
-      "version": "2.1.1",
-      "sha256": "0f8xww6n2r54c26idi6ixfk89dff7c14dljvpaa71yxm0rb0isff",
+      "version": "2.1.2",
+      "sha256": "1r1s3pckza8792342akmrpxin6sbj7i5y3abl144k0c0vhw3p313",
       "depends": ["Rcpp", "batchmeans", "dplyr", "future", "future_apply", "igraph", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tmvtnorm", "xgboost"]
     },
     "LTPDvar": {
@@ -17103,8 +17781,8 @@
     },
     "LUCIDus": {
       "name": "LUCIDus",
-      "version": "3.0.2",
-      "sha256": "0wy35s0cnnx04ic8gpf4ikm4mpxm72x4k3hrp2h6gz8fmb6iw1qm",
+      "version": "3.0.3",
+      "sha256": "1gxhad64hwyfq2ff21mphlbawclxap684717x4jg5bnnbphihi4d",
       "depends": ["boot", "glasso", "glmnet", "jsonlite", "mclust", "networkD3", "nnet", "progress"]
     },
     "LVGP": {
@@ -17121,8 +17799,8 @@
     },
     "LWFBrook90R": {
       "name": "LWFBrook90R",
-      "version": "0.5.3",
-      "sha256": "10fr3p6lgym5dlz92867yq1drv2ygx4nq8zkap5756khv0drf8za",
+      "version": "0.6.1",
+      "sha256": "1hh633ax4l4hvb09bqyx5j3v71v7n5n0v93pi49nisl48dsbpq2i",
       "depends": ["data_table", "doFuture", "foreach", "future", "iterators", "parallelly", "progressr", "vegperiod"]
     },
     "LZeroSpikeInference": {
@@ -17133,15 +17811,15 @@
     },
     "LaF": {
       "name": "LaF",
-      "version": "0.8.4",
-      "sha256": "1mj010bl4ql0hm33vl0dd08s9dab11y9fa32nsqs6kbb22gjzk6p",
+      "version": "0.8.6",
+      "sha256": "1738v1jc3diz72dc0g0fzad6pa8fyahz1qd66izj437s0xy249q6",
       "depends": ["Rcpp"]
     },
     "LaMa": {
       "name": "LaMa",
-      "version": "1.0.0",
-      "sha256": "02s13hpkw9h123wmcgawypqrskd0ivciwabv9djw9l66yk79rjix",
-      "depends": ["Rcpp", "RcppArmadillo", "mgcv"]
+      "version": "2.0.2",
+      "sha256": "0hcmcal187azpz3hzhmr1damwyiqmn9aqa4mh100qq5cg7k9vwjw",
+      "depends": ["CircStats", "MASS", "Matrix", "RTMB", "Rcpp", "RcppArmadillo", "circular", "mgcv", "mvtnorm"]
     },
     "LabApplStat": {
       "name": "LabApplStat",
@@ -17163,8 +17841,8 @@
     },
     "LadderFuelsR": {
       "name": "LadderFuelsR",
-      "version": "0.0.6",
-      "sha256": "0amdnn0n8rb5dmm9cmj7bw9kidal3agd6m3655xal2ay62rxq6mn",
+      "version": "0.0.7",
+      "sha256": "1zz76kpbf6nibwhsssgpis7wv90jnrilcxjv3xglwak9hm18a6f1",
       "depends": ["dplyr", "gdata", "ggplot2", "magrittr", "segmented", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "LagSequential": {
@@ -17175,8 +17853,8 @@
     },
     "Lahman": {
       "name": "Lahman",
-      "version": "11.0-0",
-      "sha256": "0jzxk9ykjm4mxwf2adqdy6gbv80569ynkqsrppfn8ag9d5a3k8bv",
+      "version": "12.0-0",
+      "sha256": "0va8aq63knhwm2dk87bi0c94q0yqbmrplwih4za0mkdmv8r5i7lb",
       "depends": ["dplyr"]
     },
     "LakeMetabolizer": {
@@ -17215,6 +17893,12 @@
       "sha256": "1dsfp65cg06f25zjzd5ib4qyn1alfhbhpgyvpcw5n6bszn13idap",
       "depends": []
     },
+    "Largevars": {
+      "name": "Largevars",
+      "version": "1.0.2",
+      "sha256": "0i4jxhg3ccv3d5spy7vbfmhwn5wcq4h9l2bv9a7gzhv1y0pnfnwb",
+      "depends": []
+    },
     "LassoBacktracking": {
       "name": "LassoBacktracking",
       "version": "1.1",
@@ -17259,9 +17943,9 @@
     },
     "LatticeKrig": {
       "name": "LatticeKrig",
-      "version": "8.4",
-      "sha256": "153yaf0k4l5za8f13yh2mzjv66bnmi5kp6zaxq9vrisld4vdp58h",
-      "depends": ["fields", "spam"]
+      "version": "9.3.0",
+      "sha256": "0spkbbpf6x990mv4s1dk9mhhavkjnn30m5q70gl34763flnbr0vm",
+      "depends": ["fftwtools", "fields", "spam", "spam64"]
     },
     "LavaCvxr": {
       "name": "LavaCvxr",
@@ -17311,6 +17995,12 @@
       "sha256": "1pnxiwjkdj78p4hkl1lqagmd937q63yncb45fcra28sa9v9psrcs",
       "depends": []
     },
+    "LearnNonparam": {
+      "name": "LearnNonparam",
+      "version": "1.2.6",
+      "sha256": "17923sjch3hysddxidzlldfrn2xrd71qsg4j0iv76p4qja0wgsyw",
+      "depends": ["R6", "Rcpp"]
+    },
     "LearnPCA": {
       "name": "LearnPCA",
       "version": "0.3.4",
@@ -17323,6 +18013,12 @@
       "sha256": "0iqw9hj5066yj4ij7v1dfdvn0q3y4wjwwznhilgsyvlbr0lj642b",
       "depends": ["cli"]
     },
+    "LearnVizLMM": {
+      "name": "LearnVizLMM",
+      "version": "1.0.0",
+      "sha256": "15yqy96mm1ignzpwsnjpzg3lm37k976254c1wk61089z9wb7l185",
+      "depends": ["DiagrammeR", "DiagrammeRsvg", "cli", "dplyr", "rsvg", "stringr"]
+    },
     "LearningRlab": {
       "name": "LearningRlab",
       "version": "2.4",
@@ -17361,8 +18057,8 @@
     },
     "LiblineaR": {
       "name": "LiblineaR",
-      "version": "2.10-23",
-      "sha256": "0c8sj8gyrfycqi75xxf7fpy5kbffbw3aw3xj34x90sj47vg0sr09",
+      "version": "2.10-24",
+      "sha256": "1j17y1bky1ymhxy1yynxih2v5haj7f3q8ddap5w7a33fydkaaj9r",
       "depends": []
     },
     "Libra": {
@@ -17427,8 +18123,8 @@
     },
     "LikertMakeR": {
       "name": "LikertMakeR",
-      "version": "0.3.0",
-      "sha256": "0hxyrgm88wvaa6b1cggm45f851sg7rzsbcz7745lcl9zmmkw5w1d",
+      "version": "0.4.0",
+      "sha256": "0ilj94vr7wga1aal0z7x6s3g977b6p7r4wwzc3x8irnwwsimzjcm",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gtools"]
     },
     "LilRhino": {
@@ -17523,8 +18219,8 @@
     },
     "LncFinder": {
       "name": "LncFinder",
-      "version": "1.1.5",
-      "sha256": "0mb41fjph4svn2amdx6fb2j8pzgll17c0xxwnsan9vjipnmj59hi",
+      "version": "1.1.6",
+      "sha256": "183l5dqwsh0519qyy2kz5qns5kcqf6dr9h0da6hl57bf2wwngkjd",
       "depends": ["caret", "e1071", "seqinr"]
     },
     "LncPath": {
@@ -17553,20 +18249,20 @@
     },
     "LocaTT": {
       "name": "LocaTT",
-      "version": "1.1.1",
-      "sha256": "0wbzyw0h6mz5kh9k5x45vffzp6wa76y9qz5s534vvnmgcic2vqnm",
-      "depends": ["taxize"]
+      "version": "1.1.2",
+      "sha256": "0zbhf5mpyg1cn0ab033lajjaqh7j2614lhwcxxwra5by26b6gh75",
+      "depends": []
     },
     "LocalControl": {
       "name": "LocalControl",
-      "version": "1.1.3",
-      "sha256": "0pi5z3i5hmb8nrqg6nyqrd4hx80xjgc5m3ra1z5r8rvjhw4mz0ik",
+      "version": "1.1.4",
+      "sha256": "0c8032657nhk62c5a4nd3ja5kq5igmnfxqi3r5fkpjgvx43s82s6",
       "depends": ["Rcpp", "cluster", "gss", "lattice"]
     },
     "LocalCop": {
       "name": "LocalCop",
-      "version": "0.0.1",
-      "sha256": "0cjp2ws87ys3hf18i9hha5rs2c1k8jfya7vqkp1lygmzccvan1j4",
+      "version": "0.0.2",
+      "sha256": "0kxm4jhfyd2hbh94pzi8xaq3w7l8lb6c6bpcipdc1p0m5z93lh9h",
       "depends": ["RcppEigen", "TMB", "VineCopula"]
     },
     "Lock5Data": {
@@ -17577,8 +18273,8 @@
     },
     "LogConcDEAD": {
       "name": "LogConcDEAD",
-      "version": "1.6-9",
-      "sha256": "0m744byjlf5wrpg5pzi4229h3gdzv88bxfr60mgpg9qy4l6r1p2p",
+      "version": "1.6-10",
+      "sha256": "0vm89bdaldgcpb1x14jg64p9l54sn38q1msa0zbw7fmwb8ssf59g",
       "depends": ["MASS", "mclust", "mvtnorm"]
     },
     "LogRegEquiv": {
@@ -17625,8 +18321,8 @@
     },
     "LongDat": {
       "name": "LongDat",
-      "version": "1.1.2",
-      "sha256": "1rzkb7byd32jqvhf75zyvy0dlkq79aicz8j0x7lk821qiq4dfv6l",
+      "version": "1.1.3",
+      "sha256": "0jydzc50vfml06ykk34bx5681wp35m9yj8x67h9pqwhpyn0f36ca",
       "depends": ["MASS", "bestNormalize", "car", "dplyr", "effsize", "emmeans", "ggplot2", "glmmTMB", "lme4", "magrittr", "patchwork", "reshape2", "rlang", "rstatix", "stringr", "tibble", "tidyr"]
     },
     "LongMemoryTS": {
@@ -17659,11 +18355,17 @@
       "sha256": "11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b",
       "depends": ["GenomicRanges", "IRanges", "S4Vectors"]
     },
+    "LorMe": {
+      "name": "LorMe",
+      "version": "1.1.0",
+      "sha256": "0jvdbz82n657rq6fnvhq45l2qvm66ivmqhf34yn9q66pq24yl1qi",
+      "depends": ["DescTools", "HH", "Hmisc", "RColorBrewer", "agricolae", "ape", "coin", "dplyr", "fdrtool", "ggalluvial", "ggplot2", "ggpubr", "igraph", "magrittr", "multcompView", "scales", "stringr", "tidyr", "vegan"]
+    },
     "LorenzRegression": {
       "name": "LorenzRegression",
-      "version": "1.0.0",
-      "sha256": "1jxz753bcq8b16ncjk6v8c8ylv8brlqd90fdzn9lappm1k4y0r46",
-      "depends": ["GA", "MASS", "Rcpp", "RcppArmadillo", "Rearrangement", "doParallel", "foreach", "ggplot2", "knitr", "locpol"]
+      "version": "2.1.0",
+      "sha256": "1npv0dcw16fm8k03wd4cnxxim4nc4qs81smhzg5np8bix4df36bx",
+      "depends": ["GA", "MASS", "Rcpp", "RcppArmadillo", "Rearrangement", "boot", "doParallel", "foreach", "ggplot2", "locpol", "parsnip", "rsample", "scales"]
     },
     "LowRankQP": {
       "name": "LowRankQP",
@@ -17691,8 +18393,8 @@
     },
     "Luminescence": {
       "name": "Luminescence",
-      "version": "0.9.24",
-      "sha256": "0i4z0pyykvp0kxv5xg2id9p3829wxivvn5lgqickb2xql4rrggp6",
+      "version": "0.9.26",
+      "sha256": "0k443q3xr98y6wkz2b81d156swv1v9w6ms8gxbjsrzig4ggx31p4",
       "depends": ["DEoptim", "Rcpp", "RcppArmadillo", "XML", "bbmle", "data_table", "httr", "interp", "lamW", "matrixStats", "mclust", "minpack_lm", "readxl", "shape", "zoo"]
     },
     "M2SMF": {
@@ -17751,9 +18453,9 @@
     },
     "MAGMA_R": {
       "name": "MAGMA.R",
-      "version": "1.0.1",
-      "sha256": "0i474az77w9nfmxhz2z76v483vsny1gkpzv3mb1zaqdcv26yqpzq",
-      "depends": ["doParallel", "dplyr", "flextable", "foreach", "ggplot2", "janitor", "metafor", "overlapping", "psych", "purrr", "rlang", "robumeta", "tibble", "tidyselect", "tidyverse"]
+      "version": "1.0.3",
+      "sha256": "07jicr9axlb8cnjjprzrkad57r2wrnap52n45sia5qfjp53ys12g",
+      "depends": ["doParallel", "dplyr", "flextable", "foreach", "ggplot2", "janitor", "metafor", "overlapping", "psych", "purrr", "rlang", "robumeta", "stddiff", "tibble", "tidyselect", "tidyverse"]
     },
     "MAGNAMWAR": {
       "name": "MAGNAMWAR",
@@ -17761,6 +18463,12 @@
       "sha256": "1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4",
       "depends": ["ape", "coxme", "doParallel", "dplyr", "foreach", "iterators", "lme4", "multcomp", "plyr", "qqman", "seqinr", "survival"]
     },
+    "MAICtools": {
+      "name": "MAICtools",
+      "version": "0.1.1",
+      "sha256": "0s5a0157p82f55r835dkb6zp2vwk9grzzp22alxw3hphw6ni6jmn",
+      "depends": ["VIM", "assertthat", "boot", "broom", "data_table", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "stringr", "survival", "survminer", "tibble", "tidyr", "tidyselect"]
+    },
     "MAINT_Data": {
       "name": "MAINT.Data",
       "version": "2.7.1",
@@ -17773,10 +18481,16 @@
       "sha256": "0xljmnwl8v3y68xmfm5vbycsa5y5yi0p0n207hg7zjvfaf6gbfhj",
       "depends": ["AUC", "grplasso"]
     },
+    "MALDIcellassay": {
+      "name": "MALDIcellassay",
+      "version": "0.4.47",
+      "sha256": "0bxspf3i57qz5hybjh3hfasn95m8k3ijfi2js1rsnz8pn9x6isqb",
+      "depends": ["MALDIquant", "MALDIquantForeign", "dplyr", "forcats", "ggplot2", "nplr", "purrr", "scales", "svMisc", "tibble", "tidyr"]
+    },
     "MALDIquant": {
       "name": "MALDIquant",
-      "version": "1.22.2",
-      "sha256": "1zygmn8cny5r4s0ni2kgqbg2xzjvjh9rzmqnw256jg0035qb0lb0",
+      "version": "1.22.3",
+      "sha256": "10wk8ykraw1swnlfhp5fh9fhfxkshanqkrwhs8dssqx1l474y2gx",
       "depends": []
     },
     "MALDIquantForeign": {
@@ -17793,9 +18507,9 @@
     },
     "MAMS": {
       "name": "MAMS",
-      "version": "2.0.2",
-      "sha256": "16j24z18z7dc25sk4jfnqgglw8gvv6ddhvl6v8lswm3ib4l6chvb",
-      "depends": ["future", "future_apply", "knitr", "mvtnorm"]
+      "version": "3.0.0",
+      "sha256": "1w55vysw5n1wapaz0x3zyyzlyn7l1764d32b09p45yzfv2wdwr6v",
+      "depends": ["cli", "future", "future_apply", "mvtnorm"]
     },
     "MANCIE": {
       "name": "MANCIE",
@@ -17811,9 +18525,9 @@
     },
     "MAP": {
       "name": "MAP",
-      "version": "0.1.3",
-      "sha256": "19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk",
-      "depends": ["Matrix", "flexmix"]
+      "version": "1.0.0",
+      "sha256": "0xlwcq1y57l7bshsidqrmzd26rrm9j4hq6bi0di2k4116mk5fvl4",
+      "depends": ["Matrix", "flexmix", "magrittr"]
     },
     "MAPA": {
       "name": "MAPA",
@@ -17925,8 +18639,8 @@
     },
     "MBA": {
       "name": "MBA",
-      "version": "0.1-0",
-      "sha256": "1bw3a8xcbjmhb3mfzblx8kpj3jiag8c95wm5g6xy52xrql2rj0vq",
+      "version": "0.1-2",
+      "sha256": "14jfy9wqm4k2ljn2rz4lm1zzzkjm7nn4g92lrb1a7gm7gysa3dd5",
       "depends": ["BH"]
     },
     "MBAnalysis": {
@@ -17943,8 +18657,8 @@
     },
     "MBC": {
       "name": "MBC",
-      "version": "0.10-6",
-      "sha256": "1680lnzga21qk5yddrciiaifxkkb9kk744m9fbj0hg5xw6v9dxic",
+      "version": "0.10-7",
+      "sha256": "07k9y0k2h3jwip18szr5ivpm31jqv08czmpjvwpjdcz653qrmqbh",
       "depends": ["FNN", "Matrix", "energy"]
     },
     "MBCbook": {
@@ -17971,18 +18685,6 @@
       "sha256": "0qpflcydkf2k8a7kqklvp7mskppviqkffkr98rfsklk8iqf8x9c9",
       "depends": ["MASS", "Rtsne", "SNFtool", "caTools", "caret", "class", "dplyr", "e1071", "ggplot2", "keras", "pROC", "randomForest", "readr", "reshape2", "reticulate", "rgl", "stringr", "tensorflow", "xgboost"]
     },
-    "MBNMAdose": {
-      "name": "MBNMAdose",
-      "version": "0.4.3",
-      "sha256": "1dqh7z6wpnryl9djfsacbdm4b4my08kh4l63vd31xs742sywv6i0",
-      "depends": ["R2jags", "Rdpack", "checkmate", "dplyr", "igraph", "magrittr", "reshape2", "rjags", "scales"]
-    },
-    "MBNMAtime": {
-      "name": "MBNMAtime",
-      "version": "0.2.4",
-      "sha256": "1ny438dy62zrafyf7nng2hq5v311l1zc5xd39452fgq6ij0rnrni",
-      "depends": ["R2jags", "Rdpack", "checkmate", "dplyr", "gridExtra", "knitr", "magrittr", "reshape2", "rjags"]
-    },
     "MBSGS": {
       "name": "MBSGS",
       "version": "1.1.0",
@@ -18003,9 +18705,9 @@
     },
     "MCARtest": {
       "name": "MCARtest",
-      "version": "1.2.1",
-      "sha256": "0vcw8ysxkv2ajiv44cf6pf8dgn6bmjzs01fsdijs29ky9467alw5",
-      "depends": ["Epi", "MASS", "Matrix", "Rcpp", "Rcsdp", "Rdpack", "copula", "gtools", "highs", "lpSolve", "missMethods", "misty", "norm", "pracma", "rcdd"]
+      "version": "1.2.2",
+      "sha256": "1j2p43jd1l5di93mf3arfnvg3jz4jzz1f917y2xbvgvgim2s2zmv",
+      "depends": ["Epi", "MASS", "Matrix", "Rcpp", "Rcsdp", "Rdpack", "copula", "gtools", "highs", "lpSolve", "missMethods", "norm", "pracma", "rcdd"]
     },
     "MCAvariants": {
       "name": "MCAvariants",
@@ -18081,8 +18783,8 @@
     },
     "MCMCpack": {
       "name": "MCMCpack",
-      "version": "1.7-0",
-      "sha256": "1vsx0hs8v0928lhkf2jhwc2cwq7bdb5iciibkbfc2zh123bp6q44",
+      "version": "1.7-1",
+      "sha256": "0ac5nllnsdbvbf0l578dab1i24q3kxr0dpkch8w7q694cds4c2rv",
       "depends": ["MASS", "coda", "lattice", "mcmc", "quantreg"]
     },
     "MCMCprecision": {
@@ -18129,9 +18831,9 @@
     },
     "MCPModGeneral": {
       "name": "MCPModGeneral",
-      "version": "0.1-1",
-      "sha256": "0izhbiivlb818ak49hl1f7li1chlyrxk5f80cmw4zkim3l6ddaxq",
-      "depends": ["DoseFinding", "MASS"]
+      "version": "0.1-3",
+      "sha256": "011rvj9rp5hj5nwxdkfg1i7n2121pqh8f4hk0dvbyf62121k0gxp",
+      "depends": ["DoseFinding", "MASS", "mvtnorm"]
     },
     "MCPModPack": {
       "name": "MCPModPack",
@@ -18175,6 +18877,12 @@
       "sha256": "1r3sizb2mqd4pqjy25krwmsjfkr6cl7lkd8db5jn3hgxx3qh6sgc",
       "depends": ["Rdpack", "doParallel", "foreach", "ggplot2", "lattice", "orthopolynom", "psych"]
     },
+    "MDDC": {
+      "name": "MDDC",
+      "version": "1.0.0",
+      "sha256": "1c02qzf8hpvjpjqkkcmxw0c3vb7wv0hnq6cwpfyfj1ry7a1phfiw",
+      "depends": ["MASS", "Rcpp", "RcppEigen", "doParallel", "foreach", "ggplot2"]
+    },
     "MDEI": {
       "name": "MDEI",
       "version": "1.0",
@@ -18183,8 +18891,8 @@
     },
     "MDFS": {
       "name": "MDFS",
-      "version": "1.5.3",
-      "sha256": "0gazmcgkgz915s3ljjdksm0bw4z6f4fz9qfzibdq6wscwcg9kfjn",
+      "version": "1.5.5",
+      "sha256": "1wryjmyk4baxxhdfwjczpkv1c12dalx0bmmrry4c9xa03yz483rl",
       "depends": []
     },
     "MDMA": {
@@ -18211,6 +18919,12 @@
       "sha256": "02fkrv6yn2r0ryphvxhlnv05xxq3j824ijnj75dag3v9kinx1ar2",
       "depends": []
     },
+    "MDPIexploreR": {
+      "name": "MDPIexploreR",
+      "version": "0.2.0",
+      "sha256": "1amndzpmm739cnhk66acpv50xmklc5pcxaqvfcsfhd2d7pxyvw8g",
+      "depends": ["dplyr", "ggplot2", "lubridate", "magrittr", "rvest", "scales", "stringr"]
+    },
     "MDPtoolbox": {
       "name": "MDPtoolbox",
       "version": "4.0.3",
@@ -18247,12 +18961,24 @@
       "sha256": "1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9",
       "depends": ["MASS", "RColorBrewer", "gplots", "gtools"]
     },
+    "MECfda": {
+      "name": "MECfda",
+      "version": "0.1.0",
+      "sha256": "1b92p7g1s488pb750rj0i4ivr0x8yirkvmpnbfc6l7g2j8cn8bi7",
+      "depends": ["MASS", "Matrix", "corpcor", "dplyr", "fda", "glme", "gss", "lme4", "magrittr", "mgcv", "nlme", "quantreg", "stringr"]
+    },
     "MED": {
       "name": "MED",
       "version": "0.1.0",
       "sha256": "0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109",
       "depends": []
     },
+    "MEDesigns": {
+      "name": "MEDesigns",
+      "version": "1.0.0",
+      "sha256": "1hwiwc1f4ng57gvclw0i2z9sg5irzv1bir2jwb6m28m8xm59dlva",
+      "depends": []
+    },
     "MEDseq": {
       "name": "MEDseq",
       "version": "1.4.1",
@@ -18303,9 +19029,9 @@
     },
     "MF_beta4": {
       "name": "MF.beta4",
-      "version": "1.0.3",
-      "sha256": "13k9jqspg42hgis0svad76yvzb8bh5cm4qynkpn0ga0an2lww6gs",
-      "depends": ["broom", "devtools", "dplyr", "ggplot2", "ggpubr", "lme4", "lmerTest", "patchwork", "purrr", "tidyr", "tidyverse"]
+      "version": "1.1.1",
+      "sha256": "10cnkb4a32cdm8xfbkyvp4p8pwx2xpnk6j545vaj1g07snphs3gd",
+      "depends": ["broom", "devtools", "dplyr", "ggplot2", "ggpubr", "lme4", "lmerTest", "patchwork", "purrr", "reshape2", "tidyr", "tidyverse"]
     },
     "MFAg": {
       "name": "MFAg",
@@ -18417,8 +19143,8 @@
     },
     "MHDA": {
       "name": "MHDA",
-      "version": "1.2",
-      "sha256": "1m8lz8jxf2bs8np4pwjh70yn955qa8g9xi1blwbwp8s72yjs78ll",
+      "version": "1.4",
+      "sha256": "0l0ifw2slk5wx9nv6i6xqj79ccpgirk7qzzssy7mvhd249d9ybzb",
       "depends": []
     },
     "MHTdiscrete": {
@@ -18441,8 +19167,8 @@
     },
     "MIAmaxent": {
       "name": "MIAmaxent",
-      "version": "1.3.0",
-      "sha256": "0xnl21d1jybrff711ndij71ihfarjq5lwpw26frfsni2k4wlbwfy",
+      "version": "1.3.1",
+      "sha256": "0jshi9p0q8j5j0s65s4n14b5r6gpzsigygdibmhnvvqygflyzzqa",
       "depends": ["dplyr", "e1071", "rlang", "terra"]
     },
     "MICsplines": {
@@ -18457,6 +19183,12 @@
       "sha256": "08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g",
       "depends": ["BiasedUrn"]
     },
+    "MIGEE": {
+      "name": "MIGEE",
+      "version": "0.1.0",
+      "sha256": "112wi3zs0fh2jlgrihr76f4vlqsmp3j2q76r6y264a1mhgf7yzfs",
+      "depends": ["VIM", "dplyr", "ggeffects", "ggplot2", "lme4", "mice", "readr", "reshape2"]
+    },
     "MIIPW": {
       "name": "MIIPW",
       "version": "0.1.1",
@@ -18519,8 +19251,8 @@
     },
     "MKMeans": {
       "name": "MKMeans",
-      "version": "2.1",
-      "sha256": "1zhas96xvjyphmrs48k3nza1ayv9nfj0c760ifb57p8yk28m0bfy",
+      "version": "3.1",
+      "sha256": "1gfh53v65g7c102w787wvjzdnw3n1ifx0f5hf8mwz4l6s6nfz3r3",
       "depends": []
     },
     "MKclass": {
@@ -18561,8 +19293,8 @@
     },
     "MKpower": {
       "name": "MKpower",
-      "version": "0.9",
-      "sha256": "1q04cs2qrjivyiig8nz3s8fl9b4g0smj390vb8jy67p9rq4nhjjz",
+      "version": "1.0",
+      "sha256": "1bsagc422wkbx5sy5azx167xmrv3h0jlb8yg8vxibrjb8hv3wcvd",
       "depends": ["MKdescr", "MKinfer", "coin", "ggplot2", "matrixTests", "mvtnorm", "qqplotr"]
     },
     "ML_MSBD": {
@@ -18591,8 +19323,8 @@
     },
     "MLCOPULA": {
       "name": "MLCOPULA",
-      "version": "1.0.0",
-      "sha256": "1addgypksr3hrhzrj9ypaa2w7vgscrqlrfkgx7n0rc7drm827wix",
+      "version": "1.0.1",
+      "sha256": "0a2y84xajinmpryn0bizqy57fn7i3nwnw8kqjiw5bxprc1lc863h",
       "depends": ["GRIDCOPULA", "TSP", "copula", "igraph", "kde1d", "pracma"]
     },
     "MLDS": {
@@ -18609,9 +19341,9 @@
     },
     "MLE": {
       "name": "MLE",
-      "version": "1.0",
-      "sha256": "0z5ny5lcng03rrpd6mjynxgvi3rx6pc6cm6kpv2dn89lzysv3r4r",
-      "depends": ["BGFD", "Compositional", "Directional", "MN", "Rfast", "Rfast2", "bivpois", "geppe", "gp", "skellam"]
+      "version": "1.3",
+      "sha256": "0g7416dsd110pq5xl65fzcd1ci65ln1db039r4711vgvq3nr0699",
+      "depends": ["BGFD", "CCd", "COMPoissonReg", "Compositional", "Directional", "MN", "Rfast", "Rfast2", "bivpois", "geppe", "gp", "skellam"]
     },
     "MLEce": {
       "name": "MLEce",
@@ -18621,8 +19353,8 @@
     },
     "MLEcens": {
       "name": "MLEcens",
-      "version": "0.1-7",
-      "sha256": "1kdnm5ilfn5fclry3f1d518761hykrqgjhv69kc881r2fpcfa1lv",
+      "version": "0.1-7.1",
+      "sha256": "1p7pbig81zn6ivybs9dlhx0q445z17sa95a3938wx28yi1wxrkkd",
       "depends": []
     },
     "MLFS": {
@@ -18687,8 +19419,8 @@
     },
     "MLZ": {
       "name": "MLZ",
-      "version": "0.1.4",
-      "sha256": "0kvwv13gklilpmqrc939lm1npyvmg8hrxy8m8vfpvrc5jgli49mx",
+      "version": "0.1.5",
+      "sha256": "1kaax2qz6kiqh6c9qmsf6n431ippdpvg720vlfywxyhw2v1qpgdy",
       "depends": ["RcppEigen", "TMB", "dplyr", "ggplot2", "gplots", "reshape2"]
     },
     "MLeval": {
@@ -18723,8 +19455,8 @@
     },
     "MM4LMM": {
       "name": "MM4LMM",
-      "version": "3.0.2",
-      "sha256": "02a553pncv7q0zczy6rvj4avjpryv01n2mhr9cr0ir7607k1jllx",
+      "version": "3.0.3",
+      "sha256": "11kib76r7arnjgc07x55bdaig4bg0qakvcmv9v51z7l4p5db8q2y",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "corpcor", "dplyr", "purrr"]
     },
     "MMAC": {
@@ -18763,6 +19495,12 @@
       "sha256": "1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi",
       "depends": ["Biobase", "MASS", "lawstat"]
     },
+    "MMGFM": {
+      "name": "MMGFM",
+      "version": "1.1.0",
+      "sha256": "1alsgv7wjb6mcg0zgcxkpfr89hr3yclgc68yv88wzq8ad9py9wzg",
+      "depends": ["GFM", "MASS", "MultiCOAP", "Rcpp", "RcppArmadillo", "irlba"]
+    },
     "MMINP": {
       "name": "MMINP",
       "version": "0.1.0",
@@ -18853,6 +19591,12 @@
       "sha256": "0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb",
       "depends": ["MASS", "doParallel", "glmnet", "igraph", "mvtnorm"]
     },
+    "MNormTest": {
+      "name": "MNormTest",
+      "version": "1.1.1",
+      "sha256": "02qly5jwnpmdw16hds4rf4p91l7w43pna00ladprpm8ql4r3niyq",
+      "depends": ["Rmpfr"]
+    },
     "MOCCA": {
       "name": "MOCCA",
       "version": "1.4",
@@ -18895,12 +19639,6 @@
       "sha256": "17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr",
       "depends": ["gplots", "psych", "readr"]
     },
-    "MOSS": {
-      "name": "MOSS",
-      "version": "0.2.2",
-      "sha256": "0gjsyv74hhjknlnplc8157mmypnfy1yjrs400pz0p4744k5c8c7s",
-      "depends": ["Rtsne", "cluster", "dbscan"]
-    },
     "MOST": {
       "name": "MOST",
       "version": "0.1.2",
@@ -18925,6 +19663,12 @@
       "sha256": "1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa",
       "depends": []
     },
+    "MPCR": {
+      "name": "MPCR",
+      "version": "1.1.3",
+      "sha256": "157614jz041imn2clbrq9wf6chhcgg4gvx37xm5kcy5rv2abjkqh",
+      "depends": ["Rcpp"]
+    },
     "MPDiR": {
       "name": "MPDiR",
       "version": "0.2",
@@ -18945,8 +19689,8 @@
     },
     "MPN": {
       "name": "MPN",
-      "version": "0.3.0",
-      "sha256": "0rrigkq5bkarncswv8kgvvwd1vrq5cqnb5vypa9d39q2ksqf8j3d",
+      "version": "0.4.0",
+      "sha256": "06k2hpcwiw0hgbgzl2fnf05waha6kccq4wb1l7svkcyy8s27mqa1",
       "depends": []
     },
     "MPS": {
@@ -18957,9 +19701,9 @@
     },
     "MPSEM": {
       "name": "MPSEM",
-      "version": "0.4-1",
-      "sha256": "0cq7vyyif7gxywrj420msscjf1aq427g88x8yvxf3a5a6mqapkr8",
-      "depends": ["MASS", "ape"]
+      "version": "0.5-1",
+      "sha256": "138p9iwssqpi6giy0wqmycjkipiz1sxd8rgw2bbjc3wpg2qbv8jh",
+      "depends": ["MASS", "ape", "magrittr"]
     },
     "MPTinR": {
       "name": "MPTinR",
@@ -18993,8 +19737,8 @@
     },
     "MR_RGM": {
       "name": "MR.RGM",
-      "version": "0.0.2",
-      "sha256": "0m1v1nrnd944l5hr6h7jxai6rjx8m3p09yjl2k8q2hd0kancbqdd",
+      "version": "0.0.3",
+      "sha256": "116jbzjzkf2d366r4k3j4wjk5i8k4x57k3b4nsvlb6s7yhwwq9a4",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "MRCE": {
@@ -19003,6 +19747,12 @@
       "sha256": "0j5dhzmn1bpplc5jird966gcg0zjwlajv93r2p0kh48msi5kbaqc",
       "depends": ["glasso"]
     },
+    "MRCV": {
+      "name": "MRCV",
+      "version": "0.4-0",
+      "sha256": "0qwnqb3593n9pv0flf9lyq2yzbmh6ivq3r5rfyamcs19wb79lb2j",
+      "depends": ["tables"]
+    },
     "MRFA": {
       "name": "MRFA",
       "version": "0.6",
@@ -19101,8 +19851,8 @@
     },
     "MSCquartets": {
       "name": "MSCquartets",
-      "version": "2.0.1",
-      "sha256": "1d1bgvwz88q2sipqzhiybwflixb45nc1fw9isf7xbhq18msr9vmh",
+      "version": "3.0",
+      "sha256": "1a2ba47lwdxzv358y10ni6nv2pc037q5ybi8gl3myl6vl6cxxfll",
       "depends": ["Rcpp", "RcppProgress", "Rdpack", "ape", "doParallel", "foreach", "igraph", "phangorn", "zipfR"]
     },
     "MSCsimtester": {
@@ -19113,8 +19863,8 @@
     },
     "MSEtool": {
       "name": "MSEtool",
-      "version": "3.7.1",
-      "sha256": "16m8q5h9ciydlg6gqpvwaxam2q7d327v7z40h7cwc0chh43wjysz",
+      "version": "3.7.3",
+      "sha256": "07rrh70bp3wckhszv5hgqcbch3llp84gl22x45wvx167pmgvgxp6",
       "depends": ["Rcpp", "RcppArmadillo", "abind", "dplyr", "ggplot2", "ggrepel", "gridExtra", "snowfall"]
     },
     "MSG": {
@@ -19135,6 +19885,12 @@
       "sha256": "172xpvs98b9ay44ffb8bp9k4zsjzhy92pp7bv3d1j186pqhl13ib",
       "depends": ["MSGARCH", "forecast", "nnfor"]
     },
+    "MSIMST": {
+      "name": "MSIMST",
+      "version": "1.1",
+      "sha256": "1n8jx4narzxyghn5xdmn1vm5b4nyd2n24dkrb34p29bwlnqyhdf9",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "Rdpack", "fields", "mvtnorm", "truncnorm"]
+    },
     "MSML": {
       "name": "MSML",
       "version": "1.0.0.1",
@@ -19161,8 +19917,8 @@
     },
     "MSSQL": {
       "name": "MSSQL",
-      "version": "1.0.0",
-      "sha256": "15glgn2dr1yygxps0mx68435zqc2hi4hvgr4rvgrwyxdnlm5g35y",
+      "version": "1.0.1",
+      "sha256": "01a1lnnxa0ay3jb8ph0nbnsj2mc9lwhpyncham90q94xj3slc55j",
       "depends": ["RODBC"]
     },
     "MST": {
@@ -19173,8 +19929,8 @@
     },
     "MSTest": {
       "name": "MSTest",
-      "version": "0.1.2",
-      "sha256": "0ad28aj9pmy9vn6z9fhzvap4cbxafbk09amhgp178hvw9rdp48zf",
+      "version": "0.1.3",
+      "sha256": "0r0dnayybpiq75fkwgwvwa6bviawylqjv6j95gns5p5hw03w4j7i",
       "depends": ["GA", "GenSA", "Rcpp", "RcppArmadillo", "foreach", "nloptr", "numDeriv", "pracma", "pso", "rlang"]
     },
     "MSbox": {
@@ -19213,6 +19969,12 @@
       "sha256": "0675nkv5lqw3y19i6bcqhc1jc9qjmyf0x01224d098kfwl74lxiw",
       "depends": ["MASS", "ggplot2", "ggpubr"]
     },
+    "MSinference": {
+      "name": "MSinference",
+      "version": "0.2.1",
+      "sha256": "0xazpyycpc4p2lhxfszy5ga8synwdvwilhzqhp7dv4900zsysbk7",
+      "depends": ["Rcpp", "Rdpack", "doParallel", "foreach"]
+    },
     "MSmix": {
       "name": "MSmix",
       "version": "1.0.2",
@@ -19303,6 +20065,12 @@
       "sha256": "0xid624rz0mvd03iy7ydvmx7gkscvsg4kdbaf2nji54ahai3pmn3",
       "depends": []
     },
+    "MUVR2": {
+      "name": "MUVR2",
+      "version": "0.1.0",
+      "sha256": "1w5y8vc0bxbgrn276f7yvjkq27nmlwpxnyswmqiqp87wqwjq2ni4",
+      "depends": ["caret", "doParallel", "dplyr", "foreach", "glmnet", "magrittr", "mgcv", "pROC", "psych", "randomForest", "ranger"]
+    },
     "MVA": {
       "name": "MVA",
       "version": "1.0-8",
@@ -19359,8 +20127,8 @@
     },
     "MVT": {
       "name": "MVT",
-      "version": "0.3-8",
-      "sha256": "0j3xjxrjy72dcdphlwdzfpnmxx0vs3f0jnk3w4vkp7rx01c1wbd3",
+      "version": "0.3-81",
+      "sha256": "0g4h0r17sn5xmdkln4sllwmqp1r5wc8y6idfilbz7zp9bz6i53zj",
       "depends": ["fastmatrix"]
     },
     "MVTests": {
@@ -19371,14 +20139,14 @@
     },
     "MVar": {
       "name": "MVar",
-      "version": "2.2.2",
-      "sha256": "1d1gh8wxwy3pddamhfgiy1l89swi8i9mi5i782cwd3gi2q6w6jf3",
+      "version": "2.2.5",
+      "sha256": "0bkjc8a491f42gbq5k2ysipa03n34g0jd1gmy0zlhyix35zidz1j",
       "depends": ["MASS"]
     },
     "MVar_pt": {
       "name": "MVar.pt",
-      "version": "2.2.2",
-      "sha256": "0095jhb5zfl4nix9n26mb1xdrc4fgi8mvn1l3z4m90mzrk39vsk2",
+      "version": "2.2.5",
+      "sha256": "1zw9md0yhzc4sljignl87q40mpshbdj6shm8j7clis51c0i7dhhp",
       "depends": ["MASS"]
     },
     "MVisAGe": {
@@ -19393,12 +20161,6 @@
       "sha256": "1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q",
       "depends": ["cubature"]
     },
-    "MXM": {
-      "name": "MXM",
-      "version": "1.5.5",
-      "sha256": "15r4jnf1l2nrf67xkpvzg2h7yxxhjlkr454n691ssss9z0zpsgcl",
-      "depends": ["Hmisc", "MASS", "Rfast", "Rfast2", "bigmemory", "coxme", "doParallel", "dplyr", "energy", "foreach", "geepack", "knitr", "lme4", "nnet", "ordinal", "quantreg", "relations", "survival", "visNetwork"]
-    },
     "MaOEA": {
       "name": "MaOEA",
       "version": "0.6.2",
@@ -19407,14 +20169,14 @@
     },
     "MacBehaviour": {
       "name": "MacBehaviour",
-      "version": "1.2.4",
-      "sha256": "16jcksyy8wira7i5gpl27fmbq3wzfsyp4v4xqq7r78qi2rv16wgg",
+      "version": "1.2.8",
+      "sha256": "1dinvr7fxcb36898mg2zx5sxcpcs68l4j0sq2ds16jlchqckl8lg",
       "depends": ["dplyr", "httr", "openxlsx", "rjson"]
     },
     "MachineShop": {
       "name": "MachineShop",
-      "version": "3.7.0",
-      "sha256": "073v778c7zkpxhhdvqc4hiqlgj5ws9490cqpz22bk659f8f63bav",
+      "version": "3.8.0",
+      "sha256": "0kpk3fvp7w6qx71556jplpl0wsm5q4fhxzcyz9np2gq3idxl7q37",
       "depends": ["Matrix", "Rsolnp", "abind", "cli", "dials", "foreach", "ggplot2", "kernlab", "magrittr", "nnet", "party", "polspline", "progress", "recipes", "rlang", "rsample", "survival", "tibble"]
     },
     "MacroZooBenthosWaterA": {
@@ -19497,10 +20259,16 @@
     },
     "ManlyMix": {
       "name": "ManlyMix",
-      "version": "0.1.15",
-      "sha256": "10knb2gzzsq5dkm7h70qvcw2cx7m7ra00vlkqbs36y6vw2gcjwmn",
+      "version": "0.1.15.1",
+      "sha256": "1f39y2xq9vn060v4myynwsrxx9f40vn4kq16jzn76lj99shvcvkg",
       "depends": []
     },
+    "MantaID": {
+      "name": "MantaID",
+      "version": "1.0.4",
+      "sha256": "0myy75psf2v22rl4ajg73sh4y7fvkfjcvdkbwi4bjg6rd1r5j49g",
+      "depends": ["RColorBrewer", "biomaRt", "caret", "data_table", "dplyr", "ggcorrplot", "ggplot2", "keras", "magrittr", "mlr3", "mlr3tuning", "paradox", "purrr", "reshape2", "scutr", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "ManyTests": {
       "name": "ManyTests",
       "version": "1.2",
@@ -19525,6 +20293,12 @@
       "sha256": "19srflx5x33xifn56dl1xlzy4hi8gmmv6lgf2ffyyr2y5k8j2lqp",
       "depends": ["dplyr", "magrittr", "raster", "rlang", "stringr", "testthat"]
     },
+    "MapperAlgo": {
+      "name": "MapperAlgo",
+      "version": "1.0.1",
+      "sha256": "02vvva8d0qq9ghkgillrd0xqizhcyif6wav9shqak5vbzcj5ks75",
+      "depends": []
+    },
     "MarZIC": {
       "name": "MarZIC",
       "version": "1.0.0",
@@ -19569,9 +20343,9 @@
     },
     "MassWateR": {
       "name": "MassWateR",
-      "version": "2.1.4",
-      "sha256": "0hfjddm19r53hig48sfxkkjqib4ip651q2asfgp3639w4akn8pzx",
-      "depends": ["RColorBrewer", "curl", "dplyr", "flextable", "ggplot2", "ggrepel", "ggspatial", "httr", "lubridate", "prettymapr", "raster", "readxl", "rmarkdown", "sf", "tibble", "tidyr", "units", "writexl"]
+      "version": "2.1.5",
+      "sha256": "0rpasijp7jrxxcl9v41cpaw4aqavbby51mm0rplrggxsqi8dk7ld",
+      "depends": ["RColorBrewer", "curl", "dplyr", "flextable", "ggplot2", "ggrepel", "ggspatial", "httr", "lubridate", "maptiles", "readxl", "rmarkdown", "sf", "tibble", "tidyr", "tidyterra", "units", "writexl"]
     },
     "Massign": {
       "name": "Massign",
@@ -19593,8 +20367,8 @@
     },
     "MatchIt": {
       "name": "MatchIt",
-      "version": "4.5.5",
-      "sha256": "17l5b6i4bmg3gjjhzagy451zcv2i5xj4j6zzxgiqf955sgywlfdf",
+      "version": "4.6.0",
+      "sha256": "05d8ms2q26jyis7i5jzh67y5wdf2hma81syg3np0mxmjninwfxvs",
       "depends": ["Rcpp", "RcppProgress", "backports", "chk", "rlang"]
     },
     "MatchLinReg": {
@@ -19611,14 +20385,14 @@
     },
     "Matching": {
       "name": "Matching",
-      "version": "4.10-14",
-      "sha256": "1c56yqr6zlbgjjw61c10fwbxxh4i5ng2krny9p6cz7d2bmm2id5z",
+      "version": "4.10-15",
+      "sha256": "1l6ygj6jqb7w4n6x87j02bhd7411mh4zf7ajr9414frwj1dqzv9h",
       "depends": ["MASS"]
     },
     "Matrix": {
       "name": "Matrix",
-      "version": "1.7-0",
-      "sha256": "0dxd13y6x6pz54ccbcalw2sm646h9pls4bby9zmj40ipvyhbp5zv",
+      "version": "1.7-1",
+      "sha256": "189q5dlghkj0i8v526d9adv4z3mm1c9iya041aysyb2f9vqbpjm2",
       "depends": ["lattice"]
     },
     "MatrixCorrelation": {
@@ -19639,6 +20413,12 @@
       "sha256": "0mp0si5923kfakwxcc08288zyx1nrrrpn9srcwax28vrz46l33z9",
       "depends": ["Matrix", "Rcpp", "RhpcBLASctl", "float"]
     },
+    "MatrixHMM": {
+      "name": "MatrixHMM",
+      "version": "1.0.0",
+      "sha256": "09jzhyzszra40jbxwr1np3s2s59n0gnz6x49c4gzib4fdlngxbdg",
+      "depends": ["LaplacesDemon", "data_table", "doSNOW", "foreach", "mclust", "progress", "snow", "tensor", "tidyr", "withr"]
+    },
     "MatrixLDA": {
       "name": "MatrixLDA",
       "version": "0.2",
@@ -19657,6 +20437,12 @@
       "sha256": "03zjfxjk4l2dl1117slz163w0ky675d23sjfni4d7fdhqq359ny2",
       "depends": ["Matrix"]
     },
+    "MaxMC": {
+      "name": "MaxMC",
+      "version": "0.1.2",
+      "sha256": "04zvdnm2j3dfxh03d771vxs5q0qvizx69fqxghnx1kzv64fv5pny",
+      "depends": ["GA", "GenSA", "NMOF", "pso", "scales"]
+    },
     "MaxPro": {
       "name": "MaxPro",
       "version": "4.1-2",
@@ -19669,6 +20455,12 @@
       "sha256": "0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m",
       "depends": []
     },
+    "MaxWiK": {
+      "name": "MaxWiK",
+      "version": "1.0.5",
+      "sha256": "04yaxc23m60jj1z24zkpw84g8fl7ayvbmfqqbhxa1q5am1fr3cfa",
+      "depends": ["abc", "ggplot2", "scales"]
+    },
     "MaxentVariableSelection": {
       "name": "MaxentVariableSelection",
       "version": "1.0-3",
@@ -19683,14 +20475,14 @@
     },
     "MazamaCoreUtils": {
       "name": "MazamaCoreUtils",
-      "version": "0.5.2",
-      "sha256": "1j698zjvpzynh1zsb39fs4d2vmgn0fsiaqjn1rx9vvppl5dgagar",
+      "version": "0.5.3",
+      "sha256": "1zpcxwggb18l0mbzh5m9kz37g8gnhvk090d25xqv6rps4p3zb8qd",
       "depends": ["devtools", "digest", "dplyr", "futile_logger", "geohashTools", "lubridate", "magrittr", "purrr", "rlang", "rvest", "stringr", "tibble", "xml2"]
     },
     "MazamaLocationUtils": {
       "name": "MazamaLocationUtils",
-      "version": "0.4.3",
-      "sha256": "0adzwzykp410d63dxn3izkf7nmpvlxabzzw80d0205gbs3624yrd",
+      "version": "0.4.4",
+      "sha256": "1xyfashhapzw7j5svzgv6p7ngxy09zpsp5da9x51w4r3z5f4id7w",
       "depends": ["MazamaCoreUtils", "MazamaSpatialUtils", "cluster", "dplyr", "geodist", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "readr", "rlang", "stringr", "tidygeocoder"]
     },
     "MazamaRollUtils": {
@@ -19707,8 +20499,8 @@
     },
     "MazamaSpatialUtils": {
       "name": "MazamaSpatialUtils",
-      "version": "0.8.6",
-      "sha256": "18dpnal2rkj2lkrlnr6wn4rc4n2xb7w6g6kywppc9d1qd29b0njk",
+      "version": "0.8.7",
+      "sha256": "1qszrjk8nmww390xaghi9i9cfl2ww8a9j2pffphybmi4p2g9fpir",
       "depends": ["MazamaCoreUtils", "countrycode", "dplyr", "magrittr", "rlang", "rmapshaper", "sf", "stringr"]
     },
     "MazamaTimeSeries": {
@@ -19729,6 +20521,12 @@
       "sha256": "0zn63qljsw3bnxpj823lrkcl3rnxksjsaxzn6dbddw41j80mmfa4",
       "depends": ["lubridate"]
     },
+    "MedDataSets": {
+      "name": "MedDataSets",
+      "version": "0.1.0",
+      "sha256": "0nmd2s72kzxyhiplm5rnwp6wqxp62y8gp2m0q9dvsm4w7magn9pd",
+      "depends": []
+    },
     "MedDietCalc": {
       "name": "MedDietCalc",
       "version": "0.1.1",
@@ -19773,8 +20571,8 @@
     },
     "Mercator": {
       "name": "Mercator",
-      "version": "1.1.4",
-      "sha256": "0wj8bsrj2v4icj0byllaxyqnph3zpx98gvbxhdzy0zamyrfk57ss",
+      "version": "1.1.5",
+      "sha256": "14am6xkgbiwx453qi362c3b1l3nfnigy7wdx1m01078zgff9cl5l",
       "depends": ["ClassDiscovery", "KernSmooth", "Polychrome", "Rtsne", "Thresher", "cluster", "dendextend", "flexmix", "igraph", "kohonen", "umap"]
     },
     "Mestim": {
@@ -19785,9 +20583,9 @@
     },
     "MetAlyzer": {
       "name": "MetAlyzer",
-      "version": "1.0.0",
-      "sha256": "0b5kznmqq7kda5qan5jyxy5s41y367dmq2fxk7mihjnmn9fp282n",
-      "depends": ["S4Vectors", "SummarizedExperiment", "agricolae", "data_table", "dplyr", "ggplot2", "ggrepel", "openxlsx", "qvalue", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "1.1.0",
+      "sha256": "151z2mjgfqbsm2z0hpvcj1nxif7925b17y2vqkgqxqmg2qap7ina",
+      "depends": ["S4Vectors", "SummarizedExperiment", "agricolae", "data_table", "dplyr", "ggplot2", "ggrepel", "limma", "openxlsx", "plotly", "rlang", "stringr", "tibble", "tidyr", "viridis", "viridisLite"]
     },
     "MetBrewer": {
       "name": "MetBrewer",
@@ -19839,9 +20637,9 @@
     },
     "MetaHD": {
       "name": "MetaHD",
-      "version": "0.1.2",
-      "sha256": "1fciy4zarl9gx1zdvrsgzq8y7jl59z8ljl2s2faqigsyd3nw3mbk",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "corpcor", "dplyr", "matrixcalc", "metafor", "tidyr"]
+      "version": "0.1.3",
+      "sha256": "05a4m2byc5d16l3nv1b1j3hzhxw2pxyg5zr6sdsvyin4vqzsk7c7",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "corpcor", "dplyr", "matrixcalc", "metafor", "nloptr", "tidyr"]
     },
     "MetaIntegration": {
       "name": "MetaIntegration",
@@ -19849,28 +20647,16 @@
       "sha256": "0dbmpls6gipd81c79lvxqgyhzl3nmi0ma4szv8fcrh50jbwfvsql",
       "depends": ["MASS", "Rsolnp", "corpcor", "knitr"]
     },
-    "MetaIntegrator": {
-      "name": "MetaIntegrator",
-      "version": "2.1.3",
-      "sha256": "1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx",
-      "depends": ["AnnotationDbi", "Biobase", "BiocManager", "COCONUT", "DBI", "DT", "GEOmetadb", "GEOquery", "HGNChelper", "Metrics", "RMySQL", "ROCR", "RSQLite", "Rmisc", "boot", "data_table", "dplyr", "ggplot2", "ggpubr", "gplots", "httpuv", "magrittr", "manhattanly", "multtest", "pheatmap", "plotly", "plyr", "pracma", "preprocessCore", "readr", "reshape2", "rmarkdown", "rmeta", "stringr", "zoo"]
-    },
     "MetaLandSim": {
       "name": "MetaLandSim",
       "version": "2.0.0",
       "sha256": "0dx8vya0w8n9f53g7ppjmz3a9vhs3h6fb7z4fb2c1bhp4yjkbl23",
       "depends": ["coda", "e1071", "googleVis", "igraph", "knitr", "minpack_lm", "sp", "spatstat_geom", "spatstat_random", "terra", "zipfR"]
     },
-    "MetaLonDA": {
-      "name": "MetaLonDA",
-      "version": "1.1.8",
-      "sha256": "0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g",
-      "depends": ["DESeq2", "doParallel", "edgeR", "ggplot2", "gss", "metagenomeSeq", "plyr", "pracma", "zoo"]
-    },
     "MetaNLP": {
       "name": "MetaNLP",
-      "version": "0.1.2",
-      "sha256": "0ya8hi7bpxnz1a8vjni5sg68yf86bn72wh8676x6xqf6z1qvha18",
+      "version": "0.1.3",
+      "sha256": "1aahcwpy1vxxlbkhk6q1fq23nq1h7d5k0yvr2s9fa40i5a3jhk3p",
       "depends": ["glmnet", "lexicon", "textstem", "tm"]
     },
     "MetaNet": {
@@ -19881,8 +20667,8 @@
     },
     "MetaSKAT": {
       "name": "MetaSKAT",
-      "version": "0.82",
-      "sha256": "0cbj3xfsnwn4ibqqs12sqyhhaj24ydjpyl1p1gy1dl5405j58ncl",
+      "version": "0.90",
+      "sha256": "1inibg2p1n7ij2zw39ckjh5kw4nmfq7w8rcwkzrqgbbjv0rv8b71",
       "depends": ["SKAT"]
     },
     "MetaStan": {
@@ -19935,14 +20721,14 @@
     },
     "MethComp": {
       "name": "MethComp",
-      "version": "1.30.0",
-      "sha256": "1vmwb4zw4gm2x0j2nzm2vjfj7x19ws8njr6dcglzjpbbha7nxjp6",
-      "depends": ["coda", "nlme", "rjags"]
+      "version": "1.30.2",
+      "sha256": "1apbp47l3izxgki1yyzlsrh0xiwhsvvk1rwmywpbw0jy4kf1dxdf",
+      "depends": ["coda", "nlme"]
     },
     "MethEvolSIM": {
       "name": "MethEvolSIM",
-      "version": "0.1.5",
-      "sha256": "14lnj2jgxi4y5q26bzblc7f0ljlgj8c9gnh32jbyikyych28fb1k",
+      "version": "0.1.7",
+      "sha256": "18sgbmbkhk4q2wf95j80sgbn9zcs665y2r2wmghyisnvyf5i1cqj",
       "depends": ["R6"]
     },
     "MethodCompare": {
@@ -19951,11 +20737,17 @@
       "sha256": "10i9bxjsd7gdcdmrlyl1qymrhaikcb9jpzqi2hnnwcjaf0p1hfkr",
       "depends": ["Matrix", "estimatr", "lme4", "mfp", "rockchalk"]
     },
+    "MethodOpt": {
+      "name": "MethodOpt",
+      "version": "1.0.0",
+      "sha256": "09v4ixrfjk7bz1zm29g1fzsdq5xl1q9jc73kyk5f4dh4k6936686",
+      "depends": ["DT", "DoE_wrapper", "FrF2", "dplyr", "ggplot2", "glue", "gtools", "htmltools", "magrittr", "purrr", "rlang", "shiny", "shinyBS", "shinyFeedback", "shinyalert", "shinyjs", "tibble", "zip", "zoo"]
+    },
     "MetricGraph": {
       "name": "MetricGraph",
-      "version": "1.3.0",
-      "sha256": "1pd10pxqvdvqh1jml6rpn2j5w6j0hw87wd9f272yfwd4q9d2c29r",
-      "depends": ["Matrix", "R6", "Rcpp", "RcppEigen", "broom", "dplyr", "ggnewscale", "ggplot2", "igraph", "lifecycle", "magrittr", "rSPDE", "sf", "sp", "tidyr", "zoo"]
+      "version": "1.4.0",
+      "sha256": "03dx07ah0dpqlx4nwslh83n9j3s6ys3cmq9d2m13dbypv9l6r59x",
+      "depends": ["Matrix", "R6", "RANN", "Rcpp", "RcppEigen", "broom", "dplyr", "ggnewscale", "ggplot2", "igraph", "lifecycle", "magrittr", "rSPDE", "sf", "sp", "tidyr", "zoo"]
     },
     "Metrics": {
       "name": "Metrics",
@@ -20055,8 +20847,8 @@
     },
     "MicroSEC": {
       "name": "MicroSEC",
-      "version": "2.1.3",
-      "sha256": "1n9j955yy613qhs9zhy2mhy9mg95fp1q8jxxxgsy3n2kjim33pgv",
+      "version": "2.1.6",
+      "sha256": "161m2l9ar8amfbcdj72gmlaajvbycj69g5rwfnml1xkw5rh6ywnd",
       "depends": ["BiocGenerics", "Biostrings", "GenomeInfoDb", "Rsamtools", "dplyr", "stringr"]
     },
     "MicrobiomeStat": {
@@ -20115,8 +20907,8 @@
     },
     "MiscMetabar": {
       "name": "MiscMetabar",
-      "version": "0.9.1",
-      "sha256": "002vnd2hbd5r5zjm461w7wsfngpc9zpwidnyiimmhazdm3jbrrbi",
+      "version": "0.10.1",
+      "sha256": "0x00g5yyl4w4dj8wsdba7s9jr03makxrbl3wywvjwh3qaa3lv5v7",
       "depends": ["ape", "dada2", "dplyr", "ggplot2", "lifecycle", "phyloseq", "purrr", "rlang"]
     },
     "MissCP": {
@@ -20179,11 +20971,17 @@
       "sha256": "0l1qivl9a5b8rayg9srxlgkk4wilv2m9yw4lsca29s5wd3wpyksv",
       "depends": ["Bessel", "MASS", "cluster", "e1071", "ghyp", "mixture", "mvtnorm", "numDeriv"]
     },
+    "MixLFA": {
+      "name": "MixLFA",
+      "version": "1.0.0",
+      "sha256": "1vp157cppsd6izag8vhadw6z1s4bay3jvq7wsw2mja7wvgc3p5kq",
+      "depends": ["GGally", "GPArotation", "Rcpp", "RcppEigen", "dplyr", "ggplot2", "pheatmap"]
+    },
     "MixMatrix": {
       "name": "MixMatrix",
-      "version": "0.2.6",
-      "sha256": "007vx59v5h3pfawg6slqgbs3b8dvbhcfh4cvasfydidiiyaggjdc",
-      "depends": ["CholWishart", "Rcpp", "RcppArmadillo"]
+      "version": "0.2.8",
+      "sha256": "0idrci3gksvm0am02dqlj9yfnfk64rnj8hd3hqkx7amcxpv30i7z",
+      "depends": ["CholWishart", "Rcpp", "RcppArmadillo", "glue"]
     },
     "MixOptim": {
       "name": "MixOptim",
@@ -20259,14 +21057,14 @@
     },
     "MixfMRI": {
       "name": "MixfMRI",
-      "version": "0.1-3",
-      "sha256": "1cpkqvjkhr3l4y522xgjx2mwsvpzivf2h9wxslhgsqwds52ij0ad",
+      "version": "0.1-4",
+      "sha256": "1y09q50fc8kj08nv30d87z1vqxfp85rnjkgn0bgyad2rwsm59f5l",
       "depends": ["EMCluster", "MASS", "Matrix", "MixSim", "RColorBrewer", "fftw"]
     },
     "MixtureMissing": {
       "name": "MixtureMissing",
-      "version": "3.0.2",
-      "sha256": "15pz1rhbsaz5ml9swxqm6aifzb88qjpx0z5h2z229ddb0v9hxh29",
+      "version": "3.0.3",
+      "sha256": "1qlkj37znl7zjaq6hxqkwpnalg7npr8ig8lnh8bfx0cc4mix8aw4",
       "depends": ["Bessel", "MASS", "cluster", "mclust", "mice", "mnormt", "mvtnorm", "numDeriv"]
     },
     "MixviR": {
@@ -20301,8 +21099,8 @@
     },
     "MoNAn": {
       "name": "MoNAn",
-      "version": "1.0.0",
-      "sha256": "1w33dsvwl359n9a97cvcp8c6j3js0d8q4j0w2daqllk9swnbw8i8",
+      "version": "1.1.0",
+      "sha256": "1swa9wmcnlf63sjv92vp0v24di809syp48d79pzanvwwhiflwh27",
       "depends": ["snowfall"]
     },
     "MoTBFs": {
@@ -20325,9 +21123,9 @@
     },
     "ModTools": {
       "name": "ModTools",
-      "version": "0.9.12",
-      "sha256": "09ag46i8a2lk99qxyf3jzsssv5k5jix8vvvdq2s89im20n8pk2q6",
-      "depends": ["AER", "C50", "DescTools", "MASS", "NeuralNetTools", "boot", "car", "class", "e1071", "lattice", "lmtest", "naivebayes", "nnet", "pROC", "randomForest", "relaimpo", "robustbase", "rpart", "rpart_plot", "sandwich", "survival"]
+      "version": "0.9.13",
+      "sha256": "0xp2kzfp1vqly18md52a0bhk43ds3b8yfi3bxj08vibcfg1jp78r",
+      "depends": ["AER", "C50", "DescTools", "MASS", "NeuralNetTools", "boot", "car", "class", "e1071", "lattice", "lmtest", "naivebayes", "nnet", "pROC", "pscl", "randomForest", "relaimpo", "robustbase", "rpart", "rpart_plot", "sandwich", "survival"]
     },
     "Modalclust": {
       "name": "Modalclust",
@@ -20367,8 +21165,8 @@
     },
     "MolgenisArmadillo": {
       "name": "MolgenisArmadillo",
-      "version": "2.6.3",
-      "sha256": "11xy9cwnhacrxnyxhr8zs25yr20f27vqnh9nfm7x1180g1b2b4fr",
+      "version": "2.7.0",
+      "sha256": "12js86ys9d80cf69qjl30q01i9a9nki500nq173hn4xym9sc2pcy",
       "depends": ["MolgenisAuth", "arrow", "base64enc", "cli", "dplyr", "httr", "httr2", "purrr", "readr", "rlist", "stringr", "tibble", "tidyr", "urltools"]
     },
     "MolgenisAuth": {
@@ -20379,8 +21177,8 @@
     },
     "MomTrunc": {
       "name": "MomTrunc",
-      "version": "6.0",
-      "sha256": "0nfvq6ry1c5g1xjvf2qyr5pzpnsy420m6xgj0n3aj00wi0ifdyiz",
+      "version": "6.1",
+      "sha256": "1ack3cs27q0zva8nf009rvs09qma2hdjzmci81c2yhmqzsl2zdjm",
       "depends": ["Rcpp", "RcppArmadillo", "hypergeo", "mvtnorm", "tlrmvnmvt"]
     },
     "Momocs": {
@@ -20409,9 +21207,9 @@
     },
     "MonoPhy": {
       "name": "MonoPhy",
-      "version": "1.3.1",
-      "sha256": "120vpz40iil4j6rdhnnhss4rmpfcyh3h0dpw3qkmzadb7mywr7dr",
-      "depends": ["RColorBrewer", "ape", "phangorn", "phytools", "taxize"]
+      "version": "1.3.2",
+      "sha256": "131bvqz7gcdh8q4a670dbn20ms7hgykb1gmxb66qm4hi1mzi8hg1",
+      "depends": ["RColorBrewer", "ape", "phangorn", "phytools"]
     },
     "MonoPoly": {
       "name": "MonoPoly",
@@ -20419,6 +21217,12 @@
       "sha256": "0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq",
       "depends": ["quadprog"]
     },
+    "MonotoneHazardRatio": {
+      "name": "MonotoneHazardRatio",
+      "version": "0.2.0",
+      "sha256": "1qy4rv8ky0c4j7x4ad83zn5zz5a6zfszsgbck13iwdmry26p7dw2",
+      "depends": ["KernSmooth", "fdrtool", "survival"]
+    },
     "Monte_Carlo_se": {
       "name": "Monte.Carlo.se",
       "version": "0.1.1",
@@ -20443,10 +21247,16 @@
       "sha256": "1hg1jr0y11v93mqg2kn8n841nbsiffhyyr2kswj7kk664vlpril0",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rvcg", "bezier", "colorRamps", "doParallel", "foreach", "jsonlite", "rgl", "sf"]
     },
+    "MorphoRegions": {
+      "name": "MorphoRegions",
+      "version": "0.1.0",
+      "sha256": "1w4b666m7whp8vydrvkn0b4va89s18iz74njkjcq1r23rpczvli1",
+      "depends": ["RColorBrewer", "chk", "cluster", "ggplot2", "pbapply", "scales"]
+    },
     "MorphoTools2": {
       "name": "MorphoTools2",
-      "version": "1.0.1.1",
-      "sha256": "08n9l905pfls50p278sypf8xxq6bs56f5a5b5wlxwy11flccpyia",
+      "version": "1.0.2.1",
+      "sha256": "18fvkklh4p89mcvjbnxb7cimylpj46ipslqsxkkpyzrb88wwlsjk",
       "depends": ["MASS", "StatMatch", "ade4", "candisc", "car", "class", "ellipse", "heplots", "plot3D", "vegan"]
     },
     "Morphoscape": {
@@ -20457,8 +21267,8 @@
     },
     "MortCast": {
       "name": "MortCast",
-      "version": "2.7-0",
-      "sha256": "1hw20wb0sl8q09vv68hid90ma2ml866kglsjf38kqky1whmihfbc",
+      "version": "2.8-0",
+      "sha256": "1m22d80bmr0a4j94r9n5v5wg4jlx62lb0xlnz5vp8dq1ra2hhsqg",
       "depends": ["wpp2017"]
     },
     "MortalityGaps": {
@@ -20577,9 +21387,9 @@
     },
     "MultiATSM": {
       "name": "MultiATSM",
-      "version": "0.3.6",
-      "sha256": "01q1r593v111wqaa2bqlrmsqgjpk39kfdxx6vj7ni9prbypxnbxm",
-      "depends": ["ggplot2", "hablar", "pracma", "wrapr", "zoo"]
+      "version": "1.1.0",
+      "sha256": "0s9p8sqxd5kjx9nw17xxdgjfamhny1dihphhr16mx6c4lrzphdic",
+      "depends": ["ggplot2", "pracma", "zoo"]
     },
     "MultiBD": {
       "name": "MultiBD",
@@ -20689,6 +21499,12 @@
       "sha256": "1d2dzchg6xmaazr6sajxq7f5bkx24m70w593wbmn49xxq8fbf1hp",
       "depends": ["MASS", "Matrix", "arrangements", "mvtnorm"]
     },
+    "MultiTraits": {
+      "name": "MultiTraits",
+      "version": "0.2.0",
+      "sha256": "0dm9cv2d2yb6k1z4swsaxrip3hr9sy18jjgafs9a0cm7xrvhrzsx",
+      "depends": ["Hmisc", "corrplot", "ggplot2", "ggrepel", "ggtern", "igraph", "scatterplot3d", "vegan"]
+    },
     "MultiVarMI": {
       "name": "MultiVarMI",
       "version": "1.0",
@@ -20817,8 +21633,8 @@
     },
     "NADA2": {
       "name": "NADA2",
-      "version": "1.1.6",
-      "sha256": "1kz1rvzjp18avm2jbsswnzz9jsdmk20h0vj9gs5bvjl56llih48q",
+      "version": "1.1.8",
+      "sha256": "0m06kbx7z9ad7f3xf0r6gh1rbrgin2lcsc4hvdfsrayq1n4zfdap",
       "depends": ["EnvStats", "Kendall", "NADA", "cenGAM", "coin", "fitdistrplus", "mgcv", "multcomp", "perm", "survival", "survminer", "vegan"]
     },
     "NAEPirtparams": {
@@ -20925,8 +21741,8 @@
     },
     "NCA": {
       "name": "NCA",
-      "version": "4.0.1",
-      "sha256": "0r7m6aklidi6dplv42xmaq38ifxs8zj495rs7pfidwx7z5iw0n84",
+      "version": "4.0.2",
+      "sha256": "0lwrks09pskgc23sl174bvkh3zypqpgq3ia2hp1gnbaxwcf0h3zr",
       "depends": ["KernSmooth", "doParallel", "foreach", "ggplot2", "gplots", "iterators", "lpSolve", "plotly", "quantreg", "truncnorm"]
     },
     "NCC": {
@@ -21003,14 +21819,14 @@
     },
     "NGCHM": {
       "name": "NGCHM",
-      "version": "1.0.3",
-      "sha256": "1gclzn4ps2jx452w3rvp38mc4sj8920w2dmhvafxnfk0dj25pada",
+      "version": "1.0.4",
+      "sha256": "1sjaq4ll8g0s6a23clb4w4akmyrmibny8bc71jabjrdw1zg9y1bc",
       "depends": ["digest", "htmltools", "httr", "jsonlite", "logger", "tsvio"]
     },
     "NGLVieweR": {
       "name": "NGLVieweR",
-      "version": "1.3.1",
-      "sha256": "15azdlr3a6gaacjcjpi61rwmx7c3idfn3w1zpgbaqmhxd9a4m6f0",
+      "version": "1.4.0",
+      "sha256": "032cdsqhsx9pwaz190j0ji8l5j94lv07217bymgfzsasd96lx8qy",
       "depends": ["htmlwidgets", "magrittr", "shiny"]
     },
     "NHANES": {
@@ -21081,8 +21897,8 @@
     },
     "NLP": {
       "name": "NLP",
-      "version": "0.3-0",
-      "sha256": "1v5kszwj56hdyd07ya9p0caxrd4ckpa1x6d0y6d1xrsi074638n0",
+      "version": "0.3-2",
+      "sha256": "09a24nlyc1h2a69s87virrcgb3ps2jc14dvwdq3vqdjk9338p7n5",
       "depends": []
     },
     "NLPclient": {
@@ -21123,8 +21939,8 @@
     },
     "NMF": {
       "name": "NMF",
-      "version": "0.27",
-      "sha256": "1y9y7xpfd9y8j5b8s2x5g61455ilpgqpdhrirpz58xjarbph4hxg",
+      "version": "0.28",
+      "sha256": "1yzf5vcvyb2lypxcfyhah7y2yblkar1is7c50645yppf4frygpvp",
       "depends": ["Biobase", "BiocManager", "RColorBrewer", "cluster", "codetools", "colorspace", "digest", "doParallel", "foreach", "ggplot2", "gridBase", "registry", "reshape2", "rngtools", "stringr"]
     },
     "NMFN": {
@@ -21147,15 +21963,15 @@
     },
     "NMOF": {
       "name": "NMOF",
-      "version": "2.8-0",
-      "sha256": "12n2dsgng39q9jn8m6q7bx2va389ham869yb5ydkwrqywjdkmibd",
+      "version": "2.10-1",
+      "sha256": "1y2069kfig1rvp7px2iv7knnj9a0qgv48x1lwbmkfp2mzkrcs9fb",
       "depends": []
     },
     "NMRphasing": {
       "name": "NMRphasing",
-      "version": "1.0.4",
-      "sha256": "0rg2y26bnksp2hjbjn3xplnpi2hgc4ghlw796rqhjkmnrq9h1hrs",
-      "depends": ["MassSpecWavelet", "baseline"]
+      "version": "1.0.6",
+      "sha256": "1s71n8mwqw3fazcgvdisk9m1s25x033v1id80mvra78kpalw3vzg",
+      "depends": ["MassSpecWavelet", "baseline", "signal"]
     },
     "NMTox": {
       "name": "NMTox",
@@ -21171,20 +21987,20 @@
     },
     "NMcalc": {
       "name": "NMcalc",
-      "version": "0.0.3",
-      "sha256": "199pd9wmakrk96vqb1gwwq6pwsk00r4vn6r3ff9awylwl6vbs7bq",
+      "version": "0.0.4",
+      "sha256": "12wrywa32xsky2414h98vlmr5zjqldv5scnz5v62wz9q4sjjz7ss",
       "depends": ["data_table"]
     },
     "NMdata": {
       "name": "NMdata",
-      "version": "0.1.6",
-      "sha256": "0jyfms68p18503460phhc9cw3vrv2lp7mcg9d2x498vqn0kbs5xb",
+      "version": "0.1.8",
+      "sha256": "0hz04rb6bkhkxln89wwjr31s1gdl4kjhryb9yfgr67nvw1fhmxz7",
       "depends": ["data_table", "fst"]
     },
     "NMsim": {
       "name": "NMsim",
-      "version": "0.1.2",
-      "sha256": "14n4zr32vjsdjafx7rc9x8x9hjdmvw86lh9hy66lavp3005xznia",
+      "version": "0.1.5",
+      "sha256": "0whkcvw888i72r11rp46jy15355xs99ilca0q34dqwnf9j88qn8h",
       "depends": ["MASS", "NMdata", "R_utils", "data_table", "fst", "xfun"]
     },
     "NNMIS": {
@@ -21195,9 +22011,9 @@
     },
     "NNS": {
       "name": "NNS",
-      "version": "10.8.2",
-      "sha256": "11jacanqf7c7kaarwc6micmhzg47sna1lfj5fkpvpa9396xpbrjd",
-      "depends": ["Rcpp", "RcppParallel", "Rfast", "data_table", "doParallel", "foreach", "plyr", "quantmod", "rgl", "xts", "zoo"]
+      "version": "10.9.6",
+      "sha256": "1haccrw3n3jfswh8g9h6i96nv54rlazm6h70xamghma8rk39nryy",
+      "depends": ["Rcpp", "RcppParallel", "Rfast", "data_table", "doParallel", "foreach", "quantmod", "rgl", "xts", "zoo"]
     },
     "NNTbiomarker": {
       "name": "NNTbiomarker",
@@ -21235,6 +22051,12 @@
       "sha256": "107i33z4q5w2828sm0pm8234kmp1v3a2w72lmhvi0rpnjhg0x120",
       "depends": ["BB", "R_methodsS3"]
     },
+    "NPCDTools": {
+      "name": "NPCDTools",
+      "version": "1.0",
+      "sha256": "1m8npqn0a4662nmq5w7hxphwxp2jcrv90xzsx5y4sbdal5irnpqn",
+      "depends": ["GDINA", "NPCD", "SimDesign", "gtools", "psych"]
+    },
     "NPCirc": {
       "name": "NPCirc",
       "version": "3.1.1",
@@ -21243,9 +22065,15 @@
     },
     "NPCox": {
       "name": "NPCox",
-      "version": "1.2",
-      "sha256": "0l3nrs7mqcpbh8qjzn6ckr6r12zzawb6jsmqb52ljhamrvskmg9j",
-      "depends": []
+      "version": "1.3",
+      "sha256": "19yrbq88z8gx0gbjrcfs2mqzdyjp82ldsgrqac9xkfjmdaj22zzs",
+      "depends": ["progress"]
+    },
+    "NPFD": {
+      "name": "NPFD",
+      "version": "1.0.0",
+      "sha256": "08yim6328xfrpacc43l9ayl3rkrqrwv2s5jqc32z0n6fh0i5zqaj",
+      "depends": ["KernSmooth", "VGAM", "siggenes"]
     },
     "NPHMC": {
       "name": "NPHMC",
@@ -21303,8 +22131,8 @@
     },
     "NSM3": {
       "name": "NSM3",
-      "version": "1.18",
-      "sha256": "0m0ijafjlw9pili0hxfrv5blj9ysxhhwj6c4hpnp5ry97a4gkib9",
+      "version": "1.19",
+      "sha256": "1pm4h8khl6vrspwbdbl13m83xm672x30xyzr3cqdqqgsz740bpn4",
       "depends": ["BSDA", "Hmisc", "MASS", "Rfit", "SuppDists", "agricolae", "ash", "binom", "coin", "combinat", "fANCOVA", "gtools", "km_ci", "metafor", "nortest", "np", "partitions", "quantreg", "survival", "waveslim"]
     },
     "NSO1212": {
@@ -21313,6 +22141,12 @@
       "sha256": "1wxp7rp43gl3xgwln8d1s7b7a5zhz4dlshf9dzgb2ippvjxjqbmc",
       "depends": ["httr", "jsonlite"]
     },
+    "NSR": {
+      "name": "NSR",
+      "version": "0.1.0",
+      "sha256": "0s9vdwnq19n0vh7mr337l34nrmgiv4d4fj34sx4b5kz5njyv2kl4",
+      "depends": ["httr", "jsonlite"]
+    },
     "NST": {
       "name": "NST",
       "version": "3.1.10",
@@ -21361,6 +22195,12 @@
       "sha256": "0sqd2pcsy2c2s77aivi5s4mnb7xkzja9hnc4cgdgx4hdisdwvgdj",
       "depends": []
     },
+    "NUSS": {
+      "name": "NUSS",
+      "version": "0.1.0",
+      "sha256": "10xwcihr8lfrr1s6bgh7drzc1i2hb1q2v00db2n36xjm9x4im77a",
+      "depends": ["BH", "Rcpp", "dplyr", "magrittr", "stringr", "text2vec", "textclean"]
+    },
     "NVAR": {
       "name": "NVAR",
       "version": "0.1.0",
@@ -21375,9 +22215,9 @@
     },
     "NaileR": {
       "name": "NaileR",
-      "version": "1.1.0",
-      "sha256": "03vrsv2mx4k3hp3wiscsvmg7kgscaikrx5a1qyybawl7vy92j0p4",
-      "depends": ["FactoMineR", "dplyr", "glue", "magrittr", "ollamar", "stringr"]
+      "version": "1.2.1",
+      "sha256": "11akkz0knfjhair6p163qnhjdmrrzdmpkxlr4rbz3hwwdw29x260",
+      "depends": ["FactoMineR", "SensoMineR", "dplyr", "glue", "magrittr", "ollamar", "stringr"]
     },
     "NameNeedle": {
       "name": "NameNeedle",
@@ -21523,6 +22363,12 @@
       "sha256": "02ss45giv30pi31b5rysa36bn5c4fs5x58g4vb0arz9cnicznv97",
       "depends": ["BH", "RColorBrewer", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "abind", "foreach", "statmod"]
     },
+    "NetSci": {
+      "name": "NetSci",
+      "version": "1.0.1",
+      "sha256": "1fpx8vzylhfqw6hh9c4jm94wkq8l0zj1wv7ayp7p6ipamcm2az0l",
+      "depends": ["Rfast", "binr", "cubature", "dplyr", "igraph", "magrittr", "wTO"]
+    },
     "NetSimR": {
       "name": "NetSimR",
       "version": "0.1.5",
@@ -21579,9 +22425,9 @@
     },
     "NetworkReg": {
       "name": "NetworkReg",
-      "version": "1.1",
-      "sha256": "19z5m5hn2frqrfv3lymjwfy6b2vp6mfyanynzbb6g3xkafh6mnad",
-      "depends": ["Matrix", "RSpectra", "randnet"]
+      "version": "2.0",
+      "sha256": "0dqv1si5s8zi6x832hmf0mawnqs52b1a318qxsa2lcxks4rc6a50",
+      "depends": ["RSpectra", "randnet"]
     },
     "NetworkRiskMeasures": {
       "name": "NetworkRiskMeasures",
@@ -21595,6 +22441,12 @@
       "sha256": "026gizms1xsmlpzgssgqi2y5lfhvvbqkwy5q3a0d4xvzbmyan3y7",
       "depends": ["IsingFit", "MASS", "R_matlab", "corrplot", "doParallel", "fdrtool", "foreach", "igraph", "pbapply", "ppcor", "psych", "pwr", "qgraph"]
     },
+    "NeuralEstimators": {
+      "name": "NeuralEstimators",
+      "version": "0.1.2",
+      "sha256": "05nfh2ny2snii9ai0cy52llfxzn6dclp0ycgnklz33zaabnn6zik",
+      "depends": ["JuliaConnectoR", "magrittr"]
+    },
     "NeuralNetTools": {
       "name": "NeuralNetTools",
       "version": "1.5.3",
@@ -21669,8 +22521,8 @@
     },
     "NlsyLinks": {
       "name": "NlsyLinks",
-      "version": "2.2.1",
-      "sha256": "19w7jgvdz77lmwks0a4icrkarjfnwx6bcjkj4ss90zjs7nsfyafb",
+      "version": "2.2.2",
+      "sha256": "1qc6d45whj89darnsn09dklppamg27bz8md38lc94ikimigpdsnj",
       "depends": ["lavaan"]
     },
     "Nmisc": {
@@ -21789,8 +22641,8 @@
     },
     "Numero": {
       "name": "Numero",
-      "version": "1.9.7",
-      "sha256": "04pf6x7qmgkfyj98c23maxcvlwwwfw6jas7l72xp0713lyndjl15",
+      "version": "1.9.8",
+      "sha256": "038nyc1chis326kgdbwzl0w24v7pk3cdwb5x94q2g6lvf5ffh5y3",
       "depends": ["Rcpp"]
     },
     "NutrienTrackeR": {
@@ -21801,8 +22653,8 @@
     },
     "OAIHarvester": {
       "name": "OAIHarvester",
-      "version": "0.3-4",
-      "sha256": "0b5v275w0c7y073fgwiy966djrw6p1zggzqlywa2fsdn2p0aq56w",
+      "version": "0.3-5",
+      "sha256": "0758pi2rwyxlg3dldfbz2lg7a0w5zsn61ixr2psc4hb2d6niyb25",
       "depends": ["curl", "xml2"]
     },
     "OBASpatial": {
@@ -21813,8 +22665,8 @@
     },
     "OBIC": {
       "name": "OBIC",
-      "version": "3.0.2",
-      "sha256": "0qsl9nhl71z8m9kx8cf71zhaylcbsh318crlzzs5b0aalkkl0hi2",
+      "version": "3.0.3",
+      "sha256": "0bhmry7214i018r5cjxlrf07x5wbbg0aysish053wdcgrkzjplrs",
       "depends": ["checkmate", "data_table"]
     },
     "OBL": {
@@ -21835,6 +22687,12 @@
       "sha256": "1x1s46yffjr140mwx8amnh02k6g8x2gz5hz7lypiwxh0v7a8bm8w",
       "depends": ["pracma"]
     },
+    "OBsMD": {
+      "name": "OBsMD",
+      "version": "12.0",
+      "sha256": "02ik14vpj8diwc0ylp37bk6s96mp9b79myzy8y9mmp7krj5p473q",
+      "depends": []
+    },
     "OCA": {
       "name": "OCA",
       "version": "0.5",
@@ -21889,6 +22747,12 @@
       "sha256": "0i7giibass7hadvv6mb7k9xrykgfss57jmm6gpbym8qcywhzq4ny",
       "depends": ["cubature", "survival"]
     },
+    "ODT": {
+      "name": "ODT",
+      "version": "1.0.0",
+      "sha256": "0gwjnx99g2r3fhysp0in8dby5syvnpzs3lysgagsdd38pfhizq9h",
+      "depends": ["DiagrammeR", "DiagrammeRsvg", "data_tree", "magick", "matrixStats", "partykit", "rsvg"]
+    },
     "ODataQuery": {
       "name": "ODataQuery",
       "version": "0.5.3",
@@ -21979,12 +22843,24 @@
       "sha256": "19fgfkd8zf8r7cqmkqvhzkv8lwnbg33cvm8kapqp7sb6g4i3qk1x",
       "depends": ["Rfast", "abind", "jsonlite", "openssl"]
     },
+    "OPSR": {
+      "name": "OPSR",
+      "version": "0.1.2",
+      "sha256": "13gcl93lgmrv224nsi1cvp11hp4pkm6b418bhcsak62z7ga4ly0p",
+      "depends": ["Formula", "MASS", "Rcpp", "RcppArmadillo", "Rdpack", "car", "maxLik", "mvtnorm", "sandwich", "texreg"]
+    },
     "OPTS": {
       "name": "OPTS",
       "version": "0.1",
       "sha256": "0h382gcjq2f4qm63xnqvhjvxyn9w01dzx8964fk6cm2izhw04bk2",
       "depends": ["MASS", "changepoint", "cvTools"]
     },
+    "OPTeCD": {
+      "name": "OPTeCD",
+      "version": "1.0.0",
+      "sha256": "051ljpb89clqfwpzn6k69jd30sw8zw3f09kdj8ynfmb0bqlzs1df",
+      "depends": []
+    },
     "OPTtesting": {
       "name": "OPTtesting",
       "version": "1.0.0",
@@ -22027,6 +22903,12 @@
       "sha256": "132459zd83c3www2gijcb97f5c765p66y459irlv63ny21hwpnsp",
       "depends": ["MASS", "Matrix"]
     },
+    "ORTH_Ord": {
+      "name": "ORTH.Ord",
+      "version": "1.0.1",
+      "sha256": "0n8m8dpxbb6zss7mlyq6v44yja566q3hf23qqspk88ksrah8wgiv",
+      "depends": ["MASS", "magic"]
+    },
     "ORTSC": {
       "name": "ORTSC",
       "version": "1.0.0",
@@ -22141,6 +23023,12 @@
       "sha256": "04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1",
       "depends": []
     },
+    "OasisR": {
+      "name": "OasisR",
+      "version": "3.1.1",
+      "sha256": "062m3ivs09kl6jclv4djfvji275w46w4jh6w03ydiiazlcsy20h8",
+      "depends": ["measurements", "outliers", "sf", "spdep"]
+    },
     "Observation": {
       "name": "Observation",
       "version": "0.3.0",
@@ -22165,6 +23053,12 @@
       "sha256": "1qqfnq0zzmnjjb9rr6qd2l08rn5plkg4xsbrdk7jv1alfnq1b938",
       "depends": ["ggplot2", "ggpubr", "gridExtra", "minpack_lm", "openxlsx"]
     },
+    "OhdsiShinyAppBuilder": {
+      "name": "OhdsiShinyAppBuilder",
+      "version": "1.0.0",
+      "sha256": "0rxrl9y7m5bcmq499ydhansjv6xy9q1i41bvjxif13h1fs9sv6s3",
+      "depends": ["DatabaseConnector", "ParallelLogger", "ResultModelManager", "checkmate", "devtools", "dplyr", "rlang", "shiny", "shinydashboard"]
+    },
     "Ohit": {
       "name": "Ohit",
       "version": "1.0.0",
@@ -22179,14 +23073,14 @@
     },
     "OlinkAnalyze": {
       "name": "OlinkAnalyze",
-      "version": "3.8.2",
-      "sha256": "0i8bpx3baq6x2hkk2zf45yxjk4mzhrw6wbksw1z1w11hghyld6vs",
-      "depends": ["broom", "car", "dplyr", "emmeans", "forcats", "generics", "ggplot2", "ggpubr", "ggrepel", "lme4", "lmerTest", "magrittr", "readxl", "rlang", "rstatix", "stringr", "tibble", "tidyr", "tidyselect", "zip"]
+      "version": "4.0.2",
+      "sha256": "0gwm63xibgyg6ra2zs128dc586vx73mbr60gply1jgws7h95c3b0",
+      "depends": ["broom", "car", "cli", "data_table", "dplyr", "emmeans", "forcats", "generics", "ggplot2", "ggpubr", "ggrepel", "magrittr", "readxl", "rlang", "rstatix", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "OlympicRshiny": {
       "name": "OlympicRshiny",
-      "version": "1.0.1",
-      "sha256": "1pal80qcj8jb0a0yd95qb56mkm99m9kyfcn44d63k769hkfx43fi",
+      "version": "1.0.2",
+      "sha256": "10aq9mcnb7yp2jwz897qmng3p0vwrm1rzny8nc9lzm6gisw50lby",
       "depends": ["config", "dplyr", "forcats", "ggplot2", "golem", "shiny", "shinybusy", "shinythemes", "summarytools"]
     },
     "OmegaG": {
@@ -22237,6 +23131,18 @@
       "sha256": "0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h",
       "depends": ["CompQuadForm", "stringr", "survey"]
     },
+    "OmopSketch": {
+      "name": "OmopSketch",
+      "version": "0.1.2",
+      "sha256": "1lgh0cyd5qpg4bzs1s6iwvfif7mwwjwxn3wjqhidpg6nhhiv1dga",
+      "depends": ["CDMConnector", "CohortCharacteristics", "CohortConstructor", "PatientProfiles", "cli", "clock", "dplyr", "duckdb", "flextable", "ggplot2", "gt", "omock", "omopgenerics", "purrr", "rlang", "stringr", "tibble", "tidyr", "visOmopResults"]
+    },
+    "OmopViewer": {
+      "name": "OmopViewer",
+      "version": "0.2.0",
+      "sha256": "18s9k2fc9lzzn3skyfvsl8w3lqgwl902isy02qixwpas1qdv285v",
+      "depends": ["DT", "bslib", "cli", "dplyr", "glue", "gt", "lifecycle", "markdown", "omopgenerics", "purrr", "rlang", "shiny", "snakecase", "stringr", "styler", "tidyr", "usethis", "visOmopResults", "yaml"]
+    },
     "OnAge": {
       "name": "OnAge",
       "version": "1.0.1",
@@ -22255,6 +23161,12 @@
       "sha256": "06k0lbriyx6b1nlvpyjhf5g8dp8wa37wi1pmlpfqq7ryivp39v38",
       "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "abind", "assertthat", "bayesplot", "checkmate", "dplyr", "ggplot2", "matrixStats", "posterior", "rlang", "rstan", "rstantools", "scales", "tibble", "tidyr", "tidyselect"]
     },
+    "OncoDataSets": {
+      "name": "OncoDataSets",
+      "version": "0.1.0",
+      "sha256": "0nn02dihm5gq46yrwx37z9gj069dzzxkcnv1r1d53d2kjbnng3zx",
+      "depends": []
+    },
     "OncoSubtype": {
       "name": "OncoSubtype",
       "version": "1.0.0",
@@ -22311,8 +23223,8 @@
     },
     "OneStep": {
       "name": "OneStep",
-      "version": "0.9.3",
-      "sha256": "1mnmji4pb2qbg0amgy5kkgyn8xg8ny0n7fi8xqr9pgi5zx5c63r4",
+      "version": "0.9.4",
+      "sha256": "0fm8gpdwzdx4s23gg615a6r58mrjrx2k3pcbh8dq4z4067lr880w",
       "depends": ["extraDistr", "fitdistrplus", "numDeriv"]
     },
     "OneTwoSamples": {
@@ -22333,6 +23245,12 @@
       "sha256": "0wgjihdfjvsf3p97ll496ixwv2xzlgsr138pzgalw5hq0p1kmld6",
       "depends": ["Biostrings", "RCurl", "caret", "devtools", "dplyr", "e1071", "entropy", "ftrCOOL", "gbm", "party", "randomForest", "seqinr", "splitstackshape", "stringr", "tidyverse"]
     },
+    "OpeNoise": {
+      "name": "OpeNoise",
+      "version": "0.2-18",
+      "sha256": "1awwyam8jz0vh0dlwx23r96g5mvfclnwa3a4j97ng8k5w3hcwisi",
+      "depends": ["ggplot2", "lubridate", "pracma", "tidyr"]
+    },
     "OpenCL": {
       "name": "OpenCL",
       "version": "0.2-10",
@@ -22365,14 +23283,14 @@
     },
     "OpenMx": {
       "name": "OpenMx",
-      "version": "2.21.12",
-      "sha256": "13jgm9ps4ak30ri61az8c5w4j36k77dq4gsbc0v66ydx3ciyf1n7",
+      "version": "2.21.13",
+      "sha256": "1g3g5pipzg3xnzvjk17ykmhlhmljy9mh2gqd6v2ga1b5z4mkbjrj",
       "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "digest", "lifecycle", "rpf"]
     },
     "OpenRepGrid": {
       "name": "OpenRepGrid",
-      "version": "0.1.15",
-      "sha256": "0sdqz9bhwfqcpggd2yw4inlfzn4qkzv1vxnri6mxqmjpkb7arysw",
+      "version": "0.1.16",
+      "sha256": "0dwvwfpjcbjq1vsr91df4rp552c4kvh5ygaa2ng84qryqmydcp48",
       "depends": ["XML", "abind", "colorspace", "crayon", "dplyr", "igraph", "openxlsx", "plyr", "psych", "pvclust", "scales", "stringr", "tidyr"]
     },
     "OpenRepGrid_ic": {
@@ -22383,9 +23301,9 @@
     },
     "OpenSpecy": {
       "name": "OpenSpecy",
-      "version": "1.1.0",
-      "sha256": "05vzc4vswdd1k4b0gs01rhf8lp7lspygw1m6rw9d49l5ag7hq9if",
-      "depends": ["caTools", "data_table", "digest", "glmnet", "hyperSpec", "jpeg", "jsonlite", "mmand", "osfr", "plotly", "shiny", "signal", "yaml"]
+      "version": "1.4.0",
+      "sha256": "15vnbg7h0ijrypi7i6g5kfq4zasxc9fywsyzih0p5f6wkqavmhqg",
+      "depends": ["caTools", "data_table", "digest", "glmnet", "hyperSpec", "jpeg", "jsonlite", "mmand", "plotly", "shiny", "signal", "yaml"]
     },
     "OpenStreetMap": {
       "name": "OpenStreetMap",
@@ -22393,12 +23311,6 @@
       "sha256": "0iq3y3331rjppc8nfx9krrrfybyn1spwfp15hf3vz8mnmcg86dkf",
       "depends": ["ggplot2", "rJava", "raster", "sp"]
     },
-    "OpenTreeChronograms": {
-      "name": "OpenTreeChronograms",
-      "version": "2022.1.28",
-      "sha256": "0si5aaami2x705fmzp9357h1nwhdm3sb829cbvf7zfyicqyaihkg",
-      "depends": ["ape", "geiger", "knitcitations", "paleotree", "plyr", "rotl", "stringr", "taxize", "treebase", "usethis"]
-    },
     "Opportunistic": {
       "name": "Opportunistic",
       "version": "1.2",
@@ -22545,8 +23457,8 @@
     },
     "OrigamiPlot": {
       "name": "OrigamiPlot",
-      "version": "0.1.0",
-      "sha256": "1p2fzv8bx3pxhskf1h9b6mk72b15g0l0ribp4da1vq58xn9cjgil",
+      "version": "0.2.0",
+      "sha256": "046rdyla5a4qf8wpk8lkmvsbrr85prcdr2k459bamnyvy5bgxzdl",
       "depends": ["fmsb", "plotrix"]
     },
     "OrthoPanels": {
@@ -22579,6 +23491,18 @@
       "sha256": "0d2qk76issb2k5f2ghfvpq0k8ra7d7nj9hp4ja1s0817zwr0g3zz",
       "depends": ["MASS", "circular", "ggplot2", "gridExtra", "hypervolume", "matrixStats", "sfsmisc", "viridis"]
     },
+    "OutSeekR": {
+      "name": "OutSeekR",
+      "version": "1.0.0",
+      "sha256": "0a1skaj2qchg7pnl2rpadpfmvdiiazy4q791bv2pxc8y60b1dwnp",
+      "depends": ["future_apply", "gamlss", "gamlss_dist", "lsa", "truncnorm"]
+    },
+    "OutcomeWeights": {
+      "name": "OutcomeWeights",
+      "version": "0.1.1",
+      "sha256": "1m7wzwnb2v5x40gryb88swkzqbdzqrlyk0jx4sb06qa3l865j2lc",
+      "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "grf"]
+    },
     "OutliersLearn": {
       "name": "OutliersLearn",
       "version": "1.0.0",
@@ -22629,8 +23553,8 @@
     },
     "PAGFL": {
       "name": "PAGFL",
-      "version": "1.1.1",
-      "sha256": "0as4azrg4hmh5slljjasvq248r0qylvgyqcz1myfxgja9lpzd604",
+      "version": "1.1.2",
+      "sha256": "1yh4bcrn373g0fsrdv6a59l1jnqkm45cdyd5vjs54232rxr63v51",
       "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "ggplot2", "lifecycle"]
     },
     "PAGWAS": {
@@ -22653,9 +23577,9 @@
     },
     "PAMmisc": {
       "name": "PAMmisc",
-      "version": "1.12.1",
-      "sha256": "0xv4bm1gzvhybgaww24nikwcbn8wq8299gbr1n831gscnzablzp3",
-      "depends": ["PamBinaries", "RSQLite", "RcppRoll", "dplyr", "fftw", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "ncdf4", "purrr", "rerddap", "rjson", "scales", "seewave", "signal", "suncalc", "tuneR", "xml2"]
+      "version": "1.12.3",
+      "sha256": "0d07i8kp8v6yczx7ydykjly896a15vbia9vack9iybbhl3i6gbbx",
+      "depends": ["PamBinaries", "RSQLite", "RcppRoll", "dplyr", "fftw", "geosphere", "ggplot2", "httr", "lubridate", "ncdf4", "purrr", "rerddap", "rjson", "scales", "seewave", "signal", "suncalc", "tuneR", "xml2"]
     },
     "PAMpal": {
       "name": "PAMpal",
@@ -22665,9 +23589,9 @@
     },
     "PAMscapes": {
       "name": "PAMscapes",
-      "version": "0.6.0",
-      "sha256": "0w8jrlr4j6fagzgqksbcrxn7zjqkwh4f5vaf958r48k8y6nfqpih",
-      "depends": ["PAMmisc", "data_table", "dplyr", "geosphere", "ggplot2", "httr", "lubridate", "magrittr", "ncdf4", "purrr", "readr", "rlang", "scales", "sf", "tdigest", "tidyr"]
+      "version": "0.7.0",
+      "sha256": "1wk827dlpp4266mpvm7zhw94dxmm95xam4xx8znp7ricsr0fz1x3",
+      "depends": ["PAMmisc", "data_table", "dplyr", "geosphere", "ggplot2", "httr", "lubridate", "ncdf4", "purrr", "rlang", "scales", "sf", "shiny", "tdigest", "tidyr"]
     },
     "PANACEA": {
       "name": "PANACEA",
@@ -22675,12 +23599,6 @@
       "sha256": "0pq5kq0i87yrdfs6id2lc6gg4dqsa07fsas13yc8jw6bd9lcf6rh",
       "depends": ["DBI", "igraph", "org_Hs_eg_db", "reshape2"]
     },
-    "PANPRSnext": {
-      "name": "PANPRSnext",
-      "version": "1.2.0",
-      "sha256": "1s9kv58af7hj65qxcnrsfjrh8xfqhm5m4kpg279li5b4g4cpnqx9",
-      "depends": ["Rcpp", "RcppArmadillo", "gtools"]
-    },
     "PAS": {
       "name": "PAS",
       "version": "1.2.5",
@@ -22767,8 +23685,8 @@
     },
     "PBSmapping": {
       "name": "PBSmapping",
-      "version": "2.73.4",
-      "sha256": "1g4gnqwjq45xfrymmyn89zn2gry1l142cc084qp5pv2f400qfmnc",
+      "version": "2.74.1",
+      "sha256": "0flyqb7p6y9k0zbdnnw0ym9qm2mamw8ajd42b3s03vpmsnc5ja8c",
       "depends": []
     },
     "PBSmodelling": {
@@ -22791,8 +23709,8 @@
     },
     "PCAPAM50": {
       "name": "PCAPAM50",
-      "version": "1.0.1",
-      "sha256": "09jmpw38q3j0yk27r54d3y6fbgh69a6712zklv8qrfyq59kkshnc",
+      "version": "1.0.2",
+      "sha256": "18bqdsqvbkgrxa5cdh57f88065xs9l20c5jscr2yklmc3zq2c86x",
       "depends": ["Biobase", "ComplexHeatmap", "impute", "lattice"]
     },
     "PCAmatchR": {
@@ -22809,8 +23727,8 @@
     },
     "PCBS": {
       "name": "PCBS",
-      "version": "0.1.0",
-      "sha256": "1sy2r55dard7hlha4k2b2i41y21a3nk786nzrbzicyvv6v093cd2",
+      "version": "0.1.1",
+      "sha256": "0hvqcmrx2aszmgw24bhvnj8am3bk05hnzk63pvmnc7p7f21hmdf6",
       "depends": ["data_table", "dplyr", "ggplot2", "ggrepel", "tibble"]
     },
     "PCDimension": {
@@ -23001,9 +23919,9 @@
     },
     "PEPBVS": {
       "name": "PEPBVS",
-      "version": "1.0",
-      "sha256": "1v0pl5jj2bh5iq45xgs35wzfz5hdklsnb72j4rnipy3qbm7zzliy",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppGSL"]
+      "version": "2.1",
+      "sha256": "1b8f096xw1580q6zn2gxz14nl92vhy7gyzvhlh2c4wm4xf7db0yy",
+      "depends": ["BAS", "BayesVarSel", "Matrix", "Rcpp", "RcppArmadillo", "RcppGSL", "mcmcse", "mvtnorm"]
     },
     "PERK": {
       "name": "PERK",
@@ -23031,14 +23949,14 @@
     },
     "PFIM": {
       "name": "PFIM",
-      "version": "6.0.3",
-      "sha256": "0kp213ig73vj34qgwpc1zsnvz2hf8j0mjcqnsbb541s92zv2x4y7",
-      "depends": ["Deriv", "Matrix", "Rcpp", "deSolve", "devtools", "ggplot2", "inline", "kableExtra", "knitr", "pracma", "rmarkdown", "scales", "stringr"]
+      "version": "6.1",
+      "sha256": "095ddfgq424j3hfkbh4f2hjy93z098yyqa3ld28zj9x3skwpbbs0",
+      "depends": ["Deriv", "Matrix", "Rcpp", "deSolve", "devtools", "ggplot2", "inline", "kableExtra", "knitr", "pracma", "purrr", "rmarkdown", "scales", "stringr"]
     },
     "PFLR": {
       "name": "PFLR",
-      "version": "1.0.0",
-      "sha256": "1iplycif2c9kaaxbibk1skbdnmsn0mxgbdj78lg8bgkf25gvzzii",
+      "version": "1.1.0",
+      "sha256": "1i4fsab96iiidnjk3lzd1zlz5yc665lsv4lk7d18aw4npr6gzpl8",
       "depends": ["MASS", "fda", "flare", "glmnet", "psych"]
     },
     "PGEE": {
@@ -23059,6 +23977,12 @@
       "sha256": "0z2nnjlaazrmfnjmwhsmhp8h3ifgykmsy6znqvcl77v9565libz9",
       "depends": ["data_table", "ggplot2", "gridExtra", "igraph", "stringdist", "stringi"]
     },
+    "PGaGEV": {
+      "name": "PGaGEV",
+      "version": "0.1.0",
+      "sha256": "111vr4wr5whqr4xzw5z3sw977kb98s3jvrry3pbp6p579blzys3b",
+      "depends": ["LambertW"]
+    },
     "PH1XBAR": {
       "name": "PH1XBAR",
       "version": "0.11.2",
@@ -23079,9 +24003,9 @@
     },
     "PHEindicatormethods": {
       "name": "PHEindicatormethods",
-      "version": "2.0.2",
-      "sha256": "0gjlq8vnfgc5hlscy64ypx08vafwvc2xbk971nznby4v2fkkm1h3",
-      "depends": ["broom", "dplyr", "purrr", "rlang", "tibble", "tidyr", "tidyselect"]
+      "version": "2.1.0",
+      "sha256": "1kn6awnyqh9wiv3z4kk5k3iq1mw8dbjgdhs5hirgqa9cl1gawslj",
+      "depends": ["broom", "dplyr", "lifecycle", "purrr", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "PHInfiniteEstimates": {
       "name": "PHInfiniteEstimates",
@@ -23109,9 +24033,9 @@
     },
     "PHeval": {
       "name": "PHeval",
-      "version": "0.5.4",
-      "sha256": "06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma",
-      "depends": ["survival"]
+      "version": "1.1",
+      "sha256": "1xr525f9v1py61kmv9n50dy89f7nc6mvdb0gqab23frn21f4bawv",
+      "depends": ["mvtnorm", "survival"]
     },
     "PICBayes": {
       "name": "PICBayes",
@@ -23137,6 +24061,12 @@
       "sha256": "0vys27ws0nk0bqf6pxgr689q3rnyx14ar560004g6pi0ii59mbyk",
       "depends": ["Rdpack", "coda", "dplyr", "furrr", "future", "knitr", "nloptr", "rmarkdown", "skellam"]
     },
+    "PJFM": {
+      "name": "PJFM",
+      "version": "0.1.0",
+      "sha256": "1xxiix4kvz1y8rjjxbm00ya4lvqg0ra6mdbvryljy6v1m6wx7wyf",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEnsmallen", "pracma", "statmod", "survival"]
+    },
     "PK": {
       "name": "PK",
       "version": "1.3-6",
@@ -23163,10 +24093,16 @@
     },
     "PKPDsim": {
       "name": "PKPDsim",
-      "version": "1.3.0",
-      "sha256": "1n86zl8gka78anny7fj7l95bamckwkv5ijjiihpcfyj7fmac3y72",
+      "version": "1.4.0",
+      "sha256": "0pzpr2lqgcssz5mgsb27z48x8sf9plbsd2m8rmkha1926fxks6na",
       "depends": ["BH", "MASS", "Rcpp", "data_table", "jsonlite", "magrittr", "randtoolbox", "stringr"]
     },
+    "PKbioanalysis": {
+      "name": "PKbioanalysis",
+      "version": "0.2.0",
+      "sha256": "104sm6wpplc0cljm6xdaif6ck4macix880nzx0hp9kb0w9f91066",
+      "depends": ["DBI", "DT", "DiagrammeR", "bsicons", "bslib", "checkmate", "dplyr", "duckdb", "ggforce", "ggplot2", "glue", "htmltools", "rlang", "shiny", "shinyWidgets", "shinyalert", "shinyjs", "stringr", "tidyr", "tidyselect", "units", "yaml"]
+    },
     "PKconverter": {
       "name": "PKconverter",
       "version": "1.5",
@@ -23229,8 +24165,8 @@
     },
     "PLindleyROC": {
       "name": "PLindleyROC",
-      "version": "0.1.1",
-      "sha256": "09skjwl71p8374h48mqdgwlbqivgjalgbf69nfqaz7p0cifal6lc",
+      "version": "0.1.2",
+      "sha256": "1djxgxipja4r4y5md2c0c6sqnnlp5ci5d4c8j61g4mv2jc3fys6m",
       "depends": []
     },
     "PLmixed": {
@@ -23253,8 +24189,8 @@
     },
     "PMA": {
       "name": "PMA",
-      "version": "1.2-3",
-      "sha256": "01kdrjcf459ki74572cpnxlczmllsdc82k7czmc41wsrq612ymz7",
+      "version": "1.2-4",
+      "sha256": "0mq0mchvl4zlj1sgnq7z5ccm0f4lhxajqvk9w265axs0s49g76ry",
       "depends": []
     },
     "PMAPscore": {
@@ -23271,8 +24207,8 @@
     },
     "PMCMRplus": {
       "name": "PMCMRplus",
-      "version": "1.9.10",
-      "sha256": "0w0zxlq80n673zlrfw46qzidwshc6rxsqka6pahbr816zabzi0yq",
+      "version": "1.9.12",
+      "sha256": "1ccmwpkr7vib7fflwmi45bgazsarnys9j1bsj10vn0kqw2ya3hay",
       "depends": ["BWStest", "MASS", "Rmpfr", "SuppDists", "gmp", "kSamples", "multcompView", "mvtnorm"]
     },
     "PMEvapotranspiration": {
@@ -23283,8 +24219,8 @@
     },
     "PMwR": {
       "name": "PMwR",
-      "version": "0.19-5",
-      "sha256": "1yhqbp5f6a7rkxxljqw5xsl1v0yysxjlx2r99w3h2hka44mksm21",
+      "version": "1.0-1",
+      "sha256": "0qcxsz2szgjh437ykr5hc3yml85mw3kp5nj4dg6n6cbvk3sk8dq0",
       "depends": ["NMOF", "datetimeutils", "fastmatch", "orgutils", "textutils", "zoo"]
     },
     "PNADcIBGE": {
@@ -23295,8 +24231,8 @@
     },
     "PNAR": {
       "name": "PNAR",
-      "version": "1.6",
-      "sha256": "18nq5g2vsc8xy4l1km710l2v8frw3wwpn4yx23s3xczqd8hj9wfw",
+      "version": "1.7",
+      "sha256": "0x7vfj4r3z3rsh056j8sh7jzsmk6wpzgksvidybl8ra2z1sc69x9",
       "depends": ["Rfast", "Rfast2", "doParallel", "foreach", "igraph", "nloptr"]
     },
     "PNDSIBGE": {
@@ -23329,6 +24265,12 @@
       "sha256": "1xg2xzfmzg2qrwd02xy4fwsfmccigw6lm5266z6w1kxzb7p7bbw0",
       "depends": []
     },
+    "PODES": {
+      "name": "PODES",
+      "version": "0.1.0",
+      "sha256": "095nv66a5ayikw1sv8xcjpr1jd6f8qdm7qx7i7z3k1jwd1pci9rs",
+      "depends": ["readxl"]
+    },
     "POET": {
       "name": "POET",
       "version": "2.0",
@@ -23385,8 +24327,8 @@
     },
     "POT": {
       "name": "POT",
-      "version": "1.1-10",
-      "sha256": "1gd76xc4gs7v3gcqaidnchm60gd2w7x0p6sqrvy38sfr4wbazz1s",
+      "version": "1.1-11",
+      "sha256": "0dkcikrz4xf8r49a0fap8nw8ydkz56kdmc7wjn9jannngl010z6v",
       "depends": []
     },
     "POUMM": {
@@ -23493,14 +24435,14 @@
     },
     "PRA": {
       "name": "PRA",
-      "version": "0.2.0",
-      "sha256": "1lpafrpzw43k29vk2y52wixdzgli9z8c3bvv2liypmlxmqmjfxly",
+      "version": "0.3.0",
+      "sha256": "0j5lhaw4vhmcsxbi4fymky9zi8yk3zgkjlqjm7899w7y48qdcnfq",
       "depends": ["mc2d", "minpack_lm"]
     },
     "PRANA": {
       "name": "PRANA",
-      "version": "1.0.5",
-      "sha256": "0y7hrb1lx6mbkpayic20sr08x410cgwfvmx2a5nrssfzvxqbk5y1",
+      "version": "1.0.6",
+      "sha256": "1q902pnlan8f5ds9kwrl45im12xq44nr4x64x3xn3w2lhzq159dw",
       "depends": ["dplyr", "minet", "robustbase"]
     },
     "PRDA": {
@@ -23557,16 +24499,10 @@
       "sha256": "0jhf1kgcc29b8gsb42b3d5hyfzsa13lz9qgs104ynrzld94kqqwf",
       "depends": ["DT", "DiagrammeR", "DiagrammeRsvg", "htmltools", "htmlwidgets", "rio", "rsvg", "scales", "shiny", "shinyjs", "stringr", "webp", "xml2", "zip"]
     },
-    "PRISMAstatement": {
-      "name": "PRISMAstatement",
-      "version": "1.1.1",
-      "sha256": "1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z",
-      "depends": ["DiagrammeR"]
-    },
     "PRNG": {
       "name": "PRNG",
-      "version": "0.0.2.1",
-      "sha256": "0lsr0jf08mwi4ip3hcmk8y2jxk89366skqcx85yr8j2wzqwyds15",
+      "version": "0.0.2.1.2",
+      "sha256": "0dildm11z7p5m0lxcqiwg1bm25hsczyba68cnkdcj1bankd5gcwx",
       "depends": []
     },
     "PROBShiny": {
@@ -23643,8 +24579,8 @@
     },
     "PRTree": {
       "name": "PRTree",
-      "version": "0.1.0",
-      "sha256": "04200m3bcqlb9q5rpgnd1h6nwbaxhb09ciwrpfss1airzhip5505",
+      "version": "0.1.2",
+      "sha256": "1m1npdajyrc6hcdfl8qpj0zi5wa4sh4mxsi37yz0i9v24ygdw5r8",
       "depends": []
     },
     "PReMiuM": {
@@ -23697,8 +24633,8 @@
     },
     "PSGD": {
       "name": "PSGD",
-      "version": "1.0.3",
-      "sha256": "00013hw99kwk6jlypyb38fly0smyyk6gzxvcfd33n2cbv14jx4gk",
+      "version": "1.0.4",
+      "sha256": "0nmxcwrznibx2xzgv3zl456qf1251457f31dapyj0mxg4r8pdl8r",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "PSGoft": {
@@ -23707,6 +24643,12 @@
       "sha256": "177znpqd6wix76bk59w452ki8qa6rmvwiwddflgqi6chybbn6cpr",
       "depends": ["moments"]
     },
+    "PSIM": {
+      "name": "PSIM",
+      "version": "0.1.0",
+      "sha256": "0d36yvihc24bb3djzsgc5hsbdmjxnpfn4jx513l1kscq1r6hcidd",
+      "depends": ["dplyr", "magrittr", "matrixStats", "tidyverse"]
+    },
     "PSIndependenceTest": {
       "name": "PSIndependenceTest",
       "version": "0.0.1",
@@ -23727,8 +24669,8 @@
     },
     "PSS_Health": {
       "name": "PSS.Health",
-      "version": "1.0.2",
-      "sha256": "0vkg727rhh267vvcf8zkf5k6wm0k54vqysrsm4zc3sin3w1chnaf",
+      "version": "1.1.4",
+      "sha256": "062yav2kwjq0jglfjvhw7wca3405wij8v88dq0f8l1nlgkm2qz9z",
       "depends": ["DT", "EnvStats", "ICC_Sample_Size", "dplyr", "easypower", "epiR", "ggplot2", "kappaSize", "longpower", "pROC", "plotly", "powerMediation", "powerSurvEpi", "presize", "pwr", "pwr2", "shiny", "shinyFeedback", "shinycssloaders", "shinyhelper", "writexl"]
     },
     "PSSIM": {
@@ -23763,8 +24705,8 @@
     },
     "PSinference": {
       "name": "PSinference",
-      "version": "0.1.0",
-      "sha256": "19y3pbb75rkgx9dlykrq6aa0pbn968d83bsl1d3qlnb06b6gncx6",
+      "version": "0.2.2",
+      "sha256": "0dhk46vj0np9j4vkvbmaw510ca9bijvq0p4j28qkj6xlla5dkyhn",
       "depends": ["MASS"]
     },
     "PStrata": {
@@ -23827,12 +24769,6 @@
       "sha256": "1s1aqma0p32y9db3xf9yrfgg12i3skdgzcvw3kg9s5z1msx4gax7",
       "depends": ["dplyr", "future", "ggplot2", "ggpubr", "glue", "lme4", "magrittr", "mvtnorm", "purrr", "randomizr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
-    "PUPAIM": {
-      "name": "PUPAIM",
-      "version": "0.3.1",
-      "sha256": "1sypmlpjsdn2rm6pci64xv6ibixz43zhjaw0k8q9jp3cajbb11qh",
-      "depends": ["Metrics", "ggplot2", "nls2"]
-    },
     "PUPAK": {
       "name": "PUPAK",
       "version": "0.1.1",
@@ -23907,8 +24843,8 @@
     },
     "PaRe": {
       "name": "PaRe",
-      "version": "0.1.13",
-      "sha256": "1p65p3anwyk1zg82lir7wqvl9zxi7p4hjb70kvfhj06p1n8f653c",
+      "version": "0.1.15",
+      "sha256": "123g1bh503dk5q5a497ibhnl1hrk380d61h5r08dci04db0frrsy",
       "depends": ["DiagrammeR", "DiagrammeRsvg", "R6", "checkmate", "cli", "cyclocomp", "desc", "dplyr", "git2r", "glue", "igraph", "lintr", "magrittr", "pak", "rmarkdown", "rsvg", "stringr"]
     },
     "Pade": {
@@ -23929,6 +24865,18 @@
       "sha256": "07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q",
       "depends": ["MASS", "ggplot2", "gld", "lattice", "mvtnorm"]
     },
+    "PakNAcc": {
+      "name": "PakNAcc",
+      "version": "0.1.0",
+      "sha256": "11lhjjayjk5516gjgj6czg10prl21yyaslb4idj7r7x01l6qaghc",
+      "depends": ["DT", "collapse", "htmltools", "magrittr", "rpivotTable", "shiny", "shinydashboard", "shinydashboardPlus"]
+    },
+    "PakPC": {
+      "name": "PakPC",
+      "version": "0.3.0",
+      "sha256": "0pmgzhjs4wpwf0371brhyy0ibkn0zjnj92gj4v5mad8121j2rm04",
+      "depends": ["DT", "PakPC2017", "PakPC2023", "htmltools", "magrittr", "rpivotTable", "shiny", "shinydashboard", "shinydashboardPlus"]
+    },
     "PakPC2017": {
       "name": "PakPC2017",
       "version": "1.0.0",
@@ -23937,8 +24885,8 @@
     },
     "PakPC2023": {
       "name": "PakPC2023",
-      "version": "0.1.0",
-      "sha256": "1vih3bkz6sy7bkw18c1d7a85xj112zagg65i7sfhy8dgwx7m78f1",
+      "version": "0.2.0",
+      "sha256": "05x3xqbhd0jw5l39x4dlhjgi66627aqjs006n3w4h873jfac7458",
       "depends": ["DT", "htmltools"]
     },
     "PakPMICS2014Ch": {
@@ -23967,8 +24915,8 @@
     },
     "PakPMICS2018": {
       "name": "PakPMICS2018",
-      "version": "1.0.0",
-      "sha256": "0jjch9nhwif01j6avbyr4ajpfnxb51idq6pnywfjhn46wn0by756",
+      "version": "1.2.0",
+      "sha256": "1fgwddkc9yb86lqyskr41yh3jw497bf6dipccavs49np6mxmdlm6",
       "depends": ["tibble"]
     },
     "PakPMICS2018bh": {
@@ -24063,8 +25011,8 @@
     },
     "ParallelLogger": {
       "name": "ParallelLogger",
-      "version": "3.3.0",
-      "sha256": "0arfmjxc68yfznggfv5mmafxn9xvagwxslynhqapw4yf7vlqjjam",
+      "version": "3.3.1",
+      "sha256": "05f3ysa5vipjl43pmllyq1wypbc5ddn33ysmhcrh8h6sx3j36jc7",
       "depends": ["jsonlite", "snow", "xml2"]
     },
     "ParallelPC": {
@@ -24115,11 +25063,23 @@
       "sha256": "0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf",
       "depends": []
     },
+    "Path_Analysis": {
+      "name": "Path.Analysis",
+      "version": "0.1",
+      "sha256": "0xpr05qhlc20i2k8g61jq7grvdvlvai3fx827l77x6z1kcxcbzwa",
+      "depends": ["ComplexHeatmap", "DiagrammeR", "Hmisc", "corrplot", "corrr", "gplots", "mathjaxr", "metan", "pastecs"]
+    },
+    "PathwaySpace": {
+      "name": "PathwaySpace",
+      "version": "1.0.0",
+      "sha256": "1mf76xclm2qqg10m23nybdadlq5z44qhp21r6h0fjs8n9aqygb5q",
+      "depends": ["RANN", "RGraphSpace", "ggplot2", "ggrepel", "igraph", "scales"]
+    },
     "PatientProfiles": {
       "name": "PatientProfiles",
-      "version": "1.1.1",
-      "sha256": "0h9d4qm83qkfdvdmz0vm29yhn50vrbf9qxp2mbgmxx067yynncz6",
-      "depends": ["CDMConnector", "checkmate", "cli", "dplyr", "lifecycle", "magrittr", "omopgenerics", "purrr", "rlang", "stringr", "tidyr", "visOmopResults"]
+      "version": "1.2.3",
+      "sha256": "1k3m2x3hnnmhjv6b37kp055zq1d2yaxf125wmjr7wlmdjdp9nf1l",
+      "depends": ["CDMConnector", "cli", "dplyr", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "Patterns": {
       "name": "Patterns",
@@ -24153,20 +25113,20 @@
     },
     "PeakSegDisk": {
       "name": "PeakSegDisk",
-      "version": "2023.11.27",
-      "sha256": "133ig07ah1hxzn3hlxhd3g1j5kizpsxf5z8h5d071gk7f9l3yy9c",
+      "version": "2024.10.1",
+      "sha256": "05lvfcrm51cnz1phxmmz7kgk18951jm4pkmsjzypph1q7sfr1pvk",
       "depends": ["data_table"]
     },
     "PeakSegJoint": {
       "name": "PeakSegJoint",
-      "version": "2024.6.27",
-      "sha256": "0rlm9adjrnbh58j7vb6lvqam13crgcrdcfs7rl7cbarfj3k9d8nr",
+      "version": "2024.12.4",
+      "sha256": "02vsr438zqm49ivimf1indbifl046a5i581dnww1a45s9vq7y71s",
       "depends": ["PeakError", "penaltyLearning"]
     },
     "PeakSegOptimal": {
       "name": "PeakSegOptimal",
-      "version": "2024.1.24",
-      "sha256": "0xh7z8h74jiz5yaj3hkgm1j3my6518fyj5235w54462ahdsafz7m",
+      "version": "2024.10.1",
+      "sha256": "1vrfj0kv8lhhw72zd9c4r27bhm0l1db1b1c5a9xxjsqx2bsjs68v",
       "depends": ["penaltyLearning"]
     },
     "PearsonDS": {
@@ -24183,8 +25143,8 @@
     },
     "PeerPerformance": {
       "name": "PeerPerformance",
-      "version": "2.2.5",
-      "sha256": "0cdv7ndbjxzaayxkrxh99jsyivlipbnipv21d4rmf8j8ssfq74r5",
+      "version": "2.3.1",
+      "sha256": "1mk7iylmzb1rr8vdxckkv0q2sm11qmransh17g53na0ihxbb42kj",
       "depends": ["lmtest", "sandwich"]
     },
     "PenCoxFrail": {
@@ -24199,6 +25159,12 @@
       "sha256": "0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz",
       "depends": ["MASS", "Matrix", "numDeriv"]
     },
+    "PepMapViz": {
+      "name": "PepMapViz",
+      "version": "1.0.0",
+      "sha256": "0akn8m97ngs5bhnvs6qwhg2sjwfwhcbd5q4yqns6r6h0dfzq4248",
+      "depends": ["data_table", "ggforce", "ggh4x", "ggnewscale", "ggplot2", "rlang", "stringr"]
+    },
     "PepSAVIms": {
       "name": "PepSAVIms",
       "version": "0.9.1",
@@ -24223,6 +25189,12 @@
       "sha256": "0ad9xdi1w7zis2ks1jvl4l54rfcdgayipydjcqz5hfq6qkz5k31y",
       "depends": []
     },
+    "PerRegMod": {
+      "name": "PerRegMod",
+      "version": "4.4.3",
+      "sha256": "02cnd6lwfj1v64b2h2i890qmnicgpinfipxy1bkg911y11qyff4b",
+      "depends": ["expm", "readxl", "sn"]
+    },
     "Perc": {
       "name": "Perc",
       "version": "0.1.6",
@@ -24237,8 +25209,8 @@
     },
     "PerformanceAnalytics": {
       "name": "PerformanceAnalytics",
-      "version": "2.0.4",
-      "sha256": "0ci26hsj4wnw9g0mh4vrn0cg986cpcpx169rvw6v6rbnjxq718bq",
+      "version": "2.0.8",
+      "sha256": "1hsycy1warjs5ffn2p3nhv455a56svwy3x5605zh7q9qh200kqk4",
       "depends": ["quadprog", "xts", "zoo"]
     },
     "PeriodicTable": {
@@ -24253,6 +25225,12 @@
       "sha256": "0hwla559vfv0r8bhrc8g0cvbsjgg4f3nx4y1hb4fxkvddi6pfb5a",
       "depends": []
     },
+    "PermCor": {
+      "name": "PermCor",
+      "version": "0.1.0",
+      "sha256": "1ib8126hi9chch4jgyd0h26qjc791197yx7rzq88dkj0aaqlrrr1",
+      "depends": []
+    },
     "PermutationR": {
       "name": "PermutationR",
       "version": "0.1.0",
@@ -24315,8 +25293,8 @@
     },
     "PhaseType": {
       "name": "PhaseType",
-      "version": "0.2.1",
-      "sha256": "0bqnz6rn0x8xg9qlcn2yqdkmvddc96xasnq9pb36gb8gx19p68fy",
+      "version": "0.3.0",
+      "sha256": "1ls652wiy8wfzj08pyi76ghfiv55i5x40drb547hnnh1f0583i0x",
       "depends": ["coda", "ggplot2", "reshape"]
     },
     "PhaseTypeR": {
@@ -24349,6 +25327,12 @@
       "sha256": "0bfg2vk35hrfzmpjpnv3yhnsfr17505c49msbppqrrbpw5wgawy5",
       "depends": ["lme4", "tidyr"]
     },
+    "PhenotypeR": {
+      "name": "PhenotypeR",
+      "version": "0.1.0",
+      "sha256": "1hrib4fpiyxrp195246r04jwdqs02y2q6c3553a5m2vbf66hqmgc",
+      "depends": ["CodelistGenerator", "CohortCharacteristics", "CohortConstructor", "IncidencePrevalence", "OmopSketch", "cli", "dplyr", "magrittr", "omopgenerics", "purrr", "rlang", "usethis", "vctrs"]
+    },
     "PhenotypeSimulator": {
       "name": "PhenotypeSimulator",
       "version": "0.3.4",
@@ -24405,9 +25389,9 @@
     },
     "PhytosanitaryCalculator": {
       "name": "PhytosanitaryCalculator",
-      "version": "1.1.1",
-      "sha256": "1545xy338wanrkpy55ji4ap9wf7pldrb07pmhxcmhp73w3l82r2c",
-      "depends": ["AcceptanceSampling", "shiny"]
+      "version": "1.1.3",
+      "sha256": "08jp6wvmzaybf9w8srny3yd010wb524wka655gvj7lrj1d5wigz7",
+      "depends": ["AcceptanceSampling", "htmltools", "rmarkdown", "shiny"]
     },
     "PieGlyph": {
       "name": "PieGlyph",
@@ -24427,18 +25411,18 @@
       "sha256": "0jspc19fn1mqv3zjr89sy7rqbbyjk3ij3rhrg2dsw167w63lpykx",
       "depends": ["Rcpp"]
     },
+    "PivotalP": {
+      "name": "PivotalP",
+      "version": "0.1.2",
+      "sha256": "1fsr806djbwrp9vwks51hxy2j6kqa6r7zdh1cnvzisa6shgx7g4x",
+      "depends": ["zipfR"]
+    },
     "PlackettLuce": {
       "name": "PlackettLuce",
       "version": "0.4.3",
       "sha256": "04pid91wsf3m3mg45zis17xa251491011ihbmfsdy7m914l9wcyd",
       "depends": ["CVXR", "Matrix", "R6", "RSpectra", "igraph", "matrixStats", "partykit", "psychotools", "psychotree", "qvcalc", "sandwich"]
     },
-    "PlaneGeometry": {
-      "name": "PlaneGeometry",
-      "version": "1.6.0",
-      "sha256": "0v4484kh8aqni0n6nfd9c1wiw62fj439647xb583pbmxi5ja58hq",
-      "depends": ["CVXR", "Carlson", "R6", "fitConic", "rcdd", "sdpt3r", "stringr", "uniformly"]
-    },
     "Planesmuestra": {
       "name": "Planesmuestra",
       "version": "0.1",
@@ -24475,6 +25459,12 @@
       "sha256": "0nnvi40lq6rxjxvf3p5mdn9gp4kp8nr73yzxgrpbg125cqf23vhm",
       "depends": ["mvtnorm"]
     },
+    "Platypus": {
+      "name": "Platypus",
+      "version": "3.6.0",
+      "sha256": "03sws767aih5yihqr9vfnixp0njgzfgflvajf3sbhrzpj29dpkgg",
+      "depends": ["Biostrings", "Matrix", "Seurat", "SeuratObject", "cowplot", "dplyr", "ggalluvial", "ggplot2", "ggseqlogo", "ggtree", "jsonlite", "knitr", "magrittr", "plyr", "reshape2", "seqinr", "stringdist", "stringr", "tibble", "tidyr", "useful"]
+    },
     "PlayerChart": {
       "name": "PlayerChart",
       "version": "1.0.0",
@@ -24499,6 +25489,12 @@
       "sha256": "0jjzrxmx1k1s8fyfs9m5a864pmvjh2bdklbhrc3nbhb0c7wd3h9z",
       "depends": ["KernSmooth", "MASS"]
     },
+    "PlotFTIR": {
+      "name": "PlotFTIR",
+      "version": "1.0.0",
+      "sha256": "0wqkc11fks99nx391xigvzqciwsskzrhx3dj7j5yz0bqf7s461ww",
+      "depends": ["cli", "rlang", "scales"]
+    },
     "PlotPrjNetworks": {
       "name": "PlotPrjNetworks",
       "version": "1.0.0",
@@ -24507,8 +25503,8 @@
     },
     "PlotTools": {
       "name": "PlotTools",
-      "version": "0.3.0",
-      "sha256": "1mm3cs1bgs4xscmk1k8nxq9zxddzj486fx4xnsmrc5mbr34ikgkg",
+      "version": "0.3.1",
+      "sha256": "1pf04nci0kz2f2d8xxkw72zmfypz80zq86fii3pnqhsv6d1pk800",
       "depends": []
     },
     "PoA": {
@@ -24535,6 +25531,12 @@
       "sha256": "1xwlj8dibaik37z6vj9q9vawavi7d49906wvxdd4drjzxzapq4ng",
       "depends": []
     },
+    "PoSIAdjRSquared": {
+      "name": "PoSIAdjRSquared",
+      "version": "0.0.0.1",
+      "sha256": "1awdrw16pansw8m0lvm2ahbrmv2h3mv7yrcknj6dqypjqpiv5adg",
+      "depends": ["VGAM", "lmf"]
+    },
     "PogromcyDanych": {
       "name": "PogromcyDanych",
       "version": "1.7.1",
@@ -24555,8 +25557,8 @@
     },
     "PointedSDMs": {
       "name": "PointedSDMs",
-      "version": "2.1.0",
-      "sha256": "17z51hcpr2a3z49yjp4nn532assi6nws0adcs204jnr2i0zwb8a5",
+      "version": "2.1.2",
+      "sha256": "0cy5a6v1qn5n6rzw21lwx0yz9x6d6jc85ypr8sijvirqkw4h6x46",
       "depends": ["R6", "R_devices", "blockCV", "ggplot2", "inlabru", "raster", "sf", "sp", "terra"]
     },
     "PoisBinNonNor": {
@@ -24597,8 +25599,8 @@
     },
     "PoissonBinomial": {
       "name": "PoissonBinomial",
-      "version": "1.2.6",
-      "sha256": "1g77mkz63fl8hr3fhb71l0zywgg20djzjb88sjzpzsng73mz682h",
+      "version": "1.2.7",
+      "sha256": "0vv1hmskd1ri3p9w7hxvs62jghia76l5y0b1m7vh600qqyg45k30",
       "depends": ["Rcpp"]
     },
     "PoissonMultinomial": {
@@ -24625,6 +25627,18 @@
       "sha256": "1syycldfzwymymhai0ifli93iv3p8p6xbyk25mvln6zgb43iind1",
       "depends": ["dplyr", "ggplot2", "ineq", "mgcv", "reshape2", "vegan"]
     },
+    "PolisheR": {
+      "name": "PolisheR",
+      "version": "1.0.0",
+      "sha256": "0fmjkjhdss980vx4p5j9yw0nkrydyjga2k2gv5gw3jri8335ky37",
+      "depends": ["NaileR", "dplyr", "shiny"]
+    },
+    "Poly4AT": {
+      "name": "Poly4AT",
+      "version": "1.0.1",
+      "sha256": "11dx99x6iya6liw60gwa0w7y6k3ghhhzxyvmdja43a5wgi6g4vla",
+      "depends": ["DT", "geojsonsf", "httr", "jsonlite", "leaflet", "leaflet_extras", "readxl", "sf", "shiny", "shinydashboard"]
+    },
     "PolyHaplotyper": {
       "name": "PolyHaplotyper",
       "version": "1.0.1",
@@ -24687,9 +25701,9 @@
     },
     "PoolTestR": {
       "name": "PoolTestR",
-      "version": "0.1.3",
-      "sha256": "0n9fihb2yc6jnxs1v0yq872pg7b1jd7lx7bwa9d1r8yv36haxzvr",
-      "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "brms", "dplyr", "lme4", "progress", "rstan", "rstantools", "stringr"]
+      "version": "0.2.0",
+      "sha256": "01av654dz2pk01751ijd2n5c0lp98jzxkwcyk5md5x1v9q377dib",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "brms", "dplyr", "lme4", "progress", "rlang", "rstan", "rstantools", "stringr", "tibble"]
     },
     "PooledCohort": {
       "name": "PooledCohort",
@@ -24705,8 +25719,8 @@
     },
     "PopED": {
       "name": "PopED",
-      "version": "0.6.0",
-      "sha256": "0s8lr17s6w8isjig4z8jzgpnpsb1kg98d32y7kslbwzl08cbnza0",
+      "version": "0.7.0",
+      "sha256": "10aja60d72ql1fz67xwbi4qf9z8jdz7smdm97avc1d5jqvw3fwhn",
       "depends": ["MASS", "boot", "codetools", "dplyr", "ggplot2", "gtools", "magrittr", "mvtnorm", "purrr", "stringr", "tibble"]
     },
     "PopGenHelpR": {
@@ -24723,8 +25737,8 @@
     },
     "PopVar": {
       "name": "PopVar",
-      "version": "1.3.1",
-      "sha256": "165c6gfj8qgpvv7ybl571abzf011c738l7xk5lkq9fbvbdqgdc5d",
+      "version": "1.3.2",
+      "sha256": "0gzm74mq2xp50zagnl76pq8lkpk3r4a97pqwyks4qc067icn6d9r",
       "depends": ["BGLR", "qtl", "rrBLUP"]
     },
     "PopulationGrowthR": {
@@ -24747,8 +25761,8 @@
     },
     "PortfolioAnalytics": {
       "name": "PortfolioAnalytics",
-      "version": "2.0.0",
-      "sha256": "0rncchlc3n5kyfw7hfbxivi45gr64i89ylzr20mh9lqrqi0rif6a",
+      "version": "2.1.0",
+      "sha256": "0r8h5va6pkq98ap0m8j7gh1lpwdwy0l9sfnc826nz8hhv6jfaybv",
       "depends": ["GenSA", "PerformanceAnalytics", "ROI_plugin_symphony", "foreach", "mco", "pso", "xts", "zoo"]
     },
     "PortfolioOptim": {
@@ -24777,10 +25791,16 @@
     },
     "PottsUtils": {
       "name": "PottsUtils",
-      "version": "0.3-3",
-      "sha256": "165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn",
+      "version": "0.3-3.1",
+      "sha256": "1wszkvc3h72g1b8962749bg0gjh3nhcf6ydfd7471srkh9qhg4a0",
       "depends": ["miscF"]
     },
+    "PoweREST": {
+      "name": "PoweREST",
+      "version": "0.1.0",
+      "sha256": "0y101jbazh2hfly08p5yfipdqyahxx668dm135ik20arqpfl01cl",
+      "depends": ["Seurat", "dplyr", "ggplot2", "magrittr", "plotly", "rayshader", "resample", "scam", "xgboost"]
+    },
     "Power2Stage": {
       "name": "Power2Stage",
       "version": "0.5-4",
@@ -24855,8 +25875,8 @@
     },
     "PreciseSums": {
       "name": "PreciseSums",
-      "version": "0.6",
-      "sha256": "16ycz7rcslhfc9g4z04klq9hb9fpzmrn4rysyl4zky85mlhs60gk",
+      "version": "0.7",
+      "sha256": "10fnr0b159ym001hdnkr7cir5vaaglcxrbyrxmky430f5nhhcv0f",
       "depends": []
     },
     "PredCRG": {
@@ -24871,6 +25891,12 @@
       "sha256": "00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj",
       "depends": ["MASS", "caret", "e1071", "ggplot2", "mclust", "party", "plyr", "randomForest", "rpart", "statmod"]
     },
+    "PredTest": {
+      "name": "PredTest",
+      "version": "0.1.0",
+      "sha256": "0f199gyhr91kddgkg84yplmfv865dq3lcb4ikvlsk559vlv3pxj9",
+      "depends": []
+    },
     "PredictABEL": {
       "name": "PredictABEL",
       "version": "1.2-4",
@@ -24915,8 +25941,8 @@
     },
     "PriceIndices": {
       "name": "PriceIndices",
-      "version": "0.2.0",
-      "sha256": "01r2pcq26kbz861gw2dg2crvc1dla8h7aknz7ym9ndk10v3gyl6r",
+      "version": "0.2.2",
+      "sha256": "0f4d5lq1jm3fyafrwypgpp637kizqnkkh6sx0y6sncd610iv0jfg",
       "depends": ["caret", "dplyr", "ggplot2", "lubridate", "reclin2", "reshape", "strex", "stringr", "xgboost"]
     },
     "PriorGen": {
@@ -24933,8 +25959,8 @@
     },
     "ProAE": {
       "name": "ProAE",
-      "version": "1.0.1",
-      "sha256": "1sgd5ws1jpnjsnx1daywsn3ygl6lmg048fgvc7i4nkkryq7zls6b",
+      "version": "1.0.3",
+      "sha256": "1gm71m536chp7gp3c08vwccfrp073bd74jwnf9706kx7kn200p3a",
       "depends": ["DescTools", "Hmisc", "dplyr", "ggnewscale", "ggpattern", "ggplot2", "ggtext", "gridExtra", "kableExtra", "magrittr"]
     },
     "ProDenICA": {
@@ -24961,12 +25987,24 @@
       "sha256": "1837p4vg1g4225rv55gaphma429j6pnfh078cxpv5ha2n0h1sfz3",
       "depends": ["MASS", "brglm2", "glmnet", "survival"]
     },
+    "ProSportsDraftData": {
+      "name": "ProSportsDraftData",
+      "version": "1.0.3",
+      "sha256": "0x5f0gz8cigrlpla3bf7vpwn8ndmmd49crb2m3g27zv2hn5b850r",
+      "depends": ["dplyr"]
+    },
     "ProTrackR": {
       "name": "ProTrackR",
       "version": "0.4.3",
       "sha256": "08c53ndrfgaw8hxvrw13ypcbm62nlxgfnip7p9pivvlrjpiiryvj",
       "depends": ["XML", "audio", "lattice", "signal", "tuneR"]
     },
+    "ProTrackR2": {
+      "name": "ProTrackR2",
+      "version": "0.0.5",
+      "sha256": "0rl0qs7q4jpc90q47fvcf3j8rx6j6kbw8j2lwn4w3ll9g33gigkb",
+      "depends": ["audio", "cpp11"]
+    },
     "ProbBayes": {
       "name": "ProbBayes",
       "version": "1.1",
@@ -24975,8 +26013,8 @@
     },
     "ProbBreed": {
       "name": "ProbBreed",
-      "version": "1.0.4.1",
-      "sha256": "1m224wxzighadp8gdch4fg8pc5df4xphf75ixq6r99x7klp4mcah",
+      "version": "1.0.4.4",
+      "sha256": "047c6090mbj6kfgfl9mv50b0hvgfi5hqdbwsbh93dqqns60ivc4v",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "lifecycle", "rlang", "rstan", "rstantools"]
     },
     "ProbMarg": {
@@ -25047,9 +26085,9 @@
     },
     "ProjectManagement": {
       "name": "ProjectManagement",
-      "version": "1.5.2",
-      "sha256": "04i1rz5dwgkgy6da12v3vhq3skqmnqlb3dry99hycjrfql0v4wsr",
-      "depends": ["igraph", "kappalab", "lpSolveAPI", "plotly", "triangle"]
+      "version": "2.0.2",
+      "sha256": "1lwhi542h1mq1r4501pz0xpf1plzg44zzj04bk9yinvbaqddavmm",
+      "depends": ["TUvalues", "igraph", "lpSolveAPI", "plotly", "triangle"]
     },
     "ProjectTemplate": {
       "name": "ProjectTemplate",
@@ -25131,8 +26169,8 @@
     },
     "PubChemR": {
       "name": "PubChemR",
-      "version": "2.0",
-      "sha256": "0c8n77r0yxjcb217xgalrvfwhajzkk7h0kfsg6k8jhvlvfrj7n00",
+      "version": "2.1.3",
+      "sha256": "1s10jp2z5bc5ig3m03v6i6qhqa9zfq79ncnr9jfwk26msw52zr40",
       "depends": ["RCurl", "RJSONIO", "dplyr", "httr", "magick", "magrittr", "png", "rsvg", "stringr", "testthat", "tibble", "tidyr"]
     },
     "PubMedMining": {
@@ -25149,9 +26187,9 @@
     },
     "PublicWorksFinanceIT": {
       "name": "PublicWorksFinanceIT",
-      "version": "0.2.0",
-      "sha256": "15401mwmw87w7m2kdf6b0c0zbxfqxxb04z4a3nk0wycwxkk3jzfv",
-      "depends": ["dplyr", "ggplot2", "httr", "leaflet", "lubridate", "magrittr", "rlang", "rvest", "scales", "sf", "tibble", "tidyr"]
+      "version": "0.3.1",
+      "sha256": "0pvkxf0425np1ld6z7s3sfphiykf2gm1a4410l0hj07f860pmrsh",
+      "depends": ["dplyr", "ggplot2", "httr", "knitr", "leaflet", "lubridate", "magrittr", "plotly", "rlang", "rvest", "scales", "sf", "spdep", "tibble", "tidyr"]
     },
     "PublicationBias": {
       "name": "PublicationBias",
@@ -25179,32 +26217,50 @@
     },
     "PurpleAir": {
       "name": "PurpleAir",
-      "version": "1.0.0",
-      "sha256": "0xsqd839x55m7wmr2knznqyrmvpa5kcxi16izxl5h2539diqssjx",
+      "version": "1.0.1",
+      "sha256": "17ir79f5r8c9lv4gx9mr9iv26xapygd2azgw6gdm3lcl99r36cgm",
       "depends": ["cli", "dplyr", "glue", "httr2", "purrr", "rlang", "tibble"]
     },
+    "PurpleAirAPI": {
+      "name": "PurpleAirAPI",
+      "version": "0.1.0",
+      "sha256": "1ba4ws226813h3wjlrmss4kka0nj3bhg1qrni4r75npf1gmqzbax",
+      "depends": ["httr", "jsonlite"]
+    },
     "Pursuit": {
       "name": "Pursuit",
       "version": "1.0.5",
       "sha256": "1wg1ix466zcbcgr2qqa6sbh9blx5g8hjqmagf9z3ig06qgxf1zrr",
       "depends": ["MASS"]
     },
+    "PvSTATEM": {
+      "name": "PvSTATEM",
+      "version": "0.1.2",
+      "sha256": "1951md1r40y9axrkrhp0996663psjlnx3wsqhgy94ccrvv2fsh3r",
+      "depends": ["R6", "R_utils", "dplyr", "ggplot2", "ggrepel", "lubridate", "nplr", "png", "readr", "readxl", "stringi", "stringr", "svglite"]
+    },
     "PwrGSD": {
       "name": "PwrGSD",
-      "version": "2.3.7",
-      "sha256": "0gxyx2z4yjqvivwslb31ai2vpg664p6pvyhz23s9n43wlqahvjg1",
+      "version": "2.3.8",
+      "sha256": "0rz0an16g3dwzbjcr0iln05cdpzx0rl0fiaj30y79n5f38di5ac2",
       "depends": ["survival"]
     },
     "PxWebApiData": {
       "name": "PxWebApiData",
-      "version": "0.9.0",
-      "sha256": "0xch2l9c3dana419p9zfs6vwcqgacxamzjx1c6v8bpnb49gc3dp8",
+      "version": "1.0.0",
+      "sha256": "14a4w1hd1f1mws8cjc0x32ayjswiyd725zi49j4c7b49mlr4cag4",
       "depends": ["httr", "jsonlite", "pxweb", "rjstat"]
     },
+    "PytrendsLongitudinalR": {
+      "name": "PytrendsLongitudinalR",
+      "version": "0.1.4",
+      "sha256": "00y9v9kv8a4cyfkxzzr8cbq6l2b8cfp2svnkkmq3rbrn3wrwl6d6",
+      "depends": ["jsonlite", "lubridate", "reticulate"]
+    },
     "Q2q": {
       "name": "Q2q",
-      "version": "0.1.0",
-      "sha256": "1n97axhcq64fg92cbndqw70c8awknjap91bh2h6i5cvd0c80pb85",
+      "version": "0.1.2",
+      "sha256": "0v50kc22cnkcwazwhclxsra7v8h023ih52mpwnrl2vj8cl58c9k2",
       "depends": []
     },
     "Q7": {
@@ -25221,14 +26277,14 @@
     },
     "QBMS": {
       "name": "QBMS",
-      "version": "1.0.0",
-      "sha256": "0kxhww5vvl4giap8fyymmk873j73waixa1dzg9cb6hqk3816vwqm",
-      "depends": ["DBI", "RNetCDF", "RSQLite", "httr", "jsonlite", "terra"]
+      "version": "1.5.0",
+      "sha256": "1b75qvcwm7c1f0387igw5ayafl66k8yrp1b78cb0yczhmaxx3bvm",
+      "depends": ["DBI", "RNetCDF", "RSQLite", "future", "future_apply", "httr2", "jsonlite", "terra"]
     },
     "QCA": {
       "name": "QCA",
-      "version": "3.22",
-      "sha256": "0w7ap7dqd5qhvkw41r7fy2zn1hsn7mq099b45l3p330lzdzz1grr",
+      "version": "3.23",
+      "sha256": "016xvl4mwq51l55v3k5pvi996lvzvak71arggfjr7r0sfa6b1kym",
       "depends": ["admisc", "declared", "lpSolve", "shiny", "venn"]
     },
     "QCAcluster": {
@@ -25293,8 +26349,8 @@
     },
     "QFASA": {
       "name": "QFASA",
-      "version": "1.2.0",
-      "sha256": "1dhnfr4f5ij3irkragyllfjqisgm27phk40c9i539vm6046sc2w2",
+      "version": "1.2.1",
+      "sha256": "09rdlw30jlag9lyqdvmpcqxqsrwxwrarsqkp2vp4ay11nn6xi6ka",
       "depends": ["Compositional", "MASS", "Rcpp", "RcppEigen", "Rsolnp", "TMB", "boot", "bootstrap", "compositions", "dplyr", "futile_logger", "gamlss", "gamlss_dist", "mvtnorm", "vegan"]
     },
     "QFRM": {
@@ -25395,8 +26451,8 @@
     },
     "QTE_RD": {
       "name": "QTE.RD",
-      "version": "1.0.0",
-      "sha256": "0svm97qm08ma201layin6lmym737d1gykcvlbq9n8nycria4sdfh",
+      "version": "1.1.0",
+      "sha256": "13cs1l2x0lz36zpy8bpz0jwgq5yg4rm7vvjsaadzli5drky6ymip",
       "depends": ["plotrix", "quantreg"]
     },
     "QTL_gCIMapping": {
@@ -25437,8 +26493,8 @@
     },
     "QWDAP": {
       "name": "QWDAP",
-      "version": "1.1.18",
-      "sha256": "1i1g83k2fr0c7kchwpsyxxfhi6kvbdqg8caff9ly0crdzar5xrc4",
+      "version": "1.1.20",
+      "sha256": "1rqbj4m90x1cg32hjzck4gmpvfmz28pgqk83vr527bvhaxbr4vmb",
       "depends": ["CORElearn", "Rcpp", "RcppEigen", "pls"]
     },
     "QZ": {
@@ -25461,9 +26517,9 @@
     },
     "Qindex": {
       "name": "Qindex",
-      "version": "0.1.5",
-      "sha256": "1186k9yapq6ax2y6pyk3pjhsdsnzifwv94mawgzw8fcsz7wq83q7",
-      "depends": ["matrixStats", "mgcv", "pracma", "rpart", "survival"]
+      "version": "0.1.7",
+      "sha256": "0dx812cvpkhl8gz6wql6kmkcjx4dwdbmjr6gz1ddh1axldwdiy6b",
+      "depends": ["matrixStats", "mgcv", "plotly", "rpart", "survival"]
     },
     "Qindex_data": {
       "name": "Qindex.data",
@@ -25501,6 +26557,12 @@
       "sha256": "1vvvraqgy570dj86km4qpiax4a0zhfym94am0fn6ld43p3iixg02",
       "depends": ["ggplot2", "kernlab"]
     },
+    "QuICSeedR": {
+      "name": "QuICSeedR",
+      "version": "0.1.2",
+      "sha256": "0ajl92rsp8kikpvslsg72g3jbnjhq8khmsirlr947mdzx7mab7fj",
+      "depends": ["WRS2", "dplyr", "ggplot2", "magrittr", "readxl", "rlang", "tidyr", "tidyselect"]
+    },
     "QuadRoot": {
       "name": "QuadRoot",
       "version": "0.2.1",
@@ -25509,9 +26571,9 @@
     },
     "QuadratiK": {
       "name": "QuadratiK",
-      "version": "1.1.1",
-      "sha256": "0pjg0j0hb5v6gxlg4lv1ddrwbrvp91ah3rxm6y7mjclg3ff47g16",
-      "depends": ["Rcpp", "RcppEigen", "Tinflex", "cluster", "clusterRepro", "doParallel", "foreach", "ggplot2", "ggpp", "ggpubr", "mclust", "moments", "movMF", "mvtnorm", "rgl", "rlecuyer", "rrcov", "sn"]
+      "version": "1.1.2",
+      "sha256": "1mpz90vww1vp0as70yfyv6p9sg9gnggzs4c5qld3ig4krzal7d3j",
+      "depends": ["Rcpp", "RcppEigen", "doParallel", "foreach", "ggplot2", "ggpubr", "moments", "mvtnorm", "rlecuyer", "rrcov", "scatterplot3d", "sn"]
     },
     "Quandl": {
       "name": "Quandl",
@@ -25569,14 +26631,14 @@
     },
     "Quartet": {
       "name": "Quartet",
-      "version": "1.2.6",
-      "sha256": "1qrhjxqg3899kw58irnqs7sj6n9ixyx71gaf1whld8xpj89dsz7f",
-      "depends": ["Rcpp", "Rdpack", "Ternary", "TreeTools", "ape", "viridisLite"]
+      "version": "1.2.7",
+      "sha256": "082g4wxbvrkqwkaak29ngpd523d3ygxpffghf1vfp1r2v6761s9r",
+      "depends": ["PlotTools", "Rcpp", "Rdpack", "Ternary", "TreeTools", "ape", "viridisLite"]
     },
     "QuickJSR": {
       "name": "QuickJSR",
-      "version": "1.3.1",
-      "sha256": "1lcg437b93yvbk4q63m2sh8ih4p2b6505invmjbyqf58hip9sm8h",
+      "version": "1.4.0",
+      "sha256": "1fjlgfd13zqlqilr19h00glgaqq54z9mmg2f4dkml1dxw94dlp9l",
       "depends": []
     },
     "QurvE": {
@@ -25587,9 +26649,9 @@
     },
     "Qval": {
       "name": "Qval",
-      "version": "0.1.7",
-      "sha256": "02wvj7n3zbn13mn48gxd57kfkcbx9740ca2nl0yl15nfj45c21zh",
-      "depends": ["GDINA", "Matrix", "glmnet", "nloptr", "plyr"]
+      "version": "1.0.0",
+      "sha256": "1pq2w268si3dxnzf436d2lzz7k09x7k6mydl0b8wpjjzbpqpbayp",
+      "depends": ["GDINA", "MASS", "Matrix", "glmnet", "nloptr", "plyr"]
     },
     "R_cache": {
       "name": "R.cache",
@@ -25629,8 +26691,8 @@
     },
     "R_oo": {
       "name": "R.oo",
-      "version": "1.26.0",
-      "sha256": "0ra3sjs7sqqif3dlcdry7p40vd4jxm0407d3s6sgn5i2ihw2nq7p",
+      "version": "1.27.0",
+      "sha256": "1yb73m3fyl6sn6vf1jd64xh7np3g990v3cgyzjxjj9v7dm8824ni",
       "depends": ["R_methodsS3"]
     },
     "R_rsp": {
@@ -25711,12 +26773,6 @@
       "sha256": "0xmzsd5rbfidypkxcp8jf9afa7l4r70h627gcz4y4j688n110piw",
       "depends": []
     },
-    "R2SWF": {
-      "name": "R2SWF",
-      "version": "0.9-9",
-      "sha256": "0bd1lh8f16mvgvrzk080jpqajzl0fzmiq5d2f2k3lgf0hda0x4gl",
-      "depends": ["sysfonts"]
-    },
     "R2WinBUGS": {
       "name": "R2WinBUGS",
       "version": "2.1-22.1",
@@ -25731,15 +26787,15 @@
     },
     "R2jags": {
       "name": "R2jags",
-      "version": "0.8-5",
-      "sha256": "1k895xmlrq8k34s0yc06mjkay8gj2r80sfn4rpqql09j6vr1za3i",
+      "version": "0.8-9",
+      "sha256": "0k71ms7xnj8yrqc1i8yn6hki863p6dzbx6x2pijxvn7f37wvh1nz",
       "depends": ["R2WinBUGS", "abind", "coda", "rjags", "stringr"]
     },
     "R2sample": {
       "name": "R2sample",
-      "version": "1.1.0",
-      "sha256": "18v7i0h4jbnyd08c24sr8fydk209fp76hc2k7yivva616m5c4s2d",
-      "depends": ["Rcpp", "ggplot2", "microbenchmark", "shiny"]
+      "version": "2.2.0",
+      "sha256": "11p3kw9v8lag06akdx8a50laxzgs14micv2baq3asgsbm983g5lx",
+      "depends": ["Rcpp", "ggplot2", "shiny"]
     },
     "R2ucare": {
       "name": "R2ucare",
@@ -25759,6 +26815,12 @@
       "sha256": "1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz",
       "depends": ["RCurl", "RJSONIO", "bitops"]
     },
+    "R4HCR": {
+      "name": "R4HCR",
+      "version": "0.1",
+      "sha256": "01lsig6z38mrlrmc63ys0cfp0x7w4i7nkqpyf14allla1jlfh0fk",
+      "depends": ["irr", "mada", "meta", "metafor", "survival"]
+    },
     "R6": {
       "name": "R6",
       "version": "2.5.1",
@@ -25779,9 +26841,9 @@
     },
     "R6P": {
       "name": "R6P",
-      "version": "0.3.0",
-      "sha256": "18qy69zwyzp27fiqlplcjh0034d2pn9dhnfkraarh4jxnbi7masm",
-      "depends": ["R6", "collections", "dplyr", "purrr", "stringr", "tibble", "tidyr"]
+      "version": "0.4.0",
+      "sha256": "12zfq33v2bfyasgyq601mywzva4g5405fw3jk8m2mjdlg430rlif",
+      "depends": ["R6", "collections", "dplyr", "stringr", "tibble", "tidyr"]
     },
     "R6causal": {
       "name": "R6causal",
@@ -25807,12 +26869,6 @@
       "sha256": "0j2vazbji8xqb8xkd9jrpi10iqj30rvkdjfs4snavl9nsbra99yf",
       "depends": ["ggplot2", "ggridges", "gridExtra", "vcfR"]
     },
-    "RAFS": {
-      "name": "RAFS",
-      "version": "0.2.4",
-      "sha256": "02s4p7hsjm2znj5rcfrd2cqwynd03p8zbby8qxnfxr3hp5ggq7hr",
-      "depends": ["MDFS", "fastcluster", "splitTools"]
-    },
     "RAINBOWR": {
       "name": "RAINBOWR",
       "version": "0.1.35",
@@ -25821,8 +26877,8 @@
     },
     "RALSA": {
       "name": "RALSA",
-      "version": "1.4.7",
-      "sha256": "1m9fp1y5fgyngm5n6kgwfdpr8pnczs250hy63dd3ld3n50qdmc4l",
+      "version": "1.5.0",
+      "sha256": "1mvggmprqpgyj8d0fpyma44jkpx32dbfagjrh8mg5hny0bzzz5vm",
       "depends": ["DT", "Hmisc", "data_table", "foreign", "ggplot2", "haven", "openxlsx", "r_import", "rclipboard", "readr", "rstudioapi", "shiny", "shinyFiles", "shinyWidgets", "shinydashboard", "shinyjs", "stringi", "stringr"]
     },
     "RAMClustR": {
@@ -25851,8 +26907,8 @@
     },
     "RANN": {
       "name": "RANN",
-      "version": "2.6.1",
-      "sha256": "10kid40w9w7vkz2hpcfkdpxr4afxzms5dzvfwr0sl5xynzgw76dj",
+      "version": "2.6.2",
+      "sha256": "0wlpkf6vilw871ac2bxy5nr790cfs6sax5k8m0fhasxbansxbxvf",
       "depends": []
     },
     "RAPTOR": {
@@ -25905,14 +26961,14 @@
     },
     "RApiSerialize": {
       "name": "RApiSerialize",
-      "version": "0.1.3",
-      "sha256": "0azl8qykls635qxd4lcqmznvpqb5ldy6hqx3p7icqamvx9ckfhcz",
+      "version": "0.1.4",
+      "sha256": "1jb31laigm6zbjr5l10xdfriblsz3yv0n09y4lbs34qglyn79f96",
       "depends": []
     },
     "RAppArmor": {
       "name": "RAppArmor",
-      "version": "3.2.4",
-      "sha256": "1dg9ykmgb2bzqyh08jhfm1wv6zniqg6p49k8mfgxb534sqv5wdn4",
+      "version": "3.2.5",
+      "sha256": "12l4acr1vrn8rga4072yrp5hkwxl4llm8232gwzpihl3qlfj4121",
       "depends": ["unix"]
     },
     "RAthena": {
@@ -25953,8 +27009,8 @@
     },
     "RBesT": {
       "name": "RBesT",
-      "version": "1.7-3",
-      "sha256": "19bhn1j03qsmc20xndyls0ynhqbwb3kis6mxm7wh9k87zcm1lvla",
+      "version": "1.7-4",
+      "sha256": "1zi8fk712fjwv51rfzv1wx8m0is753v2b813g38hpdfadh8arfx3",
       "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "abind", "assertthat", "bayesplot", "checkmate", "dplyr", "ggplot2", "matrixStats", "mvtnorm", "rlang", "rstan", "rstantools"]
     },
     "RBtest": {
@@ -25977,8 +27033,8 @@
     },
     "RCALI": {
       "name": "RCALI",
-      "version": "0.3.6",
-      "sha256": "1w9g5wph5l6agrlzrb8axv4ldv4aid745vkm1r5ndsmssrbgf7v9",
+      "version": "0.3.7",
+      "sha256": "0p8cvxxrnwwhd2025hdwwhaa1bk8yhsd8dcmrwv2kj13aqdywq3g",
       "depends": ["splancs"]
     },
     "RCBR": {
@@ -26023,16 +27079,28 @@
       "sha256": "1bdgc7rwkdkimp4k1p5ah26nbp1ic09kyyx6xily260xq7m31g1w",
       "depends": ["KernSmooth", "locpol"]
     },
+    "RCMsize": {
+      "name": "RCMsize",
+      "version": "1.0.0",
+      "sha256": "1i148vlg3y9w6abnzzic8773s4r7ly5js1h9klj2gh66raybzrw6",
+      "depends": ["binom"]
+    },
+    "RCNA": {
+      "name": "RCNA",
+      "version": "1.0",
+      "sha256": "09y2nhbchlb6salccas9v1zp8yr4nfivlgcp35pbirx3n3dy5xi4",
+      "depends": ["R_utils", "data_table", "doParallel", "foreach", "modeest"]
+    },
     "RCPA": {
       "name": "RCPA",
-      "version": "0.2.3",
-      "sha256": "0jk53sqcjy6a2ydv4b2ai57lbpjpva1ssmfqgzb3nl7j8iqk2ggl",
+      "version": "0.2.5",
+      "sha256": "0lihpwycp1xm9m1kb6xbr7ingw1qabgdn9za3f8prkqzpg223dg7",
       "depends": ["AnnotationDbi", "Biobase", "BiocManager", "DESeq2", "GEOquery", "IRdisplay", "RobustRankAggreg", "SummarizedExperiment", "dplyr", "edgeR", "ggnewscale", "ggpattern", "ggplot2", "ggrepel", "graph", "httr", "jsonlite", "limma", "rlang", "scales", "stringr", "tidyr"]
     },
     "RCPA3": {
       "name": "RCPA3",
-      "version": "1.2.1",
-      "sha256": "1xcrlnd41r9f7p4ql258hjh81alzah1p19pk9kady0ardp0xq1zz",
+      "version": "1.3.1",
+      "sha256": "1nfhvb26yi9iki6qh9vx2y08f83ci5h0w2i4lvd4rcd97nnfqgsv",
       "depends": ["Hmisc", "beepr", "car", "descr", "haven", "knitr", "lmtest", "survey", "weights"]
     },
     "RCRnorm": {
@@ -26107,6 +27175,12 @@
       "sha256": "03w2psiix74d2cbaz06bk77pclc6lfjhfdi057rdmw4nv3xv1fqi",
       "depends": ["assertthat", "dplyr", "httr", "lubridate", "magrittr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "RCognito": {
+      "name": "RCognito",
+      "version": "0.1.0",
+      "sha256": "0b8mhclwp5lx948nlglnx5h5hdykixs1fz6big5liz88218phxg4",
+      "depends": ["paws"]
+    },
     "RColetum": {
       "name": "RColetum",
       "version": "0.2.2",
@@ -26151,20 +27225,20 @@
     },
     "RCytoGPS": {
       "name": "RCytoGPS",
-      "version": "1.2.5",
-      "sha256": "0a5ap6dizxsilsrv0gyg9vjawm9b6r91a8kbmyd66lpssk4mzc1i",
+      "version": "1.2.7",
+      "sha256": "1xix60ch4zmx60nvyjb69ihg2axqbvdsphw5my68g17am0gk41bd",
       "depends": ["rjson"]
     },
     "RCzechia": {
       "name": "RCzechia",
-      "version": "1.12.2",
-      "sha256": "0qkg307cik7bvhgi8rm8h27pv1247559ndk39r4mjf6wql7bylwb",
+      "version": "1.12.3",
+      "sha256": "160d4f8paqysm184vxqfz8zyy8jdfmxin1bmgd1v8130na0ynm7b",
       "depends": ["curl", "httr", "jsonlite", "magrittr", "sf"]
     },
     "RDHonest": {
       "name": "RDHonest",
-      "version": "1.0.0",
-      "sha256": "15mfv573sqqhsa1snswcjbh4kyz26kldim0nx16hypzx09x6rrrc",
+      "version": "1.0.1",
+      "sha256": "162la7ilid7ljbdhzpz82fvwslxwaca80lvmvg80inp3is3kypfp",
       "depends": ["Formula", "withr"]
     },
     "RDM": {
@@ -26187,8 +27261,8 @@
     },
     "RDS": {
       "name": "RDS",
-      "version": "0.9-9",
-      "sha256": "02gd6jara1hi6h9rqcxb0an9dvnvajdi1x10cf3kqfvaa0i64igf",
+      "version": "0.9-10",
+      "sha256": "0pba1pdc6mzm9463azp36c6rsl7x8b4c0hsp9h7i5z467z7yshj0",
       "depends": ["Hmisc", "anytime", "ergm", "ggplot2", "gridExtra", "igraph", "isotone", "network", "reshape2", "scales", "statnet_common"]
     },
     "RDSsamplesize": {
@@ -26241,9 +27315,9 @@
     },
     "REDCapCAST": {
       "name": "REDCapCAST",
-      "version": "24.6.1",
-      "sha256": "18s85ryg5mr7cv1j4938ax7v3b8fsrbaaa5lv191h0ixwkyz5cp9",
-      "depends": ["REDCapR", "assertthat", "dplyr", "haven", "keyring", "openxlsx2", "purrr", "readODS", "readr", "shiny", "tidyr", "tidyselect", "zip"]
+      "version": "24.12.1",
+      "sha256": "107bwfv288qpc3bfr3bcsmqxbs9771jrjid4b7yydsv15vxd2q96",
+      "depends": ["REDCapR", "assertthat", "bslib", "dplyr", "forcats", "glue", "gt", "gtsummary", "haven", "here", "keyring", "openxlsx2", "purrr", "readODS", "readr", "shiny", "tidyr", "tidyselect", "vctrs", "zip"]
     },
     "REDCapDM": {
       "name": "REDCapDM",
@@ -26253,21 +27327,21 @@
     },
     "REDCapExporter": {
       "name": "REDCapExporter",
-      "version": "0.2.2",
-      "sha256": "0w7c1y58vnkbd11ndkcn5s5c54pmvyqhflwgg2q6dc3n671yp9wx",
-      "depends": ["curl", "data_table", "keyring", "lubridate"]
+      "version": "0.3.1",
+      "sha256": "0pwyv6wz03d38yi9xgwzjfy2sjwq30h11nji1jb30h24ls4ynxyp",
+      "depends": ["curl", "keyring", "lubridate", "rjson"]
     },
     "REDCapR": {
       "name": "REDCapR",
-      "version": "1.1.0",
-      "sha256": "02d41mbplc7fb0yf6sf62fzfzai95vjqxhz2hkz7135w17s31j8r",
+      "version": "1.3.0",
+      "sha256": "1xk7blqibnl2n9q10rjgx6vfblpm9qj6sfdcvfm245kpbj65vxc9",
       "depends": ["checkmate", "dplyr", "httr", "jsonlite", "magrittr", "readr", "rlang", "tibble", "tidyr"]
     },
     "REDCapTidieR": {
       "name": "REDCapTidieR",
-      "version": "1.1.1",
-      "sha256": "0a7q2mfnjfyfkdafvvl7y69c52qh8wsqrygv77wnrjl4kjf80gwv",
-      "depends": ["REDCapR", "checkmate", "cli", "dplyr", "formattable", "lobstr", "lubridate", "pillar", "purrr", "readr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
+      "version": "1.2.1",
+      "sha256": "0rppaxj1p27vmjq79va2x8g0jg5f1k84qwflw9yhxzbwxnlcv7rr",
+      "depends": ["REDCapR", "checkmate", "cli", "dplyr", "forcats", "formattable", "glue", "lobstr", "lubridate", "pillar", "purrr", "readr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "REDI": {
       "name": "REDI",
@@ -26295,10 +27369,16 @@
     },
     "REMLA": {
       "name": "REMLA",
-      "version": "1.1",
-      "sha256": "1j094h38047vlbql8vvlbbdnwxqpw7vnvc08qa2c95jqw8kvhwa6",
+      "version": "1.2.0",
+      "sha256": "0qjrck92fjmvwmwix5kniaqhh3y81xgpbmbfcsgimjjgpj1dqmma",
       "depends": ["GPArotation", "geex"]
     },
+    "REN": {
+      "name": "REN",
+      "version": "0.1.0",
+      "sha256": "0cw22p8qy5fv3y3xwplwj0ydfr12l8nymsnyg1iksyqa6jah01y2",
+      "depends": ["Matrix", "corpcor", "doParallel", "foreach", "ggplot2", "glmnet", "lubridate", "quadprog", "reshape2", "tictoc"]
+    },
     "REPLesentR": {
       "name": "REPLesentR",
       "version": "0.4.1",
@@ -26341,6 +27421,12 @@
       "sha256": "100w8a28bz2x9sihd9ghmiha9p5dxbwnzkrdgxg42211zmbil8cb",
       "depends": ["aod", "boot", "car", "clubSandwich", "ggplot2", "lmtest", "nlme", "sandwich"]
     },
+    "RESIDE": {
+      "name": "RESIDE",
+      "version": "0.3.2",
+      "sha256": "1f0llk8g8flirh5kwjfbnba1np6bm6jqs16sgsymz8f2jcx23mni",
+      "depends": ["RDP", "bestNormalize", "dplyr", "magrittr", "matrixcalc", "simstudy", "tibble"]
+    },
     "RESS": {
       "name": "RESS",
       "version": "1.3",
@@ -26373,8 +27459,8 @@
     },
     "REffectivePred": {
       "name": "REffectivePred",
-      "version": "1.0.0",
-      "sha256": "1ahaxwgbyfnq2gii24gg8kzhy5822v5hvdmsw2g7p9jndz7xrrkg",
+      "version": "1.0.1",
+      "sha256": "1gxiphrfmw76zvdvq8qqi1cd8n7ywyqrv0dxdx7gcm864a1af7nj",
       "depends": ["config", "yaml", "zoo"]
     },
     "REndo": {
@@ -26515,6 +27601,12 @@
       "sha256": "1gpn595ywc1yrmr0vgwk5fa2j062pap85rz62dnyz2cncr0kvr48",
       "depends": []
     },
+    "RGS": {
+      "name": "RGS",
+      "version": "1.0",
+      "sha256": "0zwj6hnpkb2zixr35hfybaizrsmb53p7jj0xijihib5hy2xj8w30",
+      "depends": ["SemiPar", "rms", "survival"]
+    },
     "RGenData": {
       "name": "RGenData",
       "version": "1.0",
@@ -26547,8 +27639,8 @@
     },
     "RGraphSpace": {
       "name": "RGraphSpace",
-      "version": "1.0.6",
-      "sha256": "1rdq9gnmc2znlpq60n3sn8zpir3wfa2k2ds63pcw1v4w921dmz55",
+      "version": "1.0.7",
+      "sha256": "05k532mwvsm9kjid69xk6pp87bgfh1hrwzq6h4gp9aphbm97nys5",
       "depends": ["ggplot2", "igraph", "scales"]
     },
     "RGraphics": {
@@ -26595,9 +27687,9 @@
     },
     "RHRV": {
       "name": "RHRV",
-      "version": "4.2.7",
-      "sha256": "0w4r2sk1h9wxmhs5l2dk9gzr85wrss3m4qi67mj37cjd4qmmn1wi",
-      "depends": ["lomb", "nonlinearTseries", "waveslim"]
+      "version": "5.0.0",
+      "sha256": "1r7drf82z7ws7j9xjb308zy0wzxs42rlv6kxr4cqk75jsw45hhi3",
+      "depends": ["PMCMRplus", "boot", "broom", "doParallel", "foreach", "iterators", "lomb", "nonlinearTseries", "plotrix", "segmented", "tibble", "tidyr", "waveslim", "writexl"]
     },
     "RHSDB": {
       "name": "RHSDB",
@@ -26715,14 +27807,14 @@
     },
     "RJDemetra": {
       "name": "RJDemetra",
-      "version": "0.2.6",
-      "sha256": "17wfzv3gknx2x90bhlq09yk6wggrq67ylbxn6biiy1qrpipyw4jj",
+      "version": "0.2.8",
+      "sha256": "0z7qyvpn48a51mlj43yiznf38z78yby8g5l6abll8mjwg45nwbvl",
       "depends": ["rJava"]
     },
     "RJSDMX": {
       "name": "RJSDMX",
-      "version": "3.3-0",
-      "sha256": "08llfpyj85nnqn07vw3i7hjs3hn84s8grg6cjjqynn38kw1849ry",
+      "version": "3.5-0",
+      "sha256": "0qz94v1v8dhijmjvqv78zb45s5ayfnd4syfjqpjbpcl5c6q582vp",
       "depends": ["rJava", "zoo"]
     },
     "RJSONIO": {
@@ -26743,6 +27835,12 @@
       "sha256": "1immjb2313ss7pc61m3y59h6m3i0257lhvrkkvhrprl9jsyanfca",
       "depends": ["Rcpp", "bbmle", "binom", "dplyr", "ggplot2", "mvtnorm", "numDeriv", "openxlsx", "readxl", "stringr"]
     },
+    "RJalaliDate": {
+      "name": "RJalaliDate",
+      "version": "0.1.0",
+      "sha256": "0q03q95wy3zj98fn0fg9k4vqkkfvfn59v9ajsfm3b6baqkj8ppdk",
+      "depends": ["lubridate", "settings", "stringi", "stringr"]
+    },
     "RJcluster": {
       "name": "RJcluster",
       "version": "3.2.4",
@@ -26821,6 +27919,12 @@
       "sha256": "1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj",
       "depends": ["rstackdeque", "stringr"]
     },
+    "RLoptimal": {
+      "name": "RLoptimal",
+      "version": "1.2.0",
+      "sha256": "0jzs037qx6rcljqyqzjslqv6kysxwz5xy2wzni955qyl4chix098",
+      "depends": ["DoseFinding", "R6", "glue", "reticulate"]
+    },
     "RLumCarlo": {
       "name": "RLumCarlo",
       "version": "0.1.9",
@@ -26875,6 +27979,12 @@
       "sha256": "0nzbjnayp85541pnibal517dhc0s7mhlllshx36m44lv2x3figpl",
       "depends": ["BH", "Rcpp"]
     },
+    "RMFM": {
+      "name": "RMFM",
+      "version": "1.1.0",
+      "sha256": "0jibvgr0f9vkvxn1hc32j5i9pd281qw2xkf7fgcg8hy3w89f37v6",
+      "depends": ["COAP", "LaplacesDemon", "MixMatrix", "Rcpp", "RcppArmadillo", "irlba"]
+    },
     "RMKdiscrete": {
       "name": "RMKdiscrete",
       "version": "0.2",
@@ -26937,8 +28047,8 @@
     },
     "RMSS": {
       "name": "RMSS",
-      "version": "1.1.1",
-      "sha256": "18hm626yr3xrsi9spzr42y9pf547xdx7byqq15bvh9f04qaalck3",
+      "version": "1.1.2",
+      "sha256": "01hf291czmdijm1152ckdrd33a8w2m0rdwclaj607b81hb1431q0",
       "depends": ["Rcpp", "RcppArmadillo", "cellWise", "robStepSplitReg", "robustbase", "srlars"]
     },
     "RMT4DS": {
@@ -26967,8 +28077,14 @@
     },
     "RMVL": {
       "name": "RMVL",
-      "version": "1.1.0.0",
-      "sha256": "1fypvlg8qi4kn3awii244vqcn9zzsci5bqv8ywpnfigph26din6f",
+      "version": "1.1.0.1",
+      "sha256": "13wyp4ri6b73j8vn787rzf5532maqmq8slv743c69rzgs2vw9hjn",
+      "depends": []
+    },
+    "RMX": {
+      "name": "RMX",
+      "version": "0.1-6",
+      "sha256": "077l2z8z2kv8lvsff5jikranchw49g9x9g029klsp4813hy7nqn5",
       "depends": []
     },
     "RMaCzek": {
@@ -26985,8 +28101,8 @@
     },
     "RMariaDB": {
       "name": "RMariaDB",
-      "version": "1.3.2",
-      "sha256": "0a38hbc9nc25x9a8z91wc24h4llmyhjim6vavmwrx2r14c3fz1vw",
+      "version": "1.3.3",
+      "sha256": "0b8qqg4pgz5fm21zp3jslrgmx0100rhg27lxpia3yl514pdnyvy6",
       "depends": ["DBI", "bit64", "blob", "cpp11", "hms", "lubridate", "plogr", "rlang"]
     },
     "RMark": {
@@ -27027,8 +28143,8 @@
     },
     "RMySQL": {
       "name": "RMySQL",
-      "version": "0.10.27",
-      "sha256": "1axz0pqvpqs028p2j7awmgdwpignl7m3hqd1fv3vkgfrkil5nwzi",
+      "version": "0.10.29",
+      "sha256": "11kbjzr6bff3ns7bh3aic8kw5bqgf1aaz2fw04vv28dwrqzrxs42",
       "depends": ["DBI"]
     },
     "RNAmf": {
@@ -27123,9 +28239,9 @@
     },
     "RNiftyReg": {
       "name": "RNiftyReg",
-      "version": "2.8.3",
-      "sha256": "0vbzjybn0431r7brh53azzw5n6nii5j4mcd9j8s7ifps6apd3s3f",
-      "depends": ["RNifti", "Rcpp", "RcppEigen", "ore"]
+      "version": "2.8.4",
+      "sha256": "1vj5rr97fzb98ggf013rir1b7i48d1cm90xkzasa3nw066vbgs04",
+      "depends": ["RNifti", "Rcpp", "RcppEigen"]
     },
     "ROAuth": {
       "name": "ROAuth",
@@ -27189,8 +28305,8 @@
     },
     "RODBC": {
       "name": "RODBC",
-      "version": "1.3-23",
-      "sha256": "0fqgbs2zanq7xjl252s1fpqivqz4ll23nnf74122kcxgq1dd3k8m",
+      "version": "1.3-26",
+      "sha256": "0qawr81jzii33n39397c7m2m1z50qg4m0xfwvswfvfiv0grh1rps",
       "depends": []
     },
     "RODBCDBI": {
@@ -27381,8 +28497,8 @@
     },
     "ROptEst": {
       "name": "ROptEst",
-      "version": "1.3.3",
-      "sha256": "0mid70i7mjic6s5vswbggpln9iv78sm9h8lrqqg2a0g379n9brbp",
+      "version": "1.3.4",
+      "sha256": "0hkasa1lzxyj6d4lbrgq9pghgvgpvj8hbygizyb7iywcdsaakz1f",
       "depends": ["MASS", "RandVar", "RobAStBase", "distr", "distrEx", "distrMod", "startupmsg"]
     },
     "ROptSpace": {
@@ -27403,12 +28519,6 @@
       "sha256": "1k5w6fi1f83mhlc8hx6y305llcwxl22h6lpkib1yvm4557k1c7zz",
       "depends": ["DBI"]
     },
-    "RPANDA": {
-      "name": "RPANDA",
-      "version": "2.3",
-      "sha256": "12cah5vw9jcpnprnfhqwdh11fkn68djzgvdv2hr23yppa8nfn9zc",
-      "depends": ["BB", "GUniFrac", "Matrix", "ParallelLogger", "RColorBrewer", "R_utils", "Rmpfr", "TESS", "ape", "bipartite", "cluster", "coda", "deSolve", "fields", "fpc", "geiger", "glassoFast", "igraph", "mvMORPH", "mvtnorm", "phangorn", "phytools", "picante", "pracma", "pspline", "pvclust", "raster", "vegan"]
-    },
     "RPDTest": {
       "name": "RPDTest",
       "version": "0.0.2",
@@ -27475,6 +28585,12 @@
       "sha256": "1lw28cfi397klxxhs97dwzsfk7ykggbh4p82yg73sq6yq3liha1a",
       "depends": ["Biobase", "Hmisc", "gam", "ggplot2", "gplots", "lattice", "limma", "quantreg"]
     },
+    "RPatternJoin": {
+      "name": "RPatternJoin",
+      "version": "1.0.0",
+      "sha256": "1v14bm286blwrw3g9b1cz3mnxac94jg0mskg6r9fnfl7iix52h1q",
+      "depends": ["Rcpp", "RcppArmadillo"]
+    },
     "RPhosFate": {
       "name": "RPhosFate",
       "version": "1.0.4",
@@ -27483,14 +28599,14 @@
     },
     "RPointCloud": {
       "name": "RPointCloud",
-      "version": "0.6.2",
-      "sha256": "1n2rlw7zpmwsk95glgfa1wcr1k4hpyknd6xcc4996305k0s0lim2",
-      "depends": ["ClassDiscovery", "Mercator", "TDA", "circlize", "rgl"]
+      "version": "0.8.0",
+      "sha256": "1rzqfszcras62gndzg3z34qlhkqjdrrf3z5gcxfqdfmn6cj2ynm9",
+      "depends": ["ClassComparison", "ClassDiscovery", "Mercator", "TDA", "circlize", "rgl"]
     },
     "RPostgreSQL": {
       "name": "RPostgreSQL",
-      "version": "0.7-6",
-      "sha256": "0b1dmx5pcd4v1xg25ihxilkga3zdblb1xy896ik5fdkaidq3jn9q",
+      "version": "0.7-7",
+      "sha256": "073xdjcbpsy9j68migxrp6p51lw6rn3rx1l4z7bygayb4niklngh",
       "depends": ["DBI"]
     },
     "RPostgres": {
@@ -27573,14 +28689,14 @@
     },
     "RRBoost": {
       "name": "RRBoost",
-      "version": "0.1",
-      "sha256": "0zp3csrpi0awk88m6sq5sf5v7j32q5sd4mwv61x6bblg991k404k",
+      "version": "0.2",
+      "sha256": "1n13aj4lf6550gx6sxv7h7xjjwi4r46pbnigbchaxm8whlzmizk8",
       "depends": ["RobStatTM", "rpart"]
     },
     "RRF": {
       "name": "RRF",
-      "version": "1.9.4",
-      "sha256": "1kdyw0v1m3ajf88gzs70p6l6pic4g46ccwqxi9iznimayby6ygjb",
+      "version": "1.9.4.1",
+      "sha256": "05sswrqjrwyyk9aha7fvvw78iymgv89y0asl5cqfl9fg7gsw9ghs",
       "depends": []
     },
     "RRI": {
@@ -27603,8 +28719,8 @@
     },
     "RRPP": {
       "name": "RRPP",
-      "version": "2.0.3",
-      "sha256": "1dd2v1zsi1hgb73a4fjd54k2mg43sb26h9l45nq9phsn8rnrfw7z",
+      "version": "2.0.4",
+      "sha256": "021f1d90rqr8yhgkhg9adym5lkm6gkyi6fyd1dh4caffm0g69281",
       "depends": ["Matrix", "ape", "ggplot2"]
     },
     "RRRR": {
@@ -27633,8 +28749,8 @@
     },
     "RRphylo": {
       "name": "RRphylo",
-      "version": "2.8.0",
-      "sha256": "1s79x7b4qbsm412vp4z8pq1803jwnr0i6mgggpk8h5pk5j3klc3f",
+      "version": "2.8.1",
+      "sha256": "0hgywjh0lac626ybfvycykhacav10pzrf6vcy3bp2nf4ihik7yhy",
       "depends": ["ape", "doParallel", "emmeans", "foreach", "phytools"]
     },
     "RRreg": {
@@ -27705,8 +28821,8 @@
     },
     "RSEIS": {
       "name": "RSEIS",
-      "version": "4.2-0",
-      "sha256": "051dd1g188llwrc5g8w3k8wxmni24lqnp8brxvggy3v6d4gkkv4k",
+      "version": "4.2-4",
+      "sha256": "1angs16rm2077cnjq6hs3n7qhdpfljsmv9yf5dm6wsmgbq9h96vs",
       "depends": ["RPMG", "Rwave"]
     },
     "RSGHB": {
@@ -27741,8 +28857,8 @@
     },
     "RSQLite": {
       "name": "RSQLite",
-      "version": "2.3.7",
-      "sha256": "1kllna6hfnyy3rizr8wkpfn7p5sxv3sra12x9vz68hp6i4jmgq15",
+      "version": "2.3.9",
+      "sha256": "116029x7kykxy0wg4p1ln14x6w7wa16jdsnb8wmy6c4khdzlbsym",
       "depends": ["DBI", "bit64", "blob", "cpp11", "memoise", "pkgconfig", "plogr", "rlang"]
     },
     "RSSL": {
@@ -27853,6 +28969,12 @@
       "sha256": "0q5wa7bq7m94xx8hcf9p29v5vvkrqzygs3v6yy5xl6jgvshvscvi",
       "depends": ["stringi", "stringr"]
     },
+    "RSquaredMI": {
+      "name": "RSquaredMI",
+      "version": "0.2.0",
+      "sha256": "0ag9ddxz535dmhisffqdak62m6cxw8ndbqx66z61pz46zklcljag",
+      "depends": ["altR2", "lm_beta", "matrixStats", "mice"]
+    },
     "RStata": {
       "name": "RStata",
       "version": "1.1.1",
@@ -27885,8 +29007,8 @@
     },
     "RTDE": {
       "name": "RTDE",
-      "version": "0.2-1",
-      "sha256": "1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq",
+      "version": "0.2-2",
+      "sha256": "1hf5jr071wzj5ms5s2a5cbwr32iycx8h1wlnbmd6p9biljawbpwd",
       "depends": []
     },
     "RTFA": {
@@ -27915,8 +29037,8 @@
     },
     "RTMB": {
       "name": "RTMB",
-      "version": "1.5",
-      "sha256": "1sgkvr0kyr46lvmp1vyv5fcqaf1qsnm24zbwlh42qrhgh8hxa871",
+      "version": "1.6",
+      "sha256": "1d9b8rxx9nj7psjcsvsv51lyik6cki3dqm996yhjysycd8ncpfx7",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen", "TMB"]
     },
     "RTSA": {
@@ -27951,8 +29073,8 @@
     },
     "RTriangle": {
       "name": "RTriangle",
-      "version": "1.6-0.13",
-      "sha256": "1rbilz34fm8i6krvbpzhv3d0s1ix1lcc3n82jmhdddkvdh465pc6",
+      "version": "1.6-0.14",
+      "sha256": "04x7xyyrh2hz556iv133iynf0vy17g8m4bli9jb6b1inrq6bdg9v",
       "depends": []
     },
     "RUnit": {
@@ -28009,6 +29131,12 @@
       "sha256": "1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3",
       "depends": ["Rcpp", "data_table", "dplyr", "feather", "tibble", "tidyr", "xts", "zoo"]
     },
+    "RWNN": {
+      "name": "RWNN",
+      "version": "0.4",
+      "sha256": "1xr2p98rx2q6l4jfhm99xbhzmi0sgnysh8gd8ddvg9g1122vz7aw",
+      "depends": ["Rcpp", "RcppArmadillo", "quadprog", "randtoolbox"]
+    },
     "RWeka": {
       "name": "RWeka",
       "version": "0.4-46",
@@ -28047,8 +29175,8 @@
     },
     "RWsearch": {
       "name": "RWsearch",
-      "version": "5.1.4",
-      "sha256": "09rkq84ppy6f6ak229wim5y0zd295saabh3q4lmv23zi6z3a9ngh",
+      "version": "5.2.0",
+      "sha256": "046z49yrsm1rsqvz3xf0fb3qy53xdzm95qs9q24pgzyz5s4rjm8f",
       "depends": ["XML", "brew", "latexpdf", "networkD3", "sig", "sos"]
     },
     "RXKCD": {
@@ -28095,8 +29223,8 @@
     },
     "RaMS": {
       "name": "RaMS",
-      "version": "1.4.0",
-      "sha256": "0bhp4sibym8gbzcqzhplfkln31z7b06v4ycd46rg4167yivm2xxc",
+      "version": "1.4.3",
+      "sha256": "14sclcyvvjlxgcqf8qkxlmci3haxpn87gn25gxvlpxkkd5ff44ss",
       "depends": ["base64enc", "data_table", "xml2"]
     },
     "RaSEn": {
@@ -28107,8 +29235,8 @@
     },
     "RaceID": {
       "name": "RaceID",
-      "version": "0.3.5",
-      "sha256": "0jmgc2nf65ymhk88mzlmh96wwygr0gs3ca1mc0all0a5c6vxyj8b",
+      "version": "0.3.9",
+      "sha256": "00c7bwjamxnhljcdgyb285zwd6sd0x81siva437d2xj21ki6ils1",
       "depends": ["FNN", "FateID", "MASS", "Matrix", "RColorBrewer", "Rcpp", "Rtsne", "cluster", "coop", "fpc", "ggplot2", "harmony", "ica", "igraph", "irlba", "leiden", "locfit", "matrixStats", "pheatmap", "princurve", "quadprog", "randomForest", "runner", "umap", "vegan"]
     },
     "Racmacs": {
@@ -28123,6 +29251,12 @@
       "sha256": "0kpmxii2080iid99y1rh0bdrvw2wf6gqwbafa4p28hvbw9lk6zw3",
       "depends": []
     },
+    "RadEro": {
+      "name": "RadEro",
+      "version": "1.0.5",
+      "sha256": "1gpmhqw0rpipvzgadwh20l4sfhz86vjy1vnh9x02l67q5phsvc5n",
+      "depends": ["Rcpp", "data_table", "devtools", "dplyr", "ggplot2", "jsonlite", "patchwork", "roxygen2", "usethis"]
+    },
     "RadOnc": {
       "name": "RadOnc",
       "version": "1.1.8",
@@ -28191,14 +29325,14 @@
     },
     "RandVar": {
       "name": "RandVar",
-      "version": "1.2.3",
-      "sha256": "00zpbbf7b3g38lh1krvwhfyxlz3f9cklfg9z2adi65lwqc27w54b",
+      "version": "1.2.4",
+      "sha256": "1w7dv3cskmwnln0i76kqqis23i4zqlcfs43rkl9sp60rprfihm7w",
       "depends": ["distr", "distrEx", "startupmsg"]
     },
     "RandomForestsGLS": {
       "name": "RandomForestsGLS",
-      "version": "0.1.4",
-      "sha256": "1viq8vv4f0l0ywcr9s1n1vk23a917yj35lgvrpac9rf0vvk70an7",
+      "version": "0.1.5",
+      "sha256": "0xyryzlqc1miradkhj2z717ws02iasz0xnc95k1iiaw0xrpybkmz",
       "depends": ["BRISC", "matrixStats", "pbapply", "randomForest"]
     },
     "RandomProjectionTest": {
@@ -28207,6 +29341,12 @@
       "sha256": "1pg88q7k89s33yfnqkn5d03mc3ix8ihh4q3l6064p44d98wdsw4f",
       "depends": ["MASS", "glue"]
     },
+    "RandomWalker": {
+      "name": "RandomWalker",
+      "version": "0.2.0",
+      "sha256": "0x1d1s4mylfl0jgx94kvl26vgkndx6gc1bcfxqwq1ayckpsvld84",
+      "depends": ["NNS", "dplyr", "ggiraph", "patchwork", "purrr", "rlang", "tidyr"]
+    },
     "Randomuseragent": {
       "name": "Randomuseragent",
       "version": "0.0.1",
@@ -28267,6 +29407,12 @@
       "sha256": "044c3qs6vyijl8j21rs351jvmz2f6i864bzzy8vrh4p58j7zhq0d",
       "depends": ["Rcpp", "crayon", "digest", "dplyr", "glue", "httr", "httr2", "jsonlite", "lubridate", "magrittr", "purrr", "rlang", "rlist", "stringr", "tibble"]
     },
+    "RapidFuzz": {
+      "name": "RapidFuzz",
+      "version": "1.0",
+      "sha256": "0sidnjdqcykjnhl8ilc31sdrrbhyyxjpdxznfr9n8n8m4ihv12ng",
+      "depends": ["Rcpp"]
+    },
     "RapidPolygonLookup": {
       "name": "RapidPolygonLookup",
       "version": "0.1.1",
@@ -28353,8 +29499,8 @@
     },
     "Rbeast": {
       "name": "Rbeast",
-      "version": "1.0.0",
-      "sha256": "1k36rinhm8r6czk60f51p2d895g280k6qrr6qkcqc33l60jl6khi",
+      "version": "1.0.1",
+      "sha256": "0mwa4gqv3m9rvdja4spsh3bzyp9xyw2hlqs76pxyby581vaqa33j",
       "depends": []
     },
     "Rbent": {
@@ -28365,14 +29511,14 @@
     },
     "RblDataLicense": {
       "name": "RblDataLicense",
-      "version": "0.2.5",
-      "sha256": "05xwk8j8qgy89vg1dkjwslbbbb3nrqagbiwag8giyzifx7w0gfsp",
+      "version": "0.2.6",
+      "sha256": "1nh8gw4c94zxfx5fhvgn9hg8nqb31r6gzjdmj22q0sbsrfq5adv5",
       "depends": ["RCurl", "xts"]
     },
     "Rblpapi": {
       "name": "Rblpapi",
-      "version": "0.3.14",
-      "sha256": "1xrfz5f7vibsfdn0v3mg7rvbn31j9znqk902cb1fwbqfqnkxw9yx",
+      "version": "0.3.15",
+      "sha256": "02fjk0b7drsqfjxxiacvp3b9rvygbxnf1n1b9dc4n4jws2s0bnq1",
       "depends": ["BH", "Rcpp"]
     },
     "Rborist": {
@@ -28389,8 +29535,8 @@
     },
     "Rcan": {
       "name": "Rcan",
-      "version": "1.3.82",
-      "sha256": "0asmlhh786c9gfgxkqybv8xzz8bqzirxvq8nr4gglx1pc812idkb",
+      "version": "1.3.91",
+      "sha256": "1himszrwppswwi7ghjs9v4yim55ia4qgi9lphdibgnz8x9bwk2li",
       "depends": ["data_table", "ggplot2", "scales"]
     },
     "Rcapture": {
@@ -28401,8 +29547,8 @@
     },
     "Rcatch22": {
       "name": "Rcatch22",
-      "version": "0.2.1",
-      "sha256": "1ggraxn88fl8m63d7aaffifgj34g6nrzjjd696lkj8ysi6x77qdl",
+      "version": "0.2.3",
+      "sha256": "1lj8md9s9c56w26h2sapvvzlxhgdxwb41xs75fcxzj3mdzvm1ywl",
       "depends": ["Rcpp", "rlang"]
     },
     "RcausalEGM": {
@@ -28413,8 +29559,8 @@
     },
     "Rcereal": {
       "name": "Rcereal",
-      "version": "1.2.1.1",
-      "sha256": "16gak1kgsnla89b6nbhfb5w9xfjhdpxza8sfc2isbhfggvl1h79j",
+      "version": "1.3.2",
+      "sha256": "1zp6dsfwrpyy2iycybjlx34kn79236ack3b60kz77rjrz4m8h2vd",
       "depends": []
     },
     "RcextTools": {
@@ -28443,8 +29589,8 @@
     },
     "Rcmdr": {
       "name": "Rcmdr",
-      "version": "2.9-2",
-      "sha256": "175c5iqgp2j7x5vjijnklc35nbnyz0s83rzmf7qq8kxv8fv2jmw8",
+      "version": "2.9-5",
+      "sha256": "06yy14iimc54w1j0wgjslnrb1qkqqnaaq0kx3by815i0kxq7v9dx",
       "depends": ["RcmdrMisc", "abind", "car", "effects", "lme4", "relimp", "tcltk2"]
     },
     "RcmdrMisc": {
@@ -28491,8 +29637,8 @@
     },
     "RcmdrPlugin_DoE": {
       "name": "RcmdrPlugin.DoE",
-      "version": "0.12-5",
-      "sha256": "0nsaj3wis8fn73spyv90j0magcl3lq4pznfxzdr62rg8w7likqx7",
+      "version": "0.12-6",
+      "sha256": "0q9sihnaibpyh115rysg1j55vlg6wnvmll44qcz76cbjj4pk1xhh",
       "depends": ["DoE_base", "DoE_wrapper", "FrF2", "Rcmdr", "RcmdrMisc"]
     },
     "RcmdrPlugin_EACSPIR": {
@@ -28605,8 +29751,8 @@
     },
     "RcmdrPlugin_UCA": {
       "name": "RcmdrPlugin.UCA",
-      "version": "5.1-1",
-      "sha256": "15z2pyi92vznkbfqycc33b39dl2wx0kf2l5w1wv8pr85i5449dzq",
+      "version": "5.1-2",
+      "sha256": "0m46318z7rrdh3amw5rs6crkpdrn1kkbn9hvqswky9swjj6ckrry",
       "depends": ["IQCC", "Rcmdr", "TeachingDemos", "qcc", "qicharts2", "randtests", "rmarkdown", "tseries"]
     },
     "RcmdrPlugin_WorldFlora": {
@@ -28659,8 +29805,8 @@
     },
     "Rcompadre": {
       "name": "Rcompadre",
-      "version": "1.3.0",
-      "sha256": "0ca82svcycz2qwk1hx808pm4d86z7i61hc427fkvknjj73vaiz5a",
+      "version": "1.4.0",
+      "sha256": "1r9krnrxpnz3pqfj4ir22gsbpdbsdyi5liwa5kfmn9xsz8jnf5qx",
       "depends": ["popdemo", "tibble"]
     },
     "Rcplex": {
@@ -28671,8 +29817,8 @@
     },
     "Rcpp": {
       "name": "Rcpp",
-      "version": "1.0.13",
-      "sha256": "1ki2vdfavwxvpw1y47kc0fpg248836zd3iw6zlspkr8kq58cdzi1",
+      "version": "1.0.13-1",
+      "sha256": "16ln8fxf4hiyg8ar588jci5i64749lhak14mkxsbb0khs8iwc7qx",
       "depends": []
     },
     "Rcpp11": {
@@ -28683,14 +29829,14 @@
     },
     "RcppAPT": {
       "name": "RcppAPT",
-      "version": "0.0.9",
-      "sha256": "03q2i1b9lrb0sn0vq4jyqjiy2zwi2ydhzlnw1b8nj9xdfxx804mx",
+      "version": "0.0.10",
+      "sha256": "0ma9457xsdpq0sc50lw99x3pmw3yvajcssqpiswcp4bzpa9l52xn",
       "depends": ["Rcpp"]
     },
     "RcppAlgos": {
       "name": "RcppAlgos",
-      "version": "2.8.3",
-      "sha256": "0ppix426yg8rnh07z2clv634ynvvwmjlsjnsxh3srss6xa8yfrb0",
+      "version": "2.8.5",
+      "sha256": "0ww5p6gwhk8bsmk8fqmnypvgmfkgwf0jjasifzz3appwkiql2kyf",
       "depends": ["cpp11", "gmp"]
     },
     "RcppAnnoy": {
@@ -28701,8 +29847,8 @@
     },
     "RcppArmadillo": {
       "name": "RcppArmadillo",
-      "version": "14.0.0-1",
-      "sha256": "145sci5fkwzrngqx2ykpxvvy3wn5wjfjfl7wmw92gn9yvkxd9i40",
+      "version": "14.2.2-1",
+      "sha256": "0a685hd0wgfsjhjsg4skrgihjgdd2j9lfd3knd1vaq4vijn82afi",
       "depends": ["Rcpp"]
     },
     "RcppArray": {
@@ -28717,6 +29863,12 @@
       "sha256": "11l70rlayg2xzmg34sg3896adzpfpvplciyicjpk963bddjb2ys8",
       "depends": ["BH", "Rcpp"]
     },
+    "RcppBessel": {
+      "name": "RcppBessel",
+      "version": "1.0.0",
+      "sha256": "19fls01nafnp8l0bdxwa188qa6r608xg7v6kgkrld3y1hqdm71x9",
+      "depends": ["Rcpp", "Rdpack"]
+    },
     "RcppBigIntAlgos": {
       "name": "RcppBigIntAlgos",
       "version": "1.1.0",
@@ -28731,26 +29883,26 @@
     },
     "RcppCCTZ": {
       "name": "RcppCCTZ",
-      "version": "0.2.12",
-      "sha256": "1jr4hi3zbm935q6ykkvnywlma36d3jl7fxmqhxs62jxbnyyqf81a",
+      "version": "0.2.13",
+      "sha256": "1wmbyaj08fbl4g47aq0mfkkvqwpah3d2j94fzc813dijxlsi847l",
       "depends": ["Rcpp"]
     },
     "RcppCGAL": {
       "name": "RcppCGAL",
-      "version": "5.6.4",
-      "sha256": "0dll6s8asylvghdzjjj1sxckyczkdjw111bfdiz0rb0ylc27yf7x",
+      "version": "6.0",
+      "sha256": "1pfwdxcan0jqzccvp2a7lmhh5yzz4zzhwcbzd8gqyi0wyd985zv7",
       "depends": ["Rcpp"]
     },
     "RcppCNPy": {
       "name": "RcppCNPy",
-      "version": "0.2.12",
-      "sha256": "16n3c2pfz9i95ngalxc5wvigwd1jfi2qwqm1v605qhidgf2vqvc5",
+      "version": "0.2.13",
+      "sha256": "0v2y1y1j2gfqyj9as556vy6pfc4fj16sk3dyzikwagpav4a83p01",
       "depends": ["Rcpp"]
     },
     "RcppCWB": {
       "name": "RcppCWB",
-      "version": "0.6.4",
-      "sha256": "17w4jz6rngwm3kqwz0v547s43xvjlxc86y9yy4hnc7blkqcp4w2g",
+      "version": "0.6.5",
+      "sha256": "0igkmm0qbj2gb0m18f6pjnvxdqraiypvlpz8qyc4hng2l6im5wih",
       "depends": ["Rcpp", "fs"]
     },
     "RcppCensSpatial": {
@@ -28791,8 +29943,8 @@
     },
     "RcppDate": {
       "name": "RcppDate",
-      "version": "0.0.3",
-      "sha256": "1nwb4fdjxwn0c1ckj1fpsxl2hxk5z3sk3y5giwgdag6nfv7yfplw",
+      "version": "0.0.4",
+      "sha256": "1cnhvbgqfcjrwm1rx6bhhj4yf4dipcp6g1hjv1qa86pmxzyjp3dn",
       "depends": []
     },
     "RcppDist": {
@@ -28809,14 +29961,14 @@
     },
     "RcppEigen": {
       "name": "RcppEigen",
-      "version": "0.3.4.0.1",
-      "sha256": "09jf5bvz77qsx4m6draarm7an07yxvip6bbmjbfsl2mm93qliv95",
+      "version": "0.3.4.0.2",
+      "sha256": "1fs2wmsq2s6nzhkrx59li4x1zvcjhk9mhmc2pdz8pm4z2ai7pbgc",
       "depends": ["Rcpp"]
     },
     "RcppEnsmallen": {
       "name": "RcppEnsmallen",
-      "version": "0.2.21.1.1",
-      "sha256": "0mhr2sv4wf6691ylx31s6607i3555n8ms9f401x7kj36jqjnwfc7",
+      "version": "0.2.22.1.1",
+      "sha256": "14iyaggs432h1pg34581z777f4394msaj2x0g7lrvmx8q55nsnl7",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "RcppExamples": {
@@ -28833,8 +29985,8 @@
     },
     "RcppFastAD": {
       "name": "RcppFastAD",
-      "version": "0.0.2",
-      "sha256": "020hw5p3vjsi00fmrbwnkdjc4lajpfjp1j0f5wiyk2d61yypfz2i",
+      "version": "0.0.4",
+      "sha256": "1vzdwixcqgb510lbyz62vmpy5ghr87i8qbgn696dmx7fvsgf4dkw",
       "depends": ["Rcpp", "RcppEigen"]
     },
     "RcppFastFloat": {
@@ -28903,6 +30055,12 @@
       "sha256": "1ih8i7i6m221iw227mnl3rvnaw2l53h8fpnc4f8yn9sm10anap1j",
       "depends": ["Matrix", "Rcpp", "RcppEigen"]
     },
+    "RcppMagicEnum": {
+      "name": "RcppMagicEnum",
+      "version": "0.0.1",
+      "sha256": "0lz13kr3l753qdkw9bvcgb998ylr2160c9688nv5bzsy5937y1pa",
+      "depends": ["Rcpp"]
+    },
     "RcppMeCab": {
       "name": "RcppMeCab",
       "version": "0.0.1.2",
@@ -28929,8 +30087,8 @@
     },
     "RcppParallel": {
       "name": "RcppParallel",
-      "version": "5.1.8",
-      "sha256": "09m1pfblmcqh02simzvnal5qqv5swx35ls8kjggy6manv25b2mfn",
+      "version": "5.1.9",
+      "sha256": "0kqivaj5swpj46gdgrccn4pawldkprsiw0lwy874xgppy3rn227x",
       "depends": []
     },
     "RcppProgress": {
@@ -28971,8 +30129,8 @@
     },
     "RcppSpdlog": {
       "name": "RcppSpdlog",
-      "version": "0.0.17",
-      "sha256": "0f1s0c32kid910p2q08d77rwprlxx3cq3ngy0kfgfpy13cvm34aa",
+      "version": "0.0.19",
+      "sha256": "0micdp7y170r2k1zh6yh9dj4b6c8jv98c026xmf5mj22m1c4ly2x",
       "depends": ["Rcpp"]
     },
     "RcppStreams": {
@@ -29049,8 +30207,8 @@
     },
     "Rcssplot": {
       "name": "Rcssplot",
-      "version": "1.0.0",
-      "sha256": "0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv",
+      "version": "1.1.0",
+      "sha256": "135npf1i1wn72b9z9g9jz6jby7w9liy1zm94zcc43iix29ia5732",
       "depends": []
     },
     "Rcurvep": {
@@ -29073,9 +30231,9 @@
     },
     "Rdiagnosislist": {
       "name": "Rdiagnosislist",
-      "version": "1.2",
-      "sha256": "0jnjqwqvaj6brgpmd9xj04ax5dbwqpbb89hhn1m2bd3v9673k1v3",
-      "depends": ["bit64", "data_table"]
+      "version": "1.3",
+      "sha256": "1b4gj0m5m3av6p16dys69sb2cw679js9y2vwxrylif8z90p8mssh",
+      "depends": ["bit64", "data_table", "readxl"]
     },
     "Rdice": {
       "name": "Rdice",
@@ -29097,8 +30255,8 @@
     },
     "Rdpack": {
       "name": "Rdpack",
-      "version": "2.6.1",
-      "sha256": "0igrmi0v17jsbfa770d6rcfnkjx6l2x3shskvjzhc5xbqjbn6qir",
+      "version": "2.6.2",
+      "sha256": "00yzjhgn58b3xqbsyw3ky18ii7y58wgw5llhkpij319nfplgk6vj",
       "depends": ["rbibutils"]
     },
     "Rdrw": {
@@ -29157,8 +30315,8 @@
     },
     "ReIns": {
       "name": "ReIns",
-      "version": "1.0.14",
-      "sha256": "1qqgphlc7wl541nx7qrkbc66414gy0l2pi164h03ndw0s7x7k4g7",
+      "version": "1.0.15",
+      "sha256": "03y671y9gzf25mxwc5syi84hw5shklg3y29829yi0qwg2x0qxl6g",
       "depends": ["Rcpp", "doParallel", "foreach", "survival"]
     },
     "ReMFPCA": {
@@ -29167,6 +30325,12 @@
       "sha256": "0q7jzya5is4ik8cjirnhixcpgda5s9a450pyksyzc05fmn7rw3rc",
       "depends": ["Matrix", "R6", "expm", "fda"]
     },
+    "ReSurv": {
+      "name": "ReSurv",
+      "version": "1.0.0",
+      "sha256": "0xvy7n1nk67bvv95ipzvr4kf1xgfj52xyc4xn05cxybl5kq9aimv",
+      "depends": ["SHAPforxgboost", "SynthETIC", "bshazard", "data_table", "dplyr", "dtplyr", "fastDummies", "forecast", "ggplot2", "purrr", "reshape2", "reticulate", "rpart", "survival", "tibble", "tidyr", "tidyverse", "xgboost"]
+    },
     "ReacTran": {
       "name": "ReacTran",
       "version": "1.4.3.1",
@@ -29251,6 +30415,12 @@
       "sha256": "02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8",
       "depends": []
     },
+    "RefBasedMI": {
+      "name": "RefBasedMI",
+      "version": "0.2.0",
+      "sha256": "1vv5h96y0xjwglmzpg6jnbvmc8glmmarb1abzg6v064x0dgy03l0",
+      "depends": ["Hmisc", "assertthat", "data_table", "mice", "pastecs"]
+    },
     "RefManageR": {
       "name": "RefManageR",
       "version": "1.4.0",
@@ -29269,6 +30439,12 @@
       "sha256": "14vb46d8m5w5vik7kfhsj97yil3sc6qnmyp3c6myadlsw9k3x4lj",
       "depends": ["Hmisc", "RationalExp", "dplyr", "geometry", "kableExtra", "pracma", "snowfall"]
     },
+    "RegDDM": {
+      "name": "RegDDM",
+      "version": "1.0",
+      "sha256": "1dj3m2ixvbxi707fwwhx2vsrbz598n55s1fvdi39kbm4l2qg0f13",
+      "depends": ["dplyr", "purrr", "rlang", "rstan", "rtdists", "stringr", "tidyr"]
+    },
     "RegKink": {
       "name": "RegKink",
       "version": "0.1.0",
@@ -29281,6 +30457,12 @@
       "sha256": "19fr0xyaw8zyqy039mdcqs09ar500vwqmsmwn0id6llhxy3wpiiy",
       "depends": ["MASS", "Matrix", "SSBtools"]
     },
+    "RegrCoeffsExplorer": {
+      "name": "RegrCoeffsExplorer",
+      "version": "1.1.0",
+      "sha256": "08xglcibfff5wg4347n8yj008wfw8yw54fyz5cgwyx7y70bzz927",
+      "depends": ["dplyr", "ggplot2", "ggpubr", "glmnet", "gridExtra", "magrittr", "rlang"]
+    },
     "RegressionFactory": {
       "name": "RegressionFactory",
       "version": "0.7.4",
@@ -29311,10 +30493,16 @@
       "sha256": "0kpdafdvpcs6iicpc10i634nlk7dqk2nymdnnlkpp5frdxlbycvx",
       "depends": ["dplyr", "ggforce", "ggplot2", "readxl", "rmarkdown", "sf", "xlsx"]
     },
+    "ReliaGrowR": {
+      "name": "ReliaGrowR",
+      "version": "0.1.3",
+      "sha256": "1inzsp8y6d2hp9wjw89rc4hisafxz36f8fnd285nj6vpariy8h7p",
+      "depends": ["segmented"]
+    },
     "ReliabilityTheory": {
       "name": "ReliabilityTheory",
-      "version": "0.3.0",
-      "sha256": "1vj09a2gc36cp98kai4m0wyjg6h9yldawhjimjqr5nrf70i60bg5",
+      "version": "0.3.1",
+      "sha256": "0844p7fxbj1c5zazli32kmz7sdffcf4nya3z5g2xhib90iswc2kk",
       "depends": ["FRACTION", "PhaseType", "actuar", "combinat", "igraph", "mcmc", "sfsmisc"]
     },
     "RelimpPCR": {
@@ -29367,8 +30555,8 @@
     },
     "ReplicationSuccess": {
       "name": "ReplicationSuccess",
-      "version": "1.3.2",
-      "sha256": "0li1sza6afxizfgcczdi8916mb5z63agpx828a48f50ldc25rlvd",
+      "version": "1.3.3",
+      "sha256": "1vw6g7manxzndhnvn86k8cwyb5hnjqljbvxvj55vll4q42dyq6d0",
       "depends": []
     },
     "Repliscope": {
@@ -29383,10 +30571,16 @@
       "sha256": "0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5",
       "depends": ["git2r", "httr", "rmarkdown", "rstudioapi"]
     },
+    "ReportSubtotal": {
+      "name": "ReportSubtotal",
+      "version": "0.1.2",
+      "sha256": "0viiirvdg31nmyh6brvqr9qsxazrpq6g9yg1cgknz9fh9pnjshji",
+      "depends": ["dplyr", "magrittr", "tidyselect"]
+    },
     "ReporterScore": {
       "name": "ReporterScore",
-      "version": "0.1.6",
-      "sha256": "13ha7xncl1slmvhi2pb6l4qwzmgrmj1fp2m6vmwxbig7fvcw0rkg",
+      "version": "0.1.9",
+      "sha256": "07kr0myak7vazwlayl6sl8sm12g95pj03qhdggh2ys0i9q2d3gph",
       "depends": ["dplyr", "foreach", "ggnewscale", "ggplot2", "ggrepel", "magrittr", "pcutils", "reshape2", "scales", "stringr"]
     },
     "Require": {
@@ -29397,9 +30591,9 @@
     },
     "ResIN": {
       "name": "ResIN",
-      "version": "1.1.0",
-      "sha256": "0m40s7qsxpphja4cw8d6f7aq5vphqzkqzy61jpa17bnyfq0v9v2d",
-      "depends": ["DirectedClustering", "Matrix", "dplyr", "fastDummies", "ggplot2", "igraph", "qgraph", "wCorr"]
+      "version": "2.0.0",
+      "sha256": "0by098xmbikvprbp2x860jvvdic3w1x09n2qcg1ipdj1pcdppz0g",
+      "depends": ["DirectedClustering", "Matrix", "doSNOW", "dplyr", "fastDummies", "foreach", "ggplot2", "igraph", "parallelly", "psych", "qgraph", "readr", "shadowtext", "wCorr"]
     },
     "ResPBIBD": {
       "name": "ResPBIBD",
@@ -29407,12 +30601,6 @@
       "sha256": "00a3qbam4dc9lwfyqq63j8q9yppd4nr7pk0wbikjfw6rnbjsl1sh",
       "depends": []
     },
-    "ResearchAssociate": {
-      "name": "ResearchAssociate",
-      "version": "1.0.1",
-      "sha256": "00j339ngc72gn2gyn1irjmazrv6l5nbsy3z25r6j1zrjwsbay15p",
-      "depends": ["XML", "ggplot2", "plyr", "rentrez"]
-    },
     "ResidentialEnergyConsumption": {
       "name": "ResidentialEnergyConsumption",
       "version": "1.1.0",
@@ -29451,8 +30639,8 @@
     },
     "ResultModelManager": {
       "name": "ResultModelManager",
-      "version": "0.5.9",
-      "sha256": "0adjf9b9j4qmn55zlh6sq55vdvpkdbfkbbwvjy0d2y8bw0yfscxs",
+      "version": "0.5.11",
+      "sha256": "14m9nb4pq3c5wasz7npmc2yhf3n8w100nl3hk8105jcwwkddk478",
       "depends": ["DBI", "DatabaseConnector", "ParallelLogger", "R6", "SqlRender", "checkmate", "dbplyr", "dplyr", "fastmap", "lubridate", "pool", "readr", "rlang", "withr", "zip"]
     },
     "ReturnCurves": {
@@ -29511,8 +30699,8 @@
     },
     "Rfast": {
       "name": "Rfast",
-      "version": "2.1.0",
-      "sha256": "1zqq4k85i0nbzndkh0iiq3k83ly0mpl3pn4wkka6qxfvk6n6rr7r",
+      "version": "2.1.2",
+      "sha256": "0wj58112zyd3cvjjws2spbx5awjj81r1fl6ns9nl23myasmcw0s4",
       "depends": ["Rcpp", "RcppArmadillo", "RcppParallel", "RcppZiggurat"]
     },
     "Rfast2": {
@@ -29557,12 +30745,6 @@
       "sha256": "0knz199h29ph6qxbasrjqdyhgsqnrmp83syz3d3mblqnlz3ar1mi",
       "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "Rssa", "dplyr", "fda", "ftsa", "ggplot2", "lattice", "markdown", "plotly", "rainbow", "shiny", "tibble"]
     },
-    "Rgb": {
-      "name": "Rgb",
-      "version": "1.7.5",
-      "sha256": "1hj7hxvj785qg4j52bvwgczv21fhz2fjncvxn2fahsb4hdkrvfrm",
-      "depends": []
-    },
     "Rgbp": {
       "name": "Rgbp",
       "version": "1.1.4",
@@ -29583,8 +30765,8 @@
     },
     "Rgof": {
       "name": "Rgof",
-      "version": "1.2.2",
-      "sha256": "0csya8lkjj3w1pwr6g0avs17na07rfnfpx5z9s01vcql92v8aii0",
+      "version": "2.1.1",
+      "sha256": "0iplhy2rwkbwbkdipj52iwvjakmwc4klj1sj7clq55z83ayq6m9h",
       "depends": ["Rcpp", "ggplot2"]
     },
     "RgoogleMaps": {
@@ -29631,8 +30813,8 @@
     },
     "Rilostat": {
       "name": "Rilostat",
-      "version": "2.1.0",
-      "sha256": "1h4vp6gim5swiy07fhf6l4agh6pi0vlz2f778s2rzsgqc4jdnawj",
+      "version": "2.2.0",
+      "sha256": "1j8pmd9xm27abyghfvifmh0mvlkn5hc11y6lhn365is1a95zy29a",
       "depends": ["data_table", "dplyr", "haven", "plyr", "readr", "stringr", "tibble"]
     },
     "Rirt": {
@@ -29709,8 +30891,8 @@
     },
     "Rlabkey": {
       "name": "Rlabkey",
-      "version": "3.2.3",
-      "sha256": "17z9fk89wj81z3cfs1g545im87191jbkh4ka849nra51dpdq4zmi",
+      "version": "3.4.1",
+      "sha256": "1y03dmn9z721i2syhw99imcxap4hrjdh1y93jb1d4dm0nhff84ia",
       "depends": ["Rcpp", "httr", "jsonlite"]
     },
     "Rlgt": {
@@ -29811,14 +30993,14 @@
     },
     "Rmpfr": {
       "name": "Rmpfr",
-      "version": "0.9-5",
-      "sha256": "06zkllbdaddq3jq03k926gfjcijvcysfrqhh76hjklzwkrra5sdw",
+      "version": "1.0-0",
+      "sha256": "0l3s0xg50dv8ygyhx405ln2sc6b5c7sl0ji474wr0m98h0x450lz",
       "depends": ["gmp"]
     },
     "Rmpi": {
       "name": "Rmpi",
-      "version": "0.7-2",
-      "sha256": "1vrf6bakx9i73sdgggpxzl1lxjn68b8pwvmk69d56lnya2gzm4c5",
+      "version": "0.7-2.1",
+      "sha256": "1fzd9r49jx1xgrn714av7riypafs401mxcggwj2l0wkhi6i3jq50",
       "depends": []
     },
     "Rmst": {
@@ -29841,9 +31023,9 @@
     },
     "Rnest": {
       "name": "Rnest",
-      "version": "0.0.0.1",
-      "sha256": "0fj1a1qsc8v238nv1dsrdw1398ah3qpf5dgimdgipkznb5dnjjc7",
-      "depends": ["EFA_MRFA", "MASS", "crayon", "fungible", "ggplot2", "scales"]
+      "version": "0.0.0.2",
+      "sha256": "1m7ay3ngqnavxzyhwa0dbw40z70dlqc4zdk5fmw6czcmc1iqhyw6",
+      "depends": ["EFA_MRFA", "MASS", "crayon", "fungible", "ggplot2", "psych", "scales"]
     },
     "Rnightly": {
       "name": "Rnightly",
@@ -29871,9 +31053,9 @@
     },
     "RoBMA": {
       "name": "RoBMA",
-      "version": "3.1.0",
-      "sha256": "0cq1hjm49sj4lnzvninf6wlpm0p0rbw3mk6sa36167b6snr6rra2",
-      "depends": ["BayesTools", "Rdpack", "ggplot2", "mvtnorm", "rjags", "rlang", "runjags", "scales"]
+      "version": "3.2.0",
+      "sha256": "17agkqwxw81v1dski13x02ngp73pm2rwf47cg3cxqqcpzac77cnd",
+      "depends": ["BayesTools", "Rdpack", "coda", "ggplot2", "mvtnorm", "rjags", "rlang", "runjags", "scales"]
     },
     "RoBSA": {
       "name": "RoBSA",
@@ -29883,14 +31065,14 @@
     },
     "RoBTT": {
       "name": "RoBTT",
-      "version": "1.3.0",
-      "sha256": "00yrl6l6pz1y8j5qwhvwg84lcxvisp578i9fsd3iv9f3hfhsw9nh",
+      "version": "1.3.1",
+      "sha256": "09j9b25wjz1vjm8nj8jyq5d106rl29qd22hgvq9m3hx6lb3qcm98",
       "depends": ["BH", "BayesTools", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "bridgesampling", "ggplot2", "rstan", "rstantools"]
     },
     "RobAStBase": {
       "name": "RobAStBase",
-      "version": "1.2.5",
-      "sha256": "16sl3nlb1cl3xyski05l0qhrl23w615sbdmvnnzxnkva6sppxqcx",
+      "version": "1.2.6",
+      "sha256": "08b6jdvgs711zppjknzbskay04h3j0nkw5ld81k2wg42yh1b6ari",
       "depends": ["RandVar", "distr", "distrEx", "distrMod", "rrcov", "startupmsg"]
     },
     "RobAStRDA": {
@@ -29901,8 +31083,8 @@
     },
     "RobExtremes": {
       "name": "RobExtremes",
-      "version": "1.3.0",
-      "sha256": "0dziaykrnhy8ijbq0pxwl5p9xjlbz3kxkmwl3s21kmjnv7nm8sx4",
+      "version": "1.3.1",
+      "sha256": "1l0csq3qldaz6wn87bfx3yw04ay7fxakm80q4ynsy2vw27rjkjck",
       "depends": ["ROptEst", "RandVar", "RobAStBase", "RobAStRDA", "actuar", "distr", "distrEx", "distrMod", "evd", "robustbase", "startupmsg"]
     },
     "RobGARCHBoot": {
@@ -29949,14 +31131,14 @@
     },
     "RobStatTM": {
       "name": "RobStatTM",
-      "version": "1.0.8",
-      "sha256": "1qbbh3ykba50ivka1h7b2cyw2km0dk3gl1rgjwaq5rqlmfdwl0nn",
+      "version": "1.0.11",
+      "sha256": "06lh20b2wgz9b8imwddfcypxvrsprzn9hjn5sm68qbgvfs5ck2fs",
       "depends": ["pyinit", "robustbase", "rrcov"]
     },
     "RobinCar": {
       "name": "RobinCar",
-      "version": "0.3.0",
-      "sha256": "0pyp73fk871ka85ci2il7cmb2g7cqrj7c53k73x5yr1kp51srxb0",
+      "version": "0.3.2",
+      "sha256": "0q8dimhygskzppbi8j3sxdcvrlrqk26f2kal8bzip6567y17dr25",
       "depends": ["AIPW", "MASS", "SuperLearner", "broom", "data_table", "dplyr", "emulator", "fastDummies", "magrittr", "numDeriv", "rlang", "survival", "tidyr", "tidyverse"]
     },
     "RobinHood": {
@@ -30013,6 +31195,12 @@
       "sha256": "06137f516gyj64qdmwby7m1xnvj4hxzpqj454jn0xcinvl89380w",
       "depends": []
     },
+    "RobustPrediction": {
+      "name": "RobustPrediction",
+      "version": "0.1.7",
+      "sha256": "14c2il0n13xsxysb0wqp4b9j480yqy86f8fakj6ydg7lmk8j19j6",
+      "depends": ["e1071", "glmnet", "mboost", "mlr", "pROC", "ranger"]
+    },
     "RobustRankAggreg": {
       "name": "RobustRankAggreg",
       "version": "1.2.1",
@@ -30129,9 +31317,9 @@
     },
     "Rpolyhedra": {
       "name": "Rpolyhedra",
-      "version": "0.5.4",
-      "sha256": "00wmxk8j89lyzbb7fws4g8znnqbw5dh64vqhxjg5rxjdpr3vibl8",
-      "depends": ["R6", "XML", "digest", "geometry", "git2r", "lgr", "rgl", "stringr"]
+      "version": "0.5.6",
+      "sha256": "1izbhp54zkczk8ibl80r9qir8q6p4y3md2cdngigdb6j022l9j8b",
+      "depends": ["R6", "XML", "digest", "dplyr", "geometry", "jsonlite", "lgr", "rgl", "stringr"]
     },
     "Rpoppler": {
       "name": "Rpoppler",
@@ -30159,8 +31347,8 @@
     },
     "Rquefts": {
       "name": "Rquefts",
-      "version": "1.2-3",
-      "sha256": "14p9g0bqkaslr3164a58crhj024xphp9ig24mvs2ad8vxvf1gsf0",
+      "version": "1.2-4",
+      "sha256": "144hmgapzk8w2cv0gmyr67ivs683djv7k8i0ciihb4gl7rp55ppg",
       "depends": ["Rcpp", "meteor"]
     },
     "Rramas": {
@@ -30169,6 +31357,12 @@
       "sha256": "16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an",
       "depends": ["diagram"]
     },
+    "Rraven": {
+      "name": "Rraven",
+      "version": "1.0.14",
+      "sha256": "1sfzsf1f758sicild58hi5lqbs1vmzma9znni3is2vlcsn9pyn5s",
+      "depends": ["pbapply", "seewave", "tuneR", "warbleR"]
+    },
     "Rrdap": {
       "name": "Rrdap",
       "version": "1.0.7",
@@ -30189,8 +31383,8 @@
     },
     "Rsagacmd": {
       "name": "Rsagacmd",
-      "version": "0.4.2",
-      "sha256": "08xj6dinqnr9ir0ljz0ybyh3wqsbw5hdp27xfvcmc8vi48gf4rlj",
+      "version": "0.4.3",
+      "sha256": "1kddbmzkmpxc8cx34vsgaqhrw6jwvx8llh5bny63zx64hlrr20nh",
       "depends": ["foreign", "generics", "processx", "rlang", "rvest", "sf", "stars", "stringr", "terra", "tibble"]
     },
     "Rsampling": {
@@ -30207,8 +31401,8 @@
     },
     "Rserve": {
       "name": "Rserve",
-      "version": "1.8-13",
-      "sha256": "0k4ssrcz28xi6sq37z3xz511jmi925q9wz8fyr3dfac0r8pk2pby",
+      "version": "1.8-15",
+      "sha256": "1c35kq5xjvk2jxx978j27b5h42mb92319cfdqr1rc8z87dz5yr0m",
       "depends": []
     },
     "Rsfar": {
@@ -30267,8 +31461,8 @@
     },
     "Rssa": {
       "name": "Rssa",
-      "version": "1.0.5",
-      "sha256": "0bajpvrj7cfch7v83dl2swa62kd59xk0lavjcx20lczvd9iijn27",
+      "version": "1.1",
+      "sha256": "16f3nyh46kvvqaym0s4ngqxg3b1snp7bmyhnfz5krjwhq371d4fr",
       "depends": ["forecast", "lattice", "svd"]
     },
     "Rstg": {
@@ -30363,20 +31557,20 @@
     },
     "Runuran": {
       "name": "Runuran",
-      "version": "0.38",
-      "sha256": "1fjr9pbjih6ahbsd557p3d5j8klj11wnnn7jkhjcry1spwlzdkhr",
+      "version": "0.40",
+      "sha256": "1ws0za51p3w9ky8f763b0x82iil21cd01w4334jb2daxjhl58071",
       "depends": []
     },
     "Rvcg": {
       "name": "Rvcg",
-      "version": "0.23",
-      "sha256": "0jdhl769r99g0x9kaf1cymzjd96z2pdnha7wyy221q3w3iy81whz",
+      "version": "0.24",
+      "sha256": "1wjb74izm3k6jgch0vj5dlr8ghj85z7nldfp6kysqyckrbpjvkgx",
       "depends": ["Rcpp", "RcppArmadillo", "RcppEigen"]
     },
     "Rveg": {
       "name": "Rveg",
-      "version": "0.1.5",
-      "sha256": "0avnsbddsls55q9c2cbfy103yxrkay7812a2wfij27y9s7p66v3x",
+      "version": "0.1.6",
+      "sha256": "0641n31dcxznrz5vi4lz12q6zbva5c49g2s20n63gpi5pq9nd3rb",
       "depends": ["dplyr"]
     },
     "Rwave": {
@@ -30435,16 +31629,10 @@
     },
     "S7": {
       "name": "S7",
-      "version": "0.1.1",
-      "sha256": "0r3v586xbcrww63jifdbfh2fgdkr5f2mgp72f2zljg4x70zn3sfw",
+      "version": "0.2.0",
+      "sha256": "16yllj1a2m9akli5z2q8fv7jlgc2y0z3bk919d96wfbsmizmlrxq",
       "depends": []
     },
-    "SACCR": {
-      "name": "SACCR",
-      "version": "3.2",
-      "sha256": "1sp8hjpwzyczj85saps6a6yw30yh5098ig2xmlf79jvzv86nqgn1",
-      "depends": ["Trading", "data_tree", "jsonlite"]
-    },
     "SADEG": {
       "name": "SADEG",
       "version": "1.0.0",
@@ -30487,6 +31675,12 @@
       "sha256": "18ig7ncmrfs5cyc28xpbqk9zjhwqfp7gwix7y2v1j4j2wbdc2hzs",
       "depends": ["MixSim", "Rcpp", "RcppArmadillo", "lowmemtkmeans", "mclust"]
     },
+    "SAKERNAS": {
+      "name": "SAKERNAS",
+      "version": "0.1.0",
+      "sha256": "1n83k8q38qw58mgdk60mq2l71j0npf0aqyljnjw3ld4m1w6r5mj0",
+      "depends": ["readxl"]
+    },
     "SALES": {
       "name": "SALES",
       "version": "1.0.2",
@@ -30543,8 +31737,8 @@
     },
     "SAMtool": {
       "name": "SAMtool",
-      "version": "1.6.4",
-      "sha256": "187j6i0giq45mgg1bb33ssiryipdk7ahc8jpimij3icxy9v73d4b",
+      "version": "1.8.0",
+      "sha256": "1dh2jazf7sc7c0cj9wbiph3ci9r00avqw7mivdlsnp9nd6m2dsmm",
       "depends": ["MSEtool", "RcppEigen", "TMB", "abind", "dplyr", "gplots", "pbapply", "rmarkdown", "snowfall", "vars"]
     },
     "SANple": {
@@ -30645,8 +31839,8 @@
     },
     "SBI": {
       "name": "SBI",
-      "version": "0.1.0",
-      "sha256": "1m4s0qmk1z3npxk952w57dxrp4asb9ixx0clxh7xjl24kvymrnrs",
+      "version": "0.1.1",
+      "sha256": "0kbcy95dq8kkqaknj8yi33nhvhhd3si2yj0xg1swq15v48ffnrak",
       "depends": []
     },
     "SBICgraph": {
@@ -30661,6 +31855,12 @@
       "sha256": "1h44qwz9gkwwgkac25h4vn0kq3mjvjsyq99yfd8v8g6g8fkkclaq",
       "depends": ["ggplot2", "reshape2", "scales"]
     },
+    "SBMTrees": {
+      "name": "SBMTrees",
+      "version": "1.2",
+      "sha256": "00mj0k4id9gqkyvf74h32yiw4k7jy53q5r7kk00k1clkf2dqkns1",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppDist", "RcppProgress", "arm", "dplyr", "lme4", "mice", "mvtnorm", "nnet", "sn", "tidyr"]
+    },
     "SBN": {
       "name": "SBN",
       "version": "1.0.0",
@@ -30721,10 +31921,16 @@
       "sha256": "0cx7xw15pwkk2nza8ng4ic6mq07vgf5idcclkwdyp3ry5j3rqnvl",
       "depends": ["R_methodsS3", "corpcor", "fda", "gnm", "survival"]
     },
+    "SCDA": {
+      "name": "SCDA",
+      "version": "0.0.2",
+      "sha256": "1501ql1cj7vwjpq2df0vc13jkdq0f90iq1dy7bk0h6j0nm8014jh",
+      "depends": ["NbClust", "dplyr", "ggplot2", "ggspatial", "performance", "rlang", "sf", "sp", "spatialreg", "spdep"]
+    },
     "SCDB": {
       "name": "SCDB",
-      "version": "0.4.0",
-      "sha256": "0n6vmn7jjl8lp5yf53kxh2d3660sbwjnl7chiv4x7dkidi81lfnr",
+      "version": "0.4.1",
+      "sha256": "0cvb69vh5s74827ni61yp5s6kflijf0zf1q2nl82ik3cv4gjpszx",
       "depends": ["DBI", "R6", "checkmate", "dbplyr", "dplyr", "glue", "lifecycle", "openssl", "parallelly", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
     },
     "SCEM": {
@@ -30751,6 +31957,12 @@
       "sha256": "0nyx0j0ab8wzl9mm5ib0p2zxq9xis2p850b2w3jdm9xn3ncm6wl1",
       "depends": ["entropy", "tibble"]
     },
+    "SCFMonitor": {
+      "name": "SCFMonitor",
+      "version": "0.3.5",
+      "sha256": "0gr84vj7n4vz61a5pqq3iqx0ng4j7dn11smhb93rdglj0v76kdf9",
+      "depends": ["dplyr", "ggplot2", "magrittr", "readr", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "SCGLR": {
       "name": "SCGLR",
       "version": "3.0",
@@ -30903,8 +32115,8 @@
     },
     "SDMtune": {
       "name": "SDMtune",
-      "version": "1.3.1",
-      "sha256": "0zzra0vig3gyz3b0h66fdlkpl2ii939d7k6p7ym5mzhz1vqdaljz",
+      "version": "1.3.2",
+      "sha256": "13i80qi52x18gmd9l3f028ib68dd16ykj9ifqd40s76yca3nnb27",
       "depends": ["Rcpp", "cli", "dismo", "gbm", "ggplot2", "jsonlite", "maxnet", "nnet", "randomForest", "rlang", "rstudioapi", "stringr", "terra", "whisker"]
     },
     "SDPDmod": {
@@ -30981,9 +32193,9 @@
     },
     "SEI": {
       "name": "SEI",
-      "version": "0.1.1",
-      "sha256": "0ncrsqai3zp7f0yx3h905645kd31zcf3qlcy08ah5v4qbdzdb7fh",
-      "depends": ["fitdistrplus", "ggplot2", "xts", "zoo"]
+      "version": "0.2.0",
+      "sha256": "14qcj2bw11xqh9ff3mpxfmcd0mg61lsdqc1cg4ffd507knf0kb2m",
+      "depends": ["fitdistrplus", "flexsurv", "gamlss", "gamlss_dist", "ggplot2", "lmom", "xts", "zoo"]
     },
     "SEIRfansy": {
       "name": "SEIRfansy",
@@ -31009,6 +32221,12 @@
       "sha256": "14x2vir17fp9wm9hzsrc1sw0qgavkpfdvcsfnnklhznl0h526xrr",
       "depends": ["R_methodsS3", "R_oo", "R_utils", "igraph"]
     },
+    "SEMdeep": {
+      "name": "SEMdeep",
+      "version": "0.1.0",
+      "sha256": "0jwaliqxcw2rja7h87j096z02fkvrmfv8ssn10m16lcng9xy5gmm",
+      "depends": ["NeuralNetTools", "SEMgraph", "cito", "corpcor", "igraph", "lavaan", "mgcv", "nnet", "ranger", "shapr", "torch", "xgboost"]
+    },
     "SEMgraph": {
       "name": "SEMgraph",
       "version": "1.2.2",
@@ -31029,8 +32247,8 @@
     },
     "SESraster": {
       "name": "SESraster",
-      "version": "0.7.0",
-      "sha256": "08lj7prqfb7ngjh6km9q2zcmmjvivnpw3f2pvakjarl312f53kla",
+      "version": "0.7.1",
+      "sha256": "1xsq2br6cilgkkmb6xzvbc6gn0yyby7b8babi7zkmxxzmfkm18b9",
       "depends": ["rlang", "terra"]
     },
     "SEofM": {
@@ -31045,6 +32263,12 @@
       "sha256": "127z85m95xn46s7lk3sdzrs73mi7pa2smx9r80fnl678f2kyz6lm",
       "depends": ["Matrix", "Rdpack", "combinat"]
     },
+    "SFM": {
+      "name": "SFM",
+      "version": "0.1.0",
+      "sha256": "1szs75bn808z17853kibjsvr39kfc5pdlfd2b826qnh0qmgh5wxk",
+      "depends": ["MASS", "SOPC", "matrixcalc", "sn"]
+    },
     "SFPL": {
       "name": "SFPL",
       "version": "1.0.0",
@@ -31059,8 +32283,8 @@
     },
     "SFSI": {
       "name": "SFSI",
-      "version": "1.4",
-      "sha256": "1ikw1mksgzbznhraa15ckhrbygidvwjl5h2psvzv81j9547f7zbq",
+      "version": "1.4.1",
+      "sha256": "1l4fqg55jjlyidbdfksvc80zkvjbg4vz89ibqxpm38j2c0vi4h9a",
       "depends": ["ggplot2", "igraph", "reshape2", "scales", "stringr", "tensorEVD", "viridis"]
     },
     "SFtools": {
@@ -31089,9 +32313,9 @@
     },
     "SGP": {
       "name": "SGP",
-      "version": "2.1-0.0",
-      "sha256": "1msz3ccgmmwwla70gwwichgzjhzym942wa6hw0imr5cgkm4hk0kq",
-      "depends": ["Cairo", "RSQLite", "callr", "colorspace", "crayon", "data_table", "digest", "doParallel", "equate", "foreach", "gridBase", "gtools", "iterators", "jsonlite", "matrixStats", "plotly", "quantreg", "randomNames", "rngtools", "sn", "svglite", "toOrdinal"]
+      "version": "2.2-0.0",
+      "sha256": "08gxwixrhnhsxf3xhx612d05jpiz7d5wl9csi612afhy3psblysq",
+      "depends": ["Cairo", "RSQLite", "callr", "collapse", "colorspace", "crayon", "data_table", "digest", "doParallel", "equate", "foreach", "gridBase", "gtools", "iterators", "jsonlite", "matrixStats", "quantreg", "randomNames", "rngtools", "sn", "svglite", "toOrdinal"]
     },
     "SGPR": {
       "name": "SGPR",
@@ -31113,9 +32337,9 @@
     },
     "SHELF": {
       "name": "SHELF",
-      "version": "1.10.0",
-      "sha256": "0867d66iak8kb4mkbj16k5b5dm58xsk5djm7r1xha3m2f73yalvd",
-      "depends": ["Hmisc", "ggExtra", "ggplot2", "ggridges", "rmarkdown", "scales", "shiny", "shinyMatrix", "sn", "tidyr"]
+      "version": "1.11.0",
+      "sha256": "1pmbn3bqb6d5mdvyadxxf8dpdvkl8kc7g0cc1b0qvd3531b7zzaw",
+      "depends": ["Hmisc", "flexsurv", "ggExtra", "ggplot2", "ggridges", "rmarkdown", "scales", "shiny", "shinyMatrix", "sn", "survival", "survminer", "tidyr"]
     },
     "SHT": {
       "name": "SHT",
@@ -31227,9 +32451,9 @@
     },
     "SIMplyBee": {
       "name": "SIMplyBee",
-      "version": "0.3.0",
-      "sha256": "0013sdgyq29w9yah1yafkd0vj9sgw5lkhi5g5fcb59w386nlfhm5",
-      "depends": ["AlphaSimR", "R6", "extraDistr"]
+      "version": "0.4.1",
+      "sha256": "05vdrzddq57jzh2dyddf2yi09k6fddkgl83qd8c0fb14zqn9ix76",
+      "depends": ["AlphaSimR", "BH", "R6", "RANN", "Rcpp", "RcppArmadillo", "extraDistr"]
     },
     "SINRELEF_LD": {
       "name": "SINRELEF.LD",
@@ -31249,12 +32473,6 @@
       "sha256": "1w5sidiajrckps358xr526jfb4d0845p595qhr5i9b9q506n0klk",
       "depends": ["Convolutioner"]
     },
-    "SIPmg": {
-      "name": "SIPmg",
-      "version": "1.4.1",
-      "sha256": "1f3jirfnxxbrkala5kk0hkkm8gn2zciva6xy459vc80y058hr7z1",
-      "depends": ["DESeq2", "HTSSIP", "MASS", "data_table", "dplyr", "ggplot2", "ggpubr", "lazyeval", "magrittr", "phyloseq", "plyr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
-    },
     "SIRE": {
       "name": "SIRE",
       "version": "1.1.0",
@@ -31287,8 +32505,8 @@
     },
     "SIT": {
       "name": "SIT",
-      "version": "0.1.0",
-      "sha256": "0s6fqw6gh96d0a194jh6qnph90zjvgjbh9fhprwncb4k2zma40rm",
+      "version": "0.1.1",
+      "sha256": "1hy5a74kp4xpmhw3cip8ccjbhdzfndnppmsk97zzxlblkl46kj3m",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "SITH": {
@@ -31317,8 +32535,8 @@
     },
     "SKNN": {
       "name": "SKNN",
-      "version": "3.1",
-      "sha256": "1qqf2l4gvwnfdi0z5bk211nax8pcc09xbc4nw09lq7fy0icd2585",
+      "version": "4.1",
+      "sha256": "1iigrps3knwij2z87rbd60si7x19mrfi298l18imqkp8axydmyp2",
       "depends": []
     },
     "SLBDD": {
@@ -31413,8 +32631,8 @@
     },
     "SMDIC": {
       "name": "SMDIC",
-      "version": "0.1.5",
-      "sha256": "1dx6k67cbk863l9vvp870syn23l7vwxylgs980mp418nfj3d1s23",
+      "version": "0.1.6",
+      "sha256": "1g1q079krf0a5aqbfgzv7kg1vv0r3q3m4kfh1fcvn0wj02drsfjx",
       "depends": ["GSVA", "MASS", "RColorBrewer", "backports", "e1071", "maftools", "pheatmap", "pracma", "preprocessCore", "samr", "survival", "survminer"]
     },
     "SMFilter": {
@@ -31477,6 +32695,12 @@
       "sha256": "10nik348b6vcmwhj5scjvkjwi86fih3bqkgpv7qxxa8jx45ds52n",
       "depends": ["Matrix", "PerformanceAnalytics"]
     },
+    "SMNlmec": {
+      "name": "SMNlmec",
+      "version": "0.1.0",
+      "sha256": "0z1a9l5yzxmap9g5lv610wan0d88cifaxd7ab8dra41gbyhf58pn",
+      "depends": ["LaplacesDemon", "MASS", "StanHeaders", "TruncatedNormal", "mnormt", "mvtnorm", "numDeriv", "rstan", "tmvtnorm"]
+    },
     "SMOTEWB": {
       "name": "SMOTEWB",
       "version": "1.2.0",
@@ -31527,8 +32751,8 @@
     },
     "SNPassoc": {
       "name": "SNPassoc",
-      "version": "2.1-0",
-      "sha256": "0ffsxlvdpd77sav5jjzv6vx5vwhh5gmw55ndzvf4299nnx5l2xka",
+      "version": "2.1-2",
+      "sha256": "17qlgk5s579bv1a9h19aclnf5sgc8f9x2zp61cx9id7lai4c35zf",
       "depends": ["ggplot2", "haplo_stats", "mvtnorm", "plyr", "poisbinom", "survival", "tidyr"]
     },
     "SNPfiltR": {
@@ -31609,6 +32833,12 @@
       "sha256": "03g1c9ip0bmc5zhnzami3f525m9ic6v5gdhaxc8s7f1nxjf2fcdy",
       "depends": ["colourpicker", "dplyr", "kohonen", "openair", "plyr", "rlist", "shiny", "shinycssloaders", "shinycustomloader"]
     },
+    "SOMMD": {
+      "name": "SOMMD",
+      "version": "0.1.2",
+      "sha256": "1sx1qvd9hn4fxg7nrv5ra7z2rn1a27iicgpi0m29in097wf0xlm5",
+      "depends": ["abind", "bio3d", "cluster", "igraph", "kohonen"]
+    },
     "SOMbrero": {
       "name": "SOMbrero",
       "version": "1.4-2",
@@ -31659,9 +32889,9 @@
     },
     "SPARRAfairness": {
       "name": "SPARRAfairness",
-      "version": "0.0.0.1",
-      "sha256": "0nyixdddqq3cmzj00gm637dm64iwb63mgp34wvmway5cflqr8yck",
-      "depends": ["cvAUC", "matrixStats", "mvtnorm", "ranger"]
+      "version": "0.0.0.2",
+      "sha256": "1kfjrwbwqigzjpzczqm6vm7yirkz46p054iic4q1yidv9m4xa3pf",
+      "depends": ["cvAUC", "ggplot2", "ggrepel", "matrixStats", "mvtnorm", "patchwork", "ranger", "scales"]
     },
     "SPARSEMODr": {
       "name": "SPARSEMODr",
@@ -31719,8 +32949,8 @@
     },
     "SPECIES": {
       "name": "SPECIES",
-      "version": "1.1.4",
-      "sha256": "18x779wh9g4fskggkiz6ggvgis4wipf1nf6bygc1v5n2yvni4fsw",
+      "version": "1.2.0",
+      "sha256": "0fyl8794hfdlhghskdv4gif88rdppd4a2jm3dyfdlwdj5zv5l12w",
       "depends": []
     },
     "SPECK": {
@@ -31887,9 +33117,9 @@
     },
     "SRTsim": {
       "name": "SRTsim",
-      "version": "0.99.6",
-      "sha256": "1436lhpjbciln8xmr9sd7d0akh5kap8a9f0az7209c1zqc46i576",
-      "depends": ["FNN", "MASS", "Matrix", "Morpho", "S4Vectors", "concaveman", "dashboardthemes", "dplyr", "ggplot2", "ggpubr", "magrittr", "matrixStats", "pdist", "plotly", "sf", "shiny", "shinyBS", "shinydashboard", "sp", "spatstat_geom", "spatstat_random", "viridis"]
+      "version": "0.99.7",
+      "sha256": "0gfi3dng3pl2ki4g6nbwjxhq4zbj3j4yq95j4dyfzbqj8k4ah7lv",
+      "depends": ["DT", "FNN", "MASS", "Matrix", "Morpho", "S4Vectors", "concaveman", "dashboardthemes", "dplyr", "ggplot2", "ggpubr", "magick", "magrittr", "matrixStats", "pdist", "plotly", "sf", "shiny", "shinyBS", "shinydashboard", "sp", "spatstat_geom", "spatstat_random", "viridis"]
     },
     "SRTtools": {
       "name": "SRTtools",
@@ -31899,8 +33129,8 @@
     },
     "SSBtools": {
       "name": "SSBtools",
-      "version": "1.5.2",
-      "sha256": "1rkmnlgs3car1allc7cr8sq2skgq3bpa274a797rmq8zjkqky16q",
+      "version": "1.6.0",
+      "sha256": "1ibcq4fv71z88gwvqkai41lssjy34kgyrqiik4q8qp0smh7ccyc8",
       "depends": ["MASS", "Matrix", "stringr"]
     },
     "SSDM": {
@@ -31911,8 +33141,8 @@
     },
     "SSDforR": {
       "name": "SSDforR",
-      "version": "1.5.34",
-      "sha256": "12lrvh9231cix5lkc53cf4fk11sfa89011kj2qddk3lkmcyvcwfz",
+      "version": "1.5.37",
+      "sha256": "1q83r1v6q6rrjhmml7x1im7axlh5vxna2f52igmsgb9mf8hccnmm",
       "depends": ["Kendall", "MASS", "MAd", "SingleCaseES", "TTR", "metafor", "modifiedmk", "psych"]
     },
     "SSEparser": {
@@ -31929,9 +33159,9 @@
     },
     "SSHAARP": {
       "name": "SSHAARP",
-      "version": "1.1.0",
-      "sha256": "0x8dinhhfk4q1cck7ms78f4k23430c4wyvlh2qclq0c83acjj4y9",
-      "depends": ["BIGDAWG", "DescTools", "data_table", "dplyr", "filesstrings", "gmt", "gtools", "stringr"]
+      "version": "2.0.5",
+      "sha256": "00yzn0acgj3dib89a28x90v865czh05ig65dbsxc9silr3fwl10j",
+      "depends": ["BIGDAWG", "DescTools", "HLAtools", "data_table", "dplyr", "filesstrings", "gmt", "gtools", "purrr", "stringi", "stringr"]
     },
     "SSIMmap": {
       "name": "SSIMmap",
@@ -31939,12 +33169,6 @@
       "sha256": "1ydwwxisb8wwxb2n5xvz6474n4rwl57xpi4fa0b6jggkzxx113ig",
       "depends": ["dplyr", "ggplot2", "knitr", "scales", "sf", "terra"]
     },
-    "SSLASSO": {
-      "name": "SSLASSO",
-      "version": "1.2-2",
-      "sha256": "0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv",
-      "depends": []
-    },
     "SSLR": {
       "name": "SSLR",
       "version": "0.9.3.3",
@@ -31959,8 +33183,8 @@
     },
     "SSN2": {
       "name": "SSN2",
-      "version": "0.2.0",
-      "sha256": "05q6vhpf305jqq9spkiwkyam6l9rjj4vhdvq1lf1a1dmync7i4x7",
+      "version": "0.2.1",
+      "sha256": "0yzhg5pvmm7bpv8c2qy345iv4r3s2liaxwmz87p9fscv01wx7m3i",
       "depends": ["Matrix", "RSQLite", "generics", "sf", "spmodel", "tibble", "withr"]
     },
     "SSNbayes": {
@@ -31969,6 +33193,12 @@
       "sha256": "1smfd7mas19y8n4jpywphck54crxn15lnc8dpi9s5il50icr2hls",
       "depends": ["SSN2", "dplyr", "plyr", "rstan", "sf"]
     },
+    "SSNbler": {
+      "name": "SSNbler",
+      "version": "1.0.1",
+      "sha256": "0h5cvl32hkdw39ky00r528qsab2zqa1922adgx1fjnqwswqvqy2i",
+      "depends": ["RSQLite", "SSN2", "dplyr", "igraph", "pdist", "sf", "withr"]
+    },
     "SSOSVM": {
       "name": "SSOSVM",
       "version": "0.2.1",
@@ -31983,8 +33213,8 @@
     },
     "SSRA": {
       "name": "SSRA",
-      "version": "0.1-0",
-      "sha256": "1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37",
+      "version": "0.1-1",
+      "sha256": "1xsjwwy1lpm5aqjs1cym34c73k3n6j7z9q3nh2xha57ai4g0drlw",
       "depends": ["shape", "stringr"]
     },
     "SSRMST": {
@@ -32007,8 +33237,8 @@
     },
     "SSplots": {
       "name": "SSplots",
-      "version": "0.1.1",
-      "sha256": "1ja631xdv2bhq7g8vs1cdg3b453zwz7h6rl9n1zma25v2z87gazi",
+      "version": "0.1.2",
+      "sha256": "15qh8yak1v8wc5mp5by7cfbqswlbhmkazsf050p6ysvm0ypq3jyd",
       "depends": ["ggplot2", "reshape2", "zoo"]
     },
     "SSrat": {
@@ -32059,6 +33289,12 @@
       "sha256": "09i6vzp5zmi84kdwafb5cbqvja32mdpj8bnp8gnc2wyqwy3a8cqv",
       "depends": ["Hmisc", "corrgram", "dplyr", "psych", "psycho", "rmarkdown", "rpivotTable", "shiny"]
     },
+    "STATcubeR": {
+      "name": "STATcubeR",
+      "version": "1.0.0",
+      "sha256": "1j5q0kll16csbwpvfaxs2g907i1g98lz5sd6zwbfpqq7908am5jb",
+      "depends": ["cli", "httr", "jsonlite", "pillar", "vctrs"]
+    },
     "STB": {
       "name": "STB",
       "version": "0.6.5",
@@ -32083,6 +33319,12 @@
       "sha256": "0xfwd0jsg3glbr3c5l5yyri4is5kg77ivgr6qlzaxp6p8q7yfzqf",
       "depends": ["brnn", "glmnet", "kernlab", "randomForest", "rrBLUP"]
     },
+    "STICr": {
+      "name": "STICr",
+      "version": "1.1",
+      "sha256": "0i75ql1si8jqqfkjj99bslvhazwjjh7v8bc53hhmr3pc2ax8y1x5",
+      "depends": ["dplyr", "lubridate", "stringr", "tidyr"]
+    },
     "STMotif": {
       "name": "STMotif",
       "version": "2.0.2",
@@ -32137,12 +33379,24 @@
       "sha256": "0x93mppdaah7sznzk1rrw76ia07fnjmb676q1rrya6bzkv5fbf5z",
       "depends": ["Matrix", "RColorBrewer", "data_table", "fields", "ggplot2", "ggridges", "haven", "reshape2", "scales", "sf", "shadowtext", "sp", "spdep", "survey", "survival", "terra", "viridis"]
     },
+    "SUMO": {
+      "name": "SUMO",
+      "version": "0.1.0",
+      "sha256": "0gs9rq18bwxmysmpvwpwc9r01ky7c8gr52hlag1m1d8dmxfb7aq5",
+      "depends": ["ggplot2", "gridExtra", "rlang"]
+    },
     "SUNGEO": {
       "name": "SUNGEO",
       "version": "1.3.0",
       "sha256": "0ydwsrgqknngx7567xwfhwj1jdmi4ip1jxkb5jdy41f7ysy1myd0",
       "depends": ["RANN", "RCurl", "Rcpp", "automap", "cartogram", "data_table", "dplyr", "httr", "jsonlite", "measurements", "packcircles", "purrr", "raster", "rlang", "rmapshaper", "sf", "spdep", "stringr", "terra"]
     },
+    "SUSENAS": {
+      "name": "SUSENAS",
+      "version": "0.1.0",
+      "sha256": "181d8gq8m45rw7xfpb7ic87y4ank4z8nrk0743k4jc896b3fnrrj",
+      "depends": ["readxl"]
+    },
     "SUSY": {
       "name": "SUSY",
       "version": "0.1.0",
@@ -32151,9 +33405,27 @@
     },
     "SVDNF": {
       "name": "SVDNF",
-      "version": "0.1.8",
-      "sha256": "1dps1qjr3a9wwzmi6vdr515lhvqligjhm7qdh7frii1y9lc4hzc2",
-      "depends": ["Rcpp"]
+      "version": "0.1.11",
+      "sha256": "1gzszsgn5dm7n2y4slwjb77hbf11ky2r290i3dj3nqk0mjjazlry",
+      "depends": ["Rcpp", "xts", "zoo"]
+    },
+    "SVEMnet": {
+      "name": "SVEMnet",
+      "version": "1.3.0",
+      "sha256": "1jwb0m9w513d9b1i8h52ya9zkaf4r73kr07avbx7ngh3cj632ggx",
+      "depends": ["doParallel", "foreach", "gamlss", "gamlss_dist", "ggplot2", "glmnet", "lhs"]
+    },
+    "SVMD": {
+      "name": "SVMD",
+      "version": "0.1.0",
+      "sha256": "0g6cp3zazfx70c0ahfymwxwsinkhrd0hcvh464sch8k77m81asbf",
+      "depends": ["VMDecomp"]
+    },
+    "SVMMaj": {
+      "name": "SVMMaj",
+      "version": "0.2.9.3",
+      "sha256": "1qr9hs857w5lv1601ksnb3z1g3ysjpp7idny2j4r4hi3nlh6pd55",
+      "depends": ["dplyr", "ggplot2", "gridExtra", "kernlab", "reshape2", "scales"]
     },
     "SVN": {
       "name": "SVN",
@@ -32181,9 +33453,9 @@
     },
     "SWTools": {
       "name": "SWTools",
-      "version": "1.0.3",
-      "sha256": "134kmw30xxw90wnzb3z6s6j21vjrxfp2q0alvy2abpmgl6wmhlvp",
-      "depends": ["dplyr", "forcats", "ggplot2", "ggspatial", "httr", "hydroTSM", "jsonlite", "lubridate", "magrittr", "prettymapr", "readr", "reshape2", "rlang", "rmarkdown", "segmented", "sf", "stringr", "tibble", "tidyr", "zoo"]
+      "version": "1.1.0",
+      "sha256": "10d9wgw2h1kykl46apaymfrriypf8xpixvk6za427xgya7krkz6l",
+      "depends": ["dplyr", "forcats", "ggplot2", "ggpubr", "ggspatial", "httr", "hydroTSM", "jsonlite", "lubridate", "magrittr", "prettymapr", "readr", "rlang", "rmarkdown", "segmented", "sf", "stringr", "tibble", "tidyr", "zoo"]
     },
     "SYNCSA": {
       "name": "SYNCSA",
@@ -32193,8 +33465,8 @@
     },
     "SafeVote": {
       "name": "SafeVote",
-      "version": "1.0.0",
-      "sha256": "1shv5l0grx3bsb0md5ann5dyh18w9i4q2nsar0qmd6cgl87ml4qn",
+      "version": "1.0.1",
+      "sha256": "01gkk16ynrimjyygma2dg7azgj7ag1bwd22w39rpjlfhaavkysza",
       "depends": ["data_table", "dplyr", "fields", "forcats", "formattable", "ggplot2", "knitr", "stringr"]
     },
     "SailoR": {
@@ -32251,6 +33523,12 @@
       "sha256": "0ijxfa1h3mx86jk1s27qp7l4sz2d7i7llkwjvgnih9zjk0ybrdzw",
       "depends": ["DBI", "dplyr", "ggplot2", "ggtext", "ggthemes", "janitor", "magrittr", "odbc", "readr", "readxl", "rlang", "scales", "tibble"]
     },
+    "SaturnCoefficient": {
+      "name": "SaturnCoefficient",
+      "version": "1.3",
+      "sha256": "10dc55pvhn6mhgfxax3ml9d8xpw9l5yr2h3608yw98gs6k19749v",
+      "depends": ["MatrixCorrelation", "ProjectionBasedClustering", "umap"]
+    },
     "ScRNAIMM": {
       "name": "ScRNAIMM",
       "version": "0.1",
@@ -32277,8 +33555,8 @@
     },
     "SchoolDataIT": {
       "name": "SchoolDataIT",
-      "version": "0.2.0",
-      "sha256": "1yi65xzi4h0aviisswrn78zgqzp17y4vvjnfcvphlgyr67nh3g6k",
+      "version": "0.2.2",
+      "sha256": "0zcbl1dhdw3bkm58ska9m12d3ilw3ljp99bpp099bika622b661c",
       "depends": ["curl", "dplyr", "ggplot2", "httr", "leafpop", "magrittr", "mapview", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "xml2"]
     },
     "SciViews": {
@@ -32347,12 +33625,6 @@
       "sha256": "1n0y91y1l657g61klbcjz82ddj2csdpnralc3rbk1hbwr4nxk069",
       "depends": []
     },
-    "SecDim": {
-      "name": "SecDim",
-      "version": "3.2",
-      "sha256": "04l4qpw409dj5i494vmf7vmksis6910599gh259nbyv0pdfw5svr",
-      "depends": ["RcppArmadillo", "geosphere"]
-    },
     "SeedCalc": {
       "name": "SeedCalc",
       "version": "1.0.0",
@@ -32383,6 +33655,12 @@
       "sha256": "1g4bwfs539jf7ckzjyindi3v1av7vd38yz16m7cb20qqa0a33kbj",
       "depends": ["jointseg"]
     },
+    "SegEnvIneq": {
+      "name": "SegEnvIneq",
+      "version": "1.2",
+      "sha256": "1jnn1ix1v07094cy9m4rx0zs46yay2ab5ijnjl4ddd53py60imbh",
+      "depends": ["OasisR", "outliers", "sf", "spdep"]
+    },
     "Sejong": {
       "name": "Sejong",
       "version": "0.01",
@@ -32463,8 +33741,8 @@
     },
     "SemiPar_depCens": {
       "name": "SemiPar.depCens",
-      "version": "0.1.2",
-      "sha256": "1dkyq8gilcxy4rml917851f7yn252g8xf6rr0glvai1jz5iyi8js",
+      "version": "0.1.3",
+      "sha256": "0ig7w36by5970p02859p8z9licmw1myy5r84hfd31ndkymv3hca7",
       "depends": ["copula", "doParallel", "foreach", "pbivnorm", "survival"]
     },
     "SenSpe": {
@@ -32485,6 +33763,12 @@
       "sha256": "1yja63087nhb5c0wlql7yynjkhkrjw69amvz4w55xqvp605rh46f",
       "depends": ["TSdist", "data_table", "doSNOW", "expint", "foreach", "mclust", "rlist", "snow", "tidyr", "withr", "zipfR"]
     },
+    "SensIAT": {
+      "name": "SensIAT",
+      "version": "0.1.1",
+      "sha256": "0327bb7zkw07qs7lq5nqh845yb65m9b5xx7wjy8pfa2f7mxwg7f2",
+      "depends": ["KernSmooth", "MASS", "Rcpp", "assertthat", "dplyr", "glue", "orthogonalsplinebasis", "pracma", "purrr", "rlang", "survival", "tibble", "tidyr"]
+    },
     "SensMap": {
       "name": "SensMap",
       "version": "0.7",
@@ -32571,8 +33855,8 @@
     },
     "Sequential": {
       "name": "Sequential",
-      "version": "4.3.3",
-      "sha256": "0k5iikj16iqlahr01y6nikd04vp0v5jk292kwdw9isnvx735fvkr",
+      "version": "4.3.4",
+      "sha256": "0qa16qj2c9gmwy80ypyqx2fcc9dl89hr1d9y68zx2m91fby06m7i",
       "depends": ["boot"]
     },
     "SequentialDesign": {
@@ -32619,8 +33903,8 @@
     },
     "ShapePattern": {
       "name": "ShapePattern",
-      "version": "3.0.1",
-      "sha256": "1vlzvfns6grxc2g0d4slsckg6lzzr0k38brncf2akb41jkczbyak",
+      "version": "3.1.0",
+      "sha256": "0myjl344qd0ibzg5im6ys3z3fbf78jr62s1p7wl87rki9g691hbj",
       "depends": ["igraph", "landscapemetrics", "raster", "sp", "terra"]
     },
     "ShapeSelectForest": {
@@ -32631,8 +33915,8 @@
     },
     "ShapleyOutlier": {
       "name": "ShapleyOutlier",
-      "version": "0.1.1",
-      "sha256": "1qdb872cppq1dh33l75pxw4l7isp8nlsinbipygm989f1sf24xkh",
+      "version": "0.1.2",
+      "sha256": "0k96jf8p5h6m81v900rj6110gq7jg3imxvlqsp4a93y67rgx58vn",
       "depends": ["RColorBrewer", "Rdpack", "dplyr", "egg", "forcats", "ggplot2", "gridExtra", "magrittr", "robustbase", "tibble", "tidyr"]
     },
     "ShapleyValue": {
@@ -32649,9 +33933,9 @@
     },
     "SharpeR": {
       "name": "SharpeR",
-      "version": "1.3.0",
-      "sha256": "1xq2m53n2gc706lyd16gccllx2wgwdrqkfpf79jwwdmipqfqnxjx",
-      "depends": ["matrixcalc"]
+      "version": "1.4.0",
+      "sha256": "1xc7bl6khkvgxwj3xsdcdx5li626wkaq2wz43lk875a6akv0v586",
+      "depends": ["epsiwal", "matrixcalc", "zoo"]
     },
     "SheetReader": {
       "name": "SheetReader",
@@ -32685,8 +33969,8 @@
     },
     "ShinyItemAnalysis": {
       "name": "ShinyItemAnalysis",
-      "version": "1.5.1",
-      "sha256": "12knai3ar8c091pwba34dz74yhnx7kd0f6si0hcwamdcnvb6i324",
+      "version": "1.5.2",
+      "sha256": "1hk04dkmk5f11m8wgr9gm02dhrzxwp2skfwgxq80y1gyqyhiywda",
       "depends": ["difR", "dplyr", "ggplot2", "lme4", "magrittr", "mirt", "nnet", "psych", "purrr", "rlang", "rstudioapi", "tibble", "tidyr"]
     },
     "ShinyLink": {
@@ -32707,10 +33991,16 @@
       "sha256": "0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8",
       "depends": ["dplyr", "purrr", "readr", "stringr", "tidyr", "visNetwork"]
     },
+    "ShinyWizard": {
+      "name": "ShinyWizard",
+      "version": "1.1.3.11",
+      "sha256": "17lpn2fi97q92f0xxyj0z30apap4yxxq2pj609zhlphsg4hqdjr1",
+      "depends": ["rstudioapi"]
+    },
     "ShortForm": {
       "name": "ShortForm",
-      "version": "0.5.5",
-      "sha256": "14qypmb51w5k6xndjdgrwawyr3ccnp9llsh93sah7xkwl1hkkbdl",
+      "version": "0.5.6",
+      "sha256": "1q81sw875n9bqc6wxagsd9f400zzci1xs0911agkxs7pijyndgkn",
       "depends": ["doSNOW", "foreach", "ggplot2", "ggrepel", "lavaan", "stringr", "tidyr"]
     },
     "ShrinkCovMat": {
@@ -32727,9 +34017,9 @@
     },
     "SiMRiv": {
       "name": "SiMRiv",
-      "version": "1.0.6",
-      "sha256": "1xwbfwhmlmgsbrg0cfgn1yp8f29vzsga8sw7fyclsf76dx9sbmc6",
-      "depends": ["mco", "raster"]
+      "version": "1.0.7",
+      "sha256": "069cjkwbzp7c62zgj939h5nbfmpcxkfx1sbk4np1hgzjfv3ybz86",
+      "depends": ["mco", "terra"]
     },
     "SiPhyNetwork": {
       "name": "SiPhyNetwork",
@@ -32775,8 +34065,8 @@
     },
     "Signac": {
       "name": "Signac",
-      "version": "1.13.0",
-      "sha256": "0ahv4j1jbhbclvidyw6h15p6n64zhawamqnrn8s1hf9pchy11d6r",
+      "version": "1.14.0",
+      "sha256": "17n5cf1y0qp53zs3xj7a6lc6pd1x3vgc50b06zfqy53wqbidkap0",
       "depends": ["BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "Matrix", "Rcpp", "RcppRoll", "Rsamtools", "S4Vectors", "SeuratObject", "data_table", "dplyr", "fastmatch", "future", "future_apply", "ggplot2", "irlba", "lifecycle", "patchwork", "pbapply", "rlang", "scales", "stringi", "tidyr", "tidyselect", "vctrs"]
     },
     "SignacX": {
@@ -32841,8 +34131,8 @@
     },
     "SimDesign": {
       "name": "SimDesign",
-      "version": "2.17.1",
-      "sha256": "0anmnzxxw7mv9kykjf2kmgv6qwxkrg48g91q32r2ia4dw8n17782",
+      "version": "2.18",
+      "sha256": "0xvqpi3pfpx80aldb6g0iyw4rzspdfy65n1q2hk0agmm1dpy4qsm",
       "depends": ["RPushbullet", "R_utils", "beepr", "dplyr", "future", "future_apply", "parallelly", "pbapply", "progressr", "sessioninfo", "snow", "testthat"]
     },
     "SimDissolution": {
@@ -32893,6 +34183,12 @@
       "sha256": "05qp6cnih319p88vrppwvxh595a7vawkc7508xzmzhvrjbn3p7jn",
       "depends": ["SimDesign", "car", "dplyr", "miniPCH", "nph", "nphRCT", "purrr", "rlang", "stringr", "survival", "tibble", "tidyr"]
     },
+    "SimRDS": {
+      "name": "SimRDS",
+      "version": "2.0.0",
+      "sha256": "1kig2mzwcqzf8vdal42hm2847b8dffma2idv8lrs8dqdxqnpk5ck",
+      "depends": ["RDS", "e1071"]
+    },
     "SimReg": {
       "name": "SimReg",
       "version": "3.4",
@@ -32943,8 +34239,8 @@
     },
     "Simile": {
       "name": "Simile",
-      "version": "1.3.3",
-      "sha256": "1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4",
+      "version": "1.3.4",
+      "sha256": "0lism5ivrs32246pf3k8pqpvkib790rdjj48n1npnd07wwazk00v",
       "depends": []
     },
     "SimplicialCubature": {
@@ -32961,9 +34257,9 @@
     },
     "SingleCaseES": {
       "name": "SingleCaseES",
-      "version": "0.7.2",
-      "sha256": "0yp7h13g9lq9ym8jzxlzc0m2vmp63kvnmf7ysyxinjardigng6k7",
-      "depends": ["dplyr", "magrittr", "purrr", "rlang", "tidyr", "tidyselect"]
+      "version": "0.7.3",
+      "sha256": "198rfvs45bqaaj91lcmasc98jximivksv6m1ik7wr49daifikddv",
+      "depends": ["dplyr", "purrr", "rlang", "tidyr", "tidyselect"]
     },
     "SixSigma": {
       "name": "SixSigma",
@@ -32991,8 +34287,8 @@
     },
     "SlaPMEG": {
       "name": "SlaPMEG",
-      "version": "1.0.1",
-      "sha256": "0ikhx14czcavfxppsaf0b6506l4gwhwk4p3wilr9zykw17s8ghzm",
+      "version": "1.0.2",
+      "sha256": "1w5iq0hkr1bx493cjzzaaxfypkvqf50nhidhxgxm337z05j55np7",
       "depends": ["ggplot2", "globaltest", "lcmm", "lme4", "magic", "mvtnorm", "reshape2"]
     },
     "SleepCycles": {
@@ -33033,8 +34329,8 @@
     },
     "SmallCountRounding": {
       "name": "SmallCountRounding",
-      "version": "1.0.3",
-      "sha256": "1jnhfzjd2x54h35si1wrr91dkzdzc502m07mvvb894y5pq5q823a",
+      "version": "1.1.0",
+      "sha256": "0a80xkf4pj8w4n6n1wai0lxacmln9bbkch7syrmsriggwgysjj1p",
       "depends": ["Matrix", "SSBtools"]
     },
     "SmartEDA": {
@@ -33129,8 +34425,8 @@
     },
     "SoilConservation": {
       "name": "SoilConservation",
-      "version": "1.0.0",
-      "sha256": "17jwz338h2km43fddnp21hf4ri0gb0y2jiggm1236m5wl87livxx",
+      "version": "1.0.1",
+      "sha256": "0m1v90y3315ip3n4d84yhqqr17b26l06h9q16zy0q8ka6fnaxnnc",
       "depends": []
     },
     "SoilFDA": {
@@ -33151,6 +34447,12 @@
       "sha256": "0f4djzmbyz6x5av0d4ii972dw6295c4l3c7gbwp0yinpy3rgvh0q",
       "depends": ["data_table", "lubridate"]
     },
+    "SoilManageR": {
+      "name": "SoilManageR",
+      "version": "1.0.1",
+      "sha256": "13qp3z09wgsfkgy8bzg79qzpy9hd0ir7hggcy5x0wl13988b5bg2",
+      "depends": ["Rdpack", "dplyr", "ggplot2", "ggthemes", "lubridate", "magrittr", "readxl", "tibble", "tidyr"]
+    },
     "SoilR": {
       "name": "SoilR",
       "version": "1.2.107",
@@ -33213,8 +34515,8 @@
     },
     "SoundShape": {
       "name": "SoundShape",
-      "version": "1.3.0",
-      "sha256": "1inp1255mdhbr0sfqwdmb6g0ab625c98q3avfk6w36gb0c77b5ry",
+      "version": "1.3.2",
+      "sha256": "1wp52p5a2b5dm3pa99n85ampmqn4l8g2dwywnhyp2naznmn2hpgw",
       "depends": ["abind", "geomorph", "plot3D", "reshape2", "seewave", "stringr", "tuneR"]
     },
     "SoundexBR": {
@@ -33249,8 +34551,8 @@
     },
     "SpATS": {
       "name": "SpATS",
-      "version": "1.0-18",
-      "sha256": "1p7ibi4593a6f5ww02l74afxaxgk2nh8h67l43vm2p7zfmdxx2b3",
+      "version": "1.0-19",
+      "sha256": "06fyns1g1iapps0f3g2555rl2cval91icc1ydszh6zv0zhq7m0la",
       "depends": ["data_table", "fields", "spam"]
     },
     "SpNMF": {
@@ -33271,6 +34573,12 @@
       "sha256": "1xykmbgwwnvl7c9mf0aam3s55xmq2pxdy5wkkz9nzj1c74m0bxqf",
       "depends": ["MASS", "ggplot2", "glmnet", "knitr", "mapproj", "maps", "rmarkdown"]
     },
+    "SpaCCI": {
+      "name": "SpaCCI",
+      "version": "1.0.2",
+      "sha256": "1917yyh1dw21rbpr7cxg36rlxfnx4f6lsnkb46zbc79v9wrmciq7",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Seurat", "circlize", "dplyr", "ggplot2", "ggrepel", "nnls", "patchwork", "pheatmap", "reshape2"]
+    },
     "SpaCOAP": {
       "name": "SpaCOAP",
       "version": "1.2",
@@ -33321,8 +34629,8 @@
     },
     "SparseChol": {
       "name": "SparseChol",
-      "version": "0.3.1",
-      "sha256": "1gva9665mlr8g14l7g6z591yhz2j6xpf56bhqhm6is3dbhl2ga24",
+      "version": "0.3.2",
+      "sha256": "19lr6dd5fp31s30chfwx2f1g7q57l3hg398df5w83sr6qw49r6ik",
       "depends": ["Matrix", "Rcpp", "RcppEigen"]
     },
     "SparseDC": {
@@ -33429,8 +34737,8 @@
     },
     "SpatialDDLS": {
       "name": "SpatialDDLS",
-      "version": "1.0.2",
-      "sha256": "1wnyy7wi7bqlm2wjmjw18b7fxyi0ngfry4rzdb4q0fl6x0lkl0hj",
+      "version": "1.0.3",
+      "sha256": "1l9rbc5k2fxr7qrv8hhki603bnmg7wbwf2vbizqkl4zk87f33rx4",
       "depends": ["FNN", "Matrix", "S4Vectors", "SingleCellExperiment", "SpatialExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggpubr", "grr", "gtools", "keras", "pbapply", "reshape2", "reticulate", "rlang", "scran", "scuttle", "tensorflow", "zinbwave"]
     },
     "SpatialEpi": {
@@ -33489,8 +34797,8 @@
     },
     "SpatialPack": {
       "name": "SpatialPack",
-      "version": "0.4",
-      "sha256": "138q209gyggpfa1ha1yc6czpv0lxp6acggvp4yc4nbcnkxnvqzwb",
+      "version": "0.4-1",
+      "sha256": "1cz6i5ws2d3nyfds02xwjzi7yyrn8a1wz0h4kr8v3h5ldfbp1abf",
       "depends": ["fastmatrix"]
     },
     "SpatialPosition": {
@@ -33531,8 +34839,8 @@
     },
     "SpatialVx": {
       "name": "SpatialVx",
-      "version": "1.0-2",
-      "sha256": "108mpxpk03gmak69fkd7snhls11hh31fwmva9kqh71rh5g3a47fw",
+      "version": "1.0-3",
+      "sha256": "1q16mslk52vn2j02ksivcjwfg7hzhsrgxzxknxbj1i037i9pyz4n",
       "depends": ["CircStats", "boot", "distillery", "fastcluster", "fields", "maps", "smatr", "smoothie", "spatstat", "spatstat_geom", "spatstat_linnet", "spatstat_model", "turboEM", "waveslim"]
     },
     "SpatialfdaR": {
@@ -33633,8 +34941,8 @@
     },
     "SplitKnockoff": {
       "name": "SplitKnockoff",
-      "version": "1.2",
-      "sha256": "1ywh86gkkcc2dddqfgs5w8w9wyjfqmvcr31jga41ddvj5rb8zkhx",
+      "version": "2.1",
+      "sha256": "13s40w98rm5bfd58272wm927nwsngydwag9pdpajhrz2lkbagnkz",
       "depends": ["MASS", "Matrix", "RSpectra", "ggplot2", "glmnet", "latex2exp", "mvtnorm"]
     },
     "SplitReg": {
@@ -33645,8 +34953,8 @@
     },
     "SplitSoftening": {
       "name": "SplitSoftening",
-      "version": "2.1-0",
-      "sha256": "1fgcqax81zpknw642fm9dx1f6dpdgbcf3va0m1bhj6kl98yq7dqd",
+      "version": "2.1-1",
+      "sha256": "12hg2cm3y50rcqqa1fk40xf4z99cwc5x411lgp0w204qdzgfjddj",
       "depends": []
     },
     "SplitSplitPlot": {
@@ -33663,8 +34971,8 @@
     },
     "SqlRender": {
       "name": "SqlRender",
-      "version": "1.18.0",
-      "sha256": "0vkxz5gl0df4yw81a698jclsph4z65v74qglfhagp1p3xknkjwy9",
+      "version": "1.19.1",
+      "sha256": "1vhc134qvjdzxn78b71skvxsjy1pyyyswzhyyz2av16dpp17c8wi",
       "depends": ["checkmate", "rJava", "rlang"]
     },
     "SqueakR": {
@@ -33709,6 +35017,12 @@
       "sha256": "0cwrizyk4l82alfwijpljwhcjhgcimrf1vv8wsz7azwwiqzb0cns",
       "depends": ["ADGofTest", "MCMCpack", "matlab", "numDeriv", "tseries"]
     },
+    "StabilityApp": {
+      "name": "StabilityApp",
+      "version": "0.1.0",
+      "sha256": "1c8yfmm63rg4mp7fhyia2szhdwwd9g5lzqnx88px7hchglsf12jf",
+      "depends": ["DT", "dplyr", "gridExtra", "patchwork", "shiny", "shinyBS", "shinydashboardPlus", "stability"]
+    },
     "StabilizedRegression": {
       "name": "StabilizedRegression",
       "version": "1.1",
@@ -33717,8 +35031,8 @@
     },
     "StableEstim": {
       "name": "StableEstim",
-      "version": "2.2",
-      "sha256": "0z8ia3zqkidnpg2zl055msc0dmhbsq73h8c43y0vfmhdzqszcx9d",
+      "version": "2.3",
+      "sha256": "133l5vnyx1sq7q6cgrwjsnl8x6k1zfzl19k3inijk9qq095pbzrd",
       "depends": ["MASS", "Matrix", "Rdpack", "fBasics", "numDeriv", "stabledist", "testthat", "xtable"]
     },
     "StackImpute": {
@@ -33831,9 +35145,9 @@
     },
     "StepReg": {
       "name": "StepReg",
-      "version": "1.5.2",
-      "sha256": "1v7inw48dg5mhhlmqvlj7s97w93sjha0djgrl1ninhgp08fl2njh",
-      "depends": ["DT", "MASS", "cowplot", "dplyr", "flextable", "ggcorrplot", "ggplot2", "ggrepel", "purrr", "rmarkdown", "shiny", "shinycssloaders", "shinyjs", "shinythemes", "stringr", "summarytools", "survival", "tidyr"]
+      "version": "1.5.6",
+      "sha256": "1s0dq1n5qmb01x7z2rssk2mxcsjc7x6g3p5xqjfgymy5gj6wrxn6",
+      "depends": ["DT", "MASS", "cowplot", "dplyr", "flextable", "ggcorrplot", "ggplot2", "ggrepel", "rmarkdown", "shiny", "shinycssloaders", "shinyjs", "shinythemes", "stringr", "summarytools", "survival", "tidyr"]
     },
     "StepSignalMargiLike": {
       "name": "StepSignalMargiLike",
@@ -33861,8 +35175,8 @@
     },
     "SticsRFiles": {
       "name": "SticsRFiles",
-      "version": "1.4.0",
-      "sha256": "1afn65z2pz99k3a1fq8w9jjy05bvsdy7p8f829iap1jaahnbz14m",
+      "version": "1.5.0",
+      "sha256": "0aw1crzji95dik556q29kxrjph80x2gx6ba1rm47l9301k6scj1k",
       "depends": ["XML", "cli", "crayon", "curl", "data_table", "dplyr", "lifecycle", "lubridate", "rlang", "rstudioapi", "stringr", "tibble", "tidyr", "tidyselect", "xml2", "xslt"]
     },
     "StochBlock": {
@@ -33895,6 +35209,12 @@
       "sha256": "1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0",
       "depends": []
     },
+    "StratPal": {
+      "name": "StratPal",
+      "version": "0.3.0",
+      "sha256": "1ic4dfkkqpwanr8i4ycalrynryy60k8fckv7q1n4gk3x9jxdj3w4",
+      "depends": ["admtools", "paleoTS"]
+    },
     "StratSel": {
       "name": "StratSel",
       "version": "1.3",
@@ -33957,15 +35277,9 @@
     },
     "StroupGLMM": {
       "name": "StroupGLMM",
-      "version": "0.1.0",
-      "sha256": "1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd",
-      "depends": ["MASS", "aod", "broom", "car", "ggplot2", "lme4", "lmerTest", "lsmeans", "mutoss", "nlme", "pbkrtest", "phia", "survey"]
-    },
-    "StrucDiv": {
-      "name": "StrucDiv",
-      "version": "0.2.1",
-      "sha256": "1mzkcij7mrmjj5ccmy0l3xbb75w0bi7vc2cxap3qkycqm1ajk1dr",
-      "depends": ["Rcpp", "RcppProgress", "doParallel", "foreach", "glue", "raster"]
+      "version": "0.3.0",
+      "sha256": "1vif5kwra18kq83f56rkcshqzmddmfl1ln6rwx54c0hwhpvnhszm",
+      "depends": ["MASS", "aod", "broom_mixed", "car", "dplyr", "emmeans", "ggplot2", "lattice", "lmerTest", "magrittr", "mutoss", "nlme", "parameters", "phia", "scatterplot3d", "survey"]
     },
     "StructuralDecompose": {
       "name": "StructuralDecompose",
@@ -34027,6 +35341,12 @@
       "sha256": "1r0sjzjmllicqmqv5phxpqcndh84kjqc779js32rlwbw0x279xhw",
       "depends": ["BiocGenerics", "ChemmineR", "GSVA", "igraph", "pheatmap", "rvest", "xml2"]
     },
+    "SudokuDesigns": {
+      "name": "SudokuDesigns",
+      "version": "1.1.0",
+      "sha256": "1yf864gcd2jm1iwj1dyghgf26q9ag39cm1kcvkhhv87879jgvs3w",
+      "depends": []
+    },
     "SuessR": {
       "name": "SuessR",
       "version": "0.1.5",
@@ -34045,6 +35365,12 @@
       "sha256": "1gb1g1xgda5psq93vy50yfr0cbhvymliblpkxz7ck1nwpp65n9py",
       "depends": ["gtools"]
     },
+    "SunCalcMeeus": {
+      "name": "SunCalcMeeus",
+      "version": "0.1.1",
+      "sha256": "18sx9s3jh792lasy9pbl98mh7w2mwqyh04np3pm8jrda7bfdvav0",
+      "depends": ["dplyr", "lubridate", "tibble"]
+    },
     "Sunclarco": {
       "name": "Sunclarco",
       "version": "1.0.0",
@@ -34063,6 +35389,12 @@
       "sha256": "1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r",
       "depends": ["dplyr", "magrittr"]
     },
+    "SuperCell": {
+      "name": "SuperCell",
+      "version": "1.0.1",
+      "sha256": "0y0mqg1vzlcll9wd5wq0fiimlzbdhwwfcyr6zpwz45nq8r8wizvq",
+      "depends": ["Hmisc", "Matrix", "RANN", "Rtsne", "WeightedCluster", "corpcor", "dbscan", "entropy", "ggplot2", "igraph", "irlba", "matrixStats", "patchwork", "plotfunctions", "plyr", "proxy", "rlang", "scales", "umap", "weights"]
+    },
     "SuperExactTest": {
       "name": "SuperExactTest",
       "version": "1.1.0",
@@ -34101,10 +35433,16 @@
     },
     "SuppDists": {
       "name": "SuppDists",
-      "version": "1.1-9.7",
-      "sha256": "025b9nlxz62wk84295csyzbncpn80i3iby3sxdigf3swcgi2fmbb",
+      "version": "1.1-9.8",
+      "sha256": "07k8sdw7qmbzflpsr1zrn8bm42qp936sm3bwpi8q7mjb7h8y40k5",
       "depends": []
     },
+    "SurfRough": {
+      "name": "SurfRough",
+      "version": "0.0.1.0",
+      "sha256": "1nvia5y38y2hx3w3k89cf4hrpl44sj23444xdr4vbpifrgy6qgpf",
+      "depends": ["terra"]
+    },
     "SurfaceTortoise": {
       "name": "SurfaceTortoise",
       "version": "2.0.1",
@@ -34129,6 +35467,12 @@
       "sha256": "1wiqn9gfvj225dvmp49fyybp77np507s04f28a9wa9jiyvqf7m97",
       "depends": ["survival"]
     },
+    "SurrogateParadoxTest": {
+      "name": "SurrogateParadoxTest",
+      "version": "1.0",
+      "sha256": "0ib1smiwycrxq9x7q9wkmj1swvmkd8dhfrc7x1jyi7xcqmmd7nzs",
+      "depends": []
+    },
     "SurrogateRank": {
       "name": "SurrogateRank",
       "version": "1.0",
@@ -34183,6 +35527,12 @@
       "sha256": "004s62c5w4lrp55g883iz8plviaij86m5wiaxcmqxaf5709sbk9g",
       "depends": []
     },
+    "SurvMA": {
+      "name": "SurvMA",
+      "version": "1.6.8",
+      "sha256": "1nypjx7ds135ffgyxvjrqfqk0cissw27dmslqf11m9jajm7brqja",
+      "depends": ["maxLik", "pec", "quadprog", "survival"]
+    },
     "SurvMI": {
       "name": "SurvMI",
       "version": "0.1.0",
@@ -34221,9 +35571,9 @@
     },
     "SurveyDefense": {
       "name": "SurveyDefense",
-      "version": "0.1.0",
-      "sha256": "1n0a1h4bzmxidzf5rszrpsmxj7kd7dw0flrpc8mps6glf8ikw7pq",
-      "depends": ["flextable"]
+      "version": "0.2.0",
+      "sha256": "13x89nnqlycdvdya8p0qphsmq4kf94m6g3s4dy1npnhddjww277s",
+      "depends": ["dplyr", "flextable"]
     },
     "SurviMChd": {
       "name": "SurviMChd",
@@ -34369,6 +35719,12 @@
       "sha256": "091mq0f2cawkfmaql9gqgv2sbs5fwyv4i2sdw14p1r01wznfrqzf",
       "depends": ["CVXR", "Rcpp", "RcppArmadillo", "Rdpack", "lpSolve"]
     },
+    "TAD": {
+      "name": "TAD",
+      "version": "1.0.0",
+      "sha256": "0ab1jb1yfm7s12ivmywr3cnh5aq5ccfrnkb56izzbbsdbc3vd31l",
+      "depends": ["doFuture", "foreach", "mblm"]
+    },
     "TAF": {
       "name": "TAF",
       "version": "4.2.0",
@@ -34449,8 +35805,8 @@
     },
     "TCHazaRds": {
       "name": "TCHazaRds",
-      "version": "1.1.0",
-      "sha256": "0v9zabnvm196053srcbfrg5aml8rrcbx5v9byq60gv8p588yfmf8",
+      "version": "1.1.2",
+      "sha256": "1jrfrx9ndjn380spshqnxjilvfxd1xkx9pkbc94cia55ffis9vnm",
       "depends": ["Rcpp", "geosphere", "latticeExtra", "ncdf4", "raster", "rasterVis", "sp", "terra"]
     },
     "TCIApathfinder": {
@@ -34461,8 +35817,8 @@
     },
     "TCIU": {
       "name": "TCIU",
-      "version": "1.2.6",
-      "sha256": "0gbzpd0yadxrlsmnwk4kzf6bvm504k18i0sf2bq6zjaczdhc0vkp",
+      "version": "1.2.7",
+      "sha256": "1l4n0h4vvhwr10pb8g042ss92ka99zdzy3z4h0n397v5n68cnlc3",
       "depends": ["DT", "ICSNP", "MultiwayRegression", "RColorBrewer", "cubature", "doParallel", "dplyr", "extraDistr", "fancycut", "fmri", "foreach", "forecast", "geometry", "ggplot2", "ggpubr", "gridExtra", "interp", "plotly", "pracma", "reshape2", "rrcov", "scales", "spatstat_explore", "spatstat_geom", "tidyr", "zoo"]
     },
     "TCPMOR": {
@@ -34485,8 +35841,8 @@
     },
     "TDApplied": {
       "name": "TDApplied",
-      "version": "3.0.3",
-      "sha256": "112zkkmi2677kyxkrk2669xdcr7g3f7saqa4iy2qi8k36all87l7",
+      "version": "3.0.4",
+      "sha256": "1l6rvx5jfyapmkrl8b02xdkwbpsf975zi1phqqivnvw2l5dwzfwg",
       "depends": ["Rcpp", "clue", "doParallel", "foreach", "iterators", "kernlab", "parallelly", "rdist"]
     },
     "TDAstats": {
@@ -34537,12 +35893,6 @@
       "sha256": "127bvwy65fr0nm7gw4mqcjm6dfrvlnl77z4ig2bpfxy7a0xq67gp",
       "depends": []
     },
-    "TDboost": {
-      "name": "TDboost",
-      "version": "1.5",
-      "sha256": "1lx5g6yrp43m0dhhs0iig9chlvqbbim5xq5i2bxy4frs2afka22g",
-      "depends": ["lattice"]
-    },
     "TE": {
       "name": "TE",
       "version": "0.3-0",
@@ -34579,6 +35929,12 @@
       "sha256": "0psdm35g7h7d8cr3xlyq8akr0qrbl44d5pnsaf535cs5pmqdp87b",
       "depends": ["ExPosition", "prettyGraphs"]
     },
+    "TFM": {
+      "name": "TFM",
+      "version": "0.1.0",
+      "sha256": "1pr020rxl8fzp55l3g23aizjpk4zz1r69pdx0wsmw3fxh8s3hr22",
+      "depends": ["MASS", "SOPC", "mvtnorm", "relliptical"]
+    },
     "TFMPvalue": {
       "name": "TFMPvalue",
       "version": "0.0.9",
@@ -34669,6 +36025,12 @@
       "sha256": "18wzr7lgzffalvacbr1617d4v50mhd13wqbyr9iyhgc07z2pfncn",
       "depends": ["dplyr", "ggplot2"]
     },
+    "TLIC": {
+      "name": "TLIC",
+      "version": "0.3",
+      "sha256": "0li3qh0jn9sw8p0cq8wdr529nsldv0ff22yrbc5l9g0jbf0h6zby",
+      "depends": ["LaplacesDemon", "fBasics"]
+    },
     "TLMoments": {
       "name": "TLMoments",
       "version": "0.7.5.3",
@@ -34677,8 +36039,8 @@
     },
     "TMB": {
       "name": "TMB",
-      "version": "1.9.14",
-      "sha256": "1lvbjz9w8m6awww1vkzaw1qc4mmhlmdlk9s4qd5i0568zb15m72d",
+      "version": "1.9.15",
+      "sha256": "11ip3cpp2mzwpja0rs62zjh3nfjv1fc21641k5h1hya7lpywmam3",
       "depends": ["Matrix", "RcppEigen"]
     },
     "TMDb": {
@@ -34693,6 +36055,12 @@
       "sha256": "1157saqs5wczzz45pk966pi5wswlcm2fa22f0q9kdsg92rfgxja7",
       "depends": ["MASS", "Matrix", "ROCR", "RcppAlgos", "Rfast", "ape", "cluster", "combinat", "gtools", "lpSolve", "lpSolveAPI", "maps", "miscTools", "phangorn", "phytools", "rcdd", "rgl"]
     },
+    "TMTI": {
+      "name": "TMTI",
+      "version": "1.0.3",
+      "sha256": "1mn0nh03w288zviikbacqasj7pv0j16svbklnwxccvksdvdcc1lw",
+      "depends": ["Rcpp"]
+    },
     "TNC": {
       "name": "TNC",
       "version": "0.1.0",
@@ -34741,12 +36109,6 @@
       "sha256": "0wia39yj7abnicx4xhaq1g69qx5fmzh6gywyl5yqfmw03azmyl55",
       "depends": ["DEoptim", "Rdpack", "ggplot2"]
     },
-    "TOmicsVis": {
-      "name": "TOmicsVis",
-      "version": "2.0.0",
-      "sha256": "0s46i8wnvvs15xwb0g62rpn864b27hbx0lrjpcv2wb1s27iz1wv3",
-      "depends": ["Biobase", "ComplexHeatmap", "EnhancedVolcano", "GGally", "Mfuzz", "RColorBrewer", "Rtsne", "UpSetR", "WGCNA", "circlize", "clusterProfiler", "cowplot", "dplyr", "e1071", "enrichplot", "factoextra", "ggcorrplot", "ggforce", "ggnewscale", "ggplot2", "ggplotify", "ggpolypath", "ggpubr", "ggrepel", "ggsci", "igraph", "pheatmap", "plotrix", "randomcoloR", "reshape2", "shiny", "stringr", "survival", "survminer", "tidyr", "umap", "vegan", "venn"]
-    },
     "TP_idm": {
       "name": "TP.idm",
       "version": "1.5.1",
@@ -34797,8 +36159,8 @@
     },
     "TPMplt": {
       "name": "TPMplt",
-      "version": "0.1.4",
-      "sha256": "0zy6y9k7cqyflzma5567sn2jkvbmvl86zlrxiqlnga03hvsvw8a0",
+      "version": "0.1.6",
+      "sha256": "17nnymcaxh294fz8kbiazzfqf1pn09a3kzjznqxflqbxlxin8kl9",
       "depends": ["RColorBrewer", "VBTree", "dlm", "e1071", "ggplot2", "metR", "rgl"]
     },
     "TPmsm": {
@@ -34809,14 +36171,14 @@
     },
     "TR8": {
       "name": "TR8",
-      "version": "0.9.22",
-      "sha256": "12miq65yl39pngpsa30qjcwp21vn93a4wvid03pmbf6x6hq0v4k7",
-      "depends": ["RCurl", "XML", "dplyr", "plyr", "rappdirs", "readxl", "reshape", "shiny", "taxize"]
+      "version": "0.9.23",
+      "sha256": "0n9qkkdarhhivsbg9y55h42dqfpbd5sah6w2fa3rziv38jzc7z9d",
+      "depends": ["RCurl", "XML", "dplyr", "plyr", "rappdirs", "readxl", "reshape", "shiny"]
     },
     "TRADER": {
       "name": "TRADER",
-      "version": "1.2-4",
-      "sha256": "0r1mv76biy0zc8ksq0dvqgspph5gxjlpvh6pv7lw2wgcn5zid79d",
+      "version": "1.2-5",
+      "sha256": "1zy48a7lrbw1kx8mrdlsjhkqba5nc2dvq9hw6n7bqd7z3iv3gl0f",
       "depends": ["dplR"]
     },
     "TRAMPR": {
@@ -34831,6 +36193,12 @@
       "sha256": "0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp",
       "depends": ["Rlab"]
     },
+    "TREDesigns": {
+      "name": "TREDesigns",
+      "version": "1.0.0",
+      "sha256": "0wcgj7hvyrh1s4dkry6jffbbaqhx0l51jh51x0awyc7abympl23g",
+      "depends": []
+    },
     "TRES": {
       "name": "TRES",
       "version": "1.1.5",
@@ -34953,8 +36321,8 @@
     },
     "TSLSTMplus": {
       "name": "TSLSTMplus",
-      "version": "1.0.4",
-      "sha256": "1r85pdf6gs7p512fhijryj76l24j7qhq7apci07iiw85y9nkv0jm",
+      "version": "1.0.5",
+      "sha256": "06jmy66brdk3c368qkljqi1a8kk7b3h0ld0ddzms1if63xgsl2cs",
       "depends": ["abind", "keras", "tensorflow", "tsutils"]
     },
     "TSMN": {
@@ -35107,12 +36475,24 @@
       "sha256": "1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk",
       "depends": []
     },
+    "TUvalues": {
+      "name": "TUvalues",
+      "version": "0.1.0",
+      "sha256": "1v0dxwwkxzrz07yqi4k9gx9327ic6pvm5ylznv7m43rsbdmmampw",
+      "depends": ["gtools"]
+    },
     "TVMM": {
       "name": "TVMM",
       "version": "3.2.1",
       "sha256": "0z2gdcci9pbpgnmr6dch5v0rsn34q18rwb14x9gyxdcvh3bch8z0",
       "depends": ["DescToolsAddIns", "MASS", "ggplot2", "gridExtra", "robustbase", "tcltk2"]
     },
+    "TWW": {
+      "name": "TWW",
+      "version": "0.1.0",
+      "sha256": "012axqhd6h5zibhjaxzqngnhi9kn7jdfhxxgkci6mlzp2bhnqhwj",
+      "depends": []
+    },
     "Taba": {
       "name": "Taba",
       "version": "1.0.0",
@@ -35133,8 +36513,8 @@
     },
     "TableMonster": {
       "name": "TableMonster",
-      "version": "1.7",
-      "sha256": "1xa4bkcpzhm50dwbpya346swjjfw46n2x26xm30p8gppilg5c0lb",
+      "version": "1.7.5",
+      "sha256": "104jm458s6880l0qpp3gbbq7kwlyqnwh9cd43igk03yj8mh86i8z",
       "depends": ["xtable"]
     },
     "TableToLongForm": {
@@ -35175,8 +36555,8 @@
     },
     "TapeS": {
       "name": "TapeS",
-      "version": "0.12.1",
-      "sha256": "1f6g8hz4bj7192kh5s7a1vc6kh4niw4pw3d259mwfklmkbc26m4f",
+      "version": "0.13.0",
+      "sha256": "1j2xqv99sganr3byi1zscg20h28ajg7192dpyppzlv39lgzqxg8c",
       "depends": ["Rcpp", "RcppArmadillo", "TapeR"]
     },
     "Tariff": {
@@ -35185,6 +36565,12 @@
       "sha256": "1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w",
       "depends": []
     },
+    "TauStar": {
+      "name": "TauStar",
+      "version": "1.1.7",
+      "sha256": "1lr0p9ilm5mg4ks6bmp2q8kh45n2dq03k3n1cldc8myy512w4ivp",
+      "depends": ["Rcpp", "RcppArmadillo"]
+    },
     "TaxaNorm": {
       "name": "TaxaNorm",
       "version": "2.4",
@@ -35305,11 +36691,17 @@
       "sha256": "18q4a155cxgzlbq5d4nfqvj88m5hc5ysdshkpcbih98axc6zm071",
       "depends": []
     },
+    "TensorTools": {
+      "name": "TensorTools",
+      "version": "1.0.0",
+      "sha256": "0x16raj8xhjzjhrpj9l5rz66rfiy8hf6ap3l7gqmx53vfk3fpsqq",
+      "depends": ["Matrix", "gsignal", "matrixcalc", "png", "raster", "wavethresh"]
+    },
     "Ternary": {
       "name": "Ternary",
-      "version": "2.3.2",
-      "sha256": "0jsb67zcp2q3mmkx6c1ns34i0x98xkzvbpmvpwn5mjssc6ir3q3m",
-      "depends": ["PlotTools", "RcppHungarian", "shiny", "sp", "viridisLite"]
+      "version": "2.3.3",
+      "sha256": "1pzkz4k0qkqdalk4fxrrkwn025197qghqxvj84r68fhcipjqsv4a",
+      "depends": ["PlotTools", "RcppHungarian", "shiny", "sp"]
     },
     "TesiproV": {
       "name": "TesiproV",
@@ -35319,9 +36711,9 @@
     },
     "TestAnaAPP": {
       "name": "TestAnaAPP",
-      "version": "1.0.1",
-      "sha256": "0550i7d4bpbd9bvs7sbjd5aaqpqjpd2fzfbplxfcvz2q9dwbcp49",
-      "depends": ["DT", "EstCRM", "bruceR", "cowplot", "difR", "dplyr", "flextable", "ggplot2", "golem", "latticeExtra", "mirt", "officedown", "officer", "openxlsx", "plotrix", "rmarkdown", "shiny", "shinycssloaders", "shinydashboard", "stringr", "tidySEM", "tidyr"]
+      "version": "1.1.2",
+      "sha256": "19rp8a98ir5q96n5ja6f4h1qjb9cjbbxbmhy8sk08x1xvs8nn2dn",
+      "depends": ["DT", "EstCRM", "bruceR", "cowplot", "difR", "dplyr", "flextable", "ggplot2", "golem", "latticeExtra", "lordif", "mirt", "officedown", "officer", "openxlsx", "plotrix", "rmarkdown", "semPlot", "shiny", "shinycssloaders", "shinydashboard", "stringr", "tidyr"]
     },
     "TestCor": {
       "name": "TestCor",
@@ -35337,8 +36729,8 @@
     },
     "TestDesign": {
       "name": "TestDesign",
-      "version": "1.6.1",
-      "sha256": "0f13d6j9x9knsd7ynz025x4pv61n49jk5m9ih09cm8xz9g1ypb4n",
+      "version": "1.7.0",
+      "sha256": "0vrlvmwa6rh4pf8wrzhqk5y6293fd15bqmnkqgd38m1zgl7clyd5",
       "depends": ["Rcpp", "RcppArmadillo", "crayon", "foreach", "logitnorm", "lpSolve"]
     },
     "TestDimorph": {
@@ -35349,21 +36741,21 @@
     },
     "TestFunctions": {
       "name": "TestFunctions",
-      "version": "0.2.1",
-      "sha256": "0119ajbmgcfwd7axvx47x3aw3j1hnc2i3fvgrixfd1rgj99hz2vj",
-      "depends": []
+      "version": "0.2.2",
+      "sha256": "1vjkdwfb8mb8sdr06dgkkirvd6699qgampah9hc1ac9giq7g9bkr",
+      "depends": ["ContourFunctions", "numDeriv", "rmarkdown"]
     },
     "TestGardener": {
       "name": "TestGardener",
-      "version": "3.3.3",
-      "sha256": "1iybx4h46shyki0ihnaxn968lkplnp88l0ld09cx632vhlpis0iv",
+      "version": "3.3.5",
+      "sha256": "1057v6jm7jfw6zq9190837hg4kq0pi86s24j0iip7zsnn6294q1h",
       "depends": ["dplyr", "fda", "ggplot2", "ggpubr", "knitr", "plotly", "pracma", "rgl", "rmarkdown", "stringr", "tidyr", "utf8"]
     },
     "TestGenerator": {
       "name": "TestGenerator",
-      "version": "0.3.1",
-      "sha256": "15jgcknxdc1nh3325rzlax3q69dgfxb2a3xm2bzpi7fb7ryv5grz",
-      "depends": ["CDMConnector", "DBI", "checkmate", "cli", "dplyr", "duckdb", "ggplot2", "glue", "jsonlite", "readr", "readxl", "rlang", "testthat", "tibble", "withr"]
+      "version": "0.3.3",
+      "sha256": "0x4rmmxmvn9wmxl9gj1fx938k3a60hn9xmsa79xnd6arfdl882fq",
+      "depends": ["CDMConnector", "DBI", "arrow", "checkmate", "cli", "dplyr", "duckdb", "ggplot2", "glue", "jsonlite", "openxlsx", "readr", "readxl", "rlang", "testthat", "tibble", "withr"]
     },
     "TestIndVars": {
       "name": "TestIndVars",
@@ -35449,12 +36841,6 @@
       "sha256": "1623r64v97ii8qq6cfrg0jrdl7nwxswjgif5l85vak8xjkfwsq7q",
       "depends": ["png", "tiff"]
     },
-    "Thermistor": {
-      "name": "Thermistor",
-      "version": "1.1.0",
-      "sha256": "0jdc5x3pylqbfxyhxhfsfd5lqiqd9qpn08w6svm0w7clbsp54bph",
-      "depends": ["ggplot2"]
-    },
     "ThomasJeffersonUniv": {
       "name": "ThomasJeffersonUniv",
       "version": "0.1.3",
@@ -35551,6 +36937,12 @@
       "sha256": "1gnkq2ssc9lvkz1j52c2l4v1frxfcnw3j186kf3xbx8qx1aikyqr",
       "depends": ["assertthat", "dplyr", "jsonlite", "magrittr", "purrr", "rlang", "stringr", "tibble"]
     },
+    "TimeDepFrail": {
+      "name": "TimeDepFrail",
+      "version": "0.0.0.9",
+      "sha256": "01b2lw40ycym3n2rjwpvhwrlip19vxhq8ywcx19wmc4bf1b1nrai",
+      "depends": []
+    },
     "TimeVTree": {
       "name": "TimeVTree",
       "version": "0.3.1",
@@ -35607,9 +36999,9 @@
     },
     "ToolsForCoDa": {
       "name": "ToolsForCoDa",
-      "version": "1.0.6",
-      "sha256": "1c37xv8h4jycnn9cnxlvby3p8hl3gfp4bdsbxm06bb323qj774pd",
-      "depends": ["HardyWeinberg", "MASS", "calibrate"]
+      "version": "1.0.9",
+      "sha256": "1rns11sddijajjnp5xc8b9n0k88zr6022ra7afd9qmf7k8pmpdp3",
+      "depends": ["Correlplot", "MASS", "calibrate"]
     },
     "Toothnroll": {
       "name": "Toothnroll",
@@ -35667,8 +37059,8 @@
     },
     "TraMineR": {
       "name": "TraMineR",
-      "version": "2.2-10",
-      "sha256": "19l51vjn4ljyfghsl93amh94zqsvf290ahvb7r4z6kqgdbz8j5lb",
+      "version": "2.2-11",
+      "sha256": "05fb5w1wz3aqc7ngr4vp84dwbwpxm10lpkqlin55h895wph5529x",
       "depends": ["RColorBrewer", "boot", "cluster", "colorspace", "vegan"]
     },
     "TraMineRextras": {
@@ -35689,12 +37081,6 @@
       "sha256": "0x2wydp9qj2r2rsv0kmwlq4y7mr391ya13rpnj3mdgl0pjdp445s",
       "depends": ["RColorBrewer", "fields"]
     },
-    "Trading": {
-      "name": "Trading",
-      "version": "3.0",
-      "sha256": "1xf3qr6g8vxdwrx57pazr79k86d3mdhqaps0vj8iz4dr172gms8k",
-      "depends": ["PerformanceAnalytics", "RcppAlgos", "data_table", "ggplot2", "readxl", "reticulate"]
-    },
     "TrafficBDE": {
       "name": "TrafficBDE",
       "version": "0.1.2",
@@ -35725,6 +37111,12 @@
       "sha256": "0g92kwi1nlmpc8m4pc9kv9xhczryr2kn9icfr3js7da7vy8g50xy",
       "depends": ["Rcpp", "ape"]
     },
+    "TransProR": {
+      "name": "TransProR",
+      "version": "0.0.6",
+      "sha256": "1wx5p59glih3p6ggy5kj5l9ngpgk75vwd7vzfgbv9vicb8sl7rlm",
+      "depends": ["ComplexHeatmap", "DESeq2", "Hmisc", "circlize", "data_table", "dplyr", "edgeR", "geomtextpath", "ggVennDiagram", "ggalt", "ggdensity", "ggnewscale", "ggplot2", "ggpubr", "ggraph", "ggtree", "ggtreeExtra", "hrbrthemes", "limma", "magrittr", "rlang", "spiralize", "stringr", "sva", "tibble", "tidygraph", "tidyr"]
+    },
     "TransTGGM": {
       "name": "TransTGGM",
       "version": "1.0.0",
@@ -35745,9 +37137,9 @@
     },
     "TreatmentPatterns": {
       "name": "TreatmentPatterns",
-      "version": "2.6.7",
-      "sha256": "1s6rvsqa4q6nr9vlfmcysn58qw88df05fp638y8yxc791bw120gm",
-      "depends": ["Andromeda", "R6", "checkmate", "dplyr", "htmlwidgets", "networkD3", "shiny", "shinydashboard", "stringr", "sunburstR", "tidyr"]
+      "version": "2.7.0",
+      "sha256": "12l5y4d9a1734ir1kaw1q7plhiirrm3lrpfwc7jdqsii3iss8hpj",
+      "depends": ["Andromeda", "R6", "checkmate", "dplyr", "ggplot2", "htmlwidgets", "networkD3", "shiny", "shinydashboard", "stringr", "sunburstR", "tidyr"]
     },
     "TreatmentSelection": {
       "name": "TreatmentSelection",
@@ -35781,21 +37173,21 @@
     },
     "TreeDist": {
       "name": "TreeDist",
-      "version": "2.8.0",
-      "sha256": "1l8clk5b4fivinxjr0amd0kcwa2bg4mb4cjk8f9cxhbp2kk78kr0",
+      "version": "2.9.1",
+      "sha256": "1l8wc0g6aq9i9r9imgl63s5qdp954mad767yr7agn9dd47q17vl2",
       "depends": ["Rcpp", "Rdpack", "TreeTools", "ape", "cli", "colorspace", "memoise", "shiny", "shinyjs"]
     },
     "TreeMineR": {
       "name": "TreeMineR",
-      "version": "1.0.1",
-      "sha256": "04rd7yrp69lz2qavfhdvbcwd0jy2qpng2xcgmbn69wp6yrm79r6y",
+      "version": "1.0.2",
+      "sha256": "0i3zwr2gx09zpa77cmc6h5cyahdch97bpvyhbfn5l67fxmyjm7l9",
       "depends": ["cli", "data_table", "future", "future_apply"]
     },
     "TreeRingShape": {
       "name": "TreeRingShape",
-      "version": "3.0.3",
-      "sha256": "0vk58ngvx362070nzg06g2130xlz4crcpmfxgxvjvr4w3pc7iqxi",
-      "depends": ["sf"]
+      "version": "3.0.5",
+      "sha256": "1a4yh78128zs40dr29v22lrkmqjwb2r89n6ihxfpk14sa9q4gk46",
+      "depends": ["sf", "tibble"]
     },
     "TreeSearch": {
       "name": "TreeSearch",
@@ -35883,14 +37275,14 @@
     },
     "TrialEmulation": {
       "name": "TrialEmulation",
-      "version": "0.0.3.8",
-      "sha256": "05gm3fpwdam3cnm0x6s4mzpjvb98yfi4alxgdanmscvx44c5ry8i",
-      "depends": ["Rcpp", "broom", "checkmate", "data_table", "formula_tools", "mvtnorm", "parglm", "sandwich"]
+      "version": "0.0.4.0",
+      "sha256": "1dd7gzi4lqbcfpv3q0am2pvlj8d64j9rxpi1lh1hi2pyd6xaqlmm",
+      "depends": ["DBI", "Rcpp", "broom", "checkmate", "data_table", "duckdb", "formula_tools", "lifecycle", "lmtest", "mvtnorm", "parglm", "sandwich"]
     },
     "TrialSize": {
       "name": "TrialSize",
-      "version": "1.4",
-      "sha256": "0k162n3jr2ixdl3pp90izdr83z14hj70jb9mrfw3iqz0pczp2cpj",
+      "version": "1.4.1",
+      "sha256": "0hrzm6v6bjnln0zyzbvgdgrsan2mg4carcy6jrms726ml2nj1n4c",
       "depends": []
     },
     "TrioSGL": {
@@ -35907,8 +37299,8 @@
     },
     "TropFishR": {
       "name": "TropFishR",
-      "version": "1.6.4",
-      "sha256": "0y4bqy27f5ngpz9z24fbl209gg9mlrj8gryn8774abvhvv62z6k0",
+      "version": "1.6.5",
+      "sha256": "16n5zi1a0mjfdnm54b52f32v7542qi0akqwznd9i61cv7qszi0bj",
       "depends": ["GA", "GenSA", "MASS", "Matrix", "doParallel", "msm", "propagate", "reshape2"]
     },
     "TroublemakeR": {
@@ -35937,8 +37329,8 @@
     },
     "TruncExpFam": {
       "name": "TruncExpFam",
-      "version": "1.1.1",
-      "sha256": "0y5vlfv5q1fphamwr3as14hc1rvz3f15x7vl0kimmmkk0pvpdxya",
+      "version": "1.2.0",
+      "sha256": "0lqx04pzj66b0x6wa4rswrlrlk0zyi0zzybk370h9gz1zdzzdjy6",
       "depends": ["invgamma", "rmutil"]
     },
     "TruncatedNormal": {
@@ -35955,8 +37347,8 @@
     },
     "TukeyGH77": {
       "name": "TukeyGH77",
-      "version": "0.1.2",
-      "sha256": "0mlq79km9m1ssa876fh93n2462i8bpwgcdxhx7j3rqhnx4q3y32q",
+      "version": "0.1.3",
+      "sha256": "0lzjvbl29aqhq6d5yg0ngs32nwl4dx26fhfi5sa6fz8vx3mwbxcz",
       "depends": ["rstpm2"]
     },
     "TukeyRegion": {
@@ -36001,12 +37393,6 @@
       "sha256": "0isb1nmm6hxwn6p52an1axj30ilkr5c8xi86zx2b8acivdz2xr12",
       "depends": ["blockrand", "dplyr", "simsurv", "survival"]
     },
-    "TwoPhaseInd": {
-      "name": "TwoPhaseInd",
-      "version": "1.1.2",
-      "sha256": "1ifdj17rlr8nd0pqpcqi6835ymdhngif279i27s6lvwha924l81c",
-      "depends": ["survival"]
-    },
     "TwoSampleTest_HD": {
       "name": "TwoSampleTest.HD",
       "version": "1.2",
@@ -36019,6 +37405,12 @@
       "sha256": "050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck",
       "depends": ["survival"]
     },
+    "TwoTimeScales": {
+      "name": "TwoTimeScales",
+      "version": "1.0.0",
+      "sha256": "1v0m8kfr7079jjvf5bhn8k4x3sa2wrh879qx1ricf9q44nc4lhgb",
+      "depends": ["Epi", "JOPS", "LMMsolver", "colorspace", "fields", "popEpi", "reshape2", "spam", "ucminf", "viridis"]
+    },
     "TwoWayFEWeights": {
       "name": "TwoWayFEWeights",
       "version": "2.0.4",
@@ -36037,6 +37429,12 @@
       "sha256": "1jpm41la5210a9shak01fsgq2yw8l1cz5zbb5zlas2nc2jg7hslh",
       "depends": ["MBA", "automap", "gstat", "randomForest", "sp"]
     },
+    "UBStats": {
+      "name": "UBStats",
+      "version": "0.2.2",
+      "sha256": "1x8pc1lb7xbjbydyl6bsckws7as6mgxr0nvmgg06kilk7s07ahmm",
+      "depends": []
+    },
     "UBayFS": {
       "name": "UBayFS",
       "version": "1.0",
@@ -36063,8 +37461,8 @@
     },
     "UComp": {
       "name": "UComp",
-      "version": "5.0.4",
-      "sha256": "0wvam2fg9adpz53jbyc5ksfldg0kllvij0968acz0y3qkgm06a5x",
+      "version": "5.0.5",
+      "sha256": "1h8gq9cnfl2id7rm8q7kjf8lw24ql4fg9r75pc5q26p1s484b0n6",
       "depends": ["Rcpp", "RcppArmadillo", "ggforce", "ggplot2", "gridExtra", "tsibble", "tsoutliers"]
     },
     "UEI": {
@@ -36087,9 +37485,9 @@
     },
     "UKFE": {
       "name": "UKFE",
-      "version": "0.3.5",
-      "sha256": "0z7jqxp34005m3331crhkqgwgh9fg2p57jnj7kxp0r5bda5vdvzd",
-      "depends": ["xml2"]
+      "version": "0.3.8",
+      "sha256": "0nd806m4c4p33ygi4xss5az978jybnv2lvay3a6gwcnf2xlkwdzb",
+      "depends": ["sf", "xml2"]
     },
     "UKgrid": {
       "name": "UKgrid",
@@ -36117,8 +37515,8 @@
     },
     "UPG": {
       "name": "UPG",
-      "version": "0.3.4",
-      "sha256": "0yyyyjxrw9833w0iwnp2c3y853h8c5kj8rbkalg5rsmxk5m0fjgn",
+      "version": "0.3.5",
+      "sha256": "1drfcmxfk16gvcgnmb5m8pnqxjhs2ai10rr1nzrzpid610b01r54",
       "depends": ["coda", "ggplot2", "knitr", "matrixStats", "mnormt", "pgdraw", "reshape2", "truncnorm"]
     },
     "UPSvarApprox": {
@@ -36195,8 +37593,8 @@
     },
     "Umoments": {
       "name": "Umoments",
-      "version": "0.1.1",
-      "sha256": "089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg",
+      "version": "1.0.1",
+      "sha256": "0g19371lg3rk2gsfjxxbb9j6nrq20gn5m3vdh2z86756yyhcn0yy",
       "depends": []
     },
     "Umpire": {
@@ -36277,6 +37675,12 @@
       "sha256": "0q8sgphhv07cv6ljgvkr41a8p12gksxs1klcly3sd3g906b8rbcv",
       "depends": ["e1071", "mclust"]
     },
+    "UnplanSimon": {
+      "name": "UnplanSimon",
+      "version": "0.1.0",
+      "sha256": "193vanpin2fxqnvjjc631593dqskz99zn4wbgrmysabqc0s6baqn",
+      "depends": []
+    },
     "UpAndDownPlots": {
       "name": "UpAndDownPlots",
       "version": "0.5.0",
@@ -36315,8 +37719,8 @@
     },
     "V8": {
       "name": "V8",
-      "version": "5.0.0",
-      "sha256": "06mjjrwg9bgyfxn4gcj3bf4xc9ijx08xf8dfd8g6w0bkz5cvg3v6",
+      "version": "6.0.0",
+      "sha256": "1wvxba4c7p8867irvhhlixr2dh64x2ffspn34x142x14qkljn8kz",
       "depends": ["Rcpp", "curl", "jsonlite"]
     },
     "VALERIE": {
@@ -36393,8 +37797,8 @@
     },
     "VBel": {
       "name": "VBel",
-      "version": "1.0.1",
-      "sha256": "02371k5mvzqkj0x9sbbg3ah6kzrcr16bwm1qrci7nh06qy1hq3hg",
+      "version": "1.1.0",
+      "sha256": "0jdr0r6m6lza884lx4khv8rbh960h113rvicxr9apg8lyh7fbqaw",
       "depends": ["Rcpp", "RcppEigen"]
     },
     "VBsparsePCA": {
@@ -36427,6 +37831,12 @@
       "sha256": "1aqjhkcj3bd5hk7iz0f2cy5nfp23gvhqsmg6nzlxd9klwc6xpq2h",
       "depends": ["ape", "stringdist"]
     },
+    "VDPO": {
+      "name": "VDPO",
+      "version": "0.1.0",
+      "sha256": "0x3sv4f4v2wnnhs02dq3fw9lrqif4qkq9bl16rs804vlmw8npb47",
+      "depends": ["Matrix", "SOP"]
+    },
     "VDSM": {
       "name": "VDSM",
       "version": "0.1.1",
@@ -36465,14 +37875,14 @@
     },
     "VGAM": {
       "name": "VGAM",
-      "version": "1.1-11",
-      "sha256": "199kicvlxciff9x243h357n4bjl00yg9k5jgs9awzz5wsadr17fy",
+      "version": "1.1-12",
+      "sha256": "05pgznwb0bwppq9mslvg197iyp0ln0npapd4r0zc6c2k6ikq4xsa",
       "depends": []
     },
     "VGAMdata": {
       "name": "VGAMdata",
-      "version": "1.1-9",
-      "sha256": "1bk4c22rwpcm5aa1kdg0dh8c87pb54639xhlh4dkxwx2idn6s9b5",
+      "version": "1.1-12",
+      "sha256": "10s0jinzwpb9wjvzkl0dihm3byr8q2mzmq4z86zpmnlw0blvkkvy",
       "depends": ["VGAM"]
     },
     "VGAMextra": {
@@ -36487,10 +37897,16 @@
       "sha256": "1zkvzkras94gyc43b9j4bq4mpyg9l1idx2pdd8a728gmq1daky0k",
       "depends": ["Rcpp", "RcppArmadillo", "foreach", "lubridate"]
     },
+    "VICatMix": {
+      "name": "VICatMix",
+      "version": "1.0",
+      "sha256": "0wkzl7km9sm26m95ngd58vlsfwpzbvx3wjaw66lmzapjjxn9801s",
+      "depends": ["Rcpp", "RcppArmadillo", "gtools", "klaR", "matrixStats", "mcclust"]
+    },
     "VIGoR": {
       "name": "VIGoR",
-      "version": "1.1.4",
-      "sha256": "02s2xpx37aszny89pp22p5rkdf35xsbzn67rgsdxp531rswhzvcw",
+      "version": "1.1.5",
+      "sha256": "13xxzlpznxvvvflqrhyh5m8v6x3q5ifrwx8dmm9hl0h8sr6i0lvp",
       "depends": []
     },
     "VIM": {
@@ -36525,8 +37941,8 @@
     },
     "VLMC": {
       "name": "VLMC",
-      "version": "1.4-3-1",
-      "sha256": "0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar",
+      "version": "1.4-4",
+      "sha256": "1mcypnr956jfq0iyfak6bhfv99p0zzal9r0bd10py5qwzal0n6i8",
       "depends": ["MASS"]
     },
     "VLMCX": {
@@ -36561,8 +37977,8 @@
     },
     "VPdtw": {
       "name": "VPdtw",
-      "version": "2.1-14",
-      "sha256": "1pr8jrd7ymgf46h2gbvanqjrvpc4xs39sk86vvxhawzf3w31g257",
+      "version": "2.2.1",
+      "sha256": "0ya9wa0wzv8z9cc8gyrwdvk7vsil45j37xjz46p04c0cgzr0l7mb",
       "depends": []
     },
     "VSOLassoBag": {
@@ -36643,16 +38059,16 @@
       "sha256": "1ihzwr8g7cmasicjw79fyksfm6kl9qzx04611a73ql0gp0pmq62y",
       "depends": ["DistributionUtils", "GeneralizedHyperbolic"]
     },
-    "Vdgraph": {
-      "name": "Vdgraph",
-      "version": "2.2-7",
-      "sha256": "0kqcwlw8dsxb1jlp412m9a372kz26sampv56saxalf8rcyd3s2jp",
-      "depends": []
+    "VecDep": {
+      "name": "VecDep",
+      "version": "0.1.3",
+      "sha256": "1zm1ri2lmh5qxi4lnla7xgrj0vjihv6nkvhbzf63x20gh4c1sw0v",
+      "depends": ["ElliptCopulas", "HAC", "Rmpfr", "covglasso", "expm", "gtools", "hash", "magic", "pbapply", "reticulate", "sets"]
     },
     "VeccTMVN": {
       "name": "VeccTMVN",
-      "version": "1.1.0",
-      "sha256": "008r2fkp16l8sdyn6is0n0v7m8lvx0zn7c3jscd1gfdzkf82zb2a",
+      "version": "1.2.1",
+      "sha256": "0ylpzdbq5c3cpmyciss9y60b5pg6fg7svv54ilb9ml589320zmax",
       "depends": ["GPvecchia", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "TruncatedNormal", "nleqslv", "truncnorm"]
     },
     "VectorCodeR": {
@@ -36681,9 +38097,9 @@
     },
     "VertexWiseR": {
       "name": "VertexWiseR",
-      "version": "1.0.0",
-      "sha256": "14ria7wf080zszjqml96dm2jb4ppjlcrhckk82x3mpyw7xsmpclh",
-      "depends": ["doParallel", "doSNOW", "foreach", "freesurferformats", "fs", "gifti", "igraph", "reticulate"]
+      "version": "1.2.0",
+      "sha256": "0qvxqy70c1nidrc9nymm6c9kvrnj8hcjnnnmyhva2yf5zanpqhvk",
+      "depends": ["ciftiTools", "doParallel", "doSNOW", "foreach", "freesurferformats", "fs", "gifti", "igraph", "plotly", "png", "rappdirs", "reticulate", "stringr"]
     },
     "VeryLargeIntegers": {
       "name": "VeryLargeIntegers",
@@ -36699,8 +38115,8 @@
     },
     "ViSe": {
       "name": "ViSe",
-      "version": "0.1.2",
-      "sha256": "0ki23qgb3xisfiq8fz0xgj6azqmjn1xcm3j87v7qfshs1yq2rk47",
+      "version": "0.1.3",
+      "sha256": "1xiim4cj4cx885fidp0xy2bgy7wv9scak0v64v9agkifhvdhx05f",
       "depends": ["cowplot", "dplyr", "ggplot2", "scales", "shiny", "tidyr"]
     },
     "ViSiElse": {
@@ -36729,8 +38145,8 @@
     },
     "VineCopula": {
       "name": "VineCopula",
-      "version": "2.5.0",
-      "sha256": "0s2v27i5cljvxzh3awpf3bcfbbghch0lphhghqnc7x51w1prxfai",
+      "version": "2.6.0",
+      "sha256": "0crr0x9zzlp0gyn4bylga0wg066fsmmkj5wsixyvnc8hjajny7xr",
       "depends": ["ADGofTest", "MASS", "lattice", "mvtnorm"]
     },
     "VirtualPop": {
@@ -36739,12 +38155,24 @@
       "sha256": "1miwljsr6r6i94q9pdpqzhapnfgg3vjv2ikwvc56cpw6k1iw9h39",
       "depends": ["HMDHFDplus", "msm"]
     },
+    "Virusparies": {
+      "name": "Virusparies",
+      "version": "1.1.0",
+      "sha256": "1jy2fab9lskf18sr2vz2gmqs36ws249vdwl936zhjnc8gn2igr84",
+      "depends": ["chromote", "cowplot", "dplyr", "ggplot2", "gt", "readr", "rlang", "scales", "stringr", "tidyr"]
+    },
     "VisCollin": {
       "name": "VisCollin",
       "version": "0.1.2",
       "sha256": "1pcd7b14a2qnq1jlk63fascdb8hkys8cg4jw4rx6xk9xmvpvyhlb",
       "depends": []
     },
+    "VisCov": {
+      "name": "VisCov",
+      "version": "1.5.0",
+      "sha256": "1vxal6kqryawg5z6vanggbrxyk7qkm7091lcir3smwdi6qakwm4z",
+      "depends": ["KernSmooth", "bayesm", "clusterGeneration", "scatterplot3d", "trialr"]
+    },
     "VisitorCounts": {
       "name": "VisitorCounts",
       "version": "2.0.2",
@@ -36765,9 +38193,9 @@
     },
     "VisualizeSimon2Stage": {
       "name": "VisualizeSimon2Stage",
-      "version": "0.1.5",
-      "sha256": "1sjnmxbd3k139rcnwnnjz0js929smdlrrrffn8mhcgrw77zl3ljy",
-      "depends": ["ggplot2"]
+      "version": "0.1.6",
+      "sha256": "0dkbkc1cprri9kkzsl47651n03h2hdlq34b4w6p4j3x14d102dgx",
+      "depends": ["geomtextpath", "ggplot2"]
     },
     "VorteksExport": {
       "name": "VorteksExport",
@@ -36811,12 +38239,6 @@
       "sha256": "1ns504i3567z90bz1p02mnfmnsgkk7wy2a772v2imiwjgzp0qia5",
       "depends": ["curl", "xml2"]
     },
-    "W4MRUtils": {
-      "name": "W4MRUtils",
-      "version": "1.0.0",
-      "sha256": "1hzr2p3kp9k2y154a2p9qc9shyqpkh0m5ylk2f9ivm4m0f3ifqdp",
-      "depends": ["rlang"]
-    },
     "WA": {
       "name": "WA",
       "version": "1.0",
@@ -36835,6 +38257,12 @@
       "sha256": "0z3863ml85065w23m6wr4hd5a0vdaiavpmrbal8kz4igj6j34ff6",
       "depends": ["Formula", "MASS", "Rdpack"]
     },
+    "WARDEN": {
+      "name": "WARDEN",
+      "version": "0.99.1",
+      "sha256": "1aw6pd7lbn35fl2fdjgwbhjk5y44vx13xzxs34binic0gy03nqxg",
+      "depends": ["MASS", "data_table", "doFuture", "flexsurv", "foreach", "future", "magrittr", "progressr", "purrr", "tidyr", "zoo"]
+    },
     "WARN": {
       "name": "WARN",
       "version": "1.2-4",
@@ -36847,6 +38275,12 @@
       "sha256": "1jjas0qklb3dyax4x26c327l59biyym5m2x6mv8z7dnkyfrw3vfq",
       "depends": ["fitdistrplus", "ggplot2", "readr", "sp", "tidyr", "waveslim", "zoo"]
     },
+    "WAnova": {
+      "name": "WAnova",
+      "version": "0.4.0",
+      "sha256": "1c4fpl8n5ynp3fwrpqnwb2v16gv8slchy3pffga9yldr0hfn957a",
+      "depends": ["SuppDists", "car"]
+    },
     "WCE": {
       "name": "WCE",
       "version": "1.0.3",
@@ -36877,16 +38311,10 @@
       "sha256": "17g4cgx0ajgj7lgxzi467cjbmbc47skyarcm88vqjc3i1j55dw12",
       "depends": ["raster", "sf", "sp"]
     },
-    "WES": {
-      "name": "WES",
-      "version": "1.0.0",
-      "sha256": "11dsn0dkc0z313x8md6qhkafk9cnbp4v64a895d54b27329ryzis",
-      "depends": ["HDInterval", "RCurl", "XML", "chirps", "data_table", "dplyr", "elevatr", "exactextractr", "foreach", "glue", "httr", "jsonlite", "openmeteo", "raster", "rworldmap", "sf", "sp", "stars", "whitebox", "zoo"]
-    },
     "WGCNA": {
       "name": "WGCNA",
-      "version": "1.72-5",
-      "sha256": "17g7lan1rpy6y4nmqksrf9ddp3gs58vdczfavgq1fp13zx1r2hq3",
+      "version": "1.73",
+      "sha256": "1kk3a2ll83zdwisjfvg4km5h0vl564nshy45ffgxv41im5ks7878",
       "depends": ["AnnotationDbi", "GO_db", "Hmisc", "Rcpp", "doParallel", "dynamicTreeCut", "fastcluster", "foreach", "impute", "matrixStats", "preprocessCore", "survival"]
     },
     "WGScan": {
@@ -36897,8 +38325,8 @@
     },
     "WH": {
       "name": "WH",
-      "version": "1.1.1",
-      "sha256": "1df2m8m17pv9wn555i7h7nrxmk7cj1znwmgfd78ybjrckijzb61m",
+      "version": "1.1.2",
+      "sha256": "0hvlyb3vb4lk4sn6vqj80y0ps5jx8fdlcniiqhy803v04cph7v4y",
       "depends": []
     },
     "WINS": {
@@ -36919,11 +38347,17 @@
       "sha256": "1j9ffilg61a4pxk26rwmpwrigm63lnnd4h0k8ivqk6flxal41jqb",
       "depends": ["inline", "survival"]
     },
-    "WMWssp": {
-      "name": "WMWssp",
-      "version": "0.4.0",
-      "sha256": "16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47",
-      "depends": []
+    "WMAP": {
+      "name": "WMAP",
+      "version": "1.1.0",
+      "sha256": "11fd1g83i2qvp9814zk3qq8bz5gir1j5gsz5x5zrqgygyla2xpbw",
+      "depends": ["caret", "forcats", "ggplot2", "pkgcond", "randomForest", "zeallot"]
+    },
+    "WOAkMedoids": {
+      "name": "WOAkMedoids",
+      "version": "0.1.0",
+      "sha256": "0hh5dkjzqxwkzx5d28cywr9q5bdk3a44md57irj3gp6bd00rv0p6",
+      "depends": ["Rcpp", "cluster", "dtwclust", "proxy"]
     },
     "WOTPLY": {
       "name": "WOTPLY",
@@ -36937,6 +38371,12 @@
       "sha256": "100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6",
       "depends": []
     },
+    "WQM": {
+      "name": "WQM",
+      "version": "0.1.4",
+      "sha256": "108cpsm7m8s4irh2k737hiljsznk98i9z4iaiv35sq1626ljalcg",
+      "depends": ["MBC", "WaveletComp", "ggplot2", "matrixStats"]
+    },
     "WR": {
       "name": "WR",
       "version": "1.0",
@@ -37111,6 +38551,12 @@
       "sha256": "1ykg7sphnm15a3dlkkhv18ycsclaw363yldfsyc83hf01vlghf77",
       "depends": ["Matrix", "lme4", "matrixStats", "minqa", "numDeriv"]
     },
+    "WeatherSentiment": {
+      "name": "WeatherSentiment",
+      "version": "1.0",
+      "sha256": "1v8bi4w9h1yi0fk9l4in7f7fhqv8ws85n06134x740rscrsa3aws",
+      "depends": ["RColorBrewer", "data_table", "ggplot2", "sentimentr", "stringr", "tidyr", "tidytext", "tidyverse", "wordcloud"]
+    },
     "WebAnalytics": {
       "name": "WebAnalytics",
       "version": "0.9.12",
@@ -37149,32 +38595,32 @@
     },
     "WeibullR_learnr": {
       "name": "WeibullR.learnr",
-      "version": "0.1.3",
-      "sha256": "14v64jr4z8j9gv4qqpwk013d6rjc5g3yisqn8lkibccgb78ifdxn",
-      "depends": ["WeibullR", "learnr"]
+      "version": "0.2",
+      "sha256": "0zifz7wbgl2al9av97r5yy5p0vlyfq34s3328l16r9z9ri02hhli",
+      "depends": ["ReliaGrowR", "WeibullR", "WeibullR_ALT", "learnr"]
     },
     "WeibullR_plotly": {
       "name": "WeibullR.plotly",
-      "version": "0.2.1",
-      "sha256": "1hhcr31kn3bcaj562x8hdh5gg7nkmwcbish8yq4faj9bhrm0lg6h",
-      "depends": ["WeibullR", "plotly"]
+      "version": "0.3",
+      "sha256": "1y8w3sgkraqjbmzrrm933574iqj75zn40niga32nn399yxqa9wnv",
+      "depends": ["ReliaGrowR", "WeibullR", "plotly"]
     },
     "WeibullR_shiny": {
       "name": "WeibullR.shiny",
-      "version": "0.2.1",
-      "sha256": "0p4vsc153x96w73bg9s0bcnfnk70qmfi9n2d57vcw0z4ppm1gdr4",
-      "depends": ["WeibullR", "WeibullR_plotly", "shiny", "shinydashboard"]
+      "version": "0.3",
+      "sha256": "1iadi0gzbyj359kbn9ycv4l3jzbrn2wfas7412hgbh51ahhkqblh",
+      "depends": ["ReliaGrowR", "WeibullR", "WeibullR_plotly", "magrittr", "shiny", "shinyWidgets", "shinydashboard"]
     },
     "WeightIt": {
       "name": "WeightIt",
-      "version": "1.2.0",
-      "sha256": "0mgwjl2d17m80pwj0n2mmnrqcymg9lgc9kz0sh9bwsq7icjdslyv",
+      "version": "1.3.2",
+      "sha256": "05mp6d7rwvqnxzml2zmxr3ffkx8z8hl5i9cik8b1vz7v3gd6h5q9",
       "depends": ["chk", "cobalt", "crayon", "generics", "ggplot2", "rlang"]
     },
     "WeightSVM": {
       "name": "WeightSVM",
-      "version": "1.7-13",
-      "sha256": "19dai6v14h644dwa1054kmkhp4p24qvvkpzf45zz942ki24n2day",
+      "version": "1.7-16",
+      "sha256": "0cbcfdn76cq54rs9qdbmji8zkbb7rb5r1dllc3f0qsv4jv9dabaw",
       "depends": []
     },
     "Weighted_Desc_Stat": {
@@ -37185,9 +38631,9 @@
     },
     "WeightedCluster": {
       "name": "WeightedCluster",
-      "version": "1.6-4",
-      "sha256": "1ayi50wjy7grzapfnyvmbi6rz7amfhdd1nxh56h1s4anv7rf20c4",
-      "depends": ["RColorBrewer", "TraMineR", "cluster", "doFuture", "foreach", "future", "nnet", "progressr"]
+      "version": "1.8-1",
+      "sha256": "0nyzn9v50kd9wnswzhqb3glrz7p4ci5gawlylc3fgjasxry9iyfs",
+      "depends": ["RColorBrewer", "TraMineR", "cluster", "doFuture", "fastcluster", "foreach", "future", "nnet", "progressr", "vegclust"]
     },
     "WeightedEnsemble": {
       "name": "WeightedEnsemble",
@@ -37209,8 +38655,8 @@
     },
     "WeightedTreemaps": {
       "name": "WeightedTreemaps",
-      "version": "0.1.2",
-      "sha256": "1jbbf915jny6lpbhv4m0grkadgjmw7vh1izql4kdbn3w5p5j8m1x",
+      "version": "0.1.4",
+      "sha256": "0kwp25iv7m1yi0r71m65g4p0kc1lr0hf90czgzhpv7w0l01aq8nx",
       "depends": ["BH", "Rcpp", "RcppCGAL", "colorspace", "dplyr", "lattice", "scales", "sf", "sp", "tibble"]
     },
     "WgtEff": {
@@ -37293,9 +38739,9 @@
     },
     "WordListsAnalytics": {
       "name": "WordListsAnalytics",
-      "version": "0.2.3",
-      "sha256": "0vw354gldqawxa1xw6abf76yh8r6jgfsc8vrppl5arj4kw72zrya",
-      "depends": ["dplyr", "ggplot2", "readr", "reshape2", "shiny"]
+      "version": "0.2.4",
+      "sha256": "0ynn3wb3b226mnj6a51xb3an2vdn4v6ckaykbf52wyrnd94a6i7x",
+      "depends": ["dplyr", "ggplot2", "lsa", "readr", "reshape2", "shiny"]
     },
     "WordOfMouth": {
       "name": "WordOfMouth",
@@ -37317,14 +38763,14 @@
     },
     "WorldFlora": {
       "name": "WorldFlora",
-      "version": "1.14-3",
-      "sha256": "0vibkgp83ligznkamqzs01j7hq6cqd42x1avcn0bp0zpdf38abcz",
+      "version": "1.14-5",
+      "sha256": "0wasm5fd387kih4a6g3z378560sbw3c2n9kdnbr1y47agysma9fp",
       "depends": []
     },
     "WorldMapR": {
       "name": "WorldMapR",
-      "version": "0.1.1",
-      "sha256": "01mfwmd99pfbxii3nbzi83jfr7141f5i7mn52jngh3m8i2zksvdr",
+      "version": "1.0.1",
+      "sha256": "1lhhm7f7fqm4rnamcvcq0927bkk138kby4bgngacrhr79161z1mj",
       "depends": ["countrycode", "dplyr", "ggfx", "ggplot2", "rnaturalearth", "sf"]
     },
     "WormTensor": {
@@ -37333,12 +38779,6 @@
       "sha256": "1xnjp6m3h0q6phmn2c2wkbjzyl8lpx07jsryz0i8rxr6ny591ja2",
       "depends": ["Rtsne", "aricode", "clValid", "cluster", "clusterSim", "cowplot", "dtwclust", "factoextra", "ggplot2", "ggrepel", "rTensor", "usedist", "uwot"]
     },
-    "WpProj": {
-      "name": "WpProj",
-      "version": "0.2.1",
-      "sha256": "17vczldqgqc8wl6yyz06zc3jdkgcxdf2s28bh83vzj98i1521ls2",
-      "depends": ["BH", "Matrix", "ROI", "ROI_plugin_ecos", "ROI_plugin_lpsolve", "RSpectra", "Rcpp", "RcppCGAL", "RcppEigen", "RcppProgress", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "ggsci", "glmnet", "lifecycle", "magrittr", "oem", "quantreg", "rlang", "rqPen", "slam"]
-    },
     "WrensBookshelf": {
       "name": "WrensBookshelf",
       "version": "0.1.0",
@@ -37347,8 +38787,8 @@
     },
     "WrightMap": {
       "name": "WrightMap",
-      "version": "1.3",
-      "sha256": "0c1v8wjqbr9y447h9iz9h2izrm1msdaz3mx1ry47qlcrq6ddlj9v",
+      "version": "1.4",
+      "sha256": "1ncng7mj207h50s8kc1c0d8z20qvzqxf28rbnbaddaj41bns23id",
       "depends": ["RColorBrewer"]
     },
     "WriteXLS": {
@@ -37375,6 +38815,12 @@
       "sha256": "0mwpk84kp6r7f6fmlby0ka58fj50y592afxzp0wcrzmx65abp7md",
       "depends": ["Rcpp"]
     },
+    "XDNUTS": {
+      "name": "XDNUTS",
+      "version": "1.5.5",
+      "sha256": "0kn8gvmlykrwrpvf5gz0n1y2f3m9gc6cfxbp94zvy69kms6mn7hd",
+      "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "coda", "ggplot2", "gridExtra", "purrr"]
+    },
     "XICOR": {
       "name": "XICOR",
       "version": "0.4.1",
@@ -37389,8 +38835,8 @@
     },
     "XLConnect": {
       "name": "XLConnect",
-      "version": "1.0.10",
-      "sha256": "1d72ssm47f3gg1r8q679whl7mvl2j5j60bhkzflv6vva3v5nghp3",
+      "version": "1.1.0",
+      "sha256": "0cn4xkmridbsm7yrbd7iag81vmakkj4ph40wmj8x51g7z3wg2irp",
       "depends": ["rJava"]
     },
     "XLS": {
@@ -37413,8 +38859,8 @@
     },
     "XNomial": {
       "name": "XNomial",
-      "version": "1.0.4",
-      "sha256": "1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6",
+      "version": "1.0.4.1",
+      "sha256": "09chxyj35s291myjaxk6y9afvg2wdsi05vz7rwqmaqzmvyqcwpw7",
       "depends": []
     },
     "XR": {
@@ -37437,10 +38883,16 @@
     },
     "XRSCC": {
       "name": "XRSCC",
-      "version": "0.1",
-      "sha256": "0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c",
+      "version": "0.2",
+      "sha256": "14qh2rpnv0iynj9wn0n00ykax9y7yphyy3097xl9jgk7xw5j0h8y",
       "depends": []
     },
+    "Xcertainty": {
+      "name": "Xcertainty",
+      "version": "1.0.1",
+      "sha256": "1qflwsigxxy0gljqa6vjr1i4gqznf7pa9j4jp6irrazx39ixp043",
+      "depends": ["coda", "dplyr", "nimble", "tidyr"]
+    },
     "XiMpLe": {
       "name": "XiMpLe",
       "version": "0.11-3",
@@ -37449,9 +38901,9 @@
     },
     "Xplortext": {
       "name": "Xplortext",
-      "version": "1.5.3",
-      "sha256": "1pmynw9zxfflzhw3iqf1gfv0c3fz2nj308hxzwjgpcds7fm2sqzm",
-      "depends": ["FactoMineR", "MASS", "flashClust", "flexclust", "ggdendro", "ggforce", "ggplot2", "ggrepel", "gridExtra", "plotly", "slam", "stringi", "stringr", "tm", "vegan"]
+      "version": "1.5.5",
+      "sha256": "0j7a603c5240fc16fmjyzrgjgrxay0mn1bam7ikwfw7g0bmah4s0",
+      "depends": ["FactoMineR", "MASS", "ape", "cluster", "dendextend", "flashClust", "flexclust", "ggdendro", "ggforce", "ggplot2", "ggpubr", "ggrepel", "gridExtra", "patchwork", "plotly", "slam", "stringi", "stringr", "tm", "vegan"]
     },
     "YPBP": {
       "name": "YPBP",
@@ -37491,9 +38943,9 @@
     },
     "YTAnalytics": {
       "name": "YTAnalytics",
-      "version": "0.1.0",
-      "sha256": "1kvw5p0fy3vqvlqwg2dnvpkq21rmf3c3xl46b2a9lifnr9fpncgk",
-      "depends": ["dplyr", "httr", "jsonlite"]
+      "version": "0.2.0",
+      "sha256": "1p3919avqxxb9w5x28mf09kfhw4md8q7rcd1v71jfasn9yqfnxcf",
+      "depends": ["dplyr", "httr", "jsonlite", "progress"]
     },
     "YaleToolkit": {
       "name": "YaleToolkit",
@@ -37543,6 +38995,12 @@
       "sha256": "0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig",
       "depends": ["MASS"]
     },
+    "ZIM4rv": {
+      "name": "ZIM4rv",
+      "version": "0.1.1",
+      "sha256": "00d5h2h67iqkdyzr4rjm490micx63vjvp8681ns25pr05bh1hk68",
+      "depends": ["CompQuadForm", "RNOmni", "SKAT", "data_table", "pscl"]
+    },
     "ZINAR1": {
       "name": "ZINAR1",
       "version": "0.1.0",
@@ -37635,9 +39093,9 @@
     },
     "aLBI": {
       "name": "aLBI",
-      "version": "0.1.5",
-      "sha256": "03xh0m6nn81sig20p3k24zx131fmi9q5wqx2d4qjlx0wzrmf36px",
-      "depends": []
+      "version": "0.1.7",
+      "sha256": "15pa431l58w3dym4v0wsma9zjmlw4xwcvjsyw0fd996ckzj1g15j",
+      "depends": ["dplyr"]
     },
     "aLFQ": {
       "name": "aLFQ",
@@ -37671,8 +39129,8 @@
     },
     "aRtsy": {
       "name": "aRtsy",
-      "version": "0.2.4",
-      "sha256": "08982646gd7m0f7zcj31jq7wmjh0lrl2gys5ma6v6ikqq06piy0c",
+      "version": "1.0.0",
+      "sha256": "0pmzv7qm00lwf8p33blzq3k4k4xfwc8s3bcaggxm2ww5l7p93zif",
       "depends": ["Rcpp", "RcppArmadillo", "ambient", "e1071", "ggplot2", "kknn", "randomForest", "scales"]
     },
     "aRxiv": {
@@ -37713,8 +39171,8 @@
     },
     "abc": {
       "name": "abc",
-      "version": "2.2.1",
-      "sha256": "16753lyzk2dfwgdjfyanwacqw3bvrwby52inq4709804labs6lnv",
+      "version": "2.2.2",
+      "sha256": "15a15y2pvrg2d7bjsavrq1wgz2fx21wa2lrzxiz6w3mp3ks1k55w",
       "depends": ["MASS", "abc_data", "locfit", "nnet", "quantreg"]
     },
     "abc_data": {
@@ -37773,8 +39231,8 @@
     },
     "abess": {
       "name": "abess",
-      "version": "0.4.8",
-      "sha256": "02261lda38931n3rgfm67ml85618wcysvl3hvr4yg9rc5y26gbfs",
+      "version": "0.4.9",
+      "sha256": "19zw9f5z4m6951gm9bg03lilbpnxz6yi0sf14gqw3aym60r49wm4",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppEigen"]
     },
     "abglasso": {
@@ -37783,10 +39241,16 @@
       "sha256": "0h8p912l0202wyr5vjsbzw5mr70m56ab39wv833g6c4c3187479y",
       "depends": ["MASS", "pracma", "statmod"]
     },
+    "abima": {
+      "name": "abima",
+      "version": "1.1",
+      "sha256": "03bpp5fkg748h4skwqlrjl3rj0j68x9m3mjjjx5xfv0j0hzs0360",
+      "depends": ["boot"]
+    },
     "abind": {
       "name": "abind",
-      "version": "1.4-5",
-      "sha256": "0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis",
+      "version": "1.4-8",
+      "sha256": "1q934vfyvszmy6nv13dchv2mbsj9i5vffy88b9wy3siwa8dhaji6",
       "depends": []
     },
     "abjData": {
@@ -38011,6 +39475,12 @@
       "sha256": "087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym",
       "depends": []
     },
+    "acoRn": {
+      "name": "acoRn",
+      "version": "0.1.0",
+      "sha256": "0p1a6qn8hhgc6sqprzs2xy3858llmv9q74b06q16rkb5vqi16bkk",
+      "depends": ["data_table", "stringi", "stringr"]
+    },
     "acopula": {
       "name": "acopula",
       "version": "0.9.4",
@@ -38025,8 +39495,8 @@
     },
     "acro": {
       "name": "acro",
-      "version": "0.1.1",
-      "sha256": "1jfrv7v7mh0laiiffgcnk0sm3kkan4ycfhnb0r43dc5mrckvk7ml",
+      "version": "0.1.3",
+      "sha256": "0vgwzjwxhfs287k0jg8lbmggnanli69jig1wfsxph26yy4hddxfk",
       "depends": ["admiraldev", "png", "reticulate"]
     },
     "acroname": {
@@ -38079,8 +39549,8 @@
     },
     "activAnalyzer": {
       "name": "activAnalyzer",
-      "version": "2.1.1",
-      "sha256": "0jbzbn9y9lwhy4003ym4w680glj9mdq3gwkk64hfsh94c52xihk3",
+      "version": "2.1.2",
+      "sha256": "1f4q96liacxi21i8zmgacaz91zvrvk5jwd5x2ld8fwbjx33bx02s",
       "depends": ["PhysicalActivity", "RSQLite", "assertthat", "dbplyr", "dplyr", "flextable", "forcats", "ggplot2", "golem", "hms", "lubridate", "magrittr", "modelr", "patchwork", "plyr", "reactable", "rmarkdown", "shiny", "shinyFeedback", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "tidyr", "zoo"]
     },
     "activPAL": {
@@ -38241,8 +39711,8 @@
     },
     "adaptivetau": {
       "name": "adaptivetau",
-      "version": "2.3-1",
-      "sha256": "0krv2pw7gg0nch96h0ffy6wli1cjscfl424jy04q0zvvqfghkvqd",
+      "version": "2.3-2",
+      "sha256": "0q6fxni66f8dsrzjrp54mpddvf0vbaji4a2sjlp9gnia5gvi9z27",
       "depends": []
     },
     "adaptr": {
@@ -38257,6 +39727,12 @@
       "sha256": "00npcl2js9vj5r3l66cp5d2l807klia581pig1gsyjjq4rvmfa7v",
       "depends": ["MCMCpack", "Matrix", "coda", "mvtnorm", "spatstat", "spatstat_geom"]
     },
+    "adas_utils": {
+      "name": "adas.utils",
+      "version": "1.0.0",
+      "sha256": "0yca2ag4lvz7bggsdwdqvr7vajarx064s2kszgf2rqr1dw51s4yz",
+      "depends": ["dplyr", "gghalfnorm", "ggplot2", "glue", "lubridate", "magrittr", "purrr", "readr", "rlang", "scales", "stringr", "tibble", "tidyr"]
+    },
     "adass": {
       "name": "adass",
       "version": "1.0.1",
@@ -38265,20 +39741,20 @@
     },
     "adbcdrivermanager": {
       "name": "adbcdrivermanager",
-      "version": "0.13.0",
-      "sha256": "0d0fcjqcmbfbpln3s6n3aas9pz3ich43vnm6qnl8sf6dil3fxnsg",
+      "version": "0.15.0",
+      "sha256": "0n556snnm8i5a4njq75sazp0wz0cajcgddzjm3w4378pamxmmm79",
       "depends": ["nanoarrow"]
     },
     "adbcpostgresql": {
       "name": "adbcpostgresql",
-      "version": "0.13.0",
-      "sha256": "0lspgnimsgpkyf6q0qk5gjf9kij5w2x6xjcp6cy8hpwbp6xci8yr",
+      "version": "0.15.0",
+      "sha256": "1pyhgnbgy41z1wylzrh24x0l44aram7ssp675bsadwym0mc9dcpm",
       "depends": ["adbcdrivermanager"]
     },
     "adbcsqlite": {
       "name": "adbcsqlite",
-      "version": "0.13.0",
-      "sha256": "1vqabya705454lsxis73j2nflqp6jydk1hhcjnc79kjxf332nq5z",
+      "version": "0.15.0",
+      "sha256": "0gp8p1pp3nsnx4nv1ag7q0qkx4wqrmqmwn56czz2wjf68zxfdx3i",
       "depends": ["adbcdrivermanager"]
     },
     "adbi": {
@@ -38373,8 +39849,8 @@
     },
     "adea": {
       "name": "adea",
-      "version": "1.5.1",
-      "sha256": "0wjklmd1r5vhp32syn9dpn5j05y9nfb0c8cnrdc2xcdsi8dzdkap",
+      "version": "1.5.2",
+      "sha256": "0n5n9wbc46iksa66pbw1lxh4yyhgprqgy3l4cs6p406swiyyn32a",
       "depends": ["ROI", "ROI_plugin_glpk", "ROI_plugin_lpsolve", "ROI_plugin_symphony", "combinat", "knitr", "lpSolveAPI", "parallelly", "rmarkdown", "slam"]
     },
     "adegenet": {
@@ -38391,33 +39867,33 @@
     },
     "adehabitatHR": {
       "name": "adehabitatHR",
-      "version": "0.4.21",
-      "sha256": "0ji4a27z5qsi8xpzlx9z8m9hg9k81bb6mkbwzpsinsn1x1dipg0n",
+      "version": "0.4.22",
+      "sha256": "09nllgkbpkcv9p6314216lal2937ffhiaahrx8319wkk4f1d9wvw",
       "depends": ["ade4", "adehabitatLT", "adehabitatMA", "sp"]
     },
     "adehabitatHS": {
       "name": "adehabitatHS",
-      "version": "0.3.17",
-      "sha256": "040qbhfrsxjnl75lmc3fmyrvqblfcp0mmagk8sj225069c64k62n",
+      "version": "0.3.18",
+      "sha256": "06k2ch6khn4g068n9fchbqkr3yr15jqax1zksdqaz566513ky6n8",
       "depends": ["ade4", "adehabitatHR", "adehabitatMA", "sp"]
     },
     "adehabitatLT": {
       "name": "adehabitatLT",
-      "version": "0.3.27",
-      "sha256": "0siaj9h9gyar6pmnv9bp4k7lcpfcvhykl3jj80pzdb6yyybgj2zx",
+      "version": "0.3.28",
+      "sha256": "1hixi29v6p2479hy5y907mfz3ij01dkiyxd62mx348pnh5nkn8bc",
       "depends": ["CircStats", "ade4", "adehabitatMA", "sp"]
     },
     "adehabitatMA": {
       "name": "adehabitatMA",
-      "version": "0.3.16",
-      "sha256": "1jmmi6rh3rnv5b3qy1xhy0rs4dnkysf4rxjfs0im1i5n4rd437h8",
+      "version": "0.3.17",
+      "sha256": "10ynrw4w00ai303i39ciip810h6wj0iqmwk0qrb1p1g6jc5jvjmb",
       "depends": ["sp"]
     },
     "adelie": {
       "name": "adelie",
-      "version": "1.0.1",
-      "sha256": "1h6i2swda173mfilib8cg535w4ba1yciliy071brazhh4r9zcm8m",
-      "depends": ["Matrix", "Rcpp", "RcppEigen", "r2r"]
+      "version": "1.0.2",
+      "sha256": "10sjpdp990jhzypkyywywl3hqrwnp0srdn2zgijm5g80w1420s52",
+      "depends": ["Matrix", "Rcpp", "RcppEigen", "r2r", "stringr"]
     },
     "adephylo": {
       "name": "adephylo",
@@ -38427,9 +39903,9 @@
     },
     "adepro": {
       "name": "adepro",
-      "version": "4.1.0",
-      "sha256": "06zj8vq7py41g0bjpnd4fczwxcr4k1lb1cxjxfc92fhj0wk51k36",
-      "depends": ["Cairo", "MASS", "V8", "audio", "dplyr", "forcats", "haven", "here", "readr", "rlang", "seriation", "shape", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "tidyr"]
+      "version": "4.1.2",
+      "sha256": "117piz0vxfd5qrfn1c9zb3mrivd6l0rbm0h8jfgcrnps5rkb7pmb",
+      "depends": ["Cairo", "DT", "MASS", "V8", "audio", "dplyr", "forcats", "haven", "here", "readr", "rlang", "seriation", "shape", "shiny", "shinyBS", "shinyWidgets", "shinyjs", "tidyr"]
     },
     "adept": {
       "name": "adept",
@@ -38445,8 +39921,8 @@
     },
     "adespatial": {
       "name": "adespatial",
-      "version": "0.3-23",
-      "sha256": "0cszq382vpd8alc98hnrzqj1wyp8bcfbvqpi1d2rqbr12f5qgq3h",
+      "version": "0.3-24",
+      "sha256": "0lrjm3hb6jn30w7kg1lcx1jk66cciyxq7gayhl2jvp6xipg10b8y",
       "depends": ["MASS", "ade4", "adegraphics", "adephylo", "lattice", "shiny", "sp", "spdep", "vegan"]
     },
     "adestr": {
@@ -38457,9 +39933,9 @@
     },
     "adfExplorer": {
       "name": "adfExplorer",
-      "version": "0.1.8",
-      "sha256": "0lpabd2gvcl0nja6q3d2hcxmam0gclnw21q1mxjf2idhqxcwscaj",
-      "depends": []
+      "version": "2.0.0",
+      "sha256": "0nhq4bv08xvd0cz9phjs3sw47jrkk8bxmh40vlkc3sfb81fm5jh7",
+      "depends": ["cpp11", "vctrs"]
     },
     "adformR": {
       "name": "adformR",
@@ -38475,8 +39951,8 @@
     },
     "adimpro": {
       "name": "adimpro",
-      "version": "0.9.7",
-      "sha256": "1p34q78w1ib5xjvxg4c1bal680a55l5dqhiry367x9nzwq8a352c",
+      "version": "0.9.7.2",
+      "sha256": "0b7dncf1w4yvm9i67q19fj95p3sc57lqv9wb2n9kvjddqk0vk4iv",
       "depends": ["awsMethods"]
     },
     "adiv": {
@@ -38499,8 +39975,8 @@
     },
     "adjclust": {
       "name": "adjclust",
-      "version": "0.6.9",
-      "sha256": "1iq0pfw0kdi792iigpj4vq8phbcs9bid09bdvpxwwxcq65djni41",
+      "version": "0.6.10",
+      "sha256": "1hdgkbsl0vng609rkb9n1sfp4vl6my3knaxgk6z1k08fdprayn5v",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "capushe", "dendextend", "ggplot2", "rlang", "sparseMatrixStats"]
     },
     "adjustedCurves": {
@@ -38557,23 +40033,29 @@
       "sha256": "1690id6s5633r47av68wivg436h5s13a5qlg9a1dyfghd6wfa79f",
       "depends": ["admiral", "admiraldev", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
     },
+    "admiralpeds": {
+      "name": "admiralpeds",
+      "version": "0.1.0",
+      "sha256": "06821f08f7mgl20p1i90h6bwzhhcnb6clmqxrygxn9fs9iza4ha0",
+      "depends": ["admiral", "admiraldev", "cli", "dplyr", "magrittr", "purrr", "rlang", "tidyselect", "zoo"]
+    },
     "admiralvaccine": {
       "name": "admiralvaccine",
-      "version": "0.2.0",
-      "sha256": "0asi4939k50y05f1klga4i8wyw4hxlczsz3sg3as39pdsp6zzn48",
-      "depends": ["admiral", "admiraldev", "assertthat", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "metatools", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
+      "version": "0.3.0",
+      "sha256": "17p7l8rx40zjaxc2ap1n1pi1025qn1cw17m26haw6d5vr1p9sk1k",
+      "depends": ["admiral", "admiraldev", "assertthat", "dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "tidyselect"]
     },
     "admisc": {
       "name": "admisc",
-      "version": "0.35",
-      "sha256": "0gzdb9dm34qfkjqgfrd3wm96dzhcps4xayyrhp80mzgh14zmnjyg",
+      "version": "0.37",
+      "sha256": "1bixvbwb5m8gxf7jpsj8a4j1bj57q7an7p1icg15la08xllinx2p",
       "depends": []
     },
     "admix": {
       "name": "admix",
-      "version": "2.1-3",
-      "sha256": "0h6saazz2p8pliznn2ggbi6zj5ib00ylghfxj5i9nk21p4y0s59s",
-      "depends": ["Iso", "MASS", "Rcpp", "cubature", "fdrtool", "orthopolynom", "pracma"]
+      "version": "2.3.3",
+      "sha256": "05s72p7gbpm689sm6vvrb830m43zhsm5gg015brdcggqpvf9kj9a",
+      "depends": ["EnvStats", "Iso", "MASS", "Rcpp", "Rdpack", "cubature", "fdrtool", "orthopolynom", "pracma"]
     },
     "admixr": {
       "name": "admixr",
@@ -38589,8 +40071,8 @@
     },
     "admtools": {
       "name": "admtools",
-      "version": "0.3.0",
-      "sha256": "01vawhabsj09zf8126wfyawp3likf2i0k7micwjdmll33ykl8254",
+      "version": "0.4.0",
+      "sha256": "08g8v5c6s2d0alpkpznh97xr5lfznmgr0w4zpplbv8m7apbk5mrq",
       "depends": ["ape"]
     },
     "adnuts": {
@@ -38607,8 +40089,8 @@
     },
     "adoptr": {
       "name": "adoptr",
-      "version": "1.0.1",
-      "sha256": "0crlwk6nk88lxz76klss7igmdx8sw99yj52kkmsa6l49s29wwqv2",
+      "version": "1.1.1",
+      "sha256": "1l3llwc0pp468kj4548yx9syj7qfvwqbxs655lc58k5qzwlk73xk",
       "depends": ["glue", "nloptr"]
     },
     "adproclus": {
@@ -38659,6 +40141,12 @@
       "sha256": "1w5qg4psm8pj89f09pz7in8zkafaimik1n6hx29y55jpmbxbk2gn",
       "depends": ["RCurl", "rjson"]
     },
+    "aebdata": {
+      "name": "aebdata",
+      "version": "0.1.2",
+      "sha256": "0y15179vy547wsi0bjycnx0fffc46vb769dvi99a4j5dr4gfsdaj",
+      "depends": ["httr2", "readr", "rvest"]
+    },
     "aeddo": {
       "name": "aeddo",
       "version": "0.1.1",
@@ -38683,6 +40171,12 @@
       "sha256": "1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl",
       "depends": []
     },
+    "afcharts": {
+      "name": "afcharts",
+      "version": "0.4.0",
+      "sha256": "1bgm5sq9q8qn6764p7xwb7igg4akx652zb9vi57c3caxybhyir6f",
+      "depends": ["cli", "dplyr", "ggplot2", "rlang", "scales"]
+    },
     "afcolours": {
       "name": "afcolours",
       "version": "1.0.0",
@@ -38697,10 +40191,16 @@
     },
     "afex": {
       "name": "afex",
-      "version": "1.3-1",
-      "sha256": "1a1ilqn5xz7kkiwwaqi911b1cf9zc78l9my0fvjq3l73hrzgnr2a",
+      "version": "1.4-1",
+      "sha256": "17i8am28l937vd2v6z17bfngslpskjx301pk050zvz3hf7ckayms",
       "depends": ["car", "lme4", "lmerTest", "pbkrtest", "reshape2"]
     },
+    "affiner": {
+      "name": "affiner",
+      "version": "0.1.3",
+      "sha256": "1qi2zi4cvhrmycxviwcm74p8vcwj7vzbncq5g974ashym4c2v6i8",
+      "depends": ["R6"]
+    },
     "affinity": {
       "name": "affinity",
       "version": "0.2.5",
@@ -38713,6 +40213,12 @@
       "sha256": "10i7wzl4xiphj5f466ga7c4ha3mkyqn63x1z0jyx50m0b84sggq1",
       "depends": ["Hmisc", "MASS", "expm", "ggplot2", "ggrepel"]
     },
+    "affluenceIndex": {
+      "name": "affluenceIndex",
+      "version": "2.2",
+      "sha256": "0g5nykvkv6qyrsr861wdbsxh6qlpmqp17c327qm0y2rb2gs8ywri",
+      "depends": ["spatstat_univar"]
+    },
     "afmToolkit": {
       "name": "afmToolkit",
       "version": "0.0.1",
@@ -38739,8 +40245,8 @@
     },
     "aftgee": {
       "name": "aftgee",
-      "version": "1.2.0",
-      "sha256": "01mjgahs6wfd47imnw0zni57ilcy76gh5lpsihxyd3grwd9jkki7",
+      "version": "1.2.1",
+      "sha256": "1gbrk0rjz1ryvbkvh4p4mm3lfc5bfrrwg4k3whxlwy30xg7549hx",
       "depends": ["BB", "MASS", "Rcpp", "RcppArmadillo", "geepack", "survival"]
     },
     "afthd": {
@@ -38749,6 +40255,12 @@
       "sha256": "0gg2cp3sj28f3pi5rqh737hna3imwarwas01jacm0m2h27587k7y",
       "depends": ["R2jags", "glmnet", "photobiology", "rstpm2", "survival"]
     },
+    "aftsem": {
+      "name": "aftsem",
+      "version": "1.0",
+      "sha256": "00rsrwv57z0inpqrgihbbm57dzbw01idi8axbhhc09z51bnbksxc",
+      "depends": ["Rcpp", "RcppArmadillo", "optimx", "quantreg", "survival"]
+    },
     "afttest": {
       "name": "afttest",
       "version": "4.3.2.3",
@@ -38787,9 +40299,9 @@
     },
     "ageutils": {
       "name": "ageutils",
-      "version": "0.0.4",
-      "sha256": "1l25f0qq5lqc5jpcwvvnl6qysrgyz1g8wgqqw10d8z38jks2mrg3",
-      "depends": []
+      "version": "0.0.7",
+      "sha256": "1qgnk39n7y46vgw44qmsg99jya4a8grdhsp7k2n8k98zvkqwkb9x",
+      "depends": ["cli", "rlang", "tibble"]
     },
     "agfh": {
       "name": "agfh",
@@ -38799,8 +40311,8 @@
     },
     "aggTrees": {
       "name": "aggTrees",
-      "version": "2.0.2",
-      "sha256": "15dz96g8vyyijbv7nm9wwzwwsm0kzv8mwhrirnm14219cx4z2r76",
+      "version": "2.1.0",
+      "sha256": "060m8k16gplbjf2jy0qh4qv2046bwzj54y9xsjj5gxnzq169ds2x",
       "depends": ["boot", "broom", "car", "caret", "estimatr", "grf", "rpart", "rpart_plot", "stringr"]
     },
     "agghoo": {
@@ -38859,8 +40371,8 @@
     },
     "agridat": {
       "name": "agridat",
-      "version": "1.23",
-      "sha256": "17xq0ihjg2z61dy1nrz5vwxwzmwrk3wmc01n2c6rwgyfa5ijfplq",
+      "version": "1.24",
+      "sha256": "0bnc2dr5lz2lqjlic8c8siwfcv63864fn857a6pi6zblfv5cfsza",
       "depends": []
     },
     "agrifeature": {
@@ -38925,8 +40437,8 @@
     },
     "ahaz": {
       "name": "ahaz",
-      "version": "1.15",
-      "sha256": "0k6i8s2miic2y1dgwjlpkhmaw6k3phn772p0600gcnjqxbqajznh",
+      "version": "1.15.1",
+      "sha256": "1739qx2jnsxkzlllrhcfa57xbbc1p32qplix7fhqh7653nr6yhj3",
       "depends": ["Matrix", "survival"]
     },
     "ahnr": {
@@ -38953,6 +40465,12 @@
       "sha256": "1dq40qf5r5h011d9fk2c4qjj6dbh0kxl2xfjaflr69r2dlsslgds",
       "depends": ["data_table", "plyr", "timereg"]
     },
+    "ai": {
+      "name": "ai",
+      "version": "1.0.4.44",
+      "sha256": "1wdvia9gnr70wvdqfg3kh4ndfr0lwsyv1mccklfpyybj90pc1gds",
+      "depends": ["MASS", "Metrics", "caTools", "class", "party"]
+    },
     "aiRly": {
       "name": "aiRly",
       "version": "0.1.0",
@@ -38979,9 +40497,9 @@
     },
     "aifeducation": {
       "name": "aifeducation",
-      "version": "0.3.3",
-      "sha256": "0lnxbvmsalis942nxgf0c3j602wcdzpvdm9r194c2ci0xpybc6ls",
-      "depends": ["Rcpp", "RcppArmadillo", "abind", "doParallel", "foreach", "iotarelr", "irr", "irrCAC", "reshape2", "reticulate", "rlang", "smotefamily", "stringr"]
+      "version": "1.0.0",
+      "sha256": "0vvx5midssgcy32bxbxkxi8jgl5ac3ivdm4hh7qfx35xi0ypbjca",
+      "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "iotarelr", "irrCAC", "reshape2", "reticulate", "rlang", "smotefamily", "stringi"]
     },
     "aihuman": {
       "name": "aihuman",
@@ -39003,8 +40521,8 @@
     },
     "aion": {
       "name": "aion",
-      "version": "1.0.4",
-      "sha256": "0acm2nffrpqbli358cbpl0sd7bq9m5qbnnrk01xd7h9l63xzs67c",
+      "version": "1.3.0",
+      "sha256": "1hn7h9y2ig4b8xcyxzsv2v8s9qkd23xqqqw19hfzy3vq96bi7iqv",
       "depends": ["arkhe"]
     },
     "air": {
@@ -39033,9 +40551,9 @@
     },
     "airGRiwrm": {
       "name": "airGRiwrm",
-      "version": "0.6.2",
-      "sha256": "09hcs5qhs3mykdarznqwiqd2vjdc5fqmp8lvfpmf4s2b3yqvydax",
-      "depends": ["DiagrammeR", "airGR", "dplyr"]
+      "version": "0.7.0",
+      "sha256": "1vb8s0jylrn9prc4s2a8427xw7jc9v8axsid0f1ckwflp1mpm40g",
+      "depends": ["airGR", "dplyr", "jsonlite", "png", "rlang", "zlib"]
     },
     "airGRteaching": {
       "name": "airGRteaching",
@@ -39079,6 +40597,12 @@
       "sha256": "0k3a9yg30brpysp62fvvl7pisgb7441ggbl03jx8mh5bjdckr210",
       "depends": ["jsonlite", "readr", "stringi", "yaml"]
     },
+    "airship": {
+      "name": "airship",
+      "version": "1.4.3",
+      "sha256": "17c68w08669ab4m7cv3w6il22mxcc47h9r887fn4p00036zk4cak",
+      "depends": ["Cairo", "DT", "colourpicker", "data_table", "dplyr", "ggplot2", "magrittr", "mvtnorm", "plotly", "rlang", "scales", "shiny", "shinyBS", "shinyWidgets", "shinyalert", "shinybusy", "shinydashboard", "shinyjs", "stringr", "tidyr", "tidyselect", "vctrs"]
+    },
     "airt": {
       "name": "airt",
       "version": "0.2.2",
@@ -39159,9 +40683,9 @@
     },
     "alcyon": {
       "name": "alcyon",
-      "version": "0.4.0",
-      "sha256": "1l3z7bsspxbhfxldq4pbh7lmwfmmfqry99xhk125ja19h1xfyxl4",
-      "depends": ["Rcpp", "igraph", "sf", "stars"]
+      "version": "0.6.0",
+      "sha256": "1lsk2hb0a6lmmy439dga2llsij6ng7bqrfigwsb5zcfi7gkh0kd4",
+      "depends": ["Rcpp", "cli", "sf", "stars"]
     },
     "ald": {
       "name": "ald",
@@ -39193,12 +40717,6 @@
       "sha256": "0xgqzn750c4f13w2h8j2xj53sx0dij56164svw01nbvns4n0yvv8",
       "depends": ["dplyr", "httr", "jsonlite", "lubridate", "magrittr", "rlang", "tibble", "tidyr", "tidyselect"]
     },
-    "algaeClassify": {
-      "name": "algaeClassify",
-      "version": "2.0.2",
-      "sha256": "08jg210aas3bxjqgsapba8fzc133nh9afl0lzy784ywdx96lfmm0",
-      "depends": ["RCurl", "curl", "jsonlite", "lubridate", "ritis", "taxize"]
-    },
     "algo": {
       "name": "algo",
       "version": "0.1.0",
@@ -39243,9 +40761,9 @@
     },
     "allcontributors": {
       "name": "allcontributors",
-      "version": "0.2.0",
-      "sha256": "043li7wdm3m66k69ijjmak53pk8f6q3a89snncv36g82zwbpfvpp",
-      "depends": ["cli", "clipr", "curl", "gert", "gh", "gitcreds", "httr2", "magrittr"]
+      "version": "0.2.2",
+      "sha256": "0yxk7433g9n62ff08cg9zcqng553kyhswc7yb15qwx4wynn376f3",
+      "depends": ["cli", "clipr", "curl", "gert", "gh", "gitcreds", "magrittr"]
     },
     "alleHap": {
       "name": "alleHap",
@@ -39267,8 +40785,8 @@
     },
     "allofus": {
       "name": "allofus",
-      "version": "1.1.0",
-      "sha256": "0lxds215ar26z28jv5kxp61vhg0yy73q7xj0dbdkiqnqhq7z8dhd",
+      "version": "1.2.0",
+      "sha256": "198cibnh0x9s1cfkjyz99i8d878z6ds08zfwfp22i2r4pzanhi7w",
       "depends": ["DBI", "bigrquery", "bit64", "cli", "dbplyr", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "rlang", "sessioninfo", "stringr", "tidyr"]
     },
     "allomr": {
@@ -39291,8 +40809,8 @@
     },
     "alone": {
       "name": "alone",
-      "version": "0.4",
-      "sha256": "1smfn3b1lcbccsi41548pr6yyld9nh74apxp54yad5ga20r68462",
+      "version": "0.5",
+      "sha256": "0iwamh7sxq62rw5vlkfh9fjlj6mwz7fbpd3cbmqb1iw1l6yc8b9c",
       "depends": []
     },
     "alookr": {
@@ -39381,8 +40899,8 @@
     },
     "altR2": {
       "name": "altR2",
-      "version": "1.0.0",
-      "sha256": "15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv",
+      "version": "1.1.0",
+      "sha256": "1whs3zqccyayv0slsd8bzfkp26q2shkdz7l7ickfxc3wnar8nrwa",
       "depends": ["gsl", "purrr"]
     },
     "altadata": {
@@ -39411,8 +40929,8 @@
     },
     "altmeta": {
       "name": "altmeta",
-      "version": "4.1",
-      "sha256": "01v308389wqzp35icrp9ssb4y4gxwjzl600qw47c6rmm6s2mxzjh",
+      "version": "4.2",
+      "sha256": "178vdrlan1ijl7dlva201yx13iba2xf9sf3dpsnp9hyfq1bgrddg",
       "depends": ["Matrix", "coda", "lme4", "metafor", "rjags"]
     },
     "amVennDiagram5": {
@@ -39421,6 +40939,12 @@
       "sha256": "0f4w66pqb95bk5h0xi35lxq4535rjpbgkl6j9r3wx7rl8g6lpl7q",
       "depends": ["htmlwidgets", "partitions", "venn"]
     },
+    "amadeus": {
+      "name": "amadeus",
+      "version": "1.1.6",
+      "sha256": "09r0zx7l9x2g8cm1bpfk504yzdh96qqp0phygz0l3lwls17lz49p",
+      "depends": ["Rdpack", "archive", "collapse", "data_table", "dplyr", "exactextractr", "future", "future_apply", "httr", "nhdplusTools", "parallelly", "rlang", "rvest", "sf", "sftime", "stars", "stringi", "terra", "testthat", "tidyr"]
+    },
     "amanida": {
       "name": "amanida",
       "version": "0.3.0",
@@ -39435,8 +40959,8 @@
     },
     "amap": {
       "name": "amap",
-      "version": "0.8-19",
-      "sha256": "000r5705lq2mc15skin07dfxjf5816nbfy4gqkya1sv99dlfljbk",
+      "version": "0.8-20",
+      "sha256": "0w65z1jqg6c9fp6knv9ps5f22f4jk94hbihr6l0hbmijiznbffwq",
       "depends": []
     },
     "amapGeocode": {
@@ -39513,8 +41037,8 @@
     },
     "ami": {
       "name": "ami",
-      "version": "0.1.1",
-      "sha256": "0gcbwhbk3lzxcp35841pdipbifhk445x2r0ch6999n1y0h7rsca7",
+      "version": "0.2.1",
+      "sha256": "03yhfn0qfwb8z1qnnsb7lvn6d71brhqd1blskhyza07hmlxbqzmd",
       "depends": ["curl", "glue", "lifecycle", "rlang", "rstudioapi"]
     },
     "ammiBayes": {
@@ -39591,8 +41115,8 @@
     },
     "analogue": {
       "name": "analogue",
-      "version": "0.17-6",
-      "sha256": "0c5h8nnbflydv35ja1pfhyx7ifwlriwgcnrmxj5il5lvcr70y1vi",
+      "version": "0.17-7",
+      "sha256": "0l8q2nyl03l1vcm6gy8ax287vh8jy0rd9cc7rwzjv8lfjq1dv2zh",
       "depends": ["MASS", "brglm", "lattice", "mgcv", "princurve", "vegan"]
     },
     "analyzer": {
@@ -39627,9 +41151,9 @@
     },
     "angstromATE": {
       "name": "angstromATE",
-      "version": "0.1.2",
-      "sha256": "0chmzliwd9ygcjvvd20vfp1immmrnhxwdc83la11l8v0ind10syl",
-      "depends": ["XML"]
+      "version": "0.1.3",
+      "sha256": "1mxm5xq08yj1ah4n3sd50fa1z6m97i6c5fzvw92fr1fkzrlfqlqk",
+      "depends": ["XML", "stringr"]
     },
     "angstroms": {
       "name": "angstroms",
@@ -39681,8 +41205,8 @@
     },
     "animint2": {
       "name": "animint2",
-      "version": "2024.1.24",
-      "sha256": "03zff0c7iz819js5iknx33kbfnqisfqbdji16bzd047y0s767rck",
+      "version": "2024.11.2",
+      "sha256": "0sapq1qjwsdbw4l5yg88q6djnrljj3sgawfm1g9cwhx6zfjlvhg4",
       "depends": ["MASS", "RJSONIO", "data_table", "digest", "gtable", "knitr", "plyr", "reshape2", "scales", "servr"]
     },
     "animl": {
@@ -39733,6 +41257,12 @@
       "sha256": "1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr",
       "depends": ["cluster"]
     },
+    "anoint": {
+      "name": "anoint",
+      "version": "1.5",
+      "sha256": "158r7dp5cyjap0qrn1p4bl4csy2wph0zly03rvnsjvp8h6nxkrgr",
+      "depends": ["MASS", "glmnet", "survival"]
+    },
     "anomalize": {
       "name": "anomalize",
       "version": "0.3.0",
@@ -39741,10 +41271,22 @@
     },
     "anomaly": {
       "name": "anomaly",
-      "version": "4.3.2",
-      "sha256": "1w0bc5147rqsakiz3cs37xcd27i2b5ni1dva2kxv8l17ma0519v3",
+      "version": "4.3.3",
+      "sha256": "12xm04qnbgc6i5w9vnvaaqfjyn014gbcb4401l1843rjr73kkv24",
       "depends": ["BH", "Rcpp", "Rdpack", "cowplot", "dplyr", "ggplot2", "tidyr", "xts", "zoo"]
     },
+    "anominate": {
+      "name": "anominate",
+      "version": "0.7",
+      "sha256": "0zy2gvn3pr01rfvh2bhgdk7a6lzmffldxy0vk2gidirhv4zvy3vr",
+      "depends": ["MCMCpack", "coda", "pscl", "wnominate"]
+    },
+    "anomo": {
+      "name": "anomo",
+      "version": "0.5.2",
+      "sha256": "12c1y2l6c2vhiairl5cxf0f2scyj2iwjgvagm7mhr8ingchxkvgm",
+      "depends": []
+    },
     "anovir": {
       "name": "anovir",
       "version": "0.1.0",
@@ -39757,6 +41299,30 @@
       "sha256": "1hakvxgc50zshi5kplg90r0499mihhwvhhz7bshndjxxci1ashkl",
       "depends": []
     },
+    "antaresEditObject": {
+      "name": "antaresEditObject",
+      "version": "0.7.1",
+      "sha256": "06r23dgz0fbqxrk2j9i78jv7i2pi8wf6qc1a0d8igal4mzxv0v88",
+      "depends": ["antaresRead", "assertthat", "cli", "data_table", "doFuture", "doParallel", "future", "httr", "jsonlite", "lifecycle", "memuse", "pbapply", "plyr", "progressr", "whisker", "yaml"]
+    },
+    "antaresProcessing": {
+      "name": "antaresProcessing",
+      "version": "0.18.3",
+      "sha256": "0xn44gqm9x7im54dqc9c506awwg6x1hps6h2w28y5psx0c3i97hx",
+      "depends": ["antaresRead", "data_table"]
+    },
+    "antaresRead": {
+      "name": "antaresRead",
+      "version": "2.7.2",
+      "sha256": "1ihz7hdfq640sbdmq55mrsp070mwkpa97bn2l2bkn1qia1bxa2rn",
+      "depends": ["assertthat", "bit64", "data_table", "doParallel", "httr", "jsonlite", "lifecycle", "lubridate", "memuse", "pbapply", "plyr", "purrr", "shiny", "stringi", "stringr"]
+    },
+    "antaresViz": {
+      "name": "antaresViz",
+      "version": "0.18.3",
+      "sha256": "141vip2ksp2zlyiddsy9ilswdyj9p7zh5p9374dwfqxwz5s3q8rk",
+      "depends": ["antaresProcessing", "antaresRead", "assertthat", "data_table", "dygraphs", "geojsonio", "htmltools", "htmlwidgets", "leaflet", "leaflet_minicharts", "lifecycle", "lubridate", "manipulateWidget", "plotly", "rAmCharts", "sf", "shiny", "sp", "spMaps", "webshot"]
+    },
     "anthro": {
       "name": "anthro",
       "version": "1.0.1",
@@ -39765,15 +41331,15 @@
     },
     "anthroplus": {
       "name": "anthroplus",
-      "version": "0.9.0",
-      "sha256": "1wnj2idgdnh2gdw34x40adijf2sxp3k72j45pqqxg4aqc1wrvvv1",
+      "version": "1.0.0",
+      "sha256": "041aa61yi3jkaal11faf06q7iqafi2npa5ayk5gwpfbh0pscaj7h",
       "depends": ["anthro"]
     },
     "anticlust": {
       "name": "anticlust",
-      "version": "0.8.5",
-      "sha256": "1y3mb8l9p5dh843i2k6b5j0yvq1kvykax6fxavcacsa55lfcl3y2",
-      "depends": ["Matrix", "RANN"]
+      "version": "0.8.7",
+      "sha256": "1rmgyscggir90rw34ksw9rd2snbi4zxxrhh4fdcpk4y931x312py",
+      "depends": ["Matrix", "RANN", "lpSolve"]
     },
     "antitrust": {
       "name": "antitrust",
@@ -39783,8 +41349,8 @@
     },
     "antiword": {
       "name": "antiword",
-      "version": "1.3.3",
-      "sha256": "1cc355sldhsbpx9wl5hkx0ydkgd3racxhkrriv58yw5xbb3b18ff",
+      "version": "1.3.4",
+      "sha256": "0750zh9jzxfk2r2n8gc4l2vlkvr6x9w0wziswbb5s1nipqcnx8ab",
       "depends": ["sys"]
     },
     "anyLib": {
@@ -39807,8 +41373,8 @@
     },
     "anytime": {
       "name": "anytime",
-      "version": "0.3.9",
-      "sha256": "0jjpqynai5nd7mfy1smb44356f3d5bmpxhs1i9x9jw5c959c35hh",
+      "version": "0.3.11",
+      "sha256": "1qvb568x99cy68855zsv28llhky1badz34gnp6mdkvz1998qsl7z",
       "depends": ["BH", "Rcpp"]
     },
     "ao": {
@@ -39825,8 +41391,8 @@
     },
     "aods3": {
       "name": "aods3",
-      "version": "0.4-1.2",
-      "sha256": "0rd4xr7nwac49m8h4pr8hv79giyv2rrlnz78r7mxa6lpgkmgqp4d",
+      "version": "0.5",
+      "sha256": "0vpnn36qqmkna3rdm88fgxbrbhf529p1qpfm0phig9jpj232a9rj",
       "depends": []
     },
     "aoos": {
@@ -39837,9 +41403,9 @@
     },
     "aopdata": {
       "name": "aopdata",
-      "version": "1.0.3",
-      "sha256": "13i8fjvqx42jslgyl271cbnpmsxqxmkrs5hiaxr5i8srrq55d60m",
-      "depends": ["checkmate", "curl", "data_table", "httr", "sf"]
+      "version": "1.1.0",
+      "sha256": "07vcxz1njl1hb8p25ni11l39llb9bl19yq3an5rarjj7mxyp8m40",
+      "depends": ["checkmate", "curl", "data_table", "sf"]
     },
     "aoristic": {
       "name": "aoristic",
@@ -39879,8 +41445,8 @@
     },
     "apache_sedona": {
       "name": "apache.sedona",
-      "version": "1.6.0",
-      "sha256": "1n5qcjhcb801sjm6yanqvlxqicc2sxlsk4g5qyf1w3zc38cbz0kx",
+      "version": "1.7.0",
+      "sha256": "1h2ikhqh065jsv10wydw7kdl8ghjmpsmkpm9mmk40agl7dynfmaf",
       "depends": ["cli", "dbplyr", "lifecycle", "rlang", "sparklyr"]
     },
     "apc": {
@@ -39909,8 +41475,8 @@
     },
     "ape": {
       "name": "ape",
-      "version": "5.8",
-      "sha256": "092dx0x763r6ch6pp4c4fkmnq5alrq0527p72w1wdg71g6cp5ki4",
+      "version": "5.8-1",
+      "sha256": "13id88b2g2m7zgp3r8nigyainlpbld1z2d7n87bplnailzfy7kfn",
       "depends": ["Rcpp", "digest", "lattice", "nlme"]
     },
     "apercu": {
@@ -39927,8 +41493,8 @@
     },
     "apexcharter": {
       "name": "apexcharter",
-      "version": "0.4.3",
-      "sha256": "0g5bg6py5a9fwqm2qsqwn6r9xcij11s4xccf6cimrx74ly4h5lff",
+      "version": "0.4.4",
+      "sha256": "1pw36j2b9ypi8gwkc5vgknsbz88ich5d71cpq7rj9xrrkdwh04jn",
       "depends": ["ggplot2", "htmltools", "htmlwidgets", "jsonlite", "magrittr", "rlang", "shiny"]
     },
     "aphid": {
@@ -39939,8 +41505,8 @@
     },
     "aphylo": {
       "name": "aphylo",
-      "version": "0.3-3",
-      "sha256": "1blvj2mz1pdsypxak78pmck097ryzaz24y4flzs5k5djqxgpjwnm",
+      "version": "0.3-4",
+      "sha256": "06zccdhvcyjxzx71rark0jn1wj9d0kjvpv063x9p46ywy5ibcvk5",
       "depends": ["MASS", "Matrix", "Rcpp", "ape", "coda", "fmcmc", "xml2"]
     },
     "api2lm": {
@@ -39963,14 +41529,14 @@
     },
     "aplot": {
       "name": "aplot",
-      "version": "0.2.3",
-      "sha256": "0shd66q2hagddc0nd96lljin0nyqwp1qq4b485r3z4wr042n5c0z",
+      "version": "0.2.4",
+      "sha256": "11cz0wmmf1vlfh25hms7x5zp6iihi81vzrk734cypz43p29dg1sy",
       "depends": ["ggfun", "ggplot2", "ggplotify", "magrittr", "patchwork"]
     },
     "aplotExtra": {
       "name": "aplotExtra",
-      "version": "0.0.2",
-      "sha256": "0sh3c78p37kn00hkps5ai3aqz391wwpbck2rar4rdvwclg4818my",
+      "version": "0.0.3",
+      "sha256": "0lpp285cnb76byf6mm4m3qzam447ldabnsda82vw1pmxgpgzrrql",
       "depends": ["aplot", "dplyr", "forcats", "ggfun", "ggplot2", "ggstar", "maftools", "purrr", "rlang", "tibble", "tidyr", "yulab_utils"]
     },
     "aplpack": {
@@ -39993,8 +41559,8 @@
     },
     "apollo": {
       "name": "apollo",
-      "version": "0.3.3",
-      "sha256": "0mlvizr7kf308y431vkdf04p64srkgd7hwbypkw68yz37r1k13za",
+      "version": "0.3.4",
+      "sha256": "1d9dbf0i0wqvxyfvnpp3p1asppgy0sch7w0w1k86wd0vqiarqgzv",
       "depends": ["Deriv", "RSGHB", "Rcpp", "RcppArmadillo", "RcppEigen", "Rsolnp", "bgw", "cli", "coda", "matrixStats", "maxLik", "mnormt", "mvtnorm", "numDeriv", "randtoolbox", "stringr", "tibble"]
     },
     "appRiori": {
@@ -40023,8 +41589,8 @@
     },
     "appnn": {
       "name": "appnn",
-      "version": "1.0-0",
-      "sha256": "0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3",
+      "version": "1.0-1",
+      "sha256": "0y97ia2fn4h4wr9xdwc8rngzlbim2d6d1cnkck1p2ip4r30rlyn4",
       "depends": []
     },
     "apportion": {
@@ -40033,12 +41599,6 @@
       "sha256": "0z8b9qsxsnwy6kmkns6cgri55mvnhsfkwwmljhlp26l93m3llabc",
       "depends": []
     },
-    "approxOT": {
-      "name": "approxOT",
-      "version": "1.1.1",
-      "sha256": "1l0grr9158d0lscnxd191h3vbal93sl25r982c5w32iyajcjn71h",
-      "depends": ["BH", "Rcpp", "RcppCGAL", "RcppEigen"]
-    },
     "approximator": {
       "name": "approximator",
       "version": "1.2-8",
@@ -40077,10 +41637,16 @@
     },
     "apsimx": {
       "name": "apsimx",
-      "version": "2.7.7",
-      "sha256": "18q9lynfy0y7abp2zlclp75xcixd022m9hqqaqjh6z7wy9z3rxbs",
+      "version": "2.8.0",
+      "sha256": "0k14qmwq2kdwd5z6ciw18wsg1jh1xcspszha5694xbfmip71cqh1",
       "depends": ["DBI", "RSQLite", "jsonlite", "knitr", "xml2"]
     },
+    "apt": {
+      "name": "apt",
+      "version": "4.0",
+      "sha256": "0rrwlm67dyzai0fdy6j8bk1vww2xm29sijb9c9s482lxiyc2hv24",
+      "depends": ["car", "erer", "urca"]
+    },
     "apyramid": {
       "name": "apyramid",
       "version": "0.1.3",
@@ -40095,9 +41661,9 @@
     },
     "aqp": {
       "name": "aqp",
-      "version": "2.0.4",
-      "sha256": "0p43q6xvvks0f424h1rgzwx3ykpb4wrh5xd24khpkxwwigmm5jc4",
-      "depends": ["cluster", "data_table", "farver", "lattice", "sp", "stringr"]
+      "version": "2.1.0",
+      "sha256": "0gwq6r92swhjv2iaakqf3w6ha2y9kyxmshvjxvlzz2mq8xrla8ck",
+      "depends": ["cluster", "data_table", "farver", "lattice", "stringr"]
     },
     "aquodom": {
       "name": "aquodom",
@@ -40137,38 +41703,26 @@
     },
     "arcgeocoder": {
       "name": "arcgeocoder",
-      "version": "0.2.0",
-      "sha256": "02bzhdz8k5c65rzx9dkwxw5v69wq8nbsxk6c6lf2v9wqhq705krp",
+      "version": "0.2.1",
+      "sha256": "1lann7gbvx4sy5jaynlclh8j4ysmx3kjx00rd9rn825hmp5ia6km",
       "depends": ["dplyr", "jsonlite"]
     },
-    "arcgis": {
-      "name": "arcgis",
-      "version": "0.1.1",
-      "sha256": "04k22569xsdl8bsi3r1bfwcdrjcdypm4b6sbjyf7yrglyyyqlpq3",
-      "depends": ["arcgisgeocode", "arcgislayers", "arcgisplaces", "arcgisutils", "cli", "httr2"]
-    },
     "arcgisgeocode": {
       "name": "arcgisgeocode",
-      "version": "0.2.1",
-      "sha256": "0mnkp50k02p10nk4wbwyilldzwdhcfkiqv2w85spir5kip670j8m",
+      "version": "0.2.2",
+      "sha256": "1ld880zppwz9wrwjhyhgdrh8hx8s0azv3iyv3kvjndhfai4psiz7",
       "depends": ["RcppSimdJson", "arcgisutils", "cli", "curl", "httr2", "jsonify", "rlang", "sf"]
     },
     "arcgislayers": {
       "name": "arcgislayers",
-      "version": "0.3.0",
-      "sha256": "02zx66iszhw2kik0yg4djzlig6rc505igp3ginxhfcnb04blbz53",
+      "version": "0.3.1",
+      "sha256": "1bzrnkrj08zv7sb2phpnpimmb224g5z9jm5s067l8ajbxp7gainv",
       "depends": ["RcppSimdJson", "arcgisutils", "arcpbf", "cli", "httr2", "jsonify", "lifecycle", "rlang", "sf", "terra"]
     },
-    "arcgisplaces": {
-      "name": "arcgisplaces",
-      "version": "0.1.0",
-      "sha256": "09xfwahdqf8v772g7gxalgzyd77diwzy6snlfjsrnli4f0svlzwi",
-      "depends": ["arcgisutils", "cli", "httr2", "rlang", "wk"]
-    },
     "arcgisutils": {
       "name": "arcgisutils",
-      "version": "0.3.0",
-      "sha256": "0553xmamgcaswnjyq0ayyfgvwl1kijrq0jan80m23kgydgi46hkv",
+      "version": "0.3.1",
+      "sha256": "0da7m2fw3hfqd2wj2lrm1l9dw0zqiqqaxbip0h05g4vj9rcr5vw3",
       "depends": ["RcppSimdJson", "cli", "dbplyr", "httr2", "rlang", "sf"]
     },
     "archdata": {
@@ -40185,8 +41739,8 @@
     },
     "archeofrag": {
       "name": "archeofrag",
-      "version": "0.8.2",
-      "sha256": "1xnfb4midmjlhq2x8mv6r0mrjbm529xnfm8y0q9wll73igg696yl",
+      "version": "1.0.0",
+      "sha256": "153w5744y9smgajwv0h76pgngry3i0wasxymwzfb6pgq175s0f4k",
       "depends": ["igraph"]
     },
     "archetypal": {
@@ -40215,8 +41769,8 @@
     },
     "archive": {
       "name": "archive",
-      "version": "1.1.8",
-      "sha256": "1ia4i59iadfvbndynk6pysnrs575s1b58gf1gpbxqra2sf0niskm",
+      "version": "1.1.10",
+      "sha256": "0040r873hydba7n55n561x2hjh4pwv55clkbnpc389dk073071si",
       "depends": ["cli", "glue", "rlang", "tibble"]
     },
     "archiveRetriever": {
@@ -40227,8 +41781,8 @@
     },
     "archivist": {
       "name": "archivist",
-      "version": "2.3.6",
-      "sha256": "0q1qysack30xzxdbvvi56rk7r85hsj4ghls9r70ki7bl3rqwr4c9",
+      "version": "2.3.8",
+      "sha256": "1qb8cim9acp4zz8rrl0drrzr2nj7msj6sghlzrll4jxgv2xi7nzi",
       "depends": ["DBI", "RCurl", "RSQLite", "digest", "flock", "httr", "lubridate", "magrittr"]
     },
     "archivist_github": {
@@ -40239,8 +41793,8 @@
     },
     "arcpbf": {
       "name": "arcpbf",
-      "version": "0.1.4",
-      "sha256": "1bbkcvi982xkjwjadfxc73rmip9hwlh3x0iyqms3pzfs1p32ansr",
+      "version": "0.1.6",
+      "sha256": "1csy9jwdgr5anhp7cd5dxwadvskv1ky3f1wkq8vyjww1kxjxhz1s",
       "depends": ["arcgisutils", "rlang"]
     },
     "arcpullr": {
@@ -40359,8 +41913,8 @@
     },
     "argparse": {
       "name": "argparse",
-      "version": "2.2.3",
-      "sha256": "0x16zp6jh9asyval1kwkxzavwjhx3a47xzlc593kw1hz4bhw8355",
+      "version": "2.2.5",
+      "sha256": "194y4ablll2cqnjsy5nga0pxqcnbxca1n9ww7pmq8404a7mskj2k",
       "depends": ["R6", "findpython", "jsonlite"]
     },
     "argparser": {
@@ -40389,8 +41943,8 @@
     },
     "arima2": {
       "name": "arima2",
-      "version": "3.1.0",
-      "sha256": "0sfg7h7rvvrsa2bjmipvm49cr26imnaf3h53czgkprw4knarx8z3",
+      "version": "3.3.0",
+      "sha256": "115igm3g8hd0ccs5si7siwr56hynjj84abrivg9ri4zld7vc8lws",
       "depends": ["ggplot2"]
     },
     "arkdb": {
@@ -40401,10 +41955,16 @@
     },
     "arkhe": {
       "name": "arkhe",
-      "version": "1.7.0",
-      "sha256": "1ray8scf2w9bgxkrkwi11iashphg4xbbgb7crbxcw7zf1pk03zi8",
+      "version": "1.9.0",
+      "sha256": "06b2w9q8af7akm1355ddwqcgpjl8rc1hwxdjvgbdh55mnnnsj2qa",
       "depends": []
     },
+    "arlclustering": {
+      "name": "arlclustering",
+      "version": "1.0.5",
+      "sha256": "0w36hkcdq0wv9yvkxd27jq4546j9x76i30vapa0vgps9k7lxn7p9",
+      "depends": ["arules", "igraph"]
+    },
     "arm": {
       "name": "arm",
       "version": "1.14-4",
@@ -40471,10 +42031,16 @@
       "sha256": "02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz",
       "depends": ["svUnit"]
     },
+    "arrg": {
+      "name": "arrg",
+      "version": "0.1.0",
+      "sha256": "11n0qd51ab8hmm6axzzpx3dg4n43g7fh72x8p3ixbj0k11id02ph",
+      "depends": ["ore"]
+    },
     "arrow": {
       "name": "arrow",
-      "version": "17.0.0",
-      "sha256": "10nagwqbz3f04r5yl2zqjwfc9ynyi2784gp10i5fflwagp0fcgkf",
+      "version": "18.1.0",
+      "sha256": "1l74n1fvr346360kiblss6yr0sm5rghbzjxc5ypph0i1pfjxyz3b",
       "depends": ["R6", "assertthat", "bit64", "cpp11", "glue", "purrr", "rlang", "tidyselect", "vctrs"]
     },
     "arrowheadr": {
@@ -40485,8 +42051,8 @@
     },
     "ars": {
       "name": "ars",
-      "version": "0.7",
-      "sha256": "03hgbyg667d0c22am5r45g6p6l5fii3x760khajjjcy8y0mqrq11",
+      "version": "0.8",
+      "sha256": "0d9p6ps074d9h20c096kmy1ny6pydfq3qw3srd6mhsw6si5rcq78",
       "depends": []
     },
     "arse": {
@@ -40521,8 +42087,8 @@
     },
     "arules": {
       "name": "arules",
-      "version": "1.7-7",
-      "sha256": "183isw4sy5gv5fxajiy4pm5p3nfd1pffa4h8sisl2nrw2rig9na2",
+      "version": "1.7-9",
+      "sha256": "0zwcqb8ximzdhxd85x0zbapm9yw8jrwgc849h86zb5zxq7ji758n",
       "depends": ["Matrix", "generics"]
     },
     "arulesCBA": {
@@ -40539,8 +42105,8 @@
     },
     "arulesSequences": {
       "name": "arulesSequences",
-      "version": "0.2-30",
-      "sha256": "1bnsgjjwrp1n5szhlyg3lhrhcz0sgdxsfdilbi5id9jbdkq9632a",
+      "version": "0.2-31",
+      "sha256": "03bs2l9zmjlcjmd18gm0ci2xq0b57wapp5hdiv7icdxqagb4j57n",
       "depends": ["arules"]
     },
     "arulesViz": {
@@ -40647,8 +42213,8 @@
     },
     "askpass": {
       "name": "askpass",
-      "version": "1.2.0",
-      "sha256": "1vrcb69gf5hc8rggc9m7wv19crz5mkl7f08cipy0ykckh6bkc8mr",
+      "version": "1.2.1",
+      "sha256": "1pf7q2p0caxnb22zvg6yj250b817drldk5d7rvr4i9s49jkhc8bc",
       "depends": ["sys"]
     },
     "aslib": {
@@ -40701,8 +42267,8 @@
     },
     "asremlPlus": {
       "name": "asremlPlus",
-      "version": "4.4.35",
-      "sha256": "016xxl928pdwpglmm3gg0rq4y04nlzbla46k7a6nmfsfygyz8gxv",
+      "version": "4.4.43",
+      "sha256": "0hvjcd877n5a0hiziyy0yhq4f4i2pkx3a70xgc9204ingmm95imz",
       "depends": ["RColorBrewer", "dae", "devtools", "doParallel", "dplyr", "foreach", "ggplot2", "nloptr", "qqplotr", "reshape2", "rlang", "sticky", "stringr", "tryCatchLog"]
     },
     "r_assert": {
@@ -40719,8 +42285,8 @@
     },
     "assertions": {
       "name": "assertions",
-      "version": "0.1.0",
-      "sha256": "18926pk2g0hc4dyzm1ghp69sgj7mdx8vzi1vykyxbk0046sg53wp",
+      "version": "0.2.0",
+      "sha256": "1kg6k45ff0s486l78vw3576jjy3h24kgd5i6palgvann82dqp0ls",
       "depends": ["cli", "glue", "rlang"]
     },
     "assertr": {
@@ -40749,8 +42315,8 @@
     },
     "assignR": {
       "name": "assignR",
-      "version": "2.4.1",
-      "sha256": "1ml8yk9a8rm05whcygaxha8lrrp0npr50fvsb3pcdikxing1khdm",
+      "version": "2.4.3",
+      "sha256": "1cafim3ihi7ifg6ff7q81g548qczjzxrc70zdwy6z03g1b06d5l8",
       "depends": ["geosphere", "mvnfast", "rlang", "terra"]
     },
     "assist": {
@@ -40791,8 +42357,8 @@
     },
     "aster2": {
       "name": "aster2",
-      "version": "0.3",
-      "sha256": "17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9",
+      "version": "0.3-2",
+      "sha256": "1dcmfirgy85ca9v542szjhxp5660kcp4lq07q7bdv1ghc3l2l7qs",
       "depends": ["Matrix"]
     },
     "astroFns": {
@@ -40803,8 +42369,8 @@
     },
     "astrochron": {
       "name": "astrochron",
-      "version": "1.3",
-      "sha256": "1vviz16yfqnqkvrb0sb7348a7xqvqi3cfdyxhlksm08g4rr3w8ar",
+      "version": "1.4",
+      "sha256": "1ba5sbg7z3jayphm6qp0v1ir4pr14jw1rfn3b4sz0vl8h2vpcmsi",
       "depends": ["IDPmisc", "doParallel", "fields", "foreach", "iterators", "multitaper", "palinsol", "viridisLite"]
     },
     "astrodatR": {
@@ -40875,8 +42441,8 @@
     },
     "atable": {
       "name": "atable",
-      "version": "0.1.14",
-      "sha256": "1dyg7zc19518dp3yxgyhcfklkmard9iwjkbnsl6sx5wkyk3s0vin",
+      "version": "0.1.15",
+      "sha256": "1x2j48wqycl9y4b8wnbhkfm2clhq5x8grw7ipjbhpxj3y3dlrh0b",
       "depends": ["DescTools", "Hmisc", "doBy", "effsize", "plyr", "reshape2", "settings"]
     },
     "atakrig": {
@@ -40887,8 +42453,8 @@
     },
     "atime": {
       "name": "atime",
-      "version": "2024.4.23",
-      "sha256": "0sh98yvzm4l2zzjsgw6g1hi0valn51lm5jm0c66swy83mgia66ny",
+      "version": "2024.11.29",
+      "sha256": "0aqwbzvdy1snyb78mhra1hdp8238wgi2vvzrv4vjrxjs57hrbvf0",
       "depends": ["bench", "data_table", "git2r", "lattice"]
     },
     "atlas": {
@@ -40897,6 +42463,12 @@
       "sha256": "02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd",
       "depends": ["httr", "testthat"]
     },
+    "atlasapprox": {
+      "name": "atlasapprox",
+      "version": "0.1.0",
+      "sha256": "060zqnx4b8zswg8nk5h6w1n9bry2pmcwpvgfimrs5dqqxazxkvfc",
+      "depends": ["httr"]
+    },
     "atmopt": {
       "name": "atmopt",
       "version": "0.1.0",
@@ -40917,8 +42489,8 @@
     },
     "atrrr": {
       "name": "atrrr",
-      "version": "0.0.3",
-      "sha256": "1y965xpipmd23c0a7rp14v8kw0n6bvxq20rq6ribl1rx5xjd2fhl",
+      "version": "0.0.4",
+      "sha256": "1zcifxzx15p4v2nlpz7jvrcnvnqgzc3mbjqk2xqlsyb5g316v52i",
       "depends": ["cli", "glue", "httr2", "purrr", "rlang", "snakecase", "stringr", "tibble"]
     },
     "attachment": {
@@ -41077,12 +42649,6 @@
       "sha256": "1k3h2gsck06dnvrifg9rhxi6b3fwfjrkvg0q2wzb9kdnnzgiwcln",
       "depends": ["FNN", "LatticeKrig", "MASS", "RSpectra", "Rcpp", "RcppEigen", "RcppParallel", "fields", "filehash", "filehashSQLite", "filematrix", "mgcv", "spam"]
     },
-    "autoGO": {
-      "name": "autoGO",
-      "version": "0.9.1",
-      "sha256": "19gy5gk214vqnil2wky2fpia1dlhcc4vwnws4fl2f0xq9as2nrq9",
-      "depends": ["ComplexHeatmap", "DESeq2", "GSVA", "RColorBrewer", "SummarizedExperiment", "ape", "dichromat", "dplyr", "enrichR", "ggplot2", "ggrepel", "imguR", "openxlsx", "purrr", "readr", "reshape2", "stringr", "textshape", "tidyr", "tidyselect"]
-    },
     "autoMFA": {
       "name": "autoMFA",
       "version": "1.0.0",
@@ -41125,6 +42691,12 @@
       "sha256": "0v27l9a0ysj7x9wjka1jl1bq9rmxmzldclcp1w59a6807wjlszhx",
       "depends": ["MASS", "broom", "checkmate", "diptest", "dplyr", "ggplot2", "hexbin", "mclust", "moments", "progress", "tibble"]
     },
+    "autogam": {
+      "name": "autogam",
+      "version": "0.0.1",
+      "sha256": "15wvyiya6hawkw1zz6q672rzwlgwzficja7q4fg1p1hsvj8dhp7j",
+      "depends": ["dplyr", "mgcv", "purrr", "stringr"]
+    },
     "autoharp": {
       "name": "autoharp",
       "version": "0.0.10",
@@ -41157,10 +42729,16 @@
     },
     "automap": {
       "name": "automap",
-      "version": "1.1-9",
-      "sha256": "0hrsdynjxv0n5n1pbdk05rgrcwfd0g5p9pgdbicx4ljk73nhl1zk",
+      "version": "1.1-12",
+      "sha256": "1lz60na443pf6k9ndzqyylllw2fz8b658j6m3ykfpia0k6fbpx55",
       "depends": ["ggplot2", "gstat", "lattice", "reshape", "sf", "sp", "stars"]
     },
+    "autometric": {
+      "name": "autometric",
+      "version": "0.1.2",
+      "sha256": "1dk2k78niqx9n8pq95cyx4qw00cmic47lyrg5ac0ghr25539jrld",
+      "depends": []
+    },
     "automl": {
       "name": "automl",
       "version": "1.3.2",
@@ -41169,9 +42747,9 @@
     },
     "autonewsmd": {
       "name": "autonewsmd",
-      "version": "0.0.8",
-      "sha256": "1wax4npyzkxjl1avgg6m275744nnpbv3qk8sbjg0dkqp58cb33lx",
-      "depends": ["R6", "data_table", "git2r", "magrittr", "quarto"]
+      "version": "0.0.9",
+      "sha256": "0pf6z420rdl7w1f8pp75qds4cnsyrc6py99h8xl39c7rcgg1lcn3",
+      "depends": ["R6", "data_table", "magrittr", "quarto"]
     },
     "autoplotly": {
       "name": "autoplotly",
@@ -41185,6 +42763,12 @@
       "sha256": "0hwrsc08lq6zyx869qmiyd0fc83wqfyzx65a3s2j2xnzf4wwzgbq",
       "depends": ["shiny"]
     },
+    "autoslider_core": {
+      "name": "autoslider.core",
+      "version": "0.2.1",
+      "sha256": "0ybiazk3r7zbyh0zlv9cvymwjlyk0sn3wbj1k1am4qbmf1rggag3",
+      "depends": ["assertthat", "checkmate", "cli", "dplyr", "flextable", "forcats", "ggplot2", "gridExtra", "officer", "rlang", "rlistings", "rtables", "stringr", "survival", "tern", "tidyr", "yaml"]
+    },
     "autostats": {
       "name": "autostats",
       "version": "0.4.1",
@@ -41205,14 +42789,14 @@
     },
     "autovi": {
       "name": "autovi",
-      "version": "0.4.0",
-      "sha256": "1f0pmcqjzb4w10693khakva84dn32k01a655c5r4xf1n86vvq2jv",
+      "version": "0.4.1",
+      "sha256": "1zhvbjs3i8i7bx7q5jxx0fxw3f15xqfraanfx8dd338sny25hqnn",
       "depends": ["bandicoot", "cassowaryr", "cli", "ggplot2", "reticulate", "tibble"]
     },
     "av": {
       "name": "av",
-      "version": "0.9.1",
-      "sha256": "0j2ajlkncdw181i2psmpahgmpxjkcg4ph2zp6iqb3nx5cyj441a3",
+      "version": "0.9.3",
+      "sha256": "13x64g0ha6xxdd2cdx7d8mqbhz0z29i9ang5zirqx104n75gjypw",
       "depends": []
     },
     "available": {
@@ -41235,8 +42819,8 @@
     },
     "avesperu": {
       "name": "avesperu",
-      "version": "0.0.2",
-      "sha256": "0s92sdxhgc8d5qwv3frig87j4fxnj28kaykrqiqvdgjwjd6yhgbh",
+      "version": "0.0.3",
+      "sha256": "14yfxmzmxsqqzf2yh56mqhgm1nfliclf3a48a2jj9l88zyjmg67p",
       "depends": []
     },
     "avidaR": {
@@ -41277,8 +42861,8 @@
     },
     "aws": {
       "name": "aws",
-      "version": "2.5-5",
-      "sha256": "0nsc7fakwcppav2h2kys0j28ga2p2si4kbygfka955dmbiwv4z5j",
+      "version": "2.5-6",
+      "sha256": "0b1rixkk4fn34hig39ayfiiidk4jdx035p2y1vhdn9dyj21cbcls",
       "depends": ["awsMethods", "gsl"]
     },
     "aws_alexa": {
@@ -41385,8 +42969,8 @@
     },
     "b64": {
       "name": "b64",
-      "version": "0.1.2",
-      "sha256": "0r4g2xikfczfhhv74jz8pp0q7rxzi789s3qqrfrq2rvi6pm9lnna",
+      "version": "0.1.3",
+      "sha256": "0alr0q2zfxni31rb3m1676kwhwwg91xaq9fsfhjgcycn7r06rjpl",
       "depends": []
     },
     "bRacatus": {
@@ -41415,8 +42999,8 @@
     },
     "bWGR": {
       "name": "bWGR",
-      "version": "2.2.9",
-      "sha256": "02g5dm23diihrgggk1azl8ds2hyrc950swl6rianbh52bbznr58g",
+      "version": "2.2.13",
+      "sha256": "0i2rkfzjsp98h70iww7ipnyvzpvmnlby62hc0zr9s7bs48ml3l0p",
       "depends": ["Matrix", "Rcpp", "RcppEigen"]
     },
     "baRcodeR": {
@@ -41425,6 +43009,12 @@
       "sha256": "199cdbwphpz6ds19841s32bm2rjd7b6v484bvaskw94z0d8bcn6w",
       "depends": ["DT", "miniUI", "qrcode", "rstudioapi", "shiny"]
     },
+    "baRulho": {
+      "name": "baRulho",
+      "version": "2.1.2",
+      "sha256": "0ymdz8dpkk8xw4baiz0xamwx526gmaf59w3nzbppckiqacjr6qvd",
+      "depends": ["Sim_DiffProc", "checkmate", "cli", "fftw", "ohun", "png", "rlang", "seewave", "tuneR", "viridis", "warbleR"]
+    },
     "babel": {
       "name": "babel",
       "version": "0.3-0",
@@ -41439,9 +43029,9 @@
     },
     "babelmixr2": {
       "name": "babelmixr2",
-      "version": "0.1.2",
-      "sha256": "0b6xa7hwx9h5n7z8xw4q7shwpzjf7kf9cfrsy68qvm8mhns0j9x1",
-      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "checkmate", "cli", "digest", "lotri", "nlmixr2", "nlmixr2est", "nonmem2rx", "qs", "rex", "rxode2", "rxode2parse"]
+      "version": "0.1.5",
+      "sha256": "0qa4hmlan67gqbgmggzkqmiw307yqfwsm968bsqh8yb2z006lmbb",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "checkmate", "cli", "digest", "lotri", "monolix2rx", "nlmixr2", "nlmixr2est", "nonmem2rx", "qs", "rex", "rxode2"]
     },
     "babelwhale": {
       "name": "babelwhale",
@@ -41503,6 +43093,18 @@
       "sha256": "1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad",
       "depends": ["lattice"]
     },
+    "backtestGraphics": {
+      "name": "backtestGraphics",
+      "version": "0.1.7",
+      "sha256": "0q6hpq1i6x2aryr154y1c3d4a0hfjvdbzg2vi2zf05iias6yk9zs",
+      "depends": ["dplyr", "dygraphs", "scales", "shiny", "xts"]
+    },
+    "baclava": {
+      "name": "baclava",
+      "version": "1.0",
+      "sha256": "1jpb59g23cmxc8c07fx9y810sx58gm6n1v6cgkmsf8m7592di1bb",
+      "depends": ["Rcpp", "RcppEigen", "RcppNumerical", "coda", "doParallel", "dplyr", "foreach", "ggplot2", "tibble", "tidyr"]
+    },
     "bacondecomp": {
       "name": "bacondecomp",
       "version": "0.1.1",
@@ -41517,8 +43119,8 @@
     },
     "badgen": {
       "name": "badgen",
-      "version": "1.0.0",
-      "sha256": "0gbafiah9bsxjq2av25003d752w5s9bh7syphl58rsr34l57qkja",
+      "version": "1.0.1",
+      "sha256": "140hmw036966hff9wjqykixxjvs5c0s2zq5yfwafl8il0k10s3y1",
       "depends": ["V8", "jsonlite"]
     },
     "badger": {
@@ -41539,6 +43141,12 @@
       "sha256": "17307jn92sr4gindd9fvaqvk990v40mr77zp2xs0079h85vh8954",
       "depends": []
     },
+    "bage": {
+      "name": "bage",
+      "version": "0.7.4",
+      "sha256": "1pld907impj1l4sbr8ndk9dsxcy6kzlb799pni2pqldriaax1xwc",
+      "depends": ["Matrix", "RcppEigen", "TMB", "cli", "generics", "matrixStats", "poputils", "rvec", "tibble", "vctrs"]
+    },
     "bagged_outliertrees": {
       "name": "bagged.outliertrees",
       "version": "1.0.0",
@@ -41625,14 +43233,14 @@
     },
     "bamdit": {
       "name": "bamdit",
-      "version": "3.4.1",
-      "sha256": "01530avwkhhvpdwr0kc50y67klqlzr6zxc2njfwy8imgy3yvg842",
+      "version": "3.4.3",
+      "sha256": "0qi31rd9wphnmx7snk6kwk8l7p7j7sirdgnh97zj98xb79hqj6gv",
       "depends": ["MASS", "R2jags", "ggExtra", "ggplot2", "gridExtra", "rjags"]
     },
     "bamlss": {
       "name": "bamlss",
-      "version": "1.2-4",
-      "sha256": "1prx8mw3n9a66s1fk616g12s0wwbxf3239256skys66csd9wzmh8",
+      "version": "1.2-5",
+      "sha256": "0p7gi5biydv73mmscizxd193fzx60cd8zwv0i5gsshspi9cwfmw6",
       "depends": ["Formula", "MBA", "Matrix", "coda", "colorspace", "distributions3", "mgcv", "mvtnorm", "sp", "survival"]
     },
     "bamm": {
@@ -41665,6 +43273,12 @@
       "sha256": "05ym5x178rgfvpvqgiv46ly6xnk44d0j74ykdxkzshil7aig1xfk",
       "depends": ["R6", "Rcpp", "RcppArmadillo"]
     },
+    "banditsCI": {
+      "name": "banditsCI",
+      "version": "1.0.0",
+      "sha256": "167myv0cd3bygypnvib0nbphcwr8sxwgj6h4fpvhkwyskdwyrnhn",
+      "depends": ["MASS", "Rdpack", "glmnet", "mvtnorm"]
+    },
     "bandsfdp": {
       "name": "bandsfdp",
       "version": "1.1.0",
@@ -41709,8 +43323,8 @@
     },
     "baorista": {
       "name": "baorista",
-      "version": "0.2.0",
-      "sha256": "044p2r5wmpm8l8q1z1g3a7x15bclcbgjb2a3qvl0438div8y5llz",
+      "version": "0.2.1",
+      "sha256": "06dgqzkl9a2v3izpwlgvc31lg2b4yh3pynhs4wgjzhrn58lf6rp1",
       "depends": ["coda", "nimble"]
     },
     "bapred": {
@@ -41733,14 +43347,20 @@
     },
     "bark": {
       "name": "bark",
-      "version": "1.0.4",
-      "sha256": "16bfws2ffcqn848vfa586z3gwjh5jfb2x887pwk05hpyd1ny9cm9",
+      "version": "1.0.5",
+      "sha256": "0kmxklp4l3yfyvh3g72zh5g1y04ahz1h7b1z3kx360yxv97098gx",
       "depends": []
     },
+    "barrks": {
+      "name": "barrks",
+      "version": "1.0.1",
+      "sha256": "1rj69p5s8w191haavjind42kr36jf4pcv3l43qsqwkndnn0f253w",
+      "depends": ["Rdpack", "dplyr", "lubridate", "purrr", "readr", "stringr", "terra"]
+    },
     "bartCause": {
       "name": "bartCause",
-      "version": "1.0-8",
-      "sha256": "05g6xmlryksbl4812krz3h8kkkz41i58l1q25wcklw4nvafpjc0v",
+      "version": "1.0-9",
+      "sha256": "1nvb3ljzh4l8bq1nixvphr0aww1zxi3bcv6jfa54qs4iq9mgqxsv",
       "depends": ["dbarts"]
     },
     "bartMachine": {
@@ -41781,8 +43401,8 @@
     },
     "base64": {
       "name": "base64",
-      "version": "2.0.1",
-      "sha256": "1w9m4n29xmj7px8fbmha04vq146bxfqi7ipj1ag09hlm05y6h8jd",
+      "version": "2.0.2",
+      "sha256": "030f8ynlga2qych88d45hk491cfi25hrjwl2gj4gsphljvi7ps5i",
       "depends": ["openssl"]
     },
     "base64enc": {
@@ -41829,8 +43449,8 @@
     },
     "basemaps": {
       "name": "basemaps",
-      "version": "0.0.7",
-      "sha256": "19cw01qs0wmrxcypr71ssbsj5266zgkxsxakig014x1wr592d3v6",
+      "version": "0.0.8",
+      "sha256": "1z8v8w95y6gic360cy8dg38c56l64yvnx5sa1ga5m47c37a1dvkz",
       "depends": ["curl", "httr", "magick", "pbapply", "sf", "slippymath", "stars", "terra"]
     },
     "basemodels": {
@@ -41869,6 +43489,12 @@
       "sha256": "130s8h54760lnjh0m2i7pjs9cx2sc6xxjkm3x93727azxzgxpk09",
       "depends": []
     },
+    "basicspace": {
+      "name": "basicspace",
+      "version": "0.25",
+      "sha256": "0scgiqqqydp8rp5gg77q7yfwr62aazyjxmfajh942j83pfclhjgx",
+      "depends": []
+    },
     "basictabler": {
       "name": "basictabler",
       "version": "1.0.2",
@@ -41911,6 +43537,12 @@
       "sha256": "0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq",
       "depends": []
     },
+    "batchLLM": {
+      "name": "batchLLM",
+      "version": "0.2.0",
+      "sha256": "0y7s0m2gdynqcnnf4yar8ga7y53km7a03izaf4ds254349dhkk0y",
+      "depends": ["DT", "digest", "dplyr", "gemini_R", "httr", "jsonlite", "openai", "readr", "readxl", "rlang", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "spsComps"]
+    },
     "batchmeans": {
       "name": "batchmeans",
       "version": "1.0-4",
@@ -42009,9 +43641,9 @@
     },
     "bayesCureRateModel": {
       "name": "bayesCureRateModel",
-      "version": "1.1",
-      "sha256": "0klmlrglkisf82q050vnf8hpgj2yfnrpag43lff8z1yiqa4hzngi",
-      "depends": ["HDInterval", "Rcpp", "RcppArmadillo", "VGAM", "calculus", "coda", "doParallel", "flexsurv", "foreach", "mclust"]
+      "version": "1.3",
+      "sha256": "0h3sq3yydzkr9f0j0n32w8x8an0ckl5q85yiz7c63c535wxhhdg0",
+      "depends": ["HDInterval", "Rcpp", "RcppArmadillo", "VGAM", "calculus", "coda", "doParallel", "flexsurv", "foreach", "mclust", "survival"]
     },
     "bayesDP": {
       "name": "bayesDP",
@@ -42031,12 +43663,6 @@
       "sha256": "0zs4qqf8881x01wblzmnw7m3zmh4ifrim3a8ws454r2lxf4y7mj5",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "purrr", "stars", "terra", "tibble", "tidyr", "tmap", "yaml"]
     },
-    "bayesGAM": {
-      "name": "bayesGAM",
-      "version": "0.0.2",
-      "sha256": "13zs68d26c66hkm8mfhcygk8rw6sdg4rf4a4az254lf2xvypbh5d",
-      "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "SemiPar", "StanHeaders", "bayesplot", "boot", "cluster", "corrplot", "geometry", "ggplot2", "gridExtra", "loo", "mlbench", "rstan", "rstantools"]
-    },
     "bayesGARCH": {
       "name": "bayesGARCH",
       "version": "2.1.10",
@@ -42051,8 +43677,8 @@
     },
     "bayesLife": {
       "name": "bayesLife",
-      "version": "5.2-0",
-      "sha256": "116wa3sqxkp8ywc0s83clg1pp81bf1rhddpvjbcw9pyim57h4kxm",
+      "version": "5.3-1",
+      "sha256": "0rfp9rhaym10li0m0jm8nlr39f8jmjlirkk772plyswjjcwmfpib",
       "depends": ["bayesTFR", "car", "coda", "data_table", "hett", "wpp2019"]
     },
     "bayesMRM": {
@@ -42063,15 +43689,15 @@
     },
     "bayesMeanScale": {
       "name": "bayesMeanScale",
-      "version": "0.1.4",
-      "sha256": "0zkfv6f50z83d8iih2f9p0dkla2bffcfjhfbmpicybicfi35f480",
+      "version": "0.2.0",
+      "sha256": "1q7majv5jx7lw6i4wn5cgvywa684qqh7hvfi1ikd7c20n59fb778",
       "depends": ["bayestestR", "data_table", "magrittr", "posterior"]
     },
     "bayesMig": {
       "name": "bayesMig",
-      "version": "0.4-6",
-      "sha256": "1b4pxg22fx898s529gigdfcdsmzlrpqhpnq96lghvsvmv5802z4n",
-      "depends": ["bayesTFR", "coda", "truncnorm", "wpp2019"]
+      "version": "1.0-0",
+      "sha256": "1byyrqgw6nbjyvcarm5zhpaz8xfrcchnqf5dvq0814a5rfbn59an",
+      "depends": ["bayesTFR", "coda", "data_table", "truncnorm", "wpp2019"]
     },
     "bayesPO": {
       "name": "bayesPO",
@@ -42099,20 +43725,20 @@
     },
     "bayesRecon": {
       "name": "bayesRecon",
-      "version": "0.3.0",
-      "sha256": "11gmav4cb89fmlpwg387sik3fllvscgn778c5smwnk5lp5sl430j",
+      "version": "0.3.2",
+      "sha256": "05x6x95dka571pidm4bs531qbnfrj59x81ji9h2n8iccfnqx38yl",
       "depends": ["lpSolve"]
     },
     "bayesSurv": {
       "name": "bayesSurv",
-      "version": "3.7",
-      "sha256": "1mqsnvqrivyl28d5fjh7alqsxr06wnhkjhhhrahmngmvgnmmnd1b",
+      "version": "3.8",
+      "sha256": "0yys80bps7567av16yw6ndj6vvx1kn8pnd7wa4xz521bjby4wsjz",
       "depends": ["coda", "smoothSurv", "survival"]
     },
     "bayesTFR": {
       "name": "bayesTFR",
-      "version": "7.4-2",
-      "sha256": "09fbyc4656dil6mqfzx7nlxxp0b95fmc73ibci60jbbzggafb51s",
+      "version": "7.4-4",
+      "sha256": "1ydizzc0pp3rwkkr6lbsxkcq1kihsqn8hsiamy2sxlghdzzdkk5b",
       "depends": ["MASS", "coda", "data_table", "lifecycle", "mvtnorm", "wpp2019"]
     },
     "bayesWatch": {
@@ -42129,9 +43755,9 @@
     },
     "bayesammi": {
       "name": "bayesammi",
-      "version": "0.1.0",
-      "sha256": "1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs",
-      "depends": ["MASS", "dplyr", "ggplot2", "lme4", "magrittr", "mvtnorm", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tmvtnorm"]
+      "version": "0.3.0",
+      "sha256": "040bczymj43rkqz66w9nqgakj43ww1mhiy5kwg2by63gxw3kjpcy",
+      "depends": ["MASS", "dplyr", "ggplot2", "ggrepel", "ks", "lme4", "magrittr", "mvtnorm", "purrr", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tmvtnorm"]
     },
     "bayesanova": {
       "name": "bayesanova",
@@ -42201,10 +43827,16 @@
     },
     "bayesianVARs": {
       "name": "bayesianVARs",
-      "version": "0.1.3",
-      "sha256": "04q140gpwk8wsybg4jcqdhxln6f4gbg5pca369rfi7yp3xffrbyp",
+      "version": "0.1.5",
+      "sha256": "0q4kvw1z529yi1vjb69qj4d69chgvq6c1dfrmhyvmpx0n6igrppj",
       "depends": ["GIGrvg", "MASS", "Rcpp", "RcppArmadillo", "RcppProgress", "colorspace", "factorstochvol", "mvtnorm", "scales", "stochvol"]
     },
+    "bayeslist": {
+      "name": "bayeslist",
+      "version": "0.0.1.4",
+      "sha256": "11b0dq1gc3qsv6qy5hdrf5jzbw5g8alqgp6nj5x1bramhnrc9mia",
+      "depends": ["BH", "Formula", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "rstan", "rstantools"]
+    },
     "bayeslm": {
       "name": "bayeslm",
       "version": "1.0.1",
@@ -42249,8 +43881,8 @@
     },
     "bayesnec": {
       "name": "bayesnec",
-      "version": "2.1.2.0",
-      "sha256": "1ja4yl3fqs5cg3n8gn7r7a2shdxkwcshbmy7cyn3l97zsrdw4a3m",
+      "version": "2.1.3.0",
+      "sha256": "0pac8s3zqg6z2x3jf4j2kkvra6mpc5aa723b4mp2pygs9x6sjn41",
       "depends": ["brms", "chk", "dplyr", "evaluate", "formula_tools", "ggplot2", "loo", "purrr", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "bayesplay": {
@@ -42273,9 +43905,9 @@
     },
     "bayesreg": {
       "name": "bayesreg",
-      "version": "1.2",
-      "sha256": "0yrx7y39xxmm0z4myj6ma24dkkhgcily5baxr6yf9balgvhd5wf4",
-      "depends": ["pgdraw"]
+      "version": "1.3",
+      "sha256": "0xx49lqmrxcygbl4znjdlamjqfc6raskm5k54lfp9l8lfd5rmq91",
+      "depends": ["doParallel", "foreach", "pgdraw"]
     },
     "bayesrules": {
       "name": "bayesrules",
@@ -42297,8 +43929,8 @@
     },
     "bayestestR": {
       "name": "bayestestR",
-      "version": "0.14.0",
-      "sha256": "10280l86a2wrlqjj8zh55pznvgjzpdzv6h3krxgg0ka19ch983zs",
+      "version": "0.15.0",
+      "sha256": "1x3r6vf414lar6z4hshf9lpindiynz2d4kb0bwr1phz5db3x77l3",
       "depends": ["datawizard", "insight"]
     },
     "bayesvl": {
@@ -42327,9 +43959,9 @@
     },
     "baystability": {
       "name": "baystability",
-      "version": "0.1.0",
-      "sha256": "1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp",
-      "depends": ["MASS", "dplyr", "ggfortify", "ggplot2", "lme4", "magrittr", "matrixStats", "reshape2", "rlang", "rstiefel", "scales", "tibble", "tidyr", "tidyverse"]
+      "version": "0.2.0",
+      "sha256": "11ac74mb9dasf4m3qqd0j89bbjq2zk2jynljs86c2mlqack3jivj",
+      "depends": ["MASS", "dplyr", "ggplot2", "lme4", "rlang", "rstiefel", "scales", "tibble", "tidyr"]
     },
     "baytrends": {
       "name": "baytrends",
@@ -42351,9 +43983,9 @@
     },
     "bbk": {
       "name": "bbk",
-      "version": "0.4.0",
-      "sha256": "1dnr024app4xp7qj777vzia72jjc8ak128dcd27879cqfzixail5",
-      "depends": ["httr2", "xml2"]
+      "version": "0.5.0",
+      "sha256": "12hx3l5yypmgj2drgq9g1c5k5xlyv4ivqpvkvl4c6ff1jqbs1lqs",
+      "depends": ["curl", "httr2", "xml2"]
     },
     "bbknnR": {
       "name": "bbknnR",
@@ -42387,8 +44019,8 @@
     },
     "bbotk": {
       "name": "bbotk",
-      "version": "1.0.1",
-      "sha256": "13kvqazlp3inxqzdm67q7hgjss8wib1hi3fbyx1zlm653zfc0sii",
+      "version": "1.5.0",
+      "sha256": "1mm8bvnlinwbrxrmjw16nmqkgxcixcwa7i4lh3s49g5i82yk7xmb",
       "depends": ["R6", "checkmate", "data_table", "lgr", "mlr3misc", "paradox"]
     },
     "bbreg": {
@@ -42435,8 +44067,8 @@
     },
     "bcdata": {
       "name": "bcdata",
-      "version": "0.4.1",
-      "sha256": "05izx4bpk60icwnsy4698cm4dyxmmffss59dca8zrrh4i4pql72f",
+      "version": "0.5.0",
+      "sha256": "00910sriqvy66km3b43gqy1rngsaq1fywn502r6kh22xpd5jfhyj",
       "depends": ["DBI", "cli", "crul", "dbplyr", "dplyr", "glue", "jsonlite", "leaflet", "leaflet_extras", "purrr", "readr", "readxl", "rlang", "sf", "tibble", "tidyselect", "xml2"]
     },
     "bcf": {
@@ -42465,8 +44097,8 @@
     },
     "bcmaps": {
       "name": "bcmaps",
-      "version": "2.2.0",
-      "sha256": "0cpghf8acq7dpmiaw314n1h2aa310513f3qwnl8p74pyr940gwvn",
+      "version": "2.2.1",
+      "sha256": "07pczf0hkw3pq9jl6rdk2nghad2irf6njhn20915xws0d0p2c5c8",
       "depends": ["bcdata", "httr", "jsonlite", "lifecycle", "progress", "rappdirs", "sf", "xml2"]
     },
     "bcmixed": {
@@ -42495,8 +44127,8 @@
     },
     "bcrypt": {
       "name": "bcrypt",
-      "version": "1.1",
-      "sha256": "1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4",
+      "version": "1.2.0",
+      "sha256": "0n1zkhjq4q16smp672617w6bb506f74ifljaddn50djk0s1cb8ca",
       "depends": ["openssl"]
     },
     "bcv": {
@@ -42513,15 +44145,15 @@
     },
     "bda": {
       "name": "bda",
-      "version": "18.2.2",
-      "sha256": "04n5lvcl5i0aziqgs6smvkr6gk8ky8gl3wf1crpzihxa3s6fb601",
+      "version": "18.3.2",
+      "sha256": "0kdm46rq939pqk0hv9x0fk9nkv45d8k2bakyhm0p4l9jcjb0vwfa",
       "depends": ["boot"]
     },
     "bdc": {
       "name": "bdc",
-      "version": "1.1.4",
-      "sha256": "1z79bsg0jz5ffl47sjgxj2bigyhbn76m0kz9sqbzkph7srcc6vpr",
-      "depends": ["CoordinateCleaner", "DT", "dplyr", "foreach", "fs", "ggplot2", "here", "magrittr", "purrr", "qs", "readr", "rgnparser", "rnaturalearth", "sf", "stringdist", "stringi", "stringr", "taxadb", "tibble", "tidyselect"]
+      "version": "1.1.5",
+      "sha256": "1v88dz54sqb878rb2c0fg97qd01hgzf7lgwsmwsrkmak361kcsdi",
+      "depends": ["CoordinateCleaner", "DT", "doParallel", "dplyr", "foreach", "fs", "ggplot2", "here", "magrittr", "purrr", "qs", "readr", "rgnparser", "rnaturalearth", "sf", "stringdist", "stringi", "stringr", "taxadb", "tibble", "tidyselect"]
     },
     "bde": {
       "name": "bde",
@@ -42595,12 +44227,6 @@
       "sha256": "02fhhwlnq31yzf0m3qyk14w1f9d4xn0ygnjcwx7m28z34l18547m",
       "depends": ["irlba"]
     },
-    "bdvis": {
-      "name": "bdvis",
-      "version": "0.2.37",
-      "sha256": "0mhvc1lbnkbawx3yj9h8h4l6bwawg1dfgyjvllhknyldxy8a7bjk",
-      "depends": ["chron", "ggplot2", "lattice", "maps", "plotrix", "plyr", "sf", "sqldf", "taxize", "treemap"]
-    },
     "bea_R": {
       "name": "bea.R",
       "version": "1.0.6",
@@ -42651,8 +44277,8 @@
     },
     "beastier": {
       "name": "beastier",
-      "version": "2.5.1",
-      "sha256": "1crdi1pmz7gf75089czvvfi31i67i6z0zak9vdppc9bwyrcj1j7f",
+      "version": "2.5.2",
+      "sha256": "1gn1yjy6d0wkvablwa4yz5qvjgrmx5lwn8kzmkbkzhd9xj1299q1",
       "depends": ["ape", "beautier", "phangorn", "rJava", "rappdirs", "readr", "rlang", "sessioninfo", "stringr", "tibble", "xml2"]
     },
     "beastt": {
@@ -42681,8 +44307,8 @@
     },
     "beeca": {
       "name": "beeca",
-      "version": "0.1.3",
-      "sha256": "1q20chw6l690fjpyaagl8h12dzna2kjyfq3l676s3w65sba7gyh0",
+      "version": "0.2.0",
+      "sha256": "0alqfi8srm3vnljgpj4510zr0da1qb8aabl0x2nqwvg17pplhyrs",
       "depends": ["dplyr", "lifecycle", "sandwich"]
     },
     "beepr": {
@@ -42741,8 +44367,8 @@
     },
     "bellreg": {
       "name": "bellreg",
-      "version": "0.0.2.1",
-      "sha256": "0576yipaj3a7j159nvp5hmlarvrkxm8pa990iasymg5s4vjfi3n7",
+      "version": "0.0.2.2",
+      "sha256": "1p162lw3hcwza59a7b99sy6yn9injvclm674ligxfxwa63x8f8qi",
       "depends": ["BH", "Formula", "LambertW", "MASS", "Rcpp", "RcppEigen", "Rdpack", "StanHeaders", "dplyr", "extraDistr", "loo", "magic", "numbers", "purrr", "rstan", "rstantools"]
     },
     "bench": {
@@ -42891,8 +44517,8 @@
     },
     "betaclust": {
       "name": "betaclust",
-      "version": "1.0.3",
-      "sha256": "1w76c7yxgnc98p6lwh5mxrrgv1kk5dgjgp12g0vs25l4fb7advqp",
+      "version": "1.0.4",
+      "sha256": "1kw8ri4244z7ckn4gizz0zbqzwx7dypv6qb974lmj6dzzyjp6922",
       "depends": ["doParallel", "foreach", "ggplot2", "pROC", "plotly", "scales"]
     },
     "betafunctions": {
@@ -42915,10 +44541,16 @@
     },
     "betareg": {
       "name": "betareg",
-      "version": "3.2-0",
-      "sha256": "1r5k0y6lyrygbwzjf5y882rdwf1dr17cppj1vy8fiyysn6zrxd0h",
+      "version": "3.2-1",
+      "sha256": "1izp7nirsziwx8803ckbgwyj4r1vf4ixgx5nlin7d5pkjy13c9mv",
       "depends": ["Formula", "flexmix", "lmtest", "modeltools", "sandwich"]
     },
+    "betaselectr": {
+      "name": "betaselectr",
+      "version": "0.1.0",
+      "sha256": "1v8920wi74fjjklai7cc1dsm2xmb98r2phf997wlxclk2ga1qy1s",
+      "depends": ["boot", "lavaan", "lavaan_printer", "manymome", "numDeriv", "pbapply"]
+    },
     "betategarch": {
       "name": "betategarch",
       "version": "3.3",
@@ -42939,14 +44571,14 @@
     },
     "bexy": {
       "name": "bexy",
-      "version": "0.1.2",
-      "sha256": "053k7b9ilvsawh6ajh2v794snsw6b5qf9s7bqfl555w5ia6cl6ri",
+      "version": "0.1.3",
+      "sha256": "0dznrvdklfrf14p9z1pmmixac086xf0a0w8zii08lqmb3blq66lk",
       "depends": ["TeachingDemos", "Ternary"]
     },
     "beyondWhittle": {
       "name": "beyondWhittle",
-      "version": "1.2.1",
-      "sha256": "0lh496w6hsdcdkn51zlnm5vw0wx1a6d60h24zqzmsl1zr4y6667z",
+      "version": "1.3.0",
+      "sha256": "0vhd6vhxcx0chc71cnp9iwxp2x3sh7w0pxzjhxa6hdmxq2f1gpp7",
       "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "forecast", "ltsa"]
     },
     "bezier": {
@@ -42957,16 +44589,28 @@
     },
     "bfast": {
       "name": "bfast",
-      "version": "1.6.1",
-      "sha256": "1vjklk7d9b0q7j348aqvspm7rn80bh06hz66r2z1qs9436ppkx5a",
+      "version": "1.7.0",
+      "sha256": "1i6rhzxj6c8hfg9pfzcnwc98lm3jj4fx8ybldjg0gxl1p1h9yy9n",
       "depends": ["Rcpp", "Rdpack", "forecast", "strucchangeRcpp", "zoo"]
     },
+    "bfboinet": {
+      "name": "bfboinet",
+      "version": "0.1.0",
+      "sha256": "03s4b0x7lfka09rm5a5fr9aiahk846znc6ag73s8gygmls58mvx5",
+      "depends": ["Iso", "copula", "dplyr", "magrittr", "tidyselect"]
+    },
     "bfp": {
       "name": "bfp",
       "version": "0.0-48",
       "sha256": "0m3ika7sfksv4xhbxcysh0yyfvj7bip9g1m8n2icb2zjwfafccvn",
       "depends": ["Rcpp"]
     },
+    "bfpwr": {
+      "name": "bfpwr",
+      "version": "0.1.3",
+      "sha256": "1vh70vqf0g4q2n4kkkq10g2917qry4bykrzvwcr5pwh3p34g87vp",
+      "depends": ["lamW"]
+    },
     "bfsMaps": {
       "name": "bfsMaps",
       "version": "1.99.3",
@@ -42997,12 +44641,6 @@
       "sha256": "0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c",
       "depends": ["magic", "mgcv", "trust"]
     },
-    "bggAnalytics": {
-      "name": "bggAnalytics",
-      "version": "0.2.1",
-      "sha256": "0c761f04vr63zsavj3vzxxab30zn4p5zpi5gyfkqplm96brpkg3m",
-      "depends": ["R6", "checkmate", "data_table", "pryr", "stringr", "xml2"]
-    },
     "bggum": {
       "name": "bggum",
       "version": "1.0.2",
@@ -43023,8 +44661,8 @@
     },
     "bgms": {
       "name": "bgms",
-      "version": "0.1.3.1",
-      "sha256": "0ylvr1sbn2mq2cc7lkgf8qfw08qyg2xvcwa29964qwdjl76dl05g",
+      "version": "0.1.4.2",
+      "sha256": "0jcapsfq55ca3bkm6gbp3c3g0vq1cs74plq9b0vgnq4vw0i2h0cw",
       "depends": ["Rcpp", "RcppProgress", "Rdpack"]
     },
     "bgsmtr": {
@@ -43057,12 +44695,6 @@
       "sha256": "1mcgbvlnrmxlxqcjmc7ij7qn3zqfwsmbx2r2facbqrf043hmiipc",
       "depends": ["R2jags", "doRNG", "foreach"]
     },
-    "bhpm": {
-      "name": "bhpm",
-      "version": "1.7",
-      "sha256": "0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp",
-      "depends": ["coda"]
-    },
     "biClassify": {
       "name": "biClassify",
       "version": "1.3",
@@ -43161,14 +44793,14 @@
     },
     "bigD": {
       "name": "bigD",
-      "version": "0.2.0",
-      "sha256": "0pzzqqazn1nv2b613vzdyhxvr454lyqq8235jydia6r3k86fpadw",
+      "version": "0.3.0",
+      "sha256": "1807m3ma7h7k7m7c8g7qrjf77limvy6q4mkfkn4nrv1rgsnq7kbq",
       "depends": []
     },
     "bigDM": {
       "name": "bigDM",
-      "version": "0.5.4",
-      "sha256": "0m1q8b4d20iqamypmalh66gkp0rba8ir2m48k5y9j05wfmshkqc4",
+      "version": "0.5.5",
+      "sha256": "183px40ah4043q2yc2811hlwx8vinqk5xxhz1wmgw4m8cig62xgw",
       "depends": ["MASS", "Matrix", "RColorBrewer", "Rdpack", "crayon", "doParallel", "fastDummies", "foreach", "future", "future_apply", "geos", "rlist", "sf", "spatialreg", "spdep"]
     },
     "bigGP": {
@@ -43203,8 +44835,8 @@
     },
     "bigalgebra": {
       "name": "bigalgebra",
-      "version": "1.1.1",
-      "sha256": "07xzgddnqxn8l41p79qqsvvg4rj03qdqlr3jhfpnra6c82wlhspw",
+      "version": "1.1.2",
+      "sha256": "0zk0n3lxqrhxzwdm47yhvv8n0m30bp9b7bvany3gg7a6vrz43yqn",
       "depends": ["BH", "Rcpp", "bigmemory"]
     },
     "biganalytics": {
@@ -43233,8 +44865,8 @@
     },
     "bigergm": {
       "name": "bigergm",
-      "version": "1.2.1",
-      "sha256": "0x8y7aijidpka117zjc80yvjlxv8cdiwxhqzy0mw33halavm10k8",
+      "version": "1.2.3",
+      "sha256": "1cwp7vqcspfg8xgjfrk8517xwnfpn1hphz16bfprjmwrr3xg5b2x",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "cachem", "dplyr", "ergm", "ergm_multi", "foreach", "glue", "igraph", "intergraph", "magrittr", "memoise", "network", "purrr", "readr", "reticulate", "rlang", "statnet_common", "stringr", "tidyr"]
     },
     "biglasso": {
@@ -43255,6 +44887,12 @@
       "sha256": "0n0dkazq74s3lml0ds9l38kzgapckjrvwyi62qb1y14cqlylhpc0",
       "depends": ["DBI"]
     },
+    "biglmm": {
+      "name": "biglmm",
+      "version": "0.9-3",
+      "sha256": "1fbrp6gmk0cxd7021pwarq20sjv1jrv6ri67hz0wjragh7zak272",
+      "depends": ["DBI"]
+    },
     "bigmatch": {
       "name": "bigmatch",
       "version": "0.6.4",
@@ -43305,9 +44943,9 @@
     },
     "bigrquerystorage": {
       "name": "bigrquerystorage",
-      "version": "1.1.0",
-      "sha256": "1idhaf6i7sbrdmzzc0ks76yr47lpl63lcjprsnjzwkyc124nx606",
-      "depends": ["DBI", "Rcpp", "arrow", "assertthat", "bigrquery", "bit64", "lifecycle", "rlang", "tibble"]
+      "version": "1.2.1",
+      "sha256": "1x48msnh3lhi5x74n1v7icd3vzxwqw9yaq8llcr0a79mj6abiwar",
+      "depends": ["Rcpp", "assertthat", "bit64", "lifecycle", "nanoarrow", "rlang", "tibble"]
     },
     "bigsimr": {
       "name": "bigsimr",
@@ -43317,14 +44955,14 @@
     },
     "bigsnpr": {
       "name": "bigsnpr",
-      "version": "1.12.2",
-      "sha256": "1xl7456xnid6pvvcppm4297vmgln7f4n15ziz0yfp5i5mqlmafj4",
+      "version": "1.12.18",
+      "sha256": "0jlf1x7k6pjzdhm765jds3f19c3s00ya6vznxlykds89rfb24b29",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "bigassertr", "bigparallelr", "bigreadr", "bigsparser", "bigstatsr", "bigutilsr", "data_table", "doRNG", "foreach", "ggplot2", "magrittr", "rmio", "roptim", "runonce", "vctrs"]
     },
     "bigsparser": {
       "name": "bigsparser",
-      "version": "0.7.1",
-      "sha256": "0ppmv09n5ypm8jhsd580flk4k6p255k7az9k96fzjwjfrn0vmm74",
+      "version": "0.7.3",
+      "sha256": "0v28k0jh7nw3ms5sh2izd28b4p5b9qf4rrnps0pfwpq0xmigr4ch",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "bigassertr", "rmio"]
     },
     "bigsplines": {
@@ -43335,8 +44973,8 @@
     },
     "bigstatsr": {
       "name": "bigstatsr",
-      "version": "1.5.12",
-      "sha256": "1wj169j91yjlb12dzy80q7rvi102l7fhlzfvc93rxifq2w3px9x8",
+      "version": "1.6.1",
+      "sha256": "1c445mm11gsvs2sqmrblig1d3456vwb1n3rz08mhkpxghjaf4dci",
       "depends": ["RSpectra", "Rcpp", "RcppArmadillo", "bigassertr", "bigparallelr", "cowplot", "foreach", "ggplot2", "ps", "rmio", "tibble"]
     },
     "bigstep": {
@@ -43395,14 +45033,14 @@
     },
     "billboarder": {
       "name": "billboarder",
-      "version": "0.4.1",
-      "sha256": "0byj1ilwnmq9n9gswsnj17r8pzhm4fp6567nbz1xfmlvl3402qkn",
+      "version": "0.5.0",
+      "sha256": "07piczkr5chsxrpkmqx533nxjaw0sgrqzd7xs2779jk8184vr36a",
       "depends": ["ggplot2", "htmltools", "htmlwidgets", "jsonlite", "magrittr", "rlang", "scales", "shiny"]
     },
     "bimets": {
       "name": "bimets",
-      "version": "4.0.2",
-      "sha256": "155radkxpjqkpdyg52qck8yiffp29nk1bplalwqkvy50lz97wrai",
+      "version": "4.0.3",
+      "sha256": "172nwa96k94j68f477nh1bf33dajma3140fjfbj09zw6p6hl06ay",
       "depends": ["xts", "zoo"]
     },
     "binGroup": {
@@ -43461,8 +45099,8 @@
     },
     "bindr": {
       "name": "bindr",
-      "version": "0.1.1",
-      "sha256": "1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w",
+      "version": "0.1.2",
+      "sha256": "16161y28wg40pwlvmildcgcwn5wx6hiyk8r79sd0r31w31h6q7sj",
       "depends": []
     },
     "bindrcpp": {
@@ -43521,8 +45159,8 @@
     },
     "binomCI": {
       "name": "binomCI",
-      "version": "1.1",
-      "sha256": "078qghb8svz7jfnmdc5j2npg2lvb00j4lal3ghszysarmw21nia1",
+      "version": "1.2",
+      "sha256": "0x4ga6935z85ki23lwna1am42mxvck1w0al5b1wpngyf86364lgk",
       "depends": []
     },
     "binomialRF": {
@@ -43599,8 +45237,8 @@
     },
     "bio3d": {
       "name": "bio3d",
-      "version": "2.4-4",
-      "sha256": "1scxzmh22ca0nmpkvapsdcmq3n06j2wy74ljz1g27r1k1p0ylm2n",
+      "version": "2.4-5",
+      "sha256": "0k6ji9n0pbkbvrinx3x2av39gmkp9ik2bgf9nqx11nv49nkff9rx",
       "depends": ["Rcpp"]
     },
     "bioC_logs": {
@@ -43609,12 +45247,6 @@
       "sha256": "092hdrfkdij3s8871z4c1lb0rf5pp07ggliaz76iyfxrbvy9hcxj",
       "depends": []
     },
-    "bioPN": {
-      "name": "bioPN",
-      "version": "1.2.0",
-      "sha256": "0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8",
-      "depends": []
-    },
     "bioRad": {
       "name": "bioRad",
       "version": "0.8.1",
@@ -43659,8 +45291,8 @@
     },
     "biogas": {
       "name": "biogas",
-      "version": "1.23.2",
-      "sha256": "05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19",
+      "version": "1.61",
+      "sha256": "18c3dn7a4gq6rlwq3wv28infrf11w7dzsb74map6n2cdvs9lf757",
       "depends": []
     },
     "biogeom": {
@@ -43677,8 +45309,8 @@
     },
     "biogrowth": {
       "name": "biogrowth",
-      "version": "1.0.4",
-      "sha256": "19czyp7n4ip01psl8hbiihfhj52vdp6nsq0h7cnl7p9h0ax9wcj5",
+      "version": "1.0.5",
+      "sha256": "0cybc5qcpk1mka4ilkhy0iyjx9xy618byz9qfkb5mw4l30pmnky0",
       "depends": ["FME", "MASS", "cowplot", "deSolve", "dplyr", "formula_tools", "ggplot2", "lamW", "lifecycle", "purrr", "rlang", "tibble", "tidyr"]
     },
     "bioimagetools": {
@@ -43731,14 +45363,14 @@
     },
     "biopixR": {
       "name": "biopixR",
-      "version": "1.1.0",
-      "sha256": "0avdpg73s9hqkyfgrfmprhcc5hpxf4in6s3221n5gf3pcii8jw0c",
+      "version": "1.2.0",
+      "sha256": "0npbdbyxm2p2iv0lhgy7bxgpx8mqiw38b5z4gklkk1qvccmz7js7",
       "depends": ["cluster", "data_table", "imager", "magick"]
     },
     "bioregion": {
       "name": "bioregion",
-      "version": "1.1.1",
-      "sha256": "03qjyaw1kiqn9q4wc49rzy6vp83pf5567y07ih4rgp1r3pamnif0",
+      "version": "1.1.1-1",
+      "sha256": "17i7cbaf0pzjja71z5c3gr8s9hjkj74z6xcdk3h3wpm4wi3lm9z2",
       "depends": ["Matrix", "Rcpp", "Rdpack", "ape", "bipartite", "cluster", "data_table", "dbscan", "dynamicTreeCut", "fastcluster", "fastkmedoids", "ggplot2", "igraph", "mathjaxr", "rlang", "rmarkdown", "segmented", "sf", "tidyr"]
     },
     "bios2mds": {
@@ -43779,9 +45411,15 @@
     },
     "biostat3": {
       "name": "biostat3",
-      "version": "0.1.9",
-      "sha256": "1pq8w7xh4l1f6z9k9k022a3szhkhsyhrkzdmqqfjhwx2cymcxalp",
-      "depends": ["MASS", "muhaz", "survival"]
+      "version": "0.2.2",
+      "sha256": "0gggiqnbflqx4h89wk17k556ifn26mz07czfpy5zq2pr2y6qfqjd",
+      "depends": ["MASS", "survival"]
+    },
+    "biostats101": {
+      "name": "biostats101",
+      "version": "0.1.1",
+      "sha256": "035qk9n4drdhv7g37gq26z5idfxkg8h8b3shagjcsxyar5s5hcfh",
+      "depends": ["dplyr", "ggplot2", "tidyr"]
     },
     "biotic": {
       "name": "biotic",
@@ -43803,9 +45441,9 @@
     },
     "bipartiteD3": {
       "name": "bipartiteD3",
-      "version": "0.3.1",
-      "sha256": "0w2bnlaga8nxdidrhgz34hqbxb5882jbz31a7g4n283gbz5w1b9g",
-      "depends": ["RColorBrewer", "downloader", "dplyr", "purrr", "r2d3", "stringr", "tibble", "tidyr"]
+      "version": "0.3.2",
+      "sha256": "0njqj4rz054vjp9chm14i20rl9hssvbf3hmrp1w1a4rnjabcijmd",
+      "depends": ["RColorBrewer", "dplyr", "purrr", "r2d3", "stringr", "tibble", "tidyr"]
     },
     "bipd": {
       "name": "bipd",
@@ -43821,8 +45459,8 @@
     },
     "biplotEZ": {
       "name": "biplotEZ",
-      "version": "2.0",
-      "sha256": "0wdsxipgfjdfa09zilqzzhpa36wg48z4alf3p7a8vgg9458igblb",
+      "version": "2.2",
+      "sha256": "0cpp0b898qlzpkf50ggd8g5lz7hswibvc9kqqgavncw6n5rqzkpk",
       "depends": ["plotrix", "withr"]
     },
     "biplotbootGUI": {
@@ -43881,8 +45519,8 @@
     },
     "bispdep": {
       "name": "bispdep",
-      "version": "1.0-0",
-      "sha256": "18rbzfp5ql0qhglmibzvdj1lbq48cvkzz4rpjgam43xkknhyivra",
+      "version": "1.0-1",
+      "sha256": "1bcqj50snjzvggii3kd69wc0kqfldb6fc3w8nxwb1v828hml6b83",
       "depends": ["RColorBrewer", "boot", "combinat", "ggplot2", "sf", "sp", "spData", "spatialreg", "spdep"]
     },
     "bisque": {
@@ -43899,22 +45537,16 @@
     },
     "bit": {
       "name": "bit",
-      "version": "4.0.5",
-      "sha256": "1g5zakrzkhrqh3d7p1zka6zzzw11rdlbrvxsh05s7dkli1m57wph",
+      "version": "4.5.0.1",
+      "sha256": "0wl8s9z54wb2l56sgdyz7rrjzydmjv3cy8q3fmbsinh435l2yhd0",
       "depends": []
     },
     "bit64": {
       "name": "bit64",
-      "version": "4.0.5",
-      "sha256": "0y0m7q1rwam1g88cjx7zyi07mj5dipxd9jkl90f294syx8k6ipr5",
+      "version": "4.5.2",
+      "sha256": "0bn7d9dlmr7arbj2090hhkxs9kc0wni5aw39a6nh0243v0zmc8d3",
       "depends": ["bit"]
     },
-    "bite": {
-      "name": "bite",
-      "version": "0.3",
-      "sha256": "00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps",
-      "depends": ["MASS", "ape", "coda", "phytools", "sm", "vioplot", "xml2"]
-    },
     "bitmexr": {
       "name": "bitmexr",
       "version": "0.3.3",
@@ -43923,8 +45555,8 @@
     },
     "bitops": {
       "name": "bitops",
-      "version": "1.0-8",
-      "sha256": "0f1744pi3qb1av41man6xp2xalwcjslz3qbk35gccpb4d6glp8bq",
+      "version": "1.0-9",
+      "sha256": "020dfk0pmiz739rnpb9yi8hnsih3z3891dljvs7kpfvjgfvsbwyg",
       "depends": []
     },
     "bittermelon": {
@@ -43933,11 +45565,17 @@
       "sha256": "0nd0jn28rfkqzvji54i4b53qjzl4xjbwnhsw55vyb3209hk84q1w",
       "depends": ["Unicode", "cli", "png"]
     },
+    "bivariateLeaflet": {
+      "name": "bivariateLeaflet",
+      "version": "0.1.0",
+      "sha256": "0q9bjwwkfmbalq4afh9s1x006nzgc02a122c2drmjkyimsi78d9v",
+      "depends": ["dplyr", "htmltools", "leaflet", "rlang", "sf"]
+    },
     "bivariatemaps": {
       "name": "bivariatemaps",
-      "version": "1.3",
-      "sha256": "0fqp5r86j6c6221lm9g2glw0k2fivsnqijc5a566vhxk3vbw0hk4",
-      "depends": ["classInt", "terra"]
+      "version": "1.7",
+      "sha256": "0glhpdn1v1sgm83gyga63b9yx5a1gflg7rqj9awm0nwr2c11ak63",
+      "depends": ["CommEcol", "ape", "betapart", "caper", "classInt", "picante", "terra"]
     },
     "bivgeom": {
       "name": "bivgeom",
@@ -44001,9 +45639,9 @@
     },
     "blackmarbler": {
       "name": "blackmarbler",
-      "version": "0.2.0",
-      "sha256": "09h2vjbqnb3kfmnmsah9p00w1sff15csaw382lmzy2klxw8k5zgn",
-      "depends": ["dplyr", "exactextractr", "hdf5r", "httr", "lubridate", "purrr", "readr", "sf", "stringr", "terra", "tidyr"]
+      "version": "0.2.3",
+      "sha256": "05wg5n7zbg7cpj44f3f7j889gbrcp155cza3csc4x43bflfbqgml",
+      "depends": ["dplyr", "exactextractr", "hdf5r", "httr", "httr2", "lubridate", "purrr", "readr", "sf", "stringr", "terra", "tidyr"]
     },
     "blaise": {
       "name": "blaise",
@@ -44043,8 +45681,8 @@
     },
     "blavaan": {
       "name": "blavaan",
-      "version": "0.5-5",
-      "sha256": "0v8b6dax5wk3y3hnih0yfsg7cvdwqv9pxs2hd54yi8hmkmgbrlx8",
+      "version": "0.5-6",
+      "sha256": "0lbvsga6ba4n05xnzahmj2dw3jjpjhkg93p9kadb656wxffkq7qy",
       "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "coda", "future_apply", "lavaan", "loo", "mnormt", "nonnest2", "rstan", "rstantools", "tmvnsim"]
     },
     "blender": {
@@ -44085,8 +45723,8 @@
     },
     "blme": {
       "name": "blme",
-      "version": "1.0-5",
-      "sha256": "0413j7gwr5yj14jamkizj55q7xii1a0kgazzj0ilqn2ascclz6k7",
+      "version": "1.0-6",
+      "sha256": "0ghpbhs3bqxv9s759i3klfzrvigaxp34sscsy2m0n3d08j09f206",
       "depends": ["lme4"]
     },
     "blmeco": {
@@ -44103,8 +45741,8 @@
     },
     "blockCV": {
       "name": "blockCV",
-      "version": "3.1-4",
-      "sha256": "00fhsiqwf6d7i48b59rgg0iw3bslg19aglzpic80gp8dgdrsrvmf",
+      "version": "3.1-5",
+      "sha256": "1ngjr7z7ivm12dijywvca776bpgagszn2aipl7d3kfzs9z3x12hg",
       "depends": ["Rcpp", "sf"]
     },
     "blockForest": {
@@ -44113,12 +45751,6 @@
       "sha256": "1i5vqs0hh3yc82hl8bsa647plcv0c4c95b1wzdzyslxz2m5khw0l",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "survival"]
     },
-    "blockTools": {
-      "name": "blockTools",
-      "version": "0.6.4",
-      "sha256": "0372ca7mgzz6j0gp2yn2mjpj0kq01jg3pyhd33s65srap2n0wg0d",
-      "depends": ["MASS", "dplyr", "tibble"]
-    },
     "blockcluster": {
       "name": "blockcluster",
       "version": "4.5.5",
@@ -44175,9 +45807,9 @@
     },
     "blorr": {
       "name": "blorr",
-      "version": "0.3.0",
-      "sha256": "1ynvg6ar7c7p01225q9czy4gxks0p1vw3sx207l7vzqxw20wb1bn",
-      "depends": ["Rcpp", "car", "data_table", "ggplot2", "gridExtra", "lest"]
+      "version": "0.3.1",
+      "sha256": "098z71gyrf7b76g36p87mipmwakgwm4s56f97vfqi13llr3gqir5",
+      "depends": ["Rcpp", "car", "data_table", "ggplot2", "gridExtra"]
     },
     "blrm": {
       "name": "blrm",
@@ -44293,6 +45925,12 @@
       "sha256": "0myv2mj5kp97dzvbf4sw63fzjxzpv2d82vxwiqxaqd1pllcgrzz1",
       "depends": ["BH", "CARBayes", "CARBayesST", "MCMCpack", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "ggplot2", "ggpubr", "inlabru", "mnormt", "rstan", "rstantools", "spBayes", "spTDyn", "spTimer"]
     },
+    "bnRep": {
+      "name": "bnRep",
+      "version": "0.0.2",
+      "sha256": "09ri3ms49w6qxck78cj5qw48jqd8vs544yw46fmz4vhq9ng08m7w",
+      "depends": ["DT", "Rgraphviz", "bnlearn", "dplyr", "qgraph", "shiny", "shinyjs", "shinythemes"]
+    },
     "bnclassify": {
       "name": "bnclassify",
       "version": "0.4.8",
@@ -44313,8 +45951,8 @@
     },
     "bnlearn": {
       "name": "bnlearn",
-      "version": "5.0",
-      "sha256": "18br08n7dbykdhx8adwvizm9m3r1pin76qqy7v1p42cq44qj11p7",
+      "version": "5.0.1",
+      "sha256": "17pr1b3dg576fsrzgvhdh0c4vfi3cl4ngkak8njddd6v4favsli4",
       "depends": []
     },
     "bnma": {
@@ -44325,8 +45963,8 @@
     },
     "bnmonitor": {
       "name": "bnmonitor",
-      "version": "0.2.0",
-      "sha256": "0ygsk817x5m474kk1vfnzkr23gj3cbsj69jxbsbvzwwimmhz0094",
+      "version": "0.2.2",
+      "sha256": "081j10b6akgya5f1hpfg2ccnlc26igf6crmhv96asachs1c5662d",
       "depends": ["RColorBrewer", "bnlearn", "dplyr", "gRain", "gRbase", "ggplot2", "igraph", "purrr", "qgraph", "reshape2", "rlang", "tidyr"]
     },
     "bnnSurvival": {
@@ -44403,27 +46041,21 @@
     },
     "boinet": {
       "name": "boinet",
-      "version": "1.0.0",
-      "sha256": "1i023h1kzf5xk92dp9iyllw2b1lprs0xz2hp23lqq9vx36cpird3",
+      "version": "1.1.0",
+      "sha256": "0jk1igg45zpds8qadzwaifmcj3b61ghn2rqx4x8b4pv3mi2sk2cn",
       "depends": ["Iso", "copula", "mfp"]
     },
     "boiwsa": {
       "name": "boiwsa",
-      "version": "1.1.1",
-      "sha256": "1xyxx6xf9az62zxczybl6iizswq7h4i55v4apll8kh0xh6nqlzr7",
-      "depends": ["Hmisc", "dplyr", "ggplot2", "lubridate", "rlang", "tidyr"]
+      "version": "1.1.2",
+      "sha256": "1ys3s4f2ydf5m1ab7y9yf1lvbjlarffn5cjcycq0yfis45gs8xqj",
+      "depends": ["Hmisc", "dplyr", "ggplot2", "gridExtra", "lubridate", "rlang", "tidyr"]
     },
     "bolasso": {
       "name": "bolasso",
-      "version": "0.2.0",
-      "sha256": "1fbd39jyxq0zfbybrzzwnyql2w8hf2b9133jj0nl99d1326wr7dh",
-      "depends": ["Matrix", "Rdpack", "future_apply", "gamlr", "ggplot2", "glmnet", "progressr", "tibble"]
-    },
-    "bold": {
-      "name": "bold",
-      "version": "1.3.0",
-      "sha256": "0pwglcykyl5dnhqs8jg4hzih286v17w5dafkg3ahqk3c73a13b8f",
-      "depends": ["crul", "data_table", "jsonlite", "stringi", "xml2"]
+      "version": "0.3.0",
+      "sha256": "1b31wnpappjhnrfnl5awzcbyxamam0c1sm72shmzscdlfa116ys2",
+      "depends": ["Matrix", "future_apply", "gamlr", "generics", "ggplot2", "glmnet", "progressr", "tibble"]
     },
     "bolsec": {
       "name": "bolsec",
@@ -44451,8 +46083,8 @@
     },
     "bonsaiforest": {
       "name": "bonsaiforest",
-      "version": "0.1.0",
-      "sha256": "1k8k2vnn3cxl1nlkls5w1yvvr1qk28j8gak7m2p85gr6nlxfy4p4",
+      "version": "0.1.1",
+      "sha256": "1h16bwwl14ikyx489n8bx63qnp7k982lxm1xlrdr8jnaq6kc7fgp",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "brms", "broom", "checkmate", "dplyr", "forcats", "gbm", "ggplot2", "glmnet", "splines2", "survival", "tibble", "tidyr", "tidyselect", "vdiffr"]
     },
     "boodist": {
@@ -44463,8 +46095,8 @@
     },
     "bookdown": {
       "name": "bookdown",
-      "version": "0.40",
-      "sha256": "0fdciqazvsmc34hqfiqlmldigxn8gw546kkz74mc9dh48w24mpsq",
+      "version": "0.41",
+      "sha256": "1xwknvsml2bpkyzpapsqlargc1zqphc9q0g7ac0b9d685kvhmd3d",
       "depends": ["htmltools", "jquerylib", "knitr", "rmarkdown", "tinytex", "xfun", "yaml"]
     },
     "boomer": {
@@ -44493,8 +46125,8 @@
     },
     "boot": {
       "name": "boot",
-      "version": "1.3-30",
-      "sha256": "15zysf5manfsap7x0zvjzgdvs9whv137iasjydp1php6sqmxc2am",
+      "version": "1.3-31",
+      "sha256": "1ln8079g7l6yxdh7bmcn2acjlln0hvrhhjbp5r0wl0xms662wm6q",
       "depends": []
     },
     "boot_heterogeneity": {
@@ -44523,8 +46155,8 @@
     },
     "bootES": {
       "name": "bootES",
-      "version": "1.3.0",
-      "sha256": "05brahlh7jk9n1wv4l429vf048x51v1ivvchlxfcqvky06zjwk1z",
+      "version": "1.3.1",
+      "sha256": "1qc01drxrmzclb2cwby475pmymwg86iq8zm3jq3fzxzi6kyfwf61",
       "depends": ["boot"]
     },
     "bootGOF": {
@@ -44547,8 +46179,8 @@
     },
     "bootPLS": {
       "name": "bootPLS",
-      "version": "0.9.9",
-      "sha256": "1i0bzykwjimyswb0z23sqbhm98b9lxifnkby682khva7yfk7k8qr",
+      "version": "1.0.1",
+      "sha256": "1sk7327fwqhy9arxn2shlxhflg4i99864wqs782jh325z18nqxwb",
       "depends": ["bipartite", "boot", "doParallel", "foreach", "mvtnorm", "pls", "plsRglm", "spls"]
     },
     "bootSVD": {
@@ -44571,9 +46203,9 @@
     },
     "bootcluster": {
       "name": "bootcluster",
-      "version": "0.3.2",
-      "sha256": "0wkc9li0hqgns7pz72fby187q81yzrgl62qs8w5llayghf8lhaml",
-      "depends": ["GGally", "cluster", "doParallel", "dplyr", "flexclust", "foreach", "fpc", "ggplot2", "gridExtra", "igraph", "intergraph", "mclust", "network", "plyr", "sna"]
+      "version": "0.4.1",
+      "sha256": "0f1zw39c4dr0j6clxg4iay0vd3jb9k2nm6rjkvx32pnvmhbdkhvn",
+      "depends": ["GGally", "cluster", "doParallel", "dplyr", "flexclust", "foreach", "fpc", "ggplot2", "gridExtra", "igraph", "intergraph", "kernlab", "mclust", "network", "plyr", "sna"]
     },
     "bootf2": {
       "name": "bootf2",
@@ -44673,14 +46305,20 @@
     },
     "box_linters": {
       "name": "box.linters",
-      "version": "0.10.0",
-      "sha256": "0m31r5bs49bw9660hsxsmnk131hf6vrzqxank39hvlnid70z9l18",
-      "depends": ["cli", "fs", "glue", "lintr", "purrr", "rlang", "stringr", "treesitter", "treesitter_r", "withr", "xfun", "xml2", "xmlparsedata"]
+      "version": "0.10.5",
+      "sha256": "1j6zjs5cpafyk1f74p059mggr9kp7c92fv4msyycs0lwji01ar88",
+      "depends": ["cli", "fs", "glue", "lintr", "purrr", "rlang", "stringr", "withr", "xfun", "xml2", "xmlparsedata"]
+    },
+    "box_lsp": {
+      "name": "box.lsp",
+      "version": "0.1.3",
+      "sha256": "0rayi6fsnk2cjzvx7i3bmih9d5x93ssm0kg3r6w1dqk0djj0xrsj",
+      "depends": ["box", "cli", "fs", "rlang"]
     },
     "boxcoxmix": {
       "name": "boxcoxmix",
-      "version": "0.42",
-      "sha256": "0z4iagli47i5jd9fi849wglwj2mbrn60wikb6n041k9yrfhgccma",
+      "version": "0.46",
+      "sha256": "0lalj4sd9ydk2k5r5jww60bm68fbwhin0p81wzraq025pil5cddm",
       "depends": ["npmlreg", "qicharts", "statmod"]
     },
     "boxfilter": {
@@ -44761,6 +46399,12 @@
       "sha256": "0wrdh4c8yws7z5zd1yl23wbja88x57x651kqbnqj70k9a1195rwc",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "fabMix", "gtools", "label_switching", "mclust", "mcmcse", "mvtnorm", "pgmm"]
     },
+    "bplsr": {
+      "name": "bplsr",
+      "version": "1.0.1",
+      "sha256": "06ybazc211ij5z81kjczfz6clxcimh4pndp36hp64d5rrz00i5rq",
+      "depends": ["coda", "progress", "statmod"]
+    },
     "bpmnR": {
       "name": "bpmnR",
       "version": "0.1.1",
@@ -44793,21 +46437,21 @@
     },
     "bqror": {
       "name": "bqror",
-      "version": "1.7.0",
-      "sha256": "1pisp3p3w5r9bfv5m5yykk410z5qvwsqdblmv7vsj1sc1nwf5y2v",
+      "version": "1.7.1",
+      "sha256": "1ac9wgg7h64z2qmrgc8lr82hzrhgl40rg6r9r7c3sdql750vdnpy",
       "depends": ["GIGrvg", "MASS", "NPflow", "invgamma", "pracma", "progress", "truncnorm"]
     },
     "bqtl": {
       "name": "bqtl",
-      "version": "1.0-36",
-      "sha256": "18fwg52j6dv1v1pcc4997j2f5vlfmcvqqdg0618fq9zaq8j4cz6h",
+      "version": "1.0-38",
+      "sha256": "1859z3wpb9w1lyx6gl01mgp3xwjd2df0xadbc0c4g00y14z5g8vr",
       "depends": []
     },
     "braQCA": {
       "name": "braQCA",
-      "version": "1.2.1.29",
-      "sha256": "0w1mg8lzl64mp5clinq3zai733iz3628zp4pw6vr51z24s56jg6i",
-      "depends": ["QCA", "bootstrap", "dplyr"]
+      "version": "1.4.11.27",
+      "sha256": "1237xajdqr6xpvq210drzakcfw390pa7h7mgv92bwbggyirida1r",
+      "depends": ["QCA", "bootstrap"]
     },
     "bracer": {
       "name": "bracer",
@@ -44829,15 +46473,15 @@
     },
     "braidReports": {
       "name": "braidReports",
-      "version": "0.5.4",
-      "sha256": "1455pswcbz3zscvk6rgvgrjcp154l5lfx5m7s24m91rpjmc2y7pk",
-      "depends": ["braidrm", "ggplot2"]
+      "version": "1.0.1",
+      "sha256": "1w6bxvpkh8wslnzickwlxk6sw793x142cinn6sn6836ldlhgzlg9",
+      "depends": ["basicdrm", "braidrm", "cowplot", "ggplot2", "gtable", "scales"]
     },
     "braidrm": {
       "name": "braidrm",
-      "version": "0.71",
-      "sha256": "1cn0rdlw775pmzbjmhny7gkm901a3qgz7infqb5s9az606xg54d3",
-      "depends": []
+      "version": "1.0.3",
+      "sha256": "16wj2bnjpr93vsiyngn4agyiizslzpglld5kr3xxhmn8n2dfmc3k",
+      "depends": ["basicdrm"]
     },
     "braids": {
       "name": "braids",
@@ -44889,8 +46533,8 @@
     },
     "bravo": {
       "name": "bravo",
-      "version": "3.2.1",
-      "sha256": "0q7qm5jsj92sras5z5xr4hkz73l202xl8f0izhg2hiv3kam0z8rf",
+      "version": "3.2.2",
+      "sha256": "16k4rsmc0nl3vvylwr55mb5vlib8x5dlkjg99b7dr99l9a0fxqps",
       "depends": ["Matrix", "Rcpp"]
     },
     "brclimr": {
@@ -44925,8 +46569,8 @@
     },
     "breakfast": {
       "name": "breakfast",
-      "version": "2.4",
-      "sha256": "0sxila1l2pk1z8lmskqppd8qm7wg08vvyyqxfyxcffvwhzqaf3rj",
+      "version": "2.5",
+      "sha256": "027q949qqyxlj58a4qpn6a2qcaqzawgzmck8ab1dnfgpyi0vkrpm",
       "depends": ["Rcpp", "ggplot2", "plyr"]
     },
     "breakpoint": {
@@ -44937,14 +46581,14 @@
     },
     "breathtestcore": {
       "name": "breathtestcore",
-      "version": "0.8.7",
-      "sha256": "0i5mih2v6397g0glgdhn5lrz3j0l6yv3pmlvs9pkg2vbjppif2sc",
+      "version": "0.8.8",
+      "sha256": "110xsdfd1c2l5vj2h3wnymljwjsj8h8llf3g8sm5b7kf8m4cj58r",
       "depends": ["MASS", "assertthat", "broom", "dplyr", "ggfittext", "ggplot2", "multcomp", "nlme", "purrr", "readr", "readxl", "signal", "stringr", "tibble", "tidyr", "xml2"]
     },
     "breathteststan": {
       "name": "breathteststan",
-      "version": "0.8.5",
-      "sha256": "1b495qb0r8wdh4rnv3namnhrd1d6mba55ayj7h9s0076h8aw04hk",
+      "version": "0.8.8",
+      "sha256": "0mwknbwxfdry48cyv7j0hzxi7lxwd0k6zbz5rl2l3bglbv219502",
       "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "breathtestcore", "dplyr", "purrr", "rstan", "rstantools", "stringr", "tidyr"]
     },
     "brew": {
@@ -44977,10 +46621,16 @@
       "sha256": "0jfjqrc2d75zhygfxpschn2mqgjc35wwgczqrh9d3f58amkg5m61",
       "depends": ["dplyr", "httr", "jsonlite", "piggyback"]
     },
+    "brickster": {
+      "name": "brickster",
+      "version": "0.2.5",
+      "sha256": "0xglzh73vyfwfvd4k2dwrp06ynxxxfak6aqk4gsv2y3jy4qrz451",
+      "depends": ["R6", "arrow", "base64enc", "cli", "curl", "dplyr", "glue", "httr2", "ini", "jsonlite", "purrr", "reticulate", "rlang", "tibble"]
+    },
     "bridgedist": {
       "name": "bridgedist",
-      "version": "0.1.2",
-      "sha256": "1bsvwh2c1i9z37d363gk5nzrbg9bcjfkarr0a2l8xrv4r1zwj43j",
+      "version": "0.1.3",
+      "sha256": "06y4c4ym27dh39ysr5sf4ymad0bk7wxyf8kmj1y560p7h97f5d32",
       "depends": []
     },
     "bridger": {
@@ -45001,6 +46651,12 @@
       "sha256": "0sry1xwiv4y52k44hq6z8y2kysp5kxgl4dix3m94svg3ladd7v2l",
       "depends": ["Brobdingnag", "Matrix", "coda", "mvtnorm", "scales", "stringr"]
     },
+    "bridgr": {
+      "name": "bridgr",
+      "version": "0.1.1",
+      "sha256": "1z5wcz1c44p8j8ynfq2im2j3f2r1fgf3v4cn0180r0q2xx9xp0hj",
+      "depends": ["dplyr", "forecast", "generics", "lubridate", "magrittr", "rlang", "tsbox"]
+    },
     "brif": {
       "name": "brif",
       "version": "1.4.1",
@@ -45045,14 +46701,14 @@
     },
     "brms": {
       "name": "brms",
-      "version": "2.21.0",
-      "sha256": "0n2xxiibypfazcbx8rx4h5c4pl9zlmm0mkpyny23bf54q8rzz2bj",
+      "version": "2.22.0",
+      "sha256": "1gl1pdna356mfrf9816rqx8q7a3h3xzkn75bjd2zylgqw49ss88p",
       "depends": ["Matrix", "Rcpp", "abind", "backports", "bayesplot", "bridgesampling", "coda", "future", "future_apply", "ggplot2", "glue", "loo", "matrixStats", "mgcv", "nleqslv", "nlme", "posterior", "rlang", "rstan", "rstantools"]
     },
     "brms_mmrm": {
       "name": "brms.mmrm",
-      "version": "1.1.0",
-      "sha256": "1v64wx6nylzrfzby8p7l3s1dn6naqnjw7vamlwm12xvq303xgap1",
+      "version": "1.1.1",
+      "sha256": "0y0bhdkpfs5xx9a5dcs00a69bzwiarf90ap34j07ym0f19fsnj0n",
       "depends": ["MASS", "brms", "dplyr", "ggplot2", "ggridges", "posterior", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "trialr", "zoo"]
     },
     "brmsmargins": {
@@ -45087,33 +46743,33 @@
     },
     "broom": {
       "name": "broom",
-      "version": "1.0.6",
-      "sha256": "1kxwkyhm4m586v2kp15r4q2zsarnkrkzmgl17n6y7ggzilj3dkr4",
+      "version": "1.0.7",
+      "sha256": "089cl8j7ammwmxc49hv2khfv3vzs6j7m5klsczws74cvlr28py6x",
       "depends": ["backports", "dplyr", "generics", "glue", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "broom_helpers": {
       "name": "broom.helpers",
-      "version": "1.15.0",
-      "sha256": "0gm9k2d73p6bhcmzc43qgy6v27pi036369dldz77hd5h5i95hp7c",
-      "depends": ["broom", "cli", "dplyr", "labelled", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "1.17.0",
+      "sha256": "0k97smqgxggdkbgfs2yvvgqw225q9106124kaw499m6cjcldxqyi",
+      "depends": ["broom", "cards", "cli", "dplyr", "labelled", "lifecycle", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "broom_mixed": {
       "name": "broom.mixed",
-      "version": "0.2.9.5",
-      "sha256": "1css1g9r1345dwww9v56m7d9r74i4d27si7fsc4d8nhk4v6sd7wm",
+      "version": "0.2.9.6",
+      "sha256": "134qwdwhm0ih55n26hbyqb1hxj8d5k5jpc6gagpn9ny2vryzsszh",
       "depends": ["broom", "coda", "dplyr", "forcats", "furrr", "nlme", "purrr", "stringr", "tibble", "tidyr"]
     },
     "brotli": {
       "name": "brotli",
-      "version": "1.3.0",
-      "sha256": "0zivyhyf6g7lb8r919a1cc2xvi36g6cszpl9rr200nfvvw6r6zf1",
+      "version": "1.3.1",
+      "sha256": "0ihrf472ynjiby4k032cnj7383wvd5fi6rm19snjxmzxx7yc6xl7",
       "depends": []
     },
     "brpop": {
       "name": "brpop",
-      "version": "0.3.0",
-      "sha256": "0wbs0r775g185q0zrlyskj5zrdkf6dbivi7lrychj9dpidl9i61i",
-      "depends": ["dplyr", "future", "magrittr", "multidplyr", "rlang"]
+      "version": "0.5.0",
+      "sha256": "0zklcvzygps99xz9qk4k2jqnk4p5pxhrkf7pjh98b6d12mq84hcw",
+      "depends": ["checkmate", "data_table", "dplyr", "dtplyr", "magrittr", "rlang", "tibble", "zendown"]
     },
     "brsim": {
       "name": "brsim",
@@ -45133,6 +46789,12 @@
       "sha256": "1lzn06q1i575n9b7axqxfp0ngycx2mdmh0cqw6zz80z3ikbi7hq9",
       "depends": ["cli", "coro", "dplyr", "generics", "ggplot2", "glue", "hardhat", "rlang", "tibble", "torch"]
     },
+    "bruneimap": {
+      "name": "bruneimap",
+      "version": "0.3.1",
+      "sha256": "0phxn05i35d2kkgg0aixa3xvn2hcxx5ksixvnj55yn30zrbiwg7n",
+      "depends": ["dplyr", "lifecycle", "sf"]
+    },
     "brunnermunzel": {
       "name": "brunnermunzel",
       "version": "2.0",
@@ -45147,8 +46809,8 @@
     },
     "bs4Dash": {
       "name": "bs4Dash",
-      "version": "2.3.3",
-      "sha256": "1vhjrgy3344fgbqxadj16sncrgkkcy1xrg69nmjizn9s757gyvri",
+      "version": "2.3.4",
+      "sha256": "1swh87gx6qzkxqa9wf2x7f20pnpq94gm4dgvkhh3kwwz1gv9c2g2",
       "depends": ["bslib", "fresh", "htmltools", "httpuv", "httr", "jsonlite", "lifecycle", "shiny", "waiter"]
     },
     "bs4cards": {
@@ -45231,8 +46893,8 @@
     },
     "bspcov": {
       "name": "bspcov",
-      "version": "1.0.0",
-      "sha256": "1zxdcqydhzisfp2bkvw585z3qfcpy0yjra91qyxwdf0lvdvqwbqx",
+      "version": "1.0.1",
+      "sha256": "15dgkn1m3wrdci98qrrx0hr8c2lbn7p124gjp45mgwkjn9rgi2qb",
       "depends": ["BayesFactor", "CholWishart", "FinCovRegularization", "GIGrvg", "MASS", "Matrix", "RSpectra", "caret", "coda", "dplyr", "furrr", "future", "ggmcmc", "ggplot2", "ks", "magrittr", "matrixStats", "matrixcalc", "mvnfast", "mvtnorm", "plyr", "progress", "purrr"]
     },
     "bspec": {
@@ -45321,8 +46983,8 @@
     },
     "bsvars": {
       "name": "bsvars",
-      "version": "3.1",
-      "sha256": "138810300y0lfmzbch5syp3sd2cfcvqvgnnvvy4xlbys9p6aif5a",
+      "version": "3.2",
+      "sha256": "06ap666qjqj14x5378442j3k3llq58v4dfyy3kl9v0f6ja9z0d54",
       "depends": ["GIGrvg", "R6", "Rcpp", "RcppArmadillo", "RcppProgress", "RcppTN", "stochvol"]
     },
     "bsynth": {
@@ -45409,6 +47071,12 @@
       "sha256": "0mh6skgkayjsqww4q6rpzhj0n5l3lb9wwh29gy9y08cqd91i02rs",
       "depends": []
     },
+    "bullseye": {
+      "name": "bullseye",
+      "version": "0.1.0",
+      "sha256": "03lzd4xw9yh3kgp53w3cpli6n0m8z1ww5744pii35vyw9456bdik",
+      "depends": ["DendSer", "cli", "dplyr", "ggiraph", "ggplot2", "labeling", "polycor", "rlang", "tidyr"]
+    },
     "bullwhipgame": {
       "name": "bullwhipgame",
       "version": "0.1.0",
@@ -45453,8 +47121,8 @@
     },
     "bundle": {
       "name": "bundle",
-      "version": "0.1.1",
-      "sha256": "1b3l14khp6fblb47sy9p5wh78izsbj1xjjj2r55hp2hcx2f1isjz",
+      "version": "0.1.2",
+      "sha256": "1q8wyzbgxhn0bsc5h2mr53kfk45019x6naxq591glrkv2m02m7ll",
       "depends": ["glue", "purrr", "rlang", "withr"]
     },
     "bupaR": {
@@ -45471,8 +47139,8 @@
     },
     "burgle": {
       "name": "burgle",
-      "version": "0.1.1",
-      "sha256": "05i5n3a9l087wcyvgdf638961i19d939zfv3d58h3cxhxsnyn4c4",
+      "version": "0.1.2",
+      "sha256": "0166pqcyhzlk8xv58hql5szanyh47blpwnawxmwxwqysfrm0w7xj",
       "depends": ["MASS", "riskRegression", "survival"]
     },
     "burnr": {
@@ -45531,8 +47199,8 @@
     },
     "bvhar": {
       "name": "bvhar",
-      "version": "2.0.1",
-      "sha256": "1qbws3xa93ladgwfqdyk3qzmijhdam3lhdzwpbb5q5397mqkyfbp",
+      "version": "2.1.2",
+      "sha256": "171ngw5a8zbq2vaxs3ipr76jnan4614fxr8ka28fhlx6qh6fy703",
       "depends": ["BH", "Rcpp", "RcppEigen", "bayesplot", "dplyr", "foreach", "ggplot2", "lifecycle", "magrittr", "optimParallel", "posterior", "purrr", "tibble", "tidyr"]
     },
     "bvls": {
@@ -45597,8 +47265,8 @@
     },
     "c212": {
       "name": "c212",
-      "version": "0.98",
-      "sha256": "0pzg239602iq56nhxfdvlk26z58lz6vvlbwsdpwhmich0by4gx4x",
+      "version": "1.0.1",
+      "sha256": "0inkjnfbcak34c96wwa65sh8h1bhy27p9vj6v62af25xjrzz59ch",
       "depends": ["coda"]
     },
     "c2c": {
@@ -45639,8 +47307,8 @@
     },
     "cNORM": {
       "name": "cNORM",
-      "version": "3.2.0",
-      "sha256": "038192srvmfasa9vg5d79imh9nr3pllf2lcn5q5gwgas38c4mmli",
+      "version": "3.4.0",
+      "sha256": "0pkaf00a4z19xbnkcxpgciakbzcshdbsgjf76irvgdd5lpwh4j6r",
       "depends": ["ggplot2", "leaps"]
     },
     "cOde": {
@@ -45667,6 +47335,12 @@
       "sha256": "0a0pv01ynlac53rdwjhw20alx72ip23izvcxv8bdkdxa41ai3bi5",
       "depends": ["MASS", "Matrix", "Rdpack", "TruncatedNormal", "alabama", "cli", "crayon", "expm", "future", "future_apply", "lavaan", "lifecycle", "magrittr", "matrixStats", "matrixcalc", "polycor", "progressr", "psych", "purrr", "rlang", "symmoments"]
     },
+    "cTMed": {
+      "name": "cTMed",
+      "version": "1.0.3",
+      "sha256": "1hsicqizv88p4x5hpwd62q5fz2lavvradfcvcajbl10frchrdbz0",
+      "depends": ["Rcpp", "RcppArmadillo", "numDeriv", "simStateSpace"]
+    },
     "cTOST": {
       "name": "cTOST",
       "version": "1.0.0",
@@ -45699,8 +47373,8 @@
     },
     "caTools": {
       "name": "caTools",
-      "version": "1.18.2",
-      "sha256": "14q2ry8gaszjl0m97qg62dxv5bpj6k02qwyi7q2lnxgcmwai3mkm",
+      "version": "1.18.3",
+      "sha256": "1n380hnddj29nrzsqf462a1h3xy55qk4q45i5287ffd2lx13j6z7",
       "depends": ["bitops"]
     },
     "cabinets": {
@@ -45723,8 +47397,8 @@
     },
     "cacc": {
       "name": "cacc",
-      "version": "0.1.0",
-      "sha256": "0dl2n5shjagr7zjsl6cyw3jxz29h9dbjfwrhphqdaymjv6yaxxj9",
+      "version": "0.1.1",
+      "sha256": "0lyczm8zdd80np7xljvvgakscbivxvpdr0vp71f40l04nx3aijxg",
       "depends": ["dplyr", "ggplot2", "rlang", "tibble", "tidyr"]
     },
     "cache": {
@@ -45777,15 +47451,15 @@
     },
     "calendRio": {
       "name": "calendRio",
-      "version": "0.2.0",
-      "sha256": "152fb5yaazb2hh99ag1aq675gc5f8xw990w55nkhxqhg6w5p0ln9",
+      "version": "0.2.1",
+      "sha256": "0y1psmsfllj3x00z7ci84cz0wr29vlj693z510iy6cr803yd0asq",
       "depends": ["dplyr", "forcats", "gggibbous", "ggimage", "ggplot2", "suncalc"]
     },
     "calendar": {
       "name": "calendar",
-      "version": "0.1.0",
-      "sha256": "0kjapjjjqmc4v2jvfnzy096m82m7xybcj952vmrx7kgnz07kynai",
-      "depends": ["lubridate", "tibble"]
+      "version": "0.2.0",
+      "sha256": "0gci7xlws9l93xrl3ksx85vqv9c2z86bmarivqjpigs40ppnsyn2",
+      "depends": ["cli", "lubridate", "tibble"]
     },
     "calibmsm": {
       "name": "calibmsm",
@@ -45825,8 +47499,8 @@
     },
     "calidad": {
       "name": "calidad",
-      "version": "0.5.0",
-      "sha256": "170ijr5kxaqwbvv8p1vs3jsld61kflicyycnjy640d28byj4lpmc",
+      "version": "0.6.0",
+      "sha256": "1i69m14xzls4wgvq4ids6f61mwkygz92h72sxhc0cwwiha6231ry",
       "depends": ["dplyr", "haven", "kableExtra", "purrr", "rlang", "stringr", "survey", "tidyr"]
     },
     "callback": {
@@ -45837,8 +47511,8 @@
     },
     "callme": {
       "name": "callme",
-      "version": "0.1.10",
-      "sha256": "1agyflf9ch5xyxmfdcv6shxz8h7ibp6rd3d6x1g7gk1cblvshlar",
+      "version": "0.1.11",
+      "sha256": "035fg1llsprv7qlww4qggzj2g1b234zrjn32bgjkn3kmqnk522bd",
       "depends": []
     },
     "callr": {
@@ -45897,14 +47571,14 @@
     },
     "campsis": {
       "name": "campsis",
-      "version": "1.5.3",
-      "sha256": "0xjwx33y383a8ax9vwd30zsb3k7l0g95llnrgjpmmj4inrarb5a7",
+      "version": "1.5.5",
+      "sha256": "172wgp87wlpd20600hcyyxdshpq7ak6zf59yjvqryni1wcrc3l1m",
       "depends": ["MASS", "assertthat", "campsismod", "digest", "dplyr", "furrr", "future", "ggplot2", "plyr", "progressr", "purrr", "rlang", "tibble", "tidyr"]
     },
     "campsismod": {
       "name": "campsismod",
-      "version": "1.1.1",
-      "sha256": "0d3bdfx4jcnpzbnz6ymgz10s4137van6bcg5s4a3yzf90f02lbns",
+      "version": "1.1.2",
+      "sha256": "0sxyx72iy1mjx6cjgags39543c36df3dxhgi3xd7q40rbhckih5n",
       "depends": ["assertthat", "dplyr", "magrittr", "plyr", "purrr", "readr", "tibble"]
     },
     "camsRad": {
@@ -45955,6 +47629,12 @@
       "sha256": "1cbpxw6l09sdnf6nyw0hvhrc97awnidi72a2jsjf3v8ml012xd5f",
       "depends": ["igraph", "qvalue", "reshape2", "survival", "systemfit"]
     },
+    "cancerR": {
+      "name": "cancerR",
+      "version": "0.1.0",
+      "sha256": "02k4d7z565xlmwv5kl7dqqdm27zvmwm2pyfqpp7czdji17agkji0",
+      "depends": []
+    },
     "cancerscreening": {
       "name": "cancerscreening",
       "version": "1.1.1",
@@ -45975,8 +47655,8 @@
     },
     "cansim": {
       "name": "cansim",
-      "version": "0.3.16",
-      "sha256": "144p7zc44xb0szslsrxg1q1lhn5rizlgc0rvsinwzglnkzl478p2",
+      "version": "0.3.17",
+      "sha256": "0lnc9idpcz043p3wb0l0x2042xx7j9mmfbx6sqkvrmi1gilsm7jx",
       "depends": ["DBI", "RSQLite", "digest", "dplyr", "httr", "jsonlite", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "xml2"]
     },
     "canvasXpress": {
@@ -46003,6 +47683,18 @@
       "sha256": "1f1mw54gv1r40wrrsznhgffdj8ggrwihiwdd8wyqccyvqm49fxjg",
       "depends": ["MASS", "ape", "mvtnorm"]
     },
+    "capesData": {
+      "name": "capesData",
+      "version": "0.0.1",
+      "sha256": "0g1frx57ch0b80dbf08a5yba2zxbizdqb9xpjjdy0l0idkc0vxfm",
+      "depends": []
+    },
+    "capesR": {
+      "name": "capesR",
+      "version": "0.1.0",
+      "sha256": "18wvcxi5ibi1mrk07idyryvnm6qcqg9h7077rv796hy5vllw3j6g",
+      "depends": ["arrow", "dplyr", "magrittr", "rlang", "stringr"]
+    },
     "capitalR": {
       "name": "capitalR",
       "version": "1.3.0",
@@ -46047,9 +47739,9 @@
     },
     "car": {
       "name": "car",
-      "version": "3.1-2",
-      "sha256": "1j3l8r3j05769gdfrqz0n38xviq6pww1cjrgdd0fkj3sjy8k89l9",
-      "depends": ["MASS", "abind", "carData", "lme4", "mgcv", "nlme", "nnet", "pbkrtest", "quantreg", "scales"]
+      "version": "3.1-3",
+      "sha256": "1gs9prinmxn4l6w8lyig3mzm1j2zfq3yhkznm1igd5ar74jc1wjr",
+      "depends": ["Formula", "MASS", "abind", "carData", "lme4", "mgcv", "nlme", "nnet", "pbkrtest", "quantreg", "scales"]
     },
     "carData": {
       "name": "carData",
@@ -46087,6 +47779,12 @@
       "sha256": "03hsss66gxkxp8zpjg6qy6mvjlcy5bchw0idzmwj37ls79g0zczr",
       "depends": ["cpp11"]
     },
+    "carbonr": {
+      "name": "carbonr",
+      "version": "0.2.1",
+      "sha256": "173yy0rf5sahncvghz1nh74k2qhzvx3mpa8gwyz6acnfg08m0ygj",
+      "depends": ["airportr", "checkmate", "cowplot", "dplyr", "emojifont", "ggplot2", "ggpp", "htmltools", "lubridate", "magrittr", "readxl", "rlang", "shiny", "shinydashboard", "sp", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "carcass": {
       "name": "carcass",
       "version": "1.7",
@@ -46095,9 +47793,15 @@
     },
     "card": {
       "name": "card",
-      "version": "0.1.0",
-      "sha256": "1api0j06fp5av5a48vnnm1wvwdcskynf0xsj9pb41njxdh9v8daf",
-      "depends": ["Hmisc", "broom", "data_table", "dplyr", "generics", "ggplot2", "ggrepel", "hardhat", "lubridate", "lutz", "magrittr", "purrr", "readr", "recipes", "rlang", "sf", "stringr", "survival", "tibble", "tidyr"]
+      "version": "0.1.1",
+      "sha256": "1vl87zdhxakhw0fh4zcrx2ngz4n1wzqg6y9csxwhnh9pidk6wj7w",
+      "depends": ["dplyr", "generics", "ggplot2", "hardhat", "parsnip", "purrr", "rlang", "tibble", "tidyr"]
+    },
+    "card_pro": {
+      "name": "card.pro",
+      "version": "2.2.1",
+      "sha256": "1sysvc68bqrl8b77g0wqbzgnzapwd0mj7dk2shzkzdssaj4ms65g",
+      "depends": ["htmltools", "quickcode", "shiny"]
     },
     "cardidates": {
       "name": "cardidates",
@@ -46113,15 +47817,15 @@
     },
     "cards": {
       "name": "cards",
-      "version": "0.2.1",
-      "sha256": "1hikcd696f6i74nlqgkfi7nip99xw25pkqxxn78c5bawmxxfq15v",
+      "version": "0.4.0",
+      "sha256": "1bspjyxwj1dcjdrgrbh7qkskviwf78ifzhn8kihjpqypsyy1plad",
       "depends": ["cli", "dplyr", "glue", "rlang", "tidyr", "tidyselect"]
     },
     "cardx": {
       "name": "cardx",
-      "version": "0.2.0",
-      "sha256": "1286hv6d1l6k0rsh996risdzbmby3z2szswvpl0vca5gb8a319ir",
-      "depends": ["cards", "cli", "dplyr", "glue", "rlang", "tidyr"]
+      "version": "0.2.2",
+      "sha256": "0jsqldsmpfgm9hvsrb833l119xsmkm8nqwdbsl7p1vhn2km0f5dv",
+      "depends": ["cards", "cli", "dplyr", "glue", "lifecycle", "rlang", "tidyr"]
     },
     "care": {
       "name": "care",
@@ -46131,8 +47835,8 @@
     },
     "care4cmodel": {
       "name": "care4cmodel",
-      "version": "1.0.2",
-      "sha256": "0526z49v4mxfxjlpzjnqyzc8j2lvj1aw47f3izsk1vrs193vxnvw",
+      "version": "1.0.3",
+      "sha256": "1plllcw927w4svqma29d5vqbi9w0h5cm2bccl0g3bl3c8fv6af1r",
       "depends": ["Rdpack", "deSolve", "dplyr", "ggplot2", "purrr", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "careless": {
@@ -46149,14 +47853,14 @@
     },
     "caret": {
       "name": "caret",
-      "version": "6.0-94",
-      "sha256": "1a191n9qswvf8ri6id8picqgdqx15l6mp996v6f77fv0l8yfh597",
+      "version": "7.0-1",
+      "sha256": "0p41k8r3sm8icfli14w6nzc9glwb8a2dmb2b8a5p2j0rrsl53sni",
       "depends": ["ModelMetrics", "e1071", "foreach", "ggplot2", "lattice", "nlme", "pROC", "plyr", "recipes", "reshape2", "withr"]
     },
     "caretEnsemble": {
       "name": "caretEnsemble",
-      "version": "4.0.0",
-      "sha256": "0hwgr7n2sahs3zlvrnhnk6yfmqpmphkl4xii8aa2x1yjgx3ssxwi",
+      "version": "4.0.1",
+      "sha256": "1iszidm3g24yi5g10wyx3vw03ka1ij4z3q4ng01v7ic863wp08gb",
       "depends": ["caret", "data_table", "ggplot2", "lattice", "patchwork", "pbapply", "rlang"]
     },
     "caretForecast": {
@@ -46185,8 +47889,8 @@
     },
     "caroline": {
       "name": "caroline",
-      "version": "0.9.2",
-      "sha256": "15q2cqfrfvy934cdfg886sp6lzmfp1bqddjpkv0bhqzpnmscbpq4",
+      "version": "0.9.9",
+      "sha256": "0ylgryaylki22m54wrra9gsa34pal64n196s100ng4q02fl7z1lk",
       "depends": []
     },
     "carpenter": {
@@ -46215,9 +47919,9 @@
     },
     "cartogramR": {
       "name": "cartogramR",
-      "version": "1.1-0",
-      "sha256": "1zyrfxknm6acrgc7k8yanqkbznp5nq41y0gdd99b5wrhp7w01qr8",
-      "depends": ["data_table", "sf"]
+      "version": "1.2-0",
+      "sha256": "16xa989hiaq17qgys14p68z2jdn79pyylzhnd5y5cqd43hiixkn0",
+      "depends": ["cleancall", "data_table", "sf"]
     },
     "cartographer": {
       "name": "cartographer",
@@ -46249,6 +47953,12 @@
       "sha256": "1hb8h0v7c76jbhqp713wkmx278q9calpg1rwgdhbrdbq6caldhq7",
       "depends": ["fontawesome", "htmltools", "reactR", "shiny"]
     },
+    "cascadess": {
+      "name": "cascadess",
+      "version": "0.2.0",
+      "sha256": "0yf431qx4alvvsr2mq4kkz3sy0f0789wm63vdm0mxdciabfgmz39",
+      "depends": ["htmltools", "magrittr", "rlang"]
+    },
     "cascsim": {
       "name": "cascsim",
       "version": "0.4",
@@ -46287,14 +47997,14 @@
     },
     "cassowaryr": {
       "name": "cassowaryr",
-      "version": "2.0.0",
-      "sha256": "1gk54haciy3vj7xj6cji1v90xh7g8790zq1rykyispx09jr2dpx3",
+      "version": "2.0.2",
+      "sha256": "1zyna3nqkdb9f2cq2k41g2nbvw35gwz6yidz3ma1rpkha5cqdi1r",
       "depends": ["alphahull", "dplyr", "energy", "ggplot2", "igraph", "interp", "magrittr", "progress", "splancs", "tibble", "tidyselect"]
     },
     "castor": {
       "name": "castor",
-      "version": "1.8.2",
-      "sha256": "1850i35qsxw7dkkblixnp4h5zhwg0ysx8rzns5h0kr9lwmil6biw",
+      "version": "1.8.3",
+      "sha256": "1hq6j8zvv01lbi8q2bcn2jz6xm1iv8lylsw20a9yaagw3xkvbgw2",
       "depends": ["Matrix", "RSpectra", "Rcpp", "jsonlite", "naturalsort"]
     },
     "cat": {
@@ -46329,8 +48039,8 @@
     },
     "cata": {
       "name": "cata",
-      "version": "0.1.0.6",
-      "sha256": "077sk9gd84b6vnp25bm6bxbbqjsmigvzndrpgh3p7a11i8377xqc",
+      "version": "0.1.0.7",
+      "sha256": "049wrqbmw77jlcwcikgjqjsnw4s3f6w4hvhilp2kvljpflmvjymf",
       "depends": []
     },
     "catalog": {
@@ -46339,6 +48049,12 @@
       "sha256": "1j43c34qdklv8pskaidq5fxrygv9lngamdcrkij9c844qj7iff14",
       "depends": ["dplyr", "sparklyr"]
     },
+    "catalytic": {
+      "name": "catalytic",
+      "version": "0.1.0",
+      "sha256": "0mxxla5ibz127lc8r795jpl1lw8bf12d5w5ql7jxwg7yvcmigplz",
+      "depends": ["MASS", "coda", "invgamma", "lme4", "quadform", "rlang", "rstan", "survival", "truncnorm"]
+    },
     "catch": {
       "name": "catch",
       "version": "1.0.1",
@@ -46401,8 +48117,8 @@
     },
     "catregs": {
       "name": "catregs",
-      "version": "0.2.1",
-      "sha256": "1i94pcfcda0pgvgvfgajmyjg91ia4qi8abjydh3ljywnsjc3bm3p",
+      "version": "1.2.2",
+      "sha256": "0zmgq5w8kd8ldfkz9j43vpzjnyv5rcaaj57r7b7gsxwi3gdvqr4a",
       "depends": []
     },
     "cats": {
@@ -46419,8 +48135,8 @@
     },
     "catsim": {
       "name": "catsim",
-      "version": "0.2.3",
-      "sha256": "1gz38xrzbray5ciiimkzdass8bhmiqxh6bcngjm5i8dvafk5gf9g",
+      "version": "0.2.4",
+      "sha256": "1lwc13xf7794fln5ylwwb9w9s1ah7y2h7wil1hjhz9vxhfpa044w",
       "depends": ["Rcpp", "testthat"]
     },
     "cauchypca": {
@@ -46431,8 +48147,8 @@
     },
     "cauphy": {
       "name": "cauphy",
-      "version": "1.0.2",
-      "sha256": "1jyw6pq17fzpkp6c68cbc7y5bs1y1xhnvd49j7kkypn7ziglpm9s",
+      "version": "1.0.3",
+      "sha256": "1rb5fjlh91k229a0hcw8d7x7wjf3m7p9apschq83xgpv4d5a0b2m",
       "depends": ["HDInterval", "ape", "doParallel", "foreach", "nloptr", "phylolm", "pracma", "robustbase"]
     },
     "causact": {
@@ -46491,8 +48207,8 @@
     },
     "causaldata": {
       "name": "causaldata",
-      "version": "0.1.3",
-      "sha256": "1v5apihm9005j1kf3p1d28v6jaqx87ryc43kjhwd5mvvm10rmflc",
+      "version": "0.1.4",
+      "sha256": "0jb5n24hlm2mnpl93aybjn1ras903gx7sa60z8zif7gwj9p65kx3",
       "depends": ["tibble"]
     },
     "causaldrf": {
@@ -46509,9 +48225,9 @@
     },
     "causaloptim": {
       "name": "causaloptim",
-      "version": "0.9.8",
-      "sha256": "0daghglhk4jngv242s1vdi8l1dwcp23gn47vacrs55in5mmpqraj",
-      "depends": ["Rcpp", "igraph", "rcdd", "shiny"]
+      "version": "1.0.0",
+      "sha256": "18rms13kwkai4yj1h8npb3dgnpy884i8vznn4cbma2frqal0rqyn",
+      "depends": ["igraph", "rcdd", "shiny"]
     },
     "causalsens": {
       "name": "causalsens",
@@ -46527,8 +48243,8 @@
     },
     "caviarpd": {
       "name": "caviarpd",
-      "version": "0.3.9",
-      "sha256": "0dd1z7n06k578rz985hvpa9h8axik93fil1qysjx98faszxxnk2r",
+      "version": "0.3.13",
+      "sha256": "0zf9s8wnyxfzmnxrq80xbxr1lrlgqdclwjbdrs6pfmdqmyix8dp6",
       "depends": []
     },
     "cba": {
@@ -46549,6 +48265,12 @@
       "sha256": "1x7k9srf2jgjhlha9fjm7rfcd9msk05nxa3p7657ns8y2v12s0nq",
       "depends": []
     },
+    "cbbinom": {
+      "name": "cbbinom",
+      "version": "0.2.0",
+      "sha256": "0n0qyzlsm54dl71n5rdrim6rvmsbk3g8n5r0i2q91yk9fayaz9ly",
+      "depends": ["BH", "Rcpp", "hypergeo2"]
+    },
     "cbcTools": {
       "name": "cbcTools",
       "version": "0.5.0",
@@ -46563,8 +48285,8 @@
     },
     "cbioportalR": {
       "name": "cbioportalR",
-      "version": "1.1.0",
-      "sha256": "0vr8sjp2fkz24zcws6i46kmswf30yj147y3108i6sk7ncc2mavr5",
+      "version": "1.1.1",
+      "sha256": "0cd6n4gg1sg4y3chsypr2k8y9nbc4ncisi45zxw1vmfkc2cq8bn0",
       "depends": ["cli", "dplyr", "glue", "httr", "jsonlite", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "cbl": {
@@ -46581,8 +48303,8 @@
     },
     "cbsodataR": {
       "name": "cbsodataR",
-      "version": "1.0.1",
-      "sha256": "0p3bchkvib7jmr5qd3x36kcpajz6i2himk5s294z74hvc9vdkc7d",
+      "version": "1.1",
+      "sha256": "0pj3c8jgdfqz5m4ws2g6jzx4xghsyji8fmm1vk5l2w07pcm1xs9a",
       "depends": ["jsonlite", "whisker"]
     },
     "ccRemover": {
@@ -46599,8 +48321,8 @@
     },
     "ccaPP": {
       "name": "ccaPP",
-      "version": "0.3.3",
-      "sha256": "1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk",
+      "version": "0.3.4",
+      "sha256": "16bw98wqjm62gjcznlwj24akng1csi3dciw6v5rkg9v2xkjn44d5",
       "depends": ["Rcpp", "RcppArmadillo", "pcaPP", "robustbase"]
     },
     "cccd": {
@@ -46623,9 +48345,9 @@
     },
     "cccrm": {
       "name": "cccrm",
-      "version": "2.2.2",
-      "sha256": "1byrz0npvchdzbp10z7blz13680x7d5yak9mmagn4q3w8wclpl7x",
-      "depends": ["Deriv", "dplyr", "nlme", "tidyselect"]
+      "version": "3.0.3",
+      "sha256": "15a797d9m90pwxc9lpa836dd3mml11pfmx256sgqysmd5rkn13fx",
+      "depends": ["Deriv", "dplyr", "furrr", "future", "lifecycle", "nlme", "nlmeU", "parallelly", "progressr", "purrr", "tidyr", "tidyselect"]
     },
     "ccdR": {
       "name": "ccdR",
@@ -46641,8 +48363,8 @@
     },
     "cchs": {
       "name": "cchs",
-      "version": "0.4.4",
-      "sha256": "14qmh4jb9i0imjkb33x61q074zsrng3acy52cw9p0zsxrbh4gdf5",
+      "version": "0.4.5",
+      "sha256": "1idc6jm5vmgl6ixcx4hz5xf82z30dkkg6f4s95ii9xp8ly9amnh1",
       "depends": ["survival"]
     },
     "cchsflow": {
@@ -46723,6 +48445,12 @@
       "sha256": "0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380",
       "depends": []
     },
+    "cctest": {
+      "name": "cctest",
+      "version": "1.1.0",
+      "sha256": "1pcfilz9a06vlgj4g25aghpacdqmfwghqahlsf3h1hnxfzi50y4z",
+      "depends": []
+    },
     "cctools": {
       "name": "cctools",
       "version": "0.1.2",
@@ -46749,8 +48477,8 @@
     },
     "cdcsis": {
       "name": "cdcsis",
-      "version": "2.0.4",
-      "sha256": "0p3nlp3pqblgw753lrh4xfm3lbx8j9bqwm6gnvdibcsrszzr0zw7",
+      "version": "2.0.5",
+      "sha256": "1vxhikdx4kqac29spzwwv696kax5fsdmmhnqgm8gjk538zq6kw4f",
       "depends": ["Rcpp", "ks", "mvtnorm"]
     },
     "cder": {
@@ -46821,9 +48549,9 @@
     },
     "ceas": {
       "name": "ceas",
-      "version": "1.0.0",
-      "sha256": "0xxinxavqkfg3zfl62mz64msivr5j8l88sshqc1z56kxldyv0xfn",
-      "depends": ["data_table", "ggplot2", "readxl"]
+      "version": "1.3.0",
+      "sha256": "1h6zd8hcxd8k6lnmq066gjgp683y6f7kfisyf1zbasbr1l4gp0fx",
+      "depends": ["data_table", "ggplot2", "lme4", "readxl"]
     },
     "ceg": {
       "name": "ceg",
@@ -46875,10 +48603,16 @@
     },
     "celltrackR": {
       "name": "celltrackR",
-      "version": "1.2.0",
-      "sha256": "1y0bdn75malabyrnrqrw5vh2sr6j09hpy8gbk1vnmkbvg9dy2xh3",
+      "version": "1.2.1",
+      "sha256": "0gmdxs9s3c1rk8mqc2pp6zdmzy9nij51m29vf24ii8s201f9raj6",
       "depends": ["ellipse", "pracma"]
     },
+    "cellularautomata": {
+      "name": "cellularautomata",
+      "version": "0.1.0",
+      "sha256": "07j0bv8bj20jjh4zdxgqnpkxm0pb2aia6045rp23i3x18n18zf42",
+      "depends": ["gganimate", "ggplot2", "patchwork", "purrr", "rlang"]
+    },
     "cem": {
       "name": "cem",
       "version": "1.1.31",
@@ -46935,9 +48669,9 @@
     },
     "censobr": {
       "name": "censobr",
-      "version": "0.3.2",
-      "sha256": "0bjrlcfzdymkp2nhrnr8ilw2xcgl9fkv47m2wlffb8ay5mlkar26",
-      "depends": ["arrow", "checkmate", "dplyr", "httr"]
+      "version": "0.4.0",
+      "sha256": "1rgl8qbhrj0yv3gw6rqx0zj5gpwwhgfja28pcqmnkglyzf8d8i5n",
+      "depends": ["DBI", "arrow", "checkmate", "curl", "dplyr", "duckdb", "duckplyr", "fs"]
     },
     "censorcopula": {
       "name": "censorcopula",
@@ -46963,6 +48697,12 @@
       "sha256": "1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc",
       "depends": ["dplyr", "httr", "stringr"]
     },
+    "centerline": {
+      "name": "centerline",
+      "version": "0.1",
+      "sha256": "00bpl7qz5hm69mnbi5278bx7v676ni8c3xyq3kmb7z7pzjgx3g83",
+      "depends": ["geos", "sf", "sfnetworks", "wk"]
+    },
     "centiserve": {
       "name": "centiserve",
       "version": "1.0.0",
@@ -46971,9 +48711,9 @@
     },
     "centr": {
       "name": "centr",
-      "version": "0.1.0",
-      "sha256": "12kf4j75q6jyyypa3cqj5pn9gn7z2nj0mp35j9dqq42qn6mwpgv7",
-      "depends": ["sf"]
+      "version": "0.2.1",
+      "sha256": "0k6gyakzlxg089wlzxhr28cr4bqywlsw30308qcxvayy6fmvsf6d",
+      "depends": ["chk", "dplyr", "sf", "tibble"]
     },
     "centrifugeR": {
       "name": "centrifugeR",
@@ -47023,6 +48763,12 @@
       "sha256": "04mywwl8hm2plcs7m4p5sjhadvgfpy42pagn2cxajpcpl7gqskfc",
       "depends": ["crsmeta", "curl", "dplyr", "fs", "glue", "purrr", "rappdirs", "rlang", "slippymath", "sp", "stringr", "terra", "tibble", "vapour", "wk"]
     },
+    "cercospoRa": {
+      "name": "cercospoRa",
+      "version": "0.0.1",
+      "sha256": "0bp76m2kj1hlr6ynq762vr1bvla16np5dlj64chmy38vx2026f8b",
+      "depends": ["circular", "data_table", "lubridate", "minpack_lm", "sf", "terra"]
+    },
     "cereal": {
       "name": "cereal",
       "version": "0.1.0",
@@ -47049,9 +48795,9 @@
     },
     "ceterisParibus": {
       "name": "ceterisParibus",
-      "version": "0.4.2",
-      "sha256": "0hxklydsqb69y5sv2hanp5ja9k0063swf5si1j6gcj15lp7phpif",
-      "depends": ["DALEX", "ggplot2", "gower", "knitr"]
+      "version": "0.6",
+      "sha256": "1jjrrb5v61kmprivc1r4ixcq9nmgqfvz7075nhcb76jrxjgf9ik3",
+      "depends": ["DALEX", "ggplot2", "gower"]
     },
     "cfa": {
       "name": "cfa",
@@ -47061,9 +48807,9 @@
     },
     "cfda": {
       "name": "cfda",
-      "version": "0.11.0",
-      "sha256": "03w2vfgjf29qn40slqfpd54dmvzql53lc9j7n51ggg7bjchrg2x0",
-      "depends": ["diagram", "fda", "ggplot2", "mgcv", "msm", "pbapply"]
+      "version": "0.12.0",
+      "sha256": "1i3c6586x8g1vv8pkp9d23l4pzv7wapvhq4xsj98xl3fj3ngss52",
+      "depends": ["diagram", "dplyr", "fda", "ggplot2", "mgcv", "msm", "pbapply", "tibble", "tidyr"]
     },
     "cfdecomp": {
       "name": "cfdecomp",
@@ -47109,8 +48855,8 @@
     },
     "cfr": {
       "name": "cfr",
-      "version": "0.1.1",
-      "sha256": "0gvajvwriiird3symkln0z52k9v1rz3bh4yvdg0xh1lqhylr165b",
+      "version": "0.1.2",
+      "sha256": "0sgjdapsiqn436xswl06p3m84j9z1savbyibxqzs2zc9x3imjfqr",
       "depends": ["checkmate"]
     },
     "cft": {
@@ -47211,8 +48957,8 @@
     },
     "changepoint": {
       "name": "changepoint",
-      "version": "2.2.4",
-      "sha256": "16v4p2c9zi2w3anwf5y9snl5dy1g5aidiqz1vn2p64qhfvg6yqxc",
+      "version": "2.3",
+      "sha256": "0bb8pcfwb8vjmg7n7giad1vi1s6ix486lcsb28zvxih7v04v1a0r",
       "depends": ["zoo"]
     },
     "changepoint_geo": {
@@ -47235,8 +48981,8 @@
     },
     "changepointTests": {
       "name": "changepointTests",
-      "version": "0.1.5",
-      "sha256": "1s6vi879h96qds2khfcv4n2rh5vp09m074mr5knlhhm0lhxf111g",
+      "version": "0.1.7",
+      "sha256": "0pq689xwkaqx8kqpdhfxxr9jwy3kdj82sg5182w8kmpd7x405k56",
       "depends": ["doParallel", "foreach"]
     },
     "changepoints": {
@@ -47263,16 +49009,22 @@
       "sha256": "0123mbdr4bkkp8w9w15bg9qxkbpd6nyp602fw690zsy1dyimm78k",
       "depends": ["AER", "chandwich", "lmtest", "progress", "purrr", "rlang", "sandwich"]
     },
+    "charcuterie": {
+      "name": "charcuterie",
+      "version": "0.0.6",
+      "sha256": "1gq4sqywi1rcp0a3wd55w4xd4gn7fzpca8ai6flr1an72sgbbdzr",
+      "depends": ["generics"]
+    },
     "charlatan": {
       "name": "charlatan",
-      "version": "0.5.1",
-      "sha256": "1f83yrvc0qnxlvcpl41718vv3c26x131q285c1mgys1xwk3s97s7",
+      "version": "0.6.1",
+      "sha256": "19vrav1yhbfag2j2fc9hbrjhv79w0gxfzaml66b374q76cjji1nz",
       "depends": ["R6", "tibble", "whisker"]
     },
     "charlesschwabapi": {
       "name": "charlesschwabapi",
-      "version": "1.0.2",
-      "sha256": "0pmf25d6vvfyxxwh7g29iwd5di3b82vw128n15amakxfjibb8rjs",
+      "version": "1.0.4",
+      "sha256": "0r3sa4fiz8d6z37wdav5434mibq5k5p6aaznawqgrncvrs1br5n3",
       "depends": ["anytime", "dplyr", "httr", "lubridate", "openssl", "purrr", "stringr", "tidyr"]
     },
     "chartql": {
@@ -47301,8 +49053,8 @@
     },
     "cheapr": {
       "name": "cheapr",
-      "version": "0.9.3",
-      "sha256": "1zf9jnwcvpw9zlh7dyrmw4wwjc3fxll0q3mkivd5q5vikmzvy0y7",
+      "version": "0.9.92",
+      "sha256": "0vr3jgr430pxvicaw5ci5v56gm26ajrzb9v3hwxjjs8rmmzgwhay",
       "depends": ["collapse", "cpp11"]
     },
     "cheatsheet": {
@@ -47331,9 +49083,9 @@
     },
     "checked": {
       "name": "checked",
-      "version": "0.2.0",
-      "sha256": "0yzg8y236w72694raz0x7ic70a0fzn9c3pl2x868rfyvq3ivsv7d",
-      "depends": ["R6", "callr", "cli", "igraph", "jsonlite", "rcmdcheck"]
+      "version": "0.2.4",
+      "sha256": "09l82y9gmz1q5m1mjql31nvid8dsc9hhalzp7fpb1pdcwdas994i",
+      "depends": ["R6", "callr", "cli", "igraph", "jsonlite", "options", "rcmdcheck"]
     },
     "checker": {
       "name": "checker",
@@ -47457,9 +49209,9 @@
     },
     "chevron": {
       "name": "chevron",
-      "version": "0.2.6",
-      "sha256": "05h8bjgjh8nj81yynidywvahhnxjnjpd3l248kxs503dhj9flqi9",
-      "depends": ["checkmate", "dplyr", "dunlin", "forcats", "formatters", "ggplot2", "glue", "lifecycle", "magrittr", "nestcolor", "purrr", "rlang", "rlistings", "rtables", "stringr", "tern", "tibble"]
+      "version": "0.2.7",
+      "sha256": "15kqs0lcsfka159s1divhnji571dgrqc0n32h3mk9l05gznclsnk",
+      "depends": ["checkmate", "dplyr", "dunlin", "forcats", "formatters", "ggplot2", "glue", "lifecycle", "lubridate", "magrittr", "nestcolor", "purrr", "rlang", "rlistings", "rtables", "stringr", "tern", "tibble"]
     },
     "chi": {
       "name": "chi",
@@ -47487,9 +49239,9 @@
     },
     "childfree": {
       "name": "childfree",
-      "version": "0.0.2",
-      "sha256": "1hss91cls38zj4dibcr9whjlmbs4w2b7xfpgfqkkd6xa6xmcxd6v",
-      "depends": ["rio"]
+      "version": "0.0.3",
+      "sha256": "1lqwn7b0mc5v5lqqx2bhh5j110zl119whi7qwgzj0y05fdri98z2",
+      "depends": ["RCurl", "rio", "survey"]
     },
     "childsds": {
       "name": "childsds",
@@ -47505,9 +49257,9 @@
     },
     "chillR": {
       "name": "chillR",
-      "version": "0.75",
-      "sha256": "0b8r8s7vqgpb6jjbqaf24yig2adagfl6rnnppx15mdhz8bmjc5aq",
-      "depends": ["GenSA", "Kendall", "RCurl", "RMAWGEN", "R_utils", "Rcpp", "XML", "assertthat", "dplyr", "ecmwfr", "fields", "ggplot2", "httr", "jsonlite", "lubridate", "magrittr", "metR", "patchwork", "pls", "plyr", "progress", "purrr", "raster", "readxl", "reshape2", "rlang", "scales", "stringr", "tidyr"]
+      "version": "0.76",
+      "sha256": "0ywanyrcfy7gkhlim7zs5sbm145kfqd3gl9k3gv52k342rrn0psn",
+      "depends": ["GenSA", "Kendall", "RCurl", "RMAWGEN", "R_utils", "Rcpp", "XML", "assertthat", "dplyr", "ecmwfr", "fields", "ggplot2", "httr", "jsonlite", "keyring", "lubridate", "magrittr", "metR", "patchwork", "pls", "plyr", "progress", "purrr", "raster", "readxl", "reshape2", "rlang", "scales", "stringr", "tidyr"]
     },
     "chinese_misc": {
       "name": "chinese.misc",
@@ -47535,8 +49287,8 @@
     },
     "chisquare": {
       "name": "chisquare",
-      "version": "1.0",
-      "sha256": "1vjhsi520p9m46xay9dh0la5ypyhi19gyg5i568d2ywka4g2ssac",
+      "version": "1.1.1",
+      "sha256": "00ykim1p71lw5wby59nmsd7xxnw3cav3lmn522c4qmsc14nzdly3",
       "depends": ["gt"]
     },
     "chk": {
@@ -47559,8 +49311,8 @@
     },
     "chngpt": {
       "name": "chngpt",
-      "version": "2023.11-29",
-      "sha256": "1zz0wgard6a1y36r78pfp5gqfjm12xlvh5cmdq3297m4d7jvrn34",
+      "version": "2024.11-15",
+      "sha256": "0svjrdliv0i2903nz8ai1zhvxgrrfg4rpxjpc05y46fzz18kvw41",
       "depends": ["MASS", "RhpcBLASctl", "boot", "kyotil", "lme4", "survival"]
     },
     "choiceDes": {
@@ -47575,6 +49327,12 @@
       "sha256": "0qfy7xqkihn8jfxnhg0l5y0mii52lbfwmg663bqsjapylqc9bjcd",
       "depends": ["HistData", "KernSmooth", "RColorBrewer", "TSP", "deldir", "elevatr", "geosphere", "ggplot2", "igraph", "pracma", "sp", "tanaka", "terra", "threejs", "viridisLite"]
     },
+    "chooseGCM": {
+      "name": "chooseGCM",
+      "version": "1.0.1",
+      "sha256": "1458dl21d0pslwcmqr791y3gk36l3pisn62pprf2akzwmyba08cl",
+      "depends": ["checkmate", "cluster", "cowplot", "factoextra", "ggcorrplot", "ggplot2", "httr", "reshape2", "terra", "usedist"]
+    },
     "choosepc": {
       "name": "choosepc",
       "version": "1.0",
@@ -47625,8 +49383,8 @@
     },
     "christmas": {
       "name": "christmas",
-      "version": "1.3.0",
-      "sha256": "0gqyxvhx8nvcrjxqrybvxyc3dgwvd3z9ln4fig6q3zamfpdmljb7",
+      "version": "1.4.0",
+      "sha256": "0hyhdz6xamhank6z23vjmpngqz6mi6318i9rflq2414xw6bmkf7p",
       "depends": ["animation"]
     },
     "chromConverter": {
@@ -47649,8 +49407,8 @@
     },
     "chromote": {
       "name": "chromote",
-      "version": "0.2.0",
-      "sha256": "0x888796760gglxqzd0i5mqim3j878dkyip64m26irprl9ksyxm3",
+      "version": "0.3.1",
+      "sha256": "0iwxrw3sbdanqzd49p809hvw839fmv93g7a862s2rf8m00x5ccx2",
       "depends": ["R6", "curl", "fastmap", "jsonlite", "later", "magrittr", "processx", "promises", "rlang", "websocket"]
     },
     "chromseq": {
@@ -47725,6 +49483,12 @@
       "sha256": "0d6aq4wcxi1q59g4kfx49x1li41rfwx2z2v4xzz2xkldn6h1794z",
       "depends": ["MASS", "arm", "boot", "dplyr", "lme4", "survival"]
     },
+    "cia": {
+      "name": "cia",
+      "version": "1.0.0",
+      "sha256": "17w1hx3rbbil2zkcgx4c20pjsqw51i297xnnkhr1db5zg6cqqvff",
+      "depends": ["arrangements", "bnlearn", "doParallel", "dplyr", "fastmatch", "foreach", "gRain", "igraph", "patchwork", "rlang", "tidyr"]
+    },
     "ciccr": {
       "name": "ciccr",
       "version": "0.3.0",
@@ -47751,8 +49515,8 @@
     },
     "ciftiTools": {
       "name": "ciftiTools",
-      "version": "0.15.1",
-      "sha256": "0wf2yqpdccriww942lyic13rsxylx4zcl670gyd81d41lj0xf5rc",
+      "version": "0.16.1",
+      "sha256": "07d7iws9d8r9ir37q8h1k2yl13sy4p9xnnlqlxhlyyfsz7pb23l3",
       "depends": ["RColorBrewer", "RNifti", "fields", "gifti", "oro_nifti", "rgl", "viridisLite", "xml2"]
     },
     "cimir": {
@@ -47775,8 +49539,8 @@
     },
     "cinterpolate": {
       "name": "cinterpolate",
-      "version": "1.0.1",
-      "sha256": "1viv904x4sbs8q2vz8a0aagamvs7n5i2xkscnxzz5csrdwr4mmai",
+      "version": "1.0.2",
+      "sha256": "06l82lvwn706jx5c7wx629y5hihqivjvypjrkmwbpypi6adq24qj",
       "depends": []
     },
     "cipheR": {
@@ -47785,10 +49549,16 @@
       "sha256": "01h8mh2xlz1kkwm3nbiw8lpjlkjc19x5x8dq1yxfwdkq5yjjkyaa",
       "depends": []
     },
+    "ciphertext": {
+      "name": "ciphertext",
+      "version": "0.1.0",
+      "sha256": "0jkhsq3n42dsr6cg3sp039cp4dah9cdc25q5h51rsq65m4bxmh9k",
+      "depends": []
+    },
     "cir": {
       "name": "cir",
-      "version": "2.3.1",
-      "sha256": "0bgza663rynx2b2p00phfz806cwf2m30yjkqzk2s23hbc47hx9qs",
+      "version": "2.5.0",
+      "sha256": "11g2avmxcv87wjdjghblhxz9fwj6dqb89xbwp15fk2f47g7sf3f4",
       "depends": []
     },
     "circacompare": {
@@ -47827,10 +49597,16 @@
       "sha256": "0rqbcmmp4h1jjl0y59bzn6k8kywjdqwvp0ajkqxd21j9f33k5p0n",
       "depends": ["GlobalOptions", "colorspace", "shape"]
     },
+    "circlus": {
+      "name": "circlus",
+      "version": "0.0.1",
+      "sha256": "0jwmsqm08crbmbbpbj0dn2vm33z1zsr18420cl09kjyz4yixwzb0",
+      "depends": ["Rcpp", "RcppArmadillo", "Tinflex", "flexmix", "torch"]
+    },
     "circular": {
       "name": "circular",
-      "version": "0.5-0",
-      "sha256": "14kvkbmvdfzh8j4hgw93qkjkg86xlpw69sp7g8d5smcyw9fxmx2b",
+      "version": "0.5-1",
+      "sha256": "1ngkhdvdzxdm8amc4s9jmiqc916fmf1xnm70gz3znxyp368zqngv",
       "depends": ["boot", "mvtnorm"]
     },
     "circularEV": {
@@ -47841,9 +49617,21 @@
     },
     "circumplex": {
       "name": "circumplex",
-      "version": "0.3.10",
-      "sha256": "1g0r004c7y51mcv7iiymgzhdy9v8y9bk814bzaam4d8fxp7qzqlr",
-      "depends": ["Rcpp", "RcppArmadillo", "assertthat", "boot", "dplyr", "ggforce", "ggplot2", "htmlTable", "magrittr", "purrr", "rlang", "scales", "tibble", "tidyr"]
+      "version": "1.0.0",
+      "sha256": "19jka0bmp5fgy65vby67ih60ka86jwiq07r90piwjplffm35qlxp",
+      "depends": ["Rcpp", "RcppArmadillo", "boot", "ggforce", "ggplot2", "htmlTable", "rlang"]
+    },
+    "cirls": {
+      "name": "cirls",
+      "version": "0.3.1",
+      "sha256": "0aw5cvn7841ayr2sb4qafjz2jy03i9k8nvpcls3zivjymynn2cx4",
+      "depends": ["TruncatedNormal", "coneproj", "osqp", "quadprog"]
+    },
+    "cisp": {
+      "name": "cisp",
+      "version": "0.1.0",
+      "sha256": "01i421rdh7n7m44sqsc2rzh2d9mpmvca8kgc2060fxi4sj116gb5",
+      "depends": ["RColorBrewer", "dplyr", "forcats", "gdverse", "ggplot2", "ggraph", "igraph", "magrittr", "purrr", "sdsfun", "sf", "tibble", "tidyr"]
     },
     "cit": {
       "name": "cit",
@@ -47967,9 +49755,9 @@
     },
     "clam": {
       "name": "clam",
-      "version": "2.5.0",
-      "sha256": "16yq457a2c8d47szimad7rx0q31h0g7iirmb75xxjicvkxqprmaz",
-      "depends": ["rintcal"]
+      "version": "2.6.1",
+      "sha256": "0kfkr5rnzmfj1jjf2jwkaxnddalid982gbd44pgz4y1nw00kj71c",
+      "depends": ["data_table", "rice", "rintcal"]
     },
     "clap": {
       "name": "clap",
@@ -47979,8 +49767,8 @@
     },
     "clarabel": {
       "name": "clarabel",
-      "version": "0.9.0",
-      "sha256": "1g66y8s4v7qzm92dhnsmng28sm4lf6wggb4kc6arvp75z0i315jh",
+      "version": "0.9.0.1",
+      "sha256": "1qfchpxd0hnw4vcs6vbkkrf0rqrrjr85j1hvpka466aqpdsl2qsa",
       "depends": []
     },
     "clarifai": {
@@ -48019,6 +49807,12 @@
       "sha256": "12rbwh7g0a6abvy423xjiv53gx1f9lg4y78r80lc0fj9pjpiwmn3",
       "depends": ["KernSmooth", "class", "e1071"]
     },
+    "classicaltest": {
+      "name": "classicaltest",
+      "version": "0.7.0",
+      "sha256": "0wqkqnyj6xdb6qsv03qz002g2b0f7s2vy33f3dm8kpajapdprvnk",
+      "depends": []
+    },
     "classifierplots": {
       "name": "classifierplots",
       "version": "1.4.0",
@@ -48037,16 +49831,22 @@
       "sha256": "125895ym1jhdd4gm7ywlhfzn66kra1a8bbkq3502vg38zvdsm3ci",
       "depends": ["cellWise", "cluster", "e1071", "ggplot2", "gridExtra", "kernlab", "randomForest", "robustbase", "rpart"]
     },
+    "clc": {
+      "name": "clc",
+      "version": "1.0.0",
+      "sha256": "08v096xvnjxahb3xlf7yvmcamn0ik4d7zs57n0f5ls214h31nr66",
+      "depends": ["RPostgres", "gdalUtilities", "ggplot2", "rlang", "sf", "terra", "xml2"]
+    },
     "cld2": {
       "name": "cld2",
-      "version": "1.2.4",
-      "sha256": "0nv17v1sjdx4xballagm5cfafswj4bqc0h550q29hal16vl4vq3r",
+      "version": "1.2.5",
+      "sha256": "1mzsr6rmqhvvk5p38y3kwd5hmyiaxgg60ay2gvh4d8psn7fx9cyv",
       "depends": ["Rcpp"]
     },
     "cld3": {
       "name": "cld3",
-      "version": "1.6.0",
-      "sha256": "0vgqg0sslj5dni9cpdfq7vbjy7wg48hdk8xa2bg7sd558apnns3c",
+      "version": "1.6.1",
+      "sha256": "0zxl4h2bx4kkhz4jax2nlx2bqf0vfy41ibds4iasv848jqifnxfs",
       "depends": ["Rcpp"]
     },
     "clda": {
@@ -48099,8 +49899,8 @@
     },
     "cleaner": {
       "name": "cleaner",
-      "version": "1.5.4",
-      "sha256": "1rkyrp8pa5sznjszxfwgkiymmdwrm87k56ghgk39yp8f919ifkpl",
+      "version": "1.5.5",
+      "sha256": "06big2ngx0j3b7r2dm01niv3jdh5fm07ax1cna0s1m2qm5zq1s3q",
       "depends": ["backports", "crayon", "knitr", "pillar", "rlang", "vctrs"]
     },
     "cleangeo": {
@@ -48153,8 +49953,8 @@
     },
     "clickR": {
       "name": "clickR",
-      "version": "0.9.39",
-      "sha256": "0kqv3kwj1dbq6d7010gdy003v11ww0bx2zr7yv93ag060viv956d",
+      "version": "0.9.45",
+      "sha256": "05k2is7y8v4x4x1kfg27191ayw9k3j1q2ap7nchw41yw8biad94a",
       "depends": ["beeswarm", "future", "future_apply", "stringdist"]
     },
     "clickableImageMap": {
@@ -48213,9 +50013,15 @@
     },
     "climaemet": {
       "name": "climaemet",
-      "version": "1.3.0",
-      "sha256": "1ccf7639zk56m60cqd6z8h4s6nsvhv76d8ndbk832d9lak13b7wb",
-      "depends": ["cli", "dplyr", "ggplot2", "httr2", "jsonlite", "rappdirs", "readr", "rlang", "tibble", "tidyr"]
+      "version": "1.4.0",
+      "sha256": "1h17lf5mkahgx9zqqbnadjc9jr8y0jis7lvla8r6ifr0vpccy7wg",
+      "depends": ["cli", "dplyr", "ggplot2", "httr2", "jsonlite", "rappdirs", "readr", "rlang", "tibble", "tidyr", "xml2"]
+    },
+    "climate": {
+      "name": "climate",
+      "version": "1.2.2",
+      "sha256": "1p8l7sdplrkc5n1f28xbmvmpz8akhbxzqm522gcgs7jg754zlxhb",
+      "depends": ["XML", "curl", "data_table", "httr", "stringi"]
     },
     "climateStability": {
       "name": "climateStability",
@@ -48297,8 +50103,8 @@
     },
     "clinicalsignificance": {
       "name": "clinicalsignificance",
-      "version": "2.0.0",
-      "sha256": "132zwgzrc9gf10x2ldr7mjbj8k83h87y7py9b34yv9s7jmciy62x",
+      "version": "2.1.0",
+      "sha256": "07y0rfjcyhc0c13w0727iapi4clr76nfk43r1d1fcj9n909bi8b4",
       "depends": ["BayesFactor", "bayestestR", "cli", "dplyr", "ggplot2", "insight", "lme4", "purrr", "rlang", "tibble", "tidyr"]
     },
     "clinmon": {
@@ -48325,6 +50131,12 @@
       "sha256": "0f8y1l3mqij6y87xf07gq7r2frigswcff5p3v119l6rldmkhp4fl",
       "depends": ["dplyr", "ggplot2", "irr", "lme4", "nlme", "pROC", "pander", "parameters", "scales", "signal", "stringi", "survival", "xml2"]
     },
+    "clintrialx": {
+      "name": "clintrialx",
+      "version": "0.1.0",
+      "sha256": "1bzhw9mspxc45min7y0qa31iklahpq6i7c8v3n9m4fszb7xsyafs",
+      "depends": ["DBI", "RPostgreSQL", "dplyr", "httr", "lubridate", "progress", "readr", "rmarkdown", "tibble", "xfun"]
+    },
     "cliot": {
       "name": "cliot",
       "version": "0.2.0",
@@ -48373,12 +50185,6 @@
       "sha256": "0y6a6s5l98i0vrj66biwr17g6pzpmm5kfz4c57af0yhv7c4s4was",
       "depends": ["Rcpp"]
     },
-    "clogitLasso": {
-      "name": "clogitLasso",
-      "version": "1.1",
-      "sha256": "1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0",
-      "depends": ["foreach", "lassoshooting"]
-    },
     "clogitboost": {
       "name": "clogitboost",
       "version": "1.1",
@@ -48471,8 +50277,8 @@
     },
     "clue": {
       "name": "clue",
-      "version": "0.3-65",
-      "sha256": "1y1ycb5yw034ccxz15x41ah699hgjffsfvbn15fwdcdjbz9zvy5x",
+      "version": "0.3-66",
+      "sha256": "1yy26zvw15bqphdlb6gj2m4ay92gbb8hvply9hwyndanq1cdv1ma",
       "depends": ["cluster"]
     },
     "clugenr": {
@@ -48541,10 +50347,22 @@
       "sha256": "05yphmjjkc42k945b8qhdrlws5bzr3f0wbancyibn8xh5697wqsx",
       "depends": ["BiDAG", "RBGL", "clue", "graph", "igraph", "pcalg"]
     },
+    "clustTMB": {
+      "name": "clustTMB",
+      "version": "0.1.0",
+      "sha256": "0dzqchr66cwcmvvaz1yfxfh46kd5f2qhlaivynyxww4rix5grlhy",
+      "depends": ["Matrix", "MoEClust", "RcppEigen", "TMB", "clustMixType", "cluster", "fmesher", "lme4", "mclust", "reformulas", "sf"]
+    },
+    "clustcurv": {
+      "name": "clustcurv",
+      "version": "2.0.2",
+      "sha256": "1pmh9xm37shdw74ivis6ynwd8az57nj5pk9c1m70da7ajjr6isb4",
+      "depends": ["Gmedian", "RColorBrewer", "doParallel", "doRNG", "foreach", "ggfortify", "ggplot2", "npregfast", "survival"]
+    },
     "cluster": {
       "name": "cluster",
-      "version": "2.1.6",
-      "sha256": "0r1i243mjbsx00ccg3f46c5iwnfmjxmhhdjvrj3m799mzpx0xifi",
+      "version": "2.1.8",
+      "sha256": "1jk0c3758p71d8icpdsxiizl5dc292kyylx9iparjk396hp4can3",
       "depends": []
     },
     "cluster_datasets": {
@@ -48553,12 +50371,6 @@
       "sha256": "0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il",
       "depends": []
     },
-    "clusterCons": {
-      "name": "clusterCons",
-      "version": "1.2",
-      "sha256": "1k1y6cqpb5fyi2mbx2i4jbiwz0fni44lnq0xnv3pl0x3dpscwh6q",
-      "depends": ["RColorBrewer", "apcluster", "cluster", "lattice"]
-    },
     "clusterCrit": {
       "name": "clusterCrit",
       "version": "1.3.0",
@@ -48579,8 +50391,8 @@
     },
     "clusterMI": {
       "name": "clusterMI",
-      "version": "1.2.1",
-      "sha256": "0irc1fcsvwkyv1g9zyjk9l6hmr1mj78rlndkd2ggg44r22mc1p0m",
+      "version": "1.3",
+      "sha256": "09acbglcih51d0i9mlazps3fab4nw8bmap14gsdc3v562mgl7084",
       "depends": ["ClusterR", "FactoMineR", "NPBayesImputeCat", "Rcpp", "RcppArmadillo", "Rfast", "cat", "diceR", "e1071", "fpc", "ggplot2", "glmnet", "gridExtra", "knockoff", "mclust", "mice", "micemd", "mix", "reshape2", "withr"]
     },
     "clusterRepro": {
@@ -48597,8 +50409,8 @@
     },
     "clusterSim": {
       "name": "clusterSim",
-      "version": "0.51-4",
-      "sha256": "1bvjhbwxxn7mxdspjyly36d258p8js9l1zxsm15kj7nplj4pnkkn",
+      "version": "0.51-5",
+      "sha256": "1lkq2dylimigfpvl4981a6xnn9bi462g0bbfkjz90sak9azzlnwx",
       "depends": ["MASS", "ade4", "cluster", "e1071"]
     },
     "clusterability": {
@@ -48627,8 +50439,8 @@
     },
     "clustermq": {
       "name": "clustermq",
-      "version": "0.9.4",
-      "sha256": "1wrbkimckskldb77cyicqklrhyzp5d58hjgnzp2gwj73cysiw5zx",
+      "version": "0.9.5",
+      "sha256": "1zr3na4if3a6za0fmx37slz3gjhgddc6ca78mvmgfi7n9wlczhyx",
       "depends": ["R6", "Rcpp", "globals", "narray", "progress"]
     },
     "clusternomics": {
@@ -48673,6 +50485,12 @@
       "sha256": "07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq",
       "depends": ["assertthat", "dplyr", "forcats", "ggplot2", "ggraph", "igraph", "magrittr", "rlang", "stringdist", "stringi", "stringr", "tidygraph"]
     },
+    "clustur": {
+      "name": "clustur",
+      "version": "0.1.1",
+      "sha256": "0pm8jzzd4002j8fkfni23h9506rbwb1scqw4ijd4ivmsxn1nd4sm",
+      "depends": ["Matrix", "Rcpp", "testthat"]
+    },
     "clustvarsel": {
       "name": "clustvarsel",
       "version": "2.3.4",
@@ -48711,9 +50529,9 @@
     },
     "cmahalanobis": {
       "name": "cmahalanobis",
-      "version": "0.3.0",
-      "sha256": "1ap8gs9dfkyk5nrq21r2a4h2y040i91n1i20sb4wwhx4n377kh0d",
-      "depends": ["ggplot2", "reshape2"]
+      "version": "0.4.2",
+      "sha256": "1lbw1ffn3lhillzmgg8q4klqybw4hka1jn37b3npzixc0mij8ywb",
+      "depends": ["ggplot2", "mice", "reshape2"]
     },
     "cmbClust": {
       "name": "cmbClust",
@@ -48753,8 +50571,8 @@
     },
     "cmhc": {
       "name": "cmhc",
-      "version": "0.2.8",
-      "sha256": "1rjwc58f43iv3ri7z42z3gzfxcpkrzbd20r07rm6m14d7d5wqw0w",
+      "version": "0.2.9",
+      "sha256": "1dy8f0d6af1bqr16xk2sxxx2zyfs2dg0r34q1baqcfgqn12dffr9",
       "depends": ["aws_s3", "digest", "dplyr", "httr", "readr", "rlang", "stringr", "tibble"]
     },
     "cml": {
@@ -48771,9 +50589,9 @@
     },
     "cmmr": {
       "name": "cmmr",
-      "version": "0.1.2",
-      "sha256": "0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4",
-      "depends": ["RJSONIO", "httr", "progress"]
+      "version": "1.0.3",
+      "sha256": "1qqwg139an072nm2szyk219id8nvqfrq3vb9z813aszmn9h6a16l",
+      "depends": ["RJSONIO", "cli", "httr", "progress"]
     },
     "cmna": {
       "name": "cmna",
@@ -48783,8 +50601,8 @@
     },
     "cmocean": {
       "name": "cmocean",
-      "version": "0.3-1",
-      "sha256": "0y6yd3x2swx88r7kv6f9lrbf3zzawhf2x8izszgg4zb21pkal6k8",
+      "version": "0.3-2",
+      "sha256": "0a4wxakh22rxv9xrmvj0rmky9pbsf4j9dl9fvj9v002flbkw9yv4",
       "depends": []
     },
     "cmprsk": {
@@ -48825,8 +50643,8 @@
     },
     "cmsaf": {
       "name": "cmsaf",
-      "version": "3.5.1",
-      "sha256": "1h4h30k72nclpi8siha050kp8i0va2r1kvwhh3nczb3lhx11zmwl",
+      "version": "3.5.2",
+      "sha256": "19mp8hf34xnw71facrb7xq081x1lclpp84p1pd8n7fy2jmp6r767",
       "depends": ["FNN", "R_utils", "SearchTrees", "cmsafops", "cmsafvis", "colorspace", "colourpicker", "data_table", "maps", "ncdf4", "raster", "shiny", "shinyFiles", "shinyWidgets", "shinyjs", "shinythemes", "xml2"]
     },
     "cmsafops": {
@@ -48837,15 +50655,15 @@
     },
     "cmsafvis": {
       "name": "cmsafvis",
-      "version": "1.2.8",
-      "sha256": "1l1gsbadwgvxvbv37kzsnns4xvhzpmhfrqnzcgd97l7fqwr3yng4",
+      "version": "1.2.9",
+      "sha256": "021dhsa84np86cjbgri0a0z1ymmxs7gr6107c4qq0xyjvh0r427m",
       "depends": ["RColorBrewer", "assertthat", "cmsafops", "colorspace", "countrycode", "fields", "gridExtra", "mapproj", "maps", "ncdf4", "png", "progress", "raster", "rasterVis", "sf", "sp"]
     },
     "cmstatr": {
       "name": "cmstatr",
-      "version": "0.9.3",
-      "sha256": "1hi3zyw73jxrl2spfbbfk5xnyg31jqlslz1342p5s45k4ydvqikm",
-      "depends": ["MASS", "dplyr", "generics", "ggplot2", "kSamples", "purrr", "rlang", "tibble"]
+      "version": "0.10.0",
+      "sha256": "0n2jqm0qp8aayl2ajrka69244d6kzhyaw479d9inf3dvir1fwx22",
+      "depends": ["MASS", "dplyr", "generics", "ggplot2", "kSamples", "purrr", "rlang", "tibble", "tidyr"]
     },
     "cmstatrExt": {
       "name": "cmstatrExt",
@@ -48903,8 +50721,8 @@
     },
     "coRanking": {
       "name": "coRanking",
-      "version": "0.2.4",
-      "sha256": "1c1b005q7dr4868wm6vcs3x0849vf8xj7aacxnyc9wzb4lgkd2lb",
+      "version": "0.2.5",
+      "sha256": "1pl44pk6z1zri3lwp6cqhphvxnm02dbmijgfnwp2919jahgk48gc",
       "depends": []
     },
     "coala": {
@@ -48945,8 +50763,8 @@
     },
     "cobs": {
       "name": "cobs",
-      "version": "1.3-8",
-      "sha256": "08cqpiylbfy5j5xxajpngqaycmmciwhyf3sk3972x2l6rg3lj81c",
+      "version": "1.3-9",
+      "sha256": "1czrnwd8qamznl2vxrj9p37azz7pgqg7ygrhwr4rmhwg5d2k9nrg",
       "depends": ["SparseM", "quantreg"]
     },
     "coca": {
@@ -48969,10 +50787,16 @@
     },
     "cocons": {
       "name": "cocons",
-      "version": "0.1.1",
-      "sha256": "1kcnbhvh42v5rgm730j8qy3xz5bwq265dvj2690p1b2add10v4ml",
+      "version": "0.1.4",
+      "sha256": "18lwz284g95kfzf8vbn9s0gp3k32f2m5liz9hf85lb1d0f6r95bw",
       "depends": ["BH", "Rcpp", "fields", "knitr", "optimParallel", "spam"]
     },
+    "cocoon": {
+      "name": "cocoon",
+      "version": "0.1.0",
+      "sha256": "0dmpvdflwns02mf499nxsqraygbaxhgjp6b1kqylrf7vf3is8hzi",
+      "depends": ["dplyr", "lifecycle"]
+    },
     "cocor": {
       "name": "cocor",
       "version": "1.1-4",
@@ -48981,8 +50805,8 @@
     },
     "cocorresp": {
       "name": "cocorresp",
-      "version": "0.4-4",
-      "sha256": "1njn1zwlm0ibn2vc20q99ih3iqlbks0psq7vrhqak6rmnsvjqjia",
+      "version": "0.4-5",
+      "sha256": "02qzcaf9i55ncr71l9iapzdziqd76s9hljvn819kpvgscdhxdfhn",
       "depends": ["vegan"]
     },
     "cocosoR": {
@@ -49047,9 +50871,9 @@
     },
     "codebook": {
       "name": "codebook",
-      "version": "0.9.2",
-      "sha256": "0hxyzwpjbvfzad8h2428q94m961mmwvv28nagw2d36qxd10awh16",
-      "depends": ["dplyr", "forcats", "ggplot2", "glue", "haven", "htmltools", "jsonlite", "knitr", "labeling", "labelled", "likert", "purrr", "rlang", "rmdpartials", "skimr", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
+      "version": "0.9.5",
+      "sha256": "1jh5qm2qzsvs9pzb67c3z0v5shdzhmqklzp7a9zq9izr9385ilmy",
+      "depends": ["dplyr", "forcats", "future", "ggplot2", "glue", "haven", "htmltools", "jsonlite", "knitr", "labeling", "labelled", "likert", "purrr", "rlang", "rmdpartials", "skimr", "stringr", "tibble", "tidyr", "vctrs"]
     },
     "codebookr": {
       "name": "codebookr",
@@ -49065,8 +50889,8 @@
     },
     "codecountR": {
       "name": "codecountR",
-      "version": "0.0.4.0",
-      "sha256": "0b8qz3lzjc8r9ddjspjhc7azwh0i1v8mx9wrk959fafyracq68fk",
+      "version": "0.0.4.5",
+      "sha256": "1vhmgnhhpf409gy1db4n5hsvgcmbdamp7mzcvn6b85imf6wlk60y",
       "depends": []
     },
     "codemeta": {
@@ -49089,8 +50913,8 @@
     },
     "codep": {
       "name": "codep",
-      "version": "1.2-3",
-      "sha256": "05k7g9nji076zzzyzpp2klr89sllmwz043pcfyiddxifgr77glk3",
+      "version": "1.2-4",
+      "sha256": "04i31h2qf5yvh593vr1fdi9yymldby7g2mmz6vc0ww2rlhwq6bzd",
       "depends": []
     },
     "coder": {
@@ -49173,8 +50997,8 @@
     },
     "cofad": {
       "name": "cofad",
-      "version": "0.3.0",
-      "sha256": "00m32r1rbc5f2b7viks68ff3sv7p4qvc1i8qag0z75l2jxi839f0",
+      "version": "0.3.1",
+      "sha256": "18czr2l9cm4n6vxmjdxasvykn6y17xrkrxyfmlf4z1hbbci3w6sy",
       "depends": ["Hmisc", "dplyr", "magrittr", "readr", "rhandsontable", "rlang", "shiny", "shinydashboard", "shinyjs", "stringr", "tibble"]
     },
     "cofeatureR": {
@@ -49185,9 +51009,9 @@
     },
     "coffee": {
       "name": "coffee",
-      "version": "0.3.0",
-      "sha256": "0vq9mwlc014vfbwyn4id99gx2dm3hyazy0qas0bv30x4fk2z2822",
-      "depends": ["data_table", "rintcal"]
+      "version": "0.4.3",
+      "sha256": "1bbl3kpigwm54k2ixlir8i9imrp8ykm5an0ijvc18fzwg8f2904x",
+      "depends": ["data_table", "rice", "rintcal"]
     },
     "cofid": {
       "name": "cofid",
@@ -49219,10 +51043,16 @@
       "sha256": "1ik2cdw1vigiplsrxy2mbv3l2w9wlzw6xkgrdm4l3pg9x6hhcx6s",
       "depends": ["base64enc", "config", "dplyr", "httr", "jsonlite", "paws", "shiny", "shinyjs"]
     },
+    "cohetsurr": {
+      "name": "cohetsurr",
+      "version": "1.0",
+      "sha256": "148cccy7xb537jpqlrxwq9ysgc3am0vm3k0w9h55pjbana6k6cv6",
+      "depends": ["matrixStats", "mvtnorm"]
+    },
     "cohortBuilder": {
       "name": "cohortBuilder",
-      "version": "0.2.0",
-      "sha256": "117gdqga61h24xa1h534837pz34ym5hnfz6731rrm3lnlzd171w6",
+      "version": "0.3.0",
+      "sha256": "0rwqi9sh69j1bx116q41gby7j0lrh81j232xlp003vs4i7pwwx4k",
       "depends": ["R6", "dplyr", "formatR", "ggplot2", "glue", "jsonlite", "magrittr", "purrr", "rlang", "tibble", "tidyr"]
     },
     "cohorts": {
@@ -49287,8 +51117,8 @@
     },
     "collapse": {
       "name": "collapse",
-      "version": "2.0.15",
-      "sha256": "19pa35yhdkas3kyrj4g3p794lckmrmhgy6gcqfqkcbqzzqiq6b2s",
+      "version": "2.0.18",
+      "sha256": "0mwp5k7pw0dds0f5jb98qmbcg2nlblz6249lsxb26bj25v6404mr",
       "depends": ["Rcpp"]
     },
     "collapsibleTree": {
@@ -49335,9 +51165,9 @@
     },
     "collinear": {
       "name": "collinear",
-      "version": "1.1.1",
-      "sha256": "1vflihmpbqhfl9y8a2s5pnj4pjdj9m20mk80lm6lvff1pjwj2sbp",
-      "depends": ["dplyr"]
+      "version": "2.0.0",
+      "sha256": "1r51qsr09bgz7kwvwspkkhrql6mih7jymv7sgnkvfapyridvw7am",
+      "depends": ["future_apply", "mgcv", "progressr", "ranger", "rpart"]
     },
     "collpcm": {
       "name": "collpcm",
@@ -49429,6 +51259,12 @@
       "sha256": "1wyqliwy64hxbhhij8m5f9s4ranjpqc3qzlkr9m37c9z70lgjril",
       "depends": ["Rcpp", "RcppArmadillo", "data_table", "purrr"]
     },
+    "colorfast": {
+      "name": "colorfast",
+      "version": "1.0.0",
+      "sha256": "04z9n4hbv4yb68sl0gzfbawm4bcm7gyqrlla5yl8fj8z0z965hr3",
+      "depends": []
+    },
     "colorfindr": {
       "name": "colorfindr",
       "version": "0.1.4",
@@ -49477,6 +51313,12 @@
       "sha256": "1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh",
       "depends": []
     },
+    "colorrepel": {
+      "name": "colorrepel",
+      "version": "0.3.0",
+      "sha256": "0p5zfcmyrs567ddn7jilzbvs2k1qr213ims5m0zx1swylxpvjda7",
+      "depends": ["Matrix", "distances", "dplyr", "dqrng", "ggalt", "ggplot2", "ggrepel", "gtools", "knitr", "matrixStats", "plotly", "png", "purrr", "stringr"]
+    },
     "colors3d": {
       "name": "colors3d",
       "version": "1.0.1",
@@ -49533,14 +51375,14 @@
     },
     "cols": {
       "name": "cols",
-      "version": "1.1",
-      "sha256": "1rf27b1xqxqyd99574hj1nv65r08z5ap8rai64baw1skzr5aznkk",
-      "depends": ["Rfast2", "quadprog"]
+      "version": "1.5",
+      "sha256": "1ral7v3y9mvp8qlh15pk8a04r6k2swjr2iisk5wq30kp1lv76nrb",
+      "depends": ["Rfast", "Rfast2", "quadprog"]
     },
     "cols4all": {
       "name": "cols4all",
-      "version": "0.7-1",
-      "sha256": "0qjmrafzx7gw8glbpxsmrb2qkddgbqq3rvb16jzcq5jm5m77klns",
+      "version": "0.8",
+      "sha256": "19r7b9ndq80sbzfnksh6869ffbwx5jvlqvccwrijczbls1xhhnlr",
       "depends": ["abind", "colorspace", "png", "spacesXYZ", "stringdist"]
     },
     "colt": {
@@ -49569,9 +51411,9 @@
     },
     "combat_enigma": {
       "name": "combat.enigma",
-      "version": "1.0",
-      "sha256": "1hz1fbjfsmz5m6mzhq7pyvx2pdm0v6f3afpzjnz0xnz30ckfgshr",
-      "depends": []
+      "version": "1.1.1",
+      "sha256": "1pbd598xdk5xfckjy9pab4q9l48c88ynz4bjhg7pcyfjg77w3x14",
+      "depends": ["Matrix", "car", "caret", "nlme"]
     },
     "combinIT": {
       "name": "combinIT",
@@ -49635,8 +51477,8 @@
     },
     "comets": {
       "name": "comets",
-      "version": "0.0-2",
-      "sha256": "13ni4c0szfizgad56ydxz8i5w25vr76h18jspc260z2mzcns084z",
+      "version": "0.1-0",
+      "sha256": "19j0k4603888kljpibfp7m7d1hd59g2mdnrin4ay1qkbx83lxmkn",
       "depends": ["Formula", "coin", "glmnet", "ranger", "survival"]
     },
     "comf": {
@@ -49659,8 +51501,8 @@
     },
     "commonmark": {
       "name": "commonmark",
-      "version": "1.9.1",
-      "sha256": "0fxm1nn4al0yn79iqix9cp5j5chr8jq56d29ayqrpag49hzs25wm",
+      "version": "1.9.2",
+      "sha256": "1sw6nizfbb88358r6mafiqiqdwd49cvf507g5cqggf72x3xxqshx",
       "depends": []
     },
     "commonsMath": {
@@ -49693,12 +51535,6 @@
       "sha256": "1rjsgvln5wa7bbh4iqpfvmdqvmx4cgl8mxxkar76rkam9r54hwhv",
       "depends": ["dplyr", "magrittr", "sf"]
     },
-    "compHclust": {
-      "name": "compHclust",
-      "version": "1.0-3",
-      "sha256": "0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj",
-      "depends": []
-    },
     "comparator": {
       "name": "comparator",
       "version": "0.1.2",
@@ -49725,21 +51561,21 @@
     },
     "compareGroups": {
       "name": "compareGroups",
-      "version": "4.8.0",
-      "sha256": "0v747rxg864gml937zizp80sf15jw2v4svcafdysna62shp4rypv",
-      "depends": ["HardyWeinberg", "chron", "flextable", "kableExtra", "knitr", "officer", "rmarkdown", "survival", "writexl"]
+      "version": "4.9.1",
+      "sha256": "0n67avlikmvn2lin7g677cibijfgyy22a26byxw806wznbczb9cy",
+      "depends": ["HardyWeinberg", "PMCMRplus", "chron", "flextable", "kableExtra", "knitr", "officer", "rmarkdown", "survival", "writexl"]
     },
     "compareMCMCs": {
       "name": "compareMCMCs",
-      "version": "0.5.0",
-      "sha256": "0g3fzazfs6f8ni251ilzk0q65hvgfhglly7v4rmkl4jwhzvsz1yr",
-      "depends": ["R6", "coda", "ggplot2", "nimble", "reshape2", "xtable"]
+      "version": "0.6.0",
+      "sha256": "0h55azjbz7lr78y65ypjmqri6g69cwmjwpj50kgk3kw2phla1pqw",
+      "depends": ["R6", "coda", "dplyr", "ggplot2", "nimble", "reshape2", "rlang", "xtable"]
     },
     "comparer": {
       "name": "comparer",
-      "version": "0.2.3",
-      "sha256": "1025r91cag4d1bpnpx5h7ja0a57k4rs9z1s3a90pq3h91rdcsr1c",
-      "depends": ["R6"]
+      "version": "0.2.4",
+      "sha256": "0jyqnma93z9fihcnpgxm6d6r2dah15ap5ii3l1d3ddbhs1b56y37",
+      "depends": ["GauPro", "R6", "mixopt", "plyr", "progress", "rmarkdown"]
     },
     "comparison": {
       "name": "comparison",
@@ -49825,6 +51661,12 @@
       "sha256": "0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y",
       "depends": ["boot", "ggplot2", "robustbase", "scales"]
     },
+    "compositeReliabilityInNestedDesigns": {
+      "name": "compositeReliabilityInNestedDesigns",
+      "version": "1.0.4",
+      "sha256": "13936214rr398758sw3l534fr4qr8b83bm4ygjbvfj9k33df2xby",
+      "depends": ["Rsolnp", "dplyr", "ggplot2", "lme4", "magrittr", "plyr", "psych", "reshape2", "tidyr"]
+    },
     "compositions": {
       "name": "compositions",
       "version": "2.0-8",
@@ -49833,8 +51675,8 @@
     },
     "compound_Cox": {
       "name": "compound.Cox",
-      "version": "3.30",
-      "sha256": "0yl2c51kl6q2j50av1acyaqcj37y4qhk9mjp7niqzq9s9zj2hnp0",
+      "version": "3.31",
+      "sha256": "0ynv2mpsph40dpkkf6fxw3kvk9x41wdfrk6332ghvfm7xn1aa97h",
       "depends": ["MASS", "numDeriv", "survival"]
     },
     "comprehenr": {
@@ -49863,8 +51705,8 @@
     },
     "comtradr": {
       "name": "comtradr",
-      "version": "1.0.1",
-      "sha256": "0mdckqnsx8xgidbw1sa39y9l6kbsvv41vbw65jfk0irlxqs11v9q",
+      "version": "1.0.3",
+      "sha256": "1lh6j5w1arkginnc8f7175b3bqbqa57ghd0rszk1pqq3wwfhpsw2",
       "depends": ["askpass", "cachem", "cli", "fs", "httr2", "lifecycle", "lubridate", "memoise", "poorman", "purrr", "rappdirs", "readr", "rlang", "stringr"]
     },
     "con2aqi": {
@@ -49975,6 +51817,12 @@
       "sha256": "1dicfa82yg8k83lnb5c17jnqwgkazpb8404kfzdf6ikmndwjn0zg",
       "depends": ["condMVNorm", "matrixNormal", "tmvmixnorm", "tmvtnorm", "truncnorm"]
     },
+    "condathis": {
+      "name": "condathis",
+      "version": "0.1.0",
+      "sha256": "0nk7j5di9pmmislm4xnx44b9pkclhpl95q1mk6157iz3xzznqpqc",
+      "depends": ["cli", "fs", "jsonlite", "processx", "rlang", "stringr", "tibble", "withr"]
+    },
     "condensr": {
       "name": "condensr",
       "version": "1.0.0",
@@ -49993,6 +51841,12 @@
       "sha256": "0aknc1qj95wf99kqzcsfqhjpvbgazv7jqpwla1g146b6fkig532h",
       "depends": ["BayesFactor", "effsize", "knitr", "psych", "shiny", "xtable"]
     },
+    "conditionalProbNspades": {
+      "name": "conditionalProbNspades",
+      "version": "1.0",
+      "sha256": "0z621mnwxcv51r2x6jhp0r2b4d7gbi1095f9cjpwp0cwwvpcazw2",
+      "depends": []
+    },
     "conditionz": {
       "name": "conditionz",
       "version": "0.1.0",
@@ -50001,8 +51855,8 @@
     },
     "condor": {
       "name": "condor",
-      "version": "2.1.0",
-      "sha256": "0v8crlg5pjqa2d37pb6744srn60cqzcih2100y3xh2a7wjml2d4w",
+      "version": "3.0.0",
+      "sha256": "0aix4v1ninz4hk3qwdgpicr3l94sa2n0rzcj4p4ld9mcwahxf5bk",
       "depends": ["ssh"]
     },
     "condorOptions": {
@@ -50017,12 +51871,6 @@
       "sha256": "1kjnjpaiya5ym20y1vry53dshna14dvcjfzgbfizg4g1izsg1czy",
       "depends": ["R6", "htmltools", "shiny"]
     },
-    "condusco": {
-      "name": "condusco",
-      "version": "0.1.0",
-      "sha256": "0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s",
-      "depends": ["DBI", "assertthat", "bigrquery", "jsonlite"]
-    },
     "condvis": {
       "name": "condvis",
       "version": "0.5-1",
@@ -50193,9 +52041,9 @@
     },
     "connectapi": {
       "name": "connectapi",
-      "version": "0.2.0",
-      "sha256": "0k3z30kgz8yl07kxfbqy1w8bdr0viyglibxv6y36f46q6nf1mf6a",
-      "depends": ["R6", "bit64", "fs", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "purrr", "rlang", "tibble", "uuid", "vctrs"]
+      "version": "0.5.0",
+      "sha256": "1468qi4g7q9asak833nj7gbvbvy51691klpk20ksphbf9n27mwcp",
+      "depends": ["R6", "bit64", "fs", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "mime", "purrr", "rlang", "tibble", "uuid", "vctrs"]
     },
     "connections": {
       "name": "connections",
@@ -50247,8 +52095,8 @@
     },
     "conrad": {
       "name": "conrad",
-      "version": "1.0.0",
-      "sha256": "0n0snn7ppmr1l5y0978sl6bj614p0b5vvh4hw55pjbj9qn1fshaj",
+      "version": "1.0.0.1",
+      "sha256": "19ya71qn898rfrbn5v72dhawsr56b29k3nw9zx096rr6iqws023p",
       "depends": ["httr2", "jsonlite", "magrittr"]
     },
     "conserveR": {
@@ -50281,6 +52129,12 @@
       "sha256": "1c71wvr7sckrv4k65l71l160z6d9amzyydbi6mf2b79zh9zv8g1g",
       "depends": ["DiagrammeR", "data_table", "dplyr", "magrittr", "purrr", "rlang", "shiny", "shinydashboard", "tibble"]
     },
+    "consrq": {
+      "name": "consrq",
+      "version": "1.0",
+      "sha256": "1rc6gibb2nmvfhha5wdx6gplyhqyqmdfp5pgxj54siq5iqkypiqr",
+      "depends": ["Rfast", "quantreg"]
+    },
     "constants": {
       "name": "constants",
       "version": "1.0.1",
@@ -50295,8 +52149,8 @@
     },
     "constrainedKriging": {
       "name": "constrainedKriging",
-      "version": "0.2-7",
-      "sha256": "06hx4kj9dfvw16fw3imxkiw1cc4k7a9pky34mrvdwhb205x91dii",
+      "version": "0.2-8",
+      "sha256": "0qbbjb1dhdsrgpnnsfwys28xhlsy8xj35pdqrza8hih5z2vp4nq6",
       "depends": ["sf", "sp", "spatialCovariance"]
     },
     "constructive": {
@@ -50319,14 +52173,14 @@
     },
     "contactdata": {
       "name": "contactdata",
-      "version": "1.0.0",
-      "sha256": "0lh3m5aln47clyc5pmz75sggqnzgkg68wyrla11zbg9isyh581nw",
+      "version": "1.1.0",
+      "sha256": "1dbh13p03md2gvgmsdrdg3b1c5fb2mi6p1jqygvw8kfw1468i1k1",
       "depends": []
     },
     "container": {
       "name": "container",
-      "version": "1.0.4",
-      "sha256": "0vpha9s5d8mxqdzmbfy92qz78b6gfibwgp1ijq70c5vqs2clkzb1",
+      "version": "1.0.5",
+      "sha256": "0kirab46p51n6592lsa82bkwi5g3rx5ixz6ag1ds74yw3r8j62g5",
       "depends": ["R6", "data_table"]
     },
     "contentid": {
@@ -50349,8 +52203,8 @@
     },
     "contingencytables": {
       "name": "contingencytables",
-      "version": "3.0.0",
-      "sha256": "1cp5cmvcxqzsagkmy4h612zrfxvaiv0ililvnzbcpxlxva3xmyba",
+      "version": "3.0.1",
+      "sha256": "0fy5rrwkas8rxvl08vvhxzcdddkhd3qy9fxxx0sgjw034k3fps3h",
       "depends": ["MASS", "boot"]
     },
     "contourPlot": {
@@ -50371,6 +52225,12 @@
       "sha256": "1k7gdjmzgsw3rm90k9gpzlg4b8ma7vxamdj106b6r40q1ypaqha5",
       "depends": ["nlme", "rms", "sandwich"]
     },
+    "contrastable": {
+      "name": "contrastable",
+      "version": "1.0.2",
+      "sha256": "0m14p86rhim5lbs3fdx0hwpm87z2sjjf4a1h03cw33f68adqv773",
+      "depends": ["MASS", "cli", "crayon", "glue", "purrr", "rlang", "tidyselect"]
+    },
     "contribution": {
       "name": "contribution",
       "version": "0.2.2",
@@ -50413,6 +52273,12 @@
       "sha256": "01ajzjj0ahlbv0q708hj7cw98b0dahnhkxrd79nrs1wb06rr2j9x",
       "depends": ["broom", "caTools", "dplyr", "eurostat", "ggplot2", "ggpubr", "leaflet", "purrr", "rlang", "rmarkdown", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "conversim": {
+      "name": "conversim",
+      "version": "0.1.0",
+      "sha256": "19s4hy1v7ib4zg393cp0b5hwalw999n2szcigcfijrhfycyk8nsy",
+      "depends": ["ggplot2", "lme4", "lsa", "sentimentr", "slam", "tm", "topicmodels", "word2vec"]
+    },
     "convertBCD": {
       "name": "convertBCD",
       "version": "1.0",
@@ -50445,8 +52311,8 @@
     },
     "convey": {
       "name": "convey",
-      "version": "1.0.0",
-      "sha256": "1v9rd5270cwr5dygh8xdyqc093qf743j8jvy3f3hds0q9ydx14jh",
+      "version": "1.0.1",
+      "sha256": "1i85j4wam81iskmynjr81xh065gh2d0wi01gprs7vg5dsvshxfh9",
       "depends": ["survey"]
     },
     "convoSPAT": {
@@ -50493,8 +52359,8 @@
     },
     "copBasic": {
       "name": "copBasic",
-      "version": "2.2.4",
-      "sha256": "0wydq03c9pvbvmcrxqw2n86ny655lhkd40ag60k6d3hjvmmv5vn6",
+      "version": "2.2.6",
+      "sha256": "01yi81v1s893b8wqwkwz5613a7j7dcb41mdnd7hbxfg3s443w8iv",
       "depends": ["lmomco", "randtoolbox"]
     },
     "copCAR": {
@@ -50541,8 +52407,8 @@
     },
     "cops": {
       "name": "cops",
-      "version": "1.11-3",
-      "sha256": "04rmi45yjzll52dsdf4qci0a06v5a9kslr36c16ginkf3w64s48y",
+      "version": "1.12-1",
+      "sha256": "0wcan46qnij8qp089ff0g7wr6byv91zd517hkmxg1zmcidcna0ys",
       "depends": ["GenSA", "NlcOptim", "Rsolnp", "analogue", "cmaes", "cordillera", "crs", "dfoptim", "minqa", "nloptr", "pso", "rgenoud", "smacof", "smacofx", "subplex"]
     },
     "copula": {
@@ -50617,6 +52483,12 @@
       "sha256": "1advzmbmnpq18ym2k8rcxhsdzfscl68jss8wbqcir68951x2aqi3",
       "depends": ["htmltools"]
     },
+    "corbouli": {
+      "name": "corbouli",
+      "version": "0.1.3",
+      "sha256": "0hdl5f426wp2f5k8nc9fhc1g1rbpqsm6kjkvyfk120anvcj09nyk",
+      "depends": []
+    },
     "corclass": {
       "name": "corclass",
       "version": "0.2.1",
@@ -50631,8 +52503,8 @@
     },
     "cordillera": {
       "name": "cordillera",
-      "version": "1.0-0",
-      "sha256": "047sl2pvfh800ggc8v62p06nfbdz8rwn4alviplf5kbvi0k3s85n",
+      "version": "1.0-3",
+      "sha256": "0fr08yzag8a866939bx3l9lqi98kvj3vi7llax1m39nlsr0ihrdk",
       "depends": ["dbscan"]
     },
     "coreCT": {
@@ -50667,8 +52539,8 @@
     },
     "corels": {
       "name": "corels",
-      "version": "0.0.4",
-      "sha256": "1ygbvhnz304y4y708ygr4x6kbwv7bfpjd5hhcrcc6lma59h7arfn",
+      "version": "0.0.5",
+      "sha256": "1ixgsgk0pbdwvk3j62lm010fwngrz6x16i9jhxs5g09lbxy2pr29",
       "depends": ["Rcpp"]
     },
     "corkscrew": {
@@ -50691,14 +52563,14 @@
     },
     "cornet": {
       "name": "cornet",
-      "version": "0.0.9",
-      "sha256": "1gd0sbf3kqzd8zwkbwbj9d8cyz52iglh1czv5ydf7nw1z8hx33r4",
+      "version": "1.0.0",
+      "sha256": "1lh6fszgxzyvxfqpl8fnxxhw521g5pg9ah9jwy9fsj06sa9yrp8i",
       "depends": ["glmnet", "palasso"]
     },
     "coro": {
       "name": "coro",
-      "version": "1.0.4",
-      "sha256": "0r6cb2gr29vxjlbfzqxdgbccp57l6raxncljisl1vyj6xi2by8cg",
+      "version": "1.1.0",
+      "sha256": "1kvaf5484s6dn6zm4nw0ns6fi09lcqnljb51w4fdgsm80s04k6kc",
       "depends": ["rlang"]
     },
     "coroICA": {
@@ -50725,6 +52597,12 @@
       "sha256": "028fw61n61i79fhnaqx7gmdifdpbvp3yiaq9vvfrbv4k7i84r83i",
       "depends": []
     },
+    "corpmetrics": {
+      "name": "corpmetrics",
+      "version": "1.0",
+      "sha256": "0v4gwd0szzyl7wqcncy5259g05fcagk2zdc6mxrqvdqlf921zn67",
+      "depends": []
+    },
     "corpora": {
       "name": "corpora",
       "version": "0.6",
@@ -50733,8 +52611,8 @@
     },
     "corporaexplorer": {
       "name": "corporaexplorer",
-      "version": "0.8.6",
-      "sha256": "1d3a1dfch9fsgq0d3am3j4ygab9k1n7px3crwwr33f8n9r3vdwmp",
+      "version": "0.9.0",
+      "sha256": "1cr5jqdqyr22x31m1qgprdisybzg90s8fifg8c5dvvnmkv9ifp78",
       "depends": ["RColorBrewer", "data_table", "dplyr", "ggplot2", "lubridate", "magrittr", "padr", "plyr", "re2", "rlang", "rmarkdown", "scales", "shiny", "shinyWidgets", "shinydashboard", "shinyjs", "stringi", "stringr", "tibble", "tidyr"]
     },
     "corpustools": {
@@ -50793,8 +52671,8 @@
     },
     "correlation": {
       "name": "correlation",
-      "version": "0.8.5",
-      "sha256": "0b5vq7lvvwcv0sw54548ncn85nq6i78dpm44dfvrl23vg65pff0y",
+      "version": "0.8.6",
+      "sha256": "0sss7xr9k31kyxgbwbg8gk5bqxyvpb29pjvah0kg9i75sqqvnpms",
       "depends": ["bayestestR", "datawizard", "insight", "parameters"]
     },
     "correlationfunnel": {
@@ -50841,8 +52719,8 @@
     },
     "corrplot": {
       "name": "corrplot",
-      "version": "0.94",
-      "sha256": "1x2mgq5fnws6imywwrkshcq41qh1dmdq98kxmf6yrpwjffpmv1cf",
+      "version": "0.95",
+      "sha256": "0xnpi4cqclsikd00mjn0qb611g1a619hfr2d3ch8kra1a1kiz8w4",
       "depends": []
     },
     "corrr": {
@@ -50937,8 +52815,8 @@
     },
     "cotram": {
       "name": "cotram",
-      "version": "0.5-1",
-      "sha256": "0ckbkhgg7026nf9xkqq3lnfi8gzb78vj4crpxms8ljxxbgv6zai1",
+      "version": "0.5-2",
+      "sha256": "19z3nsv1cy737mma4q1i8pr8zgnhv8pyrb2airxchbwlf4dxv2vb",
       "depends": ["Matrix", "alabama", "basefun", "mlt", "qrng", "survival", "tram", "variables"]
     },
     "cotrend": {
@@ -50997,8 +52875,8 @@
     },
     "counterfactuals": {
       "name": "counterfactuals",
-      "version": "0.1.4",
-      "sha256": "1sv7gswhwnhci07lvgvcnfvb7zav76r3576ymp704l6llhs44ybm",
+      "version": "0.1.6",
+      "sha256": "0qa6a2kp8w1na35i0qcyxpk99b4qw6si1pfvjamjz1qvr2xa8rhz",
       "depends": ["R6", "StatMatch", "bbotk", "checkmate", "data_table", "iml", "miesmuschel", "paradox"]
     },
     "countfitteR": {
@@ -51051,8 +52929,8 @@
     },
     "coursekata": {
       "name": "coursekata",
-      "version": "0.18.0",
-      "sha256": "05rqbi8sxr2fgaldg8fppil43a7pdw86wxpsgizln1bgncjpyywf",
+      "version": "0.18.1",
+      "sha256": "0j3c42f3ay3k5w2jrlq0yd2jh0p38q5lywp5rawhvls2ibg45ibm",
       "depends": ["Metrics", "cli", "dslabs", "ggformula", "ggplot2", "glue", "lsr", "mosaic", "palmerpenguins", "purrr", "remotes", "rlang", "supernova", "vctrs", "viridisLite"]
     },
     "covBM": {
@@ -51091,6 +52969,12 @@
       "sha256": "1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h",
       "depends": ["Rcpp", "RcppEigen"]
     },
+    "covalchemy": {
+      "name": "covalchemy",
+      "version": "1.0.0",
+      "sha256": "164wjjr32gbzqfpplqr54vcqmqgnxpr0ngv2np5bhqfibfsay0rp",
+      "depends": ["DescTools", "MASS", "clue", "dplyr", "ggExtra", "ggplot2", "gridExtra", "interp", "mvtnorm"]
+    },
     "covatest": {
       "name": "covatest",
       "version": "1.2.3",
@@ -51273,9 +53157,9 @@
     },
     "cowsay": {
       "name": "cowsay",
-      "version": "0.9.0",
-      "sha256": "18jr8v0c4vvwvixklcl3kggwzhq1xnpi3brdjiby48zh873b2chd",
-      "depends": ["crayon", "fortunes", "rmsfact"]
+      "version": "1.0.0",
+      "sha256": "1l9455777dchi09bmq8nnqvixvb22xq5xw1s92s4pwms3ab41gbs",
+      "depends": ["crayon", "rlang"]
     },
     "coxed": {
       "name": "coxed",
@@ -51291,8 +53175,8 @@
     },
     "coxme": {
       "name": "coxme",
-      "version": "2.2-20",
-      "sha256": "0qnbhywav7xhs6r3f6m4lb1pvw8gfylnrll0zss5h578mgdfmvm0",
+      "version": "2.2-22",
+      "sha256": "09p179ks8f2s6qmgsvcyl2d3vwwrwwjmbv50c41kl9ymikm95d0v",
       "depends": ["Matrix", "bdsmatrix", "nlme", "survival"]
     },
     "coxphSGD": {
@@ -51307,6 +53191,12 @@
       "sha256": "1miljwgkrzm4xpy5vbs519pzi1aycgr1n6gdd3m5w9x0fm2i7syw",
       "depends": ["generics", "survival", "tibble"]
     },
+    "coxphm": {
+      "name": "coxphm",
+      "version": "0.1.0",
+      "sha256": "0q1vzpqh1cijv1x7n16p7mnbdspbd17h9q6lhhklrk00lcyhinbd",
+      "depends": ["MASS", "survival"]
+    },
     "coxphw": {
       "name": "coxphw",
       "version": "4.0.3",
@@ -51345,26 +53235,26 @@
     },
     "cpd": {
       "name": "cpd",
-      "version": "0.3.2",
-      "sha256": "049df4ip3x7v9zviw7b4m1hp2w4gpfi6cq066mqal41frgvfmwdb",
+      "version": "0.3.3",
+      "sha256": "0rffkw87j77k1r1ipi8avibbkfsp97g52amawz2nj1mrkgamj2g2",
       "depends": ["Rdpack", "dgof", "hypergeo"]
     },
     "cpfa": {
       "name": "cpfa",
-      "version": "1.1-4",
-      "sha256": "075bbp56sx6n1bzdign9iyk2q9j35b6mrqpjwk9aiw27k4n6wmxj",
+      "version": "1.1-6",
+      "sha256": "1kwi5bvzppsls97wsqpl7q6rzycdhp31bdq6bcisqybplp4zryj4",
       "depends": ["doParallel", "e1071", "foreach", "glmnet", "multiway", "nnet", "randomForest", "rda", "xgboost"]
     },
     "cpi": {
       "name": "cpi",
-      "version": "0.1.4",
-      "sha256": "1gz92jcl8wg2vp8qhnkn37l2xs8wjdbjvnga22v9n943k9zsk2kh",
+      "version": "0.1.5",
+      "sha256": "13qygq8f3nqm9s3xapyqwj4wqh75cjv6ffq92pg6njpki9al1viy",
       "depends": ["foreach", "knockoff", "lgr", "mlr3"]
     },
     "cplm": {
       "name": "cplm",
-      "version": "0.7-12",
-      "sha256": "1m0b0jksl1y90q4sdhjspby4hafxxdgra8sbicd5rsrwq4hzwyxc",
+      "version": "0.7-12.1",
+      "sha256": "0z99fnmadjpx7d41p575dypy3pgsxxzani9npyishv5719hw35cf",
       "depends": ["Matrix", "biglm", "coda", "ggplot2", "minqa", "nlme", "reshape2", "statmod", "tweedie"]
     },
     "cplots": {
@@ -51387,9 +53277,9 @@
     },
     "cpmr": {
       "name": "cpmr",
-      "version": "0.0.9",
-      "sha256": "0hy6h32ga7gadc01z24a8ccld0bszzjw939gbhbqbmm672k728mc",
-      "depends": ["Rfast"]
+      "version": "0.1.0",
+      "sha256": "0scjp3v6li9hr7pbvmlci2qmdbmd1yzlcpr748bdm9cp548cjpqg",
+      "depends": ["Rfast", "generics", "tibble"]
     },
     "cpop": {
       "name": "cpop",
@@ -51399,16 +53289,28 @@
     },
     "cpp11": {
       "name": "cpp11",
-      "version": "0.4.7",
-      "sha256": "0i234s1g1vc6m2sqxia5r1gaca05znjv4bff5dj74fach9k147c0",
+      "version": "0.5.1",
+      "sha256": "1m5gg7rxcpjy125c8xxxgx0zaw33p7g1xr1wxvafkhidpiss87ix",
       "depends": []
     },
     "cpp11armadillo": {
       "name": "cpp11armadillo",
-      "version": "0.2.8",
-      "sha256": "1hn7yksy6rhb9kmykf2w677555zbxdwxpzasi1g3mp3riqssabib",
+      "version": "0.4.1",
+      "sha256": "0hyh94savyq90rqbvfirzz32s3kjwd7s7k4089q59d2mn85qnsw2",
+      "depends": ["cpp11"]
+    },
+    "cpp11eigen": {
+      "name": "cpp11eigen",
+      "version": "0.2.0",
+      "sha256": "1bnr08a0pspgbzpjgbvkgng9i4z094ljlw9zxf8gl83mygdh93xy",
       "depends": []
     },
+    "cpp11qpdf": {
+      "name": "cpp11qpdf",
+      "version": "1.3.5",
+      "sha256": "0i13isvc0qnsp2yvn68w4nmhs9b8sghczg99yr64rlbcmhg43blw",
+      "depends": ["cpp11", "curl"]
+    },
     "cppRouting": {
       "name": "cppRouting",
       "version": "3.1",
@@ -51421,10 +53323,16 @@
       "sha256": "1f3b8gadpiyxwxp34pd3i7s715dkm23427fp86vvnqvy9schg3ga",
       "depends": ["V8", "htmlwidgets", "rmarkdown", "rstudioapi", "shiny", "xml2"]
     },
+    "cppcontainers": {
+      "name": "cppcontainers",
+      "version": "1.0.1",
+      "sha256": "0r7580rlc84zfqh8cj1bhinz0sdsamcw80xkky1cbrwczwmjhxy9",
+      "depends": ["Rcpp"]
+    },
     "cppdoubles": {
       "name": "cppdoubles",
-      "version": "0.2.0",
-      "sha256": "1m5d4lwji6yrbzb68m61zkrkchj9mv7m0sdqg2vnxzr5799whckh",
+      "version": "0.3.0",
+      "sha256": "0f4fdq24gamr1vl92mnganx6q4hjr7sv0riwqzn9hhhjh9g9lpvs",
       "depends": ["cpp11"]
     },
     "cpr": {
@@ -51477,8 +53385,8 @@
     },
     "cptcity": {
       "name": "cptcity",
-      "version": "1.0.6",
-      "sha256": "03g10pjpz7gb6daalinki7smfjhbadrsmnxf6qgygqdaxm3ah400",
+      "version": "1.1.1",
+      "sha256": "0azw06kmh9gm963v1kmy0zzl1xrshj3hnkjnwa45q8jr921151cy",
       "depends": []
     },
     "cqrReg": {
@@ -51507,8 +53415,8 @@
     },
     "crandep": {
       "name": "crandep",
-      "version": "0.3.10",
-      "sha256": "07y5gkxdr12v715zy9skgjhw3sjsjlscpfril4hcdz0qwhr5cy5d",
+      "version": "0.3.11",
+      "sha256": "0svv8lz2654142p62rjskpwqiwhqiclx3v8swskk40738f8nw6d7",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gsl", "igraph", "pracma", "stringr"]
     },
     "crank": {
@@ -51567,8 +53475,8 @@
     },
     "crch": {
       "name": "crch",
-      "version": "1.1-2",
-      "sha256": "1iwamq8iq51sbwbis2fc783y7a0k4a7v103f4mx7mp6wrcpsg9rq",
+      "version": "1.2-1",
+      "sha256": "181yczk269nw7d1pprs5662lj1423lni0id0k3pg37ifqhjjdqzn",
       "depends": ["Formula", "ordinal", "sandwich", "scoringRules"]
     },
     "crctStepdown": {
@@ -51585,8 +53493,8 @@
     },
     "credentials": {
       "name": "credentials",
-      "version": "2.0.1",
-      "sha256": "12rm7hjrbl3vfcbvdqc1hx3a6b91gf83xm455cn9myjapm2zqz1c",
+      "version": "2.0.2",
+      "sha256": "02jxbd6nwii243r88h57h9z37knl7jm1jdzg9bpd6g5r6a4dfss9",
       "depends": ["askpass", "curl", "jsonlite", "openssl", "sys"]
     },
     "creditmodel": {
@@ -51595,6 +53503,12 @@
       "sha256": "1nmp5h1cji7g2wh099zlgcqjxi30kcb0lv7b84w3dx9aplsja57l",
       "depends": ["cli", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "glmnet", "rpart", "xgboost"]
     },
+    "creditr": {
+      "name": "creditr",
+      "version": "0.6.2",
+      "sha256": "16qqvsbbs0i3xfqkkpb6lbclkwc8maal9c9ky38cqwpbicz5zkdn",
+      "depends": ["RCurl", "Rcpp", "XML", "devtools", "quantmod", "xts", "zoo"]
+    },
     "credsubs": {
       "name": "credsubs",
       "version": "1.1.1",
@@ -51607,28 +53521,22 @@
       "sha256": "0kwjjkavch21grx845kdcansaj0g407v7z3wmhy4whra9ic12y76",
       "depends": []
     },
-    "cregg": {
-      "name": "cregg",
-      "version": "0.4.0",
-      "sha256": "1a34jhdk4r9ywsrc5dc8wq5am3059cli60f6n2n8j04ls13fvlkd",
-      "depends": ["ggplot2", "ggstance", "lmtest", "sandwich", "scales", "survey"]
-    },
     "crew": {
       "name": "crew",
-      "version": "0.9.5",
-      "sha256": "1js1znvvp650v8zpsh0vy58m5plylhq5h4x26pijk3vr6w3bl7q2",
+      "version": "0.10.2",
+      "sha256": "1ldvhh8yh8nd905hp651p0yc7f119ggbavqxadc13g6v6j8365x3",
       "depends": ["R6", "cli", "data_table", "getip", "later", "mirai", "nanonext", "processx", "promises", "ps", "rlang", "tibble", "tidyselect"]
     },
     "crew_aws_batch": {
       "name": "crew.aws.batch",
-      "version": "0.0.6",
-      "sha256": "06q06jc53w0yh91vs45r8g9q13avcfi6s30h2bwqbdsqsx6rk54r",
+      "version": "0.0.7",
+      "sha256": "0vgjrqdm6xcallx8mdwk3g9h3fv4shq2zv7pz2mf0z9drlyaw4lb",
       "depends": ["R6", "cli", "crew", "paws_common", "paws_compute", "paws_management", "rlang", "tibble"]
     },
     "crew_cluster": {
       "name": "crew.cluster",
-      "version": "0.3.2",
-      "sha256": "1n40rl1z64ig7jp637xrydnvzmpjad76xsd2avhb8nkbcima89f8",
+      "version": "0.3.3",
+      "sha256": "1a6ix0fnpg41bpdrdgas0z066789gj3mxvv6k0hf1d2i6vxqpwv9",
       "depends": ["R6", "crew", "lifecycle", "ps", "rlang", "vctrs", "xml2", "yaml"]
     },
     "crfsuite": {
@@ -51661,6 +53569,12 @@
       "sha256": "16b413drkxccxcq269spl6rwfmy61pwl7xq237g018nih439ym7d",
       "depends": ["digest", "dplyr", "osfr", "purrr", "rlang", "sf", "stringr"]
     },
+    "crimedatasets": {
+      "name": "crimedatasets",
+      "version": "0.1.0",
+      "sha256": "0j2db6rpqldv9igz23vqnan6vvvdycx4awqy9gmbqp8ihfsj7imy",
+      "depends": []
+    },
     "crimeutils": {
       "name": "crimeutils",
       "version": "0.5.1",
@@ -51699,8 +53613,8 @@
     },
     "crm12Comb": {
       "name": "crm12Comb",
-      "version": "0.1.6",
-      "sha256": "18pmsrgpc9yy3zwhdfcks5863r2cz756vrblls9s1j7pvsl4jszm",
+      "version": "0.1.9",
+      "sha256": "19k32zbb6dl6iiz3qfiwagh5vzn50kdha1kjd7scjn1m87rcckx7",
       "depends": ["dplyr", "ggforce", "ggplot2"]
     },
     "crmPack": {
@@ -51825,8 +53739,8 @@
     },
     "crossnma": {
       "name": "crossnma",
-      "version": "1.2.0",
-      "sha256": "0ma07lvf56z1ya587lb4zv8rbhzi8crnsgvh3xsz80livx9cdvp5",
+      "version": "1.3.0",
+      "sha256": "1z3q831769cd25fpnzbp6jvya872zdq56bxqpk1iav2gwp0m1kfn",
       "depends": ["coda", "dplyr", "ggplot2", "magrittr", "meta", "netmeta", "plyr", "rjags", "rlang", "tidyr"]
     },
     "crossrun": {
@@ -51837,8 +53751,8 @@
     },
     "crosstable": {
       "name": "crosstable",
-      "version": "0.7.0",
-      "sha256": "1xghynjnrk89952sa9i6rxjqnnw2w2bdf722n91k1jgcg15gkvy9",
+      "version": "0.8.1",
+      "sha256": "0wddk7wngmmjgnxrdadqakxaqs72612h02yaia6yasmmn2pl1snm",
       "depends": ["checkmate", "cli", "dplyr", "flextable", "forcats", "glue", "lifecycle", "officer", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "crosstalk": {
@@ -51915,14 +53829,14 @@
     },
     "crrstep": {
       "name": "crrstep",
-      "version": "2023.1.1",
-      "sha256": "0x4fvsvcxb529c7vp5fh6vp7l0sj1wszpqzbrk1da7kmf5454ki6",
+      "version": "2024.1.1",
+      "sha256": "16pgsqgj1cx3iw4p1rrk7fwvi3jh2m80xs6ysyl1kj451xdzrkrc",
       "depends": ["cmprsk"]
     },
     "crs": {
       "name": "crs",
-      "version": "0.15-37",
-      "sha256": "12zj49mkz769gbdacnzrn64faiqdx53yz5zyhhq7g7bpxyac7fl1",
+      "version": "0.15-38",
+      "sha256": "1wcjqpz17rcpxqixjz5a505yzp6wjnxy4mlmbxwyrfzaganpid4x",
       "depends": ["boot", "np", "quantreg"]
     },
     "crseEventStudy": {
@@ -51963,8 +53877,8 @@
     },
     "crt2power": {
       "name": "crt2power",
-      "version": "1.0.0",
-      "sha256": "00clnxyf381qhjpv8r7z0ff9jmid027izvmkpzijmx2d31mm3cr1",
+      "version": "1.1.0",
+      "sha256": "115davxwq7lxwl4qqxq28bb9q7ybhwrrmmyb6kwrl0vb848q5n7b",
       "depends": ["devtools", "dplyr", "foreach", "knitr", "mvtnorm", "rootSolve", "tableone", "tibble", "tidyr", "tidyverse"]
     },
     "crul": {
@@ -51973,6 +53887,12 @@
       "sha256": "17dx3qhdssk0zanp73g0d7h3imhwh9ydzs009fbrspw1s9w3fwyv",
       "depends": ["R6", "curl", "httpcode", "jsonlite", "mime", "urltools"]
     },
+    "crumble": {
+      "name": "crumble",
+      "version": "0.1.2",
+      "sha256": "0hnxzr76py1h3jv6w1pw1h4596dwxy4lksm80nri2bnqd5r9kr5z",
+      "depends": ["Matrix", "Rsymphony", "S7", "checkmate", "cli", "coro", "data_table", "generics", "ife", "lmtp", "mlr3superlearner", "origami", "progressr", "purrr", "torch"]
+    },
     "crunch": {
       "name": "crunch",
       "version": "1.30.4",
@@ -52005,14 +53925,14 @@
     },
     "crypto2": {
       "name": "crypto2",
-      "version": "2.0.1",
-      "sha256": "00ab8hnmfpw6r1q4ifylyga51ilij33p6g56xv5kh74w9g5slplw",
+      "version": "2.0.3",
+      "sha256": "1pszqigymlj4sdyi5hhfpdag9zarjgrf3z51q27x9fvzcn9ccgm6",
       "depends": ["base64enc", "cli", "dplyr", "janitor", "jsonlite", "lubridate", "plyr", "progress", "purrr", "tibble", "tidyr"]
     },
     "cryptoQuotes": {
       "name": "cryptoQuotes",
-      "version": "1.3.1",
-      "sha256": "0fyhnba1h3vf802rab96hch6gdkggz040yvfry9ya2i74xl972pi",
+      "version": "1.3.2",
+      "sha256": "0q236w753hw5ckd1d81w1wz9ivkwmmkb3lvmi2m9gxy1y8yyj534",
       "depends": ["TTR", "cli", "curl", "jsonlite", "lifecycle", "plotly", "xts", "zoo"]
     },
     "cryptography": {
@@ -52087,6 +54007,12 @@
       "sha256": "0c3q85whvp28zlm4k1570kwc5qvl2fmaszx9dpmfcdqv6m19f9ks",
       "depends": ["rmapshaper", "sf", "sp"]
     },
+    "csmGmm": {
+      "name": "csmGmm",
+      "version": "0.3.0",
+      "sha256": "0vnqhhhj5lb5pkdvmspncsac9f346qxb1k6zqglibpzfl63l4cln",
+      "depends": ["dplyr", "magrittr", "mvtnorm", "rlang"]
+    },
     "csmaps": {
       "name": "csmaps",
       "version": "2023.5.22",
@@ -52131,14 +54057,14 @@
     },
     "csquares": {
       "name": "csquares",
-      "version": "0.0.7",
-      "sha256": "0ah6w153vawv4047196rcwpd1vrs8czya8pl1pmxdqm2kn0g7f9x",
+      "version": "0.1.0",
+      "sha256": "0x748vc146ynf2hkpb701nqnya1lkzsyplfz13v7pfn0zaw7639j",
       "depends": ["dplyr", "purrr", "rlang", "sf", "stars", "stringr", "tidyr", "tidyselect", "vctrs"]
     },
     "csranks": {
       "name": "csranks",
-      "version": "1.2.2",
-      "sha256": "0rnwgi7446cz54lsgpnl6j6qdd4hfcwhcvvbks2hxyq5a0hr3gh3",
+      "version": "1.2.3",
+      "sha256": "0banz6a5w083jm072lzygrha6l7s419qp9g79ab3fr7k0xvzbm72",
       "depends": ["MASS", "cli", "ggplot2", "lifecycle", "scales"]
     },
     "cssTools": {
@@ -52185,8 +54111,8 @@
     },
     "csvread": {
       "name": "csvread",
-      "version": "1.2.2",
-      "sha256": "0cbsdlrbdgq039cyr42isqbg8w65dpia1rdwbfppnv2x0f6x0fwr",
+      "version": "1.2.3",
+      "sha256": "1d3mjpcy2idrniksinmrw237zmdvz7mgd1zyw73z9gb4vxcgwpls",
       "depends": []
     },
     "csvwr": {
@@ -52293,9 +54219,9 @@
     },
     "ctrdata": {
       "name": "ctrdata",
-      "version": "1.19.1",
-      "sha256": "0w0bl39lgkb7fqvm3mg3b45kak1kjfjy2ghq31gwymyx41vh220v",
-      "depends": ["V8", "clipr", "countrycode", "curl", "digest", "dplyr", "httr", "jqr", "jsonlite", "lubridate", "nodbi", "readr", "stringi", "tibble", "xml2", "zip"]
+      "version": "1.20.0",
+      "sha256": "1dcpj5c3fk4zbg2sjvqjyf4zm8dr2jrwkr50kb415i7sgw851r1d",
+      "depends": ["V8", "clipr", "countrycode", "curl", "digest", "dplyr", "htmlwidgets", "httr", "jqr", "jsonlite", "lubridate", "nodbi", "readr", "stringi", "xml2", "zip"]
     },
     "ctrialsgov": {
       "name": "ctrialsgov",
@@ -52311,8 +54237,8 @@
     },
     "ctsem": {
       "name": "ctsem",
-      "version": "3.10.0",
-      "sha256": "10ip34y03jiidwcmqlvhb4sw0f0972l3pkx694whr1dlnlb57yjr",
+      "version": "3.10.1",
+      "sha256": "040risfqqb8zbnd9ingfv6labqg8lry43943h2kr6vlaq4h3jdwb",
       "depends": ["BH", "Deriv", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cOde", "data_table", "expm", "ggplot2", "mize", "mvtnorm", "plyr", "rstan", "rstantools", "statmod", "tibble"]
     },
     "ctsemOMX": {
@@ -52329,8 +54255,8 @@
     },
     "ctv": {
       "name": "ctv",
-      "version": "0.9-5",
-      "sha256": "1mr37p7mdv2p8rswz9clwj25ipm16pc4a7flwg3a4bgyj1n5mz55",
+      "version": "0.9-6",
+      "sha256": "0w300vcvn663zpi5whv3512wchwmhjn6aamynmb6fmayf7ahsmf5",
       "depends": []
     },
     "ctxR": {
@@ -52339,16 +54265,28 @@
       "sha256": "1m3hj5cwghm7nx9s5z3j6yby2i04ykich213x6j0gps4n4c8zanr",
       "depends": ["cli", "data_table", "httr", "jsonlite", "purrr", "rlang", "stringr", "tibble", "tidyr", "urltools"]
     },
+    "ctypesio": {
+      "name": "ctypesio",
+      "version": "0.1.1",
+      "sha256": "0flgxsby1nazs3dwnjwzkz1p964qygyivmifnrb2b2sy7smda41f",
+      "depends": []
+    },
     "cuRe": {
       "name": "cuRe",
       "version": "1.1.1",
       "sha256": "0h8vblhfydrama01yzfghcv5yw5ifs719rvq17sixkgj5iyaj910",
       "depends": ["date", "numDeriv", "relsurv", "reshape2", "rstpm2", "statmod", "survival"]
     },
+    "cuadramelo": {
+      "name": "cuadramelo",
+      "version": "1.0.0",
+      "sha256": "08n1g32lfbm8mjg1m9brxbqbjlxxbpfv8gfwzqv6mjdsiri00qiw",
+      "depends": ["CVXR", "dplyr"]
+    },
     "cubar": {
       "name": "cubar",
-      "version": "1.0.0",
-      "sha256": "1hggjq1p6xcffvr13pxjc4345gzrbaxppryn6ijf2b56ffzy7xgx",
+      "version": "1.1.0",
+      "sha256": "0sdns7kfp6p3vrij56w6klfqlvzrppfqyrip4bw8ghydak3rnx0v",
       "depends": ["Biostrings", "IRanges", "data_table", "ggplot2", "rlang"]
     },
     "cubature": {
@@ -52359,8 +54297,8 @@
     },
     "cubble": {
       "name": "cubble",
-      "version": "0.3.2",
-      "sha256": "1nbamkzzlzabgq41szc4kp1q58sirq0gp0x95wv1idax37p4gh9i",
+      "version": "1.0.0",
+      "sha256": "0x05mizhhmy332ivhly5g8184s2b0q394rj2klf27qfi1fyp1vg5",
       "depends": ["cli", "dplyr", "ggplot2", "glue", "lubridate", "ncdf4", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"]
     },
     "cubelyr": {
@@ -52395,8 +54333,8 @@
     },
     "cucumber": {
       "name": "cucumber",
-      "version": "1.0.4",
-      "sha256": "0wgj0pb0h4f1n6gaml0hgbxs5pdwq6dhlmc40nk80zh95shfbhj6",
+      "version": "1.1.0",
+      "sha256": "0p2y119aqy947jkagw89hvy44pzwx3rhd1ipylpilhj57lzl4l63",
       "depends": ["checkmate", "dplyr", "fs", "glue", "purrr", "rlang", "stringr", "testthat", "tibble", "withr"]
     },
     "cuda_ml": {
@@ -52455,14 +54393,20 @@
     },
     "cureplots": {
       "name": "cureplots",
-      "version": "1.1.0",
-      "sha256": "1ikjx4bhazqba9p9sd375mrn0321cwb84d7pj7kk1my6grkd123y",
+      "version": "1.1.1",
+      "sha256": "10nr5w0qxnn1lzm6gpyj1scspz1sbjsrf7p97ynjmxpk2y3d7aji",
       "depends": ["dplyr", "ggplot2", "glue"]
     },
+    "curesurv": {
+      "name": "curesurv",
+      "version": "0.1.1",
+      "sha256": "12c22m8slw0pj38yxphwf8j9lsjwsim4gmxgs4wqivcgycvjxbqc",
+      "depends": ["Deriv", "Formula", "bbmle", "numDeriv", "optimx", "randtoolbox", "statmod", "stringr", "survival"]
+    },
     "curl": {
       "name": "curl",
-      "version": "5.2.1",
-      "sha256": "147smp4am6z23c3j21bd0zcjxsmhnkkssn4wrlpwl6xa1264syja",
+      "version": "6.0.1",
+      "sha256": "0qi3skrkdr43siiw28fmwdkjfqy3ynql5r94nlm9fpvlsyz90744",
       "depends": []
     },
     "currencyapi": {
@@ -52575,15 +54519,15 @@
     },
     "cutpointr": {
       "name": "cutpointr",
-      "version": "1.1.2",
-      "sha256": "1qxnh20hs3bh9v04ls7gwwl7lfc6bwl8c88dn8lkcdqyp3nyr01j",
+      "version": "1.2.0",
+      "sha256": "14zvdq5p1hhd6y0xzf761q2kh217rra25ihl17jipakf61zbf88m",
       "depends": ["Rcpp", "dplyr", "foreach", "ggplot2", "gridExtra", "purrr", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "cv": {
       "name": "cv",
-      "version": "2.0.0",
-      "sha256": "1jhvi0bf8r66q2kqjylg0fdnzxpsaxq1ivm82akhczivjn39wvv8",
-      "depends": ["MASS", "car", "doParallel", "foreach", "glmmTMB", "gtools", "insight", "lme4", "nlme"]
+      "version": "2.0.3",
+      "sha256": "0d0js2sfffb7k3dl89j166c90sk1a1zh1rsyx04y9grhspahiqli",
+      "depends": ["MASS", "car", "doParallel", "foreach", "glmmTMB", "gtools", "insight", "lattice", "lme4", "nlme"]
     },
     "cvAUC": {
       "name": "cvAUC",
@@ -52629,9 +54573,9 @@
     },
     "cvasi": {
       "name": "cvasi",
-      "version": "1.1.3",
-      "sha256": "0915nxf2g2v2z8mdah2cshba2ji00v3m3mbj4djfnqjcvnj8p829",
-      "depends": ["attempt", "cli", "deSolve", "dplyr", "furrr", "ggplot2", "glue", "lemna", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "units"]
+      "version": "1.3.1",
+      "sha256": "0aab17g0pjbp6c22kyf7q7d2ka79nc05a9adsy1qzrvihi180rgz",
+      "depends": ["GGally", "cli", "deSolve", "dplyr", "furrr", "ggplot2", "gridExtra", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "units"]
     },
     "cvcrand": {
       "name": "cvcrand",
@@ -52639,6 +54583,12 @@
       "sha256": "02pdhaq0mm1vijdc0hwh4vpcvk5fhwq73lhkrrg2zr6bwq8q2syz",
       "depends": ["tableone"]
     },
+    "cvdprevent": {
+      "name": "cvdprevent",
+      "version": "0.2.0",
+      "sha256": "15r9p55pa55qy7dzaffzi1fg4c7nm3fh3qfj7pi9mwm03crqk4dm",
+      "depends": ["cli", "dplyr", "glue", "httr2", "jsonlite", "purrr", "tidyr"]
+    },
     "cvequality": {
       "name": "cvequality",
       "version": "0.2.0",
@@ -52681,12 +54631,6 @@
       "sha256": "17h017p76y7sjcwik48ravygmyivj6kvkhqy5s9ch0nwzzcrzvj3",
       "depends": ["foreach", "survival"]
     },
-    "cwbtools": {
-      "name": "cwbtools",
-      "version": "0.4.2",
-      "sha256": "1aanda6rj60rkkbkxijj4r4bx0caiyr9ifw0pg6nabv4fwfnlb4x",
-      "depends": ["R6", "RcppCWB", "cli", "curl", "data_table", "fs", "httr", "jsonlite", "lifecycle", "pbapply", "rstudioapi", "stringi", "xml2", "zen4R"]
-    },
     "cwot": {
       "name": "cwot",
       "version": "0.1.0",
@@ -52711,16 +54655,10 @@
       "sha256": "125lzra4mr4cw5j18nck1faa6jf4fiw4m5pc9mp1h39268c9va6v",
       "depends": ["inline"]
     },
-    "cycleRtools": {
-      "name": "cycleRtools",
-      "version": "1.1.1",
-      "sha256": "1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0",
-      "depends": ["Rcpp", "xml2"]
-    },
     "cyclestreets": {
       "name": "cyclestreets",
-      "version": "1.0.1",
-      "sha256": "0xrgwhlq670m109j27ln93zzq0wm8cfbkivd45v2rldxgvd50348",
+      "version": "1.0.3",
+      "sha256": "1d83vxzc303vmrrlpwzv20z8xxhdwnp8ffc274axfn8mx7z21la1",
       "depends": ["RcppSimdJson", "checkmate", "curl", "data_table", "dplyr", "geojsonsf", "httr", "jsonlite", "magrittr", "progressr", "readr", "sf", "stringi", "stringr"]
     },
     "cyclocomp": {
@@ -52941,14 +54879,14 @@
     },
     "dacc": {
       "name": "dacc",
-      "version": "0.0-4",
-      "sha256": "09mnmlh3b0xlh3qcf7k0cfaszybj9dgpxczlllwjyymx7zmi1pmk",
+      "version": "0.0-5",
+      "sha256": "19gk3dgkhr6vzyh6bravanzbvykhnp6yippicx7wmcdwi9mhzqvb",
       "depends": ["CFtime", "Iso", "MASS", "janitor", "magrittr", "ncdf4", "pracma", "sp"]
     },
     "dad": {
       "name": "dad",
-      "version": "4.1.2",
-      "sha256": "12jwfa1849mfjwplc57qw3lhn5zrqjrlxhisg9hykvhcpj6i0nfl",
+      "version": "4.1.5",
+      "sha256": "1bpjgwd739l661ri78a8iq3jhrawrn9g9awjrsdwmvw10gd9skmh",
       "depends": ["DescTools", "e1071", "ggplot2"]
     },
     "dadjoke": {
@@ -52971,8 +54909,8 @@
     },
     "dae": {
       "name": "dae",
-      "version": "3.2.28",
-      "sha256": "13a3j3d8qm1phkp4x0pdqa6p36j6xlakhmkrqcb9x0bpcfzbwfyl",
+      "version": "3.2.30",
+      "sha256": "0avjx7q81gybvkzkrg9bjf57sj7mbwkv7qwkzzff05hnbcjrab0y",
       "depends": ["ggplot2", "ggpubr", "plyr", "tryCatchLog"]
     },
     "daewr": {
@@ -53025,8 +54963,8 @@
     },
     "daiR": {
       "name": "daiR",
-      "version": "1.0.0",
-      "sha256": "110car64pgpg71dcqnbkj91md0xwikpmd6iy90nj84nglycc5v00",
+      "version": "1.0.1",
+      "sha256": "1l62qlnn6xkdkqazxkx6qzv4wp3rw3pi6l6f6y6b1n2k9vz4b5za",
       "depends": ["base64enc", "beepr", "cli", "data_table", "fs", "gargle", "glue", "googleCloudStorageR", "httr", "jsonlite", "lifecycle", "magick", "pdftools", "purrr", "readtext", "stringr", "xml2"]
     },
     "dail": {
@@ -53043,14 +54981,14 @@
     },
     "daltoolbox": {
       "name": "daltoolbox",
-      "version": "1.0.767",
-      "sha256": "02rhbcgjwlx45y0641yjlamzgl2swm60hmvwppr4nk24hb0hjczs",
+      "version": "1.1.727",
+      "sha256": "0lqiamyg4h2wdv1yfjz1fbw6w78hlp4f8h7ssrcr8pz4qnkgwfgl",
       "depends": ["FNN", "MLmetrics", "caret", "class", "cluster", "dbscan", "dplyr", "e1071", "elmNNRcpp", "forecast", "ggplot2", "nnet", "randomForest", "reshape", "reticulate", "tree"]
     },
     "daltoolboxdp": {
       "name": "daltoolboxdp",
-      "version": "1.0.767",
-      "sha256": "1l34wb2vl9wmf0vrhis29w4hz1m9jx9qdfi494rfnwals054j3ah",
+      "version": "1.0.777",
+      "sha256": "0qb0wmfwcnx861ib9cvgcs53dnb8wyigj3bv123xp3npz874lm7f",
       "depends": ["FSelector", "daltoolbox", "doBy", "glmnet", "leaps", "smotefamily"]
     },
     "dam": {
@@ -53065,6 +55003,12 @@
       "sha256": "14cfixlc50ml9l2b8m397b292ddq1l36bp8yqw8jw93c3d1q3zpp",
       "depends": ["FNN", "dplyr", "leaflet", "magrittr", "sf", "shiny", "shinydashboard", "smoothr", "terra", "tibble", "tidyr", "units"]
     },
+    "dampack": {
+      "name": "dampack",
+      "version": "1.0.2.1000",
+      "sha256": "0zbxl1m4rhf69qwvhxph18wim0hwnhqijkfkwm2nfgv9nnyi3m0k",
+      "depends": ["dplyr", "ellipse", "ggplot2", "ggrepel", "mgcv", "rlang", "scales", "stringr", "tidyr", "triangle", "truncnorm"]
+    },
     "damr": {
       "name": "damr",
       "version": "0.3.7",
@@ -53103,8 +55047,8 @@
     },
     "dapper": {
       "name": "dapper",
-      "version": "1.0.0",
-      "sha256": "06s78b80215lxsi68isaha6kfrr0490s4bg0y9yf5v5ns9a6x0wv",
+      "version": "1.0.1",
+      "sha256": "0hlmndwd80s8a5y7l8c92n57xzbgy56gsv6ziwxya28ba9lf7ncx",
       "depends": ["bayesplot", "checkmate", "furrr", "memoise", "posterior", "progressr"]
     },
     "daqapo": {
@@ -53127,9 +55071,9 @@
     },
     "dartR_base": {
       "name": "dartR.base",
-      "version": "0.65",
-      "sha256": "1887ksyszlp65i4z6zhh6j1pihfkkimiwrv6bqav5z7gmw2i0pi7",
-      "depends": ["MASS", "SNPRelate", "StAMPP", "adegenet", "ape", "crayon", "dartR_data", "data_table", "dplyr", "foreach", "ggplot2", "gridExtra", "patchwork", "plyr", "reshape2", "stringr", "tidyr"]
+      "version": "0.98",
+      "sha256": "0ndl0319pidlkk5fv49zqr8kbib51v60h32k906rwc57jf60xbjk",
+      "depends": ["MASS", "SNPRelate", "SNPassoc", "StAMPP", "adegenet", "ape", "crayon", "dartR_data", "data_table", "dplyr", "foreach", "ggplot2", "gridExtra", "patchwork", "plyr", "reshape2", "stringr", "tidyr"]
     },
     "dartR_captive": {
       "name": "dartR.captive",
@@ -53187,10 +55131,16 @@
     },
     "data_table": {
       "name": "data.table",
-      "version": "1.15.4",
-      "sha256": "0lyb82kl2bn70l9ag5xdr8q7rh4majbimygaynmfqnbdjkznb05b",
+      "version": "1.16.4",
+      "sha256": "1pww4qq7zsvq1k9gdrx1wf0p190ic4mv7kr30bk1s4dwmsrlnxkj",
       "depends": []
     },
+    "data_table_threads": {
+      "name": "data.table.threads",
+      "version": "1.0.1",
+      "sha256": "1cjcf9920iqsb3w5c7mvpqlg6g0lzr34k96y6wx4nb6kav3dslrh",
+      "depends": ["data_table", "ggplot2", "microbenchmark"]
+    },
     "data_tree": {
       "name": "data.tree",
       "version": "1.1.0",
@@ -53209,6 +55159,12 @@
       "sha256": "15934ixmzw3iyqazhlz6s5cimmasf062fc8al0wdyij1f4cjcgny",
       "depends": ["data_table", "jsonlite", "reshape2"]
     },
+    "dataCompare": {
+      "name": "dataCompare",
+      "version": "1.0.5",
+      "sha256": "1akg6y31wrffhc5b68h664dsj8xrmpblggwcizg4kmqsz9lwj2fi",
+      "depends": ["DT", "arsenal", "config", "data_table", "devtools", "dplyr", "explore", "golem", "htmltools", "magrittr", "shiny", "shinyWidgets", "shinycssloaders", "shinydashboard", "shinydashboardPlus", "skimr"]
+    },
     "dataCompareR": {
       "name": "dataCompareR",
       "version": "0.1.4",
@@ -53247,8 +55203,8 @@
     },
     "dataRetrieval": {
       "name": "dataRetrieval",
-      "version": "2.7.16",
-      "sha256": "11hwk81vyzn6jx0z3flhh7gfwmfr1irysxghsbb2sgdqdffs6vh1",
+      "version": "2.7.17",
+      "sha256": "1y8c30qvnh4jr9dim4ym82l4rig8jd5lldhv9j7v45q516jsaxv1",
       "depends": ["curl", "httr", "jsonlite", "lubridate", "readr", "xml2"]
     },
     "dataSDA": {
@@ -53265,9 +55221,9 @@
     },
     "dataclass": {
       "name": "dataclass",
-      "version": "0.3.0",
-      "sha256": "1byjxwk3jlm3jaa8q2ppr5i0y98hriky7rrff9gb8nk6yvv9jgmq",
-      "depends": ["cli", "dplyr", "glue", "magrittr", "purrr", "rlang", "tibble"]
+      "version": "1.0.0",
+      "sha256": "1mx2yqxahsqdxp238q1i285q9g9mcvlfi6prchgk3cydqmqshrhy",
+      "depends": ["cli", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "rlang", "tibble"]
     },
     "datacleanr": {
       "name": "datacleanr",
@@ -53277,9 +55233,9 @@
     },
     "datacutr": {
       "name": "datacutr",
-      "version": "0.1.0",
-      "sha256": "1qgmc2r1g5zlvfq84qrmmfp6dv3458zhv741aa5wf1nkw2sv656y",
-      "depends": ["admiraldev", "assertthat", "dplyr", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble"]
+      "version": "0.2.1",
+      "sha256": "1k9yqimgabmw6b128cbvbwljaw76s7591258ssvhnbc604q9wd35",
+      "depends": ["admiraldev", "assertthat", "dplyr", "lubridate", "magrittr", "purrr", "reactable", "rlang", "stringr", "tibble"]
     },
     "datadictionary": {
       "name": "datadictionary",
@@ -53311,28 +55267,22 @@
       "sha256": "0klhkbwpaqxk2mnxha8b03mpgfxk107ff9d2nx6cky59il3c1825",
       "depends": ["GA", "Rcpp", "caret"]
     },
-    "datagovsgR": {
-      "name": "datagovsgR",
-      "version": "1.0.1",
-      "sha256": "1z3zrvz9dc9a06kp8agrgvx1l6g5hq2cmmn6xpabp68pkw4jdpc6",
-      "depends": ["data_table", "dplyr", "httr", "purrr", "stringr"]
-    },
     "datamods": {
       "name": "datamods",
-      "version": "1.5.1",
-      "sha256": "0bxfa001j9vib0sj9d32qyzrqjvdzm5zxcpg1mm3jw31546jl46p",
-      "depends": ["classInt", "data_table", "htmltools", "phosphoricons", "reactable", "readxl", "rio", "rlang", "shiny", "shinyWidgets", "shinybusy", "tibble", "toastui", "writexl"]
+      "version": "1.5.3",
+      "sha256": "1f516wh3jrpwb4xv5wwghlk1j8q4p9yrwc1d7b99z9f0kpy83i8j",
+      "depends": ["bslib", "classInt", "data_table", "htmltools", "phosphoricons", "reactable", "readxl", "rio", "rlang", "shiny", "shinyWidgets", "shinybusy", "tibble", "toastui", "writexl"]
     },
     "datana": {
       "name": "datana",
-      "version": "1.0.3",
-      "sha256": "0vci2nhavqrpah4n5gr0rhihlp9qa41mfgg8w2k7fdak65hdz3hq",
-      "depends": ["ggplot2", "lattice"]
+      "version": "1.0.5",
+      "sha256": "1dxcx9hrw7z8iizgn3bh6mg512pbf37ncyzwh67zc4jcydlm0p3p",
+      "depends": ["ggplot2"]
     },
     "datanugget": {
       "name": "datanugget",
-      "version": "1.3.0",
-      "sha256": "0l39yxvbxnzmxq1zjrm30a34ipwhjh5vnn7bqmsivbjci4z7mbyi",
+      "version": "1.3.1",
+      "sha256": "13y0plgkjnis7xmswqr5gmyygm7137kscbdkamfmahbw1qbi097i",
       "depends": ["Rfast", "doSNOW", "foreach"]
     },
     "dataonderivatives": {
@@ -53373,8 +55323,8 @@
     },
     "datardis": {
       "name": "datardis",
-      "version": "0.0.4",
-      "sha256": "0zcgl4jyz0xphliwjg8x5hqg9avflk0s5mgxd7gl52pxrki4mak3",
+      "version": "0.0.5",
+      "sha256": "0p2cn96ydl9h7fh0cnkr0v11kjpsw9whf9zzrgy07knqiqq0da24",
       "depends": ["dplyr"]
     },
     "dataresqc": {
@@ -53413,6 +55363,12 @@
       "sha256": "11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4",
       "depends": []
     },
+    "dataset": {
+      "name": "dataset",
+      "version": "0.3.4",
+      "sha256": "1hcab09cfnim1w52v7165nfs860dzj84vxwxlxa03sl519s1vjq8",
+      "depends": ["ISOcodes", "assertthat", "cli", "haven", "labelled", "pillar", "rlang", "tibble", "vctrs"]
+    },
     "datasetjson": {
       "name": "datasetjson",
       "version": "0.2.0",
@@ -53437,6 +55393,12 @@
       "sha256": "1pnmb7kdx9wdvi2873rw1a7hc7spsvx4lfvfhfcqwgll46j0f1wm",
       "depends": ["EML", "dplyr", "fs", "ggplot2", "jsonlite", "magrittr", "purrr", "readr", "rhandsontable", "shiny", "stringr", "tibble", "tidyr", "whisker"]
     },
+    "datastat": {
+      "name": "datastat",
+      "version": "0.1.0",
+      "sha256": "0xaisb2493z2j7wrasdiy8ssxh426lnsw9p46icj7mli5x8jr5ad",
+      "depends": []
+    },
     "datastepr": {
       "name": "datastepr",
       "version": "0.0.2",
@@ -53457,8 +55419,8 @@
     },
     "datawizard": {
       "name": "datawizard",
-      "version": "0.12.2",
-      "sha256": "10g05f6jm7q59ihsb8wpg5fyy2an56gv33l7jiimjc818hh6bqzy",
+      "version": "0.13.0",
+      "sha256": "12pybh84r8rjnbbyrsribsp1akhpyq20klqywbs2srxkqf2q2rxz",
       "depends": ["insight"]
     },
     "datazoom_amazonia": {
@@ -53481,16 +55443,10 @@
     },
     "datefixR": {
       "name": "datefixR",
-      "version": "1.6.1",
-      "sha256": "1xmrx8djxc05r9yvgfgkvmp19m2pj6n2g1r4siikwkzlssh2x8fz",
+      "version": "1.7.0",
+      "sha256": "1nsfi0hjamd83icxqdx4s284jrjxp13nygxbzd9vaknfl2fv3dpi",
       "depends": ["Rcpp", "lifecycle", "rlang", "stringr"]
     },
-    "datelife": {
-      "name": "datelife",
-      "version": "0.6.8",
-      "sha256": "154nmpvslnizd03jaxbhkc7vjzjx7j18zlwmrpx2qidqk424k1i9",
-      "depends": ["BiocManager", "abind", "ape", "bold", "cluster", "compare", "curl", "data_table", "geiger", "httr", "ips", "knitcitations", "paleotree", "phangorn", "phylobase", "phylocomr", "phytools", "plyr", "rotl", "stringr", "taxize", "treebase"]
-    },
     "daterangepicker": {
       "name": "daterangepicker",
       "version": "0.2.0",
@@ -53563,10 +55519,16 @@
       "sha256": "1cl0jipwnarkx26bhv9s1bk9q9y6ni2568xqy2w7x5nh5v38rvfx",
       "depends": []
     },
+    "dawaR": {
+      "name": "dawaR",
+      "version": "0.2.7",
+      "sha256": "128fhl975c9a3qmc9amv7cnglisl58sl420mxf7i9ashj1l2592a",
+      "depends": ["cli", "curl", "httr2", "memoise", "rlang", "sf", "tidyRSS"]
+    },
     "dawai": {
       "name": "dawai",
-      "version": "1.2.6",
-      "sha256": "1pfvbd3d182f5pfpc1pj00dd8bsrcaw7lb7k5i0br1i70xlali5w",
+      "version": "1.2.7",
+      "sha256": "0n6wb88i5p84afy2zq52pizmmgxiicm0dmfxcmmdaiq7a0p3gv3y",
       "depends": ["boot", "mvtnorm"]
     },
     "daySupply": {
@@ -53607,8 +55569,8 @@
     },
     "dbarts": {
       "name": "dbarts",
-      "version": "0.9-28",
-      "sha256": "0f01mk39rb7afnymi9fbaikv7hbpx2jwbzp3dd87q7hr3kpb9r6j",
+      "version": "0.9-30",
+      "sha256": "13r7r9rnm90j26dmmhljg84jrj9g57iijhbj71i8fi2h6fc8bdlr",
       "depends": []
     },
     "dbcsp": {
@@ -53641,6 +55603,12 @@
       "sha256": "1gd3n6i47qbxp6d3y5sjvgmxc5p3afy2lhkg9020ws1xm0bk9q7d",
       "depends": ["XML", "httr", "reshape2"]
     },
+    "dbi_table": {
+      "name": "dbi.table",
+      "version": "1.0.1",
+      "sha256": "05dnrwwmmgbmhsra7rv1qmygx7p4mwlsv7adniwznb46in8z0z42",
+      "depends": ["DBI", "bit64", "data_table", "dbplyr", "rlang", "stringi"]
+    },
     "dblcens": {
       "name": "dblcens",
       "version": "1.1.9",
@@ -53655,8 +55623,8 @@
     },
     "dbmss": {
       "name": "dbmss",
-      "version": "2.9-0",
-      "sha256": "16bmaq8wd7v6vqnycr670sajcyaplkw1g5w5m2ri7ch16ccpqk6j",
+      "version": "2.9-2",
+      "sha256": "1131lfli0fna2yvq383f710sr87fwfg5gngiawrhdx8b14zn796p",
       "depends": ["Rcpp", "RcppParallel", "cubature", "ggplot2", "reshape2", "rlang", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_utils", "tibble"]
     },
     "dbnR": {
@@ -53701,6 +55669,12 @@
       "sha256": "1rnjgzil98rys9fa0jkamfqrkski3vd7wi59mqg8xk26xw0v5c96",
       "depends": ["cluster", "pls"]
     },
+    "dbw": {
+      "name": "dbw",
+      "version": "1.1.4",
+      "sha256": "0sz8wcknmxaqgwqliahvh5vf3j7h9iayjm8kwqgn4qpkm4b4hni3",
+      "depends": []
+    },
     "dbx": {
       "name": "dbx",
       "version": "0.3.2",
@@ -53769,8 +55743,8 @@
     },
     "dcorVS": {
       "name": "dcorVS",
-      "version": "1.0",
-      "sha256": "1gawk22mv5ppbiqqm4k2pjjknsp7zxnnr0lk24l6phrvnszfaxlw",
+      "version": "1.1",
+      "sha256": "011lafpnxlxqf4i2w2905pshk75p4jylym892yqvfy7xgfid3dbn",
       "depends": ["Rfast", "dcov"]
     },
     "dcortools": {
@@ -53799,8 +55773,8 @@
     },
     "ddalpha": {
       "name": "ddalpha",
-      "version": "1.3.15",
-      "sha256": "1vgyg1c2ir93nsbh4xlm774b6rhx14pyr069dpcl9vwcx2j989qc",
+      "version": "1.3.16",
+      "sha256": "1139a50ili4w04034fmpxsbn2j17nx1ns5f07cijgqpskxjgi41r",
       "depends": ["BH", "MASS", "Rcpp", "class", "geometry", "robustbase", "sfsmisc"]
     },
     "ddc": {
@@ -53811,8 +55785,8 @@
     },
     "dde": {
       "name": "dde",
-      "version": "1.0.5",
-      "sha256": "1288zbhmh383b8z01yzblgs0lvq18vz4hzw63hjsaiaynqaj4hiw",
+      "version": "1.0.7",
+      "sha256": "1lvv4avajd14ph5kr7fhagigfjdyvx6077gaks9l24dwgqh6gpj2",
       "depends": ["ring"]
     },
     "ddecompose": {
@@ -53835,8 +55809,8 @@
     },
     "ddml": {
       "name": "ddml",
-      "version": "0.2.2",
-      "sha256": "0362sr8ivx3jcf0l28a6d1kb0zrcb0jqm2dcy9s9qq5d843r79xz",
+      "version": "0.3.0",
+      "sha256": "1b0cl31l0zl02mxxqjqakr3q92frjy45qs41im5yb7hky29mkk70",
       "depends": ["AER", "MASS", "Matrix", "glmnet", "nnls", "quadprog", "ranger", "xgboost"]
     },
     "ddp": {
@@ -53895,8 +55869,8 @@
     },
     "deFit": {
       "name": "deFit",
-      "version": "0.2.1",
-      "sha256": "0z4lc9s3wb7gab7cg1xr9gkggd2dxy8qbqqvbz1yxvnm86n2ai79",
+      "version": "0.3.0",
+      "sha256": "0vsixnjz531i8m3qbv1cx1nv8gyjvvy2ys6i48zc9ncb56issjad",
       "depends": ["R6", "deSolve", "ggplot2"]
     },
     "deSolve": {
@@ -53985,8 +55959,8 @@
     },
     "declared": {
       "name": "declared",
-      "version": "0.24",
-      "sha256": "0zj5rvdj2jcy23nms5dhqjp9w4sd87r7cr4slh6qli15w75ryr50",
+      "version": "0.25",
+      "sha256": "0qdzrmmn2p5wb502syk05hj3jn3wbqhjhs7ya08r5gp1fapsalq4",
       "depends": []
     },
     "decode": {
@@ -54039,8 +56013,8 @@
     },
     "decp": {
       "name": "decp",
-      "version": "0.1.0",
-      "sha256": "1ydp2czgbfarhn6d6g34q7dvfkj3b97ql6jn5cp7gnxycj53c0k6",
+      "version": "0.1.2",
+      "sha256": "0mzpq8034yyhy9lika80mmwpixk120crgzj4kllypqhnvbcg1v4l",
       "depends": ["geigen", "ggplot2", "magrittr", "matrixcalc", "purrr", "rlang"]
     },
     "deducorrect": {
@@ -54111,8 +56085,8 @@
     },
     "deepgp": {
       "name": "deepgp",
-      "version": "1.1.2",
-      "sha256": "0anrc209bvi061y0f7ms5hyb2k6rgfp627w0800aw8gxhl4mli4b",
+      "version": "1.1.3",
+      "sha256": "1vdqsf0gn55j15dsfmbj76c5bb4799rkiwiq57n2rhl7sprvpdyr",
       "depends": ["FNN", "GpGp", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "mvtnorm"]
     },
     "deeplr": {
@@ -54135,21 +56109,27 @@
     },
     "deepregression": {
       "name": "deepregression",
-      "version": "1.0.0",
-      "sha256": "15d33dsdhmw7n172rlsg70921d3z3bkn088qj565iclzmxknyfzj",
-      "depends": ["Matrix", "R6", "dplyr", "keras", "magrittr", "mgcv", "reticulate", "tensorflow", "tfprobability", "tfruns"]
+      "version": "2.2.0",
+      "sha256": "1w5n65kz4j9rs5v3m8grg4nyns01q6r1axqrygk00nkyvr0vc271",
+      "depends": ["Matrix", "R6", "coro", "dplyr", "keras", "luz", "magrittr", "mgcv", "reticulate", "tensorflow", "tfprobability", "tfruns", "torch", "torchvision"]
     },
     "deeptime": {
       "name": "deeptime",
-      "version": "1.1.1",
-      "sha256": "1d586102ya3rplpb1za6irclpbmw4ax9rxs1547cd0g2igfwmx74",
-      "depends": ["cli", "curl", "geomtextpath", "ggfittext", "ggforce", "ggnewscale", "ggplot2", "gridExtra", "gtable", "lattice", "lifecycle", "phytools", "rlang", "scales"]
+      "version": "2.1.0",
+      "sha256": "1sv4vqg1q31nkk8aq8dz3nk3q9jfdm2c5b3b2n0355z31zpqg3gq",
+      "depends": ["cli", "curl", "deeptimedata", "ggfittext", "ggforce", "ggh4x", "ggplot2", "grImport2", "gridExtra", "gtable", "lattice", "lifecycle", "rlang", "scales"]
+    },
+    "deeptimedata": {
+      "name": "deeptimedata",
+      "version": "1.0.0",
+      "sha256": "19ipdn8r344xnxaz1n3jyhxr8n8xqx9aiwz7g0bfgj8cgn7gg85r",
+      "depends": []
     },
     "deeptrafo": {
       "name": "deeptrafo",
-      "version": "0.1-1",
-      "sha256": "16lxxd75j9bwapfx716b9fmqfz6ms4x5g98wc1yykiahjpbj8156",
-      "depends": ["Formula", "R6", "deepregression", "keras", "mlt", "purrr", "reticulate", "survival", "tensorflow", "tfprobability", "variables"]
+      "version": "1.0-0",
+      "sha256": "1iq36jmz31z53b8ckin4kkd63ai27qjssq5v8iqqbs97zjcgk8zb",
+      "depends": ["Formula", "R6", "data_table", "deepregression", "keras", "mlt", "purrr", "reticulate", "survival", "tensorflow", "tfprobability", "variables"]
     },
     "default": {
       "name": "default",
@@ -54207,8 +56187,8 @@
     },
     "degreenet": {
       "name": "degreenet",
-      "version": "1.3-5",
-      "sha256": "0mv3zp5yzyf19ph6pi550g1bd2vw1hds2nfj42hidjdzjj5wqm1j",
+      "version": "1.3-6",
+      "sha256": "1z9b91c5ngjs3rngfvnk3j5q5vjnj08y8amd2xm50xyvlkcblgxh",
       "depends": ["igraph", "network"]
     },
     "degross": {
@@ -54217,6 +56197,12 @@
       "sha256": "17n389a0k4jswgs908bcdhi410wpd1ljxh5izv35cldfq7dhjb3k",
       "depends": ["cubicBsplines"]
     },
+    "deident": {
+      "name": "deident",
+      "version": "1.0.0",
+      "sha256": "1sw410lzbpfxbwwbnhv9qjm4rzl46sjcywcpr70zs1lsasnisf54",
+      "depends": ["R6", "dplyr", "fs", "glue", "lemon", "openssl", "openxlsx", "purrr", "readr", "rlang", "stringr", "tidyselect", "withr", "yaml"]
+    },
     "dejaVu": {
       "name": "dejaVu",
       "version": "0.3.1",
@@ -54315,8 +56301,8 @@
     },
     "dendextend": {
       "name": "dendextend",
-      "version": "1.17.1",
-      "sha256": "08g5z5qyrn2nkw1jw5520sval4jf9l6invqwvzsv8dkjkq8nxsc7",
+      "version": "1.19.0",
+      "sha256": "17nvk2gqyzgiwd62z2jw56rvlc14m1m5wx41xhc2p1wbl60s5njq",
       "depends": ["ggplot2", "magrittr", "viridis"]
     },
     "dendroNetwork": {
@@ -54337,6 +56323,12 @@
       "sha256": "0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx",
       "depends": []
     },
+    "dendrometeR": {
+      "name": "dendrometeR",
+      "version": "1.1.0",
+      "sha256": "1lnnra7hnaxdpck2nkdg30ywq4k9wjv6h1zbkqmm369pw21n3x2b",
+      "depends": ["forecast", "pspline", "zoo"]
+    },
     "dendrometry": {
       "name": "dendrometry",
       "version": "0.0.2",
@@ -54351,9 +56343,9 @@
     },
     "denguedatahub": {
       "name": "denguedatahub",
-      "version": "1.0.4",
-      "sha256": "0h7w7qnvh7cq9v6m9axmip0nkbas3sdhccq5h5n4yny5r1jilbq4",
-      "depends": ["dplyr", "rlang"]
+      "version": "2.1.1",
+      "sha256": "1s7in7hh90gs9lzdijdl8q2xx24dbvslyd0ykdl7l3sn7qf4cp92",
+      "depends": ["dplyr", "here", "lifecycle", "magrittr", "purrr", "rlang", "rvest", "stringr", "tabulapdf", "tibble", "tidyr", "xml2"]
     },
     "denim": {
       "name": "denim",
@@ -54427,6 +56419,12 @@
       "sha256": "0a8x7z7jagshc5h6xy24xrvqv0gm08f78ik6y8ki4i0mhl8c5fyx",
       "depends": []
     },
+    "depCensoring": {
+      "name": "depCensoring",
+      "version": "0.1.5",
+      "sha256": "0y1qc0kibhj8pl7k41ywyvj49k28avdw55fgwa10gf9ap11bidav",
+      "depends": ["EnvStats", "MASS", "Matrix", "OpenMx", "copula", "doParallel", "foreach", "matrixcalc", "mvtnorm", "nleqslv", "nloptr", "numDeriv", "pbivnorm", "rafalib", "rvinecopulib", "stringr", "survival"]
+    },
     "depcache": {
       "name": "depcache",
       "version": "0.1-2",
@@ -54451,18 +56449,18 @@
       "sha256": "0vzrdw4rhrwiyc4g4ancfd43h56b72lkvabqdwdsg54hjm35c1ky",
       "depends": ["Hmisc", "desc", "dplyr", "fs", "ggplot2", "magrittr", "progress", "purrr", "readr", "rlang", "rms", "rprojroot", "stringr", "telegram_bot", "tibble", "tidyr", "usethis"]
     },
-    "depmix": {
-      "name": "depmix",
-      "version": "0.9.16",
-      "sha256": "1vi9fi131ni34z9p3x6pdp6y9v0y0nx71zg1q8898frhqwbwhd9c",
-      "depends": ["MASS"]
-    },
     "depmixS4": {
       "name": "depmixS4",
       "version": "1.5-0",
       "sha256": "1pacvhw5m4fsk3ysbal50fdqbvlaz8ywyqp6bn1wh42wipqbb2i8",
       "depends": ["MASS", "Rsolnp", "nlme", "nnet"]
     },
+    "depower": {
+      "name": "depower",
+      "version": "2024.12.4",
+      "sha256": "1chh8ml5nrgf9h7q7dgdir339qiv4h4ss8ymf8zkh9rcsdm345p3",
+      "depends": ["Rdpack", "dplyr", "ggplot2", "glmmTMB", "multidplyr", "mvnfast", "scales"]
+    },
     "deps": {
       "name": "deps",
       "version": "0.4.0",
@@ -54525,9 +56523,9 @@
     },
     "descriptr": {
       "name": "descriptr",
-      "version": "0.5.2",
-      "sha256": "1shqcykp8ahgarsam56zv4gcbj0mmfm7jy1i9fgbmy5ddksnific",
-      "depends": ["dplyr", "ggplot2", "magrittr", "rlang", "scales", "tibble", "tidyr"]
+      "version": "0.6.0",
+      "sha256": "0y91n0znpzf98nnz3ajn9z33lzn1hdc4dkacq0kxakk9jxjdkp5d",
+      "depends": ["dplyr", "ggplot2", "magrittr", "rlang", "scales", "tidyr"]
     },
     "descstat": {
       "name": "descstat",
@@ -54603,8 +56601,8 @@
     },
     "desk": {
       "name": "desk",
-      "version": "1.1.1",
-      "sha256": "0pv54lxd326xlwscyngrfmvqf8inqqg587bi4n42wy6c76p4kbm5",
+      "version": "1.1.2",
+      "sha256": "0sddwphfnv2ljjx0mm30pdnxmwb7prf7ndn0hk6cy72963pwdgv5",
       "depends": ["cli", "rstudioapi"]
     },
     "desla": {
@@ -54613,6 +56611,12 @@
       "sha256": "18q1rw8p69p5jcqxb4hryyn2bak6pjmx91g203xrilx7k1za4p23",
       "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "parallelly", "sitmo"]
     },
+    "despair": {
+      "name": "despair",
+      "version": "0.1.1",
+      "sha256": "00yy5icda5sqzcr7x924n2aqrxrriza42h3qbg0nvvjf7dg3ahi2",
+      "depends": []
+    },
     "desplot": {
       "name": "desplot",
       "version": "1.10",
@@ -54727,6 +56731,12 @@
       "sha256": "0jwh14clyj5flygpmifk01avs7mbnj2s1686pxzfrkcshfyhw5iq",
       "depends": ["cli", "desc", "ellipsis", "fs", "lifecycle", "memoise", "miniUI", "pkgbuild", "pkgdown", "pkgload", "profvis", "rcmdcheck", "remotes", "rlang", "roxygen2", "rversions", "sessioninfo", "testthat", "urlchecker", "usethis", "withr"]
     },
+    "dexisensitivity": {
+      "name": "dexisensitivity",
+      "version": "1.0.1",
+      "sha256": "04avsh79xhcm66rl0nzyg5d9llmm6k0jyqza3crvpj6hi9k9scdx",
+      "depends": ["AlgDesign", "XML", "dplyr", "genalg", "ggplot2", "plotrix", "testthat", "xml2"]
+    },
     "dexter": {
       "name": "dexter",
       "version": "1.5.0",
@@ -54759,14 +56769,14 @@
     },
     "dfadjust": {
       "name": "dfadjust",
-      "version": "1.0.5",
-      "sha256": "0x44alfb0ryd7m0y2gqq7sqhyf6yzk4pcwb129d2qazhwya6p2y5",
-      "depends": []
+      "version": "1.1.0",
+      "sha256": "1lrzyy6w6vl1a2x47c5j20a90zpppbj11alw0h6h64dy66pw66xv",
+      "depends": ["collapse"]
     },
     "dfcomb": {
       "name": "dfcomb",
-      "version": "3.1-1",
-      "sha256": "04ply2jfbkrf5zylii24qfzhrnyksdxfj6647mkxq26a9j9r65x1",
+      "version": "3.1-4",
+      "sha256": "1h5x9759ljlyv9h7bmybm2ygw60ivnfrqc1f7drx700m71cwc6kk",
       "depends": ["BH", "Rcpp", "RcppProgress"]
     },
     "dfcrm": {
@@ -54789,9 +56799,9 @@
     },
     "dfidx": {
       "name": "dfidx",
-      "version": "0.0-5",
-      "sha256": "02ka119nxn9258hz51m603s0gwmdi8a98z0j9lx7fqjxnd01jlip",
-      "depends": ["Formula", "dplyr"]
+      "version": "0.1-0",
+      "sha256": "0ygbw1z0v2s2w7d45b09x54xycfglpd1ipgkgxq8w2q004rkdp9d",
+      "depends": ["Formula", "Rdpack", "dplyr", "glue", "pillar", "tidyselect", "vctrs"]
     },
     "dfmeta": {
       "name": "dfmeta",
@@ -54813,8 +56823,8 @@
     },
     "dfmta": {
       "name": "dfmta",
-      "version": "1.7-3",
-      "sha256": "0n9056vd75vqxddagj4k23znvwv58db306xm4vv9sq044jc7kkg6",
+      "version": "1.7-6",
+      "sha256": "0g1fi9m9j5z43n9037qq2a4i88y3p3h2q00x3q3xvhzhnqc5lrns",
       "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppProgress"]
     },
     "dfoliatR": {
@@ -54847,6 +56857,12 @@
       "sha256": "0a9cxdc81rib84sgg5mpf28nhcv1g83kvnr7rin3djyv60ccrq8x",
       "depends": ["Rcpp", "lattice", "robustbase"]
     },
+    "dfr": {
+      "name": "dfr",
+      "version": "0.1.2",
+      "sha256": "0fcm9b347pc8s54kgj2wkgxby32y8ph1wihwbca8gp7715y26227",
+      "depends": ["MASS", "Matrix", "caret", "sgs"]
+    },
     "dfrr": {
       "name": "dfrr",
       "version": "0.1.5",
@@ -54891,15 +56907,15 @@
     },
     "dgof": {
       "name": "dgof",
-      "version": "1.4",
-      "sha256": "0pbggby27av3nqbkp1b7xyn3zkjglanvl2d3wwmwwzdridjnaqfm",
+      "version": "1.5.1",
+      "sha256": "0530k0isqq26xal2smp1kf6fi7vs1r6g4bbhdnzpiwlij8a7c8zs",
       "depends": []
     },
     "dgpsi": {
       "name": "dgpsi",
-      "version": "2.4.0",
-      "sha256": "004d15bql0by1j4gacrjfbnk95wyzd1m54gdh23y7n664xdn3fql",
-      "depends": ["benchmarkme", "bitops", "clhs", "dplyr", "ggforce", "ggplot2", "lhs", "patchwork", "reshape2", "reticulate", "uuid"]
+      "version": "2.5.0",
+      "sha256": "16af7pdzyqzgikwidszjlzcjm9v2437pgcx884xmvgglddp8znp7",
+      "depends": ["benchmarkme", "clhs", "dplyr", "ggforce", "ggplot2", "kableExtra", "lhs", "lifecycle", "magrittr", "patchwork", "reshape2", "reticulate", "rlang", "tidyr", "uuid", "visNetwork"]
     },
     "dgumbel": {
       "name": "dgumbel",
@@ -54925,11 +56941,11 @@
       "sha256": "00kg2x1was85aq2vr15bak8y5p4mymbs8pbriijlbw64401djmb0",
       "depends": []
     },
-    "dhlabR": {
-      "name": "dhlabR",
-      "version": "1.0.6",
-      "sha256": "185gp7bgaw0rhl29f2gijsqx3da3mzzp06hmi187ywv8i6lsi750",
-      "depends": ["dplyr", "httr", "jsonlite", "purrr", "tibble", "zoo"]
+    "dhis2r": {
+      "name": "dhis2r",
+      "version": "0.3.0",
+      "sha256": "1q2ahch1rv4bp8c5nci2jqsrwr5y252ngv2v958623xd9rfh97kq",
+      "depends": ["R6", "attempt", "curl", "dplyr", "httr2"]
     },
     "dhsage": {
       "name": "dhsage",
@@ -54999,8 +57015,8 @@
     },
     "diathor": {
       "name": "diathor",
-      "version": "0.1.0",
-      "sha256": "0nbqjaxb2fzcg9w67nbrszwv9swr1kjmg4dximfc8qdya1kmv8z9",
+      "version": "0.1.5",
+      "sha256": "0z3pvd5262aayx4ax7324hp3h5xcnkmlz3ry2wxiif5h3nfxhpki",
       "depends": ["data_table", "ggplot2", "purrr", "stringdist", "stringr", "tibble", "tidyr", "vegan"]
     },
     "dibble": {
@@ -55021,6 +57037,12 @@
       "sha256": "1pfb1wxwh9li3z06hrx1zy5vwqmlmq4rjqjh1pi8i6jkbshf702m",
       "depends": ["NMF", "RankAggreg", "Rcpp", "abind", "assertthat", "clValid", "class", "clue", "clusterSim", "clv", "dplyr", "ggplot2", "infotheo", "klaR", "magrittr", "mclust", "purrr", "stringr", "tidyr", "yardstick"]
     },
+    "diceplot": {
+      "name": "diceplot",
+      "version": "0.1.4",
+      "sha256": "0f9dqqg176bqvydq3bbnaz73655gml64faa1l3b74nwgw9bss22r",
+      "depends": ["RColorBrewer", "cowplot", "data_table", "dplyr", "ggplot2", "rlang", "tibble", "tidyr"]
+    },
     "dichromat": {
       "name": "dichromat",
       "version": "2.0-0.1",
@@ -55051,6 +57073,12 @@
       "sha256": "0iyz6z4w2im22rvbpabql2w1cncv0pnrh0hp7agf0pazcpzk2jh6",
       "depends": ["Matrix", "MatrixExtra", "SparseM", "boot", "broom", "data_table", "did", "didimputation", "fixest", "ggplot2", "rlang", "staggered"]
     },
+    "didec": {
+      "name": "didec",
+      "version": "0.1.0",
+      "sha256": "0x1ib0jnp1y7d5rpkf1m485bzyamfzx2i64my5ldwvr738sl2bdk",
+      "depends": ["FOCI", "copBasic", "cowplot", "dendextend", "factoextra", "ggplot2", "gtools", "phylogram", "rlang"]
+    },
     "didimputation": {
       "name": "didimputation",
       "version": "0.3.0",
@@ -55065,16 +57093,10 @@
     },
     "diemr": {
       "name": "diemr",
-      "version": "1.4",
-      "sha256": "1s7ljcgrffb11cd0w2amrdyp75a8m9cv3g8zwizk2gll6p0yqpgg",
+      "version": "1.4.2",
+      "sha256": "18nih9hpxnjxjis19bbsxqzhar822gzi746ngniav9dl1wfx1dvz",
       "depends": ["vcfR", "zoo"]
     },
-    "dietr": {
-      "name": "dietr",
-      "version": "1.1.4",
-      "sha256": "0l0pf55xhfzk7il7cvcasf6gi8nvcckygvryhfqldyq7zmr1pgyh",
-      "depends": ["rfishbase"]
-    },
     "diezeit": {
       "name": "diezeit",
       "version": "0.1-0",
@@ -55083,8 +57105,8 @@
     },
     "difNLR": {
       "name": "difNLR",
-      "version": "1.4.2-1",
-      "sha256": "1wrvsjbvvqwpv7cwc445n7l4ly8gvj8hyd66k02ib8r5854zn192",
+      "version": "1.5.0",
+      "sha256": "1hcba1zrrisjz5bmhaq1r0davc06ng20l9jw5hri3bvcpg8qvyg7",
       "depends": ["VGAM", "calculus", "ggplot2", "msm", "nnet", "plyr"]
     },
     "difR": {
@@ -55113,15 +57135,15 @@
     },
     "diffcor": {
       "name": "diffcor",
-      "version": "0.8.3",
-      "sha256": "0r5hc058h59hz249dx2nf91i45ldjilfrq1a2c4vyp9jvi12qpj5",
+      "version": "0.8.4",
+      "sha256": "1dg0qdhnf33mn3853c23jlbd4d10aa7qhmqhpffhz91fcy3rivkn",
       "depends": ["MASS"]
     },
     "diffdf": {
       "name": "diffdf",
-      "version": "1.0.4",
-      "sha256": "03cr0gvspchdj49kiggsm6i9h5d9z07aswggj4n46lnyz52ihivj",
-      "depends": ["tibble"]
+      "version": "1.1.1",
+      "sha256": "0i9wq31cshxcmg61p610s2r4phi43bxmffbzh74yp9y4f1difil0",
+      "depends": ["assertthat", "tibble"]
     },
     "diffdfs": {
       "name": "diffdfs",
@@ -55149,8 +57171,8 @@
     },
     "diffeqr": {
       "name": "diffeqr",
-      "version": "2.0.1",
-      "sha256": "116j5iivp1rp0aql74mbvbp9j9q86rh49iamfbi46jx0yfh87256",
+      "version": "2.1.0",
+      "sha256": "0l1v2dgdsp77ppmkv8b70kbajz0kabj4pcs612zmpqfy27hdk7da",
       "depends": ["JuliaCall"]
     },
     "diffmatchpatch": {
@@ -55177,12 +57199,6 @@
       "sha256": "0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8",
       "depends": ["htmlwidgets"]
     },
-    "diffudist": {
-      "name": "diffudist",
-      "version": "1.0.1",
-      "sha256": "0s8k949l7fvdy0c1zlrk4zr5dnxksq67spwg8mpdsyc2xchh7b5c",
-      "depends": ["Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "expm", "ggdendro", "ggplot2", "igraph", "reshape2", "rlang", "viridis"]
-    },
     "diffusion": {
       "name": "diffusion",
       "version": "0.4.0",
@@ -55209,14 +57225,14 @@
     },
     "digest": {
       "name": "digest",
-      "version": "0.6.36",
-      "sha256": "0dz6gbfd9qnhn1jjfc4ni3w440183dygla4lszwkz2rmn9j76xyi",
+      "version": "0.6.37",
+      "sha256": "0883iyjbd50f0gwz6hgdmcsrk0i0fkjaix9hz6d4m2jbk54x3i42",
       "depends": []
     },
     "digiRhythm": {
       "name": "digiRhythm",
-      "version": "2.2",
-      "sha256": "1z8arjp4pk8iq7jwigyh7bxfd33dhdxc9blmy1j8kssml152ilhn",
+      "version": "2.4",
+      "sha256": "0ixydyh5s16zanpwb8yz53nk1bziqnsfrn9s03w97h86k7rz89jp",
       "depends": ["crayon", "dplyr", "ggplot2", "lubridate", "magrittr", "pracma", "readr", "stringr", "tidyr", "xts", "zoo"]
     },
     "digitTests": {
@@ -55225,12 +57241,6 @@
       "sha256": "0giz0zr8rcvfv36qmqy6fpamjcansrq4bs3znnq0g97iprj0x3i5",
       "depends": []
     },
-    "digitalDLSorteR": {
-      "name": "digitalDLSorteR",
-      "version": "1.0.1",
-      "sha256": "05wcvv68p55hxf9babr19528khky1pmgfbvm502qhk7ba1arzivf",
-      "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggpubr", "grr", "gtools", "keras", "pbapply", "reshape2", "reticulate", "rlang", "scran", "scuttle", "tensorflow", "tidyr", "zinbwave"]
-    },
     "digitalPCR": {
       "name": "digitalPCR",
       "version": "1.1.0",
@@ -55257,8 +57267,8 @@
     },
     "dimensio": {
       "name": "dimensio",
-      "version": "0.8.1",
-      "sha256": "1vk3maraqipmdk8jv22nxmkj6ab7lr2z4if49398irdmvyk8g7l8",
+      "version": "0.10.1",
+      "sha256": "0jpgv66f2zgqfya6bjd2gh1ys4sx6867y74iwyjpcbmkaky7hhxs",
       "depends": ["arkhe", "khroma"]
     },
     "dimensionsR": {
@@ -55293,8 +57303,8 @@
     },
     "dint": {
       "name": "dint",
-      "version": "2.1.4",
-      "sha256": "1hkbvf4aidjqmcq79bh2k0lg6ayrrhq60zl1vv93zc6a792i55ka",
+      "version": "2.1.5",
+      "sha256": "0qfvxzix6k24xnjxh9nhz9dq3qfwl14mnd7rp03l8yvh6frws8fh",
       "depends": []
     },
     "dipm": {
@@ -55303,16 +57313,10 @@
       "sha256": "1hzcwjnjrhd1s31w8pnyhpfz519jvj820jyq1rdkq8qllny5jbrk",
       "depends": ["ggplot2", "partykit", "survival"]
     },
-    "diproperm": {
-      "name": "diproperm",
-      "version": "0.2.0",
-      "sha256": "0qh8zzpbsjfwh8q833n5pchb6dakqdza77ab7vmsidfbzndka11m",
-      "depends": ["DWDLargeR", "Matrix", "SparseM", "dplyr", "e1071", "ggplot2", "gridExtra", "lemon", "sampling", "usethis"]
-    },
     "dipsaus": {
       "name": "dipsaus",
-      "version": "0.2.9",
-      "sha256": "12bhxys313iqrfkd0cpr2ibv94v14vjj3sxkhvhxqhclf1d19qc6",
+      "version": "0.3.0",
+      "sha256": "0xqza66p4lr8kmw9h8v2vzzhjynlqsmcfqkbsdc2w6c56i20vxik",
       "depends": ["R6", "Rcpp", "base64enc", "cli", "digest", "fastmap", "future", "future_apply", "jsonlite", "progressr", "rlang", "rstudioapi", "shiny", "stringr"]
     },
     "diptest": {
@@ -55377,9 +57381,9 @@
     },
     "disaggregation": {
       "name": "disaggregation",
-      "version": "0.3.0",
-      "sha256": "052l1bky89a9cb6bh22lcksijbri9wdv3pw4wh51c7a8ah9zdqbr",
-      "depends": ["Matrix", "RcppEigen", "TMB", "cowplot", "dplyr", "fmesher", "ggplot2", "sf", "sparseMVN", "splancs", "terra", "tidyterra"]
+      "version": "0.4.0",
+      "sha256": "02sn3byrw2smflimycdlax8yd0wf42qlmyjlknc74v1zc69xaw1h",
+      "depends": ["Matrix", "RcppEigen", "TMB", "cowplot", "dplyr", "fmesher", "ggplot2", "rSPDE", "sf", "sparseMVN", "splancs", "terra", "tidyterra"]
     },
     "disastr_api": {
       "name": "disastr.api",
@@ -55395,8 +57399,8 @@
     },
     "discAUC": {
       "name": "discAUC",
-      "version": "1.0.0",
-      "sha256": "1lw4ikrgb0w88k7gjyjv3qq0xy4h588rq7sgqk1w6zhv3qr8k34z",
+      "version": "1.0.3",
+      "sha256": "1b0pk75jk7z9hcrv3pnci4709cvc2givwdbisd6yhanlg9vsz545",
       "depends": ["dplyr", "glue", "rlang", "tibble"]
     },
     "discFA": {
@@ -55521,9 +57525,9 @@
     },
     "diseasystore": {
       "name": "diseasystore",
-      "version": "0.2.2",
-      "sha256": "1024r1p4wawcg1346vk91xk7x5hxasliiyjp2y0nk085s4lb7s96",
-      "depends": ["DBI", "ISOweek", "R6", "SCDB", "checkmate", "dbplyr", "dplyr", "glue", "jsonlite", "lubridate", "purrr", "readr", "rlang", "stringr", "tidyr", "tidyselect", "zoo"]
+      "version": "0.3.0",
+      "sha256": "1fls0xnf32rswa502rybmqkkcfcikjf0h1zdic8dmcsn6mi8f2xn",
+      "depends": ["DBI", "ISOweek", "R6", "SCDB", "checkmate", "curl", "dbplyr", "dplyr", "glue", "jsonlite", "lubridate", "pkgcond", "purrr", "readr", "rlang", "stringr", "tidyr", "tidyselect", "zoo"]
     },
     "disk_frame": {
       "name": "disk.frame",
@@ -55533,20 +57537,20 @@
     },
     "dismo": {
       "name": "dismo",
-      "version": "1.3-14",
-      "sha256": "1msc75xnc9lbnn8pivd5j4jvb1b9p3xgybfm2ak2mpb2aplz5837",
+      "version": "1.3-16",
+      "sha256": "0lr0cgs2ldihq0pfi1rxs7bzrii832g979r88dplm98lankj75p7",
       "depends": ["Rcpp", "raster", "sp", "terra"]
     },
     "disordR": {
       "name": "disordR",
-      "version": "0.9-8.2",
-      "sha256": "07ydnyifqdsan0kp74mlxaviwj4ccnsh77z36gsh2cpyhda2la8d",
+      "version": "0.9-8-4",
+      "sha256": "00c9glxzabcprnzh60qq9zsjp3psm4a09s5psn9jl9720ckjngcp",
       "depends": ["Matrix", "digest"]
     },
     "dispRity": {
       "name": "dispRity",
-      "version": "1.8",
-      "sha256": "0hng3g5mq75b7rvdypnz816xahbfa4fgyi2n6drxma258qskyd68",
+      "version": "1.9",
+      "sha256": "1di9n7jsbd7kdn0bidyadn6nxlh4c6dilqn163g0z45rhffjrflf",
       "depends": ["Claddis", "GET", "MASS", "ade4", "ape", "castor", "ellipse", "geometry", "mnormt", "phangorn", "phyclust", "phylolm", "scales", "vegan", "zoo"]
     },
     "disparityfilter": {
@@ -55561,6 +57565,12 @@
       "sha256": "08qs060zj58wb5y0ah20qcpm7qz7x99p7h5rblcfhcy2vf4pf239",
       "depends": ["raster", "sf", "sp"]
     },
+    "displease": {
+      "name": "displease",
+      "version": "1.0.0",
+      "sha256": "1wyx0dvw8f8c65lzgk75z0w3xiradap6imx60cv937a3k1lnjiqw",
+      "depends": []
+    },
     "dispmod": {
       "name": "dispmod",
       "version": "1.2",
@@ -55651,6 +57661,18 @@
       "sha256": "0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx",
       "depends": []
     },
+    "distfreereg": {
+      "name": "distfreereg",
+      "version": "1.0.1",
+      "sha256": "1vly5yiqfc68wvijrsa5c14yv4h5rwqrhq4isi3k5ck1sldpdfv5",
+      "depends": ["clue", "numDeriv"]
+    },
+    "distfromq": {
+      "name": "distfromq",
+      "version": "1.0.4",
+      "sha256": "0wls5151kcih7rljbk0zrhz2lqx0npr4l6s61whh70w958h9jshg",
+      "depends": ["checkmate", "purrr", "zeallot"]
+    },
     "distill": {
       "name": "distill",
       "version": "1.6",
@@ -55665,8 +57687,8 @@
     },
     "distillery": {
       "name": "distillery",
-      "version": "1.2-1",
-      "sha256": "1ymmxyamkq0zbz2m4gllln1ihks2hcib6gs0mls92as79srz122b",
+      "version": "1.2-2",
+      "sha256": "1rsxrq5j5zzk48r27l7ns7igcij9crwi001h002h2fjcai7m03cr",
       "depends": []
     },
     "distinctiveness": {
@@ -55689,38 +57711,38 @@
     },
     "distory": {
       "name": "distory",
-      "version": "1.4.4",
-      "sha256": "1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06",
+      "version": "1.4.5",
+      "sha256": "16il7ymwapjps1nscf7h22crzgxqs9alh84dhgrl07v83aq37ivb",
       "depends": ["ape"]
     },
     "distr": {
       "name": "distr",
-      "version": "2.9.3",
-      "sha256": "0n6vsyyw8fakxd0qmj6kfvc3n6hmz0ssnbz43w990nyabf1prb0m",
+      "version": "2.9.5",
+      "sha256": "1zmgmcw118cg7pbzn15kdl3n59hjyma4907yz4nbqpywp5kq07az",
       "depends": ["MASS", "sfsmisc", "startupmsg"]
     },
     "distrDoc": {
       "name": "distrDoc",
-      "version": "2.8.2",
-      "sha256": "0acbmh2lxf82527gm4i3vvh8gqfdnycsmdnf0s5pwz29zs6ql12z",
+      "version": "2.8.4",
+      "sha256": "0r3ic7v0z6wmd1r3i7zhfzv5wnsirgxdnf5g3g1hnrsf3dx7l0mc",
       "depends": ["MASS", "RandVar", "distr", "distrEx", "distrMod", "distrSim", "distrTEst", "distrTeach", "startupmsg"]
     },
     "distrEllipse": {
       "name": "distrEllipse",
-      "version": "2.8.2",
-      "sha256": "1k42wspzq73mxa2y9szcryx6284qbw23z1rjlfj0zfbl62qvq3p7",
+      "version": "2.8.3",
+      "sha256": "08gq3yq71kjh0bm2xj2r1r90xkk3pppwc24laqsvgnd467a2mf7y",
       "depends": ["distr", "distrEx", "distrSim", "mvtnorm", "setRNG", "startupmsg"]
     },
     "distrEx": {
       "name": "distrEx",
-      "version": "2.9.2",
-      "sha256": "1r7k81vlryjglf6i5z1xh71dn234czaddcn8yxszfbmmrjhwlsyh",
+      "version": "2.9.5",
+      "sha256": "1zxw0ml9rs771n3zsxhv03hdyn1jb46zfrihy4ykdsnbbn8pj8g0",
       "depends": ["distr", "startupmsg"]
     },
     "distrMod": {
       "name": "distrMod",
-      "version": "2.9.1",
-      "sha256": "0gpa19xdw4gl8impn9lq8xxc8qwzs1wygfglzfn7hjin8l588avj",
+      "version": "2.9.6",
+      "sha256": "0fhsg944qfb5irpy9w4sc065mz31l0p0vdj2rjz9jpmk75mh2b7w",
       "depends": ["MASS", "RandVar", "distr", "distrEx", "sfsmisc", "startupmsg"]
     },
     "distrRmetrics": {
@@ -55731,8 +57753,8 @@
     },
     "distrSim": {
       "name": "distrSim",
-      "version": "2.8.2",
-      "sha256": "11dd09v8fx19xglmpkhc0j3gdrzh94cpidjks54g8lkzgv5ichr7",
+      "version": "2.8.3",
+      "sha256": "0b2cyfz1ghbkz7ps4lzwkkfakxq9wc1yd53zh8pzd1r8zjkb9c7y",
       "depends": ["distr", "setRNG", "startupmsg"]
     },
     "distrTEst": {
@@ -55755,15 +57777,15 @@
     },
     "distributional": {
       "name": "distributional",
-      "version": "0.4.0",
-      "sha256": "00p6427lw65py24qr9rlhj1wg4z5wgszgmbmbxbpjk7dkckz7d89",
-      "depends": ["generics", "lifecycle", "numDeriv", "rlang", "vctrs"]
+      "version": "0.5.0",
+      "sha256": "1b3i5vgljpjcr8v2xrz20cd900q36rmijizfgcx7id3raj5dwp1l",
+      "depends": ["generics", "lifecycle", "numDeriv", "pillar", "rlang", "vctrs"]
     },
     "distributions3": {
       "name": "distributions3",
-      "version": "0.2.1",
-      "sha256": "19c8s5qshqzhvl01c7nd9912vyy0nnmc7rfg8iih2jlcpqrdql86",
-      "depends": ["ellipsis", "ggplot2", "glue"]
+      "version": "0.2.2",
+      "sha256": "0av16mpnr18ijj4g8fk85mdvvv7qxqj1i9cn1dm585qgg1q8hd0z",
+      "depends": ["ggplot2", "glue", "rlang"]
     },
     "distributionsrd": {
       "name": "distributionsrd",
@@ -55815,14 +57837,14 @@
     },
     "divDyn": {
       "name": "divDyn",
-      "version": "0.8.2",
-      "sha256": "1rqk7ih0j6d3ykx7d0r0c33bcbksw4paman5f92ragw2a96d04cf",
+      "version": "0.8.3",
+      "sha256": "0jvx5nmmb06vp9w4zv04xwdqa4ppfv712si8c69bs06kid5iq8lh",
       "depends": ["Rcpp"]
     },
     "diveMove": {
       "name": "diveMove",
-      "version": "1.6.2",
-      "sha256": "04naajbri3jrdcggh7ja1niyqb4l2afawpcw5nay0bx7823i5nhq",
+      "version": "1.6.4",
+      "sha256": "18g335912rx49vwdjw577v0jxc25y204whzb48cpg51ihrc91ngf",
       "depends": ["KernSmooth", "geosphere", "plotly", "quantreg", "uniReg"]
     },
     "diveR": {
@@ -55831,6 +57853,12 @@
       "sha256": "0n0ldc3k0ryr20794kvqxpnk8m3qc13lkl6rxw043pkwbjqj7291",
       "depends": ["cli", "crayon", "ggmulti", "loon", "loon_data", "loon_ggplot", "loon_shiny", "loon_tourr", "rstudioapi", "zenplots"]
     },
+    "divent": {
+      "name": "divent",
+      "version": "0.4-4",
+      "sha256": "0p51xpxc05w0f4djab84pcp7hi8g9lsdrrxdb3mi84qj6b5smbk4",
+      "depends": ["EntropyEstimation", "RColorBrewer", "Rdpack", "ape", "cli", "dplyr", "ggplot2", "rlang", "tibble", "tidyr", "vegan"]
+    },
     "diverge": {
       "name": "diverge",
       "version": "2.0.6",
@@ -55845,20 +57873,20 @@
     },
     "diversitree": {
       "name": "diversitree",
-      "version": "0.10-0",
-      "sha256": "1xl2swbmgpni2y2divl29xh702b88kxgcswa47g62ny59gh2fdn1",
+      "version": "0.10-1",
+      "sha256": "1k2h2pxxxm7pkjdzsn3mvf2i169vckxmyhzc4mqrcppmnbkzpx4a",
       "depends": ["Rcpp", "ape", "deSolve", "subplex"]
     },
     "diversityForest": {
       "name": "diversityForest",
-      "version": "0.4.0",
-      "sha256": "1yp9lwr5sj8mv1sxrrjsx00m2aq02xcs3q06v51h29g686rdij0f",
-      "depends": ["MapGAM", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "gam", "ggplot2", "ggpubr", "nnet", "rlang", "rms", "scales", "sgeostat", "survival"]
+      "version": "0.5.0",
+      "sha256": "0p4kk896y6cidy9nh8blvg9ghcy21dhjnw9hcpg90bq4j8s82gms",
+      "depends": ["MapGAM", "Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "gam", "ggplot2", "ggpubr", "nnet", "patchwork", "rlang", "rms", "scales", "sgeostat", "survival"]
     },
     "divest": {
       "name": "divest",
-      "version": "1.0.0",
-      "sha256": "1qm2m4dxh1rlxbr9y1vpyhngxyawi2ll72s5ayiaik6rgr5jd2cp",
+      "version": "1.1.1",
+      "sha256": "19r95llk0znr02lin39jwhidgzfnr8bigg74gi1zb69x3xp6h5v6",
       "depends": ["RNifti", "Rcpp"]
     },
     "divo": {
@@ -55929,8 +57957,8 @@
     },
     "dlm": {
       "name": "dlm",
-      "version": "1.1-6",
-      "sha256": "0mxfakryagyg2idjhw1ydp4xqk57s3z17cv69hj16lisx8q43pc9",
+      "version": "1.1-6.1",
+      "sha256": "0hsz1xavzbylqb33c0qzalcqmq4g4i1c38wd351zjj88dvg73qvk",
       "depends": []
     },
     "dlmtree": {
@@ -55971,8 +57999,8 @@
     },
     "dm": {
       "name": "dm",
-      "version": "1.0.10",
-      "sha256": "0ngh74kkzngpq6qrz8aabsv7jgmbxggbplin5jbgjalyi21gfm40",
+      "version": "1.0.11",
+      "sha256": "1jv9r5h3p4ci0d809fhzkc17xh6iliavkzkzcnkq7y4xahkk45rj",
       "depends": ["backports", "cli", "dplyr", "glue", "igraph", "lifecycle", "memoise", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "dma": {
@@ -55989,8 +58017,8 @@
     },
     "dmbc": {
       "name": "dmbc",
-      "version": "1.0.2",
-      "sha256": "0crwmprmn4k565zwvwwqkf70j6f166rvhssx0pwrmch935ascpsf",
+      "version": "1.0.3",
+      "sha256": "0rbahb7590sy6d975wd0g00x5xxfxjzsgywzcc7wqd6lyqkmn3v3",
       "depends": ["Rcpp", "RcppArmadillo", "RcppProgress", "abind", "bayesplot", "coda", "ggplot2", "ggrepel", "modeltools", "robustX", "robustbase"]
     },
     "dmetatools": {
@@ -56061,14 +58089,20 @@
     },
     "do": {
       "name": "do",
-      "version": "2.0.0.0",
-      "sha256": "16c6ksdas678k1285vk526ga3qkfb658nq4j5z9safjkyl1d5lrp",
+      "version": "2.0.0.1",
+      "sha256": "1qfhlhlyd1yg1jfsf492nhxv9n8giqjc2rdv7wgxd4bpgcx6vi9h",
       "depends": ["crayon", "data_table", "desc", "httr", "openxlsx", "plyr", "reshape2", "rstudioapi", "rvest", "stringr", "tidyr", "tidyselect", "tmcn", "usethis", "xml2"]
     },
+    "do3PCA": {
+      "name": "do3PCA",
+      "version": "1.0.0",
+      "sha256": "11ilwy7iqia6nxqphycq526crg5q1y0giqfy8q66ibj3zzql8xbs",
+      "depends": ["Rdimtools", "ape", "matrixcalc", "mclust", "nloptr", "phytools", "ratematrix"]
+    },
     "doBy": {
       "name": "doBy",
-      "version": "4.6.22",
-      "sha256": "038b1gs039br4xzv6axij2fzdzahmk718qm4akg77bwqvqvf59ra",
+      "version": "4.6.24",
+      "sha256": "1vihc2289ziakxfxfsq64axms2ppja2vgvz09grjckwiaq1widll",
       "depends": ["Deriv", "MASS", "Matrix", "boot", "broom", "cowplot", "dplyr", "ggplot2", "microbenchmark", "modelr", "rlang", "tibble", "tidyr"]
     },
     "doFuture": {
@@ -56089,6 +58123,12 @@
       "sha256": "0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938",
       "depends": ["Rmpi", "foreach", "iterators"]
     },
+    "doParabar": {
+      "name": "doParabar",
+      "version": "1.0.2",
+      "sha256": "08vz3rpsq0kar3rk7sgb9w8vx276kqkcyav6bdn9j5jhsn7p5s9w",
+      "depends": ["foreach", "iterators", "parabar"]
+    },
     "doParallel": {
       "name": "doParallel",
       "version": "1.0.17",
@@ -56139,8 +58179,8 @@
     },
     "dockerfiler": {
       "name": "dockerfiler",
-      "version": "0.2.3",
-      "sha256": "1fy9mdq24v48vv3fkglwv1rqhlm4chlgli6d7arw0wa9s4h9bh2z",
+      "version": "0.2.4",
+      "sha256": "0axiqvd3hbrb6br56qhjc5cpxv230x4j02ly9aa98gcrwwpc1w59",
       "depends": ["R6", "attempt", "cli", "desc", "fs", "glue", "jsonlite", "memoise", "pak", "pkgbuild", "purrr", "remotes", "usethis"]
     },
     "docket": {
@@ -56325,8 +58365,8 @@
     },
     "dotCall64": {
       "name": "dotCall64",
-      "version": "1.1-1",
-      "sha256": "06y9y9m5prjvqlprqpanbamgr6jkw27wj7nnha5ayyn08zbxgf11",
+      "version": "1.2",
+      "sha256": "1ah88h77lc9zb68b3xyk97xpid2pilkywk25m68x3m1h3xbspmma",
       "depends": []
     },
     "dotenv": {
@@ -56337,8 +58377,8 @@
     },
     "dotgen": {
       "name": "dotgen",
-      "version": "0.1.0",
-      "sha256": "12dvn52ggmkj2q6whi8s2hh9fpg7jcg20bgx32jxzh4cb1zxnksz",
+      "version": "0.1.1",
+      "sha256": "0ali0kybxmx0gwjmvj6zadx9s1j81yby1d88y88rh4j9s40cc59d",
       "depends": ["mvtnorm"]
     },
     "dotprofile": {
@@ -56359,10 +58399,16 @@
       "sha256": "0pyxs899429qsyhnm1n36n06wxwrk1i20qd9pyz62n4n6x706ajq",
       "depends": ["dplyr", "ggplot2", "gridExtra", "gtools", "lazyeval", "magrittr", "rlang", "scales", "stringr", "tidyr", "tidyselect"]
     },
+    "dotty": {
+      "name": "dotty",
+      "version": "0.1.0",
+      "sha256": "1w41cm1h6g2r1r6iqwyfw0m0qyg296yv5nbsav90vg9a9knq56cf",
+      "depends": []
+    },
     "dotwhisker": {
       "name": "dotwhisker",
-      "version": "0.8.2",
-      "sha256": "1hry5c2w6y5h0il5plj2mp3gmlzjq0cw6klbmlh0ka56nv9b9bcg",
+      "version": "0.8.3",
+      "sha256": "0p1l0750cy31ray9f9xm8yrc0zin4zb93rvbix51m3r4snhvjlnl",
       "depends": ["dplyr", "ggplot2", "ggstance", "gridExtra", "gtable", "parameters", "patchwork", "performance", "purrr", "rlang", "stringr"]
     },
     "doubcens": {
@@ -56379,9 +58425,9 @@
     },
     "double_truncation": {
       "name": "double.truncation",
-      "version": "1.7",
-      "sha256": "0hrb1qli7i4jhc705rb02zbq2nyk0i406bb8gpy4jrzygjjbq3g0",
-      "depends": []
+      "version": "1.8",
+      "sha256": "103gdz24piak6ynl9dbk25fvzvar1sjpid50x66n4zm0q0af07cm",
+      "depends": ["MASS"]
     },
     "doubt": {
       "name": "doubt",
@@ -56389,6 +58435,12 @@
       "sha256": "16avp0f7ks2zd4ckakvfm57zng2jk0fg3fz6vbm05lzhqymh6y30",
       "depends": ["unglue"]
     },
+    "douconca": {
+      "name": "douconca",
+      "version": "1.2.2",
+      "sha256": "0p6qmj6bhq6ggpkv59nzgx3sv4gscq6ln2l05lj1f0zskpg9skqq",
+      "depends": ["ggplot2", "ggrepel", "gridExtra", "permute", "rlang", "vegan"]
+    },
     "doudpackage": {
       "name": "doudpackage",
       "version": "2.1.0",
@@ -56409,8 +58461,8 @@
     },
     "downloadthis": {
       "name": "downloadthis",
-      "version": "0.4.0",
-      "sha256": "0hl0xgvlami8q265kyc9nfi916qyr5wh3422rzz3pl5razv09pdp",
+      "version": "0.4.1",
+      "sha256": "09hbcb9yj45l6v9iyv5pr4wz01l8624b34x45107d7a62djil1x9",
       "depends": ["b64", "bsplus", "fs", "ggplot2", "htmltools", "magrittr", "mime", "readr", "writexl", "zip"]
     },
     "downscale": {
@@ -56427,22 +58479,34 @@
     },
     "dowser": {
       "name": "dowser",
-      "version": "2.2.0",
-      "sha256": "05fjca2zfa66fq360swywmncjxz7pvjp0d5h7a0axinvy9wiccg6",
-      "depends": ["Biostrings", "RColorBrewer", "alakazam", "ape", "dplyr", "ggplot2", "ggtree", "gridExtra", "markdown", "phangorn", "phylotate", "rlang", "shazam", "stringr", "tidyr", "tidyselect"]
+      "version": "2.3",
+      "sha256": "0bd8bnz98g4jawfgbacssngw3ind41zbqdv79g8d3z8rxkndcpjb",
+      "depends": ["Biostrings", "RColorBrewer", "airr", "alakazam", "ape", "dplyr", "ggplot2", "ggtree", "gridExtra", "markdown", "phangorn", "phylotate", "rlang", "shazam", "stringr", "tidyr", "tidyselect"]
     },
     "dparser": {
       "name": "dparser",
-      "version": "1.3.1-11",
-      "sha256": "1xb4gfqcb4598wry3i1mfp9a3rjy74z2wy3ga9daaam155vcdbp8",
+      "version": "1.3.1-13",
+      "sha256": "126q30byc5li11xz22k6d6gxccy9hgh89v078hg0qq996bpz7p0a",
       "depends": ["digest"]
     },
+    "dpasurv": {
+      "name": "dpasurv",
+      "version": "0.1.0",
+      "sha256": "1dzlry0pr8i39ix0hnhg19fi00kz5jf2l568230mc1k6fv7fidbv",
+      "depends": ["dplyr", "ggplot2", "rlang", "survival", "tidyr", "timereg"]
+    },
     "dpcc": {
       "name": "dpcc",
       "version": "1.0.0",
       "sha256": "1f4c68bvkwg82k1zanjhqqika2bfjv83mbr2khl5lhvfjwvpi1m0",
       "depends": ["Rcpp"]
     },
+    "dpkg": {
+      "name": "dpkg",
+      "version": "0.6.0",
+      "sha256": "1ah4b2znqikr9llw6rmmwranswr0dbw2c2y31cj972c8h7fvn0mi",
+      "depends": ["arrow", "cli", "fs", "glue", "httr2", "rlang", "tibble"]
+    },
     "dplR": {
       "name": "dplR",
       "version": "1.7.7",
@@ -56535,20 +58599,20 @@
     },
     "drake": {
       "name": "drake",
-      "version": "7.13.10",
-      "sha256": "1nd8vqlc2hzxlh8vlqjvgls3gc2ya8vmx7nyci5g1nib1l07gxrq",
+      "version": "7.13.11",
+      "sha256": "0iabxbc9xb12kpa00yml61d6hhmhv47zsl46mb0lrbv808hkxsad",
       "depends": ["base64url", "digest", "igraph", "rlang", "storr", "tidyselect", "txtq", "vctrs"]
     },
     "drape": {
       "name": "drape",
-      "version": "0.0.1",
-      "sha256": "0y4y6vvskizghqf78d1vr0skac0ks3yb83m9fgn8i3wmgqrhws19",
+      "version": "0.0.2",
+      "sha256": "0ypfghb9qv8rnhh1qs181yhdb85a4854hsicz0sb92wn3as3kc7w",
       "depends": []
     },
     "drat": {
       "name": "drat",
-      "version": "0.2.4",
-      "sha256": "13v7dj2688ix6j9nzhvf8q9ynfihwzkppfdjkis6q1r5m4nikya3",
+      "version": "0.2.5",
+      "sha256": "1di28631gi890krazzvmfcpr2gv6gr83dzkn0rq2n2y0pmnkm2kf",
       "depends": []
     },
     "draw": {
@@ -56601,14 +58665,14 @@
     },
     "drda": {
       "name": "drda",
-      "version": "2.0.3",
-      "sha256": "1s3d0hpxl47rirsig5gbs0q3i6dj2hjzza3655381fla5n0yx9ap",
+      "version": "2.0.4",
+      "sha256": "0npw800swbdv3s0qj345101y5c8f7am40w8cf7krmyh3jj50cyx0",
       "depends": []
     },
     "dreamer": {
       "name": "dreamer",
-      "version": "3.1.0",
-      "sha256": "10yvdg5nkw4nawy9hdqyrsgh01xga8l3hn3qi1sbjzniv7903v7d",
+      "version": "3.2.0",
+      "sha256": "1hav4i6kg652xm3a9hzgjvri7gy0nc6js23jkhsk909xfxbyw0aj",
       "depends": ["coda", "dplyr", "ellipsis", "ggplot2", "purrr", "rjags", "rlang", "rootSolve", "tidyr", "tidyselect"]
     },
     "dreamerr": {
@@ -56641,6 +58705,12 @@
       "sha256": "06zy2acgmhfc1criid35ci1802zl77qcif2vrhn0w8syixsbjiq8",
       "depends": ["learnr"]
     },
+    "drhutools": {
+      "name": "drhutools",
+      "version": "1.0.0",
+      "sha256": "1j55vig4idmx3gys1n9bmcl1h4454hkhjlsg18mx3lp1696rs24n",
+      "depends": ["animation", "dplyr", "gganimate", "ggplot2", "htmltools", "htmlwidgets", "jsonlite", "leaflet", "magick", "mapview", "png", "purrr", "sf", "sp", "webshot"]
+    },
     "drifter": {
       "name": "drifter",
       "version": "0.2.1",
@@ -56673,9 +58743,9 @@
     },
     "dropout": {
       "name": "dropout",
-      "version": "2.1.1",
-      "sha256": "11clanskb3w0v1ahx6q8d7nxqfsck4zbcyrkb8db1ykbdakdq1xs",
-      "depends": ["Rcpp", "dplyr", "tibble"]
+      "version": "2.2.0",
+      "sha256": "09rcmxcdl8g7fcgv86c4mv5gd0399vd17a8g58x039s7yz52ys3j",
+      "depends": []
     },
     "droptest": {
       "name": "droptest",
@@ -56743,6 +58813,18 @@
       "sha256": "1l5qqcpzad2nnhzzcb43slgmdg08v830l5np8mc7qh4wlig1x95l",
       "depends": ["ggplot2", "unikn"]
     },
+    "dsTidyverse": {
+      "name": "dsTidyverse",
+      "version": "1.0.1",
+      "sha256": "0148pphkyyw6pflk5bhlcapzml5kw2xqw94q6gxsk2p15nm050dp",
+      "depends": ["cli", "rlang"]
+    },
+    "dsTidyverseClient": {
+      "name": "dsTidyverseClient",
+      "version": "1.0.0",
+      "sha256": "13ya0n31nkpvamrv6nmswx45npbl5yv07lqmfwccinzm6kzv39c2",
+      "depends": ["DSI", "assertthat", "cli", "rlang"]
+    },
     "dsa": {
       "name": "dsa",
       "version": "1.0.12",
@@ -56767,6 +58849,12 @@
       "sha256": "1skcmd2fh8s5d5qdj661niwa3cfd01i22kxxcf84awad0p1p8g57",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "stringi", "tidyr"]
     },
+    "dscoreMSM": {
+      "name": "dscoreMSM",
+      "version": "0.1.0",
+      "sha256": "1rh9si0kyjn2bfsknplqz2mblsw4hkcf294fcgv515wawvniqjfi",
+      "depends": ["ggplot2", "mstate", "rjags", "survival", "timeROC"]
+    },
     "dsdp": {
       "name": "dsdp",
       "version": "0.1.1",
@@ -56781,8 +58869,8 @@
     },
     "dsims": {
       "name": "dsims",
-      "version": "1.0.4",
-      "sha256": "0mqnpcs9bijkc0l6x6qssr527rh4j4ignlgvgrqxqgii3ikdx92j",
+      "version": "1.0.5",
+      "sha256": "1n8l43971wg48jjwvscrz2pihzdq44ljplx120bgajvms6qdq1nw",
       "depends": ["Distance", "dplyr", "dssd", "ggplot2", "gridExtra", "mgcv", "mrds", "purrr", "rlang", "rstudioapi", "sf"]
     },
     "dslabs": {
@@ -56791,6 +58879,12 @@
       "sha256": "19nx8jjjadwhkk4wp3lv7xddq8pbj6l405xaxk4fhvgcvlxa65zk",
       "depends": ["ggplot2"]
     },
+    "dsld": {
+      "name": "dsld",
+      "version": "0.2.2",
+      "sha256": "1qx5lj7fiaksfp4vc0n0dxjcjpijx5lp4c0ifmzrfsd67d5zhlbb",
+      "depends": ["Kendall", "fairml", "fairness", "freqparcoord", "ggplot2", "gtools", "plotly", "qeML", "ranger", "regtools", "rmarkdown", "sandwich"]
+    },
     "dslice": {
       "name": "dslice",
       "version": "1.2.2",
@@ -56805,8 +58899,8 @@
     },
     "dsmSearch": {
       "name": "dsmSearch",
-      "version": "1.0.1",
-      "sha256": "04phbkav0ryj62aqghmlrraai419qlfd03f0as248s1hmwig5xg2",
+      "version": "1.1.0",
+      "sha256": "0lkxvsicb1gs09n23n9i6pbll210v1lbv19608d04ygjj39jk7y3",
       "depends": ["dplyr", "httr2", "imager", "lidR", "sf", "sp", "terra"]
     },
     "dsmisc": {
@@ -56841,8 +58935,8 @@
     },
     "dst": {
       "name": "dst",
-      "version": "1.7.0",
-      "sha256": "1l3bc2pn092wawf11dmjyv67c280c4p9j3maillc10mpaxav5k99",
+      "version": "1.8.0",
+      "sha256": "1h91pz04cr9frnrnz7zdrn5lwhfsgfx1q9xk0wwifpzhkfy2h9ix",
       "depends": ["Matrix", "dplyr", "ggplot2", "rlang", "tidyr"]
     },
     "dstabledist": {
@@ -56865,8 +58959,8 @@
     },
     "dtComb": {
       "name": "dtComb",
-      "version": "1.0.2",
-      "sha256": "1ww0lw7j77ww1scd99ddasnxp7icbwbadiv3sl4zm8i1bb2mqmyr",
+      "version": "1.0.4",
+      "sha256": "0zfcbwl40hxva5282qplr27idclickid0p4a8vnz5559abygl5aa",
       "depends": ["OptimalCutpoints", "caret", "epiR", "gam", "ggplot2", "ggpubr", "glmnet", "pROC"]
     },
     "dtangle": {
@@ -56883,10 +58977,16 @@
     },
     "dti": {
       "name": "dti",
-      "version": "1.5.4",
-      "sha256": "065cmp4fcwb94ajg7p971jiw705kvmmygxzwscxgyqfhw2ad8hrj",
+      "version": "1.5.4.3",
+      "sha256": "058qny6hv3lcirjmc7kbldyy1i333p9vmvpz4jl9dyrcz5h6qmjh",
       "depends": ["adimpro", "aws", "awsMethods", "gsl", "oro_dicom", "oro_nifti", "quadprog", "rgl"]
     },
+    "dtmapi": {
+      "name": "dtmapi",
+      "version": "0.0.2",
+      "sha256": "1a0a5dff82igzxsz0ma3j2w7waqq2nrv3cy0df2nh7sgqvcldk4m",
+      "depends": ["httr2", "jsonlite", "magrittr"]
+    },
     "dtp": {
       "name": "dtp",
       "version": "0.1.0",
@@ -56913,9 +59013,15 @@
     },
     "dtrackr": {
       "name": "dtrackr",
-      "version": "0.4.4",
-      "sha256": "0biwciv8f8rd6psydiriyylklw7q954dsr3rrax5a2fc3gn9adbz",
-      "depends": ["V8", "base64enc", "dplyr", "fs", "glue", "htmltools", "magrittr", "pdftools", "png", "purrr", "rlang", "rsvg", "stringr", "tibble", "tidyr"]
+      "version": "0.4.6",
+      "sha256": "0rm93mwazp36mp26r4phl9s8iskzsa32zn66pjq95z0znqhl1v9l",
+      "depends": ["V8", "base64enc", "dplyr", "fs", "glue", "htmltools", "lifecycle", "magrittr", "pdftools", "png", "purrr", "rlang", "rsvg", "stringr", "tibble", "tidyr"]
+    },
+    "dtreg": {
+      "name": "dtreg",
+      "version": "1.1.0",
+      "sha256": "1zvgirihzrbgyb5pqggxf8salrwb3p9c067qdvx1cdd949137g8m",
+      "depends": ["R6", "httr2", "jsonlite", "stringr"]
     },
     "dtt": {
       "name": "dtt",
@@ -56925,8 +59031,8 @@
     },
     "dttr2": {
       "name": "dttr2",
-      "version": "0.5.0",
-      "sha256": "0fniydls6c541xhd902a6gczmhigprg0kh74cfmcx8hgknp7fm42",
+      "version": "0.5.2",
+      "sha256": "1fh154phspzwkx8mqk5v1xfq93z6x15kqv7s5xm7ky2rj27wdmin",
       "depends": ["chk", "hms", "lifecycle"]
     },
     "dtts": {
@@ -56979,14 +59085,14 @@
     },
     "duckdb": {
       "name": "duckdb",
-      "version": "1.0.0-2",
-      "sha256": "00dzrjwpd94k11gqvdafxkd8pqlwav6l4haim88p8ann48gxad9p",
+      "version": "1.1.3-1",
+      "sha256": "1r08xibqddmph5r03c224fyp400rw8qms0g6x8s1r442r6jfbxk1",
       "depends": ["DBI"]
     },
     "duckdbfs": {
       "name": "duckdbfs",
-      "version": "0.0.5",
-      "sha256": "1vj3ay4lr0whzvkljha1sk4cqjsngj7k1zykjfmj67drljvy7m64",
+      "version": "0.0.9",
+      "sha256": "05vrlqj7bzhmfil8g6bv06ll1dcm50j65fznl5vk50cv8k45cdsv",
       "depends": ["DBI", "dbplyr", "dplyr", "duckdb", "fs", "glue"]
     },
     "duckduckr": {
@@ -57027,8 +59133,8 @@
     },
     "dunlin": {
       "name": "dunlin",
-      "version": "0.1.7",
-      "sha256": "10xfps9b2dxw4w6c5z5djsp7ssz1rnpccvnai471r1zppyv14hy7",
+      "version": "0.1.8",
+      "sha256": "1bhl64g5x14bqw5flbcb5vhshwp1dmw04fakmdkvkswnl258m6gx",
       "depends": ["checkmate", "dplyr", "forcats", "glue", "magrittr", "rlang", "stringr", "tibble", "yaml"]
     },
     "dunn_test": {
@@ -57055,11 +59161,17 @@
       "sha256": "0q8c0z1yhym20rhfjrc8n03gk458z0n8axx013rcwk1vc2zwk670",
       "depends": ["dplyr", "lintr", "magrittr", "purrr", "rlang", "stringdist", "tibble"]
     },
+    "dverse": {
+      "name": "dverse",
+      "version": "0.2.0",
+      "sha256": "0f6agiv2fgkzykvfacg0pa0gbzp0ppdvrby4kjvzjg52nri657cb",
+      "depends": ["cli", "curl", "dplyr", "glue", "rlang", "tibble"]
+    },
     "dvir": {
       "name": "dvir",
-      "version": "3.2.1",
-      "sha256": "09fcqhzy53bfkzlff2jpq76d9sygj6vcs85k70n06p633ldvayap",
-      "depends": ["forrel", "pedprobr", "pedtools", "ribd"]
+      "version": "3.3.0",
+      "sha256": "1anqm4lfr911yzj3v9953b72y7mbvbm4x52vkblwzlnxznkhmcn4",
+      "depends": ["forrel", "pbapply", "pedFamilias", "pedprobr", "pedtools", "ribd", "verbalisr"]
     },
     "dvmisc": {
       "name": "dvmisc",
@@ -57109,6 +59221,12 @@
       "sha256": "0nx4gx51p0qz1565yn7xg0ijrkqvn9ql9hrmp5lwl4lxvsjnwki1",
       "depends": ["CholWishart", "MASS", "RcppZiggurat", "Rfast", "mvtnorm"]
     },
+    "dycdtools": {
+      "name": "dycdtools",
+      "version": "0.4.4",
+      "sha256": "0c5ds2bnnv08c68hyxr4p4p6h9cc2pbivgyyqglaz23317rcxlcp",
+      "depends": ["RColorBrewer", "R_utils", "dplyr", "ggplot2", "lubridate", "ncdf4", "tidyr"]
+    },
     "dydea": {
       "name": "dydea",
       "version": "0.1.0",
@@ -57165,14 +59283,14 @@
     },
     "dynaSpec": {
       "name": "dynaSpec",
-      "version": "1.0.1",
-      "sha256": "0wzfy50602wlsh4sbfjadsr01f3az2lvk5c4px3qmcvv5gybd6w0",
-      "depends": ["NatureSounds", "ari", "av", "gganimate", "ggplot2", "magrittr", "pbapply", "png", "scales", "seewave", "tuneR", "viridis"]
+      "version": "1.0.2",
+      "sha256": "1mkc74jd25ydfl3ssl5kvcwjrvi6wdlm76v1m4sf4fm3vag37jyc",
+      "depends": ["ari", "gganimate", "ggplot2", "png", "scales", "seewave", "tuneR", "viridis", "warbleR"]
     },
     "dynaTree": {
       "name": "dynaTree",
-      "version": "1.2-16",
-      "sha256": "14yxs9f03bdmrf3lis7hzk04smz0dddammbd0na4gw7bq14341bm",
+      "version": "1.2-17",
+      "sha256": "1w7z1qjyhhcymi9if1x8i8sniya642diwnvkf0qhwzan8scig1yj",
       "depends": []
     },
     "dynamAedes": {
@@ -57207,8 +59325,8 @@
     },
     "dynamite": {
       "name": "dynamite",
-      "version": "1.5.2",
-      "sha256": "1gbhrswczs1lb7qwv2wgiapl5xax2z5indfmzvq8f4d45cd4wn2v",
+      "version": "1.5.5",
+      "sha256": "1fby4z8xxz7qy3hyn016c4fap5wwsj0h6p9azk5ld51kb5blk2zh",
       "depends": ["checkmate", "cli", "data_table", "ggforce", "ggplot2", "glue", "loo", "patchwork", "posterior", "rlang", "rstan", "tibble"]
     },
     "dynatop": {
@@ -57223,12 +59341,6 @@
       "sha256": "1sv519dc7fs6zrwnyggkzrcy866a6pgag0shk6rr6cd3xa1blwpv",
       "depends": ["R6", "jsonlite", "terra"]
     },
-    "dyncomp": {
-      "name": "dyncomp",
-      "version": "0.0.2-1",
-      "sha256": "13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11",
-      "depends": ["zoo"]
-    },
     "dyndimred": {
       "name": "dyndimred",
       "version": "1.0.4",
@@ -57321,14 +59433,14 @@
     },
     "e1071": {
       "name": "e1071",
-      "version": "1.7-14",
-      "sha256": "15aiwr1jhv3a2r9jqqy8d5rf0c8y09zzi45116whgk1s0ymrfkbm",
+      "version": "1.7-16",
+      "sha256": "0krsgkcvs16jixmjwjl05aggpz02hahg2j8ydk4r9nrz0ginbm8j",
       "depends": ["class", "proxy"]
     },
     "eAnalytics": {
       "name": "eAnalytics",
-      "version": "0.3",
-      "sha256": "0kh2mnn4piy30ya0z9hrk10x14pz4li5l0gs8c2by9vkq54cq53i",
+      "version": "0.3.1",
+      "sha256": "1hphh2b8il1gj5kyz7xgq195gldq3xpkslaxz1rcc9kgqw1dyd5x",
       "depends": ["DT", "dplyr", "energyr", "googleVis", "leaflet", "plotly", "shiny", "shinyWidgets", "shinydashboard"]
     },
     "eBsc": {
@@ -57349,6 +59461,12 @@
       "sha256": "12p20sfz5q16n24fjz7z5bv54wf20z6lp9gn6fvrilfy9w18as1k",
       "depends": ["future", "future_apply", "idr", "mvtnorm"]
     },
+    "eCerto": {
+      "name": "eCerto",
+      "version": "0.5.14",
+      "sha256": "1s2dz4dq0r2fhiinnlaqpg42bfzvdlh0inkyfdz0khapd67shbgq",
+      "depends": ["DT", "R6", "bslib", "config", "golem", "knitr", "magick", "markdown", "moments", "openxlsx", "plyr", "purrr", "rmarkdown", "shiny", "shinyWidgets", "shinyjs", "tidyxl"]
+    },
     "eChem": {
       "name": "eChem",
       "version": "1.0.0",
@@ -57367,6 +59485,12 @@
       "sha256": "0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j",
       "depends": ["Rcpp", "RcppArmadillo", "xts", "zoo"]
     },
+    "eDNAjoint": {
+      "name": "eDNAjoint",
+      "version": "0.2",
+      "sha256": "0iwgrh18aaij88j9hxv0bq7hvdml339rmcz7pm21hrskv7j7gvk3",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayestestR", "dplyr", "ggplot2", "lifecycle", "loo", "magrittr", "rlist", "rstan", "rstantools", "scales", "tidyr"]
+    },
     "eFRED": {
       "name": "eFRED",
       "version": "0.1.0",
@@ -57387,8 +59511,8 @@
     },
     "eHOF": {
       "name": "eHOF",
-      "version": "1.15",
-      "sha256": "0i7iki5sgwa5ngjs86jhkc3iw2x9ph43ksn9gq84rlm5hgimwb8v",
+      "version": "1.16",
+      "sha256": "01sashvaf6m8k60kz8bzsamahqjs2cy4mqjdrlj2n6lbir73x6bp",
       "depends": ["lattice", "mgcv"]
     },
     "eLNNpairedCov": {
@@ -57429,8 +59553,8 @@
     },
     "eSDM": {
       "name": "eSDM",
-      "version": "0.4.2",
-      "sha256": "14h353kw32lb3ik8fqqsb7bb1sxf445js8mw07almq9hpl3srcbn",
+      "version": "0.4.4",
+      "sha256": "0sm5xr93i785082bwiprbkxhbb94vwha7jfd3w5xvz2a28axgpxj",
       "depends": ["ROCR", "dplyr", "magrittr", "purrr", "rlang", "sf", "shiny", "units"]
     },
     "eSIR": {
@@ -57447,8 +59571,8 @@
     },
     "eaf": {
       "name": "eaf",
-      "version": "2.5",
-      "sha256": "0krvl6gk44yy9r30sck7mn0k37mi8j7nw90b56klww1zqh0ihs8p",
+      "version": "2.5.1",
+      "sha256": "03039hjrpkgh9kzasd0q8x4k6nnzkmhyrf39psg1zizfdfdh2y4p",
       "depends": ["Rdpack", "matrixStats", "modeltools"]
     },
     "earlyR": {
@@ -57471,8 +59595,8 @@
     },
     "earth": {
       "name": "earth",
-      "version": "5.3.3",
-      "sha256": "0wpmsa2r85g7z0k7kjcvncq105vyrg61x9jb1873xc9xpg50yskq",
+      "version": "5.3.4",
+      "sha256": "1g6ywsmdp7qlp0rql6f07j9hih45w9jm7b90sgkjpylqan94zy9s",
       "depends": ["Formula", "plotmo"]
     },
     "earthdatalogin": {
@@ -57493,10 +59617,16 @@
       "sha256": "17biiw0ig8i8ihc2f8csp0bqryygg27ic2v1vrf81ax3qzhngy4l",
       "depends": ["ggmap"]
     },
+    "easy_glmnet": {
+      "name": "easy.glmnet",
+      "version": "1.0",
+      "sha256": "0yxfydyi6q5qx157gf1sdambfbq33zvldsydsjbkzn5fqv03g7h5",
+      "depends": ["doParallel", "foreach", "glmnet", "survival"]
+    },
     "easy_utils": {
       "name": "easy.utils",
-      "version": "0.0.4",
-      "sha256": "1rhdpqnhr1nv5jm3dcs8ikn35d911pi46sfsflk4f73m9fzyj9s1",
+      "version": "0.0.5",
+      "sha256": "1f9iz4jssb4ail8sp18mnfbkvsxz4rx1inry60z6zi4jswr3q25m",
       "depends": ["Polychrome", "dplyr", "fastmatch", "rlang", "scales"]
     },
     "easyAHP": {
@@ -57507,8 +59637,8 @@
     },
     "easyCODA": {
       "name": "easyCODA",
-      "version": "0.34.3",
-      "sha256": "1s1zjjvswl3444m84n6c5sznva4y19kcm171xkcy1zdx3wqmd2m3",
+      "version": "0.40.2",
+      "sha256": "01qjlv5qhl2pzyizcx93qvlrn44dic8hy4xaj6zbx4xkcpvr13l7",
       "depends": ["ca", "ellipse", "vegan"]
     },
     "easyDes": {
@@ -57559,6 +59689,12 @@
       "sha256": "0wvnyhjq94cqjx9dw2nc5v66a11qbi972g0shvzz7q4llkgm21if",
       "depends": ["Matrix", "SSBtools", "sdcTable", "shiny"]
     },
+    "easySimData": {
+      "name": "easySimData",
+      "version": "0.1.0",
+      "sha256": "19jf7j91ynsibrjsd9m7i18sqhj89md7rwc753618sjhdrdfvrww",
+      "depends": ["dplyr", "ggplot2", "gridExtra", "simdata", "stringr"]
+    },
     "easyVerification": {
       "name": "easyVerification",
       "version": "0.4.5",
@@ -57573,16 +59709,22 @@
     },
     "easyanova": {
       "name": "easyanova",
-      "version": "10.0",
-      "sha256": "0r8qyfhbipyj4j13g1h3p3gag3i3mmpxq2zzq0cighamqbcbmvaf",
+      "version": "11.0",
+      "sha256": "12w7d2n4mpaf8zii07gcp6bv7hi4k72xkyd6wvifdwhfi55zkvrr",
       "depends": ["nlme"]
     },
     "easybgm": {
       "name": "easybgm",
-      "version": "0.1.2",
-      "sha256": "10z8p9bslpnz3cp7lq7qadrpj6jm8k7rwakvak73qppvmpza7rfr",
+      "version": "0.2.1",
+      "sha256": "0v54vqi7hc28spfbb2mbq8hjcxp1p5dwr1476qkifvm9src6ja53",
       "depends": ["BDgraph", "BGGM", "HDInterval", "bgms", "dplyr", "ggplot2", "igraph", "qgraph"]
     },
+    "easybio": {
+      "name": "easybio",
+      "version": "1.1.0",
+      "sha256": "0alnbb1pjvykagpgmw7wmn8bp0pkx3wx62nl97yvw9fwwdkg56hn",
+      "depends": ["R6", "data_table", "ggplot2", "limma"]
+    },
     "easycensus": {
       "name": "easycensus",
       "version": "1.1.1",
@@ -57591,8 +59733,8 @@
     },
     "easyclimate": {
       "name": "easyclimate",
-      "version": "0.2.1",
-      "sha256": "19gfajf4bhlz0mpq70xjy87xc3qi9kqs3869zm2jy4x0i3cingk6",
+      "version": "0.2.2",
+      "sha256": "1d617g1q32hhzssnspzgi24797259cy3jqar57bh7k6hfjmisyd5",
       "depends": ["RCurl", "R_utils", "terra"]
     },
     "easycsv": {
@@ -57675,8 +59817,8 @@
     },
     "eatGADS": {
       "name": "eatGADS",
-      "version": "1.1.0",
-      "sha256": "10d9np84zb5jrak03iq72imj02c55jag121hf4g0yfpplaqnc85q",
+      "version": "1.1.1",
+      "sha256": "1rbgs04rk7rdgyvvx9bcs9g0ir9rlx0ilkdj0dzfdyh6ba4jbkp3",
       "depends": ["data_table", "eatDB", "eatTools", "haven", "hms", "plyr", "stringi", "tibble"]
     },
     "eatRep": {
@@ -57687,8 +59829,8 @@
     },
     "eatTools": {
       "name": "eatTools",
-      "version": "0.7.6",
-      "sha256": "0l9ip4y2b18qmb760xmjx174c7pp8crqmwiq7plark82q6p7ybfw",
+      "version": "0.7.8",
+      "sha256": "0ias68g4gyhvyw96hdzl4iv4dv7x1rrs8afpi8bbsz8b45yncjk0",
       "depends": ["checkmate", "data_table", "stringi"]
     },
     "ebGenotyping": {
@@ -57741,8 +59883,8 @@
     },
     "ebmstate": {
       "name": "ebmstate",
-      "version": "0.1.4",
-      "sha256": "1jbkzf7zn844jg10cy9kv3v569n82718iqaz7id4jfbcq31p7l8v",
+      "version": "0.1.5",
+      "sha256": "1f1rb6mzpmsh317gjfpyg9fhankyjpd8xixlhfp8m6cgmv6dgvfc",
       "depends": ["HDInterval", "Rcpp", "mstate", "survival"]
     },
     "ebnm": {
@@ -57759,8 +59901,8 @@
     },
     "ebvcube": {
       "name": "ebvcube",
-      "version": "0.2.3",
-      "sha256": "0637q8795n7k2mnwdvnamnkdrz4akh458ijry7x3068kfzgr778y",
+      "version": "0.3.3",
+      "sha256": "1y27asswm3cgagkqp3b6c250raab1w24ja22cljlfm53nd5k5mp8",
       "depends": ["DelayedArray", "HDF5Array", "checkmate", "curl", "ggplot2", "httr", "jsonlite", "memuse", "ncdf4", "ncmeta", "reshape2", "rhdf5", "stringr", "terra", "tidyterra", "withr"]
     },
     "ec50estimator": {
@@ -57787,6 +59929,12 @@
       "sha256": "1rxvcix414w9hmv9snmndq1ivg27njvvqh9zk7xjxlnf0d8ffc81",
       "depends": ["curl", "digest", "httr", "jsonlite", "uuid"]
     },
+    "ecdata": {
+      "name": "ecdata",
+      "version": "1.1.1",
+      "sha256": "11pmcl5f376xm56v4g2fhkfaf7safg1r5chqf3n2475pzc0nypz5",
+      "depends": ["arrow", "cachem", "cli", "curl", "glue", "memoise", "piggyback", "rlang", "vctrs"]
+    },
     "ecdfHT": {
       "name": "ecdfHT",
       "version": "0.1.1",
@@ -57879,9 +60027,9 @@
     },
     "ecmwfr": {
       "name": "ecmwfr",
-      "version": "1.5.0",
-      "sha256": "0bicldir8cmfd25wzmqhcawv94q2xmqwbzsqbk08w9y8x6yhxhic",
-      "depends": ["R6", "curl", "getPass", "httr", "keyring", "memoise", "uuid"]
+      "version": "2.0.2",
+      "sha256": "0ryyx11685vnz2fkrzslp259l3k2iiczj7r70fbf7q0rcp0k7k94",
+      "depends": ["R6", "getPass", "httr", "keyring", "memoise"]
     },
     "ecoCopula": {
       "name": "ecoCopula",
@@ -57891,9 +60039,9 @@
     },
     "ecocbo": {
       "name": "ecocbo",
-      "version": "0.10.2",
-      "sha256": "003fdvlzalga0s968mznaa7i32v5v4ppw9n0dknqw0xh53fcg5zf",
-      "depends": ["doParallel", "foreach", "ggplot2", "ggpubr", "sampling", "vegan"]
+      "version": "0.12.0",
+      "sha256": "1dixh1rdrfw419wdcp81hac2sali03wg7x9fr1x77rgy2q059370",
+      "depends": ["SSP", "doParallel", "doSNOW", "foreach", "ggplot2", "ggpubr", "rlang", "sampling", "vegan"]
     },
     "ecochange": {
       "name": "ecochange",
@@ -57957,9 +60105,9 @@
     },
     "economiccomplexity": {
       "name": "economiccomplexity",
-      "version": "1.5.0",
-      "sha256": "1xx4fpf2rjizwhicb6sfrgl5xjfin9b9zi0q4kq47gjp8kzahkg3",
-      "depends": ["Matrix", "Rdpack", "igraph"]
+      "version": "2.0.0",
+      "sha256": "1zddl25rp9fcmqp7h43xhn28j4l7h1jvg1p430az04m4dpwpnhk9",
+      "depends": ["Rdpack", "cpp11", "cpp11armadillo", "igraph"]
     },
     "econullnetr": {
       "name": "econullnetr",
@@ -57987,8 +60135,8 @@
     },
     "ecorest": {
       "name": "ecorest",
-      "version": "1.0.0",
-      "sha256": "13x95z99yqld1fvfgzbm6ahrnvfvcqwlb23yjr187yg83iynh79v",
+      "version": "2.0.0",
+      "sha256": "0s523zj537bdz47x2lcfd72cqdzz0gwbi6vg79ckz0sjzaiy51kk",
       "depends": ["viridis"]
     },
     "ecos": {
@@ -58015,6 +60163,12 @@
       "sha256": "097cr6qwf2hqm8v3afabnm7lmmv2awih2kz26vd28jr179af8p65",
       "depends": ["Hmisc", "PresenceAbsence", "ade4", "adehabitatHR", "adehabitatMA", "biomod2", "classInt", "dismo", "ecodist", "foreach", "gbm", "gtools", "ks", "matrixStats", "nabor", "poibin", "terra", "vegan"]
     },
+    "ecostate": {
+      "name": "ecostate",
+      "version": "0.2.0",
+      "sha256": "1brnqksy53fz7l4pvrbny7amh0sb6xwii9f0s22v9qqkql7pm1ir",
+      "depends": ["MASS", "RTMB", "TMB", "checkmate", "ggnetwork", "ggplot2", "igraph"]
+    },
     "ecostats": {
       "name": "ecostats",
       "version": "1.2.1",
@@ -58053,8 +60207,8 @@
     },
     "ecp": {
       "name": "ecp",
-      "version": "3.1.5",
-      "sha256": "17m2m3nz7kqzjw2bkkp6c1a3zhwjq2c5mw9pk5g0ma274iiqj8wy",
+      "version": "3.1.6",
+      "sha256": "1imahvby3nj1b5d1x7hq6gkfg0fyyd27ghls0v35456imy1fmhz5",
       "depends": ["Rcpp"]
     },
     "ecpc": {
@@ -58063,6 +60217,12 @@
       "sha256": "0vi9k3p1xicx53rmccmx1ykdidqb22hkwgr7l5hc0bjzsv7h2w38",
       "depends": ["CVXR", "JOPS", "Matrix", "checkmate", "gglasso", "glmnet", "mgcv", "multiridge", "mvtnorm", "pROC", "pracma", "quadprog", "survival"]
     },
+    "ecpdist": {
+      "name": "ecpdist",
+      "version": "0.2.1",
+      "sha256": "1an8j13ms7blyx084y1jgbf32qp2gjw62mdxyl418y4ygl6f7gji",
+      "depends": []
+    },
     "ecr": {
       "name": "ecr",
       "version": "2.1.1",
@@ -58089,16 +60249,10 @@
     },
     "eda4treeR": {
       "name": "eda4treeR",
-      "version": "0.6.0",
-      "sha256": "0dah3pamlkc6iqskj0cp645l9hrinsmh678adxprsw0yp30727ab",
+      "version": "1.1.0",
+      "sha256": "1r84xldi872kh2msfhab1pa6j577gw47vvh0jqjbps3hdii9dwh4",
       "depends": ["car", "dae", "dplyr", "emmeans", "ggplot2", "lmerTest", "magrittr", "predictmeans", "supernova"]
     },
-    "edbuildmapr": {
-      "name": "edbuildmapr",
-      "version": "0.3.1",
-      "sha256": "0hc5vfpilqxva88dzgp57j9cgsq64r75vhm3hhl8lhi2wwapwk1d",
-      "depends": ["dplyr", "magrittr", "sf", "spdep", "stringr", "tibble", "tidyselect", "tmap"]
-    },
     "edcpR": {
       "name": "edcpR",
       "version": "1.0.1",
@@ -58225,16 +60379,10 @@
       "sha256": "0pncj573n95g6vnjnyihhac94qxq63p15lxy1xy7pd2p63p5hs4f",
       "depends": ["Rcpp", "stringr"]
     },
-    "edmcr": {
-      "name": "edmcr",
-      "version": "0.2.0",
-      "sha256": "06ms8zyygkgq3divall8paiiw5blqxfgml8iy339zfyiwfxabw5a",
-      "depends": ["MASS", "Matrix", "igraph", "lbfgs", "nloptr", "sdpt3r", "truncnorm", "vegan"]
-    },
     "edmdata": {
       "name": "edmdata",
-      "version": "1.2.0",
-      "sha256": "042imrnn242jzb9wb4ghjganqmx61zjwspqy9qpkxqi9nr7zxr75",
+      "version": "1.3.0",
+      "sha256": "18818m3f5abr8srw6fdp0fxh53s6w0vlbjasynn56ri1isvzsfsw",
       "depends": []
     },
     "edstan": {
@@ -58243,6 +60391,12 @@
       "sha256": "1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5",
       "depends": ["ggplot2", "rstan"]
     },
+    "educationR": {
+      "name": "educationR",
+      "version": "0.1.0",
+      "sha256": "1rriwdvb3018bhq850chfzs6dh09plzdsipbcppakifyvn9kfr7s",
+      "depends": []
+    },
     "educationdata": {
       "name": "educationdata",
       "version": "0.1.3",
@@ -58263,9 +60417,9 @@
     },
     "eefAnalytics": {
       "name": "eefAnalytics",
-      "version": "1.1.1",
-      "sha256": "1mgbdsmbv5s87b2334rf057di4l36qmr1kw12qvmb8yz1pqrsx4w",
-      "depends": ["ggplot2", "lme4", "mvtnorm", "rstanarm"]
+      "version": "1.1.4",
+      "sha256": "0s5wa76zxgvpkyj2rrmqhyrknywdb56y91h3hai5h4bprnb7847q",
+      "depends": ["MCMCvis", "R2jags", "coda", "ggplot2", "lme4", "mvtnorm"]
     },
     "eegkit": {
       "name": "eegkit",
@@ -58339,6 +60493,12 @@
       "sha256": "1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb",
       "depends": ["ggplot2", "reshape2", "rmarkdown", "seqinr", "shiny", "viridis"]
     },
+    "effectplots": {
+      "name": "effectplots",
+      "version": "0.2.0",
+      "sha256": "1q0xk8kgvdjj541jc85njr57aqim2rqmx9njz1s11bwyjdi9wjhh",
+      "depends": ["Rcpp", "collapse", "ggplot2", "patchwork", "plotly"]
+    },
     "effects": {
       "name": "effects",
       "version": "4.2-2",
@@ -58347,8 +60507,8 @@
     },
     "effectsize": {
       "name": "effectsize",
-      "version": "0.8.9",
-      "sha256": "12qzz3zl5yn28ybmmryhmi29zwzwrfgqhb6wm7aqg78id463bjz9",
+      "version": "1.0.0",
+      "sha256": "1r9kx7dp49db43c6r6n7n21b7hsiqv5mvnwpxpmdxvxfcjgbg41z",
       "depends": ["bayestestR", "datawizard", "insight", "parameters", "performance"]
     },
     "effectsizescr": {
@@ -58407,8 +60567,8 @@
     },
     "eha": {
       "name": "eha",
-      "version": "2.11.4",
-      "sha256": "147i34fipb0qbamvs45918ci2nihvbsxvbqd8k7wv73rmgb1nw5v",
+      "version": "2.11.5",
+      "sha256": "0ps8a5q47m2yd67hap7886dwanlqlsdx1v2nh3immq61ym9zbrpv",
       "depends": ["survival"]
     },
     "ehaGoF": {
@@ -58425,9 +60585,9 @@
     },
     "ehymet": {
       "name": "ehymet",
-      "version": "0.1.0",
-      "sha256": "1ywsv8dlkp9fpvfgdpv27yjpa2wyzfx0bq6cb7fbd90b89j59lpp",
-      "depends": ["kernlab", "tf"]
+      "version": "0.1.1",
+      "sha256": "0zk8akdn2sprnh1xfd0a67nrbr1dy955hsf6agakvasy7kk5bjjx",
+      "depends": ["clusterCrit", "kernlab", "tf"]
     },
     "ei": {
       "name": "ei",
@@ -58533,16 +60693,22 @@
     },
     "eixport": {
       "name": "eixport",
-      "version": "0.6.0",
-      "sha256": "18jybscxh051h5y31gb7ywr9n5a471l6krcl95wznfvc2ba1k8pc",
+      "version": "0.6.2",
+      "sha256": "00zx8qk6zh31979vsnl857cr8yicj3j879k64p57iqxb8a9kaf79",
       "depends": ["cptcity", "data_table", "ncdf4", "raster", "sf"]
     },
     "eks": {
       "name": "eks",
-      "version": "1.0.5",
-      "sha256": "11hg9zqb5j2dswj7lx6ah2xfrxdak8xxdwml7xzkf9m3d36xjgha",
+      "version": "1.0.6",
+      "sha256": "1l4ciysx20i5a9vp8364znbnflxsg2id52yj8ispibn5k3g5y3w0",
       "depends": ["dplyr", "ggplot2", "isoband", "ks", "mapsf", "sf"]
     },
+    "elaborator": {
+      "name": "elaborator",
+      "version": "1.3.4",
+      "sha256": "0a59wp50gszyx4q2qsfq8yjkqk4kz3bnlk5r95sjgc4rj8zg8vxf",
+      "depends": ["DT", "RColorBrewer", "bsplus", "dendextend", "dplyr", "forcats", "haven", "here", "purrr", "reshape2", "rlang", "seriation", "shape", "shiny", "shinyWidgets", "shinydashboard", "tidyr", "tidyselect"]
+    },
     "elasdics": {
       "name": "elasdics",
       "version": "1.1.3",
@@ -58599,8 +60765,8 @@
     },
     "electionsBR": {
       "name": "electionsBR",
-      "version": "0.4.0",
-      "sha256": "0sqdrh7q24dwgz418gbv7i8fhy6vlf4dwals13prsjrn24zp0fj3",
+      "version": "0.5.0",
+      "sha256": "0d50hlbrby2frqvyl12y7jcy6cg7s1fqzav0cic5sllfhbk3kwdp",
       "depends": ["curl", "data_table", "dplyr", "haven", "httr", "magrittr", "readr"]
     },
     "electivity": {
@@ -58641,8 +60807,8 @@
     },
     "elhmc": {
       "name": "elhmc",
-      "version": "1.1.0",
-      "sha256": "0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5",
+      "version": "1.2.1",
+      "sha256": "19911czg6x9kb4c514w65fhjljrfm4src6hd3zai004w72h1ysb2",
       "depends": ["MASS", "emplik", "plyr"]
     },
     "elisr": {
@@ -58701,8 +60867,8 @@
     },
     "elrm": {
       "name": "elrm",
-      "version": "1.2.5",
-      "sha256": "1kqwr0nfmnb729h01p14a24kd9scsw7j7qj133kpg0ppcfsnygld",
+      "version": "1.2.6",
+      "sha256": "1xqwqkjjd616bpzn2k3hvdxpqraglw0v0m2alshs1w4hr1mrmfk9",
       "depends": ["coda"]
     },
     "elsa": {
@@ -58725,8 +60891,8 @@
     },
     "emBayes": {
       "name": "emBayes",
-      "version": "0.1.5",
-      "sha256": "1ycr91r0zh75whpf4l9hxrm07rks589bmy994nby88r5yrv34wwg",
+      "version": "0.1.6",
+      "sha256": "0v2yj9gmalm5dwxfi64zlpa4gk7r2v12sls0jy6dj3r3rv0hsyyw",
       "depends": ["Rcpp", "RcppArmadillo", "glmnet"]
     },
     "emIRT": {
@@ -58761,9 +60927,9 @@
     },
     "embryogrowth": {
       "name": "embryogrowth",
-      "version": "9.1",
-      "sha256": "0c7ggpa2i9j17zzknx9h5w6sibk5pdy81484gl6sb5s88wmn16qm",
-      "depends": ["HelpersMG", "deSolve", "numDeriv", "optimx"]
+      "version": "9.5",
+      "sha256": "059q5bp1pfz1hpas144jvb60izrl0f3nrn4ddm27h0haffx20s59",
+      "depends": ["HelpersMG", "Rdpack", "deSolve", "ggplot2", "numDeriv", "optimx"]
     },
     "emdbook": {
       "name": "emdbook",
@@ -58809,20 +60975,20 @@
     },
     "emmeans": {
       "name": "emmeans",
-      "version": "1.10.3",
-      "sha256": "01c2d0kb36lrff5l49kyfl2j3byzblmhw2jkz215hhl8jmyk0akv",
+      "version": "1.10.6",
+      "sha256": "1i0yhm3a938032h5xgmj39ymgfma4ws0iyx0gl054ps0iqsmf27p",
       "depends": ["estimability", "mvtnorm", "numDeriv"]
     },
     "emoa": {
       "name": "emoa",
-      "version": "0.5-2",
-      "sha256": "1a71xd8gdy27cfy09a4avjhc7d7idrljzan79cxb8qwb0pq9pvz9",
+      "version": "0.5-3",
+      "sha256": "1w287k5gjhgqcyq27xz0ybvhzkf1kydcnpcn30iziliw3xx71g2d",
       "depends": []
     },
     "emoji": {
       "name": "emoji",
-      "version": "15.0",
-      "sha256": "1xscypzz17a7nrajnl7isy2nrm9cyr97l0mi9vp0daqvzgyfajba",
+      "version": "16.0.0",
+      "sha256": "0128bwg5qraa4qiapy9cmvxgq6fdjm2xl7f2291j5cg4xhpwqjw0",
       "depends": ["glue", "stringr", "tibble"]
     },
     "emojifont": {
@@ -58857,14 +61023,14 @@
     },
     "emplik": {
       "name": "emplik",
-      "version": "1.3-1",
-      "sha256": "1f6v0bg9sl8kn4y8bpgjyc1b18xkmfbs86gbbmbh198v335lgcrb",
+      "version": "1.3-2",
+      "sha256": "1n36fxavkfx0ham5wglvlqgyi0c8l1g5jy2xv1a8kfd1r2r5zhbx",
       "depends": ["quantreg"]
     },
     "emplik2": {
       "name": "emplik2",
-      "version": "1.32",
-      "sha256": "0d4fzyxa7kynxgx8187vqxnb25kv1m1pkawxdpng6nfaiy76w67m",
+      "version": "1.33",
+      "sha256": "0rjsk7j1likvhv88zdmbcam1nif0iilwfsry0amf6m7yb5qfppzv",
       "depends": []
     },
     "emplikAUC": {
@@ -58915,6 +61081,12 @@
       "sha256": "01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w",
       "depends": ["dplyr", "knitr", "openssl", "purrr", "readr", "rlang"]
     },
+    "enderecobr": {
+      "name": "enderecobr",
+      "version": "0.3.0",
+      "sha256": "0pc1y9g9bji4jc7g3g8pg2bl8p1k4pzwjgwksmqv0rvawiq6qs76",
+      "depends": ["checkmate", "cli", "data_table", "rlang", "stringi", "stringr", "tibble"]
+    },
     "endoSwitch": {
       "name": "endoSwitch",
       "version": "1.0.0",
@@ -58947,8 +61119,8 @@
     },
     "energy": {
       "name": "energy",
-      "version": "1.7-11",
-      "sha256": "04b55ckmaqbnlpifg4w7smvly03kqycklvbg9x8d4yf902q8z7y2",
+      "version": "1.7-12",
+      "sha256": "0wkggv423bz9awi3dnxpmf62hdgfn5qgcvw1k4pvcsjczaz288mc",
       "depends": ["Rcpp", "boot", "gsl"]
     },
     "energyr": {
@@ -58983,14 +61155,14 @@
     },
     "enmSdmX": {
       "name": "enmSdmX",
-      "version": "1.1.6",
-      "sha256": "0hwj7xa19inifajqbgzyxcjgi0gz49yqyfbdvgdwmh8f81i99hip",
+      "version": "1.2.10",
+      "sha256": "0ksgysrpamwc3bdzkbl1pycxikc7rwbq2mvqh5vcrys06vafyp1m",
       "depends": ["AICcmodavg", "DT", "boot", "data_table", "doParallel", "foreach", "gbm", "ks", "maxnet", "mgcv", "omnibus", "predicts", "rJava", "ranger", "scales", "sf", "shiny", "sp", "statisfactory", "terra"]
     },
     "enmpa": {
       "name": "enmpa",
-      "version": "0.1.8",
-      "sha256": "07v4jqmppmvarqc8a4z2zhl52z16w2biq7mga3fd6gz5z43c9yb8",
+      "version": "0.1.9",
+      "sha256": "055fmp2jzrzycqm6jccdbg5wg41c1q3mdn5sx54h8r9gjdyx4ifw",
       "depends": ["Rcpp", "doSNOW", "ellipse", "foreach", "mgcv", "snow", "terra", "vegan"]
     },
     "enpls": {
@@ -58999,12 +61171,6 @@
       "sha256": "12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb",
       "depends": ["doParallel", "foreach", "ggplot2", "plotly", "pls", "reshape2", "spls"]
     },
-    "enrichR": {
-      "name": "enrichR",
-      "version": "3.2",
-      "sha256": "1g97q6vqwvb2l02y61343sblarqi433gjl3qmlyxjxq2lnjrnak1",
-      "depends": ["WriteXLS", "curl", "ggplot2", "httr", "rjson"]
-    },
     "enrichwith": {
       "name": "enrichwith",
       "version": "0.3.1",
@@ -59049,8 +61215,8 @@
     },
     "entropart": {
       "name": "entropart",
-      "version": "1.6-13",
-      "sha256": "1y2gdfnqz52w03g9zij07fkjhh3yf3qflk75j0bvfk7n727rz2jp",
+      "version": "1.6-15",
+      "sha256": "07ppccnxl97v403hcmyx3aw82iv7vvfigxrkmqmh5iypn5zvyyg7",
       "depends": ["EntropyEstimation", "ape", "ggplot2", "ggpubr", "reshape2", "rlang", "tibble", "vegan"]
     },
     "entropy": {
@@ -59085,8 +61251,8 @@
     },
     "envi": {
       "name": "envi",
-      "version": "0.1.19",
-      "sha256": "04hh4fgkaw8zzsjf2bzwwy3iyknfaipqd7p5icysx6il5i8hd79y",
+      "version": "1.0.0",
+      "sha256": "1xmv25m87si45dqz889cmis41djyx0ay1ad83f3rf9838i9qrlhp",
       "depends": ["ROCR", "concaveman", "cvAUC", "doFuture", "doRNG", "fields", "foreach", "future", "iterators", "pls", "sf", "sparr", "spatstat_geom", "terra"]
     },
     "enviGCMS": {
@@ -59145,15 +61311,15 @@
     },
     "eoa3": {
       "name": "eoa3",
-      "version": "1.0.0.1",
-      "sha256": "1qqdkxg4jsnqn6j0pa73g3as3hv9y2xh2jg2axj0i11jr5x68ars",
+      "version": "1.0.0.2",
+      "sha256": "1fydkmz7f4wmlc5f0ihg5n98dyv7r2r9ny27n3qai6l47hf4k4x1",
       "depends": ["GenEst", "MASS", "VGAM", "actuar", "rjags", "survival"]
     },
-    "eodhd": {
-      "name": "eodhd",
-      "version": "1.0.4",
-      "sha256": "0hm66d9dm3l87pdkv7154x7gp24v1d1aqm22p6bkzqwis1vc1rph",
-      "depends": ["httr"]
+    "eodhdR2": {
+      "name": "eodhdR2",
+      "version": "0.5.1",
+      "sha256": "1r1fxgqh9sv6gkcggjjrbby2jjz2bv5pm9kq46rkq1arfsmagxr7",
+      "depends": []
     },
     "eoffice": {
       "name": "eoffice",
@@ -59175,8 +61341,8 @@
     },
     "epanet2toolkit": {
       "name": "epanet2toolkit",
-      "version": "1.0.5",
-      "sha256": "0y9mk5w1ds31g7nwx4xkpay8h2h6cqbh9i2hl01zhycjdgh4ddfg",
+      "version": "1.0.8",
+      "sha256": "0fjhlhnb2a3y7m2hxgya48pgrzk5g5jxjiq38qbxbqcbj11knpdg",
       "depends": []
     },
     "epanetReader": {
@@ -59223,8 +61389,8 @@
     },
     "epiR": {
       "name": "epiR",
-      "version": "2.0.75",
-      "sha256": "162px7cscy791pgfci45jh3gl3hm60v3ha088kc8vydn8cvfn4kr",
+      "version": "2.0.78",
+      "sha256": "0k0dl0h5wzsbabz0d4kcwrdgnmd4nn6axkikakyvx5b6mvxxcjra",
       "depends": ["BiasedUrn", "flextable", "lubridate", "officer", "pander", "sf", "survival", "zoo"]
     },
     "epibasix": {
@@ -59239,6 +61405,18 @@
       "sha256": "191kxjrr8h44i7a7dpxziqhbcnbmhgcc5b7ddn9cnvvjqmbwmvl2",
       "depends": ["Metrics", "forecast", "wavelets"]
     },
+    "epichains": {
+      "name": "epichains",
+      "version": "0.1.1",
+      "sha256": "1a3pgaqns729z8x7582da14ps18p09dpvi3l2lkxpl9cpxpkn89h",
+      "depends": ["checkmate"]
+    },
+    "epicmodel": {
+      "name": "epicmodel",
+      "version": "0.2.0",
+      "sha256": "0f75yrai6f8ggf6nasxwl0j16pmg2mxpd3flijlnpv8pznw1q4zz",
+      "depends": ["DT", "DiagrammeR", "checkmate", "cli", "dagitty", "dplyr", "ggplot2", "gtools", "magrittr", "prompter", "purrr", "rlang", "shiny", "shinyalert", "shinyjs", "shinythemes", "spsUtil", "stringr", "tibble", "tidyr"]
+    },
     "epicontacts": {
       "name": "epicontacts",
       "version": "1.1.4",
@@ -59295,8 +61473,8 @@
     },
     "epilogi": {
       "name": "epilogi",
-      "version": "1.0",
-      "sha256": "0p5aidj9xmlw6lyb4bscb7xkjkfs4jmc4ax844bhsgl6v2y91n6b",
+      "version": "1.2",
+      "sha256": "184nlaxp2w3k860fws91vm3v7igyixiaidf8z5yb3q7sdclpckj2",
       "depends": ["Rfast"]
     },
     "epimdr": {
@@ -59329,6 +61507,12 @@
       "sha256": "1rabliw91lz9b18x9ml2g0i402p9k256qblmg2vr56pzjq5gnyq2",
       "depends": ["data_table", "ggplot2", "ggrepel", "qgcomp", "survival"]
     },
+    "epiparameterDB": {
+      "name": "epiparameterDB",
+      "version": "0.1.0",
+      "sha256": "0c8r7qgmqqiyvb1c2z6rs5g3pyk1rr1gadn8bambrna11mkwk0ag",
+      "depends": []
+    },
     "epiphy": {
       "name": "epiphy",
       "version": "0.5.0",
@@ -59373,8 +61557,8 @@
     },
     "epiworldR": {
       "name": "epiworldR",
-      "version": "0.1-0",
-      "sha256": "0jwb4p3cpsq0m2wlmhqs1dxxvqf7s6x1fw1wrffbw93gf4j4pyx3",
+      "version": "0.3-2",
+      "sha256": "1r5r7n62sk3dwqgin4pmafb5g3hfw3ikyfwxc15gyxgx3v4cs52h",
       "depends": ["cpp11"]
     },
     "epiworldRShiny": {
@@ -59383,6 +61567,12 @@
       "sha256": "0xffsvswwaxv3kcy4s9iznwmadb5r1p4darpkkplz1zvfma9sy5c",
       "depends": ["DT", "epiworldR", "ggplot2", "plotly", "shiny", "shinycssloaders", "shinydashboard", "shinyjs"]
     },
+    "epizootic": {
+      "name": "epizootic",
+      "version": "1.0.0",
+      "sha256": "1s8j5h860wvvl3yjij0vb52nihswnb90jx1jk2d6ifvksmdg05a5",
+      "depends": ["R6", "Rcpp", "RcppArmadillo", "cli", "doParallel", "dplyr", "foreach", "poems", "purrr", "qs", "raster", "tibble"]
+    },
     "eplusr": {
       "name": "eplusr",
       "version": "0.16.2",
@@ -59397,8 +61587,8 @@
     },
     "epm": {
       "name": "epm",
-      "version": "1.1.2",
-      "sha256": "1zziy07ydrxma5qhnxha5g2zm02yi6bvw2vv3w6sanrj9p4kakav",
+      "version": "1.1.3",
+      "sha256": "1qd23jvx2i1n2ykxzci3xkr1rqp6mwa9s3a485mgxnfa68b1zsqg",
       "depends": ["Rcpp", "RcppProgress", "ape", "pbapply", "sf", "terra", "viridisLite"]
     },
     "epmrob": {
@@ -59413,12 +61603,6 @@
       "sha256": "1vmqgpr5f87n7qxvblp4m58z0l18sm8cc3i66cwk36rvcfxd8ik2",
       "depends": ["assertthat", "dplyr", "rlang", "xts"]
     },
-    "epoc": {
-      "name": "epoc",
-      "version": "0.2.6-1.1",
-      "sha256": "1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna",
-      "depends": ["Matrix", "elasticnet", "irr", "lassoshooting", "survival"]
-    },
     "epocakir": {
       "name": "epocakir",
       "version": "0.9.9",
@@ -59457,8 +61641,8 @@
     },
     "epubr": {
       "name": "epubr",
-      "version": "0.6.4",
-      "sha256": "0cv1zkv27ab4h2lq8s4lgizvdrw0238lr042aw8rns27zbqz7is1",
+      "version": "0.6.5",
+      "sha256": "13szfghy4zdbz4wakrnkr5vgliy4qdnvbad41ypdahdwhbjdh2d9",
       "depends": ["dplyr", "magrittr", "tibble", "tidyr", "xml2", "xslt"]
     },
     "epwshiftr": {
@@ -59475,8 +61659,8 @@
     },
     "eq5d": {
       "name": "eq5d",
-      "version": "0.15.3",
-      "sha256": "1rynjc0bvihkk3arrcl0s16fa9p8avddhr62k60crc4xaibhvkz6",
+      "version": "0.15.5",
+      "sha256": "1n0g7jsxyhhrh2ls391lrk79a0dx35x7nyp48q1lh12s7r8xj050",
       "depends": []
     },
     "eq5dsuite": {
@@ -59511,15 +61695,15 @@
     },
     "equateIRT": {
       "name": "equateIRT",
-      "version": "2.5.0",
-      "sha256": "09g4wk41fi6sav71cnkj1gy43cb1jc8yz408kxhccyb22z8ib4z0",
+      "version": "2.5.1",
+      "sha256": "0w9n77ivk5v5bnr8sc7qgsaq9zkmzsc9s29j6a51qj3l4i1rsqfd",
       "depends": ["mirt", "statmod"]
     },
     "equateMultiple": {
       "name": "equateMultiple",
-      "version": "0.1.2",
-      "sha256": "150srrf8msr6jzyri6632xws0g2lnj34kvj7hqrvbiwkad1aqq7m",
-      "depends": ["Rcpp", "RcppArmadillo", "equateIRT", "numDeriv", "statmod"]
+      "version": "1.1.1",
+      "sha256": "08mm3yqn2jbzvc7fd7z42cq141891dfnhpv93jf3rwkbcf4k8fq1",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppDist", "data_table", "equateIRT", "mvtnorm", "numDeriv", "statmod"]
     },
     "equatiomatic": {
       "name": "equatiomatic",
@@ -59527,6 +61711,12 @@
       "sha256": "1zb8pnpdvn6159h43h4fr9sfp1fv9rgknv4wv1wra6ris204764b",
       "depends": ["broom", "broom_mixed", "knitr", "shiny"]
     },
+    "equiBSPD": {
+      "name": "equiBSPD",
+      "version": "0.1.0",
+      "sha256": "0hdch7w3i5a7gvs0lckzhqr0adz82w25kn5jdzg3zaazh5lmmhbl",
+      "depends": []
+    },
     "equil2": {
       "name": "equil2",
       "version": "1.0.0",
@@ -59553,8 +61743,8 @@
     },
     "era": {
       "name": "era",
-      "version": "0.4.1",
-      "sha256": "10hrbdxdvfgz8namczzfwwdhzwf5gsfv6jp9ikiasmjdlyn9jpps",
+      "version": "0.5.0",
+      "sha256": "1g3423pdp8l79zzihcmb0pz78k0h3l1zn5y90j67h514qpvkf8g8",
       "depends": ["pillar", "rlang", "vctrs"]
     },
     "erah": {
@@ -59563,11 +61753,11 @@
       "sha256": "136wh0gaygc7mkj507bjmgzv79jcap0whngd501gg47zf7b8jzxx",
       "depends": ["HiClimR", "furrr", "future", "igraph", "osd", "progress", "quantreg", "signal", "tibble"]
     },
-    "erboost": {
-      "name": "erboost",
-      "version": "1.4",
-      "sha256": "1fq55pq4y6b4jdjagg8b9q05hx7l5i51z98bdgbmn5b7y99vm0hy",
-      "depends": ["lattice"]
+    "eratosthenes": {
+      "name": "eratosthenes",
+      "version": "0.0.2",
+      "sha256": "1kfgqb6bd0i39k4k5wg3p33ir13wnfvdyh2ld0gmcgfl2gjks7pa",
+      "depends": ["Rcpp", "Rdpack"]
     },
     "ercv": {
       "name": "ercv",
@@ -59575,11 +61765,11 @@
       "sha256": "0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l",
       "depends": []
     },
-    "erfe": {
-      "name": "erfe",
-      "version": "0.0.1",
-      "sha256": "1v6xca2zwdg494mdb97dwg2xlqsr51919plylnl04d8dgg5adhz9",
-      "depends": ["Matrix", "mvtnorm"]
+    "erer": {
+      "name": "erer",
+      "version": "4.0",
+      "sha256": "011f655f9q3grpy607svswpw4qpbqvchmpws5fm6yg6179l4w9w2",
+      "depends": ["lmtest", "systemfit", "tseries", "urca"]
     },
     "ergMargins": {
       "name": "ergMargins",
@@ -59589,9 +61779,9 @@
     },
     "ergm": {
       "name": "ergm",
-      "version": "4.6.0",
-      "sha256": "1xx767l4z38wkxlxwq62y4khjjsz10fsy36x0s74fnzb746acwdl",
-      "depends": ["MASS", "Matrix", "Rdpack", "coda", "knitr", "lpSolveAPI", "magrittr", "memoise", "network", "purrr", "rlang", "rle", "robustbase", "statnet_common", "stringr", "tibble", "trust"]
+      "version": "4.7.5",
+      "sha256": "15icc5m4q8w6fmlf71cpzgzymvnnnkydqb7qz9s4yngr8kgnixzl",
+      "depends": ["Rdpack", "coda", "knitr", "lpSolveAPI", "magrittr", "memoise", "network", "purrr", "rlang", "rle", "robustbase", "statnet_common", "stringr", "tibble", "trust"]
     },
     "ergm_count": {
       "name": "ergm.count",
@@ -59601,14 +61791,14 @@
     },
     "ergm_ego": {
       "name": "ergm.ego",
-      "version": "1.1.0",
-      "sha256": "1wflvj946xkiy0xzq53x13v9iqj64hc7wcqzqazkvlngigibh5gl",
+      "version": "1.1.1",
+      "sha256": "0q9kmymli0056d4r2vgr94wc2zcc1vi5z617cpg7fmcnjnkfd489",
       "depends": ["RColorBrewer", "dplyr", "egor", "ergm", "network", "purrr", "statnet_common", "survey", "tibble"]
     },
     "ergm_multi": {
       "name": "ergm.multi",
-      "version": "0.2.1",
-      "sha256": "00hrl0cz81kjfp49sc3ma4jxxxgnjc6aald2drs190ks43bx17g0",
+      "version": "0.2.1.1",
+      "sha256": "122yl6g4rbfdw0pscahr3p93kga8nifb2gdrpicikynpqb6dhqdn",
       "depends": ["Matrix", "Rdpack", "ergm", "glue", "network", "purrr", "rlang", "rle", "statnet_common", "tibble"]
     },
     "ergm_rank": {
@@ -59619,8 +61809,8 @@
     },
     "ergmgp": {
       "name": "ergmgp",
-      "version": "0.1-1",
-      "sha256": "0463wg1g1vd14fwgnvm8aa20vvklvpaqdv4wn6jaybmn8y7kxi16",
+      "version": "0.1-2",
+      "sha256": "0lml2nah642g05mcayanblxzj8aawlkszlqkb638rqh3c7c6jgyg",
       "depends": ["ergm", "network", "networkDynamic", "statnet_common"]
     },
     "ergmharris": {
@@ -59721,15 +61911,15 @@
     },
     "esci": {
       "name": "esci",
-      "version": "1.0.3",
-      "sha256": "1mb23j6yhlakzmz2ph6w3wbasjl5wv2l3i8qjg8knkm2h1yg3kgc",
-      "depends": ["R6", "Rdpack", "ggbeeswarm", "ggdist", "ggh4x", "ggplot2", "ggtext", "glue", "jmvcore", "mathjaxr", "metafor", "multcomp", "rlang", "sadists", "statpsych", "stringr"]
+      "version": "1.0.6",
+      "sha256": "1cz5kc4m9lvnjk18g0x79xlz62h56j9sy05r5a77rf2f7ll297vv",
+      "depends": ["R6", "Rdpack", "ggbeeswarm", "ggdist", "ggplot2", "ggtext", "glue", "jmvcore", "legendry", "mathjaxr", "metafor", "multcomp", "rlang", "sadists", "statpsych", "stringr"]
     },
     "eseis": {
       "name": "eseis",
-      "version": "0.7.3",
-      "sha256": "0fn55mb6yklwjh0ihczjchxrxvnblzbifq59158zfmz407rrfk5g",
-      "depends": ["IRISSeismic", "Rcpp", "XML", "caTools", "colorspace", "extraDistr", "fftw", "matrixStats", "minpack_lm", "reticulate", "rmarkdown", "shiny", "signal", "terra"]
+      "version": "0.8.0",
+      "sha256": "0yi7wyf1hapvkpkcwiqi3k1p06nic0glrzrn59lcy0ck98krvy09",
+      "depends": ["Rcpp", "XML", "caTools", "colorspace", "extraDistr", "fftw", "matrixStats", "minpack_lm", "reticulate", "rmarkdown", "shiny", "signal", "terra"]
     },
     "eselect": {
       "name": "eselect",
@@ -59775,14 +61965,14 @@
     },
     "espadon": {
       "name": "espadon",
-      "version": "1.7.4",
-      "sha256": "057c321ww1fiwpsybrgyn9rs18j28xq3smv5bbxk370zz7fn9mch",
-      "depends": ["DT", "Matrix", "Morpho", "Rcpp", "Rdpack", "Rvcg", "colorspace", "igraph", "js", "mathjaxr", "misc3d", "openxlsx", "progress", "qs", "rgl", "shiny", "shinyWidgets", "sodium"]
+      "version": "1.9.0",
+      "sha256": "0dy9knx2ihq8xfkiikfv0havwb4l51403pn09hhkg06955ypixm0",
+      "depends": ["DT", "Matrix", "Rcpp", "Rdpack", "Rvcg", "colorspace", "igraph", "js", "mathjaxr", "misc3d", "openxlsx", "progress", "qs", "rgl", "shiny", "shinyWidgets", "sodium"]
     },
     "esquisse": {
       "name": "esquisse",
-      "version": "2.0.0",
-      "sha256": "0w37x5w6kvscwbr6d157ahmaigafj3ccn3zjasqazrzzlwjns3lm",
+      "version": "2.0.1",
+      "sha256": "1j01vvkjy3l948yw908yh3phdqpb6lmrykxvz52ynx3qk7y66nk2",
       "depends": ["bslib", "datamods", "downlit", "ggplot2", "htmltools", "jsonlite", "phosphoricons", "rlang", "rstudioapi", "scales", "shiny", "shinyWidgets", "shinybusy"]
     },
     "esreg": {
@@ -59937,14 +62127,14 @@
     },
     "etwfe": {
       "name": "etwfe",
-      "version": "0.4.0",
-      "sha256": "06y9xw8fdfijxv4kh0fxin6dgj6vavnjnyh9a75m14i0i69hd8bd",
-      "depends": ["Formula", "data_table", "fixest", "marginaleffects"]
+      "version": "0.5.0",
+      "sha256": "1lb7crk14cz0bh1mbzgvc9b1llrvlj5p8605lr2p6psmrn94ikip",
+      "depends": ["Formula", "data_table", "fixest", "marginaleffects", "tinyplot"]
     },
     "eudract": {
       "name": "eudract",
-      "version": "1.0.0",
-      "sha256": "0p7524xm0yzj1yqs667n026kf7hyvvkv8z8n0avnzswhkyga3cnd",
+      "version": "1.0.2",
+      "sha256": "1gqsm9nhl6ap7q9v1794yv4qvnhq7ikszvjd9cgyq4375jahlkmp",
       "depends": ["dplyr", "ggplot2", "httr", "magrittr", "patchwork", "scales", "tidyr", "xml2", "xslt"]
     },
     "eufmdis_adapt": {
@@ -59967,8 +62157,8 @@
     },
     "eummd": {
       "name": "eummd",
-      "version": "0.1.9",
-      "sha256": "05c3c471picsfpkphf39wfh95vvmfmncwrnn04zizlgcp9b7z7ws",
+      "version": "0.2.0",
+      "sha256": "0rdx4gynr0369ax7q8sgrla0fzqc82vg27npz4g3qixam1y50vvk",
       "depends": ["Rcpp"]
     },
     "eunis_habitats": {
@@ -60031,6 +62221,12 @@
       "sha256": "1b5hrwgdbw19c63ywhkvxlz3843c0mgvsxlmab6zv6r2lrrdkf62",
       "depends": ["EnvStats", "Matrix"]
     },
+    "eva3dm": {
+      "name": "eva3dm",
+      "version": "0.99.1",
+      "sha256": "1czvgnrykzll9dbq6ccgj34d5cpbk5rl6mrgp3kkl927dfs4gh2x",
+      "depends": ["ncdf4", "terra"]
+    },
     "evabic": {
       "name": "evabic",
       "version": "0.1.1",
@@ -60051,8 +62247,8 @@
     },
     "evaluate": {
       "name": "evaluate",
-      "version": "0.24.0",
-      "sha256": "1mkzb2f8rv0qd33h3gqq7idkpxnnx7zcr93xsmbm4lp7b157cgg2",
+      "version": "1.0.1",
+      "sha256": "1qki65w0qr8wndpsydy7frhdddbm122284zkn8ccdqskbgjw6v23",
       "depends": []
     },
     "evapoRe": {
@@ -60075,8 +62271,8 @@
     },
     "evd": {
       "name": "evd",
-      "version": "2.3-7",
-      "sha256": "0j2nnprzww1akin6mnj619wp6ihbd7jgbr2daj6lmgirbpqrv2aa",
+      "version": "2.3-7.1",
+      "sha256": "0y0vd2q3bjq3kwm5qlya57ijkpdipwfpgv7xs1014gdm6g639l8s",
       "depends": []
     },
     "evdbayes": {
@@ -60085,6 +62281,12 @@
       "sha256": "1adlwyr1csjmwcpc7jsywzggpvr3fk500hyahzy774jmgj3j09vh",
       "depends": []
     },
+    "evenBreak": {
+      "name": "evenBreak",
+      "version": "1.0",
+      "sha256": "0mpn8pcfyziv9wxh9q0dg1hv0m8wbzihvdq8a4vqr3jq488jpa9j",
+      "depends": ["combinat"]
+    },
     "event": {
       "name": "event",
       "version": "1.1.1",
@@ -60099,8 +62301,8 @@
     },
     "eventPred": {
       "name": "eventPred",
-      "version": "0.2.5",
-      "sha256": "1zpl609aka3pnxvam2l94ja4j5mskml7p7gbx7s6zpj49aggkvcf",
+      "version": "0.2.6",
+      "sha256": "0l605vf15da32j2x55i01gy8nyr1pcmsrg2cvw9vrq3zf41k2cmb",
       "depends": ["Matrix", "dplyr", "erify", "flexsurv", "mvtnorm", "numDeriv", "plotly", "purrr", "rlang", "rstpm2", "shiny", "survival"]
     },
     "eventTrack": {
@@ -60211,6 +62413,12 @@
       "sha256": "1wcm6d96mvp8yr6qjm3610rzdxjq6vjwz3zmbrimc1q4pwxg0rvd",
       "depends": ["curl", "jsonlite", "sf"]
     },
+    "evola": {
+      "name": "evola",
+      "version": "1.0.2",
+      "sha256": "14vpr9rds2z0pcxnhwq7w5p6h4xfsngwq34l037i5a017afh7nrr",
+      "depends": ["AlphaSimR", "Matrix", "crayon"]
+    },
     "evolqg": {
       "name": "evolqg",
       "version": "0.3-4",
@@ -60223,6 +62431,12 @@
       "sha256": "0l81d48zvvnbxlx1mj4qwga1kdzk05pzdvsp4ghi93pzzynfqn9s",
       "depends": ["Matrix", "ape", "coda", "lme4"]
     },
+    "evolved": {
+      "name": "evolved",
+      "version": "1.0.0",
+      "sha256": "105jxqv4gaqk7f0y99r21cnsiy5wgwzx803gnccy8xramrhhlc50",
+      "depends": ["ape", "diversitree", "phytools"]
+    },
     "evoper": {
       "name": "evoper",
       "version": "0.5.0",
@@ -60243,8 +62457,8 @@
     },
     "evsim": {
       "name": "evsim",
-      "version": "1.5.0",
-      "sha256": "0v057l0qb3x16kw5xdjmw724kg9zlflagkkdvhwgc39z1by1ahbd",
+      "version": "1.6.0",
+      "sha256": "04w9yz96m9sqhk9xc92ss3vjnqqm2lqm8j833n8wyn7ns8i7hg8q",
       "depends": ["MASS", "dplyr", "dygraphs", "ggplot2", "jsonlite", "lubridate", "purrr", "rlang", "tidyr"]
     },
     "evt0": {
@@ -60325,10 +62539,16 @@
       "sha256": "1pj3145c20r4hnyyrynzmps96a4fpgn408lrl6b9bs79y33c6zwv",
       "depends": ["Rcpp", "raster", "sf"]
     },
+    "exametrika": {
+      "name": "exametrika",
+      "version": "1.1.0",
+      "sha256": "025lm577yr5730f3j544nszjyscw8yk2amdbm2cjc4kjkq2qcm7w",
+      "depends": ["igraph", "mvtnorm"]
+    },
     "exampletestr": {
       "name": "exampletestr",
-      "version": "1.7.2",
-      "sha256": "1npsvx9ibg0v4v1pw89jk46sg1rqj58yxjgramz3rjf9d9dp9x61",
+      "version": "1.7.3",
+      "sha256": "1zqvws95xqnnddvjxy140n370mbglqwnnab8dga3ldh2yvh9mbmd",
       "depends": ["checkmate", "fs", "magrittr", "purrr", "readr", "rlang", "roxygen2", "rstudioapi", "strex", "stringr", "styler", "usethis", "withr"]
     },
     "exams": {
@@ -60349,6 +62569,12 @@
       "sha256": "0cswbynd1acrvdwhgg3vlgl80v0qk22kg2hacbc6y08s4367srly",
       "depends": ["exams", "glue", "pkgbuild", "stringi", "stringr", "xml2"]
     },
+    "exams2forms": {
+      "name": "exams2forms",
+      "version": "0.1-0",
+      "sha256": "05z8a0nlhz5hmzhgnahlqrrm7n9by687yjjmsd6nch11yy0kh10a",
+      "depends": ["exams", "knitr", "rmarkdown"]
+    },
     "exams2learnr": {
       "name": "exams2learnr",
       "version": "0.1-0",
@@ -60357,8 +62583,8 @@
     },
     "exams2sakai": {
       "name": "exams2sakai",
-      "version": "0.3",
-      "sha256": "0lgnk2g4q0vbkvcrhb815lah24rhaknnmsbhhkgbdkl0c5mx1yjg",
+      "version": "0.4",
+      "sha256": "1qljhqac15qz1vjrp59l7xs7yd4y3p2f3wdryrfflb5b6a1qcmbf",
       "depends": ["exams", "glue", "stringi", "stringr", "xml2"]
     },
     "exceedProb": {
@@ -60387,8 +62613,8 @@
     },
     "excessmort": {
       "name": "excessmort",
-      "version": "0.7.0",
-      "sha256": "13hmdad8l88anj7akyv7ii2hw31v4dgnsgar67ks2zlmw2hhjyj1",
+      "version": "0.8.0",
+      "sha256": "0jpwvni5x066d9hb0fjiq212rmrl5mfb1dmvasv5xvn013j9qbm0",
       "depends": ["dplyr", "ggplot2", "lubridate", "rlang", "scales", "tidyr"]
     },
     "excluder": {
@@ -60421,6 +62647,12 @@
       "sha256": "1510lhcdzlss96lpmvzv8apnb774y6ayij9cdihl5sa5kzap0nbp",
       "depends": ["automagic", "cli", "rstudioapi"]
     },
+    "exhaustiveRasch": {
+      "name": "exhaustiveRasch",
+      "version": "0.3.7",
+      "sha256": "17b2dinlygd3swys6h2d3k1ahwx7892wj13y4mlmy8sk2lc7plvk",
+      "depends": ["arrangements", "eRm", "pairwise", "pbapply", "psych", "psychotools", "psychotree", "tictoc"]
+    },
     "exif": {
       "name": "exif",
       "version": "0.1.0",
@@ -60501,9 +62733,9 @@
     },
     "explainer": {
       "name": "explainer",
-      "version": "1.0.1",
-      "sha256": "13gx8yicc0vglljhjhqb42vhsv1zcv1mpyy5yr4cvvg96s9r1wi4",
-      "depends": ["cvms", "data_table", "dplyr", "egg", "ggplot2", "ggpmisc", "ggpubr", "magrittr", "plotly", "tibble", "tidyr", "writexl"]
+      "version": "1.0.2",
+      "sha256": "0zv7miyii983ang9vr23gdrghr7ki6dpll231m1sfpcm0plfrvnd",
+      "depends": ["cvms", "data_table", "dplyr", "egg", "ggplot2", "ggpmisc", "ggpubr", "gridExtra", "magrittr", "plotly", "scales", "tibble", "tidyr", "writexl"]
     },
     "explor": {
       "name": "explor",
@@ -60519,8 +62751,8 @@
     },
     "explore": {
       "name": "explore",
-      "version": "1.3.1",
-      "sha256": "0ays8gj7ba5rdih2hszgfz0asxsmx2jxna1cxv2ahni8rjr3h632",
+      "version": "1.3.3",
+      "sha256": "1p8g85nv29lr8ncih7mh6x43xcahh1fb7y43b7kywgg85i2w257z",
       "depends": ["DT", "cli", "dplyr", "forcats", "ggplot2", "gridExtra", "magrittr", "palmerpenguins", "plotly", "rlang", "rmarkdown", "rpart", "rpart_plot", "shiny", "stringr", "tibble"]
     },
     "exploreR": {
@@ -60531,8 +62763,8 @@
     },
     "expm": {
       "name": "expm",
-      "version": "0.999-9",
-      "sha256": "1m7yiya3hyv6l87qi0vj9s9cmajnig7ah08id9y4yg4dr95278c3",
+      "version": "1.0-0",
+      "sha256": "0m5jm92mjn83zvh4jz7rdf04jdaad7lv2l0a44rb2mdgyvw3di82",
       "depends": ["Matrix"]
     },
     "export": {
@@ -60579,8 +62811,8 @@
     },
     "extBatchMarking": {
       "name": "extBatchMarking",
-      "version": "1.0.1",
-      "sha256": "0ls0h5zfnd5k4r90adzpq39l5lmb6k1nb90d58c4mfzfnms2zhji",
+      "version": "1.1.0",
+      "sha256": "112rb9qdykdkgh9qwrlzkm5q4mxq80sfdw2zp0y83rjkhhv1pjgv",
       "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "optimbase"]
     },
     "extRC": {
@@ -60597,8 +62829,8 @@
     },
     "extRemes": {
       "name": "extRemes",
-      "version": "2.1-4",
-      "sha256": "12mphdq9zi0r07x3gpj5dg4687hwnjx42d9a392rjbbsgvv2r96f",
+      "version": "2.2",
+      "sha256": "06v5q4qrznc3pafsyqh9la8k2kd5m3nd41fvcxh4a44iw5wgz6vz",
       "depends": ["Lmoments", "distillery"]
     },
     "extendedFamily": {
@@ -60625,6 +62857,12 @@
       "sha256": "1ad3xp4axbbid9i9vd4q8iccs3g3917yic2mas37mfwm5in4l9pl",
       "depends": ["Rcpp"]
     },
+    "extractox": {
+      "name": "extractox",
+      "version": "0.1.0",
+      "sha256": "16yi911yhjsh4am005b5dy59kyf288yxiwygnzl2zbzmgp7m4k23",
+      "depends": ["cli", "httr2", "janitor", "pingr", "readxl", "rvest", "webchem"]
+    },
     "extrafont": {
       "name": "extrafont",
       "version": "0.19",
@@ -60639,8 +62877,8 @@
     },
     "extrafrail": {
       "name": "extrafrail",
-      "version": "1.10",
-      "sha256": "1bkm1ja9ksd7b70sxc6jg2ha2ml0l5hwh4j2ph02imjxwcnanach",
+      "version": "1.12",
+      "sha256": "1j2i21mqqim3x8bn4fs7kb9dvzzvkjyhmwfgj459h4x39ih5pbmb",
       "depends": ["expint", "msm", "pracma", "survival"]
     },
     "extraoperators": {
@@ -60651,10 +62889,16 @@
     },
     "extras": {
       "name": "extras",
-      "version": "0.6.1",
-      "sha256": "1m807qay8zj4wbghajvmph87rwsjfhra5090adf8i42bif29phwb",
+      "version": "0.7.3",
+      "sha256": "1r0i9l49klkvibbylcj13wvbmxqn9xmpzm42s606v75mwmqgvxg1",
       "depends": ["chk", "lifecycle"]
     },
+    "extrasteps": {
+      "name": "extrasteps",
+      "version": "0.1.0",
+      "sha256": "074bxlr22dbh6br7vrj7wimp9mbq3777dlswjkprqsmxv3fb2qa9",
+      "depends": ["dplyr", "generics", "magrittr", "purrr", "recipes", "rlang", "tibble", "vctrs"]
+    },
     "extraterrestrial": {
       "name": "extraterrestrial",
       "version": "0.1.0",
@@ -60679,11 +62923,17 @@
       "sha256": "07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s",
       "depends": []
     },
+    "extrememix": {
+      "name": "extrememix",
+      "version": "0.0.1",
+      "sha256": "0v5ghhazcv0j19a9klddnbwgq05ij0nsb4rskdks6mb7686w2qys",
+      "depends": ["Rcpp", "RcppProgress", "evd", "ggplot2", "gridExtra", "mixtools", "threshr"]
+    },
     "extremevalues": {
       "name": "extremevalues",
-      "version": "2.3.4",
-      "sha256": "0ka4j43b8h2h5289wdbwsvcrmrasnhwxv3s9zz3v1z40li9yvmm6",
-      "depends": ["gWidgets2", "gWidgets2tcltk"]
+      "version": "2.4.1",
+      "sha256": "1m8nmaqxhd2ppvgx5sq2xg5j025ys02pis2a23dxpk1kv8gp3h81",
+      "depends": []
     },
     "extremis": {
       "name": "extremis",
@@ -60705,8 +62955,8 @@
     },
     "exvatools": {
       "name": "exvatools",
-      "version": "0.8.0",
-      "sha256": "090bxz71jc18h2nnmk4ja5irkh9qdihxa5pngq3c0ci7xhk6x52a",
+      "version": "0.9.0",
+      "sha256": "1k3jsaczzzvs9h72i6ldinv0byjs5wvqzy3qc0mn66lyq9gwrxg7",
       "depends": ["cli", "data_table", "openxlsx", "reshape2"]
     },
     "eye": {
@@ -60735,9 +62985,9 @@
     },
     "eyelinkReader": {
       "name": "eyelinkReader",
-      "version": "1.0.1",
-      "sha256": "0gbppd017dc93g3z3b9l885rr1r470jh7gvi89hd7nn5asba5zgz",
-      "depends": ["Rcpp", "RcppProgress", "dplyr", "fs", "ggplot2", "rlang", "stringr", "tidyr"]
+      "version": "1.0.2",
+      "sha256": "1vx02qaaw56qdb7kiz2zs17s4x7yxcrlkhwvb2xi3khp9smmx2vi",
+      "depends": ["Rcpp", "RcppProgress", "dplyr", "fs", "ggplot2", "purrr", "rlang", "stringr", "tidyr"]
     },
     "eyelinker": {
       "name": "eyelinker",
@@ -60745,6 +62995,12 @@
       "sha256": "0wijd45p6j2qal6wnj7zywks8p9v3m9cmyp7axmk44mrjdjx2i71",
       "depends": ["intervals", "readr", "stringi", "stringr", "tibble"]
     },
+    "eyetools": {
+      "name": "eyetools",
+      "version": "0.8.1",
+      "sha256": "0h4cpb273x40lyc6hnrr4mfbkh8ip255az2yfk9n9qgcr2v7iaw4",
+      "depends": ["ggforce", "ggplot2", "glue", "hdf5r", "lifecycle", "magick", "pbapply", "rlang", "viridis", "zoo"]
+    },
     "eyetrackingR": {
       "name": "eyetrackingR",
       "version": "0.2.1",
@@ -60769,6 +63025,12 @@
       "sha256": "04ah9dbfwl89xi0di0dslaf8a39nynxymm8lbacgd88al5dg7y1n",
       "depends": ["doSNOW", "foreach", "ggplot2", "lavaan", "moments", "progress"]
     },
+    "ezECM": {
+      "name": "ezECM",
+      "version": "1.0.0",
+      "sha256": "0nkydysrnjr7ihs9m5if0czfqd30q7acbbv2l81dig5bgdvrwyg8",
+      "depends": ["MCMCpack", "Rdpack", "ellipse", "klaR", "lhs", "mvnfast"]
+    },
     "ezEDA": {
       "name": "ezEDA",
       "version": "0.1.1",
@@ -60813,8 +63075,8 @@
     },
     "f1dataR": {
       "name": "f1dataR",
-      "version": "1.5.3",
-      "sha256": "1w6h6626yjh5wsdlzq28mgmg0jr7z3zdfkcg12rf9znwbkw8wl01",
+      "version": "1.6.0",
+      "sha256": "16j0fh3shnglrbywnilk76hp2x7fwfrigw9lw83vhvwadn5cs2x0",
       "depends": ["cachem", "cli", "dplyr", "glue", "httr2", "janitor", "jsonlite", "lifecycle", "magrittr", "memoise", "rappdirs", "reticulate", "rlang", "tibble", "tidyr", "withr"]
     },
     "fANCOVA": {
@@ -60831,8 +63093,8 @@
     },
     "fBasics": {
       "name": "fBasics",
-      "version": "4032.96",
-      "sha256": "14461d6ac8hcn1x3srh45a4s5imafqb0xy8bn5l6d0qwhw4njmg1",
+      "version": "4041.97",
+      "sha256": "1aqm973km7z8b6r90j3dcqi7dgf8fxcjb5ps2q3f14p80rg0ahlr",
       "depends": ["MASS", "gss", "spatial", "stabledist", "timeDate", "timeSeries"]
     },
     "fBonds": {
@@ -60867,9 +63129,9 @@
     },
     "fHMM": {
       "name": "fHMM",
-      "version": "1.3.1",
-      "sha256": "1ha935ibhz4iicyx3azlk867pkrmj4lrjs1rsyqljf46zd63nfan",
-      "depends": ["MASS", "Rcpp", "RcppArmadillo", "checkmate", "cli", "foreach", "oeli", "padr", "pracma", "progress"]
+      "version": "1.4.1",
+      "sha256": "08crmc9g42s2p2bczp73sdvllsrbnqg4ksyjwxpcdcdb0cqqz01y",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "checkmate", "cli", "curl", "foreach", "httr", "jsonlite", "oeli", "padr", "pracma", "progress"]
     },
     "fICA": {
       "name": "fICA",
@@ -60879,8 +63141,8 @@
     },
     "fImport": {
       "name": "fImport",
-      "version": "4032.87",
-      "sha256": "1vcfzivsv88k9827dlm93radm0m33cwlhx8vqnz81ib5b65amqsx",
+      "version": "4041.88",
+      "sha256": "0bgnk8s3mlgm90bz40zkv4hfcndv1ym1wwxqs86bs2fbc35h6pdh",
       "depends": ["timeDate", "timeSeries"]
     },
     "fMRIscrub": {
@@ -60903,8 +63165,8 @@
     },
     "fNonlinear": {
       "name": "fNonlinear",
-      "version": "4021.81",
-      "sha256": "1dpzg880wnja357qy3r4v5qbqhx7pkknd0rph75xvvn38p4rc0ca",
+      "version": "4041.82",
+      "sha256": "0zbi1l4r7vccs375mx6m0djlk3z767i0cp4g2rgvzh8f6wq6q08y",
       "depends": ["fBasics", "timeDate", "timeSeries"]
     },
     "fPASS": {
@@ -60981,8 +63243,8 @@
     },
     "fable": {
       "name": "fable",
-      "version": "0.3.4",
-      "sha256": "0bzw9c68dpx048ihff9sy40d7aiqdqrspfrfyj9pd1pj3brn3blv",
+      "version": "0.4.1",
+      "sha256": "04z47b8cfyr1pbbh3djn6z11vhpzfd7pm6vrhhdw3scliqd3d73m",
       "depends": ["Rcpp", "distributional", "dplyr", "fabletools", "rlang", "tibble", "tidyr", "tsibble"]
     },
     "fable_ata": {
@@ -61005,8 +63267,8 @@
     },
     "fabletools": {
       "name": "fabletools",
-      "version": "0.4.2",
-      "sha256": "12s6x32m9nn6jriy7biqkzp62njbmih6h2hybx5jmcy17pccw5rr",
+      "version": "0.5.0",
+      "sha256": "1qw05xh56sjk19a0qaslw0qnwa074pms60zgl0sbxnh8538ba0xh",
       "depends": ["R6", "distributional", "dplyr", "generics", "ggdist", "ggplot2", "lifecycle", "progressr", "rlang", "scales", "tibble", "tidyr", "tidyselect", "tsibble", "vctrs"]
     },
     "fabricatr": {
@@ -61167,8 +63429,8 @@
     },
     "fairadapt": {
       "name": "fairadapt",
-      "version": "0.2.7",
-      "sha256": "19jagj8kva94kfvg9c5aqr0vm5swjq79j3ny307wacgb9g8hkhvm",
+      "version": "1.0.0",
+      "sha256": "02xsd76bpxs8iiwsh22w99qgq0rwfvhz5vq8qw7kzyjyxxyvr7z2",
       "depends": ["assertthat", "cowplot", "ggplot2", "igraph", "qrnn", "quantreg", "ranger", "scales"]
     },
     "fairml": {
@@ -61245,14 +63507,14 @@
     },
     "familial": {
       "name": "familial",
-      "version": "1.0.5",
-      "sha256": "079dw3rwh8p0g3x5n8bc6rvkjfxa9r1179vl9dpyv186zmi1palv",
+      "version": "1.0.7",
+      "sha256": "05bcxs0sj0059pnbxcg5jzri6rzxw04kf78f9a7ry0lq0xwjh5mr",
       "depends": ["DepthProc", "ggplot2", "matrixStats"]
     },
     "familiar": {
       "name": "familiar",
-      "version": "1.4.8",
-      "sha256": "1rlnp027r02d7hr2ppal6ljnbkp6xbw86gm2wfp2gsjmckrf7lp7",
+      "version": "1.5.0",
+      "sha256": "1r1dbwv2k15w1rs8n26x11mfw8nr23f2sdjvinxdi90wpcxg77fj",
       "depends": ["data_table", "rlang", "rstream", "survival"]
     },
     "fanc": {
@@ -61263,14 +63525,14 @@
     },
     "fancycut": {
       "name": "fancycut",
-      "version": "0.1.2",
-      "sha256": "1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2",
+      "version": "0.1.3",
+      "sha256": "1vfd7vhl4wmdia8zh6fkpmw64rkfqdmadvrnaqyf72kw5gpck8li",
       "depends": []
     },
     "fangs": {
       "name": "fangs",
-      "version": "0.2.13",
-      "sha256": "11jcj9mk20lmqdwl5cczki5kzx4fdrci8xjg6g401ca1m00hhb1v",
+      "version": "0.2.17",
+      "sha256": "0szjpldld3cq8dwwldv35rbaji307n6bi5k4kxma91rxhjz0id4v",
       "depends": []
     },
     "fanovaGraph": {
@@ -61311,8 +63573,8 @@
     },
     "far": {
       "name": "far",
-      "version": "0.6-6",
-      "sha256": "0p0731vg1y57z8dmbrsa5gbnpf754q8yi5mm5h9480x1f8nk38bi",
+      "version": "0.6-7",
+      "sha256": "1r9zpm9ck7had4ikmg3fdch92hx0wgsgach9a9m0ngwxyrhqnh39",
       "depends": ["nlme"]
     },
     "faraway": {
@@ -61365,8 +63627,8 @@
     },
     "fasstr": {
       "name": "fasstr",
-      "version": "0.5.2",
-      "sha256": "1r2xgxzzjc78d5grlpapc52b11qw0d01c1fahcvfccxjby51dywx",
+      "version": "0.5.3",
+      "sha256": "11aygczi9vi85kmymrnm544iz3i6s811pzbqidcm7ijwhlp757bi",
       "depends": ["PearsonDS", "RcppRoll", "dplyr", "e1071", "fitdistrplus", "ggplot2", "lubridate", "openxlsx", "plyr", "purrr", "scales", "tidyhydat", "tidyr", "zyp"]
     },
     "fastAFT": {
@@ -61383,8 +63645,8 @@
     },
     "fastFMM": {
       "name": "fastFMM",
-      "version": "0.2.0",
-      "sha256": "1crgl5961c0k1bq4d3xsl38hrwi3cayf1lj7pprbvdd1y3nyvz8b",
+      "version": "0.3.0",
+      "sha256": "0zpfsvwnz1mp024mf2nq8jb0nxh5r1yqyp13hhbbsix6va8rblb5",
       "depends": ["MASS", "Matrix", "Rfast", "cAIC4", "dplyr", "ggplot2", "gridExtra", "lme4", "lmeresampler", "lsei", "magrittr", "mgcv", "mvtnorm", "progress", "refund", "stringr"]
     },
     "fastGHQuad": {
@@ -61407,8 +63669,8 @@
     },
     "fastICA": {
       "name": "fastICA",
-      "version": "1.2-4",
-      "sha256": "0bszvwsfal83phwsk81vwcbs8q56qp5fs9a99yzpa6hd87m8hsgd",
+      "version": "1.2-7",
+      "sha256": "08cw1aszsi4i8asfrzyyz66wl70g50y1dndmf8j8kqvhw1r6kdxw",
       "depends": []
     },
     "fastJT": {
@@ -61435,12 +63697,6 @@
       "sha256": "1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
-    "fastMatMR": {
-      "name": "fastMatMR",
-      "version": "1.2.5",
-      "sha256": "0lh2nrfj8pbhl56pg0icw0ln2bg411sjdkjb76lar3rsb67ifxvb",
-      "depends": ["cpp11"]
-    },
     "fastNaiveBayes": {
       "name": "fastNaiveBayes",
       "version": "2.2.1",
@@ -61453,6 +63709,12 @@
       "sha256": "0grkgj8kwqblikgw5pg4vdp41qd9s4cd7dzih3ima31fdw8ssi3c",
       "depends": ["Rdpack"]
     },
+    "fastPLS": {
+      "name": "fastPLS",
+      "version": "0.2",
+      "sha256": "1cjmpci3jwq6zpav1rydis77fgcqblpqlbhhpg2wcv432z28yyl0",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo"]
+    },
     "fastR2": {
       "name": "fastR2",
       "version": "1.2.4",
@@ -61479,8 +63741,8 @@
     },
     "fastTS": {
       "name": "fastTS",
-      "version": "1.0.1",
-      "sha256": "16icpdhrqx34q189iqkdpbxd95lhvsb39z4xz2b3lq80pbcri0i0",
+      "version": "1.0.2",
+      "sha256": "11h022367f7m5xxyqw9v2yqw4y0fv4p4i58fbjpbd9nvl5a4vyh9",
       "depends": ["RcppRoll", "dplyr", "ncvreg", "rlang", "yardstick"]
     },
     "fastText": {
@@ -61501,6 +63763,12 @@
       "sha256": "17dydlgwzdd4n0d4xjz64z8w4vrmrfn3lqx128840x7zvgg0kg38",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "RhpcBLASctl", "Rtsne", "ashr", "cowplot", "dplyr", "ggplot2", "ggrepel", "gtools", "htmlwidgets", "irlba", "pbapply", "plotly", "progress", "quadprog", "uwot"]
     },
+    "fastVoteR": {
+      "name": "fastVoteR",
+      "version": "0.0.1",
+      "sha256": "05wd9s057zg9wsm2cpnwvkq0n3nwhlhm80jh0whccw7ph157xhq7",
+      "depends": ["Rcpp", "checkmate", "data_table"]
+    },
     "fastWavelets": {
       "name": "fastWavelets",
       "version": "1.0.1",
@@ -61533,8 +63801,8 @@
     },
     "fastbeta": {
       "name": "fastbeta",
-      "version": "0.3.0",
-      "sha256": "0s843plibqbx2lfi4npp3pxq30rkiz768yjgc9fgpawq1nlp3ii0",
+      "version": "0.3.1",
+      "sha256": "14w51gfbdc8xfaz5sy9lr8qcabpkj5zkdjc6ajz8wsp2svqskva8",
       "depends": []
     },
     "fastcluster": {
@@ -61551,8 +63819,8 @@
     },
     "fastcmprsk": {
       "name": "fastcmprsk",
-      "version": "1.24.5",
-      "sha256": "1ymg79y913h4s55h1pbmbx0hx40khc0mq6348awzqjy8pjhz1mdl",
+      "version": "1.24.10",
+      "sha256": "0vjlfjjgnnbg1apsvsfdv0qm0qg4sl9ihz2ngqhxklw6cy38annm",
       "depends": ["Matrix", "dynpred", "foreach", "survival"]
     },
     "fastcox": {
@@ -61563,15 +63831,15 @@
     },
     "fastcpd": {
       "name": "fastcpd",
-      "version": "0.14.3",
-      "sha256": "0b5xlx80nlbmkp8h4rnz0367zxn2hlwpcb4zid5jq3q32rv8r6sz",
+      "version": "0.14.6",
+      "sha256": "0ycmyph5p2r74gdry5smwwwqxsrvj4ql0v3zcvafx71jfkcyna2p",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppClock", "fastglm", "forecast", "glmnet", "progress", "testthat", "tseries"]
     },
-    "fastdigest": {
-      "name": "fastdigest",
-      "version": "0.6-4",
-      "sha256": "1809y57cvck6gssrwnycgqjnka6jxx17dbf927cvwih4v58abdmj",
-      "depends": []
+    "fastdid": {
+      "name": "fastdid",
+      "version": "1.0.3",
+      "sha256": "1rb3lvp9s5jj34643c5njsi16hl7q67hjvyzcfw1gxdrz46nv444",
+      "depends": ["BMisc", "collapse", "data_table", "dreamerr", "ggplot2", "parglm", "stringr"]
     },
     "fasterElasticNet": {
       "name": "fasterElasticNet",
@@ -61579,10 +63847,16 @@
       "sha256": "1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "fasterRaster": {
+      "name": "fasterRaster",
+      "version": "8.4.0.3",
+      "sha256": "01ra0xxjb2c5i3422ha6zss97077cmj5kxwkbfrkb9sd4rr2rwxk",
+      "depends": ["DT", "data_table", "omnibus", "rgrass", "rpanel", "sf", "shiny", "terra"]
+    },
     "fasterize": {
       "name": "fasterize",
-      "version": "1.0.5",
-      "sha256": "1d63q77hfbn2ly8cwsik4gaavdhidpi7idf7qj2y5bi9xhd10kyl",
+      "version": "1.1.0",
+      "sha256": "0prpnbd1v3r5yxg42q9jdkgbz8h5090klgzwxmi83h2ya17s06i3",
       "depends": ["Rcpp", "RcppArmadillo", "raster", "wk"]
     },
     "fastglm": {
@@ -61629,14 +63903,14 @@
     },
     "fastmatch": {
       "name": "fastmatch",
-      "version": "1.1-4",
-      "sha256": "0symkcmyrqvz6hkawr40ga808rb3w4hy9ssfsi5ri8hykjn4r4cs",
+      "version": "1.1-6",
+      "sha256": "0rjd9yk2v0q44j8f2y4chc0rlc20ay5zqgz185pxl6yz4vzlgc8h",
       "depends": []
     },
     "fastmatrix": {
       "name": "fastmatrix",
-      "version": "0.5-772",
-      "sha256": "0mcwzwr2cam48fmb5di04jxwscq2ixw0ikwwvb2ngx2rkap1nq3j",
+      "version": "0.5-7721",
+      "sha256": "1q0swa420a2hiyi7q7xc42igil2h8wrdvhf74563m184b2bvxajv",
       "depends": []
     },
     "fastmit": {
@@ -61645,12 +63919,30 @@
       "sha256": "13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "fastml": {
+      "name": "fastml",
+      "version": "0.3.0",
+      "sha256": "09kqxmrkb0gsr94jdsz5jfca20wl866sqk34mixqrr2ml5gghz9m",
+      "depends": ["DALEX", "RColorBrewer", "baguette", "bonsai", "dials", "discrim", "doFuture", "dplyr", "finetune", "future", "ggplot2", "magrittr", "parsnip", "plsmod", "probably", "recipes", "reshape2", "rlang", "rsample", "tibble", "tune", "viridisLite", "workflows", "yardstick"]
+    },
     "fastnet": {
       "name": "fastnet",
       "version": "1.0.0",
       "sha256": "1c07msypxj8ilpa1il9jjbgylwpdxv8j8gak362xdmbm4b1bwlm6",
       "depends": ["doParallel", "foreach", "igraph", "tidygraph"]
     },
+    "fastplyr": {
+      "name": "fastplyr",
+      "version": "0.5.0",
+      "sha256": "010hqjif0h9yvjfy65riqxliv87kxwld8zw5y028bgirxawlkchn",
+      "depends": ["cheapr", "collapse", "cpp11", "dplyr", "lifecycle", "magrittr", "rlang", "stringr", "tidyselect", "vctrs"]
+    },
+    "fastpng": {
+      "name": "fastpng",
+      "version": "0.1.5",
+      "sha256": "00jajshdg6sjmyxv33c171ss0mpbr80f9h41xqsrgi9p8fknx9lq",
+      "depends": []
+    },
     "fastpos": {
       "name": "fastpos",
       "version": "0.5.1",
@@ -61695,8 +63987,8 @@
     },
     "fastverse": {
       "name": "fastverse",
-      "version": "0.3.3",
-      "sha256": "03jcgwsaxwx564dn7qmynah0l48hjs8nfx0wmv9a9x9sqw7aqknb",
+      "version": "0.3.4",
+      "sha256": "1w2b79ik58kbs3a9284ylcxqj38g684kdk1vzj1nwr9sgfsjy046",
       "depends": ["collapse", "data_table", "kit", "magrittr"]
     },
     "fat2Lpoly": {
@@ -61705,12 +63997,6 @@
       "sha256": "08bbd17aqmfcacvk283bpf9cp1isf5pgfdciwxn0f7ahdzd81g4s",
       "depends": ["kinship2", "multgee"]
     },
-    "faux": {
-      "name": "faux",
-      "version": "1.2.1",
-      "sha256": "143yc71cfsxnczi719ygrsynxry60nh8263gg8vwp3qrc80j80lh",
-      "depends": ["dplyr", "ggplot2", "jsonlite", "lme4", "rlang", "truncnorm"]
-    },
     "fauxnaif": {
       "name": "fauxnaif",
       "version": "0.7.1",
@@ -61723,6 +64009,12 @@
       "sha256": "1xhyws6nr9ayir4sykvhyaf1aprx9rjm2xyb3p5ikd26l5hp7l44",
       "depends": ["R6", "httpcode", "whisker"]
     },
+    "favawesome": {
+      "name": "favawesome",
+      "version": "0.1.1",
+      "sha256": "07bj708dxv6hmzhlb71z2cpfqcy4jlfjwj0ylw29z7rn1r302mrz",
+      "depends": ["fontawesome", "htmltools", "jsonlite", "rlang", "rsvg"]
+    },
     "faviconPlease": {
       "name": "faviconPlease",
       "version": "0.1.3",
@@ -61753,6 +64045,12 @@
       "sha256": "0i44a5mbcc5bj7d92k7cp8ljc66rrgzsa8flqx3sn017lq8smljv",
       "depends": ["fgui", "pbatR", "rootSolve"]
     },
+    "fbglm": {
+      "name": "fbglm",
+      "version": "1.5.0",
+      "sha256": "0nfv7jjgxx5441p8qp0vfifn761pqyqhslbssvf8vp4n3faiqysr",
+      "depends": ["agridat", "bbmle", "frbinom", "pscl"]
+    },
     "fbnet": {
       "name": "fbnet",
       "version": "1.0.3",
@@ -61807,6 +64105,12 @@
       "sha256": "1wiyiz51mkm5kd95xmpvlwng51awpp4y133dd5q88mnafrxyij1h",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "numDeriv", "rstan", "rstantools"]
     },
+    "fcl": {
+      "name": "fcl",
+      "version": "0.1.3",
+      "sha256": "1lqh4asy8qx2xippp7c7fsdw5y3rk6q4czqf9397f3dkdaydgv18",
+      "depends": ["xts", "ymd"]
+    },
     "fclust": {
       "name": "fclust",
       "version": "2.1.1.1",
@@ -61843,6 +64147,12 @@
       "sha256": "19ay3n7m9r72szzxlyd9yrpgajfl8dy75f54cfvmj130p9sv3jfq",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "fctutils": {
+      "name": "fctutils",
+      "version": "0.0.7",
+      "sha256": "0bm1ip8y1knx34yr46df35m7vafwzqb128l46bj69m995srmv58d",
+      "depends": ["stringdist", "stringr"]
+    },
     "fcuk": {
       "name": "fcuk",
       "version": "0.1.21",
@@ -61863,15 +64173,15 @@
     },
     "fda": {
       "name": "fda",
-      "version": "6.1.8",
-      "sha256": "01y488zviaj9z8h88vnia9wg4as62jx73la1qji1ljbr5258b3gg",
+      "version": "6.2.0",
+      "sha256": "05dym9i4619hrk6rvn2yyhndd40g80l2ll3h449i12zl9a0smjrr",
       "depends": ["deSolve", "fds"]
     },
     "fda_usc": {
       "name": "fda.usc",
-      "version": "2.1.0",
-      "sha256": "1s13zssm7x3hg1k928r5jkjz35bflb1nzz4c7b4xr0x1j8qg3d60",
-      "depends": ["MASS", "doParallel", "fda", "foreach", "iterators", "kSamples", "mgcv", "nlme"]
+      "version": "2.2.0",
+      "sha256": "04mw03xnp4azn40i3cgfr4jjza2p643clq65k7q1bigdy3l2a4s9",
+      "depends": ["MASS", "doParallel", "fda", "foreach", "iterators", "kSamples", "knitr", "mgcv", "nlme"]
     },
     "fdaACF": {
       "name": "fdaACF",
@@ -61893,8 +64203,8 @@
     },
     "fdaPDE": {
       "name": "fdaPDE",
-      "version": "1.1-19",
-      "sha256": "0vd1rhh2ks6s738g4d687v3ndpjvb8lypzfpfqpwbkjzx29g60wn",
+      "version": "1.1-20",
+      "sha256": "1w4zgjy0bqg6njdx3dcxi1rcifn6vgb33l6aif3hg5jc9x2ww5kc",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "plot3D", "rgl"]
     },
     "fdaPOIFD": {
@@ -61953,8 +64263,8 @@
     },
     "fdasrvf": {
       "name": "fdasrvf",
-      "version": "2.3.1",
-      "sha256": "0n6r0j07dhzffa0phnmjwdiqq76m37a8w6aqaa5lvbws5lilvh4n",
+      "version": "2.3.4",
+      "sha256": "0qr8p7lajpfgbc0np9am6dx8773n861534nv5g3q1pyfbdpzqcgw",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "cli", "coda", "doParallel", "fields", "foreach", "lpSolve", "mvtnorm", "rlang", "tolerance", "viridisLite"]
     },
     "fdatest": {
@@ -61969,10 +64279,16 @@
       "sha256": "1nlnn409frlhhc47z33bgxdcix20csl4bk85x4ybhknvdfffyh1a",
       "depends": ["Formula", "Rcpp", "RcppEigen"]
     },
+    "fdesigns": {
+      "name": "fdesigns",
+      "version": "1.0",
+      "sha256": "0hsn325jgzvd4bjpmy5rglnz9035k1lb4h8yf2hbajnxxald0kal",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "mvQuad", "mvtnorm"]
+    },
     "fdicdata": {
       "name": "fdicdata",
-      "version": "0.1.0",
-      "sha256": "1zz8wd124bbjn2fjllq8hc00r475w96bcaphcgxbqr9hfzzjpg2f",
+      "version": "0.1.1",
+      "sha256": "116i6r65n3kqp0mpy6y1krcap03q965hp1vpc765iphflpv9ysf6",
       "depends": ["dplyr", "httr", "yaml"]
     },
     "fdm2id": {
@@ -62001,8 +64317,8 @@
     },
     "fdrtool": {
       "name": "fdrtool",
-      "version": "1.2.17",
-      "sha256": "1pf554vb902vavgqc4c0kgghywbgcvr3lkkr414bxngavcd60lil",
+      "version": "1.2.18",
+      "sha256": "1vxswr56c63vvl2q6m0j0a5psdw724vspf6zxlr1k9zsdfcnd6b4",
       "depends": []
     },
     "fds": {
@@ -62019,8 +64335,8 @@
     },
     "feasts": {
       "name": "feasts",
-      "version": "0.3.2",
-      "sha256": "19lgycbnbvv2rwd9svm43bprivalk8p5v0bfwzsmnayikk1wws59",
+      "version": "0.4.1",
+      "sha256": "18xysg5vp29n0nbz2zdq7n8pbdggkjjifx40q839pvaij6sk4mp3",
       "depends": ["dplyr", "fabletools", "ggplot2", "gtable", "lifecycle", "lubridate", "rlang", "scales", "slider", "tibble", "tidyr", "tsibble", "vctrs"]
     },
     "feather": {
@@ -62043,8 +64359,8 @@
     },
     "featurefinder": {
       "name": "featurefinder",
-      "version": "1.1",
-      "sha256": "024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld",
+      "version": "1.2",
+      "sha256": "1l7jmr7w7xdvmnvfgvmyd2cyspvx0rjfvi3rs5j7500mhpi5qi8x",
       "depends": ["plyr", "rpart", "rpart_plot"]
     },
     "featureflag": {
@@ -62095,12 +64411,6 @@
       "sha256": "06clj31qk6ama56jmd9vpq5h1v7250aixgvaywh5j8fsrp1l7qg2",
       "depends": ["BH", "Rcpp", "SnowballC", "data_table", "forcats", "magrittr", "purrr", "scales", "stringdist", "stringr"]
     },
-    "fedregs": {
-      "name": "fedregs",
-      "version": "1.0.0",
-      "sha256": "171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn",
-      "depends": ["dplyr", "httr", "magrittr", "purrr", "rvest", "stringi", "tidyr", "tidytext", "xml2"]
-    },
     "fedstatAPIr": {
       "name": "fedstatAPIr",
       "version": "1.0.3",
@@ -62121,9 +64431,9 @@
     },
     "felp": {
       "name": "felp",
-      "version": "0.5.0",
-      "sha256": "12crd3rqkh1wj18x2nhq19v3jh4595qp1ll977ki0i6xmg5vhgfb",
-      "depends": ["callr", "curl", "data_table", "dplyr", "htmltools", "magrittr", "matrixStats", "miniUI", "prettycode", "reactable", "rlang", "rstudioapi", "shiny", "stringi"]
+      "version": "0.6.0",
+      "sha256": "1sv52hs457shlckc2c9104ww51xap1ijvhkvq8vdbmlnjlv4q7qz",
+      "depends": ["callr", "curl", "data_table", "dplyr", "htmltools", "magrittr", "matrixStats", "memoise", "miniUI", "prettycode", "reactable", "rlang", "rstudioapi", "shiny", "stringi"]
     },
     "feltr": {
       "name": "feltr",
@@ -62157,8 +64467,8 @@
     },
     "fertilmodel": {
       "name": "fertilmodel",
-      "version": "1.1",
-      "sha256": "0q0mf8n3fc53bqjsv5c4mcfm4vjhyy2hw8rh1bsjsj71xmih50a4",
+      "version": "1.4",
+      "sha256": "0bh259lgs3fbv2mkij1md1gxzx7qclbhvcb6nydcd9f7n5x15zhk",
       "depends": ["quadprog"]
     },
     "fetch": {
@@ -62181,8 +64491,8 @@
     },
     "ff": {
       "name": "ff",
-      "version": "4.0.12",
-      "sha256": "1gs1zf3x0clnim7qlrkhlsjf2xgry5ybqnh8ipa2kzhhk9d3bbq8",
+      "version": "4.5.0",
+      "sha256": "13hq86rmcvlz46v9airb8imj183s1z7fyzfcr3s1ma1wm5991v9a",
       "depends": ["bit"]
     },
     "ffmanova": {
@@ -62205,8 +64515,8 @@
     },
     "fftw": {
       "name": "fftw",
-      "version": "1.0-8",
-      "sha256": "0846s0ix2qj4dg8r9gpydsymbh2qyqnadgsaaph7dvd0cqb02zlc",
+      "version": "1.0-9",
+      "sha256": "167n8yhfai13375lqm1j24ncngrg0m6spj0y0z5187832xydix1y",
       "depends": []
     },
     "fftwtools": {
@@ -62259,8 +64569,8 @@
     },
     "fglsnet": {
       "name": "fglsnet",
-      "version": "1.0",
-      "sha256": "00qn4k4xm1zfkz77lys468c1mfx3vyfjkf19wdbcvgssrmf6w0xd",
+      "version": "1.1",
+      "sha256": "1srv60svg3ig4xp4k25cq5jw56izf1hcwr9acnpx09y2sqh11y70",
       "depends": ["MASS", "Matrix", "lmtest", "matrixcalc", "network", "sandwich", "sna"]
     },
     "fgm": {
@@ -62307,8 +64617,8 @@
     },
     "fields": {
       "name": "fields",
-      "version": "16.2",
-      "sha256": "1r5kld45dgigbaavcx3c88ci0jd66zxan3fh2wypwvj7sl69a41r",
+      "version": "16.3",
+      "sha256": "14kbl97fmiqm2q8wfyizmpl5zlbj7yakkpmsl8zgckxrzg0a1dyb",
       "depends": ["maps", "spam", "viridisLite"]
     },
     "fiery": {
@@ -62349,14 +64659,14 @@
     },
     "file2meco": {
       "name": "file2meco",
-      "version": "0.8.0",
-      "sha256": "15k3yg7kx63bwfj21xa8raca06bcc6sa2n1c0qkw5wz07apqmyvk",
+      "version": "0.9.1",
+      "sha256": "16667nj152qh5ibbq84xk8y22qhvf3sphbsswzb5i25lab5532jb",
       "depends": ["Matrix", "ape", "dplyr", "magrittr", "microeco", "rhdf5", "tidyr", "yaml"]
     },
     "filearray": {
       "name": "filearray",
-      "version": "0.1.7",
-      "sha256": "06f209qvmhpj36xdxiqds5kpvxhac2mr7lci80i4bqik1brxpv17",
+      "version": "0.1.9",
+      "sha256": "16caqi2il8qghhicjgy9nh9nf0x4xbyad0mf3yyyvdr8ng0rrxcl",
       "depends": ["BH", "Rcpp", "digest", "fastmap", "uuid"]
     },
     "filebin": {
@@ -62457,8 +64767,8 @@
     },
     "finbif": {
       "name": "finbif",
-      "version": "0.9.7",
-      "sha256": "15bys4amh2hw6sz3bby61lrw6m1nb8jwrnz0m47cmlcz770acsaz",
+      "version": "0.9.9",
+      "sha256": "0fc9kkpbl0d5j6z6ch2k5wdajmfx5cwgrmbckqfbyfg3ligqhciq",
       "depends": ["digest", "httr", "lutz"]
     },
     "finbipartite": {
@@ -62511,8 +64821,8 @@
     },
     "findpython": {
       "name": "findpython",
-      "version": "1.0.8",
-      "sha256": "1dydchid5mc79253v5b86bnbg3rm78w0hs586c1rr56lmz5r12hg",
+      "version": "1.0.9",
+      "sha256": "1jxp5hm9n3i8fl0204cpi194sp8js2m4wzkgqz7v3m6dvw65x8dn",
       "depends": []
     },
     "findviews": {
@@ -62565,15 +64875,15 @@
     },
     "finnsurveytext": {
       "name": "finnsurveytext",
-      "version": "1.0.0",
-      "sha256": "0hi0b6i37lpfs2xhb0k1qdlm91mils1kl2dl9gz3qx5hz8f9342s",
-      "depends": ["RColorBrewer", "dplyr", "ggplot2", "ggpubr", "ggraph", "gridExtra", "igraph", "magrittr", "stopwords", "stringr", "textrank", "tibble", "tidyr", "udpipe", "wordcloud"]
+      "version": "2.1.0",
+      "sha256": "0ypa3ylkn7acby7pr651ji16wpbzpi8nfl622gq007q6v4rj14qp",
+      "depends": ["RColorBrewer", "data_table", "dplyr", "ggplot2", "ggpubr", "ggraph", "igraph", "magrittr", "purrr", "stopwords", "stringr", "textrank", "tibble", "tidyr", "udpipe", "wordcloud"]
     },
     "finnts": {
       "name": "finnts",
-      "version": "0.4.0",
-      "sha256": "1cx9kl6dzkmrxb4i7vlkligx5p1q2jxinybmi1367hlpgafhv6js",
-      "depends": ["Cubist", "cli", "dials", "digest", "doParallel", "dplyr", "earth", "feasts", "foreach", "fs", "generics", "glmnet", "glue", "gtools", "hts", "kernlab", "lubridate", "magrittr", "modeltime", "parsnip", "plyr", "purrr", "recipes", "rsample", "rules", "snakecase", "stringr", "tibble", "tidyr", "tidyselect", "timetk", "tune", "vroom", "workflows"]
+      "version": "0.5.0",
+      "sha256": "1345zd9l58jg8bgcpvlvk6byh1jy6j1ry0n7j1ck4wlhzm5kzsb0",
+      "depends": ["Cubist", "cli", "dials", "digest", "doParallel", "dplyr", "earth", "feasts", "foreach", "fs", "generics", "glmnet", "glue", "gtools", "hts", "kernlab", "lubridate", "magrittr", "modeltime", "parsnip", "plyr", "purrr", "recipes", "rlang", "rsample", "rules", "snakecase", "stringr", "tibble", "tidyr", "tidyselect", "timetk", "tune", "vroom", "workflows"]
     },
     "finreportr": {
       "name": "finreportr",
@@ -62581,6 +64891,12 @@
       "sha256": "145idg2c6qmqp29afalnhxxzky08j21dmm05mp3zf63aq9mq41d4",
       "depends": ["XBRL", "curl", "dplyr", "httr", "rvest", "xml2"]
     },
+    "fio": {
+      "name": "fio",
+      "version": "0.1.2",
+      "sha256": "1m8xmfzxz41rhawy9kcrl6krjb05xv4mrxn7yfcjkk5xs77inx7d",
+      "depends": ["R6", "Rdpack", "cli", "clipr", "emoji", "fs", "miniUI", "readxl", "rlang", "shiny"]
+    },
     "fipio": {
       "name": "fipio",
       "version": "1.1.2",
@@ -62613,8 +64929,8 @@
     },
     "fishMod": {
       "name": "fishMod",
-      "version": "0.29",
-      "sha256": "0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar",
+      "version": "0.29.2",
+      "sha256": "0niglwj6ic5c454ihcjn1v1li87jqwnfhpjf3a28z9msxgnzxl3c",
       "depends": []
     },
     "fishRman": {
@@ -62685,8 +65001,8 @@
     },
     "fitODBOD": {
       "name": "fitODBOD",
-      "version": "1.5.2",
-      "sha256": "1gmpdg07vadc0f17l7g9p5gda347bd183d26dlzi4pnx6ywjl4k8",
+      "version": "1.5.4",
+      "sha256": "0m4ndbs9kbwhiqw461blr7c206bqnf6kgyvnm045fiphd4f11zd2",
       "depends": ["MASS", "Rdpack", "bbmle", "hypergeo", "mvtnorm"]
     },
     "fitODBODRshiny": {
@@ -62775,8 +65091,8 @@
     },
     "fitzRoy": {
       "name": "fitzRoy",
-      "version": "1.5.0",
-      "sha256": "0fw0prfl6iivbsprv0qw13dg5ff80621ziwz5gcy012v6hsbpk25",
+      "version": "1.6.0",
+      "sha256": "01c5khphb8w2jwh4zw4irmfy99wq1fl9rfjhchgsdlfj32spccyh",
       "depends": ["cli", "dplyr", "glue", "httr", "httr2", "janitor", "jsonlite", "lifecycle", "lubridate", "magrittr", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "tidyr", "tidyselect", "xml2"]
     },
     "fivethirtyeight": {
@@ -62791,12 +65107,6 @@
       "sha256": "18cqbxrs69p60anvii22mhqkwh5y2mxapmznff9g7j1j6h4h62lr",
       "depends": []
     },
-    "fixedincome": {
-      "name": "fixedincome",
-      "version": "0.0.5",
-      "sha256": "16wxd12hid468d1rfczyrb2ffnja0vx9mnqdg9dhdp0nlj78xx99",
-      "depends": ["bizdays", "ggplot2", "scales"]
-    },
     "fixedpointproperty": {
       "name": "fixedpointproperty",
       "version": "1.0",
@@ -62865,8 +65175,8 @@
     },
     "flan": {
       "name": "flan",
-      "version": "0.9",
-      "sha256": "0g4prvlwiaf6ig6kghniqpcaxyws27345mb5qmcpgsy4jzdc4k7j",
+      "version": "1.0",
+      "sha256": "1v2agnabvymygaqn47lf4wfmmviqkn1wh1crzdqy05ihvmhz23bl",
       "depends": ["Rcpp", "RcppArmadillo", "RcppGSL"]
     },
     "flap": {
@@ -62877,8 +65187,8 @@
     },
     "flare": {
       "name": "flare",
-      "version": "1.7.0.1",
-      "sha256": "1xvrbvq2y7zfp98ijal3z8y1w2xbzfcdykzw4pqc3mnh0qrhq2d5",
+      "version": "1.7.0.2",
+      "sha256": "1i3nyvi8av74v1jy85gqai73vf0hzlkk5rdpfnmvi8d7q4fa7xvg",
       "depends": ["MASS", "Matrix", "igraph", "lattice"]
     },
     "flashCard": {
@@ -62907,8 +65217,8 @@
     },
     "flashr": {
       "name": "flashr",
-      "version": "0.1.2",
-      "sha256": "0fqxr1j5mf9mc1agkkdlzx97qvv4phlxdcmb99x55ivhagwgvidq",
+      "version": "0.2.0",
+      "sha256": "03a88rz64qqj048rvmczcycqqxqhgx770c1jl58iq558rxdiyzsj",
       "depends": ["cli", "curl", "gh", "httr", "memoise", "revealjs", "rmarkdown", "testthat"]
     },
     "flatr": {
@@ -62973,8 +65283,8 @@
     },
     "flexlsx": {
       "name": "flexlsx",
-      "version": "0.2.1",
-      "sha256": "1h78gzq1nlz0d8m9l63d5mjxrqwzwh21l444az58d9y48zsgrrzv",
+      "version": "0.3.0",
+      "sha256": "1widk2qzisqq2j22hzw0cmw7l3p5jkcyhxcgjjgirmdw7bg771r1",
       "depends": ["dplyr", "openxlsx2", "purrr", "rlang", "stringi", "tibble", "tidyr"]
     },
     "flexmet": {
@@ -63033,8 +65343,8 @@
     },
     "flextable": {
       "name": "flextable",
-      "version": "0.9.6",
-      "sha256": "0acjiwrm0qn0i0v4p0n279ldvlknqhb43mcar9c5s6r3xh5habi3",
+      "version": "0.9.7",
+      "sha256": "01jz0rflzc0f4lwnmmk8s2vj281l2ch75avcbin0b4wis48xrj2q",
       "depends": ["data_table", "gdtools", "htmltools", "knitr", "officer", "ragg", "rlang", "rmarkdown", "uuid", "xml2"]
     },
     "flifo": {
@@ -63051,9 +65361,9 @@
     },
     "flightsbr": {
       "name": "flightsbr",
-      "version": "0.4.1",
-      "sha256": "0rb14dfs8sckp4r0wxwbgi8zs2a9r879xhbgdi5nzpmhpsy62xma",
-      "depends": ["data_table", "httr", "parzer", "pbapply", "rvest"]
+      "version": "1.0.0",
+      "sha256": "1nmfllzr0z0ihzdqy6pa28brxhfjfmfzh7maiccw6kpcfxbajgms",
+      "depends": ["archive", "curl", "data_table", "fs", "janitor", "parzer", "pbapply", "rvest"]
     },
     "flimo": {
       "name": "flimo",
@@ -63105,8 +65415,8 @@
     },
     "flipscores": {
       "name": "flipscores",
-      "version": "1.2.0",
-      "sha256": "17dmx7r29ngwz690x7p447pczh903swzpwmk5abvzjsqvfgikbi8",
+      "version": "1.3.2",
+      "sha256": "1mb95jdspi3363x75y972g1pg3cy7qhsgplm0vhl6l3mzcvvcnwi",
       "depends": ["MASS"]
     },
     "float": {
@@ -63147,9 +65457,15 @@
     },
     "florabr": {
       "name": "florabr",
-      "version": "1.2.0",
-      "sha256": "0rfzvrsv4aai3ynwxvnqiki58gbjp4lwrr36kfnkn59bpicvxmzg",
-      "depends": ["XML", "data_table", "httr", "terra"]
+      "version": "1.3.0",
+      "sha256": "1lrdclync6y61ark4czcl8kbvksakbzf5pj1gkvk1f8wwmfb0kp6",
+      "depends": ["XML", "data_table", "doSNOW", "foreach", "httr", "terra"]
+    },
+    "flourishcharts": {
+      "name": "flourishcharts",
+      "version": "1.0.0.3",
+      "sha256": "0c0kbj2ra8yms461bcg6w8pa2kvyj16pxrz7q3j3fh77i9bds1gv",
+      "depends": ["dplyr", "htmltools", "htmlwidgets", "httr", "jsonlite"]
     },
     "flow": {
       "name": "flow",
@@ -63165,22 +65481,28 @@
     },
     "flowchart": {
       "name": "flowchart",
-      "version": "0.4.0",
-      "sha256": "1h34phpgx139v28rxgiyjl696k08lp7frh3sxizj97pix29j5yds",
+      "version": "0.6.0",
+      "sha256": "0ll0s7ci5ml269i0ccabyy8kn1w7gxidd27mysnd42xmdss05qyb",
       "depends": ["Gmisc", "dplyr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "flowmapblue": {
+      "name": "flowmapblue",
+      "version": "0.0.2",
+      "sha256": "0l4pp5dmyifqrzna3cadyb6xsiqjifgb1pl8r6whw4gi11b9vxzx",
+      "depends": ["htmlwidgets"]
+    },
+    "flowmapper": {
+      "name": "flowmapper",
+      "version": "0.1.3",
+      "sha256": "0zz42c733hzk1q93qxvjidrs2jvh2cdbphd2hqlvfnddk57zhx3a",
+      "depends": ["dplyr", "forcats", "ggplot2", "purrr", "scales", "tidyr"]
+    },
     "flowml": {
       "name": "flowml",
       "version": "0.1.3",
       "sha256": "1v26lncq6qqx7x2wnvaxwb88s7hgdwj9cv16kkzn4fnybwsmkw5g",
       "depends": ["ABCanalysis", "R6", "caret", "data_table", "dplyr", "fastshap", "furrr", "future", "magrittr", "optparse", "purrr", "readr", "rjson", "rlang", "rsample", "stringr", "tibble", "tidyr", "vip"]
     },
-    "flowr": {
-      "name": "flowr",
-      "version": "0.9.11",
-      "sha256": "1cbbfrvgzqclvbhy20vjwgxbvnn3ljh0k1k54jf2si10bfw3zzi5",
-      "depends": ["diagram", "params", "readr", "whisker"]
-    },
     "flps": {
       "name": "flps",
       "version": "1.1.0",
@@ -63195,8 +65517,8 @@
     },
     "fluidsynth": {
       "name": "fluidsynth",
-      "version": "1.0.1",
-      "sha256": "1vqi9p69wjsh9shhjg0rk025hf4rawj0piw5037y97ml3n858k2l",
+      "version": "1.0.2",
+      "sha256": "1b9csw8kq3dy8lmz6a4cb0yzgyn6c3dc9vwdv8qwnpdz00p5fmb4",
       "depends": ["av", "rappdirs"]
     },
     "fluoSurv": {
@@ -63217,6 +65539,18 @@
       "sha256": "1xkiri1bxnf8j1jxlwjmajjiq1dj9cddi9cmbwyhbnpycl19y35g",
       "depends": ["caTools"]
     },
+    "fluxfinder": {
+      "name": "fluxfinder",
+      "version": "1.0.0",
+      "sha256": "1baqgwwcrxizckq12jz4ii3kd7h4rs7p31a60qy85qkh7k8shk3x",
+      "depends": ["MASS", "broom", "jsonlite", "lubridate"]
+    },
+    "fluxible": {
+      "name": "fluxible",
+      "version": "0.0.1",
+      "sha256": "1d4j3qzqnsj842qzkkfi0g51ac6a2cgy0lkqi78y7f7sqx7pqzc1",
+      "depends": ["broom", "dplyr", "ggforce", "ggplot2", "haven", "lubridate", "progress", "purrr", "rlang", "stringr", "tidyr", "zoo"]
+    },
     "fluxweb": {
       "name": "fluxweb",
       "version": "0.2.0",
@@ -63235,34 +65569,22 @@
       "sha256": "0y6garv70jn3mfrhpgbzsv6xyc7rnjqvl7whdmlfswvf5d6yl3a0",
       "depends": ["forecast"]
     },
-    "fmbasics": {
-      "name": "fmbasics",
-      "version": "0.3.0",
-      "sha256": "1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0",
-      "depends": ["assertthat", "fmdates", "lubridate", "tibble"]
-    },
     "fmcmc": {
       "name": "fmcmc",
       "version": "0.5-2",
       "sha256": "0swlghwsir1gjw5n2c8kfi5zh6bbqjhk7nnjds2b6656s8xdpr9a",
       "depends": ["MASS", "Matrix", "coda"]
     },
-    "fmdates": {
-      "name": "fmdates",
-      "version": "0.1.4",
-      "sha256": "1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0",
-      "depends": ["assertthat", "lubridate"]
-    },
     "fmdu": {
       "name": "fmdu",
-      "version": "0.1.1",
-      "sha256": "0g27a19kw23niqbj3jx5y9p1a693zi69nnfraj85mmfkyhmqilpi",
+      "version": "0.2.1",
+      "sha256": "0l730shz8c7d8mvxzaf4s6w5rvx8nx65gapprmildi8sh6rprgk9",
       "depends": ["smacof"]
     },
     "fmeffects": {
       "name": "fmeffects",
-      "version": "0.1.3",
-      "sha256": "0hw3jsq4s4rh66n9j3sll9sarnnbxp90ma6sqs9q4gjkm1qi1d1p",
+      "version": "0.1.4",
+      "sha256": "190v2qkm91pxfwkfwsdb9xi7cazkbg5020cbc9flw1kg36ym4vgn",
       "depends": ["R6", "checkmate", "cli", "cowplot", "data_table", "ggparty", "ggplot2", "partykit", "testthat"]
     },
     "fmerPack": {
@@ -63273,9 +65595,9 @@
     },
     "fmesher": {
       "name": "fmesher",
-      "version": "0.1.7",
-      "sha256": "1kwy04qs8pkjyd9ad55x8dr006z2nv0dyvgvhx15s3p3qhxgg6mm",
-      "depends": ["Matrix", "Rcpp", "dplyr", "lifecycle", "rlang", "sf", "sp", "tibble", "withr"]
+      "version": "0.2.0",
+      "sha256": "17cpq6yxpa4jwwq8s4s5nd1lvh4jqyxnnqz7bay63vq53g0b4c12",
+      "depends": ["Matrix", "Rcpp", "dplyr", "lifecycle", "rlang", "sf", "tibble", "withr"]
     },
     "fmf": {
       "name": "fmf",
@@ -63283,6 +65605,12 @@
       "sha256": "0b26040a39jys1z3h9mq9k7rjr0iyiialq442ir8vgzvmrh383cs",
       "depends": ["C50", "FactoMineR", "Rcpp", "RcppArmadillo", "caret", "dplyr", "e1071", "factoextra", "ggplot2", "kernlab", "solitude"]
     },
+    "fmpapi": {
+      "name": "fmpapi",
+      "version": "0.2.0",
+      "sha256": "0rwmvqv3zwdn409lkr9rsxgxw7yaky26wjd0w3sf0lzvqck064zc",
+      "depends": ["cli", "dplyr", "httr2"]
+    },
     "fmpcloudr": {
       "name": "fmpcloudr",
       "version": "0.1.5",
@@ -63331,6 +65659,12 @@
       "sha256": "138r081mpgw1csm93xcrci3djd7mrcl6drsdr6cpjz1fdzv1whjy",
       "depends": ["MASS", "RColorBrewer", "doParallel", "fields", "foreach", "igraph", "lpSolve"]
     },
+    "fntl": {
+      "name": "fntl",
+      "version": "0.1.2",
+      "sha256": "183j435bfx4k5vb7iplkf7544lm0mr00vy26bv4b6fc2jfixa4bx",
+      "depends": ["Rcpp"]
+    },
     "focusedMDS": {
       "name": "focusedMDS",
       "version": "1.3.3",
@@ -63343,6 +65677,12 @@
       "sha256": "1x3zgjy1pnjv0a2dra5a36fwg3lgq8yfqdm731r28kdwy6d1az85",
       "depends": ["cli", "curl", "httr2", "rlang", "rvest", "tibble", "xml2"]
     },
+    "folda": {
+      "name": "folda",
+      "version": "0.2.0",
+      "sha256": "01ppv6470k0bybzmmv0nf9ln1rgc09k8ckjdy4a80rhh0qrmjii9",
+      "depends": ["Rcpp", "RcppEigen", "ggplot2"]
+    },
     "folders": {
       "name": "folders",
       "version": "0.1.0",
@@ -63351,8 +65691,8 @@
     },
     "folio": {
       "name": "folio",
-      "version": "1.4.0",
-      "sha256": "1ny0psm4awdf6jk9dnd15w2706rl99smpacydy106f252qmqm79m",
+      "version": "1.5.0",
+      "sha256": "1hrw0bf6nmid40cr9pzqmrv3libc1y8dka2g2ax7ma0msccqx57p",
       "depends": []
     },
     "fomantic_plus": {
@@ -63375,8 +65715,8 @@
     },
     "fontawesome": {
       "name": "fontawesome",
-      "version": "0.5.2",
-      "sha256": "1jaw3jz9jz8v7msqv76f234vhrkcy21xgva81m0d313hf6ly4gfs",
+      "version": "0.5.3",
+      "sha256": "0kzvh7xlq8lpx1l7x5gs99a3vncvbccqlqjwixjlrv6mzb80j68v",
       "depends": ["htmltools", "rlang"]
     },
     "fontcm": {
@@ -63409,12 +65749,6 @@
       "sha256": "1gh1xs60bnm2g1d7dg67q683bzkh5ih1gz3psvv3dmygm5f1j1bc",
       "depends": ["R2HTML", "dplyr", "magrittr", "mvbutils", "stringr", "textshaping", "tibble", "tidyverse"]
     },
-    "foolbox": {
-      "name": "foolbox",
-      "version": "0.1.1",
-      "sha256": "06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3",
-      "depends": ["magrittr", "rlang"]
-    },
     "footBayes": {
       "name": "footBayes",
       "version": "0.2.0",
@@ -63429,9 +65763,9 @@
     },
     "footprint": {
       "name": "footprint",
-      "version": "0.1",
-      "sha256": "00m3jaxiacf9wxa0wg0qxhp6c0prbf2l5c2cid6anz8rc5b6angv",
-      "depends": ["airportr", "dplyr", "magrittr", "rlang"]
+      "version": "0.2",
+      "sha256": "1mmv0pj19zlab3yk5ffbjzl2kda8w03dvmkw0ws0sl5ga56sqbws",
+      "depends": ["airportr", "dplyr", "rlang"]
     },
     "foqat": {
       "name": "foqat",
@@ -63519,9 +65853,9 @@
     },
     "forecasteR": {
       "name": "forecasteR",
-      "version": "2.0.2",
-      "sha256": "0pwgkkzyfzjjp9qrx4xx3b68617a18i3an3gcpprkg4mwpsvcj0x",
-      "depends": ["DT", "colourpicker", "config", "echarts4r", "forecast", "golem", "htmltools", "htmlwidgets", "keras", "lubridate", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "zoo"]
+      "version": "3.0.2",
+      "sha256": "1pb1gyzzzshxiv7riccqliq3vhy3hpgi28bylc6917rglc0vxmdx",
+      "depends": ["DT", "colourpicker", "config", "echarts4r", "forecast", "golem", "htmltools", "htmlwidgets", "lubridate", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "stringr", "zoo"]
     },
     "foreign": {
       "name": "foreign",
@@ -63553,24 +65887,48 @@
       "sha256": "1dk19sgx760ph464cya4gxb1i3rpnydnhrbqyb25jja0dryjapcm",
       "depends": ["data_table", "purrr"]
     },
+    "forestGYM": {
+      "name": "forestGYM",
+      "version": "1.0.0",
+      "sha256": "11x6kmvlm4nnkdv57f6p4pcaq6sskiak3f29n87vjrblspbcm590",
+      "depends": ["gtools"]
+    },
     "forestHES": {
       "name": "forestHES",
-      "version": "1.0-1",
-      "sha256": "05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj",
+      "version": "2.0.1",
+      "sha256": "05gj7qwar6l7r6hh16dyfp1qlb259kwj1jbxg727f6bzhqbkg6hh",
       "depends": []
     },
+    "forestPSD": {
+      "name": "forestPSD",
+      "version": "1.0.0",
+      "sha256": "1n5axvkj3sdm6196kg5vm4g33djf17cqkqql2vmmqjyzh9hqc8as",
+      "depends": ["TTR", "ggplot2", "minpack_lm", "modelr", "reshape2"]
+    },
     "forestRK": {
       "name": "forestRK",
       "version": "0.0-5",
       "sha256": "0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m",
       "depends": ["ggplot2", "igraph", "knitr", "mlbench", "partykit", "pkgKitten", "rapportools"]
     },
+    "forestSAS": {
+      "name": "forestSAS",
+      "version": "2.0.4",
+      "sha256": "06y1rlfjy9dyi4k23yzx4a0wrvrp3pgqna3lh339j53qpp7v6w94",
+      "depends": ["spatstat", "spatstat_data", "spatstat_geom", "spatstat_random"]
+    },
     "forestat": {
       "name": "forestat",
       "version": "1.1.0",
       "sha256": "0bw6kkdq65d1jwhim80iwq6lcdfyawf8xfg1kc86qdhvrg2zf4wm",
       "depends": ["dplyr", "ggplot2", "nlme", "rlang"]
     },
+    "forestdynR": {
+      "name": "forestdynR",
+      "version": "0.0.1",
+      "sha256": "03bpq34wh5ja1hfsgkqvhm0fxr38sc7am5r06b8j9d3pmbclpy7h",
+      "depends": ["BIOMASS"]
+    },
     "forestecology": {
       "name": "forestecology",
       "version": "0.2.0",
@@ -63597,8 +65955,8 @@
     },
     "forestmangr": {
       "name": "forestmangr",
-      "version": "0.9.6",
-      "sha256": "0l8av1vg8dyrb15m08gby13qfalwcfizfn3jc2avvga8inyag0c5",
+      "version": "0.9.8",
+      "sha256": "1am8z2ghy6303m57rp72mm3blcknx05yj9kvf6233icw9yz1nzyd",
       "depends": ["FinCal", "broom", "car", "dplyr", "ggdendro", "ggplot2", "ggpmisc", "ggthemes", "gridExtra", "magrittr", "miniUI", "minpack_lm", "plyr", "purrr", "rlang", "scales", "shiny", "systemfit", "tibble", "tidyr"]
     },
     "forestmodel": {
@@ -63609,8 +65967,8 @@
     },
     "forestplot": {
       "name": "forestplot",
-      "version": "3.1.3",
-      "sha256": "0jbmhgbf167xi0lxqinf6m4gmh10r582bify1i731k9ywcc7psqk",
+      "version": "3.1.6",
+      "sha256": "1ijy8lir8l2pwg4y2anfi84c47ssq26z97ixnswbssk9ih07r7qh",
       "depends": ["abind", "checkmate"]
     },
     "forestploter": {
@@ -63669,14 +66027,14 @@
     },
     "formatters": {
       "name": "formatters",
-      "version": "0.5.8",
-      "sha256": "0skfmizlr028j2cy2f03vgs1gdsvlk5r67cj1pmm9zky5nymdh1k",
-      "depends": ["checkmate", "htmltools", "lifecycle"]
+      "version": "0.5.9",
+      "sha256": "0j17k51gnydp9x71xlfsbvl412y2dyg8kqax9dwl103pp0lzpw2w",
+      "depends": ["checkmate", "htmltools", "lifecycle", "stringi"]
     },
     "formods": {
       "name": "formods",
-      "version": "0.1.6",
-      "sha256": "1qawvl10g9zpbph8psndqwizx10pl74d0bhizqcl509zaws4pb95",
+      "version": "0.1.7",
+      "sha256": "012mkdv5ifi4jpx35saadiakz2i1457xyrf08c4dv59bvkj17j85",
       "depends": ["cli", "digest", "dplyr", "ggforce", "ggplot2", "onbrand", "readr", "readxl", "rhandsontable", "rlang", "shiny", "shinyAce", "shinyWidgets", "stringr", "writexl", "yaml", "zip"]
     },
     "formula_tools": {
@@ -63705,14 +66063,14 @@
     },
     "forrel": {
       "name": "forrel",
-      "version": "1.6.1",
-      "sha256": "1xq94rn86nclh0935jqxvlbqjx5qi0mdj9i6b9sb2qbzjjnm1gcl",
-      "depends": ["glue", "pedFamilias", "pedprobr", "pedtools", "ribd"]
+      "version": "1.7.0",
+      "sha256": "03hsnzn5vkhdnf63pv4fq4zxgj2hm4g7jxn0gdr3cg9l4ahwams2",
+      "depends": ["glue", "pbapply", "pedFamilias", "pedprobr", "pedtools", "ribd", "verbalisr"]
     },
     "forsearch": {
       "name": "forsearch",
-      "version": "6.2.0",
-      "sha256": "02k3k9pv55aymym8p60xl071161zigr7m8m3vpna68rril8laq8i",
+      "version": "6.3.0",
+      "sha256": "0z8d6mr9yswribbcx0wwgldzvwjbzg8wjwqvy6g65kkklnyrj46w",
       "depends": ["Cairo", "Hmisc", "formula_tools", "ggplot2", "nlme", "survival", "tibble"]
     },
     "forstringr": {
@@ -63729,8 +66087,8 @@
     },
     "forward": {
       "name": "forward",
-      "version": "1.0.6",
-      "sha256": "12yk2l9cjmlr9089a8qw8arpdq997c9d9nx5xsy2x76ik65r6i3l",
+      "version": "1.0.7",
+      "sha256": "1alm7yvk0r2nv1zm6avll3pn28wbflgbqq6q3vx96vmpb0qkl6jl",
       "depends": ["MASS"]
     },
     "forwards": {
@@ -63789,8 +66147,8 @@
     },
     "fpc": {
       "name": "fpc",
-      "version": "2.2-12",
-      "sha256": "11s7211mnb9c72061mrcdfdwfph6nmbwcnpjgl32i2p7qys9cnam",
+      "version": "2.2-13",
+      "sha256": "0irzsl1g71z7kl0qrklkv0rv9byv017lh5klp5hfw3xw8zw3sm2g",
       "depends": ["MASS", "class", "cluster", "diptest", "flexmix", "kernlab", "mclust", "prabclus", "robustbase"]
     },
     "fpcb": {
@@ -63855,8 +66213,8 @@
     },
     "fpp3": {
       "name": "fpp3",
-      "version": "1.0.0",
-      "sha256": "15kgllix1syi7974d5mrfa20zgx8s0hj2wq6wz1mlpzkaa6w2i9j",
+      "version": "1.0.1",
+      "sha256": "1dcv1xfpwlq7mcsw0zs2l8i3xn848nxbymncg9y2csy6l9s4wglq",
       "depends": ["cli", "crayon", "dplyr", "fable", "fabletools", "feasts", "ggplot2", "lubridate", "purrr", "rstudioapi", "tibble", "tidyr", "tsibble", "tsibbledata"]
     },
     "fptdApprox": {
@@ -63879,14 +66237,14 @@
     },
     "fqar": {
       "name": "fqar",
-      "version": "0.5.3",
-      "sha256": "08cz7bax680kgxcyw8gyk6b206n310a8p1zx9kzlq5sb2a1c1ivr",
+      "version": "0.5.4",
+      "sha256": "0gjf7k1rz2rlaqbmhg4sifan6x49alk8wvxracqmzkgggkp82sbw",
       "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "memoise", "rlang", "tidyr", "tidyselect"]
     },
     "fr": {
       "name": "fr",
-      "version": "0.5.1",
-      "sha256": "0kj7qjv6jdrp8wm7ynpi4mjm4sx9b2aqnhqb0pn1xnpbsj9x7557",
+      "version": "0.5.2",
+      "sha256": "1n32f9lc7j1sdxjrlvxsg0cli1a95mf1l30241hzssd45kzgli9v",
       "depends": ["S7", "cli", "dplyr", "purrr", "rlang", "tibble", "tidyselect", "vroom", "yaml"]
     },
     "frab": {
@@ -63939,9 +66297,9 @@
     },
     "fragility": {
       "name": "fragility",
-      "version": "1.5",
-      "sha256": "0das343cjixmlsdbx9i897yf3fcaj55f2dxh0wd6jsqypf67lk0q",
-      "depends": ["metafor", "netmeta", "plotrix"]
+      "version": "1.6",
+      "sha256": "0y832d7r5q35pq0jnhfabzmhxfaw7xmzk5s0f7n4cz54gg6804sf",
+      "depends": ["meta", "metafor", "netmeta", "plotrix"]
     },
     "frailtyEM": {
       "name": "frailtyEM",
@@ -63969,8 +66327,8 @@
     },
     "frailtypack": {
       "name": "frailtypack",
-      "version": "3.6.2",
-      "sha256": "06nwm4dvhszg2843d75rf42wrrglmlqg61baz7zpymxq4717chj4",
+      "version": "3.6.5",
+      "sha256": "1v9sskldqkc9fc1j8f16fkygrvjh057vangryfk56l9ik2b5iq8y",
       "depends": ["MASS", "boot", "doBy", "nlme", "rootSolve", "shiny", "statmod", "survC1", "survival"]
     },
     "frair": {
@@ -64029,9 +66387,9 @@
     },
     "freealg": {
       "name": "freealg",
-      "version": "1.1-1",
-      "sha256": "0jx9r40hql8fkpjr005snavj8fw5ykqa4ya7cy59jhxr31byma3j",
-      "depends": ["Rcpp", "disordR", "mathjaxr", "partitions"]
+      "version": "1.1-8",
+      "sha256": "13ma3lg9vjmxpnaw2zwanag1dmc09q5gx5g2mgdc9fy43rka7yv2",
+      "depends": ["Rcpp", "disordR", "partitions"]
     },
     "freebird": {
       "name": "freebird",
@@ -64173,8 +66531,8 @@
     },
     "frictionless": {
       "name": "frictionless",
-      "version": "1.1.0",
-      "sha256": "0d23gbaikwhr7jac9b21p8a3hj1rwh766v752axikbq02hf3a6vg",
+      "version": "1.2.0",
+      "sha256": "1mnrkrslwvqrlsib73gv160482hdcnxfy6cvdmfgi0qbfam0xx9n",
       "depends": ["cli", "dplyr", "httr", "jsonlite", "purrr", "readr", "rlang", "yaml"]
     },
     "friends": {
@@ -64185,8 +66543,8 @@
     },
     "fritools": {
       "name": "fritools",
-      "version": "4.3.0",
-      "sha256": "0l8h605c00a6fgkp4qr6rddwdrjs1ywjw982n90cjx2s6znrv966",
+      "version": "4.4.0",
+      "sha256": "0p1mj4icl1qjfyf2c53yjdg52r7ak3mjw5jbl26rgpr366q6ijrg",
       "depends": []
     },
     "fritools2": {
@@ -64197,8 +66555,8 @@
     },
     "fromo": {
       "name": "fromo",
-      "version": "0.2.1",
-      "sha256": "0srq13j0xqbyrmm8n93b5qwc25nz921z45yf467d7gfhxsbgy3hm",
+      "version": "0.2.4",
+      "sha256": "017s0h2nvg5xqc4r91brwjabryacnwkry5zivpcic512bvckglsj",
       "depends": ["Rcpp"]
     },
     "frontier": {
@@ -64239,8 +66597,8 @@
     },
     "fs": {
       "name": "fs",
-      "version": "1.6.4",
-      "sha256": "1j2sx9zxz0qcgvim8mvvjrl0z2qbn2j4idsivx7zadmy5l7jj1ky",
+      "version": "1.6.5",
+      "sha256": "0d0bqwi4a0kpday3kbvaawhqfh7lcx4jx2hm5nspgvjv4504sfqf",
       "depends": []
     },
     "fsbrain": {
@@ -64287,8 +66645,8 @@
     },
     "fsn": {
       "name": "fsn",
-      "version": "0.2",
-      "sha256": "12n1v8nhfn5pjjsrp41wk848yw797wxa9anx9dm8rd278smrk01f",
+      "version": "0.4",
+      "sha256": "1bx8m2ghxybmp319cbsdrwpl5n1l6hfvd9i39fvkzlfp7mcd5sb1",
       "depends": ["Rfast"]
     },
     "fso": {
@@ -64375,11 +66733,17 @@
       "sha256": "12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs",
       "depends": ["sna"]
     },
+    "fucom": {
+      "name": "fucom",
+      "version": "0.0.2",
+      "sha256": "162dnk554can240q6v8dz280qvgs336mkjklbsgnhlvj1vvd62lj",
+      "depends": ["nloptr"]
+    },
     "fude": {
       "name": "fude",
-      "version": "0.3.6",
-      "sha256": "06aacagrq4vjzq8r3xayyic8i0gjls7b7b94cnmspprh0bk9d7dw",
-      "depends": ["dplyr", "forcats", "glue", "magrittr", "purrr", "rlang", "sf", "stringi", "tidyr", "units"]
+      "version": "0.3.7",
+      "sha256": "120rhlvj3q0qbsgsrazv2k7z91bkl3h14fb5ga08f8glsd7k5vml",
+      "depends": ["DT", "dplyr", "forcats", "glue", "leaflet", "magrittr", "purrr", "rlang", "sf", "shiny", "tidyr", "units"]
     },
     "fuel": {
       "name": "fuel",
@@ -64473,9 +66837,9 @@
     },
     "funcharts": {
       "name": "funcharts",
-      "version": "1.5.0",
-      "sha256": "1klw181lmxr0hph9hq87ka9c85jhyjgdkb8mkpbp6arkx57vh0gz",
-      "depends": ["MASS", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "Rfast", "dplyr", "fda", "fda_usc", "ggplot2", "matrixStats", "mvtnorm", "patchwork", "rlang", "roahd", "robustbase", "rofanova", "rrcov", "stringr", "tidyr"]
+      "version": "1.6.0",
+      "sha256": "1bgd88091l69fwzi8zh9affakv4x5k7rh2233lzx4sm70pi94x08",
+      "depends": ["MASS", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "Rfast", "dplyr", "fda", "fda_usc", "ggplot2", "matrixStats", "mgcv", "patchwork", "rlang", "roahd", "robustbase", "rofanova", "rrcov", "scam", "spatstat_univar", "stringr", "tidyr"]
     },
     "funchir": {
       "name": "funchir",
@@ -64603,11 +66967,17 @@
       "sha256": "12z4q0fn7asxis17hisi82bvfabl5if1338lmfqmkrwv5rg7748d",
       "depends": ["future", "globals", "lifecycle", "purrr", "rlang", "vctrs"]
     },
+    "fuseMLR": {
+      "name": "fuseMLR",
+      "version": "0.0.1",
+      "sha256": "00v8rf38l3pkld5sfcg5kbbj6qc3llpkv1wdwwb7g1ih9ds53wmb",
+      "depends": ["R6", "digest"]
+    },
     "fusedMGM": {
       "name": "fusedMGM",
-      "version": "0.1.0.1",
-      "sha256": "126h8jvmx1y1n49p4s2h3qn7qfzf6q98k7b7rwjn6rn9hjvwd45j",
-      "depends": ["bigmemory", "fastDummies", "gplots"]
+      "version": "0.1.2",
+      "sha256": "113qzv4wyh76nhidk4kdcrqaczcand1ihhgcvvm9jj3nbbh8xqkh",
+      "depends": ["bigalgebra", "biganalytics", "bigmemory", "fastDummies", "gplots"]
     },
     "fusen": {
       "name": "fusen",
@@ -64623,9 +66993,9 @@
     },
     "fusionchartsR": {
       "name": "fusionchartsR",
-      "version": "0.0.3",
-      "sha256": "09l5kckgkp2l0zvfnqhbzy65bi23aavas9m74nddhjh6di8xndh8",
-      "depends": ["htmlwidgets", "jsonlite", "magrittr", "shiny"]
+      "version": "1.1.0",
+      "sha256": "1sis1wl4dpag9q4f206jcc478x5995y0wglzpfy8i0k1sy3yjw1c",
+      "depends": ["ggplot2", "htmlwidgets", "jsonlite", "magrittr", "scales", "shiny"]
     },
     "fusionclust": {
       "name": "fusionclust",
@@ -64659,8 +67029,8 @@
     },
     "future_apply": {
       "name": "future.apply",
-      "version": "1.11.2",
-      "sha256": "11qkv2r8ml1i95j5ra191ij5w1dvllgvr9ld5xnq43ayzaq3b9pl",
+      "version": "1.11.3",
+      "sha256": "1l45vc30fn4kr5v49nnh5bkixa9ff006cp9sh9qiss76162qbs76",
       "depends": ["future", "globals"]
     },
     "future_batchtools": {
@@ -64707,9 +67077,9 @@
     },
     "fuzzySim": {
       "name": "fuzzySim",
-      "version": "4.10.7",
-      "sha256": "1xfq2il2d44a99yp2lnsmmna52spqk92sv29farmxwppfvghg942",
-      "depends": ["modEvA"]
+      "version": "4.29",
+      "sha256": "1ph7iq0mz99d3czqxmv8biw06i88fdchrjcrvibsw3km6a4k6z54",
+      "depends": ["modEvA", "stringi"]
     },
     "fuzzyforest": {
       "name": "fuzzyforest",
@@ -64761,8 +67131,8 @@
     },
     "fxl": {
       "name": "fxl",
-      "version": "1.7.1",
-      "sha256": "0i7c30vaysrfav9z4ikfmjy287qvcnx3yi3898qcszkip28n9zx7",
+      "version": "1.7.2",
+      "sha256": "10wypbkh7ypsrf2598ia81ldadz6gn9a40x9b1zvq77gjz3934vk",
       "depends": ["rlang"]
     },
     "fxregime": {
@@ -64789,6 +67159,12 @@
       "sha256": "1llks14akpdpa3v80kpr8sgmdlmjsvk7hcbilnk0zqlh1xi066km",
       "depends": []
     },
+    "g3viz": {
+      "name": "g3viz",
+      "version": "1.2.0",
+      "sha256": "1lkasna05pp5sc9jqgqmias8kl7h1fb64jfb9rpld575lmy2n2gv",
+      "depends": ["AnnotationDbi", "htmlwidgets", "httr2", "jsonlite", "org_Hs_eg_db", "stringr"]
+    },
     "gCat": {
       "name": "gCat",
       "version": "0.2",
@@ -64815,8 +67191,8 @@
     },
     "gKRLS": {
       "name": "gKRLS",
-      "version": "1.0.2",
-      "sha256": "0kkk463mgrypc5vihv9hvj7dsdwv6yvmhxp6iy6ip1k7nqi8xdvf",
+      "version": "1.0.4",
+      "sha256": "1x6db22zib76xfzqxygcyxlcalg9c3f9bcyi10qsvi3sg5f77l6j",
       "depends": ["Matrix", "R6", "Rcpp", "RcppEigen", "mgcv", "mlr3", "sandwich"]
     },
     "gLRTH": {
@@ -64839,9 +67215,9 @@
     },
     "gMOIP": {
       "name": "gMOIP",
-      "version": "1.5.2",
-      "sha256": "159rqd65g17m2mh93jpkapk4r6n8gmf43vrxhv8aqyggwl0ifdkx",
-      "depends": ["MASS", "Matrix", "Rfast", "dplyr", "eaf", "geometry", "ggplot2", "ggrepel", "plyr", "png", "purrr", "rgl", "rlang", "sp", "tibble", "tidyr", "tidyselect"]
+      "version": "1.5.4",
+      "sha256": "1vjzn2r3qfwvrvh74ly8sbsarx86r2sfhxh31zkbqnwh12465dgm",
+      "depends": ["MASS", "Matrix", "Rfast", "dplyr", "geometry", "ggplot2", "ggrepel", "moocore", "plyr", "png", "purrr", "rgl", "rlang", "sp", "tibble", "tidyr", "tidyselect"]
     },
     "gMWT": {
       "name": "gMWT",
@@ -64857,32 +67233,32 @@
     },
     "gRain": {
       "name": "gRain",
-      "version": "1.4.1",
-      "sha256": "11b40ngfzqqx9pgfbgx7qr63ikccxh1hg9snw55anw32hym2dyfr",
-      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "broom", "gRbase", "igraph", "magrittr"]
+      "version": "1.4.5",
+      "sha256": "02wh9lwg7ky8yl58rxj2f7fay1gg0q0wf3j8gkb7381cn7d4c6xk",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "broom", "gRbase", "igraph"]
     },
     "gRaven": {
       "name": "gRaven",
-      "version": "1.1.8",
-      "sha256": "0nmnmn5ni4ml5r7ah7kl8n51r5bcd9r6ncg7yz4qypbdqdamqx87",
+      "version": "1.1.10",
+      "sha256": "136s54cgxi8dyy0zpjcag9b02lgqgdxa39lpzsk4fndz9h45wp9c",
       "depends": ["gRain", "gRbase", "rlang"]
     },
     "gRbase": {
       "name": "gRbase",
-      "version": "2.0.2",
-      "sha256": "15rfl3wib8gq90fy1rr1p7cvdbiqg3qkp6vc71k02difp14hwwin",
+      "version": "2.0.3",
+      "sha256": "18hvdwr3pi5pn2bw6hd4vaqy1ybgsxqkw3y5zg9yn6rzd2zhriia",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "igraph"]
     },
     "gRc": {
       "name": "gRc",
-      "version": "0.5.0",
-      "sha256": "12fz7aiddzc3pxvglin265z30ihcmy18nsw02zg7vb27bz5ldvqp",
+      "version": "0.5.1",
+      "sha256": "1l067jz2631x7kbmzr1zjyy3bbzr5qcyrrvw52sdplg1flald22c",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "gRbase", "igraph"]
     },
     "gRim": {
       "name": "gRim",
-      "version": "0.3.3",
-      "sha256": "126ip5bvqipfrclmclv0gskf2a1d0z7m5965c477q831s3a1wbb8",
+      "version": "0.3.4",
+      "sha256": "17rbvf69p5vzfb1s550sf6793bd7wgs8482hm60y9d6d10iicj60",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "doBy", "gRain", "gRbase", "glue", "igraph"]
     },
     "gSeg": {
@@ -64917,8 +67293,8 @@
     },
     "gWidgets2": {
       "name": "gWidgets2",
-      "version": "1.0-9",
-      "sha256": "1ifljpdazzmwf3mgkg9g76365n2cmw8dd3da161fpvw84xxyznfl",
+      "version": "1.0-10",
+      "sha256": "04wqyyk7wj808035862vsrmmhpvcailnscycpc83qfrkpqkr15v6",
       "depends": ["digest"]
     },
     "gWidgets2tcltk": {
@@ -64965,8 +67341,8 @@
     },
     "galah": {
       "name": "galah",
-      "version": "2.0.2",
-      "sha256": "1z4z403b3jf0rj3gjrmsgjc4niab6jxdwb01rw0pzdblc8a2y4f1",
+      "version": "2.1.0",
+      "sha256": "0byf7hh34grhar8nf6lqpsnhmj59wmz8ww6h9b9c2bimlg3s0h20",
       "depends": ["cli", "crayon", "dplyr", "glue", "httr2", "jsonlite", "lifecycle", "potions", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "galamm": {
@@ -64981,6 +67357,12 @@
       "sha256": "1lfw1kikf90nv9g0xrb656fbilmxdk64zrzi43wrz7y2y55sd5xv",
       "depends": ["cli", "crayon", "dplyr", "gargle", "getProxy", "magrittr", "purrr", "rappsflyer", "rfacebookstat", "rgoogleads", "rmytarget", "rstudioapi", "rvkstat", "ryandexdirect", "rym", "tibble", "tidyr"]
     },
+    "gallery": {
+      "name": "gallery",
+      "version": "1.0.0",
+      "sha256": "1mp247z0vh4n2xh3nwkgkxq7rrc6vcfkcx39c4z80vvvdx3rvw1m",
+      "depends": ["Matrix", "pracma"]
+    },
     "galts": {
       "name": "galts",
       "version": "1.3.2",
@@ -64995,14 +67377,14 @@
     },
     "gam": {
       "name": "gam",
-      "version": "1.22-4",
-      "sha256": "0wy0ia8z9mah8lr4lsbv9sn5z31zbqhrhmk6a74nzfzfyl478hbq",
+      "version": "1.22-5",
+      "sha256": "0mg9h8hm76wz8fbppfirgmqm1x70n3q13mmy8wdpi0h9bq0a2cvx",
       "depends": ["foreach"]
     },
     "gam_hp": {
       "name": "gam.hp",
-      "version": "0.0-2",
-      "sha256": "0zhnwl533vb094vbn5bxggav3fqh0ahrdrhjliwrgwh2h3bwqpp7",
+      "version": "0.0-3",
+      "sha256": "1cjjdd2vmn7916401dwr1dcycy7g2xz5bwy3l4bw1hblrs3np7kw",
       "depends": ["ggplot2", "mgcv"]
     },
     "gamCopula": {
@@ -65055,8 +67437,8 @@
     },
     "gameR": {
       "name": "gameR",
-      "version": "0.0.6",
-      "sha256": "05bn53ryl48s2r212wqaxljimkgskyd4qxzc7algzbyvmalcg6rx",
+      "version": "0.0.7",
+      "sha256": "1p005k6l2zkfqrkjis99shrxazaidb4d74x4z3h984qp3ag0w8p8",
       "depends": []
     },
     "gamesGA": {
@@ -65181,10 +67563,16 @@
     },
     "gamma": {
       "name": "gamma",
-      "version": "1.0.5",
-      "sha256": "1n4jd0xvn6ld5adhhanqxhl7nndj4cqf17jp18s6jmrx7jbc3k5f",
+      "version": "1.1.0",
+      "sha256": "0wsxy97kdfmlvrflp9l3fqn5ckdraxb7lbjpq1znqgj304g0j45n",
       "depends": ["IsoplotR", "ggplot2", "rlang", "rxylib"]
     },
+    "gammi": {
+      "name": "gammi",
+      "version": "0.1",
+      "sha256": "1zvmfkbjj70h7aq0yx3gchq17klgfwbjqd468pnq7wfrpvg04dgy",
+      "depends": ["Matrix", "lme4"]
+    },
     "gamreg": {
       "name": "gamreg",
       "version": "0.3",
@@ -65193,8 +67581,8 @@
     },
     "gamsel": {
       "name": "gamsel",
-      "version": "1.8-4",
-      "sha256": "1w6s19fwrqldacw4qlx3xcq33v0vx332hcyfg2qdcni6yi80fdkg",
+      "version": "1.8-5",
+      "sha256": "17c3k72absrfzj8qqjgf9rni7p3s0d1jdw5hf94d03jds00n4w21",
       "depends": ["foreach", "mda"]
     },
     "gamselBayes": {
@@ -65205,8 +67593,8 @@
     },
     "gamstransfer": {
       "name": "gamstransfer",
-      "version": "3.0.3",
-      "sha256": "0ashdicnkrvbsddqajhnqrwrpw8y3ikzibm4y3gn5ywg7y3dbp2k",
+      "version": "3.0.4",
+      "sha256": "1xfrykgfd0xw1z2fs1ay1d7wq87ak78qrfgw8vsxf0lg8lvmjqpp",
       "depends": ["R6", "R_utils", "Rcpp", "collections"]
     },
     "ganDataModel": {
@@ -65217,14 +67605,14 @@
     },
     "ganGenerativeData": {
       "name": "ganGenerativeData",
-      "version": "2.0.2",
-      "sha256": "0bwka0i9afc9vdw94mbjvqz54w4bfywm84c7mchazr4jwc5p309g",
+      "version": "2.1.4",
+      "sha256": "16n8l0ysq17kwf265i3jafnwld030i9p2zlkqa0g3wv02b8x44a4",
       "depends": ["Rcpp", "httr", "tensorflow"]
     },
     "gap": {
       "name": "gap",
-      "version": "1.5-3",
-      "sha256": "1kjjnh0s9aicwkd7wsisi4c75y701irigsbzp7y6f2264bcgj6bf",
+      "version": "1.6",
+      "sha256": "1pz0j3vglccrwm3p9lj6wbq58varb8b0xg5r97gmz8c3biprpzww",
       "depends": ["Rdpack", "dplyr", "gap_datasets", "ggplot2", "plotly"]
     },
     "gap_datasets": {
@@ -65277,9 +67665,9 @@
     },
     "garma": {
       "name": "garma",
-      "version": "0.9.13",
-      "sha256": "0h61f29x2261vky4cwmcfwlix7x1yg8qkhgkhiw1aryqmzvwf0lc",
-      "depends": ["BB", "FKF", "GA", "Rsolnp", "crayon", "dfoptim", "forecast", "ggplot2", "hypergeo", "ltsa", "lubridate", "nloptr", "pracma", "pso", "signal", "tswge", "zoo"]
+      "version": "0.9.23",
+      "sha256": "0rm77ig8payprd715z635h35338mc71pd0k7fk46s4jqlwaqkybd",
+      "depends": ["Rsolnp", "crayon", "forecast", "ggplot2", "lubridate", "nloptr", "pracma", "rlang", "signal", "zoo"]
     },
     "garray": {
       "name": "garray",
@@ -65289,8 +67677,8 @@
     },
     "gasanalyzer": {
       "name": "gasanalyzer",
-      "version": "0.4.1",
-      "sha256": "0cb6xkzfrnxd28dm17r6b57i8l48psqcgx1yaw37csjll35ngxap",
+      "version": "0.4.2",
+      "sha256": "0ca6ywbsqxj84agbmk3azlc5jwb48hk7wci61j7wp2id5gmh3d11",
       "depends": ["jsonify", "stringi", "tibble", "tidyxl", "units", "vctrs", "xml2"]
     },
     "gaselect": {
@@ -65319,8 +67707,8 @@
     },
     "gastempt": {
       "name": "gastempt",
-      "version": "0.5.5",
-      "sha256": "0pz580nhr9hnpzdi59l00jv34jmy5iyh5skbwslq6gzjdw3jgsf4",
+      "version": "0.7.0",
+      "sha256": "0ddnr4052mkaqyk3810xhxfllgr3l46vh37c8909dbkphm3isi9y",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "assertthat", "dplyr", "ggplot2", "nlme", "rstan", "shiny", "stringr", "tibble", "utf8"]
     },
     "gaston": {
@@ -65427,8 +67815,8 @@
     },
     "gbm_auto": {
       "name": "gbm.auto",
-      "version": "2023.08.31",
-      "sha256": "14gahb13p9wpsf8a8mb6a7ikas9jcd4hwh4jn4rg1mray4pgj7in",
+      "version": "2024.10.01",
+      "sha256": "1dyx937ajm461kpigbfgasb7ay96abw7s3lda8g54nfn3mxl82sq",
       "depends": ["Metrics", "beepr", "dismo", "dplyr", "gbm", "ggmap", "ggplot2", "ggspatial", "lifecycle", "lubridate", "mapplots", "readr", "sf", "stars", "starsExtra", "stringi", "tidyselect", "viridis"]
     },
     "gbm2sas": {
@@ -65439,8 +67827,8 @@
     },
     "gbmt": {
       "name": "gbmt",
-      "version": "0.1.3",
-      "sha256": "10dyghrxjd9ddgk7gp2af8a46skzb2m9vazr9s216r20257ijd13",
+      "version": "0.1.4",
+      "sha256": "1nzj8jhkabxp5ix9zw8ac4i9ij5cgss6n126pnh81vd3qjpi1fqm",
       "depends": ["Matrix"]
     },
     "gbp": {
@@ -65481,8 +67869,8 @@
     },
     "gcbd": {
       "name": "gcbd",
-      "version": "0.2.6",
-      "sha256": "1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia",
+      "version": "0.2.7",
+      "sha256": "1yprp56y15d3z48s9qk0dl9qcy9hg7caqlqnd30k47rpigxszwii",
       "depends": ["DBI", "Matrix", "RSQLite", "lattice", "plyr", "reshape"]
     },
     "gcdnet": {
@@ -65565,8 +67953,8 @@
     },
     "gdata": {
       "name": "gdata",
-      "version": "3.0.0",
-      "sha256": "0zxi0634dkgczw7gicj8r6mhb83cpkxhsy2iivz0b9v52y9bjmm4",
+      "version": "3.0.1",
+      "sha256": "0qiqfrk0qi8k1f6kvfkgp43algjdgfx6w5xmqrpyzh535gfrcfnv",
       "depends": ["gtools"]
     },
     "gde": {
@@ -65607,9 +67995,9 @@
     },
     "gdm": {
       "name": "gdm",
-      "version": "1.5.0-9.1",
-      "sha256": "10c4fk6pbd946is8h8cr8qblrq6cch5zhlhrxqd8ix5wknm8cqn8",
-      "depends": ["Rcpp", "doParallel", "foreach", "pbapply", "raster", "reshape2", "vegan"]
+      "version": "1.6.0-4",
+      "sha256": "1fw7grjbhqar3x2a4406bagl89klg974pga5w859fz8w4724wyck",
+      "depends": ["Rcpp", "doParallel", "foreach", "pbapply", "reshape2", "vegan"]
     },
     "gdpc": {
       "name": "gdpc",
@@ -65625,9 +68013,15 @@
     },
     "gdtools": {
       "name": "gdtools",
-      "version": "0.3.7",
-      "sha256": "155ky9fdi023b5fjk1gh3607xlgm3hymq232fq03ip2aaywc74nj",
-      "depends": ["Rcpp", "curl", "fontquiver", "gfonts", "htmltools", "systemfonts"]
+      "version": "0.4.1",
+      "sha256": "0vv8g0h5fkpna5b3fqrj6dkdxpqr0ws5sdmzgysb17gw4vviq39b",
+      "depends": ["Rcpp", "fontquiver", "htmltools", "systemfonts"]
+    },
+    "gdverse": {
+      "name": "gdverse",
+      "version": "1.3-1",
+      "sha256": "1gp96xxri06d821z886s86ml6gkgkq47g74z224lwv03s1av3v59",
+      "depends": ["Rcpp", "dplyr", "forcats", "ggplot2", "magrittr", "patchwork", "purrr", "reticulate", "rpart", "scatterpie", "sdsfun", "sf", "tibble", "tidyr"]
     },
     "gdxdt": {
       "name": "gdxdt",
@@ -65649,14 +68043,14 @@
     },
     "gecko": {
       "name": "gecko",
-      "version": "1.0.0",
-      "sha256": "1q0wzg3mkb6z7zs81zynj6x159w99h5an20a6m8wdqbday5sccyc",
+      "version": "1.0.1",
+      "sha256": "0kvzzlw4069csjwbp514gk92y1yarhq5yhrazl6jgvjcqca4mjy9",
       "depends": ["biomod2", "geosphere", "kernlab", "red", "sp", "terra"]
     },
     "gee": {
       "name": "gee",
-      "version": "4.13-27",
-      "sha256": "1754173msjxhkpl95v6z8c73vhz7ivfil0xfs25smrlgslzpgd1z",
+      "version": "4.13-29",
+      "sha256": "157zqbshnmkhxbq5r0ss5mswhd7s603gjdgyv1wklagpq6qfz0z0",
       "depends": []
     },
     "geeCRT": {
@@ -65673,8 +68067,8 @@
     },
     "geeVerse": {
       "name": "geeVerse",
-      "version": "0.2.1",
-      "sha256": "04hfw7y3bfgngiv5cahx3hckfl1i83x2vjc5vabqqk2nq400c4x5",
+      "version": "0.2.2",
+      "sha256": "1z3lfi9n7jrnh62wjhkmy1xqaxw3xmfm69djw0wgbd9l3k4n2lpd",
       "depends": ["Rcpp", "RcppEigen", "doParallel", "foreach", "mvtnorm", "quantreg"]
     },
     "geeasy": {
@@ -65691,8 +68085,8 @@
     },
     "geepack": {
       "name": "geepack",
-      "version": "1.3.11",
-      "sha256": "0y74allpn9bcc5hlqlr97qb9siig52qvaf1lyd4ffpg72k9z1qi9",
+      "version": "1.3.12",
+      "sha256": "0k856hw7zh553yrqp9g3s19hjviadh36drg2vvaddv2ma5ayj6z0",
       "depends": ["MASS", "broom", "magrittr"]
     },
     "geesmv": {
@@ -65703,8 +68097,8 @@
     },
     "geessbin": {
       "name": "geessbin",
-      "version": "0.1.2",
-      "sha256": "06phzv4mwa4lk93xq5824s6zxz81xi0cmwh10d53h9iakynisnw1",
+      "version": "1.0.0",
+      "sha256": "0vj1z29hccvwqsqj8gclmwzrqsqimzsr0sy2hh81jaznw9hghw5x",
       "depends": ["MASS"]
     },
     "geex": {
@@ -65737,6 +68131,12 @@
       "sha256": "10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p",
       "depends": []
     },
+    "gemini_R": {
+      "name": "gemini.R",
+      "version": "0.6.1",
+      "sha256": "0hgb9bp8gy8fy8g1lkw4lmp1wpiqj4v5raqzgzdhpmsmn8dc02sh",
+      "depends": ["base64enc", "cli", "httr2", "rstudioapi"]
+    },
     "gemma2": {
       "name": "gemma2",
       "version": "0.1.3",
@@ -65883,8 +68283,8 @@
     },
     "genekitr": {
       "name": "genekitr",
-      "version": "1.2.7",
-      "sha256": "0qymmprifw429542ns0dns801m3kvsskgddz2zvb8ny36sdrvrqm",
+      "version": "1.2.8",
+      "sha256": "04hjz6g4jzbghv28z1nfz7adx9lk93v0h1m17vpf548z0mkv6zyh",
       "depends": ["clusterProfiler", "dplyr", "europepmc", "fst", "geneset", "ggplot2", "ggraph", "ggvenn", "igraph", "magrittr", "openxlsx", "rlang", "stringi", "stringr", "tidyr"]
     },
     "genemodel": {
@@ -65947,6 +68347,12 @@
       "sha256": "0gf63gmhxvyxms2xhbgwmg8c5xpc4bswbpvfv4nyx25zr97ba7vi",
       "depends": ["dplyr", "httr2", "jsonlite", "magrittr", "readr", "tidyselect"]
     },
+    "genetic_algo_optimizeR": {
+      "name": "genetic.algo.optimizeR",
+      "version": "0.3.2",
+      "sha256": "14s8cwx7bx6a206cxm2i7rp8kisqz620qrgzj3cn1qg0pxd49ixj",
+      "depends": ["DiagrammeR", "biocViews", "dplyr", "ggplot2", "magrittr", "rsconnect", "stringr", "tinytex"]
+    },
     "geneticae": {
       "name": "geneticae",
       "version": "0.4.0",
@@ -65979,8 +68385,8 @@
     },
     "genieclust": {
       "name": "genieclust",
-      "version": "1.1.5-2",
-      "sha256": "0n8r3wvync041ppf72gd3yx1yj9b4fdbcb4gw3lhvsxx1gxwym0k",
+      "version": "1.1.6",
+      "sha256": "131nax76dsg3b6700qwgq3gpin4pl152rjsfqgh41m89ffchk0m4",
       "depends": ["Rcpp"]
     },
     "genio": {
@@ -66057,9 +68463,9 @@
     },
     "genridge": {
       "name": "genridge",
-      "version": "0.7.0",
-      "sha256": "1f7yvq3g1bgxkkbklklfirk4nqiyh6csvygfbp3z57zywrbp1019",
-      "depends": ["car", "rgl"]
+      "version": "0.8.0",
+      "sha256": "1n6aysijqskw53j9wav52fh5irfvv12nyvizwmqxv8nny10680s6",
+      "depends": ["car", "colorspace", "rgl"]
     },
     "genscore": {
       "name": "genscore",
@@ -66099,8 +68505,8 @@
     },
     "geoBayes": {
       "name": "geoBayes",
-      "version": "0.7.3",
-      "sha256": "14h3iwc0i8y205wvh81zmgz7x4qd605g7w2d3s4s4whnsmi7wf0q",
+      "version": "0.7.4",
+      "sha256": "1d32c9f9wk1x3s89v957f8pb98m6qq5j084p35skbppkmc60y5lp",
       "depends": ["coda", "optimx", "sp"]
     },
     "geoFKF": {
@@ -66147,9 +68553,9 @@
     },
     "geobr": {
       "name": "geobr",
-      "version": "1.9.0",
-      "sha256": "1q7gichqlyahzmn4wmg2v1gbg0p3p40n19amz5m0vqxx2vbpq6dl",
-      "depends": ["curl", "data_table", "dplyr", "httr", "sf"]
+      "version": "1.9.1",
+      "sha256": "0mn6qrlxxhf444ngdvq5gwvi1kadpg57zgg4gzmmrv186n709s0j",
+      "depends": ["curl", "data_table", "dplyr", "fs", "sf"]
     },
     "geocacheR": {
       "name": "geocacheR",
@@ -66159,8 +68565,8 @@
     },
     "geocausal": {
       "name": "geocausal",
-      "version": "0.3.2",
-      "sha256": "0cz1pzfyygiriwagqlhcwibmr2zakkdcnz9jnkghyw7s9xqvnnd6",
+      "version": "0.3.3",
+      "sha256": "0fjlir1ya2ldp95wgb4gz6fl00xmxfvblf85pb8fsdans83ch0dp",
       "depends": ["data_table", "dplyr", "furrr", "ggplot2", "ggpubr", "latex2exp", "mclust", "progressr", "purrr", "sf", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_univar", "terra", "tidyr", "tidyselect", "tidyterra"]
     },
     "geocmeans": {
@@ -66169,6 +68575,12 @@
       "sha256": "02h171flg295ixpgl2glav2ij0wbvy7kclazdlldw40461aar5nk",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "dplyr", "fclust", "fmsb", "future_apply", "ggplot2", "leaflet", "matrixStats", "plotly", "progressr", "reldist", "reshape2", "sf", "shiny", "spdep", "terra", "tmap"]
     },
+    "geocomplexity": {
+      "name": "geocomplexity",
+      "version": "0.2.1",
+      "sha256": "1zmfr4lsjh9k55gn4kvm4rgaaw1f771bskns2l32wjivivia5rwv",
+      "depends": ["Rcpp", "RcppArmadillo", "dplyr", "magrittr", "purrr", "sdsfun", "sf", "terra", "tibble"]
+    },
     "geodaData": {
       "name": "geodaData",
       "version": "0.1.0",
@@ -66181,6 +68593,12 @@
       "sha256": "0yiir9dslk6l60zf40kbvycd2x755whpp07is5bah1wa1wwgxwn5",
       "depends": ["terra"]
     },
+    "geodetector": {
+      "name": "geodetector",
+      "version": "1.0-5",
+      "sha256": "17651yppczr3rdnd1zb34pxllg42fs7j7hcg96vzljsaaaziv4bj",
+      "depends": []
+    },
     "geodimension": {
       "name": "geodimension",
       "version": "2.0.0",
@@ -66199,6 +68617,12 @@
       "sha256": "0580q71m71xd0kn9z8l536ypl31gx4fyw6cn1nc03sazrdilkz8r",
       "depends": ["Rcpp", "RcppArmadillo", "dplyr", "e1071", "pracma", "rlang", "sf", "spatial", "terra", "zoo"]
     },
+    "geodl": {
+      "name": "geodl",
+      "version": "0.2.0",
+      "sha256": "0fds29bsijihi47g3bh5796ni42shap8jyqrml385is6g50x9yy5",
+      "depends": ["MultiscaleDTM", "R6", "coro", "dplyr", "luz", "psych", "readr", "rlang", "terra", "torch", "torchvision"]
+    },
     "geodrawr": {
       "name": "geodrawr",
       "version": "2.0.0",
@@ -66219,8 +68643,8 @@
     },
     "geofi": {
       "name": "geofi",
-      "version": "1.0.15",
-      "sha256": "1v4gnbm5lfnd9rjiwjakbh73rifa084nhwdvjizmcfmznk0x0hxb",
+      "version": "1.0.17",
+      "sha256": "1ihy8b94p6zqr7lpz6k5waqlhvpzyjp2sh73hh4kjmm4aazhx0x2",
       "depends": ["curl", "dplyr", "httpcache", "httr", "purrr", "rlang", "sf", "xml2", "yaml"]
     },
     "geogenr": {
@@ -66235,18 +68659,18 @@
       "sha256": "0jqqv5agnw071ysrmwz5r2z76f80rzm5bfl5g23gq1mbw85x8z8m",
       "depends": ["Rcpp", "RcppArmadillo", "sf", "sp"]
     },
-    "geohabnet": {
-      "name": "geohabnet",
-      "version": "2.1.3",
-      "sha256": "16a1qvmlynsvws3kl1l1apds8gxgf4yx1c7z92qcp73kilbmgp3x",
-      "depends": ["beepr", "config", "easycsv", "future", "future_apply", "geodata", "geosphere", "ggplot2", "igraph", "magrittr", "memoise", "patchwork", "rlang", "rnaturalearth", "stringr", "terra", "viridisLite", "yaml"]
-    },
     "geohashTools": {
       "name": "geohashTools",
       "version": "0.3.3",
       "sha256": "04hvlxq5fm4mcrlbx09j079522qhlyg4jg6dymwkmqxrwdibcnqq",
       "depends": []
     },
+    "geoheatmap": {
+      "name": "geoheatmap",
+      "version": "0.1.0",
+      "sha256": "1jqbvzz3cjyrkxj7q50w1hl62q5pdw0qfi1l7ca0j3b0m4ndbhgi",
+      "depends": ["geofacet", "ggplot2", "plotly", "rlang", "statebins"]
+    },
     "geojson": {
       "name": "geojson",
       "version": "0.3.5",
@@ -66309,14 +68733,14 @@
     },
     "geometry": {
       "name": "geometry",
-      "version": "0.4.7",
-      "sha256": "0fq1sbjlc02idfsnvily7hgi6zgjvrjh7c57wz166k8vyl2l484n",
+      "version": "0.5.0",
+      "sha256": "0qcymxxbs3lqi4w6cl8h3hwrchk3ahxp83kkv86bvrq4cd6mbxxm",
       "depends": ["Rcpp", "RcppProgress", "linprog", "lpSolve", "magic"]
     },
     "geommc": {
       "name": "geommc",
-      "version": "0.0.1",
-      "sha256": "0jc5fm2qrbhdk2dnh00yffjr07j8bg20h5dm0vj6qy1xkq7mrpx0",
+      "version": "0.1.1",
+      "sha256": "172iv017p5lfsy0436sqmvf8r1grwyb146czp6x6cyzn2n9qxhqx",
       "depends": ["Matrix", "Rcpp", "cubature", "magrittr", "matrixcalc", "mcmc"]
     },
     "geomod": {
@@ -66327,8 +68751,8 @@
     },
     "geomorph": {
       "name": "geomorph",
-      "version": "4.0.8",
-      "sha256": "0m8c1y3mi794k7b8zrnkvs098gjmaq3lvp1ds3kxjn7v0ddavd0l",
+      "version": "4.0.9",
+      "sha256": "0rshmlz9ccljl7c9fsz18jajdsdgm7zgiarx1sk2d85j31bfdhmb",
       "depends": ["Matrix", "RRPP", "ape", "ggplot2", "jpeg", "rgl"]
     },
     "geomtextpath": {
@@ -66381,8 +68805,8 @@
     },
     "georob": {
       "name": "georob",
-      "version": "0.3-19",
-      "sha256": "0mxd29viapqzwmqy097r2ykkqjch5v3qn5p3ixz5kp2q9xlqfq2p",
+      "version": "0.3-20",
+      "sha256": "0z1g26z4dbayxbh506ynh03v51v0q9dgz2b98l3cfbb9g53q1d7q",
       "depends": ["abind", "constrainedKriging", "fields", "lmtest", "nleqslv", "nlme", "quantreg", "robustbase", "snowfall", "sp"]
     },
     "geos": {
@@ -66411,9 +68835,9 @@
     },
     "geosimilarity": {
       "name": "geosimilarity",
-      "version": "2.2",
-      "sha256": "1mkab3377r04zybqsswakcgqwgby9iwb8bhxkr8s27blxha44jcp",
-      "depends": ["DescTools", "SecDim", "dplyr", "ggplot2", "ggrepel"]
+      "version": "3.7",
+      "sha256": "10hdll5niqd1k5kgqzp44dipqwp6mvbq00h0x9h16yswvxrx6ji9",
+      "depends": ["dplyr", "ggplot2", "ggrepel", "magrittr", "purrr", "tibble"]
     },
     "geospark": {
       "name": "geospark",
@@ -66423,8 +68847,8 @@
     },
     "geosphere": {
       "name": "geosphere",
-      "version": "1.5-18",
-      "sha256": "1h6sqvxwxv22js6hz4s8sjk50ygw0y34icbbbdb2v36ca3q6zzwr",
+      "version": "1.5-20",
+      "sha256": "01cwlrbqi216a19h9721i0vj7vakrybybqkicbg9pwyv6c2hy8cq",
       "depends": ["Rcpp", "sp"]
     },
     "geospt": {
@@ -66441,9 +68865,9 @@
     },
     "geostan": {
       "name": "geostan",
-      "version": "0.6.2",
-      "sha256": "078lk4c9igkm3il0yfcv2i64rj1fr3b5qz3d3szly2jh2ba5zdgh",
-      "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "rstan", "rstantools", "sf", "signs", "spdep", "truncnorm"]
+      "version": "0.8.1",
+      "sha256": "0z1zqyd762pzxqxd0923n7r2jdshrlvwjk38zpbdyayw305a71pg",
+      "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "rstan", "rstantools", "sf", "signs", "spData", "spdep", "truncnorm"]
     },
     "geostats": {
       "name": "geostats",
@@ -66495,8 +68919,8 @@
     },
     "gepaf": {
       "name": "gepaf",
-      "version": "0.1.1",
-      "sha256": "0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm",
+      "version": "0.2.0",
+      "sha256": "1fmxm8dzz8jx9qc7q9rwxh8zm8flwb9xkbpbv50526klsixp0qs3",
       "depends": ["bitops"]
     },
     "geppe": {
@@ -66511,6 +68935,18 @@
       "sha256": "1ra1piza922sigxk61v55dbpkmzha716drmb6m1qxn892vykmm8w",
       "depends": ["DescTools", "MASS", "lattice", "mvtnorm", "openxlsx", "pbapply", "truncnorm"]
     },
+    "gerda": {
+      "name": "gerda",
+      "version": "0.1.0",
+      "sha256": "1s9li84ph5wxpl6j696ysfi2km62s03231avwk36hp74fxj1sgwr",
+      "depends": ["dplyr", "knitr", "readr", "stringdist", "tibble"]
+    },
+    "gerefer": {
+      "name": "gerefer",
+      "version": "0.1.1",
+      "sha256": "10l4s44amz0pc9nmwh3j7bbysyn2rwfa6a95w3xpf6qdgjkxgfnw",
+      "depends": ["bibliorefer"]
+    },
     "germinationmetrics": {
       "name": "germinationmetrics",
       "version": "0.1.8",
@@ -66519,10 +68955,16 @@
     },
     "gert": {
       "name": "gert",
-      "version": "2.1.1",
-      "sha256": "0r59xn1c7axicl137a1l2mq74gzw5m7pi2x69ppyfji83c27q0s2",
+      "version": "2.1.4",
+      "sha256": "0vbpycxn5gzygbsjhdzy5f7yz49hl4rl5savl6cglf688qr2m61d",
       "depends": ["askpass", "credentials", "openssl", "rstudioapi", "sys", "zip"]
     },
+    "gesca": {
+      "name": "gesca",
+      "version": "1.0.5",
+      "sha256": "0s3ncb9gvaww92jpiidsp6v7lmgqqdv4rrrxlfv0rpjddpnvaixk",
+      "depends": []
+    },
     "gesisdata": {
       "name": "gesisdata",
       "version": "0.1.2",
@@ -66681,10 +69123,16 @@
     },
     "gfoRmula": {
       "name": "gfoRmula",
-      "version": "1.0.4",
-      "sha256": "0g9d3z031f4ya3xkm82c4qy0548p38x8c6j0m3vdfx414y4k8mih",
+      "version": "1.1.0",
+      "sha256": "09bjc5wp8rc7wmjcx8vkk7vg386j1wq5hkf6v63fpfpcsb887251",
       "depends": ["data_table", "ggplot2", "ggpubr", "nnet", "progress", "stringr", "survival", "truncnorm", "truncreg"]
     },
+    "gfoRmulaICE": {
+      "name": "gfoRmulaICE",
+      "version": "0.1.0",
+      "sha256": "1bpm1mn88byb12fdphshz5jgnz79y7fl595g8f6h8cbk01ih9grb",
+      "depends": ["Hmisc", "data_table", "doParallel", "dplyr", "foreach", "ggplot2", "magrittr", "nnet", "reshape2", "rlang", "speedglm", "stringr"]
+    },
     "gfonts": {
       "name": "gfonts",
       "version": "0.2.0",
@@ -66703,6 +69151,12 @@
       "sha256": "0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h",
       "depends": ["cowplot", "ggplot2"]
     },
+    "gg1d": {
+      "name": "gg1d",
+      "version": "0.1.0",
+      "sha256": "1qgwvi02j57fb7lj2h20kr908xbggrlfyphrwapqlxbd6559kvid",
+      "depends": ["assertions", "cli", "ggiraph", "ggplot2", "ggtext", "patchwork", "rank", "rlang"]
+    },
     "ggBubbles": {
       "name": "ggBubbles",
       "version": "0.1.4",
@@ -66817,6 +69271,12 @@
       "sha256": "0hzjbpd3f3zn169s5nvnv7b4wlrwdn3r0pk0vgkdnhchl75g0qni",
       "depends": ["aplot", "dplyr", "forcats", "ggplot2", "tibble", "venn", "yulab_utils"]
     },
+    "ggalign": {
+      "name": "ggalign",
+      "version": "0.0.5",
+      "sha256": "17zcfwglgrn6lmjzym7q7qqgvy8fq97qc74mkmlwi0zgy6vnlb4g",
+      "depends": ["cli", "ggplot2", "gtable", "lifecycle", "rlang", "vctrs"]
+    },
     "ggaligner": {
       "name": "ggaligner",
       "version": "0.1",
@@ -66891,9 +69351,9 @@
     },
     "ggblanket": {
       "name": "ggblanket",
-      "version": "10.0.0",
-      "sha256": "1ym4sv692ly1r16hf1cxkm6mjz6djik3hwsw2gj2ydchypkdsq3q",
-      "depends": ["colorspace", "dplyr", "farver", "forcats", "ggplot2", "hms", "labelled", "lubridate", "magrittr", "purrr", "rlang", "scales", "snakecase", "stringr", "tidyr", "tidyselect", "viridisLite"]
+      "version": "11.1.0",
+      "sha256": "1c3wdxcdcn42afzal8qw4vgj3k823dbj620va4yd5v4svjxj1y95",
+      "depends": ["colorspace", "dplyr", "farver", "forcats", "ggblend", "ggplot2", "hms", "labelled", "lubridate", "purrr", "rlang", "scales", "snakecase", "stringr", "tidyr", "tidyselect", "viridisLite"]
     },
     "ggblend": {
       "name": "ggblend",
@@ -66961,6 +69421,12 @@
       "sha256": "1pl9qhj7p5kflx0ni59hq1k9afqchghg5wig9v1ml5pqrjz70pxa",
       "depends": ["dplyr", "egg", "ggplot2", "lattice", "magrittr", "readr", "rlang", "stringr", "tibble", "tidyr", "vctrs"]
     },
+    "ggcompare": {
+      "name": "ggcompare",
+      "version": "0.0.3",
+      "sha256": "03gjcwsq9dn076rcwgv1i3bmwzyhb41i8q222rlhfrw10id0p2yz",
+      "depends": ["ggplot2"]
+    },
     "ggcorrplot": {
       "name": "ggcorrplot",
       "version": "0.1.4.1",
@@ -67023,14 +69489,14 @@
     },
     "gge": {
       "name": "gge",
-      "version": "1.8",
-      "sha256": "1c8f8g4nw245cjxpx3fjw03cgwc1q13k9ly9jx1jcc6k6hsdkx9k",
+      "version": "1.9",
+      "sha256": "0n33dpqvmf3iqr3bimx91zzla5m83nhyf0ldm9hrflxgnnmlnzhg",
       "depends": ["nipals", "reshape2"]
     },
     "ggeasy": {
       "name": "ggeasy",
-      "version": "0.1.4",
-      "sha256": "1dppcffkyr6ybpz17zkq97g0p2hs1f8iwg6vwrw124pbgr065dr0",
+      "version": "0.1.5",
+      "sha256": "1inxk15lmdjpfzf46xdn6yrgz6h45i6rhv2qpcyb2rvf4v6cfm96",
       "depends": ["ggplot2", "rlang"]
     },
     "ggedit": {
@@ -67041,9 +69507,9 @@
     },
     "ggeffects": {
       "name": "ggeffects",
-      "version": "1.7.0",
-      "sha256": "1pbg6iwnbh7cwdzhb44knnbv70lkcgjzrzwyhdzv28vmyc7qy9cj",
-      "depends": ["insight"]
+      "version": "2.0.0",
+      "sha256": "02jkkgk5sv7kj2q4d3lbmww8ba52bagak8d70z2yxppll2qz9vs8",
+      "depends": ["datawizard", "insight"]
     },
     "ggenealogy": {
       "name": "ggenealogy",
@@ -67059,8 +69525,8 @@
     },
     "ggfacto": {
       "name": "ggfacto",
-      "version": "0.3.0",
-      "sha256": "069qzz2192vq6zsqpq2wqxhj6a26g4mpdbng7ing4ha9xfnp9h7g",
+      "version": "0.3.2",
+      "sha256": "1cdj34y5saf2d5cwnigmxlfyny9alcl84cyhrybv5yqykc75sim8",
       "depends": ["FactoMineR", "data_table", "dplyr", "forcats", "ggforce", "ggiraph", "ggplot2", "ggrepel", "gridExtra", "magrittr", "purrr", "rlang", "stringr", "tabxplor", "tibble", "tidyr", "tidyselect", "vctrs", "withr"]
     },
     "ggfields": {
@@ -67069,6 +69535,12 @@
       "sha256": "1b23hxi9g5fcmrw63pmksayk9j7xsi0j23qkfkchlcx258yrf7la",
       "depends": ["dplyr", "ggplot2", "rlang", "scales", "sf"]
     },
+    "ggfigdone": {
+      "name": "ggfigdone",
+      "version": "0.1.2",
+      "sha256": "1kd6k2lh6ah4faprg1vk2ala2iw136mqkw2f8gvpzgg3spc4s7q7",
+      "depends": ["data_table", "filelock", "ggplot2", "httpuv", "httr", "jsonlite", "readr", "uuid"]
+    },
     "ggfittext": {
       "name": "ggfittext",
       "version": "0.10.2",
@@ -67119,9 +69591,9 @@
     },
     "ggfun": {
       "name": "ggfun",
-      "version": "0.1.5",
-      "sha256": "1lqngd9333vlai88q2w5hrp9mmzdlvjx9pvn7zr9fx61d3yh2v7y",
-      "depends": ["cli", "dplyr", "ggplot2", "rlang"]
+      "version": "0.1.8",
+      "sha256": "0p1znrc6k7lh1i3q65v8i48z5d48fag8pz213a8297cdiik9wgq8",
+      "depends": ["cli", "dplyr", "ggplot2", "rlang", "yulab_utils"]
     },
     "ggfx": {
       "name": "ggfx",
@@ -67143,8 +69615,8 @@
     },
     "gggenomes": {
       "name": "gggenomes",
-      "version": "1.0.0",
-      "sha256": "0f3mkwbxmbszahfwr11big9cwlgp7nwbhfsxxfrhqshmr56ydpiw",
+      "version": "1.0.1",
+      "sha256": "1imahf69d17l7fk8j3jkiwlhbbc71yvdvp4q440w2mn4pnbzf6xx",
       "depends": ["colorspace", "dplyr", "ellipsis", "ggplot2", "jsonlite", "magrittr", "purrr", "readr", "rlang", "scales", "snakecase", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "ggghost": {
@@ -67167,8 +69639,8 @@
     },
     "ggh4x": {
       "name": "ggh4x",
-      "version": "0.2.8",
-      "sha256": "1vk2xqf1m14zy0jynv73f56a3slrpa9nymvw236v9ixgafarwkm8",
+      "version": "0.3.0",
+      "sha256": "0xrq0p6jhzqa1ap1c06pa77mksdh8gvm53sw5iz7hddfl46n8676",
       "depends": ["cli", "ggplot2", "gtable", "lifecycle", "rlang", "scales", "vctrs"]
     },
     "gghalfnorm": {
@@ -67185,8 +69657,8 @@
     },
     "gghdx": {
       "name": "gghdx",
-      "version": "0.1.3",
-      "sha256": "01y0c9mlk1c25r5v0kjyhmsgb77qaq4ykg8hhjr1kn1w5gfylnbk",
+      "version": "0.1.4",
+      "sha256": "0lsa84afs31jch7wgamsg721wyac64qm5wxk12iiwkyxcmlv7234",
       "depends": ["dplyr", "ggplot2", "ggthemes", "lifecycle", "magrittr", "purrr", "rlang", "showtext", "sysfonts", "tibble"]
     },
     "ggheatmap": {
@@ -67233,8 +69705,8 @@
     },
     "gginnards": {
       "name": "gginnards",
-      "version": "0.2.0",
-      "sha256": "0xhnn0kcmlggyx50dv4avhs4ngfnya2m928dqpix8km4c3y140qg",
+      "version": "0.2.0-1",
+      "sha256": "062xdhq8pgbvwl8zy7kzfgdgzfaf4zd3bnw8l4201xcl3nq6v9l3",
       "depends": ["ggplot2", "magrittr", "rlang", "stringr", "tibble"]
     },
     "ggip": {
@@ -67245,8 +69717,8 @@
     },
     "ggiraph": {
       "name": "ggiraph",
-      "version": "0.8.10",
-      "sha256": "17vdw9xaizcdf6fcbyhz9l514kk4w4dz9yvikbz9bvfx93a9z5ps",
+      "version": "0.8.11",
+      "sha256": "13mz5y9djiydz715zpa6n9jgfp9rh5rgsaialrl6nwc3smq77gni",
       "depends": ["Rcpp", "cli", "ggplot2", "htmltools", "htmlwidgets", "purrr", "rlang", "systemfonts", "uuid", "vctrs"]
     },
     "ggiraphExtra": {
@@ -67285,6 +69757,12 @@
       "sha256": "1fybwxgsdwvl4d9ixicfgr1sgrzkwndmvp91zhhfhjlf0yy4qdaj",
       "depends": ["broom", "broom_mixed", "dplyr", "ggplot2", "metafor", "nlme", "patchwork", "purrr", "rlang", "tibble", "tidyr", "vctrs"]
     },
+    "gglogger": {
+      "name": "gglogger",
+      "version": "0.1.5",
+      "sha256": "1hhpv5vvpb635hb27v64h92x7ga9m4yvrldd61qa0jzjhnmp1623",
+      "depends": ["cli", "ggplot2"]
+    },
     "gglorenz": {
       "name": "gglorenz",
       "version": "0.0.2",
@@ -67305,9 +69783,9 @@
     },
     "ggmapinset": {
       "name": "ggmapinset",
-      "version": "0.3.0",
-      "sha256": "1cakn2iqjk117ngb0ssc68hxx8s4mgc8z8bl6mfvwffvjsyjyxyp",
-      "depends": ["cli", "ggplot2", "rlang", "sf"]
+      "version": "0.4.0",
+      "sha256": "0v2q81f1ya05xbl6wi8pc07z08825aa28gcilc534rr9dgbw4gry",
+      "depends": ["cli", "ggplot2", "lifecycle", "rlang", "sf", "vctrs"]
     },
     "ggmatplot": {
       "name": "ggmatplot",
@@ -67425,16 +69903,22 @@
     },
     "ggpath": {
       "name": "ggpath",
-      "version": "1.0.1",
-      "sha256": "0iq9fl8zcyc5ihi3pf6h8pb6j7ys506yziq0qr0xgyw803cvl23m",
-      "depends": ["cachem", "cli", "ggplot2", "magick", "memoise", "rappdirs", "rlang"]
+      "version": "1.0.2",
+      "sha256": "19rsshpcgdwccv790bydvp68p4797p5d6zyqwqbahd7xa1bwmg86",
+      "depends": ["backports", "cachem", "cli", "ggplot2", "magick", "memoise", "rlang"]
     },
     "ggpattern": {
       "name": "ggpattern",
-      "version": "1.1.1",
-      "sha256": "1xlh1y6q10iqk1mbwdrr1vqmgmim3z27znbb5sbwgmm9yfxzj37s",
+      "version": "1.1.3",
+      "sha256": "1pzhspw4ppsnnqd167fwkdy69n5ahmypx7llxqnk1a3fm32kj1v8",
       "depends": ["cli", "ggplot2", "glue", "gridpattern", "lifecycle", "rlang", "scales", "vctrs"]
     },
+    "ggpca": {
+      "name": "ggpca",
+      "version": "0.1.2",
+      "sha256": "13b3iks81mhjvjpghfamiyr3nbj63hg6jgl6922fclqml5i0rbdy",
+      "depends": ["Rtsne", "config", "cowplot", "dplyr", "ggplot2", "golem", "rlang", "shiny", "umap"]
+    },
     "ggpcp": {
       "name": "ggpcp",
       "version": "0.2.0",
@@ -67447,12 +69931,6 @@
       "sha256": "03gsbdqqxi0j4slp61bzrn4m2sjhh9fvcy1a1h5vcg4ax233j270",
       "depends": ["data_table", "dplyr", "ggplot2", "sticky", "tidyselect"]
     },
-    "ggpicrust2": {
-      "name": "ggpicrust2",
-      "version": "1.7.3",
-      "sha256": "0zjlsvzl2f74fvqw4ijnai23qwhlcpgd5p8z9dclnwnsgdbm6hcq",
-      "depends": ["ALDEx2", "DESeq2", "GGally", "Maaslin2", "MicrobiomeStat", "SummarizedExperiment", "aplot", "circlize", "dplyr", "edgeR", "ggh4x", "ggplot2", "ggprism", "lefser", "limma", "metagenomeSeq", "patchwork", "readr", "tibble", "tidyr"]
-    },
     "ggpie": {
       "name": "ggpie",
       "version": "0.2.5",
@@ -67461,14 +69939,14 @@
     },
     "ggplate": {
       "name": "ggplate",
-      "version": "0.1.4",
-      "sha256": "0n2c9g6rl5vn5gki43xcc22p8hv2gyj7qr6jdbmllx22ld7zsz43",
+      "version": "0.1.5",
+      "sha256": "15q78hl9fngjx1xyccwzny78rg169zv10fvzl6an9silcgwrw2ak",
       "depends": ["dplyr", "farver", "forcats", "ggplot2", "purrr", "rlang", "scales", "stringr", "tidyr"]
     },
     "ggplot_multistats": {
       "name": "ggplot.multistats",
-      "version": "1.0.0",
-      "sha256": "1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il",
+      "version": "1.0.1",
+      "sha256": "0pffgv7ddwswmiw9nbq907sx2bnwaq88bfiq0gjl2rnqywmh8jpw",
       "depends": ["ggplot2", "hexbin", "rlang", "scales"]
     },
     "ggplot2": {
@@ -67515,8 +69993,8 @@
     },
     "ggpmisc": {
       "name": "ggpmisc",
-      "version": "0.6.0",
-      "sha256": "145w1pbwjdahgs06v8lms3ynpqryrrr4v0h8bgsmaqqkq1hjixmi",
+      "version": "0.6.1",
+      "sha256": "1ipi8dsxql94gk9h020shbvy26arpwjqlmkplyy746vmhkc03ma8",
       "depends": ["MASS", "confintr", "dplyr", "generics", "ggplot2", "ggpp", "lmodel2", "lubridate", "multcomp", "multcompView", "plyr", "polynom", "quantreg", "rlang", "scales", "splus2R", "tibble"]
     },
     "ggpointdensity": {
@@ -67587,8 +70065,8 @@
     },
     "ggragged": {
       "name": "ggragged",
-      "version": "0.1.0",
-      "sha256": "17hpzqslns2y7kpfjpw9lnwzilzshlkbhy69k0ql8k6xs2zaxn9m",
+      "version": "0.2.0",
+      "sha256": "0b97k8cs5v0zlny6spcn4amgvih6px5n6w8lmm8068siah1d1bzy",
       "depends": ["ggplot2", "gtable", "rlang", "vctrs"]
     },
     "ggrain": {
@@ -67623,8 +70101,8 @@
     },
     "ggrcs": {
       "name": "ggrcs",
-      "version": "0.4.0",
-      "sha256": "0zb97wnhlwvi5kd7q20ah5hk3775c7lx7avp32gq5kj0xx7ck647",
+      "version": "0.4.2",
+      "sha256": "16ywi8dgsp000w0869mwrn61lwk3gb40bb0i7yh9i1ch2cyc05v1",
       "depends": ["cowplot", "ggplot2", "rms", "scales"]
     },
     "ggredist": {
@@ -67635,10 +70113,16 @@
     },
     "ggrepel": {
       "name": "ggrepel",
-      "version": "0.9.5",
-      "sha256": "1alcrw304bn6c2i64rxxjkzk3il19gq30gyj3sb4blradkjh1rni",
+      "version": "0.9.6",
+      "sha256": "04kj9qzcws6wfw9pf3s6w4phpqywyv6j617l7907plkpcgd6x2i6",
       "depends": ["Rcpp", "ggplot2", "rlang", "scales", "withr"]
     },
+    "ggreveal": {
+      "name": "ggreveal",
+      "version": "0.1.4",
+      "sha256": "1999p7rkiz8bbq8c83phhdb21qf24x8wqv6g54kcwnmrdlp66w0c",
+      "depends": ["cli", "dplyr", "ggplot2", "ggplotify", "rlang", "stringr", "tidyr"]
+    },
     "ggridges": {
       "name": "ggridges",
       "version": "0.5.6",
@@ -67689,8 +70173,8 @@
     },
     "ggsector": {
       "name": "ggsector",
-      "version": "1.6.6",
-      "sha256": "0qaf8wl1mmwl3razyif08sh329p9j1jgqc0ls5szqirq3db4315i",
+      "version": "1.7.0",
+      "sha256": "0gcmk9gh51gli6dhdczjgj3sblr3ybdr2xm0byq23f8a3znscilj",
       "depends": ["Matrix", "Seurat", "dplyr", "ggplot2", "magrittr", "prettydoc", "rlang", "tibble", "tidyr"]
     },
     "ggseg": {
@@ -67705,6 +70189,12 @@
       "sha256": "1rpq2wgyyladz5nkngkvbf3cy4pw212dj1vfh7ksh0bxi7v1k6mh",
       "depends": ["dplyr", "magrittr", "plotly", "scales", "tidyr"]
     },
+    "ggsem": {
+      "name": "ggsem",
+      "version": "0.1.2",
+      "sha256": "0lyy0rxjdvbskqwx69l0gf5hsl5k69yr15n7hr1hanc329r4flqn",
+      "depends": ["DT", "colourpicker", "ggplot2", "igraph", "lavaan", "shiny", "svglite"]
+    },
     "ggseqlogo": {
       "name": "ggseqlogo",
       "version": "0.2",
@@ -67713,8 +70203,8 @@
     },
     "ggseqplot": {
       "name": "ggseqplot",
-      "version": "0.8.4",
-      "sha256": "0h4v5lxwr8rflxmxrv324axz6m1girib6gdh4p3k5hk48ilglwj0",
+      "version": "0.8.5",
+      "sha256": "012hpnrj921bxc5s2dvjks8iri322lkn21rl87gwgrh23pvhrn83",
       "depends": ["Rdpack", "TraMineR", "cli", "colorspace", "dplyr", "forcats", "ggh4x", "ggplot2", "ggrepel", "ggtext", "glue", "haven", "patchwork", "purrr", "rlang", "tidyr", "usethis"]
     },
     "ggshadow": {
@@ -67743,8 +70233,8 @@
     },
     "ggsoccer": {
       "name": "ggsoccer",
-      "version": "0.1.7",
-      "sha256": "13icxd9w3dfwpjl4yaw0gp09mviwf7xrrfs30z66nga459h6gf1d",
+      "version": "0.2.0",
+      "sha256": "0ps1xr878arwyy0h6py62ibnhrrq3wimqkyay1acxb1pl2dfz26d",
       "depends": ["ggplot2", "rlang"]
     },
     "ggsolvencyii": {
@@ -67773,8 +70263,8 @@
     },
     "ggspectra": {
       "name": "ggspectra",
-      "version": "0.3.12",
-      "sha256": "0kq029w14w3z7qscrasxv289iizcxc7lvkbn5ysiz4jgrvgyc55g",
+      "version": "0.3.14",
+      "sha256": "0yxy06aa6w9hyjk4p6y7d72ypx3kzkj8zak2wbld4avlc457341m",
       "depends": ["ggplot2", "ggrepel", "lubridate", "photobiology", "photobiologyWavebands", "rlang", "scales", "tibble"]
     },
     "ggstance": {
@@ -67791,14 +70281,14 @@
     },
     "ggstats": {
       "name": "ggstats",
-      "version": "0.6.0",
-      "sha256": "103d1d4azdiaf5i2dgr23wrx6svc0aq85axrfj0v2b2lkwial2pq",
-      "depends": ["broom_helpers", "cli", "dplyr", "forcats", "ggplot2", "lifecycle", "magrittr", "patchwork", "purrr", "rlang", "scales", "stringr", "tidyr"]
+      "version": "0.7.0",
+      "sha256": "107rv410scf1nk1gaz6gwwbciv7ni6jlid004wxg3r60j8lcak78",
+      "depends": ["cli", "dplyr", "forcats", "ggplot2", "lifecycle", "patchwork", "purrr", "rlang", "scales", "stringr", "tidyr"]
     },
     "ggstatsplot": {
       "name": "ggstatsplot",
-      "version": "0.12.4",
-      "sha256": "07xv8d5yv08wcrmz6abjcfq9vv8h78axsnhgxgz08iswhb7a377a",
+      "version": "0.13.0",
+      "sha256": "0yzai4zp2m6m13892gsqszhyf27alyylr6cdh9hvipqvhicrpwbv",
       "depends": ["correlation", "datawizard", "dplyr", "ggcorrplot", "ggplot2", "ggrepel", "ggside", "ggsignif", "glue", "insight", "paletteer", "parameters", "patchwork", "performance", "purrr", "rlang", "statsExpressions", "tidyr"]
     },
     "ggstream": {
@@ -67831,6 +70321,18 @@
       "sha256": "0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4",
       "depends": ["ggplot2"]
     },
+    "ggtangle": {
+      "name": "ggtangle",
+      "version": "0.0.6",
+      "sha256": "1q24565y2icr8cs55cni2iyh22mqlk12nll19md96g4r3hbdq0al",
+      "depends": ["ggfun", "ggplot2", "ggrepel", "igraph", "rlang", "yulab_utils"]
+    },
+    "ggtaxplot": {
+      "name": "ggtaxplot",
+      "version": "0.0.1",
+      "sha256": "004kbplbh72a0yg5m130r5pc4963qj7r70xpb9sgy61b6a7cphny",
+      "depends": ["RColorBrewer", "cluster", "dplyr", "ggalluvial", "ggplot2", "magrittr", "rlang", "scales", "tidyr", "tidyverse", "vegan"]
+    },
     "ggtea": {
       "name": "ggtea",
       "version": "0.1.1",
@@ -67909,12 +70411,24 @@
       "sha256": "0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01",
       "depends": []
     },
+    "ggview": {
+      "name": "ggview",
+      "version": "0.2.1",
+      "sha256": "0jdpr4bmw9kzq41h42r1i4ravfvkv65n2xkmqn6gm23bhdwyngmj",
+      "depends": ["ggplot2", "rstudioapi"]
+    },
     "ggvis": {
       "name": "ggvis",
       "version": "0.4.9",
       "sha256": "0bx1bg19l8nfwzwhnn2jn0b0lwcb781l6v9k5zfsx44wg22d3fb9",
       "depends": ["assertthat", "dplyr", "htmltools", "jsonlite", "magrittr", "rlang", "shiny"]
     },
+    "ggvolcano": {
+      "name": "ggvolcano",
+      "version": "0.1.3",
+      "sha256": "1sj5g3gsdk3bi9vvnjmsfx6c68dhg0b4lpsq9ljxsx2xzapmilmm",
+      "depends": ["config", "ggplot2", "ggrepel", "golem", "shiny"]
+    },
     "ggwordcloud": {
       "name": "ggwordcloud",
       "version": "0.6.2",
@@ -67935,8 +70449,8 @@
     },
     "ghapps": {
       "name": "ghapps",
-      "version": "1.1.0",
-      "sha256": "0dv48rd7yw4l927p25x26whh2x2g30b0g4afcx6hzj6mghgg0xyn",
+      "version": "1.1.1",
+      "sha256": "18m4kzz3vhkqbsdgj3k0cywsl7lvf6r6whwsaww480fazx7vwfk5",
       "depends": ["gh", "jose", "openssl"]
     },
     "ghclass": {
@@ -67965,8 +70479,8 @@
     },
     "ghyp": {
       "name": "ghyp",
-      "version": "1.6.4",
-      "sha256": "0964gr8hmqrbg7rwm4hplxfqz2iccpir1dchmnqidkjqj8p9yy1d",
+      "version": "1.6.5",
+      "sha256": "10w3wlr9wk6z4ph2m8qip6bdsr3gg4nl7v5k277zswkyz26fg135",
       "depends": ["MASS", "numDeriv"]
     },
     "ghypernet": {
@@ -68007,8 +70521,8 @@
     },
     "gifski": {
       "name": "gifski",
-      "version": "1.12.0-2",
-      "sha256": "0ybv0fm4p23zfxnyjj97bym09r4brg9z26298ibxzl58j6r624r8",
+      "version": "1.32.0-1",
+      "sha256": "1vak4chf3cxy6dq7i7asxbs6byn6gqwl8iafrfpg12bkc71b4rhb",
       "depends": []
     },
     "gifti": {
@@ -68067,8 +70581,8 @@
     },
     "giscoR": {
       "name": "giscoR",
-      "version": "0.5.1",
-      "sha256": "0j2nqv3l25j39jn6bndj5hafr2k88324jap4zwcx22mxkamb6m8g",
+      "version": "0.6.0",
+      "sha256": "1zdm79h9mxwv72y9s1nznr39zxrpl4jmqyb6b9nc7nnij9w145yf",
       "depends": ["countrycode", "geojsonsf", "jsonlite", "rappdirs", "sf"]
     },
     "gistr": {
@@ -68079,14 +70593,14 @@
     },
     "git2r": {
       "name": "git2r",
-      "version": "0.33.0",
-      "sha256": "158q1rzh9j0xb6l09j6banzvx8l26bhvip2z4lf6ymi21s6vcm8q",
+      "version": "0.35.0",
+      "sha256": "0i76pf7nfdf989fwdhx233kp3qqimqqjhdj4r4jx6yx1bklg06i9",
       "depends": []
     },
     "git2rdata": {
       "name": "git2rdata",
-      "version": "0.4.0",
-      "sha256": "05hr4ks2rdnjhbd5v865r9h6gnw149n5h6nwilw5xfx00gj86b9d",
+      "version": "0.4.1",
+      "sha256": "0vj308ilycfv9jhi6ixk7n3pg6m8dh86rzcjnh78rzrd72fvcg9h",
       "depends": ["assertthat", "git2r", "yaml"]
     },
     "git4r": {
@@ -68139,8 +70653,8 @@
     },
     "gitignore": {
       "name": "gitignore",
-      "version": "0.1.7",
-      "sha256": "047626a31rksyqcxfkvn1rpyv6gbls0b72blaifmy37nhrmwgykz",
+      "version": "0.1.8",
+      "sha256": "0gfh6szw9lycp6z8j5nghfz75lnilschg3n1yk6r6a8g4668k296",
       "depends": ["cli", "clipr", "curl", "glue", "here", "jsonlite", "purrr", "xfun"]
     },
     "gitlabr": {
@@ -68241,8 +70755,8 @@
     },
     "glca": {
       "name": "glca",
-      "version": "1.4.0",
-      "sha256": "13dzv5d7i3nq3866wcx4gccxacbqsshb2nriqsnsgbdrgpwk88h9",
+      "version": "1.4.2",
+      "sha256": "0vvd8m015g5rabpmkmfp20kh15d7ck8aamr9l9mbs2vapqs5k9c7",
       "depends": ["MASS", "Rcpp"]
     },
     "glcm": {
@@ -68283,9 +70797,9 @@
     },
     "gllvm": {
       "name": "gllvm",
-      "version": "1.4.3",
-      "sha256": "1k3yw1flqzj151kqx8wyh54a7crh62ya700x5n4989ngx5071dv3",
-      "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "alabama", "fishMod", "mgcv", "mvabund", "nloptr", "statmod"]
+      "version": "2.0",
+      "sha256": "00pyfylc75aaidk0qq8avls2dzghym7yvkx4xmjna16k9cz5vfl3",
+      "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "alabama", "fishMod", "mgcv", "nloptr", "statmod"]
     },
     "glm_deploy": {
       "name": "glm.deploy",
@@ -68331,8 +70845,8 @@
     },
     "glmertree": {
       "name": "glmertree",
-      "version": "0.2-5",
-      "sha256": "0qwfracqrxs471fmz2rcnaw6kc0b2csldm2n4vfc5jlq1k46fljk",
+      "version": "0.2-6",
+      "sha256": "05kks3wqzw1qn8cy5jnfddnza0vj5hr1q7bx435p1pg7p5dwrdj4",
       "depends": ["Formula", "lme4", "partykit"]
     },
     "glmglrt": {
@@ -68349,14 +70863,14 @@
     },
     "glmm": {
       "name": "glmm",
-      "version": "1.4.4",
-      "sha256": "0v8iill3503piyx3wjxd602hs6hgz9818ipqlvg34963hh4b4ixi",
+      "version": "1.4.5",
+      "sha256": "0wl1ca4brlqp5dn2zi5c49y2i21b22ag88cxzzwb8nx10snlr9p1",
       "depends": ["Matrix", "doParallel", "foreach", "itertools", "mvtnorm", "trust"]
     },
     "glmm_hp": {
       "name": "glmm.hp",
-      "version": "0.1-3",
-      "sha256": "07pqwgqdr2a1mxzh7sca6n0cklic4mmyp3vr6yk0485780ysh0wy",
+      "version": "0.1-7",
+      "sha256": "19kaw7az1b8as136v9drli6fszsv9xl3y9ix90mrp0n71kw8gv4w",
       "depends": ["MuMIn", "ggplot2", "lme4", "vegan"]
     },
     "glmmEP": {
@@ -68373,14 +70887,14 @@
     },
     "glmmML": {
       "name": "glmmML",
-      "version": "1.1.6",
-      "sha256": "0n3r1cpz7rgiighykbjfw1k5s1xgr1vdli960hmaadyy61jza417",
+      "version": "1.1.7",
+      "sha256": "07w6b1i9fkv8dxcmvky81f87ysbrrry3d4jczwkg953g9lankr5j",
       "depends": []
     },
     "glmmPen": {
       "name": "glmmPen",
-      "version": "1.5.4.4",
-      "sha256": "0vmgzmdrhkvlm6z80ia7b195zhspi75ks3ha7jnrayxnrrzfvqxb",
+      "version": "1.5.4.8",
+      "sha256": "1rlwfw54scd0l9n1jisf9dxjddc5fzw8ryakgdxk8k9zs5jzscbd",
       "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "bigmemory", "ggplot2", "lme4", "mvtnorm", "ncvreg", "reshape2", "rstan", "rstantools", "stringr", "survival"]
     },
     "glmmSeq": {
@@ -68391,9 +70905,9 @@
     },
     "glmmTMB": {
       "name": "glmmTMB",
-      "version": "1.1.9",
-      "sha256": "0qw9ww3l506vivs6k8v5cdiv6lf9a32f0d1iq6bizxxh0ywsdmck",
-      "depends": ["Matrix", "RcppEigen", "TMB", "lme4", "mgcv", "nlme", "numDeriv"]
+      "version": "1.1.10",
+      "sha256": "189awpihhy6k677swwss7zcnz6rprmiwmyicc2679p5n8f3ccr7n",
+      "depends": ["Matrix", "RcppEigen", "TMB", "lme4", "mgcv", "nlme", "numDeriv", "reformulas"]
     },
     "glmmfields": {
       "name": "glmmfields",
@@ -68403,14 +70917,14 @@
     },
     "glmmrBase": {
       "name": "glmmrBase",
-      "version": "0.9.2",
-      "sha256": "162lb0zv5xk25adargc064gd7g13a4k8p6p7npzzmppx5235gnp4",
+      "version": "0.11.2",
+      "sha256": "1k31ls4agxq63cpjm2xzk5vls7lqgbpy62kniqq2w1r1banh1784",
       "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppEigen", "RcppParallel", "SparseChol", "StanHeaders", "rstan", "rstantools"]
     },
     "glmmrOptim": {
       "name": "glmmrOptim",
-      "version": "0.3.5",
-      "sha256": "0aic2wc1f1qdj2g9g7zsaz4hckrgpy7w293harpjmq9ll3gxpfcz",
+      "version": "0.3.6",
+      "sha256": "1b9s53lwsn1hymx6rzgd5xjbj7hm5bsf1zrq1s904w74164wr9fj",
       "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppProgress", "SparseChol", "digest", "glmmrBase", "rminqa"]
     },
     "glmnet": {
@@ -68439,8 +70953,8 @@
     },
     "glmnetr": {
       "name": "glmnetr",
-      "version": "0.5-2",
-      "sha256": "1iw9xpai55dyz5k80f469i0czcqsa9ws7j13dcdj6m6nlw6fwiac",
+      "version": "0.5-4",
+      "sha256": "0wd8ga9cabz9alzs6fpvpig9d0m4qlfasi7p7xv19n20hzd2106d",
       "depends": ["DiceKriging", "Matrix", "ParamHelpers", "aorsf", "glmnet", "mlrMBO", "randomForestSRC", "rgenoud", "rpart", "smoof", "survival", "torch", "xgboost"]
     },
     "glmpath": {
@@ -68469,8 +70983,8 @@
     },
     "glmtlp": {
       "name": "glmtlp",
-      "version": "2.0.1",
-      "sha256": "0ax3jhbib75gzp5a2y4nj80qss4qmn65rra8bsnkmwgcn4qg8xja",
+      "version": "2.0.2",
+      "sha256": "1kdjhm29wglpn3xpr10ypx953m4y82ipf2q3qqfqk50k2g0gcy0k",
       "depends": ["doParallel", "foreach", "ggplot2"]
     },
     "glmtoolbox": {
@@ -68505,8 +71019,8 @@
     },
     "glmx": {
       "name": "glmx",
-      "version": "0.2-0",
-      "sha256": "07fgxyfz0jcp4ks2lpnbifjrnik2vwg1c5wl7m3a290rqsnzv5gx",
+      "version": "0.2-1",
+      "sha256": "0mg7m981fvnywm4kv2v4hq9r7y18pjcmhzxy7w7lfi8gak75wcpg",
       "depends": ["Formula", "MASS", "lmtest", "sandwich"]
     },
     "glmxdiag": {
@@ -68517,8 +71031,8 @@
     },
     "globalKinhom": {
       "name": "globalKinhom",
-      "version": "0.1.8",
-      "sha256": "12y9pc78mw5ry7plb86a4af6lycyn177biqcdrxs1s90qx7fmp4b",
+      "version": "0.1.9",
+      "sha256": "0j07vlr8df9amb90cdg09yypz41878nhrbxv5mplyyjj76d8szlq",
       "depends": ["spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_univar"]
     },
     "globalOptTests": {
@@ -68557,6 +71071,12 @@
       "sha256": "15zk11p10v8fmqvmg9gdhxa0h6s5axvmdkxkpwrg8sgp2ln94fr9",
       "depends": ["sandwich", "zoo"]
     },
+    "glossa": {
+      "name": "glossa",
+      "version": "1.0.0",
+      "sha256": "17b9iir51a9vavd3bpg3448wpcmb9ib2kcf08qa29f68xy8fglgz",
+      "depends": ["DT", "GeoThinneR", "bs4Dash", "dbarts", "dplyr", "ggplot2", "htmltools", "jsonlite", "leaflet", "markdown", "mcp", "pROC", "sf", "shiny", "shinyWidgets", "sparkline", "svglite", "terra", "tidyterra", "waiter", "zip"]
+    },
     "glossary": {
       "name": "glossary",
       "version": "1.0.0",
@@ -68577,8 +71097,8 @@
     },
     "glow": {
       "name": "glow",
-      "version": "0.11.0",
-      "sha256": "1q8zci8jv71xzcxsg9b0h04mx11ykpsh4lnvkgg74zfsrf3sib0f",
+      "version": "0.13.0",
+      "sha256": "0hzjvc70syb0n771fnvxayfgjcpqxbp4pm5c9451n519m9j0srk1",
       "depends": ["R6", "Rcpp", "RcppEigen", "RcppParallel", "ggplot2"]
     },
     "glpkAPI": {
@@ -68589,8 +71109,8 @@
     },
     "glue": {
       "name": "glue",
-      "version": "1.7.0",
-      "sha256": "1p4699p68k9f8d76bmgx5xabay6xjrcgajckzqxyn6icym8ipx8s",
+      "version": "1.8.0",
+      "sha256": "183j9gpffmi30lfifl8d9sq1l25f8dgsgqd3blpndf4rm15kcvy8",
       "depends": []
     },
     "gluedown": {
@@ -68691,9 +71211,9 @@
     },
     "gmoTree": {
       "name": "gmoTree",
-      "version": "1.1.0",
-      "sha256": "1f8n3j0rzps3pfi4ps71f6jn51mlnvk3chi5khnfqydz4ifhwal5",
-      "depends": ["data_table", "dplyr", "openxlsx", "plyr", "rlang", "rlist", "stringr"]
+      "version": "1.3.1",
+      "sha256": "13cspi2zz1drwmbki7vjkgrn91606r3zcqwjji3jqp835hyplsvk",
+      "depends": ["data_table", "dplyr", "knitr", "openxlsx", "pander", "plyr", "rlang", "rlist", "rmarkdown", "stringr"]
     },
     "gmodels": {
       "name": "gmodels",
@@ -68703,8 +71223,8 @@
     },
     "gmp": {
       "name": "gmp",
-      "version": "0.7-4",
-      "sha256": "069r0m0jwhwaknnd1vmp3pxcbxrnfgsbhw2ivc8rqqfjfw7v9mm7",
+      "version": "0.7-5",
+      "sha256": "0y6f2fdpydjcf1iz75xnjln3gzwpc1njls0n9y923naczfdazkgm",
       "depends": []
     },
     "gmpoly": {
@@ -68713,6 +71233,12 @@
       "sha256": "0rlmwlxyg9b8gqyrc7mbqv7x86v9pqj51pd847raq7x1smjnz1kg",
       "depends": ["english", "gmp", "mvp", "purrr"]
     },
+    "gmresls": {
+      "name": "gmresls",
+      "version": "0.2.2",
+      "sha256": "1xzry0z02qb54ygvrykq3jyfrrs39zq0as8f54i7sdzx7nryxas3",
+      "depends": []
+    },
     "gms": {
       "name": "gms",
       "version": "0.31.2",
@@ -68733,15 +71259,15 @@
     },
     "gmvarkit": {
       "name": "gmvarkit",
-      "version": "2.1.2",
-      "sha256": "06w822gq2zigynzmqndd3wilqyh1clbx2a52c9x5mg9km4pp95mb",
+      "version": "2.1.3",
+      "sha256": "188xy6kys2l7s5ah2lqww53jpvdnsljd8gkxg6pm29d85ypy6qq8",
       "depends": ["Brobdingnag", "gsl", "mvnfast", "pbapply"]
     },
     "gmvjoint": {
       "name": "gmvjoint",
-      "version": "0.4.0",
-      "sha256": "1gycj6b51irzkv2rg6vvlanaiar8z54pqwd9qswlrw48wk2q074w",
-      "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmmTMB", "mvtnorm", "pracma", "statmod", "survival", "xtable"]
+      "version": "0.4.5",
+      "sha256": "1kalq3w70ixzw7anwbalfnyzxa0vap81bk05b91sk2aw98n36qq1",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "glmmTMB", "mvtnorm", "pracma", "reformulas", "statmod", "survival", "xtable"]
     },
     "gmwmx": {
       "name": "gmwmx",
@@ -68781,8 +71307,8 @@
     },
     "gnonadd": {
       "name": "gnonadd",
-      "version": "1.0.2",
-      "sha256": "1yhh6s5hzvpdy6qrvnjx84basrbvi1r7dcgapwf7g8677c8f5fdb",
+      "version": "1.0.3",
+      "sha256": "00wrqz5qgkbcig39rkygqffk3mj2i476kk6hnvn3fzim6hcnyhzc",
       "depends": ["ggplot2"]
     },
     "gnorm": {
@@ -68833,6 +71359,12 @@
       "sha256": "17bdrn8xsqjz64caa5wdigkv798i18gc2f9jiin1bz840bqn1abg",
       "depends": ["MASS", "R_utils", "SparseGrid", "VineCopula", "copula", "crayon", "doSNOW", "foreach", "numDeriv", "progress", "yarrr"]
     },
+    "gofIG": {
+      "name": "gofIG",
+      "version": "1.0",
+      "sha256": "0243pag8ky7ja78dmcxnkjl5ijkxp4ga3zfiq1aq8zi0w097hkxv",
+      "depends": ["pracma", "rmutil"]
+    },
     "gofar": {
       "name": "gofar",
       "version": "0.1",
@@ -68863,6 +71395,12 @@
       "sha256": "00wda3fandrd1kkm20fb615g5fd0wykk3s0xn0xh9da28q08yh2m",
       "depends": []
     },
+    "gofreg": {
+      "name": "gofreg",
+      "version": "1.0.0",
+      "sha256": "0jy3vb8xm35waqzbj1px5nnm9ld7hdni28qwwciqsxsgpyb1n92z",
+      "depends": ["R6", "checkmate", "dplyr", "ggplot2", "survival"]
+    },
     "goft": {
       "name": "goft",
       "version": "1.3.6",
@@ -68883,14 +71421,14 @@
     },
     "goldfish": {
       "name": "goldfish",
-      "version": "1.6.8",
-      "sha256": "1c49xmn29c1qvx2rmhyvwy5ql2b4zsk4chrv8bni6lwiprib5d9q",
+      "version": "1.6.10",
+      "sha256": "0y6x3zlsgq48kv5mhgcaaczjz8zlf8yvs5z7hgdc8jdzi1dl0vw8",
       "depends": ["Rcpp", "RcppArmadillo", "changepoint", "generics", "ggplot2", "rlang", "tibble"]
     },
     "golem": {
       "name": "golem",
-      "version": "0.4.1",
-      "sha256": "0pcvp2rmwzvl0wi73fp9pmjq1rrknq2h45sfvbjhmbz8ilvr8zpa",
+      "version": "0.5.1",
+      "sha256": "079zjzqvslv8k9pj52xwdhk6a9a8sg0p9wc6s457lz0ircan9ml6",
       "depends": ["attempt", "config", "here", "htmltools", "rlang", "shiny", "yaml"]
     },
     "gomms": {
@@ -68911,12 +71449,6 @@
       "sha256": "0asvpc3nizcn7cqdxr1j9hvhprmrazd8c7a2svhmln4vg9x1zzkp",
       "depends": []
     },
-    "good": {
-      "name": "good",
-      "version": "1.0.2",
-      "sha256": "06lzr8kb0pb5k10md23dlzkzx4qk8ajriwinj4mqhgd51manm3nk",
-      "depends": ["copula", "maxLik", "plyr"]
-    },
     "goodpractice": {
       "name": "goodpractice",
       "version": "1.0.5",
@@ -68935,12 +71467,6 @@
       "sha256": "15ir747qmxdcfqvdpj48famrgd1c2r1l3gfawnv55akqbxdwhmgx",
       "depends": ["assertthat", "cli", "digest", "gargle", "httr", "jsonlite", "memoise", "rlang"]
     },
-    "googleCloudRunner": {
-      "name": "googleCloudRunner",
-      "version": "0.5.0",
-      "sha256": "14nynl56gc8aj03wxbj243fz80j1wxd93ywfaivy1cgyfi3rid6z",
-      "depends": ["assertthat", "cli", "curl", "googleAuthR", "googleCloudStorageR", "googlePubsubR", "httr", "jose", "jsonlite", "openssl", "plumber", "usethis", "withr", "yaml"]
-    },
     "googleCloudStorageR": {
       "name": "googleCloudStorageR",
       "version": "0.7.0",
@@ -68973,9 +71499,9 @@
     },
     "googlePolylines": {
       "name": "googlePolylines",
-      "version": "0.8.4",
-      "sha256": "1qrigccfnv6g2jii2kfdhnxnvx0mjpxq78pg8g8nza33w9lrmrrq",
-      "depends": ["BH", "Rcpp"]
+      "version": "0.8.5",
+      "sha256": "0vhq0cl7zs2gazds6ciwykdhz92ayqyaqhzn4zcxfsfg42gsvxk9",
+      "depends": ["Rcpp"]
     },
     "googlePublicData": {
       "name": "googlePublicData",
@@ -69033,8 +71559,8 @@
     },
     "googletraffic": {
       "name": "googletraffic",
-      "version": "0.1.6",
-      "sha256": "18hk7rg60s8bbr0kn0mi1j7r8iycjfmpnmp88lslzvhq0d1mvaxx",
+      "version": "0.1.7",
+      "sha256": "0zy3dn8rzhdwlxpxmpj8j3m5nzx1hkk733lcvfl6dl7z61n72s7a",
       "depends": ["ColorNameR", "dplyr", "googleway", "htmlwidgets", "plotwidgets", "png", "raster", "schemr", "sf", "sp", "stringr", "webshot2"]
     },
     "googleway": {
@@ -69063,8 +71589,8 @@
     },
     "gosset": {
       "name": "gosset",
-      "version": "1.3",
-      "sha256": "0k50vjfrqqkw9anq012pbq861lnq3ihjh310rp12xyvzbzf6d6c7",
+      "version": "1.4",
+      "sha256": "0gmbjlc4ywcdlxwma9acc91bb9a2lraym5hzjk3kqr1fdfalsrk0",
       "depends": ["BradleyTerry2", "DescTools", "PlackettLuce", "ggparty", "ggplot2", "ggrepel", "partykit", "patchwork", "psychotools", "qvcalc", "tidyr"]
     },
     "gotop": {
@@ -69087,8 +71613,8 @@
     },
     "governor": {
       "name": "governor",
-      "version": "0.1.2",
-      "sha256": "0prvpab34jr59n9j3xqkapwrd51cm00w47dkvi5f6w414791ayzw",
+      "version": "0.1.3",
+      "sha256": "0nm6bdlzm0qbk5pdy77iahq44ya86dkfkabx0hyalprdrn3cbpm2",
       "depends": []
     },
     "govinfoR": {
@@ -69099,14 +71625,14 @@
     },
     "gower": {
       "name": "gower",
-      "version": "1.0.1",
-      "sha256": "1z0mhfp8xp7rk9i820pkvspm6mwih24g6b5rqs63m37sbs79ssi9",
+      "version": "1.0.2",
+      "sha256": "0lap31w6y82z65r5byfpijgrn31lh42ssiwncbakn4r60fjnkmag",
       "depends": []
     },
     "goweragreement": {
       "name": "goweragreement",
-      "version": "1.0",
-      "sha256": "1z0a0z920r51kyq15jkdypyp0hq3vsbhs40vn4gkg5way95zqf85",
+      "version": "1.0-1",
+      "sha256": "0jcnl8snw6chz6hy5a7hnmzsxkzf4hhimrnp3igpg23gl0pgc2yx",
       "depends": []
     },
     "goxygen": {
@@ -69129,20 +71655,26 @@
     },
     "gpbStat": {
       "name": "gpbStat",
-      "version": "0.4.3",
-      "sha256": "07zjc033jazpmax7x96zd5g4z1rz9qmmfwzssl7p3d9ff7aiayvx",
+      "version": "0.4.4",
+      "sha256": "18yzwa07grj5mqhl4y5p4gq9fqi8mrvv8mp886fjw6c3r5s84c6j",
       "depends": ["dplyr", "magrittr", "purrr", "tibble", "tidyr"]
     },
     "gpboost": {
       "name": "gpboost",
-      "version": "1.5.1.1",
-      "sha256": "1qnw64lmiv8yyd69hyxqg7x90y9nxcdbipvb6kzpb34if8x2hqgq",
+      "version": "1.5.5",
+      "sha256": "13gmp546xh233shbf7836jjsa8krfc5pbsh3v8l5qbg87qz86491",
       "depends": ["Matrix", "R6", "RJSONIO", "data_table"]
     },
+    "gpcp": {
+      "name": "gpcp",
+      "version": "0.1.0",
+      "sha256": "17gywg1rs9nbds6zaw6yq6a57ccg8jrw1b161jcp338s86ghgajs",
+      "depends": ["AGHmatrix", "BiocManager", "Rcpp", "RcppArmadillo", "VariantAnnotation", "dplyr", "magrittr", "snpStats", "sommer"]
+    },
     "gpg": {
       "name": "gpg",
-      "version": "1.2.9",
-      "sha256": "0k2f00l400dcxa8akhy48a34w7nhbdmpq3nz6lbwp0cqa7aj678z",
+      "version": "1.3.0",
+      "sha256": "04hnmxvnxligd93vzvp38wpxpyxvqz5qd5084awklim846v3dg03",
       "depends": ["askpass", "curl"]
     },
     "gpindex": {
@@ -69177,8 +71709,8 @@
     },
     "gplots": {
       "name": "gplots",
-      "version": "3.1.3.1",
-      "sha256": "1whs45axg1vp2p3jjya4aq68bl6vp11g059saj2av0vmyaadxq8s",
+      "version": "3.2.0",
+      "sha256": "0isgbzsj0zkbzp5zvcz4nkc70rm33pcvcmfd6jiiqiw7nilirqqj",
       "depends": ["KernSmooth", "caTools", "gtools"]
     },
     "gplsim": {
@@ -69213,8 +71745,8 @@
     },
     "gptoolsStan": {
       "name": "gptoolsStan",
-      "version": "0.1.0",
-      "sha256": "1f2aigkqpmbi8hxcivrbbfrpl3qs8fi2hcbvmcdc3k7j6znv4al3",
+      "version": "0.2.0",
+      "sha256": "1cdvfy451grnyzplivzfndmfaxhr1g81z8nr12rqr35sxnk03s2z",
       "depends": []
     },
     "gptr": {
@@ -69427,16 +71959,22 @@
       "sha256": "1zrnwh86jv37z07b6l1i94dgjn8k3b3a3f76gfjsyyxvlc64i76x",
       "depends": ["dplyr", "googlePolylines", "httr", "jsonlite", "magrittr", "tibble"]
     },
+    "graphicalEvidence": {
+      "name": "graphicalEvidence",
+      "version": "1.1",
+      "sha256": "123zqij3rhc4jwms9jgv8vnw6ib37r84d848kk7iyr3aavbb7rq9",
+      "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "mvtnorm"]
+    },
     "graphicalExtremes": {
       "name": "graphicalExtremes",
-      "version": "0.3.2",
-      "sha256": "18gyfynx9rd06168vv1qxa8hg7ibwv0h2mx1ppizrnrl7ciwwis1",
-      "depends": ["CVXR", "Rdpack", "corpcor", "edmcr", "glassoFast", "glmnet", "igraph", "mvtnorm", "osqp"]
+      "version": "0.3.3",
+      "sha256": "11g036kbh3qr76irvsk126jbqha4miyzk0627s6cscdipvshr5cl",
+      "depends": ["CVXR", "Rdpack", "corpcor", "glassoFast", "glmnet", "igraph", "mvtnorm", "osqp"]
     },
     "graphicalMCP": {
       "name": "graphicalMCP",
-      "version": "0.2.5",
-      "sha256": "0bs4d1fz6l2rwssh8wq5sakkl478lr6vsx6lb1jz8qnryk6cb3wy",
+      "version": "0.2.6",
+      "sha256": "1ffhxifncj5v4fm0kkfdnl3qgg9g13xy9kih6sf5rhiww3cs4haz",
       "depends": ["matrixStats", "mvtnorm"]
     },
     "graphicalVAR": {
@@ -69453,8 +71991,8 @@
     },
     "graphlayouts": {
       "name": "graphlayouts",
-      "version": "1.1.1",
-      "sha256": "009q5y46lbizdabbb6a61xlfa3g5lf3nd9w42709lcxi0ad4bhkv",
+      "version": "1.2.1",
+      "sha256": "11izxd744jvsbvfwbyng5g1nzid8zvz1hry4har1gsg8z8l21yjd",
       "depends": ["Rcpp", "RcppArmadillo", "igraph"]
     },
     "graphon": {
@@ -69465,8 +72003,8 @@
     },
     "graphql": {
       "name": "graphql",
-      "version": "1.5.1",
-      "sha256": "10zpibqh1vsin60pl5dnk4z2kzrfc3aqrhijcn36zq7f97629wv8",
+      "version": "1.5.2",
+      "sha256": "0b9j7hv45ml7xl29w7s2m63qc96rm6v746yy6ckpz25y1zv3j2aq",
       "depends": ["Rcpp", "jsonlite"]
     },
     "graphsim": {
@@ -69483,21 +72021,21 @@
     },
     "grateful": {
       "name": "grateful",
-      "version": "0.2.4",
-      "sha256": "0g1xn8chm4if31xfd012w6zj6gl7s19yifp1pyp6v0frpslcks4b",
+      "version": "0.2.10",
+      "sha256": "02flwjchvqr7wx5rsbiq3l8pgkmg6anw30piydnw0dsp5pmxrq1b",
       "depends": ["knitr", "remotes", "renv", "rmarkdown", "rstudioapi"]
     },
     "grates": {
       "name": "grates",
-      "version": "1.2.1",
-      "sha256": "1sqvrjyv8ncls9nvhfw6y4nyfdc349n8hyrmnfbqlm2rdhgnf6qr",
+      "version": "1.3.0",
+      "sha256": "1xglxba5i31hmam49mvklp17vwzagqc0gj05v61aq48ay0kj7pbv",
       "depends": []
     },
     "gratia": {
       "name": "gratia",
-      "version": "0.9.2",
-      "sha256": "0jjjncs5c3zd3jlxk5ywkg31lhxafdj5b58k664yd29193f2w3m0",
-      "depends": ["cli", "dplyr", "ggokabeito", "ggplot2", "lifecycle", "mgcv", "mvnfast", "nlme", "patchwork", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "withr"]
+      "version": "0.10.0",
+      "sha256": "1b5qkjmip4sb64q65d7pw1cjhb2npvkh0q21a072jkra009lzaih",
+      "depends": ["cli", "dplyr", "ggokabeito", "ggplot2", "lifecycle", "mgcv", "mvnfast", "nlme", "patchwork", "pillar", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "withr"]
     },
     "graticule": {
       "name": "graticule",
@@ -69519,8 +72057,8 @@
     },
     "grattanInflators": {
       "name": "grattanInflators",
-      "version": "0.5.3",
-      "sha256": "1pky7gi9rwxggzv2rhqjkzlql16xs506ba0yhqy1dqs219k1dvwd",
+      "version": "0.5.4",
+      "sha256": "1mls2pnnds5c2ys5wsiki0xrwcn9l4bfpl785817cbfw61rwwi3h",
       "depends": ["data_table", "fy", "hutils"]
     },
     "gravitas": {
@@ -69561,14 +72099,14 @@
     },
     "greekLetters": {
       "name": "greekLetters",
-      "version": "1.0.2",
-      "sha256": "0c52lfpm0awd3hc6ggnjqz5ymcbbm74qlj9iznkd5gln85q29vqc",
+      "version": "1.0.4",
+      "sha256": "1bsdxzfz8ipa4c8xl2gjjymy20skqf5x52lqkn5wyxiln3dyx3vn",
       "depends": ["assertthat", "stringr"]
     },
     "greeks": {
       "name": "greeks",
-      "version": "1.4.2",
-      "sha256": "11ps312r6nhda5a2d7mjxzjnlvfj2kz31hyvnfngfpwdg3ndw1hr",
+      "version": "1.4.3",
+      "sha256": "0vhb3k3fs57kx24bh3dnk3qgzrvn4qxnqakb2g8h1ah22i0qnvcs",
       "depends": ["Rcpp", "dqrng", "ggplot2", "magrittr", "plotly", "shiny", "tibble", "tidyr"]
     },
     "greenclust": {
@@ -69583,6 +72121,12 @@
       "sha256": "11lrbjm91m2lbgr0wdy84mal4qxs9x0bmniaijxpw9fdwrkqq0aw",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"]
     },
+    "greenfeedr": {
+      "name": "greenfeedr",
+      "version": "1.0.1",
+      "sha256": "075kv3ir9pffsx6asxq73laniyx2rz02i4rd73x5vv4sy64vrvb1",
+      "depends": ["dplyr", "ggplot2", "httr", "lubridate", "purrr", "readr", "readxl", "rmarkdown", "stringr", "tidyr"]
+    },
     "gregRy": {
       "name": "gregRy",
       "version": "0.1.0",
@@ -69591,8 +72135,8 @@
     },
     "gremlin": {
       "name": "gremlin",
-      "version": "1.0.1",
-      "sha256": "1pi1bksxmjmzclppgbqqg93swf4d72d2mr8bsxv7ndcdjr69xd5r",
+      "version": "1.1.0",
+      "sha256": "164rql775rhfri3ih188lci4lwi5lzykdxhz3lypfvf5mr588ic9",
       "depends": ["Matrix", "nlme"]
     },
     "greport": {
@@ -69603,21 +72147,33 @@
     },
     "greta": {
       "name": "greta",
-      "version": "0.4.5",
-      "sha256": "0ky2d0i2s768na50940b733rr1fmmbpkdw1a8r21wbr5h43n8xf2",
-      "depends": ["R6", "abind", "callr", "cli", "coda", "future", "glue", "parallelly", "progress", "reticulate", "tensorflow", "yesno"]
+      "version": "0.5.0",
+      "sha256": "01cpa5125h0a9hxqrccfbsxkqvv8y4bdw0fgn43gyfgns90g3g8h",
+      "depends": ["R6", "abind", "callr", "cli", "coda", "future", "glue", "parallelly", "progress", "reticulate", "rlang", "tensorflow", "whisker", "yesno"]
+    },
+    "greta_censored": {
+      "name": "greta.censored",
+      "version": "0.1.0",
+      "sha256": "0j4bfbwsx0hrm6ni64wzmj6sb2696cbn1g9yyp0d69xa41da5194",
+      "depends": ["glue", "greta", "reticulate", "tensorflow"]
     },
     "greta_dynamics": {
       "name": "greta.dynamics",
+      "version": "0.2.2",
+      "sha256": "0pv74j4j0ggad5akv318bmc14vjgx4fqw3p8dsdi4447ks5z68l7",
+      "depends": ["cli", "glue", "greta", "rlang", "tensorflow"]
+    },
+    "greta_gam": {
+      "name": "greta.gam",
       "version": "0.2.0",
-      "sha256": "143ixhi2hxxgb10lp9c8b2xdp63rpbhqbxzbbbzhigf9aflpmh62",
-      "depends": ["cli", "glue", "greta", "tensorflow"]
+      "sha256": "1071pi8pzxjgi9gk7hgm7pln2196lg2xhvh76aqcc7fzgvr3444j",
+      "depends": ["cli", "greta", "mgcv", "rlang"]
     },
     "greta_gp": {
       "name": "greta.gp",
-      "version": "0.2.1",
-      "sha256": "0r33lbg9zjgq4pkzllr9vadfk8jm24avf68dnhm1n5j5ahzpc242",
-      "depends": ["cli", "glue", "greta", "tensorflow"]
+      "version": "0.2.2",
+      "sha256": "0mfz958yinhnddai9k3hsg2zb20b1v8csxxfw2q3fgfqz7p2y3i1",
+      "depends": ["cli", "glue", "greta", "rlang", "tensorflow"]
     },
     "gretel": {
       "name": "gretel",
@@ -69639,14 +72195,14 @@
     },
     "greybox": {
       "name": "greybox",
-      "version": "2.0.1",
-      "sha256": "053id2kd7q4ydxlrg6yi39y72idicp0cjgrhvmnwyv6zh2jd3ahk",
+      "version": "2.0.3",
+      "sha256": "0mykacbfj27ms7q89nqhisyvdrxkd0h1xiq8x7v64xvvkmp19nzn",
       "depends": ["Rcpp", "generics", "nloptr", "pracma", "statmod", "texreg", "xtable", "zoo"]
     },
     "grf": {
       "name": "grf",
-      "version": "2.3.2",
-      "sha256": "0za2c9hlvp1s2h25vr6f0qlw92r9wp0vbmfdsp38q190drpjnff0",
+      "version": "2.4.0",
+      "sha256": "1ibb2ylqrvgji899sraywklsq63i65y7hvm4km7hwblxgarbjgxm",
       "depends": ["DiceKriging", "Matrix", "Rcpp", "RcppEigen", "lmtest", "sandwich"]
     },
     "gridBase": {
@@ -69675,8 +72231,8 @@
     },
     "gridGeometry": {
       "name": "gridGeometry",
-      "version": "0.3-0",
-      "sha256": "0x2b993ffqp8hk0sml6yhmpzy89inv4cjr7f2j60m5jlk55zvx55",
+      "version": "0.4-0",
+      "sha256": "1j19bwkc33r85xkc9vlphyyq3w8gwfigjkifikl7yi216fhgfrgr",
       "depends": ["polyclip"]
     },
     "gridGraphics": {
@@ -69759,8 +72315,8 @@
     },
     "groc": {
       "name": "groc",
-      "version": "1.0.9",
-      "sha256": "19ki9i9w0lfbcf9h7fff6vkav74ixmazn1k8lqcirplidhs0r23j",
+      "version": "1.0.10",
+      "sha256": "1q95j7yp8iv1545gqgkq139i08ky5ga32krkr1vy67j3qs4zkiwm",
       "depends": ["MASS", "mgcv", "pls", "robustbase", "rrcov"]
     },
     "gromovlab": {
@@ -69769,10 +72325,16 @@
       "sha256": "0mm303iiaqfdvr94x765dbd1018cvvl0q4z2zppwk1aif0kb53x8",
       "depends": ["ape", "cluster", "glpkAPI", "igraph", "quadprog"]
     },
+    "groqR": {
+      "name": "groqR",
+      "version": "0.0.1",
+      "sha256": "0q03yad36mlrm8yqavdssb9h55vphxnb3vp6kman78nm2nkf6zmq",
+      "depends": ["clipr", "httr", "jsonlite", "miniUI", "rstudioapi", "shiny", "shinyWidgets"]
+    },
     "groundhog": {
       "name": "groundhog",
-      "version": "3.2.0",
-      "sha256": "1pswzqn15dz4b0s2a79pi5y45jn1l3amsn3qpfm47nmb80dynfgh",
+      "version": "3.2.1",
+      "sha256": "00lp733avwjxap5drc3p3763y4xhhphlck7zp7g5cijcbga4k54s",
       "depends": []
     },
     "groupICA": {
@@ -69795,8 +72357,8 @@
     },
     "groupdata2": {
       "name": "groupdata2",
-      "version": "2.0.3",
-      "sha256": "0r126mq7cyc19nizyh8xk5a0pfi1sic8lxfvnlmhhhbpn97lqyqz",
+      "version": "2.0.5",
+      "sha256": "0zq8np8h652z04zhzzf8vb6gglpjw4jws4h0f1sa5x9j18690ciz",
       "depends": ["checkmate", "dplyr", "lifecycle", "numbers", "plyr", "purrr", "rearrr", "rlang", "tibble", "tidyr"]
     },
     "groupedSurv": {
@@ -69903,20 +72465,20 @@
     },
     "grpnet": {
       "name": "grpnet",
-      "version": "0.5",
-      "sha256": "131g08gwvsiaxlsz7ihrhd6n33rjjczh72fh9wfa2ibc247g48w5",
+      "version": "0.6",
+      "sha256": "0ivkk669ycgghmbqzbkg6nz94y9gicixnyxd0np4bmrv62knz1h2",
       "depends": []
     },
     "grpreg": {
       "name": "grpreg",
-      "version": "3.4.0",
-      "sha256": "1bfnahkb249996m3qmf96g4ldgnw7xfcm2wr45ccrlk3mw5x4mzx",
+      "version": "3.5.0",
+      "sha256": "0344k07xy64byfp01qkp5fmwykl8nflz2l6zkk613f8bxqd342qn",
       "depends": ["Matrix"]
     },
     "grpsel": {
       "name": "grpsel",
-      "version": "1.3.1",
-      "sha256": "0b901si4xm6306mzfk3nmwg2h8pk9rhvv2m08v3qnbnxaw06my2h",
+      "version": "1.3.2",
+      "sha256": "1jcf1h3jbczin6qxjs9f1yjbm83rlkih23zgfj2j0yxhxk9b7vfj",
       "depends": ["Rcpp", "RcppArmadillo", "ggplot2"]
     },
     "grpseq": {
@@ -69945,14 +72507,14 @@
     },
     "gsDesign": {
       "name": "gsDesign",
-      "version": "3.6.4",
-      "sha256": "1lknw7n2zd9mfr13lyn9ny3d0lgla56hkdvqmgmvkjsv19jpaq5r",
+      "version": "3.6.5",
+      "sha256": "02rc0b69ay7gr3s91kqfy56n5laxxdirj61krll3p074123j9a65",
       "depends": ["dplyr", "ggplot2", "gt", "magrittr", "r2rtf", "rlang", "tibble", "tidyr", "xtable"]
     },
     "gsDesign2": {
       "name": "gsDesign2",
-      "version": "1.1.2",
-      "sha256": "0kyj5pv5cr8ljbhzsly70115czhgx5wrpcgpd0jvv2djjf21klh2",
+      "version": "1.1.3",
+      "sha256": "11bd2l0vi1xa8hx59i543csqyphmqbg2jax9gcsjrgjfn2pjm2cm",
       "depends": ["Rcpp", "corpcor", "data_table", "dplyr", "gsDesign", "gt", "mvtnorm", "npsurvSS", "r2rtf", "survival", "tibble", "tidyr"]
     },
     "gsEasy": {
@@ -70011,14 +72573,14 @@
     },
     "gsheet": {
       "name": "gsheet",
-      "version": "0.4.5",
-      "sha256": "0b8q44cqkjfy6vnffm94czq4ag8xfbxik52026ahq95kcf9v2j91",
+      "version": "0.4.6",
+      "sha256": "19xcqaqxs6220zs1ajmi8j9i8pwxfk1dl3klz2w3051bdsh8byk1",
       "depends": ["httr", "stringr"]
     },
     "gsignal": {
       "name": "gsignal",
-      "version": "0.3-5",
-      "sha256": "0qyb8p8vg7sfx6kgib03lwidxh9my669asbjwvbpwzxd4sb51gsf",
+      "version": "0.3-7",
+      "sha256": "1chkzv3bx1nas1yc6l5i3hgc8m40n1lm1y3c8577l8sqi89hnhs3",
       "depends": ["Rcpp", "pracma"]
     },
     "gsisdecoder": {
@@ -70077,8 +72639,8 @@
     },
     "gss": {
       "name": "gss",
-      "version": "2.2-7",
-      "sha256": "0siz9xmfiirkg8sb0amzyp7k1mjbgz8jmsmlc8schw65093i84rv",
+      "version": "2.2-8",
+      "sha256": "0kkfwzkdabn109lnnlbjjc21q69z5wy65j89003mmzxlvbi2q6xk",
       "depends": []
     },
     "gstar": {
@@ -70089,8 +72651,8 @@
     },
     "gstat": {
       "name": "gstat",
-      "version": "2.1-1",
-      "sha256": "09ax28di93r4r334qwdp84i95809lkr6587w4xlgpvsma7k0bcj8",
+      "version": "2.1-2",
+      "sha256": "1zvfljlpgvydvjhdhyc9g8c39a3ba347l8hvc6nv27j0w7kyplr6",
       "depends": ["FNN", "lattice", "sf", "sftime", "sp", "spacetime", "stars", "zoo"]
     },
     "gstsm": {
@@ -70107,8 +72669,8 @@
     },
     "gsw": {
       "name": "gsw",
-      "version": "1.1-1",
-      "sha256": "10nxyi1kqq9ypincpr347iqixfz17nd69g7ikhyid1djqfy1v8nj",
+      "version": "1.2-0",
+      "sha256": "08lmw719mhdzg4g8384y3fbhm6lx8a1hzz5zdlfqq5xv3n4s974z",
       "depends": []
     },
     "gsynth": {
@@ -70119,8 +72681,8 @@
     },
     "gt": {
       "name": "gt",
-      "version": "0.11.0",
-      "sha256": "1jg9kg2b1qig1awfgnb5fi54qjmvl2qw1ny0l4vsqh87c2f3yij3",
+      "version": "0.11.1",
+      "sha256": "0njzpj57afvbi7jsbpb0j1mgm1nz01bd25668gsmvpd7lajm7ig0",
       "depends": ["base64enc", "bigD", "bitops", "cli", "commonmark", "dplyr", "fs", "glue", "htmltools", "htmlwidgets", "juicyjuice", "magrittr", "markdown", "reactable", "rlang", "sass", "scales", "tidyselect", "vctrs", "xml2"]
     },
     "gt4ireval": {
@@ -70143,8 +72705,8 @@
     },
     "gtable": {
       "name": "gtable",
-      "version": "0.3.5",
-      "sha256": "0wpavsypw2yp0pklmqw0qcwsh8smx5gr2kkxmgdmm52r0fiw37xi",
+      "version": "0.3.6",
+      "sha256": "1vz0kpj1hh3iz27yaax4i3l9n018py455p4f5nfn92r727xaa1fk",
       "depends": ["cli", "glue", "lifecycle", "rlang"]
     },
     "gte": {
@@ -70153,6 +72715,12 @@
       "sha256": "0fnrpgfji5f1n8nra0d8xghqgsjil7r2j6xnbmfm7mjafcav4wwk",
       "depends": ["survival"]
     },
+    "gtexr": {
+      "name": "gtexr",
+      "version": "0.1.0",
+      "sha256": "18g7138mzr4hk5h6k13zkc3vy7pmidva0vplfd6vbgqbm9p79yf8",
+      "depends": ["cli", "dplyr", "httr2", "purrr", "rlang", "tibble", "tidyr"]
+    },
     "gtexture": {
       "name": "gtexture",
       "version": "1.0.0",
@@ -70161,33 +72729,33 @@
     },
     "gtfs2emis": {
       "name": "gtfs2emis",
-      "version": "0.1.0",
-      "sha256": "1nh3m57xhh12sm18d5lvf0i9z4ayn6kgbmp036lw89wz10s42w6z",
+      "version": "0.1.1",
+      "sha256": "1vz0kfycv3fgcm5bhbdn9hg3ls4pr1n88r1lhmy2fq9hwp8djgc6",
       "depends": ["checkmate", "data_table", "furrr", "future", "gtfs2gps", "sf", "sfheaders", "terra", "units"]
     },
     "gtfs2gps": {
       "name": "gtfs2gps",
-      "version": "2.1-1",
-      "sha256": "0k65iy7armdn13bs31wr6gq7hdxpz5nqqzpdxpm5g1mkxwc9fi1g",
+      "version": "2.1-2",
+      "sha256": "0g1mklndk3y49h1ydxmzrmiz2098k1w4b053b6dcr8dsj2gga8wr",
       "depends": ["Rcpp", "checkmate", "data_table", "furrr", "future", "gtfstools", "lwgeom", "progressr", "sf", "sfheaders", "terra", "units"]
     },
     "gtfsio": {
       "name": "gtfsio",
-      "version": "1.1.1",
-      "sha256": "06kw2r00y277a822qqgjifmrz0l6gfq1dx8znrc2yhrk0ynadsjz",
-      "depends": ["data_table", "zip"]
+      "version": "1.2.0",
+      "sha256": "0dzmlq7x8zlvljfgyj5hs7f7ivgml0j4j9fl6zkdbg3dqwmrrysb",
+      "depends": ["data_table", "fs", "jsonlite", "zip"]
     },
     "gtfsrouter": {
       "name": "gtfsrouter",
-      "version": "0.1.2",
-      "sha256": "1v8b3yr7c7yaavy3ivj7ik2hmbdyjasmkxkbrs3f943m9fbkngwi",
-      "depends": ["Rcpp", "cli", "data_table", "geodist"]
+      "version": "0.1.3",
+      "sha256": "02vgx456z8d3yf5lklf7cddypkpxqxyv745xlax7y2fkanbinh3v",
+      "depends": ["Rcpp", "cli", "data_table", "fs", "geodist"]
     },
     "gtfstools": {
       "name": "gtfstools",
-      "version": "1.2.0",
-      "sha256": "03gc784dvskvg8m0fcqc966ka0slnh10in5gk7bba8h7lnfb893w",
-      "depends": ["checkmate", "cpp11", "curl", "data_table", "gtfsio", "processx", "sf", "sfheaders", "units", "zip"]
+      "version": "1.3.0",
+      "sha256": "1gdizd3lkli60jkkfs7xd7yak8nc4w9sy21sjikdxbhh3xwks775",
+      "depends": ["checkmate", "cli", "curl", "data_table", "gtfsio", "parallelly", "processx", "sf", "sfheaders", "units", "zip"]
     },
     "gtheory": {
       "name": "gtheory",
@@ -70197,8 +72765,8 @@
     },
     "gto": {
       "name": "gto",
-      "version": "0.1.1",
-      "sha256": "111jla0acxpb749ncr77lnbxk7hmsv8syin1p2cs1d1fr2jxkzs1",
+      "version": "0.1.2",
+      "sha256": "0j8yflfibqa9lypvblb6l25wmwfi5mypr20gp7fqy5hadaliy3d6",
       "depends": ["gt", "magrittr", "officer", "rlang", "xml2"]
     },
     "gtools": {
@@ -70227,8 +72795,8 @@
     },
     "gtsummary": {
       "name": "gtsummary",
-      "version": "2.0.1",
-      "sha256": "13p3ii63whd0vgx5lnvdaqhmi6if492r9x2v769vnck2dzpsrjbp",
+      "version": "2.0.4",
+      "sha256": "1vh9lffll6l1d6wbzhmci9zy9m6kq6wbnc8x4ydplagr5nigdh05",
       "depends": ["cards", "cli", "dplyr", "glue", "gt", "lifecycle", "rlang", "tidyr", "vctrs"]
     },
     "guaguas": {
@@ -70281,8 +72849,8 @@
     },
     "gumbel": {
       "name": "gumbel",
-      "version": "1.10-2",
-      "sha256": "0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij",
+      "version": "1.10-3",
+      "sha256": "1ifvr284h1pwg2883qhzwi4a52l8sgdji1hk6la1h509aw2agv74",
       "depends": []
     },
     "gumboot": {
@@ -70323,9 +72891,9 @@
     },
     "gvcR": {
       "name": "gvcR",
-      "version": "0.1.0",
-      "sha256": "0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8",
-      "depends": ["dplyr", "eda4treeR", "lme4", "magrittr"]
+      "version": "0.4.0",
+      "sha256": "1gp13980yqfyqgjj19445vyva2769wsa1kfq7h7y366g4knygnlp",
+      "depends": ["R6", "dplyr", "eda4treeR", "lme4", "magrittr", "rlang", "supernova", "tibble"]
     },
     "gvlma": {
       "name": "gvlma",
@@ -70353,9 +72921,9 @@
     },
     "gwavr": {
       "name": "gwavr",
-      "version": "0.3.1",
-      "sha256": "1hr1d66n5xf7ppmag70lzdnwp3m2jcs1qmh1nzrqq0nbqmqg8nck",
-      "depends": ["dplyr", "elevatr", "htmlwidgets", "httr", "jsonlite", "leaflet", "leaflet_extras", "miniUI", "nhdplusTools", "promises", "purrr", "scales", "sf", "shiny", "shinyWidgets", "terra", "tidyr", "units", "whitebox"]
+      "version": "0.3.2",
+      "sha256": "1275whdsnrjn14r4ir25g6lkqsg4czaragxjalj2n65y7dps7az7",
+      "depends": ["dplyr", "elevatr", "htmlwidgets", "httr", "jsonlite", "leaflet", "leaflet_extras", "miniUI", "nhdplusTools", "promises", "purrr", "rlang", "scales", "sf", "shiny", "shinyWidgets", "terra", "tidyr", "units", "whitebox"]
     },
     "gwbr": {
       "name": "gwbr",
@@ -70365,8 +72933,8 @@
     },
     "gwid": {
       "name": "gwid",
-      "version": "0.2.0",
-      "sha256": "1qkj6773ywm3mxry9d9yzf2m52dcmjg5h5031h48x6gpg4qjf1k2",
+      "version": "0.3.0",
+      "sha256": "1rkq7pzqinsrjbidmjyjfkcwm2hldk8fnmkp4s222xlbj230ybwv",
       "depends": ["Matrix", "RcppRoll", "SNPRelate", "data_table", "gdsfmt", "ggplot2", "lattice", "piggyback", "plotly", "shiny"]
     },
     "gwpcormapper": {
@@ -70437,14 +73005,14 @@
     },
     "h3lib": {
       "name": "h3lib",
-      "version": "0.1.3",
-      "sha256": "1zrda5g2b50iz6qxk1dz18dnanp1dr6d5wldiwh1ap5qclz7w9b4",
+      "version": "0.1.4",
+      "sha256": "193df3bzbydj85a0mwza3jd59391nglqrzyy599qz5qd3fh5y16l",
       "depends": []
     },
     "h3r": {
       "name": "h3r",
-      "version": "0.1.1",
-      "sha256": "0i4k66092aqj32snh94pifhml95md2f03y698zvzscl8bgxwlra7",
+      "version": "0.1.2",
+      "sha256": "09z588pnpmz3isxdnkfwjm0645546fvldfnm6zcbfn2blp80xld2",
       "depends": ["h3lib"]
     },
     "hBayesDM": {
@@ -70503,8 +73071,8 @@
     },
     "habtools": {
       "name": "habtools",
-      "version": "1.0.5",
-      "sha256": "1y0pjx16272dknmp2lpc69fmj5h4s4hsl2kchlrcwxpdyfyz7yb2",
+      "version": "1.0.7",
+      "sha256": "1283ng0ypn6b9smi9jca04sl4s4xrsap76rx7w4inc7vfi2h2xvj",
       "depends": ["Rvcg", "concaveman", "dplyr", "geometry", "magrittr", "purrr", "raster", "sp", "terra"]
     },
     "hackeRnews": {
@@ -70593,9 +73161,21 @@
     },
     "handwriter": {
       "name": "handwriter",
-      "version": "3.1.1",
-      "sha256": "1gwxp5nsw38f368z586hixk4i7b87vg0fcmxxdl2zldawv1sx0v9",
-      "depends": ["Rcpp", "RcppArmadillo", "Rfast", "doParallel", "dplyr", "foreach", "ggplot2", "igraph", "lpSolve", "magick", "mc2d", "png", "purrr", "reshape2", "rjags", "stringr", "tidyr"]
+      "version": "3.2.3",
+      "sha256": "1b17w22sc71h9gn20lvfwzh0i4jb58rg5vlzcjj82c2phz05cpxa",
+      "depends": ["Rcpp", "RcppArmadillo", "Rfast", "doParallel", "dplyr", "foreach", "ggplot2", "igraph", "lpSolve", "magick", "mc2d", "png", "purrr", "reshape2", "rjags", "stringr", "tidyr", "tidyselect"]
+    },
+    "handwriterApp": {
+      "name": "handwriterApp",
+      "version": "2.0.0",
+      "sha256": "19b5vki2l9hj8s20bymfcjjiliflk31qxhg91x9yd3b9ri1fiz65",
+      "depends": ["bslib", "dplyr", "ggplot2", "handwriter", "handwriterRF", "magick", "magrittr", "rmarkdown", "shiny", "shinyFiles", "shinycssloaders", "shinyjs", "stringr", "tidyr"]
+    },
+    "handwriterRF": {
+      "name": "handwriterRF",
+      "version": "1.0.2",
+      "sha256": "1a3q74kjgzfriikk739sib7jmzq0dgvab0l5k4wh4xyb4z0s1z99",
+      "depends": ["dplyr", "handwriter", "magrittr", "purrr", "ranger", "reshape2", "tidyr", "tidyselect"]
     },
     "handyFunctions": {
       "name": "handyFunctions",
@@ -70615,12 +73195,6 @@
       "sha256": "0hh2nlzxs2kj93yb7yfm873m6nymjw5qmkin3qqn3acza6dr0k6q",
       "depends": ["Rcpp"]
     },
-    "hansard": {
-      "name": "hansard",
-      "version": "0.8.0",
-      "sha256": "00mcy58nhlphb0v0wchbaw1qamm0435s09nxxw6rr5z872rhyf5a",
-      "depends": ["dplyr", "jsonlite", "lubridate", "snakecase", "tibble", "tidyr"]
-    },
     "hapassoc": {
       "name": "hapassoc",
       "version": "1.2-9",
@@ -70635,8 +73209,8 @@
     },
     "haplo_stats": {
       "name": "haplo.stats",
-      "version": "1.9.5.1",
-      "sha256": "1fcnyglmz9ia6zpk0vvmjqiwxlpal58rksgb1yvrajqgylw3kbsy",
+      "version": "1.9.7",
+      "sha256": "1h6r6ddhff75n9brh1pxpqc0s7xn36ly1c3nhlnjipy0k77kxdrg",
       "depends": ["arsenal", "rms"]
     },
     "haploR": {
@@ -70659,9 +73233,9 @@
     },
     "happign": {
       "name": "happign",
-      "version": "0.3.0",
-      "sha256": "0mg3w5djg0hg8x1826kqj3b75zyhibcpxrh5sp6w17pmamfif9a4",
-      "depends": ["archive", "dplyr", "httr2", "jsonlite", "sf", "terra", "xml2"]
+      "version": "0.3.1",
+      "sha256": "05lcl8r63f8rjzjs8bgl3n97lh73hnwaw7r4i0hz4qc68fxggn1r",
+      "depends": ["archive", "dplyr", "httr2", "jsonlite", "sf", "terra", "xml2", "yyjsonr"]
     },
     "happytime": {
       "name": "happytime",
@@ -70677,8 +73251,8 @@
     },
     "harbinger": {
       "name": "harbinger",
-      "version": "1.0.787",
-      "sha256": "0ibmcwxlcdw4k7xd0bdnixz5fbnc6avj6jg7sd9ij5kir82xi03f",
+      "version": "1.1.707",
+      "sha256": "0vvqfdb8f5ly75c5a1fbalir7142l7qrb07zbvc0387w9b9fpmfs",
       "depends": ["changepoint", "daltoolbox", "dplyr", "dtwclust", "forecast", "ggplot2", "hht", "rugarch", "stringr", "strucchange", "tsmp", "wavelets", "zoo"]
     },
     "hardhat": {
@@ -70701,8 +73275,8 @@
     },
     "harmony": {
       "name": "harmony",
-      "version": "1.2.0",
-      "sha256": "1df7bb9ba3m0c44fhmh8cs4hlkh4fffjwm8rz7l87lf5pdy7sg56",
+      "version": "1.2.3",
+      "sha256": "1pdxdfk6xcaza66ibilspsn3db9w9kxf73dl5dmp59k00amibf4s",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "RhpcBLASctl", "cowplot", "dplyr", "ggplot2", "rlang", "tibble"]
     },
     "harmonydata": {
@@ -70779,8 +73353,8 @@
     },
     "hbamr": {
       "name": "hbamr",
-      "version": "2.3.1",
-      "sha256": "1cch2l4dazny7p5hn16v0fp5mir10fy4qa8ibpgx3j2vi8w05c1x",
+      "version": "2.3.2",
+      "sha256": "1rl1sd46r1pk1mikczladgwszynr3p50ydbd6hl8ixczkvadgldm",
       "depends": ["BH", "RColorBrewer", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "colorspace", "dplyr", "future", "future_apply", "ggplot2", "loo", "matrixStats", "plyr", "progressr", "rlang", "rstan", "rstantools", "tidyr"]
     },
     "hbbr": {
@@ -70821,8 +73395,8 @@
     },
     "hce": {
       "name": "hce",
-      "version": "0.6.0",
-      "sha256": "0a9fdb3mx1rgnmdpjxjwgj0xlcd2cw43ydrj5mmld186w0c14kdz",
+      "version": "0.6.5",
+      "sha256": "1zivik69va92mbqhv46xh3pj98jxbc6z3x5i4isb07k8incv4wcy",
       "depends": []
     },
     "hchinamap": {
@@ -70867,11 +73441,23 @@
       "sha256": "0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b",
       "depends": ["e1071"]
     },
+    "hdar": {
+      "name": "hdar",
+      "version": "1.0.4",
+      "sha256": "1hx1jrxi8jmls5xi7mnpw06192l60i3ksrjbsmr7qz4ww8r8s31m",
+      "depends": ["R6", "htmltools", "httr2", "humanize", "jsonlite", "magrittr", "stringr"]
+    },
     "hdbayes": {
       "name": "hdbayes",
-      "version": "0.0.3",
-      "sha256": "19c8nxa30sngrz8z01xc2qxkyi4vjjnvqacphm318ianpwi7pi69",
-      "depends": ["bridgesampling", "callr", "enrichwith", "formula_tools", "fs", "instantiate", "mclust", "posterior"]
+      "version": "0.1.1",
+      "sha256": "1vm89cdi2dfx6dhv62s3c0iv81rd2mfp1m99am4r6bdc71rqi0qi",
+      "depends": ["bridgesampling", "callr", "enrichwith", "formula_tools", "fs", "instantiate", "mclust", "mvtnorm", "posterior"]
+    },
+    "hdbcp": {
+      "name": "hdbcp",
+      "version": "1.0.0",
+      "sha256": "1c2mjfv7d93zn29dr0rcd5ym109qznfyjj45c8608qpaj8g6jqkx",
+      "depends": ["Rcpp", "RcppArmadillo", "dplyr"]
     },
     "hdbinseg": {
       "name": "hdbinseg",
@@ -70923,15 +73509,15 @@
     },
     "hdf5r_Extra": {
       "name": "hdf5r.Extra",
-      "version": "0.0.6",
-      "sha256": "0k8rvwxr30pbx0svikfar40465ff2daipsf91yp2px7hrgb4y129",
-      "depends": ["Matrix", "MatrixExtra", "checkmate", "dplyr", "easy_utils", "hdf5r", "rlang"]
+      "version": "0.1.0",
+      "sha256": "1kfpa8i697f0ksa0pd726g6bf0j2injlbwkjg71k6apv3sq8aqxg",
+      "depends": ["Matrix", "checkmate", "dplyr", "easy_utils", "hdf5r", "rlang"]
     },
     "hdflex": {
       "name": "hdflex",
-      "version": "0.2.1",
-      "sha256": "1f02gkgry8zilrk3sl4dl2jkbnvqn9700lv8k5zlh4cangq5jp9n",
-      "depends": ["Rcpp", "RcppArmadillo", "checkmate", "dplyr", "roll", "stringr"]
+      "version": "0.3.0",
+      "sha256": "19ncn1nks93g3xgdnnsxd72lzyxx9qsxj4m8sd7sdlz7azccpm51",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppThread", "checkmate", "ggplot2", "reshape2"]
     },
     "hdfqlr": {
       "name": "hdfqlr",
@@ -70971,8 +73557,8 @@
     },
     "hdnom": {
       "name": "hdnom",
-      "version": "6.0.3",
-      "sha256": "0n6wvjkg4dyq140a5grpnv526v2z5m7w726cnslrshcj31mngr46",
+      "version": "6.0.4",
+      "sha256": "0d9khk2a16p4j6vcj109pn695fbrra8vx821fzzyg56px5j1j8k0",
       "depends": ["foreach", "ggplot2", "glmnet", "gridExtra", "ncvreg", "penalized", "survival"]
     },
     "hdpGLM": {
@@ -70999,12 +73585,24 @@
       "sha256": "1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4",
       "depends": ["survival", "tensor"]
     },
+    "hdthreshold": {
+      "name": "hdthreshold",
+      "version": "1.0.0",
+      "sha256": "0zmikbad74vpbk66ylixzk585si6lh984a1v85ggm91c4jidi4mq",
+      "depends": ["KernSmooth", "fdrtool", "rdrobust"]
+    },
     "headliner": {
       "name": "headliner",
       "version": "0.0.3",
       "sha256": "1llq007b032q526csfxxwrrwaxkzgq8wl4g4cr65j8biwwynpaba",
       "depends": ["dplyr", "glue", "lubridate", "purrr", "rlang", "tibble", "tidyr"]
     },
+    "healthatlas": {
+      "name": "healthatlas",
+      "version": "0.1.1",
+      "sha256": "1zxdcqmckfs4g7bxi6ssk0bxj8h0gn03qf1gd44p9asjzdwmindv",
+      "depends": ["chk", "curl", "httr2", "sf", "tibble"]
+    },
     "healthcare_antitrust": {
       "name": "healthcare.antitrust",
       "version": "0.1.4",
@@ -71019,8 +73617,8 @@
     },
     "healthequal": {
       "name": "healthequal",
-      "version": "1.0.0",
-      "sha256": "1n96x414pa3khgbvxczavddg2fzfjc3awrpnzd460x12lhw8lfgn",
+      "version": "1.0.1",
+      "sha256": "06vjiw526nvzb392pfsi9qs59yw5bsk5m5y2p88zyi2lny02k2fk",
       "depends": ["dplyr", "emmeans", "marginaleffects", "rlang", "srvyr", "survey"]
     },
     "healthfinance": {
@@ -71043,8 +73641,8 @@
     },
     "healthyR_ai": {
       "name": "healthyR.ai",
-      "version": "0.0.13",
-      "sha256": "0qck4118f0kg9rfnmjc14qh7kdzvxh28rdlydhz8i5j91a6731a4",
+      "version": "0.1.0",
+      "sha256": "1wfwjl1v91y16v6x2zzag8h85lvrq4m9jnh041s9gxmv0wpccnqr",
       "depends": ["broom", "dials", "dplyr", "forcats", "ggplot2", "ggrepel", "h2o", "magrittr", "modeltime", "parsnip", "purrr", "recipes", "rlang", "tibble", "tidyr", "tune", "workflows", "yardstick"]
     },
     "healthyR_data": {
@@ -71055,15 +73653,15 @@
     },
     "healthyR_ts": {
       "name": "healthyR.ts",
-      "version": "0.3.0",
-      "sha256": "1h8x47k239f8mmylpiydw7yf9r0synrzjhdk12a3nnbxbajn6iab",
+      "version": "0.3.1",
+      "sha256": "139y1xjnb2803gk191mhi1ib8m9ivaf64zqcqxs3dnd7blbdxvj6",
       "depends": ["cowplot", "dplyr", "forcats", "ggplot2", "hardhat", "lubridate", "magrittr", "modeltime", "parsnip", "plotly", "purrr", "recipes", "rlang", "stringi", "tibble", "tidyr", "timetk", "workflowsets"]
     },
     "healthyverse": {
       "name": "healthyverse",
-      "version": "1.0.4",
-      "sha256": "1h3d8wq6if1nkqc1d3n6y0g7i7xsvx9ci09z3jvhqx62f464ybgm",
-      "depends": ["TidyDensity", "cli", "crayon", "dplyr", "healthyR", "healthyR_ai", "healthyR_data", "healthyR_ts", "magrittr", "purrr", "rlang", "rstudioapi", "tibble", "tidyAML"]
+      "version": "1.1.0",
+      "sha256": "0l7fwlfr1kzrwmb8g9vln0bhdig9sqi27sdxx8ydpl9pgqwqv1vx",
+      "depends": ["RandomWalker", "TidyDensity", "cli", "crayon", "dplyr", "healthyR", "healthyR_ai", "healthyR_data", "healthyR_ts", "magrittr", "purrr", "rlang", "rstudioapi", "tibble", "tidyAML"]
     },
     "heapsofpapers": {
       "name": "heapsofpapers",
@@ -71109,10 +73707,16 @@
     },
     "heck": {
       "name": "heck",
-      "version": "0.1.1",
-      "sha256": "0s4j0cyac3lqk4jjlbwamdk3nkdicq0nxaa579j9k63azcdz49rs",
+      "version": "0.1.3",
+      "sha256": "0kr4ch84j0fnj9zhmfnvwn24kfnz8kcykg0vhqvw5grnx7971sq9",
       "depends": []
     },
+    "heckmanGE": {
+      "name": "heckmanGE",
+      "version": "1.0.0",
+      "sha256": "1brkxdasmb62vq8295qvaiz5c1sgj4qhsdyg9mxv96945r0z2rw6",
+      "depends": ["glm2", "maxLik", "miscTools", "vctrs"]
+    },
     "heddlr": {
       "name": "heddlr",
       "version": "0.6.0",
@@ -71133,8 +73737,8 @@
     },
     "heemod": {
       "name": "heemod",
-      "version": "1.0.1",
-      "sha256": "09kj8gy74dklkbvxxh95qa5s7iaksvyamggppcpnp5c115625rrb",
+      "version": "1.0.2",
+      "sha256": "0zcj2g578m6pxv7iz3xlypka64qm2j906w10n69wplpn9h9cp3s4",
       "depends": ["dplyr", "ggplot2", "glue", "lifecycle", "memoise", "mvnfast", "purrr", "rlang", "tibble", "vctrs"]
     },
     "heimdall": {
@@ -71151,8 +73755,8 @@
     },
     "heiscore": {
       "name": "heiscore",
-      "version": "0.1.3",
-      "sha256": "1yh4khm83aw56f8xkjan0a3v0xcc7idg6agpp2mk39dwzaqmxbk0",
+      "version": "0.1.4",
+      "sha256": "0q4zz4h6554h1z6d1ikhlb6ghfqgbz2yrlp4pa5svyyhpir7y6n2",
       "depends": ["dplyr", "fmsb", "ggplot2", "ggpubr", "magrittr", "rlang", "shiny", "shinyWidgets", "shinythemes", "stringr", "tibble", "tidyr", "viridis"]
     },
     "helixvis": {
@@ -71175,16 +73779,10 @@
     },
     "hellorust": {
       "name": "hellorust",
-      "version": "1.2.0",
-      "sha256": "0x2lnbrii9z4kyd810rphcip9wpx7ibqx9b4fs5c5msrqa03amk3",
+      "version": "1.2.2",
+      "sha256": "1dh22ip3cqz7gp2viywdrxsh9bhgmvs2jxkksic8xs9670rzf674",
       "depends": []
     },
-    "helminthR": {
-      "name": "helminthR",
-      "version": "1.0.10",
-      "sha256": "0ssw0smxc5zx3d189fq8c6kdg6d7db1sd5iblhz54pg41j9fvqhq",
-      "depends": ["httr", "magrittr", "plyr", "rvest", "taxize", "xml2"]
-    },
     "helsinki": {
       "name": "helsinki",
       "version": "1.0.6",
@@ -71199,8 +73797,8 @@
     },
     "heplots": {
       "name": "heplots",
-      "version": "1.7.0",
-      "sha256": "0hkwfg2xfsmvxnzr2jdfxn93ny325rkhc2cakr4hvddvg65dckfx",
+      "version": "1.7.3",
+      "sha256": "19xb2fih45vx17xbkr3vlv19xdzy2vzhx63xqwrvjjshzqnqfcb4",
       "depends": ["MASS", "broom", "car", "magrittr", "purrr", "rgl", "tibble"]
     },
     "here": {
@@ -71211,8 +73809,8 @@
     },
     "hereR": {
       "name": "hereR",
-      "version": "1.0.0",
-      "sha256": "0la67qdsq72x8k19v27g73fh6w04fdgfj1cxbd3a6w1sfvjvvy6z",
+      "version": "1.0.1",
+      "sha256": "0nl8k58syhkbwdmy4jxc7as99bv8j5k9j87bqmr0y2jlfi9ny2d2",
       "depends": ["crul", "curl", "data_table", "flexpolyline", "jsonlite", "sf", "stringr"]
     },
     "heritability": {
@@ -71241,16 +73839,22 @@
     },
     "hesim": {
       "name": "hesim",
-      "version": "0.5.4",
-      "sha256": "1fx55wwzk2w3zxnk96821bxrsklln7r6px19m7iv0f376iaamiq7",
+      "version": "0.5.5",
+      "sha256": "0r3hwn60z0ypxw7ylvkkd0kh9kgk0rxhghckla77h2505h7wq2x6",
       "depends": ["MASS", "R6", "Rcpp", "RcppArmadillo", "data_table", "flexsurv", "ggplot2", "msm", "survival"]
     },
     "hetGP": {
       "name": "hetGP",
-      "version": "1.1.6",
-      "sha256": "1rw8ss67d2zglnc0vl2kvmkgglks1666d1ps0bpqgn1f8mdwv2kr",
+      "version": "1.1.7",
+      "sha256": "0h4lhy3ifmdh51f91a5i5cw85mhzszcijrafg1andhkm4fsps5m8",
       "depends": ["DiceDesign", "MASS", "Rcpp"]
     },
+    "heterocop": {
+      "name": "heterocop",
+      "version": "0.1.0.0",
+      "sha256": "0bb56pq2cc3vi5c2kskn76dgrsn5f32dlhrxfpblaq3a5fg0w445",
+      "depends": ["doSNOW", "foreach", "igraph", "matrixcalc", "mvtnorm", "stringr"]
+    },
     "heterogen": {
       "name": "heterogen",
       "version": "1.2.33",
@@ -71265,8 +73869,8 @@
     },
     "heteromixgm": {
       "name": "heteromixgm",
-      "version": "2.0.1",
-      "sha256": "111qhf88bjkpraaqabyq8m40yk99jkmd2b6m7d7502gac3a0bf6z",
+      "version": "2.0.2",
+      "sha256": "02vy3v62mr5kn56w60ckcl8gcwks5z950vaxyk0aps428q1f954f",
       "depends": ["BDgraph", "MASS", "Matrix", "glasso", "igraph", "tmvtnorm"]
     },
     "hetsurr": {
@@ -71275,6 +73879,12 @@
       "sha256": "1086lqxg6s5a0qxmd29bp3ninr4jzfdp3m6fsn9sfl7bagvrs5wy",
       "depends": ["Rsurrogate"]
     },
+    "hetsurrSurv": {
+      "name": "hetsurrSurv",
+      "version": "1.0",
+      "sha256": "01i918hq0rsmagpzld9zg7zzsv1i94y4dcm9apzb71pn90rmmg3n",
+      "depends": ["MASS", "Rsurrogate", "groc"]
+    },
     "hett": {
       "name": "hett",
       "version": "0.3-3",
@@ -71301,8 +73911,8 @@
     },
     "hetu": {
       "name": "hetu",
-      "version": "1.0.7",
-      "sha256": "1ml3jzfc71j0d7a7yn97sbfzlpdpg46jpjcn6xbnh17xrqc1mv2a",
+      "version": "1.1.0",
+      "sha256": "14jg5y18b2ah66yzgga8zmp2z47wnlzap7yw62zab8p79ld9nmwf",
       "depends": ["checkmate", "lubridate"]
     },
     "heumilkr": {
@@ -71323,6 +73933,12 @@
       "sha256": "0w4f7xpz2342k38b5a7fs6fq50045hh2836390zg36nqdapg8vlv",
       "depends": ["BH", "DiagrammeR", "Rcpp", "bupaR", "data_table", "dplyr", "ggplot2", "ggthemes", "magrittr", "petrinetR", "processmapR", "purrr", "rlang", "scales", "stringr", "tidyr"]
     },
+    "hexDensity": {
+      "name": "hexDensity",
+      "version": "1.4.5",
+      "sha256": "08viz39hxb34w8xycs6r1qdrb2rfxai4frxc3vjlgg97b5lcnl0q",
+      "depends": ["hexbin", "spatstat_geom"]
+    },
     "hexSticker": {
       "name": "hexSticker",
       "version": "0.4.9",
@@ -71337,14 +73953,14 @@
     },
     "hexbin": {
       "name": "hexbin",
-      "version": "1.28.3",
-      "sha256": "0pyy97bh9xf9hijg3iw1z4ri01571r1fx7xqm3fjkzx4q48kbcqf",
+      "version": "1.28.5",
+      "sha256": "1rnk94mjhzfmpcq77iy8qi2j8dj8bdw9vdjmwm27s94z77b8gl1f",
       "depends": ["lattice"]
     },
     "hexfont": {
       "name": "hexfont",
-      "version": "0.4.0",
-      "sha256": "0pi64rzrzjrfpbjpgvj8fpf81550jfsy5sjsvgc4a0gv9b1dswr6",
+      "version": "0.5.1",
+      "sha256": "0pxn1b5w8nzj23m4js8b93cbs6sx06jb1mqicwldd91a58xpz8jx",
       "depends": ["bittermelon"]
     },
     "hextri": {
@@ -71403,20 +74019,20 @@
     },
     "hgutils": {
       "name": "hgutils",
-      "version": "0.2.11",
-      "sha256": "0l288fqymh2i4dngy909gi8b4c9hdis02gqwyyvy6r8xzisk4m44",
-      "depends": ["crayon", "dplyr", "limSolve", "lubridate", "magrittr", "stringr", "usethis"]
+      "version": "0.2.13",
+      "sha256": "12sylpfjzh8avlk9b51vcz5dm8097z9k90n043pv3g5jzywd4wxd",
+      "depends": ["crayon", "dplyr", "limSolve", "lubridate", "magrittr", "stringr"]
     },
     "hgwrr": {
       "name": "hgwrr",
-      "version": "0.5-0",
-      "sha256": "03ma8g0qz6hpp2m1ys3c6mnkbpjbmpf60pxl0cggaj5d9aymjs1c",
-      "depends": ["Rcpp", "RcppArmadillo", "sf"]
+      "version": "0.6-1",
+      "sha256": "19lx5xnxvvxq7yax1i9pn19vjvn5ak6s2khm9bi8h43rj08wc4ck",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "sf"]
     },
     "hhh4contacts": {
       "name": "hhh4contacts",
-      "version": "0.13.3",
-      "sha256": "1hxdf8mkcaimglpq6z2gk523w7xh3ih0c2m9mlqbgrgnysb22biy",
+      "version": "0.13.4",
+      "sha256": "04mfdc8ksxkcrg24ww3chmpjzcbwb5r0sn9qsdyrwykk410hnn0d",
       "depends": ["sp", "surveillance"]
     },
     "hhi": {
@@ -71427,8 +74043,8 @@
     },
     "hhsmm": {
       "name": "hhsmm",
-      "version": "0.4.0",
-      "sha256": "15lqb4k8q0c9w2fi03ndrzs5vdnh7r5wa4ifpzqvggw5vrnfmfy8",
+      "version": "0.4.2",
+      "sha256": "0liyx7jii3ryg8zffr9qjq92mdp193p8zzv0azajs038s4flzrlx",
       "depends": ["CMAPSS", "MASS", "Rcpp", "Rdpack", "magic", "mice", "mvtnorm", "progress", "splines2"]
     },
     "hht": {
@@ -71527,6 +74143,12 @@
       "sha256": "02yyzfhzgkrp8hgdp2gyqrrvxzh9wqn3c90lyd9nlavn4qn4789z",
       "depends": ["assertthat", "broom", "dplyr", "htmltools", "htmlwidgets", "igraph", "jsonlite", "lubridate", "magrittr", "purrr", "quantmod", "rjson", "rlang", "rlist", "stringr", "tibble", "tidyr", "xts", "yaml", "zoo"]
     },
+    "highd2means": {
+      "name": "highd2means",
+      "version": "1.0",
+      "sha256": "10gy9rhbpllp6qq8ribjswp3h0cdli6qhnh87ccb1ag252383kqc",
+      "depends": ["Rfast", "doParallel", "foreach"]
+    },
     "highfrequency": {
       "name": "highfrequency",
       "version": "1.0.1",
@@ -71553,9 +74175,9 @@
     },
     "highlightr": {
       "name": "highlightr",
-      "version": "1.0.0",
-      "sha256": "14as9gqikswfpwzvq0v9s03r6rwzdsa0k9wad6f6zs416a65v1i4",
-      "depends": ["dplyr", "fuzzyjoin", "ggplot2", "magrittr", "purrr", "quanteda", "quanteda_textstats", "stringr", "tibble", "tidyr", "tm"]
+      "version": "1.0.2",
+      "sha256": "1n4jb1snl9riqkfhzn84rq1czyg5r5v41m3fk78wc0fi2wacxwil",
+      "depends": ["dplyr", "fuzzyjoin", "ggplot2", "magrittr", "purrr", "quanteda", "quanteda_textstats", "stringi", "stringr", "tibble", "tidyr", "tm"]
     },
     "highmean": {
       "name": "highmean",
@@ -71697,14 +74319,14 @@
     },
     "historicalborrow": {
       "name": "historicalborrow",
-      "version": "1.0.4",
-      "sha256": "0g7fs6qn957s3zw4ibbqszn2zpncpf6m41r68dw8g6x942mr0fhv",
+      "version": "1.1.0",
+      "sha256": "19z7v6a0yw5z0niyf7a5l3ydr2wrbvmrd3ly7zbkd9as6scks8hb",
       "depends": ["Matrix", "dplyr", "ggplot2", "posterior", "rjags", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "historicalborrowlong": {
       "name": "historicalborrowlong",
-      "version": "0.0.8",
-      "sha256": "05kk4m80xvmlra9dlkcq2ww5llyg9r8bqhh8p7i8kzma6c31w4qa",
+      "version": "0.1.0",
+      "sha256": "024dq8kyw67bz4p58d99r1ldhh3wjhpjzgqdmi25ncgxq7k9ylva",
       "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "clustermq", "dplyr", "ggplot2", "posterior", "rlang", "rstan", "rstantools", "tibble", "tidyr", "tidyselect", "trialr", "withr", "zoo"]
     },
     "historydata": {
@@ -71791,6 +74413,12 @@
       "sha256": "0536bdrg4cw4kqmx6czzh63b8wia6fhm02fvjv9irlmxqhmy0mxa",
       "depends": ["GGally", "MASS", "R6", "cluster", "dplyr", "ggbeeswarm", "ggplot2", "isoband", "lhs", "mvtnorm", "pdist", "purrr", "rlang", "stringr", "viridis"]
     },
+    "hmix": {
+      "name": "hmix",
+      "version": "1.0.2",
+      "sha256": "1h1qj4c0f3nbw3p61n8fvwqr1q2da1q476xinj6bl7pcy4y5l6mb",
+      "depends": ["HMM", "cubature", "dplyr", "edfun", "gld", "glogis", "mc2d", "normalp", "purrr"]
+    },
     "hmm_discnp": {
       "name": "hmm.discnp",
       "version": "3.0-9",
@@ -71821,6 +74449,12 @@
       "sha256": "10h2k5j97fggq3hc0qzxv1q9821y21m326v3x99zsvpl1b3g89p6",
       "depends": ["lifecycle", "pkgconfig", "rlang", "vctrs"]
     },
+    "hmsidwR": {
+      "name": "hmsidwR",
+      "version": "1.1.2",
+      "sha256": "067hkf1brnspvzldjibbi0xq1xyczijga9srp8x0231g2ry6v700",
+      "depends": ["ggplot2", "gstat", "purrr", "showtext", "sysfonts", "tibble"]
+    },
     "hmsr": {
       "name": "hmsr",
       "version": "1.0.1",
@@ -71829,9 +74463,9 @@
     },
     "hmstimer": {
       "name": "hmstimer",
-      "version": "0.2.1",
-      "sha256": "178jnxhbpa5y2k2cw3w7czyapb23n6yygmymijvn3pzcgx607y3v",
-      "depends": ["hms"]
+      "version": "0.3.0",
+      "sha256": "100jkilzpr02ccdywwqnj2fvfmv23l9qiw837jdn8y1ggmn87rzy",
+      "depends": ["hms", "lifecycle", "rlang"]
     },
     "hnp": {
       "name": "hnp",
@@ -71853,20 +74487,20 @@
     },
     "hockeystick": {
       "name": "hockeystick",
-      "version": "0.8.4",
-      "sha256": "0l5sk4x66zalmznksf9c099jn9i2i90bs57h2f44z105hzpdi606",
+      "version": "0.8.5",
+      "sha256": "1kfv5f2zzw9dr549carnjwa59xz69iy2dbldllqg99lpqhigs4z0",
       "depends": ["RColorBrewer", "dplyr", "ggplot2", "jsonlite", "lubridate", "patchwork", "readr", "rvest", "scales", "tibble", "tidyr", "treemapify"]
     },
     "holi": {
       "name": "holi",
-      "version": "0.1.0",
-      "sha256": "08q9b4vji3ak75kvkmzx0nb6pmq9bzv6r9rwj1pdk9sj0pswkp3c",
+      "version": "0.1.1",
+      "sha256": "0bmi95q4lbphs261hhsq1a2d9qvf1177z0dszdff53ch3ip9w9ak",
       "depends": ["DT", "MASS", "RPostgres", "ggplot2", "likelihoodAsy", "pool", "shiny", "shinythemes", "sn"]
     },
     "holiglm": {
       "name": "holiglm",
-      "version": "1.0.0",
-      "sha256": "02i6smmwmvbkx351ahjzz247kky377r6ara06c5wk5jrfsfjbbr7",
+      "version": "1.0.1",
+      "sha256": "10j0h5x5rqaw9gwiyk32imzb05fakpz8hmg4jilg3qlqk97bwfrn",
       "depends": ["MASS", "ROI", "ROI_plugin_ecos", "SuppDists", "checkmate", "slam"]
     },
     "holland": {
@@ -71875,6 +74509,18 @@
       "sha256": "0f5nr17rmx1m3g4aw6c1f82xdj2ll5nr8slm8ha80cg2i6a90v10",
       "depends": ["MplusAutomation", "mvtnorm"]
     },
+    "hollr": {
+      "name": "hollr",
+      "version": "1.0.0",
+      "sha256": "0ygnhzy2pf3gkayxcmv2rrapwp6xj9s33x71bczwchy6iipvmnml",
+      "depends": ["data_table", "httr", "jsonlite", "pbapply", "reticulate"]
+    },
+    "holobiont": {
+      "name": "holobiont",
+      "version": "0.1.2",
+      "sha256": "1m22x1la59kh7z57s05rsmxf44y2fzk32159wjnfs4wvqdfskzkl",
+      "depends": ["ape", "dplyr", "ggplot2", "phyloseq", "phytools", "tibble"]
+    },
     "holodeck": {
       "name": "holodeck",
       "version": "0.2.2",
@@ -72051,8 +74697,8 @@
     },
     "hqreg": {
       "name": "hqreg",
-      "version": "1.4",
-      "sha256": "1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi",
+      "version": "1.4-1",
+      "sha256": "1srr7vw5w2qpzxlhybbri2qj9gdk5yqamh33xxl58b65spdkiwds",
       "depends": []
     },
     "hrbrthemes": {
@@ -72079,6 +74725,12 @@
       "sha256": "0l0hjspncr6pkc3sg11p63k1gy1jmc70g6581ykh6zy0b07zm8rk",
       "depends": ["CompQuadForm", "Rcpp", "RcppEigen"]
     },
+    "hrtlFMC": {
+      "name": "hrtlFMC",
+      "version": "0.1.0",
+      "sha256": "1pzfdr1ylqcp7mnxx3wmxdf89g2mqpfx2sfmkhybwqqk5irqspnm",
+      "depends": ["FMC"]
+    },
     "hscovar": {
       "name": "hscovar",
       "version": "0.4.2",
@@ -72141,8 +74793,8 @@
     },
     "htetree": {
       "name": "htetree",
-      "version": "0.1.18",
-      "sha256": "144jn5b79xqr4h190c06wwpa5679125xa9qmnaxqh371h45263gd",
+      "version": "0.1.19",
+      "sha256": "16wjx56c5h9vbbh9gw9j646q0hdylcbgc70v6x3fdvis457nxv7a",
       "depends": ["Matching", "Rcpp", "data_tree", "dplyr", "grf", "jsonlite", "partykit", "rpart", "rpart_plot", "shiny", "stringr"]
     },
     "htm2txt": {
@@ -72175,6 +74827,12 @@
       "sha256": "19brwxqnsxzvgsqq3gsjkcyag9ag3xa3mrl5c4s7x48xx2knfh9q",
       "depends": ["R_utils", "cld3", "dplyr", "httr", "lubridate", "magrittr", "processx", "progress", "ranger", "rvest", "stringr", "tibble", "tidyr", "urltools", "xml2"]
     },
+    "htmlreportR": {
+      "name": "htmlreportR",
+      "version": "1.0.0",
+      "sha256": "0zvjpm4dd0zd9h4x2wi1m6a8x63kjgjm0x2yyzw9f0nk5jcy2wwv",
+      "depends": ["ggplot2", "jsonlite", "knitr", "mime", "xfun"]
+    },
     "htmltools": {
       "name": "htmltools",
       "version": "0.5.8.1",
@@ -72187,12 +74845,24 @@
       "sha256": "1l0f7bz2icixsrgg5fg8k09mv0nq9vn5ch1fywkaqpa8605qzc3w",
       "depends": ["htmltools", "jsonlite", "knitr", "rmarkdown", "yaml"]
     },
+    "htrSPRanalysis": {
+      "name": "htrSPRanalysis",
+      "version": "0.1.0",
+      "sha256": "1r8vyi6r0k6cm1mv10vr0xd9jqvg491z70rmwkhw7dfq4dpkhd90",
+      "depends": ["dplyr", "forcats", "ggplot2", "gridExtra", "magrittr", "minpack_lm", "openxlsx", "purrr", "readr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "zoo"]
+    },
     "hts": {
       "name": "hts",
       "version": "6.0.3",
       "sha256": "04s4ndvlxbjz2hamnhakibj92ipbppf1sj1pfc571lkz2c91ggf9",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "SparseM", "forecast"]
     },
+    "htsDegenerateR": {
+      "name": "htsDegenerateR",
+      "version": "0.1.0",
+      "sha256": "1flvq2dk5lb3y5d011ysy3v5izrimaxrszrbc3px6p5qvb17llnw",
+      "depends": ["SparseM"]
+    },
     "htsr": {
       "name": "htsr",
       "version": "2.1.6",
@@ -72201,8 +74871,8 @@
     },
     "httk": {
       "name": "httk",
-      "version": "2.3.1",
-      "sha256": "1ws9bxrl0r59nni6avvr7qgs866p90l88x9xyfw2s90j5q2zzil5",
+      "version": "2.4.0",
+      "sha256": "0p1vxy8pl38aqa6xq84g1pandc4h0cg53aykn6xf1difbkjz9a9z",
       "depends": ["Rdpack", "data_table", "deSolve", "ggplot2", "magrittr", "msm", "mvtnorm", "purrr", "survey", "truncnorm"]
     },
     "httpRequest": {
@@ -72267,10 +74937,22 @@
     },
     "httr2": {
       "name": "httr2",
-      "version": "1.0.2",
-      "sha256": "0j0062wx5xzlr36cs2jh3qji9fin6d2myvl87cdlx7x5fizy7y6i",
+      "version": "1.0.7",
+      "sha256": "1h7pdbalrpipn09srmh2rr5jx5bbngx8jvb0g54835bpg80vh8mn",
       "depends": ["R6", "cli", "curl", "glue", "lifecycle", "magrittr", "openssl", "rappdirs", "rlang", "vctrs", "withr"]
     },
+    "hubEnsembles": {
+      "name": "hubEnsembles",
+      "version": "0.1.9",
+      "sha256": "1kl3m41mfi1r47sv1m4w8kdk6zqq3jizr2hjv5wbvsgdrcxqc7nx",
+      "depends": ["cli", "distfromq", "dplyr", "hubUtils", "matrixStats", "purrr", "rlang", "tidyr", "tidyselect"]
+    },
+    "hubUtils": {
+      "name": "hubUtils",
+      "version": "0.1.7",
+      "sha256": "125smlfffs9mrpms8pxvri6fyww7ybawf7s3b7gf1vapji0z3mc6",
+      "depends": ["checkmate", "cli", "curl", "fs", "gh", "glue", "jsonlite", "lifecycle", "magrittr", "memoise", "purrr", "rlang", "stringr", "tibble"]
+    },
     "hubeau": {
       "name": "hubeau",
       "version": "0.5.0",
@@ -72297,8 +74979,8 @@
     },
     "huito": {
       "name": "huito",
-      "version": "0.2.4",
-      "sha256": "0i7wxgddgdk72r6a2zmfi8b84ism0551f9n0hz8jx6aj21wqkx4r",
+      "version": "0.2.5",
+      "sha256": "08p60mdmnpvqii75psza79yi4wasbnfwf5qay68lsyw836nylnra",
       "depends": ["cowplot", "dplyr", "ggplot2", "magick", "pdftools", "purrr", "qrcode", "showtext", "sysfonts", "tibble", "tidyr"]
     },
     "humanFormat": {
@@ -72321,8 +75003,8 @@
     },
     "humanleague": {
       "name": "humanleague",
-      "version": "2.3.1",
-      "sha256": "0nkpn7cafy2rk6181g4z90kg9il99p40h0wa2hjgi0kg6y16wmgg",
+      "version": "2.3.2",
+      "sha256": "0xfbah1lwj2izdky1b37ycislqr13fnarfz07dqi24sfvn17qm1s",
       "depends": ["Rcpp"]
     },
     "humidity": {
@@ -72333,8 +75015,8 @@
     },
     "hunspell": {
       "name": "hunspell",
-      "version": "3.0.3",
-      "sha256": "1ws2hhrn3iw89vs17q9claf0cip5hy6rbgdr4dcjmzrdlrri9apx",
+      "version": "3.0.5",
+      "sha256": "0fpwj1ymccxqasm34x5cnhc2c72nrkagk5c63kz7zj7mjkdavkmw",
       "depends": ["Rcpp", "digest"]
     },
     "hurdlr": {
@@ -72357,15 +75039,15 @@
     },
     "hutilscpp": {
       "name": "hutilscpp",
-      "version": "0.10.5",
-      "sha256": "1f4ywd8ibg2349fvp7ypiqyslb64gdqi64fwhnag7d6qhrhm563b",
+      "version": "0.10.6",
+      "sha256": "0yvrzkpgjdk0pq8p2v771rl6nj5yszzlr8k6ajif62qndvxkwc64",
       "depends": ["data_table", "hutils", "magrittr"]
     },
     "huxtable": {
       "name": "huxtable",
-      "version": "5.5.6",
-      "sha256": "04hbnc8gij28523b6kiyibc05sjn1z4y1r8z9j4f5ghyl8hm0mdx",
-      "depends": ["R6", "assertthat", "commonmark", "fansi", "generics", "glue", "htmltools", "memoise", "rlang", "stringi", "stringr", "tidyselect", "xml2"]
+      "version": "5.5.7",
+      "sha256": "0piaa4zcx3xsr25yf15cv3vindsksxwwqvsjgvk47p1nvw1f0k6y",
+      "depends": ["R6", "assertthat", "base64enc", "commonmark", "fansi", "generics", "glue", "htmltools", "memoise", "rlang", "stringi", "stringr", "tidyselect", "xml2"]
     },
     "hwde": {
       "name": "hwde",
@@ -72445,6 +75127,12 @@
       "sha256": "0k34blmjyradfbrq5j6lqkhs64q80k9a5pdrc3anyvanadcz32af",
       "depends": ["Rdpack", "curl", "httr2"]
     },
+    "hydflood": {
+      "name": "hydflood",
+      "version": "0.5.9",
+      "sha256": "1275r7wqkbzcqf5ha5kxj4bf7mcqw9gki0s2m9i4mkq8dfhirlq8",
+      "depends": ["Rdpack", "curl", "httr2", "hyd1d", "raster", "sf", "terra"]
+    },
     "hydra": {
       "name": "hydra",
       "version": "0.1.0",
@@ -72453,8 +75141,8 @@
     },
     "hydraulics": {
       "name": "hydraulics",
-      "version": "0.7.0",
-      "sha256": "0aw84gr2fcqgf20bjf9658wqyhlp40v3pkvsj72l27s39wma94xf",
+      "version": "0.7.1",
+      "sha256": "0hjvs57zl51b2f49ryawpfnhw1gw27p2dkzpac8k14zwvxq3kjif",
       "depends": ["ggplot2", "gtools", "pracma", "purrr", "reshape2", "tibble", "units"]
     },
     "hydroDCindex": {
@@ -72471,14 +75159,14 @@
     },
     "hydroGOF": {
       "name": "hydroGOF",
-      "version": "0.6-0",
-      "sha256": "17i68al88d4xvam1fq63knsqgd29s4wvpd31z6zhnbbcbpd3j67v",
+      "version": "0.6-0.1",
+      "sha256": "0vg9cm2xjayhi1xsr6x8cl1ix5dk7x9p0wn0nhrf31nlvmpwh0c1",
       "depends": ["hydroTSM", "xts", "zoo"]
     },
     "hydroTSM": {
       "name": "hydroTSM",
-      "version": "0.7-0",
-      "sha256": "13jaz7mrjmfvankncfmnwxa0m2r78a9p686h0my3m3sv9bvz1qd6",
+      "version": "0.7-0.1",
+      "sha256": "0gan9f46lbnaa9993lgyi2p70c2dlrb8xf6if5n320hy2h98mlh6",
       "depends": ["classInt", "e1071", "lattice", "xts", "zoo"]
     },
     "hydroToolkit": {
@@ -72495,8 +75183,8 @@
     },
     "hydroloom": {
       "name": "hydroloom",
-      "version": "1.0.2",
-      "sha256": "0hh8j9a3rkg81mp9als41rvvmwfclbwg92jx6rzy5fn2qvlxx36m",
+      "version": "1.1.0",
+      "sha256": "1m69bh09ci3zbwpqlkfjjp66l3lsav62sxb0y3ilb57cfswdd7qz",
       "depends": ["RANN", "data_table", "dplyr", "fastmap", "pbapply", "rlang", "sf", "tidyr", "units"]
     },
     "hydropeak": {
@@ -72549,8 +75237,8 @@
     },
     "hyperbolicDEA": {
       "name": "hyperbolicDEA",
-      "version": "1.0.0",
-      "sha256": "05iqbkg3id7ysfmandan416mczzc76qq6kz5lm7s9444a6101agf",
+      "version": "1.0.2",
+      "sha256": "03lc3dycrjh33425waswn7a7s5b6s6d8l4200yqlqqczih3xii3y",
       "depends": ["Benchmarking", "doParallel", "dplyr", "foreach", "lpSolveAPI", "nloptr"]
     },
     "hypercube": {
@@ -72571,18 +75259,18 @@
       "sha256": "13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd",
       "depends": ["contfrac", "deSolve", "elliptic"]
     },
+    "hypergeo2": {
+      "name": "hypergeo2",
+      "version": "0.2.0",
+      "sha256": "1xc4yva1k93j01x061pa0g4smlbbqmwlcg8gfax9k2ry4pj1p339",
+      "depends": ["BH", "Rcpp"]
+    },
     "hyperoverlap": {
       "name": "hyperoverlap",
       "version": "1.1.1",
       "sha256": "10kcphn5zl1pl70xg9bn947i9mbnjxk03p6y7xhdlv152cihffw0",
       "depends": ["MASS", "e1071", "ggplot2", "matlib", "misc3d", "rgl"]
     },
-    "hypersampleplan": {
-      "name": "hypersampleplan",
-      "version": "0.1.1",
-      "sha256": "1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq",
-      "depends": []
-    },
     "hypervolume": {
       "name": "hypervolume",
       "version": "3.1.4",
@@ -72591,8 +75279,8 @@
     },
     "hypoRF": {
       "name": "hypoRF",
-      "version": "1.0.0",
-      "sha256": "1yyq1pjxm9p395wq4zfimvcagspl8vlk0kzpa92pr084q5f7jcyr",
+      "version": "1.0.1",
+      "sha256": "0876i9x2s0vzhki7sp5f62akvjkpksd88k09yd9iaczixvbiwisy",
       "depends": ["ranger"]
     },
     "hypothesis": {
@@ -72639,9 +75327,9 @@
     },
     "hytest": {
       "name": "hytest",
-      "version": "0.1.0",
-      "sha256": "0zqbfra2ynnk7xhqbisrbjycydz4f91m6aljyym67iv0lpizdrwi",
-      "depends": []
+      "version": "0.1.1",
+      "sha256": "067b44yrjqnr8zrb4f532nyry5z5faijaxi55zmi2vkxvgvw0pxr",
+      "depends": ["gamlss", "gamlss_dist"]
     },
     "i18n": {
       "name": "i18n",
@@ -72723,9 +75411,9 @@
     },
     "iClusterVB": {
       "name": "iClusterVB",
-      "version": "0.1.1",
-      "sha256": "17jwpl1h7khcz6isix88ia95p1fldl2mh4lsjiyfi1adyylqpvdq",
-      "depends": ["MCMCpack", "R_utils", "Rcpp", "RcppArmadillo", "VarSelLCM", "clustMixType", "cluster", "cowplot", "ggplot2", "inline", "mclust", "mvtnorm", "pheatmap", "poLCA"]
+      "version": "0.1.4",
+      "sha256": "1jmnb6l86svqjip48c3zbprbpmcgspimnxwlnnjrm6l69pap8xjd",
+      "depends": ["MCMCpack", "Rcpp", "RcppArmadillo", "VarSelLCM", "clustMixType", "cluster", "cowplot", "ggplot2", "mclust", "mvtnorm", "pheatmap", "poLCA"]
     },
     "iDINGO": {
       "name": "iDINGO",
@@ -72747,8 +75435,8 @@
     },
     "iForecast": {
       "name": "iForecast",
-      "version": "1.0.7",
-      "sha256": "03g15xps3bymx2jj6j02pr1llk3lcb5lc3s5r0i2c86qc92lprch",
+      "version": "1.0.9",
+      "sha256": "184nfvh7syrhsifpdk3ma4spsmil52q0lih5l4sc02gx06za5drb",
       "depends": ["caret", "magrittr"]
     },
     "iGSEA": {
@@ -72777,9 +75465,9 @@
     },
     "iMRMC": {
       "name": "iMRMC",
-      "version": "2.0.0",
-      "sha256": "13dz307rqyf9pm6pc8qzx2r8whvcm8k53pryzxh10pyqdswy8wgm",
-      "depends": []
+      "version": "2.1.0",
+      "sha256": "19shm3fcflhk223a520g38adkcslaifyf4nxa1bkpws1qxshk03x",
+      "depends": ["Matrix"]
     },
     "iMediate": {
       "name": "iMediate",
@@ -72795,8 +75483,8 @@
     },
     "iNEXT_3D": {
       "name": "iNEXT.3D",
-      "version": "1.0.5",
-      "sha256": "1dpfwf95sin8yn9mn60d9jappsq1spm02x4p0ikjj637qwisgpjs",
+      "version": "1.0.6",
+      "sha256": "074lz7ld2q4h1dk0anxjwk5dpgbp42lvgh5r9c3pz0k6wj4vsk1s",
       "depends": ["Rcpp", "ape", "dplyr", "ggplot2", "phyclust", "reshape2", "tibble", "tidytree"]
     },
     "iNEXT_4steps": {
@@ -72847,12 +75535,6 @@
       "sha256": "0zn139a3pfwhsxb1564n7fxw0qv96lhaipl0yjns8by7vc3pv6pi",
       "depends": ["Hmisc", "Matrix", "ggplot2", "igraph", "pbapply", "tidyr"]
     },
-    "iRafNet": {
-      "name": "iRafNet",
-      "version": "1.1-1",
-      "sha256": "0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb",
-      "depends": ["ROCR"]
-    },
     "iRegression": {
       "name": "iRegression",
       "version": "1.2.1",
@@ -72895,6 +75577,12 @@
       "sha256": "1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47",
       "depends": ["Matrix", "corpcor"]
     },
+    "iTOS": {
+      "name": "iTOS",
+      "version": "1.0.3",
+      "sha256": "0zi8q5vhmmyc1n4g8ccvf7mdr5740llkmrcbpddl7nzfjgx9n6c3",
+      "depends": ["BiasedUrn", "MASS", "rcbalance", "xtable"]
+    },
     "iTensor": {
       "name": "iTensor",
       "version": "1.0.2",
@@ -72921,8 +75609,8 @@
     },
     "iai": {
       "name": "iai",
-      "version": "1.10.1",
-      "sha256": "1fqa3gig417yc72yvw0phaiv799f91yf9c4yvj0biw1midw6fmcb",
+      "version": "1.10.2",
+      "sha256": "12a08dszd3d1d6dm56jcgw00k1qykk7a45g4ijlzgwb2q24dlpjf",
       "depends": ["JuliaCall", "cowplot", "ggplot2", "lifecycle", "rappdirs", "rjson", "rlang", "stringr"]
     },
     "ialiquor": {
@@ -72951,9 +75639,9 @@
     },
     "ibawds": {
       "name": "ibawds",
-      "version": "0.6.0",
-      "sha256": "1x1l3a94sjxzadaxfchc0zkaq9hjpj0y2b8crg3253v708m0h7r5",
-      "depends": ["dplyr", "dslabs", "ggplot2", "magrittr", "remotes", "rlang", "scales", "stringr"]
+      "version": "1.0.0",
+      "sha256": "0hkpp21gk980n6gii7444kms3bnxyj9qcapigk1x5xya3djybj7c",
+      "depends": ["cli", "dplyr", "dslabs", "ggplot2", "magrittr", "remotes", "rlang", "rstudioapi", "scales", "stringr"]
     },
     "ibb": {
       "name": "ibb",
@@ -72969,8 +75657,8 @@
     },
     "ibdsim2": {
       "name": "ibdsim2",
-      "version": "2.1.0",
-      "sha256": "0bgjhfsplqs4j20x2d1mdhqpdjfnvicgzac62mv4284blzjhnz2d",
+      "version": "2.1.1",
+      "sha256": "13w5cfbbm90v822ylz8m4khy33x7blmag6h0051lw9v655km2gcs",
       "depends": ["Rcpp", "ggplot2", "glue", "pedtools", "ribd"]
     },
     "ibelief": {
@@ -73081,6 +75769,12 @@
       "sha256": "1q6nrbhirrzjjmqwn7mc0wziknqx9zi70s5riza2ic5shgsjq87i",
       "depends": []
     },
+    "iccmult": {
+      "name": "iccmult",
+      "version": "1.0.1",
+      "sha256": "0jspirbiad1w39xdbkivqd5qyj4v043hk16wmfck5q06xhk9sk03",
+      "depends": ["ICCbin", "dirmult", "gtools", "lme4"]
+    },
     "icd_data": {
       "name": "icd.data",
       "version": "1.0",
@@ -73093,6 +75787,12 @@
       "sha256": "1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz",
       "depends": ["Matrix"]
     },
+    "icdcomorbid": {
+      "name": "icdcomorbid",
+      "version": "1.0.0",
+      "sha256": "15si1kp96agpwh7b47pk225js25aaycigz0q9c2kahhrx8pf3sna",
+      "depends": ["jsonlite"]
+    },
     "icdpicr": {
       "name": "icdpicr",
       "version": "1.0.1",
@@ -73147,11 +75847,29 @@
       "sha256": "0xhv95zs1bwxplvvdh2flx9v97zwvc8pvckwfjxcrff64vxxb0f1",
       "depends": []
     },
+    "icesDatsu": {
+      "name": "icesDatsu",
+      "version": "1.2.0",
+      "sha256": "0kjnc2z0yyxln7axq9k1x652phjvq22pxqiz2a8s2v4c1iffy1j3",
+      "depends": ["httr", "icesConnect", "jsonlite"]
+    },
+    "icesDatsuQC": {
+      "name": "icesDatsuQC",
+      "version": "1.2.0",
+      "sha256": "1nlz8lsy0hk7zq6hjl5dp1f06ii4pnfn701zd3vcpbfrid6ayff7",
+      "depends": ["glue", "icesDatsu", "icesVocab", "sqldf"]
+    },
     "icesSAG": {
       "name": "icesSAG",
-      "version": "1.4.1",
-      "sha256": "0dsjsn3qx3k7grjgqsj120valzga7vjlj6jb8mfwmi85gmvlx329",
-      "depends": ["httr", "icesVocab", "openssl", "png", "xml2"]
+      "version": "1.5.0",
+      "sha256": "0y4jmvy7b91jzyc39b4cfakr9xs82icyna91aqizgh038bcn7wy9",
+      "depends": ["cachem", "httr", "icesConnect", "icesVocab", "memoise", "rlang", "xml2"]
+    },
+    "icesSD": {
+      "name": "icesSD",
+      "version": "2.1.0",
+      "sha256": "016x8rn4v2bi81nfpid9x88zyn1k5f40idv15qwwlyzidgjdyyas",
+      "depends": ["httr", "icesConnect"]
     },
     "icesTAF": {
       "name": "icesTAF",
@@ -73167,16 +75885,28 @@
     },
     "ichimoku": {
       "name": "ichimoku",
-      "version": "1.5.4",
-      "sha256": "09s7x956bx84z9ci017zzf96306wwdy78v1jaknps2rl85xfh0bi",
+      "version": "1.5.5",
+      "sha256": "1llc7ps19pqmcwm33avbscn0izh30x164xxcn1b28pyppnzwggxf",
       "depends": ["RcppSimdJson", "ggplot2", "mirai", "nanonext", "secretbase", "shiny", "xts", "zoo"]
     },
+    "iclogcondist": {
+      "name": "iclogcondist",
+      "version": "1.0.1",
+      "sha256": "0agmyghl4zw7llydz0vbgzsfhjs2fff3jdkk4smix7hw28bf34pa",
+      "depends": ["Rcpp", "RcppArmadillo", "fdrtool", "flexsurv", "ggplot2", "icenReg", "monotone"]
+    },
     "icmm": {
       "name": "icmm",
       "version": "1.2",
       "sha256": "179q8w60g4yrv6wqgfmg47by1zc1mbhsdjgl7jq4wirqvwnxvgym",
       "depends": ["EbayesThresh"]
     },
+    "icmstate": {
+      "name": "icmstate",
+      "version": "0.1.1",
+      "sha256": "0nkvfa03vzmq1sh95fbc16820666afs16v60iprw1n3426gxiyls",
+      "depends": ["Rcpp", "checkmate", "deSolve", "ggplot2", "igraph", "msm", "mstate", "prodlim"]
+    },
     "icosa": {
       "name": "icosa",
       "version": "0.11.1",
@@ -73197,22 +75927,10 @@
     },
     "icr": {
       "name": "icr",
-      "version": "0.6.5",
-      "sha256": "1plkqhz6kgsykvpx1m4n515s1idzmp6qx2xc8rq3x5080yavz278",
+      "version": "0.6.6",
+      "sha256": "1z6nhpnnixn4ib1ighr4caf6dnxgzan9j7j0nnrllmr6l1z5bv3n",
       "depends": ["Rcpp"]
     },
-    "icrf": {
-      "name": "icrf",
-      "version": "2.0.2",
-      "sha256": "1apd9klng8dhd9z9nzqzpx8i84rvpwgyam9mzyh8jk6vd49cgjaf",
-      "depends": []
-    },
-    "icsw": {
-      "name": "icsw",
-      "version": "1.0.0",
-      "sha256": "0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6",
-      "depends": []
-    },
     "idar": {
       "name": "idar",
       "version": "1.5",
@@ -73243,6 +75961,12 @@
       "sha256": "1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd",
       "depends": ["dplyr", "ggplot2", "stringr", "tidyr"]
     },
+    "ideanet": {
+      "name": "ideanet",
+      "version": "1.0.0",
+      "sha256": "0p1gkz1qhplw3zh41951azlbspma7g0xfl2jaa5rm0a1f36bc2m9",
+      "depends": ["CliquePercolation", "Matrix", "RSpectra", "cluster", "colorspace", "concorR", "cowplot", "data_table", "dplyr", "forcats", "ggplot2", "gridGraphics", "igraph", "intergraph", "jsonlite", "linkcomm", "magrittr", "moments", "network", "readxl", "rlang", "shiny", "sna", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "idefix": {
       "name": "idefix",
       "version": "1.0.3",
@@ -73273,6 +75997,12 @@
       "sha256": "0d4jf219x1l5978yx1k2ynkcx1b5xwbbba2lcd67s80y6s1q1jhv",
       "depends": ["crayon", "dplyr", "plyr", "rlang", "scales", "tidyr"]
     },
+    "idiolect": {
+      "name": "idiolect",
+      "version": "1.0.1",
+      "sha256": "1wmigxzja5wkr7s2zp67fd2n77b67s2l4jllhrcn2zji8s6qlv2m",
+      "depends": ["caret", "dplyr", "fdrtool", "ggplot2", "kgrams", "pROC", "pbapply", "proxy", "quanteda", "quanteda_textstats", "spacyr", "stringr", "textclean"]
+    },
     "idm": {
       "name": "idm",
       "version": "1.8.3",
@@ -73287,16 +76017,10 @@
     },
     "idmc": {
       "name": "idmc",
-      "version": "0.3.0",
-      "sha256": "1z5v3r2ckcw7bwpbysd1pw3x7b9fw3clyhrw8p70g29kpnxwpy3k",
+      "version": "0.3.1",
+      "sha256": "0niffzlfm6437524hamhn95l011c8wm425nnabd5qs8zs9sgbniv",
       "depends": ["dplyr", "httr", "jsonlite", "lifecycle", "magrittr", "stringr", "tidyr"]
     },
-    "idmodelr": {
-      "name": "idmodelr",
-      "version": "0.4.0",
-      "sha256": "11h7l1iv21jxmjwmg0klwiadvwpn1bj055y4a7fqfgsbbqraxlsj",
-      "depends": ["deSolve", "dplyr", "furrr", "future", "ggplot2", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "viridis"]
-    },
     "idopNetwork": {
       "name": "idopNetwork",
       "version": "0.1.2",
@@ -73335,10 +76059,16 @@
     },
     "ieeeround": {
       "name": "ieeeround",
-      "version": "0.2-0",
-      "sha256": "0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh",
+      "version": "0.2-2",
+      "sha256": "0dbvrfw5qp2cqqgys4k37kcnrm343599w2j3ajkl6hf9pwlsp5xp",
       "depends": []
     },
+    "ieegio": {
+      "name": "ieegio",
+      "version": "0.0.2",
+      "sha256": "0jja6laclbvza77s1c92f0z4c75hvjb137pddqlx4k7jmnq1dlig",
+      "depends": ["R6", "R_matlab", "data_table", "digest", "fastmap", "filearray", "freesurferformats", "fs", "fst", "gifti", "hdf5r", "jsonlite", "oro_nifti", "readNSx", "rpyANTs", "stringr", "yaml"]
+    },
     "iemisctext": {
       "name": "iemisctext",
       "version": "1.0.1",
@@ -73369,11 +76099,17 @@
       "sha256": "1qw50vc3icdfchas1l4d3i3i1r0i0w0kj91xm4wkyj4fsl19qqam",
       "depends": []
     },
+    "ife": {
+      "name": "ife",
+      "version": "0.1.0",
+      "sha256": "08v2ab0wdyng9y3m75118d7pgck07hym2y8b7cz8xpzbwysgsba4",
+      "depends": ["S7", "cli", "generics"]
+    },
     "ifo": {
       "name": "ifo",
-      "version": "0.1.0",
-      "sha256": "0f2c7c6z1h7b5c0g21yr2drb7yqk68ivnxaa8m3ck2xlm226fa5g",
-      "depends": ["readxl", "rvest", "tidyr"]
+      "version": "0.2.0",
+      "sha256": "0zi89cwyr7pvws4b9brb2zcyy9sxjh61px9hkni0pf8m39kxzqkg",
+      "depends": ["curl", "readxl", "rvest", "tidyr"]
     },
     "ifpd": {
       "name": "ifpd",
@@ -73387,6 +76123,12 @@
       "sha256": "0w27z3fjv007717dsn72bm9hbpgzd6pfib6maf9ihnsjllb6k0v5",
       "depends": []
     },
+    "ig_degree_betweenness": {
+      "name": "ig.degree.betweenness",
+      "version": "0.1.0",
+      "sha256": "0h42476jir5xih6lmd63f53p233lihv4h2gfx5rms6vxfks2dm25",
+      "depends": ["BBmisc", "igraph", "igraphdata", "qgraph", "rlist"]
+    },
     "ig_vancouver_2014_topcolour": {
       "name": "ig.vancouver.2014.topcolour",
       "version": "0.1.2.0",
@@ -73407,26 +76149,26 @@
     },
     "iglu": {
       "name": "iglu",
-      "version": "4.1.6",
-      "sha256": "1v73715hjmmyn1264m0q1skirvgfjwx316vlslysr5bvbcwggljf",
+      "version": "4.2.0",
+      "sha256": "09ky2mg1x8kqxb87qs8piwmbbkd3z56f46k0bvpxz8sj1c1pq2vj",
       "depends": ["DT", "caTools", "dplyr", "ggplot2", "ggpubr", "gridExtra", "gtable", "hms", "lubridate", "magrittr", "patchwork", "pheatmap", "plotly", "scales", "shiny", "tibble", "tidyr", "zoo"]
     },
     "igoR": {
       "name": "igoR",
-      "version": "0.2.0",
-      "sha256": "06f9f363zf1k026a0xg5myydzhgl6kgkqp74sz0jwgl44j2zp44s",
+      "version": "0.2.1",
+      "sha256": "10kjnik4s1kq13ff0lskr6f05gd6d559zc5f1aza8d33z2wci215",
       "depends": []
     },
     "igr": {
       "name": "igr",
-      "version": "0.1.1",
-      "sha256": "0kb3jnh2z1fklbhf00cf8s2l3kd3g3nim4dllyc59ivgj66a5yf8",
+      "version": "0.2.0",
+      "sha256": "18lkbx6r11p06y1i1jl6iwxijnwlv6qycm95609qh8ckhqr9qiwp",
       "depends": ["sf"]
     },
     "igraph": {
       "name": "igraph",
-      "version": "2.0.3",
-      "sha256": "0xlg5lxzr8dc260fii43chsspqvb962i1yrcars988b78lnig2lf",
+      "version": "2.1.2",
+      "sha256": "17sjw2gz4qxhfsa7nf37szfmir1wq6fhchm3p5zfkv3bnydsgljj",
       "depends": ["Matrix", "cli", "cpp11", "lifecycle", "magrittr", "pkgconfig", "rlang", "vctrs"]
     },
     "igraphdata": {
@@ -73485,8 +76227,8 @@
     },
     "iimi": {
       "name": "iimi",
-      "version": "1.1.1",
-      "sha256": "05v6j1mmygr67jsgv68b506xabpnl912hxyrz02l87xfb69c5cv8",
+      "version": "1.2.1",
+      "sha256": "1q8kzc9b032axhjg28igbpys02ryfj89x8ksa7sr266nyk3dmz1w",
       "depends": ["Biostrings", "GenomicAlignments", "IRanges", "MTPS", "R_utils", "Rdpack", "Rsamtools", "caret", "data_table", "dplyr", "mltools", "randomForest", "stringr", "xgboost"]
     },
     "ijtiff": {
@@ -73497,8 +76239,8 @@
     },
     "ilabelled": {
       "name": "ilabelled",
-      "version": "0.9.0",
-      "sha256": "0a77dq1bf0ha6r0l2x7kq8nbmssprs8m62b8jsw3yh12f3kh895v",
+      "version": "1.0.0",
+      "sha256": "1s37k1ylcyayckk4ib52bm3i76q42grd51nayj8vdkv62fdyjbsz",
       "depends": []
     },
     "imabc": {
@@ -73549,12 +76291,6 @@
       "sha256": "03p06qmv1s5i08hw4616qf7dqyqp3hrcibz1w66bh5dzv6yl9j7c",
       "depends": ["Rcpp", "magick"]
     },
-    "image_dlib": {
-      "name": "image.dlib",
-      "version": "0.1.1",
-      "sha256": "0wrg6cwnrqwvgs5w1wjhc8ald7fij76xr2qbv6yb217v13ahwskm",
-      "depends": ["Rcpp"]
-    },
     "image_libfacedetection": {
       "name": "image.libfacedetection",
       "version": "0.1",
@@ -73623,8 +76359,8 @@
     },
     "imagine": {
       "name": "imagine",
-      "version": "2.1.0",
-      "sha256": "0kf6fka9zplp8r9rdndd5n7hypf1lp8hbv2djswav1wp95knzqhg",
+      "version": "2.1.1",
+      "sha256": "0ifg21d4hp4zx64p3jhspb3rf3jyfifn61fibg0bwb635qvmdzd8",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "imanr": {
@@ -73665,14 +76401,14 @@
     },
     "imf_data": {
       "name": "imf.data",
-      "version": "0.1.6",
-      "sha256": "081p2vv022c3585j9dqalqgk8y1gnx0z7h0mwh57dmk8adbb1zb0",
+      "version": "0.1.7",
+      "sha256": "1ynpb95nqcdcd9pfrpj6zppany2q46dlrx9j4ddq20861rh1cr7y",
       "depends": ["curl", "jsonlite"]
     },
     "imgpalr": {
       "name": "imgpalr",
-      "version": "0.3.2",
-      "sha256": "0wdddswyakcgwvp75ydp8q3wmxdgrms8r2lh9jm024f8im3j5ccw",
+      "version": "0.4.0",
+      "sha256": "15v0zsy36gd270vg841d39q6av0wfz160lgdbwdqva14i5pppfj8",
       "depends": ["downloader", "dplyr", "farver", "jpeg", "magrittr", "tibble"]
     },
     "imgrec": {
@@ -73711,6 +76447,12 @@
       "sha256": "0z44z74zvb1ci931n8zxpvs36cpwx5my6qd77c4z50bgn2hr00rf",
       "depends": ["MASS", "Rcpp", "Rtsne", "UpSetR", "airr", "ape", "circlize", "data_table", "doParallel", "dplyr", "dtplyr", "factoextra", "fpc", "ggalluvial", "ggplot2", "ggpubr", "ggraph", "ggrepel", "ggseqlogo", "glue", "igraph", "jsonlite", "magrittr", "patchwork", "phangorn", "pheatmap", "plyr", "purrr", "readr", "readxl", "reshape2", "rlang", "rlist", "scales", "shiny", "shinythemes", "stringdist", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "uuid"]
     },
+    "immunaut": {
+      "name": "immunaut",
+      "version": "1.0.1",
+      "sha256": "0vnc32v7igazyn63jm2lrp27arrg6dgyv73pvw482rnfc2cyxy7s",
+      "depends": ["FNN", "PRROC", "RColorBrewer", "R_utils", "Rtsne", "caret", "cluster", "clusterSim", "dbscan", "doParallel", "dplyr", "fpc", "ggplot2", "igraph", "mclust", "pROC", "plyr", "rlang"]
+    },
     "immuneSIM": {
       "name": "immuneSIM",
       "version": "0.8.7",
@@ -73831,6 +76573,12 @@
       "sha256": "0w6wn9b74phiz9f58b6p95fymgrrlh94avhas046ngzaax6ay71n",
       "depends": ["impute", "norm", "pcaMethods", "tmvtnorm"]
     },
+    "imputeMissings": {
+      "name": "imputeMissings",
+      "version": "0.0.4",
+      "sha256": "0mlppw8g8ngiyxc572jlayc1xhmfvg03z3v5qs8wvfc58rkfrvvw",
+      "depends": ["randomForest"]
+    },
     "imputeMulti": {
       "name": "imputeMulti",
       "version": "0.8.4",
@@ -73867,6 +76615,18 @@
       "sha256": "175is0b39grc609dskv9274czv4iwnmlg81dl4nr01xdp6f7g487",
       "depends": ["HiClimR", "RColorBrewer", "ggplot2", "gridExtra", "igraph", "survival"]
     },
+    "imt": {
+      "name": "imt",
+      "version": "1.0.0",
+      "sha256": "0adx632v7nz9pjpl0gzc9d7h1isabv7qnlwm28wrkp1fvr36h38a",
+      "depends": ["BH", "R6", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "caret", "dplyr", "ggplot2", "glue", "magrittr", "purrr", "rlang", "rstan", "rstantools", "scales", "tibble", "tidyr", "tidyselect", "vizdraws"]
+    },
+    "imuf": {
+      "name": "imuf",
+      "version": "0.4.0",
+      "sha256": "10jwp0yrvgwpy6y9wmplwcjpavds4kzhhf3y80yvh1l6pw5yi9yd",
+      "depends": ["Rcpp", "RcppEigen"]
+    },
     "in2extRemes": {
       "name": "in2extRemes",
       "version": "1.0-3",
@@ -73929,9 +76689,9 @@
     },
     "incidence2": {
       "name": "incidence2",
-      "version": "2.3.1",
-      "sha256": "1zv31csmvfia8m1z1cql17my5xvnhfjc6647g0f4bpcba33vqk9i",
-      "depends": ["data_table", "dplyr", "grates", "pillar", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"]
+      "version": "2.6.0",
+      "sha256": "0xciyrcrsnh00g8g56zn9xxhwdi3llvw0yr54ciiz6y9wq3p5hnn",
+      "depends": ["data_table", "dplyr", "grates", "pillar", "rlang", "tibble", "tidyr", "tidyselect", "vctrs", "ympes"]
     },
     "incidental": {
       "name": "incidental",
@@ -73989,8 +76749,8 @@
     },
     "indicspecies": {
       "name": "indicspecies",
-      "version": "1.7.14",
-      "sha256": "15cfmjwblq3fcd2mymvh9p09jfgcifs2sngwnlfz3290glfb6zzm",
+      "version": "1.7.15",
+      "sha256": "0h434wvqcl43k4wqqqch1jglcsqvp2z8xr9imrrw7xaa7dn1zgqp",
       "depends": ["permute"]
     },
     "indiedown": {
@@ -74011,6 +76771,12 @@
       "sha256": "0zgnykbr71pi3nii178ijmzd8ijwf3g8y8yz6g3jy4c0by7w676s",
       "depends": ["SixSigma", "dplyr", "ggplot2", "lattice", "magrittr", "rlang", "tidyr"]
     },
+    "ineAtlas": {
+      "name": "ineAtlas",
+      "version": "0.1.3",
+      "sha256": "0i20f2n3p3kix62fpqxyk4lfvlccg86a2rb986f7rrxplid7qiv8",
+      "depends": ["dplyr", "httr", "readr", "sf", "stringr", "zip"]
+    },
     "inegiR": {
       "name": "inegiR",
       "version": "3.0.0",
@@ -74049,9 +76815,9 @@
     },
     "inferCSN": {
       "name": "inferCSN",
-      "version": "1.0.5",
-      "sha256": "01wzimr1gjj4993k15w8kyq1rmc5a2a9q68hv19gdkrwsyd2zspa",
-      "depends": ["ComplexHeatmap", "Matrix", "Rcpp", "RcppArmadillo", "doParallel", "dplyr", "foreach", "ggnetwork", "ggplot2", "ggraph", "patchwork", "pbapply", "purrr"]
+      "version": "1.0.8",
+      "sha256": "0n8048g1bmqk9fpapbrjffa40s7zp3idd03mxhv6gkxixmz3bar3",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "cli", "doParallel", "dplyr", "foreach", "ggnetwork", "ggplot2", "ggraph", "patchwork", "pbapply", "purrr"]
     },
     "inferference": {
       "name": "inferference",
@@ -74061,8 +76827,8 @@
     },
     "inferr": {
       "name": "inferr",
-      "version": "0.3.1",
-      "sha256": "1ma90f31jcd65l5v3wqbx4x61gw3iay1a2hwjsd5aln1ivbgmzsv",
+      "version": "0.3.2",
+      "sha256": "05rxccfa420dllj4kgb68gvpigcy9h14fsfvyxwyqaddn3016m4q",
       "depends": ["Rcpp", "data_table", "magrittr"]
     },
     "infiltrodiscR": {
@@ -74137,12 +76903,6 @@
       "sha256": "0r1capiv4zr31dsy0sqly9zb00i86zq2ihbgsmb5g4cy0f04xlqz",
       "depends": ["MASS"]
     },
-    "infoelectoral": {
-      "name": "infoelectoral",
-      "version": "1.0.2",
-      "sha256": "1ni00y4wni9dgpaj6x2p50bgmzfh2ybr350ywqmnwz5q30r9kjsm",
-      "depends": ["dplyr", "httr", "stringr"]
-    },
     "informativeSCI": {
       "name": "informativeSCI",
       "version": "1.0.3",
@@ -74193,14 +76953,14 @@
     },
     "inlabru": {
       "name": "inlabru",
-      "version": "2.11.1",
-      "sha256": "07iwi0m8wa1hybl5pjsdkq21zbchm6pimjvpxma72lpdcbmijfxy",
-      "depends": ["Matrix", "MatrixModels", "dplyr", "fmesher", "lifecycle", "magrittr", "plyr", "rlang", "sf", "sp", "terra", "tibble", "withr"]
+      "version": "2.12.0",
+      "sha256": "19njs1ji1w2gnn25jkis3qk2xd0zgb9kfz6p6k8h83lc2852ipp3",
+      "depends": ["Matrix", "MatrixModels", "dplyr", "fmesher", "lifecycle", "magrittr", "plyr", "rlang", "sf", "tibble", "withr"]
     },
     "inlamemi": {
       "name": "inlamemi",
-      "version": "1.0.0",
-      "sha256": "0l18skd43kl99xjyw59pil9rmm60jlkgr7iklghrid280p2984zj",
+      "version": "1.1.0",
+      "sha256": "0djsk1yl7zpqbhxag073dmw7527amicb5hzb6pnq6gf3ypmn1jyb",
       "depends": ["dplyr", "ggplot2", "rlang", "scales"]
     },
     "inlcolor": {
@@ -74209,10 +76969,16 @@
       "sha256": "0yhhy7yrycxg58shfwrja2zfdixss2wldi6qg262dfa9w6j68brj",
       "depends": ["checkmate", "rlang", "scales"]
     },
+    "inldata": {
+      "name": "inldata",
+      "version": "1.2.7",
+      "sha256": "1hi2rzh95in4zgy9vwsnb9vddl64ia9jsb0mvcpgr7fciqnfp0rw",
+      "depends": ["checkmate", "sf", "stringi", "terra"]
+    },
     "inline": {
       "name": "inline",
-      "version": "0.3.19",
-      "sha256": "1mcr9hgq6kkq03n7pkcccxa7vg8jma0q7lfxc5vvkc6snydk1s8f",
+      "version": "0.3.20",
+      "sha256": "0102axl0481z1fnkm9xcjswa9mrjwwi5fkfp8ja6iqighxfszi3j",
       "depends": []
     },
     "inlinedocs": {
@@ -74229,8 +76995,8 @@
     },
     "innsight": {
       "name": "innsight",
-      "version": "0.3.0",
-      "sha256": "17di0a7jff4rg944h247kjbd76vai2hsg9gif1q871c7lq04fw4s",
+      "version": "0.3.1",
+      "sha256": "1624wn4z1s8ai6dbc4kabxwhzgx7x7vdvjjvqf2bsyy01650kbqa",
       "depends": ["R6", "checkmate", "cli", "ggplot2", "torch"]
     },
     "inops": {
@@ -74263,16 +77029,16 @@
       "sha256": "0pbac9il1jrhii0hxvvqjc3phyr2iamxwzanxx5mrkyjh2wsl3jh",
       "depends": ["RANN", "ape", "aphid", "kmer", "openssl", "phylogram", "seqinr", "xml2"]
     },
-    "insectDisease": {
-      "name": "insectDisease",
-      "version": "1.2.2",
-      "sha256": "1ncj5fgmx19caf8m2p3ij5iamk941m9y725gs0nqpa9m6zfnzgf8",
-      "depends": ["plyr", "taxize"]
+    "insee": {
+      "name": "insee",
+      "version": "1.1.7",
+      "sha256": "0ksh8dbk5856zikvj9h39ckl8brp3bl77m216shg75j2qz36rzld",
+      "depends": ["crayon", "dplyr", "httr", "openssl", "purrr", "rappdirs", "rlang", "stringr", "tibble", "tidyselect", "xml2"]
     },
     "insight": {
       "name": "insight",
-      "version": "0.20.3",
-      "sha256": "1ckb25cbf6xg425fnkz86hxvmyrdkkl7889bkj73cg6d96c1h3mn",
+      "version": "1.0.0",
+      "sha256": "1sgfkw33rpmzgbxmhz1mdmnbnjmc80sdhbza0rai0pd6mvy3cy70",
       "depends": []
     },
     "inspectdf": {
@@ -74313,8 +77079,8 @@
     },
     "instantiate": {
       "name": "instantiate",
-      "version": "0.2.2",
-      "sha256": "0nmx2r0hkzbm5bzz28yvzdphkxhzcnd9dgi88wixzkbnmhny83d2",
+      "version": "0.2.3",
+      "sha256": "1myd80di5w6d3qxfhhnwkhr98ck8xqybxz7rw37q89m8ik2n9yfz",
       "depends": ["callr", "fs", "rlang"]
     },
     "insuranceData": {
@@ -74325,9 +77091,9 @@
     },
     "insurancerating": {
       "name": "insurancerating",
-      "version": "0.7.4",
-      "sha256": "1bfl5khi70cfqg1kx0fa7ym6nxqhvk1rjff91kvxbc8q2nxj6wda",
-      "depends": ["DHARMa", "ciTools", "classInt", "colorspace", "data_table", "dplyr", "evtree", "fitdistrplus", "ggplot2", "insight", "lubridate", "mgcv", "patchwork", "scales", "stringr"]
+      "version": "0.7.5",
+      "sha256": "1s71g9663s44ixnp9wn9isciwxkdnyn1ywx8p9rr4s2vs69ywwjz",
+      "depends": ["DHARMa", "ciTools", "classInt", "colorspace", "data_table", "dplyr", "evtree", "fitdistrplus", "ggplot2", "insight", "lubridate", "mgcv", "patchwork", "scales", "scam", "stringr"]
     },
     "intRegGOF": {
       "name": "intRegGOF",
@@ -74337,8 +77103,8 @@
     },
     "intRinsic": {
       "name": "intRinsic",
-      "version": "1.0.2",
-      "sha256": "07hs1srvdzrqqqzzxkbrc10sns3i7nlp41b3ysaf1j03jgxwdyid",
+      "version": "1.1.0",
+      "sha256": "1nkp2zb0wz1kw61lsm39d72k927hgdvck9asxy7495qa10dpl9ac",
       "depends": ["FNN", "Rcpp", "RcppArmadillo", "dplyr", "ggplot2", "knitr", "latex2exp", "reshape2", "rlang", "salso"]
     },
     "intRvals": {
@@ -74347,6 +77113,12 @@
       "sha256": "013n0qp12dqnnk931rvs6lql2r13z5j4jf27s4aqfyd80mnl5w7k",
       "depends": ["lme4", "plyr"]
     },
+    "intSDM": {
+      "name": "intSDM",
+      "version": "2.1.0",
+      "sha256": "1h8npxwv9rnnaxkxf82s82qg9yc90shz99xi6bgsx2p9pf74d5mg",
+      "depends": ["PointedSDMs", "R6", "blockCV", "geodata", "ggplot2", "giscoR", "inlabru", "rgbif", "sf", "terra", "tidyterra"]
+    },
     "intamap": {
       "name": "intamap",
       "version": "1.5-7",
@@ -74437,10 +77209,16 @@
       "sha256": "11g33j14493kr03qviv8nr1x7kj7p61fhm8slmab0nzbfcbwfwih",
       "depends": ["MASS", "Rcpp", "RcppArmadillo"]
     },
+    "interface": {
+      "name": "interface",
+      "version": "0.1.2",
+      "sha256": "1y1z8gc7y8b9521p6wz9kjqjp9pwll9zicck6jiw7av1x11x03h2",
+      "depends": []
+    },
     "interfacer": {
       "name": "interfacer",
-      "version": "0.2.3",
-      "sha256": "0ymmm5ij5q8jg1la1k7wfdhb8p8c6kzwf6jqcsa86snz3ssmlrvm",
+      "version": "0.3.2",
+      "sha256": "1jbcjny61n5wql1igxz0l75pi47wdzykl9dmlxnvqsscf9qhmkfn",
       "depends": ["digest", "dplyr", "forcats", "glue", "knitr", "magrittr", "purrr", "rlang", "roxygen2", "stringr", "tibble", "tidyselect"]
     },
     "interflex": {
@@ -74517,8 +77295,8 @@
     },
     "interpret": {
       "name": "interpret",
-      "version": "0.1.33",
-      "sha256": "17619lyfbvkssls5l3ymlvq72b2162w0n9r7xa5n8wjnnx8mlipz",
+      "version": "0.1.34",
+      "sha256": "0fclf4nfa27n90d08f92svalyyw1vp452lkz9qydzkw7w98m645p",
       "depends": []
     },
     "interpretCI": {
@@ -74553,8 +77331,8 @@
     },
     "intervals": {
       "name": "intervals",
-      "version": "0.15.4",
-      "sha256": "13wzwg5yc1wr8ww8bhv9x5ha78yajsfmb9phq4nbgrxkmbiy3h2h",
+      "version": "0.15.5",
+      "sha256": "0p6fqw311fni5zaw4hy7zcsjrfmrvb03s4amj0szdr3yqki7p40i",
       "depends": []
     },
     "intervcomp": {
@@ -74565,9 +77343,9 @@
     },
     "inti": {
       "name": "inti",
-      "version": "0.6.5",
-      "sha256": "1zbfxc34613r460mhln3qn4fsx999vi4qamf5c8pkjdwyd8nvvbz",
-      "depends": ["DT", "FactoMineR", "agricolae", "dplyr", "emmeans", "ggplot2", "googlesheets4", "lme4", "purrr", "shiny", "stringi", "stringr", "tibble", "tidyr"]
+      "version": "0.6.6",
+      "sha256": "1kznq589q3x1pfjwfhr41x37b3qdidxmh2h6kfszxj3d57j34skn",
+      "depends": ["DT", "FactoMineR", "agricolae", "dplyr", "emmeans", "ggplot2", "googlesheets4", "lme4", "purrr", "shiny", "stringr", "tibble", "tidyr"]
     },
     "intkrige": {
       "name": "intkrige",
@@ -74719,12 +77497,6 @@
       "sha256": "18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni",
       "depends": ["gplots", "psych"]
     },
-    "iopspackage": {
-      "name": "iopspackage",
-      "version": "2.1.0",
-      "sha256": "1l51h8ljcqdrbcn10d0x98ycnz8xd9da4r6y4wc8dbkvaafynm42",
-      "depends": ["dplyr", "economiccomplexity", "openxlsx", "readxl", "tidyr", "usethis"]
-    },
     "iopsych": {
       "name": "iopsych",
       "version": "0.90.1",
@@ -74761,12 +77533,24 @@
       "sha256": "1nbqg4nnhxwcwi9kgbyjkikdwh8djglxkrw0lcqfvaqn4n7qf1i5",
       "depends": ["ggplot2", "jsonlite", "maps", "reticulate", "scales"]
     },
+    "ip2locationio": {
+      "name": "ip2locationio",
+      "version": "1.0.0",
+      "sha256": "1wkyb3655n0ly9whgpnad3p1xwksn07b54jcpjcni8daqqjwlcv8",
+      "depends": ["jsonlite", "reticulate"]
+    },
     "ip2proxy": {
       "name": "ip2proxy",
       "version": "1.2.0",
       "sha256": "0h0krm4sli400mmk8jw9jnxlp773barnyx3z66y45iqr3m23z6lx",
       "depends": ["ggplot2", "jsonlite", "maps", "reticulate", "scales"]
     },
+    "ip2whois": {
+      "name": "ip2whois",
+      "version": "1.0.0",
+      "sha256": "0gkjqddkm5l93l89pdjnf9p5kdfi50rffaagdjq5a4ir40cswwql",
+      "depends": ["jsonlite", "reticulate"]
+    },
     "ipADMIXTURE": {
       "name": "ipADMIXTURE",
       "version": "0.1.0",
@@ -74809,6 +77593,12 @@
       "sha256": "12z16c8sv1nhdv70kwx1a0wh588znkv5y5r0s9kcws0n3rjhzh9p",
       "depends": ["survival"]
     },
+    "ipd": {
+      "name": "ipd",
+      "version": "0.1.3",
+      "sha256": "0fv5jk2pb2vw85rgf7zavzsl8kyjp677jirnh6gx2zb8337v2wxi",
+      "depends": ["MASS", "caret", "gam", "generics", "randomForest", "ranger"]
+    },
     "ipdw": {
       "name": "ipdw",
       "version": "2.0-0",
@@ -74823,9 +77613,9 @@
     },
     "ipeaplot": {
       "name": "ipeaplot",
-      "version": "0.3.1",
-      "sha256": "0bhqgxx2jc8abn73slk2w0961d51kx0sj5cs8b3livp3idxdrl4l",
-      "depends": ["checkmate", "extrafont", "ggplot2", "ggthemes", "paletteer", "rlang", "scales", "showtext"]
+      "version": "0.4.0",
+      "sha256": "1vkfb651m8cs5m8y8vid0h4khzmhadcvywrlsys2g7qx9qbmv0zn",
+      "depends": ["checkmate", "ggplot2", "ggthemes", "paletteer", "rlang", "scales"]
     },
     "iperform": {
       "name": "iperform",
@@ -74883,8 +77673,8 @@
     },
     "ipolygrowth": {
       "name": "ipolygrowth",
-      "version": "0.1.2",
-      "sha256": "0q3n2mbkkra09kxq3scglli0ghj4g0j4xv3py9maq0ii7mbx0547",
+      "version": "1.0.0",
+      "sha256": "0pz0abbj1wq0p80f1ayimpq2b7ca41c18xx4qk4chbl0hyl40zyy",
       "depends": ["dplyr", "magrittr", "rlang", "tidyr", "tidyselect"]
     },
     "ipr": {
@@ -74955,8 +77745,8 @@
     },
     "iq": {
       "name": "iq",
-      "version": "1.9.12",
-      "sha256": "0ka189anzdyfbf1gyhbsq40rsf4b85ragjg84mwfcgwk324y307c",
+      "version": "1.10.1",
+      "sha256": "02k3ccp5flkh007dcbyb67hrlv63cbp0w3vm8c6q1hvys17lbsfh",
       "depends": ["Rcpp", "RcppEigen"]
     },
     "ir": {
@@ -74967,15 +77757,15 @@
     },
     "irace": {
       "name": "irace",
-      "version": "3.5",
-      "sha256": "1x0b0qr1ccq3s4d6k3z6dz94z4caxsmaywwdalw4isd7lm28d4nr",
-      "depends": ["R6"]
+      "version": "4.1",
+      "sha256": "0383gw288nps1lb0zawbxqdb18hcdl59x8vav26c6fg15vr8n9x2",
+      "depends": ["R6", "data_table", "fs", "matrixStats", "spacefillr", "withr"]
     },
     "iraceplot": {
       "name": "iraceplot",
-      "version": "1.3",
-      "sha256": "19scipjkxf08wmsv7vwscx3j120444l5ncin9l8fq1i3jq5w6pjy",
-      "depends": ["DT", "cli", "dplyr", "forcats", "ggforce", "ggplot2", "gridExtra", "irace", "knitr", "labeling", "matrixStats", "plotly", "rlang", "rmarkdown", "tibble", "tidyr", "truncnorm", "viridisLite", "withr"]
+      "version": "2.0.0",
+      "sha256": "0j8im2x4zb2pzp8ichcrkv0xxqxvrrvhnm8r68g2mwlbp1dc8s93",
+      "depends": ["DT", "cli", "data_table", "dplyr", "forcats", "fs", "ggforce", "ggplot2", "gridExtra", "irace", "knitr", "labeling", "matrixStats", "plotly", "rlang", "rmarkdown", "tibble", "tidyr", "truncnorm", "viridisLite", "withr"]
     },
     "irboost": {
       "name": "irboost",
@@ -75045,9 +77835,9 @@
     },
     "irtQ": {
       "name": "irtQ",
-      "version": "0.2.0",
-      "sha256": "1728699zrzpazjs7csvlzlcz7mncxspsq3lykd3i0rrpw6cixwsn",
-      "depends": ["Matrix", "Rfast", "dplyr", "ggplot2", "gridExtra", "janitor", "mirt", "purrr", "reshape2", "rlang", "statmod", "tibble"]
+      "version": "0.2.1",
+      "sha256": "0jql9lz6f2ik5ixv66028h45wh1jcb54rbgmazsgrzvjpb12zybg",
+      "depends": ["Matrix", "Rfast", "dplyr", "ggplot2", "gridExtra", "janitor", "mirt", "purrr", "reshape2", "rlang", "statmod", "tibble", "tidyr"]
     },
     "irtawsi": {
       "name": "irtawsi",
@@ -75151,6 +77941,12 @@
       "sha256": "0p8a290chq01800avvrsljmxvmhhk0hazrd2dry04w7qkxbzyn93",
       "depends": []
     },
+    "iso8601": {
+      "name": "iso8601",
+      "version": "0.1.2",
+      "sha256": "1wkbcwgxf86j5lyr18k2xx9pnk49qj8wlrwhh2wx9hayb4v8k39f",
+      "depends": ["Rcpp"]
+    },
     "isoSurv": {
       "name": "isoSurv",
       "version": "0.3.0",
@@ -75201,8 +77997,8 @@
     },
     "isocountry": {
       "name": "isocountry",
-      "version": "0.2.0",
-      "sha256": "0n2sx731jy42g3yr3c6jba1x3fx42rczq95cwi94f4i78vsphl4f",
+      "version": "0.3.0",
+      "sha256": "0rzw08gpp0lh3flnxc03wqq4qpdyk02pqr3gskw8kdrfhi7n3sqm",
       "depends": ["tibble"]
     },
     "isodistrreg": {
@@ -75225,20 +78021,20 @@
     },
     "isoorbi": {
       "name": "isoorbi",
-      "version": "1.3.0",
-      "sha256": "1n0mga4djak8qsfjjaaqd2wfw842qp4vqfq3n3lrimlrn8l52l0j",
+      "version": "1.3.1",
+      "sha256": "0nc1mn7l9jbgg7fkls1zwzvgbi1lj575ksn0m0wmap50c7ladfvn",
       "depends": ["dplyr", "ggplot2", "lifecycle", "openxlsx", "purrr", "readr", "rlang", "scales", "tidyr", "tidyselect"]
     },
     "isopam": {
       "name": "isopam",
-      "version": "2.0",
-      "sha256": "1d05hcnz8pvgfsbj7hwf9jgcqnxf1rd3h1c0kw4450xhn63jbsbk",
-      "depends": ["cluster", "future", "future_apply", "ggplot2", "proxy", "tibble", "vegan"]
+      "version": "3.0",
+      "sha256": "1sl2z73133wilgrs68gsnkszg7rhqsn2jifnnj0nmig1rp13abr1",
+      "depends": ["cluster", "fastkmedoids", "future", "future_apply", "ggplot2", "proxy", "ps", "tibble", "vegan"]
     },
     "isopleuros": {
       "name": "isopleuros",
-      "version": "1.2.0",
-      "sha256": "1vqazdpg8whpx5nw8gq8bchh93dl04xmygs9as1k5yx1sijw164j",
+      "version": "1.3.0",
+      "sha256": "0bbhysxxcxnq5l9bwgx7j2ksnf623rf86xd3yfgrl3yyj0h03i2l",
       "depends": []
     },
     "isotone": {
@@ -75255,8 +78051,8 @@
     },
     "isotracer": {
       "name": "isotracer",
-      "version": "1.1.6",
-      "sha256": "0yapaaycakxzq6h3r2zp72zwf514qs64lhygiy3ix0dwxzafnh3b",
+      "version": "1.1.7",
+      "sha256": "0ijnjm2hhhk29kllmdmb4rhmmfiavgijsiqvmsp6d77j8i0p2f7r",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "coda", "data_table", "dplyr", "latex2exp", "magrittr", "pillar", "purrr", "rlang", "rstan", "rstantools", "tibble", "tidyr", "tidyselect"]
     },
     "isotree": {
@@ -75283,6 +78079,12 @@
       "sha256": "1hg94p0b5zkj50ckxrgas2a8rdwh0avspykscincxkfi0wk1cx0r",
       "depends": ["jsonlite"]
     },
+    "istat": {
+      "name": "istat",
+      "version": "1.0",
+      "sha256": "14ilhx3zwn8vpir2lc7lz4n6m5wkpxjzimkrwgl1ri1g4shr5kgx",
+      "depends": ["DT", "datamods", "dplyr", "ggplot2", "htmltools", "httr", "magrittr", "openxlsx", "reactable", "readxl", "rsdmx", "shiny", "shinyBS", "shinyWidgets", "shinydashboard", "shinyhelper", "shinyjs", "writexl"]
+    },
     "isva": {
       "name": "isva",
       "version": "1.9",
@@ -75361,6 +78163,12 @@
       "sha256": "0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96",
       "depends": ["iterators"]
     },
+    "itmsa": {
+      "name": "itmsa",
+      "version": "0.1.0",
+      "sha256": "1q6c2pkx271p4gv1n1kz8qk40c3rk4jwj0q3jdaxvcv37nw23vja",
+      "depends": ["Rcpp", "RcppThread", "dplyr", "purrr", "sdsfun", "sf"]
+    },
     "itol_toolkit": {
       "name": "itol.toolkit",
       "version": "1.1.7",
@@ -75393,8 +78201,8 @@
     },
     "itscalledsoccer": {
       "name": "itscalledsoccer",
-      "version": "0.2.4",
-      "sha256": "1xyfs9y60mrmmrpx5rhm2xg3ysgc75wfb62vb63rr7nlv6sfisgl",
+      "version": "0.3.0",
+      "sha256": "0jw65h5ypn0wf6hlyk7vk7q3z2zm78yrwb1zd4a3ydpi06k15xmh",
       "depends": ["R6", "clisymbols", "crayon", "data_table", "dplyr", "glue", "httpcache", "httr", "jsonlite", "magrittr", "rlang", "stringi", "tidyr"]
     },
     "itsdm": {
@@ -75409,6 +78217,12 @@
       "sha256": "1dr8n95rjbsfvw82v2r8rsahxa26f75icp9fn3hfr0d6g0xpkb69",
       "depends": []
     },
+    "iucnr": {
+      "name": "iucnr",
+      "version": "0.0.0.1",
+      "sha256": "17psqmw9qh8x5b9f0ziwk7p8xq2wz8kc24pnsh4vg0kxcsrhzi1w",
+      "depends": ["cli", "dplyr", "stringr"]
+    },
     "ivDiag": {
       "name": "ivDiag",
       "version": "1.0.6",
@@ -75421,12 +78235,6 @@
       "sha256": "1pcls9lgj6i7qad5y28bvj2nra8kpnjslcdkjvl1q1aq8ig1yb98",
       "depends": ["BSSprep"]
     },
-    "ivdesc": {
-      "name": "ivdesc",
-      "version": "1.1.1",
-      "sha256": "0b28xghncvq182kl19m8k1frnr2cqj7nvnhcd831kfd84bk2sz13",
-      "depends": ["knitr", "purrr", "rsample"]
-    },
     "ivdesign": {
       "name": "ivdesign",
       "version": "0.1.0",
@@ -75465,14 +78273,14 @@
     },
     "ivo_table": {
       "name": "ivo.table",
-      "version": "0.4.1",
-      "sha256": "0hs3x52566y7axri1wyzr2c5w156nwfiq0j9sddvl1lcvsrxdivg",
+      "version": "0.5",
+      "sha256": "1h9k5xn04fs86g2iny18cwnlpsdyd4mvxi9h2hlll3rp35nfglvx",
       "depends": ["checkmate", "dplyr", "flextable", "officer", "tidyr"]
     },
     "ivreg": {
       "name": "ivreg",
-      "version": "0.6-3",
-      "sha256": "1ccxs6bblknss41605vvvb473s936rvgj7ls7sd9ismxgq83ad5k",
+      "version": "0.6-4",
+      "sha256": "10navv8n1hivr5s5916fss8lywnzgpkjk10va37vfa6xn03hyag2",
       "depends": ["Formula", "MASS", "car", "lmtest"]
     },
     "ivs": {
@@ -75573,9 +78381,9 @@
     },
     "jackstraw": {
       "name": "jackstraw",
-      "version": "1.3.9",
-      "sha256": "0wgqj1n4nvj0jdlm6kzg0r2c93m7ynm49azffd4qhr1wh31rwnba",
-      "depends": ["ClusterR", "cluster", "corpcor", "irlba", "qvalue", "rsvd"]
+      "version": "1.3.17",
+      "sha256": "12n3n759wb1p51y27hx7rnw5qy1apbakc2aphgbn68hsy9vvlnw6",
+      "depends": ["BEDMatrix", "ClusterR", "cluster", "corpcor", "genio", "irlba", "rsvd"]
     },
     "jacobi": {
       "name": "jacobi",
@@ -75615,15 +78423,15 @@
     },
     "jagshelper": {
       "name": "jagshelper",
-      "version": "0.3.1",
-      "sha256": "105v1clrhr17l78dyi28c21y48sbwbwzjj1irwyrlxinbpxclr2q",
+      "version": "0.4.1",
+      "sha256": "1i214hkg0g2zbln5cy9s175w1jf3akz3jpzf9wydd9wcbl9j0qa2",
       "depends": ["MASS", "jagsUI"]
     },
     "jagstargets": {
       "name": "jagstargets",
-      "version": "1.2.0",
-      "sha256": "10bx1sy5lcq1k1nliiwqjyq5hrywa97dh5zyyjdxq9rh94xhcc7p",
-      "depends": ["R2jags", "coda", "fst", "posterior", "purrr", "qs", "rjags", "rlang", "secretbase", "tarchetypes", "targets", "tibble", "tidyselect", "withr"]
+      "version": "1.2.2",
+      "sha256": "1nhlqn30p2hzpvr9wspccmd68fkc192pcfanvi059ry1zn31iwvh",
+      "depends": ["R2jags", "coda", "fst", "posterior", "purrr", "qs2", "rjags", "rlang", "secretbase", "tarchetypes", "targets", "tibble", "tidyselect", "withr"]
     },
     "jalcal": {
       "name": "jalcal",
@@ -75639,8 +78447,8 @@
     },
     "janitor": {
       "name": "janitor",
-      "version": "2.2.0",
-      "sha256": "1bmsyrmy833kzj3s9s6207f54bx1ca0ianwhiyrlp0jfbqcd1m99",
+      "version": "2.2.1",
+      "sha256": "1pvcmqlkdlain7zf10i2hwq7kg1l703m2sp6d27gxjk258q03i17",
       "depends": ["dplyr", "hms", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "snakecase", "stringi", "stringr", "tidyr", "tidyselect"]
     },
     "janus": {
@@ -75657,8 +78465,8 @@
     },
     "jarbes": {
       "name": "jarbes",
-      "version": "2.2.1",
-      "sha256": "1gpm7by9wmqgr69876wqd1w3nrzmzsgchh2xlsf37jxz2m5827c0",
+      "version": "2.2.3",
+      "sha256": "16777dmig327jc1hrnhn3yr5g972wbqa3pqmsnavblkjwcxpr7mv",
       "depends": ["GGally", "MASS", "R2jags", "bookdown", "ggExtra", "ggplot2", "gridExtra", "kableExtra", "mcmcplots", "qpdf", "rjags", "tidyr"]
     },
     "jcalendaR": {
@@ -75729,8 +78537,8 @@
     },
     "jfa": {
       "name": "jfa",
-      "version": "0.7.1",
-      "sha256": "167n554hpmz4iqszlsjzjiphsf857hysfjkd2gx9kwv6r1crmv3k",
+      "version": "0.7.2",
+      "sha256": "19vr5146fp0gnsjp4nif2gms27f7x98awjvyi05fxklddkrl6j44",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "bde", "extraDistr", "ggplot2", "rstan", "rstantools", "truncdist"]
     },
     "jgsbook": {
@@ -75777,8 +78585,8 @@
     },
     "jlme": {
       "name": "jlme",
-      "version": "0.1.0",
-      "sha256": "06fkxb73mv63v4yhgn66dh8dyk45n3mcrqykhy5mgdbnd3a54vjd",
+      "version": "0.4.1",
+      "sha256": "1xfz8x6vxfcia12vwyzfz4zwyh75fd37bjwwykwa8ap3hidf85zj",
       "depends": ["JuliaConnectoR", "JuliaFormulae", "MASS", "generics"]
     },
     "jlmerclusterperm": {
@@ -75843,8 +78651,8 @@
     },
     "jmvReadWrite": {
       "name": "jmvReadWrite",
-      "version": "0.4.7",
-      "sha256": "11dynr6gs4jh2q5s1wqvd8vmld0c1yyylmvy5dskndj2xxvcgx48",
+      "version": "0.4.8",
+      "sha256": "0iqp762fp6qks0jrvqk6z1f6bc61zyda1znfkw02cwbqs1rlm3c4",
       "depends": ["jsonlite", "zip"]
     },
     "jmvconnect": {
@@ -75855,9 +78663,9 @@
     },
     "jmvcore": {
       "name": "jmvcore",
-      "version": "2.4.7",
-      "sha256": "1pzcv5rkkhff73cf9kfp56d5frk5vjjj6ls1cd4bskyrm0754p3a",
-      "depends": ["R6", "base64enc", "jsonlite", "rlang", "stringi"]
+      "version": "2.6.3",
+      "sha256": "02micn8g1l21x10sqcw6h2866drb8828723spvn3wg5gqm19f15p",
+      "depends": ["R6", "base64enc", "jsonlite", "rlang"]
     },
     "job": {
       "name": "job",
@@ -75891,8 +78699,8 @@
     },
     "joinet": {
       "name": "joinet",
-      "version": "0.0.10",
-      "sha256": "1jjx1rvg2x9zdfdqsjk04hcn7qsf8g7pq8q0x9q83kd8sb1ikjk5",
+      "version": "1.0.0",
+      "sha256": "1r285jymjqqpzfj8cw7p6pc8fp33wih4y9i4zqc9w8517zx54agr",
       "depends": ["cornet", "glmnet", "palasso"]
     },
     "joint_Cox": {
@@ -75933,10 +78741,16 @@
     },
     "jointVIP": {
       "name": "jointVIP",
-      "version": "0.1.2",
-      "sha256": "1m1fqngc2000i7mfp6rcs5js0bg0kzspmavi55ksrb1kybf8rh7k",
+      "version": "1.0.0",
+      "sha256": "0297n9n5n6mjkc5lhbxy8ab5k5b23anj8kwhx73i4zzxbdh7y2h1",
       "depends": ["ggplot2", "ggrepel"]
     },
+    "jointest": {
+      "name": "jointest",
+      "version": "1.0",
+      "sha256": "13pzg4g2ajfx9dnnjn6fgw4zcicdxqrp95mxx1ramk887wym4pls",
+      "depends": ["flip", "flipscores"]
+    },
     "jointseg": {
       "name": "jointseg",
       "version": "1.0.2",
@@ -75963,8 +78777,8 @@
     },
     "jose": {
       "name": "jose",
-      "version": "1.2.0",
-      "sha256": "09k6wnnqlsbmlag4156rcsnavph52grqagkax9kd1sxgpknril3v",
+      "version": "1.2.1",
+      "sha256": "0si1mg325fwx9zgjdbqspw9v6prl5mn3iccg7vki4bpzmwhd953q",
       "depends": ["jsonlite", "openssl"]
     },
     "jot": {
@@ -75981,14 +78795,14 @@
     },
     "joyn": {
       "name": "joyn",
-      "version": "0.2.2",
-      "sha256": "1pcg70znihl310aibhd2k8w8nc5960wj7g418f2xb1rx9yxvwn8g",
+      "version": "0.2.4",
+      "sha256": "1r1wydrgsh1zjlbgzrv9l6bcc1y5xp22a2ynsqipd55aw78gx3h5",
       "depends": ["cli", "collapse", "data_table", "lifecycle", "rlang"]
     },
     "jpcity": {
       "name": "jpcity",
-      "version": "0.2.1",
-      "sha256": "1wpznczyx9vmhyznzph0f4lc2rl5x3nhdygp2yfq3hl0kwxrgzfz",
+      "version": "0.3.0",
+      "sha256": "0lm748kch50k9fh87z9r4pv0rcgb98hgshknm4wv3gmb4bm9zmlz",
       "depends": ["cli", "dplyr", "lifecycle", "lubridate", "pillar", "purrr", "rlang", "stringr", "tibble", "vctrs"]
     },
     "jpeg": {
@@ -76023,8 +78837,8 @@
     },
     "jqr": {
       "name": "jqr",
-      "version": "1.3.4",
-      "sha256": "1h7rbqjgc1hilqyzlzfsd3603hfj26cprg7cjmxw08bi6p0w4hwc",
+      "version": "1.4.0",
+      "sha256": "0bnhk3p0yb30245g8fglrc88nk8xrc2k86q1wa5v3cw3rfpyhac9",
       "depends": ["lazyeval", "magrittr"]
     },
     "jquerylib": {
@@ -76065,8 +78879,8 @@
     },
     "js": {
       "name": "js",
-      "version": "1.2",
-      "sha256": "0s5rj845255a4fzv4h76gcnnqyl5cg3c03r2ay3f00jxnxvvigcg",
+      "version": "1.2.1",
+      "sha256": "1k4linb8r0a5wqm66qy8xiw465yl4558sj3nk77g9dq5prjkps2w",
       "depends": ["V8"]
     },
     "jsTree": {
@@ -76089,15 +78903,15 @@
     },
     "jskm": {
       "name": "jskm",
-      "version": "0.5.5",
-      "sha256": "16a1v5vs9hdsyp5x0r237lc4vh7mdvylplb6ad2c9q09xdglrgs6",
+      "version": "0.5.6",
+      "sha256": "00a0ggcm26gb0m1zm46ascd9hrd99mh83gqr858f4m3lj4p4fa6h",
       "depends": ["ggplot2", "ggpubr", "patchwork", "scales", "survey", "survival"]
     },
     "jsmodule": {
       "name": "jsmodule",
-      "version": "1.5.6",
-      "sha256": "1yyyrl6pgi4hzjcr20p2930iivi1mzyafw6cihny0lr81yv0kyh7",
-      "depends": ["DT", "GGally", "Hmisc", "MatchIt", "RColorBrewer", "data_table", "epiDisplay", "flextable", "forestploter", "geepack", "ggplot2", "ggpubr", "haven", "jskm", "jstable", "labelled", "maxstat", "officer", "pROC", "purrr", "readr", "readxl", "rstudioapi", "rvg", "scales", "see", "shiny", "shinyWidgets", "shinycustomloader", "shinyjs", "survIDINRI", "survey", "survival", "timeROC"]
+      "version": "1.6.0",
+      "sha256": "1bqi16iyg1jbi021jg1c02ww3dh2fbrybg9zvvqy1k20aiv16cf7",
+      "depends": ["DT", "GGally", "Hmisc", "MatchIt", "RColorBrewer", "data_table", "epiDisplay", "flextable", "forestploter", "geepack", "ggplot2", "ggpubr", "ggrepel", "haven", "jskm", "jstable", "labelled", "maxstat", "officer", "pROC", "purrr", "readr", "readxl", "rstudioapi", "rvg", "scales", "see", "shiny", "shinyWidgets", "shinycustomloader", "shinyjs", "survIDINRI", "survey", "survival", "timeROC"]
     },
     "json2aRgs": {
       "name": "json2aRgs",
@@ -76131,14 +78945,14 @@
     },
     "jsonld": {
       "name": "jsonld",
-      "version": "2.2",
-      "sha256": "0bplz2s97wl9yp383jazykh5647iw6kbr1zanqai2s0sxp1xbwn8",
+      "version": "2.2.1",
+      "sha256": "1jjshi7bb2sxs6is5130ayqz6k1adn5w2yi7pnbjbvlpnpx2hdgx",
       "depends": ["V8", "curl", "jsonlite"]
     },
     "jsonlite": {
       "name": "jsonlite",
-      "version": "1.8.8",
-      "sha256": "196an37f118qw43vyfaygh01dirh3hyz84ix8bbs6fsck0b17qkx",
+      "version": "1.8.9",
+      "sha256": "1c4hdsdcn8iphd901nk7lv8g7sxm29vlxmgc3p02hcqnw7h31wc9",
       "depends": []
     },
     "jsonstat": {
@@ -76155,15 +78969,15 @@
     },
     "jstable": {
       "name": "jstable",
-      "version": "1.3.0",
-      "sha256": "0gz2cx1qlgq2ghmlk452clhvzqf18ir3bfc81mfg1jb24l7n2129",
-      "depends": ["coxme", "data_table", "dplyr", "geepack", "labelled", "lme4", "magrittr", "purrr", "survey", "survival", "tableone", "tibble"]
+      "version": "1.3.8",
+      "sha256": "1m89dgldg0rs20nlfsyqrqqv7k1yc9kkbza92ni83x48z0a2y2vn",
+      "depends": ["car", "coxme", "data_table", "dplyr", "geepack", "labelled", "lme4", "lmerTest", "magrittr", "purrr", "rlang", "survey", "survival", "tableone", "tibble"]
     },
     "jstager": {
       "name": "jstager",
-      "version": "0.0.5",
-      "sha256": "0x6pwpzyls8267f0n62bm9s350wr6770vzh46cz382sri8hx8013",
-      "depends": ["chromote", "dplyr", "httr", "openxlsx", "rvest", "tibble", "xml2"]
+      "version": "0.0.6",
+      "sha256": "136qzh5ymag7m6vyn9qq7yc9i3i4izlx6780ysvkkxclwamvc7rg",
+      "depends": ["chromote", "dplyr", "httr", "openxlsx", "purrr", "rvest", "tibble", "xml2"]
     },
     "jstor": {
       "name": "jstor",
@@ -76173,21 +78987,21 @@
     },
     "jtdm": {
       "name": "jtdm",
-      "version": "0.1-2",
-      "sha256": "034hajlqz7mypnia77nm1fihhc5sjwaxvrk83qj1miqd5yilygvx",
+      "version": "0.1-3",
+      "sha256": "14v0nvrfvxqf1lxcshk2apfkksnqgjvyg8kiybksnb1kpzrsnwm6",
       "depends": ["ggforce", "ggplot2", "gridExtra", "mniw", "mvtnorm", "reshape2"]
     },
     "jti": {
       "name": "jti",
-      "version": "0.8.4",
-      "sha256": "0jxqv3xa9yyzizx1rhxjv65c8b253shridy57skrd5kya701n460",
+      "version": "1.0.0",
+      "sha256": "1m7c0b4n9l8nbqgi4xgqkdxrn2k3zl0l2gi2gba03bgd6kdphq6j",
       "depends": ["Rcpp", "RcppArmadillo", "igraph", "sparta"]
     },
     "jtools": {
       "name": "jtools",
-      "version": "2.2.2",
-      "sha256": "1fcpsh9kdr83ngxab6y9b00ridsz764qj3rdlc3dcmqbgas6m8vr",
-      "depends": ["crayon", "generics", "ggplot2", "magrittr", "pander", "pkgconfig", "rlang", "tibble"]
+      "version": "2.3.0",
+      "sha256": "04g9r8pfvzkx7x1gjwlc93wrbpcwhk8cc7y0niqk3gg0z8q6vz7y",
+      "depends": ["broom", "broom_mixed", "cli", "generics", "ggplot2", "magrittr", "pander", "pkgconfig", "rlang", "sandwich", "tibble"]
     },
     "jubilee": {
       "name": "jubilee",
@@ -76293,8 +79107,8 @@
     },
     "kairos": {
       "name": "kairos",
-      "version": "2.1.1",
-      "sha256": "07vlw4vyrkx1j12z8ik7fl9xqy3zmvx6nhcv8vwmzjbzhr3bv2j6",
+      "version": "2.2.0",
+      "sha256": "1j590bbbnji5yrwq464xmykgsipcq82y4l5inna9dja3nw49bxlv",
       "depends": ["aion", "arkhe", "dimensio", "extraDistr"]
     },
     "kalmanfilter": {
@@ -76339,6 +79153,12 @@
       "sha256": "081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa",
       "depends": []
     },
+    "kappaGold": {
+      "name": "kappaGold",
+      "version": "0.4.0",
+      "sha256": "04kzzvc5pbx3cw1i41pffhhq53s49h30i0d0qkx35vcr7ihsdfi7",
+      "depends": ["future_apply", "purrr", "rlang", "tibble", "tidyr"]
+    },
     "kappaSize": {
       "name": "kappaSize",
       "version": "1.2",
@@ -76377,8 +79197,8 @@
     },
     "katex": {
       "name": "katex",
-      "version": "1.4.1",
-      "sha256": "18cziglz8qy1v9gfcjiixq2d3l3na5p51zrxpy3x8asjiddq13d3",
+      "version": "1.5.0",
+      "sha256": "1fvijk4jp7svvkqd5p6c8z2xv23a5w8syhv262l6py7qqw69cbpl",
       "depends": ["V8"]
     },
     "kayadata": {
@@ -76435,11 +79255,11 @@
       "sha256": "18q7njvsb9sbm412c6ms4b4nxg768z9qahws5rnin06gvb25nfcx",
       "depends": []
     },
-    "kdpee": {
-      "name": "kdpee",
-      "version": "1.0.0",
-      "sha256": "1vrpr1rkk0ypl5yi3cjgw0fglyx9r2fbcq21n172ax0w3kdyflgk",
-      "depends": ["checkmate"]
+    "kdml": {
+      "name": "kdml",
+      "version": "1.1.0",
+      "sha256": "042rzbrjmypxp7gb501hwnyr90c90g16pycakj4xbwky9bqb7c8a",
+      "depends": ["MASS", "markdown", "np"]
     },
     "kdry": {
       "name": "kdry",
@@ -76477,6 +79297,12 @@
       "sha256": "1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa",
       "depends": ["actuar", "dplyr", "ggplot2", "tibble"]
     },
+    "kendallknight": {
+      "name": "kendallknight",
+      "version": "0.4.0",
+      "sha256": "16b1hs3ck8l7j8v8nw6b6n0kn6i1r2drnsjj7rb4n3pqxxh881np",
+      "depends": ["cpp11"]
+    },
     "kequate": {
       "name": "kequate",
       "version": "1.6.4",
@@ -76509,8 +79335,8 @@
     },
     "keras3": {
       "name": "keras3",
-      "version": "1.1.0",
-      "sha256": "0dssv7n34lc934z16kpcjiyf30qgnmn5sqyyhbqxbxs23g2mvmjl",
+      "version": "1.2.0",
+      "sha256": "05g2kqf9ffk94vgclndyf5hqx9g5gnl0skzn5bfx48qlsi9g3m37",
       "depends": ["cli", "fastmap", "generics", "glue", "magrittr", "reticulate", "rlang", "tensorflow", "tfruns", "zeallot"]
     },
     "kerastuneR": {
@@ -76521,8 +79347,8 @@
     },
     "kergp": {
       "name": "kergp",
-      "version": "0.5.7",
-      "sha256": "0cf6acz09cbzhnl26x2z0s674mvikl9lq31mdl2s10y6ah00cpsk",
+      "version": "0.5.8",
+      "sha256": "1w8rglzl32k1006gdaxh3nxd23mnnddkznksyw3xqcznm4rz8k11",
       "depends": ["MASS", "Rcpp", "doFuture", "doParallel", "lattice", "nloptr", "numDeriv", "testthat"]
     },
     "kerndwd": {
@@ -76573,6 +79399,18 @@
       "sha256": "0vk0ppb24la6876sw96kk5s3lw4qqs56m507xncbdvjjgw6pq180",
       "depends": ["MASS", "mvtnorm"]
     },
+    "kernstadapt": {
+      "name": "kernstadapt",
+      "version": "0.4.0",
+      "sha256": "1va9ykbimjl3i02hdnwp41sjsxrqrnpp5lkq34sqnzcbyz87y47s",
+      "depends": ["misc3d", "sparr", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_random", "spatstat_univar", "spatstat_utils"]
+    },
+    "kerntools": {
+      "name": "kerntools",
+      "version": "1.1.0",
+      "sha256": "0jgwqjkvxb8m3748h9x8a8kj1lpkhran1v7vymjblayk1hizqm2r",
+      "depends": ["dplyr", "ggplot2", "kernlab", "reshape2", "stringi"]
+    },
     "kesernetwork": {
       "name": "kesernetwork",
       "version": "0.1.0",
@@ -76677,10 +79515,16 @@
     },
     "kgrams": {
       "name": "kgrams",
-      "version": "0.2.0",
-      "sha256": "09py3p85ffa03m3xjvwscz4w61k1yxkxqy96im06509bx51qha0q",
+      "version": "0.2.1",
+      "sha256": "0783im4bj2jxpvicy5kvg05pmaiyr5nwhjfdswdnh3mpdzm4jx7b",
       "depends": ["Rcpp", "RcppProgress", "Rdpack", "rlang"]
     },
+    "kgraph": {
+      "name": "kgraph",
+      "version": "1.0.0",
+      "sha256": "04fh0rnihlyxbj19bhnvvcbszp4x7zimbra344gdyz2im4xlkmzh",
+      "depends": ["DT", "Matrix", "RColorBrewer", "amap", "bslib", "data_table", "dplyr", "htmltools", "igraph", "magrittr", "pROC", "plyr", "reshape2", "rsvd", "sgraph", "shiny", "text2vec"]
+    },
     "kgschart": {
       "name": "kgschart",
       "version": "1.3.5",
@@ -76689,14 +79533,14 @@
     },
     "khisr": {
       "name": "khisr",
-      "version": "1.0.5",
-      "sha256": "00l4iabxysj1g3fwxvnbi96gafyw6szj4s95kd845rk19198pyjx",
+      "version": "1.0.6",
+      "sha256": "14z9h4msddq36kf79hrqyqlq956vbyn9jxqc02w56z9b91mrkjgm",
       "depends": ["cli", "curl", "dplyr", "httr2", "janitor", "jsonlite", "lifecycle", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tidyr", "withr"]
     },
     "khroma": {
       "name": "khroma",
-      "version": "1.13.0",
-      "sha256": "0h84ds9cihd0kacrziq1j562wqcdx06ib6m7a4b786c3ck696l69",
+      "version": "1.14.0",
+      "sha256": "00kb8k5np6inxdjcjbmr36xp6qckf3qmc9p210g7r70pshzxgszp",
       "depends": []
     },
     "kibior": {
@@ -76719,8 +79563,8 @@
     },
     "kim": {
       "name": "kim",
-      "version": "0.5.422",
-      "sha256": "1fmih9w46a68dd025kk27s8rkyls5q2jvypfv40d764rmc6fpkvg",
+      "version": "0.5.431",
+      "sha256": "0d4jvvk9bvsh2cvkpswqfs41m4n0a6ly9093vb1s43k2i1jh7v6m",
       "depends": ["data_table", "remotes"]
     },
     "kimfilter": {
@@ -76731,8 +79575,8 @@
     },
     "kimisc": {
       "name": "kimisc",
-      "version": "0.4",
-      "sha256": "0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z",
+      "version": "1.0.0",
+      "sha256": "0jchqhc9961br64x1x7ilg5gszvsjn1zjfas27ylnwivm8j7z51p",
       "depends": ["memoise", "plyr", "pryr"]
     },
     "kin_cohort": {
@@ -76791,8 +79635,8 @@
     },
     "kit": {
       "name": "kit",
-      "version": "0.0.18",
-      "sha256": "0iv1bnh9gcxdxm4ydgsgsgrhygy7km94y3azk4q4xmg6s362q7hq",
+      "version": "0.0.19",
+      "sha256": "0a0q57q3c5kfjd2c3vz1918hgzsh2ik1rwkr7kdrmzn45xs1nmdy",
       "depends": []
     },
     "kitagawa": {
@@ -76803,9 +79647,9 @@
     },
     "kiwisR": {
       "name": "kiwisR",
-      "version": "0.2.0",
-      "sha256": "14fzf72swy221jcbiplss9dh7g03idrpbbyvbxp4bcqpxwr6hbsa",
-      "depends": ["dplyr", "httr", "jsonlite", "lubridate", "purrr", "tibble"]
+      "version": "0.2.4",
+      "sha256": "07sg5qxfgff99kv800q6g1ivs7l29r1fy1s3q84z4da61csdpxk6",
+      "depends": ["dplyr", "httr2", "lubridate", "purrr", "tibble"]
     },
     "kknn": {
       "name": "kknn",
@@ -76827,9 +79671,9 @@
     },
     "klassR": {
       "name": "klassR",
-      "version": "0.2.4",
-      "sha256": "1n0nwg5r6cqksps621ff40dy447mbaqvd3zfjlhnlkywjx7iay60",
-      "depends": ["httr", "jsonlite", "tm"]
+      "version": "1.0.1",
+      "sha256": "0kx774cddcwhqfawqiz73jnmibkafd78vwd3q8i6byawn1qa6v3b",
+      "depends": ["httr", "igraph", "jsonlite", "tm"]
     },
     "klausuR": {
       "name": "klausuR",
@@ -76903,6 +79747,12 @@
       "sha256": "0wybkzf3l5adgchdxklipkmd063x5nsdqrnhjz0kghc27v7h5zdg",
       "depends": ["BiocGenerics", "Biostrings", "pwalign"]
     },
+    "kmeRtone": {
+      "name": "kmeRtone",
+      "version": "1.0",
+      "sha256": "0aq7smn0ga60x5s69x6d0hln85d69q02w1b75gsp1fpzyf5mqw1w",
+      "depends": ["Biostrings", "R6", "R_utils", "Rcpp", "RcppSimdJson", "curl", "data_table", "future", "future_apply", "jsonlite", "openxlsx", "png", "progressr", "seqLogo", "stringi", "venneuler"]
+    },
     "kmed": {
       "name": "kmed",
       "version": "0.4.2",
@@ -76923,14 +79773,14 @@
     },
     "kml": {
       "name": "kml",
-      "version": "2.4.6.1",
-      "sha256": "01wy3w4bczn5fa22rq5ibys44nif7260flshwsjghpk4hh6qz759",
+      "version": "2.5.0",
+      "sha256": "1qaiffqcfgqaygvxvp980q8kcag4bddckmbsllj7dyy72l87566g",
       "depends": ["clv", "longitudinalData"]
     },
     "kml3d": {
       "name": "kml3d",
-      "version": "2.4.6.1",
-      "sha256": "1nah82m97kg6s6yh1aqdgypda6dj0cx6r2b2rdcz0mwkh55dqh74",
+      "version": "2.5.0",
+      "sha256": "1y265nkz2fpwrvvljnl75qgrm0nl1kck7912cgm6y2vw2b46s4l4",
       "depends": ["clv", "kml", "longitudinalData", "misc3d", "rgl"]
     },
     "kmodR": {
@@ -76939,6 +79789,12 @@
       "sha256": "1khp383k5rr7nnn1fih7wfw6k202igxcj3ddwawyp895qa9w12cj",
       "depends": []
     },
+    "knfi": {
+      "name": "knfi",
+      "version": "1.0.1.9",
+      "sha256": "1snshy9mh34l3iimwr4jz4ja9xv88plhlsn2h9g2nmgpp90nqx8d",
+      "depends": ["BiodiversityR", "broom", "cellranger", "cowplot", "data_table", "dplyr", "drat", "ggplot2", "ggpubr", "magrittr", "plotrix", "purrr", "readxl", "rlang", "scales", "sf", "sp", "stringr", "tidyr", "vegan"]
+    },
     "knitLatex": {
       "name": "knitLatex",
       "version": "0.9.0",
@@ -76953,8 +79809,8 @@
     },
     "knitr": {
       "name": "knitr",
-      "version": "1.48",
-      "sha256": "15zipywk2ayrmy0p7q4d18512c2cgr9kk1lmc7gyi8bxv8k5j6sh",
+      "version": "1.49",
+      "sha256": "1lx2k2gg14pmpbh8i884mdaqx0zaf0x07x1001z3hja6cmwwali9",
       "depends": ["evaluate", "highr", "xfun", "yaml"]
     },
     "knitrBootstrap": {
@@ -77067,8 +79923,8 @@
     },
     "konfound": {
       "name": "konfound",
-      "version": "0.5.1",
-      "sha256": "0gyz5n6x0brkv7c7j1k1fgna8bm1xl9i32qyxsl6h3lhqqi185dh",
+      "version": "1.0.2",
+      "sha256": "03p7rsrag1xskccg42rx4dz1f42dah1bjqkfca64cs0rxvq4g2yk",
       "depends": ["broom", "broom_mixed", "crayon", "dplyr", "ggplot2", "ggrepel", "lavaan", "lme4", "pbkrtest", "purrr", "rlang", "tibble", "tidyr"]
     },
     "kosel": {
@@ -77151,8 +80007,8 @@
     },
     "ks": {
       "name": "ks",
-      "version": "1.14.2",
-      "sha256": "1jrzh1syq6jdqpp5xmb25hqsk07bpbn6caqhp9mw5zpsdi3k14gi",
+      "version": "1.14.3",
+      "sha256": "0dj0nig3pqxi5mwxwzajq938abq48jazpzmw20mwzcs7jrlwn22i",
       "depends": ["FNN", "KernSmooth", "Matrix", "kernlab", "mclust", "mgcv", "multicool", "mvtnorm", "pracma"]
     },
     "ksNN": {
@@ -77199,8 +80055,8 @@
     },
     "kstMatrix": {
       "name": "kstMatrix",
-      "version": "0.2-0",
-      "sha256": "1fwjvwnyb2ldpxrsv2bsgv4b8jqq04h58nxmxlkjcn9f7ih3q6db",
+      "version": "1.0-1",
+      "sha256": "1n2hz08fv2f6fbi3hcaccc4bmhpn9lvfba1q4ralwn84knxn6khv",
       "depends": ["igraph", "pks", "sets"]
     },
     "ktaucenters": {
@@ -77241,8 +80097,8 @@
     },
     "kyotil": {
       "name": "kyotil",
-      "version": "2024.7-31",
-      "sha256": "0m0ivjf8masizgljq9l913r0qakwdc38p146nw2p8d4kzzkisx2k",
+      "version": "2024.11-01",
+      "sha256": "15h5h732zr3k441naj86wmzz5z9zx22gpljp2w6494l57ig6irsz",
       "depends": []
     },
     "kza": {
@@ -77293,6 +80149,12 @@
       "sha256": "1wwmy662mpifphf3bbaqamg9mnvb3rbxhpf1p00r6xqg2xfzgx1b",
       "depends": ["tgp"]
     },
+    "lab2clean": {
+      "name": "lab2clean",
+      "version": "1.0.0",
+      "sha256": "1836dr3g32lw71z8fgrbzn6fn9r6a92ckkk85m9fjwxp9xcmb9lj",
+      "depends": ["data_table"]
+    },
     "labNorm": {
       "name": "labNorm",
       "version": "1.0.1",
@@ -77343,8 +80205,8 @@
     },
     "labelr": {
       "name": "labelr",
-      "version": "0.1.7",
-      "sha256": "0gp0y2jqdjyw3z6zxwrqk690vvgysgrkif4vjpia0szwbh8lw9x0",
+      "version": "0.1.9",
+      "sha256": "09fw3nxbkjvjkgyh6rmm3bzqgwir9z9vqz4svrwz4hfagprapxhk",
       "depends": []
     },
     "lablaster": {
@@ -77473,6 +80335,12 @@
       "sha256": "1vbaxy15a925lmc9a6d0b9yxivw0gd6pw4a89acg797y84fgmyl4",
       "depends": ["httr", "jsonlite", "logger"]
     },
+    "laminr": {
+      "name": "laminr",
+      "version": "0.3.0",
+      "sha256": "0fwrazhwc2b87an19dy3krfgvb2a0mf7gq1f30harqyxm3yx9cng",
+      "depends": ["R6", "R_utils", "cli", "httr", "jsonlite", "purrr", "rlang", "tibble"]
+    },
     "lamle": {
       "name": "lamle",
       "version": "0.3.1",
@@ -77529,9 +80397,9 @@
     },
     "landscapeR": {
       "name": "landscapeR",
-      "version": "1.2",
-      "sha256": "1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy",
-      "depends": ["Rcpp", "raster"]
+      "version": "1.3.1",
+      "sha256": "1x8lfsvg995hkhik526w256phzdwwvb61i97zapyzwqpdqrrng9m",
+      "depends": ["Rcpp", "terra"]
     },
     "landscapemetrics": {
       "name": "landscapemetrics",
@@ -77539,16 +80407,10 @@
       "sha256": "0yq04y8gchwssmaj0xg02jxixx9q7ffdfl91l31q6hkibh4lz8pl",
       "depends": ["Rcpp", "RcppArmadillo", "cli", "ggplot2", "terra", "tibble"]
     },
-    "landscapetools": {
-      "name": "landscapetools",
-      "version": "0.5.0",
-      "sha256": "11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1",
-      "depends": ["Rcpp", "ggplot2", "raster", "tibble"]
-    },
     "landsepi": {
       "name": "landsepi",
-      "version": "1.4.0",
-      "sha256": "0hd4cvik5bfw2yjls4wxnzxq7ylcg69yz34ncj7c3zrg4agka1nm",
+      "version": "1.5.1",
+      "sha256": "1n0ymmycgpfmv7drlazkws7vyw868lwkdyw2gfsb7fl615qwg6j3",
       "depends": ["DBI", "Matrix", "RSQLite", "Rcpp", "deSolve", "doParallel", "fields", "foreach", "mvtnorm", "sf", "sp", "splancs", "testthat"]
     },
     "langevitour": {
@@ -77595,8 +80457,8 @@
     },
     "lares": {
       "name": "lares",
-      "version": "5.2.8",
-      "sha256": "1859nwb7ymdamk7akwrmq011var821cww0bg6k89d5sjhs529jd7",
+      "version": "5.2.10",
+      "sha256": "0cx40lxkrgdp5z6rx51b21nl3ki42apbjgyw240k73dw6r1gvayy",
       "depends": ["dplyr", "ggplot2", "httr", "jsonlite", "lubridate", "openxlsx", "pROC", "patchwork", "rlang", "rpart", "rpart_plot", "rvest", "stringr", "tidyr", "yaml"]
     },
     "lareshiny": {
@@ -77617,12 +80479,6 @@
       "sha256": "0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z",
       "depends": ["lars"]
     },
-    "lassoshooting": {
-      "name": "lassoshooting",
-      "version": "0.1.5-1.1",
-      "sha256": "1hc05irjwcw54hdrdbwsxfr5b0qq7dysvybzm04jyixqs5b2m8wx",
-      "depends": []
-    },
     "latcontrol": {
       "name": "latcontrol",
       "version": "0.1.1",
@@ -77673,8 +80529,8 @@
     },
     "later": {
       "name": "later",
-      "version": "1.3.2",
-      "sha256": "07jn5gp4237va5pcq8lvqzyblgij7k2wj9k5wl93q3fd6cyhgxaj",
+      "version": "1.4.1",
+      "sha256": "0b3jwf2nfpjxc0ffijsb4x6smcdyb96afjv9kby330xv2n1ypwry",
       "depends": ["Rcpp", "rlang"]
     },
     "latex2exp": {
@@ -77683,6 +80539,12 @@
       "sha256": "1jp0l0hi5kv4yh28qg2yj2z5fj33gnfvdz2g2v4ibn516fj2d636",
       "depends": ["magrittr", "stringr"]
     },
+    "latexSymb": {
+      "name": "latexSymb",
+      "version": "0.4.2",
+      "sha256": "0p12dag85zvrzk3z3chynf2fbwwgf1fzypxgv6av013jgn0rdqcn",
+      "depends": ["purrr"]
+    },
     "latexdiffr": {
       "name": "latexdiffr",
       "version": "0.2.0",
@@ -77733,10 +80595,16 @@
     },
     "lavaan": {
       "name": "lavaan",
-      "version": "0.6-18",
-      "sha256": "0lfz92dgqna6r6fcn2slads0gkqanqbny85jih9j08sadk6wl1xr",
+      "version": "0.6-19",
+      "sha256": "11dpx1bmlx5120fp214bzadqvk2p46l5vgcq6r1kmlv4q7ikgca7",
       "depends": ["MASS", "mnormt", "numDeriv", "pbivnorm", "quadprog"]
     },
+    "lavaan_printer": {
+      "name": "lavaan.printer",
+      "version": "0.1.0",
+      "sha256": "1913bk8vqffa3jywgwyf01wq9vb038c0j7fvjnf2rmy9jrvwskl6",
+      "depends": ["lavaan"]
+    },
     "lavaan_shiny": {
       "name": "lavaan.shiny",
       "version": "1.2",
@@ -77755,6 +80623,12 @@
       "sha256": "08isy888r5ispw2i74arnkc52qdba28yl6mzypx6j33rkbnbxrai",
       "depends": ["DiagrammeR", "dplyr", "lavaan", "magrittr", "purrr", "rlang", "stringr"]
     },
+    "lavaangui": {
+      "name": "lavaangui",
+      "version": "0.2.1",
+      "sha256": "04wna8rphdqb9va9pklw74ccjl85daqw5k0zr6cyicwqy95gbswv",
+      "depends": ["DT", "base64enc", "colorspace", "digest", "future", "haven", "igraph", "jsonlite", "lavaan", "plyr", "promises", "readr", "readxl", "shiny"]
+    },
     "lavacreg": {
       "name": "lavacreg",
       "version": "0.2-2",
@@ -77847,8 +80721,8 @@
     },
     "lbfgsb3c": {
       "name": "lbfgsb3c",
-      "version": "2024-3.4",
-      "sha256": "1dsacah7srkg0i9anl283244mvi8chkjkfplzj00dfzcj8nv2cgm",
+      "version": "2024-3.5",
+      "sha256": "0rgikv5p05rv4r55mihlbk1953jiwd95wp2rn05xqi4ix33y3vxj",
       "depends": ["Rcpp", "RcppArmadillo", "numDeriv"]
     },
     "lbm": {
@@ -77871,8 +80745,8 @@
     },
     "lcars": {
       "name": "lcars",
-      "version": "0.3.8",
-      "sha256": "0c68f9l69brdjpiabpjwpfjll7hmgfn3mi6zrjpgzc8jvvlfxi44",
+      "version": "0.4.0",
+      "sha256": "1v1fdnni4smkmsvsf09k96hf2503djlkyrglb5dc6yz66dsdg2bj",
       "depends": ["ggplot2", "shiny", "trekcolors"]
     },
     "lcc": {
@@ -77989,6 +80863,12 @@
       "sha256": "0br0zx5qiv4q1gg3q4kw8jhm4rwycajgp968fwal87mzid65q3ni",
       "depends": ["ggplot2", "gnorm", "moments", "optimx", "scales", "xts", "yaml", "zoo"]
     },
+    "ldmppr": {
+      "name": "ldmppr",
+      "version": "1.0.3",
+      "sha256": "1y9f4i149fhb4px8fv7m1smsqq75nm0c84r4ilj1c38map7xhckm",
+      "depends": ["GET", "Rcpp", "RcppArmadillo", "bundle", "dials", "doParallel", "dplyr", "furrr", "future", "ggplot2", "hardhat", "magrittr", "nloptr", "parsnip", "progress", "ranger", "recipes", "rsample", "spatstat_explore", "spatstat_geom", "terra", "tune", "workflows", "xgboost", "yardstick"]
+    },
     "ldsep": {
       "name": "ldsep",
       "version": "2.1.5",
@@ -78045,8 +80925,8 @@
     },
     "leafgl": {
       "name": "leafgl",
-      "version": "0.1.1",
-      "sha256": "042jps6zh4xr0xj19a7fbgrcb6q6gsw2q5f191lyskr8iajdrz1h",
+      "version": "0.2.2",
+      "sha256": "12l9aa97jp1hhqfnp7700za85x2n0r34b4878cnj2hg4k6r3vs19",
       "depends": ["geojsonsf", "htmltools", "jsonify", "leaflet", "sf"]
     },
     "leaflegend": {
@@ -78069,8 +80949,8 @@
     },
     "leaflet_extras": {
       "name": "leaflet.extras",
-      "version": "2.0.0",
-      "sha256": "0bhqid6sqgfmk8ipjy34h54la0mbx02169rc7l3h3fkqs8ffpw0c",
+      "version": "2.0.1",
+      "sha256": "0yhn8dz33wq1yka480hqbsn4izzj9xp2vj4m072dpc6iwgp5rjny",
       "depends": ["htmltools", "htmlwidgets", "leaflet", "magrittr", "stringr"]
     },
     "leaflet_extras2": {
@@ -78091,6 +80971,12 @@
       "sha256": "0rl69bfx2l10x80rl8cppqch3fnd05sk9w29h8589jc8h3ffmkn5",
       "depends": ["htmltools"]
     },
+    "leafletZH": {
+      "name": "leafletZH",
+      "version": "0.1.1",
+      "sha256": "02q5znqjx5mhw469j5zfkhb518hv54vhc9lds8zc27m9i4jwpyfa",
+      "depends": ["Rcpp", "RcppArmadillo", "geojsonsf", "geosphere", "htmltools", "htmlwidgets", "leaflet", "leaflet_extras", "purrr", "scales", "sf", "stringr"]
+    },
     "leafpm": {
       "name": "leafpm",
       "version": "0.1.0",
@@ -78159,8 +81045,8 @@
     },
     "learningtower": {
       "name": "learningtower",
-      "version": "1.0.1",
-      "sha256": "041hx9a1jq5aw6gbgb1xj8pl9dhc3kb85cx670nkc3ngaj4j2g17",
+      "version": "1.1.0",
+      "sha256": "1vs115cyzji1ngpv3nyg1xdn84f1nm5hxqc474xrh9pcagy8qhyp",
       "depends": ["dplyr", "tibble"]
     },
     "learnr": {
@@ -78195,9 +81081,15 @@
     },
     "lefko3": {
       "name": "lefko3",
-      "version": "6.2.1",
-      "sha256": "027x9k6wl59mbwfi1pd8jjhj60sbxi4gw27xb47rksbwkqbp0q4d",
-      "depends": ["BH", "MASS", "Matrix", "MuMIn", "Rcpp", "RcppArmadillo", "VGAM", "glmmTMB", "lme4", "pscl"]
+      "version": "6.3.1",
+      "sha256": "1avwk08ngvr5l0mvrz6zfljgwhf6bnffllarwgq8w4pna9102m2l",
+      "depends": ["BH", "MASS", "Matrix", "MuMIn", "Rcpp", "RcppArmadillo", "VGAM", "glmmTMB", "lme4", "pscl", "rlang"]
+    },
+    "legendry": {
+      "name": "legendry",
+      "version": "0.2.0",
+      "sha256": "0syvk61c47pd27cx3q89hd1abvrd6j29mlq983w6a1a0cd1fp9zn",
+      "depends": ["cli", "ggplot2", "gtable", "lifecycle", "rlang", "scales", "vctrs"]
     },
     "legion": {
       "name": "legion",
@@ -78213,14 +81105,14 @@
     },
     "legocolors": {
       "name": "legocolors",
-      "version": "0.3.1",
-      "sha256": "0ds9c2x0x590yk7mrjm4hh7k72p51slssg7jlprd71mw6hry91ma",
+      "version": "0.4.0",
+      "sha256": "12ak1dfssqdzn0j9ag35kl26qqvzd84b78s640gxsn057viw1q1f",
       "depends": []
     },
     "lehdr": {
       "name": "lehdr",
-      "version": "1.1.3",
-      "sha256": "0jkfnda7dpkhvlam6l4r5b80yrrhnvlx61frxi56qr7mws5z2h1w",
+      "version": "1.1.4",
+      "sha256": "16d5kmzn59ykdgbjrf3h1psxawwbzxdijzfc21j4kmh2z3ldc4xh",
       "depends": ["dplyr", "glue", "httr2", "magrittr", "readr", "rlang", "stringr"]
     },
     "lehuynh": {
@@ -78237,14 +81129,14 @@
     },
     "leidenAlg": {
       "name": "leidenAlg",
-      "version": "1.1.3",
-      "sha256": "0g4gs6rrz3wn97ag7wsfr6qa4zgb75i0k9jc1siii4pf6h689d1x",
+      "version": "1.1.4",
+      "sha256": "1mn78hmav0082s7ic018w2ilr0mb5z7crx7mmllv9wpr3xb1xsid",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "igraph", "sccore"]
     },
     "leidenbase": {
       "name": "leidenbase",
-      "version": "0.1.30",
-      "sha256": "1jz2272wvbsgn098wvl0dd9hmvasznwanacw8gf07zk5fslaa5al",
+      "version": "0.1.31",
+      "sha256": "1q93mfd0p99yi36h1psnbrkhalmc68mw08bkhibyk1a4ligq42nd",
       "depends": ["igraph"]
     },
     "leiv": {
@@ -78261,8 +81153,8 @@
     },
     "lemon": {
       "name": "lemon",
-      "version": "0.4.9",
-      "sha256": "1yjam478s6sz1spggybb34akpmpgq8ybyrhzy3b1v9s1j81b6k87",
+      "version": "0.5.0",
+      "sha256": "0d0x9mds241hm6armdb32zg4wkkvyy23q2cwk550lmxx2x6bb71w",
       "depends": ["ggplot2", "gridExtra", "gtable", "knitr", "lattice", "plyr", "scales"]
     },
     "lenght": {
@@ -78309,9 +81201,9 @@
     },
     "lessR": {
       "name": "lessR",
-      "version": "4.3.6",
-      "sha256": "1d0k41fg66g0x6apd6yvc74gnl3mgs16kmykz53qhnd4zi5rj99k",
-      "depends": ["colorspace", "ellipse", "knitr", "lattice", "latticeExtra", "leaps", "openxlsx", "robustbase", "shiny"]
+      "version": "4.3.9",
+      "sha256": "1qdxs84q0nd9pam09zglywjc556943b4kan6c3ml3cafsi2x9bgi",
+      "depends": ["colorspace", "ellipse", "knitr", "lattice", "latticeExtra", "leaps", "openxlsx", "robustbase", "shiny", "xts", "zoo"]
     },
     "lessSEM": {
       "name": "lessSEM",
@@ -78387,15 +81279,15 @@
     },
     "lfe": {
       "name": "lfe",
-      "version": "3.0-0",
-      "sha256": "16838gqglnc2l5hnyv46fpikh6h0l5yy59rmbisxpl1j571hab9l",
+      "version": "3.1.0",
+      "sha256": "0lj4xz5m9hvsfi5pyfrlbap64s3yxzsddv9qhr9l9gjpfk6phyw8",
       "depends": ["Formula", "Matrix", "sandwich", "xtable"]
     },
     "lfl": {
       "name": "lfl",
-      "version": "2.2.0",
-      "sha256": "02kd7fz12v6xl1f3lv7kkxccln4fm8dmvbn7m9prbiawrbmy16dx",
-      "depends": ["Rcpp", "e1071", "foreach", "forecast", "plyr", "tseries", "zoo"]
+      "version": "2.2.1",
+      "sha256": "0x7lwbpigfbfmwr5mynrkb8d0x4wvl1w0kj68dgbqg46mwh7v0mi",
+      "depends": ["Rcpp", "e1071", "foreach", "forecast", "plyr", "tibble", "tseries", "zoo"]
     },
     "lfmm": {
       "name": "lfmm",
@@ -78405,8 +81297,8 @@
     },
     "lfproQC": {
       "name": "lfproQC",
-      "version": "0.1.0",
-      "sha256": "0cs6x5nqwm1n11i287f26x4lclpmd5vwj9wwnzlr7cr95riwrqxk",
+      "version": "1.4.0",
+      "sha256": "0ga5zwgqj5249kx7psnjzxj46v64npq6qvn8gl7hi7177r5ysgn9",
       "depends": ["Hmisc", "MASS", "VIM", "dplyr", "ggplot2", "laeken", "limma", "magrittr", "matrixStats", "pcaMethods", "plotly", "reshape", "reshape2", "tidyr", "tidyselect", "vsn"]
     },
     "lfstat": {
@@ -78453,8 +81345,8 @@
     },
     "lgrExtra": {
       "name": "lgrExtra",
-      "version": "0.0.8",
-      "sha256": "19qg67mjq0n5zbrcfhjhxfwl1jlq11iblhczl3m22n2nplpi70q8",
+      "version": "0.0.9",
+      "sha256": "1qjm6pz7s2nhx78cgc9si2mfcrqimpv2i11gqiznfxcy6rq2n3lp",
       "depends": ["R6", "data_table", "lgr"]
     },
     "lgrdata": {
@@ -78501,8 +81393,8 @@
     },
     "libr": {
       "name": "libr",
-      "version": "1.3.4",
-      "sha256": "16q65f1slbzlysqcn5mzj7ws8cm59qk3yxgippwhcjmrswrfk5y2",
+      "version": "1.3.8",
+      "sha256": "0rx7g1nf3xgmqsikjxw1shp2hkb93cz146frmi4gg6h0kw83j5fn",
       "depends": ["Rcpp", "common", "crayon", "data_table", "dplyr", "haven", "openxlsx", "readr", "readxl", "tibble"]
     },
     "librarian": {
@@ -78549,8 +81441,8 @@
     },
     "lifecontingencies": {
       "name": "lifecontingencies",
-      "version": "1.3.11",
-      "sha256": "1wz0v7abl3g3kgbp613rx5rw2ryxahk1h8bk8d3p5v7wyfwqignh",
+      "version": "1.3.12",
+      "sha256": "03kcfvm01il451hy9rg7adwg5vllv9kr61n58kkqkyvx7cj0xk5b",
       "depends": ["Rcpp", "markovchain"]
     },
     "lifecourse": {
@@ -78603,8 +81495,8 @@
     },
     "lightr": {
       "name": "lightr",
-      "version": "1.7.1",
-      "sha256": "0wbrwkkz11cp4n0ikxc541y9hpav5kvr4fv9s9llrd1ammpkzfw3",
+      "version": "1.8.0",
+      "sha256": "0pw2kdw4izhnlzis6mn52c3m8x3nhrhknlh6mk7i5ri8phv237w8",
       "depends": ["future_apply", "progressr", "xml2"]
     },
     "lightsout": {
@@ -78633,8 +81525,8 @@
     },
     "likelihoodR": {
       "name": "likelihoodR",
-      "version": "1.1.4",
-      "sha256": "0ixgqan4606bfsgvnsg2h0kvq112518gjw784w0mif2z5xxkj7x5",
+      "version": "1.1.5",
+      "sha256": "126s7qs9mn3apjdnl6vmiqlms1c075wcj44wr8a0cyjfich7ajnh",
       "depends": ["lme4"]
     },
     "likert": {
@@ -78789,8 +81681,8 @@
     },
     "lingglosses": {
       "name": "lingglosses",
-      "version": "0.0.7",
-      "sha256": "0qa42bjx9mszdfnzgmi7i23czrqnz8vbdaj0vq5sx8rn547dhymx",
+      "version": "0.0.8",
+      "sha256": "03skh28dhqjkc6clxqrknfmkbxyxfkb3nmbdhs5dd32xc5gqa63c",
       "depends": ["htmltools", "kableExtra", "knitr", "rmarkdown"]
     },
     "lingmatch": {
@@ -78801,8 +81693,8 @@
     },
     "lingtypology": {
       "name": "lingtypology",
-      "version": "1.1.18",
-      "sha256": "041l20dsp2jdnpvdlawb0xn6hawym5wkxyhhvbl5y8mfxibdq37h",
+      "version": "1.1.20",
+      "sha256": "02xhk9ncgsgqygwszdzkrzlkg2zikfhlfan00wh0w0h0d6gd6z47",
       "depends": ["jsonlite", "leaflet", "leaflet_minicharts", "stringdist"]
     },
     "linguisticsdown": {
@@ -78819,9 +81711,9 @@
     },
     "link2GI": {
       "name": "link2GI",
-      "version": "0.6-1",
-      "sha256": "0ivzbmvwxx2v0pk7f1y84jxad5pvpl4m6czmjkga52wnk0y5dnn1",
-      "depends": ["R_utils", "brew", "devtools", "git2r", "renv", "roxygen2", "rstudioapi", "sf", "terra", "xfun", "xml2", "yaml"]
+      "version": "0.6-2",
+      "sha256": "01k15a88x574vcmgclglfrm5lm1jb97hgjwy13w388y4r45x27wk",
+      "depends": ["R_utils", "brew", "devtools", "renv", "roxygen2", "rstudioapi", "sf", "terra", "xfun", "xml2", "yaml"]
     },
     "linkcomm": {
       "name": "linkcomm",
@@ -78997,6 +81889,12 @@
       "sha256": "005lagzgyc05ssy4bvj6vlfjypqpacqh60bfj8yhj75b81m321a9",
       "depends": ["chandwich", "exdex", "revdbayes", "rust", "sandwich"]
     },
+    "litedown": {
+      "name": "litedown",
+      "version": "0.4",
+      "sha256": "1fm0932z35flb7rwx3pydifrfmw62b7hrm6qr7b0wv9gcqvi6pxx",
+      "depends": ["commonmark", "xfun"]
+    },
     "liteq": {
       "name": "liteq",
       "version": "1.1.0",
@@ -79005,9 +81903,9 @@
     },
     "literanger": {
       "name": "literanger",
-      "version": "0.0.2",
-      "sha256": "0n39kr8gnps5vyifbafq736s05h939p7ys31s58zz3rg64k6l1bp",
-      "depends": ["cpp11"]
+      "version": "0.1.1",
+      "sha256": "15y9jmpml0a5j5fafg7i7zgjxy17bcm7il8gb3cjj8nn2zphamy4",
+      "depends": ["Rcereal", "cpp11"]
     },
     "litteR": {
       "name": "litteR",
@@ -79041,8 +81939,8 @@
     },
     "liver": {
       "name": "liver",
-      "version": "1.15",
-      "sha256": "0b786f9r3i2cskshzqgwkb2wx33xv82kl2rxfy047jda2y938lhc",
+      "version": "1.18",
+      "sha256": "0lrqbdj0a3dbdl2xdn94jdc0sv3cns0bnkfd3z94c571z35xzx56",
       "depends": ["class", "ggplot2"]
     },
     "ljr": {
@@ -79077,8 +81975,8 @@
     },
     "lm_br": {
       "name": "lm.br",
-      "version": "2.9.7",
-      "sha256": "15ddkfy4166qkll6sf23v139mkgv67vw45haiqvf1zxfi5gc53md",
+      "version": "2.9.8",
+      "sha256": "1v9izpyklxsm8bi2kaksgbzzpdrj33p4dxx01mxgal3dk5101v0b",
       "depends": ["Rcpp"]
     },
     "lmDiallel": {
@@ -79089,8 +81987,8 @@
     },
     "lmForc": {
       "name": "lmForc",
-      "version": "0.1.0",
-      "sha256": "0v1r7yv0i3sc6cii78d9f9d3a6rvpvwrs6k3byi825r497xjgw3j",
+      "version": "1.0.0",
+      "sha256": "1dx65bnwz2x83yw4v86zzwkgvyy3vh3609yxv80nz1aq4hj54zqw",
       "depends": []
     },
     "lmPerm": {
@@ -79113,8 +82011,8 @@
     },
     "lmap": {
       "name": "lmap",
-      "version": "0.1.2",
-      "sha256": "08bdznssicrl493zv5qa1vyjh38zhb83rwnipq83zi4qfp2s8n5p",
+      "version": "0.1.3",
+      "sha256": "04sk5f4f753b8r24w1004dx13gc9m7ix9vi1r9wlcn5rg0k4j1g1",
       "depends": ["MASS", "Rfast", "dplyr", "fmdu", "ggforce", "ggplot2", "ggrepel", "magrittr", "nnet"]
     },
     "lmboot": {
@@ -79137,8 +82035,8 @@
     },
     "lme4breeding": {
       "name": "lme4breeding",
-      "version": "1.0.30",
-      "sha256": "1zwbb4f2r0gmdvcnf4sh38ispqb7gifxi7gl04rfyxabbsanmvbb",
+      "version": "1.0.40",
+      "sha256": "1dlgdpd1gzwkkvijqg479r6fx4jbzg6ifv0hwrxqlilxva84fya0",
       "depends": ["Matrix", "crayon", "lme4"]
     },
     "lmeInfo": {
@@ -79185,14 +82083,14 @@
     },
     "lmhelprs": {
       "name": "lmhelprs",
-      "version": "0.3.0",
-      "sha256": "1q7awxnl0ll3ds8hshflw1s1mwdrw7d4nh8ibjci4ds2lgvhyjgm",
+      "version": "0.4.0",
+      "sha256": "1ari7wmg5xfwp7902zi0yfi6hlicwvl0h098h8090rsklsz65mvp",
       "depends": []
     },
     "lmls": {
       "name": "lmls",
-      "version": "0.1.0",
-      "sha256": "0gv7mawdpcqvvf3f61aa1l0yi32z9bs41i36ggn1nwga837g33k3",
+      "version": "0.1.1",
+      "sha256": "165wr49fnmd1xv33hic4b20nfmv4j86y7z90prlgjqhh8cdnk7nm",
       "depends": ["generics"]
     },
     "lmm": {
@@ -79215,14 +82113,14 @@
     },
     "lmodel2": {
       "name": "lmodel2",
-      "version": "1.7-3",
-      "sha256": "1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb",
+      "version": "1.7-4",
+      "sha256": "1rclwaq2hqn6qpkzl686sikkwc5lrmbbdgpsf8qxwqkn2f0xia4f",
       "depends": []
     },
     "lmom": {
       "name": "lmom",
-      "version": "3.0",
-      "sha256": "1482kbb4cm65m2d1xlxml93yjd3d43iiap6nvzg5vd33i9iyh2jb",
+      "version": "3.2",
+      "sha256": "165dqz8yv3wak77935shz8axcck6jg5h7fnyy0ih9dzin3npng6s",
       "depends": []
     },
     "lmomPi": {
@@ -79233,8 +82131,8 @@
     },
     "lmomRFA": {
       "name": "lmomRFA",
-      "version": "3.6",
-      "sha256": "1av113gxif93v26g2x4c4l4fbax42w5bv3560p5sgdxbnb7sdmqp",
+      "version": "3.8",
+      "sha256": "125svks0i6yig6ydllgzyi5jaywaj8l9mmbv95wv2dzw4h7i37k9",
       "depends": ["lmom"]
     },
     "lmomco": {
@@ -79297,16 +82195,22 @@
       "sha256": "1y5zf2m4kgysm15xnbd1zc21svif2mxpm1zla4nhg68hljl41j8s",
       "depends": ["MASS", "Rcpp", "foreach", "gtools", "mclust", "pgmm", "stringr"]
     },
+    "lnmixsurv": {
+      "name": "lnmixsurv",
+      "version": "3.1.6",
+      "sha256": "0ddjsnl8r5sk1jnf2kg6yh80qankfdjkfcwx9fjm2mm4yk8cf5bv",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppGSL", "RcppParallel", "broom", "dplyr", "generics", "ggplot2", "hardhat", "parsnip", "posterior", "purrr", "readr", "rlang", "survival", "tibble", "tidyr", "tidyselect"]
+    },
     "loa": {
       "name": "loa",
-      "version": "0.2.48.3",
-      "sha256": "1fa1yxpsydx2kjbnj00vn9zv4dw9awng4lxrcllcgzkir9bikgq0",
+      "version": "0.3.1.1",
+      "sha256": "1j99lh6sv6gax29q66277w4yxwnyv99gm4nixqlrhn9b2q6rjwbd",
       "depends": ["MASS", "OpenStreetMap", "RColorBrewer", "RgoogleMaps", "lattice", "mgcv", "plyr", "png", "sp"]
     },
     "loadeR": {
       "name": "loadeR",
-      "version": "1.2.0",
-      "sha256": "0hxvmhl0xyyxjiinbh55clwdzihpxyw61k1gm6wcvj8hs21y8sl0",
+      "version": "1.3.0",
+      "sha256": "06jzk5mdp5cx6aj71lb0g8zwrqv4r7m0gckn8aq5vd244nr53l5r",
       "depends": ["DT", "caret", "colourpicker", "config", "data_table", "echarts4r", "golem", "htmltools", "htmlwidgets", "readxl", "rlang", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "writexl"]
     },
     "loadings": {
@@ -79437,8 +82341,8 @@
     },
     "locuszoomr": {
       "name": "locuszoomr",
-      "version": "0.3.1",
-      "sha256": "1rp8gv846jfi688xkl0mbspbj9rzs0bqddl5fmp13vb1kslys8w5",
+      "version": "0.3.5",
+      "sha256": "0g9cgj8rkq44n2s0yv6dh2viw6n2hgmjj88lrziq5vffhhxbpj4j",
       "depends": ["AnnotationFilter", "BiocGenerics", "GenomeInfoDb", "GenomicRanges", "IRanges", "LDlinkR", "cowplot", "dplyr", "ensembldb", "gggrid", "ggplot2", "ggrepel", "memoise", "plotly", "rlang", "rtracklayer", "zoo"]
     },
     "lodGWAS": {
@@ -79477,6 +82381,12 @@
       "sha256": "0j9vvh2ys09hy2k3mbrlf0p493ymrxvfsdcjw0p6rlls54z9lqqc",
       "depends": ["dplyr", "ggplot2", "gridExtra", "magrittr", "metR", "rlang", "rootSolve", "tidyr", "viridis"]
     },
+    "lofifonts": {
+      "name": "lofifonts",
+      "version": "0.1.3",
+      "sha256": "162l0ijgam1jykpdzrmhscqai67m9dlarxnqjzaq932g3aib9bqg",
+      "depends": []
+    },
     "log": {
       "name": "log",
       "version": "1.1.1",
@@ -79485,8 +82395,8 @@
     },
     "log4r": {
       "name": "log4r",
-      "version": "0.4.3",
-      "sha256": "0k4hyln1mqxkp8y383mgs0ds0h05hs7d2mpicfnz7n586nfx9qyz",
+      "version": "0.4.4",
+      "sha256": "0cp7divn39mdy5hg42ayva1r8iqmnpn7crz3h1kdd4pla8jjs7zz",
       "depends": []
     },
     "logKDE": {
@@ -79515,8 +82425,8 @@
     },
     "logconcens": {
       "name": "logconcens",
-      "version": "0.17-3",
-      "sha256": "1a9p4pr8pva2bpqbq4wzrcisfffjvaigbvk6ixm2klys0nkwlbhp",
+      "version": "0.17-4",
+      "sha256": "0z0cd2sa4p27f8hyklg80l1vv3nahkr3q4ipjz31cpnkgc8flmxa",
       "depends": []
     },
     "logcondens": {
@@ -79533,8 +82443,8 @@
     },
     "logger": {
       "name": "logger",
-      "version": "0.3.0",
-      "sha256": "0ivhrmq408pb7gx7yhmrn6mjkx15dvkb4bpk4z5y642l3j2vv9vd",
+      "version": "0.4.0",
+      "sha256": "1ph4al2ish2c3zpznr2zn7wg4hjn1bslywc1vv6smrxfcch3n90g",
       "depends": []
     },
     "logging": {
@@ -79563,14 +82473,14 @@
     },
     "logib": {
       "name": "logib",
-      "version": "0.1.2",
-      "sha256": "09c528wrgyk0cg1flx2fsl53q4v9442rr44g9kh5jznqs788608b",
+      "version": "0.2.0",
+      "sha256": "1zf6xw88ikp587g9whqx4cs0lrf2lxivqqpxz0457v7r971g02ih",
       "depends": ["lubridate", "readxl"]
     },
     "logicDT": {
       "name": "logicDT",
-      "version": "1.0.4",
-      "sha256": "0i60wqhhmscwhbcyril4n2g1hxja5w225s4vvnk778kd7s1ig6g2",
+      "version": "1.0.5",
+      "sha256": "1ghs7qp1sjsxrj1a96vb1h7bxrvy208i9dqjy9fb6gj101ssjvj9",
       "depends": ["glmnet"]
     },
     "logihist": {
@@ -79743,8 +82653,8 @@
     },
     "longitudinalData": {
       "name": "longitudinalData",
-      "version": "2.4.5.1",
-      "sha256": "1x7n2jlmils9iw0ynq1hvixvrqzpzh37xi6wx0qawab1wm9igc5m",
+      "version": "2.4.7",
+      "sha256": "12saa9ycmh2ysap0k36fgwcf2skjkrhdf3pk67xsh6qpw1h65dhc",
       "depends": ["class", "clv", "misc3d", "rgl"]
     },
     "longitudinalcascade": {
@@ -79773,15 +82683,15 @@
     },
     "longpower": {
       "name": "longpower",
-      "version": "1.0.25",
-      "sha256": "023s4ckc6695l51025qji2ggkad8cj0gz5h4zmk7i5d3pwk7g14y",
+      "version": "1.0.27",
+      "sha256": "1n6g2frmpsg8990gcvnky9s96qql816zn1r01vn7kjbkyba99vx9",
       "depends": ["lme4", "nlme"]
     },
     "longreadvqs": {
       "name": "longreadvqs",
-      "version": "0.1.2",
-      "sha256": "07pdnipq4nl7v8sgbfrcz7slz36gnfj3zj6i6pcvq6zh4fy1bw3g",
-      "depends": ["Biostrings", "QSutils", "RColorBrewer", "ape", "cowplot", "dplyr", "ggplot2", "ggpubr", "magrittr", "plyr", "purrr", "reshape2", "scales", "seqinr", "stringdist", "stringr", "tibble", "tidyr"]
+      "version": "0.1.3",
+      "sha256": "07b55vkklz3qrkdlsnydkpj1kgrkqmprvd9p7iqk86cyr4bdhgna",
+      "depends": ["Biostrings", "IRanges", "QSutils", "RColorBrewer", "ape", "cowplot", "dplyr", "ggplot2", "ggpubr", "magrittr", "plyr", "purrr", "reshape2", "scales", "seqinr", "stringdist", "stringr", "tibble", "tidyr"]
     },
     "longsurr": {
       "name": "longsurr",
@@ -79887,15 +82797,15 @@
     },
     "lori": {
       "name": "lori",
-      "version": "2.2.2",
-      "sha256": "1153ilp1i849rwbbms4vfc6c1mxgpav04zfqm2sdj7s63nvknx6r",
+      "version": "2.2.3",
+      "sha256": "06x6p2f315aw3a3j377ay1slhryg7nb14lb9qpchx9cg4qq0f8nv",
       "depends": ["data_table", "rARPACK", "svd"]
     },
     "lotri": {
       "name": "lotri",
-      "version": "0.4.3",
-      "sha256": "1r24ldi8asa2n1w4czrwl5kp6b7xq27prrsxf23f436zfc4hhjvl",
-      "depends": ["crayon"]
+      "version": "1.0.0",
+      "sha256": "15myyigrlfc8gmasaf3z9g3dy44c19814ydvql4pi4867cfmgi4x",
+      "depends": ["checkmate", "cpp11", "cpp11armadillo", "crayon"]
     },
     "lotterybr": {
       "name": "lotterybr",
@@ -79903,6 +82813,12 @@
       "sha256": "1p0cv9g01l02917nndnw6f0wkms4kqpyiiddpjg251iy5j4qyl1k",
       "depends": ["dplyr", "ggplot2", "plotly", "shiny"]
     },
+    "lovecraftr": {
+      "name": "lovecraftr",
+      "version": "1.2.0",
+      "sha256": "16pnbfqdbn0n0zmm9dzpbpx7gyifrh5qybqy3w0swi3clvz007ds",
+      "depends": ["magrittr", "rvest", "stringr"]
+    },
     "lowmemtkmeans": {
       "name": "lowmemtkmeans",
       "version": "0.1.2",
@@ -79917,8 +82833,8 @@
     },
     "lpSolve": {
       "name": "lpSolve",
-      "version": "5.6.20",
-      "sha256": "1nr1vjz6ma42kxbcay4g9j30r9srkbw79f06sdnc68sid2h0dziz",
+      "version": "5.6.23",
+      "sha256": "1mx25kas78w9jygxk56qpk0r20i8fss1zj69fh0y8mpjsc3rdhs6",
       "depends": []
     },
     "lpSolveAPI": {
@@ -79941,8 +82857,8 @@
     },
     "lpcde": {
       "name": "lpcde",
-      "version": "0.1.4",
-      "sha256": "0gb130x8177bcw3snrndm87p21na6v3zayqcn9z16rviiyy1nscg",
+      "version": "0.1.5",
+      "sha256": "06hfgqh4fdzajd1h9nc9bzb8qnpiajv7cjw3655ml7lr0r51c1pq",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "combinat", "ggplot2", "mvtnorm", "purrr"]
     },
     "lpda": {
@@ -79953,8 +82869,8 @@
     },
     "lpdensity": {
       "name": "lpdensity",
-      "version": "2.4",
-      "sha256": "1vbbvg2wb2jggqls185bwpm8c8ky6693kai3lr5xz4r8f6ivdm29",
+      "version": "2.5",
+      "sha256": "15w6paw8kd0sblmsif7bg0g6zm47c87x8isjj0a36gs65fwx5mad",
       "depends": ["MASS", "ggplot2"]
     },
     "lphom": {
@@ -80031,8 +82947,8 @@
     },
     "lrstat": {
       "name": "lrstat",
-      "version": "0.2.9",
-      "sha256": "046j8v4faj4hfap7hn1bdin7zwxbck8732c3ay8ncxilh46bpgs9",
+      "version": "0.2.11",
+      "sha256": "1apn1wdmpn2ymb4g7lskw60dc9fhdppfyk5g3ckfkh7x9fv2vqyi",
       "depends": ["Rcpp", "lpSolve", "mvtnorm", "shiny"]
     },
     "lsa": {
@@ -80073,8 +82989,8 @@
     },
     "lsirm12pl": {
       "name": "lsirm12pl",
-      "version": "1.3.2",
-      "sha256": "0fsn1p9jdh3v64b473g1jz0nv0vr1psza9s4lijflyc2rmgnx9cd",
+      "version": "1.3.3",
+      "sha256": "1sq54klskfdml2qyp7n0cc3zk58hk4x80izn3dnkslys1lj5adah",
       "depends": ["GPArotation", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "dplyr", "fpc", "ggplot2", "gridExtra", "kernlab", "pROC", "plotly", "plyr", "purrr", "rlang", "spatstat", "spatstat_geom", "spatstat_random", "tidyr"]
     },
     "lsl": {
@@ -80103,8 +83019,8 @@
     },
     "lsnstat": {
       "name": "lsnstat",
-      "version": "1.0.0",
-      "sha256": "1ydda46j5yv51yq1pgf4nihsg5ihayk603vn3yxzhnnb1r3azh4w",
+      "version": "1.0.1",
+      "sha256": "0ig1ndbnng052ww0fmw5k7lwb0whzg9ychww40h7mdg3dpiyswi5",
       "depends": ["dplyr", "httr", "jsonlite"]
     },
     "lspartition": {
@@ -80157,9 +83073,9 @@
     },
     "ltertools": {
       "name": "ltertools",
-      "version": "1.0.0",
-      "sha256": "1jfldvhhzxnpvssgzwjyjg442hwkg04zw7f1g2723mij73byk3dd",
-      "depends": ["dplyr", "generics", "ggplot2", "magrittr", "purrr", "readxl", "rlang", "stringr", "tidyr"]
+      "version": "1.1.0",
+      "sha256": "1xjcpwniaim9kxrydqnjbl8fchsxnisr44acxzdr7s0xbjz8lvmi",
+      "depends": ["RJSONIO", "dplyr", "generics", "ggplot2", "magrittr", "purrr", "readxl", "stringr", "tidyr"]
     },
     "ltm": {
       "name": "ltm",
@@ -80181,8 +83097,8 @@
     },
     "ltsa": {
       "name": "ltsa",
-      "version": "1.4.6",
-      "sha256": "10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186",
+      "version": "1.4.6.1",
+      "sha256": "0apiknfi0jhd2pn27ybid60ws8xbj5pgv5gak4y619g2jzmy0229",
       "depends": []
     },
     "ltsk": {
@@ -80211,10 +83127,16 @@
     },
     "lubridate": {
       "name": "lubridate",
-      "version": "1.9.3",
-      "sha256": "1zvzycng2hsks9d7552nb93abzjrs43c975rc16s3c1is8318vib",
+      "version": "1.9.4",
+      "sha256": "1ha68ri36gcq573j7s71m284166qd1ywran62h9d88nn4gi7wjw6",
       "depends": ["generics", "timechange"]
     },
+    "lubrilog": {
+      "name": "lubrilog",
+      "version": "1.1.0",
+      "sha256": "166787agrp4a0gnm8vs72q6cgr1vha1g3d6yhdsla76l394rzq5n",
+      "depends": ["cli", "lubridate"]
+    },
     "luca": {
       "name": "luca",
       "version": "1.0-6",
@@ -80245,6 +83167,12 @@
       "sha256": "0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq",
       "depends": ["ncdf4", "raster"]
     },
+    "lulab_utils": {
+      "name": "lulab.utils",
+      "version": "0.0.4",
+      "sha256": "0rll4x1fjxr1308fhymi40cml31ysh0z45vzq8hprplr9f5fqrqc",
+      "depends": ["boot", "car", "descr", "dplyr", "httr2", "magrittr", "openxlsx", "purrr", "rappdirs", "stringr", "table1"]
+    },
     "lulcc": {
       "name": "lulcc",
       "version": "1.0.4",
@@ -80305,6 +83233,12 @@
       "sha256": "0zby40866kvqxdz4hk6r0f4rfh7rzmy0n899cjjg5rqzcap7s5di",
       "depends": ["RColorBrewer", "ggplot2", "tibble"]
     },
+    "lwc2022": {
+      "name": "lwc2022",
+      "version": "1.0.0",
+      "sha256": "0w05bsin1wl00h0s1na2acf37jwdh4x9f09p9kr1nz1kvax861k8",
+      "depends": ["dplyr"]
+    },
     "lwgeom": {
       "name": "lwgeom",
       "version": "0.2-14",
@@ -80319,8 +83253,8 @@
     },
     "lzstring": {
       "name": "lzstring",
-      "version": "0.1.2",
-      "sha256": "1wp822my088gzp8n1w97rk081qijls3p0lx749l1y68j44mhk8w9",
+      "version": "0.1.3",
+      "sha256": "1vyh0lbnz2mpz2zs3pbh9dbabh9k774hz5qv3ir84blmkmfi1hmf",
       "depends": ["cpp11"]
     },
     "m2b": {
@@ -80409,8 +83343,8 @@
     },
     "mMARCH_AC": {
       "name": "mMARCH.AC",
-      "version": "2.9.2.0",
-      "sha256": "0lp32m6cfplbm72g0j1cm1c7rcpmy5jrsd3p577p9a4bwqf5ynxc",
+      "version": "2.9.4.0",
+      "sha256": "0mrhr1f5qvqdv1mwzd8iqgfjwq9n4ny1s8a5sppkdp9zyvvmwv81",
       "depends": ["ActCR", "ActFrag", "GGIR", "abind", "accelerometry", "cosinor", "cosinor2", "denseFLMM", "dplyr", "ineq", "kableExtra", "minpack_lm", "refund", "survival", "tidyr", "xlsx", "zoo"]
     },
     "mMPA": {
@@ -80421,8 +83355,8 @@
     },
     "mRMRe": {
       "name": "mRMRe",
-      "version": "2.1.2.1",
-      "sha256": "1nbz2rq6fzzy01vhizpszw47c8yha1rvks6hf5dh0dx4h8p3jg6m",
+      "version": "2.1.2.2",
+      "sha256": "02cj6dvh463f80alb4qchflvgssid56i220yi7s63ypclr9knb0x",
       "depends": ["igraph", "survival"]
     },
     "mRc": {
@@ -80433,8 +83367,8 @@
     },
     "mRpostman": {
       "name": "mRpostman",
-      "version": "1.1.2",
-      "sha256": "0ss00mxk0s3lpxrhy3hszx6hmf7qiycl8vdif1fdzxz5yglki4xa",
+      "version": "1.1.4",
+      "sha256": "0jg1mgcqcsms0ggirxxwphjhmwbwsjsb05frzwlnrri3iz4sdym0",
       "depends": ["R6", "assertthat", "base64enc", "curl", "magrittr", "rvest", "stringi", "stringr", "xml2"]
     },
     "mSTEM": {
@@ -80479,11 +83413,17 @@
       "sha256": "0slyigq90bn2dn09s2ipc13glsywwzs7y5d80zyazwwr51i23xsq",
       "depends": ["MASS", "TestDesign", "diagram", "readxl"]
     },
+    "mabacR": {
+      "name": "mabacR",
+      "version": "0.1.0",
+      "sha256": "1km8yi69xc5n2ksyps2ggw21b7zy972bw3hyazj026619j71dlqg",
+      "depends": []
+    },
     "mable": {
       "name": "mable",
-      "version": "3.1.3",
-      "sha256": "1ilhs04hiqdqwc13sp9szl5rgnc4vv6jczzq92dc7d70a5vr7m40",
-      "depends": ["doParallel", "foreach", "icenReg", "iterators", "survival"]
+      "version": "4.1.1",
+      "sha256": "1sq0i4zdd0r55qzlsmx9p88hxyvbzhaga2bx2akxmz7x7crqbz2j",
+      "depends": ["LowRankQP", "doParallel", "foreach", "icenReg", "iterators", "mnormt", "quadprog", "rlang", "survival"]
     },
     "macc": {
       "name": "macc",
@@ -80553,8 +83493,8 @@
     },
     "maditr": {
       "name": "maditr",
-      "version": "0.8.4",
-      "sha256": "15jhchxa5ckir6n2gz4vlsvlz64mxqlry11zqpma32wj901d18r4",
+      "version": "0.8.5",
+      "sha256": "0f0l25l3j84akswmbk0gxl5jrp6grs8vp24dqnaxrhqimz6iy8i1",
       "depends": ["data_table", "magrittr"]
     },
     "madness": {
@@ -80571,8 +83511,8 @@
     },
     "madrat": {
       "name": "madrat",
-      "version": "3.6.4",
-      "sha256": "03wkzpr0nx50li0g69fn2fznfh6nbg4sdpymsilx3387v50vc9vs",
+      "version": "3.15.6",
+      "sha256": "025mh4x0035q3xgscghpvdwfysm2rzimr156la1bhrbp9dpf7iyl",
       "depends": ["Matrix", "callr", "digest", "igraph", "magclass", "pkgload", "renv", "stringi", "withr", "yaml"]
     },
     "madshapR": {
@@ -80589,9 +83529,15 @@
     },
     "maestro": {
       "name": "maestro",
-      "version": "0.1.2",
-      "sha256": "0mdrphwsr4wywgndi90hif688sah7brx45g62q8hjbyqpvx272ly",
-      "depends": ["R_utils", "cli", "dplyr", "glue", "logger", "lubridate", "purrr", "rlang", "roxygen2", "tictoc", "timechange"]
+      "version": "0.4.1",
+      "sha256": "086rmgiswpwy1d5zpcdrna8afgpa0b252xyllj5bvq1iv71sv1c5",
+      "depends": ["R6", "R_utils", "cli", "dplyr", "glue", "lifecycle", "logger", "lubridate", "purrr", "rlang", "roxygen2", "tictoc", "timechange"]
+    },
+    "mafR": {
+      "name": "mafR",
+      "version": "1.1.6",
+      "sha256": "1cqqrgn9br1rpn6zqngammdwrzx32nds7f2nn151nwn1hwg9xin7",
+      "depends": ["reticulate"]
     },
     "magclass": {
       "name": "magclass",
@@ -80631,8 +83577,8 @@
     },
     "magick": {
       "name": "magick",
-      "version": "2.8.4",
-      "sha256": "02pa6kkymj4idawnffqk2fn6zgkw33ib6541vclvg5hd1wvh7j25",
+      "version": "2.8.5",
+      "sha256": "0nhwl46lvsgxhnw6cq71sx5rpa1g693fdw88hbqr8msi2qy91vga",
       "depends": ["Rcpp", "curl", "magrittr"]
     },
     "magickGUI": {
@@ -80671,6 +83617,12 @@
       "sha256": "1c2n8avrhx0lvw9hi5slymm49lzf37hbkqzkqy230aikgmpv0cpa",
       "depends": ["data_table", "ggplot2", "lpSolve", "quadprog", "tidyr"]
     },
+    "maicplus": {
+      "name": "maicplus",
+      "version": "0.1.1",
+      "sha256": "0qcfpr78gj625svgndclkyy2l482fr57jn8pcnx8n015jvib8mya",
+      "depends": ["DescTools", "MASS", "boot", "lmtest", "lubridate", "sandwich", "stringr", "survival"]
+    },
     "mailR": {
       "name": "mailR",
       "version": "0.8",
@@ -80727,8 +83679,8 @@
     },
     "makemyprior": {
       "name": "makemyprior",
-      "version": "1.2.1",
-      "sha256": "02zhgskkfr964g813rly0lym4j0msgmyggfgz6l00vcpnffqy9fq",
+      "version": "1.2.2",
+      "sha256": "03njj91hwmfpxwv3srjfylcnv02h17f5dnbawnrqxrgakpwsxib4",
       "depends": ["MASS", "Matrix", "ggplot2", "rlang", "shiny", "shinyBS", "shinyjs", "visNetwork"]
     },
     "makepipe": {
@@ -80739,8 +83691,8 @@
     },
     "maketools": {
       "name": "maketools",
-      "version": "1.3.0",
-      "sha256": "06n14v9wrvbdplb42w7yqjjf8r995335fs2pn2b5848m0mrknsbv",
+      "version": "1.3.1",
+      "sha256": "03ng6lfs1phi41zvpdc2mp336c4smb7882hh76nis5qn8njmpf3b",
       "depends": ["sys"]
     },
     "makeunique": {
@@ -80763,8 +83715,8 @@
     },
     "malariaAtlas": {
       "name": "malariaAtlas",
-      "version": "1.6.1",
-      "sha256": "05d62m4w93bfx868sk8w6navw8w5z0jx30w2wnzma27gjydyc0z1",
+      "version": "1.6.3",
+      "sha256": "1ipjhds73pcw30y3ks9glqlxng97fnavvpi1v9s01jr7m0l587xs",
       "depends": ["dplyr", "future_apply", "ggnewscale", "ggplot2", "gridExtra", "httr", "jsonlite", "lifecycle", "lubridate", "ows4R", "rlang", "sf", "stringr", "terra", "tidyr", "tidyterra", "xml2"]
     },
     "malaytextr": {
@@ -80775,10 +83727,16 @@
     },
     "maldipickr": {
       "name": "maldipickr",
-      "version": "1.3.0",
-      "sha256": "1k534c8x3ygf44r7q1nybd8b6gl3pw0h0r6ddwc35jxq1vmxx6qi",
+      "version": "1.3.1",
+      "sha256": "1324dgmkigdynkph52afwyn5iycw37ndl6jfsqjgarm9hyr72dy2",
       "depends": ["MALDIquant", "dplyr", "lifecycle", "magrittr", "readBrukerFlexData", "rlang", "tibble", "tidyr", "tidyselect"]
     },
+    "mall": {
+      "name": "mall",
+      "version": "0.1.0",
+      "sha256": "1367g2f9idlr463h8aw3bz02fzggy76mhq0k32zf1n0qh1m2900z",
+      "depends": ["cli", "dplyr", "fs", "glue", "jsonlite", "ollamar", "rlang"]
+    },
     "mallet": {
       "name": "mallet",
       "version": "1.3.0",
@@ -80871,21 +83829,21 @@
     },
     "manymome": {
       "name": "manymome",
-      "version": "0.2.2",
-      "sha256": "1j7rvk3xdxxji7l1jqi0fgv9x9vwrymdmfpj7plg8vc53apnfy5f",
+      "version": "0.2.5",
+      "sha256": "0ppd42xysg388s6b8d09w7rfj043354zmvszahxz0sdng8vsf9m4",
       "depends": ["MASS", "boot", "ggplot2", "igraph", "lavaan", "pbapply"]
     },
     "manymome_table": {
       "name": "manymome.table",
-      "version": "0.3.0",
-      "sha256": "01znxw82k2ycp8cncbayn0c4jhkydd5nvydfyxv1bwgixdkad1ff",
+      "version": "0.4.0",
+      "sha256": "1zpr0xqybabm7k9xxh7ahg8iyc0wqpw42711225pwpdzl7y43bi7",
       "depends": ["flextable", "manymome"]
     },
     "manynet": {
       "name": "manynet",
-      "version": "1.0.2",
-      "sha256": "0bqd46n30rsy87nc5ylwp7k0wzfmddkq3in38420c4rds3gf1m51",
-      "depends": ["dplyr", "ggplot2", "ggraph", "igraph", "minMSE", "network", "pillar", "tidygraph"]
+      "version": "1.3.2",
+      "sha256": "1nspzw0q80nr5w6pmjaggxy1mim872m36ik9caq2h1lydsaqm6vj",
+      "depends": ["cli", "dplyr", "ggplot2", "ggraph", "igraph", "network", "pillar", "tidygraph"]
     },
     "maotai": {
       "name": "maotai",
@@ -80895,8 +83853,8 @@
     },
     "mapSpain": {
       "name": "mapSpain",
-      "version": "0.9.1",
-      "sha256": "144i03v3sjq1fsywhc2dgkm7p5gg019gvd5milga6hiirnhm3k5d",
+      "version": "0.10.0",
+      "sha256": "0ylaca6vnyazfna17ybf41sncj57qwpfgv5xb2i8fw4c8jxn8f4s",
       "depends": ["countrycode", "giscoR", "rappdirs", "sf"]
     },
     "mapStats": {
@@ -80919,8 +83877,8 @@
     },
     "mapboxapi": {
       "name": "mapboxapi",
-      "version": "0.6",
-      "sha256": "1nvs5ikg3vrcvbidpl50gp84vjig7j3k1wjkhqk6jpr4dspi4p60",
+      "version": "0.6.2",
+      "sha256": "1sf01288m3hix7mgkp529vasnmxs1qw508v9i5w931nla03wsl3h",
       "depends": ["aws_s3", "curl", "dplyr", "geojsonsf", "htmltools", "httr", "jpeg", "jsonlite", "leaflet", "magick", "png", "protolite", "purrr", "raster", "rlang", "sf", "slippymath", "stringi", "tidyr", "units"]
     },
     "mapboxer": {
@@ -80967,8 +83925,8 @@
     },
     "mapgl": {
       "name": "mapgl",
-      "version": "0.1.2",
-      "sha256": "0azjdkywmyn9njddy1kish69as8dg9yp18qly6fqljbh50c2rlkj",
+      "version": "0.1.4",
+      "sha256": "1xs2csjagz7brlfjc7msnhs9csbfw61lfvbs1682wj4hnmzn0mmg",
       "depends": ["base64enc", "classInt", "geojsonsf", "htmltools", "htmlwidgets", "rlang", "sf", "terra"]
     },
     "mapi": {
@@ -80977,6 +83935,18 @@
       "sha256": "1yljvapzkb43i2sbqsmn5aqp95hm8gjkz8m41x1chwyfddrzjsbw",
       "depends": ["Rcpp", "data_table", "pbapply", "sf"]
     },
+    "mapindia": {
+      "name": "mapindia",
+      "version": "1.0.1",
+      "sha256": "1549d2w5nhrpj0zjv7h0x2z8cykkixdgcbmjsyfp0clp51769qn2",
+      "depends": ["ggplot2", "mapindiatools", "rlang", "sf", "vdiffr"]
+    },
+    "mapindiatools": {
+      "name": "mapindiatools",
+      "version": "1.0.1",
+      "sha256": "1i3cczpsc7xviw4fghiwqsc9s3np3kfd3ymc261i73khfcxdzcbf",
+      "depends": ["dplyr", "readr", "rlang", "sf", "stringr", "tidyr"]
+    },
     "mapiso": {
       "name": "mapiso",
       "version": "0.3.0",
@@ -80985,15 +83955,15 @@
     },
     "maplegend": {
       "name": "maplegend",
-      "version": "0.1.0",
-      "sha256": "1jngbampps5gn3xdy292466qq4nhx0k7c08mams84xmmb9jbq0h0",
+      "version": "0.2.0",
+      "sha256": "0phf116pf8hfs7di7hwjj7777wjzlw00hmn25ldkg7s8dbhsjhy6",
       "depends": []
     },
     "mapme_biodiversity": {
       "name": "mapme.biodiversity",
-      "version": "0.8.0",
-      "sha256": "1fx8779vp4a1k5qy4csqhj5wmhd7aamkzl9mlwk6v4rx667szdzj",
-      "depends": ["dplyr", "furrr", "httr", "jsonlite", "magrittr", "purrr", "sf", "terra", "tibble", "tidyr"]
+      "version": "0.9.3",
+      "sha256": "1zygn11wlvzp88visgrrppqnwy8b20pw95x09px7adl5961sk4j0",
+      "depends": ["dplyr", "furrr", "httr2", "jsonlite", "magrittr", "purrr", "sf", "terra", "tibble", "tidyr"]
     },
     "mapmisc": {
       "name": "mapmisc",
@@ -81003,10 +83973,16 @@
     },
     "mapmixture": {
       "name": "mapmixture",
-      "version": "1.1.3",
-      "sha256": "0ndr0ds8fjlrx54042ch9ks07b6983fnqj84zih57aa4xk8y8sng",
+      "version": "1.1.4",
+      "sha256": "0wr7p5q0kin59cr9fayvbgb9c1jdm0nv8chy63nvznrhcw361xik",
       "depends": ["bslib", "colourpicker", "dplyr", "ggplot2", "ggspatial", "htmltools", "purrr", "rlang", "rnaturalearthdata", "sf", "shiny", "shinyFeedback", "shinyWidgets", "shinyjs", "stringr", "tidyr", "waiter"]
     },
+    "mappeR": {
+      "name": "mappeR",
+      "version": "1.3.0",
+      "sha256": "11j696xds77dhvx351vlb968p4mari21yqpsidhvcmzrpdr1kbn4",
+      "depends": ["fastcluster", "igraph"]
+    },
     "mapping": {
       "name": "mapping",
       "version": "1.4.1",
@@ -81045,8 +84021,8 @@
     },
     "maps": {
       "name": "maps",
-      "version": "3.4.2",
-      "sha256": "032b8348k8vjhwj0d58v7akjkvfpvqzfva0nl7acyy8pky47prak",
+      "version": "3.4.2.1",
+      "sha256": "1vsbjk4kqjd37j3aqz7nqc9zlzjdpprq1cp80pmdkz7n91y5rqqb",
       "depends": []
     },
     "mapsFinland": {
@@ -81081,14 +84057,14 @@
     },
     "mapsf": {
       "name": "mapsf",
-      "version": "0.11.0",
-      "sha256": "0vyy88fflkz5iaanbp77dxznw528ikr06q4q4srxcp0ylg71fq4m",
+      "version": "0.12.0",
+      "sha256": "1rxydssi9f0n9kgkvlcirzpdsnxn9a3gd7panljm1lqa92aqh1ck",
       "depends": ["classInt", "maplegend", "s2", "sf"]
     },
     "maptiles": {
       "name": "maptiles",
-      "version": "0.7.0",
-      "sha256": "064lxy2qzawbbdv69zpzkn2nbchvlcw4zjpxl5h44qrriivd60hh",
+      "version": "0.8.0",
+      "sha256": "0y2jybibpy09pi5cbdxab2abj01rm7nx8i9sfyp5575xyqhc1d45",
       "depends": ["curl", "digest", "png", "sf", "slippymath", "terra"]
     },
     "maptpx": {
@@ -81111,8 +84087,8 @@
     },
     "maq": {
       "name": "maq",
-      "version": "0.4.0",
-      "sha256": "1rfwnwx9qglr49ymhhpglywrc6w2ilryiwxykxy0rdawml4zcw3j",
+      "version": "0.5.0",
+      "sha256": "0k9rhvwrljxsjdjjiniln22i3cl7nn33yc4snpdkx85s1fjni9w5",
       "depends": ["Rcpp"]
     },
     "mar1s": {
@@ -81121,12 +84097,6 @@
       "sha256": "1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l",
       "depends": ["cmrutils", "fda", "zoo"]
     },
-    "maraca": {
-      "name": "maraca",
-      "version": "0.7",
-      "sha256": "0sy5vmgkbcr1gi7l0hkdzdmibkgs1yvbgj14sfi4jc8zabwbpkz2",
-      "depends": ["checkmate", "dplyr", "ggplot2", "hce", "lifecycle", "patchwork", "tidyr"]
-    },
     "marble": {
       "name": "marble",
       "version": "0.0.3",
@@ -81165,8 +84135,8 @@
     },
     "marginaleffects": {
       "name": "marginaleffects",
-      "version": "0.21.0",
-      "sha256": "1zq9xkaacgy3d3rsbhdjaprd352mcpbfwn9jazijx6csjs5pxqmp",
+      "version": "0.24.0",
+      "sha256": "047whcdmky8kq75f6696441ih17kn26mgrzdkjp3zam5scqaqr7p",
       "depends": ["Rcpp", "RcppEigen", "checkmate", "data_table", "generics", "insight", "rlang"]
     },
     "marginalizedRisk": {
@@ -81189,8 +84159,8 @@
     },
     "mark": {
       "name": "mark",
-      "version": "0.8.0",
-      "sha256": "16gzi253s6mdqr5axhp1fk0vcqc2sslnb8nmwjxarrcgh8d22ba3",
+      "version": "0.8.2",
+      "sha256": "1j6x92ghrzf129spc3vckgvamy17b2h9hgsgmjbkj1xc85lnmsfh",
       "depends": ["cli", "fs", "fuj", "magrittr", "rlang"]
     },
     "markdown": {
@@ -81249,8 +84219,8 @@
     },
     "markovchain": {
       "name": "markovchain",
-      "version": "0.9.5",
-      "sha256": "0z67i4j676gwvxyf1gw73x7jib7jm5jgyzqvami47mfvc3b2dygf",
+      "version": "0.10.0",
+      "sha256": "0lrvyd9m2i3bva6m7r2x905jrjkxd9xsaqin2v2w55a7ndr4zm7v",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "expm", "igraph"]
     },
     "markovmix": {
@@ -81259,6 +84229,18 @@
       "sha256": "07fzyg7szs4662jww6xpdlvki5wc60g2aw16884ghd8h9ch625yi",
       "depends": ["Rcpp", "dplyr", "forcats", "pillar", "purrr", "rlang", "tibble", "tidyr"]
     },
+    "markowitz": {
+      "name": "markowitz",
+      "version": "0.1.0",
+      "sha256": "03fifi14mskbs5yl5i48frswij0i7nkx3nlvf1k7rgz3abcs6v32",
+      "depends": ["dplyr", "magrittr", "tidyr", "tidyverse"]
+    },
+    "marlod": {
+      "name": "marlod",
+      "version": "0.1.2",
+      "sha256": "1xz8ax946mg7mhhm47hpv5s0jgvw9c3idanmgd6sch4ihz5d29yf",
+      "depends": ["MASS", "knitr", "miWQS", "quantreg"]
+    },
     "marmap": {
       "name": "marmap",
       "version": "1.0.10",
@@ -81313,6 +84295,12 @@
       "sha256": "1pdj0jdxrqss6hp20163fh1ywdd6wmwjl4s8gnpd3m9d1j955gr3",
       "depends": ["dplyr", "e1071", "lubridate", "magrittr", "raster", "sp"]
     },
+    "maskr": {
+      "name": "maskr",
+      "version": "0.1.0",
+      "sha256": "0vqxwhmyp9w0i76px6407k5fcyhs4s552xv45wdig4b8268mpnmj",
+      "depends": ["cli", "pillar", "rlang", "vctrs"]
+    },
     "masscor": {
       "name": "masscor",
       "version": "0.0.7.1",
@@ -81355,6 +84343,12 @@
       "sha256": "07c02dwim46f511fswbkr7s25inli7nblvf11gb5npz7p7yjc9bw",
       "depends": ["MASS", "coin", "dplyr", "magrittr", "mvtnorm", "plyr", "rcbsubset", "rlang", "sandwich", "weights"]
     },
+    "matchedcc": {
+      "name": "matchedcc",
+      "version": "0.1.1",
+      "sha256": "1h5cms9r62z0j2a5bnrg0x5g588pdilfl20rm4i2ywq4mp3ca3kr",
+      "depends": ["binom", "checkmate", "cli"]
+    },
     "matchingMarkets": {
       "name": "matchingMarkets",
       "version": "1.0-4",
@@ -81435,9 +84429,9 @@
     },
     "matlib": {
       "name": "matlib",
-      "version": "0.9.8",
-      "sha256": "0nknc17wxdf7svp91ak6y1h83yyacqfz528lwyqg9zdfcnax08nm",
-      "depends": ["MASS", "car", "dplyr", "rgl", "xtable"]
+      "version": "1.0.0",
+      "sha256": "1cbip4xnd854zb42pkr44094bg9jm4gxq37pf3837p1mwkb0w4vc",
+      "depends": ["MASS", "car", "dplyr", "knitr", "rgl", "rmarkdown", "rstudioapi", "xtable"]
     },
     "matman": {
       "name": "matman",
@@ -81489,8 +84483,8 @@
     },
     "matrixStats": {
       "name": "matrixStats",
-      "version": "1.3.0",
-      "sha256": "0ni4jgw3jfbwakzrcz6jcjr1zsnaq924jz2a9d8kq92vv43ycgj1",
+      "version": "1.4.1",
+      "sha256": "046ddvy20rmd1ylyr33kwj9awilrhsdwafxw6mpr4c6anv56avdc",
       "depends": []
     },
     "matrixStrucTest": {
@@ -81583,16 +84577,28 @@
       "sha256": "0pcjhf8r7xz93qp4phs6l4i56y30ksivgv5ysnjh6khbdmicfm6h",
       "depends": ["generics", "miscTools", "sandwich"]
     },
+    "maxaltall": {
+      "name": "maxaltall",
+      "version": "0.1.0",
+      "sha256": "13px8r6rirvycvr5s4i39h1bxdfr5c1qw2lgzd8yv6yg65xk8rhj",
+      "depends": ["data_table", "dplyr", "magrittr", "tidyr"]
+    },
     "maxcombo": {
       "name": "maxcombo",
       "version": "1.0",
       "sha256": "1hwv38a07ry5fv53r2vizifj83xf98znix8nx4zshqyk38vblgp5",
       "depends": ["MCMCpack", "dplyr", "magrittr", "mstate", "mvtnorm", "purrr", "rlang", "survival"]
     },
+    "maxent_ot": {
+      "name": "maxent.ot",
+      "version": "1.0.0",
+      "sha256": "1pqbrc1x98hf363rmlfyxlbdxq67p05nz6v3b5rkalym9hrzfybg",
+      "depends": ["data_table"]
+    },
     "maximin": {
       "name": "maximin",
-      "version": "1.0-5",
-      "sha256": "1nk2qdj9kap16fakwzvswzhc3id7p06xhw48j8nnz5ffg79ai604",
+      "version": "1.0-6",
+      "sha256": "1lbgyn8qis4d8rqg29ysjg3yib9iyd7clxa5qvkmq3sm8rvknj70",
       "depends": ["plgp"]
     },
     "maxlike": {
@@ -81613,6 +84619,12 @@
       "sha256": "05l24dksdgb43dpi4py4qkh8j9ynrnsglydy3gph1b61ygnfa8gx",
       "depends": ["glmnet"]
     },
+    "maxstablePCA": {
+      "name": "maxstablePCA",
+      "version": "0.1.1",
+      "sha256": "02lxvkg9ia25cvwppf8qf84mwzjkfc8w9acc99wnisddrdq7l1h2",
+      "depends": ["nloptr"]
+    },
     "maxstat": {
       "name": "maxstat",
       "version": "0.7-25",
@@ -81663,8 +84675,8 @@
     },
     "mbbefd": {
       "name": "mbbefd",
-      "version": "0.8.11",
-      "sha256": "0yhrbyydbxibxxffk5y35yv7k0i8aq8qdkkzgpvzfmyipl1lgbnv",
+      "version": "0.8.13",
+      "sha256": "1q1726x9gi3qvdvggm39yvpnfcm679s4fhisv0sl4amq2s23g6zf",
       "depends": ["MASS", "Rcpp", "actuar", "alabama", "fitdistrplus", "gsl"]
     },
     "mbend": {
@@ -81693,14 +84705,14 @@
     },
     "mbmixture": {
       "name": "mbmixture",
-      "version": "0.4",
-      "sha256": "0g74jzhdf8grrp7pipj1m6hvyv4akycabm0ingy505a5a546ddzg",
+      "version": "0.6",
+      "sha256": "12p1sap4rhl4fyz0y0v4xh9zl3askfb703vinz17kp9wapm3l0a6",
       "depends": ["numDeriv"]
     },
     "mboost": {
       "name": "mboost",
-      "version": "2.9-10",
-      "sha256": "13dhs3q9gf5n6kwf6j3b29gvwxnkycfkpsw5fr4lnhllm9zs84z7",
+      "version": "2.9-11",
+      "sha256": "0n5wpyayhdyd46vl87c9r70m13y48khmlwii58rvi57mgw6aadwz",
       "depends": ["Matrix", "lattice", "nnls", "partykit", "quadprog", "stabs", "survival"]
     },
     "mbr": {
@@ -81717,8 +84729,8 @@
     },
     "mbreaks": {
       "name": "mbreaks",
-      "version": "1.0.0",
-      "sha256": "1vnrn7f19j52jn707ps9mjz5p0rgcm7mmwbq585hf4c4mbyglrbz",
+      "version": "1.0.1",
+      "sha256": "0fy5m5vmhbjcz79qj3z42ag97dpspzldnkz42wsv0dl7kgmzcigk",
       "depends": ["ggplot2"]
     },
     "mbrglm": {
@@ -81765,8 +84777,8 @@
     },
     "mcauchyd": {
       "name": "mcauchyd",
-      "version": "1.3.2",
-      "sha256": "1n0vgp526wlyf553n2cvxkawzxdvvzqhgar5sqnhiidas7iri3zc",
+      "version": "1.3.3",
+      "sha256": "157mfbq4zz8brzxixmaipcfw267cr4gv3my5d51aqv0figij9ay9",
       "depends": ["MASS", "data_table", "lifecycle", "rgl"]
     },
     "mcb": {
@@ -81775,6 +84787,12 @@
       "sha256": "0k986m2vyvfqxw3jmlyvf6r5bq68y92fymy03lffq5lmiqhypixj",
       "depends": ["MASS", "ggplot2", "glmnet", "lars", "leaps", "ncvreg", "reshape2", "smoothmest"]
     },
+    "mcbette": {
+      "name": "mcbette",
+      "version": "1.15.3",
+      "sha256": "11r2mc1scgvvgffhpmvakj1a9i9q1b0a0rk6m40vdd9m5dkhxnk8",
+      "depends": ["Rmpfr", "babette", "beastier", "beautier", "curl", "devtools", "mauricer", "testit", "txtplot"]
+    },
     "mcbiopi": {
       "name": "mcbiopi",
       "version": "1.1.6",
@@ -81873,9 +84891,9 @@
     },
     "mclustAddons": {
       "name": "mclustAddons",
-      "version": "0.8",
-      "sha256": "12wlj1rl5d384fydk27rpm62ghmwv3iax4nfsrcpczxrfk8zshc9",
-      "depends": ["Rcpp", "RcppArmadillo", "foreach", "iterators", "mclust"]
+      "version": "0.9.1",
+      "sha256": "1h68l64xjbn94scxlwiv0lzv3wvh06hzi7vb74v5vni1gk4dpdr6",
+      "depends": ["Rcpp", "RcppArmadillo", "cli", "doParallel", "doRNG", "foreach", "iterators", "knitr", "mclust", "rmarkdown"]
     },
     "mclustcomp": {
       "name": "mclustcomp",
@@ -81883,6 +84901,12 @@
       "sha256": "1kxrms77m7n9lv32771zvwg82xqh5kx8al6f0bknsj8idq8aqbh3",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack"]
     },
+    "mcmapper": {
+      "name": "mcmapper",
+      "version": "0.0.11",
+      "sha256": "083s6dj8qfpnarplia571r782i3ncq4qjw9fbdl5wryi0310sjvm",
+      "depends": []
+    },
     "mcmc": {
       "name": "mcmc",
       "version": "0.9-8",
@@ -81921,8 +84945,8 @@
     },
     "mcmcsae": {
       "name": "mcmcsae",
-      "version": "0.7.7",
-      "sha256": "0q3rw6xbx5wqpa0hf0jldplcs9ry80bck95bn9g6bhzj0128ysm4",
+      "version": "0.7.8",
+      "sha256": "03y1mbdikwg63facvs4jkh670cj01w7s5nyxg1hnzmg3dc22k38j",
       "depends": ["GIGrvg", "Matrix", "Rcpp", "RcppEigen", "loo", "matrixStats"]
     },
     "mcmcse": {
@@ -81939,8 +84963,8 @@
     },
     "mco": {
       "name": "mco",
-      "version": "1.16",
-      "sha256": "1sz5gfhniv4rjd7kq8kx7604dybim06559l0wdrwkvixs0hm44ax",
+      "version": "1.17",
+      "sha256": "18lyd6qp320jxw50hi6jvy3f408jws3gbfl6s9dqahd5b68yk242",
       "depends": []
     },
     "mcompanion": {
@@ -81973,22 +84997,28 @@
       "sha256": "118n3pxzjm4j9y09d1n2hw7pm0b8b0m8mnm5v9kq76vignklh75l",
       "depends": ["ggplot2", "mvtnorm", "quadprog"]
     },
+    "mcprogress": {
+      "name": "mcprogress",
+      "version": "0.1.1",
+      "sha256": "1b1g92sw5x2rz21hl6fnfqc9q1bhawmbj8f4pbq6llljxb85k0id",
+      "depends": []
+    },
     "mcr": {
       "name": "mcr",
-      "version": "1.3.3",
-      "sha256": "1blaswdd1754fg6xdznkqq1igj6i6x8r3r9vdn3jpfq41qba5d40",
+      "version": "1.3.3.1",
+      "sha256": "0gbpnbs8mgqpyiayddcaf1xwh908gk1n375bqpnvfppyj0wz3yr9",
       "depends": ["robslopes"]
     },
     "mcrPioda": {
       "name": "mcrPioda",
-      "version": "1.3.3",
-      "sha256": "16n9dgmv3cjk4qy27n62n5hw43slp8hxkfdhbl60qxyrmw80lijn",
+      "version": "1.3.4",
+      "sha256": "1f3gwcbm7sgy0ny9q7l6dkc1a74sjh92x8h54rimm57b98avij4k",
       "depends": ["mixtools", "robslopes", "rrcov"]
     },
     "mcradds": {
       "name": "mcradds",
-      "version": "1.1.0",
-      "sha256": "11pa8y6q20rqsflxlsnyjq79l6xbfqy1739zvnvdl024mv0jvrw7",
+      "version": "1.1.1",
+      "sha256": "07wh4xh1dr966ybncbh3938kpnjny7qikiiwagivv90mzapf2g7m",
       "depends": ["DescTools", "VCA", "boot", "checkmate", "dplyr", "formatters", "ggplot2", "lifecycle", "magrittr", "mcr", "pROC", "purrr", "rlang", "tibble", "tidyr"]
     },
     "mcreplicate": {
@@ -82053,14 +85083,14 @@
     },
     "mda": {
       "name": "mda",
-      "version": "0.5-4",
-      "sha256": "0nd7p3yz7qdzka7jizymv5vhbhzb4v8bjpmmn5wa83vxh0l7ypzj",
+      "version": "0.5-5",
+      "sha256": "1kk28250mplv5dc12d2frp5wi19q4lf0sndlryiqnrsyqmxh8l9k",
       "depends": ["class"]
     },
     "mdatools": {
       "name": "mdatools",
-      "version": "0.14.1",
-      "sha256": "1fbjrg0xwa9bgm8gkvd2xk17xax3yzf3zjzkh7c9627v8r6gnp8j",
+      "version": "0.14.2",
+      "sha256": "0w54phv95cv1mvz2mq7bijw9b03byg7bvxz98a81dzc907j8r2bh",
       "depends": ["Matrix"]
     },
     "mdbr": {
@@ -82149,8 +85179,8 @@
     },
     "mdsr": {
       "name": "mdsr",
-      "version": "0.2.7",
-      "sha256": "0b1z1ng6zzqwrn0a5i17jcqwh5yyv7nqyghp8w9r6ik1q46hmvz1",
+      "version": "0.2.8",
+      "sha256": "171c79kl32qam0fm9hxikbfimfvccazmnlz08kg10dkv8l67b423",
       "depends": ["DBI", "RMariaDB", "babynames", "dbplyr", "downloader", "dplyr", "fs", "ggplot2", "htmlwidgets", "kableExtra", "skimr", "stringr", "tibble", "webshot2"]
     },
     "mdw": {
@@ -82251,14 +85281,14 @@
     },
     "medfate": {
       "name": "medfate",
-      "version": "4.4.0",
-      "sha256": "19ljklfvzxvf3pxpx88r0im9f8kw261d6drhyj3njiv0ykxy19qq",
+      "version": "4.7.0",
+      "sha256": "0fxzvqvg879ps59b7469cp4mhjs5hj7d55hl4q80p2zv31dc84k3",
       "depends": ["Rcpp", "ggplot2", "meteoland", "shiny"]
     },
     "medfateland": {
       "name": "medfateland",
-      "version": "2.4.5",
-      "sha256": "0rklmkq53c1xi8i89422c0jvfvhppr1a52f5xc87xzfh5z3jnhmk",
+      "version": "2.4.7",
+      "sha256": "0fkpzz92ai7wfqx7ajdldba2mmcwxvgjq5yvdhzjkznnab7lhlj2",
       "depends": ["Rcpp", "cli", "dplyr", "ggplot2", "httr", "jsonlite", "lifecycle", "medfate", "meteoland", "rlang", "sf", "shiny", "stars", "terra", "tibble", "tidyr", "tidyterra"]
     },
     "medflex": {
@@ -82321,6 +85351,12 @@
       "sha256": "1xgylvgjcaxw49sy65chwr56iinsmfm0bj32mw1f4ssc6l0bm2ab",
       "depends": []
     },
+    "medrxivr": {
+      "name": "medrxivr",
+      "version": "0.1.1",
+      "sha256": "03p5rz6a362wvlcaq2khzyhjivvw62i50846db8p6rj9rwqba228",
+      "depends": ["bib2df", "curl", "data_table", "dplyr", "httr", "jsonlite", "lubridate", "progress", "purrr", "rlang", "stringr", "tibble"]
+    },
     "meerva": {
       "name": "meerva",
       "version": "0.2-2",
@@ -82401,8 +85437,8 @@
     },
     "memery": {
       "name": "memery",
-      "version": "0.5.7",
-      "sha256": "1c0gv5853klzq90w4s2bxdribak8jpczmsxvi5ij4kkqq911siz1",
+      "version": "0.6.0",
+      "sha256": "0rz8pcxvfxg4iz1l46jkf95yyfn831zh31x28hmpi8i4hsj0607a",
       "depends": ["Cairo", "colourpicker", "cowplot", "ggplot2", "jpeg", "magrittr", "png", "purrr", "shiny", "shinyBS", "shinycssloaders", "showtext", "sysfonts"]
     },
     "memgene": {
@@ -82419,8 +85455,8 @@
     },
     "memisc": {
       "name": "memisc",
-      "version": "0.99.31.7",
-      "sha256": "0drn923y8bwwwk2csa7l9b3fd06zfrfgi3b0pn7b23aja1c1h0xl",
+      "version": "0.99.31.8.1",
+      "sha256": "03qk4393xsvsa6mw67nx2y906sn704j448q8y82am33pwggmg7aj",
       "depends": ["MASS", "data_table", "jsonlite", "lattice", "yaml"]
     },
     "memo": {
@@ -82443,8 +85479,8 @@
     },
     "memoiR": {
       "name": "memoiR",
-      "version": "1.2-9",
-      "sha256": "0asaw2xfnbn0g37y0h4lz223hh4xkaa6z8679mbvp4pk7p86b95s",
+      "version": "1.2-10",
+      "sha256": "1lqaw3a4wlfvbgxphzr6fwykl3b4glj3cmb7jywcdhbik2lngjfn",
       "depends": ["bookdown", "distill", "rmarkdown", "rmdformats", "usethis"]
     },
     "memoise": {
@@ -82489,6 +85525,12 @@
       "sha256": "17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav",
       "depends": ["Rcpp"]
     },
+    "mergedblocks": {
+      "name": "mergedblocks",
+      "version": "1.1.1",
+      "sha256": "06d7n3qck9n3g4hbwlhxamgqvjl9a9zfb9f9wbdzgx4hgs57v5ga",
+      "depends": ["randomizeR"]
+    },
     "mergen": {
       "name": "mergen",
       "version": "0.2.1",
@@ -82507,12 +85549,6 @@
       "sha256": "04ryamfb19js6dq4iv2j0p2dlgrayl3zis2r1kic1wfvh4a46ihg",
       "depends": ["MASS", "dplyr", "purrr", "rlang", "stringr", "tidyr"]
     },
-    "merlin": {
-      "name": "merlin",
-      "version": "0.1.0",
-      "sha256": "11in84pxgz76l2cfpd7m03fai1gwdhp2rzrn3pbwrpywgq210pmj",
-      "depends": ["MASS", "randtoolbox", "statmod", "survival"]
-    },
     "merror": {
       "name": "merror",
       "version": "3.0",
@@ -82537,6 +85573,12 @@
       "sha256": "1z3fjxfmvxc9zr98zmkd84rj27iabjmw71hwqgnbjwcw5mnw2b5h",
       "depends": ["MASS", "ggplot2", "patchwork", "progress"]
     },
+    "messy": {
+      "name": "messy",
+      "version": "0.1.0",
+      "sha256": "12s7jcdr90kkw7ahjah84hivbn7d48npl6jlkydlkr86z6dii3z6",
+      "depends": ["dplyr", "rlang", "stringr"]
+    },
     "messy_cats": {
       "name": "messy.cats",
       "version": "1.0",
@@ -82551,8 +85593,8 @@
     },
     "metR": {
       "name": "metR",
-      "version": "0.15.0",
-      "sha256": "17qhx6jx8h9dxfzxgg4nx3nx4xjnjpz9r0cix0qqbgngri55lap0",
+      "version": "0.16.0",
+      "sha256": "0pimgvgxq494qlh339hq0v38y444i9syc46vl4r071bv15nar5dp",
       "depends": ["Formula", "checkmate", "data_table", "digest", "formula_tools", "ggplot2", "gtable", "isoband", "lubridate", "memoise", "plyr", "purrr", "scales", "sf", "stringr"]
     },
     "metRology": {
@@ -82563,8 +85605,8 @@
     },
     "meta": {
       "name": "meta",
-      "version": "7.0-0",
-      "sha256": "0zfyjyaabwgzlnws8ny2r7f1qr6h827kba4fddv44aqd9z4xksnq",
+      "version": "8.0-1",
+      "sha256": "09m7qbc04lmfz7hk79dhps53jh2czrblxq0var5cgnkkb2sdnls4",
       "depends": ["CompQuadForm", "dplyr", "lme4", "magrittr", "metadat", "metafor", "purrr", "readr", "stringr", "xml2"]
     },
     "meta_shrinkage": {
@@ -82599,9 +85641,9 @@
     },
     "metaConvert": {
       "name": "metaConvert",
-      "version": "1.0.0",
-      "sha256": "0akn9y8h2f7fnxi9sbvnhqzvvnysr4q9rssj4gysnj9b9pqb7gra",
-      "depends": ["compareDF", "estimraw", "metafor", "mvtnorm", "numDeriv", "rio"]
+      "version": "1.0.2",
+      "sha256": "0h2gr1ixcbjykhs0f9i09l910ixj4x9jsa393c8x7jffprxcvjy7",
+      "depends": ["compareDF", "estimraw", "metafor", "mvtnorm", "rio"]
     },
     "metaDigitise": {
       "name": "metaDigitise",
@@ -82659,8 +85701,8 @@
     },
     "metaSEM": {
       "name": "metaSEM",
-      "version": "1.4.0",
-      "sha256": "1gkgcczdm14cz2z4ys9qxy068g1ma6sik5ycas3z6m5rgwbd2amy",
+      "version": "1.5.0",
+      "sha256": "1dhlpi67m0mjmid8s2zma1y4p2g7fisnxfm5ff6i30qxrphryv9m",
       "depends": ["MASS", "Matrix", "OpenMx", "ellipse", "lavaan", "mvtnorm", "numDeriv"]
     },
     "metaSurvival": {
@@ -82699,12 +85741,6 @@
       "sha256": "1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n",
       "depends": ["Rcpp", "ggplot2", "gridExtra", "rpart"]
     },
-    "metacoder": {
-      "name": "metacoder",
-      "version": "0.3.7",
-      "sha256": "0f7y7yzkqblqal71lp2kip8lzismdzlj3cpw0mb15hvca9dz12x4",
-      "depends": ["GA", "R6", "RCurl", "Rcpp", "ape", "cowplot", "crayon", "dplyr", "ggfittext", "ggplot2", "igraph", "lazyeval", "magrittr", "readr", "rlang", "seqinr", "stringr", "taxize", "tibble", "vegan"]
-    },
     "metacom": {
       "name": "metacom",
       "version": "1.5.3",
@@ -82809,16 +85845,22 @@
     },
     "metalite": {
       "name": "metalite",
-      "version": "0.1.3",
-      "sha256": "1pai4a5mnba80cyvhpdxhk0hwzhmw2xa23px1x7154ddl6rnykvg",
-      "depends": ["glue", "rlang"]
+      "version": "0.1.4",
+      "sha256": "1l6n31l5qb4x15k88jpanrhd20i8cbm3rllgkzww7b85wib8vy1h",
+      "depends": ["rlang"]
     },
     "metalite_ae": {
       "name": "metalite.ae",
-      "version": "0.1.2",
-      "sha256": "0vf8v6nf4f7lagfzs4dr6q5gz2dh18wal74xmlfaw7cmw42z8nsh",
+      "version": "0.1.3",
+      "sha256": "1gcdjzm8nrk6w69glgc6z8p9gd4ricnjjpg1rzrp4s8a1m5pd0an",
       "depends": ["glue", "metalite", "r2rtf"]
     },
+    "metalite_sl": {
+      "name": "metalite.sl",
+      "version": "0.1.0",
+      "sha256": "0m7xdaglkz5xwgvxn03y8b88a21ba89zhiwsh40wxkd6mkkx30j4",
+      "depends": ["brew", "forestly", "glue", "htmltools", "metalite", "metalite_ae", "plotly", "r2rtf", "reactable", "rlang", "stringr", "uuid"]
+    },
     "metalite_table1": {
       "name": "metalite.table1",
       "version": "0.4.0",
@@ -82851,8 +85893,8 @@
     },
     "metan": {
       "name": "metan",
-      "version": "1.18.0",
-      "sha256": "0m7czvd7djv80c6kly8ckgs9m5ld0rqnd92y76n181d2xk9l6ypc",
+      "version": "1.19.0",
+      "sha256": "1l63rcr1wn2dvl26cmfn2q8yk6mhg84zcz0l5wla4ii6dmlz002r",
       "depends": ["GGally", "dplyr", "ggforce", "ggplot2", "ggrepel", "lme4", "lmerTest", "magrittr", "mathjaxr", "patchwork", "purrr", "rlang", "tibble", "tidyr", "tidyselect"]
     },
     "metanetwork": {
@@ -82863,8 +85905,8 @@
     },
     "metansue": {
       "name": "metansue",
-      "version": "2.5",
-      "sha256": "098f3jfqxraf86p6ciqpryqs1vwbhsmy3wngqj50d5ndf302qxmc",
+      "version": "2.6",
+      "sha256": "0mi688060xqxb63wnszpwvag08p1czzggapmy15rzrzysz5j0dsz",
       "depends": []
     },
     "metap": {
@@ -82927,6 +85969,12 @@
       "sha256": "0jd5adkyi14blbppmv6lny4pnj0ld2wkq6xpv7dhvh0xhgw5n49y",
       "depends": ["meta"]
     },
+    "metasnf": {
+      "name": "metasnf",
+      "version": "1.1.2",
+      "sha256": "0jydlpq10kfp7h425z1rmm24jlj9vdz1cjldw6158dy2ggawmph2",
+      "depends": ["MASS", "SNFtool", "cluster", "digest", "dplyr", "ggplot2", "mclust", "progressr", "purrr", "rlang", "tidyr"]
+    },
     "metatest": {
       "name": "metatest",
       "version": "1.0-5",
@@ -82945,12 +85993,6 @@
       "sha256": "09rr7hfzkwk2ddc9cs9x8yvqbizk0bxfflkn9vdlf1b9kvrpknh9",
       "depends": ["dplyr", "magrittr", "metacore", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
-    "metaumbrella": {
-      "name": "metaumbrella",
-      "version": "1.0.11",
-      "sha256": "02x7f26c4flcj07i5jj2xpnx2y8zlvna7zxyillkq33pvh0yw95v",
-      "depends": ["meta", "powerSurvEpi", "pwr", "readxl", "withr", "writexl", "xtable"]
-    },
     "metavcov": {
       "name": "metavcov",
       "version": "2.1.5",
@@ -82995,8 +86037,8 @@
     },
     "meteoland": {
       "name": "meteoland",
-      "version": "2.2.1",
-      "sha256": "1543ka7yd7v1yca7my1114mb5j6wmn7dsj3kcr7gj8z99v8mxadk",
+      "version": "2.2.2",
+      "sha256": "1p08bm1hp6m5086g41wpri85j1y8z3lq2bb6xs3aamp85rjja70z",
       "depends": ["Rcpp", "assertthat", "cli", "cubelyr", "dplyr", "lifecycle", "lubridate", "ncdfgeom", "ncmeta", "purrr", "rlang", "sf", "stars", "tidyr", "units"]
     },
     "meteor": {
@@ -83013,8 +86055,8 @@
     },
     "meteospain": {
       "name": "meteospain",
-      "version": "0.1.4",
-      "sha256": "16y3ay7bfjwf5f2nl63fhfs9j040zx5w9jfv45fbqksfcdhkcid1",
+      "version": "0.2.0",
+      "sha256": "1bbnq9b03r2njqphdkg43zfgf2hv2qy7zrfzy2nbzj784f599z3h",
       "depends": ["assertthat", "cachem", "cli", "curl", "dplyr", "glue", "httr", "jsonlite", "lubridate", "memoise", "purrr", "rlang", "sf", "stringr", "tidyr", "units", "vctrs", "xml2"]
     },
     "metevalue": {
@@ -83139,8 +86181,8 @@
     },
     "mfpp": {
       "name": "mfpp",
-      "version": "0.0.7",
-      "sha256": "1z250grk06cmclyz4v3qnxdy43dm5vcrcq1rglpps3cfrg09i2g1",
+      "version": "0.0.8",
+      "sha256": "0gji3qsh6938f5sxii4x6f9hjn45rij81cv6lxaxshlg54qvjj13",
       "depends": ["Rfast", "genalg", "ggplot2", "igraph", "nsga2R", "pracma", "reshape2"]
     },
     "mfx": {
@@ -83175,14 +86217,14 @@
     },
     "mgee2": {
       "name": "mgee2",
-      "version": "0.5",
-      "sha256": "0p4601z2dyg2yjyjdcl0ry7fda89rjl6kilk8977z8p4n7d1kynj",
+      "version": "0.6",
+      "sha256": "19h1y6bnqgvvdd9hp1dgvyjmiqd3xpbd1bpxfq0j6hnwr7mwjmp1",
       "depends": ["MASS", "ggplot2"]
     },
     "mggd": {
       "name": "mggd",
-      "version": "1.3.1",
-      "sha256": "07ajrhbsxr608688qppg6p2q7i3bh67fr6q9hvl9cs12av4bdznq",
+      "version": "1.3.3",
+      "sha256": "1ygyi16vv8xdqbi8kw0223iapc0i88qimsqnzvy9nh3nwv15fa6x",
       "depends": ["MASS", "data_table", "lifecycle", "rgl"]
     },
     "mgi_report_reader": {
@@ -83283,8 +86325,8 @@
     },
     "mi4p": {
       "name": "mi4p",
-      "version": "1.1",
-      "sha256": "1fl5vbykgw3wihv1gqbnqrfjiyng8mzfdg469x6y12mxdrgl4myj",
+      "version": "1.2",
+      "sha256": "0xjbjjfm9ypa8qz1d2aq0zlkwdrr2c9642476i2d63p4aqipx2kb",
       "depends": ["emmeans", "foreach", "imp4p", "impute", "limma", "mice", "stringr"]
     },
     "miCoPTCM": {
@@ -83295,8 +86337,8 @@
     },
     "miLAG": {
       "name": "miLAG",
-      "version": "1.0.2",
-      "sha256": "03krcr0l9clafjghpnic0wds1h3zn6ighncip7c2555ql75b0g79",
+      "version": "1.0.4",
+      "sha256": "16bkab769ip0xcyjk4mfxb9p4481819jyarvsqd4yqkm01xbkzr8",
       "depends": ["dplyr", "ggplot2", "minpack_lm", "nlsMicrobio", "testthat"]
     },
     "miLineage": {
@@ -83385,9 +86427,9 @@
     },
     "mice": {
       "name": "mice",
-      "version": "3.16.0",
-      "sha256": "0h20lirk2257y3i1ww5y2pqp9lc21ilmf8yykmz36h55hm8jiw19",
-      "depends": ["Rcpp", "broom", "cpp11", "dplyr", "generics", "glmnet", "lattice", "mitml", "nnet", "rlang", "rpart", "tidyr"]
+      "version": "3.17.0",
+      "sha256": "1bin518q7wapz8iy33m1g8rw7w5sa21dds6cgjxymjywbbx17nd3",
+      "depends": ["Rcpp", "broom", "cpp11", "dplyr", "glmnet", "lattice", "mitml", "nnet", "rpart", "tidyr"]
     },
     "miceFast": {
       "name": "miceFast",
@@ -83457,8 +86499,8 @@
     },
     "microbenchmark": {
       "name": "microbenchmark",
-      "version": "1.4.10",
-      "sha256": "10dlp4295jb5l7lhz80f4mkz3jccv02v277z666wx3bhfaz43k04",
+      "version": "1.5.0",
+      "sha256": "0pvn94zfv50imz5g39wyqbqaa7fkl0h5sy98ic9as4b842lr47ix",
       "depends": []
     },
     "microbial": {
@@ -83467,6 +86509,12 @@
       "sha256": "1d2sr4wwjlxcaxqr57gzf8m2pydgx4kp3h8mgyxzcm4s00i8m5bc",
       "depends": ["DESeq2", "S4Vectors", "SummarizedExperiment", "broom", "dplyr", "edgeR", "ggplot2", "ggpubr", "magrittr", "phangorn", "phyloseq", "plyr", "randomForest", "rlang", "rstatix", "tidyr", "vegan"]
     },
+    "microbiomeMQC": {
+      "name": "microbiomeMQC",
+      "version": "1.0.2",
+      "sha256": "1wnx3j85k2hb21382kakmn6ly9wvskffwha1qm0z8kzb726v9wxi",
+      "depends": ["readxl", "vegan"]
+    },
     "microclass": {
       "name": "microclass",
       "version": "1.2",
@@ -83487,8 +86535,8 @@
     },
     "microeco": {
       "name": "microeco",
-      "version": "1.9.0",
-      "sha256": "0hk1mria8r0jqq8q0qxhpq42j9cna64ip4z056jda8n7l9jympsf",
+      "version": "1.11.0",
+      "sha256": "0iba14hpddas231nf0ykwmdk1qw0pj7ncbz14mpsxs3amvf7j2vz",
       "depends": ["R6", "RColorBrewer", "ape", "data_table", "dplyr", "ggplot2", "igraph", "magrittr", "reshape2", "rlang", "scales", "tibble", "vegan"]
     },
     "microhaplot": {
@@ -83497,16 +86545,22 @@
       "sha256": "0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i",
       "depends": ["DT", "dplyr", "ggiraph", "ggplot2", "gtools", "magrittr", "scales", "shiny", "shinyBS", "shinyWidgets", "tidyr"]
     },
+    "microinverterdata": {
+      "name": "microinverterdata",
+      "version": "0.2.0",
+      "sha256": "1bxiq06rky10ispi0h55dqfqv744d79vmrkz7pin95gif095a1l4",
+      "depends": ["cli", "dplyr", "glue", "httr2", "lubridate", "purrr", "readr", "rlang", "tidyr", "units"]
+    },
     "micromap": {
       "name": "micromap",
-      "version": "1.9.8",
-      "sha256": "129q0a6jywxmhgddyacjl150zfxr04qdv17pqngp4xl0rd9r5zcz",
+      "version": "1.9.10",
+      "sha256": "0kyi4amnmjrgicyg2nj3aranxpzv68kr990syhj81pzsfigmishn",
       "depends": ["RColorBrewer", "ggplot2", "sf", "sp"]
     },
     "micromapST": {
       "name": "micromapST",
-      "version": "3.0.3",
-      "sha256": "0zg0wgqlk9z9k3qhcnd8y8swa7p3g8q30fvw3g0n71dd4vqxzdcl",
+      "version": "3.0.4",
+      "sha256": "0h3fysynvy5gkydpjsklvas7hm5sidhjkdi674sw2789qdwyn1v2",
       "depends": ["RColorBrewer", "labeling", "readxl", "rmapshaper", "sf", "spdep", "stringr", "writexl"]
     },
     "micromodal": {
@@ -83541,8 +86595,8 @@
     },
     "microsimulation": {
       "name": "microsimulation",
-      "version": "1.4.3",
-      "sha256": "0vn7lx6qa0dqd7h208s36jwcxswmnhdp4kazkavagd61sqr2gah2",
+      "version": "1.4.4",
+      "sha256": "0fc3ppmj7rl5dnkrvky8d1lj7w2rp7rv0ahmlwd1r5wl4qhh6lmp",
       "depends": ["Rcpp", "RcppArmadillo", "ascii", "survival"]
     },
     "microsynth": {
@@ -83559,8 +86613,8 @@
     },
     "micss": {
       "name": "micss",
-      "version": "0.1.5",
-      "sha256": "1npamxj7jc6qkkswwm7gb0x7naii93m53dnwqlnv6a8v3q4whm6n",
+      "version": "0.2.0",
+      "sha256": "094h7jf38k8mijkr546s5cg6nm0s86qd81wizgjxxppf78k36sxf",
       "depends": ["dplyr"]
     },
     "midas": {
@@ -83605,6 +86659,12 @@
       "sha256": "06dc0lazi7pkdm66isaqa9igfrl8dq4klpg06aggmilgay09fi5s",
       "depends": ["R6", "cli", "ggplot2", "plotly", "purrr", "rlang", "withr"]
     },
+    "midoc": {
+      "name": "midoc",
+      "version": "1.0.0",
+      "sha256": "17ycy3wj02a88l0wj1bhpgjd45j3mn4kijxj8lz2fyzg156yn1kw",
+      "depends": ["arm", "blorr", "dagitty", "glue", "lifecycle", "mfp2", "mice", "rlang", "rmarkdown"]
+    },
     "midrangeMCP": {
       "name": "midrangeMCP",
       "version": "3.1.1",
@@ -83637,8 +86697,8 @@
     },
     "migraph": {
       "name": "migraph",
-      "version": "1.4.1",
-      "sha256": "0nr5y9yxwny8k4z5jm742k7n9r4s00xlkqbynfdf4apd5y6q8snm",
+      "version": "1.4.5",
+      "sha256": "0b9qr64ff7r14pvvxlfs7dc54llrx9q0riziyz272qwbxdaq9raw",
       "depends": ["dplyr", "furrr", "future", "generics", "ggplot2", "manynet", "purrr"]
     },
     "migrate": {
@@ -83661,8 +86721,8 @@
     },
     "miic": {
       "name": "miic",
-      "version": "1.5.3",
-      "sha256": "1wrvgzi91jirn5n5fvvbhhpcga7l75h149sz1g1r1wbci181l3bg",
+      "version": "2.0.3",
+      "sha256": "1862sdlp4bk4ih0522yi4mxkccylwnvgm272dvm8iqqd9cnzmnkd",
       "depends": ["Rcpp", "ppcor", "scales"]
     },
     "mikropml": {
@@ -83719,6 +86779,12 @@
       "sha256": "1cxr3pcm32cbl3nqblh8s8lx6pn72sgnp63ib0gvcysr8rdx1gza",
       "depends": ["dplyr", "lubridate", "magrittr", "openxlsx"]
     },
+    "minFactorial": {
+      "name": "minFactorial",
+      "version": "0.1.0",
+      "sha256": "1m48jqvhvz2cbj8imfja2sp2a4lcb5qiy3fxbb0c6rl3fk7hszg8",
+      "depends": ["FMC"]
+    },
     "minMSE": {
       "name": "minMSE",
       "version": "0.5.1",
@@ -83767,6 +86833,12 @@
       "sha256": "03srkii3rmx40lyr050bnrxil6w0hfv5pr64k339m66ciwyka9ig",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "minesweeper": {
+      "name": "minesweeper",
+      "version": "1.0.1",
+      "sha256": "0333kp0scmlypxa6ny97h3jpi8gnd8rfp6lgdhz464dla6v0h1wd",
+      "depends": []
+    },
     "miniCRAN": {
       "name": "miniCRAN",
       "version": "0.3.0",
@@ -83779,6 +86851,12 @@
       "sha256": "0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i",
       "depends": []
     },
+    "miniLNM": {
+      "name": "miniLNM",
+      "version": "0.1.0",
+      "sha256": "1ljs6av8lhghib5kn9lq9pzmfjv18l4vqx2qyw8jg4wm2lck3ln3",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "cli", "dplyr", "fansi", "formula_tools", "glue", "posterior", "rstan", "rstantools", "tidyselect"]
+    },
     "miniMeta": {
       "name": "miniMeta",
       "version": "0.3.2",
@@ -83787,8 +86865,8 @@
     },
     "miniPCH": {
       "name": "miniPCH",
-      "version": "0.3.2",
-      "sha256": "1z8zsagas50ndwygkxfdi933x5vq3dmq5kwmi3lg28hqdaf2hcnm",
+      "version": "0.4.0",
+      "sha256": "0kv6dg6wfbhs7z8g59kbgiq36rbkyc6bb5iy01dzlkdb34z7q3yc",
       "depends": ["Rcpp", "RcppArmadillo", "checkmate"]
     },
     "miniUI": {
@@ -83799,8 +86877,8 @@
     },
     "minic": {
       "name": "minic",
-      "version": "1.0",
-      "sha256": "1n7xhgwlfyy18y1d0rjnkrvfdblkd4n55c673fyrkdc1q8lpmngw",
+      "version": "1.0.1",
+      "sha256": "0p95vzld2v7j4z25hxi0vkx9y7xdzxnjhsh11k4v63yqfl6iiikx",
       "depends": ["Rcpp", "RcppEigen"]
     },
     "minidown": {
@@ -83821,12 +86899,6 @@
       "sha256": "0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r",
       "depends": []
     },
-    "minimapR": {
-      "name": "minimapR",
-      "version": "0.0.1.0",
-      "sha256": "1cf0mp0mc3zalsi4fa2khz139hky0vjzj0cfay70prh5cll7dm3b",
-      "depends": ["Rsamtools", "git2r", "pafr"]
-    },
     "minimax": {
       "name": "minimax",
       "version": "1.1.1",
@@ -83845,6 +86917,12 @@
       "sha256": "1caqigfjlga5vv5nk7k0jmzhiakj4xrbvpf43n0byygqqfpxd6i8",
       "depends": ["fs", "glue", "jsonlite", "processx"]
     },
+    "minired": {
+      "name": "minired",
+      "version": "1.0.1",
+      "sha256": "068jwb37d7dpqx9xxp6c56rk20aks89063hbx0gwxivc6rrsvyja",
+      "depends": ["cpp11"]
+    },
     "minpack_lm": {
       "name": "minpack.lm",
       "version": "1.2-4",
@@ -83877,10 +86955,16 @@
     },
     "minty": {
       "name": "minty",
-      "version": "0.0.1",
-      "sha256": "1kbs4f36s5bnjpc5wcqawbk154n9wjpf549hsjj4xdcg7ihcdgfg",
+      "version": "0.0.4",
+      "sha256": "0hh7yqg8cff0x7b23ng4944h7rqpm96zb7qrqifkdssxcl1jf8ln",
       "depends": ["cpp11", "tzdb"]
     },
+    "mintyr": {
+      "name": "mintyr",
+      "version": "0.1.0",
+      "sha256": "0va4r4497j09afac01camqah4vrjgl1w394zx6mikm07nxzsvx9v",
+      "depends": ["arrow", "data_table", "dplyr", "purrr", "readxl", "rlang", "rsample", "rstatix", "tibble"]
+    },
     "mipfp": {
       "name": "mipfp",
       "version": "3.2.1",
@@ -83895,14 +86979,20 @@
     },
     "mirai": {
       "name": "mirai",
-      "version": "1.2.0",
-      "sha256": "18x7imacq8gj44afjh77pq4cvnqnjfcnvqdp7hkmh19qbl708cpk",
+      "version": "1.3.1",
+      "sha256": "0gyhbipql7gsd9mb2ks334k44zs8pmc0bvxkwg80wmbai0h5576d",
       "depends": ["nanonext"]
     },
+    "mirrorselect": {
+      "name": "mirrorselect",
+      "version": "0.0.3",
+      "sha256": "1xxgf1w7njylgm8zjp36js8wirxbvc4q0kj6xh8y5lmb7hklnk7i",
+      "depends": ["yulab_utils"]
+    },
     "mirt": {
       "name": "mirt",
-      "version": "1.42",
-      "sha256": "15yzgph7957wvrfnxwc9p27hckamkkxmi0c02x6p5i505ya16lly",
+      "version": "1.43",
+      "sha256": "18lqlpcw16bs9qkxdzgbhp7r1mgihkn5798amall341bpym8y1lc",
       "depends": ["Deriv", "GPArotation", "Matrix", "Rcpp", "RcppArmadillo", "SimDesign", "dcurver", "gridExtra", "lattice", "mgcv", "pbapply", "vegan"]
     },
     "mirtCAT": {
@@ -83949,8 +87039,8 @@
     },
     "miscFuncs": {
       "name": "miscFuncs",
-      "version": "1.5-8",
-      "sha256": "1inx03ga2dqwh6pxcf9wdkh847f0abfkmxn91xdj612c66r4r0aq",
+      "version": "1.5-10",
+      "sha256": "1g0fz17da09rych0sxdbs660bpa1zjmigcw618ybwd1niyqjm0bi",
       "depends": ["extraDistr", "mvtnorm", "roxygen2"]
     },
     "miscIC": {
@@ -84009,8 +87099,8 @@
     },
     "missDeaths": {
       "name": "missDeaths",
-      "version": "2.7",
-      "sha256": "1c8vbc7r1g4dkngmal6iqg7piw656h1vc6cmpkv16vjn4j0w2n2c",
+      "version": "2.8",
+      "sha256": "1qwrzb5nhbigyg7ivhsh3yqhrp0qaq3abgfffy808fry5rkz6sj6",
       "depends": ["MASS", "Rcpp", "cmprsk", "mitools", "relsurv", "rms", "survival"]
     },
     "missDiag": {
@@ -84045,8 +87135,8 @@
     },
     "missRanger": {
       "name": "missRanger",
-      "version": "2.6.0",
-      "sha256": "1qwjimdzb88pmqscpkl35y2lawrybps5wn3dnrpkh2zj2zxjf1md",
+      "version": "2.6.1",
+      "sha256": "0nk8ivmpwgwqfsajinn4makzdcczj2ny8xv3p3pkb4dvl2wv3nim",
       "depends": ["FNN", "ranger"]
     },
     "missSBM": {
@@ -84093,9 +87183,9 @@
     },
     "misty": {
       "name": "misty",
-      "version": "0.6.5",
-      "sha256": "1gj244gywajfp7gzcn4rdcy88n1qp2gj9jn9aswhhhiha4fp620k",
-      "depends": ["ggplot2", "haven", "lavaan", "lme4", "nlme", "norm", "readxl", "rstudioapi", "writexl"]
+      "version": "0.6.8",
+      "sha256": "0d43m9k7vsg7fqlsglzh68kx7l1c73lj22401sxxq3h6vrkij1bi",
+      "depends": ["data_table", "ggplot2", "haven", "lavaan", "lme4", "rstudioapi"]
     },
     "misuvi": {
       "name": "misuvi",
@@ -84123,14 +87213,14 @@
     },
     "mix": {
       "name": "mix",
-      "version": "1.0-12",
-      "sha256": "05a3mklaawkch7spcin1rfzx556w315bklwipd64kzhfxj5nds1x",
+      "version": "1.0-13",
+      "sha256": "12sdyz4nsxxd7m0qvblqx0mx8ihqwhy7jrxs3ngxbm7pw704nv80",
       "depends": []
     },
     "mixAK": {
       "name": "mixAK",
-      "version": "5.7",
-      "sha256": "08n6shkibidqjmxjpjny48drxk3lmmnylh9l9ad3lrf8i2ixriqp",
+      "version": "5.8",
+      "sha256": "16prqmlhy462glp3n73f0fvcqajnqf89jibicsdjzg08g9gqb08w",
       "depends": ["coda", "colorspace", "fastGHQuad", "lme4", "mnormt"]
     },
     "mixAR": {
@@ -84165,8 +87255,8 @@
     },
     "mixR": {
       "name": "mixR",
-      "version": "0.2.0",
-      "sha256": "1iarsys7jyi3zck01y7415xwyd1knnh1fkc8z4ipfd63nnlm2pqc",
+      "version": "0.2.1",
+      "sha256": "0n279sinm3b1cx7dsnp72pv8ipmhvf61f1rdjmngvvx1ql8i60xh",
       "depends": ["Rcpp", "ggplot2"]
     },
     "mixRaschTools": {
@@ -84225,8 +87315,8 @@
     },
     "mixedBayes": {
       "name": "mixedBayes",
-      "version": "0.1.2",
-      "sha256": "0aywgn8qhnkcq45w6vsrwarjm7mqfh4x7vqpwcp3vkygr3ykvcla",
+      "version": "0.1.3",
+      "sha256": "1jcbkbai1sm0nncixkmfbzphf1x2gnwi52bri31bay9d591p4w9h",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "mixedCCA": {
@@ -84247,6 +87337,12 @@
       "sha256": "1p0gplfcn663xp40dk0yg70qffn1fwa9gxv7bppflgm9wkn8g3l5",
       "depends": ["BH", "Rcpp", "RcppArmadillo", "gtools"]
     },
+    "mixedbiastest": {
+      "name": "mixedbiastest",
+      "version": "0.3.0",
+      "sha256": "0xy388hqj5gscx8q5wklx3n5gsaqsm56qi0dl9mq1agxy2jpjynm",
+      "depends": ["Matrix", "ggplot2", "lme4", "rlang"]
+    },
     "mixedsde": {
       "name": "mixedsde",
       "version": "5.0",
@@ -84255,20 +87351,20 @@
     },
     "mixexp": {
       "name": "mixexp",
-      "version": "1.2.7",
-      "sha256": "06bp8w9r6fxhnp2ga3hig7fbl2nsvfvwxggbfd7nfc60c91p80mq",
+      "version": "1.2.7.1",
+      "sha256": "1b9m820sy6g4ahfrghqm0wzs2v5imqn1n8x2nrd5ilyissav6p08",
       "depends": ["daewr", "lattice"]
     },
     "mixgb": {
       "name": "mixgb",
-      "version": "1.0.2",
-      "sha256": "1i6sckdbgckp84wvmsbay20vfqqzzphif2r7v3fc158gfw1vvkr4",
-      "depends": ["Matrix", "Rfast", "data_table", "ggplot2", "mice", "rlang", "scales", "tidyr", "xgboost"]
+      "version": "1.5.2",
+      "sha256": "0j2rsm7mjv1hsh6xqx5s05ivsdqdlll3q46lvgqr30zdnavh7lyk",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rfast", "data_table", "magrittr", "mice", "xgboost"]
     },
     "mixhvg": {
       "name": "mixhvg",
-      "version": "0.1.1",
-      "sha256": "1vwn4wdxs81r08x4f8zlpdqr1hvf6dk59qqrbxyj9xdk35hw9il4",
+      "version": "1.0.1",
+      "sha256": "1n41k5jrx5ffxsxaw22smy2gdmx8qr8bdawwmhg0v2qyswny3kdi",
       "depends": ["Matrix", "Seurat", "SingleCellExperiment", "scran", "scuttle"]
     },
     "mixl": {
@@ -84279,8 +87375,8 @@
     },
     "mixlm": {
       "name": "mixlm",
-      "version": "1.3.0",
-      "sha256": "04dy72yr9q6n4k1bzrwqpcmpy04fqnxadpv2j4rwlc77pprpd30h",
+      "version": "1.4.0",
+      "sha256": "0ghs818zdlrjs390223qrr69amx3ca9zfdc7w1sapj5np70wmljb",
       "depends": ["car", "leaps", "multcomp", "pls", "pracma"]
     },
     "mixmeta": {
@@ -84291,9 +87387,9 @@
     },
     "mixopt": {
       "name": "mixopt",
-      "version": "0.1.2",
-      "sha256": "06al9nsgf1lz397w62dzlkqy1r9agrl8sr3waw0mh02c209mjmiy",
-      "depends": []
+      "version": "0.1.3",
+      "sha256": "0zgdkazsfmrqn5k4qanc18mw0scjwjyfzh9jwgjrbamv36ygry6n",
+      "depends": ["dplyr", "ggplot2", "splitfngr"]
     },
     "mixpoissonreg": {
       "name": "mixpoissonreg",
@@ -84351,14 +87447,14 @@
     },
     "mizer": {
       "name": "mizer",
-      "version": "2.5.1",
-      "sha256": "0s6vjvik0qcnrsb7f976cx623xg9jspkiskpzly2w9wbs6bbmnbg",
+      "version": "2.5.3",
+      "sha256": "01yb00mrp17cihms80nd5qnmmrvik9m2mvnq623fw3038ipbfkb1",
       "depends": ["Rcpp", "assertthat", "deSolve", "dplyr", "ggplot2", "ggrepel", "lifecycle", "lubridate", "plotly", "plyr", "progress", "reshape2", "rlang"]
     },
     "mkde": {
       "name": "mkde",
-      "version": "0.3",
-      "sha256": "1g6g8zh0inza6lak4l6az2czqz22c8sf1pbcakibbhc5f1h2b8g9",
+      "version": "0.4",
+      "sha256": "1fn1ldvik2y25ihpvnyy3jmifqv3l30q41f3fyal5mh0pc945b9h",
       "depends": ["Rcpp", "sf", "stars", "terra"]
     },
     "mkin": {
@@ -84477,8 +87573,8 @@
     },
     "mlflow": {
       "name": "mlflow",
-      "version": "2.14.1",
-      "sha256": "17rdg8admwih6dhmci089l8kwidbbjni98fl2al5480abhm63n74",
+      "version": "2.19.0",
+      "sha256": "0kcaw4cvdxf4gfiibw9ga6368hxhsmq6xq3mmz2fh95av9n49rjw",
       "depends": ["base64enc", "forge", "fs", "git2r", "glue", "httpuv", "httr", "ini", "jsonlite", "openssl", "processx", "purrr", "rlang", "swagger", "tibble", "withr", "yaml", "zeallot"]
     },
     "mlim": {
@@ -84505,6 +87601,12 @@
       "sha256": "16v3rwdc7kzn2k84ghkss14p1kqx86md9k1xv2k2x187f5lncamh",
       "depends": ["abind", "car", "coxme", "gplots", "lme4", "survival"]
     },
+    "mlmc": {
+      "name": "mlmc",
+      "version": "2.1.1",
+      "sha256": "0hmy9j75wra9sgjxqx1gn7p1nc938094lqar8zvdlf5391a67fni",
+      "depends": ["Rcpp", "ggplot2"]
+    },
     "mlmhelpr": {
       "name": "mlmhelpr",
       "version": "0.1.1",
@@ -84525,10 +87627,16 @@
     },
     "mlmpower": {
       "name": "mlmpower",
-      "version": "1.0.8",
-      "sha256": "0sakpiqi220j00w8s251ajaknm2lcg9jf9kif4l4qnz6z2vzn7y2",
+      "version": "1.0.9",
+      "sha256": "1y7vvawgzp8gw287jrcfam1izimy4il3vzanx0mqd5x88n76mpbp",
       "depends": ["cli", "lme4", "lmerTest", "varTestnlme"]
     },
+    "mlms": {
+      "name": "mlms",
+      "version": "1.0.2",
+      "sha256": "1yijs5lda2yqly871lwxq5iw61zkig096jvvdkkvdviav75vklgx",
+      "depends": ["checkmate", "jsonlite", "plotrix", "readxl", "sf", "stringi"]
+    },
     "mlmtools": {
       "name": "mlmtools",
       "version": "1.0.2",
@@ -84549,21 +87657,21 @@
     },
     "mlogitBMA": {
       "name": "mlogitBMA",
-      "version": "0.1-7",
-      "sha256": "0q8c5897z8f519nf6p55ksc610a9dbpnah2rr4srij4gs9a4clx1",
+      "version": "0.1-9",
+      "sha256": "1c9v2q4nbd3rm3whm4gv3kn32nv40m6mgr5hivimrv559q68msmj",
       "depends": ["BMA", "abind", "maxLik"]
     },
     "mlpack": {
       "name": "mlpack",
-      "version": "4.4.0",
-      "sha256": "0x8apd4pyyg5i326z7259y604yqcw02l1537nm83rdczrs5c9r3z",
+      "version": "4.5.1",
+      "sha256": "0dg1pva7nwshb3zsv6wabiy8js75jrg8a8fszqhf3m9936d194dw",
       "depends": ["Rcpp", "RcppArmadillo", "RcppEnsmallen"]
     },
     "mlpwr": {
       "name": "mlpwr",
-      "version": "1.1.0",
-      "sha256": "18w0vklxy61v0r33xi57j3s76iwsb2cs2cjhg1gjyxzl07byj89j",
-      "depends": ["DiceKriging", "WeightSVM", "digest", "ggplot2", "randtoolbox", "rgenoud", "rlist"]
+      "version": "1.1.1",
+      "sha256": "0pxlqmpsyzb0s5h0mj16xx09xkvjc7h6r8a6nbk8rk8rbmzxszl0",
+      "depends": ["DiceKriging", "digest", "ggplot2", "randtoolbox", "rgenoud", "rlist"]
     },
     "mlquantify": {
       "name": "mlquantify",
@@ -84579,32 +87687,32 @@
     },
     "mlr3": {
       "name": "mlr3",
-      "version": "0.20.2",
-      "sha256": "0k3qyc2jyffdpnykn5ays5slgxzij803186xgwpjg38l9r13w9r1",
+      "version": "0.22.1",
+      "sha256": "1h2rp8l9cinxaza2nny2y0hv1m0jf5viw0mi7gh2xl26g1ly71lj",
       "depends": ["R6", "backports", "checkmate", "data_table", "evaluate", "future", "future_apply", "lgr", "mlbench", "mlr3measures", "mlr3misc", "palmerpenguins", "paradox", "parallelly", "uuid"]
     },
     "mlr3batchmark": {
       "name": "mlr3batchmark",
-      "version": "0.1.1",
-      "sha256": "1qirzjmb17y1rzq69x1lpl56qk5w63zjq30if97vfab3spsd2ilf",
+      "version": "0.2.0",
+      "sha256": "00y3hkr81s13qjz42q48fjfnj4hv6klklm0766sj9ay1bn2v5blj",
       "depends": ["batchtools", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "uuid"]
     },
     "mlr3benchmark": {
       "name": "mlr3benchmark",
-      "version": "0.1.6",
-      "sha256": "1bhn0lm0k9dm9mbji6cwgqkwsa1qg928fbjs8chra9s3d3bzcb0x",
+      "version": "0.1.7",
+      "sha256": "0azfwvpbaqxz4llcd0i050h9imzs08q9jdxb60d3zrjwqc9ssydl",
       "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3misc"]
     },
     "mlr3cluster": {
       "name": "mlr3cluster",
-      "version": "0.1.9",
-      "sha256": "09fsw2b43f9m7clv1qwylimyz622snhn9ykq3xwbiric7zr4ca91",
+      "version": "0.1.10",
+      "sha256": "1pkadg1m4j8bpkdp74a62bpsh2flw7nab1v3mmpbxyadsqscjja1",
       "depends": ["R6", "backports", "checkmate", "clue", "cluster", "data_table", "fpc", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3data": {
       "name": "mlr3data",
-      "version": "0.7.0",
-      "sha256": "04hwmj8cdszwgd845va26pgzdw0k4cm025zjrmp3fr7ypp73mirg",
+      "version": "0.9.0",
+      "sha256": "05hbg2s1y8gxkbrnvmw0vahl5x9dbdajhl857j2j7f7pbdwckjva",
       "depends": []
     },
     "mlr3db": {
@@ -84627,14 +87735,14 @@
     },
     "mlr3filters": {
       "name": "mlr3filters",
-      "version": "0.8.0",
-      "sha256": "16z359bc2li7f35xk4g08np3r2a3127avv0ak6bn9bywcs13z6bl",
+      "version": "0.8.1",
+      "sha256": "12gbvp99hai6cnqa8nxlc4x24ig2andnwhhhfkxdkbxjm89dnfaa",
       "depends": ["R6", "backports", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3fselect": {
       "name": "mlr3fselect",
-      "version": "1.0.0",
-      "sha256": "0bw5gxcxydvh14j6zy9q1k32b84v76lm6ksa4dh1l6pck14a76pj",
+      "version": "1.2.1",
+      "sha256": "01dfhcy6xmzs1n2ch1hyzx0n15k86r2prqar9vgfipn6d18nzmdm",
       "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox", "stabm"]
     },
     "mlr3hyperband": {
@@ -84645,26 +87753,26 @@
     },
     "mlr3learners": {
       "name": "mlr3learners",
-      "version": "0.7.0",
-      "sha256": "0skfxmmqxfxxm0m9r46pvixnlpqfjqb3hmg2ggvgjnk47klha8v2",
+      "version": "0.9.0",
+      "sha256": "195xjfi6b1zh9y2zbk6cvfd1vf28y0mcdaxhycalvrrz494jcyq0",
       "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3mbo": {
       "name": "mlr3mbo",
-      "version": "0.2.4",
-      "sha256": "1i97mqsxgdipl2gklp2h7d7s3jm977jzm6arxn6hvshw6a2ikzgm",
+      "version": "0.2.8",
+      "sha256": "0q3rr4dq13sjalsjm27ggn6g2kqxlnr2rdq2gbawxglnad50ws0n",
       "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3tuning", "paradox", "spacefillr"]
     },
     "mlr3measures": {
       "name": "mlr3measures",
-      "version": "0.6.0",
-      "sha256": "0vhqcfn3fijj2lwjrly2lyb9bs5msqvlwdv1asfkr9shkw61piik",
-      "depends": ["PRROC", "checkmate"]
+      "version": "1.0.0",
+      "sha256": "02jsg40bpzgic34jidv20yspnl12c9bmjmim22d307nzrpkqp4gh",
+      "depends": ["PRROC", "checkmate", "mlr3misc"]
     },
     "mlr3misc": {
       "name": "mlr3misc",
-      "version": "0.15.1",
-      "sha256": "1yakq3ir3i46h1a1vnqqdlp4qznnwwk7zmjv7v831jmah9fzf5m3",
+      "version": "0.16.0",
+      "sha256": "05d4dkciw5k8dxy61sjlgvjkz8cvjrc577l6y72kwvzl2dy1i40z",
       "depends": ["R6", "backports", "checkmate", "data_table", "digest"]
     },
     "mlr3oml": {
@@ -84675,14 +87783,14 @@
     },
     "mlr3pipelines": {
       "name": "mlr3pipelines",
-      "version": "0.6.0",
-      "sha256": "09wivgnj3jj39ngrxjip6ss0138fvjsmn4dmi5v0a78ppvsr96sp",
+      "version": "0.7.1",
+      "sha256": "0h089ip9vqjdq9dps5ihwdwiaik8ricm2cj86shm8195ad1wnlyx",
       "depends": ["R6", "backports", "checkmate", "data_table", "digest", "lgr", "mlr3", "mlr3misc", "paradox", "withr"]
     },
     "mlr3resampling": {
       "name": "mlr3resampling",
-      "version": "2024.7.7",
-      "sha256": "114vcxrmkr37yzlc14454phgl7mr49j482pcwa6c700k6d5l00ja",
+      "version": "2024.9.6",
+      "sha256": "0mw30yhin2j4r695xn14mnnsyf7mrih96r6vx4dycdpq6lzrprj7",
       "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3shiny": {
@@ -84699,8 +87807,8 @@
     },
     "mlr3spatiotempcv": {
       "name": "mlr3spatiotempcv",
-      "version": "2.3.1",
-      "sha256": "04n5bzppkj9fmdhd54qk8738id0sfd3ij7p31l3hxmjbak5inh83",
+      "version": "2.3.2",
+      "sha256": "06kb8v0g1kn1z2107g1ik2r2hydcxljs8hb77cffhz2l7ac5cnq2",
       "depends": ["R6", "checkmate", "data_table", "ggplot2", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3summary": {
@@ -84709,22 +87817,28 @@
       "sha256": "16r9sjjjy3f3aqjw1npibqk0pwhdajh6r3rkrypjfl80mhk9fpi4",
       "depends": ["backports", "checkmate", "cli", "data_table", "future_apply", "mlr3", "mlr3misc"]
     },
+    "mlr3superlearner": {
+      "name": "mlr3superlearner",
+      "version": "0.1.2",
+      "sha256": "1dvqkfijl3r87smx46x4ycjmqzprk45pmkd5gf538jmkrjg3rid0",
+      "depends": ["checkmate", "cli", "data_table", "glmnet", "lgr", "mlr3", "mlr3learners", "purrr"]
+    },
     "mlr3torch": {
       "name": "mlr3torch",
-      "version": "0.1.0",
-      "sha256": "100fwy1qg14z4wxv8gvq3aib4a59r2hviij9mkdd3vamkbjbf827",
+      "version": "0.1.2",
+      "sha256": "1q6jdyy0jyvjg3hab0i77p53iznx4z2hhxzx1rdj82n3q61wi8v2",
       "depends": ["R6", "backports", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "mlr3pipelines", "paradox", "torch", "withr"]
     },
     "mlr3tuning": {
       "name": "mlr3tuning",
-      "version": "1.0.0",
-      "sha256": "0lmczwydnd2fbvb43vqxvy58clygipwpqrnydhc8hlmnjy9vbzc6",
+      "version": "1.3.0",
+      "sha256": "1fa2hd6mrzkcygwhmxd5yzs0yfvzkw7k3v73c7rdbn3bangmafmi",
       "depends": ["R6", "bbotk", "checkmate", "data_table", "lgr", "mlr3", "mlr3misc", "paradox"]
     },
     "mlr3tuningspaces": {
       "name": "mlr3tuningspaces",
-      "version": "0.5.1",
-      "sha256": "0zcmhzrr9b3blg49dx3zmxnm5qh87k0rlka0vk2jp59ifd2yggrr",
+      "version": "0.5.2",
+      "sha256": "001bggs50h8rdsz0x7kcnd18b70bqvhn3lv34bbpgbcb24lqaidc",
       "depends": ["R6", "checkmate", "data_table", "mlr3", "mlr3misc", "mlr3tuning", "paradox"]
     },
     "mlr3verse": {
@@ -84735,8 +87849,8 @@
     },
     "mlr3viz": {
       "name": "mlr3viz",
-      "version": "0.9.0",
-      "sha256": "1dm0xkrmd4c9hs22rxpxvvd4xxki4nxh2x7s06s2d7n3dhr4l3xh",
+      "version": "0.10.0",
+      "sha256": "0xjw59lv6bwq9ww3a3lm4lmxjqrgppr4wpip0p7f6lyr3jpbih51",
       "depends": ["checkmate", "data_table", "ggplot2", "mlr3misc", "scales", "viridis"]
     },
     "mlrCPO": {
@@ -84795,14 +87909,14 @@
     },
     "mlt": {
       "name": "mlt",
-      "version": "1.5-1",
-      "sha256": "1bhcw5b2mwvr9qsssxd9qd9qn5k0v8g925dqfm1ziycniaprm9g6",
-      "depends": ["BB", "Matrix", "alabama", "basefun", "coneproj", "nloptr", "numDeriv", "sandwich", "survival", "variables"]
+      "version": "1.6-1",
+      "sha256": "0zkvacasi4alqi1ag2dsppi5qj7a6ljv5nrldzgy0lb0gixw8j2r",
+      "depends": ["BB", "Matrix", "alabama", "basefun", "coneproj", "mvtnorm", "nloptr", "numDeriv", "sandwich", "survival", "variables"]
     },
     "mlt_docreg": {
       "name": "mlt.docreg",
-      "version": "1.1-8",
-      "sha256": "1hyzfz2s27n4bavz9b9g50w5fdhinj4dgijadbll52dih7v97dnl",
+      "version": "1.1-10",
+      "sha256": "0c5x1kk59kd3nc8g3ajf9l3w0w1fk3gk8mjbipj9nin5xwdigbx0",
       "depends": ["eha", "flexsurv", "lattice", "mlt", "multcomp", "numDeriv", "survival", "truncreg"]
     },
     "mltest": {
@@ -84915,9 +88029,9 @@
     },
     "mmiCATs": {
       "name": "mmiCATs",
-      "version": "0.1.1",
-      "sha256": "1dnh77ac2m8sbv3ly1wny2nn86f13bs90f91gzzy83x2r4a3bvfj",
-      "depends": ["DT", "MASS", "broom", "broom_mixed", "clusterSEs", "lmerTest", "mmcards", "robust", "robustbase", "shiny", "shinythemes"]
+      "version": "0.2.0",
+      "sha256": "0g4w0h15dglyk28dibz2vp780s7zygwpvm87hc1gl2a3lb9kzy2v",
+      "depends": ["DT", "MASS", "RPostgres", "broom", "broom_mixed", "clusterSEs", "lmerTest", "mmcards", "pool", "robust", "robustbase", "shiny", "shinythemes"]
     },
     "mmibain": {
       "name": "mmibain",
@@ -84925,6 +88039,12 @@
       "sha256": "1ii2lfsbmp0n85a3y76zp87fpj5nm5ndigjyl09sl0cl2g8q7ql7",
       "depends": ["DT", "bain", "broom", "car", "e1071", "ggplot2", "igraph", "lavaan", "mmcards", "psych", "shiny", "shinythemes"]
     },
+    "mmints": {
+      "name": "mmints",
+      "version": "0.1.0",
+      "sha256": "0ddqbnj466sd56470sc8m1irzgch7nqidrbb01axwmyqjnfy56jv",
+      "depends": ["DT", "RPostgres", "pool", "shiny"]
+    },
     "mmirestriktor": {
       "name": "mmirestriktor",
       "version": "0.3.1",
@@ -84969,8 +88089,8 @@
     },
     "mmrm": {
       "name": "mmrm",
-      "version": "0.3.12",
-      "sha256": "0bgvh7bjijsfv6rb8syhmiqd600pdc3kg9z1dx2iskghxjwiww93",
+      "version": "0.3.14",
+      "sha256": "04rzb1bww8rdnpawwcx16kp5x0zfdhi23q4v7avb3c6ilw641s65",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "Rdpack", "TMB", "checkmate", "generics", "lifecycle", "nlme", "stringr", "testthat", "tibble"]
     },
     "mmsample": {
@@ -85011,8 +88131,8 @@
     },
     "mniw": {
       "name": "mniw",
-      "version": "1.0.1",
-      "sha256": "0cb2jr0kq82pw0ai74w9a3lfhiqx4snwha5ygmc6z664i9q2wr1w",
+      "version": "1.0.2",
+      "sha256": "10l4nrnjx8hrn2iqkh57ncqjma9mqbfbnkxzb7nw24i611pvxhcx",
       "depends": ["Rcpp", "RcppEigen"]
     },
     "mnlfa": {
@@ -85051,6 +88171,12 @@
       "sha256": "1wf2mq4zdhznv589j7snw0gpnfrlvq6lhfihi2n20qlwm3lb9naa",
       "depends": ["MASS", "pracma"]
     },
+    "moRphomenses": {
+      "name": "moRphomenses",
+      "version": "1.0.2",
+      "sha256": "058bm66w688y5awxvvph9wqm4haf4fd158crx2alh18vqwfbh387",
+      "depends": []
+    },
     "mob": {
       "name": "mob",
       "version": "0.4.2",
@@ -85071,14 +88197,14 @@
     },
     "mobsim": {
       "name": "mobsim",
-      "version": "0.3.1",
-      "sha256": "0ny924lsj12fqfagjwd2pq8prk0xgm89ray5b07dw7yfdcisx90i",
+      "version": "0.3.2",
+      "sha256": "0qc00aiv40q79xlhzk58062jl29inxawja76b0y520mm2phzsxrj",
       "depends": ["Rcpp", "sads", "vegan"]
     },
     "moc_gapbk": {
       "name": "moc.gapbk",
-      "version": "0.1.1",
-      "sha256": "1d29aiks5qpn983b5yamsw8h0gh9hh4lgjdx0sgi6aj79sg0lfa8",
+      "version": "0.1.3",
+      "sha256": "1zjyaybrjxr2krx66spa93bf2q1zl5izfh6ir3r7w3n02sx9g25y",
       "depends": ["amap", "doMPI", "doParallel", "doSNOW", "foreach", "nsga2R"]
     },
     "mockery": {
@@ -85125,8 +88251,8 @@
     },
     "modEvA": {
       "name": "modEvA",
-      "version": "3.17",
-      "sha256": "1c7kv3jn38kxxxgzmpanla5jnhadh3qzvjw8w5bivdmv1gda6yzj",
+      "version": "3.23",
+      "sha256": "1xvkdmx9vywz2p807n98g2cx406iyz9rvfl8rwvqpgnbmzsmn81g",
       "depends": ["terra"]
     },
     "modMax": {
@@ -85167,8 +88293,8 @@
     },
     "model4you": {
       "name": "model4you",
-      "version": "0.9-7",
-      "sha256": "0pni9v3nradvy8sp2m07903vc7z610xrh426lf19dxss12kgrfi8",
+      "version": "0.9-8",
+      "sha256": "17xa2lvbsbwsyy54nna99xxwjv04p7xgqa61jz1ivggq0fgrd9fg",
       "depends": ["Formula", "ggplot2", "gridExtra", "partykit", "sandwich", "survival"]
     },
     "modelDown": {
@@ -85197,15 +88323,15 @@
     },
     "modelbased": {
       "name": "modelbased",
-      "version": "0.8.8",
-      "sha256": "0fksigmpps5xrxqk2v7afm1zsg87mc11bfid160f84wixfk7hqw6",
+      "version": "0.8.9",
+      "sha256": "1y1ywc53xifc7df0c0vc5db1qxbi3k6ckbk7yk2i2dyv6adnvkn2",
       "depends": ["bayestestR", "datawizard", "effectsize", "insight", "parameters", "performance"]
     },
     "modelbpp": {
       "name": "modelbpp",
-      "version": "0.1.3",
-      "sha256": "1mji4i8xpl833lhs6prbvfy6vz4276qhi4zidy8rhdl6szvq8r6s",
-      "depends": ["igraph", "lavaan", "pbapply"]
+      "version": "0.1.5",
+      "sha256": "02qy1y57dsgl9sl275ansbnliaafjijg49iakw32jycpf7zfh0rx",
+      "depends": ["igraph", "lavaan", "manymome", "pbapply"]
     },
     "modelc": {
       "name": "modelc",
@@ -85233,9 +88359,9 @@
     },
     "modelenv": {
       "name": "modelenv",
-      "version": "0.1.1",
-      "sha256": "1pnc3bs2fzanqzjv2y8a7yy6s8hmwwsccjc8pvifff5kp557a6di",
-      "depends": ["glue", "rlang", "tibble", "vctrs"]
+      "version": "0.2.0",
+      "sha256": "1h8vksmvdj5nv6cswr0c21fh1jcryw1lvpq9pn0n771pxybhxqbl",
+      "depends": ["cli", "glue", "rlang", "tibble", "vctrs"]
     },
     "modelfactory": {
       "name": "modelfactory",
@@ -85269,8 +88395,8 @@
     },
     "modelsummary": {
       "name": "modelsummary",
-      "version": "2.1.1",
-      "sha256": "1sqb5c34ymv2bvkrc2c3fd24ajjn2zz0rhasv3gdmbrp8fxgyxf8",
+      "version": "2.2.0",
+      "sha256": "185nnazkvqfnhiafzp0kdgrclsqvkpwa477ckfz0np32v9sykzqn",
       "depends": ["checkmate", "data_table", "generics", "glue", "insight", "parameters", "performance", "tables", "tinytable"]
     },
     "modeltests": {
@@ -85281,8 +88407,8 @@
     },
     "modeltime": {
       "name": "modeltime",
-      "version": "1.3.0",
-      "sha256": "035y6qcz4jkgf1k297ykyglp82303a69iswymx8c0qmcvw4x66nc",
+      "version": "1.3.1",
+      "sha256": "0wrr5phca5iaamhiv3hp5v7pbc57zhz9fk3bxk1wmgh54cgfddbi",
       "depends": ["StanHeaders", "cli", "dials", "doParallel", "dplyr", "forcats", "foreach", "forecast", "ggplot2", "glue", "gt", "hardhat", "janitor", "magrittr", "parallelly", "parsnip", "plotly", "prophet", "purrr", "reactable", "rlang", "scales", "stringr", "tibble", "tidymodels", "tidyr", "timetk", "workflows", "xgboost", "yardstick"]
     },
     "modeltime_ensemble": {
@@ -85329,9 +88455,9 @@
     },
     "moderndive": {
       "name": "moderndive",
-      "version": "0.6.1",
-      "sha256": "1gd4mb8i2bl5h9q0ahcpqjqw1ji120q9p305q9rfkfpv5nzwbwyr",
-      "depends": ["broom", "dplyr", "formula_tools", "ggplot2", "glue", "infer", "janitor", "knitr", "magrittr", "rlang", "stringr", "tibble"]
+      "version": "0.7.0",
+      "sha256": "0pvmqkgxnjj5sw8bj0m7d6k9imcyrfndn3g09qwk83k8jsbwg85d",
+      "depends": ["broom", "dplyr", "formula_tools", "ggplot2", "glue", "infer", "janitor", "knitr", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "modest": {
       "name": "modest",
@@ -85351,6 +88477,12 @@
       "sha256": "0j9fmhy3wra9qr8753a495ligfz5fwgydv3ixlfzx3sgbq882hic",
       "depends": ["DT", "readxl", "shiny", "shinydashboard"]
     },
+    "modgo": {
+      "name": "modgo",
+      "version": "1.0.1",
+      "sha256": "03c48akfdmnr47i88pzix7kz11nyrmppb94grjvy98yp4c1phnl9",
+      "depends": ["GLDEX", "MASS", "Matrix", "ggcorrplot", "ggplot2", "gp", "gridExtra", "patchwork", "psych", "survival", "wesanderson"]
+    },
     "modi": {
       "name": "modi",
       "version": "0.1.2",
@@ -85365,9 +88497,9 @@
     },
     "modisfast": {
       "name": "modisfast",
-      "version": "0.9.1",
-      "sha256": "1h3r5iwqrjzvfavsmvr6i5x2gvl76g44d712gnir9jl8sdhk0ynr",
-      "depends": ["curl", "dplyr", "httr", "lubridate", "magrittr", "purrr", "rvest", "sf", "stringr", "terra", "xml2"]
+      "version": "1.0.0",
+      "sha256": "1shdhvc1bcfrmr8gxqx7qqphq0kj0lmc20sggq3bvs82yml77jda",
+      "depends": ["cli", "curl", "dplyr", "httr", "lubridate", "magrittr", "purrr", "rvest", "sf", "stringr", "terra", "xml2"]
     },
     "modmarg": {
       "name": "modmarg",
@@ -85389,9 +88521,9 @@
     },
     "modsem": {
       "name": "modsem",
-      "version": "1.0.2",
-      "sha256": "1qab2lqj6p3lkfnyf72a2sk18lclnlisl3ky59998nylx3raanan",
-      "depends": ["MplusAutomation", "R6", "Rcpp", "RcppArmadillo", "dplyr", "fastGHQuad", "ggplot2", "lavaan", "mvnfast", "mvtnorm", "nlme", "purrr", "rlang", "stringr"]
+      "version": "1.0.5",
+      "sha256": "0dzkar23k58170sc9lmbihg5w1wyia53hrh9s2c60mp6jj27lvy0",
+      "depends": ["MplusAutomation", "Rcpp", "RcppArmadillo", "dplyr", "fastGHQuad", "ggplot2", "lavaan", "mvnfast", "mvtnorm", "nlme", "purrr", "rlang", "stringr"]
     },
     "moduleColor": {
       "name": "moduleColor",
@@ -85471,6 +88603,12 @@
       "sha256": "109m9rvy39bp7j3jj8y6qdr4dran0qqvcx267mvil9c8ipxr89ms",
       "depends": ["htmltools", "htmlwidgets", "rstudioapi", "shiny"]
     },
+    "monad": {
+      "name": "monad",
+      "version": "0.1.1",
+      "sha256": "1mwvwmpsz3miaybj4bw5www35h8xnhca91g77ax8mjjkdjrzlj0j",
+      "depends": ["S7"]
+    },
     "monashtipr": {
       "name": "monashtipr",
       "version": "0.1.0",
@@ -85485,8 +88623,8 @@
     },
     "mongolite": {
       "name": "mongolite",
-      "version": "2.8.0",
-      "sha256": "0hmh7rvzjrmmq0rxs510lw0829h4fqrfhpszi7sz48zl2yp85zwn",
+      "version": "2.8.2",
+      "sha256": "0fndymkqgghk7pswbvl37r0lg7ns7fnkly42s191r3lrbij437j9",
       "depends": ["jsonlite", "mime", "openssl"]
     },
     "mongopipe": {
@@ -85543,10 +88681,16 @@
       "sha256": "0sqhz3zpbk57s2sm56csqr198fclk9x8zq3bfamzardpax8r2cjr",
       "depends": ["circular", "png", "raster", "rmarkdown", "rnaturalearth", "rpart", "sf", "shiny", "shinyWidgets", "shinydashboard", "shinythemes", "sp", "terra"]
     },
+    "monolix2rx": {
+      "name": "monolix2rx",
+      "version": "0.0.4",
+      "sha256": "0ij28qrk28s2hcdifvmlnbprfl6nivgx3fbmp7zhclm9i23a793g",
+      "depends": ["Rcpp", "checkmate", "cli", "crayon", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "rxode2", "stringi", "withr"]
+    },
     "monomvn": {
       "name": "monomvn",
-      "version": "1.9-20",
-      "sha256": "0if2b13yak9x0sfcwghhih901hk8n762w59r53k0949vf5f336yd",
+      "version": "1.9-21",
+      "sha256": "1wjbxd0zzfpjlqin4f69f3vzjksjyafr3mbyi3hjkh64pv3kpgph",
       "depends": ["MASS", "lars", "mvtnorm", "pls", "quadprog"]
     },
     "monoreg": {
@@ -85575,8 +88719,8 @@
     },
     "moocore": {
       "name": "moocore",
-      "version": "0.1.0",
-      "sha256": "0xnix4izfl7hs8an1w8jvdsd6gcw61njqhzh2wy9mxkvl7kjw7jg",
+      "version": "0.1.2",
+      "sha256": "0qn95fv5j3z2vgks9y0kny1pq99ixadfmyr0ff1a778blgn7w7jf",
       "depends": ["Rdpack", "matrixStats"]
     },
     "moodef": {
@@ -85603,6 +88747,12 @@
       "sha256": "1ml4vvm0mvrprpyi0l50aw38brx18bk2qny4gybmkvlbakalz9bx",
       "depends": ["crayon", "magrittr", "nortest", "sjmisc", "stringr", "survival"]
     },
+    "moonboot": {
+      "name": "moonboot",
+      "version": "0.9.1",
+      "sha256": "0igcs4jjsvm25lirjdmlzckd18fswld7ihmi55fzlyh6ir6s90b9",
+      "depends": []
+    },
     "moose": {
       "name": "moose",
       "version": "0.0.1",
@@ -85663,12 +88813,6 @@
       "sha256": "1fs1g5vv5qwrab0cj5wff4r9skiaa5mwfawa2j32skga6niaqydz",
       "depends": []
     },
-    "morpheus": {
-      "name": "morpheus",
-      "version": "1.0-4",
-      "sha256": "0y9immrs87yghp0j1h0vp1fhiah5wddfj6pj2hgcqch1imxprhy7",
-      "depends": ["MASS", "jointDiag", "pracma"]
-    },
     "morphomap": {
       "name": "morphomap",
       "version": "1.5",
@@ -85681,6 +88825,12 @@
       "sha256": "09kpsarbv32cylr0qp067m184lnj95p50ayi49w7sgwrs70xdanb",
       "depends": []
     },
+    "morse": {
+      "name": "morse",
+      "version": "3.3.4",
+      "sha256": "1cq1xmabx4glgkxh6vn33ma1mb97079p5mmlydrm07h7r542k4vz",
+      "depends": ["coda", "deSolve", "dplyr", "epitools", "ggplot2", "gridExtra", "magrittr", "reshape2", "rjags", "tibble", "tidyr", "zoo"]
+    },
     "mort": {
       "name": "mort",
       "version": "0.0.1",
@@ -85791,20 +88941,20 @@
     },
     "movMF": {
       "name": "movMF",
-      "version": "0.2-8",
-      "sha256": "1rxi0qk5lg4nyhsbmpdkfj9ygnhx8zdkamb6s5hyjgw5z6lm6ni6",
+      "version": "0.2-9",
+      "sha256": "06k5hz7zkn78591349m8xzsrasqgv0da363b3ahbc3gamki3r2kx",
       "depends": ["clue", "skmeans", "slam"]
     },
     "move": {
       "name": "move",
-      "version": "4.2.4",
-      "sha256": "1i6qyx4i8vb2g7i8c2hwjia81m2wd3pyvp6hf6f64j4lcrnafqz7",
+      "version": "4.2.6",
+      "sha256": "1s6zzfrr7c28fikqnzikvd8m234vvawq64jhjzn1ngx69pfdn9na",
       "depends": ["Rcpp", "geosphere", "httr", "memoise", "raster", "sp", "terra", "xml2"]
     },
     "move2": {
       "name": "move2",
-      "version": "0.3.0",
-      "sha256": "0ms6s0znjdrf7sfs7ydy6jfic39xi8fbd4r89z3scks7lhm0q1qb",
+      "version": "0.4.2",
+      "sha256": "0i60pcp26biq3hp6bcg2yjcxxq9c9f1nxz5x84yi77ivmhw5fjy4",
       "depends": ["assertthat", "bit64", "cli", "dplyr", "rlang", "sf", "tibble", "tidyselect", "units", "vctrs", "vroom"]
     },
     "moveHMM": {
@@ -85839,8 +88989,8 @@
     },
     "movieROC": {
       "name": "movieROC",
-      "version": "0.1.1",
-      "sha256": "0znqdqdl7hszg0q9a5sbaj5m9h0lglk33jrxbvfhyw1dfkg29v93",
+      "version": "0.1.2",
+      "sha256": "0f65p8b9agpq0ym9xrnbvc5hspir0810ksfk4jjr0l2gbm024xkk",
       "depends": ["Rsolnp", "animation", "e1071", "gtools", "intrval", "ks", "rms", "robustbase", "zoo"]
     },
     "mp": {
@@ -85849,6 +88999,12 @@
       "sha256": "0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "mpactr": {
+      "name": "mpactr",
+      "version": "0.1.0",
+      "sha256": "0hb1d2afjsl9zj6bmjh6hzzc07h0ip1lc8r40w9c9ikl1klm2x23",
+      "depends": ["R6", "cli", "data_table", "ggplot2", "readr", "treemapify", "viridis"]
+    },
     "mpae": {
       "name": "mpae",
       "version": "0.1.2",
@@ -85861,6 +89017,12 @@
       "sha256": "1pzmcp3kznkfi0bh7pcpgciwla3wgzbb2h1mrngfd1pmm3406pvr",
       "depends": ["MASS", "WeightSVM", "bst", "doParallel", "foreach", "glmnet", "numDeriv", "pscl"]
     },
+    "mpathr": {
+      "name": "mpathr",
+      "version": "1.0.2",
+      "sha256": "1y5p3c86xs3fmdlbraf2048b6ylxbhziw5kjvasv5drk6hb25hzd",
+      "depends": ["cli", "dplyr", "ggplot2", "jsonlite", "lifecycle", "lubridate", "readr", "rlang", "tidyr"]
+    },
     "mpathsenser": {
       "name": "mpathsenser",
       "version": "1.2.3",
@@ -85911,8 +89073,8 @@
     },
     "mpmsim": {
       "name": "mpmsim",
-      "version": "3.0.0",
-      "sha256": "1bbbprdx2z7sm6m6419vcd4kz194p98n3xrk1y918jas5mi75i95",
+      "version": "3.1.0",
+      "sha256": "0qvjicciqd3zgkz6s9pnp6z98g0irwz0bbmj0pvvy8bhjcs7yln4",
       "depends": ["Rage", "Rcompadre", "dplyr", "ggplot2", "popbio", "popdemo", "reshape"]
     },
     "mpoly": {
@@ -85947,8 +89109,8 @@
     },
     "mpt": {
       "name": "mpt",
-      "version": "0.8-0",
-      "sha256": "02m92dn9y5q4ql7ydn01nn5irm82kknd2dqc0bcnxsn7kdbglnid",
+      "version": "1.0-0",
+      "sha256": "1gv3gfak0mdng15md78fg57dfylskvdrhr6aycw0hyss40gpglvq",
       "depends": []
     },
     "mpwR": {
@@ -85981,12 +89143,6 @@
       "sha256": "0ywxaw164czfgbnqfkh5zw06006clisbc780w2h4z71wfvj56dsi",
       "depends": ["Rcpp", "RcppEigen", "bigmemory", "coin", "data_table", "doParallel", "foreach", "lars", "mrMLM", "ncvreg", "sampling", "sbl", "shiny", "shinyjs"]
     },
-    "mra": {
-      "name": "mra",
-      "version": "2.16.11",
-      "sha256": "0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0",
-      "depends": []
-    },
     "mratios": {
       "name": "mratios",
       "version": "1.4.2",
@@ -85995,14 +89151,14 @@
     },
     "mrbayes": {
       "name": "mrbayes",
-      "version": "0.5.1",
-      "sha256": "11n3d18di01vmwqs5a0i1h8839aammzbcavi1jk58bmrwb3l771j",
-      "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "plyr", "rstan", "rstantools"]
+      "version": "0.5.2",
+      "sha256": "0jvfqfyds3g8dfh946l08vkgx3kqwjkp5vph20mhi20qqqiw21di",
+      "depends": ["BH", "DescTools", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "rstan", "rstantools"]
     },
     "mrbin": {
       "name": "mrbin",
-      "version": "1.7.5",
-      "sha256": "1pa6acqry480xf2hng10m2i3wlh9k5rxfxl8zarlpcczg8pb1pv2",
+      "version": "1.8.0",
+      "sha256": "1vcdx0py9qrdprxvf7kc1j16yz34v8hl8srx6bcsz9i4fsmv7hbq",
       "depends": []
     },
     "mrbsizeR": {
@@ -86019,9 +89175,9 @@
     },
     "mrds": {
       "name": "mrds",
-      "version": "2.3.0",
-      "sha256": "1arp1nk393wbbvasvsp3mb08lbvl3y38bw06sxyk148za3lnhkhq",
-      "depends": ["Rsolnp", "mgcv", "numDeriv", "optimx"]
+      "version": "3.0.0",
+      "sha256": "0xrir814jmhp7kvp5jn3f5amy5lqjcrj6qmg5ffkj96yzmpc4ab2",
+      "depends": ["Rsolnp", "mgcv", "nloptr", "numDeriv", "optimx"]
     },
     "mreg": {
       "name": "mreg",
@@ -86029,6 +89185,12 @@
       "sha256": "1j958jkibjlvjh0nwbwmqk7imcv3srhnzg28gs9j5p8xhyx12i0f",
       "depends": []
     },
+    "mregions2": {
+      "name": "mregions2",
+      "version": "1.1.1",
+      "sha256": "1hhl3y8x777yfnn5l92nv6cc4kfk1alg64anzaz589g8802al7aw",
+      "depends": ["ISOcodes", "checkmate", "cli", "curl", "digest", "dplyr", "glue", "httr2", "magrittr", "memoise", "rdflib", "sf", "wrapr", "xml2"]
+    },
     "mrf": {
       "name": "mrf",
       "version": "0.1.6",
@@ -86049,8 +89211,8 @@
     },
     "mrfse": {
       "name": "mrfse",
-      "version": "0.4.1",
-      "sha256": "1kk6j7x4z4vaiwnd2mv2brzd1z7g4kyxxylxf31971i6klnsn4zb",
+      "version": "0.4.2",
+      "sha256": "06bz31ajbx4b7gsnqpfasmcnhrc8wh781dhm627s45h9akny7dq7",
       "depends": ["Rcpp", "Rfast", "gtools"]
     },
     "mrgsim_parallel": {
@@ -86067,8 +89229,8 @@
     },
     "mrgsolve": {
       "name": "mrgsolve",
-      "version": "1.5.1",
-      "sha256": "0bzvzj346ssys7wl7pb0mddg8k0la2sw0q2dxapwvlmasbj4x81g",
+      "version": "1.5.2",
+      "sha256": "19c3bq58sca4i3iizpnvkgig62bhnq4c4lwi8gxihv00vrl9lil2",
       "depends": ["BH", "Rcpp", "RcppArmadillo", "dplyr", "glue", "lifecycle", "magrittr", "rlang", "tibble", "tidyselect"]
     },
     "mri": {
@@ -86265,9 +89427,9 @@
     },
     "msm": {
       "name": "msm",
-      "version": "1.7.1",
-      "sha256": "0nvqgx74rwx061vgmhvc872bwq8smccm2n8r51s37vbfjqmphd6i",
-      "depends": ["expm", "mvtnorm", "survival"]
+      "version": "1.8.2",
+      "sha256": "09my3vgj0d2w0g6dn0fh4clcqqh0xbyxp44nphap6kdmg0wkb5sv",
+      "depends": ["expm", "generics", "mvtnorm", "survival", "tibble"]
     },
     "msma": {
       "name": "msma",
@@ -86281,12 +89443,6 @@
       "sha256": "0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh",
       "depends": ["MASS", "lattice"]
     },
-    "msmtools": {
-      "name": "msmtools",
-      "version": "2.0.1",
-      "sha256": "09an9bpr0gnqbglb8kj4x8bb7f5dm2lc3d01wx6dh7j1d99vrrdk",
-      "depends": ["data_table", "ggplot2", "msm", "patchwork", "scales", "survival"]
-    },
     "msos": {
       "name": "msos",
       "version": "1.2.0",
@@ -86295,14 +89451,14 @@
     },
     "mssearchr": {
       "name": "mssearchr",
-      "version": "0.1.1",
-      "sha256": "0w5i2vcnargw8z80sgmh0qrb5sdv5s3fi3b05qvyc0mx0k6b77lh",
+      "version": "0.2.0",
+      "sha256": "06fvsy7dhvf2rc1jml33336jbr84kslc0fg00jd80hdiwa58wzb4",
       "depends": ["Rcpp"]
     },
     "mstDIF": {
       "name": "mstDIF",
-      "version": "0.1.7",
-      "sha256": "0krb3g1njm97cnjjhc2p5r8djgnzarn5gm65x76h1k43qxfb5iw1",
+      "version": "0.1.8",
+      "sha256": "010v2rbwv7fl4w3jln6isjx8nm8lv4p6iimhrwwkp5vnbvxs3jkq",
       "depends": ["Matrix", "PP", "eRm", "expm", "mirt", "scDIFtest"]
     },
     "mstR": {
@@ -86343,8 +89499,8 @@
     },
     "mstudentd": {
       "name": "mstudentd",
-      "version": "1.1.1",
-      "sha256": "0s5kidcz6sv9gaa0mdx2lawn79qd1y5j3vpr76bpv91fibfpzpa6",
+      "version": "1.1.2",
+      "sha256": "0412nmbiw97rb7g86f650x2j58qfrdg9chagnnahjg4dvnzrsyfa",
       "depends": ["MASS", "data_table", "rgl"]
     },
     "msu": {
@@ -86379,9 +89535,9 @@
     },
     "mtdesign": {
       "name": "mtdesign",
-      "version": "0.1.0",
-      "sha256": "0fnyw6zcls12b6mmr9pxj3b9vs8pv1ik3h671kmxfgv1k6dwn6b9",
-      "depends": ["BH", "Rcpp", "dplyr", "ggplot2", "logger", "magrittr", "rlang", "tibble", "tidyr"]
+      "version": "0.1.2",
+      "sha256": "1fk48z40yg3pgdbf9bqivw33k88m2ns8y2cjxszp5686h68nn01v",
+      "depends": ["BH", "Rcpp", "dplyr", "futile_logger", "ggplot2", "magrittr", "rlang", "tibble", "tidyr"]
     },
     "mthapower": {
       "name": "mthapower",
@@ -86397,8 +89553,8 @@
     },
     "mtscr": {
       "name": "mtscr",
-      "version": "1.0.1",
-      "sha256": "1cx2j10v89n2i4pml0m82xlx77pid5sw3737h09ak0hhr1l0p4x4",
+      "version": "1.0.2",
+      "sha256": "132dp97sx6177j8apla2qlw8gfw75dmg2vrbv3h99sd99jnhb8yz",
       "depends": ["broom_mixed", "cli", "dplyr", "glmmTMB", "glue", "lifecycle", "purrr", "readr", "rlang", "stringr", "tibble"]
     },
     "mtsdi": {
@@ -86469,8 +89625,8 @@
     },
     "mulea": {
       "name": "mulea",
-      "version": "1.0.1",
-      "sha256": "0mgwhf24raycj01cyw835a843pgfi7nkhzjj73ln3xhkk42np3km",
+      "version": "1.1.1",
+      "sha256": "0slxskgvxzpw6qhxjn8dbhbv6vv1zgbxhgxzkmam6yxmgacqjnci",
       "depends": ["Rcpp", "data_table", "dplyr", "fgsea", "ggplot2", "ggraph", "magrittr", "plyr", "readr", "rlang", "scales", "stringi", "tibble", "tidygraph", "tidyverse"]
     },
     "mulgar": {
@@ -86493,8 +89649,8 @@
     },
     "mult_latent_reg": {
       "name": "mult.latent.reg",
-      "version": "0.1.7",
-      "sha256": "0lvkysncxjlzlzdy1a7vvcr03sd6vcfqgflgaxxy6k1j9qvx92wf",
+      "version": "0.2.1",
+      "sha256": "02xnmx6p501mkmm33p165kw3x6inxffjxvgm67i9hk45izcvcimh",
       "depends": ["lme4", "matrixStats", "mvtnorm"]
     },
     "multDM": {
@@ -86505,8 +89661,8 @@
     },
     "multIntTestFunc": {
       "name": "multIntTestFunc",
-      "version": "0.2.0",
-      "sha256": "0z2wsbhb8lbmb5favqaang3rq4fk6ln9d5spssinzlbpqb04y6nk",
+      "version": "0.3.0",
+      "sha256": "02gv9fjjhm7d77g6jmkf52b7xchsx123zz4bkdxl0xn8s64z4jpk",
       "depends": ["mvtnorm", "pracma"]
     },
     "multbxxc": {
@@ -86613,9 +89769,9 @@
     },
     "multibias": {
       "name": "multibias",
-      "version": "1.5.1",
-      "sha256": "16fbrc2phljrvmlraii31g16z41lid9x9s5sw1d03v6vzgca09aj",
-      "depends": ["dplyr", "magrittr", "rlang"]
+      "version": "1.6.1",
+      "sha256": "07kcdgfqmgdw7da81z88mz4fcxv7pwr1bxd834xs3z1v6bh444bk",
+      "depends": ["dplyr", "lifecycle", "magrittr", "rlang"]
     },
     "multibiasmeta": {
       "name": "multibiasmeta",
@@ -86631,8 +89787,8 @@
     },
     "multiblock": {
       "name": "multiblock",
-      "version": "0.8.8.1",
-      "sha256": "0b4xk6pr4ffs44iras74mswligfyrx52fgm5yvcs5f4y94bsd6pp",
+      "version": "0.8.8.2",
+      "sha256": "05z6zf9vh94as4m2si5kam101swhyfyv2vm0k9js1pxakwziavkq",
       "depends": ["MASS", "RSpectra", "Rcpp", "RcppEigen", "SSBtools", "ade4", "car", "lme4", "mixlm", "plotrix", "pls", "plsVarSel", "pracma", "progress"]
     },
     "multibreakeR": {
@@ -86655,8 +89811,8 @@
     },
     "multichull": {
       "name": "multichull",
-      "version": "3.0.0",
-      "sha256": "17c2hwgnlw67s2209ran6gz0mdg66kzxzp6d484dp53gggnpdw0l",
+      "version": "3.0.1",
+      "sha256": "109359jc79w9yr479x2jwwzg75i10sw5rhk11q9xfcbdsm69i6yl",
       "depends": ["DT", "igraph", "plotly", "shiny", "shinythemes"]
     },
     "multiclassPairs": {
@@ -86733,8 +89889,8 @@
     },
     "multilevLCA": {
       "name": "multilevLCA",
-      "version": "1.5.1",
-      "sha256": "0cf51abcypl3a3xl0lhvb614ja83s6nkcc0glws9x112wwm2dgs4",
+      "version": "1.5.2",
+      "sha256": "0pmviwqsyb4lj8l4m359c2rynbb57k6ljsbvy3kg4nld9yyq9wa0",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "dplyr", "foreach", "klaR", "magrittr", "tidyr"]
     },
     "multilevel": {
@@ -86757,9 +89913,9 @@
     },
     "multilevelcoda": {
       "name": "multilevelcoda",
-      "version": "1.3.0.2",
-      "sha256": "0dd31bs1wfwfmi65aj8ycmipyszpl79cik5z2w7rkii4pl1zc6ja",
-      "depends": ["DT", "abind", "bayesplot", "bayestestR", "brms", "bslib", "compositions", "data_table", "doFuture", "emmeans", "extraoperators", "foreach", "future", "ggplot2", "hrbrthemes", "insight", "loo", "plotly", "shiny", "shinystan"]
+      "version": "1.3.1",
+      "sha256": "1rakgj40zz526wsjgcbym5b31q2pdxk35z229xfpkhdc627w2954",
+      "depends": ["DT", "abind", "bayesplot", "bayestestR", "brms", "bslib", "compositions", "data_table", "doFuture", "emmeans", "extraoperators", "foreach", "future", "ggplot2", "hrbrthemes", "loo", "plotly", "posterior", "shiny", "shinystan"]
     },
     "multilevelmediation": {
       "name": "multilevelmediation",
@@ -86791,6 +89947,12 @@
       "sha256": "14zgp3pqxmfjxf78rfr92qd3gjyzfrx5sbid3gcg14bsnpyhkns4",
       "depends": ["Brobdingnag", "Matrix", "RMark", "coda", "mvtnorm", "prodlim", "raster", "sp", "statmod"]
     },
+    "multimedia": {
+      "name": "multimedia",
+      "version": "0.2.0",
+      "sha256": "0rh7z5wn3ndg03hkd42kk43ydxcdyhrsfxbvlxb3bir6pvwa9s6m",
+      "depends": ["MASS", "S4Vectors", "SummarizedExperiment", "brms", "cli", "dplyr", "fansi", "formula_tools", "ggplot2", "glmnetUtils", "glue", "miniLNM", "patchwork", "phyloseq", "progress", "purrr", "ranger", "rlang", "tidygraph", "tidyr", "tidyselect"]
+    },
     "multimix": {
       "name": "multimix",
       "version": "1.0-10",
@@ -86803,6 +89965,12 @@
       "sha256": "0qxb67qss2pmid0wiwblqng5qmihqchdhbkyjklgj20pvbjz1wjm",
       "depends": ["diptest", "ks", "rootSolve"]
     },
+    "multimolang": {
+      "name": "multimolang",
+      "version": "0.1.1",
+      "sha256": "075crgi9p96hfiifc7g7cggzr1nxw73jwr4lrrzyyq35sl7lbnvw",
+      "depends": ["arrow"]
+    },
     "multimorbidity": {
       "name": "multimorbidity",
       "version": "0.5.1",
@@ -86817,8 +89985,8 @@
     },
     "multinet": {
       "name": "multinet",
-      "version": "4.2",
-      "sha256": "1rrb03nl658r28sjn4d1g7hdwz5jsg8hgwhygy79xfsqf1pykmy8",
+      "version": "4.2.1",
+      "sha256": "0nwxy55ab5bb2sbcmf4kx9k6a1faxm11ax5i855nkbyv2wy3pgbj",
       "depends": ["RColorBrewer", "Rcpp", "igraph"]
     },
     "multinets": {
@@ -86829,8 +89997,8 @@
     },
     "multinma": {
       "name": "multinma",
-      "version": "0.7.1",
-      "sha256": "0p0bw7kz1i7bnmwzyzn7gbblpq05rf2axcklppj9h072ysh1x7mn",
+      "version": "0.7.2",
+      "sha256": "1k4a0rgbxwnbkhdksjh25cp2m26qjl0rsqhbz3d6v7s1nms4aikz",
       "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "bayesplot", "copula", "dplyr", "forcats", "ggdist", "ggplot2", "ggraph", "glue", "igraph", "purrr", "randtoolbox", "rlang", "rstan", "rstantools", "stringr", "survival", "tibble", "tidyr", "truncdist"]
     },
     "multinomialLogitMix": {
@@ -86883,8 +90051,8 @@
     },
     "multiplex": {
       "name": "multiplex",
-      "version": "3.4",
-      "sha256": "00dxlign3l34vjjpzasj6jiyzr53lppq7hw5xb5rm9zqiw31cd2w",
+      "version": "3.8-3",
+      "sha256": "0ninfd1gf7w2b97l8r7nbgnk8v8312qymfvqbzdarynlxz6qbdlv",
       "depends": []
     },
     "multipol": {
@@ -86973,9 +90141,9 @@
     },
     "multiverse": {
       "name": "multiverse",
-      "version": "0.6.1",
-      "sha256": "0l3h4pg450brw27n0jhc3k5fsl57kczxsmzzs3ffj9lwrpnvvn7z",
-      "depends": ["R6", "berryFunctions", "collections", "dplyr", "evaluate", "formatR", "future_apply", "knitr", "magrittr", "purrr", "rlang", "rstudioapi", "tibble", "tidyr", "tidyselect"]
+      "version": "0.6.2",
+      "sha256": "070d4giyf14kphb987nd7v2pry1y4h8w4mk8hl01z0128z2ks3h1",
+      "depends": ["R6", "berryFunctions", "collections", "distributional", "dplyr", "evaluate", "formatR", "furrr", "jsonlite", "knitr", "magrittr", "purrr", "readr", "rlang", "rstudioapi", "styler", "tibble", "tidyr", "tidyselect"]
     },
     "multiview": {
       "name": "multiview",
@@ -87001,6 +90169,18 @@
       "sha256": "1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc",
       "depends": ["boot", "sandwich"]
     },
+    "multpois": {
+      "name": "multpois",
+      "version": "0.2.0",
+      "sha256": "0yk8c7qndsl45bfckk7ljqmky5yzd0p2kiaxz99c7np29v8hvrp1",
+      "depends": ["car", "dfidx", "dplyr", "lme4", "plyr"]
+    },
+    "multvardiv": {
+      "name": "multvardiv",
+      "version": "1.0.10",
+      "sha256": "05lx348s9bqawrbmgg88zz11bddd7rzhh059p7gq3y1dspnxz6bw",
+      "depends": ["MASS", "data_table", "rgl"]
+    },
     "multxpert": {
       "name": "multxpert",
       "version": "0.1.1",
@@ -87123,8 +90303,8 @@
     },
     "mvMORPH": {
       "name": "mvMORPH",
-      "version": "1.1.9",
-      "sha256": "0061jzmrhgp029a22c53pyjdlc492rlvxhdxrbcd3x0ni2b1nh6x",
+      "version": "1.2.1",
+      "sha256": "1ga9ngbanavlix5jhr32924lz45mxwdinx0vrbxh7b594iwb385y",
       "depends": ["ape", "corpcor", "glassoFast", "pbmcapply", "phytools", "spam", "subplex"]
     },
     "mvMonitoring": {
@@ -87133,12 +90313,6 @@
       "sha256": "1s8djfn89qdyph3gahh5gsf1pdyn4k07p2a1rs9ajzjqv9dznc4p",
       "depends": ["dplyr", "lazyeval", "plyr", "rlang", "robustbase", "xts", "zoo"]
     },
-    "mvPot": {
-      "name": "mvPot",
-      "version": "0.1.6",
-      "sha256": "18cx02wg6nkgmh2ba2gp37z838xr70w354wbkfgl5jnyirl5g9xz",
-      "depends": ["MASS", "evd", "gmp", "numbers"]
-    },
     "mvProbit": {
       "name": "mvProbit",
       "version": "0.1-10",
@@ -87187,6 +90361,12 @@
       "sha256": "0vnf5q71hkj6nqljm73rcmvr7ir6zhp4qwrjvi49d6zxpdrs8yx1",
       "depends": ["Rfast", "Rfast2"]
     },
+    "mvcor": {
+      "name": "mvcor",
+      "version": "1.0",
+      "sha256": "0i9g2h05cwhkiaryzb2ghr1ix3i27bpxmvnay5vgrc36k5dmllyr",
+      "depends": ["Rfast"]
+    },
     "mvctm": {
       "name": "mvctm",
       "version": "1.2",
@@ -87199,22 +90379,16 @@
       "sha256": "0iblpg5yi9ig4hi6ff84m9pfgyrpkyfc9m9m98dpngpbhxfqnvhq",
       "depends": ["MASS", "car", "ggplot2", "moments", "penalized", "plyr", "reshape2", "sn"]
     },
-    "mverse": {
-      "name": "mverse",
-      "version": "0.1.0",
-      "sha256": "1qj77s98j05j8d1k1w3h56c7z2i1j973mflhklxhb3xxc7plyk3y",
-      "depends": ["broom", "cowplot", "dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "multiverse", "rlang", "stringr", "tidyr", "tidyselect"]
-    },
     "mvgam": {
       "name": "mvgam",
-      "version": "1.1.2",
-      "sha256": "1cbqz680844zjd0girpivig11infzn417cra3r87yg0iai7cz5zd",
+      "version": "1.1.3",
+      "sha256": "03nirq7wn3rp9lwkagvqcjrzihq0vmj8dijpn350j8cxvcdvbscl",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "bayesplot", "brms", "dplyr", "ggplot2", "insight", "loo", "magrittr", "marginaleffects", "mgcv", "mvnfast", "pbapply", "posterior", "purrr", "rlang", "rstan", "rstantools", "smooth", "zoo"]
     },
     "mvgb": {
       "name": "mvgb",
-      "version": "0.0.4",
-      "sha256": "1928mfbhlhwh03xiwlf5mvn6yp0i95rlknqb132b5hdsd3y5xin3",
+      "version": "0.0.6",
+      "sha256": "1qlbhs9lyzrgfiyqyhfnpwfzb2snjmbxv1rk5cg7h00hsdhdc890",
       "depends": []
     },
     "mvglmmRank": {
@@ -87309,8 +90483,8 @@
     },
     "mvord": {
       "name": "mvord",
-      "version": "1.2.4",
-      "sha256": "0hxgz5gjrvapfdjyf5w9wcankbwkd32ii291nzmlh8n8gb7pr067",
+      "version": "1.2.5",
+      "sha256": "08b4q7rbfq1b1ll2xlw1d28m744xng5b6b0xglxvhrxxm1wj3xac",
       "depends": ["BB", "MASS", "Matrix", "dfoptim", "minqa", "mnormt", "mvtnorm", "numDeriv", "optimx", "pbivnorm", "ucminf"]
     },
     "mvoutlier": {
@@ -87339,8 +90513,8 @@
     },
     "mvs": {
       "name": "mvs",
-      "version": "1.0.2",
-      "sha256": "1p0782c940chysr4sk746gl9gjxzx7rx8xyxbkdp3y6z0904ib5w",
+      "version": "2.0.0",
+      "sha256": "1fkkxrx5mraa2zlmgq9fgka2rvzn95yzaqby8slhyfpsrzxqwm4y",
       "depends": ["foreach", "glmnet"]
     },
     "mvst": {
@@ -87357,8 +90531,8 @@
     },
     "mvtnorm": {
       "name": "mvtnorm",
-      "version": "1.2-6",
-      "sha256": "0cfdd8l58yn48vc4zf4n5vfs3g02wdnvmkdf5zyybn3f54ydrpn4",
+      "version": "1.3-2",
+      "sha256": "1cmjl7h4v27rh9dzl5ayv4fw5i2lrj2sbsaz52na1ak0vni4cfva",
       "depends": []
     },
     "mvtsplot": {
@@ -87367,6 +90541,12 @@
       "sha256": "0n7lfxr3hq32fpg0vv9v0426k4dlgadfcjrjg7kj3abahykx7zl9",
       "depends": ["RColorBrewer"]
     },
+    "mvvg": {
+      "name": "mvvg",
+      "version": "0.1.0",
+      "sha256": "1il28fac763pgk5jl358aj32z6r59j30vsyfa0fvck5inr163iw6",
+      "depends": ["MixMatrix", "nlme", "psych"]
+    },
     "mwTensor": {
       "name": "mwTensor",
       "version": "1.1.0",
@@ -87379,6 +90559,12 @@
       "sha256": "0f994xpylqhhwwr3rv0y5y68989ssy7q4pb3hawq0ww0l3wj9lmd",
       "depends": ["MASS", "cem", "rJava"]
     },
+    "mwcsr": {
+      "name": "mwcsr",
+      "version": "0.1.9",
+      "sha256": "09pw4x9kbmbk3cnvh1xxwfan6kc4bmab52jly9fm3b0nji3apbkj",
+      "depends": ["Rcpp", "igraph"]
+    },
     "mwlaxeref": {
       "name": "mwlaxeref",
       "version": "0.0.1",
@@ -87391,10 +90577,16 @@
       "sha256": "0c1a0d9qnaszffhzanmk31mdxqi7j3rn6bk7a3dwg4bq1da3rlgl",
       "depends": ["htmltools", "shiny"]
     },
+    "mxcc": {
+      "name": "mxcc",
+      "version": "0.0.1",
+      "sha256": "1dlard1w925mgppx21d8a44l1pplglk9gkr5p394dsnf9fb20x54",
+      "depends": ["chi", "shotGroups"]
+    },
     "mxfda": {
       "name": "mxfda",
-      "version": "0.2.1",
-      "sha256": "0msfkyxdyy8p3rwxqyzqy9jmsjnv3ra7qspm1cfql3azpmhs8k4s",
+      "version": "0.2.2",
+      "sha256": "1fzbnsfyqav87lhc8w910wzqilw429x8swm5s6a4991p5dy19pvr",
       "depends": ["SimDesign", "SpatEntropy", "dplyr", "ggplot2", "lifecycle", "magrittr", "mgcv", "purrr", "refund", "reshape2", "rlang", "spatstat_explore", "spatstat_geom", "tidyr"]
     },
     "mxkssd": {
@@ -87429,15 +90621,15 @@
     },
     "myClim": {
       "name": "myClim",
-      "version": "1.1.0",
-      "sha256": "1wy5yzx4z2c9n9bq3imih339h20wigwy7120kk3wclpfxvhfi2b4",
+      "version": "1.3.0",
+      "sha256": "1fbld4aarqhg1sjpk9k5lwz4lq9zwgv56m5b565r4rxd13wd2qmv",
       "depends": ["data_table", "dplyr", "ggforce", "ggplot2", "lubridate", "plotly", "progress", "purrr", "stringr", "tibble", "tidyr", "viridis", "vroom", "zoo"]
     },
-    "myTAI": {
-      "name": "myTAI",
-      "version": "0.9.3",
-      "sha256": "0fd6srvwzqir8zif56cnyi02c952fgc67xzc17wn7xvmvljfvh4x",
-      "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "cpp11", "doParallel", "dplyr", "edgeR", "fitdistrplus", "foreach", "ggplot2", "gridExtra", "nortest", "readr", "reshape2", "scales", "taxize", "tibble"]
+    "mycaas": {
+      "name": "mycaas",
+      "version": "0.0.1",
+      "sha256": "1gjpn8mz8vp3410s6fbl3ndkasfzywzmyp33qzf5f29sirk2cn4m",
+      "depends": ["ggplot2", "igraph", "rPref", "rlang", "shiny"]
     },
     "mycobacrvR": {
       "name": "mycobacrvR",
@@ -87459,8 +90651,8 @@
     },
     "n1qn1": {
       "name": "n1qn1",
-      "version": "6.0.1-11",
-      "sha256": "17p48wm0wcw46lk9382yd9xpzx4rygdjyrbfdi6xnph1k5phjxpj",
+      "version": "6.0.1-12",
+      "sha256": "1rgmvmawvrac0b2k4r39429yvw7vidkhln68q2llr2k81ns58b32",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "nFactors": {
@@ -87501,8 +90693,8 @@
     },
     "naaccr": {
       "name": "naaccr",
-      "version": "2.0.2",
-      "sha256": "1j30fb7qvxzpx0y7hq8sbqvszwjfnc4r2g0j8885fmn2wxvcgzdx",
+      "version": "3.1.1",
+      "sha256": "09g3kk2ahd051fn4pw7r9pycvqbn1m7glqjh3c4qla1wsiksn2ih",
       "depends": ["XML", "data_table", "stringi"]
     },
     "nabor": {
@@ -87519,14 +90711,14 @@
     },
     "naflex": {
       "name": "naflex",
-      "version": "0.1.0",
-      "sha256": "18fqfhm6p38z4h8dznac5v8yz53n86cw2x6ma29kvcbvdp4r3yd2",
+      "version": "0.1.1",
+      "sha256": "0h5dciabqqqsy8m7f8h6jmhp35c7hphk5pp2csxlg31x75jjs79d",
       "depends": []
     },
     "naijR": {
       "name": "naijR",
-      "version": "0.6.0",
-      "sha256": "1108fz4rhckmb2d9s63rjb44dpfazhvhsqprgx82akbssr7xf9br",
+      "version": "0.6.1",
+      "sha256": "189sqj8dfjyphhg5dys58lixhhqfvy9d2ycrv1qaj7p4ikl6bgpi",
       "depends": ["RColorBrewer", "cli", "lifecycle", "mapdata", "maps", "rlang", "sf", "stringi"]
     },
     "naive": {
@@ -87591,14 +90783,14 @@
     },
     "nanoarrow": {
       "name": "nanoarrow",
-      "version": "0.5.0.1",
-      "sha256": "0rd2nd5b3zhfb4i8gygp9nrn9hbvzqqra0rzdp4msr11r4nkgh15",
+      "version": "0.6.0",
+      "sha256": "0wad6dvc7f4z9ll0v5mvqlvk2waf2wfhpnd3sckxsjfpg2s1an6b",
       "depends": []
     },
     "nanonext": {
       "name": "nanonext",
-      "version": "1.2.0",
-      "sha256": "1gqgrkl3px5s25qfqzd39x442nlls6s0hqwr5q6l92c95yfz14xx",
+      "version": "1.4.0",
+      "sha256": "029401ngvzxhfjcnny759nq11f3sy6f2dk446x30xp3qqrmn738q",
       "depends": []
     },
     "nanoparquet": {
@@ -87615,8 +90807,8 @@
     },
     "nanotime": {
       "name": "nanotime",
-      "version": "0.3.9",
-      "sha256": "1n3rz8zvrq5kxkfiv4gc64lmn72fm2jjgb9f2j23my38zpnnaafc",
+      "version": "0.3.10",
+      "sha256": "0iql143mv58j7i1v97ana17q25qssyivrm6pclyf58slvashndiy",
       "depends": ["Rcpp", "RcppCCTZ", "RcppDate", "bit64", "zoo"]
     },
     "naptanr": {
@@ -87645,8 +90837,8 @@
     },
     "naryn": {
       "name": "naryn",
-      "version": "2.6.26",
-      "sha256": "0v41cmmg19w2rfyndxzsv3k9h1clfc0p2py3mq47zl79qv79vqbr",
+      "version": "2.6.30",
+      "sha256": "0d4w1y6g2dzcs98x7lqnhjadzqcrw2wvn5lbkbsrs1xkf23z6rjh",
       "depends": ["dplyr", "glue", "lifecycle", "magrittr", "purrr", "stringr", "tidyr", "yaml"]
     },
     "nasadata": {
@@ -87657,8 +90849,8 @@
     },
     "nasapower": {
       "name": "nasapower",
-      "version": "4.2.1",
-      "sha256": "064n7yd5qkaqx1q5s16bm6fvkjlqjknrkkcpin5hz2nishmkqqwb",
+      "version": "4.2.2",
+      "sha256": "0735j9lcb15j20g3hv28wz77mfnrwfh6wz7r5fvq8q5mgyy46d0z",
       "depends": ["cli", "crul", "jsonlite", "lubridate", "readr", "rlang", "tibble"]
     },
     "nasaweather": {
@@ -87811,16 +91003,22 @@
       "sha256": "1p1m1jml7grpjfp5qibffm3dx8zz37h216bpcwybm293naprmbfr",
       "depends": ["cli", "magrittr"]
     },
+    "nbody": {
+      "name": "nbody",
+      "version": "1.41",
+      "sha256": "19l6w5axpahcnm2kxlbl61gkkhg1r947z23cjlw4ln7n7vgcrxxn",
+      "depends": ["Rcpp", "magicaxis"]
+    },
     "nbpMatching": {
       "name": "nbpMatching",
-      "version": "1.5.5",
-      "sha256": "0r9q4vkqsrb1m0kzwgih797r3shy04fd185z3rwdi3w4cs03xydp",
+      "version": "1.5.6",
+      "sha256": "0hl1plld7b0kjwiwwsiwlwfhv790w2kg660956zvw4jdnwqhfadk",
       "depends": ["Hmisc", "MASS"]
     },
     "nc": {
       "name": "nc",
-      "version": "2024.2.21",
-      "sha256": "00m2128n3mpl9i77qcdrr49swpj2lr5wif8xxkfimhm3fciw2fgh",
+      "version": "2024.9.20",
+      "sha256": "0q1xf2mf0si8j80ppddnn88x0mnx4ij0bf8azpv781m5sl6dklyx",
       "depends": ["data_table"]
     },
     "ncappc": {
@@ -87855,9 +91053,9 @@
     },
     "ncdfCF": {
       "name": "ncdfCF",
-      "version": "0.1.1",
-      "sha256": "1q6q36zml4lm3yznsb245ll80a1mdgykmrk6chq0ymn64azbd73l",
-      "depends": ["CFtime", "RNetCDF", "stringr"]
+      "version": "0.2.1",
+      "sha256": "0fqn438yi85i17xkgxd9i63fsfxfwz99mghi6bp687hp4g6vh5fd",
+      "depends": ["CFtime", "R6", "RNetCDF", "stringr"]
     },
     "ncdfgeom": {
       "name": "ncdfgeom",
@@ -87897,15 +91095,15 @@
     },
     "ncvreg": {
       "name": "ncvreg",
-      "version": "3.14.2",
-      "sha256": "1hbidxb9f6ygvjkvcdr1b642akgz25kzamnav55snjny82fmfspv",
+      "version": "3.14.3",
+      "sha256": "0kisb28qb8vya2b77jacfy0y4vdf7krqps4761b27nh0a8ybbdgd",
       "depends": []
     },
     "nda": {
       "name": "nda",
-      "version": "0.1.13",
-      "sha256": "1v3nfjq0v0vjv3871qsx7sxl5b6p74187cvacj3jfjyxbzghb8pc",
-      "depends": ["MASS", "Matrix", "energy", "igraph", "ppcor", "psych", "visNetwork"]
+      "version": "0.1.15",
+      "sha256": "18kl1c12anhladf2cr5wyxm67mxd83ykj52fig57gs806xzcafac",
+      "depends": ["MASS", "Matrix", "Rfast", "energy", "igraph", "leidenAlg", "ppcor", "psych", "visNetwork"]
     },
     "ndi": {
       "name": "ndi",
@@ -87973,6 +91171,12 @@
       "sha256": "1al5cw4s2gsjfmrq0pgzz2y3xnvmibma01q8k6923k2wfwgnlkkn",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "Rfast", "Seurat", "SingleCellExperiment", "doFuture", "doRNG", "foreach", "future", "nloptr", "parallelly", "trust"]
     },
+    "necountries": {
+      "name": "necountries",
+      "version": "0.1-1",
+      "sha256": "1wqn0n3qzjsblwzprhxs99c4z9pwcy11s7iiai0pn7ki7vx2k8g2",
+      "depends": ["Rdpack", "classInt", "dplyr", "ggplot2", "ggrepel", "magrittr", "rlang", "sf", "stringi", "stringr", "tibble"]
+    },
     "needmining": {
       "name": "needmining",
       "version": "0.1.1",
@@ -87993,8 +91197,8 @@
     },
     "negligible": {
       "name": "negligible",
-      "version": "0.1.8",
-      "sha256": "0ammn1zfzy2q4vd20bj40ix58lz5rkjl7csyp98hq6mq2h091gmv",
+      "version": "0.1.9",
+      "sha256": "085pv5nh7v6mwyvhdr2nqnh0z6729lq86nwb6klhzhqi376i1r6q",
       "depends": ["DescTools", "MBESS", "WRS2", "dplyr", "e1071", "ez", "fungible", "ggplot2", "lavaan", "nptest", "rockchalk"]
     },
     "neighbours": {
@@ -88053,8 +91257,8 @@
     },
     "neojags": {
       "name": "neojags",
-      "version": "0.1.4",
-      "sha256": "10z5x78a3mjy5jbxlzfzsixp6w8y0v0mkxnwf5bq3rk5dgnga0g0",
+      "version": "0.1.5",
+      "sha256": "095m133almpw84yaw0sh1qngjsf30gl6yxp83gyaaysrjmz3i9yq",
       "depends": ["coda", "rjags", "runjags"]
     },
     "neonOS": {
@@ -88077,8 +91281,8 @@
     },
     "neonUtilities": {
       "name": "neonUtilities",
-      "version": "2.4.2",
-      "sha256": "0mx0pj6zxi0kqn2bqhyrn4bwg9jl151lv3fhk7llswivxp8fzd1p",
+      "version": "2.4.3",
+      "sha256": "0jpfgiaznpglc499qa6kqbyswpm9nf5004sqqxg797fv4n9z72jy",
       "depends": ["R_utils", "curl", "data_table", "downloader", "httr", "jsonlite", "pbapply", "stringr", "tidyr"]
     },
     "neonstore": {
@@ -88089,8 +91293,8 @@
     },
     "neotoma2": {
       "name": "neotoma2",
-      "version": "1.0.4",
-      "sha256": "0dhbb7hhbw508mc4zwa2hr5kx5gaz4fj2vp2mrgjqww3dr55c1kp",
+      "version": "1.0.5",
+      "sha256": "13l41cypjpiqdkpkdwz7z39iiza2z6jcxj4sgm85713m7ws9dyak",
       "depends": ["assertthat", "dplyr", "geojsonsf", "gtools", "httr", "jsonlite", "leaflet", "lubridate", "magrittr", "progress", "purrr", "rlang", "sf", "stringr", "tidyr", "uuid", "wk"]
     },
     "nephro": {
@@ -88125,8 +91329,8 @@
     },
     "nestedcv": {
       "name": "nestedcv",
-      "version": "0.7.10",
-      "sha256": "1cfxw9pblrn2f0bw448sxdnj7pb04l1pkfdajzcmg9yn95k1v95b",
+      "version": "0.7.12",
+      "sha256": "0f5wmnd8q1zq1xpp05n245v7zag63wwblh5rhi9qfw8069lpyp1p",
       "depends": ["ROCR", "Rfast", "RhpcBLASctl", "caret", "data_table", "doParallel", "foreach", "ggplot2", "glmnet", "matrixStats", "matrixTests", "pROC", "rlang"]
     },
     "nestedmodels": {
@@ -88167,8 +91371,8 @@
     },
     "netCoin": {
       "name": "netCoin",
-      "version": "2.0.48",
-      "sha256": "03rmi75rjjy03jy0cv6qzz46q06027zvbwy4vp13748vq49aql1s",
+      "version": "2.0.84",
+      "sha256": "0mkks87k4m4khd9ykw6fhy7f1naildms1h7s0wdr4d6r63a8fhzs",
       "depends": ["GPArotation", "MASS", "Matrix", "haven", "igraph", "rD3plot"]
     },
     "netSEM": {
@@ -88185,8 +91389,8 @@
     },
     "netUtils": {
       "name": "netUtils",
-      "version": "0.8.2",
-      "sha256": "0laha093wxkvs06wh2hsmyxypn89n7vlh183zw6k26d67vl15a6j",
+      "version": "0.8.3",
+      "sha256": "1wqy57s2frnylbk9fw58cmx1734zrfc85x7wdz69bsfiyb4rgj7h",
       "depends": ["Rcpp", "RcppArmadillo", "igraph"]
     },
     "netassoc": {
@@ -88281,8 +91485,8 @@
     },
     "netropy": {
       "name": "netropy",
-      "version": "0.1.0",
-      "sha256": "1c7gmv4lm2i2bmvhan5v0w3s3qvaxq0l7f4q76jhcc9mlz0plbh1",
+      "version": "0.2.0",
+      "sha256": "1v5nmcpf47jxqdzxaly649fvbcn3li3lpfp540rgd2prlaplialc",
       "depends": ["ggplot2", "ggraph", "igraph"]
     },
     "nets": {
@@ -88293,9 +91497,9 @@
     },
     "netseer": {
       "name": "netseer",
-      "version": "0.1.0",
-      "sha256": "0bqwiv7n396myk73rqycx1d4i0nak9gsrda5pxqzr0j82k62vkqx",
-      "depends": ["Matrix", "dplyr", "fable", "fabletools", "igraph", "lpSolve", "rlang", "tibble", "tidyr", "tsibble"]
+      "version": "0.1.1",
+      "sha256": "1ivkd13w896sf3rdqrklxxabylm9rjp6hbygp51lgshv9mqvps5c",
+      "depends": ["Matrix", "dplyr", "fable", "fabletools", "forecast", "future", "igraph", "lpSolve", "rlang", "tibble", "tsibble"]
     },
     "netseg": {
       "name": "netseg",
@@ -88323,8 +91527,8 @@
     },
     "network": {
       "name": "network",
-      "version": "1.18.2",
-      "sha256": "0yx20v3izm7037cx5swc19966z97w7q9xw4p2p6skfyap4nqjcxz",
+      "version": "1.19.0",
+      "sha256": "04i02ld1wq5qij2q7sx7k1kmpz1gb2xkwbqhhvriwh8nzc3s04px",
       "depends": ["magrittr", "statnet_common", "tibble"]
     },
     "networkABC": {
@@ -88341,8 +91545,8 @@
     },
     "networkDynamic": {
       "name": "networkDynamic",
-      "version": "0.11.4",
-      "sha256": "0ija33qxka8nw6rikvcz5b6648scmq7mcaayjbzq7wa4lhbf5wvb",
+      "version": "0.11.5",
+      "sha256": "1h55y95l23r1670aqgcfi0n9mymcnnv3wy8raa8j7yfpm06g8gx3",
       "depends": ["network", "networkLite", "statnet_common"]
     },
     "networkDynamicData": {
@@ -88405,6 +91609,12 @@
       "sha256": "09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz",
       "depends": ["Deriv", "MASS"]
     },
+    "neuroUp": {
+      "name": "neuroUp",
+      "version": "0.3.1",
+      "sha256": "0j8czjpw3inj1nmca55cz0yxwffdcwdr8vjq0z9c0diij9460lb7",
+      "depends": ["bootstrap", "dplyr", "ggplot2", "magrittr", "psychometric", "rlang", "tibble"]
+    },
     "neurobase": {
       "name": "neurobase",
       "version": "1.32.4",
@@ -88417,12 +91627,6 @@
       "sha256": "18n2ysrxb47wn5xpf906i5hn84f45r3ijla7sravyrsh8lbx6xih",
       "depends": []
     },
-    "neurocInstall": {
-      "name": "neurocInstall",
-      "version": "0.12.0",
-      "sha256": "1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf",
-      "depends": ["devtools"]
-    },
     "neurohcp": {
       "name": "neurohcp",
       "version": "0.9.0",
@@ -88437,8 +91641,8 @@
     },
     "neuroimaGene": {
       "name": "neuroimaGene",
-      "version": "0.1.0",
-      "sha256": "1axdb20zv7y1rkazm6ppmkf09czff2bp2ylcl1ahn5sw5fi7adcc",
+      "version": "0.1.2",
+      "sha256": "0j0z6l93b2pxa2dyw5xi7s1cgijx06w0mzyqh5d2s5rhdr5ihzvg",
       "depends": ["DBI", "RSQLite", "data_table", "ggplot2", "ggseg", "stringr"]
     },
     "neuromplex": {
@@ -88447,18 +91651,18 @@
       "sha256": "1zj7x528qv4bp24fx546jj9kf0q0n26jyi65v6h2bl3c61rrb6bz",
       "depends": ["BayesLogit", "dplyr", "ggplot2", "gridExtra", "magrittr", "tidyr"]
     },
-    "neuronorm": {
-      "name": "neuronorm",
-      "version": "1.0.2",
-      "sha256": "1bypspygib963n255q6j5pmm14sw67ipmkq54faz8w2i3mdb845v",
-      "depends": ["fslr", "knitr", "oro_nifti"]
-    },
     "neutralitytestr": {
       "name": "neutralitytestr",
       "version": "0.0.3",
       "sha256": "1660v7nng6dj9gwn04ynirms0g10wpsz33i26va229zdviqm5cyy",
       "depends": ["cowplot", "dplyr", "ggplot2", "ggpmisc", "pracma", "scales"]
     },
+    "neutrostat": {
+      "name": "neutrostat",
+      "version": "0.0.2",
+      "sha256": "15xp2aj480zp2gyylvakfs88ccpszk6jdqcxgzdq5f33gfbsiq8c",
+      "depends": ["ggplot2", "moments", "ntsDists"]
+    },
     "nevada": {
       "name": "nevada",
       "version": "0.2.0",
@@ -88527,9 +91731,9 @@
     },
     "nexus": {
       "name": "nexus",
-      "version": "0.2.0",
-      "sha256": "0dyhgd18kz7yfdziycxkmqb58zx99fr99wxp3dfjfxip537sx1sn",
-      "depends": ["MASS", "arkhe", "dimensio", "isopleuros"]
+      "version": "0.3.0",
+      "sha256": "0288hjbw5xisrv1wsd2msl8i7migpw1yi2lnwh4cl5r42mn2wcj9",
+      "depends": ["MASS", "arkhe", "dimensio", "isopleuros", "khroma"]
     },
     "nfer": {
       "name": "nfer",
@@ -88545,15 +91749,15 @@
     },
     "nflfastR": {
       "name": "nflfastR",
-      "version": "4.6.1",
-      "sha256": "0b9pn53kzgf0bni98j6f06piwp21wxkm15k9hvhbq0g3x9sj0zqg",
-      "depends": ["cli", "curl", "data_table", "dplyr", "fastrmodels", "furrr", "future", "glue", "janitor", "mgcv", "nflreadr", "progressr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xgboost"]
+      "version": "5.0.0",
+      "sha256": "0bpgkl5gxh3brm8wiqpx0m1ky4w8czadzrjhjw1p478yaldn9xx5",
+      "depends": ["cli", "curl", "data_table", "dplyr", "fastrmodels", "furrr", "future", "glue", "janitor", "lifecycle", "mgcv", "nflreadr", "progressr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "xgboost"]
     },
     "nflplotR": {
       "name": "nflplotR",
-      "version": "1.3.1",
-      "sha256": "1j6vhd1ysanc47ixa56gj0dgxqhiwdkbvkcmhdpkwc3zs5c78lzn",
-      "depends": ["cachem", "cli", "data_table", "ggpath", "ggplot2", "gt", "lifecycle", "magick", "memoise", "nflreadr", "rappdirs", "rlang", "scales"]
+      "version": "1.4.0",
+      "sha256": "153hw03p1cbrl2nmglspldapyrah35xvnnv6lw37v3aligh7414n",
+      "depends": ["backports", "cachem", "cli", "data_table", "ggpath", "ggplot2", "gt", "lifecycle", "magick", "memoise", "nflreadr", "rlang", "scales"]
     },
     "nflreadr": {
       "name": "nflreadr",
@@ -88609,12 +91813,6 @@
       "sha256": "09hdvmbna4m62zv18k5kj9718wzw7p43wnal2j6aa0m5sd2rx9rz",
       "depends": ["Rcpp", "RcppArmadillo", "batchmeans"]
     },
-    "nhanesA": {
-      "name": "nhanesA",
-      "version": "1.1",
-      "sha256": "10vbgwz0m94yqjydrylyl699j92yr1f7j9cc23q9v4grg7zspk0b",
-      "depends": ["foreign", "plyr", "rvest", "stringr", "xml2"]
-    },
     "nhdR": {
       "name": "nhdR",
       "version": "0.6.1",
@@ -88623,8 +91821,8 @@
     },
     "nhdplusTools": {
       "name": "nhdplusTools",
-      "version": "1.2.1",
-      "sha256": "13jms0cfccydcc5jz2mv6ych8zwsvxf2g6qzspa9vqxyjdq1wzqn",
+      "version": "1.3.0",
+      "sha256": "0imh5zkapzxgv45804n412ypa5x4jqr6xzk19znzib6cmypcp20k",
       "depends": ["R_utils", "arrow", "dataRetrieval", "digest", "dplyr", "fst", "httr", "hydroloom", "jsonlite", "magrittr", "mapsf", "maptiles", "memoise", "pbapply", "sf", "tidyr", "units", "xml2", "zip"]
     },
     "nhlapi": {
@@ -88641,8 +91839,8 @@
     },
     "nhppp": {
       "name": "nhppp",
-      "version": "0.1.4",
-      "sha256": "0822xcv2yq6f12naphh6d29q0215nwamf342fji6nffj6flfhh8d",
+      "version": "1.0.0",
+      "sha256": "1v85by6jlnvn49061jxkx9ba7rgvcp5hh4pnyp45q30lf6xba2wp",
       "depends": ["Rcpp", "lifecycle", "rstream"]
     },
     "nhs_predict": {
@@ -88695,9 +91893,9 @@
     },
     "nichetools": {
       "name": "nichetools",
-      "version": "0.2.0",
-      "sha256": "12hcgqwq74pkf0x4240blb699qnazsls1dsni9arnf9hq06zypdy",
-      "depends": ["cli", "dplyr", "ellipse", "lifecycle", "nicheROVER", "purrr", "rlang", "tibble", "tidyr"]
+      "version": "0.3.2",
+      "sha256": "1fis4vp5kjid2b9qv0wvi9m5y1d9ij7z9n5j2lhlsb6r3jn37l56",
+      "depends": ["SIBER", "cli", "dplyr", "ellipse", "lifecycle", "nicheROVER", "purrr", "rlang", "tibble", "tidyr"]
     },
     "nichevol": {
       "name": "nichevol",
@@ -88737,8 +91935,8 @@
     },
     "nimble": {
       "name": "nimble",
-      "version": "1.2.1",
-      "sha256": "11r5h2v8q4n50i843va2lm5is8cfq5268dyvhkp56xav7vkp319f",
+      "version": "1.3.0",
+      "sha256": "0kn7r3l70cwqjrhy9734dx9h58niv5778434z1xj1qys6q94ja9l",
       "depends": ["R6", "coda", "igraph", "numDeriv", "pracma"]
     },
     "nimbleAPT": {
@@ -88761,8 +91959,8 @@
     },
     "nimbleHMC": {
       "name": "nimbleHMC",
-      "version": "0.2.2",
-      "sha256": "0xy8rhpskfb41pa2gsx2qy1bza3rqh5ihiaipc8xpsd2d22c1xnc",
+      "version": "0.2.3",
+      "sha256": "0wzxiynx952a4rls08z2krn5hys4r9914jmkp87aigfxs7g3d1bl",
       "depends": ["nimble"]
     },
     "nimbleNoBounds": {
@@ -88785,8 +91983,8 @@
     },
     "nipals": {
       "name": "nipals",
-      "version": "0.8",
-      "sha256": "0nv7h68hysxnpiinmgw6v3bz4ya53c0p96k9bfvcmalfb7hs8j5z",
+      "version": "1.0",
+      "sha256": "1aasm7ifnlxwaywq0g7v5m2w6jl7kld08k9gn3vbsm43wnpp0ahw",
       "depends": []
     },
     "nipnTK": {
@@ -88809,9 +92007,9 @@
     },
     "nixtlar": {
       "name": "nixtlar",
-      "version": "0.5.2",
-      "sha256": "0r0vcrwpx7gyndbp6wwvlzvvl1ivk2js13m7lgpkdhriwy4bws9v",
-      "depends": ["dplyr", "ggplot2", "httr2", "lubridate", "rlang", "tidyr", "tidyselect", "tsibble"]
+      "version": "0.6.2",
+      "sha256": "0gi8v0l3032di8ph7x0x9yqsmip7fyams8bpznphg75h4wlalvlv",
+      "depends": ["dplyr", "future", "future_apply", "ggplot2", "httr2", "lubridate", "purrr", "rlang", "tidyr", "tidyselect"]
     },
     "njgeo": {
       "name": "njgeo",
@@ -88887,8 +92085,8 @@
     },
     "nlmixr2": {
       "name": "nlmixr2",
-      "version": "2.1.2",
-      "sha256": "1mfc9gyz21796j7h9g18hrkisrd6vyw4nc5dpfdd9r0abp8x61aw",
+      "version": "3.0.1",
+      "sha256": "1s5q6ik5y6yz127rra0xq5qafwjrk2z342wx3w72m3bn38jzisjm",
       "depends": ["cli", "crayon", "lotri", "magrittr", "nlmixr2data", "nlmixr2est", "nlmixr2extra", "nlmixr2plot", "rxode2"]
     },
     "nlmixr2data": {
@@ -88899,26 +92097,26 @@
     },
     "nlmixr2est": {
       "name": "nlmixr2est",
-      "version": "2.2.2",
-      "sha256": "1g25cqh3yybq9lxbxma3fd11jw1wgpnadxjx78sqqbzwx54xiawf",
-      "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "backports", "checkmate", "cli", "knitr", "lbfgsb3c", "lotri", "magrittr", "minqa", "n1qn1", "nlme", "nlmixr2data", "rex", "rxode2", "rxode2parse", "rxode2random", "symengine"]
+      "version": "3.0.2",
+      "sha256": "1i4vdh5malwg4r81ik5n5p3b1iw2y8apvdnsy9r9fz39s4m4yia0",
+      "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "backports", "checkmate", "cli", "knitr", "lbfgsb3c", "lotri", "magrittr", "minqa", "n1qn1", "nlme", "nlmixr2data", "rex", "rxode2", "symengine"]
     },
     "nlmixr2extra": {
       "name": "nlmixr2extra",
-      "version": "2.0.10",
-      "sha256": "03k8f6v6qqgbl8ngga0n6xyx2kz98xfv6kvi7rad9n90fpdqiaxl",
-      "depends": ["Rcpp", "RcppArmadillo", "checkmate", "cli", "crayon", "data_table", "digest", "ggplot2", "ggtext", "knitr", "lotri", "nlme", "nlmixr2est", "rxode2", "symengine"]
+      "version": "3.0.1",
+      "sha256": "04w119h03xk6fdn008pbrn6p8lpma9ip669vrmw4wrypxjw2knz2",
+      "depends": ["Rcpp", "RcppArmadillo", "checkmate", "cli", "crayon", "data_table", "digest", "dplyr", "ggplot2", "ggtext", "knitr", "lotri", "nlme", "nlmixr2est", "rxode2", "symengine"]
     },
     "nlmixr2lib": {
       "name": "nlmixr2lib",
-      "version": "0.2.0",
-      "sha256": "1clar5nw77dc07q1l014ajc5avfdd2n82chdpbv1gcs2mfyrwr9r",
+      "version": "0.3.0",
+      "sha256": "1026kc00slcx7frbi46mqa506fnm5syy0ks11cam4vnzk554mx9r",
       "depends": ["checkmate", "cli", "nlmixr2est", "rxode2"]
     },
     "nlmixr2plot": {
       "name": "nlmixr2plot",
-      "version": "2.0.9",
-      "sha256": "0n0crjmb5mwnrq52hf9hwi36ggvwrpyxsr9gm608dwwxky8zmrwg",
+      "version": "3.0.0",
+      "sha256": "1f5pga8v3rs6vdbmk2m06swkn6d90l2i6pgnm1y9k9mk0324v9qz",
       "depends": ["ggplot2", "nlmixr2est", "nlmixr2extra", "rxode2", "vpc", "xgxr"]
     },
     "nlmixr2rpt": {
@@ -89133,8 +92331,8 @@
     },
     "nn2poly": {
       "name": "nn2poly",
-      "version": "0.1.1",
-      "sha256": "03p3asvx1913lkmi6f1bq71wxm83qc0lbniv4s9s9fcv13md3xml",
+      "version": "0.1.2",
+      "sha256": "1qcgcg9pwx6x6ffrqlmyc7wazx2zhmfq221dr5x04abrr58zx6yr",
       "depends": ["Rcpp", "RcppArmadillo", "generics", "matrixStats", "pracma"]
     },
     "nnGarrote": {
@@ -89199,14 +92397,14 @@
     },
     "nnlib2Rcpp": {
       "name": "nnlib2Rcpp",
-      "version": "0.2.8",
-      "sha256": "06fb4wh39gdlywpyj86hnys87mrwrx2m6dw16zkrs1kawg4z5gvm",
+      "version": "0.2.9",
+      "sha256": "0jckh6krzydcam78zyf34jm23781alla2r11sw640bhw3j71amxc",
       "depends": ["Rcpp", "class"]
     },
     "nnls": {
       "name": "nnls",
-      "version": "1.5",
-      "sha256": "0lilga63p7k5mkkfcf5p3swx76vwysl979jxszm6svzqhsrgww6d",
+      "version": "1.6",
+      "sha256": "1nkz25rld4ia9l5zwf4dn9imd15mdi8lmi3ydx449dxsrxs62br7",
       "depends": []
     },
     "nnspat": {
@@ -89227,12 +92425,6 @@
       "sha256": "0anv6vl9md127y59k6sqvpx7sacfwz62amgc4x0yb0rj7xwvzjnd",
       "depends": ["GpGp", "TruncatedNormal"]
     },
-    "noaaoceans": {
-      "name": "noaaoceans",
-      "version": "0.3.0",
-      "sha256": "0pxsddzkrprzjch173shhmd7c2h6rh5xzs3n5bbs97l51ni8m60m",
-      "depends": ["httr", "jsonlite", "rvest", "xml2"]
-    },
     "noaastormevents": {
       "name": "noaastormevents",
       "version": "0.2.0",
@@ -89253,8 +92445,8 @@
     },
     "nodbi": {
       "name": "nodbi",
-      "version": "0.10.6",
-      "sha256": "1kgn6c0s0gac38ip5z5sm56psg912b9hg3klsymazam9r76ddaqx",
+      "version": "0.11.0",
+      "sha256": "0801jcs5kln8fpjr3vgn2mmv52ygdybynh2fwfa632j2cn0laq1i",
       "depends": ["DBI", "R_utils", "V8", "jqr", "jsonlite", "stringi", "uuid"]
     },
     "node2vec": {
@@ -89275,6 +92467,12 @@
       "sha256": "1yz2ynn7cfwjim3bmwvf4v7fflghc2kfx9frwz2m85l9pcr3qlx0",
       "depends": ["ape", "picante", "raster", "sp", "vegan"]
     },
+    "noegletalR": {
+      "name": "noegletalR",
+      "version": "0.2.1",
+      "sha256": "0kjbkisxm1kyb55sgphqsl29sfrwrwbfynfmlv70b31axyhvp6b4",
+      "depends": ["dplyr", "httr", "readr", "rlang", "rvest", "stringr", "tibble", "tidyr"]
+    },
     "nofrills": {
       "name": "nofrills",
       "version": "0.3.2",
@@ -89343,8 +92541,8 @@
     },
     "nominatimlite": {
       "name": "nominatimlite",
-      "version": "0.4.1",
-      "sha256": "0vnpd21ybwmkkafsd65zg9bdcnmffxwqxrdfhgwdv82sclnd8xa8",
+      "version": "0.4.2",
+      "sha256": "0n0q5g4r5m8rq0m94ddbrsv91c67jvca9ca02f9id1qyha7pbkvz",
       "depends": ["dplyr", "jsonlite", "sf"]
     },
     "nomisr": {
@@ -89403,8 +92601,8 @@
     },
     "nonlinearTseries": {
       "name": "nonlinearTseries",
-      "version": "0.3.0",
-      "sha256": "1qzg5azydivxp04bs1s3m21bigacyrv6cak3cx7xpgq2w4fnb3br",
+      "version": "0.3.1",
+      "sha256": "1rvjklmja5ak2mkg5vp97pilghgxk789b8p1n1rcd69qv3nl1hlw",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "lifecycle", "tseries", "zoo"]
     },
     "nonmem2R": {
@@ -89415,14 +92613,14 @@
     },
     "nonmem2rx": {
       "name": "nonmem2rx",
-      "version": "0.1.4",
-      "sha256": "08yyh7jwlqfxprwrs2f3pgjzlii66p98ixnd5r2jliqdzxbx1ciy",
-      "depends": ["Rcpp", "checkmate", "cli", "crayon", "data_table", "digest", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "qs", "rxode2", "rxode2parse", "xml2"]
+      "version": "0.1.6",
+      "sha256": "1gw4bw83a1d77y3nj0glqik1j59az30iga53qaci8wxadx95k9lk",
+      "depends": ["Rcpp", "checkmate", "cli", "crayon", "data_table", "digest", "dparser", "ggforce", "ggplot2", "lotri", "magrittr", "qs", "rxode2", "xml2"]
     },
     "nonmemica": {
       "name": "nonmemica",
-      "version": "1.0.8",
-      "sha256": "000pjp7zk3pw7xhg0w8363b1q52l6ikqjpvdxjd1kb61y99bi6m2",
+      "version": "1.0.11",
+      "sha256": "097lglq9xns7kbrlz8p36hx68p8zysdg58nbxyl9rp3x7hjkspzp",
       "depends": ["csv", "dplyr", "encode", "lazyeval", "magrittr", "metaplot", "rlang", "spec", "tidyr", "xml2"]
     },
     "nonneg_cg": {
@@ -89433,8 +92631,8 @@
     },
     "nonnest2": {
       "name": "nonnest2",
-      "version": "0.5-7",
-      "sha256": "0gnv538wskgyp6v08b0grz76mfpc1qlbp0r5w19b9lrv9d3c4h74",
+      "version": "0.5-8",
+      "sha256": "10nw8b0qcppbwc4lvvpyxpxvg583bl3fy916yx74xcm563aar98r",
       "depends": ["CompQuadForm", "lavaan", "mvtnorm", "sandwich"]
     },
     "nonpar": {
@@ -89457,8 +92655,8 @@
     },
     "nonprobsvy": {
       "name": "nonprobsvy",
-      "version": "0.1.0",
-      "sha256": "0p5x88dgas0hy3xydn5803pybf5ryxc85gzn9fb2c5kdrv2v0pcr",
+      "version": "0.1.1",
+      "sha256": "0sckbj0src1skhdyikr1gk2aim3sbh9s8ha0pbf2yqyy8bmcga2s",
       "depends": ["MASS", "Matrix", "RANN", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "mathjaxr", "maxLik", "ncvreg", "nleqslv", "survey"]
     },
     "nonsmooth": {
@@ -89469,8 +92667,8 @@
     },
     "nopaco": {
       "name": "nopaco",
-      "version": "1.0.7",
-      "sha256": "0ffcbrk3l2xprd4jiilvk6i5l39x4mi7vrx4irzqnf3m9nwsz6w5",
+      "version": "1.0.9",
+      "sha256": "1n2jqjlsssk116dziw8fbr9p74yil2fxzj0yi3nkphlw5bhqy8qa",
       "depends": ["Matrix"]
     },
     "nopp": {
@@ -89487,8 +92685,8 @@
     },
     "norMmix": {
       "name": "norMmix",
-      "version": "0.1-1",
-      "sha256": "1nkgidzbqp83bqvkpalxs58s2blpx9s1j9dm2i13plfx3kv0d6x3",
+      "version": "0.2-0",
+      "sha256": "1hlyfqgcb7yxmc4qls5k9q5jxxdpp5hffz3k4hv3bsg6gvh200hm",
       "depends": ["MASS", "cluster", "mclust", "mvtnorm", "sfsmisc"]
     },
     "nord": {
@@ -89541,9 +92739,9 @@
     },
     "normfluodbf": {
       "name": "normfluodbf",
-      "version": "1.5.2",
-      "sha256": "1xhvwrkjhdxdzh9p1wmnxmskn6q5658s0v63p9x67b30g5s2bsca",
-      "depends": ["badger", "data_table", "dplyr", "emojifont", "foreign", "ggplot2", "ggthemes", "rio", "stringr", "tibble", "tidyr"]
+      "version": "2.0.0",
+      "sha256": "0q110lyp5hjxg0zi9176s9a7b167l19d8xic8zx5yddaxpnplphz",
+      "depends": ["assertthat", "badger", "data_table", "dplyr", "emojifont", "forcats", "foreign", "ggplot2", "gridExtra", "hexSticker", "magrittr", "pkgsearch", "plotly", "purrr", "rlang", "rstudioapi", "shiny", "stringr", "testthat", "tibble", "tidyr", "wesanderson"]
     },
     "nortest": {
       "name": "nortest",
@@ -89577,8 +92775,8 @@
     },
     "not": {
       "name": "not",
-      "version": "1.5",
-      "sha256": "0g40500h2cwimzf7w3zqas924i4cvxddmqv0ysqrm4r7y2dpv48i",
+      "version": "1.6",
+      "sha256": "1cf3hnms3n3ipnsrbgjfjpqsixgwi9amcx2ws3ki8479b5wcxxng",
       "depends": []
     },
     "notebookutils": {
@@ -89613,8 +92811,8 @@
     },
     "np": {
       "name": "np",
-      "version": "0.60-17",
-      "sha256": "0dkz8aing2zdah83sjs874cxgwyzx82x60idziqfbhjf4g5mfyfr",
+      "version": "0.60-18",
+      "sha256": "16ragidbi560fvkl4pwn8wxsbcj40hp03bxqhx811cicmk0m875j",
       "depends": ["boot", "cubature", "quadprog", "quantreg"]
     },
     "npDoseResponse": {
@@ -89673,15 +92871,15 @@
     },
     "npboottprm": {
       "name": "npboottprm",
-      "version": "0.3.1",
-      "sha256": "0ipicpy1hfxbj7mw18slykxwyyav8r2z8rsnqhhvxw3f9w656nhd",
-      "depends": ["DT", "MASS", "MKinfer", "RPostgres", "fGarch", "ggplot2", "lmPerm", "pool", "shiny", "shinythemes", "sn"]
+      "version": "0.3.2",
+      "sha256": "0f9l97fbna8gghl7yzk65w4zss8kk10rmmi67d8y75mhp2bvk4ir",
+      "depends": ["DT", "MASS", "MKinfer", "fGarch", "ggplot2", "lmPerm", "mmints", "shiny", "shinythemes", "sn"]
     },
     "npboottprmFBar": {
       "name": "npboottprmFBar",
-      "version": "0.1.1",
-      "sha256": "039da7k4mbw08siwicfvfn12v7ngc9989rw4f1rsyqskgj7s4h4g",
-      "depends": ["fGarch", "lmPerm", "npboottprm", "restriktor"]
+      "version": "0.2.0",
+      "sha256": "1hww2jdb6sgkn9mq3wi2139l7i0dki48v3s91c8advck8214p4vq",
+      "depends": ["DT", "fGarch", "lmPerm", "mmints", "npboottprm", "restriktor", "shiny"]
     },
     "npbr": {
       "name": "npbr",
@@ -89691,20 +92889,14 @@
     },
     "npclust": {
       "name": "npclust",
-      "version": "0.1.0",
-      "sha256": "0a1las0vxm4mhwvds66lvq87kb140sjrnjq5sihbrrh7wpbq31zg",
+      "version": "0.1.1",
+      "sha256": "0bj65f4nqd3sw5jf4p1y4dy2c89ax53qdz8zn4iqlpg47rrgpc0m",
       "depends": ["MASS", "ggplot2"]
     },
-    "npcopTest": {
-      "name": "npcopTest",
-      "version": "1.03",
-      "sha256": "1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr",
-      "depends": []
-    },
     "npcp": {
       "name": "npcp",
-      "version": "0.2-5",
-      "sha256": "0mh5z4flksj7v1klylwqn2dxn5sbvs16sdy46l7y7n93i4v3pqvi",
+      "version": "0.2-6",
+      "sha256": "0xlbl5155dv4ngfr8b98rrsjjbb5pih8lil1bfw42vkqcz7s64dd",
       "depends": ["sandwich"]
     },
     "npcs": {
@@ -89985,8 +93177,8 @@
     },
     "nswgeo": {
       "name": "nswgeo",
-      "version": "0.4.0",
-      "sha256": "18s7mkcf32h7si5b9n1djqz9jl24n6f6pg38ifafb1a5jnkwqs2f",
+      "version": "0.5.0",
+      "sha256": "1czb617hhf7ghirfkdaywzazgdjys4ybhkjphklvqbyjdi26g61n",
       "depends": ["cartographer", "sf"]
     },
     "nsyllable": {
@@ -89997,9 +93189,15 @@
     },
     "ntdr": {
       "name": "ntdr",
-      "version": "0.3.4",
-      "sha256": "1s4zqfi9nyr1sksiq0bpdjgnv32qp1yk3igqs5jsrzdrgzbda1z9",
-      "depends": ["curl", "dplyr", "httr", "lubridate", "purrr", "readxl", "rvest", "tidyr"]
+      "version": "0.4.0",
+      "sha256": "0a2k1vlmknlj2d8xg73rp7985mnrxzivdbqqkxzwpplz1yfqxpdn",
+      "depends": ["curl", "dplyr", "httr2", "lubridate", "purrr", "rappdirs", "readxl", "rlang", "rvest", "tidyr"]
+    },
+    "ntfy": {
+      "name": "ntfy",
+      "version": "0.0.6",
+      "sha256": "18j64bs44h3gr6q9znm26pw1lz83c9xa6jd3rn5mznarfvgaafsm",
+      "depends": ["httr2", "jsonlite"]
     },
     "ntranova": {
       "name": "ntranova",
@@ -90027,8 +93225,8 @@
     },
     "nuggets": {
       "name": "nuggets",
-      "version": "1.0.2",
-      "sha256": "1ijlzcp42bhb2qpnnv9gi3nm87pprgs54m8s6vl7lgqv2njdasdg",
+      "version": "1.3.0",
+      "sha256": "0i7w2jf9v1kfa4cgbgvz45bxm3giy8yf4d608dld8f6h4458djwd",
       "depends": ["Rcpp", "cli", "rlang", "testthat", "tibble", "tidyr", "tidyselect"]
     },
     "nullabor": {
@@ -90063,14 +93261,14 @@
     },
     "numbat": {
       "name": "numbat",
-      "version": "1.4.0",
-      "sha256": "1a9rcna5m7lyh56d8dwwzq32svgad8vwidikna1j2j63i4frjms4",
+      "version": "1.4.2",
+      "sha256": "0a78iwr23nandzq6jk8lnh6qdaq99060j41klf8bzl7rmn43h4d6",
       "depends": ["GenomicRanges", "IRanges", "Matrix", "R_utils", "Rcpp", "RcppArmadillo", "RhpcBLASctl", "ape", "caTools", "data_table", "dendextend", "dplyr", "ggplot2", "ggraph", "ggtree", "glue", "hahmmr", "igraph", "logger", "magrittr", "optparse", "parallelDist", "patchwork", "pryr", "purrr", "roptim", "scales", "scistreer", "stringr", "tibble", "tidygraph", "tidyr", "vcfR", "zoo"]
     },
     "numberize": {
       "name": "numberize",
-      "version": "1.0.0",
-      "sha256": "1p3zcknlrv4ayyxk79vd021r9jwk2dxwp3saryzn4vgj8fnac8iy",
+      "version": "1.0.1",
+      "sha256": "1mvr9lnlph054j343rjqlfiagpfx5f1sx3pbrmbhd2fw6vnv1pz2",
       "depends": []
     },
     "numberofalleles": {
@@ -90157,6 +93355,12 @@
       "sha256": "1nrd67d78klhnbslrpqaigbv1qrvl2nr6l9qhmgm2j34qpjrv7n5",
       "depends": ["httr", "jsonlite", "rstudioapi", "stringr"]
     },
+    "nzilbb_vowels": {
+      "name": "nzilbb.vowels",
+      "version": "0.3.1",
+      "sha256": "1yjh9pyw3f4fqjx25ahmqjz0jq696idjfxvaghg021drlakhgm3n",
+      "depends": ["Rdpack", "dplyr", "forcats", "gghalves", "ggplot2", "ggrepel", "glue", "lifecycle", "magrittr", "patchwork", "purrr", "rlang", "rsample", "rstudioapi", "smacof", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "nzpullover": {
       "name": "nzpullover",
       "version": "0.3.0",
@@ -90213,8 +93417,8 @@
     },
     "oaqc": {
       "name": "oaqc",
-      "version": "1.0",
-      "sha256": "1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf",
+      "version": "2.0.0",
+      "sha256": "0f777a8i03mb4f4q2zdacglyn0lbmf5b7c6682ssw2dlnm14jhz9",
       "depends": []
     },
     "oaxaca": {
@@ -90277,12 +93481,6 @@
       "sha256": "07dvz3v580yliwqvfisgvzvg8ly9nw3r4y5bmwkmgphbfmh88635",
       "depends": []
     },
-    "observer": {
-      "name": "observer",
-      "version": "0.1.2",
-      "sha256": "1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m",
-      "depends": ["bazar", "bit", "dplyr", "lazyeval", "magrittr", "tibble"]
-    },
     "oc": {
       "name": "oc",
       "version": "1.2.1",
@@ -90291,15 +93489,15 @@
     },
     "occ": {
       "name": "occ",
-      "version": "1.1",
-      "sha256": "1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g",
+      "version": "1.2",
+      "sha256": "043n429q4md3x7bzgr22gh5mmbdx27b0vi161sw31vkmmzk1mblw",
       "depends": []
     },
     "occCite": {
       "name": "occCite",
-      "version": "0.5.7",
-      "sha256": "130fk8m1dcid4kiswr4fpq6da84b2gfjwa20gmcsp1r75yzi95nx",
-      "depends": ["BIEN", "DBI", "RColorBrewer", "RPostgreSQL", "bib2df", "curl", "dplyr", "ggplot2", "htmltools", "leaflet", "lubridate", "rgbif", "rlang", "stringr", "taxize", "tidyr", "viridis", "waffle"]
+      "version": "0.5.9",
+      "sha256": "17msmwh1rlyf4a2jkz36856bmvy2v636jmg3f8c4xingmfgdi94i",
+      "depends": ["BIEN", "DBI", "RColorBrewer", "RPostgreSQL", "RefManageR", "ape", "bib2df", "curl", "dplyr", "ggplot2", "htmltools", "leaflet", "lubridate", "rgbif", "rlang", "stringr", "tidyr", "viridis", "waffle"]
     },
     "occumb": {
       "name": "occumb",
@@ -90375,8 +93573,8 @@
     },
     "ocf": {
       "name": "ocf",
-      "version": "1.0.0",
-      "sha256": "04d0j863a2zqj3v9s9iwlc4v7fxpp6cydpphxcfr6n22f8ciq5bd",
+      "version": "1.0.1",
+      "sha256": "1vzpiy7dby61yydszgm2magdq9dah7c0pw9zl7bsrycrzs5qfxgs",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "glmnet", "orf", "ranger", "stringr"]
     },
     "ockc": {
@@ -90423,8 +93621,8 @@
     },
     "od": {
       "name": "od",
-      "version": "0.4.4",
-      "sha256": "0msfgqcx2qh728fqzdkhaab7b5na8wa3sga7hfzvxjy996bdfliw",
+      "version": "0.5.1",
+      "sha256": "16lal5asj6h9i5zwafpgzplcbl5pmwfn9gs2azi5swq5v6n0i748",
       "depends": ["sfheaders", "vctrs"]
     },
     "odbc": {
@@ -90433,12 +93631,6 @@
       "sha256": "1c49209bf1swsk5mhwb4zxymlg5dha9rg500nq83kbgib6ikkk9f",
       "depends": ["DBI", "Rcpp", "bit64", "blob", "cli", "hms", "lifecycle", "rlang"]
     },
-    "odbr": {
-      "name": "odbr",
-      "version": "0.1.0",
-      "sha256": "03bdhmya86whrzijc8h6gvd4yzmivdskm42a80n4ryqn4szfyrpd",
-      "depends": ["R_utils", "data_table", "fs", "haven", "piggyback", "sf", "usethis"]
-    },
     "oddnet": {
       "name": "oddnet",
       "version": "0.1.1",
@@ -90477,8 +93669,8 @@
     },
     "odeGUTS": {
       "name": "odeGUTS",
-      "version": "1.0.2",
-      "sha256": "0ra9svfwdvsil5hqbmyxhnz80zm905v1m2lm8s5cbkjkfs5fsnls",
+      "version": "1.0.3",
+      "sha256": "0bk2ahk9qigqx00rdppgml4fb1czibhqal8wymqgs1bifixxb5wy",
       "depends": ["deSolve", "dplyr", "magrittr", "tidyr", "zoo"]
     },
     "odetector": {
@@ -90489,8 +93681,8 @@
     },
     "odin": {
       "name": "odin",
-      "version": "1.2.5",
-      "sha256": "1fczgf3x35inlyhkw1h4mf8j9alrv4w98b9jfmbc2a9q29gi161p",
+      "version": "1.2.6",
+      "sha256": "0rr3sg96z7f64pz84pfrcaaz8sqa6lgp4z7dj2pyrvzgjxjr3fjm",
       "depends": ["R6", "cinterpolate", "deSolve", "digest", "glue", "jsonlite", "ring", "withr"]
     },
     "odk": {
@@ -90507,9 +93699,9 @@
     },
     "oeli": {
       "name": "oeli",
-      "version": "0.5.2",
-      "sha256": "0a9bk8dch6852nkddxwjyrs24knpx09sb5dyfakb9fpmksrv4f3p",
-      "depends": ["Rcpp", "RcppArmadillo", "benchmarkme", "checkmate", "cli", "ggplot2", "hexSticker", "latex2exp", "rprojroot", "showtext", "sysfonts", "testthat", "usethis"]
+      "version": "0.7.1",
+      "sha256": "00qyrkrpd1lp1mcjsj12qil58zgwk0p6mgqyng20a6vlxqmvd96p",
+      "depends": ["Rcpp", "RcppArmadillo", "SimMultiCorrData", "benchmarkme", "checkmate", "cli", "ggplot2", "hexSticker", "latex2exp", "rprojroot", "showtext", "sysfonts", "testthat"]
     },
     "oem": {
       "name": "oem",
@@ -90555,9 +93747,9 @@
     },
     "officer": {
       "name": "officer",
-      "version": "0.6.6",
-      "sha256": "04mlmq64gjdicdlai78iy28n8z64p3k4mnk4k381znlrj9x3zz7i",
-      "depends": ["R6", "openssl", "ragg", "uuid", "xml2", "zip"]
+      "version": "0.6.7",
+      "sha256": "1a9bv5qryivi84f56plz2xaffy2sapviwgwdgzxq9mys7bzsybzh",
+      "depends": ["R6", "cli", "openssl", "ragg", "uuid", "xml2", "zip"]
     },
     "offlineChange": {
       "name": "offlineChange",
@@ -90573,8 +93765,8 @@
     },
     "ofpetrial": {
       "name": "ofpetrial",
-      "version": "0.1.1",
-      "sha256": "1wid8d4m8bk087z8fi4ls493p1g30cymyl5xcbzcv0an2rkd739j",
+      "version": "0.1.2",
+      "sha256": "0ig54jjanjgxmrsaca8cd72rfyhzxmzcd3p87xay1ncvwsqniyjw",
       "depends": ["bookdown", "data_table", "dplyr", "ggExtra", "ggplot2", "ggpubr", "leaflet", "lwgeom", "magrittr", "purrr", "rmarkdown", "sf", "terra", "tibble", "tidyr", "tmap", "zip"]
     },
     "oglmx": {
@@ -90585,14 +93777,14 @@
     },
     "ogrdbstats": {
       "name": "ogrdbstats",
-      "version": "0.5.0",
-      "sha256": "140i4wippqr1260a1c4syg6lfspkf9q8rifnalf6iaaqx2bz4yfq",
+      "version": "0.5.2",
+      "sha256": "1dppd0jzzrifclic1bs6asjl2rbzygvbrjbc922xsz95wazgfmww",
       "depends": ["Biostrings", "ComplexHeatmap", "RColorBrewer", "alakazam", "argparser", "bookdown", "data_table", "dplyr", "ggplot2", "gridExtra", "magrittr", "scales", "stringdist", "stringr", "tidyr", "tigger"]
     },
     "ohenery": {
       "name": "ohenery",
-      "version": "0.1.1",
-      "sha256": "0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq",
+      "version": "0.1.2",
+      "sha256": "14f46s2d75313d7vkshlnan40452pyxnj02cz98dkpk6mis6y751",
       "depends": ["Rcpp", "dplyr", "magrittr", "maxLik"]
     },
     "ohoegdm": {
@@ -90613,6 +93805,12 @@
       "sha256": "0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69",
       "depends": ["lattice"]
     },
+    "ohun": {
+      "name": "ohun",
+      "version": "1.0.2",
+      "sha256": "0l3c6p1q2mjvr03q905ygmaax94bn3a0fkfn8kfjr6d5bs60283s",
+      "depends": ["checkmate", "cli", "fftw", "ggplot2", "igraph", "rlang", "seewave", "sf", "tuneR", "warbleR"]
+    },
     "oii": {
       "name": "oii",
       "version": "1.0.2.1",
@@ -90621,9 +93819,9 @@
     },
     "ojsr": {
       "name": "ojsr",
-      "version": "0.1.2",
-      "sha256": "0nwdws9kqnya9qjc939b7ksrf7ri6d25zzcdxhyhabirhnrqdg7m",
-      "depends": ["dplyr", "magrittr", "purrr", "rlang", "rvest", "tidyr", "urltools", "xml2"]
+      "version": "0.1.5",
+      "sha256": "0jmz9zmzbaass3l8w5gvcg2ywa2mwmz7ngq5xb11in8gckbpn7cs",
+      "depends": ["RCurl", "dplyr", "magrittr", "purrr", "rlang", "rvest", "tidyr", "urltools", "xml2"]
     },
     "okxAPI": {
       "name": "okxAPI",
@@ -90639,8 +93837,8 @@
     },
     "ollamar": {
       "name": "ollamar",
-      "version": "1.2.0",
-      "sha256": "1cs12w5rcm2v7bnzbmqpycm5r2n8c7iw6g6jzzw272hbsjjqkm8a",
+      "version": "1.2.1",
+      "sha256": "0l9k84hf5y46ci6l2sy1zi3423akip2jr0zi8cnjh337dfww9sis",
       "depends": ["base64enc", "crayon", "glue", "httr2", "jsonlite", "tibble"]
     },
     "ollg": {
@@ -90663,8 +93861,8 @@
     },
     "olsrr": {
       "name": "olsrr",
-      "version": "0.6.0",
-      "sha256": "1jnp7dirjgg49v958fwcmcz1nalkgmr15kr4pqbxylmi45bqkqr6",
+      "version": "0.6.1",
+      "sha256": "0hvz8kab1bwnm36npdsk54yav3ga268a54rirjh1xij0nvc9hwp9",
       "depends": ["car", "ggplot2", "goftest", "gridExtra", "nortest", "xplorerr"]
     },
     "omics": {
@@ -90687,21 +93885,21 @@
     },
     "omnibus": {
       "name": "omnibus",
-      "version": "1.2.13",
-      "sha256": "0a528lk2snhav6yw6z1sx6il5sazjqwfs2vb2c6smy9frs3vlgq7",
+      "version": "1.2.14",
+      "sha256": "16lzx1acbl6nbjg21dv2g3n934bvial7nkbbs15pm00aliclws7p",
       "depends": []
     },
     "omock": {
       "name": "omock",
-      "version": "0.2.0",
-      "sha256": "14qqvjviwr45x5g9i036pkd9y0qjaqhx27win3j1xb4c8mj20k02",
+      "version": "0.3.1",
+      "sha256": "13p5ms9c3lpbc8n2a4vjx6pfayv6pfllspyifxsq53pn9cfm2z6z",
       "depends": ["cli", "dplyr", "lubridate", "omopgenerics", "purrr", "rlang", "snakecase"]
     },
     "omopgenerics": {
       "name": "omopgenerics",
-      "version": "0.3.0",
-      "sha256": "07w2k4hp33ll0adlcnpi7pbv3zqq806dish1vghigcx4wzvpsfgi",
-      "depends": ["cli", "dbplyr", "dplyr", "glue", "lifecycle", "purrr", "rlang", "snakecase", "stringr", "tidyr", "vctrs"]
+      "version": "0.4.1",
+      "sha256": "02rmgl0jgyhg1j7vdz72n32n5mfz5x4x38kd88zppiyzrlhc5hs6",
+      "depends": ["cli", "dbplyr", "dplyr", "generics", "glue", "lifecycle", "purrr", "rlang", "snakecase", "stringr", "tidyr", "vctrs"]
     },
     "ompr": {
       "name": "ompr",
@@ -90741,8 +93939,8 @@
     },
     "onbrand": {
       "name": "onbrand",
-      "version": "1.0.5",
-      "sha256": "1iyizky2vrdpl325qg4mllzgs2aabshpp7cshvldfyxnlw4dxvrn",
+      "version": "1.0.6",
+      "sha256": "1hnhnhzfmd3cjl9ibkydzcy9i7if1f1ykqj0a74wmawh37cv4iiv",
       "depends": ["digest", "dplyr", "flextable", "ggplot2", "magrittr", "officer", "rlang", "stringr", "yaml"]
     },
     "onc_api": {
@@ -90873,8 +94071,8 @@
     },
     "onpoint": {
       "name": "onpoint",
-      "version": "1.0.5",
-      "sha256": "1ib7bj8y1ykrsl84bjz0y6ncc9rj5pazad9541vpn3xpr7c11xj1",
+      "version": "1.0.6",
+      "sha256": "0v45r1sjlhh17xcrw5498k3g82ar2y83b83qp1hfpv5hybghvr5x",
       "depends": ["ggplot2", "spatstat_explore", "spatstat_geom", "spatstat_random"]
     },
     "onsr": {
@@ -90981,8 +94179,8 @@
     },
     "opalr": {
       "name": "opalr",
-      "version": "3.4.1",
-      "sha256": "14pv1rbmmhgcid2gcs1hxwr8a84jn6cyrqpfjlw10ia76qd63qkk",
+      "version": "3.4.2",
+      "sha256": "08jh04m6bpcfidibgl6qb01fii6smb5wvjxji6fp19iahcl9wn6h",
       "depends": ["httr", "jsonlite", "labelled", "mime", "progress", "readr", "tibble"]
     },
     "opdisDownsampling": {
@@ -90993,8 +94191,8 @@
     },
     "openCR": {
       "name": "openCR",
-      "version": "2.2.6",
-      "sha256": "08cqv6xxv35hzllab0glb42h54racgqk0x3dvam6lk7c561kbas4",
+      "version": "2.2.7",
+      "sha256": "13z547bfbnmlnlmnir98j26gn82ksfhfzbqdgcfnb768w33hjv7v",
       "depends": ["BH", "MASS", "Rcpp", "RcppParallel", "abind", "nlme", "plyr", "secr", "stringr"]
     },
     "openEBGM": {
@@ -91003,11 +94201,17 @@
       "sha256": "19q5xlvgc91mcr6sjzppgkmvdlfb6cr7rs952i2yys3w7ylwk3bj",
       "depends": ["data_table", "ggplot2"]
     },
+    "openFDA": {
+      "name": "openFDA",
+      "version": "0.1.0",
+      "sha256": "1z5mljnn4f6hasc207spiz5yvhrssb09mfnbnfdi8p7di0wg8szw",
+      "depends": ["checkmate", "cli", "httr2", "purrr", "rlang", "vctrs"]
+    },
     "openMSE": {
       "name": "openMSE",
-      "version": "1.0.0",
-      "sha256": "15jp9hybnkwmnkcqawhpd3y3imq6wfxxzxzh90yx4cvzky36hf89",
-      "depends": ["DLMtool", "MSEtool", "SAMtool", "crayon"]
+      "version": "1.0.1",
+      "sha256": "1yd5p92w9l4vag591slnxvj8zzljilv7idv52978z2gsrihy5lsb",
+      "depends": ["DLMtool", "MSEtool", "SAMtool", "crayon", "dplyr", "ggplot2", "purrr", "tidyr"]
     },
     "openNLP": {
       "name": "openNLP",
@@ -91047,8 +94251,8 @@
     },
     "openairmaps": {
       "name": "openairmaps",
-      "version": "0.9.0",
-      "sha256": "1g3jxks2qvys3rv5z4lz0889fq5b5wyjmzfgcj6pl3l67lgy5yj1",
+      "version": "0.9.1",
+      "sha256": "0f56qpfjrx620qmlcad6d69rf02kvdh9fbb3p1ip4j9swshcl1a6",
       "depends": ["cli", "dplyr", "forcats", "ggplot2", "ggspatial", "ggtext", "leaflet", "lifecycle", "lubridate", "magrittr", "mgcv", "openair", "prettymapr", "purrr", "rlang", "rosm", "sf", "stringr", "tibble", "tidyr"]
     },
     "openaistream": {
@@ -91063,6 +94267,12 @@
       "sha256": "14bhwbkwxaj8vjrix7klhqqxrfkaybd83dxkvxhpnsfr7yqhls3q",
       "depends": ["httr", "jsonlite", "progress", "tibble"]
     },
+    "openappr": {
+      "name": "openappr",
+      "version": "0.2.0",
+      "sha256": "1icdv5cr39xrv0nyqaz6727ffzh7zc84j1lb9jbz7bai8ky9k3w1",
+      "depends": ["DBI", "RPostgres", "RSQLite", "dplyr", "jsonlite", "magrittr", "purrr", "rlang", "stringr", "tidyr"]
+    },
     "openbankeR": {
       "name": "openbankeR",
       "version": "0.1.1",
@@ -91083,16 +94293,22 @@
     },
     "opencpu": {
       "name": "opencpu",
-      "version": "2.2.13",
-      "sha256": "1gyfgv5w9bi1lng8xzkpnqr50x90qshb1q4927jxzl5l4vdzlahn",
+      "version": "2.2.14",
+      "sha256": "0gq97fcjwycnxkn73fiwp2qs6pnbs81qsjk93vq3s9mj22rk7l04",
       "depends": ["brew", "curl", "evaluate", "httpuv", "jsonlite", "knitr", "mime", "openssl", "protolite", "rappdirs", "remotes", "rlang", "sys", "vctrs", "webutils", "zip"]
     },
     "opencv": {
       "name": "opencv",
-      "version": "0.4.0",
-      "sha256": "0bplljn5qpgb3yp3jlmr99vrffqr53q8hlznbzpmj78kn5f1j71y",
+      "version": "0.4.1",
+      "sha256": "087vjygs446lw10nizl14kq27n668wqky3jr6ks28mqmcvk1wgqx",
       "depends": ["Rcpp", "magrittr"]
     },
+    "opendataformat": {
+      "name": "opendataformat",
+      "version": "2.1.1",
+      "sha256": "1xy5zg9bh2vkj7jhm3wrpvrb4lrr9x8q6h304zfygz0hadvaiqq1",
+      "depends": ["cli", "data_table", "magrittr", "tibble", "xml2", "zip"]
+    },
     "opendatatoronto": {
       "name": "opendatatoronto",
       "version": "0.1.5",
@@ -91111,6 +94327,12 @@
       "sha256": "02rm34mgjhcb3pp71x0rspyz7cmpmj4g5rs93xnly304il8v0rx2",
       "depends": ["IRdisplay", "R6", "base64enc", "htmltools", "httr2", "jsonlite", "lubridate", "rlang", "sf"]
     },
+    "opengraph": {
+      "name": "opengraph",
+      "version": "0.0.2",
+      "sha256": "0aa83saicrmg724qmm75z6yrpkhps171nr81fdcqi9vpy7bzqz1m",
+      "depends": ["rvest"]
+    },
     "openintro": {
       "name": "openintro",
       "version": "2.5.0",
@@ -91129,10 +94351,22 @@
       "sha256": "0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82",
       "depends": ["R6"]
     },
+    "openrouteservice": {
+      "name": "openrouteservice",
+      "version": "0.6.1",
+      "sha256": "18la6cy6xs0rlp4b40cri4fzs9xl4ddh8y1hq5kziv9rswckv6bv",
+      "depends": ["V8", "geojsonsf", "httr", "jsonlite", "jsonvalidate", "keyring", "leaflet", "xml2"]
+    },
+    "openscoring": {
+      "name": "openscoring",
+      "version": "1.0.4",
+      "sha256": "0y7yfqk0bqj03fvzni8dwvv0dhis1dp3h0gzbnfky9kmw43iinjv",
+      "depends": ["cli", "dplyr", "glue", "httr", "jsonlite", "lifecycle", "purrr", "rlang", "stringr"]
+    },
     "openssl": {
       "name": "openssl",
-      "version": "2.2.1",
-      "sha256": "13gp6q8s0pdjvnd7mnmdqhmmsb0mf4m3snq99j6js8c4sll27895",
+      "version": "2.3.0",
+      "sha256": "1c4bickay72lcfy4mcb2ridi7vam5drr8sbzqnqz2g8blyxr44zk",
       "depends": ["askpass"]
     },
     "opentripplanner": {
@@ -91143,14 +94377,14 @@
     },
     "openxlsx": {
       "name": "openxlsx",
-      "version": "4.2.6.1",
-      "sha256": "1absl7kl3gzg2rwjv3qj74clcyj6xgfbxc6232ddi8fnll3ca262",
+      "version": "4.2.7.1",
+      "sha256": "1wgv8144lbnfa6a2a6vj0dq3l2xv960xr7vdbkghadcnps9n4bzi",
       "depends": ["Rcpp", "stringi", "zip"]
     },
     "openxlsx2": {
       "name": "openxlsx2",
-      "version": "1.8",
-      "sha256": "1gicp19n8y4hid0mh3yig9cx6p0b25f56v6ndb4pggzzlff3s994",
+      "version": "1.12",
+      "sha256": "1vy5b6wizic7xi1gqjapkpzkr701g5ywkvb9aamx251l166l5nrp",
       "depends": ["R6", "Rcpp", "magrittr", "stringi", "zip"]
     },
     "opera": {
@@ -91207,6 +94441,12 @@
       "sha256": "0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32",
       "depends": []
     },
+    "optRF": {
+      "name": "optRF",
+      "version": "1.0.1",
+      "sha256": "02imgfmfigcps4z4028r7jp61153m4ircb4l1axszcaag0181gba",
+      "depends": ["irr", "minpack_lm", "ranger"]
+    },
     "optband": {
       "name": "optband",
       "version": "0.2.2",
@@ -91221,8 +94461,8 @@
     },
     "optbin": {
       "name": "optbin",
-      "version": "1.3",
-      "sha256": "09pdmbvhwj7g13bqcql70x1c6l1islyasbhxcbqdf1cr7r6ylysz",
+      "version": "1.4",
+      "sha256": "15ami2m95sn0axdnjn3kn6rxdw8ip8zn4fanshfsxw9vfmygyvln",
       "depends": []
     },
     "optedr": {
@@ -91263,9 +94503,9 @@
     },
     "opticskxi": {
       "name": "opticskxi",
-      "version": "0.1",
-      "sha256": "1vdz5sgjgyh2nj034w87d2yxcbbg97f1b0vijlwzwjkrfz5knfhl",
-      "depends": ["ggplot2", "magrittr"]
+      "version": "1.1.0",
+      "sha256": "0v19qa102xzxfwvaymvq464kl272ynld8kk4j11dwc4drqm037p8",
+      "depends": ["ggplot2", "magrittr", "rlang"]
     },
     "opticut": {
       "name": "opticut",
@@ -91291,6 +94531,12 @@
       "sha256": "1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g",
       "depends": ["lhs", "randtoolbox", "stringr"]
     },
+    "optimCheck": {
+      "name": "optimCheck",
+      "version": "1.0.1",
+      "sha256": "0nxvq6xmcgfdnmlva65swi519vysa1dya14r5vna4ma006229ncy",
+      "depends": []
+    },
     "optimLanduse": {
       "name": "optimLanduse",
       "version": "1.2.1",
@@ -91341,8 +94587,8 @@
     },
     "optimizeR": {
       "name": "optimizeR",
-      "version": "1.1.1",
-      "sha256": "134828h3ibypam0k0xxmj7pj6pzx084in06rmbcxgc900ibbqgb4",
+      "version": "1.1.2",
+      "sha256": "0y51r8v2kzhiac3d1zkh5z0gw87hcfx7cr1xdfsnzjdxckcgvmhv",
       "depends": ["R6", "TestFunctions", "checkmate", "cli", "lbfgsb3c", "oeli", "ucminf"]
     },
     "optimos_prime": {
@@ -91365,8 +94611,8 @@
     },
     "optimx": {
       "name": "optimx",
-      "version": "2023-10.21",
-      "sha256": "1da4daxgk4kbq1n2mn72482c3j96wba0xf4mzffgasn20ib2swqd",
+      "version": "2024-12.2",
+      "sha256": "0brap8bhizmfxd8mf71izrs4211qxacxbb938ainsmdsc6idv9dj",
       "depends": ["nloptr", "numDeriv", "pracma"]
     },
     "optional": {
@@ -91377,8 +94623,8 @@
     },
     "options": {
       "name": "options",
-      "version": "0.2.0",
-      "sha256": "02qnbipdmnw01f40300pg1ycrcbnr37f8yiqbabm6jznf6r4ihm9",
+      "version": "0.3.0",
+      "sha256": "0xngadnr0swdd40wm15mgb9vx4bmcfk8ay4vg1g4w44p2hp3lw80",
       "depends": []
     },
     "optionstrat": {
@@ -91401,8 +94647,8 @@
     },
     "optmatch": {
       "name": "optmatch",
-      "version": "0.10.7",
-      "sha256": "07bx6bs5kk9pv0a2nsvq5y4bq4z17sa5f54kpxpim476xd8w43rk",
+      "version": "0.10.8",
+      "sha256": "14a93plyhm3j009lcqwvh94zcd5i90kvp92y0kjb0ahn1bmanc2i",
       "depends": ["Rcpp", "dplyr", "rlemon", "tibble"]
     },
     "optparse": {
@@ -91443,14 +94689,14 @@
     },
     "orbital": {
       "name": "orbital",
-      "version": "0.2.0",
-      "sha256": "167hpki2v1m8n0fpx3giy7pdc49lwcsn1qacgi38f7m8v0dca4ga",
-      "depends": ["cli", "dplyr", "rlang"]
+      "version": "0.3.0",
+      "sha256": "08nhyh73fkyzh1q65lnx4m2z279my595b672p8cwyaf9sl08g1cn",
+      "depends": ["cli", "dplyr", "generics", "rlang"]
     },
     "orca": {
       "name": "orca",
-      "version": "1.1-2",
-      "sha256": "0nzm0i0ms2l4n10pgs1jg7mb9pd1k3pg7nvyd0w3ivq490g2py79",
+      "version": "1.1-3",
+      "sha256": "1bcksv7rrrpxjaj42ddcfn2v9gi70233p7lrik5rv0dvl4wblbhf",
       "depends": []
     },
     "orclus": {
@@ -91459,12 +94705,6 @@
       "sha256": "0d78mn2vl2yxlvdswyxkxp9zg59b8cvfksz9m56kddn79aps1ikl",
       "depends": []
     },
-    "orcutt": {
-      "name": "orcutt",
-      "version": "2.3",
-      "sha256": "0pj7pqzbcg4gp35nsz3avyawmx69dgj0l2w0x8ypw5qwl4zhmnyk",
-      "depends": ["lmtest"]
-    },
     "ordDisp": {
       "name": "ordDisp",
       "version": "2.1.1",
@@ -91489,6 +94729,12 @@
       "sha256": "1hy24s23l099b21w5j3p2f0748s8xmhxhslfp65fg7ycwda5qsyw",
       "depends": ["rms"]
     },
+    "orderanalyzer": {
+      "name": "orderanalyzer",
+      "version": "1.0.0",
+      "sha256": "1r680i3a9c55d86m4kzav92kcmbalyp9yjnqr7qq3y44g43nw9qi",
+      "depends": ["data_table", "digest", "dplyr", "lubridate", "matrixcalc", "purrr", "quanteda", "rlist", "stringr", "tibble", "tidyr", "tidyselect"]
+    },
     "ordering": {
       "name": "ordering",
       "version": "0.7.0",
@@ -91527,8 +94773,8 @@
     },
     "ordinal": {
       "name": "ordinal",
-      "version": "2023.12-4",
-      "sha256": "18lzpmf36vvc3krk7jqz7naikhrcdyplj2z9y6xgzlnzhgcjln7m",
+      "version": "2023.12-4.1",
+      "sha256": "1c9qiv0zz77i80gbhljj9hm4lh2zs9chfg834lcgyr6972jcz79c",
       "depends": ["MASS", "Matrix", "nlme", "numDeriv", "ucminf"]
     },
     "ordinalCont": {
@@ -91539,8 +94785,8 @@
     },
     "ordinalForest": {
       "name": "ordinalForest",
-      "version": "2.4-3",
-      "sha256": "06blmwmn42dv6sri3j3473arrql5rihdlp7kgh56b2w1j2wdqq7s",
+      "version": "2.4-4",
+      "sha256": "105pblsn182qdbb7qvr6izri19vlxlc53h3kl68h56mcnpmwiqi4",
       "depends": ["Rcpp", "combinat", "nnet", "verification"]
     },
     "ordinalLBM": {
@@ -91575,8 +94821,8 @@
     },
     "ordinalpattern": {
       "name": "ordinalpattern",
-      "version": "0.2.4",
-      "sha256": "0d2vb73318agam3bmcva2mirwlskhfl66jzla36yihkb2r64cxgn",
+      "version": "0.2.6",
+      "sha256": "19kakwb2p5lqqzc7lgc0y9js90nnb2427y702p2z79bzfprrvqn9",
       "depends": ["gtools", "mvtnorm"]
     },
     "ordr": {
@@ -91641,8 +94887,8 @@
     },
     "origin": {
       "name": "origin",
-      "version": "1.1.2",
-      "sha256": "0gnq66zsnmnwsn0xaxavw4ipkcb91371g5rh7i9pk863q7fvzkc0",
+      "version": "1.2.0",
+      "sha256": "0cdr9lizkw09z0lnn07v8jjwyxz1z9277sn7ib0bhyjzxwc9h48c",
       "depends": ["cli", "rstudioapi"]
     },
     "orloca": {
@@ -91699,6 +94945,12 @@
       "sha256": "01gnqqcasdwbh5dk1yg50qiyn59wsk0d01q0xwg0aqcclmnsfkds",
       "depends": ["BB", "BHH2"]
     },
+    "orthGS": {
+      "name": "orthGS",
+      "version": "0.1.6",
+      "sha256": "0nb0jayfx5pi23kq1xybiz0v9fyjj50z13fansna5h9zc6f3m4s7",
+      "depends": ["TreeTools", "ape", "bio3d", "castor", "igraph", "phangorn", "phytools", "seqinr"]
+    },
     "orthoDr": {
       "name": "orthoDr",
       "version": "0.6.8",
@@ -91767,8 +95019,8 @@
     },
     "osmapiR": {
       "name": "osmapiR",
-      "version": "0.1.0",
-      "sha256": "1bdfi1ykw3vjlca44kpn69b0snz948r8nyvg3dn1ik89f8xc9sj7",
+      "version": "0.2.2",
+      "sha256": "0ws9dvcnc3zmdgzyx01bhhix2c6fackgzivkhypipybb9m8z6cc1",
       "depends": ["curl", "httr2", "xml2"]
     },
     "osmclass": {
@@ -91785,8 +95037,8 @@
     },
     "osmextract": {
       "name": "osmextract",
-      "version": "0.5.1",
-      "sha256": "03q3ra119j8rxkqasyxg0m4dlcpb378milfa1mwihsmmq4qd6ak5",
+      "version": "0.5.2",
+      "sha256": "0n0c5zq7r5gckblxsrf5a1bc841dakhfgzhpf7ny9vfpk7zdla68",
       "depends": ["httr", "jsonlite", "sf"]
     },
     "osqp": {
@@ -91807,10 +95059,16 @@
       "sha256": "1vnf6g1d9fjckz9ay910nb9gr1km2adwk3b0k460mxvpr36izkh7",
       "depends": ["R_utils", "assertthat", "bitops", "rjson", "stringr"]
     },
+    "osum": {
+      "name": "osum",
+      "version": "0.1.0",
+      "sha256": "066h6xylagrs313zy4p9qm5rgml6pkz6kq4jvpw922f89q5cd04m",
+      "depends": []
+    },
     "otargen": {
       "name": "otargen",
-      "version": "1.1.1",
-      "sha256": "0hdnxwrlqchmbbg3fvcbfdr6m3igdcmd1i0plmhh2vy5xg3fn1r9",
+      "version": "1.1.5",
+      "sha256": "1akqdz0qcc5clj2mqn71zqi7d93l5yihzr9d4wsk4pv9rsw3vqry",
       "depends": ["cli", "dplyr", "ggiraphExtra", "ggplot2", "ggrepel", "ghql", "janitor", "jsonlite", "magrittr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "otinference": {
@@ -91851,8 +95109,8 @@
     },
     "ottr": {
       "name": "ottr",
-      "version": "1.5.0",
-      "sha256": "1b1p957plsx09xfa4qwqk2bnib1hnbikrsdn2cll17b8pfwrp29k",
+      "version": "1.5.1",
+      "sha256": "0ixvisvzxfdznmdgy3jjknqmldryagp7nynvszf99lbxbnxcvdhj",
       "depends": ["R6", "jsonlite", "testthat", "zip"]
     },
     "ottrpal": {
@@ -91873,6 +95131,12 @@
       "sha256": "1r1nj4m2hw4gdaw596q14d6majcz15ppa0mfhfl8f791phcyarka",
       "depends": ["subplex"]
     },
+    "ouladFormat": {
+      "name": "ouladFormat",
+      "version": "1.1.2",
+      "sha256": "1m8m5nrf2y42yvz9f0j976dvq5jrmyswiznq7iv32bppm0jwz92m",
+      "depends": ["dplyr", "httr", "magrittr", "tidyr"]
+    },
     "outForest": {
       "name": "outForest",
       "version": "1.0.1",
@@ -91917,10 +95181,16 @@
     },
     "outliertree": {
       "name": "outliertree",
-      "version": "1.9.0",
-      "sha256": "1sk4bdkqd4i47zh0hlaviyif936v608qrgirpi6pdry3r24jgwbl",
+      "version": "1.10.0",
+      "sha256": "13z39pfc7fzxil5gc48s7b2f0zal4l4d8qw5xvwy4mlp010mwrc5",
       "depends": ["Rcereal", "Rcpp"]
     },
+    "outqrf": {
+      "name": "outqrf",
+      "version": "1.0.0",
+      "sha256": "0gl3ix39kx7n1akg1789nfqg84jxq5q9qdxwcmf8ch7zklbkgccb",
+      "depends": ["dplyr", "ggplot2", "ggpubr", "missRanger", "ranger", "tidyr"]
+    },
     "outreg": {
       "name": "outreg",
       "version": "0.2.2",
@@ -91959,8 +95229,8 @@
     },
     "overtureR": {
       "name": "overtureR",
-      "version": "0.2.1",
-      "sha256": "07m6ly4wci51zsrszznpcds9z8acv4lajf29s8icn21xkfsnr32f",
+      "version": "0.2.4",
+      "sha256": "15j9i2c1admjbgc41y4kv1bs2b9pqzrvzq6fc8cqkmb9xkxz52xd",
       "depends": ["DBI", "dbplyr", "dplyr", "duckdb", "glue", "rlang", "sf"]
     },
     "overturemapsr": {
@@ -92029,6 +95299,12 @@
       "sha256": "042f2pplhwj6q7n87qk6r2xcriif76ywyf4mcx3xsr2fjislajw9",
       "depends": []
     },
+    "ozbabynames": {
+      "name": "ozbabynames",
+      "version": "0.1.0",
+      "sha256": "1aknsdik18jgifz9l4hd37xd67lpdl1sgg71yqzs8f8kz5xg1xmw",
+      "depends": []
+    },
     "ozmaps": {
       "name": "ozmaps",
       "version": "0.4.5",
@@ -92043,8 +95319,8 @@
     },
     "pARI": {
       "name": "pARI",
-      "version": "1.1.1",
-      "sha256": "17dxrs4ckxh70d33n93bxr0gzsidychnyclwvnb42cqfplbndca5",
+      "version": "1.1.2",
+      "sha256": "0c6lbzam854j9c442jxgshkb18zr2jdwlc5kbddll64ijxxk5cym",
       "depends": ["ARIbrain", "RNifti", "Rcpp", "RcppArmadillo", "matrixStats", "plyr"]
     },
     "pAnalysis": {
@@ -92095,6 +95371,18 @@
       "sha256": "1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd",
       "depends": []
     },
+    "pMEM": {
+      "name": "pMEM",
+      "version": "0.1-1",
+      "sha256": "0y18s0y3mh1jx43gpx32awysgxbh9gyyb5mp7kpj5asi98bwmzjj",
+      "depends": ["Rcpp", "sf"]
+    },
+    "pPCA": {
+      "name": "pPCA",
+      "version": "1.1",
+      "sha256": "1kciyg8frjryq7wd2k0lgv2c8n4xgwij1bc2xcs7fy5xbfybd9pr",
+      "depends": ["Matrix", "RSpectra", "Rcpp"]
+    },
     "pRF": {
       "name": "pRF",
       "version": "1.2",
@@ -92115,9 +95403,9 @@
     },
     "pRecipe": {
       "name": "pRecipe",
-      "version": "3.0.1-3",
-      "sha256": "0mwv2xrxp4iws19dwph713xqnkgq3fnwfq1vmw68934qacyjmk79",
-      "depends": ["data_table", "doParallel", "foreach", "ggplot2", "ggpubr", "lubridate", "magrittr", "ncdf4", "openair", "raster", "scales", "sf", "sp"]
+      "version": "3.0.2",
+      "sha256": "0kiwc4zs3xbi6r6f1symrf5kcw85nz71av9h5krj4850y8w0knrn",
+      "depends": ["data_table", "ggplot2", "ggpubr", "magrittr", "openair", "raster", "scales", "twc"]
     },
     "pRepDesigns": {
       "name": "pRepDesigns",
@@ -92149,12 +95437,6 @@
       "sha256": "0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7",
       "depends": []
     },
-    "packDAMipd": {
-      "name": "packDAMipd",
-      "version": "1.1.0",
-      "sha256": "0y81ap4nhvfc5k0xfcbghnf32svgkx8p01g0md3hzhyfvmgjffqm",
-      "depends": ["IPDFileCheck", "ISLR", "MASS", "SurvRegCensCov", "broom", "car", "data_table", "dplyr", "effects", "flextable", "ggplot2", "ggpubr", "gvlma", "hash", "haven", "labelled", "lme4", "lmtest", "purrr", "readxl", "relaimpo", "reshape2", "rlang", "stringr", "survival", "survminer", "systemfit", "tidyr", "valueEQ5D"]
-    },
     "packHV": {
       "name": "packHV",
       "version": "2.2",
@@ -92175,8 +95457,8 @@
     },
     "packageRank": {
       "name": "packageRank",
-      "version": "0.9.2",
-      "sha256": "0k5lby2gfvqa6d9r0js3n9k6s62cnj2b31vrpik6wf4nbrps709m",
+      "version": "0.9.4",
+      "sha256": "1l2ybm7684hmw2jzxkl29vd9nkysn2v1k0zv2ggvzn9nz90s4cr3",
       "depends": ["ISOcodes", "RCurl", "R_utils", "cranlogs", "curl", "data_table", "ggplot2", "memoise", "pkgsearch", "rlang", "rversions", "sugrrants"]
     },
     "packagefinder": {
@@ -92199,9 +95481,9 @@
     },
     "packcircles": {
       "name": "packcircles",
-      "version": "0.3.6",
-      "sha256": "0fjc575i1vxjp2v4niv2syqqk0d609wm86gkq9rvgmch841x40ps",
-      "depends": ["Rcpp"]
+      "version": "0.3.7",
+      "sha256": "17z3kmvszg3r6d6p4bagcrdamx13bpgq95mylwyv4wr9rvn5ph6d",
+      "depends": ["Rcpp", "checkmate"]
     },
     "packer": {
       "name": "packer",
@@ -92235,14 +95517,20 @@
     },
     "pacs": {
       "name": "pacs",
-      "version": "0.5.1",
-      "sha256": "0vqmck5jajlbn3iazb7s6jpfgbwvl7aa084ag25cahsmajczg2v7",
+      "version": "0.6.0",
+      "sha256": "0afsci8qknvhg0zlc6fli87dn1pcs5jhyzddg7fad4qqyyy41sqx",
       "depends": ["curl", "jsonlite", "memoise", "stringi", "xml2"]
     },
+    "pacu": {
+      "name": "pacu",
+      "version": "0.1.44",
+      "sha256": "0dfpqrlnnv571qzjdr528mwny8w94gvx9iv5r0l09xqxwvki2czc",
+      "depends": ["XML", "apsimx", "concaveman", "gstat", "httr", "jsonlite", "sf", "stars", "tmap", "units"]
+    },
     "padr": {
       "name": "padr",
-      "version": "0.6.2",
-      "sha256": "0mgjdva2yj9m0mps69gafy3w1c4zhik002b5b2j2zvbv3m34mw97",
+      "version": "0.6.3",
+      "sha256": "0jr04cwcwzrk9yqbainpkr9qrfhdjppsar3p85dq79zw4rib4ds6",
       "depends": ["Rcpp", "dplyr", "lubridate", "rlang"]
     },
     "pafdR": {
@@ -92259,8 +95547,8 @@
     },
     "pagedown": {
       "name": "pagedown",
-      "version": "0.20",
-      "sha256": "1900694r5l289y9yn176hbngiyk26jrslshqf5saq8zdxa67ad0x",
+      "version": "0.21",
+      "sha256": "1hb4h2bq3gvlmbwbbhkn2c5cbdfi8jmbv4gb4xssc9z37297v56k",
       "depends": ["bookdown", "htmltools", "httpuv", "jsonlite", "later", "processx", "rmarkdown", "servr", "websocket", "xfun"]
     },
     "pagemap": {
@@ -92331,10 +95619,16 @@
     },
     "pak": {
       "name": "pak",
-      "version": "0.7.2",
-      "sha256": "0bgl3np3x2a4si99mx618jd8c4skq8bfdnxjwq7m59bapqc1s7c8",
+      "version": "0.8.0",
+      "sha256": "0rr8ikhy0zg2n0dqjrdmjdb8qdmzncrpizy1dqzqqlmfrpmxsgw5",
       "depends": []
     },
+    "pakret": {
+      "name": "pakret",
+      "version": "0.2.2",
+      "sha256": "0gv6kjgz0zcxjqmchlp9rkj91d915wdy86lcgw1cjgzjnsjxyj46",
+      "depends": ["knitr", "readr", "rmarkdown", "withr"]
+    },
     "palaeoSig": {
       "name": "palaeoSig",
       "version": "2.1-3",
@@ -92343,14 +95637,14 @@
     },
     "palaeoverse": {
       "name": "palaeoverse",
-      "version": "1.3.0",
-      "sha256": "1qfi5cv2xg89azax1v4hvajv1g6m59shp5q9db44rn65idxld7x5",
-      "depends": ["ape", "curl", "geosphere", "h3jsr", "httr", "pbapply", "sf", "stringdist"]
+      "version": "1.4.0",
+      "sha256": "1i2dqlql24nsgnz0i3lc9f0s1lr2wig6xyp7la9dk2pzm16ars7g",
+      "depends": ["ape", "curl", "geosphere", "h3jsr", "httr", "lifecycle", "pbapply", "sf", "stringdist"]
     },
     "palasso": {
       "name": "palasso",
-      "version": "0.0.9",
-      "sha256": "1qx6xa1csa4dz4vjr0q83pr22yxy01dzzqrjp5mxqqm6265wxqdh",
+      "version": "1.0.0",
+      "sha256": "1lc258dfigfnafafm1h4v935wl0gjdw3ay14g1y0iw06b4r7x436",
       "depends": ["Matrix", "glmnet", "survival"]
     },
     "pald": {
@@ -92359,16 +95653,22 @@
       "sha256": "1b24z6lls2z2c3mwmnbp3qjr63hc1css8d2zy61fzrc78v6v42am",
       "depends": ["glue", "igraph"]
     },
+    "paleoAM": {
+      "name": "paleoAM",
+      "version": "1.0.1",
+      "sha256": "1svl2nqdflk65ppvlrdr07w66lzgj9g5mx8n2mamwrs9k1pv9gg8",
+      "depends": ["vegan"]
+    },
     "paleoDiv": {
       "name": "paleoDiv",
-      "version": "0.3.0",
-      "sha256": "1gj26y0ipc6rvf39293blxchnvm89pbmcwhqbnjz81cgp2zrw514",
+      "version": "0.4.0",
+      "sha256": "1v4dmx00vh3qpbw7pwvrr3sh4v6262b5y2h5nz2kgg9n4mfakc7n",
       "depends": ["ape", "stringr"]
     },
     "paleoTS": {
       "name": "paleoTS",
-      "version": "0.6.1",
-      "sha256": "0ni3rxhmd30gqm2hkq23qr106pkxr2rnl318lzgrh7hxk9nwpgnl",
+      "version": "0.6.2",
+      "sha256": "1cz390nbiy28zgi4nc8w57bkljrx5sz5l7kcwbrvyya1n83r59dz",
       "depends": ["doParallel", "foreach", "mnormt"]
     },
     "paleobioDB": {
@@ -92389,6 +95689,12 @@
       "sha256": "05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa",
       "depends": []
     },
+    "paleopop": {
+      "name": "paleopop",
+      "version": "2.1.6",
+      "sha256": "0cxwx159krfdhf1ifdaidhsqq27y6ladmi1s70cw27aipmylrlrn",
+      "depends": ["R6", "poems", "sf", "trend"]
+    },
     "paleotree": {
       "name": "paleotree",
       "version": "3.4.7",
@@ -92497,6 +95803,12 @@
       "sha256": "0liwcym035174h6c4b9ddmqxa3vkpkk3alyr9psk8yhv7i61hzp3",
       "depends": []
     },
+    "pandemics": {
+      "name": "pandemics",
+      "version": "0.1.0",
+      "sha256": "17rivm44crgws0pcpw7ii8kqzq7r18bwawpfchx4fzgql8647d8d",
+      "depends": []
+    },
     "pander": {
       "name": "pander",
       "version": "0.6.5",
@@ -92517,9 +95829,9 @@
     },
     "panelPomp": {
       "name": "panelPomp",
-      "version": "1.1",
-      "sha256": "054nma2h355xd8bazbjrwgxa825qrwfjjwny5m9hry5pyb2vszwm",
-      "depends": ["pomp"]
+      "version": "1.5.0.0",
+      "sha256": "0apsnji5xg0w8r0ry6k29drr32lv8vjsgz1xap3y1jykrpwdkw4k",
+      "depends": ["lifecycle", "pomp"]
     },
     "panelSUR": {
       "name": "panelSUR",
@@ -92565,8 +95877,8 @@
     },
     "panelvar": {
       "name": "panelvar",
-      "version": "0.5.5",
-      "sha256": "15bks8aqy29rslgbjp4w8xw7w2mcpgcc77bya7a9jcs5715j9xdb",
+      "version": "0.5.6",
+      "sha256": "0yzj8brm7snydk19x1vm0hyckx3n4fdzs3kiwwzimgrmc66yznam",
       "depends": ["MASS", "Matrix", "ggplot2", "knitr", "matrixcalc", "progress", "reshape2", "texreg"]
     },
     "pangaear": {
@@ -92575,6 +95887,12 @@
       "sha256": "1x1dbf7jahzc5s4gs0hn6xpw35xxbgp61aym50k384pavsdm9xgw",
       "depends": ["crul", "hoardr", "jsonlite", "oai", "png", "tibble", "xml2"]
     },
+    "pannotator": {
+      "name": "pannotator",
+      "version": "1.0.0.4",
+      "sha256": "06062z1idszmxkfy7wqj6yn8svb3fgh5421246dxw5yw0mr0kpq7",
+      "depends": ["bslib", "colourpicker", "config", "configr", "dplyr", "exiftoolr", "geojsonsf", "ggplot2", "golem", "htmlwidgets", "jpeg", "jsonify", "jsonlite", "leaflet", "leaflet_extras", "leafpm", "magrittr", "readr", "scales", "sf", "shiny", "shinyFiles", "shinyWidgets", "shinyhelper", "shinyjs", "shinythemes", "stringr"]
+    },
     "panstarrs": {
       "name": "panstarrs",
       "version": "0.2.2",
@@ -92583,8 +95901,8 @@
     },
     "papaja": {
       "name": "papaja",
-      "version": "0.1.2",
-      "sha256": "08ydk9fws5x37q120cdjdx1dsib0y2g9bp826vxzxcaymlwx3dl7",
+      "version": "0.1.3",
+      "sha256": "0lknj3r4kd8i4jlfi8q7p7fi2s009q8rryf0r44zxfxvr9nkmyxv",
       "depends": ["bookdown", "broom", "glue", "knitr", "rmarkdown", "rmdfiltr", "tinylabels", "yaml", "zip"]
     },
     "papci": {
@@ -92619,8 +95937,8 @@
     },
     "parabar": {
       "name": "parabar",
-      "version": "1.1.1",
-      "sha256": "1hhhcxaap1ih4chf5l2c8mqkv9i4bsqml64ak3nfydsi4znymha4",
+      "version": "1.4.2",
+      "sha256": "01vpqhpadj20rf384fc8nk14v8mbqjgip7rg3i9b7fldsbxqkc9n",
       "depends": ["R6", "callr", "filelock", "progress"]
     },
     "parade": {
@@ -92635,6 +95953,12 @@
       "sha256": "120ll8xrdg9s7ip0053m0i83gshxh3n79spsfwv6dzjwsj3mmpkj",
       "depends": ["R6", "backports", "checkmate", "data_table", "mlr3misc"]
     },
+    "parafac4microbiome": {
+      "name": "parafac4microbiome",
+      "version": "1.0.3",
+      "sha256": "1l60qpx5k6h7ba6g4crl5f3gclyrmn5xlvpp2jg0hbqav5qn4418",
+      "depends": ["compositions", "cowplot", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "lifecycle", "magrittr", "mize", "multiway", "pracma", "rTensor", "rlang", "tidyr"]
+    },
     "parallelDist": {
       "name": "parallelDist",
       "version": "0.2.6",
@@ -92661,8 +95985,8 @@
     },
     "parallelly": {
       "name": "parallelly",
-      "version": "1.38.0",
-      "sha256": "1ani63idvsx2apg3q2h9smi3sx7wbwpwpwjz585q9fyichy84b33",
+      "version": "1.41.0",
+      "sha256": "03z56kfdwxslz8ypz56ijpzr1a1y41dhppbc64fy6b3fsbii9zii",
       "depends": []
     },
     "parallelpam": {
@@ -92691,8 +96015,8 @@
     },
     "parameters": {
       "name": "parameters",
-      "version": "0.22.1",
-      "sha256": "0axyl6iwa0x6yk340g5943v1d1q023z63smxf0j6033mdikf3xm4",
+      "version": "0.24.0",
+      "sha256": "14kzkn1y3jy50g4j88vn4j15zvmidk35q4g9n4bqn7w5zxwnn4bw",
       "depends": ["bayestestR", "datawizard", "insight"]
     },
     "paramhetero": {
@@ -92701,6 +96025,12 @@
       "sha256": "1zkwzmh3igkwfq87v3rmp3axfspl20qn4qmpyqql6ain564yyabw",
       "depends": ["MASS", "ggplot2"]
     },
+    "paramix": {
+      "name": "paramix",
+      "version": "0.0.1",
+      "sha256": "136c1pqk8plx5kzx12xbvd502hgqdlc169f9cjwkbr7p51mwhsyk",
+      "depends": ["data_table"]
+    },
     "paramlink": {
       "name": "paramlink",
       "version": "1.1-5",
@@ -92709,16 +96039,10 @@
     },
     "paramlink2": {
       "name": "paramlink2",
-      "version": "1.0.4",
-      "sha256": "1dw6z49yd7g89hmnzpb5m0w8fz56iwwf7zr01kji0ss9p9vnr9pg",
+      "version": "1.0.6",
+      "sha256": "1qdpwmrxjl5109wvgdc05yyifm9myhc852dzy96ypi6lqhyn5snr",
       "depends": ["pedprobr", "pedtools"]
     },
-    "params": {
-      "name": "params",
-      "version": "0.7.3",
-      "sha256": "0zii9nxgl2z46vyqn2l0kdjmib90534ybpizck74mp2wp1vh9ndj",
-      "depends": ["RcppTOML", "glue", "purrr", "readr", "whisker"]
-    },
     "paramsim": {
       "name": "paramsim",
       "version": "0.1.0",
@@ -92757,8 +96081,8 @@
     },
     "pargasite": {
       "name": "pargasite",
-      "version": "2.1.0",
-      "sha256": "0jna1mjq4k8zfnszw3yarn6s0bhc70awins3nz4kmply01jy5jfi",
+      "version": "2.1.1",
+      "sha256": "0q04kyfnsxyr2myddrblisbd11v7szqpas5v5scvj9j1p8j9z6hz",
       "depends": ["cli", "gstat", "leaflet", "leafsync", "raqs", "rlang", "sf", "shiny", "shinycssloaders", "stars"]
     },
     "parglm": {
@@ -92775,8 +96099,8 @@
     },
     "parmigene": {
       "name": "parmigene",
-      "version": "1.1.0",
-      "sha256": "067rqxqyzy1fsjj0s1g7af4527whwdhzjzc5b8a8n7683na59ns4",
+      "version": "1.1.1",
+      "sha256": "03n93x8qsc4cl5a3d2z3q56rm2zs7xnpn9iqli25g3plv69hp0kk",
       "depends": []
     },
     "parmsurvfit": {
@@ -92817,8 +96141,8 @@
     },
     "parsedate": {
       "name": "parsedate",
-      "version": "1.3.1",
-      "sha256": "1cfinqlbchmkhkgmdwiy3mnxb17lp02jfk2gpw56hq9vh6wimhqz",
+      "version": "1.3.2",
+      "sha256": "0w0phy4jrhh14la507p9051skmmymbdza8kz8jpvhvkg81sdrd79",
       "depends": []
     },
     "parsel": {
@@ -92865,14 +96189,14 @@
     },
     "particles": {
       "name": "particles",
-      "version": "0.2.3",
-      "sha256": "0x76q9qcfaraiy0w8hrdk4ws16w1a8m363a3l4cphpi6xi329027",
+      "version": "0.2.4",
+      "sha256": "0k0v6ar9894bx5pvarfxm4vwi2a9aji09z57b8nm0zrkhcfr0v91",
       "depends": ["cpp11", "digest", "dplyr", "igraph", "mgcv", "rlang", "tidygraph"]
     },
     "partition": {
       "name": "partition",
-      "version": "0.2.1",
-      "sha256": "0nbhkzx4rp8zm6n49sf2kdzqkyfjh9032qbkpp4f4mnk5434z1qk",
+      "version": "0.2.2",
+      "sha256": "1m02743l6sl33qyv862xm9c7g009n4c969rjbm74dd1svqk678f3",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "crayon", "dplyr", "forcats", "ggplot2", "infotheo", "magrittr", "pillar", "progress", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "partitionBEFsp": {
@@ -92925,8 +96249,8 @@
     },
     "partykit": {
       "name": "partykit",
-      "version": "1.2-22",
-      "sha256": "1nqabizmy44c6ip7clg15wljwmd66p7jzzdb3xfsh40bjym1a00g",
+      "version": "1.2-23",
+      "sha256": "0lxbz3rr9iv1x26584i11jvghmzlmmd4bix9zzkxw9dcaxv16cqf",
       "depends": ["Formula", "inum", "libcoin", "mvtnorm", "rpart", "survival"]
     },
     "parzer": {
@@ -92973,8 +96297,8 @@
     },
     "pastboon": {
       "name": "pastboon",
-      "version": "0.1.1",
-      "sha256": "17qaglv3hf0llkf5v16pdb8ym5p2lhxvhvaj025qpf60x20y6zmc",
+      "version": "0.1.2",
+      "sha256": "06xp6p4vrdkblhypz745r6sl0n1a7wxhinfb6sx18hiaaaw73ixh",
       "depends": []
     },
     "pastclim": {
@@ -92997,8 +96321,8 @@
     },
     "patchDVI": {
       "name": "patchDVI",
-      "version": "1.11.0",
-      "sha256": "1cxgbrwb2qz39b9q1afz2i1pbnqyyi0hz8zc6j1i0llayyd6pgxk",
+      "version": "1.11.3",
+      "sha256": "0jqh9d9pwk3an59glkj3rhkhxb7cchih5yij402v521yaf9pl46h",
       "depends": ["RmdConcord"]
     },
     "patchSynctex": {
@@ -93009,9 +96333,9 @@
     },
     "patchwork": {
       "name": "patchwork",
-      "version": "1.2.0",
-      "sha256": "18b83gsv8idi5d062m9dvb46r7kxda97sa72pzllshhcaq9ylcfc",
-      "depends": ["cli", "ggplot2", "gtable", "rlang"]
+      "version": "1.3.0",
+      "sha256": "05ifwnrvlxk95nafvba09i7gq35i5xyxja51bfdvvkmalk26xbvp",
+      "depends": ["cli", "farver", "ggplot2", "gtable", "rlang"]
     },
     "patentr": {
       "name": "patentr",
@@ -93027,9 +96351,9 @@
     },
     "path_chain": {
       "name": "path.chain",
-      "version": "0.2.0",
-      "sha256": "1p28mcar4krgvkgn02xrlwcpzchnppn2l2k2iwh511c3qrfpy653",
-      "depends": ["logger", "rlang", "stringi"]
+      "version": "1.0.0",
+      "sha256": "16mpdms639hnzdarn8vkwr1rm8irjl55zgk0h3ia5y8r5yh1vpqh",
+      "depends": ["rlang", "stringi"]
     },
     "pathfindR": {
       "name": "pathfindR",
@@ -93099,9 +96423,9 @@
     },
     "patterncausality": {
       "name": "patterncausality",
-      "version": "0.1.1",
-      "sha256": "0gsh7wca9ncs8ixsj2j3vz28ab7xfmvim1zzwrn3clgwp0g1rasf",
-      "depends": []
+      "version": "0.1.3",
+      "sha256": "01k4sg4vab8263vxyx7bc1phv1lj2x85wqw7nrpv4mzcq0pywr9d",
+      "depends": ["corrplot", "plot3D"]
     },
     "patternize": {
       "name": "patternize",
@@ -93129,92 +96453,92 @@
     },
     "paws": {
       "name": "paws",
-      "version": "0.6.0",
-      "sha256": "1w8jzkcr86s67rclx994zkfwqqy02mlj2gk52a198dxg737w5nw0",
+      "version": "0.7.0",
+      "sha256": "15ff693czjaxd0b18xnv15m4yv7wm81d5f8mvmx0v57xzxsp7f3s",
       "depends": ["paws_analytics", "paws_application_integration", "paws_common", "paws_compute", "paws_cost_management", "paws_customer_engagement", "paws_database", "paws_developer_tools", "paws_end_user_computing", "paws_machine_learning", "paws_management", "paws_networking", "paws_security_identity", "paws_storage"]
     },
     "paws_analytics": {
       "name": "paws.analytics",
-      "version": "0.6.0",
-      "sha256": "0w65f4bmcybp30zas20b90f1cmw1znhpjhcsf8xnq7x4s2lnpy3d",
+      "version": "0.7.0",
+      "sha256": "0b9i4wyxgqdq2ninhna5kfh8bknxb5f6hiknr017fq2g2jp23sps",
       "depends": ["paws_common"]
     },
     "paws_application_integration": {
       "name": "paws.application.integration",
-      "version": "0.6.0",
-      "sha256": "0wmkxnrjmaf88bw1xypj7n41klxxhf538krsk0xrnwjb14v7lqla",
+      "version": "0.7.0",
+      "sha256": "1vqwa67px96kw9lrrb3hq9c22jzailwwdw5icvngglaqyd6xvfky",
       "depends": ["paws_common"]
     },
     "paws_common": {
       "name": "paws.common",
-      "version": "0.7.4",
-      "sha256": "0jrnliac0la9i9mlb95p07s3p7qkp3m79haz16bf8q3wdnc522i1",
+      "version": "0.7.7",
+      "sha256": "19ql3sylkbxqwzafgfd5iv9lr3pdakqisgpdasnsjl17fj3ydrj4",
       "depends": ["Rcpp", "base64enc", "curl", "digest", "httr", "jsonlite", "xml2"]
     },
     "paws_compute": {
       "name": "paws.compute",
-      "version": "0.6.1",
-      "sha256": "0s1d7gj7lb6fra4l6h3c74v3hsp701qbiqirnk0q0qm7ild5399r",
+      "version": "0.7.0",
+      "sha256": "00794ayxmpc2z4gxh0mal3lyhi37y9bmjy3k7rpwv0b17k7p04by",
       "depends": ["paws_common"]
     },
     "paws_cost_management": {
       "name": "paws.cost.management",
-      "version": "0.6.1",
-      "sha256": "03mpmwg3lnky9ylpc4707a10y7b1hv228c0jc0yik0zfvrka0h64",
+      "version": "0.7.0",
+      "sha256": "1gib8fyx4gvhiaf68r3qql7n1swda11687dal4swp7f4kmgz4x0d",
       "depends": ["paws_common"]
     },
     "paws_customer_engagement": {
       "name": "paws.customer.engagement",
-      "version": "0.6.0",
-      "sha256": "1akwx39xmkms9zpsb7i5wx2hzvhhkmi0xlxag13cf9gjpg822361",
+      "version": "0.7.0",
+      "sha256": "06lqmfzw2d60y9jg6lkznxbx6si2mwmq2qzdpq76jy1nzvwsp8d8",
       "depends": ["paws_common"]
     },
     "paws_database": {
       "name": "paws.database",
-      "version": "0.6.0",
-      "sha256": "0jm3cwl2scfc4jgxzlwnax195xlii2b3p9kjmid48p8zx6h68hb9",
+      "version": "0.7.0",
+      "sha256": "0sndg7s3z8w9lp826i752jlggl90x4ghm8ws68g7kkvjcd86l6rs",
       "depends": ["paws_common"]
     },
     "paws_developer_tools": {
       "name": "paws.developer.tools",
-      "version": "0.6.0",
-      "sha256": "1cj9k005267wpd9pblvhk0sdy2ll2n0wcq4ch5wjwkz9kgl02jjr",
+      "version": "0.7.0",
+      "sha256": "0p8ds2ks5pd54x891ha3y57rnjh9da3x0nbwqdhl0f2c2l6bqf74",
       "depends": ["paws_common"]
     },
     "paws_end_user_computing": {
       "name": "paws.end.user.computing",
-      "version": "0.6.0",
-      "sha256": "17550n93d0lndhfk9r8zdh2yif4hw3m4wn7wzgj53akgqy1jg10y",
+      "version": "0.7.0",
+      "sha256": "1chmqzmc9c70582lj9dy9hxcgnmia2qnl33c8ggmkscqay9hfprs",
       "depends": ["paws_common"]
     },
     "paws_machine_learning": {
       "name": "paws.machine.learning",
-      "version": "0.6.0",
-      "sha256": "1l2gy9bzibbjwqxb5x72dpfaylxa999c3zyb3y3359ckqkxsqgpy",
+      "version": "0.7.0",
+      "sha256": "07p24svzy570x9lglik2wpb2c92nrl6mn982n5j02j5b7z88w33p",
       "depends": ["paws_common"]
     },
     "paws_management": {
       "name": "paws.management",
-      "version": "0.6.1",
-      "sha256": "0yxh3lr5b9cgsq9gmbjwfikiv38wa4d82mrq0fdqidhcsqfbz62g",
+      "version": "0.7.0",
+      "sha256": "0y3xn7v9ikzm7d4gxhcwps4kqhpxvp3hmcd434d4sdbh6j382b03",
       "depends": ["paws_common"]
     },
     "paws_networking": {
       "name": "paws.networking",
-      "version": "0.6.0",
-      "sha256": "1lfkll2gb83vw9zfb7bnmlg4alncqhp48s1w046fkh9qlg8hc7j6",
+      "version": "0.7.0",
+      "sha256": "0mlpx5ydcdnwindf7rs6062xyams77xhlncmqhniyndlzh9lyq8x",
       "depends": ["paws_common"]
     },
     "paws_security_identity": {
       "name": "paws.security.identity",
-      "version": "0.6.1",
-      "sha256": "14zcvd2cf2015r7b4y69176czznz69nzjp344ys262a8r31nliz5",
+      "version": "0.7.0",
+      "sha256": "0mv44m42k8nx3vfl26w3b9xrwrcw8x0zrjgirb4p4fmi7swbv3s0",
       "depends": ["paws_common"]
     },
     "paws_storage": {
       "name": "paws.storage",
-      "version": "0.6.0",
-      "sha256": "1mngxy88r94n1zwbvimj71hw4w9myk5kgqpgyj0m3spwv7338rfd",
+      "version": "0.7.0",
+      "sha256": "16mf1ddvwbl44gnjkcg9n5ms5s5q647pp2gwf4jcqcnynnq745d4",
       "depends": ["paws_common"]
     },
     "pawscore": {
@@ -93249,26 +96573,26 @@
     },
     "pbcc": {
       "name": "pbcc",
-      "version": "0.0.5",
-      "sha256": "09yx6p0v8pa049l85kwm0rw15amyna9r35kbbahby3lfb212syb2",
+      "version": "0.0.7",
+      "sha256": "0vm4lq0x996d4fd7f33n27km0z92jmqzd6qwf90l2wr61h6hsrf7",
       "depends": ["ggplot2", "ggpubr", "qcc", "rgenoud"]
     },
     "pbdMPI": {
       "name": "pbdMPI",
-      "version": "0.5-1",
-      "sha256": "047pxra6n3pacyqg5qdg8dbz32s8bq8z9dyi5rvs0ax76vr1v8v4",
+      "version": "0.5-2",
+      "sha256": "0xvbchsikaapgr5d10izn70icjvjgivh7dswiidhgn69nrra4g91",
       "depends": ["float"]
     },
     "pbdSLAP": {
       "name": "pbdSLAP",
-      "version": "0.3-5",
-      "sha256": "0l6w1kxn0clqi36lqg494d71dd3rv77v94nzqn0rp7zv33n63cnp",
+      "version": "0.3-7",
+      "sha256": "1cdrd7cvrmd9jw32m988hbc5dhn7n2lrifn9l5v54g77h42v43ch",
       "depends": ["pbdMPI"]
     },
     "pbdZMQ": {
       "name": "pbdZMQ",
-      "version": "0.3-11",
-      "sha256": "0ns0fpfsbx28iyxmas691i29sh1gia0bspx0flgj0w3khm6j0zns",
+      "version": "0.3-13",
+      "sha256": "16l3g7syiwx5lfjr9rw9jckyzy2h8nikxmx8hd576av44f1shfa1",
       "depends": []
     },
     "pbivnorm": {
@@ -93357,14 +96681,14 @@
     },
     "pcaPP": {
       "name": "pcaPP",
-      "version": "2.0-4-1",
-      "sha256": "04xqicm1c16ajhzvlg17w8y50qnbqjisj3xvgpi3k18idkmmf6xx",
+      "version": "2.0-5",
+      "sha256": "043w3g3f57j2d0irnrxm58mzzisg7xmnsl17v7wijsh1czcswkv7",
       "depends": ["mvtnorm"]
     },
     "pcadapt": {
       "name": "pcadapt",
-      "version": "4.3.5",
-      "sha256": "106h6xvqixi1lgrx1280f7jmdyc5k6da6j9vy49iq2gyma6v2q9v",
+      "version": "4.4.0",
+      "sha256": "1b5sk6dy51465n96qyycy1i1lkiky7lwxycdmynv66xrkyyn3gas",
       "depends": ["RSpectra", "Rcpp", "bigutilsr", "data_table", "ggplot2", "magrittr", "mmapcharr", "rmio"]
     },
     "pcal": {
@@ -93375,8 +96699,8 @@
     },
     "pcalg": {
       "name": "pcalg",
-      "version": "2.7-11",
-      "sha256": "14709561m2vz3y0qx1jwnxq0z464j9ddmvr8p765aclm97n87rvm",
+      "version": "2.7-12",
+      "sha256": "0wz94x8jg9810pr3sx8zccsidqz99xbffq4smwqn0hnz3r00g3w9",
       "depends": ["BH", "RBGL", "Rcpp", "RcppArmadillo", "abind", "bdsmatrix", "clue", "corpcor", "fastICA", "ggm", "graph", "igraph", "robustbase", "sfsmisc", "vcd"]
     },
     "pcalls": {
@@ -93387,8 +96711,8 @@
     },
     "pcaone": {
       "name": "pcaone",
-      "version": "1.0.0",
-      "sha256": "0lpi4y8alddaplq2pjpgkbias1k08y02jg1zd236dh3n2qkfmamw",
+      "version": "1.1.0",
+      "sha256": "0ds64x9g2jbxhk2qdgpshr8lkksklaswjxphyw43jimz5lslds11",
       "depends": ["Rcpp", "RcppEigen"]
     },
     "pcatsAPIclientR": {
@@ -93453,8 +96777,8 @@
     },
     "pchc": {
       "name": "pchc",
-      "version": "1.2",
-      "sha256": "0h1b1n9mw22wsh51nciphgyqk2cp98qkm4wskxw4ryj6lyqjk4k2",
+      "version": "1.3",
+      "sha256": "1w48x0ggkk8417yd1hl5k2w0wqad2k49c9x8sdzqpghns6qqm04y",
       "depends": ["Rfast", "Rfast2", "bigstatsr", "bnlearn", "dcov", "doParallel", "foreach", "robustbase"]
     },
     "pci": {
@@ -93499,16 +96823,10 @@
       "sha256": "0pqc6qpl95dxphi77wcgi0v22a1q455iqaplsrvg32cf0mn3gikg",
       "depends": ["Rdpack", "gtools"]
     },
-    "pct": {
-      "name": "pct",
-      "version": "0.9.9",
-      "sha256": "15rshwdrfkr0ahnywss0qqbcyfxakknv9ffvb58nzc960c97zmy8",
-      "depends": ["boot", "crul", "readr", "sf", "stplanr"]
-    },
     "pctax": {
       "name": "pctax",
-      "version": "0.1.1",
-      "sha256": "153vbgs3fw3x5n20wn58r3958kqrzcx0y15z5xjyc0lzhc66bzfs",
+      "version": "0.1.3",
+      "sha256": "1wfxxjms5iz0a612a1d9bsryjnngkw632sfia15k6x0l7v2n6raq",
       "depends": ["RColorBrewer", "ade4", "dplyr", "ggnewscale", "ggplot2", "ggpubr", "ggrepel", "magrittr", "pcutils", "reshape2", "scales", "tibble", "vegan"]
     },
     "pcts": {
@@ -93519,8 +96837,8 @@
     },
     "pcutils": {
       "name": "pcutils",
-      "version": "0.2.6",
-      "sha256": "1732qrr9f419a2g4wi7dnf97209k57qk9myb839sybdb3irvra9j",
+      "version": "0.2.7",
+      "sha256": "0ncj8gwi6axpbg02gq6jnwxp4zh0f4r94iky8b5m8hfhbkm15gxb",
       "depends": ["RColorBrewer", "dplyr", "ggplot2", "magrittr", "reshape2", "scales", "tibble", "tidyr"]
     },
     "pcv": {
@@ -93529,6 +96847,12 @@
       "sha256": "03rpfxdpinr1a6964gch0j852h96jfk4sccs4bv1pzkvv2qsnzlr",
       "depends": []
     },
+    "pcvr": {
+      "name": "pcvr",
+      "version": "1.1.1.0",
+      "sha256": "1hlfbddi54hrr3s15vrbpxc8jvnhvrlifp632qpninf9lfik23js",
+      "depends": ["FactoMineR", "bayestestR", "car", "data_table", "extraDistr", "ggplot2", "ggridges", "igraph", "jsonlite", "lme4", "lmeSplines", "mgcv", "nlme", "patchwork", "quantreg", "rlang", "scales", "survival", "viridis"]
+    },
     "pdR": {
       "name": "pdR",
       "version": "1.9.3",
@@ -93567,9 +96891,9 @@
     },
     "pdfetch": {
       "name": "pdfetch",
-      "version": "0.2.9",
-      "sha256": "03hx8h2sfahfy05wwrac048wzzlh1d1g6hbr0qzkkhk4xsv69qa1",
-      "depends": ["XML", "curl", "dplyr", "httr", "jsonlite", "lubridate", "magrittr", "readr", "stringr", "tidyr", "xml2", "xts", "zoo"]
+      "version": "0.3.3",
+      "sha256": "14fjvzwzgiz4wsmij9154psmss8y4q95cv7v9xpbx4wq0cdlj86a",
+      "depends": ["XML", "dplyr", "httr", "jsonlite", "lubridate", "magrittr", "quantmod", "readr", "stringr", "tidyr", "xml2", "xts", "zoo"]
     },
     "pdfminer": {
       "name": "pdfminer",
@@ -93591,8 +96915,8 @@
     },
     "pdftools": {
       "name": "pdftools",
-      "version": "3.4.0",
-      "sha256": "0r1c91qrva8lz0gs717llzs6zjiqjrdjhi71asf9bmx600hpp78b",
+      "version": "3.4.1",
+      "sha256": "1g8w5456iy8zv77yc96vgf9da7apsszvn88k347a57klb1bdzh9i",
       "depends": ["Rcpp", "qpdf"]
     },
     "pdi": {
@@ -93615,8 +96939,8 @@
     },
     "pdp": {
       "name": "pdp",
-      "version": "0.8.1",
-      "sha256": "0v1pr8fvx1z11kci6rna5bd8bk280p6lqrpxr3akflspbmpbcgg2",
+      "version": "0.8.2",
+      "sha256": "06xbjk8ynavfpcrkxm6r60smk465wxqm6j1xflwgpcgp81rzsfhl",
       "depends": ["foreach", "ggplot2", "lattice", "rlang"]
     },
     "pdqr": {
@@ -93687,8 +97011,8 @@
     },
     "pedFamilias": {
       "name": "pedFamilias",
-      "version": "0.2.2",
-      "sha256": "0fxwsamflw4vkw2hi0gmgkds0vx9yikda31s6fdcvnbjs1cpf1zd",
+      "version": "0.2.4",
+      "sha256": "015cpgzk7ampam0q85hmwnscwxv72kiyvs4p9rsp00r468zwyfca",
       "depends": ["pedmut", "pedtools"]
     },
     "pedMermaid": {
@@ -93705,14 +97029,14 @@
     },
     "pedalfast_data": {
       "name": "pedalfast.data",
-      "version": "1.0.1",
-      "sha256": "027npj067r4cv0mdgd26x6ilrfz9a0hd0yagkkl3b06nx292pba5",
+      "version": "1.0.2",
+      "sha256": "0dr1zfg3sxmah2zghwpmv3a6znap7hbkkz88z0668ki34lf22pvm",
       "depends": []
     },
     "pedbp": {
       "name": "pedbp",
-      "version": "2.0.0",
-      "sha256": "1cs03920am54c944ca8xif5k154zwzrvb8pa8kr0j03nxymkp7dm",
+      "version": "2.0.1",
+      "sha256": "0yrlmwiizdwpyvdd4dlhq6s9bjs3xjcrpzp6wx3vr4sbzfjjqmwm",
       "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "scales"]
     },
     "pedbuildr": {
@@ -93735,14 +97059,14 @@
     },
     "pedigreeTools": {
       "name": "pedigreeTools",
-      "version": "0.2",
-      "sha256": "048lpzg0mmbzdc5cd52ssvzlji5293xz7bpqy3cjjszwcfjppc6c",
+      "version": "0.3",
+      "sha256": "03kmpizrjsr1x4av7zis2swrz0wr6b708bpss545mvjwm7zq3wc4",
       "depends": ["Matrix"]
     },
     "pedigreemm": {
       "name": "pedigreemm",
-      "version": "0.3-4",
-      "sha256": "1fy9fq5g94p7v2s0yih1kj4in5gqmip8dd96pls0k9ixbgcqj95v",
+      "version": "0.3-5",
+      "sha256": "1bnvd25z8ff0d00wijp2vw9xw11fczqrlblw3ag39pjzn98a1zf7",
       "depends": ["Matrix", "lme4"]
     },
     "pedmut": {
@@ -93771,16 +97095,22 @@
     },
     "pedsuite": {
       "name": "pedsuite",
-      "version": "1.2.0",
-      "sha256": "1l7yyn8w1lsqlnd79vp2yaxyh6wrkxn4rm1kcbcv5bd9ivxc9k8b",
-      "depends": ["dvir", "forrel", "ibdsim2", "paramlink2", "pedbuildr", "pedmut", "pedprobr", "pedtools", "ribd", "segregatr", "verbalisr"]
+      "version": "1.3.1",
+      "sha256": "0arydd5lmwsqp0g7akd7w0w5mc7bs4dap38bnap9qh0znf94kka2",
+      "depends": ["dvir", "forrel", "ibdsim2", "paramlink2", "pedFamilias", "pedbuildr", "pedmut", "pedprobr", "pedtools", "ribd", "segregatr", "verbalisr"]
     },
     "pedtools": {
       "name": "pedtools",
-      "version": "2.7.0",
-      "sha256": "01zh9jks0qdry8yszfdb8rkmmp8035av3y4vxkybnaryymlnmaqy",
+      "version": "2.7.1",
+      "sha256": "0ip8r88xky8z6dphif2p86l7mfasgaxac0bgi1rrfj385lr5swbb",
       "depends": ["kinship2", "pedmut"]
     },
+    "pedtricks": {
+      "name": "pedtricks",
+      "version": "0.4.2",
+      "sha256": "1l1ysyipwlbfvhm6d8dqyvn2hchy7dnmlgnx5l32znv0dv4s0zcl",
+      "depends": ["MCMCglmm", "Matrix", "dplyr", "genetics", "ggplot2", "igraph", "kinship2", "mvtnorm", "nadiv", "tidyr"]
+    },
     "peermodels": {
       "name": "peermodels",
       "version": "0.10.3",
@@ -93867,8 +97197,8 @@
     },
     "penaltyLearning": {
       "name": "penaltyLearning",
-      "version": "2024.1.25",
-      "sha256": "0nvh5szn27dsvdr80ldgq9d2bqvfplp4hdcwgv5f6g2lfcsmiil8",
+      "version": "2024.9.3",
+      "sha256": "0fip36rx11w9n3q17139gxdm12bknclx287r1qlxandr7hwpac9g",
       "depends": ["data_table", "ggplot2"]
     },
     "pencal": {
@@ -93981,8 +97311,8 @@
     },
     "performance": {
       "name": "performance",
-      "version": "0.12.2",
-      "sha256": "0a20xnky7h6hgd6sk9n5jb4a2s201kr0cibhbii8i3jvnhz6cpmm",
+      "version": "0.12.4",
+      "sha256": "0dsvgc8svl5c2zzif656m56ql198nlsjq88bcby8g26bncvhbq5y",
       "depends": ["bayestestR", "datawizard", "insight"]
     },
     "performanceEstimation": {
@@ -94011,8 +97341,8 @@
     },
     "permChacko": {
       "name": "permChacko",
-      "version": "1.0.0",
-      "sha256": "0wnq6wgh78cp8d0xab00fb94p9sm67412dvxrki56rajjsagclqq",
+      "version": "1.0.1",
+      "sha256": "0djmhbmjxq1id1qdnalndmvb9zqy5vhbsapk9zf2mv5z4rnkycyk",
       "depends": []
     },
     "permGS": {
@@ -94047,8 +97377,8 @@
     },
     "permuco": {
       "name": "permuco",
-      "version": "1.1.2",
-      "sha256": "0lh7n94hchq7wcp8j27c1m2v0xa5mq1dzpdvzkv2cwagy45v4383",
+      "version": "1.1.3",
+      "sha256": "1zih4hb91507cqd6r6vsxqsv8q299i37p764mf33yyplr9w22vrb",
       "depends": ["Matrix", "Rcpp", "permute"]
     },
     "permutations": {
@@ -94069,6 +97399,12 @@
       "sha256": "1ibpjg72vfvw3yvldqka0c70ydxvl2vbpqv1cn07yiwf7l0d5f51",
       "depends": ["plyr"]
     },
+    "permutest": {
+      "name": "permutest",
+      "version": "1.0.0",
+      "sha256": "1y34l09bh4l7mjzdbm0dycsx7021icqj9wla6v1lpfid4lbr6y1p",
+      "depends": []
+    },
     "perplexR": {
       "name": "perplexR",
       "version": "0.0.3",
@@ -94123,6 +97459,12 @@
       "sha256": "175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03",
       "depends": ["ape", "boot", "doParallel", "foreach", "ggplot2", "mapproj", "sp"]
     },
+    "persval": {
+      "name": "persval",
+      "version": "1.1.1",
+      "sha256": "12gij3lvd8lvdpcmnyzxjwy4060xv3q5smvaz3ni82165f90dw47",
+      "depends": ["fmsb"]
+    },
     "perturbR": {
       "name": "perturbR",
       "version": "0.1.3",
@@ -94195,12 +97537,6 @@
       "sha256": "1z3lpbijivr32r9y0lh2yxsww7sz9kqmsvnril1gzn09d498xz3b",
       "depends": ["FD", "Matrix", "ade4", "animation", "ape", "caper", "mvtnorm", "phytools", "picante", "quantreg", "vegan"]
     },
-    "pfa": {
-      "name": "pfa",
-      "version": "1.1",
-      "sha256": "0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31",
-      "depends": ["POET", "lars", "quantreg"]
-    },
     "pfica": {
       "name": "pfica",
       "version": "0.1.3",
@@ -94317,8 +97653,8 @@
     },
     "phangorn": {
       "name": "phangorn",
-      "version": "2.11.1",
-      "sha256": "086lxqzqx1n3237h9q28r54libaz2xk9h3f6vfj8l49yw356w28h",
+      "version": "2.12.1",
+      "sha256": "1rwyzvqs5hwjmwa70b7g4jm7h1x1spyh81cd2qnmvfml0rw9ricx",
       "depends": ["Matrix", "Rcpp", "ape", "digest", "fastmatch", "generics", "igraph", "quadprog"]
     },
     "phantSEM": {
@@ -94341,20 +97677,20 @@
     },
     "pharmaverseadam": {
       "name": "pharmaverseadam",
-      "version": "1.0.0",
-      "sha256": "1nwm0mbaaca5ry449h1llvv44wcy2lgd4bs3wfacb9ag2pfgglc8",
+      "version": "1.1.0",
+      "sha256": "1h5d5ky5pb83rrss16mg8l9s8mk6l1alw3jga5mx5xmg5ii8w6jf",
       "depends": []
     },
     "pharmaversesdtm": {
       "name": "pharmaversesdtm",
-      "version": "1.0.0",
-      "sha256": "0nd6v6lg8a05z83f1h2wqan5vq7p26hvkrjh36f6521aakw4if74",
+      "version": "1.1.0",
+      "sha256": "19bf2nrwh04bnjczzgq1vqqnbmj1b0qfmbym37xcz88xdyky7w6n",
       "depends": []
     },
     "pharmr": {
       "name": "pharmr",
-      "version": "1.0.1",
-      "sha256": "0vxaas0rrzfcia47bhqd54d2sjnwgx3djbfy9ggf2hr3cw3dz7fg",
+      "version": "1.4.0",
+      "sha256": "027zmkkd9jdqlbln7yisp9bf3w5zjkyvx54qz3517d8zzi121nh3",
       "depends": ["altair", "reticulate"]
     },
     "phase": {
@@ -94473,8 +97809,8 @@
     },
     "phenology": {
       "name": "phenology",
-      "version": "9.1",
-      "sha256": "095697ahyhl70h9wlwfbxqp6d9z8kc08k450apx65m1jvcl6jq1b",
+      "version": "10.1",
+      "sha256": "088288idp4jgj1jcrqxij9p5phlh425r41v7wnvxghp066cg1snr",
       "depends": ["HelpersMG", "numDeriv", "optimx"]
     },
     "phenomap": {
@@ -94509,8 +97845,8 @@
     },
     "philentropy": {
       "name": "philentropy",
-      "version": "0.8.0",
-      "sha256": "0gmycszk86mc9clmxfdrspqh5z0g3cw2cgzaaqngxx38h68x99is",
+      "version": "0.9.0",
+      "sha256": "04rmhfslim3vwxi14qllp9kzjcl7fwyzczar0lb72j5vd07mmns0",
       "depends": ["KernSmooth", "Rcpp", "poorman"]
     },
     "phm": {
@@ -94521,8 +97857,8 @@
     },
     "phoenics": {
       "name": "phoenics",
-      "version": "0.3",
-      "sha256": "1a7dws11pf2bpgkvchddr14v6zvbn16xwqrdmmz9plw9lindc00j",
+      "version": "0.4",
+      "sha256": "178bw6fbgdsbm2b6l1dikyj5vfvp5h3gd26zrqnz50zp83v366k9",
       "depends": ["FactoMineR", "blme", "factoextra", "lme4", "tibble", "tidyr"]
     },
     "phoenix": {
@@ -94569,8 +97905,8 @@
     },
     "photobiology": {
       "name": "photobiology",
-      "version": "0.11.2",
-      "sha256": "1vsxkcjng0cdjzg76k944cm01jfmq52vqqwvblsq6hr8klbcvp8k",
+      "version": "0.11.4",
+      "sha256": "08qq7yc5gdflagg58f5g357ajrlhbyy87ici3z7r9pzanw7v6n09",
       "depends": ["dplyr", "lubridate", "plyr", "polynom", "rlang", "splus2R", "stringr", "tibble", "tidyr", "zoo"]
     },
     "photobiologyFilters": {
@@ -94581,9 +97917,9 @@
     },
     "photobiologyInOut": {
       "name": "photobiologyInOut",
-      "version": "0.4.27",
-      "sha256": "1z5vyh44mp4nfp3b2piv6fs8b6k963yw0zb2dgiz8qfgzsyfhnzr",
-      "depends": ["anytime", "colorSpec", "dplyr", "lubridate", "photobiology", "readr", "readxl", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "0.4.29",
+      "sha256": "153yim3ggljxg4inijpsch0aipfgidy3xghjv2ap7rpzbdj6wmcb",
+      "depends": ["anytime", "colorSpec", "dplyr", "jsonlite", "lubridate", "photobiology", "readr", "readxl", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "photobiologyLEDs": {
       "name": "photobiologyLEDs",
@@ -94621,10 +97957,16 @@
       "sha256": "0p4as2kpcjy0mc38pmjjlpngbf4568zn5rpz9rhrlc0ynarrgnzj",
       "depends": ["photobiology"]
     },
+    "photon": {
+      "name": "photon",
+      "version": "0.3.1",
+      "sha256": "0gl6v57g1d2p6h90yhilqh0gy044lm8mm65dx7rjiam7r8zpii6z",
+      "depends": ["R6", "cli", "countrycode", "httr2", "processx", "sf"]
+    },
     "photosynthesis": {
       "name": "photosynthesis",
-      "version": "2.1.4",
-      "sha256": "1bilhqzhwxanlxvn98piysv45bpw7zh7f5w56rvllxgrpmra68pq",
+      "version": "2.1.5",
+      "sha256": "0v57asd65sh1hg462vsbpmlda5daqdyz6wmwbmfcs6b1m1as3sih",
       "depends": ["checkmate", "crayon", "dplyr", "furrr", "ggplot2", "glue", "gunit", "lifecycle", "magrittr", "minpack_lm", "nlme", "progress", "purrr", "readr", "rlang", "stringr", "tealeaves", "units"]
     },
     "phrases": {
@@ -94635,8 +97977,8 @@
     },
     "phreeqc": {
       "name": "phreeqc",
-      "version": "3.8.0",
-      "sha256": "0ywhxqc33ybwlch2ym6wgm5s4dillhwg3ccdiz9iklv0i85grmd8",
+      "version": "3.8.5",
+      "sha256": "0gc30wzin5ld0f24nyn491snrx2inh58wx2m4qqhr9bfww0wr8mb",
       "depends": []
     },
     "phsmethods": {
@@ -94693,12 +98035,6 @@
       "sha256": "1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn",
       "depends": ["ape", "htmlwidgets", "phylobase"]
     },
-    "phyloclim": {
-      "name": "phyloclim",
-      "version": "0.9.5",
-      "sha256": "107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs",
-      "depends": ["ape", "raster", "sp"]
-    },
     "phylocomr": {
       "name": "phylocomr",
       "version": "0.3.4",
@@ -94713,10 +98049,16 @@
     },
     "phylolm": {
       "name": "phylolm",
-      "version": "2.6.2",
-      "sha256": "04pz7i44s8w6py4nk2zilzjlkrf1c5dbb6jij7zfkk49hvslbynn",
+      "version": "2.6.5",
+      "sha256": "0sg2a7isy5f5phk2db4v2b78apdmd3k9c8jdwpkrm3lw7vxj52v5",
       "depends": ["ape", "future_apply"]
     },
+    "phylolm_hp": {
+      "name": "phylolm.hp",
+      "version": "0.0-3",
+      "sha256": "1v0l8h6c2i3wysjnx4p6mhzv7jq9p47nqpa19bjs4y997s0lfiva",
+      "depends": ["ggplot2", "phylolm", "rr2", "vegan"]
+    },
     "phylometrics": {
       "name": "phylometrics",
       "version": "0.0.1",
@@ -94783,6 +98125,12 @@
       "sha256": "1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w",
       "depends": ["ape"]
     },
+    "phylotypr": {
+      "name": "phylotypr",
+      "version": "0.1.0",
+      "sha256": "1p7k7qw89ihwzpkdvr5zcrrbj6j3n7vclch1miggs7mwb92apabq",
+      "depends": ["Rcpp", "Rfast", "readr", "stringi"]
+    },
     "phylter": {
       "name": "phylter",
       "version": "0.9.11",
@@ -94801,16 +98149,10 @@
       "sha256": "0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp",
       "depends": []
     },
-    "physiology": {
-      "name": "physiology",
-      "version": "1.2.1",
-      "sha256": "1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb",
-      "depends": ["Rcpp"]
-    },
     "phytoclass": {
       "name": "phytoclass",
-      "version": "1.2.0",
-      "sha256": "12b1xmzwcp90km4irjsrnks44b1rd82p8yn9cn4m6hsaiq6mb45c",
+      "version": "2.0.0",
+      "sha256": "17yd1ns6mvk8kr60jp818hnfivfag6qmgf9jkgvp37fya4k2x287",
       "depends": ["Metrics", "RcppML", "bestNormalize", "dplyr", "dynamicTreeCut", "ggplot2", "tidyr"]
     },
     "phytools": {
@@ -94821,8 +98163,8 @@
     },
     "piar": {
       "name": "piar",
-      "version": "0.7.0",
-      "sha256": "04m2xcym1pm0v6riz18mdfjzhgw9hpi67djym2a15970av15ld9l",
+      "version": "0.8.1",
+      "sha256": "0153cyfnw7cprvm2gkk0ajishs2rhbwdlx6xd07ls8jpzm3jl5k6",
       "depends": ["Matrix", "gpindex"]
     },
     "picClip": {
@@ -94855,6 +98197,12 @@
       "sha256": "1n7h1lvrivy7czzhisd9p3g187ivcyhzyjj7ahkimyb296gy8z1b",
       "depends": ["htmlwidgets"]
     },
+    "picohdr": {
+      "name": "picohdr",
+      "version": "0.1.1",
+      "sha256": "1lx6x0crxbiz8pp7rm4zk263q7lxjaw6dsppkax90x57ll0xzcic",
+      "depends": ["ctypesio"]
+    },
     "pid": {
       "name": "pid",
       "version": "0.50",
@@ -94891,11 +98239,23 @@
       "sha256": "1vkawf3jk8ddzapgvbixzq2kswnprfpjkvinby4z5x9gg535lfwq",
       "depends": ["cli", "fs", "gh", "glue", "httr", "jsonlite", "lubridate", "memoise"]
     },
+    "pii": {
+      "name": "pii",
+      "version": "1.0.0",
+      "sha256": "1pibrfycgci331bpkgj4qn7b2w1vdwg9gvgkjnw7mxdfgr8f4qxm",
+      "depends": ["dplyr", "stringr", "uuid"]
+    },
+    "pikchr": {
+      "name": "pikchr",
+      "version": "1.0",
+      "sha256": "0zz3bmj2glaml0yvs6gng2kkma0337zir1hlgyrssd1clgk4bijp",
+      "depends": ["brio", "dplyr", "htmltools", "knitr", "purrr", "rlang", "rsvg", "stringr"]
+    },
     "pillar": {
       "name": "pillar",
-      "version": "1.9.0",
-      "sha256": "1k3sp37dpn46d2xbq621alpvzgnm06x5qb87nk169y47q23b8gpj",
-      "depends": ["cli", "fansi", "glue", "lifecycle", "rlang", "utf8", "vctrs"]
+      "version": "1.10.0",
+      "sha256": "1nzaf2ckiqdlwwwav6lwpjnmy43l6f43qpbf5ny9z3iqaifvpxlp",
+      "depends": ["cli", "glue", "lifecycle", "rlang", "utf8", "vctrs"]
     },
     "pim": {
       "name": "pim",
@@ -94923,8 +98283,8 @@
     },
     "pingr": {
       "name": "pingr",
-      "version": "2.0.3",
-      "sha256": "0qyqmv3anrdh9416rnq1l0mnhdwfl3x603rcg8kfwgwcb2zc0a9w",
+      "version": "2.0.5",
+      "sha256": "152zffi2bg5yyjbk7h83fdn1n6ab24m14d69qb2xhs4bydjad2r1",
       "depends": ["processx"]
     },
     "pinnacle_data": {
@@ -94941,15 +98301,15 @@
     },
     "pinp": {
       "name": "pinp",
-      "version": "0.0.10",
-      "sha256": "1qah1b9chn237pfxisjsn6rr4h9h9zdqrk323c0k1qds7vm0xpra",
+      "version": "0.0.11",
+      "sha256": "1yqlhmc4zl6hclcf4463wyyzp73n4z75swxdz1l6xlfxq4bl3gp0",
       "depends": ["knitr", "rmarkdown"]
     },
     "pins": {
       "name": "pins",
-      "version": "1.3.0",
-      "sha256": "1jbry96ac19i2g61pdb2r997b450bgi98szi3dgwgvnhfq4sidjp",
-      "depends": ["cli", "digest", "ellipsis", "fs", "generics", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "purrr", "rappdirs", "rlang", "tibble", "whisker", "withr", "yaml"]
+      "version": "1.4.0",
+      "sha256": "07hggz1yjhcgvknhsp183gwd4lzqwwsvw7vdv2rn8rx8yh23ylcp",
+      "depends": ["cli", "digest", "fs", "generics", "glue", "httr", "jsonlite", "lifecycle", "magrittr", "purrr", "rappdirs", "rlang", "tibble", "whisker", "withr", "yaml"]
     },
     "pinterestadsR": {
       "name": "pinterestadsR",
@@ -94963,6 +98323,12 @@
       "sha256": "0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2",
       "depends": ["data_table", "splitstackshape"]
     },
+    "pioneeR": {
+      "name": "pioneeR",
+      "version": "0.5.0",
+      "sha256": "1bfmr69bpm4xdffrx7qqlggqalpwfvcmbhx82jdq7h3p40lvh7pr",
+      "depends": ["bsicons", "bslib", "cli", "ggplot2", "haven", "htmltools", "lpSolveAPI", "markdown", "reactable", "readxl", "rlang", "scales", "shiny", "writexl"]
+    },
     "pipe_design": {
       "name": "pipe.design",
       "version": "0.5.1",
@@ -94987,6 +98353,12 @@
       "sha256": "0pzd7f0rhn0rydncki666zlajdwyiay3apa17cb0xy5454d99mvh",
       "depends": ["magrittr", "miniUI", "rstudioapi", "shiny", "stringr"]
     },
+    "pipeflow": {
+      "name": "pipeflow",
+      "version": "0.2.2",
+      "sha256": "1kdqgs0phaq1bqp2lbwjbi9zs4g67sy4bl5g3nxnpxmpnscm44xr",
+      "depends": ["R6", "data_table", "jsonlite", "lgr"]
+    },
     "pipeliner": {
       "name": "pipeliner",
       "version": "0.1.1",
@@ -95089,6 +98461,12 @@
       "sha256": "04g74v8g9r0f3czzk4r3n0wxyg7ldgfdlh21bas7axa9l10wdnz3",
       "depends": []
     },
+    "pk_unit_trans": {
+      "name": "pk.unit.trans",
+      "version": "0.1.0",
+      "sha256": "1z5xbybjd8zm7xmx3kh0jd53dhnm32za41hpl0616vkz7fn0ri12",
+      "depends": ["maditr", "stringi"]
+    },
     "pk4adi": {
       "name": "pk4adi",
       "version": "0.1.3.2",
@@ -95103,26 +98481,26 @@
     },
     "pkgGraphR": {
       "name": "pkgGraphR",
-      "version": "0.2.0",
-      "sha256": "0qmrbwgm6aclzdgpcwr2c2bvakh3rcrf9z8m5mqd9vxgjykjfgks",
+      "version": "0.3.0",
+      "sha256": "060p7f6s1q0zfig82lvhhsr6nlxy9jyhxqkpypks9lmc4jj4r3p7",
       "depends": ["DiagrammeR", "dplyr", "purrr"]
     },
     "pkgKitten": {
       "name": "pkgKitten",
-      "version": "0.2.3",
-      "sha256": "10q0sa6l4phi04d7a2pdiy5pykg9y4c8sp3hhg6g19jbldvyhx2w",
+      "version": "0.2.4",
+      "sha256": "1ff2qhrgmlbayz7k12p7qs42w38g7ipwnq97wiw830dyf7k7c3f7",
       "depends": []
     },
     "pkgbuild": {
       "name": "pkgbuild",
-      "version": "1.4.4",
-      "sha256": "1a72s2gg7ddjj94naiii44f3vyhky05gaa6xvdf72m1nshy88wjr",
+      "version": "1.4.5",
+      "sha256": "000swh4qfd536d1qpi81xxfk161fl6j159qcbrzw1d5q08ml9pi1",
       "depends": ["R6", "callr", "cli", "desc", "processx"]
     },
     "pkgcache": {
       "name": "pkgcache",
-      "version": "2.2.2",
-      "sha256": "1qsvgdhinrz2mb4fr33pp6rm23pra6bgwzc70kjyl983zk2nrgby",
+      "version": "2.2.3",
+      "sha256": "1isvbb2l6l2wk2grh7cz85q80nbghp5287jr137sal4gviprgk7v",
       "depends": ["R6", "callr", "cli", "curl", "filelock", "jsonlite", "processx"]
     },
     "pkgcond": {
@@ -95139,20 +98517,20 @@
     },
     "pkgdepR": {
       "name": "pkgdepR",
-      "version": "1.0.0",
-      "sha256": "098fcj1s5rcjxmn57449f4zk9z2w4mqwxkvxxjazd1nj7wa45z8p",
+      "version": "1.1.1",
+      "sha256": "0khydf9229zlfxkvp2s95ql0nn8fj5878yrh8wgxm4v0kp12hj5k",
       "depends": ["dplyr", "magrittr", "scales", "viridisLite", "visNetwork"]
     },
     "pkgdepends": {
       "name": "pkgdepends",
-      "version": "0.7.2",
-      "sha256": "09nddbcz0z5lh6aaspjvfvbp74na7693a5w3hq36p4ah2b824zmi",
+      "version": "0.8.0",
+      "sha256": "025ni959zvqfaxs6af9pka7gn23yzgbabpy28bsa45v75hi4i79m",
       "depends": ["R6", "callr", "cli", "curl", "desc", "filelock", "jsonlite", "lpSolve", "pkgbuild", "pkgcache", "processx", "ps", "zip"]
     },
     "pkgdown": {
       "name": "pkgdown",
-      "version": "2.1.0",
-      "sha256": "1d4z4wv18yn00cj9wb4pizjjyvy4hqfc0mqynw6ycrldfcxxzlf4",
+      "version": "2.1.1",
+      "sha256": "1phcdh1a178m60164613p6z9cqz379wp3d6b62k4ss64z1sc7qf7",
       "depends": ["bslib", "callr", "cli", "desc", "digest", "downlit", "fontawesome", "fs", "httr2", "jsonlite", "openssl", "purrr", "ragg", "rlang", "rmarkdown", "tibble", "whisker", "withr", "xml2", "yaml"]
     },
     "pkgfilecache": {
@@ -95169,8 +98547,8 @@
     },
     "pkglite": {
       "name": "pkglite",
-      "version": "0.2.2",
-      "sha256": "1781gkzz5p1rbksyxaznqp7n0ixig8lzjg88bj3v24r0zg5wwdwc",
+      "version": "0.2.4",
+      "sha256": "1163hjqlpryzrjnsxylsr7s50bxhb6y679dyhhkxak045l922c4a",
       "depends": ["crayon", "magrittr", "remotes"]
     },
     "pkgload": {
@@ -95179,12 +98557,6 @@
       "sha256": "0jbmlvii40q6ymdhislmgby6dpf9585xl9d5cf8g4nn2kig8ir09",
       "depends": ["cli", "desc", "fs", "glue", "lifecycle", "pkgbuild", "processx", "rlang", "rprojroot", "withr"]
     },
-    "pkgmaker": {
-      "name": "pkgmaker",
-      "version": "0.32.10",
-      "sha256": "0cr95vmsb4gkl917wg4wwq8jihvwasdg18qzhk2cq224lrrh8awp",
-      "depends": ["assertthat", "codetools", "digest", "registry", "stringr", "withr", "xtable"]
-    },
     "pkgndep": {
       "name": "pkgndep",
       "version": "1.99.3",
@@ -95229,8 +98601,8 @@
     },
     "pks": {
       "name": "pks",
-      "version": "0.6-0",
-      "sha256": "1wmpnpssmipkzfwsvdq33yhl9cba0i81w3rmwd4fbjvphx8bf7ax",
+      "version": "0.6-1",
+      "sha256": "1c0g160c8d2bqlhg5qwbdzfx5whnwin8hwywzyfzv14qk7dalb2p",
       "depends": ["sets"]
     },
     "pksensi": {
@@ -95277,15 +98649,15 @@
     },
     "planr": {
       "name": "planr",
-      "version": "0.4.1",
-      "sha256": "0qk8m235qja26g02rkg4sla6998mswqsy3hjwq39zdsmh88zy6bi",
+      "version": "0.4.2",
+      "sha256": "1dw4n4jmpqmrklpcxi2yfcbqbf81kbrqr6sw3fwrg2ppn3hiz9af",
       "depends": ["RcppRoll", "dplyr", "lubridate", "magrittr", "tidyr"]
     },
     "planscorer": {
       "name": "planscorer",
-      "version": "0.0.1",
-      "sha256": "0jyjbi36bn6biw6h99w6s8zx7wllx5argfhhx8lqq5wmh9vb8vl1",
-      "depends": ["cli", "curl", "dplyr", "fs", "httr2", "jsonlite", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "tidyr"]
+      "version": "0.0.2",
+      "sha256": "1dhhdzbkjchfkdg7ylda6hi7zsc0g9i5fc66mccg6a8vcf4nk3p6",
+      "depends": ["cli", "curl", "dplyr", "fs", "httr2", "jsonlite", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "tidyr", "webshot2"]
     },
     "plantTracker": {
       "name": "plantTracker",
@@ -95299,12 +98671,6 @@
       "sha256": "1qf9a38n8nvvz8dvqra9mdsmkbkhxymjrin0wfis8g1ndf1f406c",
       "depends": []
     },
-    "plantecowrap": {
-      "name": "plantecowrap",
-      "version": "1.0.4",
-      "sha256": "0syxf63xy5whzw03ys5cxyw7689mr7ihgmqddv53jb8rlbwm84p8",
-      "depends": ["ggplot2", "minpack_lm", "plantecophys", "tidyr"]
-    },
     "plantphysioR": {
       "name": "plantphysioR",
       "version": "1.0.0",
@@ -95331,8 +98697,8 @@
     },
     "plater": {
       "name": "plater",
-      "version": "1.0.4",
-      "sha256": "0k2ha44ydcf180y44cgxd1haq55k96df39lahs6fji04imh75fii",
+      "version": "1.0.5",
+      "sha256": "05bchpb667a9fakj8vzb62qylh22g9nkif33y4z9nfwc798p8k3l",
       "depends": ["dplyr", "rlang"]
     },
     "platetools": {
@@ -95349,8 +98715,8 @@
     },
     "plattice": {
       "name": "plattice",
-      "version": "1.0",
-      "sha256": "00kc0ymrdr0glxzix1hrwn2vxnkzvq6ji4hkd1fjp5p2fws9ymfq",
+      "version": "1.1",
+      "sha256": "0mn4z55cbnyhz7l978xc4sayk33c8yf44c891yqfznqj64fivgrf",
       "depends": ["ggplot2"]
     },
     "play": {
@@ -95415,9 +98781,9 @@
     },
     "pliman": {
       "name": "pliman",
-      "version": "2.1.0",
-      "sha256": "0pgv7ayb78k481yd071hjvympikhdw6q8wqb9d5fazp9avmjlfz7",
-      "depends": ["Rcpp", "RcppArmadillo", "doParallel", "foreach", "sf", "stars", "terra"]
+      "version": "3.0.0",
+      "sha256": "17bklypca08r4p1cczvmy6pf9awp1hc04vjyr8d06nyw23yr13b7",
+      "depends": ["Rcpp", "RcppArmadillo", "doFuture", "dplyr", "exactextractr", "foreach", "future", "purrr", "sf", "terra"]
     },
     "plink": {
       "name": "plink",
@@ -95443,10 +98809,16 @@
       "sha256": "0xpd6r75g2mc9dsf8ckafbd3pjyrvlyrh12izj9yaqfw4v0vr9fx",
       "depends": ["Formula", "MASS", "Rdpack", "bdsmatrix", "collapse", "lattice", "lmtest", "maxLik", "nlme", "sandwich", "zoo"]
     },
+    "plmmr": {
+      "name": "plmmr",
+      "version": "4.1.0",
+      "sha256": "1x3g170sx6nh68mvd3l66rzzaslsh3s6k3fy7vhs368d298nlvwr",
+      "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "bigalgebra", "biglasso", "bigmemory", "data_table", "glmnet", "ncvreg"]
+    },
     "pln": {
       "name": "pln",
-      "version": "0.2-2",
-      "sha256": "03jjmfr1dwz6p652y917g9rv2alyam9ws6xh9ig02d3w78b0rsv9",
+      "version": "0.2-3",
+      "sha256": "1fasqp3dgspj0my1b1p4w8csq4jdb7089690c4gf5clg20qq0mmg",
       "depends": []
     },
     "plnr": {
@@ -95589,14 +98961,14 @@
     },
     "plotmo": {
       "name": "plotmo",
-      "version": "3.6.3",
-      "sha256": "0ywv334n0f9x8iy0vxwcf0dkznd8wvwxw57vk0liyprjhn0ws5v9",
+      "version": "3.6.4",
+      "sha256": "0wl2xlidib4r54nm1q5zndr9iilagpyc3xlxs0cpd487hdh3zcn8",
       "depends": ["Formula", "plotrix"]
     },
     "plotor": {
       "name": "plotor",
-      "version": "0.4.1",
-      "sha256": "1cn1sa1m4afcszlxj5rq89i876d2pnmxinaiizc9hdzdmwciswjn",
+      "version": "0.5.1",
+      "sha256": "1wfhdmlc6042yvqnj3lv34swfnkr75ygsd48yg2mldxjm2b8ma09",
       "depends": ["broom", "dplyr", "ggplot2", "glue", "purrr", "scales", "tidyselect"]
     },
     "plotpc": {
@@ -95623,6 +98995,18 @@
       "sha256": "0h2g0rv1lh70nqmqydgg5swwnwmy08wbjajxyb1c2a716rad765j",
       "depends": []
     },
+    "plotscaper": {
+      "name": "plotscaper",
+      "version": "0.2.5",
+      "sha256": "1fv6vkfa54fqim543wx5k4z94561xn37cqmkinj3glq22lxp068a",
+      "depends": ["htmlwidgets", "httpuv", "jsonlite", "knitr", "uuid"]
+    },
+    "plotthis": {
+      "name": "plotthis",
+      "version": "0.4.0",
+      "sha256": "03gnpyanj5fs64zii47ss2k31l25hm1ps4dqkgxhi7dxciarz0f5",
+      "depends": ["circlize", "cowplot", "dplyr", "forcats", "ggnewscale", "ggplot2", "ggrepel", "glue", "gridtext", "gtable", "patchwork", "reshape2", "rlang", "scales", "stringr", "tidyr", "zoo"]
+    },
     "plotwidgets": {
       "name": "plotwidgets",
       "version": "0.5.1",
@@ -95631,14 +99015,14 @@
     },
     "plpoisson": {
       "name": "plpoisson",
-      "version": "0.3.0",
-      "sha256": "15g5z07m0rf4hm6nynrb3bmsiakg7j790lsy30ksxswxrzwb9a1k",
+      "version": "0.3.1",
+      "sha256": "0cyp8j6diafkadjav2bj64f01gr3c74p4psygna7kfzwx92mygv9",
       "depends": []
     },
     "pls": {
       "name": "pls",
-      "version": "2.8-4",
-      "sha256": "0qnmndljjnk9amsrmx402dhpc742pm3cskqjxhdq2m4pcdiinnvq",
+      "version": "2.8-5",
+      "sha256": "1krkl11b90w4hbdj168x4x9mvifwmx8ia265gr6gl8c99j6h2ac0",
       "depends": []
     },
     "plsRbeta": {
@@ -95751,8 +99135,8 @@
     },
     "plume": {
       "name": "plume",
-      "version": "0.2.4",
-      "sha256": "00czlz71wwj77kxppxrfvsgi23g71h5r4xbdsadqjr8jidcplhch",
+      "version": "0.2.5",
+      "sha256": "1zl3mbi6igv3wirg6zjil1l36vlja1h964v6kwh7ma97mfrdh1km",
       "depends": ["R6", "dplyr", "glue", "jsonlite", "knitr", "lifecycle", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "yaml"]
     },
     "plusCode2": {
@@ -95787,8 +99171,8 @@
     },
     "pmartR": {
       "name": "pmartR",
-      "version": "2.4.5",
-      "sha256": "07996a2xs3rwxaa8dw53pm07n2052lq223prqd4lbf8ijy3za765",
+      "version": "2.4.6",
+      "sha256": "0ay61ypvhc04r6j91h4jc5iqjxshk0dzcbqhxamrjdwmrs6yyzng",
       "depends": ["BH", "RColorBrewer", "Rcpp", "RcppArmadillo", "data_table", "doParallel", "dplyr", "e1071", "foreach", "ggplot2", "glmpca", "magrittr", "mvtnorm", "parallelly", "patchwork", "pcaMethods", "purrr", "rrcov", "stringr", "tidyr"]
     },
     "pmc": {
@@ -95823,9 +99207,9 @@
     },
     "pmev": {
       "name": "pmev",
-      "version": "0.0.2",
-      "sha256": "02qkajcmv46s1aapxmm59k7y8mcnjdcgvhirdzqmzj88li3sgm3f",
-      "depends": ["dplyr", "lubridate", "magrittr", "rlang", "zoo"]
+      "version": "0.1.2",
+      "sha256": "0pyzxp1i62y04yzv729mmn5iaz02gi3gg73h5yd35ksihd46vqfy",
+      "depends": ["dplyr", "ggplot2", "lubridate", "rlang", "scales", "vdiffr", "zoo"]
     },
     "pmhtutorial": {
       "name": "pmhtutorial",
@@ -95833,12 +99217,6 @@
       "sha256": "1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx",
       "depends": ["Quandl", "mvtnorm"]
     },
-    "pmlbr": {
-      "name": "pmlbr",
-      "version": "0.2.1",
-      "sha256": "06kac7h4skccs48ixyjnxxry38dci9cgkckfvkpzaqhzzlbvmn0g",
-      "depends": ["FNN"]
-    },
     "pmledecon": {
       "name": "pmledecon",
       "version": "0.2.1",
@@ -95901,8 +99279,8 @@
     },
     "pmxcode": {
       "name": "pmxcode",
-      "version": "0.1.3",
-      "sha256": "1zh8461zxdrp6xf7795ivgjhhjvnlyhkif8cqmijnjjylvami09g",
+      "version": "0.1.4",
+      "sha256": "1m183y1pfd7as9j3ph1in52fi1fi82f9y7fphbjh4r0ch3pl4dws",
       "depends": ["bsicons", "bslib", "config", "dplyr", "glue", "golem", "htmltools", "htmlwidgets", "jsonlite", "magrittr", "markdown", "pillar", "rclipboard", "readr", "rhandsontable", "rlang", "shiny", "shinyAce", "shinyBS", "shinyFiles", "tidyr", "xfun"]
     },
     "pmxcv": {
@@ -95947,6 +99325,12 @@
       "sha256": "1r8mvf8bw329n3ifi2dyy4220nbij2rgkvq1xlqzynxf8qadxbrl",
       "depends": ["dplyr", "fuzzyjoin", "magrittr", "progress", "purrr", "readr", "rlang", "stringi", "stringr", "tibble", "tidyr"]
     },
+    "poems": {
+      "name": "poems",
+      "version": "1.3.1",
+      "sha256": "0pfiv55ql9kjqgkc4dblc5l36626mxknga2gbh1xw5wwzpbiw7xm",
+      "depends": ["R6", "abc", "doParallel", "foreach", "fossil", "gdistance", "lhs", "metRology", "qs", "raster", "trend", "truncnorm"]
+    },
     "pogit": {
       "name": "pogit",
       "version": "1.3.0",
@@ -95955,14 +99339,14 @@
     },
     "poibin": {
       "name": "poibin",
-      "version": "1.5",
-      "sha256": "1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v",
+      "version": "1.6",
+      "sha256": "1y5wxpvp3nxn57lgnkmd92n2y5y5dh5mhk62kcv8dbly1gnpkl0a",
       "depends": []
     },
     "poilog": {
       "name": "poilog",
-      "version": "0.4.2",
-      "sha256": "0dk2c65b7aac2ak3ajgh3wa2jhqyfv1qp90flw8xcx3f5w5gyv7s",
+      "version": "0.4.2.1",
+      "sha256": "1m1zw8r98h863c3qr729vsl06lfdnfhcl1si3ik16jcz6g4wx77f",
       "depends": []
     },
     "pointRes": {
@@ -95973,8 +99357,8 @@
     },
     "pointblank": {
       "name": "pointblank",
-      "version": "0.12.1",
-      "sha256": "1wwb9ncji7450rbbmrh9mznl4pnpmxq8ibx785bz9dsswdglzfhq",
+      "version": "0.12.2",
+      "sha256": "0p02alcjbhxz5dzj7bs5ijdwyn2gl9fdhhzxs7jhck7rm3xlinf6",
       "depends": ["DBI", "base64enc", "blastula", "cli", "dbplyr", "digest", "dplyr", "fs", "glue", "gt", "htmltools", "knitr", "magrittr", "rlang", "scales", "testthat", "tibble", "tidyr", "tidyselect", "yaml"]
     },
     "pointdensityP": {
@@ -96019,6 +99403,12 @@
       "sha256": "02mnrrynlmcbcywmgm829kajlixwr91aj49d43pkfc3yxcnj815w",
       "depends": []
     },
+    "poissoned": {
+      "name": "poissoned",
+      "version": "0.1.3",
+      "sha256": "0v4yzl690ns7i4zh0a05qrj6ybzdfhfil7licrd0s71a3pa124kf",
+      "depends": []
+    },
     "poissonreg": {
       "name": "poissonreg",
       "version": "1.0.1",
@@ -96045,8 +99435,8 @@
     },
     "poldis": {
       "name": "poldis",
-      "version": "0.1.1",
-      "sha256": "02043wqc2ja12pybaid7c1a33s14q7dhj7mzca5z6i5ganqihrgr",
+      "version": "0.1.2",
+      "sha256": "0si3lvxajp4jlgwh1paksd48yqk3qknh8k5p4zas61056ckdyj8q",
       "depends": ["dplyr", "purrr", "quanteda", "spacyr", "stringdist", "stringi", "stringr", "textstem", "tidyr"]
     },
     "policytree": {
@@ -96093,8 +99483,8 @@
     },
     "polle": {
       "name": "polle",
-      "version": "1.4",
-      "sha256": "11n2g4gbwvcgw49pfr7qgbfidfwliqkag3n6wxcinl44b2l6jjfi",
+      "version": "1.5",
+      "sha256": "1adzq67nqgdfi0n1fjag19pl529qwj0w70wrs182m4zp5a5k2zvl",
       "depends": ["DynTxRegime", "SuperLearner", "data_table", "future_apply", "lava", "policytree", "progressr", "survival", "targeted"]
     },
     "pollen": {
@@ -96165,8 +99555,8 @@
     },
     "polyapost": {
       "name": "polyapost",
-      "version": "1.7",
-      "sha256": "1inq3b8qq17w5zx2lrkrxjzb7drfajsp4qgy0194971m6x2j4cfx",
+      "version": "1.7-1",
+      "sha256": "1q1ack0wpn21d8p4wfm0xyinw0lc0506x3zxyiqdwppgq9491r8n",
       "depends": ["boot", "rcdd"]
     },
     "polyclip": {
@@ -96183,8 +99573,8 @@
     },
     "polyglotr": {
       "name": "polyglotr",
-      "version": "1.5.1",
-      "sha256": "00h9v05sv6bqyp2wqa6dvxix9psa2i6csx4yig74i8iycl9issfb",
+      "version": "1.5.2",
+      "sha256": "1l6dpbsslc1lynm39nx5x9kxb6zh54klfnrqb0i8lybavd14i24k",
       "depends": ["RCurl", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "rlang", "rvest", "stringr", "tibble", "urltools"]
     },
     "polyhedralCubature": {
@@ -96195,8 +99585,8 @@
     },
     "polylabelr": {
       "name": "polylabelr",
-      "version": "0.2.0",
-      "sha256": "01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2",
+      "version": "0.3.0",
+      "sha256": "1wxr2mhbsq7sm3byb4jn6dskmlxxjywhj453qhs0z40aaiphd49c",
       "depends": ["Rcpp"]
     },
     "polymapR": {
@@ -96255,8 +99645,8 @@
     },
     "pomdp": {
       "name": "pomdp",
-      "version": "1.2.3",
-      "sha256": "1l873a4p0fzfmgz52v57i2ccmpsrv10lvbrm7mr39qwqsaklh3bv",
+      "version": "1.2.4",
+      "sha256": "0r9sh9954nl38nk465h8dgs4yd40s0xr6q1q5smlbgzc9rcrv228",
       "depends": ["Matrix", "Rcpp", "foreach", "igraph", "pomdpSolve", "processx"]
     },
     "pomdpSolve": {
@@ -96273,8 +99663,8 @@
     },
     "pomp": {
       "name": "pomp",
-      "version": "5.10",
-      "sha256": "0pz12apfh600nnbdcrm3p9xr47p3qlc9bp80ahkvixb17vkr9z30",
+      "version": "5.11",
+      "sha256": "059j6g2ckyr0818llabwr05p1hfjwr9pb7bwyd9qgc6mdkdc0p50",
       "depends": ["coda", "data_table", "deSolve", "digest", "mvtnorm"]
     },
     "pompom": {
@@ -96297,8 +99687,8 @@
     },
     "pool": {
       "name": "pool",
-      "version": "1.0.3",
-      "sha256": "1v0w396cszpyi6p59bmvbbpzb8gk0qj0s5hq42jj9rf351lzjqf4",
+      "version": "1.0.4",
+      "sha256": "0xynrvcybsfa0chfw2ljld5dmikas22azhgcrji44sm7k3x90hqc",
       "depends": ["DBI", "R6", "later", "rlang"]
     },
     "poolABC": {
@@ -96319,11 +99709,17 @@
       "sha256": "19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6",
       "depends": ["EmpiricalBrownsMethod", "Hmisc", "ranger"]
     },
+    "pooledpeaks": {
+      "name": "pooledpeaks",
+      "version": "1.0.7",
+      "sha256": "10nk65iyar9skh0dfz5mzh3alrmg55ysiyzbvxbc1jxvxj5msgfh",
+      "depends": ["Fragman", "ape", "dplyr", "magrittr", "pdftools", "qpdf", "rlang", "tibble", "tidyr"]
+    },
     "poolfstat": {
       "name": "poolfstat",
-      "version": "2.2.0",
-      "sha256": "17wama4lxl7q2i9j2v15kn33i2lszrsyim9qj8dihhx9r6p9vdls",
-      "depends": ["DiagrammeR", "Matrix", "Rcpp", "RcppProgress", "Ryacas", "ape", "data_table", "doParallel", "foreach", "nnls", "progress", "zoo"]
+      "version": "3.0.0",
+      "sha256": "1p70b4mbzgwazgqk33s7xa1cic1fl23rzg2m8p6cqg1sgiwbd719",
+      "depends": ["DiagrammeR", "Matrix", "Rcpp", "RcppProgress", "Ryacas", "ape", "data_table", "doParallel", "foreach", "nnls", "progress"]
     },
     "pooling": {
       "name": "pooling",
@@ -96453,8 +99849,8 @@
     },
     "poputils": {
       "name": "poputils",
-      "version": "0.3.1",
-      "sha256": "1bd9zb1kmzw1xfrslnp89iw2ilgxy5vv6r918dss76lwab9qja5c",
+      "version": "0.3.3",
+      "sha256": "01g7zca29pfizi3gjk4jpbjrx36dbnp3qgcmfwrcp3mzz4bs0znn",
       "depends": ["cli", "cpp11", "rlang", "rvec", "tibble", "tidyselect", "vctrs"]
     },
     "porridge": {
@@ -96471,9 +99867,9 @@
     },
     "portalr": {
       "name": "portalr",
-      "version": "0.4.1",
-      "sha256": "1i241nn694nyyljldpsah1555spbhksassf7i18pmqigzpk01qix",
-      "depends": ["clipr", "clisymbols", "crayon", "dplyr", "forecast", "httr", "lubridate", "lunar", "magrittr", "rlang", "tidyr", "tidyselect", "zoo"]
+      "version": "0.4.3",
+      "sha256": "1n6p1ighh5m209snfsy7fr71mz7bg9lyg4lnscaczaq9x91sjk9d",
+      "depends": ["cli", "clipr", "dplyr", "forecast", "httr", "lubridate", "lunar", "magrittr", "rlang", "tidyr", "tidyselect", "zoo"]
     },
     "portes": {
       "name": "portes",
@@ -96483,8 +99879,8 @@
     },
     "portfolio": {
       "name": "portfolio",
-      "version": "0.5-2",
-      "sha256": "13w8gyaphg0qspjl6d0jh0jf3wvz4agy8vzkriba0k59qhdbi52f",
+      "version": "0.5-3",
+      "sha256": "12nbv64gwycshcrsiilfvsw9f6p24c8vdr2jbv9a5xx4c5r7xpaa",
       "depends": ["lattice", "nlme"]
     },
     "portfolio_optimization": {
@@ -96531,8 +99927,8 @@
     },
     "posologyr": {
       "name": "posologyr",
-      "version": "1.2.4",
-      "sha256": "1m05cs72npvsz1pj44q1sn80gwd2fzlb3mira3wdqqy91f02qd00",
+      "version": "1.2.7",
+      "sha256": "0cwqcsbp5mafimrvwmha78nqggssm3dm9n50cqkc5rfjcyxi953g",
       "depends": ["data_table", "mvtnorm", "rxode2"]
     },
     "postGGIR": {
@@ -96555,8 +99951,8 @@
     },
     "postdoc": {
       "name": "postdoc",
-      "version": "1.2.2",
-      "sha256": "1d9d82z72jh2g777pzxfnav7nq14c4q93jiwcsp3plvgfkj0sfl8",
+      "version": "1.4.0",
+      "sha256": "0169wgld7snnfm447nw3hsjxy8sw9vkvlh6cmvdz30wpb869c8xm",
       "depends": ["curl", "jsonlite", "katex", "prismjs", "xml2"]
     },
     "posterdown": {
@@ -96601,6 +99997,12 @@
       "sha256": "1zq82jlqxmz1cjg0wi1r7cqxq32f3dk6gzx11fnf5mfy44613vl2",
       "depends": ["doParallel", "foreach", "mapiso", "sf"]
     },
+    "poth": {
+      "name": "poth",
+      "version": "0.2-0",
+      "sha256": "0jm9sgd9w8d0c0zlabd57amg70yy6xsal2hzdl13v02ib5nd1iy2",
+      "depends": ["ggplot2", "netmeta", "stringr"]
+    },
     "potions": {
       "name": "potions",
       "version": "0.2.0",
@@ -96639,9 +100041,9 @@
     },
     "powRICLPM": {
       "name": "powRICLPM",
-      "version": "0.1.1",
-      "sha256": "01mccy1s0sl3haz4q26vv1dfrgzdrkds8b1c38iv6zy5am68s9iy",
-      "depends": ["dplyr", "furrr", "future", "ggplot2", "lavaan", "progressr", "purrr", "rlang"]
+      "version": "0.2.1",
+      "sha256": "0apnaszi8whj5sad9jmwc52jsgcav9zx8af7r7mxh2czkcwaavs0",
+      "depends": ["cli", "future", "future_apply", "ggplot2", "lavaan", "lifecycle", "progressr", "rlang"]
     },
     "powdR": {
       "name": "powdR",
@@ -96667,6 +100069,12 @@
       "sha256": "1jvj2x22h6px1rcxmpz9h3x8r4486sb8zl3hjrsdxqa73ypmcdbi",
       "depends": ["pracma"]
     },
+    "power_transform": {
+      "name": "power.transform",
+      "version": "1.0.0",
+      "sha256": "0jfpza0bvjgn4zh5shzi6lhcqv0z9dz0qlsad9kdvankjn1l24kr",
+      "depends": ["data_table", "nloptr", "rlang"]
+    },
     "powerCompRisk": {
       "name": "powerCompRisk",
       "version": "1.0.1",
@@ -96699,15 +100107,15 @@
     },
     "powerNLSEM": {
       "name": "powerNLSEM",
-      "version": "0.1.1",
-      "sha256": "08l8yfry95zdfdi809vyymv71gal54jb8jlyxkpa08iwj7zyybc4",
+      "version": "0.1.2",
+      "sha256": "1iy5jkrn5lr8h64rv33jyv5qdn4jymwv80xp0ii3hirscv3pssbd",
       "depends": ["crayon", "ggplot2", "lavaan", "mvtnorm", "numDeriv", "pbapply", "rlang", "stringr"]
     },
     "powerPLS": {
       "name": "powerPLS",
-      "version": "0.1.0",
-      "sha256": "03y06wnd8i3lkw5fakihgrb9karjfw496vfygqgl8b6fxb2nz2yw",
-      "depends": ["MASS", "compositions", "foreach", "ks", "mvtnorm", "nipals", "simukde"]
+      "version": "0.2.0",
+      "sha256": "1g36snvgm38g0x22b1ldryx331zir2yw5p2pvmk8i38n0fy6hqlc",
+      "depends": ["FKSUM", "MASS", "compositions", "foreach", "ks", "mvtnorm", "nipals", "simukde"]
     },
     "powerSurvEpi": {
       "name": "powerSurvEpi",
@@ -96751,10 +100159,16 @@
       "sha256": "18cq3zsdvzmqjp0niq0libjk4riarmiar3h6lifq54spqgrvvxh2",
       "depends": []
     },
+    "powertools": {
+      "name": "powertools",
+      "version": "0.1.2",
+      "sha256": "06sdbd7m4q470xrn91npml2yzcab0nch26lg4s69bd7xrjdch2jw",
+      "depends": ["Hmisc", "PowerTOST", "knitr", "mvtnorm"]
+    },
     "ppRank": {
       "name": "ppRank",
-      "version": "0.1.0",
-      "sha256": "1843cnrdiwns14471dnjq8i5wxkp3p1sj4rw74zzy9w3ydcc3v1z",
+      "version": "0.1.1",
+      "sha256": "0qjdxzacg9c118w8fq8sjvkfxyahhbdqfd3ab7qdlfrxkilzc29b",
       "depends": []
     },
     "ppRep": {
@@ -96847,6 +100261,12 @@
       "sha256": "082f5ij43iyfw1i864va4cdklfnv5zs4i21f1kcai2dlcqs5kc0v",
       "depends": ["data_table", "lattice", "plyr", "spatstat", "spatstat_explore", "spatstat_geom", "spatstat_model"]
     },
+    "pprof": {
+      "name": "pprof",
+      "version": "1.0.1",
+      "sha256": "1i5vf2815gli269jj5y2b181mjv1spr7q5ybnk876nvry4g807lr",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppParallel", "caret", "dplyr", "ggplot2", "lme4", "magrittr", "olsrr", "pROC", "poibin", "rlang", "scales", "tibble"]
+    },
     "pps": {
       "name": "pps",
       "version": "1.0",
@@ -96861,8 +100281,8 @@
     },
     "ppseq": {
       "name": "ppseq",
-      "version": "0.2.4",
-      "sha256": "1yf0pyfkb2knjn2gf36jhy0qpxwzil37s3zhp3a97cq80jza47hd",
+      "version": "0.2.5",
+      "sha256": "1bprhx8cqn8bsr5ypg2i9mp9pwhk679axvw68f0398ql6yc6bk3h",
       "depends": ["dplyr", "furrr", "ggplot2", "patchwork", "plotly", "purrr", "tibble", "tidyr"]
     },
     "ppsr": {
@@ -96885,8 +100305,8 @@
     },
     "pqrBayes": {
       "name": "pqrBayes",
-      "version": "1.0.2",
-      "sha256": "0mbhkha99qyk5hkpk13ysb0686lcn6q9vq34838fz1l7xy47mzw3",
+      "version": "1.0.3",
+      "sha256": "1pkdhs73xjg7qgcvj24yqwkxibg55c9kdjskm6v44nnks11shinl",
       "depends": ["Rcpp", "RcppArmadillo", "glmnet"]
     },
     "pqrfe": {
@@ -96903,14 +100323,14 @@
     },
     "praatpicture": {
       "name": "praatpicture",
-      "version": "1.2.0",
-      "sha256": "1gbarx2s59k1nz78g3g3l4mj586v75pyw16h33kwrfhhpfd3sxd7",
+      "version": "1.3.0",
+      "sha256": "1w7gzkkdjy2m5p82b9q7vksdakycay33kc7w3jvvp633b7pa0grp",
       "depends": ["av", "bslib", "crayon", "emuR", "gifski", "gsignal", "ipa", "phonTools", "rPraat", "rstudioapi", "shiny", "shinyjs", "soundgen", "tuneR", "wrassp"]
     },
     "prabclus": {
       "name": "prabclus",
-      "version": "2.3-3",
-      "sha256": "1haq8dvvi21fdnzl7ykm28sif5nv9pybir96vrqfcmy3k8500p80",
+      "version": "2.3-4",
+      "sha256": "0wmcw0iz0a4q0x83v36ldv8b67czcpw3g18v68i3v9284rbj6xnd",
       "depends": ["MASS", "mclust"]
     },
     "pracma": {
@@ -96933,9 +100353,9 @@
     },
     "prais": {
       "name": "prais",
-      "version": "1.1.2",
-      "sha256": "16h3771lr6vn0g92bfpdq7r3wpdkspbhmrl5948p4isc5qxy2cgx",
-      "depends": ["lmtest", "pcse", "sandwich"]
+      "version": "1.1.3",
+      "sha256": "0mwg87z2rki1g50464h9q25i28zm0glhyzaar5xvls9xvqx96dvm",
+      "depends": ["pcse", "sandwich"]
     },
     "praise": {
       "name": "praise",
@@ -96993,9 +100413,9 @@
     },
     "precmed": {
       "name": "precmed",
-      "version": "1.0.0",
-      "sha256": "1hkdm1fqq9fswfii9ac016xfnbggdvxcvazi5l8ir0vna9jfkcwb",
-      "depends": ["MASS", "MESS", "dplyr", "gam", "gbm", "ggplot2", "glmnet", "mgcv", "randomForestSRC", "rlang", "stringr", "survival", "tidyr"]
+      "version": "1.1.0",
+      "sha256": "0clla6wpkclmx2v3mwzcwz95jm7i2802pc6v001g5gjgqzvzyp9q",
+      "depends": ["MASS", "dplyr", "gam", "gbm", "ggplot2", "glmnet", "mgcv", "randomForestSRC", "rlang", "stringr", "survival", "tidyr"]
     },
     "precommit": {
       "name": "precommit",
@@ -97023,8 +100443,8 @@
     },
     "predRupdate": {
       "name": "predRupdate",
-      "version": "0.1.1",
-      "sha256": "087jkaw27lssh7400gjbjd9d583aiz7fm6a70cjhxwf5f8s8qpp8",
+      "version": "0.2.0",
+      "sha256": "0wy5yrzsp36gyb6za4965xnk1pkii895a510zkghybarxnsxcb1h",
       "depends": ["ggplot2", "ggpubr", "pROC", "rlang", "survival"]
     },
     "predfairness": {
@@ -97077,15 +100497,15 @@
     },
     "predictmeans": {
       "name": "predictmeans",
-      "version": "1.1.0",
-      "sha256": "1010s79c55vndv3v4my0xrmdxvgpy7vhp46j1anxvr3xzgx1279q",
-      "depends": ["HRW", "MASS", "Matrix", "car", "ggplot2", "glmmTMB", "lme4", "lmeInfo", "lmeSplines", "lmerTest", "nlme", "numDeriv", "pbkrtest", "plotly", "plyr", "splines2"]
+      "version": "1.1.1",
+      "sha256": "0kizp3d4xq576b97m3x8jgfnxfhgr8ldgiv72ykf4ns07743nzix",
+      "depends": ["HRW", "MASS", "Matrix", "car", "ggplot2", "glmmTMB", "lme4", "lmeInfo", "lmeSplines", "lmerTest", "nlme", "numDeriv", "pbkrtest", "plotly", "plyr", "reformulas", "splines2"]
     },
     "predictoR": {
       "name": "predictoR",
-      "version": "3.0.10",
-      "sha256": "0lj13rn9dpx0rqxb03abisa06ihphmrq5shpv6q2p0qb857pgmkf",
-      "depends": ["DT", "colourpicker", "config", "dplyr", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR", "xgboost", "xtable"]
+      "version": "4.1.1",
+      "sha256": "1x7sg15pwsgb5x0my8farhav0gmm8p7sz5d926wv6las7h85asxf",
+      "depends": ["DT", "colourpicker", "config", "dplyr", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR", "xgboost"]
     },
     "predictrace": {
       "name": "predictrace",
@@ -97095,8 +100515,8 @@
     },
     "predicts": {
       "name": "predicts",
-      "version": "0.1-11",
-      "sha256": "1jvaayy7qwi2l8q8m8r42b6rj3945z9vrpgdds6dz8qz35clrpir",
+      "version": "0.1-17",
+      "sha256": "1r7gdfsy2d0wl5sq1cxvvg4xnm4d7pqhdbwb2cznilij6mghy3w8",
       "depends": ["terra"]
     },
     "predieval": {
@@ -97141,12 +100561,6 @@
       "sha256": "0n9ns715f274bcr3mbh7yjyvx3ajz949f7yyyq38f54cs2anwwrd",
       "depends": ["entropy", "mcmc"]
     },
-    "preferably": {
-      "name": "preferably",
-      "version": "0.4.1",
-      "sha256": "11xvh0a8m2lpmrrrrn95axqgz9rdipn63zd7c505a8spzwf6dvm5",
-      "depends": ["knitr", "pkgdown"]
-    },
     "preference": {
       "name": "preference",
       "version": "1.1.6",
@@ -97359,10 +100773,16 @@
     },
     "prim": {
       "name": "prim",
-      "version": "1.0.21",
-      "sha256": "085dwmflag45qg0p4w2f9v000zj2kfaijp6jm11dj85swxmx7vjm",
+      "version": "1.0.22",
+      "sha256": "1gan4y5mkqvhvcpqdzw6wgvq32w9yq7fs3cxnmrjzyrz5dyyizc8",
       "depends": ["plot3D", "scales"]
     },
+    "primarycensored": {
+      "name": "primarycensored",
+      "version": "1.0.0",
+      "sha256": "133hk9z7m5zarky18arjdm6b6himjb54x3d41yddcj4kxkl4iz7a",
+      "depends": ["pracma"]
+    },
     "primate": {
       "name": "primate",
       "version": "0.2.0",
@@ -97423,6 +100843,18 @@
       "sha256": "0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l",
       "depends": ["AnnotationDbi", "org_Hs_eg_db"]
     },
+    "prior3D": {
+      "name": "prior3D",
+      "version": "0.1.3",
+      "sha256": "0x0wnxvjqc6b7ig9i1g8xgq2gzdjj2365myzka8aggq5knx9jxy5",
+      "depends": ["geodiv", "highs", "maps", "prioritizr", "rasterdiv", "readxl", "terra", "viridis"]
+    },
+    "priorCON": {
+      "name": "priorCON",
+      "version": "0.1.3",
+      "sha256": "11ibhwz655q2xwma9d8010d6rkrirg0f3hy1sc45gj5k0bjk55if",
+      "depends": ["brainGraph", "highs", "igraph", "prioritizr", "sf", "terra", "tmap"]
+    },
     "prioriactions": {
       "name": "prioriactions",
       "version": "0.5.0",
@@ -97449,8 +100881,8 @@
     },
     "priorsense": {
       "name": "priorsense",
-      "version": "1.0.2",
-      "sha256": "1gilv3w1nn7ika226p78lj4fba7icp5xc8wgf1vg3fg8m2jjq356",
+      "version": "1.0.4",
+      "sha256": "0a3jpacd1560jb26rhm0yq2swdhwh8l2h069y0r5fgj6bv7ydigp",
       "depends": ["checkmate", "ggdist", "ggh4x", "ggplot2", "matrixStats", "posterior", "rlang", "tibble"]
     },
     "prism": {
@@ -97473,8 +100905,8 @@
     },
     "prismjs": {
       "name": "prismjs",
-      "version": "2.0.0",
-      "sha256": "032m8brgsvgdry8y1hsigl8pnckh13d23ylsj4hsga6dbyvkj7lf",
+      "version": "2.0.1",
+      "sha256": "0m655x662r29c5s5yzb6p268lp60rp5y3lxkiar5mrrg96j6g44i",
       "depends": ["V8", "xml2"]
     },
     "prisonbrief": {
@@ -97491,9 +100923,9 @@
     },
     "prnsamplr": {
       "name": "prnsamplr",
-      "version": "0.3.0",
-      "sha256": "1qhrk6am6irp5m0gh61vv6612738p0kwjcvgdnza50731rias8v7",
-      "depends": []
+      "version": "1.0.0",
+      "sha256": "0m6j0wr66kwx51q89352hidvdjzq2vp3ans5vf1dzxrjs6ghm2qm",
+      "depends": ["rlang"]
     },
     "pro": {
       "name": "pro",
@@ -97533,8 +100965,8 @@
     },
     "probstats4econ": {
       "name": "probstats4econ",
-      "version": "0.2.0",
-      "sha256": "1xjf4i5jw0qf87zmizkwbb9i0fd0gji40kwvm9nz5gxyns98fqmk",
+      "version": "0.3.1",
+      "sha256": "1by0g4jvilxygfhgz9mzkxz6jlvjy0dsik7faa2b4awfckhb15nh",
       "depends": []
     },
     "proccalibrad": {
@@ -97563,8 +100995,8 @@
     },
     "processmapR": {
       "name": "processmapR",
-      "version": "0.5.4",
-      "sha256": "0jb69si8npmw92nfsd35wfzrj8jwfflaajsd6xxvyp1bhfvjsvn6",
+      "version": "0.5.6",
+      "sha256": "0152v160gh1m0805a9gbk21k71l1mqvddha7zlk4ydqqf9gm0qbw",
       "depends": ["BH", "DiagrammeR", "Rcpp", "bupaR", "cli", "data_table", "dplyr", "edeaR", "forcats", "ggplot2", "glue", "hms", "htmltools", "htmlwidgets", "lifecycle", "miniUI", "plotly", "purrr", "rlang", "scales", "shiny", "stringr", "tidyr"]
     },
     "processmonitR": {
@@ -97611,9 +101043,9 @@
     },
     "prodigenr": {
       "name": "prodigenr",
-      "version": "0.6.2",
-      "sha256": "07r6xiqany2qzarfqphs90pcwx7zbki0z7mp329l7szfz01wxiqr",
-      "depends": ["cli", "fs", "rlang", "rmarkdown", "rprojroot", "whisker", "withr"]
+      "version": "0.7.0",
+      "sha256": "1ypnzgkalm7xz8zvhqyxxh4va7fbra48v39pqi1xwj3k5nx2qbds",
+      "depends": ["cli", "fs", "gert", "rlang", "rprojroot", "whisker", "withr"]
     },
     "prodlim": {
       "name": "prodlim",
@@ -97641,9 +101073,9 @@
     },
     "proffer": {
       "name": "proffer",
-      "version": "0.1.6",
-      "sha256": "0y94rwhg3gr63avmmwvfv84cgg08fya6vc7q535xjv1wspiyvjnl",
-      "depends": ["RProtoBuf", "cli", "parallelly", "pingr", "processx", "profile", "withr"]
+      "version": "0.2.2",
+      "sha256": "16pih26cyali8ljw7z5qhwxjpfs079khbvkjqz2vd99g036799v0",
+      "depends": ["RProtoBuf", "R_utils", "cli", "parallelly", "pingr", "processx", "profile", "withr"]
     },
     "profile": {
       "name": "profile",
@@ -97677,8 +101109,8 @@
     },
     "profoc": {
       "name": "profoc",
-      "version": "1.3.2",
-      "sha256": "1vs5l6f18maga6v27wschxzsbr5i4wqwsd64mz4z666rf92d7l60",
+      "version": "1.3.3",
+      "sha256": "0iknp4mjz3q2nzfy3ysnhxwrf3qbylzggl5jp6azc488gln2wfhq",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "abind", "generics", "ggplot2", "lifecycle", "rcpptimer", "splines2", "tibble"]
     },
     "profr": {
@@ -97701,9 +101133,9 @@
     },
     "profvis": {
       "name": "profvis",
-      "version": "0.3.8",
-      "sha256": "1cmlcp91q8v0550iay9vsw5wllb6w2ldy6k99rb76ylhr5dwf0pc",
-      "depends": ["htmlwidgets", "purrr", "rlang", "stringr", "vctrs"]
+      "version": "0.4.0",
+      "sha256": "1x2cpykcmq5a30c0mf22h2pnnanqij0yqjv3q33xzx11c07fpzfj",
+      "depends": ["htmlwidgets", "rlang", "vctrs"]
     },
     "progenyClust": {
       "name": "progenyClust",
@@ -97719,8 +101151,8 @@
     },
     "progressr": {
       "name": "progressr",
-      "version": "0.14.0",
-      "sha256": "1bsqcarh38z86klcm5iaqmf6akgy5gaii7797c27ymx5g7w9ja4s",
+      "version": "0.15.1",
+      "sha256": "09m4a21rwkm2g0z6m9di8vmammzzs391cn5ya00whps011wggn9h",
       "depends": ["digest"]
     },
     "proj4": {
@@ -97731,8 +101163,8 @@
     },
     "projections": {
       "name": "projections",
-      "version": "0.6.0",
-      "sha256": "0wpqklw5aif9vgcp6hyc7j5k8ifxwx5bhhd50llwgrh5xiy9yxyq",
+      "version": "0.6.1",
+      "sha256": "0giqd30gzlxgy93r033ds5cf51p3cbvhkhpkr8pdzglv11xffwjp",
       "depends": ["ggplot2", "incidence"]
     },
     "projects": {
@@ -97779,8 +101211,8 @@
     },
     "promises": {
       "name": "promises",
-      "version": "1.3.0",
-      "sha256": "1lzs65csxaq26d1g37qjjgxzm418xv52c3ccpk0l0cxkpbrrs87q",
+      "version": "1.3.2",
+      "sha256": "1gal4rgnrb4k8ws8zbwyrzsmjslrpnw77max7x6ifwsdnmzb1mcl",
       "depends": ["R6", "Rcpp", "fastmap", "later", "magrittr", "rlang"]
     },
     "promor": {
@@ -97813,6 +101245,12 @@
       "sha256": "18bbgcirw6z1vwna4bad4f4s4wnfq62bf9mzkakzlrn59kq9rxgc",
       "depends": ["shiny"]
     },
+    "promptr": {
+      "name": "promptr",
+      "version": "1.0.0",
+      "sha256": "17yi549a2xx9dmsaqwckbyagjgymjrc1d8nzffmr24pk9sh2z3fj",
+      "depends": ["curl", "dplyr", "glue", "httr2", "jsonlite", "stringr"]
+    },
     "promr": {
       "name": "promr",
       "version": "0.1.3",
@@ -97887,8 +101325,8 @@
     },
     "proteomicsCV": {
       "name": "proteomicsCV",
-      "version": "0.3.0",
-      "sha256": "0gvjl47x1wca2y386if2fgzp8k7a1xn9qxlq82ml66n193bp4k6a",
+      "version": "0.4.0",
+      "sha256": "1gn06x5apjhjq9n1vflr2mil26dp8w9axl90mkc9w7vwwpvf46hw",
       "depends": []
     },
     "proteus": {
@@ -97911,8 +101349,8 @@
     },
     "protolite": {
       "name": "protolite",
-      "version": "2.3.0",
-      "sha256": "1sccyyf89bban3b83yxzkcyqpgcp7ggm9lirxixzjj433baj9vsk",
+      "version": "2.3.1",
+      "sha256": "1k4p2sraxirjq746rx80pbnwjiafyr8r63j29ybky64x7zb6zm7f",
       "depends": ["Rcpp", "jsonlite"]
     },
     "proton": {
@@ -97935,14 +101373,14 @@
     },
     "protr": {
       "name": "protr",
-      "version": "1.7-2",
-      "sha256": "0qkp9h6kndr5vkgqckzhhy7dsidbynpns3bap3r3gy2p1wzwmhx5",
+      "version": "1.7-4",
+      "sha256": "0r7ccnj34m26r91pgcvwpvdm0n7k6yd4cbkl8d5zdvghgj7md4ld",
       "depends": []
     },
     "protti": {
       "name": "protti",
-      "version": "0.9.0",
-      "sha256": "1lnlikkgw0cvyw6sh49fzzwin31vya3dgq6zyash51vf6i3nc992",
+      "version": "0.9.1",
+      "sha256": "15ww485y1dn7cx7w3ffjpvmd3xfwzw0qi1jlls95rb62p06bnc95",
       "depends": ["R_utils", "curl", "data_table", "dplyr", "forcats", "ggplot2", "ggrepel", "httr", "janitor", "lifecycle", "magrittr", "plotly", "progress", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "proustr": {
@@ -98031,8 +101469,8 @@
     },
     "prqlr": {
       "name": "prqlr",
-      "version": "0.8.1",
-      "sha256": "00i9y7yb0czhr7853v9syrcjr74v6x1a022nawjmryl831f4bl9g",
+      "version": "0.9.0",
+      "sha256": "05k2wj5dyqrbscc3dg1400i5zg0fvx1hgxq9djm9wiskmha2scj5",
       "depends": []
     },
     "prrd": {
@@ -98055,8 +101493,8 @@
     },
     "ps": {
       "name": "ps",
-      "version": "1.7.7",
-      "sha256": "1wi27l0a3z7wkrgn97jj5yqx6khy3brycj0y8nhlxagsp2rdrzj6",
+      "version": "1.8.1",
+      "sha256": "1087m3a76vldiamj81qqzqk0n23jjw2c42bsyc91sfhpa1zkp832",
       "depends": []
     },
     "psBayesborrow": {
@@ -98101,6 +101539,12 @@
       "sha256": "05mcfbgkdlx6yfiysvh3yk75c8rdcci7ql89n76vlm9h17ff5fm1",
       "depends": ["Matrix", "checkmate", "future", "generics", "glue", "mvtnorm", "posterior", "simsurv"]
     },
+    "psc": {
+      "name": "psc",
+      "version": "1.1.0",
+      "sha256": "1pb1jbdkh4vpvggvhmc7slvxy0fbfz4mm1il0rh0qbk85xakg0d3",
+      "depends": ["enrichwith", "flexsurv", "ggplot2", "mvtnorm", "survival", "survminer"]
+    },
     "pscl": {
       "name": "pscl",
       "version": "1.5.9",
@@ -98131,6 +101575,12 @@
       "sha256": "0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs",
       "depends": ["KMsurv", "geepack"]
     },
+    "pseudobibeR": {
+      "name": "pseudobibeR",
+      "version": "1.2",
+      "sha256": "1a6n9a46n8k3ycxlqhlxi26m2yqjc97yxhz2m9vdyzfi0881x44c",
+      "depends": ["dplyr", "magrittr", "purrr", "quanteda", "quanteda_textstats", "rlang", "stringr", "tibble"]
+    },
     "pseudohouseholds": {
       "name": "pseudohouseholds",
       "version": "0.1.1",
@@ -98163,8 +101613,8 @@
     },
     "psidR": {
       "name": "psidR",
-      "version": "2.2",
-      "sha256": "0vfvx5aidd7g3s02hajnlfr8c0czzzbsrkgzfw5zx1lm4rxw8z26",
+      "version": "2.3",
+      "sha256": "0vljs69q51qw1dbvybrwjyh507q35qy3pg25lrzl1ajl51xmbq6l",
       "depends": ["RCurl", "SAScii", "data_table", "foreign", "futile_logger", "openxlsx"]
     },
     "psidread": {
@@ -98217,14 +101667,14 @@
     },
     "pspline": {
       "name": "pspline",
-      "version": "1.0-20",
-      "sha256": "12pbjdxvb92qwzxrdag3cgaa12v9psy5whvw8p7i0p8dhydwv9za",
+      "version": "1.0-21",
+      "sha256": "1jmb710jcrdmv8lhgb3xixrglamfhigjn59xsdndm39prywkjmvz",
       "depends": []
     },
     "psqn": {
       "name": "psqn",
-      "version": "0.3.1",
-      "sha256": "05nzyapilhzwjgc3lizg424i28mshmwirpggg79hssjqmqraflpj",
+      "version": "0.3.2",
+      "sha256": "0zy5h7v9fh07kjqjk5vc1d4354xk56227gkvq9jn8cy8igdb6lyg",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "testthat"]
     },
     "pssmooth": {
@@ -98239,6 +101689,18 @@
       "sha256": "1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z",
       "depends": ["MASS", "glmx"]
     },
+    "psvd": {
+      "name": "psvd",
+      "version": "0.1-0",
+      "sha256": "1j6qlmzpqdjh2vzmn8xyry739rpnfpb57y3gpgv1lg93wcinchhq",
+      "depends": []
+    },
+    "psvmSDR": {
+      "name": "psvmSDR",
+      "version": "1.0.2",
+      "sha256": "1mlxrlq3h3q6230xkb15cn7pyccvi7flbkm8q7dsp812dadsf449",
+      "depends": []
+    },
     "psy": {
       "name": "psy",
       "version": "1.2",
@@ -98259,8 +101721,8 @@
     },
     "psych": {
       "name": "psych",
-      "version": "2.4.6.26",
-      "sha256": "1gnjpcpqlviyyj5myhy440fj1zwx14b9jwhp5907yyhhw2ail69d",
+      "version": "2.4.12",
+      "sha256": "1yz095dywaavc4j5lf653v2qkvs138dzw689k2f8rywbvpl1i7rq",
       "depends": ["GPArotation", "lattice", "mnormt", "nlme"]
     },
     "psychReport": {
@@ -98295,8 +101757,8 @@
     },
     "psychomix": {
       "name": "psychomix",
-      "version": "1.1-8",
-      "sha256": "0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw",
+      "version": "1.1-9",
+      "sha256": "0mr9ibzzn203r8hxvgf3927r7ml30ikifv6ghc0apj5v50phjhvv",
       "depends": ["Formula", "flexmix", "lattice", "modeltools", "psychotools"]
     },
     "psychonetrics": {
@@ -98415,9 +101877,9 @@
     },
     "pubh": {
       "name": "pubh",
-      "version": "1.3.7",
-      "sha256": "16z0icqzcjz28wqjjmgv66v5x4m8kdf6vakqq1ihvghz5dyv1j8c",
-      "depends": ["Epi", "car", "dplyr", "emmeans", "epiR", "epitools", "ggformula", "ggplot2", "gtsummary", "huxtable", "jtools", "lmtest", "moonBook", "performance", "sandwich", "sjlabelled", "sjmisc", "survival", "tibble", "tidyselect"]
+      "version": "2.0.0",
+      "sha256": "1z575vb9b4774p42dyqbbf14dynnym0377zr5i0c6whr67dcz99q",
+      "depends": ["Epi", "car", "dplyr", "emmeans", "epitools", "ggformula", "ggplot2", "jtools", "lmtest", "performance", "sandwich", "sjlabelled", "sjmisc", "survival", "tibble", "tidyselect"]
     },
     "public_ctn0094data": {
       "name": "public.ctn0094data",
@@ -98439,8 +101901,8 @@
     },
     "pubmed_mineR": {
       "name": "pubmed.mineR",
-      "version": "1.0.20",
-      "sha256": "0apmdrn5bdis55d73j8xgfvv4x54fplmny5c28y5pwa262kchbid",
+      "version": "1.0.21",
+      "sha256": "1dwcpzxqx5672yq7pf7jd692w0pj4737sjdkh395nwpqsllp0sw9",
       "depends": ["R2HTML", "RCurl", "RJSONIO", "XML", "boot"]
     },
     "pubmedR": {
@@ -98493,9 +101955,9 @@
     },
     "puremoe": {
       "name": "puremoe",
-      "version": "1.0.1",
-      "sha256": "18sjbsaljhwzmw2sbmb5hb9w9s3i3qfppizk74fpqnm720rbcfd1",
-      "depends": ["curl", "data_table", "httr", "jsonlite", "pbapply", "rappdirs", "rentrez", "textshape", "xml2"]
+      "version": "1.0.2",
+      "sha256": "119pndm7s343vmgac3jx64f66ax1gk4831svc9b8f54bgk2gqvdx",
+      "depends": ["data_table", "httr", "jsonlite", "pbapply", "rappdirs", "rentrez", "textshape", "xml2"]
     },
     "pureseqtmr": {
       "name": "pureseqtmr",
@@ -98623,6 +102085,12 @@
       "sha256": "0vq7xw6nlaf3vi3415640752988vjj0cdrpjmpl7fjh0z2m5w758",
       "depends": ["MASS", "MBESS", "afex", "broom", "car", "dplyr", "ez", "lavaan", "lmPerm", "lmtest", "nlme", "phia", "pls", "quantreg", "semTools", "tidyr"]
     },
+    "pwr4exp": {
+      "name": "pwr4exp",
+      "version": "0.1.0",
+      "sha256": "081ci87idiqxfr0xa0mws0lzqg2rd4hq0yq6y7izr1al6nfiwffj",
+      "depends": ["car", "emmeans", "lme4", "lmerTest"]
+    },
     "pwrAB": {
       "name": "pwrAB",
       "version": "0.1.0",
@@ -98631,9 +102099,9 @@
     },
     "pwrFDR": {
       "name": "pwrFDR",
-      "version": "2.8.9",
-      "sha256": "16qlxwhljhf878a7jif2kjj7hvga01bgr8zb6bh555yacxxh4yiz",
-      "depends": []
+      "version": "3.2.2",
+      "sha256": "1awcf65pwr8p2cp478yywnn9dfkhbwv64134nwqy8vfc0lydgqpi",
+      "depends": ["TableMonster", "flextable", "ggplot2", "mvtnorm", "stringr"]
     },
     "pwrRasch": {
       "name": "pwrRasch",
@@ -98733,9 +102201,9 @@
     },
     "qCBA": {
       "name": "qCBA",
-      "version": "0.5.1",
-      "sha256": "1r9khpmdxjcnlbx4ccg26vsyp3wdc06bvlx9yl9zm4kwfi68aj9y",
-      "depends": ["arc", "arules", "rJava"]
+      "version": "1.0",
+      "sha256": "0dayvrhy3y0ksslgxiwwv330k0x7cqmpjjz2l4z6c8s2mjz0j9iv",
+      "depends": ["arc", "arules", "arulesCBA", "rJava"]
     },
     "qGaussian": {
       "name": "qGaussian",
@@ -98745,8 +102213,8 @@
     },
     "qMRI": {
       "name": "qMRI",
-      "version": "1.2.7.6",
-      "sha256": "0mbxgg80p159vkz05hbzvvip7h5y5rpvjrjnq1vivz855dk0053g",
+      "version": "1.2.7.8",
+      "sha256": "1fpqxlgpzfzfr7vc3dvrrr8b935sc13b09p9ldimpz775lzd1g9n",
       "depends": ["adimpro", "aws", "awsMethods", "oro_nifti", "stringr"]
     },
     "qPCRhelper": {
@@ -98761,6 +102229,18 @@
       "sha256": "1m9niwqva1b7spkk8xn4n6f7xnfv9zmh1ardahaq10wr7c0x11sy",
       "depends": ["broom", "dplyr", "ggplot2", "ggpmisc", "ggthemes", "kableExtra", "magrittr", "multcomp", "rstatix", "tibble", "tidyr"]
     },
+    "qPRAentry": {
+      "name": "qPRAentry",
+      "version": "0.1.0",
+      "sha256": "1nqhwim7irm8n64a3fjjaqhvzajz8dxh6rbnq43nwvd2ih42s5mv",
+      "depends": ["DT", "bsplus", "dplyr", "eurostat", "ggiraph", "ggplot2", "giscoR", "memoise", "purrr", "sf", "shiny", "shinyWidgets", "shinycssloaders", "shinyjs", "tidyr"]
+    },
+    "qVarSel": {
+      "name": "qVarSel",
+      "version": "1.1",
+      "sha256": "0nvfl4nkm5fwziba7cligr2xg18w2h7ibj5bff2zh189n87n3ly9",
+      "depends": ["Rcpp", "lpSolveAPI"]
+    },
     "qacBase": {
       "name": "qacBase",
       "version": "1.0.3",
@@ -98799,9 +102279,9 @@
     },
     "qbr": {
       "name": "qbr",
-      "version": "1.2.3",
-      "sha256": "0d6rhzi1kcd0q7vfnwdrvywyxavc97kmkbfza82srz3n91zjkjrb",
-      "depends": ["dplyr", "httr", "httr2", "jsonlite", "magrittr", "purrr", "stringr", "tibble", "tidyr"]
+      "version": "1.2.4",
+      "sha256": "0licmg1599dvzc6h9s9h29m9zx1l4wd7mwnwl13wcsp7mwdr4s6j",
+      "depends": ["dplyr", "httr", "httr2", "jsonlite", "magrittr", "purrr", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "qcQpcr": {
       "name": "qcQpcr",
@@ -98839,10 +102319,16 @@
       "sha256": "1d2mcyzfnpmr4pv036crhsc91gypj0jrn6hmd9jcnm49khqc0lan",
       "depends": ["Rcpp", "RcppArmadillo", "copula", "dplyr", "ks", "purrr", "qvalue", "stringr"]
     },
+    "qcluster": {
+      "name": "qcluster",
+      "version": "1.2",
+      "sha256": "1zkl11r0fnmhp1z2qd7jc407g63a0i8fyichb6q1iw6d43bwv2az",
+      "depends": ["cluster", "doParallel", "foreach", "iterators"]
+    },
     "qcpm": {
       "name": "qcpm",
-      "version": "0.3",
-      "sha256": "0yjqbhazmdgw08yn1r8pxafgwxzhb76nmxzb8k68risd2r49jikj",
+      "version": "0.4",
+      "sha256": "09akywvxry40lgpbw1kvfilh40jd7ck8547idskqczsql232jn9d",
       "depends": ["broom", "cSEM", "quantreg"]
     },
     "qcr": {
@@ -98895,8 +102381,8 @@
     },
     "qfa": {
       "name": "qfa",
-      "version": "2.1",
-      "sha256": "1cawddpspdwrnc7ysp0v109j3k1lqpl9gyhp0jg5ribfiipyszww",
+      "version": "3.1",
+      "sha256": "1f16xw2nilhv99gg5a5pxi5hsnsw0njrjcq0nj3jkjbxn6z8688b",
       "depends": ["MASS", "RhpcBLASctl", "colorRamps", "doParallel", "fields", "foreach", "mgcv", "nlme", "quantreg"]
     },
     "qfasar": {
@@ -98931,14 +102417,14 @@
     },
     "qgg": {
       "name": "qgg",
-      "version": "1.1.2",
-      "sha256": "0195fzcr0xy2dns4jl5kn3nigy989l47syn8iavfdpqb76zsh0a3",
-      "depends": ["MASS", "MCMCpack", "Rcpp", "RcppArmadillo", "coda", "corpcor", "data_table", "statmod"]
+      "version": "1.1.6",
+      "sha256": "06bs565ylv4h8g0lp08x13si0lnjaj17a5znc172lql48qgnmw6z",
+      "depends": ["MASS", "MCMCpack", "Matrix", "Rcpp", "RcppArmadillo", "coda", "corpcor", "data_table", "statmod"]
     },
     "qgisprocess": {
       "name": "qgisprocess",
-      "version": "0.4.0",
-      "sha256": "0dshfyfhn9lwr8rx1d0ys0bg6m1y99wma0v07h5r8gz8h7zzm1hb",
+      "version": "0.4.1",
+      "sha256": "0l3rql8w12kqgaz6fczmm4b7mxxagm60d3fvw1i2sv1wdqwlb269",
       "depends": ["assertthat", "glue", "jsonlite", "processx", "rappdirs", "rlang", "stringr", "tibble", "vctrs", "withr"]
     },
     "qgraph": {
@@ -99003,8 +102489,8 @@
     },
     "qlcal": {
       "name": "qlcal",
-      "version": "0.0.12",
-      "sha256": "1q8944agv3wdd1ylssk7p11mms0s3jpy3ai0rnhafdj4spycwgp2",
+      "version": "0.0.13",
+      "sha256": "0gp16hc3fbq07f1qai9sy1bwzjmmrf0gkb8xnnszqapiv2b1m96x",
       "depends": ["BH", "Rcpp"]
     },
     "qlifetable": {
@@ -99039,8 +102525,8 @@
     },
     "qmvs": {
       "name": "qmvs",
-      "version": "0.2.0",
-      "sha256": "0mmz0f62n5yip3h7knagc3rp7kb5jyfr9a24ih6knya5lri5d70h",
+      "version": "0.2.2",
+      "sha256": "11m42xw10vll9l1ij73f48ig9cwirnnz1rphpckfc33bm43vpn27",
       "depends": []
     },
     "qoi": {
@@ -99063,8 +102549,8 @@
     },
     "qpdf": {
       "name": "qpdf",
-      "version": "1.3.3",
-      "sha256": "0lzyc1g7q809h047il5nkizv124j13m1zf3j32in0gx7dyz10mj1",
+      "version": "1.3.4",
+      "sha256": "1r6ag7znm809y1pc6sfn89dba6696c0xp1j13jj82mvj6c3syfmr",
       "depends": ["Rcpp", "askpass", "curl"]
     },
     "qpmadr": {
@@ -99141,8 +102627,8 @@
     },
     "qrcode": {
       "name": "qrcode",
-      "version": "0.2.2",
-      "sha256": "07dkvga60532ngqg77icdfzv1wmx1qdn02js7pwyjf55xgim3fvn",
+      "version": "0.3.0",
+      "sha256": "0jzam1wb7mhjr35jq4xplnm3abbvhc0dngn0jaaqz87habd0v9wq",
       "depends": ["assertthat"]
     },
     "qrencoder": {
@@ -99207,10 +102693,16 @@
     },
     "qs": {
       "name": "qs",
-      "version": "0.26.3",
-      "sha256": "1qqy6aada9jkq0z6bmzb5vhb18cdxvy7b6nwjd8saqaidqgs80c8",
+      "version": "0.27.2",
+      "sha256": "00dbkxzc2ysrcfs8774b5hdadsssg1716hf13kn8jwpk4zpfn9zd",
       "depends": ["BH", "RApiSerialize", "Rcpp", "stringfish"]
     },
+    "qs2": {
+      "name": "qs2",
+      "version": "0.1.4",
+      "sha256": "011g2q769ak57g4kzyyr89ksiar3wxgpgzcnwkk8mc1xcjlcipn2",
+      "depends": ["Rcpp", "RcppParallel", "stringfish"]
+    },
     "qsimulatR": {
       "name": "qsimulatR",
       "version": "1.1.1",
@@ -99261,14 +102753,14 @@
     },
     "qtkit": {
       "name": "qtkit",
-      "version": "1.0.0",
-      "sha256": "0bplhks1sbhx5h34ijx3xdalgvczl8zg4vi6hh7iyp92wncid1vx",
-      "depends": ["Matrix", "chromote", "dplyr", "ggplot2", "glue", "gutenbergr", "kableExtra", "knitr", "openai", "purrr", "readr", "rlang", "stringr", "tibble", "tidytext"]
+      "version": "1.1.0",
+      "sha256": "0ra0wjb85i1i5wqlknpqixfqlnygw88d24yxsvwridsmjkpag0zg",
+      "depends": ["Matrix", "chromote", "dplyr", "ggplot2", "gutenbergr", "kableExtra", "knitr", "openai", "rlang", "xml2"]
     },
     "qtl": {
       "name": "qtl",
-      "version": "1.66",
-      "sha256": "10fnc3ms97rdqsqxz5jpvg2cmrwmz69wjxxs3h65r1yhy94pssnl",
+      "version": "1.70",
+      "sha256": "06zlp6m0w3gxxa04q7jhfh29r0d8xa0lgn9jaz80axn94css243m",
       "depends": []
     },
     "qtl2": {
@@ -99285,8 +102777,8 @@
     },
     "qtl2fst": {
       "name": "qtl2fst",
-      "version": "0.28",
-      "sha256": "1dnbnpx1xbm8n7jgczh6fzwnns7biab8x742l8n8knh6zrksqn93",
+      "version": "0.30",
+      "sha256": "1n1abgqw5q0l731ypzl02aar8n2hwp6japwhwijm0mh3zwfppb8n",
       "depends": ["fst", "qtl2"]
     },
     "qtl2ggplot": {
@@ -99337,12 +102829,6 @@
       "sha256": "0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m",
       "depends": ["corpcor", "mnormt", "qtl"]
     },
-    "qtlmt": {
-      "name": "qtlmt",
-      "version": "0.1-6",
-      "sha256": "023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c",
-      "depends": []
-    },
     "qtlnet": {
       "name": "qtlnet",
       "version": "1.5.4",
@@ -99477,26 +102963,26 @@
     },
     "quanteda": {
       "name": "quanteda",
-      "version": "4.0.2",
-      "sha256": "1s046p3bnf36z2mqh5ijirq7jygqj5clal3r0l3f89gr0466a75j",
-      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "SnowballC", "fastmatch", "jsonlite", "lifecycle", "magrittr", "stopwords", "stringi", "xml2", "yaml"]
+      "version": "4.1.0",
+      "sha256": "01j10gy1svzsz3d2yqg4mbdq7mlgkf1ymzkzjprs6mn91qb0b0ng",
+      "depends": ["Matrix", "Rcpp", "SnowballC", "fastmatch", "jsonlite", "lifecycle", "magrittr", "stopwords", "stringi", "xml2", "yaml"]
     },
     "quanteda_textmodels": {
       "name": "quanteda.textmodels",
-      "version": "0.9.7",
-      "sha256": "0whzy9hbybxmlzkckhlp6whbbg17vskx9bk40iy02j2z6fw6bqxg",
+      "version": "0.9.9",
+      "sha256": "0k6kx0aym2gyl5c537kj728pbf6l3zzcr7mfrv6i5r4gfdcx4bw5",
       "depends": ["LiblineaR", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "SparseM", "glmnet", "quanteda", "stringi"]
     },
     "quanteda_textplots": {
       "name": "quanteda.textplots",
-      "version": "0.94.4",
-      "sha256": "0adl3dahr51f2sqdr0fng99r87pq4mknlqmhg6nfjx617rni9w2a",
+      "version": "0.95",
+      "sha256": "1lgardgbwc3rhla6bxq4cy4wif7w0s3s5pyvyswb9fz6yyfw0wrk",
       "depends": ["Matrix", "RColorBrewer", "Rcpp", "extrafont", "ggplot2", "ggrepel", "igraph", "network", "quanteda", "sna", "stringi"]
     },
     "quanteda_textstats": {
       "name": "quanteda.textstats",
-      "version": "0.97",
-      "sha256": "0h8fyb8smyyhbfk677a2ldyl6b7sdjl0pzk5bbgz8qymw6yg1zdj",
+      "version": "0.97.2",
+      "sha256": "0bzlbwjlwjrmwa1anzarhmbgzsg0gwynlwpwxv786yb235x8znrn",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "nsyllable", "proxyC", "quanteda", "stringi"]
     },
     "quantification": {
@@ -99513,9 +102999,9 @@
     },
     "quantilogram": {
       "name": "quantilogram",
-      "version": "2.2.1",
-      "sha256": "0gvr93d6jjixcrislym0mna2l3plqhl8adaqiagdvxg4y0adfmf0",
-      "depends": ["SparseM", "np", "quantreg"]
+      "version": "3.1.1",
+      "sha256": "1r5fg0jj1f7knabbr7h13sjniy6f6jnk4lnq41acq5sllxm565ip",
+      "depends": ["ggplot2", "np", "quantreg", "rlang", "scales"]
     },
     "quantities": {
       "name": "quantities",
@@ -99543,8 +103029,8 @@
     },
     "quantreg": {
       "name": "quantreg",
-      "version": "5.98",
-      "sha256": "0qbad2wzw7qvsrm821k2vr0dsx75jj3qbs2sl9k3ymngv1cv5359",
+      "version": "5.99.1",
+      "sha256": "1hcd4dj2893yxyp37z0fqcnbd8s50bmnp9d4x07bk6a4kcphyfz9",
       "depends": ["MASS", "Matrix", "MatrixModels", "SparseM", "survival"]
     },
     "quantreg_nonpar": {
@@ -99555,8 +103041,8 @@
     },
     "quantregForest": {
       "name": "quantregForest",
-      "version": "1.3-7",
-      "sha256": "0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz",
+      "version": "1.3-7.1",
+      "sha256": "0b1xmjcv0wrad7il1gg1gaggq19v37akp8zh31dvsnnpmrk05zsp",
       "depends": ["RColorBrewer", "randomForest"]
     },
     "quantregGrowth": {
@@ -99571,6 +103057,12 @@
       "sha256": "1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx",
       "depends": ["Rcpp", "ranger"]
     },
+    "quantsig": {
+      "name": "quantsig",
+      "version": "0.1.0",
+      "sha256": "0mvlbhx74jjpqcyz032sgc4rz27sv4ppi4a29ql496ix0q22xsv2",
+      "depends": []
+    },
     "quantspec": {
       "name": "quantspec",
       "version": "1.2-4",
@@ -99603,10 +103095,16 @@
     },
     "quaxnat": {
       "name": "quaxnat",
-      "version": "1.0.0",
-      "sha256": "0indrll8yqj95lx3f30sic2w5730r5my44sqn59mwhgvdh5rw693",
+      "version": "1.0.1",
+      "sha256": "0aicg3b840rai7m6hkm5kanzj1zfq5qx9n2pkdxz4m205gy44xdj",
       "depends": ["terra"]
     },
+    "queryBuilder": {
+      "name": "queryBuilder",
+      "version": "0.1.0",
+      "sha256": "1d06qmnni2mbn63fxbfj23sql82wmn9ziqf5891wbb88xa0wp4mi",
+      "depends": ["dplyr", "glue", "magrittr", "purrr", "rlang"]
+    },
     "queryparser": {
       "name": "queryparser",
       "version": "0.3.2",
@@ -99643,6 +103141,12 @@
       "sha256": "0hw1ykm24cjpfwh7ac7fjf7mhc59mq8wy2g07aacpy5ibwi8bbsf",
       "depends": []
     },
+    "quicR": {
+      "name": "quicR",
+      "version": "1.0.2",
+      "sha256": "1q5d8v8a704pjgwf6n228qiqaqpfw488ylkzzvmzg5zznbgbh2d0",
+      "depends": ["dplyr", "ggplot2", "openxlsx", "readxl", "reshape2", "slider", "stringr", "tidyr"]
+    },
     "quickNmix": {
       "name": "quickNmix",
       "version": "1.1.1",
@@ -99681,8 +103185,8 @@
     },
     "quickcode": {
       "name": "quickcode",
-      "version": "0.9.1",
-      "sha256": "0q9pmnwxrhkf4x78wgfdz3ysahfg4yn51m2ljsk4nf4zvhgdi1yr",
+      "version": "1.0.3",
+      "sha256": "04dcjc7l7213hcr7p6zlk5zhc52l18svjqfy8zgjqf19gs0q6y2c",
       "depends": ["Polychrome", "fitdistrplus", "rstudioapi"]
     },
     "quickmatch": {
@@ -99763,6 +103267,12 @@
       "sha256": "17sr4100ciy5jp0b8sxvqjxf4m176ayzd5yyaw40ri4xf6h0z7la",
       "depends": []
     },
+    "qvirus": {
+      "name": "qvirus",
+      "version": "0.0.3",
+      "sha256": "12hw8r6liknirdmyiarhjbhvj00dp9ybc2z8qfrgz11p56gnawmh",
+      "depends": ["dplyr", "factoextra", "ggplot2", "gridExtra"]
+    },
     "qwalkr": {
       "name": "qwalkr",
       "version": "0.1.0",
@@ -99771,8 +103281,8 @@
     },
     "qwraps2": {
       "name": "qwraps2",
-      "version": "0.6.0",
-      "sha256": "06i3h6ydjfvy7qrhzznsb272r843fgvykfsgaviq83gi8k5c5i00",
+      "version": "0.6.1",
+      "sha256": "1zv3yg5b32irh3paz2qwwhj2cn3a9laqi4d5gwlk8qmjiacxq6bh",
       "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "knitr", "xfun"]
     },
     "r_blip": {
@@ -99807,8 +103317,8 @@
     },
     "r2d2": {
       "name": "r2d2",
-      "version": "1.0.1",
-      "sha256": "1956p9xr9as8v4673d6fsdyas3racfzh6a5pafqz56r8ai1ssbyq",
+      "version": "1.0.2",
+      "sha256": "0ff5624g1hzckfw4kf6hih4s8n8nnymjb8snd415g38k733q0ihn",
       "depends": ["KernSmooth", "MASS", "sp"]
     },
     "r2d3": {
@@ -99837,8 +103347,8 @@
     },
     "r2dii_match": {
       "name": "r2dii.match",
-      "version": "0.2.1",
-      "sha256": "1f2r5f0p851yhjb81gam7spai46bbrrj2y1g89p0s1kjcpnz6ixz",
+      "version": "0.3.0",
+      "sha256": "06a5l9fb9fan103nwb74720ls3s450j6y9zfqyvrps0sa53bwc0w",
       "depends": ["data_table", "dplyr", "glue", "lifecycle", "magrittr", "purrr", "r2dii_data", "rlang", "stringdist", "stringi", "tibble", "tidyr", "tidyselect"]
     },
     "r2dii_plot": {
@@ -99867,8 +103377,8 @@
     },
     "r2pmml": {
       "name": "r2pmml",
-      "version": "0.28.0",
-      "sha256": "110hr4cj4xlm050hmhag0v32jw6g5ka2ws0jibjw58zm4fg3c0x0",
+      "version": "0.29.0",
+      "sha256": "11z3imzsghd2z85i52mynqi0jz9hgxm22jl2jwn5zv5rp1hhkz1l",
       "depends": []
     },
     "r2pptx": {
@@ -99879,8 +103389,8 @@
     },
     "r2r": {
       "name": "r2r",
-      "version": "0.1.1",
-      "sha256": "0vp0ak88m3ssca8b8kxf9w6qkxsdy0qs6cngrr9gqvbrnx0gh9j6",
+      "version": "0.1.2",
+      "sha256": "06xniycac43i330y0cmbpmp3bn32910gqp9zn2f0yyb7fn83300z",
       "depends": ["digest", "rlang"]
     },
     "r2redux": {
@@ -99891,8 +103401,8 @@
     },
     "r2resize": {
       "name": "r2resize",
-      "version": "1.9.1",
-      "sha256": "1s5mkgrq66kbwh8vm2dnbhn801b44ym3vr98nvv9bn81cbn4ifaf",
+      "version": "1.9.2",
+      "sha256": "0fckxlr3wmlz8pq52sq342c50jripc1fcb8059fa1h63nmvlx17r",
       "depends": ["DT", "htmltools", "quickcode", "shiny"]
     },
     "r2rtf": {
@@ -100003,6 +103513,12 @@
       "sha256": "18q1qd7hkxbk0yilqdk17cp7qbl4c71jv10z732539wcmy8svb1v",
       "depends": ["dplyr", "glue", "magrittr", "miniUI", "purrr", "rstudioapi", "shiny", "stringr"]
     },
+    "r6qualitytools": {
+      "name": "r6qualitytools",
+      "version": "1.0.1",
+      "sha256": "06yrh6ladbrclg8dsi9a31yx38zx4lg1kx9bxn6rnafim9ijgb82",
+      "depends": ["EnvStats", "MASS", "R6", "RColorBrewer", "Rsolnp", "dplyr", "ggplot2", "gridExtra", "patchwork", "plotly", "scales", "tibble", "tidyr"]
+    },
     "rADA": {
       "name": "rADA",
       "version": "1.1.9",
@@ -100065,8 +103581,8 @@
     },
     "rBeta2009": {
       "name": "rBeta2009",
-      "version": "1.0",
-      "sha256": "0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq",
+      "version": "1.0.1",
+      "sha256": "0qr81zcmryvrg7awrl5kvkqp0hw1nlnm2s986351hvcmnirf05rr",
       "depends": []
     },
     "rBiasCorrection": {
@@ -100089,8 +103605,8 @@
     },
     "rCNV": {
       "name": "rCNV",
-      "version": "1.2.0",
-      "sha256": "07c47qz5ma0g9nr0qdsmwhiw1fq3a7r40siavgkhd2in9rb5fzrw",
+      "version": "1.3.0",
+      "sha256": "19wgvaqivhh1mm68i1286a650c5fplqx134g2sgw6cw7wwx6277y",
       "depends": ["R_utils", "colorspace", "data_table", "qgraph", "stringr"]
     },
     "rChoiceDialogs": {
@@ -100101,8 +103617,8 @@
     },
     "rD3plot": {
       "name": "rD3plot",
-      "version": "1.0.68",
-      "sha256": "03zcmxjpa6zz1aw6yaijdhzxv3sar04w3kaz59asmcg8f8r0ghys",
+      "version": "1.1.21",
+      "sha256": "1jjfr1ncfv0dxlzhlyfkdvx19cdxixzv89xl7y2piyvx1rbi14j6",
       "depends": ["igraph"]
     },
     "rDEA": {
@@ -100113,8 +103629,8 @@
     },
     "rDataPipeline": {
       "name": "rDataPipeline",
-      "version": "0.54.1",
-      "sha256": "0i0vb7gsjshh1wn0lksdma51xdyn6qw54j02cb0xmzcg896gl2p9",
+      "version": "0.60.0",
+      "sha256": "0b161pixwfr0dx0xdrdwnixyxzfkmgalmznkcmasx6mlw81frbhg",
       "depends": ["R6", "assertthat", "cli", "configr", "dplyr", "git2r", "httr", "jsonlite", "openssl", "rhdf5", "semver", "usethis", "yaml"]
     },
     "rDecode": {
@@ -100155,8 +103671,8 @@
     },
     "rGV": {
       "name": "rGV",
-      "version": "0.0.4",
-      "sha256": "1a2nlvwdw9zhqp8hw2di68y5y0zbp50xwb8fdgzyvx6l80y3z8b4",
+      "version": "0.0.5",
+      "sha256": "11z8chazz9h2i9083xcb2y5826azr3lkrxl01615ijjvba7jn94v",
       "depends": ["chron"]
     },
     "rGhanaCensus": {
@@ -100189,6 +103705,12 @@
       "sha256": "05v4k0vzv1yx80b5dgmp6l7q3w64cr3k5a29hvggg1ixapswr84y",
       "depends": []
     },
+    "rJavaEnv": {
+      "name": "rJavaEnv",
+      "version": "0.2.2",
+      "sha256": "1shh4w3lw5lgjqxwbkggafsa9kj2fdfsymd4jjfs9vm7kzz8l75d",
+      "depends": ["checkmate", "cli", "curl", "jsonlite"]
+    },
     "rKIN": {
       "name": "rKIN",
       "version": "1.0.2",
@@ -100263,9 +103785,9 @@
     },
     "rMVP": {
       "name": "rMVP",
-      "version": "1.0.8",
-      "sha256": "1k7n8hmwybbp41iqgckkvzqa75kl0ikl5mpq2c5ynmlfkr244by8",
-      "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "bigmemory"]
+      "version": "1.3.0",
+      "sha256": "1c7y8lql419fsjvfq3c2y1b4brbh2v2l2vx372q6w37c918ybgih",
+      "depends": ["BH", "MASS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppProgress", "RhpcBLASctl", "bigmemory"]
     },
     "rMultiNet": {
       "name": "rMultiNet",
@@ -100291,6 +103813,12 @@
       "sha256": "1balbky8jyvyn2v56dvx7b80gpys40pfslqrsv25sywmp0cqy68p",
       "depends": ["Matrix", "gaston", "qtl"]
     },
+    "rOCEAN": {
+      "name": "rOCEAN",
+      "version": "1.0",
+      "sha256": "1vw3v9idc26sfbd14fl0vjg0svxqn4s6cj19klkn8qrigyixh3hh",
+      "depends": ["ff"]
+    },
     "rODE": {
       "name": "rODE",
       "version": "0.99.6",
@@ -100317,9 +103845,9 @@
     },
     "rPDBapi": {
       "name": "rPDBapi",
-      "version": "1.3",
-      "sha256": "16vfwln7k55010h3x9f7znljf0m4x0x97dgnaycxnqf5gpsv65iw",
-      "depends": ["bio3d", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "xml2"]
+      "version": "2.1.1",
+      "sha256": "06l24wff8ym3ksr6j01bph7lrnar7cwwlm0jp1kfshjdbmxqbb0n",
+      "depends": ["bio3d", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "testthat", "xml2"]
     },
     "rPackedBar": {
       "name": "rPackedBar",
@@ -100363,12 +103891,6 @@
       "sha256": "1s2s7bvb9pd7vsdcbkk4zmndixfwfmiv4a9bkaix7rdh5fk057kw",
       "depends": ["caret", "corrplot", "dplyr", "ggplot2", "gridExtra", "leaps", "pls", "randomForest", "rcdk", "tibble"]
     },
-    "rRAP": {
-      "name": "rRAP",
-      "version": "1.1",
-      "sha256": "1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb",
-      "depends": ["MASS", "lars", "lassoshooting"]
-    },
     "rSAFE": {
       "name": "rSAFE",
       "version": "0.1.4",
@@ -100413,14 +103935,14 @@
     },
     "rSPDE": {
       "name": "rSPDE",
-      "version": "2.3.3",
-      "sha256": "1l03rd8knh9mws1fbagspvpyli1sdgijslc0axwwbfjqxcpqg6yq",
+      "version": "2.4.0",
+      "sha256": "116jdmdr0aqhcz5nrcj2g4dxk3brrikvin45ablj1kssngvmc6fl",
       "depends": ["Matrix", "broom", "fmesher", "lifecycle"]
     },
     "rSRD": {
       "name": "rSRD",
-      "version": "0.1.7",
-      "sha256": "1srvv49xxkq2nx7fvbn3d2hr4v6ypkxgz6ms1l89zgd0ypdgmypa",
+      "version": "0.1.8",
+      "sha256": "0jnjdd3glzxc1dk7pz6mnhqnmd14mnq16xmc5zr9s8ml2j36cqp2",
       "depends": ["Rcpp", "dplyr", "ggplot2", "ggrepel", "gplots", "janitor", "rlang", "stringr", "tibble"]
     },
     "rSpectral": {
@@ -100431,9 +103953,9 @@
     },
     "rStrava": {
       "name": "rStrava",
-      "version": "1.3.1",
-      "sha256": "1kn2x208iyz235zf64r2wz4jqgas5srzzjf6gpckqh8dkc6s234f",
-      "depends": ["RCurl", "XML", "dplyr", "geosphere", "ggplot2", "ggspatial", "googleway", "httr", "magrittr", "maptiles", "purrr", "rvest", "tibble", "tidyr", "tidyterra", "xml2"]
+      "version": "1.3.2",
+      "sha256": "0fclv44qjhca61xlwykvp82w4w2c0q5gcdryvyawgbhvmdryqnyy",
+      "depends": ["XML", "dplyr", "geosphere", "ggplot2", "ggspatial", "googleway", "httr", "jsonlite", "magrittr", "maptiles", "purrr", "rvest", "tibble", "tidyr", "tidyterra", "xml2"]
     },
     "rTCRBCRr": {
       "name": "rTCRBCRr",
@@ -100503,9 +104025,9 @@
     },
     "rTwig": {
       "name": "rTwig",
-      "version": "1.0.2",
-      "sha256": "1d3h4ym2vrlp04arjxg4s8zd9d5kyxf6ibvv169calsvkd4rfcn7",
-      "depends": ["DescTools", "Matrix", "Morpho", "R_matlab", "Rdpack", "cobs", "colourvalues", "data_table", "doFuture", "foreach", "future", "igraph", "kit", "progressr", "purrr", "randomcoloR", "rgl", "rmatio", "tidytable"]
+      "version": "1.3.0",
+      "sha256": "1pkczwr4j9dm37b1hsgczdv0rkpjqkzz879xjld1rjgabphcmdfy",
+      "depends": ["R_matlab", "Rcpp", "RcppArmadillo", "RcppSimdJson", "Rdpack", "cobs", "colourvalues", "geometry", "igraph", "rgl", "rlang", "rmatio", "tidytable"]
     },
     "rUM": {
       "name": "rUM",
@@ -100525,6 +104047,12 @@
       "sha256": "0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri",
       "depends": ["MASS", "Matrix", "lazyeval"]
     },
+    "rYWAASB": {
+      "name": "rYWAASB",
+      "version": "0.2",
+      "sha256": "1672h1c48m71sjyhk2hdmmnl8z864dryw5y852qijacyck7726hs",
+      "depends": ["FactoMineR", "factoextra", "ggplot2", "lifecycle", "mathjaxr"]
+    },
     "rYoutheria": {
       "name": "rYoutheria",
       "version": "1.0.3",
@@ -100599,9 +104127,9 @@
     },
     "radiant_data": {
       "name": "radiant.data",
-      "version": "1.6.6",
-      "sha256": "09cbd21bvj4a3n5r1ch638y5dgi7xmmg1y62i6ixcjhbr8wypjmn",
-      "depends": ["DT", "MASS", "arrow", "base64enc", "broom", "bslib", "car", "curl", "dplyr", "ggplot2", "glue", "jsonlite", "knitr", "lubridate", "magrittr", "markdown", "patchwork", "plotly", "png", "psych", "r_import", "randomizr", "readr", "readxl", "rlang", "rmarkdown", "rstudioapi", "scales", "shiny", "shinyAce", "shinyFiles", "stringi", "tibble", "tidyr", "writexl"]
+      "version": "1.6.7",
+      "sha256": "0p55nppclr5dzlslwrhzrg8cc4i0k3ck3076sh2fiay0qi2fh9cm",
+      "depends": ["DT", "MASS", "base64enc", "broom", "bslib", "car", "curl", "dplyr", "ggplot2", "glue", "jsonlite", "knitr", "lubridate", "magrittr", "markdown", "patchwork", "plotly", "png", "psych", "r_import", "randomizr", "readr", "readxl", "rlang", "rmarkdown", "rstudioapi", "scales", "shiny", "shinyAce", "shinyFiles", "stringi", "tibble", "tidyr", "writexl"]
     },
     "radiant_design": {
       "name": "radiant.design",
@@ -100611,8 +104139,8 @@
     },
     "radiant_model": {
       "name": "radiant.model",
-      "version": "1.6.6",
-      "sha256": "0y1qvngicw279m9065pr6kj2yp80iz88bf4jqj1dawjvcbrl27wv",
+      "version": "1.6.7",
+      "sha256": "0442pwj623qrrhiv8yp1r1dhi0jrnkmxd7cydmp87q65fj1xvvyy",
       "depends": ["DiagrammeR", "NeuralNetTools", "broom", "car", "data_tree", "dplyr", "e1071", "ggplot2", "ggrepel", "lubridate", "magrittr", "nnet", "patchwork", "pdp", "psych", "r_import", "radiant_basics", "radiant_data", "ranger", "rlang", "rpart", "sandwich", "scales", "shiny", "stringi", "stringr", "tidyr", "tidyselect", "vip", "xgboost", "yaml"]
     },
     "radiant_multivariate": {
@@ -100645,16 +104173,28 @@
       "sha256": "0zw0dn8pi1yn786fcmm414dap77wdni43dma2pyjbxb15zagpmli",
       "depends": ["RadData", "dplyr", "ggplot2", "ggthemes", "lifecycle", "magrittr", "readr", "rlang", "scatterplot3d", "stringr"]
     },
+    "raem": {
+      "name": "raem",
+      "version": "0.1.0",
+      "sha256": "1hn4a8sys57lk4x984z4skg874r77ybid9w725yxh0wb5v5rr40k",
+      "depends": ["deSolve"]
+    },
     "rafalib": {
       "name": "rafalib",
       "version": "1.0.0",
       "sha256": "1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k",
       "depends": ["RColorBrewer"]
     },
+    "rafsi": {
+      "name": "rafsi",
+      "version": "0.0.2",
+      "sha256": "03f5svk6y2by7sja9clf7pmmb4mz6k4mx7qzh6bq87fgfcngq89g",
+      "depends": []
+    },
     "ragg": {
       "name": "ragg",
       "version": "1.3.3",
-      "sha256": "sha256-QtuEX/GNZ8rm0pGDPHahNsHvArWyRtTZDB8a6Mwbsq8=",
+      "sha256": "1bxj3g6fh6hz1kcx8imjnl1fzh9nl5v3r0wisbkclrwdy5gq9ns2",
       "depends": ["systemfonts", "textshaping"]
     },
     "rags2ridges": {
@@ -100797,8 +104337,8 @@
     },
     "random_cdisc_data": {
       "name": "random.cdisc.data",
-      "version": "0.3.15",
-      "sha256": "05hq7hvypc4nm72f879pjyf2iyvj9hgrr1gwjyvwj8by7pkyyw2y",
+      "version": "0.3.16",
+      "sha256": "1q5krsak9vaajdv5prh2qx9jb8hqnbmhcs657rxscq87xp300z8q",
       "depends": ["checkmate", "dplyr", "lifecycle", "lubridate", "magrittr", "rlang", "stringr", "tibble", "tidyr", "yaml"]
     },
     "random_polychor_pa": {
@@ -100809,8 +104349,8 @@
     },
     "randomForest": {
       "name": "randomForest",
-      "version": "4.7-1.1",
-      "sha256": "1micz9794j7xmj755ln2692rzip8azndflxgdg6xn3j86issi7pm",
+      "version": "4.7-1.2",
+      "sha256": "04aan0wzkfdl2nh4z8fls7qhgz80xl7px7c4282dbfj8nqkk5lxa",
       "depends": []
     },
     "randomForestExplainer": {
@@ -100839,8 +104379,8 @@
     },
     "randomLCA": {
       "name": "randomLCA",
-      "version": "1.1-3",
-      "sha256": "1hjkglqdr9czjr91iwshcdb0acrlk461x896rca4bzc9jv8in9cy",
+      "version": "1.1-4",
+      "sha256": "04qb2r4mpgsi077npf05gw1mf5halbc2r275mx4dil7s4d29javb",
       "depends": ["Matrix", "Rfast", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "lattice"]
     },
     "randomMachines": {
@@ -100905,8 +104445,8 @@
     },
     "randtoolbox": {
       "name": "randtoolbox",
-      "version": "2.0.4",
-      "sha256": "0jwylffr8zajgd1x24nrv4xxlkic10i8cfd9sy0pkz2g7sai9nll",
+      "version": "2.0.5",
+      "sha256": "07ynzr9pp7c7wgjlq75610hivdzjprvxa7fjl42y4a5rzr9vjvmb",
       "depends": ["rngWELL"]
     },
     "rang": {
@@ -100917,8 +104457,8 @@
     },
     "rangeBuilder": {
       "name": "rangeBuilder",
-      "version": "2.1",
-      "sha256": "1r82rmmfwbfl2lxcsnl9xwyr2932jv43cjlvlihi5172irpfgvpw",
+      "version": "2.2",
+      "sha256": "1g4vd20926rbjvr31wfhydfv0jplmyjs55gdjca7fg3wnskvvmsb",
       "depends": ["Rcpp", "alphahull", "pbapply", "rnaturalearth", "sf", "stringi", "terra", "units"]
     },
     "rangeMapper": {
@@ -100935,14 +104475,14 @@
     },
     "ranger": {
       "name": "ranger",
-      "version": "0.16.0",
-      "sha256": "12c52gqqwaaid5b062gad18ir1vala1z3a0z5j4af1xqzlxgk583",
+      "version": "0.17.0",
+      "sha256": "0dlxl1cgxd778gzvnnvnxlwm37q825fw48g2kwyzjyliwi6dz36l",
       "depends": ["Matrix", "Rcpp", "RcppEigen"]
     },
     "rank": {
       "name": "rank",
-      "version": "0.1.0",
-      "sha256": "1pbi2s7361v6jzv9574dhcvdryachrw8s25vk2ca5jjvp9yrj2li",
+      "version": "0.1.1",
+      "sha256": "1b2rrnwcaz10anb9fni3hxkk42iy3wkpvliidz271gfmnh2660j9",
       "depends": []
     },
     "rankCorr": {
@@ -101007,8 +104547,8 @@
     },
     "rapiclient": {
       "name": "rapiclient",
-      "version": "0.1.5",
-      "sha256": "1xp6mmk2rrlk0wmvv23k1dgr7pydw46iinvd138167frmr0rdica",
+      "version": "0.1.8",
+      "sha256": "1alzkcvzaj3vr2qd8v4yw1pfg3vfvn3lvjcivsdxkwljvrv67v8w",
       "depends": ["httr", "jsonlite", "yaml"]
     },
     "rapidjsonr": {
@@ -101109,8 +104649,8 @@
     },
     "rarestR": {
       "name": "rarestR",
-      "version": "1.0.0",
-      "sha256": "0zpzxg960yk55fbqqbx0vrm5275f88p9cqbh4wy3rv6ckhbmbygc",
+      "version": "1.1.0",
+      "sha256": "1hyk3c4m6v19v30728mlxlq36hkirm6isi2j1lbzkvbs6k54pc7x",
       "depends": ["Rdpack"]
     },
     "rarms": {
@@ -101133,14 +104673,14 @@
     },
     "rassta": {
       "name": "rassta",
-      "version": "1.0.5",
-      "sha256": "0yia0pwg29fd6hq0f96hdf6k70pj296805a4lgxn4qqwn3gw7006",
+      "version": "1.0.6",
+      "sha256": "1f3npgq5qxdj98jpl84givkg77z7n09hksbj1pcpsapn5a688vz3",
       "depends": ["DT", "GGally", "KernSmooth", "cluster", "data_table", "dplyr", "foreach", "ggplot2", "histogram", "kohonen", "plotly", "rlang", "scales", "shiny", "stringdist", "stringi", "terra"]
     },
     "raster": {
       "name": "raster",
-      "version": "3.6-26",
-      "sha256": "14jmpm6rlhya192ckyjlwhais6fgc16gb600wycsdba6b8i7fmy6",
+      "version": "3.6-30",
+      "sha256": "0w1h9a2151njdlnlg617bcfva558cac739czphwjdc6na9566zxv",
       "depends": ["Rcpp", "sp", "terra"]
     },
     "rasterDT": {
@@ -101181,9 +104721,9 @@
     },
     "rasterdiv": {
       "name": "rasterdiv",
-      "version": "0.3.4",
-      "sha256": "1pq9xsm6yyb97b8nvqlmb4s3kmd72a9mqxqqd31225qjnm6gv9pz",
-      "depends": ["doParallel", "foreach", "ggforce", "ggplot2", "progress", "proxy", "terra", "viridis"]
+      "version": "0.3.6",
+      "sha256": "0rdghxfx0ym0dki8w25b347gkp9gbrwl56ap9arvbs1pyjrlnflz",
+      "depends": ["doParallel", "foreach", "ggforce", "ggplot2", "progress", "proxy", "terra", "twdtw", "viridis"]
     },
     "rasterize": {
       "name": "rasterize",
@@ -101199,8 +104739,8 @@
     },
     "rasterpic": {
       "name": "rasterpic",
-      "version": "0.2.5",
-      "sha256": "03p24iw384dxws25mwfzclhpfj9hm3wrv8xmhgrcsffw61q3ad0x",
+      "version": "0.2.6",
+      "sha256": "1q2kl95rf0c77nngf83805rqbpirzcl2xwzbpdaf8yqvcs780jfh",
       "depends": ["png", "sf", "terra"]
     },
     "ratdat": {
@@ -101235,8 +104775,8 @@
     },
     "raters": {
       "name": "raters",
-      "version": "2.1.0",
-      "sha256": "0pjyg4g8z6ixcypi4sz4asgbafcfg0kchza1fpa65xvjmss681bj",
+      "version": "2.1.1",
+      "sha256": "0yxwvziajzwnbqsnjf8myvx5jxzrickzm4b6zqy2s5fm2xh9675q",
       "depends": []
     },
     "ratesci": {
@@ -101263,6 +104803,12 @@
       "sha256": "16q9v2lhgklvdp3hi9x3afdldznfpwg775p80m2g5074q2dzjpgg",
       "depends": ["data_table", "stringr"]
     },
+    "ratlas": {
+      "name": "ratlas",
+      "version": "0.1.0",
+      "sha256": "0iwkdr08jwyar1k737izjg7xw3wz1qlc0c7jar0fzlcn06i32c9k",
+      "depends": ["bookdown", "colorspace", "dplyr", "extrafont", "fs", "ggplot2", "ggtext", "glue", "hrbrthemes", "knitr", "magrittr", "officedown", "purrr", "rlang", "scales", "stringr", "tibble", "tidyr", "xaringan", "xfun"]
+    },
     "rattle": {
       "name": "rattle",
       "version": "5.5.1",
@@ -101283,8 +104829,8 @@
     },
     "ravetools": {
       "name": "ravetools",
-      "version": "0.1.7",
-      "sha256": "1y0zpbdyr8izdjdgxma8v226fqacrg0j0ykiivqarkkdq82gvbj5",
+      "version": "0.2.0",
+      "sha256": "1a4837437g8g4lfraqcqlgbryzqfn0ki66s33465b06v832skdsa",
       "depends": ["R6", "RNiftyReg", "Rcpp", "RcppEigen", "digest", "filearray", "gsignal", "pracma", "waveslim"]
     },
     "raw": {
@@ -101305,12 +104851,6 @@
       "sha256": "04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg",
       "depends": ["stringr", "tibble", "withr"]
     },
-    "raybevel": {
-      "name": "raybevel",
-      "version": "0.1.3",
-      "sha256": "0431mk0lslqwffknarb7zm2nbgv564d3karf9davc7w1xgnf11fj",
-      "depends": ["BH", "Rcpp", "RcppCGAL", "RcppThread", "decido", "digest", "progress", "rayvertex", "sf"]
-    },
     "rayimage": {
       "name": "rayimage",
       "version": "0.11.0",
@@ -101347,17 +104887,11 @@
       "sha256": "0xbhkv77238y742vpci6d2z87n6mnnp80qxv938rwb9hfs4c66j4",
       "depends": ["Rcpp", "RcppThread", "cli", "digest", "pillar", "png", "rayimage", "spacefillr", "tibble", "vctrs", "withr"]
     },
-    "rb3": {
-      "name": "rb3",
-      "version": "0.0.11",
-      "sha256": "1nxh4a3ihjdm1xp3sam9pqh56q2yic97fssm00g7djdfcxq6y0fy",
-      "depends": ["XML", "ascii", "base64enc", "bizdays", "cli", "digest", "dplyr", "httr", "jsonlite", "proto", "purrr", "readr", "readxl", "rlang", "rvest", "stringr", "tidyr", "yaml"]
-    },
     "rbacon": {
       "name": "rbacon",
-      "version": "3.2.0",
-      "sha256": "18d0mcfmslycbsi9sgqkxw1xwm9cgq4rxkwrvlbm67g0ryad86l3",
-      "depends": ["Rcpp", "coda", "data_table", "rintcal"]
+      "version": "3.3.1",
+      "sha256": "1zg4sy56cp2j7bq26ap83g63h7adzzmaaliyw7k75a58drkf5pxx",
+      "depends": ["Rcpp", "coda", "data_table", "rice", "rintcal"]
     },
     "rbbnp": {
       "name": "rbbnp",
@@ -101365,6 +104899,12 @@
       "sha256": "0lpzccb645lbzplwq8rvxd9jx90k3wy70ijwx8c7gdpn9kxb13jr",
       "depends": ["dplyr", "ggplot2", "gridExtra", "pracma", "purrr", "tidyr"]
     },
+    "rbc": {
+      "name": "rbc",
+      "version": "0.1.0",
+      "sha256": "1szzfwbbysnifiymj3mnrcjd6n5wqc53smh8dk8nx2av4hgpl1ia",
+      "depends": ["Formula", "R6"]
+    },
     "rbcb": {
       "name": "rbcb",
       "version": "0.1.14",
@@ -101373,14 +104913,14 @@
     },
     "rbcc": {
       "name": "rbcc",
-      "version": "0.1.1",
-      "sha256": "1v99cpbq7wd9kfjfanyxfmxifvnr73882hh0zyrp6n3nvj7l85rz",
+      "version": "0.1.3",
+      "sha256": "1a1awv1cxdv45342dixzjf9664vzvriprdlnbm0k1swkbr2pa6l5",
       "depends": ["PearsonDS", "ggplot2", "pracma", "qcc", "reshape2"]
     },
     "rbch": {
       "name": "rbch",
-      "version": "0.1-1",
-      "sha256": "0n2s5qfgjvg7vv65myz6dcmmaf37z883z1sw4hryngz2z6w4zz5q",
+      "version": "0.1-2",
+      "sha256": "1zzcjfd5djk790gbdzv7y4zn7sjfr8400awp74qbqz7ismsc63z4",
       "depends": ["gmp", "httr", "openssl", "rjson"]
     },
     "rbedrock": {
@@ -101415,14 +104955,14 @@
     },
     "rbibutils": {
       "name": "rbibutils",
-      "version": "2.2.16",
-      "sha256": "1brab8vzzf44d9rpp9k3r2ajvrs09cbwf4ak014iffzn8yx0yz4w",
+      "version": "2.3",
+      "sha256": "0zvpa39d6a9ibaqnz6na0nm7ybmhmshr5s4vdndsmgcv45iasd8c",
       "depends": []
     },
     "rbin": {
       "name": "rbin",
-      "version": "0.2.0",
-      "sha256": "18g6s4m0yc1bzrymk8km553kcwi4vj16b6mxw2lmv48z7243iq87",
+      "version": "0.2.1",
+      "sha256": "04in2h0wfsc1bmz804vwqr0sr4la4ayfll5g7avfymyvh5b0y428",
       "depends": ["data_table", "ggplot2"]
     },
     "rbioacc": {
@@ -101463,9 +105003,9 @@
     },
     "rbmi": {
       "name": "rbmi",
-      "version": "1.2.6",
-      "sha256": "0yy5yz9ld74wvljvpfz4gh7xzq9b60nf9lc97s1zvmwjgrzp77v4",
-      "depends": ["BH", "Matrix", "R6", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "assertthat", "mmrm", "pkgload", "rstan", "rstantools"]
+      "version": "1.3.1",
+      "sha256": "1m9dlf8f13jqzjvrjsigbdf6q7vcx1fzy0jb1k264k48ibbq0xyj",
+      "depends": ["Matrix", "R6", "assertthat", "mmrm", "pkgload"]
     },
     "rbmn": {
       "name": "rbmn",
@@ -101499,8 +105039,8 @@
     },
     "rbtc": {
       "name": "rbtc",
-      "version": "0.1-6",
-      "sha256": "1z5p1jn5b0hzwcbdpiwj224h45x01bbsgkskllir5j13l416561p",
+      "version": "0.1-7",
+      "sha256": "12sl7ng8z3ncxv4vw5qg045757fry2qpyxjhq4174fhq8z8vrgs7",
       "depends": ["gmp", "httr", "openssl", "rjson"]
     },
     "rbtt": {
@@ -101613,14 +105153,14 @@
     },
     "rchemo": {
       "name": "rchemo",
-      "version": "0.1-2",
-      "sha256": "06wrpv3bnzq9sz6wq4f1sgcq549rafnqh6rzldl160hv7yb7rl80",
+      "version": "0.1-3",
+      "sha256": "0jpd62mggsysh95dqp5dy0w1nhp06rc55fk7d4a7vqbblfipxihm",
       "depends": ["FNN", "data_table", "e1071", "signal"]
     },
     "rcheology": {
       "name": "rcheology",
-      "version": "4.4.1.0",
-      "sha256": "1k49z9czxdksvc7m7767q52l613lv7fsfykx0yaajjlvp67ac4ly",
+      "version": "4.4.2.0",
+      "sha256": "1gswy1vyd895ndslznvdkhbib4zjr846f2z9fgd15cc1vigqzixy",
       "depends": []
     },
     "rciplot": {
@@ -101659,6 +105199,12 @@
       "sha256": "09l1gvcf453j058rls4y2r342y3p4ywvf1g0qzq4kwavxxcl5rn2",
       "depends": ["dplyr", "glue", "rlang"]
     },
+    "rcollectadhd": {
+      "name": "rcollectadhd",
+      "version": "0.8",
+      "sha256": "0dvfj1mhsdjb8rl3h85ypvsn6gzlk43yxx0x4vdavkrcdzv7qdkz",
+      "depends": []
+    },
     "rcolors": {
       "name": "rcolors",
       "version": "0.1.0",
@@ -101685,8 +105231,8 @@
     },
     "rcontroll": {
       "name": "rcontroll",
-      "version": "0.1.1",
-      "sha256": "14xh5hhb96qk0f3kvvvjbkyswcq17g6y70v5prazldq7i4bzpv8q",
+      "version": "0.1.2",
+      "sha256": "15bv66awbw85p3szbqhfs283i285pfysx0bb3vrp8aikfk4isgyb",
       "depends": ["Rcpp", "RcppGSL", "doParallel", "doSNOW", "dplyr", "foreach", "gganimate", "ggplot2", "iterators", "lidR", "lubridate", "magrittr", "readr", "reshape2", "sys", "terra", "tibble", "tidyr", "viridis", "vroom"]
     },
     "rcorpora": {
@@ -101697,10 +105243,16 @@
     },
     "rcpptimer": {
       "name": "rcpptimer",
-      "version": "1.1.0",
-      "sha256": "0dpny4b5r9nxll5pwlwd7jvjmk0ixi6wgcm9v49dxm3cax2p7jlg",
+      "version": "1.2.1",
+      "sha256": "120ml0s0lrz920ixwrgfw8blggb829zaikwbw5csb2wkg0alz0kj",
       "depends": ["Rcpp"]
     },
+    "rcprd": {
+      "name": "rcprd",
+      "version": "0.0.1",
+      "sha256": "0l1j85pkbkpivh811b6rf6q1ji9ddvm1gw10bx0gfhw3bmfwxdaj",
+      "depends": ["RSQLite", "data_table", "dplyr", "fastmatch", "stringr"]
+    },
     "rcrimeanalysis": {
       "name": "rcrimeanalysis",
       "version": "0.5.0",
@@ -101739,8 +105291,8 @@
     },
     "rdacca_hp": {
       "name": "rdacca.hp",
-      "version": "1.1-0",
-      "sha256": "1ac558vwd0sfalmb39gaa5vrmrmj55l0lk6xp6cnig9gp60x1wcr",
+      "version": "1.1-1",
+      "sha256": "0bgsr2a7xb82q5rnfdxd0h2c923c1s8jc7jgglbzqbinlwqjry5i",
       "depends": ["ggplot2", "vegan"]
     },
     "rdaisi": {
@@ -101781,8 +105333,8 @@
     },
     "rddensity": {
       "name": "rddensity",
-      "version": "2.5",
-      "sha256": "07pzj4gi94nl4zd75xxkhiqfzy75zfwl8ps7x5whpg7qp1j48dqh",
+      "version": "2.6",
+      "sha256": "0a72cfy1y2q4hkq66h0xcwiincvj9x1dlzi4j9cmxn0689hsy2rr",
       "depends": ["ggplot2", "lpdensity"]
     },
     "rddi": {
@@ -101895,8 +105447,8 @@
     },
     "rdracor": {
       "name": "rdracor",
-      "version": "1.0.3",
-      "sha256": "014xa4n6av0g3ffplna8z25b00176war3h2pv20wclx9lq8wz9hs",
+      "version": "1.0.4",
+      "sha256": "1bypz0llvr05zvhfw76yinvr2qsbqnbws0mkif2mmckd57a7395x",
       "depends": ["Rdpack", "data_table", "httr", "igraph", "jsonlite", "purrr", "stringr", "tibble", "tidyr", "xml2"]
     },
     "rdrobust": {
@@ -101929,6 +105481,12 @@
       "sha256": "0bcdpza4rbvfzn69zws5s2l32rs7m39a5h3zxyz4gszff3yn37fx",
       "depends": ["rgrass", "sf", "stars", "stringr"]
     },
+    "re": {
+      "name": "re",
+      "version": "0.1.0",
+      "sha256": "1lh75gm42kvazgr1f6v3wrxac2i28fi0khbsw749iidk4xay39ba",
+      "depends": ["stringi"]
+    },
     "re2": {
       "name": "re2",
       "version": "0.1.3",
@@ -101937,8 +105495,8 @@
     },
     "reReg": {
       "name": "reReg",
-      "version": "1.4.6",
-      "sha256": "1p1rbj88bc5qz909w2q6mnzkscz2djdm8w3lcfj1pzka6699jz8z",
+      "version": "1.4.7",
+      "sha256": "0irf6x03w1hb5mh30nffwpdiy7sg7m4aypwg1bbcmbwcyb1n6fx8",
       "depends": ["BB", "MASS", "Rcpp", "RcppArmadillo", "SQUAREM", "dfoptim", "directlabels", "ggplot2", "nleqslv", "optimx", "reda", "rootSolve", "scam", "survival"]
     },
     "react": {
@@ -101955,8 +105513,8 @@
     },
     "reactR": {
       "name": "reactR",
-      "version": "0.6.0",
-      "sha256": "0mi9zfy50njvykmp4rfgpvsmf7q8l92n2196jw9sc06q7ybjn92v",
+      "version": "0.6.1",
+      "sha256": "14nqaxgfnqrwl67b705jna8vljhx9xlakvkdl76bwk759myhsscv",
       "depends": ["htmltools"]
     },
     "reactable": {
@@ -101967,8 +105525,8 @@
     },
     "reactable_extras": {
       "name": "reactable.extras",
-      "version": "0.2.0",
-      "sha256": "16cfldbfcz34jp0kfxiaz8l49ri2s9fr1r9kissqzs0xzjrp78in",
+      "version": "0.2.1",
+      "sha256": "06027fyv3mp8vs5dv8ac590za65kl46ny2ibkfhimcxpz8l34izp",
       "depends": ["checkmate", "dplyr", "htmltools", "purrr", "reactable", "rjson", "rlang", "shiny"]
     },
     "reactablefmtr": {
@@ -102003,8 +105561,8 @@
     },
     "readBrukerFlexData": {
       "name": "readBrukerFlexData",
-      "version": "1.9.2",
-      "sha256": "1zp7ml0rf7ary0lmg6b3hjpivpws4fn3gg4ppg842zcq5nrrzy0i",
+      "version": "1.9.3",
+      "sha256": "122q01l08isdkhlf013drcyjnc5rqr8wnavj2xr465r58xk79bwj",
       "depends": []
     },
     "readHAC": {
@@ -102019,6 +105577,12 @@
       "sha256": "16ixrwnmpmq3x358gdyrf3fm1vr8dxjbz3cql3zldz1sfl3f4z76",
       "depends": ["stringr"]
     },
+    "readMDTable": {
+      "name": "readMDTable",
+      "version": "0.2.0",
+      "sha256": "0bwhf02sb1v6p7mck93sk1vl1q73la38lwq2gs3a5g8mi11a3ykv",
+      "depends": ["cli", "httr2", "readr", "stringr"]
+    },
     "readMLData": {
       "name": "readMLData",
       "version": "0.9-7",
@@ -102033,15 +105597,15 @@
     },
     "readNSx": {
       "name": "readNSx",
-      "version": "0.0.4",
-      "sha256": "1mllas238wvmpc094vw242h2gv9qgdyfml9k618ijp1s0mabnwcc",
+      "version": "0.0.5",
+      "sha256": "1fl4lr6yax8nn06pna4mcxjfc4zjf42whaslxvvy40008wm2bkqj",
       "depends": ["R6", "cpp11", "data_table", "fastmap", "hdf5r", "jsonlite"]
     },
     "readODS": {
       "name": "readODS",
-      "version": "2.3.0",
-      "sha256": "14849i7c48ilx212kp5zh33fkvps7j2b89kpy007wk5kzpw0y4hy",
-      "depends": ["cellranger", "minty", "stringi", "tibble", "vctrs", "zip"]
+      "version": "2.3.1",
+      "sha256": "08mgpca2c0dmhcrgxlvjg5bp6kyzmfg3z5yyn5fzphrfq8gmgvlm",
+      "depends": ["cellranger", "cpp11", "minty", "stringi", "tibble", "vctrs", "zip"]
     },
     "readOffice": {
       "name": "readOffice",
@@ -102117,8 +105681,8 @@
     },
     "readrba": {
       "name": "readrba",
-      "version": "0.1.10",
-      "sha256": "16g1zwib8f4vm4jb8lc9w2rfvszajfrs978gbgdgqz0raw7h4grf",
+      "version": "0.1.11",
+      "sha256": "0ja8di5jmiiq9kkigwahhhdfkppfqfkan7iqgrxa3gp838dxlq2r",
       "depends": ["dplyr", "httr", "lubridate", "purrr", "readxl", "rlang", "rvest", "stringr", "tidyr", "xml2"]
     },
     "readroper": {
@@ -102183,8 +105747,8 @@
     },
     "ready4": {
       "name": "ready4",
-      "version": "0.1.14",
-      "sha256": "09kf290dq1qdafyx8f12sasf10chiqrh8d1wa1apfkrr01n4b45j",
+      "version": "0.1.18",
+      "sha256": "1inmxzb4lzrbxk7qzbxh2dc0s75idk1yma522n1sy6ff6g62q8dg",
       "depends": ["curl", "dataverse", "dplyr", "gh", "kableExtra", "lifecycle", "magrittr", "piggyback", "purrr", "rlang", "rvest", "stringi", "stringr", "tibble", "tidyRSS", "tidyselect"]
     },
     "realTimeloads": {
@@ -102199,6 +105763,12 @@
       "sha256": "1k2chcxpqrl4b4xfc80b8kvkn0nw8dfbl6n1965zjzszf7qaizkp",
       "depends": []
     },
+    "ream": {
+      "name": "ream",
+      "version": "1.0-5",
+      "sha256": "11m1n8hqx1sszbrcw87kaahzyyrq10vmfbi9fhwkzkw5b316y9bi",
+      "depends": []
+    },
     "reappraised": {
       "name": "reappraised",
       "version": "0.1.1",
@@ -102219,8 +105789,8 @@
     },
     "rebib": {
       "name": "rebib",
-      "version": "0.3.2",
-      "sha256": "15ydvw4nbdw885y99a4g4zc6xvzaxjl8q3rriwrg7fbilib8i8pz",
+      "version": "0.5.0",
+      "sha256": "17ps6369gk4rx30y9kk9ddary6v05x9nvr01rmyyhc7y9hvswdvs",
       "depends": ["cli", "logger", "stringr", "whisker", "xfun"]
     },
     "rebird": {
@@ -102289,6 +105859,12 @@
       "sha256": "0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20",
       "depends": ["Rcpp", "kriging"]
     },
+    "recforest": {
+      "name": "recforest",
+      "version": "1.0.0",
+      "sha256": "0vzx37aayp92q4g2dwsgfzkvl99k7ms47a81cqzpk60s8cx3lxja",
+      "depends": ["cli", "dplyr", "future", "future_apply", "magrittr", "mets", "purrr", "reda", "survival", "tibble", "timereg"]
+    },
     "rechaRge": {
       "name": "rechaRge",
       "version": "1.0.0",
@@ -102403,6 +105979,12 @@
       "sha256": "01d8r1pwvd606cbs9bq2rq3ahq7jnfgak9p58ch4fs4ki5nxf1sj",
       "depends": ["Rcpp", "RcppProgress", "float"]
     },
+    "rectpacker": {
+      "name": "rectpacker",
+      "version": "1.0.0",
+      "sha256": "1kav3zfagds94b6ip6a7q5ayn254az2r5dqslwfcd45kz3523y44",
+      "depends": []
+    },
     "recurrentpseudo": {
       "name": "recurrentpseudo",
       "version": "1.0.0",
@@ -102427,6 +106009,18 @@
       "sha256": "1lrfbcvxgbbpi7l3vls3rdj8y3w30gg5f1fjcfscmykvp0i01j3d",
       "depends": ["Rcpp", "RcppArmadillo", "ggplot2", "splines2"]
     },
+    "redatam": {
+      "name": "redatam",
+      "version": "2.0.4",
+      "sha256": "1fb6v1vsgnjnzg666njcn5ph3lz6f0cfnvcr2xhia5c0qkj4wpi3",
+      "depends": ["cpp11", "data_table", "janitor", "stringi", "stringr", "tibble"]
+    },
+    "redatamx": {
+      "name": "redatamx",
+      "version": "1.1.0",
+      "sha256": "0924yw0lwzfk7v57kmslazg3mz5c7di4q7b6j5yxqba1s5m9s6h4",
+      "depends": ["cpp11"]
+    },
     "redbookperu": {
       "name": "redbookperu",
       "version": "0.0.3",
@@ -102435,9 +106029,15 @@
     },
     "redcapAPI": {
       "name": "redcapAPI",
-      "version": "2.9.1",
-      "sha256": "1zz5dwd1i7j0d9qf79zmlqb5i4d4qk59sg7qqzb6y8vmp1ldqwm7",
-      "depends": ["checkmate", "chron", "getPass", "httr", "keyring", "labelVector", "lubridate", "yaml"]
+      "version": "2.10.0",
+      "sha256": "0c7pp0cwbchmrr07diiacdnr77jny0l9gfahp3g742z8rzr8zb04",
+      "depends": ["checkmate", "chron", "curl", "getPass", "jsonlite", "keyring", "labelVector", "lubridate", "mime", "yaml"]
+    },
+    "redcas": {
+      "name": "redcas",
+      "version": "0.1.1",
+      "sha256": "04icmr0bz8hyyfn842vhj30y0i8zfyvawwzwaznflbfqpdihbw6b",
+      "depends": []
     },
     "reddPrec": {
       "name": "reddPrec",
@@ -102499,12 +106099,6 @@
       "sha256": "1mix12qxap6rqs6dg4nlbm9vlkzxgr1ivkjjkzap3k0km0agldx9",
       "depends": ["MCMCglmm", "Rdpack", "classInt", "coda", "dplyr", "ggplot2", "gtools", "mvtnorm", "pracma", "sf", "sp", "spdep"]
     },
-    "refdb": {
-      "name": "refdb",
-      "version": "0.1.1",
-      "sha256": "1g30n7jvn532nhbn4mrfkfym40vw1ha0q8yi3d3d3v86gyr5ga4n",
-      "depends": ["ape", "bioseq", "bold", "dplyr", "ggplot2", "ggraph", "igraph", "leaflet", "readr", "rentrez", "rlang", "rmarkdown", "stringr", "taxize", "tibble", "tidyr", "xml2", "yaml"]
-    },
     "refer": {
       "name": "refer",
       "version": "0.1.0",
@@ -102519,8 +106113,8 @@
     },
     "refineR": {
       "name": "refineR",
-      "version": "1.6.1",
-      "sha256": "1bwafqcvsvmb6svdcr4ri31wvyzws33xfxrf42g4dzx03q0wwkin",
+      "version": "1.6.2",
+      "sha256": "1ygfs0fdx8bj3a2i15l3218837phf52lapf0v7agmm95jciw7wip",
       "depends": ["ash", "future", "future_apply"]
     },
     "refinr": {
@@ -102549,8 +106143,8 @@
     },
     "reformulas": {
       "name": "reformulas",
-      "version": "0.3.0",
-      "sha256": "0p8v8j0xw4np84vvkbd41r4n1rvj5awlrnpbvqccgjasspl07smh",
+      "version": "0.4.0",
+      "sha256": "0d5zda1a355xl935kgbqzbk1mpsdfafa92pgfqhfrap8wnwxjkq4",
       "depends": ["Matrix", "Rdpack"]
     },
     "refreg": {
@@ -102567,8 +106161,8 @@
     },
     "refseqR": {
       "name": "refseqR",
-      "version": "1.1.4",
-      "sha256": "09zh4fq232arcykaflgjy2bmjikfqhrqbwfy6pdhj48ixwxbwdbf",
+      "version": "1.1.5",
+      "sha256": "1i3gbyi5a49a9pz99asb5gpi7zvws9cxkx3lyhhzy2rwwv4cvaqr",
       "depends": ["Biostrings", "IRanges", "rentrez", "tibble"]
     },
     "refset": {
@@ -102585,14 +106179,14 @@
     },
     "refugees": {
       "name": "refugees",
-      "version": "2023.12.0",
-      "sha256": "11isc2q3y3syi1hkvxg8rgism9qynskxypsivcvjdpdhw4sfh263",
+      "version": "2024.6.0",
+      "sha256": "1lgxkcc4hv2nnndirp70hpn5mahcsv65nj289ms4qh3wdg89h9pb",
       "depends": ["tibble"]
     },
     "refund": {
       "name": "refund",
-      "version": "0.1-35",
-      "sha256": "0hdm8ycgxzmmpgp885w49fxzvn6j5078x42gf7hh1ms7w0k4k72g",
+      "version": "0.1-37",
+      "sha256": "1lkdgpxnvnr9d9kmwdnk4wx656c1lhi353s64f065l6qg837kmw6",
       "depends": ["MASS", "Matrix", "RLRsim", "boot", "fda", "gamm4", "ggplot2", "grpreg", "lattice", "lme4", "magic", "mgcv", "nlme", "pbs"]
     },
     "refund_shiny": {
@@ -102607,6 +106201,12 @@
       "sha256": "0b7sdkykvdgzss1ipqsxfna870g8nry1aa83gsm43fp2y9kmv62z",
       "depends": ["foreach", "statmod"]
     },
+    "regMMD": {
+      "name": "regMMD",
+      "version": "0.0.1",
+      "sha256": "0ph2vs8xbjwsgin13pnpjagqqcj025k7vcv134h1g3djjmk10k63",
+      "depends": ["Rdpack"]
+    },
     "regRSM": {
       "name": "regRSM",
       "version": "0.5",
@@ -102733,6 +106333,12 @@
       "sha256": "0yrxhlam7jmxwk1v53kllv6ja1m938symfvqp84xb278r3wb1wv7",
       "depends": ["mvtnorm"]
     },
+    "regreplaceR": {
+      "name": "regreplaceR",
+      "version": "0.1.0",
+      "sha256": "1f3szaxvfqvcapb20xfbdyk4d8qyyabkkym71mw4hd2j5vg5gr6d",
+      "depends": ["R6"]
+    },
     "regress": {
       "name": "regress",
       "version": "1.3-21",
@@ -102747,9 +106353,9 @@
     },
     "regressoR": {
       "name": "regressoR",
-      "version": "3.0.2",
-      "sha256": "0c7kxhkcy02vlb0fabf70bzkrk6l7rsvj7ppx3nxhjrhfp7p8j2m",
-      "depends": ["DT", "dplyr", "echarts4r", "glmnet", "golem", "htmltools", "loadeR", "pls", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR"]
+      "version": "4.0.3",
+      "sha256": "06azxr11pb779nkabrklxpjndvjvjbpidm5gjfq7m4iqfd7kw95c",
+      "depends": ["DT", "dplyr", "echarts4r", "gbm", "glmnet", "golem", "htmltools", "loadeR", "pls", "psych", "rlang", "rpart_plot", "shiny", "shinyAce", "shinycustomloader", "shinydashboard", "shinydashboardPlus", "shinyjs", "traineR"]
     },
     "regrrr": {
       "name": "regrrr",
@@ -102777,9 +106383,9 @@
     },
     "regtomean": {
       "name": "regtomean",
-      "version": "1.1",
-      "sha256": "0xw0pany9cwfxdn26ckk6fdjnqx1916288mhphsnvwns3383nq4k",
-      "depends": ["effsize", "formattable", "mefa", "plotrix", "plyr", "sjPlot", "sjlabelled", "sjmisc"]
+      "version": "1.2",
+      "sha256": "1j13sc4lklw4rnfrg62b26sy7rcw3spa0a0bzc0mrbvinsq7b5dc",
+      "depends": ["effsize", "formattable", "ggplot2", "htmlwidgets", "mefa", "plotrix", "sjPlot", "sjmisc"]
     },
     "regtools": {
       "name": "regtools",
@@ -102843,8 +106449,8 @@
     },
     "relations": {
       "name": "relations",
-      "version": "0.6-13",
-      "sha256": "1nnr0kcr3whbwzi36sg7wn46jp7r0hfkvcwlybvjsjhczcvc6ngq",
+      "version": "0.6-14",
+      "sha256": "176qybc6pl2lvrbqyvy6xwxhan5jdsdrpjly25vqf0bjynsv4kq2",
       "depends": ["cluster", "sets", "slam"]
     },
     "relcircle": {
@@ -103023,8 +106629,8 @@
     },
     "renv": {
       "name": "renv",
-      "version": "1.0.7",
-      "sha256": "01s5g4w96s0jz9xa1gdj8y4pfvz8cf3gg0kz2smh6f3l4f5baq3v",
+      "version": "1.0.11",
+      "sha256": "09dyr3bka8540k1lq1kyvvvrkj32ck2dw5ys796qjwhfz38jdwap",
       "depends": []
     },
     "renz": {
@@ -103047,8 +106653,8 @@
     },
     "repeated": {
       "name": "repeated",
-      "version": "1.1.8",
-      "sha256": "07bm52dwkd4hpk57k7rlmcac2kfb8ri2znss2bcvjasy4pacm3jd",
+      "version": "1.1.10",
+      "sha256": "09zpjw2f44vabhxdk2mgcr8xx8hyxgfmszgdnavg2xj77dc948wr",
       "depends": ["rmutil"]
     },
     "repec": {
@@ -103203,9 +106809,9 @@
     },
     "reproducible": {
       "name": "reproducible",
-      "version": "2.1.0",
-      "sha256": "0axrhjzd8wv17f2djx6yg8f4kiwrcs267jwj4h4a10jykqrl9p4v",
-      "depends": ["data_table", "digest", "filelock", "fpCompare", "fs", "lobstr"]
+      "version": "2.1.2",
+      "sha256": "1b9q0dbsl1vazm3hxjqvkacq3bd9zkln9mnz58x8cz1njz3f2cf0",
+      "depends": ["cli", "data_table", "digest", "filelock", "fpCompare", "fs", "lobstr"]
     },
     "reproj": {
       "name": "reproj",
@@ -103257,9 +106863,9 @@
     },
     "rerddap": {
       "name": "rerddap",
-      "version": "1.1.0",
-      "sha256": "0s3xgk7z2j6g5f67j899f6d49igx1si562mbfqywba830a3ixn40",
-      "depends": ["crul", "data_table", "digest", "dplyr", "hoardr", "jsonlite", "lubridate", "ncdf4", "tibble", "xml2"]
+      "version": "1.2.0",
+      "sha256": "0kqh0q3ighlqj1bhd64hpf62jsgk92vq4gjm7qym2cjxcnc6sfq2",
+      "depends": ["crul", "data_table", "digest", "dplyr", "hoardr", "jsonlite", "lubridate", "nanoparquet", "ncdf4", "tibble", "xml2"]
     },
     "rerddapXtracto": {
       "name": "rerddapXtracto",
@@ -103275,8 +106881,8 @@
     },
     "resampledata": {
       "name": "resampledata",
-      "version": "0.3.1",
-      "sha256": "1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak",
+      "version": "0.3.2",
+      "sha256": "08wj28yy77raxsgw40r868dpzdkk0i0z931f45x0x2cv6zlvzdd2",
       "depends": []
     },
     "resampledata3": {
@@ -103335,8 +106941,8 @@
     },
     "resilience": {
       "name": "resilience",
-      "version": "2024.1.1",
-      "sha256": "0rzjj6bsi9dwis0k3zl329njcb6khr4a037k7i8s20v28qvs760c",
+      "version": "2024.1.2",
+      "sha256": "05rwyw77sws7d04gxafj41x5amih39lf63mb71vn6b16fgf6mg61",
       "depends": ["doParallel", "foreach", "nptest"]
     },
     "reslife": {
@@ -103353,10 +106959,16 @@
     },
     "resmush": {
       "name": "resmush",
-      "version": "0.2.0",
-      "sha256": "0d4mldxxgfypfm9p2b38iqr55j31vcyim018m7csqxplmvxrs45b",
+      "version": "0.2.1",
+      "sha256": "0g1z0scy49a6av77x907h1khl2ppvmlgy5myc30jgm8k11pakf58",
       "depends": ["cli", "curl", "httr2"]
     },
+    "resourcecode": {
+      "name": "resourcecode",
+      "version": "0.2.1",
+      "sha256": "1dsiyhsb0nbb1ylh44vxxhvycjj7rlyv2c39bl5l7ns8ad1sspjn",
+      "depends": ["Rcpp", "RcppArmadillo", "abind", "curl", "geosphere", "ggplot2", "jsonlite", "ncdf4", "pracma", "rlang", "sf", "tibble", "tidyr"]
+    },
     "resourcer": {
       "name": "resourcer",
       "version": "1.4.0",
@@ -103371,8 +106983,8 @@
     },
     "respirometry": {
       "name": "respirometry",
-      "version": "2.0.0",
-      "sha256": "0z8600bwh8c7kg69qf4nab26sqbxs73h24dfwk2fiispxvs1c83k",
+      "version": "2.0.1",
+      "sha256": "10pa1jv08125r6jhly27ilp5pmnmwsdwsl21i5na5l3glidrzbdn",
       "depends": ["birk", "dplyr", "lubridate", "marelac", "measurements", "minpack_lm", "plyr", "rlang", "seacarb", "segmented"]
     },
     "responsePatterns": {
@@ -103381,10 +106993,16 @@
       "sha256": "0ym6jbacsi4lv9rcw3k80wiil94ymivm55c4hz6hwbv54ybkzlcj",
       "depends": []
     },
+    "resquin": {
+      "name": "resquin",
+      "version": "0.0.2",
+      "sha256": "0h3wmmhx3bqy1li6nvgdxfvdr9k2yiw2b7h74jbc4mvpil747l7l",
+      "depends": ["cli", "purrr", "vctrs"]
+    },
     "restatapi": {
       "name": "restatapi",
-      "version": "0.23.1",
-      "sha256": "0sbyy35c7klwb9j99krmfr2hww16n51qmw1xdif32kmdq9sjiqdc",
+      "version": "0.23.2",
+      "sha256": "1779ish3ny48961fp0fz9d22f72iqx4np0h34z5hjqah1g5pfjcb",
       "depends": ["data_table", "rjson", "xml2"]
     },
     "restatis": {
@@ -103425,9 +107043,9 @@
     },
     "restriktor": {
       "name": "restriktor",
-      "version": "0.5-80",
-      "sha256": "1dpkwwkww19pr57rqx77g8q1b0chflyihgb4nsdkaizgc5mh5r04",
-      "depends": ["MASS", "boot", "ggplot2", "glue", "gridExtra", "ic_infer", "lavaan", "mvtnorm", "norm", "pbapply", "quadprog", "scales", "tmvtnorm"]
+      "version": "0.6-10",
+      "sha256": "0v8mnccvgsayaqfggqchxfp523l72sinw5mxqmcg80s85rkvsn0x",
+      "depends": ["MASS", "boot", "future", "future_apply", "ggplot2", "gridExtra", "lavaan", "mvtnorm", "norm", "progressr", "quadprog", "scales", "tmvtnorm"]
     },
     "result": {
       "name": "result",
@@ -103461,14 +107079,14 @@
     },
     "rethnicity": {
       "name": "rethnicity",
-      "version": "0.2.5",
-      "sha256": "0v2v2vajidw9nv1c9drglyyy4smxz740zx3kvl77pn9djf2im85v",
-      "depends": ["Rcpp", "RcppEigen", "RcppThread", "cli"]
+      "version": "0.2.6",
+      "sha256": "1wmy0anrcz2ww028k5i7fcfa5vyl7gzb1qyymh6xdpgijk4b32rr",
+      "depends": ["Rcpp", "RcppEigen", "RcppThread", "cli", "rlang"]
     },
     "reticulate": {
       "name": "reticulate",
-      "version": "1.38.0",
-      "sha256": "13favs31kzzff7ii0fxsdwvwb3iijasn2mg57ghcv8si4cz32byb",
+      "version": "1.40.0",
+      "sha256": "1n1858s5091hi8b3xnvsgl8hcngj4sl73hj1f44qw040cjb7pzfd",
       "depends": ["Matrix", "Rcpp", "RcppTOML", "here", "jsonlite", "png", "rappdirs", "rlang", "withr"]
     },
     "retriever": {
@@ -103545,9 +107163,9 @@
     },
     "reverseR": {
       "name": "reverseR",
-      "version": "0.1",
-      "sha256": "0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw",
-      "depends": ["DT", "knitr", "markdown", "shiny"]
+      "version": "0.2",
+      "sha256": "1rgp0i4f332w6bshaw0vjch7pgs2jsxqv2292281p2j6wsm9c99b",
+      "depends": ["L1pack", "boot", "boot_pval", "isotree", "quantreg", "robustbase"]
     },
     "revert": {
       "name": "revert",
@@ -103665,9 +107283,9 @@
     },
     "rfishbase": {
       "name": "rfishbase",
-      "version": "4.1.2",
-      "sha256": "1v0dzgzxl1p6ay60z0dfmi499hzywi5k4vdrf5ag4q6zvrk0vp8w",
-      "depends": ["DBI", "contentid", "dbplyr", "dplyr", "duckdb", "fs", "glue", "jsonlite", "magrittr", "memoise", "progress", "purrr", "readr", "rlang", "rstudioapi", "stringr", "tibble"]
+      "version": "5.0.0",
+      "sha256": "0bpzwsvg9d09xfpscjnyw49m46vam3dvl35rkdfc77zn18gabip8",
+      "depends": ["dplyr", "duckdbfs", "glue", "jsonlite", "magrittr", "memoise", "purrr", "rlang", "stringr"]
     },
     "rfishdraw": {
       "name": "rfishdraw",
@@ -103755,8 +107373,8 @@
     },
     "rgbif": {
       "name": "rgbif",
-      "version": "3.8.0",
-      "sha256": "1s1cdls4sv2ncxp8c9a2rah9yw95rlvfskzcg2bx74a282bd0p4b",
+      "version": "3.8.1",
+      "sha256": "0vmnccwy3dd043c59s9k7y6r40bb7blvn94hiz7sb1vqc37jiphc",
       "depends": ["R6", "crul", "data_table", "ggplot2", "jsonlite", "lazyeval", "magrittr", "oai", "tibble", "whisker", "wk", "xml2"]
     },
     "rgdax": {
@@ -103791,20 +107409,14 @@
     },
     "rgenoud": {
       "name": "rgenoud",
-      "version": "5.9-0.10",
-      "sha256": "1sfd59lislwcb81j56a5z9b1d62r69hb6gg05g9x4zh919jfwi76",
+      "version": "5.9-0.11",
+      "sha256": "12pf7kvyvly0aqrk84k07cx7gnqmnrpfzs41ys960gx70lzf77f6",
       "depends": []
     },
-    "rgeoboundaries": {
-      "name": "rgeoboundaries",
-      "version": "1.3",
-      "sha256": "1hw96fq781zfyy0gq0flpizd6aq0av2hpvrcsvyh43n3vjfhy2n3",
-      "depends": ["countrycode", "crul", "glue", "hoardr", "jsonlite", "lifecycle", "memoise", "sf"]
-    },
     "rgeoda": {
       "name": "rgeoda",
-      "version": "0.0.10-4",
-      "sha256": "18rcrlah1iaqvf90cymh71c8wpgy3yxlwlq84waxilpccwhd68x0",
+      "version": "0.0.11-1",
+      "sha256": "0p9r8l4wpcchjnbxmhnkc1x1jppsdsph6ynz9wcs2774c1vm0zmg",
       "depends": ["BH", "Rcpp", "digest", "sf"]
     },
     "rgeomstats": {
@@ -103833,8 +107445,8 @@
     },
     "rgl": {
       "name": "rgl",
-      "version": "1.3.1",
-      "sha256": "0jbda1b4lrkcpdld369687pm7isy69l5sx1wg2yrpvvzvmcppslz",
+      "version": "1.3.14",
+      "sha256": "15f3v6b62bpm0k3hgj5aza24yd5k7r4jp38nydyil82wpbhgfi4s",
       "depends": ["R6", "base64enc", "htmltools", "htmlwidgets", "jsonlite", "knitr", "magrittr", "mime"]
     },
     "rgl_cry": {
@@ -103845,8 +107457,8 @@
     },
     "rgl2gltf": {
       "name": "rgl2gltf",
-      "version": "1.0.3",
-      "sha256": "0krn4dp8xf6z5363agz42v4dwhhxdrxpqzhmf9yd8xl2l3yj6pfp",
+      "version": "1.0.7",
+      "sha256": "0vipb7zal7svz4rrnzzf4qiijfd832f363aibhr2xs8bdsli7g3q",
       "depends": ["R6", "base64enc", "jsonlite", "rgl"]
     },
     "rglobi": {
@@ -103899,8 +107511,8 @@
     },
     "rgplates": {
       "name": "rgplates",
-      "version": "0.4.0",
-      "sha256": "1yrqx0m9va1izszpz6s2vd3hx5db9p4hsbj3i1ismd5pryb4xk1j",
+      "version": "0.5.0",
+      "sha256": "1mxr7h42cbcpapm976c3pwsvhkqfm38kxcpms2pr79blgb2yd12j",
       "depends": ["sf"]
     },
     "rgraph6": {
@@ -103911,8 +107523,8 @@
     },
     "rgrass": {
       "name": "rgrass",
-      "version": "0.4-3",
-      "sha256": "1zn549yas4j8m9qn3c0zsa0qfbc221v7q612rhb5rg45jw2bfy19",
+      "version": "0.4-4",
+      "sha256": "00vbnc5p8fffkxl2bg4p5mvkygp3hqqlsmfqcixgs8mpigqyp04a",
       "depends": ["xml2"]
     },
     "rgsp": {
@@ -103965,9 +107577,9 @@
     },
     "rhino": {
       "name": "rhino",
-      "version": "1.9.0",
-      "sha256": "0s7l23zmdskidqhc49j77qxi1nj321q5rgdayq91fdg1vcchrwvp",
-      "depends": ["box", "box_linters", "cli", "config", "fs", "glue", "lintr", "logger", "purrr", "renv", "rstudioapi", "sass", "shiny", "styler", "testthat", "withr", "yaml"]
+      "version": "1.10.1",
+      "sha256": "15lbn4ymhjqhhklprs2zxx8qm1gy0vx54zycn25jpq633i7jczsf",
+      "depends": ["box", "box_linters", "box_lsp", "cli", "config", "fs", "glue", "lintr", "logger", "purrr", "renv", "rstudioapi", "sass", "shiny", "styler", "testthat", "withr", "yaml"]
     },
     "rhmc": {
       "name": "rhmc",
@@ -104037,8 +107649,8 @@
     },
     "rib": {
       "name": "rib",
-      "version": "0.20.0",
-      "sha256": "03nj88x8zbspadprqhzcs8781cmp5bkl4gdrncbl4lzcjdi4mn0h",
+      "version": "0.23.1",
+      "sha256": "17wjqyhjz2rdqg7vhcms50pjhm1k4vprwy14p5k8i8p90f7p5hwf",
       "depends": ["R6"]
     },
     "ribd": {
@@ -104047,6 +107659,12 @@
       "sha256": "1g378kpi6660176d64r84kw8zk662sai83r33ayjxbfn6w8s48xy",
       "depends": ["glue", "kinship2", "pedtools", "slam"]
     },
+    "rice": {
+      "name": "rice",
+      "version": "0.4.0",
+      "sha256": "1hzgm5fip9ircf2nzr5zmyw7vjr4nl7i13wyabh7p2qivcb93y6w",
+      "depends": ["ggplot2", "rintcal", "rlang", "rnaturalearth", "rnaturalearthdata"]
+    },
     "ricegeneann": {
       "name": "ricegeneann",
       "version": "1.0.2",
@@ -104097,9 +107715,9 @@
     },
     "ridigbio": {
       "name": "ridigbio",
-      "version": "0.3.8",
-      "sha256": "1202w1gf77xnbgiwjyajjf2bvi879q4nlfnq6fwd03bzmypdn675",
-      "depends": ["httr", "jsonlite", "plyr"]
+      "version": "0.4.1",
+      "sha256": "0wrxi3flazjdwd5pf76ix7cmdaxbb2k9jccgn861ax98hjf4s7pg",
+      "depends": ["cowplot", "httr", "jsonlite", "kableExtra", "leaflet", "plyr", "tidyverse"]
     },
     "ridittools": {
       "name": "ridittools",
@@ -104139,8 +107757,8 @@
     },
     "rim": {
       "name": "rim",
-      "version": "0.6.4",
-      "sha256": "0i4xb56kj4w9hd5i4g42y1ml6yy3p94lsmfm5mlkwixg8f25hhwj",
+      "version": "0.7.0",
+      "sha256": "05bi61zwrmwd3nm5jvmlaq8cxwabpb3xfji45q2wggvbgj63wm9f",
       "depends": ["GlobalOptions", "R6", "Rcpp", "knitr"]
     },
     "rimu": {
@@ -104163,8 +107781,8 @@
     },
     "ring": {
       "name": "ring",
-      "version": "1.0.5",
-      "sha256": "0mvrmh0axqlrdq3y5qaxydbindhv34gm4jagmq0bchrdvh1db2s4",
+      "version": "1.0.6",
+      "sha256": "0mmjlbmv46wz2ph2cmkxrn1kldih581wpfj8398vrajajkx8k35l",
       "depends": ["R6"]
     },
     "ringostat": {
@@ -104175,8 +107793,8 @@
     },
     "rintcal": {
       "name": "rintcal",
-      "version": "0.6.4",
-      "sha256": "0gc6wzmhvbmhvcxl17bhdzcms5zqvc7bl2s2jbhcqr010zignybs",
+      "version": "1.1.1",
+      "sha256": "0b5rc0b6crgc6830k30yjiivlbpys957yq494amsdl2x1aaap426",
       "depends": ["data_table", "jsonlite"]
     },
     "rintimg": {
@@ -104193,14 +107811,14 @@
     },
     "rio": {
       "name": "rio",
-      "version": "1.2.1",
-      "sha256": "0iqfgic57qzbgqqxgfrccxwi05zknlgr5v929qqmb4mxx3569fmw",
+      "version": "1.2.3",
+      "sha256": "1annh9zsfskizr2idylgvqm41cfzldn56bh9vkzxqqvznka7k123",
       "depends": ["R_utils", "curl", "data_table", "foreign", "haven", "lifecycle", "readr", "readxl", "tibble", "writexl"]
     },
     "rioja": {
       "name": "rioja",
-      "version": "1.0-6",
-      "sha256": "029p70d3ih5prnjxrk60rnqnfky1xkajmq6ldf6sz8bq6idkn2d3",
+      "version": "1.0-7",
+      "sha256": "1xmw12hg8q37bxzh0x9wbk9nbi9mx9q40v734ap1azq0c4bf2k0k",
       "depends": ["mgcv", "vegan"]
     },
     "rioplot": {
@@ -104319,8 +107937,8 @@
     },
     "riverdist": {
       "name": "riverdist",
-      "version": "0.16.3",
-      "sha256": "0ai29wb3ah27v58xqzhip3kaj7zhkzrsi4300n9kf7yvb2y018gp",
+      "version": "0.17.1",
+      "sha256": "1c6m8py0fpqc13dya63dvk6h36hmiq6y0g9j694lhrxy71422b5p",
       "depends": ["sf"]
     },
     "rivernet": {
@@ -104331,9 +107949,9 @@
     },
     "rivnet": {
       "name": "rivnet",
-      "version": "0.4.2",
-      "sha256": "1mzhxf3xirblbrz13w29970ja9ldhsfjk2pszj86z39dyby17dj0",
-      "depends": ["OCNet", "Rcpp", "curl", "elevatr", "fields", "raster", "sf", "spam", "terra", "traudem"]
+      "version": "0.5.0",
+      "sha256": "19ncnyfhh1rmq2xp0779j9fp7cfv99jam7ac5l0wzyp087f4w9g0",
+      "depends": ["OCNet", "Rcpp", "curl", "elevatr", "fields", "parallelly", "raster", "sf", "spam", "terra", "traudem"]
     },
     "rivr": {
       "name": "rivr",
@@ -104341,16 +107959,28 @@
       "sha256": "10k4cqrlzcy5g0yqbkrzxfz0dwsnf8kgmfq011lj13kxpb38bpvy",
       "depends": ["Rcpp"]
     },
+    "rix": {
+      "name": "rix",
+      "version": "0.12.4",
+      "sha256": "0m2njhb9cbl9qvrvwxjjh07416diw4r5zbdnrdxv0szpb7s58i09",
+      "depends": ["codetools", "curl", "jsonlite", "sys"]
+    },
     "rjade": {
       "name": "rjade",
       "version": "0.1.1",
       "sha256": "0wv1vpy8ql1r9ya5mfqxdj7jv5wk029g8hjjp0xqp8dm507vj11x",
       "depends": ["V8"]
     },
+    "rjaf": {
+      "name": "rjaf",
+      "version": "0.1.1",
+      "sha256": "0053nrd7pxzj67aafx9s6xv34wdd2bgg50pnc7q4bbi9ynyz8r1l",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "dplyr", "forcats", "magrittr", "randomForest", "ranger", "readr", "rlang", "stringr", "tibble", "tidyr"]
+    },
     "rjags": {
       "name": "rjags",
-      "version": "4-15",
-      "sha256": "188qxyanny4yb1cq8hrz0y7pjafgvj0vhly0gaw271dam8glrk9m",
+      "version": "4-16",
+      "sha256": "1rz7qx5prkikrvfcj3ps0sxsj44kgpqairj4zwcn5qlsa4z3k79n",
       "depends": ["coda"]
     },
     "rjdmarkdown": {
@@ -104391,8 +108021,8 @@
     },
     "rjson": {
       "name": "rjson",
-      "version": "0.2.21",
-      "sha256": "1qm27r1w677zg31gsiln60hcciszbymkw78cnaq7s36cbk9mcawq",
+      "version": "0.2.23",
+      "sha256": "0j0gbwd4cn1f7fb6ml14jr3m38ny1y62gnh1cxz6bvalr1sla0sm",
       "depends": []
     },
     "rjsoncons": {
@@ -104511,14 +108141,14 @@
     },
     "rlibkriging": {
       "name": "rlibkriging",
-      "version": "0.8-0.1",
-      "sha256": "07k0vb21bk83ygvgks4fspfik5zjwlqilwjy2rjzimhikx87srgk",
+      "version": "0.9-0.4",
+      "sha256": "1d1i1xk2vd80nc8w6n8gxy3a5mxxvbb7vkk425mh68c5qlwgxhrk",
       "depends": ["DiceKriging", "Rcpp", "RcppArmadillo"]
     },
     "rliger": {
       "name": "rliger",
-      "version": "2.0.1",
-      "sha256": "1903jylhv6pb87p4zywx8b5aqvf3c96lpx479r1c58lbc0i3f5p1",
+      "version": "2.1.0",
+      "sha256": "0x3f11zdixgxxlwrd0qrwfp10rssyfs8pcwz5wclqzj6s7f9zdqn",
       "depends": ["ComplexHeatmap", "Matrix", "RANN", "RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "Rtsne", "S4Vectors", "circlize", "cli", "cowplot", "dplyr", "ggplot2", "hdf5r", "leidenAlg", "lifecycle", "magrittr", "rlang", "scales", "uwot", "viridis"]
     },
     "rlinkedinads": {
@@ -104583,8 +108213,8 @@
     },
     "rmacrostrat": {
       "name": "rmacrostrat",
-      "version": "0.0.1",
-      "sha256": "1db884smxz6vymvm7ihm63gvwiv8hpragk0cmjzpfw6qrl76sn40",
+      "version": "1.0.0",
+      "sha256": "19q9azaskbnd8bph8lb7fpvmgn0mb1b2xsmfm1iq8mjd18iigv60",
       "depends": ["curl", "geojsonsf", "httr", "jsonlite", "sf"]
     },
     "rmake": {
@@ -104619,8 +108249,8 @@
     },
     "rmarkdown": {
       "name": "rmarkdown",
-      "version": "2.28",
-      "sha256": "11d0fpzcwgi84dfbvjpg33gn155g3m2pa1jsih1h6hidm41sa0m1",
+      "version": "2.29",
+      "sha256": "0a0995dc0h4dvdkb0ivd23pnwzyrr9l59fg3ssm9r1kc662sqqk6",
       "depends": ["bslib", "evaluate", "fontawesome", "htmltools", "jquerylib", "jsonlite", "knitr", "tinytex", "xfun", "yaml"]
     },
     "rmass2": {
@@ -104637,8 +108267,8 @@
     },
     "rmcfs": {
       "name": "rmcfs",
-      "version": "1.3.5",
-      "sha256": "0rbq2b9fw1x44v7ifxp8qgp4yciinw2sw9mqp4ms5jsxznpi2pi6",
+      "version": "1.3.6",
+      "sha256": "0hj3nnbihvy37ky89x8frfd95slh8ff6l6msr0xdm03bl8jqcd72",
       "depends": ["data_table", "dplyr", "ggplot2", "gridExtra", "igraph", "rJava", "reshape2", "stringi", "yaml"]
     },
     "rmcorr": {
@@ -104661,8 +108291,8 @@
     },
     "rmdfiltr": {
       "name": "rmdfiltr",
-      "version": "0.1.3",
-      "sha256": "0llnn4pdfznidalm4f7fpyxbhzsqv1096fkbsl1pgf4f7ll6w7a7",
+      "version": "0.1.5",
+      "sha256": "05czq9nvs66zd8wgmy5bvk0k1qfspf3imwxs25gn4d3w188klhnv",
       "depends": ["assertthat", "rmarkdown"]
     },
     "rmdformats": {
@@ -104733,8 +108363,8 @@
     },
     "rminer": {
       "name": "rminer",
-      "version": "1.4.6",
-      "sha256": "1xydc43is756cy4vsm4k4micj88hhqgyrhb8cmvgv1y8zfrzg2qz",
+      "version": "1.4.8",
+      "sha256": "1z2nfnsj8k066amawnydhhmjzhni4w6hjw7xzhvikfdwzxhq2kjx",
       "depends": ["Cubist", "MASS", "adabag", "e1071", "glmnet", "kernlab", "kknn", "lattice", "mda", "nnet", "party", "plotrix", "pls", "randomForest", "rpart", "xgboost"]
     },
     "rminizinc": {
@@ -104775,8 +108405,8 @@
     },
     "rms": {
       "name": "rms",
-      "version": "6.8-1",
-      "sha256": "0sjr4lwvh05ji8s6jk2f4imnyzsaw8f1iqds8b1661s395bm8f4x",
+      "version": "6.9-0",
+      "sha256": "1q3wdbgf190phc0qwnl18h7ydymy2ffz58zwqszd1a3d7kidcqwz",
       "depends": ["Hmisc", "MASS", "SparseM", "cluster", "colorspace", "digest", "ggplot2", "htmlTable", "htmltools", "knitr", "multcomp", "nlme", "polspline", "quantreg", "rpart", "survival"]
     },
     "rmsb": {
@@ -104859,8 +108489,8 @@
     },
     "rnassqs": {
       "name": "rnassqs",
-      "version": "0.6.1",
-      "sha256": "00daka4pgvmipqq3151jj35fsicpfc06mnim8mm5jx5cyqcvilf7",
+      "version": "0.6.3",
+      "sha256": "0l7fk172xfkc1fksf2f83201s1xrnfwcpf6mviiw7whyb9v80my1",
       "depends": ["httr", "jsonlite"]
     },
     "rnaturalearth": {
@@ -104899,16 +108529,10 @@
       "sha256": "14fwf4pqdjrrbnf2s9i0dbmqk2xv0mxs3zz1j1pwnm46fiiawa2g",
       "depends": []
     },
-    "rngSetSeed": {
-      "name": "rngSetSeed",
-      "version": "0.3-3",
-      "sha256": "1ymhrfv83nr2mkqncbi7k8h43xxz53r50vp215hakh093n5im71k",
-      "depends": []
-    },
     "rngWELL": {
       "name": "rngWELL",
-      "version": "0.10-9",
-      "sha256": "1jyanz789ylbz9a2agqv5c674zrfqn0k7s9d5dfia63dpq8cqscr",
+      "version": "0.10-10",
+      "sha256": "0vspzmic0d1zjfywaa59a4hvp4p1mdifz818sjhmaab27379ji44",
       "depends": []
     },
     "rngtools": {
@@ -104935,10 +108559,16 @@
       "sha256": "1qgmy4sqs14zbv1mm6cany6xxk0hsaaiblsd4am85qj8gbjflm3f",
       "depends": ["BH", "Matrix", "Rcpp", "dqrng", "sitmo"]
     },
+    "rnnmf": {
+      "name": "rnnmf",
+      "version": "0.3.0",
+      "sha256": "1i97al4gfzdv1vg7bl99pbfq3f71vhssqnxn09qkzbwmahqf09y2",
+      "depends": ["Matrix"]
+    },
     "rnpn": {
       "name": "rnpn",
-      "version": "1.2.8.0",
-      "sha256": "1svamnpfs76551cil1grch4nr6716j2qncdq7nqzp3ni5ia8522w",
+      "version": "1.2.9.0",
+      "sha256": "0dlxc0gr4bxkwkah0sfwxhqkfzg8v4mvwr37xxc7i43jbvyd7c0w",
       "depends": ["XML", "curl", "data_table", "httr", "jsonlite", "magrittr", "plyr", "raster", "sp", "tibble"]
     },
     "rnr": {
@@ -104955,8 +108585,8 @@
     },
     "roadoi": {
       "name": "roadoi",
-      "version": "0.7.2",
-      "sha256": "1q2mkd7r5aqvahx7rrzv58nd6d13gvlw7kjidqhm7z89na94pn8w",
+      "version": "0.7.3",
+      "sha256": "1hx297xfy4j12a74m2b4rnbalhaavlywb11q1frfsmzdiakxsfjg",
       "depends": ["dplyr", "httr", "jsonlite", "miniUI", "plyr", "purrr", "rlang", "shiny", "tibble", "tidyr"]
     },
     "roads": {
@@ -105027,20 +108657,20 @@
     },
     "robmed": {
       "name": "robmed",
-      "version": "1.0.2",
-      "sha256": "0ajr7ybaf4d0nwj0cbbdrbydidr9vbp33bv21iwcqr0cpgn80dwj",
+      "version": "1.2.0",
+      "sha256": "081ykspsaw4abr7b8viam4fzrs27v9c0dhpis7bylj66l3109sh1",
       "depends": ["boot", "ggplot2", "quantreg", "robustbase", "sn"]
     },
     "robmedExtra": {
       "name": "robmedExtra",
-      "version": "0.1.0",
-      "sha256": "12ld19f7hc7xdslyd3z75h54lqg3p5saliz4pgk3m7rj3m3i24if",
+      "version": "0.1.1",
+      "sha256": "0k7w9hjz760wam4kakcmibqf0lynnv8ks782bc5fzirsqdgpdd0w",
       "depends": ["DT", "flextable", "ggplot2", "officer", "robmed", "shiny"]
     },
     "robmixglm": {
       "name": "robmixglm",
-      "version": "1.2-3",
-      "sha256": "18xcbxj3jl9w5i74vy5i2ha7zsln4sgh8anv9n7haa7zilflvrx3",
+      "version": "1.2-4",
+      "sha256": "10l0w7a2p5lids1idw8z6qc6rqahbbidgkqk3fb0b0yakcppvycn",
       "depends": ["MASS", "Rcpp", "VGAM", "actuar", "bbmle", "boot", "doParallel", "doRNG", "fastGHQuad", "foreach", "numDeriv"]
     },
     "robnptests": {
@@ -105063,15 +108693,21 @@
     },
     "robotoolbox": {
       "name": "robotoolbox",
-      "version": "1.3.2",
-      "sha256": "0aj7819za3abw40rflvpwndf8i8gpmqmzb691km7shy9xq4sq48s",
+      "version": "1.4",
+      "sha256": "0j62dqix9awb3dxm2afzgix4pkinirxcaan8q3b63bcwzpphy4df",
       "depends": ["RcppSimdJson", "cli", "crul", "data_table", "dm", "dplyr", "glue", "labelled", "purrr", "readr", "rlang", "stringi", "tibble", "tidyr", "tidyselect"]
     },
     "robotstxt": {
       "name": "robotstxt",
-      "version": "0.7.13",
-      "sha256": "1x5sachf7g5c2aj1mg3z2lf60723k1ad80bdr89szkgi92jkfal7",
-      "depends": ["future", "future_apply", "httr", "magrittr", "spiderbar", "stringr"]
+      "version": "0.7.15",
+      "sha256": "1pjspm9cw25mmsg7hxpp51ni76wlqi72avkar1fg5j7x8j5xj8ch",
+      "depends": ["future_apply", "httr", "magrittr", "spiderbar", "stringr"]
+    },
+    "robqda": {
+      "name": "robqda",
+      "version": "1.0",
+      "sha256": "0pclh76g3p51xcijp8q5adkm78h47gyfr6k3696ily1h4vq9qrpz",
+      "depends": ["MASS", "Rfast", "Rfast2"]
     },
     "robreg3S": {
       "name": "robreg3S",
@@ -105105,8 +108741,8 @@
     },
     "robsurvey": {
       "name": "robsurvey",
-      "version": "0.6",
-      "sha256": "0y1yw89ms0805iixv5xz9sq8zbdr7l89hb1nhwccdn7v62ydpxip",
+      "version": "0.7",
+      "sha256": "1jvjmgykslc8wbirpi5ysnpjrxp6xf9v4cpzma6bf6zq9cf3r5q4",
       "depends": ["KernSmooth", "survey"]
     },
     "robumeta": {
@@ -105163,10 +108799,16 @@
       "sha256": "0wy0fv7v03lsvzjhg5m6g331lhqsd8f1adgjw0r6bwdkkak2l2gl",
       "depends": ["robustbase"]
     },
+    "robustarima": {
+      "name": "robustarima",
+      "version": "0.2.7",
+      "sha256": "1f1bp9mqkrz91j1jfq2w4wp1dps0rni9l0jpa0r0pflbqlhjhdz3",
+      "depends": ["splusTimeDate", "splusTimeSeries"]
+    },
     "robustbase": {
       "name": "robustbase",
-      "version": "0.99-3",
-      "sha256": "11h0v9q44i8gl55q40aszmzn7214pljpzncgcws9pvgbypf17g31",
+      "version": "0.99-4-1",
+      "sha256": "14gz260amdy60shm3bfsw214471by27yac6r66fs6rjgc7kxw7j8",
       "depends": ["DEoptimR"]
     },
     "robustbetareg": {
@@ -105201,8 +108843,8 @@
     },
     "robustmatrix": {
       "name": "robustmatrix",
-      "version": "0.1.2",
-      "sha256": "1lq7gniz41sidc6i6clbrq7hyw6dj2y886a24w90ls7f5cgyd0dl",
+      "version": "0.1.3",
+      "sha256": "1qhb2wxzb0wh0b9c7jj42aanmyxd22b0hn5gip3s9q2ypdzhnllc",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack"]
     },
     "robustmeta": {
@@ -105369,9 +109011,9 @@
     },
     "rollama": {
       "name": "rollama",
-      "version": "0.1.0",
-      "sha256": "1sldaddmklqljfmmxqri0xfbsa977qg3kgymcprkybd59wbxxrd4",
-      "depends": ["callr", "cli", "dplyr", "httr2", "jsonlite", "prettyunits", "purrr", "rlang", "tibble"]
+      "version": "0.2.0",
+      "sha256": "1ck5xbqpw6kb64gipzcdvr52vkyc4hx2pyqks32dfr59lkglr9lz",
+      "depends": ["callr", "cli", "dplyr", "httr2", "jsonlite", "prettyunits", "purrr", "rlang", "tibble", "withr"]
     },
     "rollbar": {
       "name": "rollbar",
@@ -105397,6 +109039,12 @@
       "sha256": "099nc02gxcd8vma9lpdiw449bcq7shp8p5z5ldj9bawll32k91sz",
       "depends": ["dplyr", "magrittr"]
     },
+    "rollup": {
+      "name": "rollup",
+      "version": "0.1.0",
+      "sha256": "1d22kp4qdw9wj365y9q375mhkczadfyjn8k1py4c84hnbp680kba",
+      "depends": ["dplyr", "magrittr", "rlang", "sparklyr", "tidyr"]
+    },
     "roloc": {
       "name": "roloc",
       "version": "0.1-2",
@@ -105457,6 +109105,12 @@
       "sha256": "1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl",
       "depends": ["httr", "jsonlite"]
     },
+    "ropenmeteo": {
+      "name": "ropenmeteo",
+      "version": "0.1",
+      "sha256": "0y07dqmcn31gjghvzwgnl8311iqc4yjc5w3s6rb0z82z1ag1s7y2",
+      "depends": ["dplyr", "glue", "httr2", "imputeTS", "jsonlite", "lubridate", "purrr", "stringr", "tidyr"]
+    },
     "ropensecretsapi": {
       "name": "ropensecretsapi",
       "version": "1.0.1",
@@ -105499,6 +109153,12 @@
       "sha256": "1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp",
       "depends": ["dplyr", "magrittr"]
     },
+    "roseRF": {
+      "name": "roseRF",
+      "version": "0.1.0",
+      "sha256": "1fc8vj765haf7fjldapsy8my950y2n67pbp4q60wxbcql14si6na",
+      "depends": ["ParamHelpers", "caret", "glmnet", "grf", "keras", "mgcv", "mlr", "ranger", "rpart", "tuneRanger", "xgboost"]
+    },
     "rosetta": {
       "name": "rosetta",
       "version": "0.3.12",
@@ -105525,8 +109185,8 @@
     },
     "rospca": {
       "name": "rospca",
-      "version": "1.1.0",
-      "sha256": "0my95jgza6irihdbsqj05sjfrhcy7705aca7j5qifkr21pk0n4dq",
+      "version": "1.1.1",
+      "sha256": "0vn930zg98pcr7x3m49bjkaw812v5l3gcb2dcrxf1h9xnv8fizy6",
       "depends": ["elasticnet", "mrfDepth", "mvtnorm", "pcaPP", "pracma", "robustbase", "rrcov"]
     },
     "rosv": {
@@ -105595,6 +109255,12 @@
       "sha256": "0xx2wai9pdq0g7x8xmwlf48wxv4v18c7ymzvzxpvw1gggppmbk69",
       "depends": []
     },
+    "roundwork": {
+      "name": "roundwork",
+      "version": "0.0.1",
+      "sha256": "0pi2gr1qn4sw0ganysi78cbrnnhss9ha0rfs0jvx9pd3j4n1j6gz",
+      "depends": ["cli", "dplyr", "magrittr", "purrr", "rlang", "stringr", "tibble"]
+    },
     "roundyh": {
       "name": "roundyh",
       "version": "0.1.0",
@@ -105613,6 +109279,12 @@
       "sha256": "1ciflhmavl24wk4kjbilmm70q6z8i02m36x4pyh4m3czhnpyyv03",
       "depends": ["roxygen2"]
     },
+    "roxy_shinylive": {
+      "name": "roxy.shinylive",
+      "version": "1.0.0",
+      "sha256": "1fa2c5d4cby193ls50n57im4iadv1kghkpm1a56bshgpgzc9ivph",
+      "depends": ["glue", "jsonlite", "lzstring", "roxygen2", "stringr"]
+    },
     "roxygen2": {
       "name": "roxygen2",
       "version": "7.3.2",
@@ -105645,14 +109317,14 @@
     },
     "roxytypes": {
       "name": "roxytypes",
-      "version": "0.1.0",
-      "sha256": "02i2ki8s2dfnr3qdvgmklgsh0aidrymi46gp2x1xx2xfs6bi4mrv",
+      "version": "0.1.2",
+      "sha256": "0cb6i93f9rramlzpcqb4g4mi2967fm0jp6qbmgxrwzh4ih1n8977",
       "depends": ["cli", "glue", "roxygen2"]
     },
     "rpact": {
       "name": "rpact",
-      "version": "4.0.0",
-      "sha256": "1mwsy5y917sihyq3i001hzz98zx5zvm8042inv072vxik2pybngc",
+      "version": "4.1.0",
+      "sha256": "1cjdrj1sbn4xv6mrkvr0n3cx3zqh1lqg1kp0vppndz3qqwxjql4w",
       "depends": ["R6", "Rcpp", "knitr", "rlang"]
     },
     "rpaleoclim": {
@@ -105705,9 +109377,9 @@
     },
     "rphylopic": {
       "name": "rphylopic",
-      "version": "1.4.0",
-      "sha256": "13kgk5icqs6n6v985p0r0ifiham0m7i2w4ds8pr52mvizg76ymmi",
-      "depends": ["curl", "ggplot2", "grImport2", "httr", "jsonlite", "knitr", "lifecycle", "pbapply", "png", "rsvg"]
+      "version": "1.5.0",
+      "sha256": "1flfxxmrn537f9vlnynrwjsjm3gak90m69jwrl5nms06y25wvyih",
+      "depends": ["curl", "ggplot2", "grImport2", "httr", "jsonlite", "knitr", "lifecycle", "pbapply", "png", "rsvg", "scales"]
     },
     "rpinterest": {
       "name": "rpinterest",
@@ -105741,8 +109413,8 @@
     },
     "rplum": {
       "name": "rplum",
-      "version": "0.4.0",
-      "sha256": "0fwzfbbg5dv0rg0w8xijn9zjrp5gclzrf8m2m8nla61dzbpn2jsx",
+      "version": "0.5.1",
+      "sha256": "1mrwvpq9pbp1fq797d8wy10syqki42mjbivbg8vlai1fyy4i0gpi",
       "depends": ["rbacon", "rintcal"]
     },
     "rpm": {
@@ -105777,9 +109449,9 @@
     },
     "rpostgis": {
       "name": "rpostgis",
-      "version": "1.5.1",
-      "sha256": "1fnizm0xb7div6mrg3s9a4mv8dbm6lrq9azjxi786261jmv3dbvg",
-      "depends": ["DBI", "RPostgreSQL", "purrr", "raster", "sf", "sp", "terra"]
+      "version": "1.6.0",
+      "sha256": "1mz2a0g6y94hzfvmbbykdbjw0qwi3n7w16f4k9zg3hbpzgq7864j",
+      "depends": ["DBI", "RPostgreSQL", "cli", "lifecycle", "sf", "terra"]
     },
     "rpql": {
       "name": "rpql",
@@ -105843,8 +109515,8 @@
     },
     "rpyANTs": {
       "name": "rpyANTs",
-      "version": "0.0.3",
-      "sha256": "1dmlpwx9x1gh2x0a4krp0v5a4km7pp65zalvbibb6r69iqmqr858",
+      "version": "0.0.4",
+      "sha256": "11044d5vi825g1b597hwkrw121m0q7vf5p5v17dq56zkrnr5jyx8",
       "depends": ["RNifti", "reticulate", "rpymat"]
     },
     "rpymat": {
@@ -105855,8 +109527,8 @@
     },
     "rqPen": {
       "name": "rqPen",
-      "version": "4.1.1",
-      "sha256": "112x6y6ykmd1isw19xdpzn8alf5llz6jp7l5pfi6vp22w27z852w",
+      "version": "4.1.2",
+      "sha256": "1fdl7s76kii0vwy69506h2nnjnq079zw8wjkrx41w3hg10pmiipd",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "Rdpack", "data_table", "hqreg", "hrqglas", "lifecycle", "plyr", "quantreg"]
     },
     "rqcanon": {
@@ -105889,6 +109561,12 @@
       "sha256": "0540xw33wxk4w73s234pc0ss6vffzdkz7wqlca67im9h4sph19y3",
       "depends": ["wrapr"]
     },
+    "rquest": {
+      "name": "rquest",
+      "version": "1.0.2",
+      "sha256": "08hyalcj8836ix830kr2ma2gaaq6cjn55kyish81wjmxzgl3sqal",
+      "depends": []
+    },
     "rr": {
       "name": "rr",
       "version": "1.4.2",
@@ -105933,8 +109611,8 @@
     },
     "rrcov": {
       "name": "rrcov",
-      "version": "1.7-5",
-      "sha256": "0cxhs0plbd8b01hmnpaphshhk34rw1bwg56rackb2pmngw3rbifz",
+      "version": "1.7-6",
+      "sha256": "1pj8w4w4yd730qy7bl8h3z7d5xj05avnq0fbj2gnxrz489yc18mq",
       "depends": ["lattice", "mvtnorm", "pcaPP", "robustbase"]
     },
     "rrcov3way": {
@@ -106071,8 +109749,8 @@
     },
     "rsconnect": {
       "name": "rsconnect",
-      "version": "1.3.1",
-      "sha256": "0msmrdw7933xics464asyy9v2gm5b4jb8gr4nfhy54x45n1qmpj7",
+      "version": "1.3.3",
+      "sha256": "07c532cnhp3hqy46zqbi2s0b8rkxygk5zlzz691l4klc1f1sbda8",
       "depends": ["PKI", "cli", "curl", "digest", "jsonlite", "lifecycle", "openssl", "packrat", "renv", "rlang", "rstudioapi", "yaml"]
     },
     "rscontract": {
@@ -106089,8 +109767,8 @@
     },
     "rscorecard": {
       "name": "rscorecard",
-      "version": "0.28.1",
-      "sha256": "090n5sw7r6qhcryi41agnh65mqny01s1a0h7m9ksf8mzvwpqdqv5",
+      "version": "0.30.0",
+      "sha256": "0vlm35ibaam4zasdya7b3jkgil1ysigq54rva8zzsn14cn6r7992",
       "depends": ["dplyr", "httr", "jsonlite", "lazyeval", "purrr", "tibble", "tidyr", "tidyselect"]
     },
     "rsdNE": {
@@ -106107,8 +109785,8 @@
     },
     "rsdmx": {
       "name": "rsdmx",
-      "version": "0.6-3",
-      "sha256": "0axy02p6kh67sc1nqp67sa1i2n3r24j1cdd3lczxzfkxms0qznc7",
+      "version": "0.6-4",
+      "sha256": "1gphviy39dqixjn8m77786kl2mfhsvvc73zsa96h1xgpn7w78f0s",
       "depends": ["R6", "XML", "httr", "plyr"]
     },
     "rseedcalc": {
@@ -106137,14 +109815,14 @@
     },
     "rshift": {
       "name": "rshift",
-      "version": "3.0.0",
-      "sha256": "0w82dqya4qmcdpin1d7pg2cri69qjsm1qhjn2gfpbs6wkd7m7mic",
+      "version": "3.1.1",
+      "sha256": "103sadb3fz6xysxmz1i3zvjawvb8wsdr2632f5m1rqibknjb6l94",
       "depends": ["dplyr", "ggplot2", "tibble"]
     },
     "rsi": {
       "name": "rsi",
-      "version": "0.2.1",
-      "sha256": "03vipq6ykq5px705r1ixaj02770rh6wpmk0zjw73zr04dzrg878n",
+      "version": "0.3.1",
+      "sha256": "0gcyzpr7am9hzc3741y90l70df32m0j744x2na0c9lv4pkp1a92k",
       "depends": ["future_apply", "glue", "httr", "jsonlite", "lifecycle", "proceduralnames", "rlang", "rstac", "sf", "terra", "tibble"]
     },
     "rsides": {
@@ -106197,8 +109875,8 @@
     },
     "rsmatrix": {
       "name": "rsmatrix",
-      "version": "0.2.8",
-      "sha256": "1yc9zhfpzadlk39z7lzxd26qmg9hq24c32md7bkny6yyrhy857sn",
+      "version": "0.2.9",
+      "sha256": "1wr2jidal5iynv9hiy0c62x6nq07ncc54c4qjdqbfan1116hw5rp",
       "depends": ["Matrix"]
     },
     "rsnell": {
@@ -106213,6 +109891,12 @@
       "sha256": "1ch8n35pa325ihgkld8j8mrgn631r9m1b10r68a08ydj1nxrjv9z",
       "depends": ["curl", "dplyr", "httr", "jsonlite", "lubridate", "purrr", "sf", "splitstackshape", "stringr"]
     },
+    "rsofun": {
+      "name": "rsofun",
+      "version": "5.0.0",
+      "sha256": "1d32bp9gq9if11g0qn25rjhj9rdffbh4s6cb8bvbn3091skakhaq",
+      "depends": ["BayesianTools", "GenSA", "dplyr", "magrittr", "multidplyr", "purrr", "tidyr"]
+    },
     "rsoi": {
       "name": "rsoi",
       "version": "0.5.6",
@@ -106251,8 +109935,8 @@
     },
     "rspm": {
       "name": "rspm",
-      "version": "0.6.0",
-      "sha256": "0jr4zqz0jw8i5zvp8sf5irsz08sbcs8d8jdvqlda9ajv42qmqhna",
+      "version": "0.6.1",
+      "sha256": "15ypr6r4kxi73dg3h6kssn5r3sq8q1fc2fxpj28h69qx9d9yryhl",
       "depends": []
     },
     "rsppfp": {
@@ -106269,9 +109953,9 @@
     },
     "rsq": {
       "name": "rsq",
-      "version": "2.6",
-      "sha256": "01b9rl2ng1sq0ibpfsf50agkwh01pfpw354vvgdjd0lzh9dxmsgp",
-      "depends": ["Deriv", "MASS", "Matrix", "deming", "lme4", "nlme"]
+      "version": "2.7",
+      "sha256": "1dnx7cn533wg5gqvggfpq3hfid924ccywxnw5sw0l50m4p0p1p5g",
+      "depends": ["Deriv", "MASS", "Matrix", "deming", "lme4", "mcr", "nlme"]
     },
     "rstac": {
       "name": "rstac",
@@ -106311,9 +109995,9 @@
     },
     "rstanemax": {
       "name": "rstanemax",
-      "version": "0.1.5",
-      "sha256": "0n15dw6bz7g5j5dng32zna1r4p4ywkmspc82q1b3lcg3zbjmda3f",
-      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "ggplot2", "magrittr", "purrr", "rstan", "rstantools", "tidyr"]
+      "version": "0.1.7",
+      "sha256": "0i3a54cxx2zhiiy8wk6wigm5v2kfz35i63sbprbssi531c4dlgcj",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "boot", "dplyr", "ggplot2", "magrittr", "posterior", "purrr", "rstan", "rstantools", "tidyr"]
     },
     "rstantools": {
       "name": "rstantools",
@@ -106341,9 +110025,9 @@
     },
     "rstpm2": {
       "name": "rstpm2",
-      "version": "1.6.3",
-      "sha256": "07q3n9hv8azwiipggyb6ykhvb8qy10s4nkp5irv76d54fsl7jq2y",
-      "depends": ["BH", "Rcpp", "RcppArmadillo", "bbmle", "deSolve", "fastGHQuad", "mgcv", "mvtnorm", "survival"]
+      "version": "1.6.6.1",
+      "sha256": "1rxzma2k7zhx57x0kjgznky6wn4686sz5182fnk33wls76ck8p2s",
+      "depends": ["BH", "Rcpp", "RcppArmadillo", "bbmle", "fastGHQuad", "mgcv", "mvtnorm", "survival"]
     },
     "rstream": {
       "name": "rstream",
@@ -106359,8 +110043,8 @@
     },
     "rstudioapi": {
       "name": "rstudioapi",
-      "version": "0.16.0",
-      "sha256": "1rjgxn7p15a69vfkhwrxywag6w9k4ccnklpvhr1sb1wy35ksizvl",
+      "version": "0.17.1",
+      "sha256": "029rbfdw9b57mcnx8yblgrwd79v47ky068mr3w9p61lnr21zjzk1",
       "depends": []
     },
     "rsubgroup": {
@@ -106377,14 +110061,14 @@
     },
     "rsurv": {
       "name": "rsurv",
-      "version": "0.0.1",
-      "sha256": "1xin45sc6zlap0w2ydq0ji4w3kz4ksvhark7vgim6vb1d1zv3py0",
-      "depends": ["Rdpack", "dplyr", "stabledist"]
+      "version": "0.0.2",
+      "sha256": "005fyfgmaf4rhx12fxv5rinc8v076qfj7f2i38d45rzs2lag4hgc",
+      "depends": ["MASS", "Rdpack", "bellreg", "dplyr", "stabledist"]
     },
     "rsurveycto": {
       "name": "rsurveycto",
-      "version": "0.2.0",
-      "sha256": "10ahwi1xiy2gw3abj6scrp1qdlqg3js4h9q2z6d7a5vwaxpz95hh",
+      "version": "0.2.1",
+      "sha256": "1s2slc7wlbrsvw0jnsimchypn6f8jmcs8fkc12a0f02lalgm21qn",
       "depends": ["checkmate", "cli", "curl", "data_table", "glue", "httr", "jsonlite", "lifecycle", "readxl", "rlang", "vctrs", "withr"]
     },
     "rsvd": {
@@ -106401,21 +110085,21 @@
     },
     "rsvg": {
       "name": "rsvg",
-      "version": "2.6.0",
-      "sha256": "0w29isj7n33vwacvk5h6ghgm9j3phghnz7a98b1xi60cyk08qi2b",
+      "version": "2.6.1",
+      "sha256": "0mf9916jnrhpqccz7qnybz0qp74q0yjcrpagyis21yipbilb0sky",
       "depends": []
     },
     "rswipl": {
       "name": "rswipl",
-      "version": "9.3.7.2",
-      "sha256": "1wyyvv8nrgfk811vbsixyiyhz0yq65bls420d5fl9rrcwzdv3rkj",
+      "version": "9.3.16",
+      "sha256": "09p0cyd904a0l644ydrj2ssbs6kimgcdk580qs2a9vb4x94dgjvk",
       "depends": ["Rcpp"]
     },
     "rsyncrosim": {
       "name": "rsyncrosim",
-      "version": "1.5.0",
-      "sha256": "0pg7i40m8qjcfwamb9prhkzyf4571jgnamqibxzd35n6vm6s9npy",
-      "depends": ["DBI", "RSQLite", "gtools", "lifecycle", "terra"]
+      "version": "2.0.1",
+      "sha256": "0s5nprv5nij08d5ha55q71j4lqbybk2g70n2sb5g88dlcq71xfqm",
+      "depends": ["DBI", "RSQLite", "gtools", "terra"]
     },
     "rsyntax": {
       "name": "rsyntax",
@@ -106449,10 +110133,16 @@
     },
     "rtables": {
       "name": "rtables",
-      "version": "0.6.9",
-      "sha256": "137c8ks15v1w19a3g7pvnwabzpj1vj277r46npr6ymr90ddb5ha7",
+      "version": "0.6.10",
+      "sha256": "1kjzxj5rgcpzyr86sq375j4hy322lfw6cnid7hfyxzwirmhzi684",
       "depends": ["checkmate", "formatters", "htmltools", "lifecycle", "magrittr", "stringi"]
     },
+    "rtabulator": {
+      "name": "rtabulator",
+      "version": "0.1.2",
+      "sha256": "0z2l8zxhx12pyhffz4x3n5glmg4ikjm1ijmq8dwwz0y7k3j82wri",
+      "depends": ["glue", "htmltools", "htmlwidgets", "purrr", "readr", "shiny"]
+    },
     "rtape": {
       "name": "rtape",
       "version": "2.2",
@@ -106491,8 +110181,8 @@
     },
     "rtgstat": {
       "name": "rtgstat",
-      "version": "0.3.2",
-      "sha256": "1alvs2gd0kp11vlnk6ql2hk6fm1mn5wdkm6p9c8amb1n6i3c097x",
+      "version": "0.3.4",
+      "sha256": "1mvl19a66z5bmm3vwk89vdwdznm96kazmxr2rndwngz94dsyc79y",
       "depends": ["cli", "dplyr", "httr2", "purrr", "snakecase", "stringr", "tidyr"]
     },
     "rticles": {
@@ -106503,8 +110193,8 @@
     },
     "rticulate": {
       "name": "rticulate",
-      "version": "1.7.3",
-      "sha256": "0h22ixngz4nw85s79ssanms9ysvx0kgp0srq2nvyfk4mm7g4hfi7",
+      "version": "1.7.4",
+      "sha256": "1z5hngx3vk5i1q2w2qpp6j0hwc5bagrq4k091dnnvv9kdrkvn0zh",
       "depends": ["dplyr", "ggplot2", "glue", "magrittr", "mgcv", "purrr", "readr", "rlang", "tibble", "tidymv", "tidyr", "tidyselect"]
     },
     "rtiddlywiki": {
@@ -106515,8 +110205,8 @@
     },
     "rtide": {
       "name": "rtide",
-      "version": "0.0.9",
-      "sha256": "0gr0j52jy7y1w1s0s88rjv9l85yvavypagmi0qw2ix9ca2xadlzl",
+      "version": "0.0.11",
+      "sha256": "17hr3s28im9hb9xzcwakqvm57s6y5sjz0l42dx5syh8yrskbf93c",
       "depends": ["abind", "chk", "dttr2", "tibble"]
     },
     "rties": {
@@ -106531,6 +110221,12 @@
       "sha256": "11m4czs6wiybdcck3b4s6nzm47zf029mdik7n013yihvxp4q6rbs",
       "depends": ["backports", "curl", "digest", "sys"]
     },
+    "rtiktoken": {
+      "name": "rtiktoken",
+      "version": "0.0.6",
+      "sha256": "0ykrwhf9h8mqy434w32gind3xfcvkrk5msk5f5i642l6nd6phcw5",
+      "depends": []
+    },
     "rtip": {
       "name": "rtip",
       "version": "1.1.1",
@@ -106581,8 +110277,8 @@
     },
     "rtoot": {
       "name": "rtoot",
-      "version": "0.3.4",
-      "sha256": "0zil9zkmgwmncw1q4nxrnz93bmjg0lfa34qbrf6a5yj63x4dmwar",
+      "version": "0.3.5",
+      "sha256": "1fdr1v7v7828gfd9mh0br2fzqx6p7rpy2avr58brli4i3lq25rgx",
       "depends": ["clipr", "curl", "dplyr", "httr", "jsonlite", "tibble"]
     },
     "rtop": {
@@ -106599,8 +110295,8 @@
     },
     "rtrek": {
       "name": "rtrek",
-      "version": "0.5.0",
-      "sha256": "0sra9v02vh6x8jydgibd2962f9nkzbdx02r4gn9b6qsirgsgn502",
+      "version": "0.5.1",
+      "sha256": "0hc58h2g3xldlcqlns43xf01sj09lmb7wnjlngsg6dr31z59xbk2",
       "depends": ["downloader", "dplyr", "ggplot2", "jpeg", "jsonlite", "memoise", "png", "purrr", "rvest", "tibble", "tidyr", "xml2"]
     },
     "rtrend": {
@@ -106635,8 +110331,8 @@
     },
     "rts2": {
       "name": "rts2",
-      "version": "0.7.5",
-      "sha256": "0qzdcwrs326vl5m82x06029a8y85k2ysxbwy1lzgdnhwqp127a42",
+      "version": "0.7.7",
+      "sha256": "05njx6d6rrcsycp0q55ja5yx53nv8gpp2mnmp5kzmsdnlghimyg5",
       "depends": ["BH", "R6", "Rcpp", "RcppEigen", "RcppParallel", "SparseChol", "StanHeaders", "glmmrBase", "lubridate", "rstan", "rstantools", "sf"]
     },
     "rtsdata": {
@@ -106695,9 +110391,9 @@
     },
     "rugarch": {
       "name": "rugarch",
-      "version": "1.5-1",
-      "sha256": "07nyfwaqqlizg0cawgiv8wdj7qr36pgi0z1mk9lambzb0w453zlz",
-      "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "SkewHyperbolic", "chron", "ks", "nloptr", "numDeriv", "spd", "xts", "zoo"]
+      "version": "1.5-3",
+      "sha256": "150rw7hyfxcrrhpnwjq5zqk54jrqkj8pjzm65nb5077qjicd7yf0",
+      "depends": ["Rcpp", "RcppArmadillo", "Rsolnp", "SkewHyperbolic", "chron", "fracdiff", "ks", "nloptr", "numDeriv", "spd", "xts", "zoo"]
     },
     "ruijter": {
       "name": "ruijter",
@@ -106749,8 +110445,8 @@
     },
     "runMCMCbtadjust": {
       "name": "runMCMCbtadjust",
-      "version": "1.1.1",
-      "sha256": "1m4f0vx69y060pm1asbbk166y0ih0vmqywwwc7fn8c4frj07g40k",
+      "version": "1.1.2",
+      "sha256": "1gplz947hschc5kwm5rd70hvs4d582cs4m7mvlsxhh536xrdf3j2",
       "depends": ["coda"]
     },
     "runcharter": {
@@ -106795,16 +110491,10 @@
       "sha256": "0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d",
       "depends": ["fftwtools"]
     },
-    "rusda": {
-      "name": "rusda",
-      "version": "1.0.8",
-      "sha256": "0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338",
-      "depends": ["RCurl", "XML", "foreach", "httr", "plyr", "stringr", "taxize", "testthat"]
-    },
     "rush": {
       "name": "rush",
-      "version": "0.1.1",
-      "sha256": "1lq1yikhykxa70ypn7y2s3njj0b8vnazjd24766sq4bgmyp60fdj",
+      "version": "0.1.2",
+      "sha256": "1pcp60hn07r57dfs2xk7nd7y59q1ahnjylz30vbdpmny8cjxlx4n",
       "depends": ["R6", "checkmate", "data_table", "jsonlite", "lgr", "mlr3misc", "processx", "redux", "uuid"]
     },
     "rusk": {
@@ -106813,6 +110503,12 @@
       "sha256": "0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk",
       "depends": ["dplyr", "ggforce", "ggplot2", "reshape2", "shiny", "tidyr"]
     },
+    "rusquant": {
+      "name": "rusquant",
+      "version": "1.1.4",
+      "sha256": "1573sbzv2zy1k0bqqillwr2lzvy05kbv6qvil9dhwahjcn38x6j6",
+      "depends": ["XML", "base64enc", "data_table", "httr", "jose", "jsonlite", "quantmod", "rvest", "stringr", "xts"]
+    },
     "rust": {
       "name": "rust",
       "version": "1.4.3",
@@ -106863,8 +110559,8 @@
     },
     "rvec": {
       "name": "rvec",
-      "version": "0.0.6",
-      "sha256": "15wwpkhnzib5nnyv15mdv8avxrzwc57xrpk7xr6qx440ibsg60x9",
+      "version": "0.0.7",
+      "sha256": "0m30jyzrbywlbhqc6k2178fmq7z6169qwr8pckijnx63al3qsyxn",
       "depends": ["cli", "glue", "matrixStats", "rlang", "tibble", "tidyselect", "vctrs"]
     },
     "rversions": {
@@ -106887,8 +110583,8 @@
     },
     "rvg": {
       "name": "rvg",
-      "version": "0.3.3",
-      "sha256": "0m9xfii35rv5dkk1n675s2schnxy90344ccbk1998g1qw9x1bj0m",
+      "version": "0.3.4",
+      "sha256": "0s173s4bxi44s4j30y804vffsccir74jx2awsv0r45g1007w6mx0",
       "depends": ["Rcpp", "gdtools", "officer", "rlang", "xml2"]
     },
     "rviewgraph": {
@@ -106899,8 +110595,8 @@
     },
     "rvif": {
       "name": "rvif",
-      "version": "1.0",
-      "sha256": "0aqzh8n889avbjdf4244h4a5y5a6w9hxxgm15ygxvysrw5rjb37f",
+      "version": "2.0",
+      "sha256": "0w7any6km13jnad9jx1a8gkfmzbz345dwkhm5mxi06zfk65yv65r",
       "depends": ["multiColl"]
     },
     "rvinecopulib": {
@@ -106989,8 +110685,8 @@
     },
     "rworkflows": {
       "name": "rworkflows",
-      "version": "1.0.1",
-      "sha256": "1ys66dcl5k61bkzvz8pxw08hr987jy3xpgm8akha5s4vp3jdkpqc",
+      "version": "1.0.2",
+      "sha256": "1gl223swngk3v5q3s0drv245nxj8bbbxyhmawzj7n8da7y4a3pwx",
       "depends": ["BiocManager", "badger", "data_table", "desc", "here", "renv", "yaml"]
     },
     "rworldmap": {
@@ -107031,38 +110727,20 @@
     },
     "rxode2": {
       "name": "rxode2",
-      "version": "2.1.3",
-      "sha256": "0r6j4wxkzxw4dabz2z1lssbw98mfk7sb64br01bmsqr1d19p5n1v",
-      "depends": ["BH", "PreciseSums", "Rcpp", "RcppArmadillo", "backports", "checkmate", "cli", "data_table", "ggplot2", "inline", "lotri", "magrittr", "memoise", "qs", "rex", "rxode2et", "rxode2ll", "rxode2parse", "rxode2random", "sys"]
-    },
-    "rxode2et": {
-      "name": "rxode2et",
-      "version": "2.0.13",
-      "sha256": "1pprky6j5vzijichr7kzfavc8ly3k272xnzvwix60v77z9zn5kyw",
-      "depends": ["Rcpp", "checkmate", "cli", "crayon", "lotri", "magrittr", "rxode2parse", "rxode2random"]
+      "version": "3.0.3",
+      "sha256": "0sjv3pqv78ncaklb4h2yyxbazngsfvknl0fh0vrmz1lwzqrsgyf8",
+      "depends": ["BH", "PreciseSums", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "backports", "checkmate", "cli", "data_table", "dparser", "ggplot2", "inline", "lotri", "magrittr", "memoise", "qs", "rex", "rxode2ll", "sitmo", "sys"]
     },
     "rxode2ll": {
       "name": "rxode2ll",
-      "version": "2.0.11",
-      "sha256": "0fj5lbs67g1adjywfnav88rsj0sy3lwwf4gyimdh89rbm1glrrs3",
+      "version": "2.0.13",
+      "sha256": "0czg97cyky78564drmdyy4cm7zhxm3ql1jyvcchsk3lx3f9ffwa0",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "checkmate"]
     },
-    "rxode2parse": {
-      "name": "rxode2parse",
-      "version": "2.0.19",
-      "sha256": "01q3chhq7nl1jl50w623m1nik9jdrizpc4hi792ynsr27lsqlhcx",
-      "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "checkmate", "crayon", "data_table", "digest", "dparser", "knitr", "qs", "rex", "symengine"]
-    },
-    "rxode2random": {
-      "name": "rxode2random",
-      "version": "2.1.1",
-      "sha256": "1zrddjq1i2wfx6ai4wwp1l0vnyk5i19dcr7f2q3f66jhlj9fqp27",
-      "depends": ["BH", "Rcpp", "RcppArmadillo", "checkmate", "lotri", "rxode2parse", "sitmo"]
-    },
     "rxylib": {
       "name": "rxylib",
-      "version": "0.2.12",
-      "sha256": "1drmizyvbhza6p5gdqn2ahkppa99z1xvc1w7s4mbxjh15x3c633g",
+      "version": "0.2.14",
+      "sha256": "0g9rrn9xjwscq0k8cd4zwx1vdbgajbc493gk0mibpjg8lcvmc53k",
       "depends": ["BH", "Rcpp"]
     },
     "ryandexdirect": {
@@ -107091,8 +110769,8 @@
     },
     "rzmq": {
       "name": "rzmq",
-      "version": "0.9.13",
-      "sha256": "1wb3nhgik436nq2518npy7z8c1nh0c6ck5a95csph2rsn91kaq4d",
+      "version": "0.9.15",
+      "sha256": "003i4k6gl62hx9ai5v1cq4j1fzl621hb976gcaiibvd4brfyjmjf",
       "depends": []
     },
     "s2": {
@@ -107109,8 +110787,8 @@
     },
     "s2dv": {
       "name": "s2dv",
-      "version": "2.0.0",
-      "sha256": "0lgkdb1gphqsggqnyrl1hlfx1x5zxbhb9msr6xyj4hhp03m16z9x",
+      "version": "2.1.0",
+      "sha256": "0bs46hgvryaydf0hmdn02cpfc3b3schx26gpw11b78j6by95z0yw",
       "depends": ["ClimProjDiags", "NbClust", "SpecsVerification", "abind", "bigmemory", "easyNCDF", "easyVerification", "mapproj", "maps", "multiApply", "ncdf4", "plyr"]
     },
     "s2net": {
@@ -107121,9 +110799,9 @@
     },
     "s3": {
       "name": "s3",
-      "version": "1.0.0",
-      "sha256": "1cb9xmi4fb0bi3vglbg3jk872nci015v1yxk3049482r92v6lnsn",
-      "depends": ["aws_signature", "cli", "digest", "dplyr", "fs", "glue", "httr", "prettyunits", "purrr"]
+      "version": "1.1.0",
+      "sha256": "10nrm45zji8k1paz7zkmq4ankwz8nisv8ngc459j1bd4578mzv9y",
+      "depends": ["cli", "dplyr", "fs", "glue", "httr", "prettyunits", "purrr", "rlang"]
     },
     "s3_resourcer": {
       "name": "s3.resourcer",
@@ -107133,8 +110811,8 @@
     },
     "s3fs": {
       "name": "s3fs",
-      "version": "0.1.6",
-      "sha256": "18v81w2b7xgq8x66x3z893bg456qq38v1f9n4xx12vhk45sh8y2h",
+      "version": "0.1.7",
+      "sha256": "16692xrdgvijhdaqaysr61bl8hfjx0li7xnbk9rbnvj4g196zq2n",
       "depends": ["R6", "curl", "data_table", "fs", "future", "future_apply", "lgr", "paws_storage"]
     },
     "s4vd": {
@@ -107227,6 +110905,12 @@
       "sha256": "1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx",
       "depends": ["MASS", "Matrix"]
     },
+    "sTSD": {
+      "name": "sTSD",
+      "version": "0.1.0",
+      "sha256": "0cxp34kcxnfvi8jz6cm24n8mpzpg373aigw57y9614blwx73d15m",
+      "depends": []
+    },
     "sValues": {
       "name": "sValues",
       "version": "0.1.6",
@@ -107251,12 +110935,6 @@
       "sha256": "1yg133zm0db2lv0m62ij7c27bs4k3kbjic15dwrak534lk885sj2",
       "depends": []
     },
-    "sacRebleu": {
-      "name": "sacRebleu",
-      "version": "0.1.3",
-      "sha256": "0piapn7srrfc4qmwkpjrsfyhz253pl69ppm3y9flqlffki5b5zx1",
-      "depends": ["Rcpp", "checkmate", "tok"]
-    },
     "saccadr": {
       "name": "saccadr",
       "version": "0.1.3",
@@ -107287,6 +110965,12 @@
       "sha256": "1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z",
       "depends": ["MASS", "lme4"]
     },
+    "sae_projection": {
+      "name": "sae.projection",
+      "version": "0.1.0",
+      "sha256": "09rrl7xb2hxxd7z62zhl07kj32gr5h8fqshi01sakqarbky2qc14",
+      "depends": ["bonsai", "cli", "doParallel", "dplyr", "lightgbm", "parsnip", "ranger", "recipes", "rlang", "rsample", "survey", "tidymodels", "tune", "workflows", "yardstick"]
+    },
     "sae_prop": {
       "name": "sae.prop",
       "version": "0.1.2",
@@ -107337,10 +111021,22 @@
     },
     "saeHB_panel_beta": {
       "name": "saeHB.panel.beta",
-      "version": "0.1.3",
-      "sha256": "1zhg53nkwky76v1wdiqfmljkz95k6fgz0hvxy1l8mhdfx3d79srk",
+      "version": "0.1.5",
+      "sha256": "0mpq6wskfna4v7wdlq35sg2qjr6l55mq9n87pv71j41yvq3ymanm",
       "depends": ["coda", "dplyr", "rjags", "stringr"]
     },
+    "saeHB_spatial": {
+      "name": "saeHB.spatial",
+      "version": "0.1.1",
+      "sha256": "1gnw07aa8isgalry6v1apsy3sb95zzm13l0lpczxv0rrb387v1d6",
+      "depends": ["coda", "rjags", "stringr"]
+    },
+    "saeHB_twofold": {
+      "name": "saeHB.twofold",
+      "version": "0.1.2",
+      "sha256": "0rvqdc5iiav4hq17pj07jmavzhjsg5ibvm8jwlcv81sg94g19l10",
+      "depends": ["coda", "data_table", "rjags", "stringr"]
+    },
     "saeHB_unit": {
       "name": "saeHB.unit",
       "version": "0.1.0",
@@ -107355,8 +111051,8 @@
     },
     "saeMSPE": {
       "name": "saeMSPE",
-      "version": "1.2",
-      "sha256": "086nmcx14sjwnydka805il11lc02jv9l39kk9j1h2j5p9gz0b3gp",
+      "version": "1.4",
+      "sha256": "1k3b400jhhsd2k4ryzjac43nxlxk9jpn28mm39h61cgd8pvr3rs7",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "smallarea"]
     },
     "saePseudo": {
@@ -107415,8 +111111,8 @@
     },
     "saens": {
       "name": "saens",
-      "version": "0.1.0",
-      "sha256": "1fmg7lcryc426hclrzhj26l8zaar0cc2j3vqxd752g86h4n0g6hz",
+      "version": "0.1.2",
+      "sha256": "1rl4s2g18z5q2xf1365xvfp7yxp8jf70v186azywpvc6ciw255na",
       "depends": ["cli", "dplyr", "ggplot2", "rlang", "tidyr"]
     },
     "safejoin": {
@@ -107475,26 +111171,26 @@
     },
     "salad": {
       "name": "salad",
-      "version": "1.0",
-      "sha256": "1fcs6g1ld514gkr5rxbawpxd81p9ywfxfhrh3jjwd3807gc9l2r4",
+      "version": "1.2",
+      "sha256": "0bfd6249wm9p1z14d48wms3hnwmziv8jkwx3502bpxdk6hi2vxnk",
       "depends": []
     },
     "salesforcer": {
       "name": "salesforcer",
-      "version": "1.0.1",
-      "sha256": "19z4q5k0k1c1s2piqjg0z6nrwabap016nbx3jpf51lvmh5lp8ycf",
+      "version": "1.0.2",
+      "sha256": "065bnvvzxsq13bivbkz4kpskl0xwawjsavgzvssdkk49v99c4j6q",
       "depends": ["XML", "anytime", "base64enc", "curl", "data_table", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "mime", "purrr", "readr", "rlang", "rlist", "tibble", "vctrs", "xml2", "zip"]
     },
     "salso": {
       "name": "salso",
-      "version": "0.3.35",
-      "sha256": "1jgslcn5lc34aj58kg1madbhf3v9n9ap70jv349rsr97p9vqi2bx",
+      "version": "0.3.42",
+      "sha256": "0j4ygcdjs241fcixzvas77rkqynrrzf84w35g791gsxgilpsl0zc",
       "depends": []
     },
     "salty": {
       "name": "salty",
-      "version": "0.1.0",
-      "sha256": "1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6",
+      "version": "0.1.1",
+      "sha256": "05hzyicd0qc661npkxy95547lbll693zslk48dcx6icdxvf8gbix",
       "depends": ["assertthat", "purrr", "stringr"]
     },
     "samadb": {
@@ -107511,8 +111207,8 @@
     },
     "samc": {
       "name": "samc",
-      "version": "3.3.0",
-      "sha256": "0vr6f63phzki3wsq3c4db00wzzfbfnbym33skvxn41c3xggvl324",
+      "version": "4.0.0",
+      "sha256": "0hmsna94q373hq92nlgswclda2f1007ssip8nl1hqyrhxvfswwn5",
       "depends": ["Matrix", "Rcpp", "RcppEigen", "RcppThread", "circular", "raster", "terra"]
     },
     "samon": {
@@ -107527,6 +111223,12 @@
       "sha256": "09pr2cdlpxml2dxs27gy5s5i76ff3q8x1ja09f3is0mg98c872as",
       "depends": ["cowplot", "dplyr", "forcats", "ggplot2", "magrittr", "rlang", "rnaturalearth", "sf", "terra", "tidyr", "viridis"]
     },
+    "sampcompR": {
+      "name": "sampcompR",
+      "version": "0.2.6",
+      "sha256": "14rxs1dn8pwlhxhlny0swxkaajydl59h45chk32bk4b37kvlcac6",
+      "depends": ["Hmisc", "boot", "data_table", "dplyr", "forcats", "furrr", "future", "ggplot2", "lmtest", "magrittr", "psych", "purrr", "readr", "reshape2", "sandwich", "survey", "svrep", "tibble", "tidyr"]
+    },
     "sampleSelection": {
       "name": "sampleSelection",
       "version": "1.2-12",
@@ -107539,6 +111241,12 @@
       "sha256": "1fxqjbczw5wpdx19rmlc2jwsk8nlkbbpdagn9z1xkfba3xli9f1w",
       "depends": ["lubridate", "splitstackshape"]
     },
+    "sampledatasets": {
+      "name": "sampledatasets",
+      "version": "0.1.0",
+      "sha256": "1j8ss1qx1czg2sw8apx03v0d835pkm5r57ldm27crl41f7dgy9a0",
+      "depends": []
+    },
     "sampler": {
       "name": "sampler",
       "version": "0.2.4",
@@ -107575,6 +111283,12 @@
       "sha256": "180c5bvrr3nb88ci1cg8kh6kj6gfg1dfmrabp8a232x2n2ykq76m",
       "depends": ["mvtnorm"]
     },
+    "samplezoo": {
+      "name": "samplezoo",
+      "version": "1.1.1",
+      "sha256": "0v63f203knil6rzsrwx65nv1pazvz1lnl4pwazfb613w5vf2g0nl",
+      "depends": []
+    },
     "sampling": {
       "name": "sampling",
       "version": "2.10",
@@ -107607,14 +111321,14 @@
     },
     "samplingin": {
       "name": "samplingin",
-      "version": "1.1.0",
-      "sha256": "0a7c078vz4p5x5r29xsvab630pq3p7fwsn31qdcjdcl7n4475rhr",
+      "version": "1.1.1",
+      "sha256": "0alcfy69wgdcp0mizw17qnd79v448if8yy98kl0frf2kmjkc7hlj",
       "depends": ["data_table", "dplyr", "magrittr", "rlang", "sampling"]
     },
     "samplr": {
       "name": "samplr",
-      "version": "1.0.0",
-      "sha256": "1zmh68518vz3nfjch524b9q5fi8wap54qziq6z5mz9ymaqrwayaa",
+      "version": "1.0.1",
+      "sha256": "1vjkai27hwrvz9pxis564b0iqz26r42c7fdpmfda5mrzy15my3i4",
       "depends": ["R6", "Rcpp", "RcppArmadillo", "RcppDist", "Rdpack", "ggplot2", "latex2exp", "lme4", "pracma", "testthat"]
     },
     "samplrData": {
@@ -107661,8 +111375,8 @@
     },
     "sandwich": {
       "name": "sandwich",
-      "version": "3.1-0",
-      "sha256": "1yi3l2q63j0vlaqqh1x3bxb0i7v6lrmmbsc6s8gilfahxq2y3c4n",
+      "version": "3.1-1",
+      "sha256": "06cikmpgv0dla92dhp8i89wj52wjwky1g4sb9cxqpac38bx1xrgc",
       "depends": ["zoo"]
     },
     "sanic": {
@@ -107749,6 +111463,12 @@
       "sha256": "0x437nhv3g327apxnihr1wnp4mmzxn9pfk24shpj6a8amxphlzxd",
       "depends": ["assertthat", "dplyr", "furrr", "ggplot2", "glue", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
+    "sapo": {
+      "name": "sapo",
+      "version": "0.8.0",
+      "sha256": "0x6hd2747v2w8hv87ymdk5xzxk57dh7zjibpgygli1y10sd2v0v7",
+      "depends": ["sf"]
+    },
     "saqgetr": {
       "name": "saqgetr",
       "version": "0.2.21",
@@ -107769,9 +111489,15 @@
     },
     "saros": {
       "name": "saros",
-      "version": "1.0.4",
-      "sha256": "1b43hzvhagv43g7p2xqzk3ay3ylph41l4d69zm7hvbq6sdm69s27",
-      "depends": ["bcrypt", "cli", "clipr", "dplyr", "forcats", "fs", "ggiraph", "ggplot2", "glue", "mschart", "officer", "rlang", "rstudioapi", "rvest", "stringi", "tidyr", "tidyselect", "vctrs", "yaml"]
+      "version": "1.2.0",
+      "sha256": "03ignw4ah05nkfkck1dn6ghy13d892dy4sw6h8ijn2lmkxbjlgkm",
+      "depends": ["cli", "dplyr", "forcats", "fs", "ggiraph", "ggplot2", "glue", "lifecycle", "mschart", "officer", "rlang", "stringi", "tidyr", "tidyselect", "vctrs"]
+    },
+    "saros_base": {
+      "name": "saros.base",
+      "version": "0.2.1",
+      "sha256": "0c0h6v5r81gylz9xhd2ibf0mn78lpqslgbjb7dkwmscwc8s7ky7w",
+      "depends": ["bcrypt", "cli", "dplyr", "forcats", "fs", "glue", "rlang", "rstudioapi", "stringi", "tidyr", "tidyselect", "vctrs", "yaml", "zip"]
     },
     "sarp_snowprofile": {
       "name": "sarp.snowprofile",
@@ -107781,9 +111507,9 @@
     },
     "sarp_snowprofile_alignment": {
       "name": "sarp.snowprofile.alignment",
-      "version": "1.2.2",
-      "sha256": "1cjs31m3y9971m5zq9fpv4p2l6wjm5kb1wj6r42yj5p27yajv3vy",
-      "depends": ["data_table", "dtw", "sarp_snowprofile"]
+      "version": "2.0.2",
+      "sha256": "00i8j267zbv8ln52cr25drj06n3qhkgvbh184aq3rvvrpwrg846x",
+      "depends": ["cluster", "data_table", "dtw", "sarp_snowprofile"]
     },
     "sarp_snowprofile_pyface": {
       "name": "sarp.snowprofile.pyface",
@@ -107793,9 +111519,9 @@
     },
     "sars": {
       "name": "sars",
-      "version": "1.3.6",
-      "sha256": "198dz3gbzm7iqa2p813anifzpjkna3blf4yzyy73j43h8w4k5v0b",
-      "depends": ["AICcmodavg", "cli", "crayon", "doParallel", "foreach", "nortest", "numDeriv"]
+      "version": "1.3.7",
+      "sha256": "1rv69i8p8bkcn2av5sa86mz4m70cn6bd1kdbvhfigg05h2kw070w",
+      "depends": ["AICcmodavg", "cli", "crayon", "doParallel", "foreach", "minpack_lm", "nortest", "numDeriv"]
     },
     "sarsop": {
       "name": "sarsop",
@@ -107805,14 +111531,14 @@
     },
     "sas7bdat": {
       "name": "sas7bdat",
-      "version": "0.7",
-      "sha256": "0pwmngwmkybz64sqby86vzxq5wwfkh5hxnqncdv0fmp6w6x7jhjn",
+      "version": "0.8",
+      "sha256": "1ml9r4am13c3f0lmhzxl5m9v0lgkjb7cylfasqn7ghc27cc9yx70",
       "depends": []
     },
     "sasLM": {
       "name": "sasLM",
-      "version": "0.10.4",
-      "sha256": "0saw3n0n1yw32ajnvp4g2gk4ikhgxc83rnyzqrndji39kc9qffkq",
+      "version": "0.10.5",
+      "sha256": "1m44rf8mpw9pc5jlxw8ab5z62knj0fjfvbrs53yvfvlbh39xjbq4",
       "depends": ["mvtnorm"]
     },
     "sasfunclust": {
@@ -107847,8 +111573,8 @@
     },
     "sate": {
       "name": "sate",
-      "version": "2.1.0",
-      "sha256": "19jd8z1343ajx27b14grjnvxxf38b008fzclv7rcpqqp717ajpnv",
+      "version": "2.2.1",
+      "sha256": "0z8mjab1rndzspz7388641k5v39sypwz86r9hv2rx72d4b2pdw3n",
       "depends": ["MASS", "ellipse"]
     },
     "satellite": {
@@ -107937,8 +111663,8 @@
     },
     "sbm": {
       "name": "sbm",
-      "version": "0.4.6",
-      "sha256": "1cnf4d5xrfsvsy56sh4nz83j82j8yp09hlnvddfgi15zf4md7glx",
+      "version": "0.4.7",
+      "sha256": "1gx8nii5r2651crc0dfns2ir3pps8lbkxymlj1ngjwl7yhh8lksw",
       "depends": ["GREMLINS", "R6", "Rcpp", "RcppArmadillo", "alluvial", "blockmodels", "dplyr", "ggplot2", "igraph", "magrittr", "prodlim", "purrr", "reshape2", "rlang", "stringr"]
     },
     "sbmSDP": {
@@ -107979,8 +111705,8 @@
     },
     "sc2sc": {
       "name": "sc2sc",
-      "version": "0.0.1-12",
-      "sha256": "0cdfx47vlcqqbl6d75zr91x8j4ayar7wdk5mkdilgw0izcxwscjf",
+      "version": "0.0.1-14",
+      "sha256": "1z7k2n30c7k5lz3gb4khgy16lqj6lmhadwip78k44x91i5mrnbm7",
       "depends": []
     },
     "scAnnotate": {
@@ -108015,8 +111741,8 @@
     },
     "scCustomize": {
       "name": "scCustomize",
-      "version": "2.1.2",
-      "sha256": "150h8aj9qyg7v9yh5mhkr6nbf05ia91l5v9cqy58ipg6bwa9lmib",
+      "version": "3.0.1",
+      "sha256": "1l1ghfhgpgnn7n2lk48x9siad2drvpxlspzrh3nlxwly5ka58z79",
       "depends": ["Matrix", "Seurat", "SeuratObject", "circlize", "cli", "cowplot", "data_table", "dplyr", "forcats", "ggbeeswarm", "ggplot2", "ggprism", "ggrastr", "ggrepel", "glue", "janitor", "lifecycle", "magrittr", "paletteer", "patchwork", "pbapply", "purrr", "rlang", "scales", "scattermore", "stringi", "stringr", "tibble", "tidyr"]
     },
     "scDECO": {
@@ -108103,6 +111829,12 @@
       "sha256": "0p8rn2c58601yjkampgw360w6r8sbwg0rk007jnvkayfad5xhdvd",
       "depends": ["GenomicRanges", "MASS", "Rsamtools", "dplyr", "magrittr", "matrixStats", "mixtools", "nimble", "rlang", "tibble", "tidyr"]
     },
+    "scR": {
+      "name": "scR",
+      "version": "0.4.0",
+      "sha256": "1fb3n4n77i2yss9g08mm1vdma5v35a0m898gic7spyg8qrkn3pfp",
+      "depends": ["caret", "dplyr", "ggplot2", "pbapply", "plotly", "tidyr"]
+    },
     "scRNAstat": {
       "name": "scRNAstat",
       "version": "0.1.1",
@@ -108129,8 +111861,8 @@
     },
     "scSpatialSIM": {
       "name": "scSpatialSIM",
-      "version": "0.1.3.3",
-      "sha256": "09pzdh8zygza3d5ld0j7xm7mks2x158iy1i3p3yrhdhrldx7llfy",
+      "version": "0.1.3.4",
+      "sha256": "04r3fqsv0ycjycy11r03ga05s4wzjlmhxifw8cm92qkcl8h4av40",
       "depends": ["crayon", "dplyr", "ggplot2", "ggpubr", "magrittr", "pbmcapply", "proxy", "spatstat_geom", "spatstat_random", "tidyr"]
     },
     "scTenifoldKnk": {
@@ -108231,8 +111963,8 @@
     },
     "scape": {
       "name": "scape",
-      "version": "2.3.3",
-      "sha256": "1jb5c335qsbrpsgngs8c1qlibyb7zvvx6mwydfhm1plx4pkcq0n1",
+      "version": "2.3.5",
+      "sha256": "1sy9ilyaidkjaqj3j54gcbacqdxy26ajwvwwms365pwrswc01jnl",
       "depends": ["Hmisc", "coda", "lattice"]
     },
     "scaper": {
@@ -108271,6 +112003,12 @@
       "sha256": "1hg49n0qk3wlca4abfyzr5n10k2gcv4kq42fm7x9fhiw2mm1xiw9",
       "depends": ["htmlwidgets"]
     },
+    "scatterbar": {
+      "name": "scatterbar",
+      "version": "0.1.0",
+      "sha256": "1ir5mva0hwq6v9zbh1n9jdna4b4v2dc8bq52g9i9ydkcw5zlrpzw",
+      "depends": ["dplyr", "ggplot2", "magrittr", "tidyr"]
+    },
     "scattermore": {
       "name": "scattermore",
       "version": "1.2",
@@ -108279,9 +112017,9 @@
     },
     "scatterpie": {
       "name": "scatterpie",
-      "version": "0.2.3",
-      "sha256": "0iv4i775s22j3wg6mhsdx5d9zdb23v4fanfnznp2jiwkzxr10kvh",
-      "depends": ["dplyr", "ggforce", "ggfun", "ggplot2", "rlang", "tidyr"]
+      "version": "0.2.4",
+      "sha256": "165n0jay7aad5i10g520zrrcdx12m63mxg6d3a66gmash6sj2jsr",
+      "depends": ["dplyr", "ggforce", "ggfun", "ggplot2", "rlang", "tidyr", "yulab_utils"]
     },
     "scatterplot3d": {
       "name": "scatterplot3d",
@@ -108321,8 +112059,8 @@
     },
     "scdensity": {
       "name": "scdensity",
-      "version": "1.0.2",
-      "sha256": "173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9",
+      "version": "1.0.3",
+      "sha256": "00r06syfhg26mhnpnkvswgyqyagxh35j1jxg4ay72l4d05b9pnkg",
       "depends": ["lpSolve", "quadprog"]
     },
     "scdhlm": {
@@ -108333,9 +112071,9 @@
     },
     "scdtb": {
       "name": "scdtb",
-      "version": "0.1.0",
-      "sha256": "0f79lrdrfn064gsgjpj9mr4sx2wyc5z2d6kkz42kb67rqpk23ibl",
-      "depends": ["DT", "broom_mixed", "ggplot2", "mmcards", "nlme", "shiny", "shinythemes"]
+      "version": "0.2.0",
+      "sha256": "1gb5asgqgymczih5x4078m3ksnvm9j06pqhyl37cxrzxx4ahw87s",
+      "depends": ["DT", "MASS", "broom_mixed", "ggplot2", "mmcards", "mmints", "nlme", "shiny", "shinythemes", "sn"]
     },
     "scellpam": {
       "name": "scellpam",
@@ -108357,8 +112095,8 @@
     },
     "sched": {
       "name": "sched",
-      "version": "1.0.1",
-      "sha256": "0cbbchax694aqbi12hxnssmfk8x56k5wdzkshbzanwjn2ivvr1rb",
+      "version": "1.0.3",
+      "sha256": "1n6r8g5cd3y6yiplhf0jlb8zm8z37cz1ds66qqpipiva4vx26xr3",
       "depends": ["R6", "RCurl", "chk", "fscache", "lgr", "openssl"]
     },
     "schemr": {
@@ -108369,8 +112107,8 @@
     },
     "schoRsch": {
       "name": "schoRsch",
-      "version": "1.10",
-      "sha256": "0bf4lahfzi6dchqfnykh4saiagcka12h82d9mvd1ddv5phmbyi10",
+      "version": "1.11",
+      "sha256": "06q4basin2mdbl4ibb0hp68ipk4n7v6vy1ms60c22r65iyqqj79x",
       "depends": []
     },
     "schoenberg": {
@@ -108423,9 +112161,9 @@
     },
     "scicomptools": {
       "name": "scicomptools",
-      "version": "1.0.0",
-      "sha256": "193byqr8sjb0hk1k4qj26pnqr5dgqfsxn47ckddgcvzk6ybd6cpl",
-      "depends": ["SemNetCleaner", "data_tree", "dplyr", "ggplot2", "ggwordcloud", "gitcreds", "googledrive", "magrittr", "purrr", "readxl", "stringr", "tibble", "tidyr", "tidytext", "tidyxl"]
+      "version": "1.1.0",
+      "sha256": "0v3a8spx199rqs3y861kh8syax02f0pcvnyg5ivxm4zzhvfnmcvx",
+      "depends": ["SemNetCleaner", "chromote", "data_tree", "dplyr", "ggplot2", "ggwordcloud", "gitcreds", "googledrive", "magrittr", "purrr", "readxl", "stringr", "tibble", "tidyr", "tidytext", "tidyxl"]
     },
     "scidesignR": {
       "name": "scidesignR",
@@ -108477,8 +112215,8 @@
     },
     "scitb": {
       "name": "scitb",
-      "version": "0.1.8",
-      "sha256": "1dkp4ch2n3j09b49pp0wsnx7pd9c3007kjm4jm72mpk1z17w5c9f",
+      "version": "0.2.1",
+      "sha256": "11gv2whjc62vxrgk3hc175pz3f56zfpnyk62hxg4hvqlypl6g75r",
       "depends": ["MASS", "ggplot2", "nortest", "reshape2", "stringi"]
     },
     "sclr": {
@@ -108511,6 +112249,12 @@
       "sha256": "09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl",
       "depends": ["car", "e1071", "gbm", "ggplot2", "partykit", "randomForest", "reshape2", "sqldf", "stringr"]
     },
+    "scoredec": {
+      "name": "scoredec",
+      "version": "0.1.2",
+      "sha256": "0xs51bgv2kvq4c3r3w6hsnrk4aya3klwwjhvpf8lpc0yd63d1pzg",
+      "depends": ["Rcpp", "Rfast", "igraph"]
+    },
     "scorematchingad": {
       "name": "scorematchingad",
       "version": "0.0.67",
@@ -108531,21 +112275,21 @@
     },
     "scoringRules": {
       "name": "scoringRules",
-      "version": "1.1.1",
-      "sha256": "1qy521jhr5mj7999ncz27f3ggld2rqvgy3y3wznk23772xpgjgrr",
+      "version": "1.1.3",
+      "sha256": "01p918qj6gmnkyh79b2hhd1h6a5v3b7ssnnx5a1ppf1a5xmx2ps6",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "knitr"]
     },
     "scoringfunctions": {
       "name": "scoringfunctions",
-      "version": "0.0.6",
-      "sha256": "05bxqj8pq8halwljsy89l2p8hq8gghvivyhk1078w6yrrn8w18lq",
+      "version": "1.0",
+      "sha256": "031aki5f8idcclbybvdqpwisl02b98l8sq97d48k630lmizfpbxs",
       "depends": []
     },
     "scoringutils": {
       "name": "scoringutils",
-      "version": "1.2.2",
-      "sha256": "1ylw7ql5ayfn6fcxnmmmr3zpvczax6mhmis28r03kwm8val5q233",
-      "depends": ["data_table", "ggdist", "ggplot2", "lifecycle", "rlang", "scoringRules"]
+      "version": "2.0.0",
+      "sha256": "0p9cvy66srqvp9f9birzb001x009jfp7bgh60jbrr0prfk0la30w",
+      "depends": ["Metrics", "checkmate", "cli", "data_table", "ggplot2", "purrr", "scoringRules"]
     },
     "scout": {
       "name": "scout",
@@ -108553,6 +112297,12 @@
       "sha256": "0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2",
       "depends": ["glasso"]
     },
+    "scoutbaR": {
+      "name": "scoutbaR",
+      "version": "0.0.1",
+      "sha256": "1pmyawanqcyyc623g5g2rh2a049x55063bqnnjf2y2fmx0dlnmkz",
+      "depends": ["htmltools", "reactR", "shiny"]
+    },
     "scperturbR": {
       "name": "scperturbR",
       "version": "0.1.0",
@@ -108561,8 +112311,8 @@
     },
     "scpi": {
       "name": "scpi",
-      "version": "2.2.5",
-      "sha256": "12wr7kk57qv28kypk5czr0gv2xfib040m8k5047kdgd4fj3i6fhr",
+      "version": "2.2.6",
+      "sha256": "1xfw0paa05c9pzizyqpnxph0wwbv6ryvlxph35f9xfcs6fm97nl8",
       "depends": ["CVXR", "ECOSolveR", "MASS", "Matrix", "Qtools", "abind", "doSNOW", "dplyr", "fastDummies", "foreach", "ggplot2", "magrittr", "purrr", "reshape2", "rlang", "stringr", "tibble", "tidyr"]
     },
     "scplot": {
@@ -108613,6 +112363,12 @@
       "sha256": "16b1dzagy92jk1y1dymq6r2yzri3lynaj9a2bjqqjn0bh21aqsxr",
       "depends": ["dplyr", "fs", "imager", "purrr", "rlang", "stringr", "tibble"]
     },
+    "scregclust": {
+      "name": "scregclust",
+      "version": "0.2.0",
+      "sha256": "0pcnwyv3qx1wbjr27576zp0jfi1axplmghgc0yf9rjdxsh6hp44b",
+      "depends": ["Matrix", "Rcpp", "RcppEigen", "cli", "ggplot2", "igraph", "prettyunits", "reshape", "rlang"]
+    },
     "scribe": {
       "name": "scribe",
       "version": "0.3.0",
@@ -108627,9 +112383,9 @@
     },
     "script": {
       "name": "script",
-      "version": "0.1.1",
-      "sha256": "1ba0mr77g4v4nv7yfs5yaj7x8yqrl3q8a1yia105pclgwq9ybs8i",
-      "depends": ["rstudioapi"]
+      "version": "0.1.3",
+      "sha256": "1xm30c0dqc92agc3wflvzd76zd3pr7cfjpcjm70vzr6hvfsxr41p",
+      "depends": ["knitr", "rstudioapi"]
     },
     "scriptName": {
       "name": "scriptName",
@@ -108675,8 +112431,8 @@
     },
     "scrutiny": {
       "name": "scrutiny",
-      "version": "0.4.0",
-      "sha256": "0f8z5iz37h227ik5191p7yi8wqjq4lz57vi3z0sh6w0v6qdm250a",
+      "version": "0.5.0",
+      "sha256": "0f03nd378ks6cr15gkjmq0756cbzvrz5gp912nvdgc5r59q7j665",
       "depends": ["cli", "corrr", "dplyr", "ggplot2", "ggrepel", "glue", "lifecycle", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "scrypt": {
@@ -108823,18 +112579,24 @@
       "sha256": "061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa",
       "depends": ["PolynomF", "numDeriv", "rootSolve"]
     },
-    "sdpt3r": {
-      "name": "sdpt3r",
-      "version": "0.3",
-      "sha256": "02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5",
-      "depends": ["Matrix"]
-    },
     "sdrt": {
       "name": "sdrt",
       "version": "1.0.0",
       "sha256": "1kiq73m1wzqa8d0542nhm2bh7rc0bib0jnrwccawjyxmhm4jix73",
       "depends": ["pracma", "psych", "tseries"]
     },
+    "sdsfun": {
+      "name": "sdsfun",
+      "version": "0.6.0",
+      "sha256": "0q8v3lqijjjvzj16z4shazsqzkwz6amijx3xk8w3ls0rhj7m53zq",
+      "depends": ["Rcpp", "RcppArmadillo", "dplyr", "geosphere", "magrittr", "pander", "purrr", "sf", "spdep", "tibble"]
+    },
+    "sdtm_oak": {
+      "name": "sdtm.oak",
+      "version": "0.1.1",
+      "sha256": "130rbc36j3y75cfrfx9n5bryablb43a1w3aafji41n8ac0wa629y",
+      "depends": ["admiraldev", "assertthat", "cli", "dplyr", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "vctrs"]
+    },
     "sdtmchecks": {
       "name": "sdtmchecks",
       "version": "1.0.0",
@@ -108853,6 +112615,12 @@
       "sha256": "14x5hjdbkr5lsh8x3wninxg88acqh6q50famf6qjlfm7727rdysc",
       "depends": ["Matrix"]
     },
+    "seAMLess": {
+      "name": "seAMLess",
+      "version": "0.1.1",
+      "sha256": "0yx09scpvc1n8998j4gqkss11vl9snp146ssdsnjzffrkki2mflb",
+      "depends": ["Biobase", "data_table", "ggplot2", "optparse"]
+    },
     "seacarb": {
       "name": "seacarb",
       "version": "3.3.3",
@@ -108885,20 +112653,20 @@
     },
     "seasonal": {
       "name": "seasonal",
-      "version": "1.9.0",
-      "sha256": "0kpmqix7lxlsnhacrhk5aa9gvzng3fg024ngpk5apmhai7m2bp20",
+      "version": "1.10.0",
+      "sha256": "11d67bwkhrsphv7nb1ilimpcfv6n89ykd5sbx8p123dr3h02sgss",
       "depends": ["x13binary"]
     },
     "seasonalityPlot": {
       "name": "seasonalityPlot",
-      "version": "1.2.1",
-      "sha256": "03gfbpzy97kjw1mxm9xqh384ilyap2nqn4j5ir22rdyg60rfj2mp",
+      "version": "1.3.1",
+      "sha256": "17a5i6gs1bb10fklmb8rkhpss56bp82nz96z5xz5a8qx81k08iww",
       "depends": ["TTR", "assertthat", "crypto2", "dygraphs", "htmltools", "lubridate", "magrittr", "plotrix", "quantmod", "zoo"]
     },
     "seasonalview": {
       "name": "seasonalview",
-      "version": "0.3",
-      "sha256": "1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n",
+      "version": "1.0.0",
+      "sha256": "12rfn9hm206s53rrzgcdsbc09hikw0vzs80vvviyxaxbx7sjfycg",
       "depends": ["dygraphs", "htmlwidgets", "openxlsx", "seasonal", "shiny", "shinydashboard", "xtable", "xts", "zoo"]
     },
     "seastests": {
@@ -108915,14 +112683,14 @@
     },
     "secr": {
       "name": "secr",
-      "version": "4.6.9",
-      "sha256": "1rm7hlfwz8wf4551dw79figmx6n968dlyrq1n2agdv5wdv97gjdg",
-      "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppNumerical", "RcppParallel", "abind", "mgcv", "nlme", "raster", "sf", "stringr", "terra"]
+      "version": "5.1.0",
+      "sha256": "1dy1mxbh6gag540165990g0qmmab13c366rgxxkq5pvgn214xh37",
+      "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppNumerical", "RcppParallel", "abind", "mgcv", "mvtnorm", "nlme", "raster", "sf", "stringr", "terra"]
     },
     "secrdesign": {
       "name": "secrdesign",
-      "version": "2.9.1",
-      "sha256": "03aibck9r4rs9cc9rywm8rs9s9swp7wil1xgfgy6fxpxypapqfvx",
+      "version": "2.9.2",
+      "sha256": "12n0xy838r2a1ilgf4d8kxmpbhrzwnx64r14194ma8v6sdj44xqi",
       "depends": ["BH", "Rcpp", "RcppArmadillo", "abind", "kofnGA", "secr", "sf"]
     },
     "secret": {
@@ -108933,8 +112701,8 @@
     },
     "secretbase": {
       "name": "secretbase",
-      "version": "1.0.1",
-      "sha256": "013f9lvsgfr5way2clkrwb1r2s9kvq2d3al68yjmf1lfpdmc1fdb",
+      "version": "1.0.3",
+      "sha256": "0bmnbjnwwb7s697f9pjy905x8pj6jmsg4rldgmrzpbhazlzwxbn6",
       "depends": []
     },
     "secrettext": {
@@ -108945,8 +112713,8 @@
     },
     "secrlinear": {
       "name": "secrlinear",
-      "version": "1.2.2",
-      "sha256": "1ivhl5imc7ic72h4v5276d2n02s39j78lcdr0rcx3dqycf3yyqag",
+      "version": "1.2.4",
+      "sha256": "15hmykib4lvm0js4lnv4akvfxis8s1042y6m4h9yyjr70zckdcfd",
       "depends": ["MASS", "igraph", "secr", "sf", "sp"]
     },
     "secsse": {
@@ -108981,8 +112749,8 @@
     },
     "see": {
       "name": "see",
-      "version": "0.8.5",
-      "sha256": "1c0pgl9k0m2zdwcz4sf158wpg1gkza1hqcry6hjqql7rg2dga7f8",
+      "version": "0.9.0",
+      "sha256": "002cszzsykwgvxwbqhpfxbf6vsbwq6rqkb1qhbdvfmfvgfplr8wi",
       "depends": ["bayestestR", "correlation", "datawizard", "effectsize", "ggplot2", "insight", "modelbased", "parameters", "performance"]
     },
     "seeclickfixr": {
@@ -109005,8 +112773,8 @@
     },
     "seededlda": {
       "name": "seededlda",
-      "version": "1.3.2",
-      "sha256": "0333b74aiam8k8rgqbbaqqlnh1mbqlyz0lxbpbqpvd2sb50ic3fx",
+      "version": "1.4.1",
+      "sha256": "1v5cy47asihjsxkywfa3rpc93a7s6qkmfmk2sbqygx9gr08r8ac0",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "proxyC", "quanteda", "testthat"]
     },
     "seedr": {
@@ -109029,8 +112797,8 @@
     },
     "seeker": {
       "name": "seeker",
-      "version": "1.1.5",
-      "sha256": "14gxxa7d929ynlrsxz24nprfy1q2x51lh2zxg8wpi3yswphkvd6b",
+      "version": "1.1.6",
+      "sha256": "0xzlm0ph1g88ccv1f4k7nicsmmzcsdxmwbzpdx8vvpfihjy808qa",
       "depends": ["AnnotationDbi", "BiocManager", "GEOquery", "RCurl", "R_utils", "affy", "biomaRt", "checkmate", "curl", "data_table", "foreach", "glue", "jsonlite", "qs", "readr", "sessioninfo", "tximport", "withr", "yaml"]
     },
     "seer": {
@@ -109083,8 +112851,8 @@
     },
     "segmented": {
       "name": "segmented",
-      "version": "2.1-1",
-      "sha256": "1p83g6qj8y4xblggm12bhr9zpsqbrrc7lbbigxcafhhi9c8v08v7",
+      "version": "2.1-3",
+      "sha256": "0h3c6gnhy7242phidzia8ly1sa8x9xyspqlbbj0g9w4vxqby4bh7",
       "depends": ["MASS", "nlme"]
     },
     "segmentr": {
@@ -109111,6 +112879,12 @@
       "sha256": "12par5appi94jliz8lghrhj3q6ws99hw49r2mcgs8g5c0mzgmp4x",
       "depends": ["pedprobr", "pedtools"]
     },
+    "segtest": {
+      "name": "segtest",
+      "version": "1.0.1",
+      "sha256": "1mj9difdlxn0dpnni65f75qbzbfmpvxah37rwi711x7g0383bwhv",
+      "depends": ["Rcpp", "RcppArmadillo", "doFuture", "doRNG", "foreach", "future", "iterators", "updog"]
+    },
     "seguid": {
       "name": "seguid",
       "version": "0.1.0",
@@ -109197,9 +112971,9 @@
     },
     "selenium": {
       "name": "selenium",
-      "version": "0.1.3",
-      "sha256": "1v1bh9a1ybzwyzfsy7q82cjjaz2011zi9i80y275ayjwdsw1rfyf",
-      "depends": ["R6", "httr2", "jsonlite", "lifecycle", "processx", "rappdirs", "rlang"]
+      "version": "0.1.4",
+      "sha256": "0dnz7zz1rxkf80ayxmp56kcx3blbl5hxwcy66rhrs1s090mbhyxr",
+      "depends": ["R6", "base64enc", "httr2", "jsonlite", "lifecycle", "processx", "rappdirs", "rlang"]
     },
     "seleniumPipes": {
       "name": "seleniumPipes",
@@ -109215,14 +112989,14 @@
     },
     "sem": {
       "name": "sem",
-      "version": "3.1-15",
-      "sha256": "05hk72zxvyv6kkjhk5y6qw253c64108az7030z8j1sz8wq03n0md",
+      "version": "3.1-16",
+      "sha256": "0jy9hp85w3lnicymw9881qk7z7ypvz6iy7dd88qqxc6pknzkx7x3",
       "depends": ["MASS", "boot", "mi"]
     },
     "semEff": {
       "name": "semEff",
-      "version": "0.6.1",
-      "sha256": "0vqvmjp9b9qcl0l3gbxijp73qmcy0czdgc0hq2mr129l7qshigla",
+      "version": "0.7.2",
+      "sha256": "1a71yaw20l5wsmgchwf4p3yhwbb2g65aw5i8cmajyhwp0hhvgyls",
       "depends": ["boot", "gsl", "lme4"]
     },
     "semPlot": {
@@ -109233,16 +113007,10 @@
     },
     "semPower": {
       "name": "semPower",
-      "version": "2.1.0",
-      "sha256": "17smfaslw1nnps3ibkqjqdklwd1k7ckvl4zqngvv78r40jcmq6xv",
+      "version": "2.1.1",
+      "sha256": "000daccgvw0ld4iihj6zih85wirsfmj5wk7r8zhbzkmjyiw3xf3s",
       "depends": []
     },
-    "semTests": {
-      "name": "semTests",
-      "version": "0.5.0",
-      "sha256": "0qf3z5vy4lqb2mp28gzkd1l3px1y1hn6l2mm77mvvijvklb3n26b",
-      "depends": ["CompQuadForm", "future_apply", "lavaan", "progressr"]
-    },
     "semTools": {
       "name": "semTools",
       "version": "0.5-6",
@@ -109261,6 +113029,12 @@
       "sha256": "0518pdxgjjv8ql1aaysk64pv1pa01bbg3s7qdibw1v0c6pcf3adb",
       "depends": ["checkmate", "glue", "htmltools", "shiny", "shiny_semantic"]
     },
+    "semaphore": {
+      "name": "semaphore",
+      "version": "1.0.2",
+      "sha256": "1rkm0q7zvw9vz3gwy2h4yaz9mf50zxp8rgv0f3mlwwi5jabl6x01",
+      "depends": ["BH", "Rcpp"]
+    },
     "semdrw": {
       "name": "semdrw",
       "version": "0.1.0",
@@ -109287,8 +113061,8 @@
     },
     "semhelpinghands": {
       "name": "semhelpinghands",
-      "version": "0.1.11",
-      "sha256": "1v6gyjk2awlpz8zpczkxifb2pdnd7js6l75kmrh9lbyy5s7q9xxi",
+      "version": "0.1.12",
+      "sha256": "1czk7id5ah1s38jqc8sgq5j42dyf8062gqnb4y3gy27s5i5gkrbi",
       "depends": ["boot", "ggplot2", "ggrepel", "lavaan", "rlang"]
     },
     "semiArtificial": {
@@ -109317,8 +113091,8 @@
     },
     "seminr": {
       "name": "seminr",
-      "version": "2.3.3",
-      "sha256": "0y9lf8ik8rdq3j4hqw86zwaa4xsizgdryxsc8njxfzaw51z57ljm",
+      "version": "2.3.4",
+      "sha256": "0zh5slwrsv20z1irfy944cd0x7940yv84p5mjj7jj9isgr9a8wbz",
       "depends": ["DiagrammeR", "DiagrammeRsvg", "glue", "knitr", "lavaan", "rmarkdown", "testthat", "webp"]
     },
     "semlbci": {
@@ -109347,8 +113121,8 @@
     },
     "semnar": {
       "name": "semnar",
-      "version": "0.8.1",
-      "sha256": "18c509yh52sdmvm60p0kzyz86fmzi0by4gnb2jw8nppv8qlnz6zb",
+      "version": "0.8.2",
+      "sha256": "0f63k60z41sdh70acx1x1k1abgf19l8l0nawxjvnmj5ywal1cv5a",
       "depends": ["jsonlite", "leaflet", "lubridate", "parsedate", "urlshorteneR"]
     },
     "semnova": {
@@ -109359,8 +113133,8 @@
     },
     "semptools": {
       "name": "semptools",
-      "version": "0.2.10",
-      "sha256": "15rzkavr3njaln9mgn93ypbxw93prskvxw1s0865xqp58mh14k8y",
+      "version": "0.3.1",
+      "sha256": "0hyf1zr592hrl45xd678vma3g6wa3qdj4bchr3a7bvvr42nhcsyf",
       "depends": ["lavaan", "rlang", "semPlot"]
     },
     "semsfa": {
@@ -109437,8 +113211,8 @@
     },
     "sensitivity": {
       "name": "sensitivity",
-      "version": "1.30.0",
-      "sha256": "1larcjjl3yy8rk448m0k77h9bc1mfsm7n8wxf6i2ig2fbyh1rlkl",
+      "version": "1.30.1",
+      "sha256": "1k9ka5jszlrbgz57383632znv7n2vdnbf81scmqh87jyay7bp55m",
       "depends": ["Rcpp", "RcppArmadillo", "boot", "dtwclust", "foreach", "ggplot2", "numbers"]
     },
     "sensitivity2x2xk": {
@@ -109479,8 +113253,8 @@
     },
     "sensmediation": {
       "name": "sensmediation",
-      "version": "0.3.0",
-      "sha256": "0pmhlc5aqz1vwl4fpn38nkqy63pbq6q62fk9xjja4khrq35zh9yb",
+      "version": "0.3.1",
+      "sha256": "10m5z651nij61rh9pq7yh03q06crdhl9p9msiangd8r3lkm77sbi",
       "depends": ["maxLik", "mvtnorm"]
     },
     "sensobol": {
@@ -109527,8 +113301,8 @@
     },
     "sentopics": {
       "name": "sentopics",
-      "version": "0.7.3",
-      "sha256": "1n9z2k4nwzd7j2nliar4v1as1vixx6cbmcysf4phjmh7qfay8bqk",
+      "version": "0.7.4",
+      "sha256": "1sqlblsy75i0bqn5jplmc6ghrak9d6whn0xzx5mbr6vc3802r28d",
       "depends": ["Rcpp", "RcppArmadillo", "RcppHungarian", "RcppProgress", "data_table", "generics", "quanteda"]
     },
     "sentryR": {
@@ -109555,6 +113329,12 @@
       "sha256": "1jx1ilbz7md501035vklk5bsw8krg8dn18pwkqynsacqy8wjwl2s",
       "depends": []
     },
+    "seq2R": {
+      "name": "seq2R",
+      "version": "2.0.1",
+      "sha256": "1g5zg3v5fjv2vnnskv4az8kk3cm0spnnz6q8b5wa4ic5izlg4fcf",
+      "depends": ["seqinr"]
+    },
     "seqDesign": {
       "name": "seqDesign",
       "version": "1.2",
@@ -109593,8 +113373,8 @@
     },
     "seqimpute": {
       "name": "seqimpute",
-      "version": "2.0.0",
-      "sha256": "1g60drnx12j6wzkisxlmhidvqzzgsrmmmmp8dljq94bb5iv8xjmz",
+      "version": "2.1.0",
+      "sha256": "0acagq51d2fs6sf59xxlvfkf3f6qbaki9mgylfrdyfsxjjj42bc1",
       "depends": ["Amelia", "TraMineR", "TraMineRextras", "cluster", "dfidx", "doRNG", "doSNOW", "dplyr", "foreach", "mice", "mlr", "nnet", "plyr", "ranger", "rms", "stringr"]
     },
     "seqinr": {
@@ -109611,8 +113391,8 @@
     },
     "seqminer": {
       "name": "seqminer",
-      "version": "9.4",
-      "sha256": "0m9ysdq4ch4c2i3d86gd32rbi0v637djvr295wzzwgkflk66sz5c",
+      "version": "9.7",
+      "sha256": "15dkh4wfszfrpfpwyhnwj3bnkjfxm17bp0grr1wf4h6zxj0jbkp5",
       "depends": []
     },
     "seqmon": {
@@ -109653,8 +113433,8 @@
     },
     "seriation": {
       "name": "seriation",
-      "version": "1.5.5",
-      "sha256": "0v84pic838rpbcmrz8ip466aagz57vmzlgfk0vkhlcv8zn34r0zp",
+      "version": "1.5.7",
+      "sha256": "0m98qhk3mkdny728v90cwmq24qinn7v03fyj4vmaw7hsjrzmj6kc",
       "depends": ["MASS", "TSP", "ca", "cluster", "colorspace", "foreach", "gclus", "qap", "registry", "vegan"]
     },
     "serieslcb": {
@@ -109663,16 +113443,16 @@
       "sha256": "1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq",
       "depends": ["gplots", "shiny"]
     },
-    "serocalculator": {
-      "name": "serocalculator",
-      "version": "1.0.3",
-      "sha256": "1cxwii35gp9dybjp2989wbmsrv9f3s1qxrrsl4s57lj3q1by2kpk",
-      "depends": ["Rcpp", "cli", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "lifecycle", "magrittr", "mixtools", "rlang", "rngtools", "scales", "tibble", "tidyr"]
+    "serosv": {
+      "name": "serosv",
+      "version": "1.0.1",
+      "sha256": "11nwpbbzcp6lch79kfz2v63l899dvjdg58qdlc4z2r1c68yxk4vp",
+      "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "boot", "deSolve", "dplyr", "ggplot2", "locfit", "magrittr", "mgcv", "mixdist", "patchwork", "rstan", "rstantools"]
     },
     "serp": {
       "name": "serp",
-      "version": "0.2.4",
-      "sha256": "0hd25rxknj636ssy2289xjvq5fflp2p561yb9w0siqihfc7cfjpc",
+      "version": "0.2.5",
+      "sha256": "0sm61v1jks41g4fl2scc78z89bbhpl48z1ncsp3smklwfcapxwpw",
       "depends": ["crayon", "ordinal"]
     },
     "serpstatr": {
@@ -109695,8 +113475,8 @@
     },
     "servr": {
       "name": "servr",
-      "version": "0.30",
-      "sha256": "0h1di3whhd6fm4cilm2k2aa0i9j964sw7dv24h21m1q82hb21ya3",
+      "version": "0.32",
+      "sha256": "19ixy27b87z99s1crqnmxm7vqzz4zsxpjgpy4101dic7628wlak7",
       "depends": ["httpuv", "jsonlite", "mime", "xfun"]
     },
     "sesem": {
@@ -109767,14 +113547,14 @@
     },
     "sf": {
       "name": "sf",
-      "version": "1.0-16",
-      "sha256": "11wrbaj5s0dqbnh1mfm03l7xi9flzx8grgbkqxrs1wnd2481jvp9",
+      "version": "1.0-19",
+      "sha256": "0rr77mxmdbxra52xf7kwa9vgjshlz2d6nxs46jxkz0rzl4hqb168",
       "depends": ["DBI", "Rcpp", "classInt", "magrittr", "s2", "units"]
     },
     "sfaR": {
       "name": "sfaR",
-      "version": "1.0.0",
-      "sha256": "1c7rnnsmdlhby765avb8134f7424qf0b8gdl5q6vz3ialalfg49d",
+      "version": "1.0.1",
+      "sha256": "0sxfg5gj22j3dr3mjb46vq16ybzz08ybd2wclwcmh05ygnfnxdrv",
       "depends": ["Formula", "cubature", "fastGHQuad", "marqLevAlg", "maxLik", "mnorm", "nleqslv", "plm", "qrng", "randtoolbox", "sandwich", "texreg", "trustOptim", "ucminf"]
     },
     "sfadv": {
@@ -109807,6 +113587,12 @@
       "sha256": "05ip1z6rh0k7az0y7nwp9c6rv1s53i0i698yfhx46lfnhzz87anf",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "dplyr", "expm", "forcats", "igraph", "kableExtra", "magrittr", "purrr", "rlang", "rootSolve", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
+    "sfcurve": {
+      "name": "sfcurve",
+      "version": "1.0.0",
+      "sha256": "02r87znczsvx8k4yrwjyayg9hynk97dgy5i3xbhal0cc6rlf1h5m",
+      "depends": ["Rcpp", "colorRamp2"]
+    },
     "sfd": {
       "name": "sfd",
       "version": "0.1.0",
@@ -109821,10 +113607,16 @@
     },
     "sfdep": {
       "name": "sfdep",
-      "version": "0.2.4",
-      "sha256": "0b8dk5rs0xvgnmwsnli2xgw5qgp80a4xffh6aqd6sxg3dyw1z9g4",
+      "version": "0.2.5",
+      "sha256": "0x3wwa3s5aa402ab0p07lx0cs3vg5qhhrhz4p3sdjw4lxwfw1hks",
       "depends": ["cli", "rlang", "sf", "spdep"]
     },
+    "sffdr": {
+      "name": "sffdr",
+      "version": "1.0.0",
+      "sha256": "0z2nx5k7hmmyl4y64ajzf1j9ksbfqq0hfdg7m3xkfjmi51vn5whz",
+      "depends": ["Rcpp", "dplyr", "gam", "ggplot2", "locfit", "patchwork", "qvalue", "tibble", "tidyr"]
+    },
     "sfheaders": {
       "name": "sfheaders",
       "version": "0.4.4",
@@ -109851,8 +113643,8 @@
     },
     "sfnetworks": {
       "name": "sfnetworks",
-      "version": "0.6.4",
-      "sha256": "0q64ki4ylgkwnz4g43pq43hv9lspi1akyssjpbd4947x69hlyhiz",
+      "version": "0.6.5",
+      "sha256": "047g34fl1klmykls4fxw99w8pcq2c8jynf5lfhp0q7p285ciq7pb",
       "depends": ["crayon", "dplyr", "igraph", "lwgeom", "rlang", "sf", "sfheaders", "tibble", "tidygraph", "units"]
     },
     "sfo": {
@@ -109863,8 +113655,8 @@
     },
     "sfsmisc": {
       "name": "sfsmisc",
-      "version": "1.1-18",
-      "sha256": "1bc3qjnh3k4ia7w2sdbawr4rp8w9pmcbzbdjg7qbiwmpx6h2w19k",
+      "version": "1.1-20",
+      "sha256": "0svpqdcwq62y5d2ywcdrqn1lpq1jvfqx9mxl0dxxa08whahhyqs4",
       "depends": []
     },
     "sft": {
@@ -109875,8 +113667,8 @@
     },
     "sftime": {
       "name": "sftime",
-      "version": "0.2-0",
-      "sha256": "1ymi60ag8kqb3293bdcvb83zwsgrz000ylifjvlpzzmh1xsisanq",
+      "version": "0.3.0",
+      "sha256": "1dypvq8pc86n02hqd7dfbr3h7b90q3y9cf6q8mqqnf7gyvax9bdd",
       "depends": ["sf"]
     },
     "sftrack": {
@@ -109885,18 +113677,18 @@
       "sha256": "0cm87fla8bnhp1j35wq2llw1jziqhgfcj1yn503z4ds40gh4wnqa",
       "depends": ["sf"]
     },
+    "sg": {
+      "name": "sg",
+      "version": "0.2.0",
+      "sha256": "1nbj4qrhm8kqcd5620hjdz57yfc3dkchvrxrp9qdrqaf6k1kc5vq",
+      "depends": ["base64enc", "httr2", "mime", "rlang"]
+    },
     "sgPLS": {
       "name": "sgPLS",
       "version": "1.8",
       "sha256": "16cjhrla1f4pf2gqfnbi5n1ai69nbr80crwn1f29ldk483d6hjc5",
       "depends": ["mixOmics", "mvtnorm"]
     },
-    "sgapi": {
-      "name": "sgapi",
-      "version": "1.0.2",
-      "sha256": "0q0qamhzsn4421wzbjfqlwrs2w4qj61ynvjh9pjv7fkk89szh7xx",
-      "depends": ["dplyr", "httr", "magrittr", "readr", "sf", "xml2"]
-    },
     "sgat": {
       "name": "sgat",
       "version": "0.9",
@@ -109983,15 +113775,15 @@
     },
     "sgraph": {
       "name": "sgraph",
-      "version": "1.0.0",
-      "sha256": "07kqgzdfhkmannx5kpnmm2hrw74ywpnbi9964628lk82pi9g8la9",
+      "version": "1.1.0",
+      "sha256": "00vwzjn09cdpng7ss852ha98v3shaznvspbm8687w0gzgd86974d",
       "depends": ["RColorBrewer", "cowplot", "ggplot2", "htmlwidgets", "igraph", "jsonlite", "magrittr", "stringi"]
     },
     "sgs": {
       "name": "sgs",
-      "version": "0.2.0",
-      "sha256": "1vkg7pw83hf12j8sjxpc9n6c6cpc7w2llry263lcw7a6293j69vr",
-      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rlab", "SLOPE", "caret", "faux"]
+      "version": "0.3.2",
+      "sha256": "1rlpgd0b5fa7pl56kijivjy3d47p0ig95qimn8bl9kfql4bavb3z",
+      "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "Rlab", "SLOPE", "caret"]
     },
     "sgsR": {
       "name": "sgsR",
@@ -110029,6 +113821,12 @@
       "sha256": "1s3fsh6cmblyhlqrswialc9437as306ki36dyx0dv4001slvxl47",
       "depends": ["ggplot2", "scales"]
     },
+    "shannon": {
+      "name": "shannon",
+      "version": "0.2.0",
+      "sha256": "010w30pj9ci1qgsi0zv2nixvqcwbhgpd998fvqn248458lrf0jdi",
+      "depends": ["VaRES", "extraDistr"]
+    },
     "shape": {
       "name": "shape",
       "version": "1.4.6.1",
@@ -110061,8 +113859,8 @@
     },
     "shapley": {
       "name": "shapley",
-      "version": "0.3",
-      "sha256": "0zr1mjpsn7s1wb708vza5vlv5biqcx3h7ng36rfq7v08lzrakwqk",
+      "version": "0.4",
+      "sha256": "1lv5p76mf2a03ivz45nxa2gbj1qrrzh6xgi6fz6r3w9qqpazgqf1",
       "depends": ["curl", "ggplot2", "h2o", "waffle"]
     },
     "shapper": {
@@ -110079,8 +113877,8 @@
     },
     "shapviz": {
       "name": "shapviz",
-      "version": "0.9.3",
-      "sha256": "01zq6kr5na40xgypif6sv2pjynhva9v0npx779k7fxck1db68z80",
+      "version": "0.9.6",
+      "sha256": "14p24c9pxbqiagy27gd6iam4dgh7rbgnzp04w49y337pd99m4qj7",
       "depends": ["ggfittext", "gggenes", "ggplot2", "ggrepel", "patchwork", "rlang", "xgboost"]
     },
     "shar": {
@@ -110121,8 +113919,8 @@
     },
     "sharpshootR": {
       "name": "sharpshootR",
-      "version": "2.3.1",
-      "sha256": "1cvq2wh05dkaijkmwm20bs7xcmcv0xwv1gcf535xnd9gkzpy8xdr",
+      "version": "2.3.2",
+      "sha256": "1b41bspxlbwbnwn51gd968vqlcahpmrkqgi0asa8h1rzs78db6x2",
       "depends": ["RColorBrewer", "ape", "aqp", "circular", "cluster", "curl", "digest", "e1071", "lattice", "plyr", "reshape2", "scales", "soilDB", "stringi"]
     },
     "sharx": {
@@ -110149,6 +113947,12 @@
       "sha256": "1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz",
       "depends": ["bmp", "tiff", "xlsx"]
     },
+    "shelter": {
+      "name": "shelter",
+      "version": "0.1.1",
+      "sha256": "0nvq96i0i4gcp8p81zk48b936gmz5sxag41pcajxr9gwkhpnkqwb",
+      "depends": ["checkmate", "filelock", "getPass", "rappdirs", "sodium", "yaml"]
+    },
     "sherlock": {
       "name": "sherlock",
       "version": "0.7.0",
@@ -110181,8 +113985,8 @@
     },
     "shiny": {
       "name": "shiny",
-      "version": "1.9.1",
-      "sha256": "1qsllqmkhhcddzsi26f1b2q0jcnmbxkjvq70w8nnaz8j9whnljw5",
+      "version": "1.10.0",
+      "sha256": "0lj46hm42a66fancgcy8pxcbv5xfm9x66kxdlvjq7cc4cqbhlw3f",
       "depends": ["R6", "bslib", "cachem", "commonmark", "crayon", "fastmap", "fontawesome", "glue", "htmltools", "httpuv", "jsonlite", "later", "lifecycle", "mime", "promises", "rlang", "sourcetools", "withr", "xtable"]
     },
     "shiny_benchmark": {
@@ -110197,6 +114001,12 @@
       "sha256": "1hxn9z565g34fx7wbx5648sx2q4q1w2nggbfcjplrjwg709swbdr",
       "depends": ["checkmate", "htmltools", "shiny", "shiny_react"]
     },
+    "shiny_destroy": {
+      "name": "shiny.destroy",
+      "version": "0.1.0",
+      "sha256": "07hn079pmyilmjh7gjlz608987j4z42l7s3fskwpc5asnjnx2brq",
+      "depends": ["purrr", "rlang", "shiny"]
+    },
     "shiny_emptystate": {
       "name": "shiny.emptystate",
       "version": "0.1.0",
@@ -110265,20 +114075,14 @@
     },
     "shiny_telemetry": {
       "name": "shiny.telemetry",
-      "version": "0.3.0",
-      "sha256": "190cpxx9ddapixv8ci6xkabmyb0i8qb1kak49c286p43psm6dy66",
+      "version": "0.3.1",
+      "sha256": "1kn89gfz9a8j3ymmv2mpgazixyig6g1vxjd1a5incnj5qd58inv5",
       "depends": ["R6", "RSQLite", "checkmate", "digest", "dplyr", "glue", "htmltools", "httr2", "jsonlite", "lifecycle", "logger", "lubridate", "odbc", "purrr", "rlang", "shiny", "stringr", "tidyr"]
     },
-    "shiny_worker": {
-      "name": "shiny.worker",
-      "version": "0.0.1",
-      "sha256": "1l30dx46s3q1x9nd42r6dracd3lqkjk80r9jyjqy8lmdsq48300i",
-      "depends": ["R6", "future", "shiny"]
-    },
     "shinyAce": {
       "name": "shinyAce",
-      "version": "0.4.2",
-      "sha256": "12mqvdh6rxsr61pc3pzla95r5f4l7xagjs2rcdr7c2lbqyxpx6aa",
+      "version": "0.4.3",
+      "sha256": "07xb4mjz9fm5zpysh6133ps0qlakbq74rcsz05kzv9mwxz8bm5sh",
       "depends": ["jsonlite", "shiny"]
     },
     "shinyBS": {
@@ -110307,14 +114111,14 @@
     },
     "shinyCohortBuilder": {
       "name": "shinyCohortBuilder",
-      "version": "0.2.1",
-      "sha256": "1ld8sing87s5r2yxhd5w9wybacx508hgp1crbrpnirq80jnmrazy",
+      "version": "0.3.1",
+      "sha256": "0l22fwq6mk9z8bv3vpxbf6gfimknwidbx55gjxjsww85v7qmh6r5",
       "depends": ["bslib", "cohortBuilder", "dplyr", "ggiraph", "ggplot2", "glue", "highr", "htmltools", "htmlwidgets", "jsonlite", "lifecycle", "magrittr", "purrr", "rlang", "shiny", "shinyGizmo", "shinyWidgets", "tibble", "tryCatchLog"]
     },
     "shinyCox": {
       "name": "shinyCox",
-      "version": "1.1.0",
-      "sha256": "055v9mxy3z0ks5fvfqs1qf7cb8mavxd2p55790ndj3k04vf6mwd2",
+      "version": "1.1.2",
+      "sha256": "16i1n0624rbzrs8jv0g50bm8n7m9bs28fqhh4282wdk423qy51k2",
       "depends": ["shiny", "survival"]
     },
     "shinyCyJS": {
@@ -110367,9 +114171,9 @@
     },
     "shinyGovstyle": {
       "name": "shinyGovstyle",
-      "version": "0.0.8",
-      "sha256": "1czyz51k0xm62b9bzcsygslm2nd3fnmll4wjxwimlngy00rnjnng",
-      "depends": ["htmltools", "jsonlite", "shiny", "shinyjs"]
+      "version": "0.1.0",
+      "sha256": "1irhcyj4ixlfz4qilz2vwls6a6sc0zzzixgvizh7cwnkjf962cg9",
+      "depends": ["htmltools", "jsonlite", "magrittr", "purrr", "shiny", "shinyjs", "stringr"]
     },
     "shinyHeatmaply": {
       "name": "shinyHeatmaply",
@@ -110379,9 +114183,9 @@
     },
     "shinyHugePlot": {
       "name": "shinyHugePlot",
-      "version": "0.2.6",
-      "sha256": "1sf26jz2jbyrs11a1gricnb3iq4106cpf10kbhqx0hy12q47lk1y",
-      "depends": ["R6", "assertthat", "bit64", "data_table", "dplyr", "htmltools", "jsonlite", "lazyeval", "nanotime", "plotly", "purrr", "rlang", "shiny", "shinyjs", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "0.3.0",
+      "sha256": "0i5qgj24ar1ig5p7wmd5acf4k3yb879k4zsm7575jnz8cs3z13vl",
+      "depends": ["DBI", "R6", "assertthat", "bit64", "data_table", "dplyr", "duckdb", "htmltools", "jsonlite", "lazyeval", "nanotime", "plotly", "purrr", "rlang", "shiny", "shinyjs", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "shinyIRT": {
       "name": "shinyIRT",
@@ -110437,10 +114241,16 @@
       "sha256": "1rvv5lcbb17i263xx1zn9524iwpmw56xwh0b2qii8096l20w6cnd",
       "depends": ["shiny"]
     },
+    "shinyMixR": {
+      "name": "shinyMixR",
+      "version": "0.5.0",
+      "sha256": "1z73wdv8vc71x3rp0axm3ad8wqj3fz4g9bdvzd3d4m6gblvydvpq",
+      "depends": ["DT", "R3port", "bs4Dash", "cli", "collapsibleTree", "fresh", "ggplot2", "gridExtra", "magrittr", "nlmixr2", "nlmixr2est", "patchwork", "plotly", "ps", "shiny", "shinyAce", "shinyWidgets", "shinyjs", "stringi", "whisker", "xfun"]
+    },
     "shinyMobile": {
       "name": "shinyMobile",
-      "version": "2.0.0",
-      "sha256": "0n678q4rqf2fxv8mv683byd9zjl7hg6rlvycf3g519griksba5mn",
+      "version": "2.0.1",
+      "sha256": "0vsmvd30n4i2gqzywl0h11v5zrrcf40gmr12fvngxm3baxa5v3xc",
       "depends": ["gplots", "htmltools", "jsonlite", "lifecycle", "magrittr", "shiny"]
     },
     "shinyMolBio": {
@@ -110473,6 +114283,12 @@
       "sha256": "086dawnwzhcfz4l555j8wvy46f8h939y17c0glm86i339jszzra3",
       "depends": []
     },
+    "shinyQueryBuilder": {
+      "name": "shinyQueryBuilder",
+      "version": "0.1.0",
+      "sha256": "1v6za6xpl91dfbqp5pzdgxrwcs26y0qlwj19av00ggmjgzdca29c",
+      "depends": ["R6", "glue", "htmltools", "jsonlite", "magrittr", "purrr", "queryBuilder", "rlang", "shiny"]
+    },
     "shinyRGL": {
       "name": "shinyRGL",
       "version": "0.1.0",
@@ -110523,8 +114339,8 @@
     },
     "shinyStorePlus": {
       "name": "shinyStorePlus",
-      "version": "1.2",
-      "sha256": "08xyd26wcfv629a4791s20f690faf472rn33qhnlsjbddnmla62z",
+      "version": "1.3",
+      "sha256": "1f2gpfh3y68njc6bq77bjia53g9pl6kklz7bw2s165kawi9cc18w",
       "depends": ["htmltools", "jsonlite", "shiny", "shinyWidgets"]
     },
     "shinyTempSignal": {
@@ -110551,11 +114367,17 @@
       "sha256": "0krffsgdv99cvyzdspb9l7cdnq1vibsbmpd4w48r5pi4v8jbvfj6",
       "depends": ["htmlwidgets", "jsonlite", "promises", "shiny", "stringr"]
     },
+    "shinyWGD": {
+      "name": "shinyWGD",
+      "version": "1.0.0",
+      "sha256": "1kpqq413pxkkbabbnpgrvy37z739avp41wrhll30yn2zw5gqss2m",
+      "depends": ["ape", "data_table", "dplyr", "fs", "htmltools", "httr", "jsonlite", "ks", "mclust", "seqinr", "shiny", "shinyalert", "stringr", "tidyr", "vroom"]
+    },
     "shinyWidgets": {
       "name": "shinyWidgets",
-      "version": "0.8.6",
-      "sha256": "1dv0bwp3rxc1c3n05sczvshg5i9mffqxb61r1z2radwmj5c28g46",
-      "depends": ["anytime", "bslib", "htmltools", "jsonlite", "rlang", "sass", "shiny"]
+      "version": "0.8.7",
+      "sha256": "08kpf98spkyx7vq9jk5g3wnhdhzfmkkzq04p8gv44hjw2b2v9m5d",
+      "depends": ["bslib", "htmltools", "jsonlite", "rlang", "sass", "shiny"]
     },
     "shinyXYpad": {
       "name": "shinyXYpad",
@@ -110605,6 +114427,18 @@
       "sha256": "1bjfi5xdidj8n84mylghvrncvcyg625kj8pnizl59m649k3n10v2",
       "depends": ["htmltools", "htmlwidgets", "jsonlite", "shiny"]
     },
+    "shinychat": {
+      "name": "shinychat",
+      "version": "0.1.1",
+      "sha256": "0fy6b56dniccir93h6a2cxi9j83bzclgffpdg0x7386snzahqm1s",
+      "depends": ["bslib", "coro", "htmltools", "promises", "rlang", "shiny"]
+    },
+    "shinycroneditor": {
+      "name": "shinycroneditor",
+      "version": "1.0.0",
+      "sha256": "14z2yzzsycy5vplrim40j295mcw74rk3bxwpncavk3widjbmvjhx",
+      "depends": ["htmltools", "htmlwidgets"]
+    },
     "shinycssloaders": {
       "name": "shinycssloaders",
       "version": "1.1.0",
@@ -110703,8 +114537,8 @@
     },
     "shinylive": {
       "name": "shinylive",
-      "version": "0.2.0",
-      "sha256": "16r3fbzgv9qjdr08cdazddjxanliymi2mhlx56p0bdrn10miiyp9",
+      "version": "0.3.0",
+      "sha256": "1pzv8c1vhdff6r39ig6xxqhf22kcldp1vsbk3jv1y6ppqs8mvs3f",
       "depends": ["archive", "brio", "cli", "fs", "gh", "glue", "httr2", "jsonlite", "pkgdepends", "progress", "rappdirs", "renv", "rlang", "whisker", "withr"]
     },
     "shinyloadtest": {
@@ -110947,6 +114781,18 @@
       "sha256": "0fcvx7pz4mn89g9g8x32wgqil9xyh29vjxx8hlvv5385ig2wd4lw",
       "depends": ["GIGrvg", "Rcpp", "RcppArmadillo", "RcppGSL", "RcppProgress", "coda", "stochvol", "zoo"]
     },
+    "shrinkTVPVAR": {
+      "name": "shrinkTVPVAR",
+      "version": "0.1.1",
+      "sha256": "0938fmh45nnvvkpxskqrzgkv25yghzy8pq8313l8q50xxpskp1rm",
+      "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "RcppProgress", "coda", "lattice", "shrinkTVP", "stochvol", "zoo"]
+    },
+    "shrinkem": {
+      "name": "shrinkem",
+      "version": "0.2.0",
+      "sha256": "0frnmri4ycmfjj6375iwjxldfcspfyhfvr1wyaxpqcxqa0c7gdxh",
+      "depends": ["CholWishart", "brms", "extraDistr", "matrixcalc", "mvtnorm"]
+    },
     "shroomDK": {
       "name": "shroomDK",
       "version": "0.3.0",
@@ -110983,6 +114829,12 @@
       "sha256": "178bqjdx96lk8npa26w29aanal7g6x22b6p1p8gsbyi6h8acgkh0",
       "depends": ["cli", "data_table", "dplyr", "httr", "magrittr", "tibble"]
     },
+    "sicure": {
+      "name": "sicure",
+      "version": "0.1.0",
+      "sha256": "096ynmqdsc6nwj5kp9p5s13fgq8vrrzasl2nrxpwrp7y1hqzqpzm",
+      "depends": ["StatMatch", "caTools", "doBy", "fda", "npcure"]
+    },
     "sidier": {
       "name": "sidier",
       "version": "4.1.0",
@@ -111115,6 +114967,12 @@
       "sha256": "16v6f25pdbfm10b3cicf11nzqz5ykq70vppll7rxqbyafkcfwcra",
       "depends": ["wrapr"]
     },
+    "sigugr": {
+      "name": "sigugr",
+      "version": "1.0.0",
+      "sha256": "1mr28fr3rxih6mdizr90d8c2n9saapb0sdaafn36g3nyh4j5xc6d",
+      "depends": ["clc", "gdalUtilities", "httr", "jsonlite", "rpostgis", "sf", "snakecase", "terra"]
+    },
     "siie": {
       "name": "siie",
       "version": "0.4.0",
@@ -111133,6 +114991,12 @@
       "sha256": "193n0gh2kg5900si1m94cliyh0fbmp9dybs17vl1xxn34pg9c9s9",
       "depends": ["crsmeta", "decido", "dplyr", "gibble", "gridBase", "magrittr", "purrr", "rlang", "tibble", "unjoin"]
     },
+    "silp": {
+      "name": "silp",
+      "version": "1.0.0",
+      "sha256": "1a0ng4lmibcx1afkxxd17593h5dn6iizi6x5kgdy9660llfs1q57",
+      "depends": ["MASS", "Matrix", "lavaan", "purrr", "semTools", "stringr"]
+    },
     "sim_BA": {
       "name": "sim.BA",
       "version": "0.1.0",
@@ -111153,14 +115017,14 @@
     },
     "simCAT": {
       "name": "simCAT",
-      "version": "1.0.0",
-      "sha256": "1ngdfzackzm82v7qs8809w3k70hayzan4zsvf061w04wvlhgzllp",
+      "version": "1.0.1",
+      "sha256": "0p82v24b7y3fbbyk4mxva6kzg0pxyxrnp739npcspira9d4v0ypa",
       "depends": ["dplyr", "mirt", "mirtCAT", "shiny", "shinycssloaders"]
     },
     "simDAG": {
       "name": "simDAG",
-      "version": "0.1.2",
-      "sha256": "18zbqpvndblrqmdz7hsbc0kf1w8v6a75z4x9yr95f3saazirrj6p",
+      "version": "0.2.0",
+      "sha256": "160q8f65na8kbl3069hrjapz8cb9f1kk5kxp7928756jkak7ifvq",
       "depends": ["Rfast", "data_table", "igraph", "rlang"]
     },
     "simDNAmixtures": {
@@ -111249,8 +115113,8 @@
     },
     "simStateSpace": {
       "name": "simStateSpace",
-      "version": "1.2.2",
-      "sha256": "072dyrzxpmp6i565162bpriviy47d59f3ssvkhpdpvs1d0g11j2a",
+      "version": "1.2.3",
+      "sha256": "0p8sy58c8b1v2xm8m661mdkg1zhxilaiwnxl4y9wijbq90vbpnw6",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "simTargetCov": {
@@ -111267,9 +115131,9 @@
     },
     "simaerep": {
       "name": "simaerep",
-      "version": "0.5.0",
-      "sha256": "1r0hgf8i7grpiww42l28az4pr81s998ghyrmbrva8ap27vj3r269",
-      "depends": ["RColorBrewer", "cowplot", "dplyr", "forcats", "furrr", "ggplot2", "knitr", "magrittr", "progressr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
+      "version": "0.6.0",
+      "sha256": "0sjq6lrs9fawgwpyr8p97c36m9a6yw16ww247kw86qncnb1ya4vx",
+      "depends": ["RColorBrewer", "cowplot", "dbplyr", "dplyr", "forcats", "furrr", "ggplot2", "knitr", "magrittr", "progressr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "simboot": {
       "name": "simboot",
@@ -111279,8 +115143,8 @@
     },
     "simcausal": {
       "name": "simcausal",
-      "version": "0.5.6",
-      "sha256": "0r87i5m8sd9bf8ddlkgq9dl0pglhxl9pj5b0vx79va9r5wb55vgk",
+      "version": "0.5.7",
+      "sha256": "1k9qq4xr4xznqzw668z49bw3nw4q1vb87v134dwr8b1zns5r5a4v",
       "depends": ["Matrix", "R6", "assertthat", "data_table", "igraph", "stringr"]
     },
     "simcdm": {
@@ -111297,14 +115161,14 @@
     },
     "simctest": {
       "name": "simctest",
-      "version": "2.6",
-      "sha256": "0igwn82zfx6ajv42gpyx6969aldygldkpdc9ik6601511sscvf2a",
+      "version": "2.6.1",
+      "sha256": "0f2lmbvhd8j0can7bh1qddbwr9778ms8k17nc4pf2isa9kpgjr9q",
       "depends": []
     },
     "simdata": {
       "name": "simdata",
-      "version": "0.4.0",
-      "sha256": "1yzxa2xfjclhwbzvzdivgd99h8n9cvb16ws074r5gw2xvd0ilf3m",
+      "version": "0.4.1",
+      "sha256": "026pwxgvsr0f0yscsjg9fkcyy02imrhsx334y10w846w2j9x76x2",
       "depends": ["Matrix", "igraph", "mvtnorm"]
     },
     "simdd": {
@@ -111327,9 +115191,9 @@
     },
     "simer": {
       "name": "simer",
-      "version": "0.9.0.4",
-      "sha256": "1mgkmfv1mm4paxvzq43rdxjxf13csxizl8v1gc47y7h21hq2f5sx",
-      "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "bigmemory", "igraph", "jsonlite"]
+      "version": "0.9.0.5",
+      "sha256": "00080aqr66qh86rp5yy7zmymy6rh1k0ihqm1y0jbfcqd51sch48i",
+      "depends": ["BH", "MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "bigmemory", "jsonlite"]
     },
     "simest": {
       "name": "simest",
@@ -111381,9 +115245,9 @@
     },
     "simhelpers": {
       "name": "simhelpers",
-      "version": "0.2.1",
-      "sha256": "0awj430nmwgh2v19zy9sfkq06kjnbr7hp9mrnz4ziwlzm7bzv9wk",
-      "depends": ["Rdpack", "furrr", "rstudioapi", "tibble", "tidyr"]
+      "version": "0.3.0",
+      "sha256": "0xxnzs98q4py1z19g7hamfgd3gfhg4fc63w1drzbfsg53kzgxk13",
+      "depends": ["Rdpack", "furrr", "rstudioapi", "tidyr"]
     },
     "simitation": {
       "name": "simitation",
@@ -111399,8 +115263,8 @@
     },
     "simmer": {
       "name": "simmer",
-      "version": "4.4.6.4",
-      "sha256": "110wjmhr4645nrrjx4vk8inpz543qkrz8zg4avv4i05zrad2393x",
+      "version": "4.4.7",
+      "sha256": "0lj9jrbs3p9ya8xyxvbwpxhkfxvvd1zaphqsvjxyin2l5a1waydc",
       "depends": ["Rcpp", "codetools", "magrittr"]
     },
     "simmer_bricks": {
@@ -111423,8 +115287,8 @@
     },
     "simmr": {
       "name": "simmr",
-      "version": "0.5.1.216",
-      "sha256": "0rvf6b0x6iivgp1czj98972p8gr1g96sc3g55p30gnw08b48i1x5",
+      "version": "0.5.1.217",
+      "sha256": "15b24mmmljajfp5yrgfbnk9wm53vrky9sza3hsl4i77pvikdpf9q",
       "depends": ["GGally", "R2jags", "Rcpp", "RcppArmadillo", "RcppDist", "bayesplot", "boot", "checkmate", "compositions", "ggplot2", "reshape2", "viridis"]
     },
     "simode": {
@@ -111435,8 +115299,8 @@
     },
     "simodels": {
       "name": "simodels",
-      "version": "0.1.0",
-      "sha256": "0fhrlmyh0hnv518131wabadidim5k6f2gjsq5k4jc9zwmm5qbgfz",
+      "version": "0.2.0",
+      "sha256": "0jbfkd2db38z1h0lww7ql5vizr1pniripa83ivzs00mvaj9xc2q6",
       "depends": ["dplyr", "geodist", "od", "rlang", "sf"]
     },
     "simphony": {
@@ -111447,8 +115311,8 @@
     },
     "simplace": {
       "name": "simplace",
-      "version": "5.0.13",
-      "sha256": "0cxhva0hypvjxck1dwajpymrjvmk9h7yvxdbiws8axdcmrwgmq76",
+      "version": "5.1.2",
+      "sha256": "1249z5fh7z3n25bazkn9jky9j50gmi3l3mavxd53fc11jry038l2",
       "depends": ["rJava"]
     },
     "simplanonym": {
@@ -111567,8 +115431,8 @@
     },
     "simputation": {
       "name": "simputation",
-      "version": "0.2.8",
-      "sha256": "02l7j2s74mjd4vgly4nnf2w7as9m3m6qifa292r29iaw12l0zj81",
+      "version": "0.2.9",
+      "sha256": "1hs2sndxnry3y5ldwx9y71y8nbph5bj3iw7gkbfbmgv8wzngnc98",
       "depends": ["MASS", "VIM", "glmnet", "gower", "missForest", "norm", "randomForest", "rpart"]
     },
     "simr": {
@@ -111591,8 +115455,8 @@
     },
     "sims": {
       "name": "sims",
-      "version": "0.0.3",
-      "sha256": "0wsq8plbrmk4xrs8i3g3pqwp2xkhfh1pffva1bwyx44l1r5imzs2",
+      "version": "0.0.4",
+      "sha256": "0iqqzmgxlldiqbl5dc4yfc6g6p4ayw3mzsy3gdrpb4yxmharhfrk",
       "depends": ["chk", "future_apply", "nlist", "yesno"]
     },
     "simsalapar": {
@@ -111645,9 +115509,9 @@
     },
     "simtrial": {
       "name": "simtrial",
-      "version": "0.4.1",
-      "sha256": "1gsd7ykqws7y5ggblbjjrg3yid9fj7samrnbk7fb4dnknvv8lgls",
-      "depends": ["Rcpp", "data_table", "doFuture", "foreach", "future", "mvtnorm", "rlang", "survival"]
+      "version": "0.4.2",
+      "sha256": "1wwx9z10ycl06s0v3farfk2hkbw4xpsgvhg1rdzl7p2cr3s5840m",
+      "depends": ["Rcpp", "data_table", "doFuture", "foreach", "future", "gsDesign2", "mvtnorm", "survival"]
     },
     "simts": {
       "name": "simts",
@@ -111735,8 +115599,8 @@
     },
     "singleRcapture": {
       "name": "singleRcapture",
-      "version": "0.2.1.2",
-      "sha256": "18h10ms9xh97c4s9sa33bcvv341img73b9vh4ppgyk1lpissa1mb",
+      "version": "0.2.1.3",
+      "sha256": "0nybr15cdwzgz69jk28nxb609jf7ncyhly43nd73xlr5fknxfczm",
       "depends": ["doParallel", "foreach", "lamW", "mathjaxr", "sandwich"]
     },
     "sinib": {
@@ -111765,8 +115629,8 @@
     },
     "siren": {
       "name": "siren",
-      "version": "1.0.4",
-      "sha256": "1w4a1dkhph0ai5faxvgmvf0phnpqapmp6wlax5r38ry5p11s0ljq",
+      "version": "1.0.5",
+      "sha256": "1n6ni8yz3106qff7mjml6szjbfjcd04nr6qs6bbsv114dvy9m9s2",
       "depends": ["EFA_MRFA", "lavaan", "psych"]
     },
     "sirt": {
@@ -111789,15 +115653,15 @@
     },
     "sisal": {
       "name": "sisal",
-      "version": "0.48",
-      "sha256": "1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd",
+      "version": "0.49",
+      "sha256": "179yrdi1wzkpmm1yhgr1qhrizirwkrg8b889d2kansjnjlavy7ww",
       "depends": ["R_matlab", "R_methodsS3", "boot", "digest", "lattice", "mgcv"]
     },
     "sisireg": {
       "name": "sisireg",
-      "version": "1.1.1",
-      "sha256": "1jw1nl8l7kh5fa3hh7zh418brck6zayhhqm50nqhbghlmjs7y67i",
-      "depends": ["raster", "reticulate", "zoo"]
+      "version": "1.1.2",
+      "sha256": "0xwi1c60xlcl1ykgacxdk35wanmc4rbp1wl97s91xhvcfmfpvj4k",
+      "depends": ["reticulate", "zoo"]
     },
     "sistec": {
       "name": "sistec",
@@ -111861,9 +115725,15 @@
     },
     "sits": {
       "name": "sits",
-      "version": "1.5.0",
-      "sha256": "0ym6dkw1nvijvhyskiwp9m4pys9gmsxqhjwmqs6n670mxfnqibss",
-      "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gdalUtilities", "lubridate", "purrr", "rstac", "sf", "showtext", "slider", "sysfonts", "terra", "tibble", "tidyr", "torch", "yaml"]
+      "version": "1.5.1",
+      "sha256": "0k0wb18zranqzjsczxjrn5xl9mprn3vzi8ds6hx7n3cr63crwp9w",
+      "depends": ["Rcpp", "RcppArmadillo", "dplyr", "gdalUtilities", "lubridate", "magrittr", "purrr", "rstac", "sf", "showtext", "slider", "sysfonts", "terra", "tibble", "tidyr", "torch", "units", "yaml"]
+    },
+    "sivirep": {
+      "name": "sivirep",
+      "version": "1.0.1",
+      "sha256": "0kcj1wjk0ks2jl58lzv1l3wwzhi41jrsi42n94nhnym7b7sw4lzb",
+      "depends": ["config", "dplyr", "epitrix", "ggplot2", "httr2", "kableExtra", "readxl", "rlang", "sf", "showtext", "stringr", "sysfonts", "xml2"]
     },
     "sivs": {
       "name": "sivs",
@@ -111879,15 +115749,15 @@
     },
     "sjPlot": {
       "name": "sjPlot",
-      "version": "2.8.16",
-      "sha256": "093nmn1gq8i4kr5nhwby883rxpdiyb959shqvfnvplwcnnv762ji",
+      "version": "2.8.17",
+      "sha256": "0rai02bnqj5q829f35vw1z779cyw4rx84w6ngv7mpiagw3nb6agj",
       "depends": ["MASS", "bayestestR", "datawizard", "dplyr", "ggeffects", "ggplot2", "insight", "knitr", "parameters", "performance", "purrr", "rlang", "scales", "sjlabelled", "sjmisc", "sjstats", "tidyr"]
     },
     "sjSDM": {
       "name": "sjSDM",
-      "version": "1.0.5",
-      "sha256": "1qrslxrminbzvqkcngx875kkbaj9f2wd8svdwsd0706v5w72pisg",
-      "depends": ["Metrics", "abind", "checkmate", "cli", "crayon", "ggplot2", "ggtern", "mathjaxr", "mgcv", "mvtnorm", "reticulate", "rstudioapi"]
+      "version": "1.0.6",
+      "sha256": "0jmagj162vdq9ikzd92fk61bq6jv3dm5w1bfpjbvzg55d3cqli44",
+      "depends": ["Metrics", "abind", "beeswarm", "checkmate", "cli", "crayon", "ggplot2", "ggtern", "mathjaxr", "mgcv", "mvtnorm", "qgam", "reticulate", "rstudioapi", "scales"]
     },
     "sjdbc": {
       "name": "sjdbc",
@@ -111963,9 +115833,9 @@
     },
     "sketchy": {
       "name": "sketchy",
-      "version": "1.0.3",
-      "sha256": "1vr3vwzbm1k1g05wxdv0y543zn1fspprr121i8pxqmgbyhcs1i65",
-      "depends": ["cli", "crayon", "git2r", "knitr", "packrat", "remotes", "rmarkdown", "stringi", "xaringanExtra"]
+      "version": "1.0.4",
+      "sha256": "090gsly8ih3k8c6vbs32ikwd5j5l906mwj3xfbpa1mr2pdpg7sxd",
+      "depends": ["cli", "crayon", "git2r", "knitr", "packrat", "remotes", "rmarkdown", "stringi", "stringr", "urlchecker", "xaringanExtra"]
     },
     "skewMLRM": {
       "name": "skewMLRM",
@@ -111975,8 +115845,8 @@
     },
     "skewlmm": {
       "name": "skewlmm",
-      "version": "1.1.0",
-      "sha256": "04jxf7bwh71r33s1s2xhiy0ipfaqz97ya86rr4m0f5kxnb942ggv",
+      "version": "1.1.2",
+      "sha256": "0n3hhg2hwgmfqjys88c6hgblc48914f7k6y1p6n051k7pbypnmfk",
       "depends": ["MomTrunc", "TruncatedNormal", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "haven", "matrixcalc", "moments", "mvtnorm", "nlme", "numDeriv", "optimParallel", "purrr", "relliptical"]
     },
     "skewsamp": {
@@ -112023,8 +115893,8 @@
     },
     "skmeans": {
       "name": "skmeans",
-      "version": "0.2-16",
-      "sha256": "0rigfkjq41ivj2hz35rqak23mmzyz15ic5izzkm3vxbwhsmk9ars",
+      "version": "0.2-18",
+      "sha256": "1ilrz24yp7w7jc1683brmfzsvskakms2l02hwmqj9c24cvp9h7y6",
       "depends": ["clue", "cluster", "slam"]
     },
     "skpr": {
@@ -112039,12 +115909,6 @@
       "sha256": "1yh3hk1z4c25pkb9gzyc16a68jd1za4h9z4l9xh5avkg68ixff5j",
       "depends": []
     },
-    "skynet": {
-      "name": "skynet",
-      "version": "1.4.3",
-      "sha256": "08a5p3rk0qhsxawdxj5sfw07rdk56x6viy37w1b0hxqaxxxv239i",
-      "depends": ["RCurl", "data_table", "dplyr", "geosphere", "ggplot2", "ggrepel", "httr", "igraph", "leaflet", "maps", "stringr"]
-    },
     "skyscapeR": {
       "name": "skyscapeR",
       "version": "1.0.0",
@@ -112059,8 +115923,8 @@
     },
     "slam": {
       "name": "slam",
-      "version": "0.1-52",
-      "sha256": "09j1k63nw1m1vgblnla6s52v2337ixs958jmlzkjjz1xb01yd0y3",
+      "version": "0.1-55",
+      "sha256": "00qwx6yrsqxa8kk2dn8i024a2cq1hcg9801k0rari9rb006lbf0g",
       "depends": []
     },
     "slanter": {
@@ -112083,8 +115947,8 @@
     },
     "slca": {
       "name": "slca",
-      "version": "1.0.0",
-      "sha256": "0wllwz9cn9wvxwb4gd4g3blwhaplmfdxx06jki41ii64sq9cxbyq",
+      "version": "1.3.0",
+      "sha256": "09pawakcljv7bl7jhbllbsvaapaqkfkdnhz774n8xlx9lg2mrk6c",
       "depends": ["DiagrammeR", "MASS", "Rcpp", "magrittr"]
     },
     "slcm": {
@@ -112107,8 +115971,8 @@
     },
     "sleeperapi": {
       "name": "sleeperapi",
-      "version": "1.1.1",
-      "sha256": "1lmpcpd407bz7fwb20c8m5vaxq7l7sgna7jmh6mjy579az0fzllj",
+      "version": "1.1.2",
+      "sha256": "0304v06gaa4lw5jjz5j009acf43d1wdq96nvq1qc108whm542sm0",
       "depends": ["DT", "RColorBrewer", "dplyr", "htmltools", "htmlwidgets", "httr", "jsonlite", "plotly", "purrr", "rlang", "scales", "shiny", "shinyWidgets", "shinycssloaders", "stringr", "tidyr"]
     },
     "sleepr": {
@@ -112125,14 +115989,14 @@
     },
     "sleev": {
       "name": "sleev",
-      "version": "1.0.3",
-      "sha256": "0irc0k4asml5vfqwkv5rxw6xv1dj6sllravyggg49cdqfbhwcv3w",
+      "version": "1.0.5",
+      "sha256": "149324mvaixnrjrm20mfmvj3dy6rahaxdhdxq4iczkf3knv0hkbs",
       "depends": ["Rcpp", "RcppArmadillo", "RcppEigen"]
     },
     "slendr": {
       "name": "slendr",
-      "version": "0.9.1",
-      "sha256": "1qqbi9rmby2v4q57sp6i64lk5h2srmriglc3m0f9isz34m0ivnzl",
+      "version": "1.0.0",
+      "sha256": "1kbxc6jnh3iqwmk3rfnfpriip9w7qx774qs0pdqp4ijnjxqjbqjr",
       "depends": ["ape", "digest", "dplyr", "ggplot2", "ijtiff", "magrittr", "png", "purrr", "readr", "reticulate", "scales", "shiny", "shinyWidgets", "tidyr"]
     },
     "slfm": {
@@ -112155,8 +116019,8 @@
     },
     "slider": {
       "name": "slider",
-      "version": "0.3.1",
-      "sha256": "1c19lk0ddh5qh0jzx7178l314zyygmlpmbvn7670bcmdbxwjc2i0",
+      "version": "0.3.2",
+      "sha256": "069nvjcmhsk8y7nfgx0ln5rab3r73q61cpvrqm9m0iv4z6rlsc69",
       "depends": ["cli", "rlang", "vctrs", "warp"]
     },
     "slideview": {
@@ -112233,26 +116097,26 @@
     },
     "smaa": {
       "name": "smaa",
-      "version": "0.3-2",
-      "sha256": "0cv6xa6miy45pj0lskg70bq7bmwxdprwjl51ghlxgifkv1qdxqhc",
+      "version": "0.3-3",
+      "sha256": "1lasa8179bp9fs49n26b41mw8vwkqnz5a051913rd246lmdjnyb0",
       "depends": []
     },
     "smacof": {
       "name": "smacof",
-      "version": "2.1-6",
-      "sha256": "06mdvkbc9q8b5sbqnx4c5mq06jkqspvc4bb7zn15byz8ybv5h7aa",
-      "depends": ["Hmisc", "MASS", "candisc", "colorspace", "doParallel", "e1071", "ellipse", "foreach", "nnls", "plotrix", "polynom", "weights", "wordcloud"]
+      "version": "2.1-7",
+      "sha256": "0fj9r6x3bn5kjb2v37prmba4brzjammcxrvswc0ixvx20r75m5ks",
+      "depends": ["Hmisc", "MASS", "colorspace", "doParallel", "e1071", "ellipse", "foreach", "nnls", "plotrix", "polynom", "weights", "wordcloud"]
     },
     "smacofx": {
       "name": "smacofx",
-      "version": "1.5-3",
-      "sha256": "19pb825b7fx6ah0njap03yg763swhbfw79vhk25d37yvcidj7nm3",
+      "version": "1.6-1",
+      "sha256": "112457wqdyj4ld083ibzkfjww6xilyamcj7v6mal2gh1jxcf2r8k",
       "depends": ["MASS", "ProjectionBasedClustering", "minqa", "plotrix", "smacof", "vegan", "weights"]
     },
     "smacpod": {
       "name": "smacpod",
-      "version": "2.6",
-      "sha256": "193mqxk17ygr518p2mvk9wnj3hnckxay9jz85ng00kz2kaykdpd6",
+      "version": "2.6.4",
+      "sha256": "0rbmibwx7gkhalkza08jbxqii8ab1gpy6pb5wmxnnrs64q4hhql7",
       "depends": ["abind", "pbapply", "plotrix", "smerc", "spatstat_explore", "spatstat_geom", "spatstat_random"]
     },
     "smallarea": {
@@ -112323,8 +116187,8 @@
     },
     "smcfcs": {
       "name": "smcfcs",
-      "version": "1.8.0",
-      "sha256": "0l658ynkf3lb1nckfrgysj19m6735fi2k48r7l5qaf6jq7f3l3bh",
+      "version": "1.9.1",
+      "sha256": "0vz651qfmbif1ay2zrmnhb8i2vx16yli0k4n3dyhs0980y4ycm8p",
       "depends": ["MASS", "VGAM", "abind", "brglm2", "checkmate", "rlang", "survival"]
     },
     "smcryptoR": {
@@ -112353,8 +116217,8 @@
     },
     "smdi": {
       "name": "smdi",
-      "version": "0.3.0",
-      "sha256": "0grgj1wf2pdcz1wangnsni5x6idqz19plr7jghq6p0a7w9b89d6q",
+      "version": "0.3.1",
+      "sha256": "17l5620pjwyfwl1p0h5zv264nllca3gzcnw94hbfvb79kyls9x2s",
       "depends": ["Hotelling", "broom", "caret", "dplyr", "fastDummies", "forcats", "ggplot2", "glue", "gt", "lifecycle", "magrittr", "mice", "naniar", "pROC", "randomForest", "stringr", "survival", "tableone", "tibble", "tidyr"]
     },
     "smdocker": {
@@ -112365,8 +116229,8 @@
     },
     "smerc": {
       "name": "smerc",
-      "version": "1.8.3",
-      "sha256": "181av1l1r327iszxrihilvfiqbc4m4496g94i5r9vhhamvgk8cwm",
+      "version": "1.8.4",
+      "sha256": "0i1wd8vfs1jc6p43m73agg6g89340qwcj16vvxsjijb40hv8ga2z",
       "depends": ["Rcpp", "RcppProgress", "pbapply"]
     },
     "smetlite": {
@@ -112405,6 +116269,12 @@
       "sha256": "1474jfk6vqcx3jv0mlf45l93bnn3f2qgm2j03rbjid4skg811618",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "mvtnorm", "numDeriv", "sf"]
     },
+    "smiles": {
+      "name": "smiles",
+      "version": "0.1-0",
+      "sha256": "0bjdp4198069hmlcxy718idv50jbscl0l4ffl8aqvqh7iqmy14cz",
+      "depends": ["boot", "meta"]
+    },
     "smirnov": {
       "name": "smirnov",
       "version": "1.0-1",
@@ -112431,8 +116301,8 @@
     },
     "smof": {
       "name": "smof",
-      "version": "1.1.0",
-      "sha256": "0sysqz2jxzfpiril7i6496in43zpk5nrvybzz40rb5dashwwh4nv",
+      "version": "1.2.2",
+      "sha256": "1vd9bya14jh41f3gzqhmmvn9szm8fdxjbp2fnb7k0y04rvvsmz7m",
       "depends": []
     },
     "smoke": {
@@ -112449,8 +116319,8 @@
     },
     "smooth": {
       "name": "smooth",
-      "version": "4.0.2",
-      "sha256": "1q0sgn30hsak9nyy30nbslh39byhqygypi1kp6gp99qfdrgxflva",
+      "version": "4.1.0",
+      "sha256": "14yprj4kwqad9a4vhspxcgjiqzfya3x9hhmvcw8h4s6s6r2wjxiq",
       "depends": ["MASS", "Rcpp", "RcppArmadillo", "generics", "greybox", "nloptr", "pracma", "statmod", "xtable", "zoo"]
     },
     "smoothAPC": {
@@ -112497,8 +116367,8 @@
     },
     "smoothie": {
       "name": "smoothie",
-      "version": "1.0-3",
-      "sha256": "1ari4av4vsydaxg56vsfifc50kxsqy8xlxl7by32capc6pcjwvq8",
+      "version": "1.0-4",
+      "sha256": "1fvnpldxani93h2pjlg7gr36phsg1461krl2rqs9ld4k60xb1bq8",
       "depends": []
     },
     "smoothmest": {
@@ -112575,8 +116445,8 @@
     },
     "smurf": {
       "name": "smurf",
-      "version": "1.1.5",
-      "sha256": "1gpzzj67x0i70vw1x4rv56mhk2b74ynvdsy93rzmdk6b2h3dvv46",
+      "version": "1.1.6",
+      "sha256": "0s30v6bq8rr3zha93vg1q63yqak5s7wl9acqv1pxnz8n35k3jxpr",
       "depends": ["MASS", "Matrix", "RColorBrewer", "Rcpp", "RcppArmadillo", "catdata", "glmnet", "mgcv"]
     },
     "smvgraph": {
@@ -112593,14 +116463,14 @@
     },
     "snSMART": {
       "name": "snSMART",
-      "version": "0.2.3",
-      "sha256": "0d05wn2w9x7gapaz94zpf251rh2mld8agsir3hqbzjyil14xrpv6",
+      "version": "0.2.4",
+      "sha256": "0sy8wvrjw1cbdlcdsjqk08k00v7bk1szkzv0a4xff56dis7z2hz3",
       "depends": ["EnvStats", "HDInterval", "bayestestR", "condMVNorm", "cubature", "geepack", "pracma", "rjags", "tidyr", "truncdist"]
     },
     "sna": {
       "name": "sna",
-      "version": "2.7-2",
-      "sha256": "1kd7qxdc8wy8d385yddj6rs0xc6lkn8hpra3wy4r7svzjqk4c8bv",
+      "version": "2.8",
+      "sha256": "0k4r5a3p3ngdc8szy6xdvgaibasggcrpb5hdxplnmmawa27dn2pj",
       "depends": ["network", "statnet_common"]
     },
     "snahelper": {
@@ -112665,8 +116535,8 @@
     },
     "snotelr": {
       "name": "snotelr",
-      "version": "1.4",
-      "sha256": "1sr5ihr8qsa0lcihx8cgkr3q9qhc9grjyjp2fbf4siv7j3p21xzp",
+      "version": "1.5.2",
+      "sha256": "03gk7w3axi1z7zccnzf54kixjvx48l5my8g2lsnf67mf6q9zgnrl",
       "depends": ["dplyr", "httr", "memoise", "rvest", "shiny"]
     },
     "snow": {
@@ -112701,8 +116571,8 @@
     },
     "snowquery": {
       "name": "snowquery",
-      "version": "1.2.0",
-      "sha256": "1q9qbz35pid2y010gs69yqb4x2cq56xkgxk1grl8hhvp4fb1iszg",
+      "version": "1.2.1",
+      "sha256": "1dp4hwsrn7k6d3cvhqspi0g6p7m70rb4s3pk5yljnfx3fisig9pk",
       "depends": ["DBI", "RPostgres", "RSQLite", "reticulate", "yaml"]
     },
     "snpAIMeR": {
@@ -112719,9 +116589,9 @@
     },
     "snplinkage": {
       "name": "snplinkage",
-      "version": "1.0.0",
-      "sha256": "112wg2gnr4ikj916nb71sm39g41ls05d4j56hhml9hfnkiv76x5p",
-      "depends": ["GWASTools", "gdsfmt", "ggplot2", "gtable", "magrittr"]
+      "version": "1.2.0",
+      "sha256": "1kfmpr81wc8ckz0mr093a7nk2x6xihss2ziwd7d7ykwl6pcl1w6k",
+      "depends": ["GWASTools", "SNPRelate", "biomaRt", "cowplot", "data_table", "gdsfmt", "ggplot2", "ggrepel", "gtable", "knitr", "magrittr", "reshape2"]
     },
     "snplist": {
       "name": "snplist",
@@ -112779,9 +116649,9 @@
     },
     "socialmixr": {
       "name": "socialmixr",
-      "version": "0.3.2",
-      "sha256": "1gj7gsjzrx170i8ifnpi38pas5k952nrm1bx59zbjz46wc2h3n2h",
-      "depends": ["countrycode", "curl", "data_table", "fields", "httr", "jsonlite", "lifecycle", "lubridate", "oai", "wpp2017", "xml2"]
+      "version": "0.4.0",
+      "sha256": "1drmcvkma3xym17mkpzswjxfcna1vn6r8ym7i21ws0m2whha1wwy",
+      "depends": ["countrycode", "curl", "data_table", "httr", "jsonlite", "lubridate", "memoise", "oai", "wpp2017", "xml2"]
     },
     "socialranking": {
       "name": "socialranking",
@@ -112815,8 +116685,8 @@
     },
     "sodium": {
       "name": "sodium",
-      "version": "1.3.1",
-      "sha256": "0cbj7mgchi42ri6h1fc24asj7lkcn9n3l0zbabrx89s9zi4im0gx",
+      "version": "1.4.0",
+      "sha256": "1k8sa1y27hxmi5mi35aw4pxk0qlwq3bm1qa9g40ggy81wkam6zck",
       "depends": []
     },
     "sofa": {
@@ -112839,22 +116709,16 @@
     },
     "softclassval": {
       "name": "softclassval",
-      "version": "1.0-20160527",
-      "sha256": "1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr",
+      "version": "1.1.0",
+      "sha256": "0avffzxp5w6ahk8i98arky2jwr14b0iqii1iqwdgz09a2kbim93y",
       "depends": ["arrayhelpers", "svUnit"]
     },
     "soilDB": {
       "name": "soilDB",
-      "version": "2.8.4",
-      "sha256": "122vwi9149xd8cadm4lrbq1fdxvdxzh3vs23zdvcbsm4dmzqhr6k",
+      "version": "2.8.5",
+      "sha256": "01q563q8yzb62hzznh8gk7lvgk87isfbcgvvvmhw3y91ggsbz8hy",
       "depends": ["DBI", "aqp", "curl", "data_table"]
     },
-    "soilassessment": {
-      "name": "soilassessment",
-      "version": "0.2.6",
-      "sha256": "0cgyji88q3r6b57q32nk8xgxb4q29678h8zgh9ywxhr3mr40i0qv",
-      "depends": ["FuzzyAHP", "Hmisc", "caret", "deSolve", "e1071", "googledrive", "nnet", "png", "randomForest", "raster", "sf", "soiltexture", "sp", "terra"]
-    },
     "soilchemistry": {
       "name": "soilchemistry",
       "version": "0.1.0",
@@ -112909,6 +116773,12 @@
       "sha256": "1hv9rj8kvqh5i77s6cls7hknz43scdsi5zjh04mjg0gynb265f4p",
       "depends": ["RColorBrewer", "lattice", "latticeExtra", "zoo"]
     },
+    "solaR2": {
+      "name": "solaR2",
+      "version": "0.10",
+      "sha256": "0bs9pwskdi9pw2d1bkdb8gdsgvwwj4s9f8i2py8588qrjrrxn5wn",
+      "depends": ["RColorBrewer", "data_table", "lattice", "latticeExtra"]
+    },
     "solarPos": {
       "name": "solarPos",
       "version": "1.0",
@@ -112917,8 +116787,8 @@
     },
     "solartime": {
       "name": "solartime",
-      "version": "0.0.2",
-      "sha256": "1lg7sc3vxsqqiq6a3qsl14gcc1fdi15h1mqcfjmq2j5xna6s5msx",
+      "version": "0.0.4",
+      "sha256": "117ar6n8s2b6vsjdhjphcfixqqyyp77g93vqgvq18rglvzv3k307",
       "depends": ["lubridate"]
     },
     "solitude": {
@@ -112947,8 +116817,8 @@
     },
     "som": {
       "name": "som",
-      "version": "0.3-5.1",
-      "sha256": "1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56",
+      "version": "0.3-5.2",
+      "sha256": "0ibhcadjfgi93p5jvs8hni7a92k3x1k74m93w6h2xl6c2q2vpavn",
       "depends": []
     },
     "som_nn": {
@@ -112977,8 +116847,8 @@
     },
     "sommer": {
       "name": "sommer",
-      "version": "4.3.5",
-      "sha256": "0lhbrv4m44zgd178xpm5h0qdn54ldfjz7c96mmhm41pz0zn97h5h",
+      "version": "4.3.6",
+      "sha256": "1px2d66gzdymp0bvaf3xs240i2ikbfmy87v8xmsdnpnarq568y8c",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "crayon"]
     },
     "somspace": {
@@ -113011,6 +116881,12 @@
       "sha256": "1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15",
       "depends": ["tuneR"]
     },
+    "sooty": {
+      "name": "sooty",
+      "version": "0.1.0",
+      "sha256": "1mp88bnsi1f3nngcpy0dpxqz75jfg6p0n6rsdcinbba4xfmjvmy7",
+      "depends": ["arrow", "cachem", "curl", "dplyr", "memoise"]
+    },
     "soptdmaeA": {
       "name": "soptdmaeA",
       "version": "1.0.0",
@@ -113025,8 +116901,8 @@
     },
     "sorcering": {
       "name": "sorcering",
-      "version": "1.0.1",
-      "sha256": "195m83n57fsxg3w59y8q33b4hl9ng752lxdnvmvfb1m7iy1yaj49",
+      "version": "1.1.0",
+      "sha256": "1w0kwc7wbkdl41kcjgdc68hscklg10byzbk309r13s1101xn6g3v",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack", "mathjaxr"]
     },
     "sorocs": {
@@ -113085,8 +116961,8 @@
     },
     "soundgen": {
       "name": "soundgen",
-      "version": "2.6.3",
-      "sha256": "1d865daz5ylbcklb67yqwjflw5pv16rgyvjqxlwnn2knkxhm6m92",
+      "version": "2.7.1",
+      "sha256": "11l01hnj4r3rsgz3d3nxjbvp9dcwik06270f1vjxdpqv5hv571h7",
       "depends": ["data_table", "doParallel", "dtw", "foreach", "mvtnorm", "nonlinearTseries", "phonTools", "seewave", "shiny", "shinyBS", "shinyjs", "signal", "tuneR", "zoo"]
     },
     "sourcetools": {
@@ -113103,8 +116979,8 @@
     },
     "sox": {
       "name": "sox",
-      "version": "1.2",
-      "sha256": "1phrs0mxycimzf7zz0g7bzkdkzf0fvqa86jwqnvmfyjjzqplpf2p",
+      "version": "1.2.1",
+      "sha256": "0i15z47bjs1cj17g4x5i74v069ba5ypl7qv5sblxs13wwlgs5ah5",
       "depends": ["Rcpp", "glmnet", "survival"]
     },
     "sp": {
@@ -113127,8 +117003,8 @@
     },
     "spAbundance": {
       "name": "spAbundance",
-      "version": "0.1.3",
-      "sha256": "02qvgyiyrwaz2jgfp746fyr1bwd8m4lwjijaml9ychq4rdmrfjli",
+      "version": "0.2.1",
+      "sha256": "1705pq18bnycx06inbr29z7gcmn1381l44x56ncrmbdigj0i0lsk",
       "depends": ["RANN", "abind", "coda", "doParallel", "foreach", "lme4"]
     },
     "spAddins": {
@@ -113143,10 +117019,16 @@
       "sha256": "1bi3lhbx37zlj2x0nql51x5422zxc1gcbn8vqjf81badwf80fwsp",
       "depends": ["Rcpp", "RcppArmadillo", "msm", "mvtnorm", "pgdraw"]
     },
+    "spBPS": {
+      "name": "spBPS",
+      "version": "0.0-4",
+      "sha256": "10xq277c5pcchq25p5xg98khzvnc1lncdvggn61b4ka20jjm7xma",
+      "depends": ["CVXR", "Rcpp", "RcppArmadillo", "mniw"]
+    },
     "spBayes": {
       "name": "spBayes",
-      "version": "0.4-7",
-      "sha256": "18rb4k7yfnz07ilrgdipbl30a78zzl3yaikd999l482v1a95hibr",
+      "version": "0.4-8",
+      "sha256": "17jnbwafk5kky0zwjni9nvbcllxr5ww0jrrq5gzzddjrp1x1ybhd",
       "depends": ["Formula", "Matrix", "coda", "magic", "sp"]
     },
     "spBayesSurv": {
@@ -113163,8 +117045,8 @@
     },
     "spData": {
       "name": "spData",
-      "version": "2.3.1",
-      "sha256": "0x80qzn12lrr8al5igj5nass3aqasg65drhdrb2p9cmp4chpydwc",
+      "version": "2.3.3",
+      "sha256": "1q1rkq03hn4hl03n7l7ravhsh6qp3q26hqpr9984v59iqvmvk4y0",
       "depends": ["sp"]
     },
     "spDates": {
@@ -113173,6 +117055,12 @@
       "sha256": "0k6383hgrs4751qnwx03s85a9a0ldpxm7xanrnmg13plc2713kvm",
       "depends": ["data_table", "dplyr", "ggplot2", "gstat", "magrittr", "raster", "rcarbon", "rlang", "smatr", "sp", "viridisLite"]
     },
+    "spEDM": {
+      "name": "spEDM",
+      "version": "1.1",
+      "sha256": "0nrgfa8v336vsddr0pqqyn8n97pnxq3qn44d90dcmfacingb7vsp",
+      "depends": ["Rcpp", "RcppThread", "dplyr", "sdsfun", "terra"]
+    },
     "spFSR": {
       "name": "spFSR",
       "version": "2.0.4",
@@ -113211,20 +117099,14 @@
     },
     "spNNGP": {
       "name": "spNNGP",
-      "version": "1.0.0",
-      "sha256": "0z09hxmm2pbxsbm3zqk839z2gb3g2n2hqkahcbvcgywrqn3v8cal",
+      "version": "1.0.1",
+      "sha256": "1qanar1b3avlw8q18yisl4yjwbvzmz8kir8q21rnjdx612wmgsll",
       "depends": ["Formula", "RANN", "coda"]
     },
-    "spNetwork": {
-      "name": "spNetwork",
-      "version": "0.4.4.3",
-      "sha256": "18g885w54d5hx9pwbqwz28gs723h9wpnfhr4a0yl37j5i3rasccx",
-      "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "abind", "cubature", "data_table", "dbscan", "future_apply", "ggplot2", "igraph", "progressr", "sf", "sfheaders", "spdep"]
-    },
     "spOccupancy": {
       "name": "spOccupancy",
-      "version": "0.7.6",
-      "sha256": "0gl6z2dch254nmyd19w7z3jmivadzvv27ymsbn1rk08qm19bf69g",
+      "version": "0.8.0",
+      "sha256": "0l3l4i7n9n16qkdkd3aq223qacvnhx6h95xnczhiy3mhgq26mvl1",
       "depends": ["RANN", "abind", "coda", "doParallel", "foreach", "lme4", "spAbundance"]
     },
     "spRingsteen": {
@@ -113233,10 +117115,16 @@
       "sha256": "13mdbsbq51sp34xp04lgc4klwb3chnnkvh5r99qfapbbr0vra8vl",
       "depends": ["devtools", "rlang"]
     },
+    "spStack": {
+      "name": "spStack",
+      "version": "1.0.1",
+      "sha256": "11ikxhm7iqb3pk6q2nw2mym23znvlxqfzs9b1569hh33znki2p7m",
+      "depends": ["CVXR", "MBA", "future", "future_apply", "ggplot2", "rstudioapi"]
+    },
     "spTDyn": {
       "name": "spTDyn",
-      "version": "2.0.2",
-      "sha256": "010x3rjncasly1scngwyiys7asmk4ay51bzhk0zfjazwfkmqd12r",
+      "version": "2.0.3",
+      "sha256": "05f9ginar5xc3aiyvy2dlad4bs62x2z492h096g77pj2wbba8ysh",
       "depends": ["coda", "sp", "spTimer", "spacetime"]
     },
     "spThin": {
@@ -113247,8 +117135,8 @@
     },
     "spTimer": {
       "name": "spTimer",
-      "version": "3.3.2",
-      "sha256": "0dlsyj0mawpgxr1yn4ldqm3xh148c79lk55fq475zjzyiwz9ynfc",
+      "version": "3.3.3",
+      "sha256": "0xibbwsvnfs43q58bbld23mbpzhby2qcwavhr30k4yd5fxzfpzbr",
       "depends": ["coda", "extraDistr", "sp", "spacetime"]
     },
     "spaMM": {
@@ -113283,8 +117171,8 @@
     },
     "spacesRGB": {
       "name": "spacesRGB",
-      "version": "1.5-0",
-      "sha256": "1v4az4qn965p0xds10ff7f4565j5n9pqc44501l6fi5j7h819hsc",
+      "version": "1.6-1",
+      "sha256": "0qb9w4igmrjf2qx8wrlvhpfmy3cz44635xgcn39fa59zm3s7krj0",
       "depends": []
     },
     "spacesXYZ": {
@@ -113295,8 +117183,8 @@
     },
     "spacetime": {
       "name": "spacetime",
-      "version": "1.3-1",
-      "sha256": "1kr12pbi6hqns30kqy4jv5pcm3lgfcfyc2gwaak1jbg894csahhr",
+      "version": "1.3-2",
+      "sha256": "01dvih9f7m7vmjv057d1lls5kyxq5h87mmxaby566r9b2svrx0fn",
       "depends": ["intervals", "lattice", "sp", "xts", "zoo"]
     },
     "spacyr": {
@@ -113319,8 +117207,8 @@
     },
     "spam": {
       "name": "spam",
-      "version": "2.10-0",
-      "sha256": "0ydc513jg7phzdqg8jp7210ayrrmxq91jafqzx8z1v0172i8d73i",
+      "version": "2.11-0",
+      "sha256": "02ax6fnzymdkn868w341xznbgb3fmrvb9pqqfpcrh5fldp0acjfq",
       "depends": ["Rcpp", "dotCall64"]
     },
     "spam64": {
@@ -113335,10 +117223,16 @@
       "sha256": "15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp",
       "depends": ["magrittr", "xml2"]
     },
+    "spanishoddata": {
+      "name": "spanishoddata",
+      "version": "0.1.0",
+      "sha256": "1fwj6568g199m1fjblw8ypfmfy0922sh62zhn417j19y5f7i18v9",
+      "depends": ["DBI", "checkmate", "curl", "dplyr", "duckdb", "fs", "glue", "here", "httr2", "lubridate", "memuse", "parallelly", "purrr", "readr", "rlang", "sf", "stringr", "tibble", "xml2"]
+    },
     "spant": {
       "name": "spant",
-      "version": "2.22.0",
-      "sha256": "01snrzvyxc48dy2md3iac0c858i016wykmyhnk3p7gjh7bmh12s5",
+      "version": "3.1.0",
+      "sha256": "1vp70xsjfdsp4w8fscr7mhf2six1l4xam41q96df038wqh6b7zfg",
       "depends": ["RNifti", "RNiftyReg", "abind", "expm", "fields", "irlba", "jsonlite", "minpack_lm", "mmand", "nloptr", "numDeriv", "plyr", "pracma", "ptw", "signal", "stringr"]
     },
     "sparcl": {
@@ -113461,12 +117355,6 @@
       "sha256": "174lnhqig7m6fjfsj114ld059z9mjih3jzm5cq8iscxnhr9m11lr",
       "depends": ["MASS", "Matrix", "data_table", "mgcv", "refund"]
     },
-    "sparseGAM": {
-      "name": "sparseGAM",
-      "version": "1.0",
-      "sha256": "0qqfsgrp0ll11mws0s54g5nsqxwn2j5kbs60q2zrviv6n8bs8xf0",
-      "depends": ["MASS", "grpreg", "pracma"]
-    },
     "sparseHessianFD": {
       "name": "sparseHessianFD",
       "version": "0.3.3.7",
@@ -113517,14 +117405,14 @@
     },
     "sparseSEM": {
       "name": "sparseSEM",
-      "version": "4.0",
-      "sha256": "15pgh5x01inyl8kxaqsz9hf7iv3splzarch89yz1nappv86c7khq",
+      "version": "4.1",
+      "sha256": "1kxw4q7rqs3h5q2b1x3hpkc13g1v77fpwj4m3qws6y1s6qk2pfvx",
       "depends": []
     },
     "sparseSVM": {
       "name": "sparseSVM",
-      "version": "1.1-6",
-      "sha256": "0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0",
+      "version": "1.1-7",
+      "sha256": "1zyil9sc8bxs99n3bhfxhcd59ng0qvlcwk3ff2sbh4bykqlcxya8",
       "depends": []
     },
     "sparsediscrim": {
@@ -113535,8 +117423,8 @@
     },
     "sparsegl": {
       "name": "sparsegl",
-      "version": "1.1.0",
-      "sha256": "0931wsd905bhrqkwjdv6m3vg7wpzdqyvzkkqp5pcwilvrswh0kdb",
+      "version": "1.1.1",
+      "sha256": "1fp3csfs56nshw19yhr8nq77af9mbmpcncckifrx7spsl6ywl8w9",
       "depends": ["Matrix", "RSpectra", "cli", "dotCall64", "ggplot2", "magrittr", "rlang", "tidyr"]
     },
     "sparseinv": {
@@ -113547,8 +117435,8 @@
     },
     "sparsenet": {
       "name": "sparsenet",
-      "version": "1.6",
-      "sha256": "1r3p14qbwkmb8hmgfh0ymzz52lqxgc9cnp8yh8y8la1sm3hxc92n",
+      "version": "1.7",
+      "sha256": "004f852ayq467pv135k0q5nn2wsz4pylx61qxpn1x3iy9rm80j0h",
       "depends": ["Matrix", "shape"]
     },
     "sparsepca": {
@@ -113607,8 +117495,8 @@
     },
     "sparta": {
       "name": "sparta",
-      "version": "0.8.4",
-      "sha256": "109i8yhv8snhpccrhxy1k8xcy9jj8m3li2d7vaylvxbrlnc26d89",
+      "version": "1.0.1",
+      "sha256": "1k4f7z7grr38w127d9v23ni44nsn726389inqvysa9w15bmngzf9",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "sparvaride": {
@@ -113625,8 +117513,8 @@
     },
     "spatPomp": {
       "name": "spatPomp",
-      "version": "0.35.0",
-      "sha256": "0zz6xbbxrj287mjphhq21jpmnbdm60fii13sv8dg8v95l4lhi8pl",
+      "version": "1.0.0",
+      "sha256": "017m5y1zcnviv9vbcsvmxp50dvl7f8d3aw5b5ig5qi56rqf1fj99",
       "depends": ["abind", "dplyr", "foreach", "ggplot2", "pomp", "rlang", "stringr", "tidyr"]
     },
     "spate": {
@@ -113647,12 +117535,6 @@
       "sha256": "1xiq4a8br46qk19k23kkb6l1b7ciw9lmmrvwfznwkamwps6dwlg8",
       "depends": ["Matrix", "Rcpp"]
     },
-    "spathial": {
-      "name": "spathial",
-      "version": "0.1.2",
-      "sha256": "1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb",
-      "depends": ["MASS", "Rtsne", "class", "igraph", "irlba", "knitr", "matrixStats", "pracma", "rmarkdown"]
-    },
     "spaths": {
       "name": "spaths",
       "version": "1.1.3",
@@ -113703,8 +117585,8 @@
     },
     "spatialreg": {
       "name": "spatialreg",
-      "version": "1.3-4",
-      "sha256": "0sgvcqswfpa9aq1x2ir1d5vg52gny1r1l15g66nk0113vvbrz982",
+      "version": "1.3-6",
+      "sha256": "020jr120lapsrgyfsmfls4229spy1rn83096ipnhfp7pzdnfsib4",
       "depends": ["LearnBayes", "MASS", "Matrix", "boot", "coda", "multcomp", "nlme", "sf", "spData", "spdep"]
     },
     "spatialrisk": {
@@ -113715,14 +117597,14 @@
     },
     "spatialsample": {
       "name": "spatialsample",
-      "version": "0.5.1",
-      "sha256": "0pcwf15ani4r8j3zgqz093jkimazzwi0218qx18xglymk180hhcp",
+      "version": "0.6.0",
+      "sha256": "0ywcdk7fbaqbk016c3wa1f62c4h2y3s4l14g4v6vnsh1i6y32410",
       "depends": ["cpp11", "dplyr", "ggplot2", "glue", "purrr", "rlang", "rsample", "sf", "tibble", "tidyselect", "units", "vctrs"]
     },
     "spatialwarnings": {
       "name": "spatialwarnings",
-      "version": "3.0.3",
-      "sha256": "03a0gb8v6028v6q5w3iap8fn9nkb2rpnabqgzmr2dyxnpfgr9dn3",
+      "version": "3.1.0",
+      "sha256": "0k3xzc5xrdmgx2ax85qn2gb8cchwj031x1n3b2hsajrfwl6cgwzi",
       "depends": ["Rcpp", "RcppArmadillo", "future", "future_apply", "ggplot2", "gsl", "plyr", "segmented"]
     },
     "spatialwidget": {
@@ -113739,32 +117621,32 @@
     },
     "spatstat": {
       "name": "spatstat",
-      "version": "3.1-1",
-      "sha256": "04jmyngwzdb1v5yzcmnsj26kaaxxvhjnmdp7is5nrry632c30jan",
+      "version": "3.3-0",
+      "sha256": "1xr7qngxn4syqm6y25fsjdi7vcb67ljljs84f9vkz4gldm7ss23m",
       "depends": ["spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_Knet": {
       "name": "spatstat.Knet",
-      "version": "3.1-0",
-      "sha256": "1n9hqq0pamk4bm9jbl1plpsa6ynab7kll6j3dhcvpmyai462wcxa",
+      "version": "3.1-2",
+      "sha256": "1l5742m0sq94fl055anxdxl5fr3b4nv6l82kjrxfrpfnyv6kpkib",
       "depends": ["Matrix", "spatstat", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_linnet", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_data": {
       "name": "spatstat.data",
-      "version": "3.1-2",
-      "sha256": "0xqb94xm095qwxkhfrjqv7qwyxfs9i2xrwq06ir0y15q0dil36wv",
+      "version": "3.1-4",
+      "sha256": "1w2id4rkyycqp2y8bp2p4fh4x82x46hcbipabgfc2wny1a4pa4hn",
       "depends": ["Matrix", "spatstat_utils"]
     },
     "spatstat_explore": {
       "name": "spatstat.explore",
-      "version": "3.3-1",
-      "sha256": "09if9x87g1zgcpqrg4ad4j6l0nd2yalpbbd3syxdvs4m671y7gyc",
+      "version": "3.3-3",
+      "sha256": "0fix1l1g8fgnq1d371l3gcwd4ddg025qmyqrqjwfbpzf85zrnfyf",
       "depends": ["Matrix", "abind", "goftest", "nlme", "spatstat_data", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_geom": {
       "name": "spatstat.geom",
-      "version": "3.3-2",
-      "sha256": "03spxazgjspmsialvjy2sv5yxjh049dns4q4l4g0zgzd4ilqmh6b",
+      "version": "3.3-4",
+      "sha256": "11sg20vk8vbkki4rg4r4sxfwzw32p23xyfa6sxgmfcdgkjndq2kx",
       "depends": ["deldir", "polyclip", "spatstat_data", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_gui": {
@@ -113775,8 +117657,8 @@
     },
     "spatstat_linnet": {
       "name": "spatstat.linnet",
-      "version": "3.2-1",
-      "sha256": "1gqivj8lsqn67068ygjqjjbnl2wywq3zp6mpqqbhyrbj7h3diw0s",
+      "version": "3.2-3",
+      "sha256": "0gldnj3bf93y6gfsz6nns4ivyirhw6ac2mv1gkhqmsm1kgh963bg",
       "depends": ["Matrix", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_model", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_local": {
@@ -113787,14 +117669,14 @@
     },
     "spatstat_model": {
       "name": "spatstat.model",
-      "version": "3.3-1",
-      "sha256": "19xgc4hmcyhxdk4cw7k5qyffr48vyc9dj76k3blxzgrbbydrc72w",
+      "version": "3.3-3",
+      "sha256": "1d82s8065mx3b20xpp87kzbddjyqjxk6f102p0dd2jfqvpz4f4ib",
       "depends": ["Matrix", "abind", "goftest", "mgcv", "nlme", "rpart", "spatstat_data", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_sparse", "spatstat_univar", "spatstat_utils", "tensor"]
     },
     "spatstat_random": {
       "name": "spatstat.random",
-      "version": "3.3-1",
-      "sha256": "1lxvi1wkbv6z0hcargcjb5b79vvrhaf0y2psxlil9q82i376n0l3",
+      "version": "3.3-2",
+      "sha256": "1ghfhnp6s5nskk0m7v8qhsbgw1b6h0lbrf3lhcr7cyw27zhppmn6",
       "depends": ["spatstat_data", "spatstat_geom", "spatstat_univar", "spatstat_utils"]
     },
     "spatstat_sparse": {
@@ -113805,14 +117687,14 @@
     },
     "spatstat_univar": {
       "name": "spatstat.univar",
-      "version": "3.0-0",
-      "sha256": "0wa7zys089sym8f16rg4dih81miv34rj8mph0w926cpckcfm1g00",
+      "version": "3.1-1",
+      "sha256": "12x8w2y44qfiqd92dv0gfrdylg7lsl06mdprsc1yr8vpg8a0hb6m",
       "depends": ["spatstat_utils"]
     },
     "spatstat_utils": {
       "name": "spatstat.utils",
-      "version": "3.1-0",
-      "sha256": "0g9djqpn4yl9wcv3x1qb2pvjhq8491194a5lx6xg8180f1a32363",
+      "version": "3.1-1",
+      "sha256": "13h7avpzmzcizx70j53ls36f2hwkf57vfcb7ygan9zzrd7h3q085",
       "depends": []
     },
     "spatsurv": {
@@ -113835,8 +117717,8 @@
     },
     "spc": {
       "name": "spc",
-      "version": "0.6.8",
-      "sha256": "1w63rwalw6m4dd44nhpdvvwawj1i8001vli9359a6q50m96i4ij5",
+      "version": "0.7.1",
+      "sha256": "0lp9ngjshkpww28vqsbazh1wila8p1v5x4xq04x58acwhf3cpjxx",
       "depends": []
     },
     "spc4sts": {
@@ -113851,6 +117733,12 @@
       "sha256": "016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0",
       "depends": []
     },
+    "spconf": {
+      "name": "spconf",
+      "version": "1.0.1",
+      "sha256": "1ah99q7bdsf49ldsn4y6jqsr3blihxxm29sgzi8cmrdd5n5j4imv",
+      "depends": ["flexclust", "mgcv"]
+    },
     "spcosa": {
       "name": "spcosa",
       "version": "0.4-2",
@@ -113877,14 +117765,14 @@
     },
     "spdep": {
       "name": "spdep",
-      "version": "1.3-5",
-      "sha256": "09p6aqzg109vnbh56nf0v4qj34l4dmh8ak3d9y7l04mwvl3gm3ms",
+      "version": "1.3-8",
+      "sha256": "0ww4xwjgi7r19v503rg5nq50pzrrkbjdq93fs5xfp2v2xa1z8km7",
       "depends": ["boot", "deldir", "e1071", "s2", "sf", "sp", "spData", "units"]
     },
     "spdesign": {
       "name": "spdesign",
-      "version": "0.0.4",
-      "sha256": "0kc73mv7fpz0anzr9q2l5zd3g127igi5kbmfn0m19x3hpwh3qfyj",
+      "version": "0.0.5",
+      "sha256": "01lmbclp4g813zjdv3cb2bqh836q844cvn537vvgj6s9dl6sxivi",
       "depends": ["cli", "dplyr", "future", "matrixStats", "randtoolbox", "stringr", "tibble"]
     },
     "spdl": {
@@ -113913,14 +117801,14 @@
     },
     "speakeasyR": {
       "name": "speakeasyR",
-      "version": "0.1.2",
-      "sha256": "0idymzf2rh0vzgi3x84prqkkr6rjzf7whbj8ax11v141abwb7nlk",
+      "version": "0.1.4",
+      "sha256": "0jrndx1cjxg7f0p7v5z7frpfi8bs6nxpdv21v8ld6n4ffl0vvrbq",
       "depends": ["Matrix"]
     },
     "speakr": {
       "name": "speakr",
-      "version": "3.2.2",
-      "sha256": "159ir49i2fdw5fcq93rqdhf5ij5s9sfr2ygdy2snbgnx3rgi1sfc",
+      "version": "3.2.4",
+      "sha256": "1d1vx364g6lbj966a574l0jkdw9f6gf0ai44z7ixci5xprkgmkqy",
       "depends": ["cli", "ggplot2", "lifecycle", "quarto", "readr", "stringr", "tibble"]
     },
     "speaq": {
@@ -113943,9 +117831,9 @@
     },
     "speccurvieR": {
       "name": "speccurvieR",
-      "version": "0.3.0",
-      "sha256": "01lxyc2v7schci37m1lafjqxqas9dxy614ia742i1g4mb530cch8",
-      "depends": ["combinat", "dplyr", "fixest", "ggplot2", "magrittr", "pbapply", "stringr", "tidyr"]
+      "version": "0.4.2",
+      "sha256": "1iyylk1fvb4fk7wq81qkwd9wwnxd8v1rq3xhjgbf45k84f34iman",
+      "depends": ["combinat", "dplyr", "fixest", "ggplot2", "lmtest", "magrittr", "pbapply", "sandwich", "stringr", "tidyr"]
     },
     "specieschrom": {
       "name": "specieschrom",
@@ -114001,6 +117889,12 @@
       "sha256": "0b2f992p7vpzhzncrvpdkifbgymyiqxz66yk6md3j39wmx3ijkjw",
       "depends": ["BiocGenerics", "NMF", "RColorBrewer", "baseline", "data_table", "dplyr", "ggplot2", "hNMF", "jsonlite", "magrittr", "nnls", "plotly", "pls", "plyr", "signal", "viridis", "zoo"]
     },
+    "spectralAnomaly": {
+      "name": "spectralAnomaly",
+      "version": "0.1.1",
+      "sha256": "0gfgnbl2awliw94xy7q269n5dzj2sh95wz470cynr1m035kp51s1",
+      "depends": []
+    },
     "spectralGP": {
       "name": "spectralGP",
       "version": "1.3.3",
@@ -114055,6 +117949,12 @@
       "sha256": "0jxvh9gbhip1hj7hzjs5fj8iw6ibvl6hc0llcg2j9wqgq5vkcrpq",
       "depends": ["MASS", "Matrix", "biglm"]
     },
+    "speedyBBT": {
+      "name": "speedyBBT",
+      "version": "1.0",
+      "sha256": "18iwjmj05vngxa1vx40nhkv35sryi34fcm0lg2na21hcpcs5qq9f",
+      "depends": ["BayesLogit", "Matrix"]
+    },
     "speedycode": {
       "name": "speedycode",
       "version": "0.3.0",
@@ -114087,8 +117987,8 @@
     },
     "spelling": {
       "name": "spelling",
-      "version": "2.3.0",
-      "sha256": "0fxa0wpmmx7bal7xb4yy3134s2bskj98kwhqn25bqga3inzqdm6d",
+      "version": "2.3.1",
+      "sha256": "1mww2czkfrb1xvjbks7g1xhr8nx1v9mikb2lc3ynn6j2rp9zgwgp",
       "depends": ["commonmark", "hunspell", "knitr", "xml2"]
     },
     "spemd": {
@@ -114145,11 +118045,11 @@
       "sha256": "1lxl4byihwih0iban0ypsh7p7vzbprjzl4xv62181dbsjm5xhmyk",
       "depends": ["sp", "spData"]
     },
-    "sphereTessellation": {
-      "name": "sphereTessellation",
-      "version": "1.2.0",
-      "sha256": "1b8wxbh44qd0rznjln3icp9k4jy598rva9kwcgzscpjm5j86r97w",
-      "depends": ["BH", "Polychrome", "Rcpp", "RcppCGAL", "RcppEigen", "colorsGen", "rgl"]
+    "spheredata": {
+      "name": "spheredata",
+      "version": "0.1.2",
+      "sha256": "1j7jrvgkdvbs98afa28bj7hk1ynrbsc6v9l9scy5w121prika8a7",
+      "depends": []
     },
     "spherepc": {
       "name": "spherepc",
@@ -114165,14 +118065,14 @@
     },
     "spheresmooth": {
       "name": "spheresmooth",
-      "version": "0.1.0",
-      "sha256": "1xf1cg3y7dvx274ccmia97lj278ghpx2p1ayqrfxxl1cnw4p53rv",
+      "version": "0.1.3",
+      "sha256": "1i0s3nfwlmmnwr0hkanwbr8fx47wsh8g65vl74ml9yg2by8pc9pc",
       "depends": []
     },
     "sphet": {
       "name": "sphet",
-      "version": "2.0",
-      "sha256": "1qr4n4kbmc58qmr8niqq3mnwv18x9q2f24c1kg67asf7n3pnmy77",
+      "version": "2.1-1",
+      "sha256": "0j3innblmsbxfwzi38cbmknx16nxzarcq3y8yhssjmj3mc2mldq9",
       "depends": ["Matrix", "coda", "mvtnorm", "nlme", "sf", "sp", "spData", "spatialreg", "spdep", "stringr"]
     },
     "sphunif": {
@@ -114201,8 +118101,8 @@
     },
     "spikeSlabGAM": {
       "name": "spikeSlabGAM",
-      "version": "1.1-19",
-      "sha256": "0qj16s4vmg058wzjd1bi1dc32kbj1gh56696hkqmpb87cgbwmff2",
+      "version": "1.1-20",
+      "sha256": "10hnav7div0mzwvvdldil3bp0v186fh9afgykna99gkkvfpyy0vf",
       "depends": ["MASS", "MCMCpack", "R2WinBUGS", "cluster", "coda", "ggplot2", "gridExtra", "interp", "mvtnorm", "reshape", "scales"]
     },
     "spikes": {
@@ -114283,6 +118183,12 @@
       "sha256": "10bvx4z2b0kl2dl91dvr611cfp28dvch41vj9z1k1qlw03ybqpr8",
       "depends": ["Formula", "MASS", "Matrix", "car", "maxLik", "memisc", "numDeriv", "spatialreg", "sphet"]
     },
+    "splineCox": {
+      "name": "splineCox",
+      "version": "0.0.1",
+      "sha256": "1d3gbw3znmfmpwk074smghcah2graljgwcrajg82cdanzql6x8gg",
+      "depends": ["joint_Cox"]
+    },
     "splines2": {
       "name": "splines2",
       "version": "0.5.3",
@@ -114361,6 +118267,18 @@
       "sha256": "097bpzazw5ryb6izbmz2sdlghn3qvh7c7wsnn0j08j65f9bfmc77",
       "depends": []
     },
+    "splusTimeDate": {
+      "name": "splusTimeDate",
+      "version": "2.5.8",
+      "sha256": "1avas42g0bm40vzj9fag6p5wzw5cd43vv9xx2ycgc48579lfyh7v",
+      "depends": []
+    },
+    "splusTimeSeries": {
+      "name": "splusTimeSeries",
+      "version": "1.5.7",
+      "sha256": "1q2ldyfz27dam033gki3f8chp87qy8f0s985hn762fv2cpi5p02m",
+      "depends": ["splusTimeDate"]
+    },
     "splutil": {
       "name": "splutil",
       "version": "2022.6.20",
@@ -114381,14 +118299,14 @@
     },
     "spmodel": {
       "name": "spmodel",
-      "version": "0.7.0",
-      "sha256": "099ki3j9zafxczx0bw6sc5gv1pzj6xc4vdxm34bh3h16bkwgxs0q",
+      "version": "0.9.0",
+      "sha256": "14zp5p9518p1divavcy2ydwm1fw3n0l0a5r2nxbxn2n25gbmpdky",
       "depends": ["Matrix", "generics", "sf", "tibble"]
     },
     "spmoran": {
       "name": "spmoran",
-      "version": "0.2.3",
-      "sha256": "0gjniczvggcpgyriskcbry8hn5pbf4ga4nx6hj98kvy5qrv5dcnj",
+      "version": "0.3.3",
+      "sha256": "056jy286hd27rpfiwql1ligczh9q2dy9c8kk9j0xph0ibjfm5mh6",
       "depends": ["FNN", "Matrix", "RColorBrewer", "doParallel", "fields", "foreach", "ggplot2", "rARPACK", "sf", "spdep", "vegan"]
     },
     "spnaf": {
@@ -114435,8 +118353,8 @@
     },
     "spork": {
       "name": "spork",
-      "version": "0.3.3",
-      "sha256": "035s59y1jfjyjmi7352yj04nzv29q6v48maifikdzn4b7l6mlsbg",
+      "version": "0.3.5",
+      "sha256": "1qigb3m98rrsz2ggf23dxcr79zmri8safdkly7iwzm14lysjzl7p",
       "depends": ["ggplot2", "kableExtra", "latexpdf", "png"]
     },
     "sport": {
@@ -114459,21 +118377,27 @@
     },
     "spotifyr": {
       "name": "spotifyr",
-      "version": "2.2.4",
-      "sha256": "14rq4yzvly3yl1xnndpzp6mp2mmbvc0qwkx75lb85gad8271a4ij",
+      "version": "2.2.5",
+      "sha256": "1fk1h1y032d99m78v6g3x0569dpcf18mrb9i21kp0mv4ya0bsl2j",
       "depends": ["assertthat", "dplyr", "httr", "janitor", "jsonlite", "lubridate", "magrittr", "purrr", "readr", "rlang", "rvest", "stringr", "tibble", "xml2"]
     },
     "spotoroo": {
       "name": "spotoroo",
-      "version": "0.1.4",
-      "sha256": "004pjlad31xkxvl9bm4ga33ikmph93blb0qd1rpvs8s0lgi7v6pn",
+      "version": "0.1.5",
+      "sha256": "0ziwbhc87y05cp7fx8ffsgxr3w2z14kz2wl6mxpbbpln623kyr2i",
       "depends": ["cli", "dplyr", "geodist", "ggExtra", "ggbeeswarm", "ggplot2", "ggrepel", "patchwork", "progress"]
     },
+    "spphpr": {
+      "name": "spphpr",
+      "version": "0.1.4",
+      "sha256": "085brpsqd5yyhjq3lgvlwb8qaynz7820vih2nfmprjv7qcy2z8p7",
+      "depends": []
+    },
     "spray": {
       "name": "spray",
-      "version": "1.0-25",
-      "sha256": "1mdnabkrj10r4bqll0qd2h7nqpmalbwfs8kzry1wxxy0j1886fv3",
-      "depends": ["Rcpp", "disordR", "magic", "mathjaxr", "partitions"]
+      "version": "1.0-26",
+      "sha256": "05vq5hy2k5c1pa9nwnklyqwaxxwbhck9wsc5lngkk0xdy35sfqsg",
+      "depends": ["Rcpp", "disordR", "magic", "partitions", "stringr"]
     },
     "spreadr": {
       "name": "spreadr",
@@ -114565,12 +118489,6 @@
       "sha256": "13h25mhb45s2k73a5709zlxfxylxqls0avan6d8pcp0iyrmpxjak",
       "depends": ["MASS", "boot", "crossdes", "deldir", "lme4", "sampling", "sf", "survey", "units"]
     },
-    "spt": {
-      "name": "spt",
-      "version": "2.5.1",
-      "sha256": "04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn",
-      "depends": []
-    },
     "sptotal": {
       "name": "sptotal",
       "version": "1.0.1",
@@ -114645,14 +118563,14 @@
     },
     "sqltargets": {
       "name": "sqltargets",
-      "version": "0.2.0",
-      "sha256": "08jwbpdzs686yx433l066qpyxb2c2nv0vpbhj5ybsm6x7q8nsb9a",
+      "version": "0.2.1",
+      "sha256": "1wncxgjcaxn8dqc78vpqmp0hv7hvmyhp8i32k0992wrmvnghh1l3",
       "depends": ["DBI", "cli", "fs", "glue", "jinjar", "purrr", "readr", "rlang", "stringr", "tarchetypes", "targets", "withr"]
     },
     "squant": {
       "name": "squant",
-      "version": "1.1.5",
-      "sha256": "0ab4hrjkvd04jxfp40dz350mkv4a8a57gjf74mg631pmipw3cd5n",
+      "version": "1.1.7",
+      "sha256": "1bxy0xxrrckw0j44jgqwy2ganl84r9b4hdc2g56xg9c735cnz4xf",
       "depends": ["ggplot2", "glmnet", "survival"]
     },
     "squash": {
@@ -114715,12 +118633,6 @@
       "sha256": "1wpqsjhj4vl8gzma4i9y75srzwl8zmkj55lmrhni7xar4d81mnb4",
       "depends": ["TeachingSampling", "caret", "dplyr", "gamlss", "gamlss_dist", "magrittr"]
     },
-    "srlTS": {
-      "name": "srlTS",
-      "version": "0.1.1",
-      "sha256": "1alqywbp36adgnak1s78mcwfg0gcg90a9412nypylsk6bfa7wgsv",
-      "depends": ["RcppRoll", "dplyr", "ncvreg", "rlang", "yardstick"]
-    },
     "srlars": {
       "name": "srlars",
       "version": "1.0.1",
@@ -114739,6 +118651,12 @@
       "sha256": "0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh",
       "depends": ["fda", "mgcv"]
     },
+    "srppp": {
+      "name": "srppp",
+      "version": "1.0.1",
+      "sha256": "12fxyy7g52d4hhx3g4x3cps8rbnx5s9xw8h5cv3dqr5i1pgcnrxb",
+      "depends": ["cli", "dm", "dplyr", "stringr", "tibble", "tidyr", "xml2"]
+    },
     "srt": {
       "name": "srt",
       "version": "1.0.4",
@@ -114747,8 +118665,8 @@
     },
     "srvyr": {
       "name": "srvyr",
-      "version": "1.2.0",
-      "sha256": "0c3y5ijcybf45f4f1bn95m364grsa0c8rf9l0p1jkcr74nmryx9d",
+      "version": "1.3.0",
+      "sha256": "0576jgvnyfxks1r6nc53npgmljvm3i1v389zvar25pyq9n77sdpc",
       "depends": ["dplyr", "magrittr", "rlang", "survey", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "ss3sim": {
@@ -114759,9 +118677,9 @@
     },
     "ssMRCD": {
       "name": "ssMRCD",
-      "version": "0.1.0",
-      "sha256": "16s7jpm9yik1l5s682hdrmh22hrxk5qzy31ls54g48125j8v96la",
-      "depends": ["car", "dbscan", "dplyr", "ggplot2", "plot3D", "robustbase", "scales"]
+      "version": "1.1.0",
+      "sha256": "056yk3bahjc2vd8nxg9anjzb3jz61ymgrp0wcv1381ci2qymzrvc",
+      "depends": ["DescTools", "Matrix", "car", "dbscan", "doParallel", "dplyr", "expm", "foreach", "ggplot2", "plot3D", "reshape2", "robustbase", "rootSolve", "rrcov", "scales"]
     },
     "ssMousetrack": {
       "name": "ssMousetrack",
@@ -114771,8 +118689,8 @@
     },
     "ssMutPA": {
       "name": "ssMutPA",
-      "version": "0.1.0",
-      "sha256": "15nrv2yzs5ydzm7030cznyqxdisg68hld28z3060bvq4ad3a9wvq",
+      "version": "0.1.2",
+      "sha256": "1gdjw84n10ii2crdwv6yr0y4x72b2rkknigzfm8jvpwkvslprxsk",
       "depends": ["Matrix", "NbClust", "RColorBrewer", "ggplot2", "ggridges", "igraph", "kernlab", "maftools", "pheatmap", "survival"]
     },
     "ssaBSS": {
@@ -114819,9 +118737,9 @@
     },
     "ssdtools": {
       "name": "ssdtools",
-      "version": "1.0.6",
-      "sha256": "13pyl9cscs6zsbfjg2x7gfk568mnrnhv7n5fkl0r47r6x94vbr0s",
-      "depends": ["Rcpp", "RcppEigen", "TMB", "VGAM", "abind", "chk", "doFuture", "foreach", "furrr", "generics", "ggplot2", "goftest", "lifecycle", "plyr", "purrr", "scales", "ssddata", "stringr", "tibble", "universals"]
+      "version": "2.1.0",
+      "sha256": "1j9l32mlf52llwrsvs1k4i7jznpv8h9si3c9aq4han76c75wskgg",
+      "depends": ["Rcpp", "RcppEigen", "TMB", "abind", "chk", "furrr", "generics", "ggplot2", "glue", "goftest", "lifecycle", "plyr", "purrr", "rlang", "scales", "ssddata", "stringr", "tibble", "universals", "withr"]
     },
     "sse": {
       "name": "sse",
@@ -114855,10 +118773,16 @@
     },
     "ssh": {
       "name": "ssh",
-      "version": "0.9.2",
-      "sha256": "06lalzlh0kis4jlhlgyqbq5xzqy0dr8b4nh5z50qjks9jzai7qyv",
+      "version": "0.9.3",
+      "sha256": "1gnkpb2xqh0ahqbhm1zb0wxwy3gdis32pwdgv5vf9sdcj4q35zik",
       "depends": ["askpass", "credentials"]
     },
+    "sshicm": {
+      "name": "sshicm",
+      "version": "0.1.0",
+      "sha256": "0iwqld7xzz5p7a6g7zl1sxsp7b10ziidd3vgfnh0daldi8qv6z94",
+      "depends": ["Rcpp", "RcppThread", "dplyr", "purrr", "sdsfun", "sf"]
+    },
     "sship": {
       "name": "sship",
       "version": "0.9.0",
@@ -114915,8 +118839,8 @@
     },
     "sspse": {
       "name": "sspse",
-      "version": "1.1.0-1",
-      "sha256": "0dy78fkazjm6ai2smxfkkhfzgbqk4sxvq7yhj89zdnk1vp1p1fy7",
+      "version": "1.1.0-2",
+      "sha256": "1qm6gy689yy1hfffzhvw5y984cvx0hsqjh6nh97fni2hidwwxpqn",
       "depends": ["KernSmooth", "RDS", "coda", "scam"]
     },
     "ssr": {
@@ -114951,10 +118875,16 @@
     },
     "sstvars": {
       "name": "sstvars",
-      "version": "1.0.1",
-      "sha256": "16ans039cx5kj0l1l8108jfplgz4mq5bbqhixks2dqmlsn5qn34m",
+      "version": "1.1.1",
+      "sha256": "0ybl84pfh4x96z0ahkyn5c7zhk4fp0hrj3l687ppryq3iqswvpn2",
       "depends": ["Rcpp", "RcppArmadillo", "pbapply"]
     },
+    "ssw": {
+      "name": "ssw",
+      "version": "0.2.1",
+      "sha256": "0593w6zq59770r3hm7wbsbc71sw0hc9mzz1dmlpdnzgkgb6x7lqh",
+      "depends": ["reticulate"]
+    },
     "ssym": {
       "name": "ssym",
       "version": "1.5.8",
@@ -114975,9 +118905,9 @@
     },
     "stRoke": {
       "name": "stRoke",
-      "version": "23.9.1",
-      "sha256": "0rlhi8cj1gb5cpvpds4hr6m1g4g53yqlzrvl5gzn3xkiyd5i3kx3",
-      "depends": ["MASS", "calendar", "dplyr", "ggplot2", "gtsummary", "lubridate", "rankinPlot", "tidyr"]
+      "version": "24.10.1",
+      "sha256": "0pbhnfvj35v1di8dsm3m9qzdq9v9rq34b0drs3mgcy8nqd4kkavp",
+      "depends": ["MASS", "calendar", "dplyr", "ggplot2", "gtsummary", "lubridate", "rankinPlot", "tibble", "tidyr", "tidyselect"]
     },
     "sta": {
       "name": "sta",
@@ -114999,8 +118929,8 @@
     },
     "stability": {
       "name": "stability",
-      "version": "0.5.0",
-      "sha256": "0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11",
+      "version": "0.6.0",
+      "sha256": "1a44pn3dyxz39jxnb286p2vrq6rrmhw6snmsn80c53wnga9fihda",
       "depends": ["dplyr", "ggfortify", "ggplot2", "lme4", "magrittr", "matrixStats", "reshape2", "rlang", "scales", "tibble", "tidyr"]
     },
     "stabilo": {
@@ -115045,18 +118975,18 @@
       "sha256": "1vslidq2pzpwhsrsklghaqsdjjf4w4wqs2dng0p68zhrv5vlivhq",
       "depends": ["Matrix", "checkmate"]
     },
-    "stabreg": {
-      "name": "stabreg",
-      "version": "0.1.2",
-      "sha256": "1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia",
-      "depends": ["numDeriv"]
-    },
     "stabs": {
       "name": "stabs",
       "version": "0.6-4",
       "sha256": "1nf1yg14cgxrs4np1yghpzw1nczaslfv3rvf3918wrlzg0vp6l7q",
       "depends": []
     },
+    "staccuracy": {
+      "name": "staccuracy",
+      "version": "0.2.0",
+      "sha256": "0nqnrkb7b5a892q9dsy7vqdk9aa1f9pbapg2m7pqwrbgcw6xnbph",
+      "depends": ["cli", "dplyr", "purrr", "rlang", "stringr", "tidyr"]
+    },
     "stackgbm": {
       "name": "stackgbm",
       "version": "0.1.0",
@@ -115065,8 +118995,8 @@
     },
     "stacking": {
       "name": "stacking",
-      "version": "0.1.2",
-      "sha256": "0kizp8ivkan5qjqvc19fg5f5n1k32z1nw81m41nrnblp5c9klvg7",
+      "version": "0.1.3",
+      "sha256": "0clxlkzz4dmri2ykk9aj9mfixpi2k0jhn2jw6zf6yyq1w70vscr7",
       "depends": ["caret"]
     },
     "stacks": {
@@ -115101,9 +119031,9 @@
     },
     "staggered": {
       "name": "staggered",
-      "version": "1.1",
-      "sha256": "0z9358qbgn637j8iz5qwr4nyrlvi9w85l325vxpc61mcwksx5ip8",
-      "depends": ["MASS", "Rcpp", "RcppEigen", "coop", "dplyr", "magrittr", "purrr", "reshape2", "tidyr"]
+      "version": "1.2.1",
+      "sha256": "1v19sf51rfl58irr4six6j7pj61i46mbpwczx9p3z0cs37r92kyj",
+      "depends": ["MASS", "Rcpp", "RcppEigen", "data_table", "magrittr", "purrr"]
     },
     "stampr": {
       "name": "stampr",
@@ -115113,8 +119043,8 @@
     },
     "stan4bart": {
       "name": "stan4bart",
-      "version": "0.0-8",
-      "sha256": "1i0asl380p38ksi59wmyi23jwq05mm9kxymphyqjniq68i0lban4",
+      "version": "0.0-10",
+      "sha256": "0gf89r4wj1ahkzbc6hhbsf5xmnz092y9rb6qwfysf9ix5a6g281a",
       "depends": ["BH", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "dbarts"]
     },
     "standardize": {
@@ -115137,8 +119067,8 @@
     },
     "standby": {
       "name": "standby",
-      "version": "0.1.0",
-      "sha256": "05kn866ibk0a0ncbsmfb31nhj7cfdidd8smvnpyrvw9rjs8k37hv",
+      "version": "0.2.0",
+      "sha256": "04gqgjj38z9gggfmza8aqq7hdiilszvg023a1b9f3pga3rlc54y8",
       "depends": ["htmltools", "shiny"]
     },
     "stapler": {
@@ -115173,8 +119103,8 @@
     },
     "starnet": {
       "name": "starnet",
-      "version": "0.0.6",
-      "sha256": "0gbg8svyj4nh846q7986ap7jjry599kb1348k9lifz19kvyr4rn4",
+      "version": "0.0.7",
+      "sha256": "1rzssz1gj1bsfshk4a89vk7lllmq23334a8rahvivqkm1jvpxwnj",
       "depends": ["Matrix", "cornet", "glmnet", "survival"]
     },
     "starry": {
@@ -115185,8 +119115,8 @@
     },
     "stars": {
       "name": "stars",
-      "version": "0.6-6",
-      "sha256": "1b679s25f9vpzrisyxs5xzc0dv47yn3prm0hi752fhpvml4kbjkh",
+      "version": "0.6-7",
+      "sha256": "07wfjair7dgbznh656kk4wy1drwnfpmwvkb69fzs9z1q5p9wp2i3",
       "depends": ["abind", "classInt", "rlang", "sf", "units"]
     },
     "starsExtra": {
@@ -115209,26 +119139,26 @@
     },
     "startR": {
       "name": "startR",
-      "version": "2.3.1",
-      "sha256": "03wdaqiyrjhihsnw33z87baplv854znh4l7ww4ywmp17hl6hr7l8",
+      "version": "2.4.0",
+      "sha256": "1p1yrwcmzzln5qjpsdsz3a8a3d6dlq5fvibx0zq3njmvbffwsh24",
       "depends": ["ClimProjDiags", "PCICt", "abind", "bigmemory", "easyNCDF", "future", "multiApply", "s2dv"]
     },
     "starter": {
       "name": "starter",
-      "version": "0.1.15",
-      "sha256": "0lzaiw4m6wxniv8bgri33z8np49mqbgip4jhibsw0xa717anlqa4",
+      "version": "0.1.16",
+      "sha256": "12yxsvqharj15ynh1m4p37bvkxpp9xfzxaqrcy680jjyzd7aiwpf",
       "depends": ["R_utils", "cli", "dplyr", "gert", "glue", "renv", "rlang", "rprojroot", "rstudioapi"]
     },
     "startup": {
       "name": "startup",
-      "version": "0.22.0",
-      "sha256": "04hifi5cck1vzhacmy9kg7k1f278lvvsrj6p0d1n61fiiv3fqscm",
+      "version": "0.23.0",
+      "sha256": "1v7zn20k4m49xj8wmwssgsh036av5im2kgiqnl4fj1ffpj3pwpw6",
       "depends": []
     },
     "startupmsg": {
       "name": "startupmsg",
-      "version": "0.9.6.1",
-      "sha256": "10aqls30yqi2mzy1ph8s67rji4kww95cs94ba4hz9wg9bzm4w6s3",
+      "version": "0.9.7",
+      "sha256": "17h57636d0c1wcidw5ivqqf4wpyy402i24rj0vl5yszj99szgy29",
       "depends": []
     },
     "starvars": {
@@ -115239,8 +119169,8 @@
     },
     "starvz": {
       "name": "starvz",
-      "version": "0.8.0",
-      "sha256": "0slym8xwvihbslxm4llbzb8fybjbk040lbzng4fh5dsw58zf04r1",
+      "version": "0.8.2",
+      "sha256": "0rgrbnsn1cx6255scqyjrywbq2bn3mpn7aq60p31k6f80dd850lg",
       "depends": ["BH", "RColorBrewer", "Rcpp", "data_tree", "dplyr", "ggplot2", "gtools", "lpSolve", "magrittr", "patchwork", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "yaml", "zoo"]
     },
     "starwarsdb": {
@@ -115263,8 +119193,8 @@
     },
     "statGraph": {
       "name": "statGraph",
-      "version": "1.0.3",
-      "sha256": "0rwmn6mhvvahzdqhp58v3icas4mlr73jizmb7lv8dzgxvq8dz0i0",
+      "version": "1.0.6",
+      "sha256": "0342hxbf4irhkr7i4ggq63ac66i97y4fcixm1jvbwbdahss6f38y",
       "depends": ["MASS", "cluster", "doParallel", "foreach", "igraph", "mvtnorm", "rARPACK"]
     },
     "statVisual": {
@@ -115321,22 +119251,28 @@
       "sha256": "18bir894yrbff5h5pbqr342xckb78zzb24x2yrv9ffhrl5dvyk5d",
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack"]
     },
+    "statforbiology": {
+      "name": "statforbiology",
+      "version": "0.9.9",
+      "sha256": "1m0jygm6kps40591cx6z5y82d8b7avpgxikds0kawrq9zfn8cm0h",
+      "depends": ["MASS", "car", "drc", "drcte", "emmeans", "ggplot2", "multcomp", "multcompView", "nlme", "tidyr"]
+    },
     "statgenGWAS": {
       "name": "statgenGWAS",
-      "version": "1.0.9",
-      "sha256": "0isjzb83vwml654b1azgvnwiijpihdk24b3jamls976is359qvrv",
-      "depends": ["Rcpp", "RcppArmadillo", "data_table", "ggplot2", "sommer"]
+      "version": "1.0.10",
+      "sha256": "0dyp357vi4ng68zcdx7kxwxq1k1ndydc6cj82j1q4n255ray34i6",
+      "depends": ["Rcpp", "RcppArmadillo", "data_table", "ggplot2", "rlang", "sommer"]
     },
     "statgenGxE": {
       "name": "statgenGxE",
-      "version": "1.0.8",
-      "sha256": "16ngsxg3vhbg1kg0zs6ddfbcfgkz40ybxll2jfyc1n4l4ip9j52q",
+      "version": "1.0.9",
+      "sha256": "0p2z8qf0gjznkcp99dzrdjkbv9433h62iwcj3h01dpx2f6v0f6zb",
       "depends": ["emmeans", "ggplot2", "gridExtra", "knitr", "lme4", "rlang", "statgenSTA", "xtable"]
     },
     "statgenHTP": {
       "name": "statgenHTP",
-      "version": "1.0.6.1",
-      "sha256": "1lhs72y9p98vas7iv1zgqb9zac6plzgv5lffccyg75r88784xn1s",
+      "version": "1.0.7",
+      "sha256": "0ia3xw8cnh4hyx31w2hzgqx2mp9fipk59rq6pvc8n33r3byzph9p",
       "depends": ["LMMsolver", "Matrix", "SpATS", "animation", "factoextra", "ggforce", "ggnewscale", "ggplot2", "gridExtra", "locfit", "lubridate", "reshape2", "rlang", "scales", "spam"]
     },
     "statgenIBD": {
@@ -115347,9 +119283,9 @@
     },
     "statgenMPP": {
       "name": "statgenMPP",
-      "version": "1.0.2",
-      "sha256": "1qpf9gic9671hr6zyj56sqwx9wl51qr6gj84rfssdla718h766im",
-      "depends": ["LMMsolver", "Matrix", "data_table", "foreach", "ggplot2", "gridExtra", "scales", "spam", "statgenGWAS", "statgenIBD", "stringi"]
+      "version": "1.0.3",
+      "sha256": "1if034avq7j5jxsppmxrvam0wl17bfnhmj9yzb5qv54zn6gpnr2f",
+      "depends": ["LMMsolver", "Matrix", "data_table", "foreach", "ggplot2", "gridExtra", "rlang", "scales", "spam", "statgenGWAS", "statgenIBD", "stringi"]
     },
     "statgenQTLxT": {
       "name": "statgenQTLxT",
@@ -115359,22 +119295,22 @@
     },
     "statgenSTA": {
       "name": "statgenSTA",
-      "version": "1.0.13",
-      "sha256": "1pnb13psnyqj4mjry6g78pjc4qz642wjnxi9ki8i4h73i335ixxv",
+      "version": "1.0.14",
+      "sha256": "0mj314ikqrhjjs2dcri0da8sbmar7acnh2rnpx99ylk32i6l6lrl",
       "depends": ["SpATS", "emmeans", "ggplot2", "ggrepel", "gridExtra", "knitr", "lme4", "mapproj", "maps", "qtl", "rlang", "scales", "xtable"]
     },
+    "staticryptR": {
+      "name": "staticryptR",
+      "version": "0.1.0",
+      "sha256": "1ki3kpjvwbradgr3nip8cxgasxcys1qyryh0gq9kmx9f0dbql5y2",
+      "depends": []
+    },
     "stationaRy": {
       "name": "stationaRy",
       "version": "0.5.1",
       "sha256": "1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl",
       "depends": ["downloader", "dplyr", "lubridate", "lutz", "magrittr", "progress", "readr", "stringr", "tidyr"]
     },
-    "stationery": {
-      "name": "stationery",
-      "version": "1.1",
-      "sha256": "1n5mzk6ibb8j4vy2ca3bj0jm2bk2qg5x6nsch2hwcyspm3gym4jl",
-      "depends": ["knitr", "kutils", "rmarkdown"]
-    },
     "statip": {
       "name": "statip",
       "version": "0.2.3",
@@ -115401,9 +119337,9 @@
     },
     "statnet_common": {
       "name": "statnet.common",
-      "version": "4.9.0",
-      "sha256": "1mrdzhxxrr6a0hwxczs40f8ppkdimlki1gbg6f3kv69s6rpdr1d4",
-      "depends": ["coda"]
+      "version": "4.10.0",
+      "sha256": "1hs16lqi0flr6bnyh6ajhhs9l49aldq0j9iljr4bgxw67cyxifmp",
+      "depends": ["Matrix", "coda"]
     },
     "statnetWeb": {
       "name": "statnetWeb",
@@ -115413,8 +119349,8 @@
     },
     "statnipokladna": {
       "name": "statnipokladna",
-      "version": "0.7.3",
-      "sha256": "0zym16mmimyfkz4f9h5xm9ispqnr7pbfxragv71d6kl3iz2185hp",
+      "version": "0.7.4",
+      "sha256": "0hdpyqq6qa01kvwa2ml8virm6h75xwlck2xx3madh9jkgijnysfa",
       "depends": ["cli", "curl", "dplyr", "httr", "jsonlite", "lifecycle", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringi", "stringr", "tibble", "tidyr", "xml2"]
     },
     "statprograms": {
@@ -115425,8 +119361,8 @@
     },
     "statpsych": {
       "name": "statpsych",
-      "version": "1.6.0",
-      "sha256": "1kxgwzg6qwkrlih0rwllmm31c9yyxp6w051wslb4q695piq4las2",
+      "version": "1.7.0",
+      "sha256": "0cm384ii8978v5l0x8801najvfz7zpv5ik75a91jsigq7pmx3kh3",
       "depends": ["Rdpack", "mathjaxr", "mnonr"]
     },
     "statquotes": {
@@ -115437,8 +119373,8 @@
     },
     "stats19": {
       "name": "stats19",
-      "version": "3.1.0",
-      "sha256": "1af7a2p1n1rxgx25qpkw27qmhy0gyiq2549vibdp8gfdybsf38g6",
+      "version": "3.2.0",
+      "sha256": "0zczzdd97xzkc18ld9mbb2rm8vp5nx2j1yrshy7ncxymxz9780fq",
       "depends": ["readr", "sf"]
     },
     "stats4teaching": {
@@ -115449,9 +119385,9 @@
     },
     "statsExpressions": {
       "name": "statsExpressions",
-      "version": "1.5.5",
-      "sha256": "0ba594rvqgczb10ldkmc637z9v6c0j3qixa1pw7jzd2bmhqfmaxh",
-      "depends": ["BayesFactor", "PMCMRplus", "WRS2", "afex", "correlation", "datawizard", "dplyr", "effectsize", "glue", "insight", "magrittr", "parameters", "performance", "purrr", "rlang", "tibble", "tidyr", "withr", "zeallot"]
+      "version": "1.6.2",
+      "sha256": "16gzq2sfcmbygqri73bm3iv5y6dpgm9jf4ivfxq44av9ffl4rmhn",
+      "depends": ["BayesFactor", "PMCMRplus", "WRS2", "afex", "bayestestR", "correlation", "datawizard", "dplyr", "effectsize", "glue", "insight", "magrittr", "parameters", "performance", "purrr", "rlang", "rstantools", "tidyr", "withr", "zeallot"]
     },
     "statsearchanalyticsr": {
       "name": "statsearchanalyticsr",
@@ -115491,8 +119427,8 @@
     },
     "stcpR6": {
       "name": "stcpR6",
-      "version": "0.9.6",
-      "sha256": "1336fdr5gy84j9mj15r4kgc88p53x4alk8z5gd3j4b7f1fd9skpa",
+      "version": "0.9.8",
+      "sha256": "0li5n6z56r5h1d43q3x43rpqjwm35m654z3qmkmj4n42pl9a39jw",
       "depends": ["R6", "Rcpp"]
     },
     "stdReg": {
@@ -115501,6 +119437,12 @@
       "sha256": "0x4awgbja70mdpbavgkg9mpnrxxc0qpsnl8i3rj9hs4vwbdkalr8",
       "depends": ["data_table", "drgee", "numDeriv", "survival"]
     },
+    "stdReg2": {
+      "name": "stdReg2",
+      "version": "1.0.1",
+      "sha256": "0vbiqm4cg4wnn94gl9f8616k6h6p92bn1myh4apak88c3vajhmyy",
+      "depends": ["data_table", "drgee", "generics", "survival"]
+    },
     "stddiff": {
       "name": "stddiff",
       "version": "3.1",
@@ -115509,8 +119451,8 @@
     },
     "stdmod": {
       "name": "stdmod",
-      "version": "0.2.10",
-      "sha256": "1rjky1llvj1w883xj2dicdqw9qz06az5aqj0ls9lhdnz9ipqp6i6",
+      "version": "0.2.11",
+      "sha256": "1vr4r62hyikpj0kg4rzhbj3jp2aaqxk7khj0v1afwz28lsdxjp9k",
       "depends": ["boot", "ggplot2", "lavaan", "manymome", "rlang"]
     },
     "stdvectors": {
@@ -115521,8 +119463,8 @@
     },
     "steadyICA": {
       "name": "steadyICA",
-      "version": "1.0",
-      "sha256": "0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g",
+      "version": "1.0.1",
+      "sha256": "0hknrjwcp0zy11fyf0c1qr9fcin34335pkjgygdhrzlmrapf02cc",
       "depends": ["MASS", "Rcpp", "clue", "combinat"]
     },
     "steepness": {
@@ -115575,16 +119517,22 @@
     },
     "stepR": {
       "name": "stepR",
-      "version": "2.1-9",
-      "sha256": "1dw402p49j2m076b7ybmnfhxhxb4i8fnalqqblxq2ax7rl69i2vz",
+      "version": "2.1-10",
+      "sha256": "08v9blxqyha4phk90f09vdq8vh9czprfvsiwk06l8am01cspdj4j",
       "depends": ["R_cache", "Rcpp", "digest", "lowpassFilter"]
     },
     "stepSplitReg": {
       "name": "stepSplitReg",
-      "version": "1.0.3",
-      "sha256": "04ks599bb3rbyc81kyakj6nmj7i8fvkb1pild0gd3i6j84j70071",
+      "version": "1.0.4",
+      "sha256": "1nvpb1wd4na49rcy8ixwnhkmkw9si8xkajcddl7x9c3rc8zyzm10",
       "depends": ["Rcpp", "RcppArmadillo", "SplitGLM", "nnls"]
     },
+    "stepcount": {
+      "name": "stepcount",
+      "version": "0.3.2",
+      "sha256": "1isa817lqkb5a1rl2kb7nm6gbfp6c2kqk399mrw4j2ysbhcjgiq7",
+      "depends": ["assertthat", "curl", "lubridate", "magrittr", "readr", "reticulate"]
+    },
     "stepdownfdp": {
       "name": "stepdownfdp",
       "version": "1.0.0",
@@ -115629,8 +119577,8 @@
     },
     "stevedata": {
       "name": "stevedata",
-      "version": "1.3.0",
-      "sha256": "0ggfgf3g240r69g4wnhyxvzp46by9b79hzhhpbs1rmh2pzd6zj96",
+      "version": "1.4.0",
+      "sha256": "0zhgagvndzjimbg03xfdm7ndqsxb75abdyng41caw8i9wjina90i",
       "depends": []
     },
     "stevedore": {
@@ -115641,8 +119589,8 @@
     },
     "stevemisc": {
       "name": "stevemisc",
-      "version": "1.7.0",
-      "sha256": "1xngshwsqd3z0zygrzxwnmr3jwha2kbw7fcf0vc0yngqg62gzrvn",
+      "version": "1.8.0",
+      "sha256": "1xbhmz3yh7qjchq07khd8qa61654x3chj3srlyd8c15in0dxch5z",
       "depends": ["arm", "dplyr", "forcats", "ggplot2", "httr", "labelled", "lme4", "magrittr", "purrr", "rlang", "rmarkdown", "stringr", "tibble", "tidyr"]
     },
     "stevetemplates": {
@@ -115791,16 +119739,10 @@
     },
     "stochvol": {
       "name": "stochvol",
-      "version": "3.2.4",
-      "sha256": "1cr8rn4nzdbvgjhsahyijn2kgbndiyvycbn6rjxc0x5prc99j52w",
+      "version": "3.2.5",
+      "sha256": "1adzkd7m1lpcqbqqr39v558qfwjgs23h600z0dm2p1rf4cs51f5f",
       "depends": ["Rcpp", "RcppArmadillo", "coda"]
     },
-    "stochvolTMB": {
-      "name": "stochvolTMB",
-      "version": "0.2.0",
-      "sha256": "07m3qz8j1sw37lrxzmbkbifd3nsdvd2blbca8vr1aq5bbafr1g1b",
-      "depends": ["MASS", "RcppEigen", "TMB", "data_table", "ggplot2", "sn"]
-    },
     "stockAnalyst": {
       "name": "stockAnalyst",
       "version": "1.0.1",
@@ -115851,15 +119793,15 @@
     },
     "stoppingrule": {
       "name": "stoppingrule",
-      "version": "0.4.0",
-      "sha256": "07gchj75hj1sjgp6nx1hry563vcd33q1j0iw1w1z9qaf3ivqby5a",
+      "version": "0.5.1",
+      "sha256": "0vcqz35l3xid1d98a6xaxz2yas23fh29k1q17mxq9vr568gcxcwp",
       "depends": ["matrixStats", "pracma"]
     },
     "stops": {
       "name": "stops",
-      "version": "1.6-2",
-      "sha256": "1fn1xbxq1ls5xw38hnv0kh5gx9pd4myspkj146q6w83yzzrwjnry",
-      "depends": ["DiceKriging", "DiceOptim", "acepack", "clue", "cmaes", "cordillera", "dfoptim", "energy", "minerva", "nloptr", "pomp", "pso", "scagnostics", "smacof", "smacofx", "tgp", "vegan"]
+      "version": "1.8-2",
+      "sha256": "0nc4c371rq144f1ci5ppxnbjr9qchp2a2knsp3hiyyvg2mfax241",
+      "depends": ["DiceKriging", "DiceOptim", "acepack", "clue", "cmaes", "cordillera", "dfoptim", "energy", "minerva", "nloptr", "pomp", "pso", "registry", "scagnostics", "smacof", "smacofx", "tgp", "vegan"]
     },
     "stopwords": {
       "name": "stopwords",
@@ -115893,8 +119835,8 @@
     },
     "stplanr": {
       "name": "stplanr",
-      "version": "1.2.1",
-      "sha256": "08hhx6lagfwy153xwbpqbvsz13dfq29607bp2640c5bfmddgnaxp",
+      "version": "1.2.2",
+      "sha256": "111hhmixq3h2f4hrzpldzkq3wwipwggalavy8wszkwbs3l35h487",
       "depends": ["Rcpp", "curl", "data_table", "dplyr", "geosphere", "httr", "jsonlite", "lwgeom", "magrittr", "nabor", "od", "pbapply", "rlang", "sf", "sfheaders"]
     },
     "stpm": {
@@ -115957,6 +119899,12 @@
       "sha256": "0m41866xr21h4mih4z98y6pcrp2ws0mxxx157vdhbv7rhlh5djvp",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "strata": {
+      "name": "strata",
+      "version": "1.0.1",
+      "sha256": "0yb9wchf31810yz24r135cwmbyjdzyzc0pm0m3simdgwi26szyab",
+      "depends": ["checkmate", "dplyr", "fs", "glue", "lifecycle", "purrr", "readr", "rlang", "stringr", "tibble"]
+    },
     "strata_MaxCombo": {
       "name": "strata.MaxCombo",
       "version": "0.0.1",
@@ -115999,6 +119947,12 @@
       "sha256": "0vsra08lbq2nabd9lizakgpvn5lrp0lc961jvpns59l0b4wvdqab",
       "depends": []
     },
+    "stratifiedyh": {
+      "name": "stratifiedyh",
+      "version": "0.1.0",
+      "sha256": "03hj2zap6cks74nk3al66dpphlinp10bi1pzpcc51ycb1n95gw95",
+      "depends": []
+    },
     "stratifyR": {
       "name": "stratifyR",
       "version": "1.0-3",
@@ -116067,9 +120021,9 @@
     },
     "streetscape": {
       "name": "streetscape",
-      "version": "1.0.2",
-      "sha256": "0y06719766yh6ifbk1h7wgdsw3asnwagli50czwqyilcp8p0fc4z",
-      "depends": ["OpenImageR", "SuperpixelImageSegmentation", "dplyr", "httr", "mapview", "osmdata", "parallelly", "pbmcapply", "quickPWCR", "reticulate", "rlang", "sf", "sp"]
+      "version": "1.0.4",
+      "sha256": "1m4zrqvi0rlqps46vfrsz2wnqhn6a392nfmxhbs22rdgzwh9j3qq",
+      "depends": ["OpenImageR", "SuperpixelImageSegmentation", "cli", "dplyr", "httr", "mapview", "osmdata", "parallelly", "pbmcapply", "quickPWCR", "reticulate", "rlang", "sf", "sp"]
     },
     "stressaddition": {
       "name": "stressaddition",
@@ -116091,8 +120045,8 @@
     },
     "strex": {
       "name": "strex",
-      "version": "2.0.0",
-      "sha256": "1cxkpqwnpsqkg0i6n6bkkgbf3jkbgff5s8db95rz57lki8xwlqp9",
+      "version": "2.0.1",
+      "sha256": "1dd6gsx45rqwwdj25034hzqj3wg62v0zqrdv2xq8qx3ylixv0v9q",
       "depends": ["checkmate", "lifecycle", "magrittr", "rlang", "stringi", "stringr"]
     },
     "strider": {
@@ -116103,14 +120057,14 @@
     },
     "string2path": {
       "name": "string2path",
-      "version": "0.1.7",
-      "sha256": "00gzfibv3pw35r9lqzxpik1x3daffrs5xlbbxm46d9gvd2bhrzxd",
+      "version": "0.1.8",
+      "sha256": "1grp1r2dgng1p436g1hx01w8m3a8r37x30q9b38lfrjsmzqqzgzp",
       "depends": ["cli", "tibble"]
     },
     "stringdist": {
       "name": "stringdist",
-      "version": "0.9.12",
-      "sha256": "1i365vwjx8kk47wzry8d3zhzrlv51hn76s2ipk9vi121zx939171",
+      "version": "0.9.14",
+      "sha256": "1m6rx1wrfv81937nwaa26hfmk7hsdakhfp2d0105xpl8g91dns04",
       "depends": []
     },
     "stringfish": {
@@ -116173,16 +120127,22 @@
       "sha256": "1c8z2qf1kp43ir4dmyxq6hc46dclq8vx3ggkj02p8j1icjswm9bh",
       "depends": ["Rcpp", "magrittr", "stringr"]
     },
+    "strs": {
+      "name": "strs",
+      "version": "0.1.0",
+      "sha256": "072abw4am93h51zd4yi48fprvgg61rzif259i1150aav2n43aklw",
+      "depends": ["stringi"]
+    },
     "strucchange": {
       "name": "strucchange",
-      "version": "1.5-3",
-      "sha256": "11hgz64snlwhfqsmqajmkciflwkz1wficxr340wqvk38iw1b9ina",
+      "version": "1.5-4",
+      "sha256": "066pbldj1a0hdhrzszqp8ad71krj7w5dbqxmgp8kk5d76r6wd6vq",
       "depends": ["sandwich", "zoo"]
     },
     "strucchangeRcpp": {
       "name": "strucchangeRcpp",
-      "version": "1.5-3-1.0.4",
-      "sha256": "0vfqbhck0qwc8dsnm5ggc0if03vx4ma53qidi7qsqjyfjfszq1pm",
+      "version": "1.5-4-1.0.0",
+      "sha256": "15csz77hfii23dv8rrsabwilq8z0fa5f0vp6nhwh2nmww4y2fm7v",
       "depends": ["Rcpp", "RcppArmadillo", "sandwich", "zoo"]
     },
     "structree": {
@@ -116197,6 +120157,12 @@
       "sha256": "0s7n26in5fb6lxgffx01743vd4854qg4wclqgsa6mwnrqg8ihg4y",
       "depends": ["DT", "MASS", "data_table", "dplyr", "gWidgets2", "gWidgets2tcltk", "ggplot2", "gridExtra", "gtable", "plotly", "plyr", "scales"]
     },
+    "sts": {
+      "name": "sts",
+      "version": "1.2",
+      "sha256": "1sz2g4zclyq6s29zydv5pifq6pxmnkr19v654w3gpnzl8ngna0aw",
+      "depends": ["Matrix", "Rcpp", "RcppArmadillo", "doParallel", "foreach", "ggplot2", "glmnet", "matrixStats", "mvtnorm", "slam", "stm"]
+    },
     "stuart": {
       "name": "stuart",
       "version": "0.10.2",
@@ -116275,6 +120241,12 @@
       "sha256": "0faww87ncylqixb640hc2axvn4i50d2r2ggngmd7s9wazbb6sd55",
       "depends": []
     },
+    "subincomeR": {
+      "name": "subincomeR",
+      "version": "0.2.2",
+      "sha256": "07942h6c714j5w3ji23llan84a0888l4wlfg5cwbc5jy6b5d4vaf",
+      "depends": ["countrycode", "curl", "dplyr", "rlang", "sf", "tidygeocoder", "zip"]
+    },
     "submax": {
       "name": "submax",
       "version": "1.1.1",
@@ -116293,6 +120265,12 @@
       "sha256": "1sg1krlzck5m7g9klppxcwpbj6dnwlnc1pjvyyyw0hb5raz102w1",
       "depends": []
     },
+    "subsampling": {
+      "name": "subsampling",
+      "version": "0.1.1",
+      "sha256": "1c6xz59n902w413wc3hs84p44l4imln93x90y947rbp53iglabx4",
+      "depends": ["Rcpp", "RcppArmadillo", "expm", "nnet", "quantreg", "survey"]
+    },
     "subscore": {
       "name": "subscore",
       "version": "3.3",
@@ -116359,6 +120337,12 @@
       "sha256": "0xgazjr55cdjcxngpfasq17pc72lkg2p9jfzfpmwkjrpvsqw8dff",
       "depends": ["dplyr", "geosphere", "progress", "purrr", "rlang", "rmapshaper", "sf", "tibble", "tidyr"]
     },
+    "sugarglider": {
+      "name": "sugarglider",
+      "version": "1.0.3",
+      "sha256": "0vy7sar2ly3syjsfnlhvl7ki3ijf6in3qzzxvr4j7i9vkzjijc5w",
+      "depends": ["dplyr", "ggplot2"]
+    },
     "suggests": {
       "name": "suggests",
       "version": "0.1.0",
@@ -116421,14 +120405,14 @@
     },
     "sundialr": {
       "name": "sundialr",
-      "version": "0.1.4.2",
-      "sha256": "1qzak0zrdj2ygw4h6cn28z6q5qxaam8dybqblmf17xq2lkvn2bpn",
+      "version": "0.1.6.1",
+      "sha256": "10b9il73v2vy32pq75vh2gssrmwrilvn271ll6aymzlrp5jv1l0m",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "suntools": {
       "name": "suntools",
-      "version": "1.0.0",
-      "sha256": "1qlp0q2ckqg5v3yvbr98k3nr9awgg7ks0l1103nqvm1ssadv7ds2",
+      "version": "1.0.1",
+      "sha256": "1j7xz3yxg1azvcshb6sp88diipjiq37895cbipxm0s22dhhx1bqv",
       "depends": ["sf"]
     },
     "supclust": {
@@ -116437,6 +120421,12 @@
       "sha256": "1iar957gdarp1m677fjmph0ll8zsqiy2bzkzx03gv37k56w1acpd",
       "depends": ["class", "rpart"]
     },
+    "super": {
+      "name": "super",
+      "version": "0.0.4",
+      "sha256": "0a61zsg08j4kbcpcawcpzyplb6w8nx3b4kw55d3yk3dhzwi1spxb",
+      "depends": []
+    },
     "superMICE": {
       "name": "superMICE",
       "version": "1.1.1",
@@ -116445,9 +120435,9 @@
     },
     "superb": {
       "name": "superb",
-      "version": "0.95.15",
-      "sha256": "1lirfmsrkbssfg0kwlfw67g8hi4j2g71c7q177hvahpw90ajr6gf",
-      "depends": ["MASS", "Rdpack", "foreign", "ggplot2", "lsr", "plyr", "shiny", "shinyBS", "stringr"]
+      "version": "0.95.19",
+      "sha256": "003b7r79kc3sx3jp661f3p974jgczchd7b9f3jw89xrh0jh3214a",
+      "depends": ["MASS", "Rdpack", "foreign", "ggplot2", "lsr", "plyr", "rrapply", "shiny", "shinyBS", "stringr"]
     },
     "superbiclust": {
       "name": "superbiclust",
@@ -116565,9 +120555,15 @@
     },
     "surface": {
       "name": "surface",
-      "version": "0.5",
-      "sha256": "1fw75543aa6yafldffh9cnpm6m0rif0fpcihwj56d7nfnkbslawz",
-      "depends": ["MASS", "ape", "geiger", "ouch"]
+      "version": "0.6",
+      "sha256": "1s5z7krv7kaxdkx4vsvp405bb1a13lkbfcmcf1lp0ia46vqdiph3",
+      "depends": ["MASS", "ape", "geiger", "ouch", "phytools"]
+    },
+    "surreal": {
+      "name": "surreal",
+      "version": "0.0.1",
+      "sha256": "1d1hymkb8asqrhjz7c1shf3mm3c2y0d9pbjapfq5xz52vp01sawb",
+      "depends": ["png"]
     },
     "surrosurv": {
       "name": "surrosurv",
@@ -116601,8 +120597,8 @@
     },
     "survAUC": {
       "name": "survAUC",
-      "version": "1.2-0",
-      "sha256": "138z4my55lbaxvvk6fih2vn16vvmdy0a07l0yjdhfy87yq7vhvki",
+      "version": "1.3-0",
+      "sha256": "18j3fmn0ac97pl3bwnj0iamgcnva0198g7g09gdqml1dp9vh4k8y",
       "depends": ["rms", "survival"]
     },
     "survAWKMT2": {
@@ -116637,9 +120633,9 @@
     },
     "survHE": {
       "name": "survHE",
-      "version": "2.0.1",
-      "sha256": "00h7jjwynhg75d6f4j0c9d1mivw7ycln5ymcsvx2lfy7i22widk9",
-      "depends": ["dplyr", "flexsurv", "ggplot2", "rms", "tibble", "xlsx"]
+      "version": "2.0.2",
+      "sha256": "02nznc00jwgvpfyn95fhaxr2hsznmdplwjysi0bg722lhlp2w2bn",
+      "depends": ["dplyr", "flexsurv", "ggplot2", "rms", "tibble", "tidyr", "xlsx"]
     },
     "survIDINRI": {
       "name": "survIDINRI",
@@ -116649,9 +120645,9 @@
     },
     "survML": {
       "name": "survML",
-      "version": "1.1.0",
-      "sha256": "10fz2k7c3q94qb5rvhabcyxpyn1flj0xjfsf7h5pxqz6hx221hpn",
-      "depends": ["Iso", "SuperLearner"]
+      "version": "1.2.0",
+      "sha256": "0pqsyqz4d34p11g4s0qw6bl9qi3bfc8fvv2cafgjr9ydd0mvyiy2",
+      "depends": ["ChernoffDist", "Iso", "SuperLearner", "dplyr", "fdrtool", "gtools", "haldensify", "mboost", "survival"]
     },
     "survMisc": {
       "name": "survMisc",
@@ -116667,8 +120663,8 @@
     },
     "survPen": {
       "name": "survPen",
-      "version": "1.6.0",
-      "sha256": "1gihr41a7smq4ql52gah249g3q2zd5zf5qiwpbxi7imgfzkmbzza",
+      "version": "2.0.0",
+      "sha256": "1b6w7fvyhryjz4cds1xn7kcvfx10jwzkbxy8lli4q4lzdc5x8lnf",
       "depends": ["Rcpp", "RcppEigen", "statmod"]
     },
     "survPresmooth": {
@@ -116695,6 +120691,12 @@
       "sha256": "0js9sgslxzzs8k94k9kdmbmwp1ckk9mlr8sndk17dg24raks4zmz",
       "depends": ["survival"]
     },
+    "survSAKK": {
+      "name": "survSAKK",
+      "version": "1.3.1",
+      "sha256": "0j2avaf08jn7llbik1pfjlbficn79s7x2by1fyni3l7bjk6lhpb1",
+      "depends": ["survival"]
+    },
     "survSNP": {
       "name": "survSNP",
       "version": "0.26",
@@ -116715,8 +120717,8 @@
     },
     "survcompare": {
       "name": "survcompare",
-      "version": "0.1.2",
-      "sha256": "15x37k5zrydak6aby5b1x0q9pnxmk6crxpbfpqjkb3g86b4kpm0q",
+      "version": "0.2.0",
+      "sha256": "1g5gzs61srzx4glrxgfr70vwmx96mvf6lbca43srskn1f8n93k14",
       "depends": ["caret", "glmnet", "randomForestSRC", "survival", "timeROC"]
     },
     "surveil": {
@@ -116727,9 +120729,9 @@
     },
     "surveillance": {
       "name": "surveillance",
-      "version": "1.23.0",
-      "sha256": "1xqcm71mfmk3x8kq9sb66a4654c1vblpjz4may4xn7yh62nbcy2n",
-      "depends": ["MASS", "Matrix", "Rcpp", "nlme", "polyCub", "sp", "spatstat_geom", "xtable"]
+      "version": "1.24.1",
+      "sha256": "0wzjv9pb8nl1almd0qmn5xqfms2026pg21jvcqd73ij053w4vz1a",
+      "depends": ["MASS", "Matrix", "nlme", "polyCub", "sp", "spatstat_geom", "xtable"]
     },
     "survex": {
       "name": "survex",
@@ -116773,6 +120775,12 @@
       "sha256": "0wrp92j50a19is4xvh5s82zkp3rvn46gi2344pxinppfax0kjf2h",
       "depends": ["DT", "assertthat", "dplyr", "ggplot2", "magrittr", "purrr", "rlang", "scales", "tidyr"]
     },
+    "surveydown": {
+      "name": "surveydown",
+      "version": "0.7.2",
+      "sha256": "04w5bxgscrniv2cn1babk6z758wd15wm8jq1mpg2rmmsvy2gr0q6",
+      "depends": ["DBI", "DT", "RPostgres", "fs", "htmltools", "markdown", "pool", "quarto", "rstudioapi", "rvest", "shiny", "shinyWidgets", "shinyjs", "usethis", "xml2", "yaml"]
+    },
     "surveyexplorer": {
       "name": "surveyexplorer",
       "version": "0.2.0",
@@ -116785,6 +120793,12 @@
       "sha256": "06izdycgrggzgyf730fkrd1m3d9a8k2f4fvs9hhihsbkcns2kpgi",
       "depends": []
     },
+    "surveynnet": {
+      "name": "surveynnet",
+      "version": "1.0.0",
+      "sha256": "17qzac2zi2mx90k0r8v05bwmh6bchg64whvaw06g3n53l9kqrr6b",
+      "depends": ["PracTools", "dplyr", "nnet", "survey", "survival"]
+    },
     "surveyplanning": {
       "name": "surveyplanning",
       "version": "4.0",
@@ -116799,9 +120813,9 @@
     },
     "surveytable": {
       "name": "surveytable",
-      "version": "0.9.4",
-      "sha256": "0prfr3y7xbx6fylc5xpyg74biiqim4sjsfbc4f8khm57nznpg91v",
-      "depends": ["assertthat", "huxtable", "kableExtra", "magrittr", "survey"]
+      "version": "0.9.5",
+      "sha256": "1l76dqg6dansl47fqc55yq70hd43cjqwqjkd1sfpg0n75jdcsbaa",
+      "depends": ["assertthat", "huxtable", "kableExtra", "lifecycle", "magrittr", "survey"]
     },
     "surveyvoi": {
       "name": "surveyvoi",
@@ -116817,8 +120831,8 @@
     },
     "survival": {
       "name": "survival",
-      "version": "3.7-0",
-      "sha256": "1vzy8kg159yqnvg733air11la2qrirwcqhn9d67h5c18r67b15nd",
+      "version": "3.8-3",
+      "sha256": "05crwnjvdx2z6asjipc04534zp2jk3a16qkg8b3n399pgnjhbayw",
       "depends": ["Matrix"]
     },
     "survival_svb": {
@@ -116827,12 +120841,6 @@
       "sha256": "13lipzn1cnkd5dcg8n69cdghycifiin3jnjvgzsv0g60l1jk0lmp",
       "depends": ["Rcpp", "RcppEigen", "glmnet", "survival"]
     },
-    "survival666": {
-      "name": "survival666",
-      "version": "0.5",
-      "sha256": "11vs546lrbxnhpxjmwxhh2hnp6kwcf4hzgigi3x9525hr8n9cy01",
-      "depends": ["ggplot2", "survival", "survminer"]
-    },
     "survivalAnalysis": {
       "name": "survivalAnalysis",
       "version": "0.3.0",
@@ -116851,6 +120859,12 @@
       "sha256": "1wqlzpwm1p7nq19l3d7c93zv6fnn0b1w24kak9zwsgyhar3f5lv9",
       "depends": ["copula", "matrixcalc", "splines2", "survival"]
     },
+    "survivalPLANN": {
+      "name": "survivalPLANN",
+      "version": "0.1",
+      "sha256": "0vkpclsirb37a0xdzbbk7z0ajnp398l12mwkrxh2nprngsnfvywn",
+      "depends": ["nnet", "survival"]
+    },
     "survivalREC": {
       "name": "survivalREC",
       "version": "1.1",
@@ -116865,9 +120879,9 @@
     },
     "survivalSL": {
       "name": "survivalSL",
-      "version": "0.94",
-      "sha256": "03d38fh8pw5m2cd3v6hvcwc9d9b15idzrh9nj48cn6k27cnzf8qg",
-      "depends": ["MASS", "caret", "date", "dplyr", "flexsurv", "glmnet", "glmnetUtils", "hdnom", "randomForestSRC", "rpart", "survival"]
+      "version": "0.96",
+      "sha256": "0mjaklq2zkz35z4y1w11yv5pc520a3xkinrynkkmrpdmvhlwjsk9",
+      "depends": ["MASS", "caret", "date", "dplyr", "flexsurv", "glmnet", "glmnetUtils", "hdnom", "randomForestSRC", "rpart", "survival", "survivalPLANN"]
     },
     "survivalVignettes": {
       "name": "survivalVignettes",
@@ -116895,8 +120909,8 @@
     },
     "survminer": {
       "name": "survminer",
-      "version": "0.4.9",
-      "sha256": "0byh0wxdbjfwdrzsnqv4xlmnik6lj0vkkzfxy7lssk8dv5zmj7nz",
+      "version": "0.5.0",
+      "sha256": "12zmjd42w3ay2hf7dmdlpc10gan2adgz64jm5cg9prxw3ryi3iyj",
       "depends": ["broom", "dplyr", "ggplot2", "ggpubr", "ggtext", "gridExtra", "magrittr", "maxstat", "purrr", "rlang", "scales", "survMisc", "survival", "tibble", "tidyr"]
     },
     "survmixer": {
@@ -116979,9 +120993,9 @@
     },
     "svMisc": {
       "name": "svMisc",
-      "version": "1.2.3",
-      "sha256": "1r3kih5bnr4plnzdn5f2gg3xl3krgyl7gkdlf58a2l8vk13j3m9d",
-      "depends": []
+      "version": "1.4.3",
+      "sha256": "0sjqc3bxah1a0zmsyla0pnbpsjzpzqsphpiy9j42fh7bj8qg6z3k",
+      "depends": ["cli", "rlang"]
     },
     "svSocket": {
       "name": "svSocket",
@@ -117021,8 +121035,8 @@
     },
     "svd": {
       "name": "svd",
-      "version": "0.5.5",
-      "sha256": "1ilcz7qjykawrd0r74k51f7xryy6d30dmf7zzpbwga6i99wkj0g2",
+      "version": "0.5.7",
+      "sha256": "050m8hjddgygm7q1lvz2lqvq9r6xrbi4cy4kpbvypnwdf1w4x6ah",
       "depends": []
     },
     "svenssonm": {
@@ -117091,16 +121105,34 @@
       "sha256": "0hfs0dif4b9ssi98mv2aa849blgdgvphymafabmsix4nkdjqzi2k",
       "depends": ["Matrix", "gtools"]
     },
+    "svyROC": {
+      "name": "svyROC",
+      "version": "1.0.0",
+      "sha256": "0pyxrcjww4q0wv2g135hvrd46h661nz5fyqamppdx8x6gwchcdwb",
+      "depends": ["survey", "svyVarSel"]
+    },
     "svyVGAM": {
       "name": "svyVGAM",
       "version": "1.2",
       "sha256": "01y372p52xjd7j20xk5gwxkl8sfnwdvixx3pb3f6r407ca7l330h",
       "depends": ["VGAM", "survey"]
     },
+    "svyVarSel": {
+      "name": "svyVarSel",
+      "version": "1.0.1",
+      "sha256": "1sfgifyjnfmf8piwpzhgnl0vdrv6nj1raab2aj6ajrxr6va780kh",
+      "depends": ["glmnet", "survey"]
+    },
+    "svycdiff": {
+      "name": "svycdiff",
+      "version": "0.1.1",
+      "sha256": "1hfgrcrkwgsi3d71aih9w866cwnidhkl45bnw29g0gz3wyvxj9gs",
+      "depends": ["betareg", "numDeriv", "survey"]
+    },
     "svydiags": {
       "name": "svydiags",
-      "version": "0.6",
-      "sha256": "13rmy02f5d2ysbi5r9w9mhnyqrsvikhqwjk1d3dgkxgvz9lyqas0",
+      "version": "0.7",
+      "sha256": "1pbv991fyz66rvmzpc36qcl9q6q8lxr5qydpikc915xmszjx2f01",
       "depends": ["MASS", "Matrix", "survey"]
     },
     "svylme": {
@@ -117135,8 +121167,8 @@
     },
     "swaRmverse": {
       "name": "swaRmverse",
-      "version": "0.1.0",
-      "sha256": "1z14ys2y42griwbwcjilk552haczlfbazjzwa5g6kvlxjibm1dq0",
+      "version": "0.1.1",
+      "sha256": "1c5mwncc4ms651gcil2yskm1fzkcj9na0y25k3q9bp56cf0vvmbx",
       "depends": ["Rtsne", "geosphere", "pbapply", "swaRm", "trackdf"]
     },
     "swag": {
@@ -117177,8 +121209,8 @@
     },
     "swdpwr": {
       "name": "swdpwr",
-      "version": "1.9",
-      "sha256": "12ynji4qg30gypldmcqrj2m89ip0biqvy525kgi7s38a3ian3fhn",
+      "version": "1.11",
+      "sha256": "1c1l0qmphd2xjm7v8fkvr354yn5blm7w8n8s3xg3vidnr9x39ysx",
       "depends": ["spatstat_random"]
     },
     "sweater": {
@@ -117207,8 +121239,8 @@
     },
     "swfscAirDAS": {
       "name": "swfscAirDAS",
-      "version": "0.3.0",
-      "sha256": "1x9k883hv10ki6lbcp14j4808hj6krr0jd4cmkni0jbsj0sv0d81",
+      "version": "0.3.1",
+      "sha256": "0y52ishci4djp1izanzh6psrmnqrpcgvkq28vxs61gdgrgxqp5lk",
       "depends": ["dplyr", "lubridate", "magrittr", "purrr", "readr", "rlang", "stringr", "swfscDAS", "swfscMisc", "tidyr"]
     },
     "swfscDAS": {
@@ -117261,8 +121293,8 @@
     },
     "switchSelection": {
       "name": "switchSelection",
-      "version": "1.1.2",
-      "sha256": "0mgl3s02pz9nbhdnm7fhyd8vbrfl718rv7bardlqc448qyb78hb8",
+      "version": "2.0.0",
+      "sha256": "0lgicakwcmvjhvy1sqvv4rasxyyx2s1gadxnz81s7ii1865lbryk",
       "depends": ["Rcpp", "RcppArmadillo", "gena", "hpa", "mnorm"]
     },
     "switchboard": {
@@ -117387,8 +121419,8 @@
     },
     "synMicrodata": {
       "name": "synMicrodata",
-      "version": "2.0.0",
-      "sha256": "03fx8lzg90p8cw237lgn6yqxnxlknximpyafx6jnd9yh2sc3ccjb",
+      "version": "2.1.0",
+      "sha256": "08p2ikghjypn6qc5zv7cp8cqf9d7adj894n9hjyf8nnm21n9j7qn",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
     "synchronicity": {
@@ -117447,15 +121479,15 @@
     },
     "synthesizer": {
       "name": "synthesizer",
-      "version": "0.2.0",
-      "sha256": "1d676d75bf6nh535iz9wp8887203xzfggnvw1z95l599jz6mbymr",
+      "version": "0.3.1",
+      "sha256": "0x1px8dzihrrr5gg0pzwjnxda5zfhck3c3rj605wrgjps16zdj41",
       "depends": ["randomForest"]
     },
     "synthpop": {
       "name": "synthpop",
-      "version": "1.8-0",
-      "sha256": "0ljq3vhprzxj0p5s57pr223n3mxbiwz0p5bdvjcdkw4xykx7zkka",
-      "depends": ["MASS", "broman", "classInt", "foreign", "ggplot2", "lattice", "mipfp", "nnet", "party", "plyr", "polspline", "proto", "randomForest", "ranger", "rmutil", "rpart", "stringr", "survival"]
+      "version": "1.9-0",
+      "sha256": "0ij574d7c1xx5qv5w79a1lrrgvk9hvd6l1cjvylfkc0s6b9rj39c",
+      "depends": ["MASS", "broman", "classInt", "forcats", "foreign", "ggplot2", "lattice", "mipfp", "nnet", "party", "plyr", "polspline", "proto", "randomForest", "ranger", "rmutil", "rpart", "stringr", "survival"]
     },
     "syrup": {
       "name": "syrup",
@@ -117465,8 +121497,8 @@
     },
     "sys": {
       "name": "sys",
-      "version": "3.4.2",
-      "sha256": "1cz57jkc159zfgffvcdb40wv9avb5id7pdvgx8q1hs7vy1kcxgdp",
+      "version": "3.4.3",
+      "sha256": "0flihfpfawismsy5piddf2flz1i1fw35k47gxwkbhk87wcr767h5",
       "depends": []
     },
     "sysfonts": {
@@ -117531,8 +121563,8 @@
     },
     "tRigon": {
       "name": "tRigon",
-      "version": "0.3.2",
-      "sha256": "1qnvg06dgny2q4lfsbnjn5c664ibm332mr8rfwv5lzgr56d44nnk",
+      "version": "0.3.3",
+      "sha256": "0gvq5xz8wg40bvh3ipm5m15rjv5q97zs3srdwl1bai0kvzp1n0aj",
       "depends": ["DT", "RColorBrewer", "boot", "caret", "data_table", "dplyr", "factoextra", "ggcorrplot", "ggplot2", "ggpubr", "ggridges", "markdown", "patchwork", "randomForest", "readxl", "sessioninfo", "shiny", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "simpleboot", "writexl"]
     },
     "tRnslate": {
@@ -117585,8 +121617,8 @@
     },
     "table_glue": {
       "name": "table.glue",
-      "version": "0.0.3",
-      "sha256": "1viaz9swdhgk4ysjhyvl9fr4m430qvmwwblij2b2dadwbdl0z9k4",
+      "version": "0.0.5",
+      "sha256": "1d9qz39vmnn2jhhxp68fwc3fz2bhdi0rjjdi0zlpr53lqfp1zlv9",
       "depends": ["glue", "stringi"]
     },
     "table1": {
@@ -117633,14 +121665,14 @@
     },
     "tablerDash": {
       "name": "tablerDash",
-      "version": "0.1.0",
-      "sha256": "1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm",
-      "depends": ["htmltools", "knitr", "shiny"]
+      "version": "0.1.5",
+      "sha256": "0cjidfkxwc56xj9rka0ba80hnwvm05wfvpw65wwmr3l56smnfcbz",
+      "depends": ["htmltools", "shiny"]
     },
     "tables": {
       "name": "tables",
-      "version": "0.9.28",
-      "sha256": "0adkbx8jcjxlx9jhg4ic1jyclx2x8ky9z8zd9x14xw8a94yczlnc",
+      "version": "0.9.31",
+      "sha256": "1378kj6y166p8kgd8jqq795rbd6p7y1qv23kqapmk8ih7qcwy6mq",
       "depends": ["htmltools", "knitr"]
     },
     "tableschema_r": {
@@ -117655,16 +121687,22 @@
       "sha256": "1gw6pfqa64xq4akbzzn5d1nd9wd505k8lqldy46b40h6ahkr1k78",
       "depends": ["ggplot2", "tables"]
     },
+    "tablespan": {
+      "name": "tablespan",
+      "version": "0.1.7",
+      "sha256": "0zs7m967pjk313pi8m8qj6irj4ywvcr5dxqisyj0nfm6wzywp88c",
+      "depends": ["dplyr", "gt", "openxlsx", "rlang"]
+    },
     "tablet": {
       "name": "tablet",
-      "version": "0.6.8",
-      "sha256": "0yg58dh8k32155pm16ai327a33i0bx7qkrd4jvj7mf4qy9ava6v3",
+      "version": "0.6.12",
+      "sha256": "18szlxhmxflskab60n4hdjl8w5pqmc54ipadckd4xmjyz67y9xxp",
       "depends": ["dplyr", "fs", "kableExtra", "magrittr", "reactable", "rlang", "spork", "tidyr", "yamlet"]
     },
     "tablexlsx": {
       "name": "tablexlsx",
-      "version": "1.0.0",
-      "sha256": "11xnazwsmm3gwmwqnqjv2yc3bwcz5na168dkl8i2g7p983z4999p",
+      "version": "1.1.0",
+      "sha256": "05vbm0s96m6jm7idxqgpfa4yz0zmpkjz3dxr7ygd9ph1dv8z1frg",
       "depends": ["cli", "magrittr", "openxlsx"]
     },
     "tabnet": {
@@ -117681,8 +121719,8 @@
     },
     "tabr": {
       "name": "tabr",
-      "version": "0.5.0",
-      "sha256": "0b8qg6zkfm7hqclpb79asjsz3p8kg0645n8gxc61r6gcv7hyzdvc",
+      "version": "0.5.1",
+      "sha256": "1y14whqm0xw9n14nc2r27c6i6hchcbmbzidkyi9nhjn3prdln5b2",
       "depends": ["crayon", "dplyr", "ggplot2", "purrr", "tibble", "tidyr"]
     },
     "tabshiftr": {
@@ -117699,14 +121737,14 @@
     },
     "tabula": {
       "name": "tabula",
-      "version": "3.1.0",
-      "sha256": "03h4i899ciiwhwjwbkkm6x93r3469r1bmw6dfrrya5iykk434v0d",
-      "depends": ["arkhe"]
+      "version": "3.1.1",
+      "sha256": "0vw1ksjv82azg97k2kvszvp5d8nqprk9g3i0i5mx20iymxjjv032",
+      "depends": ["arkhe", "khroma"]
     },
     "tabulapdf": {
       "name": "tabulapdf",
-      "version": "1.0.5-3",
-      "sha256": "1cavgzchfpwa8mg7g4di5sys41909iwvy6sj0ah7p8cd623k9f7g",
+      "version": "1.0.5-5",
+      "sha256": "0vi4djizwmzbvyq4808nh7cc29xhk9z14h34jypjxfbrsrm9p19i",
       "depends": ["png", "rJava", "readr"]
     },
     "tabularMLC": {
@@ -117747,8 +121785,8 @@
     },
     "tabxplor": {
       "name": "tabxplor",
-      "version": "1.1.3",
-      "sha256": "1fxcbw117sz564ylxch7jgs6zv5d3lniyam5vlxfbdgvszlw9vhh",
+      "version": "1.2.1",
+      "sha256": "0navimnpj93n1gxv7cr83xj3c28rrd1zzg1rjs78rxidci4lhcxm",
       "depends": ["DescTools", "cli", "crayon", "data_table", "dplyr", "forcats", "kableExtra", "magrittr", "pillar", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "tacmagic": {
@@ -117817,6 +121855,12 @@
       "sha256": "09w9lkqhxdb26fvrsb8n16601kqpr2smplipx3lj6cdgbyhb1hqz",
       "depends": ["MASS", "baseline", "broom", "colorRamps", "data_table", "deSolve", "devEMF", "minpack_lm", "pracma", "segmented", "sfsmisc", "smoother"]
     },
+    "talkr": {
+      "name": "talkr",
+      "version": "0.1.3",
+      "sha256": "1pf45vhp0jnqxja16fgng5jbxq8dgkl6yi89vgvs1vqqmsjd1br7",
+      "depends": ["cowplot", "dplyr", "ggplot2", "ggthemes", "knitr", "stringr", "tidyr", "tidyselect"]
+    },
     "tame": {
       "name": "tame",
       "version": "0.0.1",
@@ -117841,6 +121885,12 @@
       "sha256": "0v86xn5rvr6c74cqhiwfxgfb4mizqlf5bqc51870na28i2ariaap",
       "depends": ["dplyr"]
     },
+    "tapLock": {
+      "name": "tapLock",
+      "version": "0.2.0",
+      "sha256": "0ks57nwdhxgvc81a312m0jvqqj3xjd7f72szn4pnfj3qn44x2z6s",
+      "depends": ["curl", "glue", "httr2", "jose", "lubridate", "promises", "purrr", "shiny", "stringr", "tower"]
+    },
     "tapkee": {
       "name": "tapkee",
       "version": "1.2",
@@ -117855,8 +121905,8 @@
     },
     "tarchetypes": {
       "name": "tarchetypes",
-      "version": "0.9.0",
-      "sha256": "0lb5y3rlm369szabmamhq8rrjh7ybngmd3av0jisi84bwdvrwhxk",
+      "version": "0.11.0",
+      "sha256": "1cvcry42dhfz08xqspg76biwq575qgwqxrz3k0c4v6i604317ldv",
       "depends": ["dplyr", "fs", "rlang", "secretbase", "targets", "tibble", "tidyselect", "vctrs", "withr"]
     },
     "tardis": {
@@ -117873,8 +121923,8 @@
     },
     "targets": {
       "name": "targets",
-      "version": "1.7.1",
-      "sha256": "1r4pg990nhmyg4i15qgqafvqas4vh5rvcki3iaff2hyrfdcmy6vy",
+      "version": "1.9.1",
+      "sha256": "1rqj2238jckigayl7i2vq9byjjvd074s9905ccf8xm9kn92mwic7",
       "depends": ["R6", "base64url", "callr", "cli", "codetools", "data_table", "igraph", "knitr", "ps", "rlang", "secretbase", "tibble", "tidyselect", "vctrs", "yaml"]
     },
     "tashu": {
@@ -117901,10 +121951,16 @@
       "sha256": "0lvnl2lqp16af4rkmijl47bx5xf17gpji21s0h8xxzpbxbmy3xwx",
       "depends": ["assertthat", "colt", "crayon", "data_table", "magrittr", "openxlsx", "stringi", "withr"]
     },
+    "tatooheene": {
+      "name": "tatooheene",
+      "version": "0.19.0",
+      "sha256": "07f7jv4nq4r45bv7816d8y6br9rh27msygxyzpg4y7h1153sqxxn",
+      "depends": ["assertthat", "dplyr", "tidyr"]
+    },
     "tau": {
       "name": "tau",
-      "version": "0.0-25",
-      "sha256": "144fpmxzwr7jn8l6mpma2w835y89vwih476vxkh7jx4m6fkd88pz",
+      "version": "0.0-26",
+      "sha256": "00pwc479a8d0clvqxq1byzv2j54mlr3mmxhza0knrmg4dlwwz26v",
       "depends": []
     },
     "tauProcess": {
@@ -117937,18 +121993,6 @@
       "sha256": "035jzz1dk1icxs9mbd6q091ljf1lalr0wwbcz6a90avwyqphjjx3",
       "depends": ["contentid", "thor"]
     },
-    "taxize": {
-      "name": "taxize",
-      "version": "0.9.100",
-      "sha256": "0afdjcwkkpkc5kgk558jccnw6jzs6mswd4i86c316pgb8py7irg2",
-      "depends": ["R6", "ape", "bold", "cli", "conditionz", "crayon", "crul", "data_table", "foreach", "jsonlite", "natserv", "phangorn", "ritis", "rotl", "rredlist", "tibble", "wikitaxa", "worrms", "xml2", "zoo"]
-    },
-    "taxizedb": {
-      "name": "taxizedb",
-      "version": "0.3.1",
-      "sha256": "157xpbmqp3l0blf6n7cb0qswj12v39rhvx0zkbrc2w73g601naj5",
-      "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "hoardr", "magrittr", "readr", "rlang", "tibble"]
-    },
     "taxlist": {
       "name": "taxlist",
       "version": "0.3.0",
@@ -118035,8 +122079,8 @@
     },
     "tcl": {
       "name": "tcl",
-      "version": "0.2.0",
-      "sha256": "0n735xyl0fr3zgigw68xpy1ky3rfd2djwg9qhgbgif0cvgrrki1n",
+      "version": "0.2.1",
+      "sha256": "0mawx6ynpjfbqaq53l61rq61wmiqhsgg428aivraiycyyvbqnr59",
       "depends": ["MASS", "Matrix", "eRm", "lattice", "ltm", "numDeriv", "psychotools", "rlang"]
     },
     "tcltk2": {
@@ -118047,21 +122091,21 @@
     },
     "tclust": {
       "name": "tclust",
-      "version": "2.0-4",
-      "sha256": "0y05aqpmal7ky33hs8n1phai94d7f48ich43jvy4m5wbfxkp2rm6",
-      "depends": ["MASS", "Rcpp", "RcppArmadillo", "doParallel", "foreach"]
+      "version": "2.0-5",
+      "sha256": "1gx8avqpy5m69h5a3pxy23dwnvy5pbi2ih6sxacs4lmsahpivj0p",
+      "depends": ["MASS", "Rcpp", "RcppArmadillo", "doParallel", "ellipsis", "foreach"]
     },
     "tcpl": {
       "name": "tcpl",
-      "version": "3.1.0",
-      "sha256": "0s35j9ky49d2f58hg93a47l6j855vm95a3qzwq3i8wd0p2zh1x7b",
-      "depends": ["DBI", "RColorBrewer", "RMariaDB", "data_table", "dplyr", "ggplot2", "gridExtra", "numDeriv", "plotly", "sqldf", "stringr", "tcplfit2", "tidyr"]
+      "version": "3.2.0",
+      "sha256": "0ah6yb7pi7h4hkkmp475p84dsaqnq9ni5cvwjy8j8pqak4g4w1nz",
+      "depends": ["DBI", "RColorBrewer", "RMariaDB", "ctxR", "data_table", "dplyr", "ggplot2", "gridExtra", "numDeriv", "plotly", "rlang", "sqldf", "stringr", "tcplfit2", "tidyr"]
     },
     "tcplfit2": {
       "name": "tcplfit2",
-      "version": "0.1.6",
-      "sha256": "1znhma87nyy36m3viyh80m6gygqh4iwwh1xj0nw6wh88qal4935p",
-      "depends": ["RColorBrewer", "numDeriv", "stringr"]
+      "version": "0.1.7",
+      "sha256": "0ay9lylizr91piif5gynykp8mnw59sy3sqjmilrbp6r53f8w33cc",
+      "depends": ["RColorBrewer", "ggplot2", "numDeriv", "reshape2", "stringr"]
     },
     "td": {
       "name": "td",
@@ -118149,8 +122193,8 @@
     },
     "teal_logger": {
       "name": "teal.logger",
-      "version": "0.2.0",
-      "sha256": "1kji87sajwh06r2gqbj6gyg7q4kcw6am9cf2clwr39qg9srq2lri",
+      "version": "0.3.0",
+      "sha256": "05841x1g48av438hja6x6vd2wdzx385qnxyjp2v9x2aqhf2492cq",
       "depends": ["glue", "lifecycle", "logger", "shiny", "withr"]
     },
     "teal_modules_clinical": {
@@ -118209,9 +122253,9 @@
     },
     "tectonicr": {
       "name": "tectonicr",
-      "version": "0.3.2",
-      "sha256": "0w2pg7b3bk4vc72aw2n7hcp47aq7a25l41m9yh3x3a6ssnzcg350",
-      "depends": ["RColorBrewer", "boot", "dplyr", "ggplot2", "sf", "smoothr", "spatstat_explore", "spatstat_geom", "spatstat_univar", "spatstat_utils", "terra", "tidyr", "viridis", "zoo"]
+      "version": "0.4.4",
+      "sha256": "11avniwd068yrdg78fa3j01fy9y0gqldvkdnv3nz6pj6m5h3nj8k",
+      "depends": ["RColorBrewer", "boot", "circular", "dplyr", "ggplot2", "sf", "smoothr", "spatstat_explore", "spatstat_geom", "spatstat_univar", "spatstat_utils", "terra", "tidyr", "viridis", "zoo"]
     },
     "teda": {
       "name": "teda",
@@ -118287,9 +122331,9 @@
     },
     "templateICAr": {
       "name": "templateICAr",
-      "version": "0.6.4",
-      "sha256": "15f2bv4vcsnqcb2rnpa1ylhxj8a511ab3mil3b8n9icffpzgahy0",
-      "depends": ["Matrix", "Rcpp", "RcppEigen", "SQUAREM", "abind", "excursions", "expm", "fMRItools", "ica", "matrixStats", "pesel"]
+      "version": "0.9.1",
+      "sha256": "19273x2z6shyd737zx65jwfxqi21p49gszkvbfgcvf6d9c0y90ri",
+      "depends": ["Matrix", "SQUAREM", "abind", "fMRIscrub", "fMRItools", "foreach", "ica", "matrixStats", "pesel"]
     },
     "templates": {
       "name": "templates",
@@ -118341,14 +122385,14 @@
     },
     "tensorBSS": {
       "name": "tensorBSS",
-      "version": "0.3.8",
-      "sha256": "1chgkdshjpxzy0cxkgjzpr5k4v2hyad1vchrxyqhsj9isfic2581",
+      "version": "0.3.9",
+      "sha256": "01w7bv7cnbjy3v7i49337gfwdmsqijp5jzf4w51ii3wpvvgx4935",
       "depends": ["ICtest", "JADE", "Rcpp", "RcppArmadillo", "abind", "fICA", "ggplot2", "tensor", "tsBSS"]
     },
     "tensorEVD": {
       "name": "tensorEVD",
-      "version": "0.1.3",
-      "sha256": "0gqcnigv5hwp955q21ms7xgn30926yqi8bg8vnc409jp9mz5km8a",
+      "version": "0.1.4",
+      "sha256": "0gzl02y4zwirlk07b7aavrz17djk5qqbgsfsh00qbj8zisf6fjkk",
       "depends": []
     },
     "tensorMiss": {
@@ -118389,8 +122433,8 @@
     },
     "tergm": {
       "name": "tergm",
-      "version": "4.2.0",
-      "sha256": "0sfszgvm38y2j0j6hnwg2llf6djgxbw0ibq6cxv6blf4q9na5xfw",
+      "version": "4.2.1",
+      "sha256": "1mv01rhd6ddsfcnzrv0lcb982fqswmzs932m23snpm76a11w074a",
       "depends": ["MASS", "coda", "ergm", "ergm_multi", "network", "networkDynamic", "nlme", "purrr", "robustbase", "statnet_common"]
     },
     "tergmLite": {
@@ -118413,22 +122457,28 @@
     },
     "tern": {
       "name": "tern",
-      "version": "0.9.5",
-      "sha256": "0pmx2f9xjw463jnnbdbpvlwjaq5c04lry8iavisxniwshr5piqfm",
+      "version": "0.9.6",
+      "sha256": "1psvwx3ylwxdd2v5li8c9ymc4a303gci0b9k4bh4wd2nbikb4wfl",
       "depends": ["MASS", "Rdpack", "broom", "car", "checkmate", "cowplot", "dplyr", "emmeans", "forcats", "formatters", "ggplot2", "gridExtra", "gtable", "labeling", "lifecycle", "magrittr", "rlang", "rtables", "scales", "survival", "tibble", "tidyr"]
     },
     "tern_gee": {
       "name": "tern.gee",
-      "version": "0.1.4",
-      "sha256": "03znf66m3alai8n75g9sxl47wsnai6kgav8pm28zk3nimcx0b0bw",
+      "version": "0.1.5",
+      "sha256": "0z1mkr1bydx9r0wq70l35s92qh2wk059l18s7sixgchlm8d8a8qr",
       "depends": ["checkmate", "emmeans", "formatters", "geeasy", "geepack", "nlme", "rtables", "tern"]
     },
     "tern_mmrm": {
       "name": "tern.mmrm",
-      "version": "0.3.1",
-      "sha256": "1jklh18fmhcjpkp85cpf4q1xcgidp8rr9py5qfns2iwkac530sdn",
+      "version": "0.3.2",
+      "sha256": "0xw0ikqi352sg8nvh1g0pmychhagq6lzvawqv25qvb66mw5ayhpc",
       "depends": ["checkmate", "cowplot", "dplyr", "emmeans", "formatters", "generics", "ggplot2", "lifecycle", "magrittr", "mmrm", "parallelly", "rlang", "rtables", "tern", "tidyr"]
     },
+    "tern_rbmi": {
+      "name": "tern.rbmi",
+      "version": "0.1.4",
+      "sha256": "1z9jl7agfhrvbjpxb80mrlpn8xhavzlkywwsfdnn1fhb1n4yapzy",
+      "depends": ["broom", "checkmate", "formatters", "lifecycle", "magrittr", "rbmi", "rtables", "tern"]
+    },
     "ternvis": {
       "name": "ternvis",
       "version": "1.2",
@@ -118437,8 +122487,8 @@
     },
     "terra": {
       "name": "terra",
-      "version": "1.7-78",
-      "sha256": "0zjb5m5nh1r307g9lm5s6va5hsvmy4b06c7pznp724waknvmd2b5",
+      "version": "1.8-5",
+      "sha256": "0bjzinfgfhf95nsmn0xf5ivfvj28vf8q2jbkasw1cygcwkjhypmh",
       "depends": ["Rcpp"]
     },
     "terrainmeshr": {
@@ -118461,14 +122511,14 @@
     },
     "tesselle": {
       "name": "tesselle",
-      "version": "1.4.0",
-      "sha256": "10ahssk9qaj7a0x82364cdqigx8af1vrxvnm2z44x7j688mc17cg",
+      "version": "1.5.0",
+      "sha256": "0h7znhyjy80040irxwyk1pf1sgvhf7mwfjs4wr5mqnqi7gx3a71c",
       "depends": ["dimensio", "folio", "isopleuros", "kairos", "khroma", "nexus", "tabula"]
     },
     "tesseract": {
       "name": "tesseract",
-      "version": "5.2.1",
-      "sha256": "1zhpl6pbi7gwwc9y1d8cd7hb21ljcs561lyysjva4cfmqm0sdazz",
+      "version": "5.2.2",
+      "sha256": "0mbsa1djfmx1c6hrxs14wdzv0kqc56dlr3yzsij2d0vnjgyjrhis",
       "depends": ["Rcpp", "curl", "digest", "pdftools", "rappdirs"]
     },
     "test2norm": {
@@ -118479,8 +122529,8 @@
     },
     "testCompareR": {
       "name": "testCompareR",
-      "version": "1.0.3",
-      "sha256": "09pfdnc0hfaj8f3vgsprm5pjlwygliflm40dk3cnr71v89ihddxg",
+      "version": "1.1.1",
+      "sha256": "0aq7k964r14pgccwzxpc3kc8ahwhj1g60rr8naqjwhpp6yfjrf6d",
       "depends": []
     },
     "testDriveR": {
@@ -118545,8 +122595,8 @@
     },
     "testthat": {
       "name": "testthat",
-      "version": "3.2.1.1",
-      "sha256": "1xz94i0r62lslyqya8gz6i2r100wi26y5c2822v2i7lkflwwx1fp",
+      "version": "3.2.2",
+      "sha256": "139hrfbk0dmjfzz76x4ina0ayg2iwxak6lzrrkh9a5afz9crh1vd",
       "depends": ["R6", "brio", "callr", "cli", "desc", "digest", "evaluate", "jsonlite", "lifecycle", "magrittr", "pkgload", "praise", "processx", "ps", "rlang", "waldo", "withr"]
     },
     "testthatmulti": {
@@ -118569,9 +122619,9 @@
     },
     "tetRys": {
       "name": "tetRys",
-      "version": "1.1",
-      "sha256": "0xqvkr6lick8isykgdpb9bmag6w19br2k6w26j8zlwa2kf84hw85",
-      "depends": ["audio"]
+      "version": "1.2",
+      "sha256": "0inbkdlw1dra4yqg46rf331jdgxj34647c3501sw43gqnjmx4ynj",
+      "depends": ["audio", "tuneR"]
     },
     "tetraclasse": {
       "name": "tetraclasse",
@@ -118605,9 +122655,9 @@
     },
     "texor": {
       "name": "texor",
-      "version": "1.3.0",
-      "sha256": "12sjrxg82ynjs3s4mah5mhm011d9qmmv1s10kbna69n84j4a6vlc",
-      "depends": ["cli", "logger", "pdftools", "rebib", "rjtools", "rmarkdown", "stringr", "tinytex", "whisker", "xfun", "yaml"]
+      "version": "1.5.3",
+      "sha256": "1d62c35faq3hjgdc750pvrinx33j7350b10w5mkwih3gxwfm55g3",
+      "depends": ["cli", "desc", "logger", "pdftools", "rebib", "rjtools", "rmarkdown", "stringr", "tinytex", "whisker", "xfun", "yaml"]
     },
     "texreg": {
       "name": "texreg",
@@ -118617,9 +122667,9 @@
     },
     "text": {
       "name": "text",
-      "version": "1.2.3",
-      "sha256": "0mgjc9yjrb3y1avzdqzx01zbdy1sl7glfgv2yvjrxkw3lw9lwjlb",
-      "depends": ["cowplot", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "magrittr", "overlapping", "parsnip", "purrr", "recipes", "reticulate", "rlang", "rsample", "stringi", "tibble", "tidyr", "tune", "workflows", "yardstick"]
+      "version": "1.3.0",
+      "sha256": "1q7kpmc27jjq54xsqmvn34pf6nmmx9aps7mxvkf7b1bdlgjs5csj",
+      "depends": ["cowplot", "dplyr", "furrr", "future", "ggplot2", "ggrepel", "magrittr", "parsnip", "purrr", "recipes", "reticulate", "rlang", "rsample", "stringi", "tibble", "tidyr", "topics", "tune", "workflows", "yardstick"]
     },
     "text_alignment": {
       "name": "text.alignment",
@@ -118657,6 +122707,12 @@
       "sha256": "0sjlvp4zhzwc0ai7626fpw3ws8xv0xhl8gv8mrk24lrpk5nhin2h",
       "depends": ["Matrix", "R6", "Rcpp", "data_table", "digest", "lgr", "mlapi", "rsparse", "stringi"]
     },
+    "textAnnotatoR": {
+      "name": "textAnnotatoR",
+      "version": "0.1.4",
+      "sha256": "113lmlww135gwv6l3230vfh8vgwfhiw96inlyanwwc13bhq331dk",
+      "depends": ["DT", "data_tree", "jsonlite", "magrittr", "readtext", "shiny", "shinyFiles", "shinydashboard", "shinyjs"]
+    },
     "textBoxPlacement": {
       "name": "textBoxPlacement",
       "version": "1.0",
@@ -118683,8 +122739,8 @@
     },
     "textcat": {
       "name": "textcat",
-      "version": "1.0-8",
-      "sha256": "17kl76m6065ci84p4ii7fxhwg1fckwf8690m71w9rbkbax3h2rfb",
+      "version": "1.0-9",
+      "sha256": "1pr5fyhwgkf4yqkgqid8pk3rq3b3xlc8h45a7phz3fggw0nzixnw",
       "depends": ["slam", "tau"]
     },
     "textclean": {
@@ -118747,6 +122803,12 @@
       "sha256": "1ag2h365zsx0fxbl05s2yfhf1q13p40akvbqg4qwsb5ynh2a56bf",
       "depends": ["Matrix", "data_table", "lattice"]
     },
+    "textpress": {
+      "name": "textpress",
+      "version": "1.0.0",
+      "sha256": "1wxsqgpqrcwr3p3w2csq3g9312dfnv6nfygbirs3l12j4pr3aykj",
+      "depends": ["Matrix", "data_table", "httr", "jsonlite", "lubridate", "pbapply", "rvest", "stringi", "stringr", "xml2"]
+    },
     "textrank": {
       "name": "textrank",
       "version": "0.3.1",
@@ -118785,8 +122847,8 @@
     },
     "textshaping": {
       "name": "textshaping",
-      "version": "0.4.0",
-      "sha256": "0ylx4fdvm64cxcy62q84in3nrj7q8r7mvd8vwq6mcy5jddw41s9m",
+      "version": "0.4.1",
+      "sha256": "07ihnnwdf16nj682c8jdwk3fb70fmssqipa0ykrqz53ksvr5x2i3",
       "depends": ["cpp11", "lifecycle", "systemfonts"]
     },
     "textstem": {
@@ -118905,15 +122967,15 @@
     },
     "tfrmt": {
       "name": "tfrmt",
-      "version": "0.1.2",
-      "sha256": "19ymfvz9pdlrgz2z6mnwz6w4wk7v3mj1pnfzddsy997ii4qh8y5k",
+      "version": "0.1.3",
+      "sha256": "1hjjxagcmr3rrg105mbnhddajicm0q8vxgzq72f8gkf5yhsbi9w5",
       "depends": ["dplyr", "forcats", "ggplot2", "glue", "gt", "jsonlite", "magrittr", "purrr", "rlang", "stringi", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "tfrmtbuilder": {
       "name": "tfrmtbuilder",
-      "version": "0.0.6",
-      "sha256": "0c5x0sva90q7ghfz64fjy4w83a549ism6hwl6a1j4j81l9w6p8f7",
-      "depends": ["DT", "bslib", "dplyr", "fontawesome", "forcats", "gt", "purrr", "rio", "rlang", "shiny", "shinyAce", "shinyFeedback", "shinyWidgets", "shinycssloaders", "shinyjs", "sortable", "stringr", "tfrmt", "tidyr", "webshot2"]
+      "version": "0.1.0",
+      "sha256": "010vb839fkzj17mivyxjd3vbk7jhm2wrrdk7s7giy57dwmcyql5c",
+      "depends": ["DT", "bslib", "dplyr", "fontawesome", "forcats", "gt", "purrr", "rio", "rlang", "shiny", "shinyAce", "shinyFeedback", "shinyWidgets", "shinycssloaders", "shinyjs", "sortable", "stringr", "tfrmt", "webshot2"]
     },
     "tfruns": {
       "name": "tfruns",
@@ -118947,8 +123009,8 @@
     },
     "tgp": {
       "name": "tgp",
-      "version": "2.4-22.1",
-      "sha256": "1jf4mr59qp169z00pxb4kc0484mg73hgcyajg9hisdxl02qs1m4r",
+      "version": "2.4-23",
+      "sha256": "074d2c88ydgmggz24hqkxb8sqvbcgf5d32dhcxwa79snv8br5aqd",
       "depends": ["maptree"]
     },
     "tgram": {
@@ -118959,8 +123021,8 @@
     },
     "tgstat": {
       "name": "tgstat",
-      "version": "2.3.27",
-      "sha256": "0scljimskda5hinkb4y5va9c9qlqwf6k6zrm20bjk133710qsscb",
+      "version": "2.3.28",
+      "sha256": "0gn7xpbl7y86n19y8jvw00m03p3aff78yv2g62yp96bi7qygaq2a",
       "depends": []
     },
     "tgver": {
@@ -118989,14 +123051,14 @@
     },
     "theft": {
       "name": "theft",
-      "version": "0.6.1",
-      "sha256": "0fapqgbr3mnag8nvciz6cv7i0xadj8madjzqrd67if3z37afhn0p",
+      "version": "0.6.3",
+      "sha256": "03ppazjwjg30a01nkawxg8bb2gzv7qnkbav5c25allsbw8gfbshh",
       "depends": ["R_matlab", "Rcatch22", "dplyr", "fabletools", "feasts", "purrr", "reticulate", "rlang", "tibble", "tidyr", "tsfeatures", "tsibble"]
     },
     "theftdlc": {
       "name": "theftdlc",
-      "version": "0.1.0",
-      "sha256": "0zv9ihzs41dk4q4wsfyi2v6g9z8gglak17l71bhvqs207rl923d1",
+      "version": "0.1.2",
+      "sha256": "0gc5xfizqdljkg4cqz6a0zp981804sfcjd07zrqc8pkjvq8489j8",
       "depends": ["MASS", "Rtsne", "broom", "correctR", "dplyr", "e1071", "ggplot2", "janitor", "mclust", "normaliseR", "purrr", "reshape2", "rlang", "scales", "theft", "tibble", "tidyr", "umap"]
     },
     "theiaR": {
@@ -119049,14 +123111,14 @@
     },
     "this_path": {
       "name": "this.path",
-      "version": "2.5.0",
-      "sha256": "0ickm26sqlgi6kz8vh92408l04brxqznwrrmhcs2pvk2czj6dr0p",
+      "version": "2.6.0",
+      "sha256": "193a97z3v7zjvdj92nwl6j2s3fn9zakmcyd85cxa1v7qlygm4y51",
       "depends": []
     },
     "thor": {
       "name": "thor",
-      "version": "1.1.5",
-      "sha256": "1bpcyzw5xwl4vdld7ysrychcz35lz8g8qhpq0ca3bkkihj62v04r",
+      "version": "1.1.6",
+      "sha256": "12gpqs02gh4zvrxh862s64ba5shp4h30vddgplf67qzd8sijmx5q",
       "depends": ["R6", "storr"]
     },
     "thorn": {
@@ -119071,6 +123133,12 @@
       "sha256": "1323hgd7id4q1g88bczvnghdlb3g2vmywhij0f98ghj0a0ip6v00",
       "depends": ["R6", "httr", "magrittr", "rlang", "xml2"]
     },
+    "threeBrain": {
+      "name": "threeBrain",
+      "version": "1.2.0",
+      "sha256": "113lbz8h6vrqbg3ppqhj8k400hhhmk8a4v8f1hdwhc1z48hjqbks",
+      "depends": ["R6", "digest", "dipsaus", "freesurferformats", "gifti", "htmlwidgets", "jsonlite", "knitr", "oro_nifti", "png", "servr", "shiny", "stringr", "xml2"]
+    },
     "threejs": {
       "name": "threejs",
       "version": "0.3.3",
@@ -119133,8 +123201,8 @@
     },
     "tibbletime": {
       "name": "tibbletime",
-      "version": "0.1.8",
-      "sha256": "18a63vipcw95yk37r490a3a4xag59v7475bch2dizq7nqhfc5wfn",
+      "version": "0.1.9",
+      "sha256": "1zimvdan1mch7hb57hnp2x9sps69i8p76hamji08rlrpfxb6rcgk",
       "depends": ["Rcpp", "assertthat", "dplyr", "glue", "hms", "lifecycle", "lubridate", "pillar", "purrr", "rlang", "tibble", "vctrs", "zoo"]
     },
     "tibblify": {
@@ -119143,6 +123211,12 @@
       "sha256": "165ygq6wf35siiml6dsm4hxqg5lndqhwh82cdwyfwnl829nbz9a7",
       "depends": ["cli", "lifecycle", "purrr", "rlang", "tibble", "tidyselect", "vctrs", "withr"]
     },
+    "tican": {
+      "name": "tican",
+      "version": "1.0.1",
+      "sha256": "0mh4x7qa8q5jgvf0zbdqmgv0qqj338b2878ngik98d5jz7iwy138",
+      "depends": []
+    },
     "tictactoe": {
       "name": "tictactoe",
       "version": "0.2.2",
@@ -119169,8 +123243,8 @@
     },
     "tidyBdE": {
       "name": "tidyBdE",
-      "version": "0.3.6",
-      "sha256": "0mvjv9qfb93mq8bn2mc8sphyppqw9pn0ia4jb5wvgakwbqs5gf3i",
+      "version": "0.3.8",
+      "sha256": "1ck1ah6nh6pa10x02iczllddnwzgff6qvwajrkkqri3jp8si9d0h",
       "depends": ["dplyr", "ggplot2", "readr", "scales", "tibble", "tidyr"]
     },
     "tidyCDISC": {
@@ -119223,8 +123297,8 @@
     },
     "tidyREDCap": {
       "name": "tidyREDCap",
-      "version": "1.1.1",
-      "sha256": "1k06bnxvq5k4j005h269n5ivxn1vr2i8nkdg048q8m7vmpanwz4m",
+      "version": "1.1.2",
+      "sha256": "12h1z0cs2lbni48y3bwgfj3z7wlkl1iid8ayni295fyz5lxa7bgq",
       "depends": ["REDCapR", "cli", "dplyr", "janitor", "labelVector", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs"]
     },
     "tidyRSS": {
@@ -119247,8 +123321,8 @@
     },
     "tidybayes": {
       "name": "tidybayes",
-      "version": "3.0.6",
-      "sha256": "146vmb3sf3ld6n20bbd8lj972g6xcclmisqsmnjq99jmg3hl8q3h",
+      "version": "3.0.7",
+      "sha256": "02i9113vp8va60057k024ad4daajq9cmsn9j9l9z0iq58cd4ik0w",
       "depends": ["arrayhelpers", "cli", "coda", "dplyr", "ggdist", "ggplot2", "magrittr", "posterior", "rlang", "tibble", "tidyr", "tidyselect", "vctrs", "withr"]
     },
     "tidybins": {
@@ -119271,10 +123345,16 @@
     },
     "tidycensus": {
       "name": "tidycensus",
-      "version": "1.6.5",
-      "sha256": "08pi8pzxvlprjii11xrfw1kyqpyvx9wh9zkcbw1zh77jxxp40imq",
+      "version": "1.6.7",
+      "sha256": "163l25li5smywz91ndcw2v7m7dcya309wkmb6pkjj7jqcyhlfv74",
       "depends": ["crayon", "dplyr", "httr", "jsonlite", "purrr", "rappdirs", "readr", "rlang", "rvest", "sf", "stringr", "tidyr", "tidyselect", "tigris", "units", "xml2"]
     },
+    "tidychangepoint": {
+      "name": "tidychangepoint",
+      "version": "0.0.1",
+      "sha256": "15wdwpglm6pxq3211crqsi0m047b4lwvlk8bnm4d01vpgq3dz2iq",
+      "depends": ["GA", "broom", "changepoint", "cli", "dplyr", "ggplot2", "lifecycle", "memoise", "patchwork", "purrr", "scales", "stringr", "tibble", "tidyr", "tsibble", "vctrs", "wbs", "xts", "zoo"]
+    },
     "tidycharts": {
       "name": "tidycharts",
       "version": "0.1.3",
@@ -119305,6 +123385,12 @@
       "sha256": "07izzm2ywdjs8z4yfkrrdy0mn54vqc3gnpiymgag8wkxsmxqpz64",
       "depends": ["GGally", "MASS", "MBESS", "car", "dplyr", "fastDummies", "forcats", "ggplot2", "glue", "lm_beta", "lubridate", "magrittr", "misty", "pillar", "purrr", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
+    "tidycountries": {
+      "name": "tidycountries",
+      "version": "0.1.0",
+      "sha256": "190yy49j3vxlv703ikrnrfl83kr5p9qrf8fkx7r8qr4bqraw99pg",
+      "depends": ["dplyr", "sf", "stringr"]
+    },
     "tidycwl": {
       "name": "tidycwl",
       "version": "1.0.7",
@@ -119361,14 +123447,14 @@
     },
     "tidyfinance": {
       "name": "tidyfinance",
-      "version": "0.3.0",
-      "sha256": "01vk9h6p4kk9qh07c8mhwk6267j6p05lblc74zmwxqcfblf0zymn",
-      "depends": ["dplyr", "lifecycle", "lubridate", "purrr", "rlang", "tidyr"]
+      "version": "0.4.3",
+      "sha256": "1ipny1zf02gqy23r0ac12f2cjay9n6myf76a9da7d8kghk68kvam",
+      "depends": ["cli", "dplyr", "lifecycle", "lubridate", "purrr", "rlang", "slider", "tibble", "tidyr"]
     },
     "tidyfit": {
       "name": "tidyfit",
-      "version": "0.7.1",
-      "sha256": "117x0cmrs0hhp0k4c2c6dx80jjvar7bfgipjzx5d977l4343fhx7",
+      "version": "0.7.2",
+      "sha256": "10zsyr7mimqp7pb7yb6lcs8p83s7fzn46pysswgp4bkz6kib4xl6",
       "depends": ["MASS", "broom", "crayon", "dials", "dplyr", "furrr", "generics", "magrittr", "progressr", "purrr", "rlang", "rsample", "tibble", "tidyr", "vctrs", "yardstick"]
     },
     "tidyformula": {
@@ -119379,20 +123465,20 @@
     },
     "tidyfst": {
       "name": "tidyfst",
-      "version": "1.7.9",
-      "sha256": "114wdgrcwkl5mpjxdilp51xc9qn4sa3qj5fclyz84s305hiaba6d",
+      "version": "1.8.1",
+      "sha256": "0zwp4vbvgmd65fjjdpdyvhj9zzvdjmg7wkh4y5sdazbabj75088p",
       "depends": ["data_table", "fst", "stringr"]
     },
     "tidyft": {
       "name": "tidyft",
-      "version": "0.5.7",
-      "sha256": "00qcsr2sx8fwyil384vgppx0q72qjrkj7h5nv4mdxdi8f9h6ph2r",
+      "version": "0.9.20",
+      "sha256": "144w36q4yrscdvv3jq7h6s6pklm3l4m5rv005hr1akvn9d7klcq9",
       "depends": ["data_table", "fst", "stringr"]
     },
     "tidygam": {
       "name": "tidygam",
-      "version": "0.2.0",
-      "sha256": "1m2lzmbvxflnyqf7m0waq0svgwhqh1snc2zn3n8wjh70lkzclpkx",
+      "version": "1.0.0",
+      "sha256": "0kw0x686zz9j6vyg76dwv8izy7cmzg1vf82m8aagi4y6bpbp49q4",
       "depends": ["cli", "dplyr", "ggplot2", "glue", "insight", "magrittr", "mgcv", "rlang", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "tidygapminder": {
@@ -119403,8 +123489,8 @@
     },
     "tidygate": {
       "name": "tidygate",
-      "version": "1.0.13",
-      "sha256": "1ighc3193ifvk3qisxinlgkw3p70ap64w7skspms648x7n89bb4a",
+      "version": "1.0.14",
+      "sha256": "1wfrcna9k67n23p1kyr7cc8illj6nvml2cxf0xb42i0fxlniyqb8",
       "depends": ["RColorBrewer", "dplyr", "ggplot2", "lifecycle", "magrittr", "plotly", "purrr", "rlang", "scales", "shiny", "stringr", "tibble", "tidyr", "viridis"]
     },
     "tidygenomics": {
@@ -119445,9 +123531,9 @@
     },
     "tidyhydat": {
       "name": "tidyhydat",
-      "version": "0.6.1",
-      "sha256": "0rcb3q17ckp7l7xrjf3r32dlnxm6ykwlk20w5h7amnc2vimjnir9",
-      "depends": ["DBI", "RSQLite", "cli", "crayon", "dbplyr", "dplyr", "httr", "lubridate", "rappdirs", "readr", "rlang", "tidyr"]
+      "version": "0.7.0",
+      "sha256": "16y5n5pi4lhn20dmxavis2nvfbzxqd21lixvr5gsaz6wb08z194n",
+      "depends": ["DBI", "RSQLite", "cli", "crayon", "dbplyr", "dplyr", "httr2", "lubridate", "rappdirs", "readr", "rlang", "tidyr"]
     },
     "tidyindex": {
       "name": "tidyindex",
@@ -119467,6 +123553,12 @@
       "sha256": "1i5nhb49g5sw5dwha7ia61yp5nnqi9bln35ij0smhrrfjwxz5djp",
       "depends": ["Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "RcppThread", "dplyr", "generics", "gtools", "mvrsquared", "rlang", "stringr", "tibble", "tidyr", "tidytext"]
     },
+    "tidyllm": {
+      "name": "tidyllm",
+      "version": "0.3.0",
+      "sha256": "0h6wisq34499l4bl5g8s8pxcq25x82lj5gms2fcwq9b474a9d4gl",
+      "depends": ["S7", "base64enc", "cli", "curl", "glue", "httr2", "jsonlite", "lifecycle", "lubridate", "pdftools", "png", "purrr", "rlang", "stringr", "tibble"]
+    },
     "tidylo": {
       "name": "tidylo",
       "version": "0.2.0",
@@ -119485,6 +123577,12 @@
       "sha256": "04lj7mjg9q72x19d9j4wqarp38w64b0klq8phsall82p0x2bg9pc",
       "depends": ["broom", "cli", "conflicted", "dials", "dplyr", "ggplot2", "hardhat", "infer", "modeldata", "parsnip", "purrr", "recipes", "rlang", "rsample", "rstudioapi", "tibble", "tidyr", "tune", "workflows", "workflowsets", "yardstick"]
     },
+    "tidymodlr": {
+      "name": "tidymodlr",
+      "version": "1.0.0",
+      "sha256": "1zcrkhxpx69hkqq433i18xk8pdfw01y6p6zkcifi45h7jnhkg4vj",
+      "depends": ["FactoMineR", "R6", "corrr", "dplyr", "tidyr", "tm"]
+    },
     "tidymv": {
       "name": "tidymv",
       "version": "3.4.2",
@@ -119505,9 +123603,15 @@
     },
     "tidyplate": {
       "name": "tidyplate",
-      "version": "1.1.0",
-      "sha256": "0gkjncv23cq4mmlr1s9vsddy3dm1gkg6ch8sk8j9shhs5cv011zz",
-      "depends": ["dplyr", "janitor", "purrr", "readr", "readxl", "rlang", "tibble", "tidyr"]
+      "version": "2.2.0",
+      "sha256": "14jiw2mzghl3d7id2v5yzl151psmjrg7wcmw6z759bqavxxq9wic",
+      "depends": ["data_table", "lifecycle", "openxlsx", "readxl", "rlang", "tibble"]
+    },
+    "tidyplots": {
+      "name": "tidyplots",
+      "version": "0.2.0",
+      "sha256": "07qkywn6nmd1m6h2npg0grysi8rd5rip3ivvj5cfs8cqjk7s9zin",
+      "depends": ["Hmisc", "cli", "dplyr", "forcats", "ggbeeswarm", "ggplot2", "ggpubr", "ggrastr", "ggrepel", "glue", "htmltools", "lifecycle", "patchwork", "purrr", "rlang", "scales", "stringr", "tidyr", "tidyselect"]
     },
     "tidyplus": {
       "name": "tidyplus",
@@ -119517,8 +123621,8 @@
     },
     "tidypmc": {
       "name": "tidypmc",
-      "version": "1.7",
-      "sha256": "1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq",
+      "version": "2.0",
+      "sha256": "03zs394raq0igpps5y2bvzs0kvlcsxrv1njp7ardglan9jnfvmjc",
       "depends": ["dplyr", "readr", "stringr", "tibble", "tokenizers", "xml2"]
     },
     "tidyposterior": {
@@ -119529,15 +123633,15 @@
     },
     "tidypredict": {
       "name": "tidypredict",
-      "version": "0.5",
-      "sha256": "1h05gm6fwjh6v9qqi9jbislf008h7d50k003qymb0x9gz6p75qgy",
-      "depends": ["dplyr", "generics", "knitr", "purrr", "rlang", "tibble", "tidyr"]
+      "version": "0.5.1",
+      "sha256": "0c33g58glc4j781fbvykgw3qbxlf5wc8x6gijqfcnyk42qkz9iib",
+      "depends": ["cli", "dplyr", "generics", "knitr", "purrr", "rlang", "tibble", "tidyr"]
     },
     "tidyquant": {
       "name": "tidyquant",
-      "version": "1.0.7",
-      "sha256": "1pb7d6x2b8kf16aah1n9kq4il4kp54lcvzd27r5viwdbgvk1sr4h",
-      "depends": ["PerformanceAnalytics", "Quandl", "TTR", "alphavantager", "curl", "dplyr", "ggplot2", "httr", "jsonlite", "lazyeval", "lubridate", "magrittr", "purrr", "quantmod", "readr", "readxl", "riingo", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "tidyverse", "timeDate", "timetk", "xts"]
+      "version": "1.0.9",
+      "sha256": "1caazsqwf505i7anhn8cr48c8x26msvg4bwpj3i412b8rim25xx7",
+      "depends": ["PerformanceAnalytics", "TTR", "cli", "curl", "dplyr", "ggplot2", "httr", "httr2", "lazyeval", "lubridate", "magrittr", "purrr", "quantmod", "readr", "readxl", "rlang", "stringr", "tibble", "tidyr", "timeDate", "timetk", "xts", "zoo"]
     },
     "tidyquery": {
       "name": "tidyquery",
@@ -119595,8 +123699,8 @@
     },
     "tidysq": {
       "name": "tidysq",
-      "version": "1.1.3",
-      "sha256": "1k4ws5zymrc93rlh8118xxfgjdwr7g99cyhzjp34abcsip1c3g21",
+      "version": "1.2.2",
+      "sha256": "1v92jpifcjh51igh3izr7r0x0dz7xmc6mx6rz0xndylgi4418wcf",
       "depends": ["Rcpp", "checkmate", "cli", "crayon", "dplyr", "pillar", "testthat", "tibble", "vctrs"]
     },
     "tidystats": {
@@ -119617,16 +123721,10 @@
       "sha256": "1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4",
       "depends": ["attempt", "rlang", "stringdist", "tibble"]
     },
-    "tidysynth": {
-      "name": "tidysynth",
-      "version": "0.2.0",
-      "sha256": "1arvjv3w6my47xwrzxrnpb2npskhqb9xmqhszgrxcqa55s1x6p15",
-      "depends": ["dplyr", "forcats", "ggplot2", "kernlab", "magrittr", "optimx", "rgenoud", "rlang", "tibble", "tidyr"]
-    },
     "tidytable": {
       "name": "tidytable",
-      "version": "0.11.1",
-      "sha256": "0mhwfa8zaljnsxm5bkhkfjy3v5a4hlf55qjvy840rgyyw06vfw06",
+      "version": "0.11.2",
+      "sha256": "12h6znlsdj8pkb0c7f1gl8fimkwyhy0shica3p2lxlkh31wpygqz",
       "depends": ["data_table", "glue", "lifecycle", "magrittr", "pillar", "rlang", "tidyselect", "vctrs"]
     },
     "tidyterra": {
@@ -119655,9 +123753,9 @@
     },
     "tidytransit": {
       "name": "tidytransit",
-      "version": "1.6.1",
-      "sha256": "0n5iy7cpj94r396rf6rzx2n258836rjf7906hrdj58rgc28qhacm",
-      "depends": ["data_table", "digest", "dplyr", "geodist", "gtfsio", "hms", "rlang", "sf"]
+      "version": "1.7.0",
+      "sha256": "174h4ly85bn7c4sr9nnzdfybnm2nm33hw8rvk6j9xwj78bg5m0k7",
+      "depends": ["data_table", "digest", "dplyr", "geodist", "gtfsio", "hms", "jsonlite", "rlang", "sf"]
     },
     "tidytreatment": {
       "name": "tidytreatment",
@@ -119673,9 +123771,9 @@
     },
     "tidytuesdayR": {
       "name": "tidytuesdayR",
-      "version": "1.0.3",
-      "sha256": "0n6pl2n3gv3f1idqfgb5w2pr71za551kgc4whxda4dwzl5ylkc0v",
-      "depends": ["httr", "jsonlite", "lubridate", "magrittr", "purrr", "readr", "readxl", "rstudioapi", "rvest", "usethis", "xml2"]
+      "version": "1.1.2",
+      "sha256": "0ja78nngnqcdnhnkcrxgnyychf83izn88yv5b2kpif72qdz8qny3",
+      "depends": ["cli", "gh", "glue", "jsonlite", "lubridate", "magrittr", "purrr", "readr", "rlang", "rvest", "tidyr", "usethis", "xml2"]
     },
     "tidyverse": {
       "name": "tidyverse",
@@ -119685,10 +123783,16 @@
     },
     "tidyvpc": {
       "name": "tidyvpc",
-      "version": "1.5.1",
-      "sha256": "1i7dsmji1kjjs7lncpdxg5kpy0r4rc9ylb197fnbgkkz8yxjb8q3",
+      "version": "1.5.2",
+      "sha256": "0wlq423mirs2jcjfb1bqxrl923dkwkswhj0ib08z3k8al4dq2y65",
       "depends": ["classInt", "cluster", "data_table", "egg", "fastDummies", "ggplot2", "magrittr", "mgcv", "quantreg", "rlang"]
     },
+    "tidywater": {
+      "name": "tidywater",
+      "version": "0.6.2",
+      "sha256": "1jjy2zk08n6bnsd3ppplxd3wsiv5zsfjdj32sh7abqrzj9zrv7jy",
+      "depends": ["dplyr", "furrr", "ggplot2", "ggrepel", "knitr", "magrittr", "purrr", "rlang", "tidyr"]
+    },
     "tidywikidatar": {
       "name": "tidywikidatar",
       "version": "0.5.9",
@@ -119769,8 +123873,8 @@
     },
     "tiledb": {
       "name": "tiledb",
-      "version": "0.29.0",
-      "sha256": "1fzmsgn9x4z5ya7rrb83nlwarjswbq5gpjb0lka0xldmdzl9f22j",
+      "version": "0.30.2",
+      "sha256": "0b6130y039ppc5b748rzhbivrd44z5rpbnxw8cqdfivfcbfxv734",
       "depends": ["Rcpp", "RcppInt64", "nanoarrow", "nanotime", "spdl"]
     },
     "tilegramsR": {
@@ -119787,8 +123891,8 @@
     },
     "tiler": {
       "name": "tiler",
-      "version": "0.3.1",
-      "sha256": "09xxfkbgjd9x27fjkbk1ady7sxz9lqkmaw5027xgakn65g9vmssz",
+      "version": "0.3.2",
+      "sha256": "052dv3lca6yr0d9i5ysgw8yazvv046z4j9ka588p7xmfvjhkwbig",
       "depends": ["png", "raster", "sp"]
     },
     "tilting": {
@@ -119823,8 +123927,14 @@
     },
     "timeDate": {
       "name": "timeDate",
-      "version": "4032.109",
-      "sha256": "0n5rzi3bb1wjpqcgpxcagjy815vy8ksjzpkkjzs3333yljyl2a20",
+      "version": "4041.110",
+      "sha256": "1rvi1h7jm02vnsrk9mm0fldymf7zyjkv1id6xvn1iwgb5psz2syf",
+      "depends": []
+    },
+    "timeEL": {
+      "name": "timeEL",
+      "version": "0.9.1",
+      "sha256": "1dwm3dk2pa7a9sbarjyavzkj2hpw08k8ljghl4ibjncwv9k0x9zq",
       "depends": []
     },
     "timeLineGraphics": {
@@ -119847,10 +123957,16 @@
     },
     "timeSeries": {
       "name": "timeSeries",
-      "version": "4032.109",
-      "sha256": "07vkppp9azbrn0lv1xhi4s3vpy4mglhysp7d250fl08b9rc4f32y",
+      "version": "4041.111",
+      "sha256": "0hwazbv91lcxcddas7hwyc86rzl5fbyw6mrpksbyb6025ivj8g85",
       "depends": ["timeDate"]
     },
+    "timeSeriesDataSets": {
+      "name": "timeSeriesDataSets",
+      "version": "0.1.0",
+      "sha256": "0wjsc72j7imm42w4s72qxh6z3d4clafv2xv1ala0gdz7n702732n",
+      "depends": []
+    },
     "timechange": {
       "name": "timechange",
       "version": "0.3.0",
@@ -119869,12 +123985,6 @@
       "sha256": "0cg3akp5clyh0jm2808n4glmvfb8pjfsrpiw8724q7zsx3mfhgff",
       "depends": ["mvtnorm"]
     },
-    "timeless": {
-      "name": "timeless",
-      "version": "0.2.3",
-      "sha256": "0wq98ngwn9ajgxmc1ybfgzmxr21jsvjqsc3crrkska7vpzxpjy11",
-      "depends": []
-    },
     "timelineS": {
       "name": "timelineS",
       "version": "0.1.1",
@@ -119883,8 +123993,8 @@
     },
     "timeordered": {
       "name": "timeordered",
-      "version": "1.0.0",
-      "sha256": "0gcf2mvqzqrqxf7qqfhvxb42y32vxaz5nc29vnyig1lh6bnywkhq",
+      "version": "1.0.1",
+      "sha256": "1ag58dk5b6fjdpcppn66vq9ybn4xz480whn14gq49fmjk9ci3s6m",
       "depends": ["igraph", "plyr"]
     },
     "timeperiodsR": {
@@ -119901,8 +124011,8 @@
     },
     "timereg": {
       "name": "timereg",
-      "version": "2.0.5",
-      "sha256": "1vzphh7hfkc65r61wms1dh58i3ng7340whqkw947yb4nyvmdvld0",
+      "version": "2.0.6",
+      "sha256": "1jscqask74l8hr68grjfvgm30v00aixf1459ws5s332l5brp7awb",
       "depends": ["lava", "numDeriv", "survival"]
     },
     "timeseriesdb": {
@@ -119965,6 +124075,12 @@
       "sha256": "02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3",
       "depends": ["chk"]
     },
+    "tintin": {
+      "name": "tintin",
+      "version": "0.2",
+      "sha256": "1pz6nfzd7vj2bhg5g2xzxnx98gd2l67ahjb75x74v84cxl5swsl9",
+      "depends": ["dplyr", "ggplot2", "magrittr", "rlang", "scales", "tidyr"]
+    },
     "tinyProject": {
       "name": "tinyProject",
       "version": "0.6.1",
@@ -119989,10 +124105,16 @@
       "sha256": "01pvnirma3wzfqnnz8zvyqajjyysjm3sd6813bgdhz199lcg7hhz",
       "depends": []
     },
+    "tinylens": {
+      "name": "tinylens",
+      "version": "0.1.0",
+      "sha256": "01p2z3xzsqvr74bmqdvjgx7jcdjckjnjvhfnkp0b3a694r8mj0pn",
+      "depends": ["S7", "rlang", "vctrs"]
+    },
     "tinyplot": {
       "name": "tinyplot",
-      "version": "0.2.0",
-      "sha256": "0cd934pzrfg49f1l4pm2g8r83h8zzid23brh2jyl5ydlmfks1zmy",
+      "version": "0.2.1",
+      "sha256": "04f2r3xm2knrlj4yrkpbcm6r2zvpyzryqi6c9184as200ms5shsp",
       "depends": []
     },
     "tinyscholar": {
@@ -120003,8 +124125,8 @@
     },
     "tinysnapshot": {
       "name": "tinysnapshot",
-      "version": "0.0.5",
-      "sha256": "1w41xcimj7p51v484vqkwlzjcv3667mibs2p830wd6r2aq7zadiy",
+      "version": "0.0.6",
+      "sha256": "15sg7pp8clx1kmq94v5j9sc4m0j9x9k3ap0m9078jdp7psi4av8w",
       "depends": ["diffobj", "magick", "tinytest"]
     },
     "tinyspotifyr": {
@@ -120015,8 +124137,8 @@
     },
     "tinytable": {
       "name": "tinytable",
-      "version": "0.3.0",
-      "sha256": "0ckqa4vl873939wvjalpyafi00dxigiy2219lcn9gr4nyxscpzsq",
+      "version": "0.6.1",
+      "sha256": "07ffil0s846sbqk1znr2qk2gc02hb99hri0c03nsbb7hcj7l5yz8",
       "depends": []
     },
     "tinytest": {
@@ -120033,8 +124155,8 @@
     },
     "tinytex": {
       "name": "tinytex",
-      "version": "0.52",
-      "sha256": "0fji3yca7qpxpzdd8hy55v0g40jny41qvhz8d64gwlnxkwxp2alk",
+      "version": "0.54",
+      "sha256": "1ypzj2zbjvqrpirv3lwzxgvxg0nj042awfyzfkhyafw1lgi4hlgs",
       "depends": ["xfun"]
     },
     "tinythemes": {
@@ -120087,8 +124209,8 @@
     },
     "tipsae": {
       "name": "tipsae",
-      "version": "1.0.2",
-      "sha256": "14x5g5qc1lnc2p0vkmf8vs7gkjlbkahgaf38j9q23xx8dizym6w9",
+      "version": "1.0.3",
+      "sha256": "1lpjygkk1syjji9hkj8fysmqhja2b5019c11xp9b3iyvnjkfg6z0",
       "depends": ["BH", "Rcpp", "RcppEigen", "RcppParallel", "Rdpack", "StanHeaders", "ggplot2", "ggpubr", "nlme", "rstan", "shiny", "sp"]
     },
     "tis": {
@@ -120165,8 +124287,8 @@
     },
     "tm": {
       "name": "tm",
-      "version": "0.7-14",
-      "sha256": "103n9m9vh1s1fn2wlab5qm4i1dx4wq0ffl7v69mwa6mvdklfw7ks",
+      "version": "0.7-15",
+      "sha256": "1ravd83xafkpzzs8ark8ijq6607jsnnqg6j983z8v5fqyr3jp9bw",
       "depends": ["BH", "NLP", "Rcpp", "slam", "xml2"]
     },
     "tm_plugin_alceste": {
@@ -120207,8 +124329,8 @@
     },
     "tm_plugin_mail": {
       "name": "tm.plugin.mail",
-      "version": "0.3-0",
-      "sha256": "02gbpdqi9cqk0na7ali1wwjapnf497hwv3k8mx354496pcrbi8m5",
+      "version": "0.3-1",
+      "sha256": "181ar4n7fp8babpigv72fsb02pvg45wi364h9nqyk5ijsyyf9fw4",
       "depends": ["NLP", "reticulate", "tm"]
     },
     "tm1r": {
@@ -120267,8 +124389,8 @@
     },
     "tmsens": {
       "name": "tmsens",
-      "version": "0.3.0",
-      "sha256": "0xdcmz2mqfb7agjgmkv4kgschsdlxqsjv5z30z8bpqxbi45x9ry0",
+      "version": "0.3.1",
+      "sha256": "10z4c5dzayhgf73zb64x7gy67j4xw17qmvyj44g9mgczppz4sadi",
       "depends": []
     },
     "tmt": {
@@ -120301,6 +124423,12 @@
       "sha256": "15nhk21x9yklpxnqmd6qblmh0g4p9065hkvy26gd8ppaz19law5s",
       "depends": ["Rcpp", "RcppArmadillo"]
     },
+    "tna": {
+      "name": "tna",
+      "version": "0.3.0",
+      "sha256": "0lcs2jv0zjnq6acym4llhg7ff4vycdlahg5mdffib55b2h6c93h7",
+      "depends": ["RColorBrewer", "checkmate", "cli", "colorspace", "dplyr", "ggplot2", "igraph", "qgraph", "rlang", "tibble", "tidyr"]
+    },
     "tnet": {
       "name": "tnet",
       "version": "3.0.16",
@@ -120315,9 +124443,9 @@
     },
     "tntpr": {
       "name": "tntpr",
-      "version": "1.0.3",
-      "sha256": "09vxsv5f5inl8pdlz4lap4zfry90lb58h3bypvj9grd2n75qxsrf",
-      "depends": ["cli", "dplyr", "extrafont", "formattable", "ggplot2", "janitor", "keyring", "labelled", "lubridate", "magrittr", "purrr", "readr", "rlang", "rstudioapi", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
+      "version": "1.2.1",
+      "sha256": "0qvga8f72ylh3rxqdsqq5y1b24f7ds96rbwsxf2nfqxi2cmsz47n",
+      "depends": ["Microsoft365R", "cli", "colorspace", "dplyr", "extrafont", "formattable", "ggplot2", "janitor", "keyring", "labelled", "lubridate", "purrr", "readr", "rlang", "rstudioapi", "scales", "stringr", "tibble", "tidyr", "tidyselect"]
     },
     "toOrdinal": {
       "name": "toOrdinal",
@@ -120327,8 +124455,8 @@
     },
     "toastui": {
       "name": "toastui",
-      "version": "0.3.3",
-      "sha256": "1m6l3acvsznhm22gvc9jjl8jnlxa3l6l6s42mdv04kwzw1qqm6xp",
+      "version": "0.3.4",
+      "sha256": "1pyrw9wnrnkfxdyjq5k8n4brk6l2mrhqdbqb3y1ayfnby82n154v",
       "depends": ["htmltools", "htmlwidgets", "magrittr", "phosphoricons", "rlang", "shiny", "shinyWidgets"]
     },
     "todor": {
@@ -120343,12 +124471,6 @@
       "sha256": "12fmj6h8vx8f46qhadgwcaq0cn55jwi8kvnci1hw7cld46f4s50l",
       "depends": ["assertthat", "cachem", "dplyr", "getPass", "glue", "httr", "jsonlite", "keyring", "lubridate", "magrittr", "memoise", "parsedate", "prettyunits", "purrr", "rappdirs", "rstudioapi"]
     },
-    "tok": {
-      "name": "tok",
-      "version": "0.1.3",
-      "sha256": "0grnqf0k8vlyfsy8nwaawbyd91l6j8kyvny3cnn8xjgws0pyslli",
-      "depends": ["R6", "cli"]
-    },
     "tokenbrowser": {
       "name": "tokenbrowser",
       "version": "0.1.5",
@@ -120429,8 +124551,8 @@
     },
     "topiclabels": {
       "name": "topiclabels",
-      "version": "0.1.0",
-      "sha256": "0x56bgm609xzx844j0qamyix3nr8ziqzj5rd33qgj023gfgrhg8i",
+      "version": "0.2.0",
+      "sha256": "1njmcbmk7d3yappvmavm1nd5xxqdjm3mikb1nfl2p93wqbsv86ik",
       "depends": ["checkmate", "httr", "jsonlite", "progress"]
     },
     "topicmodels": {
@@ -120445,11 +124567,11 @@
       "sha256": "06w2n1gswv268sgzm0nz14mmrahibnsgcxh7hcks3bmq9r8d9ba4",
       "depends": ["Matrix", "torch"]
     },
-    "topmodel": {
-      "name": "topmodel",
-      "version": "0.7.5",
-      "sha256": "1bhzjy2ja4953a5wx8s3cz3v0ip6lym193faqxxabxjklgbsp416",
-      "depends": []
+    "topics": {
+      "name": "topics",
+      "version": "0.21.0",
+      "sha256": "13s9lpsvqpzpcwwh426s331fv96vjx7bx7dsm9vx5n1mfqs7ni9w",
+      "depends": ["Matrix", "dplyr", "effsize", "ggplot2", "ggwordcloud", "mallet", "ngram", "purrr", "rJava", "readr", "rlang", "stopwords", "stringr", "textmineR", "tibble", "tidyr"]
     },
     "topoDistance": {
       "name": "topoDistance",
@@ -120583,6 +124705,12 @@
       "sha256": "1sbaf94ms03jw5bc04xf974zp7zgfdx9xv8yl4hch82kfmfcdmxy",
       "depends": ["MASS", "dplyr", "tibble"]
     },
+    "tower": {
+      "name": "tower",
+      "version": "0.2.0",
+      "sha256": "1bajsrn6jj9jxjqc7jlprh1kmbm96vaskbp9r7bmrjvl6v7zgrr6",
+      "depends": ["curl", "glue", "jsonlite", "purrr", "rlang", "stringr"]
+    },
     "toweranNA": {
       "name": "toweranNA",
       "version": "0.1.0",
@@ -120591,8 +124719,8 @@
     },
     "toxEval": {
       "name": "toxEval",
-      "version": "1.3.2",
-      "sha256": "1dyrbvb2l7bdz6d0lph7s8m3ydy6wz9k01qd9ilvkdqcf3y05ih0",
+      "version": "1.4.0",
+      "sha256": "0d3sa2f1irp6jxz8alalxjjfnd1wbsxrwl3kg41vhqgc93zqhw87",
       "depends": ["DT", "RColorBrewer", "dplyr", "ggplot2", "leaflet", "magrittr", "readxl", "shiny", "shinyAce", "shinycssloaders", "shinydashboard", "tidyr"]
     },
     "toxSummary": {
@@ -120603,9 +124731,9 @@
     },
     "toxpiR": {
       "name": "toxpiR",
-      "version": "1.2.1",
-      "sha256": "0n6x87gyzxsib267h0gs5b4sdkwmgjpgqzipfhlrjsnxq55q6599",
-      "depends": ["BiocGenerics", "S4Vectors", "pryr", "rlang", "tidyr"]
+      "version": "1.3.0",
+      "sha256": "1d19zpf2i5yrnby2ypfq4q8fahjfrdagvzparkaynwipwcs1qhkm",
+      "depends": ["BiocGenerics", "S4Vectors", "ggplot2", "pryr", "rlang", "tidyr"]
     },
     "tpAUC": {
       "name": "tpAUC",
@@ -120633,8 +124761,8 @@
     },
     "tpn": {
       "name": "tpn",
-      "version": "1.8",
-      "sha256": "1jhddrgkzlwmljqzy4hgday4ydyc76fskk2ahnz9x2abfm21dx7g",
+      "version": "1.9",
+      "sha256": "0zw7973dpm71l6ncvh1n2wapfkvgpks9afkzpih690qdda7p4nmm",
       "depends": ["RBE3", "VGAM", "moments", "pracma", "skewMLRM"]
     },
     "tpr": {
@@ -120657,8 +124785,8 @@
     },
     "tr_iatgen": {
       "name": "tr.iatgen",
-      "version": "1.0.0",
-      "sha256": "0bwr6c5mg41avsjj55wql0nyvb9pix8n5rpzlqjsq93xwixapy5s",
+      "version": "1.1.0",
+      "sha256": "0ljamadndnigbxa55y0wab085qqm46brk7nqvd7s5jmxjci8awds",
       "depends": ["shiny"]
     },
     "tracee": {
@@ -120747,8 +124875,8 @@
     },
     "tradestatistics": {
       "name": "tradestatistics",
-      "version": "4.5.0",
-      "sha256": "0s6v5xfcasrpdqvpxi8nbw9v4w8yvnjwxz21pa9321pchrhw4v6p",
+      "version": "5.0.0",
+      "sha256": "0a3pf18s06af7czi39hkvb1bmqn47dkva7kvbvpfl1vrl9298fwm",
       "depends": ["crul", "data_table", "digest", "jsonlite", "memoise"]
     },
     "trafo": {
@@ -120781,12 +124909,6 @@
       "sha256": "1ln0l8dkslj8pf0h5g5pj5iwy9x05nfkp1x36dxbi5iab88cv76w",
       "depends": ["geodist", "geosphere", "magrittr"]
     },
-    "traits": {
-      "name": "traits",
-      "version": "0.5.1",
-      "sha256": "1jkap9qh3m2hxwib0h3vqzs2rc0dfnk875nbsr682sad8mx8i01h",
-      "depends": ["crul", "data_table", "hoardr", "httr", "jsonlite", "readr", "rvest", "taxize", "tibble", "xml2"]
-    },
     "traitstrap": {
       "name": "traitstrap",
       "version": "0.1.0",
@@ -120801,15 +124923,15 @@
     },
     "trajectories": {
       "name": "trajectories",
-      "version": "0.2-8",
-      "sha256": "0rs4jlj2w9byvx47kvp4aayh485ck2xra3pkpjl95dyk8b0xpl4d",
+      "version": "0.2-9",
+      "sha256": "1wwkkz96wp300ps8jqg4bi7arb43z81821rziw7n31yhag38h3zp",
       "depends": ["lattice", "sp", "spacetime", "zoo"]
     },
     "trajmsm": {
       "name": "trajmsm",
-      "version": "0.1.0",
-      "sha256": "1nxklv2hsv4kry3zzyga2qgjjb0jhsx4f3l8a0k1j6lx2p7ysjah",
-      "depends": ["class", "e1071", "flexmix", "geepack", "ggplot2", "sandwich", "survival"]
+      "version": "0.1.3",
+      "sha256": "1rjg89qh4ljaz1pspwx6njfbc5b1i4b5mka0vlypm2i5pljk71wa",
+      "depends": ["e1071", "flexmix", "ggplot2", "sandwich", "survival"]
     },
     "trajr": {
       "name": "trajr",
@@ -120819,14 +124941,14 @@
     },
     "tram": {
       "name": "tram",
-      "version": "1.0-5",
-      "sha256": "12466rha6h7i034pwqjl37isga6lzxagjj7ppaffqg3aajzdlzss",
+      "version": "1.2-0",
+      "sha256": "1awqv33j82rkl2s64hw9his0bxrz50cgys3cdb7v1j2xbzn3syx1",
       "depends": ["Formula", "Matrix", "basefun", "mlt", "multcomp", "mvtnorm", "sandwich", "survival", "variables"]
     },
     "tramME": {
       "name": "tramME",
-      "version": "1.0.6",
-      "sha256": "00i0813czlwlb6lxsljhsp644mpz3zwcy068lb1z7qkxncic377d",
+      "version": "1.0.7",
+      "sha256": "150fh6a7dw5bh240m2dlv3insssdv2qfyngm1faa8rfkcqwbb2p1",
       "depends": ["MASS", "Matrix", "RcppEigen", "TMB", "alabama", "basefun", "coneproj", "mgcv", "mlt", "mvtnorm", "nlme", "numDeriv", "reformulas", "tram", "variables"]
     },
     "tramicp": {
@@ -120841,23 +124963,17 @@
       "sha256": "19hx2hn8m5abfzp4sm0myhxlx9hp2rl7dry5izxsfjjls3h8z1n4",
       "depends": ["CVXR", "ParamHelpers", "basefun", "lhs", "mlr", "mlrMBO", "mlt", "sandwich", "smoof", "tram"]
     },
-    "trampoline": {
-      "name": "trampoline",
-      "version": "0.1.1",
-      "sha256": "05inq5j8gvnpww6z21dzc57vilsm4gx3m274fpsamp54q85mi68s",
-      "depends": ["coro", "fastmap", "rlang"]
-    },
     "tramvs": {
       "name": "tramvs",
-      "version": "0.0-4",
-      "sha256": "0vvdj4q5pf1p0yzpx17h76pgvwmca51dkjx0m33c74vcxp5wmrks",
-      "depends": ["cotram", "tram", "variables"]
+      "version": "0.0-6",
+      "sha256": "1j0ymgr09vfhpcg684ggs0zynpy48mgmmymzkq806dqv85qhjq4f",
+      "depends": ["cotram", "future", "future_apply", "mvtnorm", "tram", "variables"]
     },
-    "tranSurv": {
-      "name": "tranSurv",
-      "version": "1.2.2",
-      "sha256": "17rvzjcn76z5niw1jappiadbkf66a9x0m7p3251lgb7qrnvpx3gk",
-      "depends": ["SQUAREM", "rootSolve", "survival", "truncSP"]
+    "transDA": {
+      "name": "transDA",
+      "version": "1.0.0",
+      "sha256": "0v2ldrv5h35xbj9k76dx4ygfqn5j9ni2h22jj2l61sp2bfh1crbf",
+      "depends": ["mvtnorm"]
     },
     "transPlotR": {
       "name": "transPlotR",
@@ -120873,8 +124989,8 @@
     },
     "transforEmotion": {
       "name": "transforEmotion",
-      "version": "0.1.4",
-      "sha256": "0vm6jls2whqkr1x7gwa9h6x1phng908z9qyfmpjr6nrykkwmk5va",
+      "version": "0.1.5",
+      "sha256": "13a6gcw9ifzy1x7dj5p3qnapf4l1nrsgxq8dn31hlk9dkl51c1hp",
       "depends": ["LSAfun", "Matrix", "dplyr", "googledrive", "pbapply", "remotes", "reticulate"]
     },
     "transform_hazards": {
@@ -120907,12 +125023,6 @@
       "sha256": "1klh4aisip0q0899lbybniy38f346m66k5g929l444f26dq9snw0",
       "depends": ["nleqslv", "nnet"]
     },
-    "translated": {
-      "name": "translated",
-      "version": "0.1.1",
-      "sha256": "12jd0dzbhliajg2x88kqwxpvrd1xy64sd551rsvbklfc3n7fqx09",
-      "depends": ["glue", "jsonlite"]
-    },
     "translit_uk": {
       "name": "translit.uk",
       "version": "1.0.0",
@@ -120939,14 +125049,14 @@
     },
     "transport": {
       "name": "transport",
-      "version": "0.15-2",
-      "sha256": "0pf0lza2qf0alwphiy978fyp58k3lz5i44kcw86a3rrf7cpf4rwa",
+      "version": "0.15-4",
+      "sha256": "1kr03iqyfv2icxdalj06rfwrjj6k281wn87dvz4kkp35zpv454sf",
       "depends": ["Rcpp", "RcppEigen", "data_table"]
     },
     "transreg": {
       "name": "transreg",
-      "version": "1.0.2",
-      "sha256": "1kh106kgnjliw84p219g317img4aaas8s2bm5x6pakvswqf2qjxw",
+      "version": "1.0.3",
+      "sha256": "1xyvyj2l846hxknlf9h4dfidf85rnn1wa9m43kf3p3csfhfh6ahm",
       "depends": ["glmnet", "joinet", "starnet"]
     },
     "transx": {
@@ -120993,14 +125103,14 @@
     },
     "treats": {
       "name": "treats",
-      "version": "1.0",
-      "sha256": "16ahw46wkjhvxhkiy4313ky9vvzjrg2bhxw1pz0j4hasdkd9xq1s",
-      "depends": ["MASS", "ape", "dispRity", "rgl"]
+      "version": "1.1",
+      "sha256": "1s96pazw6l7gak4fy5ba5wiw8ff9zb07ghd7xhx2mpllkaph4x1l",
+      "depends": ["MASS", "ape", "dispRity", "geiger", "rgl"]
     },
     "tree": {
       "name": "tree",
-      "version": "1.0-43",
-      "sha256": "11sjkm89ql1576jy0cqbxzjdpx7qs95wbgdxg92lzkiw05nrj2lv",
+      "version": "1.0-44",
+      "sha256": "03zp9g2cwf6099l8xkvs9ab11i8a4iflh8afblqihcl4yrglnsfv",
       "depends": []
     },
     "tree_interpreter": {
@@ -121051,11 +125161,11 @@
       "sha256": "07rggigdgjbmz9wvbkxs6xcwg6k53zb4j4rvlfrgb5b4mq44s0wj",
       "depends": ["RCurl", "XML", "ape", "httr"]
     },
-    "treedata_table": {
-      "name": "treedata.table",
-      "version": "0.1.0",
-      "sha256": "0dhnb8if5wq6hzhjg40cw80sacigqmlm7nplm1f1ay5cqx1ynfi7",
-      "depends": ["ape", "data_table", "geiger", "lazyeval"]
+    "treeclim": {
+      "name": "treeclim",
+      "version": "2.0.7.1",
+      "sha256": "1bmb2ccqm47x1lzp8c7pg61j74x01n98p0sfs6ih8svvgydq4fk1",
+      "depends": ["Rcpp", "RcppArmadillo", "abind", "boot", "ggplot2", "lmodel2", "lmtest", "np", "plyr"]
     },
     "treedater": {
       "name": "treedater",
@@ -121113,14 +125223,14 @@
     },
     "treesitter_r": {
       "name": "treesitter.r",
-      "version": "1.0.1",
-      "sha256": "1bxliv544w2aa033r4nhqzs5cmsiriymfcxwcc76v05nm82dncim",
+      "version": "1.1.0",
+      "sha256": "15kbbzz0mfs9wwm0lk7v764m85fjwbng881r1yhyjklc9zlxanx3",
       "depends": []
     },
     "treesliceR": {
       "name": "treesliceR",
-      "version": "1.0.1",
-      "sha256": "1hsb4rjl7kl2q9z4mkpsnwf6a8r0j1m6y4sl112rssrwrk836gb8",
+      "version": "1.0.2",
+      "sha256": "1hzi2l24x1hb21ljnv0zcqghibpjxh8gx0rfryvh6fvd71v1g4hb",
       "depends": ["ape", "doParallel", "foreach", "ggplot2", "sf"]
     },
     "treespace": {
@@ -121137,8 +125247,8 @@
     },
     "treestats": {
       "name": "treestats",
-      "version": "1.70.4",
-      "sha256": "0nfs4432q8nirhspdqnkp02a50c0rcphf1anx5qgqdal2njmk146",
+      "version": "1.70.5",
+      "sha256": "0yka744l2dyszpjrdvipz227l46h1972fscl8ds6027dba5h5rlf",
       "depends": ["Rcpp", "ape", "nloptr"]
     },
     "treestructure": {
@@ -121149,14 +125259,14 @@
     },
     "trekcolors": {
       "name": "trekcolors",
-      "version": "0.1.3",
-      "sha256": "0jm85lrsqlpl1k62fbim48kprsqs50bm0dbajnk8f42x6i3m1xav",
+      "version": "0.2.0",
+      "sha256": "0rjlwi0rnyx2dmxm0903cgbfdxr7fg320qflhc1p9yggrgjrhy5v",
       "depends": ["ggplot2"]
     },
     "trekfont": {
       "name": "trekfont",
-      "version": "0.9.5",
-      "sha256": "1c0rwjmpg6b83kvkwrc0fcg1adx5is1g0wn01iss037jph5j0f2l",
+      "version": "0.9.6",
+      "sha256": "0sbc3bwa2nyvqkbr3v5si4sxaipgsq7qc2i1zbyzfkxd8vs8mh6q",
       "depends": []
     },
     "trelliscopejs": {
@@ -121293,8 +125403,8 @@
     },
     "trinROC": {
       "name": "trinROC",
-      "version": "0.6",
-      "sha256": "0jpnr3l8f057k334sx803cc7kxgi8mxvxjgli88f8682ax9z47k3",
+      "version": "0.7",
+      "sha256": "1jk494hm3rl2xy7gq010l9b9akms1ddkip9niwmz1zvy9924j3pj",
       "depends": ["ggplot2", "gridExtra", "rgl"]
     },
     "trip": {
@@ -121311,8 +125421,8 @@
     },
     "tripack": {
       "name": "tripack",
-      "version": "1.3-9.1",
-      "sha256": "1ghza4by6shalsnqybn5qgv076dxh59b6vycg9v6ii216zbgi0kz",
+      "version": "1.3-9.2",
+      "sha256": "0in9jlqni00qy9czpw7lnhm846ijxqbm02z8dy5bhgmh9v048brv",
       "depends": []
     },
     "triplesmatch": {
@@ -121347,8 +125457,8 @@
     },
     "troopdata": {
       "name": "troopdata",
-      "version": "1.0.0",
-      "sha256": "0y7rkb2lvv8yy3sl4r0zha873basfbh51gpwcxcqb1ihrn8i8c4c",
+      "version": "1.0.2",
+      "sha256": "13a1a6d724816s5mkx4hxn7syvwy34l8bdffas76g0g3kadkpvj7",
       "depends": ["dplyr", "magrittr", "rlang"]
     },
     "tropAlgebra": {
@@ -121365,8 +125475,8 @@
     },
     "trouBBlme4SolveR": {
       "name": "trouBBlme4SolveR",
-      "version": "0.1.1",
-      "sha256": "0718n2lgwyj8c2cnxs6r6gy41ygv8pl04fnjb07c6jhzr30ndc6l",
+      "version": "0.1.2",
+      "sha256": "0rcsv0nrrwvgicrwig5278rb861ynh6crgixbg2400wxc30r9g24",
       "depends": ["lme4"]
     },
     "trtf": {
@@ -121375,6 +125485,12 @@
       "sha256": "15aalp82igw23rlk36dqqkcnmcy8q869wjbr7ak19gygy8p525wn",
       "depends": ["Formula", "libcoin", "mlt", "partykit", "sandwich", "tram", "variables"]
     },
+    "trtswitch": {
+      "name": "trtswitch",
+      "version": "0.1.2",
+      "sha256": "11hwwbp6s3g621wvfik7i4ch4rlxq44ck9hkwkwwc01mbs5n1hms",
+      "depends": ["Rcpp"]
+    },
     "trud": {
       "name": "trud",
       "version": "0.1.0",
@@ -121467,9 +125583,9 @@
     },
     "tsDyn": {
       "name": "tsDyn",
-      "version": "11.0.4.1",
-      "sha256": "04w7kf66q9bspyh62g8r9xzcb6mj6nd11za63b0h5jyj6rv6kbrq",
-      "depends": ["MASS", "Matrix", "foreach", "forecast", "mgcv", "mnormt", "nnet", "tseries", "tseriesChaos", "urca", "vars"]
+      "version": "11.0.5.2",
+      "sha256": "0v60h5f8302izj6vbgandmr923nf5ygrygbwzapgn83rh80wcj77",
+      "depends": ["MASS", "Matrix", "foreach", "forecast", "generics", "mgcv", "mnormt", "nnet", "tseries", "tseriesChaos", "urca", "vars"]
     },
     "tsLSTMx": {
       "name": "tsLSTMx",
@@ -121497,8 +125613,8 @@
     },
     "tsallisqexp": {
       "name": "tsallisqexp",
-      "version": "0.9-4",
-      "sha256": "07ymkrik1vwblcj5i0crihbrrxkrn8xjkap3lrzxy4vidgqalw3f",
+      "version": "0.9-5",
+      "sha256": "0227qyz2s4nyrbz5ci8v1rg97pfsm143b99g3m8hw09vswj2b29q",
       "depends": []
     },
     "tsapp": {
@@ -121509,8 +125625,8 @@
     },
     "tsbox": {
       "name": "tsbox",
-      "version": "0.4.1",
-      "sha256": "1amv1rwa78phrgi5njq66kz42wkk0n1b6wzg232m4znq2jj2b6s7",
+      "version": "0.4.2",
+      "sha256": "12m0b8000r8b2ik0p3kd612lng8i98hc8yicvr5162vw9v9vxki2",
       "depends": ["anytime", "data_table"]
     },
     "tscopula": {
@@ -121557,9 +125673,9 @@
     },
     "tsdistributions": {
       "name": "tsdistributions",
-      "version": "1.0.1",
-      "sha256": "0xhia2w6s0b2zfva2pj58n8vj666ffmmgcbdid9lbgcsy09fsf01",
-      "depends": ["GeneralizedHyperbolic", "KernSmooth", "RcppEigen", "Rdpack", "Rsolnp", "SkewHyperbolic", "TMB", "data_table", "future", "future_apply", "mev", "progressr", "sandwich", "tsmethods", "zoo"]
+      "version": "1.0.2",
+      "sha256": "19pzh7pa5ss8dj9bxmvz7l4q90rzr6rlbg80qax25yypxsqg8zkn",
+      "depends": ["GeneralizedHyperbolic", "KernSmooth", "Rcpp", "RcppEigen", "Rdpack", "Rsolnp", "SkewHyperbolic", "TMB", "data_table", "future", "future_apply", "mev", "progressr", "sandwich", "tsmethods"]
     },
     "tsensembler": {
       "name": "tsensembler",
@@ -121575,8 +125691,8 @@
     },
     "tseries": {
       "name": "tseries",
-      "version": "0.10-57",
-      "sha256": "1vlvz009y683k3xz2bhzkfdnk5m2c9abfz7661p92a17cjvlnx8q",
+      "version": "0.10-58",
+      "sha256": "0957pi65myp6qnrk710kcbw83401v226lsxdxkas73mv84cygphf",
       "depends": ["jsonlite", "quadprog", "quantmod", "zoo"]
     },
     "tseriesChaos": {
@@ -121593,9 +125709,9 @@
     },
     "tseriesTARMA": {
       "name": "tseriesTARMA",
-      "version": "0.3-4",
-      "sha256": "00ch7dg9fia7yh9q502wndi72nhz5ywqhhla9qgpgg08sfj2414f",
-      "depends": ["Matrix", "Rdpack", "Rsolnp", "lbfgsb3c", "mathjaxr", "rugarch", "zoo"]
+      "version": "0.5-1",
+      "sha256": "1dgsxsykfj2xgk730751v7gkrzdjjss9n6vqv7cm9bjbp6wr33ik",
+      "depends": ["Matrix", "Rdpack", "Rsolnp", "fitdistrplus", "lbfgsb3c", "mathjaxr", "rugarch", "zoo"]
     },
     "tsfeatures": {
       "name": "tsfeatures",
@@ -121623,9 +125739,15 @@
     },
     "tsgarch": {
       "name": "tsgarch",
-      "version": "1.0.2",
-      "sha256": "1hlbz6iycq9fvmcrdf238a48dl9hdpdrvxa5vfz1j28061r3sp8f",
-      "depends": ["Rcpp", "RcppArmadillo", "RcppEigen", "Rdpack", "TMB", "data_table", "flextable", "future", "future_apply", "lubridate", "nloptr", "numDeriv", "progressr", "sandwich", "tsdistributions", "tsmethods", "xts", "zoo"]
+      "version": "1.0.3",
+      "sha256": "0ivrn2lm41dggld9dh8ag9r9pxpfc3gmh53gzzlw13vn0snbpk49",
+      "depends": ["Rcpp", "RcppEigen", "Rdpack", "TMB", "data_table", "flextable", "future", "future_apply", "lubridate", "nloptr", "numDeriv", "progressr", "sandwich", "tsdistributions", "tsmethods", "xts", "zoo"]
+    },
+    "tsgc": {
+      "name": "tsgc",
+      "version": "0.0",
+      "sha256": "17vq2dp48w9401mn9j218wlc98h0g2rxrkqqqwdmxgfak303r2nj",
+      "depends": ["KFAS", "dplyr", "ggplot2", "ggthemes", "magrittr", "scales", "tidyr", "xts", "zoo"]
     },
     "tsiR": {
       "name": "tsiR",
@@ -121657,11 +125779,17 @@
       "sha256": "1zg7gacrcf9ykzhp90vbgmqx9f4pvr5l600g1yfki11r8q8jhx62",
       "depends": ["MAPA"]
     },
+    "tsmarch": {
+      "name": "tsmarch",
+      "version": "1.0.0",
+      "sha256": "0ppw92jaxs396gjvn17z0z8m6idjhchvy80h0gh881ds4v0qh8v8",
+      "depends": ["Rcpp", "RcppArmadillo", "RcppBessel", "RcppParallel", "Rdpack", "Rsolnp", "abind", "data_table", "future", "future_apply", "lubridate", "nloptr", "numDeriv", "sandwich", "shape", "tsdistributions", "tsgarch", "tsmethods", "xts", "zoo"]
+    },
     "tsmethods": {
       "name": "tsmethods",
-      "version": "1.0.1",
-      "sha256": "062n1zcl4v16nai0bpzvc7pjax4gdh8rgyq04pb9b5spy7pcx0n1",
-      "depends": ["xts", "zoo"]
+      "version": "1.0.2",
+      "sha256": "0zalax4bhaf11nhvxk1sxlixgizf4bkfpwaa81v24q4x5y9b2acn",
+      "depends": ["data_table", "xts", "zoo"]
     },
     "tsmp": {
       "name": "tsmp",
@@ -121701,8 +125829,8 @@
     },
     "tspredit": {
       "name": "tspredit",
-      "version": "1.0.777",
-      "sha256": "0yqgd9rlqldplcsq8hk1wkgjq0931sbqdxd31ynylkpiy4d0psca",
+      "version": "1.0.787",
+      "sha256": "0zyfmwr8sbkn27xwvzdk3wl1ycnrjfdampx2sakqxirdrapn2w2b",
       "depends": ["DescTools", "KFAS", "daltoolbox", "dplyr", "forecast", "hht", "mFilter", "wavelets"]
     },
     "tsqn": {
@@ -121725,14 +125853,14 @@
     },
     "tssim": {
       "name": "tssim",
-      "version": "0.1.7",
-      "sha256": "154snb0npy8zbkspp475nv9rvv1ls6rbgxz3jr152j79vsiis3ng",
-      "depends": ["dsa", "timeDate", "tsbox", "xts", "zoo"]
+      "version": "0.2.7",
+      "sha256": "1n05b1m5058gsxq0d7x4xlrkapjdkg7wj942p5di5fqvm61j47c2",
+      "depends": ["dsa", "forecast", "mvtnorm", "timeDate", "tsbox", "xts", "zoo"]
     },
     "tstests": {
       "name": "tstests",
-      "version": "1.0.0",
-      "sha256": "00gjmvg1b7v2cdrv95l9ic9j50wch8y23qxkiqmrp1nznjjicpsy",
+      "version": "1.0.1",
+      "sha256": "0771k05gmbag61q429yvqwn1xh2l1y87z68szg3njrbnabrihpmb",
       "depends": ["Rdpack", "car", "data_table", "flextable", "ks", "tsmethods", "xts"]
     },
     "tstools": {
@@ -121773,8 +125901,8 @@
     },
     "tsxtreme": {
       "name": "tsxtreme",
-      "version": "0.3.3",
-      "sha256": "1725rkdq377z3c06hc2g9l0dwgfy5gz3pgygpz1pyy83s5c7j869",
+      "version": "0.3.4",
+      "sha256": "0k35kavamz8s9c2na2f01i74wxid4lf4h8w71hk0nxzdm1qv3i45",
       "depends": ["MASS", "evd", "mvtnorm", "tictoc"]
     },
     "ttScreening": {
@@ -121867,6 +125995,12 @@
       "sha256": "04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw",
       "depends": ["knitr", "rmarkdown"]
     },
+    "tugboat": {
+      "name": "tugboat",
+      "version": "0.1.1",
+      "sha256": "0kxhnswyrsy03ad6qc73x5pm60m9jkpv3f0dmg315pk92jln2hv1",
+      "depends": ["here", "renv"]
+    },
     "tukeytrend": {
       "name": "tukeytrend",
       "version": "0.7",
@@ -121923,8 +126057,8 @@
     },
     "tutorial_helpers": {
       "name": "tutorial.helpers",
-      "version": "0.3.0",
-      "sha256": "0q8rwa2x7ail9rswlldbi8i7dly0yafc4ch4pbz7widgxv1wwc7l",
+      "version": "0.3.1",
+      "sha256": "1cm4rc3jjdd2czjw21brav9d86dxjg9s2mh05xhkhhfvindv2wmw",
       "depends": ["dplyr", "learnr", "mime", "parsermd", "purrr", "readr", "rmarkdown", "rstudioapi", "rvest", "shiny", "stringr", "tibble"]
     },
     "tv": {
@@ -121987,6 +126121,12 @@
       "sha256": "0q7rbq6ajvl2b3x8bcfxggdzfawc7p1dlfm4ydwvl74iighvq8sp",
       "depends": ["extrafont", "ggplot2", "magick", "scales"]
     },
+    "tvtools": {
+      "name": "tvtools",
+      "version": "0.0.3",
+      "sha256": "1wczllprcjfc21am9m9bg7mb5mn4aplh952y0ls1wh9q6z0x7mz5",
+      "depends": ["DTwrappers", "data_table"]
+    },
     "twang": {
       "name": "twang",
       "version": "2.6.1",
@@ -122011,6 +126151,12 @@
       "sha256": "03z2c18nq6iwwb3si7wjc56npdyray3xsy6k6ifvbalib2ibv2f1",
       "depends": ["MatrixModels", "data_table", "ggplot2", "xgboost"]
     },
+    "twc": {
+      "name": "twc",
+      "version": "0.0.1",
+      "sha256": "0v6vnbsgiqgfsy0qcmwkrjkii39fg3cvd3wqhgxh4m57b4190dwy",
+      "depends": ["data_table", "doParallel", "foreach", "lubridate", "magrittr", "ncdf4", "raster", "sf", "sp"]
+    },
     "twdtw": {
       "name": "twdtw",
       "version": "1.0-1",
@@ -122053,6 +126199,12 @@
       "sha256": "0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd",
       "depends": ["httr", "jsonlite", "lubridate", "magrittr", "purrr"]
     },
+    "twingp": {
+      "name": "twingp",
+      "version": "1.0.0",
+      "sha256": "0mjhvvgbv1vj5h8pwhlhn2hyk6h2rnghk7qrn62h9863phc3jz2g",
+      "depends": ["Rcpp", "RcppEigen", "nloptr"]
+    },
     "twinning": {
       "name": "twinning",
       "version": "1.0",
@@ -122085,10 +126237,16 @@
     },
     "twn": {
       "name": "twn",
-      "version": "0.2.4",
-      "sha256": "084l15y6zj2sqx2jkzjc0c1f9wgb56aw2slrzwic1g3zs00ym4ij",
+      "version": "0.2.5",
+      "sha256": "1bgjy63fb4dj3zz2by0bwz75dkp8qzhr8jhcl66wr68yd9szh8hf",
       "depends": ["crayon", "dplyr", "rlang", "stringr", "tibble"]
     },
+    "twoStageDesignTMLE": {
+      "name": "twoStageDesignTMLE",
+      "version": "1.0",
+      "sha256": "134yiwmkyqq80zvk328fl5mzyp5h2i68n8m544maipi5kjhv4sz7",
+      "depends": ["tmle"]
+    },
     "twopartm": {
       "name": "twopartm",
       "version": "0.1.0",
@@ -122121,8 +126279,8 @@
     },
     "twowaytests": {
       "name": "twowaytests",
-      "version": "1.4",
-      "sha256": "1blzifflmkcvjysw4bbn81fgydczg9rkcqchw832d322dymh2hzn",
+      "version": "1.5",
+      "sha256": "1xyr7q8i4hni1vcb61wnr8xpshrvzaw9m5ndmp97rwgl7apb3r5r",
       "depends": ["MASS", "car", "ggplot2", "nortest", "onewaytests", "wesanderson"]
     },
     "twoxtwo": {
@@ -122193,8 +126351,8 @@
     },
     "uGMAR": {
       "name": "uGMAR",
-      "version": "3.5.0",
-      "sha256": "0bd5qj3sqb5swirjpind4rap3yssldjv2zd874p52z88rnf3qhys",
+      "version": "3.5.1",
+      "sha256": "1a8krmhpi6pd79rbgdiqigz4dvgknx05wzs95qa11giz433d5r6y",
       "depends": ["Brobdingnag", "gsl", "pbapply"]
     },
     "uHMM": {
@@ -122223,9 +126381,9 @@
     },
     "ubms": {
       "name": "ubms",
-      "version": "1.2.6",
-      "sha256": "10jr2nb8pq0rxx1h0zci4zybbj108maa5kdzgf9bj87pzsrxhda7",
-      "depends": ["BH", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "lme4", "loo", "pbapply", "rlang", "rstan", "rstantools", "unmarked"]
+      "version": "1.2.7",
+      "sha256": "0q2fz2nz5k1jvyh57c3wlagrb5ik0d7w4imm5yx473aii3a963n7",
+      "depends": ["BH", "Matrix", "RSpectra", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "ggplot2", "gridExtra", "loo", "pbapply", "reformulas", "rlang", "rstan", "rstantools", "unmarked"]
     },
     "uci": {
       "name": "uci",
@@ -122241,8 +126399,8 @@
     },
     "ucimlrepo": {
       "name": "ucimlrepo",
-      "version": "0.0.1",
-      "sha256": "0v0qprchgi8553hf4aqwd4gn06spbr0yzym8c5z1c3dqy9vp8bax",
+      "version": "0.0.2",
+      "sha256": "19r8iy0s4jwjs99bx49l8acx94c5jgn1kzpvlmyqv0311kydry51",
       "depends": ["httr2"]
     },
     "uclust": {
@@ -122319,9 +126477,9 @@
     },
     "ukbnmr": {
       "name": "ukbnmr",
-      "version": "2.2",
-      "sha256": "05bcsz74aayi5rk9nv7izj4xz9mmf1yw933syvvp2g0ly6z8l66w",
-      "depends": ["MASS", "bit64", "data_table"]
+      "version": "3.2.0",
+      "sha256": "0ajdnc75bqbc1i2x157h59sj7x8xwickf6llc8iwzzacs1hnj481",
+      "depends": ["MASS", "bit64", "data_table", "lubridate"]
     },
     "ukbtools": {
       "name": "ukbtools",
@@ -122397,8 +126555,8 @@
     },
     "umx": {
       "name": "umx",
-      "version": "4.20.0",
-      "sha256": "1b0xkwy9b8sq686smjjl08wmvijnkvm0rh3gy31lamcbw7k0b60w",
+      "version": "4.21.0",
+      "sha256": "0iyrpqv8z49vcnv021j1iwxpahc2gflfq9nfx7clr7gjnbkxx98k",
       "depends": ["DiagrammeR", "MASS", "Matrix", "MuMIn", "OpenMx", "R2HTML", "RCurl", "cowplot", "foreign", "gert", "ggplot2", "hrbrthemes", "kableExtra", "knitr", "lavaan", "mvtnorm", "nlme", "openxlsx", "paran", "polycor", "psych", "psychTools", "pwr", "rmarkdown", "scales", "xtable"]
     },
     "unbalhaar": {
@@ -122461,6 +126619,12 @@
       "sha256": "1p5dl3906gbaszvny33gj56phqcclnj1c73lmnz6l1b1h5xahyw0",
       "depends": ["dplyr", "forcats", "magrittr", "readxl", "rlang", "stringr", "tibble", "tidyr", "tidyxl"]
     },
+    "uni_shrinkage": {
+      "name": "uni.shrinkage",
+      "version": "1.0.0",
+      "sha256": "0pba68jnsipc52rw091mx3dmxk1cp4w8f4dn0w7nmk7q93av09kp",
+      "depends": []
+    },
     "uni_survival_tree": {
       "name": "uni.survival.tree",
       "version": "1.5",
@@ -122601,8 +126765,8 @@
     },
     "unix": {
       "name": "unix",
-      "version": "1.5.8",
-      "sha256": "0jjy4vhxvyd7i85g50xz392m7blqai8crfrnyf7kbgzkbibr7jb0",
+      "version": "1.5.9",
+      "sha256": "0jbbdrrcb13w7c3rb2f3z4mja2cw0lf2c45pf4294qzsrnkq422j",
       "depends": []
     },
     "unjoin": {
@@ -122613,26 +126777,26 @@
     },
     "unmarked": {
       "name": "unmarked",
-      "version": "1.4.1",
-      "sha256": "1ishwzqkkvin7vralpxnb2fdc75gvsxz1l5b9902y4h0mm4749qw",
+      "version": "1.4.3",
+      "sha256": "126svli0755263kc0gn6yf9lzhc3c3jpabsa481r2zf16l6r3br1",
       "depends": ["MASS", "Matrix", "Rcpp", "RcppArmadillo", "RcppEigen", "TMB", "lattice", "lme4"]
     },
     "unmconf": {
       "name": "unmconf",
-      "version": "0.1.0",
-      "sha256": "1cs9kjyq4s6s48ck1wg7piy9r9f6s27kiawzpv6mb514z09gvgr7",
-      "depends": ["glue", "janitor", "rjags"]
+      "version": "1.0.0",
+      "sha256": "0h07n154z5pwrvllan4gpgmcnsqnpq8aiyrjhpyvsdgbgn6s89wm",
+      "depends": ["coda", "glue", "janitor", "rjags"]
     },
     "unnest": {
       "name": "unnest",
-      "version": "0.0.5",
-      "sha256": "188la0g80ihcisb0gwnxbgxy882i74ngjgaa304kx8bq8sn6x4cz",
+      "version": "0.0.6",
+      "sha256": "091vmhk31i2qh7jzbpv03arnjs14zgz8z540w5vjvnm58yc7gnri",
       "depends": []
     },
     "unpivotr": {
       "name": "unpivotr",
-      "version": "0.6.3",
-      "sha256": "0j3vlh9g0zkm4gql4myisbmkhpvyqa0sb1dkc0xvvqczs93pzzax",
+      "version": "0.6.4",
+      "sha256": "0rkkq4m0w8pcya1yvxvilpdxmn0wjg7xfz6d06026zlhx8c4xm9s",
       "depends": ["cellranger", "dplyr", "forcats", "magrittr", "pillar", "purrr", "rlang", "tibble", "tidyr", "tidyselect", "xml2"]
     },
     "unrepx": {
@@ -122643,14 +126807,14 @@
     },
     "unrtf": {
       "name": "unrtf",
-      "version": "1.4.5",
-      "sha256": "17n9n9ld6ylg20p8zw57jc4q22h7plrhf1zk0ca7pxr099g8pj6r",
+      "version": "1.4.7",
+      "sha256": "1z5bdck8ykj9dh6ngr3qf88ad209hx8xizv02z7iil0jgycriqqr",
       "depends": ["sys"]
     },
     "unstruwwel": {
       "name": "unstruwwel",
-      "version": "0.2.0",
-      "sha256": "1s8vfmh1lafb244r0bwp4m0r9x5la95lglxqvhb4sq9wmah04ka7",
+      "version": "0.2.1",
+      "sha256": "01zaa1vbflbjx6pgaclcbnymkmlnnmy3y3ggiy185iq5p5hhaw1i",
       "depends": ["R6", "assertthat", "dplyr", "lubridate", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr"]
     },
     "unsystation": {
@@ -122661,8 +126825,8 @@
     },
     "untb": {
       "name": "untb",
-      "version": "1.7-7",
-      "sha256": "0sd9vapgzy3ifpyl08hm5l7d5g1yvyccqf3n9dyc9x5gmqkvhri1",
+      "version": "1.7-7-1",
+      "sha256": "1v0c43shqn7nmzzrf3yx740xjwrn4djll438p5gf31ny0q0hlgzb",
       "depends": ["Brobdingnag", "partitions", "polynom"]
     },
     "unusualprofile": {
@@ -122703,9 +126867,9 @@
     },
     "upndown": {
       "name": "upndown",
-      "version": "0.1.0",
-      "sha256": "0yri819zib1m7cj669x007183x9062xgz0pmhghbh6mfaz6rbclj",
-      "depends": ["cir", "expm", "numbers"]
+      "version": "0.2.0",
+      "sha256": "15dlzn52nyk37naqjxxzy6wmspv3ambc0rg5xc9ffrbiai4j2sqr",
+      "depends": ["cir", "expm", "numbers", "plyr"]
     },
     "upsetjs": {
       "name": "upsetjs",
@@ -122739,8 +126903,8 @@
     },
     "urbin": {
       "name": "urbin",
-      "version": "0.1-12",
-      "sha256": "18zskhpcngpw0zanya88l8znhbac5f7a89kq231w59yml9ll7y52",
+      "version": "0.1-14",
+      "sha256": "1061a7n9yrpz6ixy88zwiam6amy7jg2l2hv7c5n8cqg33j32lf22",
       "depends": []
     },
     "urca": {
@@ -122775,9 +126939,9 @@
     },
     "ursa": {
       "name": "ursa",
-      "version": "3.10.4",
-      "sha256": "0bjvssrxvlj83g3xkcykjk3k3nl1vhd0q1l3y1z8hrgxdpgh5p2h",
-      "depends": ["png", "sf"]
+      "version": "3.11.1",
+      "sha256": "1k0inghx7nfb69k3np6h4w1sj167ahcyifzfyn9mccq17whcpvxs",
+      "depends": ["sf"]
     },
     "us_census_geoheader": {
       "name": "us.census.geoheader",
@@ -122791,6 +126955,12 @@
       "sha256": "1hvdflhdwf9dkwqld32kjllr6669mn20v2q6mi06baqfnf5jjmki",
       "depends": ["tibble"]
     },
+    "usaidplot": {
+      "name": "usaidplot",
+      "version": "2.0.2",
+      "sha256": "0ar4raxmmsy8v4qakq2bff9dr85mnbpid5z94nqk43nxwcrhs7lx",
+      "depends": ["extrafont", "extrafontdb", "ggplot2"]
+    },
     "uscoauditlog": {
       "name": "uscoauditlog",
       "version": "1.0.3",
@@ -122815,6 +126985,12 @@
       "sha256": "0b6q733l5mrkdbxi9h9gpzz19pmr3c5phigrmmp6fas8gnsm3b3c",
       "depends": ["tibble"]
     },
+    "usdatasets": {
+      "name": "usdatasets",
+      "version": "0.1.0",
+      "sha256": "0gr4284pzzf2l2h0kxd9i1zj0jx9h874zllzp6ng01fazsyajb3p",
+      "depends": []
+    },
     "usdm": {
       "name": "usdm",
       "version": "2.1-7",
@@ -122841,9 +127017,9 @@
     },
     "usefun": {
       "name": "usefun",
-      "version": "0.5.0",
-      "sha256": "1gpyix8xpn4jmfjrycan6r1qvp7z7mhcngp02fcws6k2hvd7jajr",
-      "depends": ["PRROC", "dplyr"]
+      "version": "0.5.2",
+      "sha256": "0w8l35a9kpk735s6j7xc9cb8nr7s3gkywjgvhhk6zycr6f50cx67",
+      "depends": ["PRROC", "checkmate", "dplyr", "precrec", "tibble"]
     },
     "usemodels": {
       "name": "usemodels",
@@ -122853,8 +127029,8 @@
     },
     "usethis": {
       "name": "usethis",
-      "version": "3.0.0",
-      "sha256": "1dfcyxvw95lhm4giarsw266833sfbckk44nddjqpxqxarvwm1y4q",
+      "version": "3.1.0",
+      "sha256": "1n0nd6z8scwx8scl1y2i80d1h1h3c29kqcbipzdy36xi3lffibv3",
       "depends": ["cli", "clipr", "crayon", "curl", "desc", "fs", "gert", "gh", "glue", "jsonlite", "lifecycle", "purrr", "rappdirs", "rlang", "rprojroot", "rstudioapi", "whisker", "withr", "yaml"]
     },
     "usfertilizer": {
@@ -122971,6 +127147,12 @@
       "sha256": "16l64scyipj7plwyv6whv3h040sgvzxx43jhjxyhrcdci4pqwh94",
       "depends": ["ROCR", "mldr"]
     },
+    "utsf": {
+      "name": "utsf",
+      "version": "1.1.0",
+      "sha256": "1bfhms7j1042j30v9k84i9jsvsahjdx6h5dfplynlvwb1isb5hi8",
+      "depends": ["Cubist", "FNN", "forecast", "ggplot2", "ipred", "ranger", "rpart", "vctsfr"]
+    },
     "uuid": {
       "name": "uuid",
       "version": "1.2-1",
@@ -122997,9 +127179,9 @@
     },
     "vDiveR": {
       "name": "vDiveR",
-      "version": "1.2.1",
-      "sha256": "1rxygl5micg07p7la9wyvp4dmfwkjdbhqp660mrq6a3drr4x5bj2",
-      "depends": ["DT", "dplyr", "gghalves", "ggplot2", "ggpubr", "ggtext", "gridExtra", "magrittr", "maps", "plyr", "readr", "rentrez", "rlang", "scales", "stringr", "tidyr"]
+      "version": "2.0.1",
+      "sha256": "0xgazc1appn9z1qj7kqaydknskvcphz4y822sryygmngl9608xgz",
+      "depends": ["cowplot", "dplyr", "gghalves", "ggplot2", "ggpubr", "ggtext", "magrittr", "maps", "rentrez", "rlang", "scales", "stringdist", "stringr", "tidyr"]
     },
     "vICC": {
       "name": "vICC",
@@ -123025,6 +127207,18 @@
       "sha256": "0pqgavah2bjb0mw8irgri9sglaff3assx10xmhqnixb4jig8d87r",
       "depends": ["Rsolnp", "SuperLearner", "dplyr", "e1071", "fdrtool", "gam", "ggplot2", "ggpubr", "ranger", "rlang", "simest", "survML", "survival", "truncnorm"]
     },
+    "vaccineff": {
+      "name": "vaccineff",
+      "version": "1.0.0",
+      "sha256": "1cvcfp8a229i3i1s725i9g5qgbaj22h9k69yyfpwmbjbp14lmgm7",
+      "depends": ["MatchIt", "checkmate", "ggplot2", "linelist", "rlang", "scales", "survival"]
+    },
+    "vachette": {
+      "name": "vachette",
+      "version": "0.40.1",
+      "sha256": "1w8nc8rmp6d2553dc4gflqzh2cksd437daqcm5hzzs4w1vzp95qa",
+      "depends": ["Hmisc", "dplyr", "ggplot2", "magrittr", "minpack_lm", "photobiology", "progress", "prospectr", "purrr", "rlang", "tidyr"]
+    },
     "vacuum": {
       "name": "vacuum",
       "version": "0.1.0",
@@ -123129,8 +127323,8 @@
     },
     "validmind": {
       "name": "validmind",
-      "version": "0.1.1",
-      "sha256": "1rj93fgkix3xr1lla286whf06pnhs0n9hz23s85yn9155f7xgndk",
+      "version": "0.1.2",
+      "sha256": "04kcisl7xwxzinqi0rzm3ixf814l2wihhpinnncna6sffzd9g3xd",
       "depends": ["DT", "base64enc", "dplyr", "glue", "htmltools", "plotly", "reticulate", "rmarkdown"]
     },
     "valmetrics": {
@@ -123153,8 +127347,8 @@
     },
     "valr": {
       "name": "valr",
-      "version": "0.8.1",
-      "sha256": "1pp8naglh26yi8c2p15arx8jkj3jyslzw7j3n5bnzngdpfprk3as",
+      "version": "0.8.2",
+      "sha256": "1mba0dbmpx7bnwfffiiwd7ipqfl74fmgsbcsgbfp74qd8k5gly2h",
       "depends": ["Rcpp", "broom", "cli", "dplyr", "ggplot2", "lifecycle", "readr", "rlang", "rtracklayer", "stringr", "tibble"]
     },
     "valueEQ5D": {
@@ -123189,8 +127383,8 @@
     },
     "vandalico": {
       "name": "vandalico",
-      "version": "0.0.1",
-      "sha256": "0ipx9yq5wgpwphy1wzpa8jh605k3b5nkhplj4k0bym107010s3qd",
+      "version": "0.1.0",
+      "sha256": "06lfxcn5f042vkxprkagfcwp0dlm5pgw82k63a89ya9yfq71xhsw",
       "depends": ["ROCR"]
     },
     "vangogh": {
@@ -123393,9 +127587,9 @@
     },
     "vaxpmx": {
       "name": "vaxpmx",
-      "version": "0.0.3",
-      "sha256": "0slbp5iaafwa3bw8mrzraq8yvklvyji1r4bvmvwlmgr99yk2kgk4",
-      "depends": ["MASS", "dplyr"]
+      "version": "0.0.6",
+      "sha256": "1vjc2bm3i41di1nxjplgb347cghnv9ymv43c83dydkywa3wzqx1d",
+      "depends": ["MASS", "dplyr", "survival"]
     },
     "vcPB": {
       "name": "vcPB",
@@ -123411,8 +127605,8 @@
     },
     "vcd": {
       "name": "vcd",
-      "version": "1.4-12",
-      "sha256": "127dkln826ah5ydp3pmd5bqyns9m9m6yrjnmn7fir4r9al8yycf9",
+      "version": "1.4-13",
+      "sha256": "1k7q3nl437bmg1pylivfykwx4l0k104qkypml5b6xvwkwfn65b4x",
       "depends": ["MASS", "colorspace", "lmtest"]
     },
     "vcdExtra": {
@@ -123429,10 +127623,16 @@
     },
     "vcfppR": {
       "name": "vcfppR",
-      "version": "0.4.6",
-      "sha256": "19qw5x92v15x6cyamigf4fq36h5cw573fp0ln9n2bwsy89px5ghm",
+      "version": "0.7.1",
+      "sha256": "12w2w929cxrsl6fp2l4v4sprjrfzc07bsh1nmf5j27zaq5lb56cx",
       "depends": ["Rcpp"]
     },
+    "vchartr": {
+      "name": "vchartr",
+      "version": "0.1.3",
+      "sha256": "0dcw8bhhynmn15xwas4qwzzvm1pmil7sdh7wvfvghkjfa6nibf5v",
+      "depends": ["ggplot2", "htmlwidgets", "magrittr", "rlang", "scales"]
+    },
     "vcmeta": {
       "name": "vcmeta",
       "version": "1.4.0",
@@ -123459,8 +127659,8 @@
     },
     "vcrpart": {
       "name": "vcrpart",
-      "version": "1.0-5",
-      "sha256": "1h3p95gmy9lymnhw061awrxfn3xsadcmdr84azyn6c4p2l2qk5b6",
+      "version": "1.0-6",
+      "sha256": "0vz8wss290q6m0234syqwxnrk6c3jm64r2rccsj44sypbf887db5",
       "depends": ["formula_tools", "nlme", "numDeriv", "partykit", "rpart", "sandwich", "strucchange", "ucminf", "zoo"]
     },
     "vctrs": {
@@ -123495,8 +127695,8 @@
     },
     "vdiffr": {
       "name": "vdiffr",
-      "version": "1.0.7",
-      "sha256": "1ljj94swqgs8pvicdrlals6pckm7knwfvxxmmbhhi2zfcxdjwhzd",
+      "version": "1.0.8",
+      "sha256": "16zdb910dc40s79f336mdpr0zymxbjh84vx41051hq4gfx54y342",
       "depends": ["cpp11", "diffobj", "glue", "htmltools", "lifecycle", "rlang", "testthat", "xml2"]
     },
     "vec2dtransf": {
@@ -123525,8 +127725,8 @@
     },
     "vectorsurvR": {
       "name": "vectorsurvR",
-      "version": "0.2.0",
-      "sha256": "17h634yb4fqc3xgp48qxvrfzn0ly2x91j76i8cap90rhidq0vqxx",
+      "version": "1.2.1",
+      "sha256": "0n4k7mrwdj8y6dd7wlvl7i4rkbw37rsxal509h4l697ranvd1mq6",
       "depends": ["DT", "dplyr", "ggplot2", "httr", "jsonlite", "kableExtra", "knitr", "lubridate", "magrittr", "plotly", "rstudioapi", "stringr", "tidyr"]
     },
     "vectorwavelet": {
@@ -123543,8 +127743,8 @@
     },
     "vegan": {
       "name": "vegan",
-      "version": "2.6-6.1",
-      "sha256": "0q0bp7xxmab1gcqk8wwm81sdvhccdvz5vqyn0grbwfb619q5wakx",
+      "version": "2.6-8",
+      "sha256": "1hdkp316cx06jccb4f4n8592g82wmrf0k0pcm1nxy38m72xy4v8r",
       "depends": ["MASS", "cluster", "lattice", "mgcv", "permute"]
     },
     "vegan3d": {
@@ -123633,8 +127833,8 @@
     },
     "verbalisr": {
       "name": "verbalisr",
-      "version": "0.6.0",
-      "sha256": "1i324dmcbm9pgkmb0v21x3z89vvb6805ziq059xf49p3m6m3ad8s",
+      "version": "0.7.1",
+      "sha256": "0xkqz3hbxp885bsxxiqh0a240745wi13f6kqvxfb5jgacmbpwyi7",
       "depends": ["pedtools", "ribd"]
     },
     "verhoeff": {
@@ -123645,8 +127845,8 @@
     },
     "verification": {
       "name": "verification",
-      "version": "1.42",
-      "sha256": "0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw",
+      "version": "1.44",
+      "sha256": "095b0s2i2j655xfwjrddlz9pia0a1njzh7r3cjnfk84dp43a03hl",
       "depends": ["CircStats", "MASS", "boot", "dtw", "fields"]
     },
     "vermeulen": {
@@ -123717,8 +127917,8 @@
     },
     "vglmer": {
       "name": "vglmer",
-      "version": "1.0.3",
-      "sha256": "0wfl1n6xp6qiv34d4p5qy3mwzrvf3n324hrlksdpa68j5xfw9w0f",
+      "version": "1.0.6",
+      "sha256": "1xcz1h6wr0ipvhny5ay2kxqh75fdd8k1xv6aywn1jfbyf1mcw20q",
       "depends": ["CholWishart", "Matrix", "Rcpp", "RcppEigen", "lme4", "lmtest", "mgcv", "mvtnorm"]
     },
     "vhcub": {
@@ -123741,8 +127941,8 @@
     },
     "viafr": {
       "name": "viafr",
-      "version": "0.3.0",
-      "sha256": "1cxmk82cr2ci99j7wgfp7slqwyk5rxv109mk2c09mxqn3pdavil9",
+      "version": "0.3.1",
+      "sha256": "1b8gxn1zbr032xp11247agqyhi3iypr65a9jvkgg57l6b92hf6cq",
       "depends": ["assertthat", "crul", "dplyr", "jsonlite", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "utf8"]
     },
     "vici": {
@@ -123777,8 +127977,8 @@
     },
     "viewscape": {
       "name": "viewscape",
-      "version": "1.0.0",
-      "sha256": "1hjr6r6p5n4knmbdd38dpdlwdpycq8k5im0i0rfk28xnix7769mv",
+      "version": "2.0.2",
+      "sha256": "1647masd0bb3lmpya119m3dvy7fpbv8g2zybk1wgd06q2y1g6k16",
       "depends": ["ForestTools", "Rcpp", "dplyr", "pbmcapply", "rlang", "sf", "sp", "terra"]
     },
     "viking": {
@@ -123849,15 +128049,15 @@
     },
     "viraldomain": {
       "name": "viraldomain",
-      "version": "0.0.5",
-      "sha256": "0cm6k88jr1vyc2k61cpkj49kcha1v9cpkafslzdh8zy5ngbsfy1j",
+      "version": "0.0.6",
+      "sha256": "1g5872l0vgv3dx2ilkk75rzrvp2df7c7avx9n51dzfxkm82s41hi",
       "depends": ["applicable", "dplyr", "ggplot2", "parsnip", "recipes", "tidyselect", "workflows"]
     },
     "viralmodels": {
       "name": "viralmodels",
-      "version": "1.2.0",
-      "sha256": "0azpydlvbkbsaj7zcvl95s5y8d8pj72rkv4zna2851046yz170jl",
-      "depends": ["dplyr", "earth", "kknn", "nnet", "parsnip", "recipes", "rsample", "tidyselect", "tune", "vdiffr", "workflows", "workflowsets"]
+      "version": "1.3.1",
+      "sha256": "0ryjymbry92278sacbnfbkzl90i58cfk10dradkzp6rxl1ik9ryf",
+      "depends": ["dials", "dplyr", "hardhat", "parsnip", "purrr", "recipes", "rsample", "tidyselect", "tune", "workflows", "workflowsets"]
     },
     "viralx": {
       "name": "viralx",
@@ -123909,9 +128109,9 @@
     },
     "visOmopResults": {
       "name": "visOmopResults",
-      "version": "0.3.0",
-      "sha256": "1lfvihny8r8x0qhzlqhq3wysijypkqz3mgd70j9cy71m5hhypx6z",
-      "depends": ["cli", "dplyr", "generics", "glue", "lifecycle", "omopgenerics", "rlang", "stringr", "tidyr"]
+      "version": "0.5.1",
+      "sha256": "0q810igj994xqk1b5lngq3bfh3aj1q8g6y4whdiqlafgcf4bshgc",
+      "depends": ["cli", "dplyr", "generics", "glue", "lifecycle", "omopgenerics", "purrr", "rlang", "stringr", "tidyr"]
     },
     "visStatistics": {
       "name": "visStatistics",
@@ -123939,16 +128139,10 @@
     },
     "visachartR": {
       "name": "visachartR",
-      "version": "3.3.0",
-      "sha256": "1yr6mb4vgzqn1g32grq681yrnx5dzm4b1fzh7lv0pggaga3h61m8",
+      "version": "4.0.1",
+      "sha256": "1a0jvdkmkk86p7xl16mpwibkrxbk4zsas6yrmjg9zwincsf3xx81",
       "depends": ["htmlwidgets"]
     },
-    "visae": {
-      "name": "visae",
-      "version": "0.2.0",
-      "sha256": "0ycwb380z8nb646w7w42952lwvdi8prmph7yv1lraswvp4wjfx3p",
-      "depends": ["DT", "ca", "dplyr", "ggplot2", "ggrepel", "magrittr", "rlang", "shiny", "shinyjs", "tidyr"]
-    },
     "viscomp": {
       "name": "viscomp",
       "version": "1.0.0",
@@ -123957,8 +128151,8 @@
     },
     "viscomplexr": {
       "name": "viscomplexr",
-      "version": "1.1.1",
-      "sha256": "1b45yi5xv4vq52pfa064ll3ghxgkwpbknzq94gg60vcvb7spd0if",
+      "version": "1.1.2",
+      "sha256": "03v49zhqfv2ifzyqhjhagvjk65hz0vzn61ax9w1lhgd751kpazha",
       "depends": ["Rcpp", "Rdpack", "doParallel", "foreach", "plotrix", "scales"]
     },
     "visdat": {
@@ -123993,20 +128187,20 @@
     },
     "vistla": {
       "name": "vistla",
-      "version": "2.0.2",
-      "sha256": "06mjzm00q3zfw3a7a7pivdnn47zxi0qrqlv47izhy6baqlrxp3mr",
+      "version": "2.0.3",
+      "sha256": "0r4l1jdphq3d075ypbc5ab7rsj77qpi43600b6sqqw418za5fqkz",
       "depends": []
     },
     "vistributions": {
       "name": "vistributions",
-      "version": "0.1.2",
-      "sha256": "1nzkbyqks38n7gp55iqhrlxqyfwxk4fvqzi9vsb45h0m0hlmwhxr",
+      "version": "0.2.0",
+      "sha256": "012ccs5wy8mll0qnqp0qbcqbjmm7kw5d48yyi8xkxym5qffms9w3",
       "depends": ["ggplot2", "magrittr"]
     },
     "visualFields": {
       "name": "visualFields",
-      "version": "1.0.1",
-      "sha256": "1z62xappwjdv9f7ql5spydkb626rdj3hvpvzy3d71fwm0y3qwki3",
+      "version": "1.0.5",
+      "sha256": "0p8a3xjhw6sjhnq5gscz5nsqk9fnzp6si5k2sa00qw6x70ihw0gk",
       "depends": ["DT", "Hmisc", "XML", "boot", "combinat", "deldir", "dplyr", "gtools", "htmlTable", "oro_dicom", "plotrix", "polyclip", "pracma", "rlang", "shiny", "shinyjs"]
     },
     "visualize": {
@@ -124015,6 +128209,18 @@
       "sha256": "0bsdyqakidgdgxhzyl6w0pg3mnkj84550c4s7dwcwjjqqjsr9bj1",
       "depends": []
     },
+    "visualpred": {
+      "name": "visualpred",
+      "version": "0.1.1",
+      "sha256": "03vdy0rpfw84jwgp48xws30vxbb9zaly1da298ffyk94knpdf5yg",
+      "depends": ["FactoMineR", "MASS", "MBA", "data_table", "dplyr", "e1071", "gbm", "ggplot2", "ggrepel", "magrittr", "mltools", "nnet", "pROC", "randomForest"]
+    },
+    "visvaR": {
+      "name": "visvaR",
+      "version": "1.0.0",
+      "sha256": "1kxydr8inciq7285xrhwzi8hxim0bg4ckpzh8dhzp9q3iwd2jp0d",
+      "depends": ["DT", "agricolae", "bslib", "corrplot", "dplyr", "flextable", "ggcorrplot", "ggplot2", "htmltools", "officer", "patchwork", "readxl", "rlang", "shiny", "tibble", "tidyr"]
+    },
     "visvow": {
       "name": "visvow",
       "version": "1.3.11",
@@ -124053,8 +128259,8 @@
     },
     "vivainsights": {
       "name": "vivainsights",
-      "version": "0.5.3",
-      "sha256": "0gdhq8qdzzzvv2l5cr57wp6lnn082hcs7svbdjaphzx6ryw1bqna",
+      "version": "0.5.5",
+      "sha256": "0pphz6zflf3ym8ldlfklgm5p8a7khmz3ix3hgmm1lj7zxkw0245w",
       "depends": ["data_table", "dplyr", "ggplot2", "ggraph", "ggrepel", "ggwordcloud", "htmltools", "igraph", "lifecycle", "magrittr", "markdown", "networkD3", "purrr", "reshape2", "rmarkdown", "scales", "tidyr", "tidyselect", "tidytext", "wpa"]
     },
     "vivaldi": {
@@ -124119,8 +128325,8 @@
     },
     "voi": {
       "name": "voi",
-      "version": "1.0.2",
-      "sha256": "0fxaspvy64791dh9d00slfqi8wwip7353cf68kya0rkm2b12kr4m",
+      "version": "1.0.3",
+      "sha256": "1d72g5wpyfq92gc7bp42xbiafbl4q769bxq8awifsc93haawrwqm",
       "depends": ["Matrix", "dbarts", "earth", "ggplot2", "gridExtra", "mgcv", "mvtnorm", "posterior", "progress"]
     },
     "voice": {
@@ -124137,8 +128343,8 @@
     },
     "vol2birdR": {
       "name": "vol2birdR",
-      "version": "1.0.3",
-      "sha256": "0pryk17cyimli1wgb573kq162pwkxir4nrmp3lbv6f4i61nyxxch",
+      "version": "1.0.5",
+      "sha256": "08vcq5i7i3mm6pzzai6fnmm0phb0zxxbv1mav70jn2qs09ailm8q",
       "depends": ["Rcpp", "RcppGSL", "assertthat", "pkgbuild", "rlang", "withr"]
     },
     "volatilityTrader": {
@@ -124161,14 +128367,14 @@
     },
     "volesti": {
       "name": "volesti",
-      "version": "1.1.2-7",
-      "sha256": "1x730da30y763j6dcdahspbpf81zqaazqzfvfznsi0kq05856z2n",
+      "version": "1.1.2-8",
+      "sha256": "0g8p2y1awjdxfnghcsj91ws2kdgczlhgwg3dd2dxwhfv2ch2693n",
       "depends": ["BH", "Rcpp", "RcppEigen"]
     },
     "volker": {
       "name": "volker",
-      "version": "2.0.1",
-      "sha256": "18dmzr6ginlqdmkqbdzsqfwndgkgx7fydkq32d6plinb2fsaccd7",
+      "version": "3.0.0",
+      "sha256": "09h3g2c9psp9c5cpjbvlr8z9d4523aipd0s464q1jdk8r1ky88m6",
       "depends": ["base64enc", "broom", "car", "dplyr", "effectsize", "ggplot2", "kableExtra", "knitr", "lifecycle", "magrittr", "psych", "purrr", "rlang", "rmarkdown", "scales", "skimr", "tibble", "tidyr", "tidyselect"]
     },
     "volleystat": {
@@ -124179,9 +128385,9 @@
     },
     "voluModel": {
       "name": "voluModel",
-      "version": "0.2.1",
-      "sha256": "1kkqgbsjsgwia03v7mfbn2zc830hfsayx4q6f4qmrv6ql6x5imcg",
-      "depends": ["dplyr", "fields", "ggplot2", "ggtext", "modEvA", "rangeBuilder", "sf", "terra", "viridisLite"]
+      "version": "0.2.2",
+      "sha256": "1pl4rxqpsh2kvnqph53nbcv4kj9zj7i3krn7y0h1mcvp0pzz1yva",
+      "depends": ["dplyr", "fields", "ggplot2", "ggtext", "metR", "modEvA", "rangeBuilder", "sf", "terra", "viridisLite"]
     },
     "voronoiTreemap": {
       "name": "voronoiTreemap",
@@ -124323,9 +128529,9 @@
     },
     "vsp": {
       "name": "vsp",
-      "version": "0.1.1",
-      "sha256": "0aa3vqzazh0x5irbmqh9ac1xiprwnbgbrjl9bybxzynl91hwg9yw",
-      "depends": ["LRMF3", "Matrix", "RSpectra", "ggplot2", "glue", "invertiforms", "magrittr", "rlang", "tibble", "withr"]
+      "version": "0.1.2",
+      "sha256": "0i1syjh64v0wwdr9r2rp853spvxq79rqlv6j9bdhd9ldpys103aw",
+      "depends": ["LRMF3", "Matrix", "RSpectra", "clue", "ggplot2", "glue", "invertiforms", "magrittr", "rlang", "tibble", "withr"]
     },
     "vstdct": {
       "name": "vstdct",
@@ -124341,8 +128547,8 @@
     },
     "vtable": {
       "name": "vtable",
-      "version": "1.4.6",
-      "sha256": "1via6iz6ykw02wh5aagr9vqbzlqjvc5iyzfjr13yzyxarpi8zpdr",
+      "version": "1.4.8",
+      "sha256": "0n96r41i5w778z4ljg2rn99q96j60fp04h9g15awxj15g3n45xrj",
       "depends": ["haven", "kableExtra", "knitr", "rstudioapi", "sjlabelled"]
     },
     "vtreat": {
@@ -124425,8 +128631,8 @@
     },
     "vvtableau": {
       "name": "vvtableau",
-      "version": "0.6.0",
-      "sha256": "0l5ma8004zw69w55qvdmrl1jzg25bp69szyhqddn2h5qcnbg9r1j",
+      "version": "0.7.0",
+      "sha256": "1d2d8zd6zp9dsmmzjrslhjkm41312g7dl0a333yrs57cwzxarc5l",
       "depends": ["XML", "data_table", "dplyr", "httr", "jsonlite", "magrittr", "purrr", "stringr", "tidyr", "xml2"]
     },
     "vvtermtime": {
@@ -124437,8 +128643,8 @@
     },
     "vwline": {
       "name": "vwline",
-      "version": "0.2-2",
-      "sha256": "1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5",
+      "version": "0.2-4",
+      "sha256": "0cyv3kn6wza7bh7nzzq74s08b4ifr7cs6kkmqpdxqbh2yabim207",
       "depends": ["gridBezier", "polyclip"]
     },
     "wCorr": {
@@ -124449,8 +128655,8 @@
     },
     "wINEQ": {
       "name": "wINEQ",
-      "version": "1.2.0",
-      "sha256": "1b47dxa9q34xylp2bvzl0c9bbsd2l4fw8avq50575sc3w3v0bs62",
+      "version": "1.2.1",
+      "sha256": "09iqi3z6lw5mv4d8hl19c11slvy0gfgv99rhvia637wdihgbg8j2",
       "depends": ["dplyr", "sampling"]
     },
     "wISAM": {
@@ -124515,9 +128721,9 @@
     },
     "waldo": {
       "name": "waldo",
-      "version": "0.5.2",
-      "sha256": "019fvypq36kwvr2znlr0fd9f2ihb08rgigf6ypdybry5n8daxkc2",
-      "depends": ["cli", "diffobj", "fansi", "glue", "rematch2", "rlang", "tibble"]
+      "version": "0.6.1",
+      "sha256": "1jbn3vfykyv8czwqs6wbb8m172cl2fqgggy86n3h1rrg59rz7hy9",
+      "depends": ["cli", "diffobj", "glue", "rlang"]
     },
     "walkboutr": {
       "name": "walkboutr",
@@ -124527,8 +128733,8 @@
     },
     "walker": {
       "name": "walker",
-      "version": "1.0.8",
-      "sha256": "1y8jj3kf8wrkw3rkai0scnakb9cyb8dbvhji3vprs3cyprcrkf4r",
+      "version": "1.0.10",
+      "sha256": "135psiyyhv91x5rfj2y8im3a0l4gkby75p9k5d1kdb5lrkyhq8ib",
       "depends": ["BH", "Hmisc", "KFAS", "Rcpp", "RcppArmadillo", "RcppEigen", "RcppParallel", "StanHeaders", "bayesplot", "coda", "dplyr", "ggplot2", "loo", "rlang", "rstan", "rstantools"]
     },
     "walkscore": {
@@ -124579,6 +128785,18 @@
       "sha256": "0b1g2fpshhkd15b6fz4v3qwf425p5ahbh57acclqq6znl1acl1hg",
       "depends": ["flextable", "lubridate", "readtext"]
     },
+    "warbleR": {
+      "name": "warbleR",
+      "version": "1.1.33",
+      "sha256": "1a3s2211whjnki77xkimjd71gyjp07ayyis85d8kgm21hmlqiiyq",
+      "depends": ["NatureSounds", "RCurl", "Rcpp", "bioacoustics", "cli", "curl", "dtw", "fftw", "httr", "knitr", "monitoR", "pbapply", "rjson", "seewave", "testthat", "tuneR"]
+    },
+    "warehouseTools": {
+      "name": "warehouseTools",
+      "version": "0.1.2",
+      "sha256": "1qw7rmr7jh61icbjq4fd3y02bkqamgq4np6k6fxb9kvzf09r7fs7",
+      "depends": ["clusterSim", "dplyr"]
+    },
     "warp": {
       "name": "warp",
       "version": "0.2.1",
@@ -124615,6 +128833,12 @@
       "sha256": "04cibvi0d9spx8h0r28m1sz5drrkiblzfp63v6csm2n4dv55x075",
       "depends": ["cli", "flextable", "ggplot2", "officer", "scales", "systemfonts"]
     },
+    "washr": {
+      "name": "washr",
+      "version": "1.0.1",
+      "sha256": "0c8rvgbiqfn6n36rhp9i8czzbb3qywddj97x9vixr53vq22m96gz",
+      "depends": ["cffr", "desc", "devtools", "pkgdown", "rlang", "usethis"]
+    },
     "waspasR": {
       "name": "waspasR",
       "version": "0.1.5",
@@ -124659,8 +128883,8 @@
     },
     "watson": {
       "name": "watson",
-      "version": "0.4",
-      "sha256": "02wf4nh8gqq0ks9mzv4w1ly194syiixrfr8b6c61m90qwswglx1l",
+      "version": "0.5",
+      "sha256": "030ybj5cxgg17gixar9hggwyd2sgv3yli0pwpca698wz2b0mypnm",
       "depends": ["Rcpp", "RcppArmadillo", "Tinflex"]
     },
     "wav": {
@@ -124677,8 +128901,8 @@
     },
     "waveband": {
       "name": "waveband",
-      "version": "4.7.3",
-      "sha256": "08pa6vasv5miyw492ybwlszhk12ws61qd7a1rwjm1xkl838ca7kp",
+      "version": "4.7.4",
+      "sha256": "0z0a273z3gaqfhpjgqlxql2faz794xpr3yhnzd26r9r5680niq3a",
       "depends": ["wavethresh"]
     },
     "waved": {
@@ -124719,8 +128943,8 @@
     },
     "wavethresh": {
       "name": "wavethresh",
-      "version": "4.7.2",
-      "sha256": "0mmn8f5x8iw8vn0zsskzs3g41bm28prvzy9bmbng8va94g5795ws",
+      "version": "4.7.3",
+      "sha256": "133msy9bn32531n9z9wr9z6hccz5w8zczv0a5f2awkfbap8nlwn2",
       "depends": ["MASS"]
     },
     "waydown": {
@@ -124737,14 +128961,20 @@
     },
     "wbacon": {
       "name": "wbacon",
-      "version": "0.6-1",
-      "sha256": "1589ds5n25k6mii75k83yr7rc5kkk1xvhg2jrzd5i1hm31dhv3rp",
+      "version": "0.6-2",
+      "sha256": "10rhxwgjdrhyrk0zkrifgwyxjzrk2aypq65pdg08bymwsch44d1g",
       "depends": ["hexbin"]
     },
+    "wbids": {
+      "name": "wbids",
+      "version": "0.1.0",
+      "sha256": "0sx9w1y7hwhzjcswz0a1mjlzifqrhb9wmv5rwmfkpxba590hpv4h",
+      "depends": ["cli", "dplyr", "httr2", "purrr", "rlang", "tidyr", "withr"]
+    },
     "wbs": {
       "name": "wbs",
-      "version": "1.4",
-      "sha256": "0ibrf30riavy6shaxgiznwh4gmnkx92260gsl0d74jkys98mlxdj",
+      "version": "1.4.1",
+      "sha256": "1xrkh51xrvri1m48ndx9szj661ymjb23xgf0l4k8iggd9dllz9nl",
       "depends": []
     },
     "wbsd": {
@@ -124789,6 +129019,12 @@
       "sha256": "13shz5iz2ab9yqp24m6z7ciw70sdg2jdyqifmshq4flp4a737fr7",
       "depends": ["dplyr", "survival", "tidyr"]
     },
+    "wdiEF": {
+      "name": "wdiEF",
+      "version": "1.0.2",
+      "sha256": "1gm3m1ds4yrmlhzwwd4sbsksq0yjkh8m511nnzp5kja6l9jbjlb7",
+      "depends": ["dplyr", "terra"]
+    },
     "wdm": {
       "name": "wdm",
       "version": "0.2.4",
@@ -124815,9 +129051,9 @@
     },
     "wdpar": {
       "name": "wdpar",
-      "version": "1.3.7",
-      "sha256": "0z7p5gcz4fzaga1z5k8q3rnrwzd2iliq0bixsvnqhaddy5aznpms",
-      "depends": ["assertthat", "cli", "countrycode", "curl", "httr", "lwgeom", "pingr", "progress", "rappdirs", "sf", "tibble", "webdriver", "withr", "xml2"]
+      "version": "1.3.8",
+      "sha256": "0mn05wg755xkj3pw6qv0g50p4h5v6n0if31gr9a2i04zjza5nr86",
+      "depends": ["assertthat", "chromote", "cli", "countrycode", "curl", "httr", "lwgeom", "pingr", "progress", "rappdirs", "sf", "tibble", "withr", "xml2"]
     },
     "weaana": {
       "name": "weaana",
@@ -124867,6 +129103,12 @@
       "sha256": "06b9i9jipg564zyw4gkgiidz7501rlp40hxm4z3k5mzy148lr5vq",
       "depends": ["base64enc", "data_tree", "dplyr", "httr", "jsonlite", "purrr", "rlang", "rvest", "stringr", "tibble", "xml2"]
     },
+    "webdav": {
+      "name": "webdav",
+      "version": "0.1.2",
+      "sha256": "1llqzzh7rlrs7f2d4kb9y7n5fgiv1n2fkm07jh3kbv3yzi5x3yy1",
+      "depends": ["dplyr", "glue", "httpuv", "httr2", "magrittr", "stringr", "tibble", "xml2"]
+    },
     "webdeveloper": {
       "name": "webdeveloper",
       "version": "1.0.5",
@@ -124911,8 +129153,8 @@
     },
     "webp": {
       "name": "webp",
-      "version": "1.2.0",
-      "sha256": "0srmqrjff3c15d2921rd3b203c6qq170gschbp92fi3d3qshv0fk",
+      "version": "1.3.0",
+      "sha256": "0gm238kmn51r0z3yrg1i1w49r3gph6xqyb8w75r76agic6nv9p9s",
       "depends": []
     },
     "webr": {
@@ -124965,8 +129207,8 @@
     },
     "webutils": {
       "name": "webutils",
-      "version": "1.2.0",
-      "sha256": "0g3zrbwiyq9z0chc66dr8gndqs0xdqkc49bpisbb7ns3g0fkl92i",
+      "version": "1.2.2",
+      "sha256": "07k6d37pscnbsqxg4rpxr0zxrylpv9z1f3s8c6nwd3fhpwjs4d55",
       "depends": ["curl", "jsonlite"]
     },
     "wec": {
@@ -125109,10 +129351,16 @@
     },
     "wgaim": {
       "name": "wgaim",
-      "version": "2.0-1",
-      "sha256": "1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4",
+      "version": "2.0-6",
+      "sha256": "0i13ngp0z0l72jbzdpydp3pigggmp4bn9jfyzjkbzj2fhfixsqf0",
       "depends": ["ggplot2", "qtl"]
     },
+    "wget": {
+      "name": "wget",
+      "version": "0.0.3",
+      "sha256": "0vnrnfcsacic57r730cjhrrb743qiq2yga9abhqi9w3fd5vixsni",
+      "depends": ["yulab_utils"]
+    },
     "whSample": {
       "name": "whSample",
       "version": "0.9.6.2",
@@ -125137,6 +129385,12 @@
       "sha256": "16xzhwvhd3zdklyvdb1lla5lykbvkq5hghfm9yz0cc6ykcnz7afr",
       "depends": ["DBI", "dm", "dplyr", "hms", "lubridate", "rlang", "snakecase", "tibble", "xlsx"]
     },
+    "where": {
+      "name": "where",
+      "version": "1.0.0",
+      "sha256": "11i91wqr64ginwzy8flv7d3z4wsnha223mjnpjljj98x7ixx3xm2",
+      "depends": []
+    },
     "whereami": {
       "name": "whereami",
       "version": "0.2.0",
@@ -125263,6 +129517,12 @@
       "sha256": "0niym9azy4qzcr4rriw0bfd97scx1mdpx67szinj7qsh569xb61m",
       "depends": ["WikipediR", "dplyr", "maps", "rvest", "selectr", "sp", "stringi", "stringr", "tidyr", "units", "xml2"]
     },
+    "wikiprofiler": {
+      "name": "wikiprofiler",
+      "version": "0.1.5",
+      "sha256": "180hgqc1saqc280p423qhgm5h106kd783l4ckhxs5nnhygm3yiv4",
+      "depends": ["ggplot2", "ggplotify", "gson", "rsvg", "yulab_utils"]
+    },
     "wikitaxa": {
       "name": "wikitaxa",
       "version": "0.4.0",
@@ -125359,28 +129619,52 @@
       "sha256": "17jwnnzy5a38a2n9ixhs8vk8ybq2a8lhjv5hfx4dwdg73iklnmib",
       "depends": ["BH", "LearnBayes", "MASS", "Matrix", "Rcpp", "RcppEigen", "RcppParallel", "StanHeaders", "dplyr", "future", "future_apply", "ks", "matrixStats", "matrixcalc", "plm", "rstan", "rstantools"]
     },
+    "winr": {
+      "name": "winr",
+      "version": "1.0.0",
+      "sha256": "1iw7xmqa03zqba9qvs1hdxmig5fgj7hz1ydj8cbcm2dscz4686sr",
+      "depends": ["Rdpack", "dplyr", "tidyr"]
+    },
+    "wintime": {
+      "name": "wintime",
+      "version": "0.3.0",
+      "sha256": "12ghq92mqr76jvld47cy4hh1gqs8kvjd0afb39qyx24l5abcl4nc",
+      "depends": ["survival"]
+    },
     "wiqid": {
       "name": "wiqid",
       "version": "0.3.3",
       "sha256": "1d5bckkr6cnixccxaa14n7vbsya5cc00y9mryy1j69shhsmxp5ks",
       "depends": ["HDInterval", "MASS", "coda", "mcmcOutput", "plotrix", "truncnorm"]
     },
+    "wishmom": {
+      "name": "wishmom",
+      "version": "1.1.0",
+      "sha256": "1j43s6n9y757gs7q9xjps9qsy81jznh5vyij1yds8nfz1r53wg3h",
+      "depends": ["roxygen2"]
+    },
     "withdots": {
       "name": "withdots",
       "version": "0.1.1",
       "sha256": "0vpbw9swyi8qf5s2nlml9pdmrzvwn4rpm4gbfsc0vikbzp29dmvi",
       "depends": []
     },
+    "wither": {
+      "name": "wither",
+      "version": "0.1.0",
+      "sha256": "0m4hz06y2dlgnr91nq7jf70fgdl9l6z6b7cf1nxcbc1q0a6rzxv0",
+      "depends": ["fs", "here", "withr"]
+    },
     "withr": {
       "name": "withr",
-      "version": "3.0.1",
-      "sha256": "0h9qbaa4i63awk176i3pm7bia7wgssav9zk9jvc7sg3k5yng2wym",
+      "version": "3.0.2",
+      "sha256": "18y1jbyf6b70zm0kyjdjhdzyskhsbaww3j0kpyjcqxfjjgs0afha",
       "depends": []
     },
     "wk": {
       "name": "wk",
-      "version": "0.9.2",
-      "sha256": "1y75hdg1p1h6pja3zxpllmbvzqlh67n5z9d3d6zhknxfkgfmwrrk",
+      "version": "0.9.4",
+      "sha256": "12rlkspg0zavda6jfwcah7gm9fh4x13720m4gvy4xndfm5gxswxr",
       "depends": []
     },
     "wkb": {
@@ -125463,14 +129747,14 @@
     },
     "wooldridge": {
       "name": "wooldridge",
-      "version": "1.4-3",
-      "sha256": "16lgdzbjp4yjhihbhz9kpagsdral802lhgg6m94vxprlz2sna1r4",
+      "version": "1.4-4",
+      "sha256": "0ga4b754l3w6hs1ffyk2zljxzjbwzny03zlph4p4836lhk9m4q1b",
       "depends": []
     },
     "worcs": {
       "name": "worcs",
-      "version": "0.1.14",
-      "sha256": "1l18xf9lhp1ba36an46ii3gdcaf01xm6c2v70cswsyf05x61kzsy",
+      "version": "0.1.15",
+      "sha256": "0hqsviiznr5rp3bg1fajpcpcnnb9819h96i198vslqn9qjr10a9q",
       "depends": ["credentials", "digest", "gert", "gh", "prereg", "ranger", "renv", "rmarkdown", "rticles", "tinytex", "usethis", "xfun", "yaml"]
     },
     "word_alignment": {
@@ -125511,9 +129795,9 @@
     },
     "wordmap": {
       "name": "wordmap",
-      "version": "0.8.0",
-      "sha256": "04s77aghy7q2x9khhl49xv2kbkhim39pmrr9ra3wrlm7map47ygr",
-      "depends": ["Matrix", "quanteda", "stringi"]
+      "version": "0.9.1",
+      "sha256": "1hvnf5r82gymlyr08gkmyd2y8q51a66b9k47pzgagmv5fi1bpilm",
+      "depends": ["Matrix", "ggplot2", "ggrepel", "quanteda", "stringi"]
     },
     "wordnet": {
       "name": "wordnet",
@@ -125535,8 +129819,8 @@
     },
     "wordpredictor": {
       "name": "wordpredictor",
-      "version": "0.0.3",
-      "sha256": "0079nkjimzz07yzqx8ksgk7isi0b5j1nxmisicbc8qvsamirm68v",
+      "version": "0.0.5",
+      "sha256": "0gr04si037rwnmkb2i9p4cc75lrshjfwh3chbgl86dxyxryx9mdy",
       "depends": ["SnowballC", "digest", "dplyr", "ggplot2", "patchwork", "stringr"]
     },
     "words": {
@@ -125557,6 +129841,12 @@
       "sha256": "17fqd4zrsklv2ik3lg00x66yasfh1kyhs3k9ri6lrk56wwv6hzb2",
       "depends": ["MASS", "Matrix", "Rcpp", "cluster", "iotools", "sparsesvd"]
     },
+    "wordvector": {
+      "name": "wordvector",
+      "version": "0.1.0",
+      "sha256": "08wmg84lgi6n77dhb78f3270ra1hzjbkzwxywxvrfsijv0nrss5q",
+      "depends": ["Matrix", "RSpectra", "Rcpp", "irlba", "proxyC", "quanteda", "rsvd", "stringi"]
+    },
     "workflowr": {
       "name": "workflowr",
       "version": "1.7.1",
@@ -125583,8 +129873,8 @@
     },
     "worldbank": {
       "name": "worldbank",
-      "version": "0.2.0",
-      "sha256": "0bl8c5cqz5s8yl06qy7xg92nhgald7xil4ck7vb4h6rln210bz9v",
+      "version": "0.4.0",
+      "sha256": "0kpiihqc87cl583r1my8w2in8a7b1g2a2ng3gvzs54bb7v0wv4ak",
       "depends": ["httr2"]
     },
     "worldfootballR": {
@@ -125623,6 +129913,12 @@
       "sha256": "0i677bzgd9qx57x7n7qsaqpacgpap2d0n8gq1lc9hsmg13bs2v8f",
       "depends": ["Rcpp"]
     },
+    "woylier": {
+      "name": "woylier",
+      "version": "0.0.9",
+      "sha256": "12hn1jn5q1gnc71w7mcbxq8zkaf2y3vwy8i06s7cakpdcrs0971z",
+      "depends": ["dplyr", "geozoo", "tibble", "tourr"]
+    },
     "wpa": {
       "name": "wpa",
       "version": "1.9.1",
@@ -125691,26 +129987,26 @@
     },
     "wqtrends": {
       "name": "wqtrends",
-      "version": "1.4.2",
-      "sha256": "17hgh4kp5nlq5n8nrd0zrjj87rlk8ny67nbdlqnr9q0y5yxbyw63",
+      "version": "1.5.0",
+      "sha256": "0swgjxq1i6pgflvavwq2dcdw21mc9bngqy18l089xrdv8kvilw4m",
       "depends": ["dplyr", "ggplot2", "lubridate", "mgcv", "mixmeta", "plotly", "purrr", "tibble", "tidyr", "viridisLite"]
     },
     "wrGraph": {
       "name": "wrGraph",
-      "version": "1.3.7",
-      "sha256": "127s4i73ww817q9k7x463633rlk8fj0kjvpwqwcaxswdc7a3ks7b",
+      "version": "1.3.8",
+      "sha256": "13wnj9260nchac59spg7k9vw073pa50kj98hvq5snr1j33nrxzgr",
       "depends": ["RColorBrewer", "lattice", "wrMisc"]
     },
     "wrMisc": {
       "name": "wrMisc",
-      "version": "1.15.1",
-      "sha256": "1ii3dl2dpxrshhh8dfvn75s7rn99ylvldb46cc3pdadjb8czzgmn",
+      "version": "1.15.2",
+      "sha256": "0pp1m2ijvkdyagc6rzfafgq2348lxdi5rplnsslg5wx0j88g5m92",
       "depends": ["MASS"]
     },
     "wrProteo": {
       "name": "wrProteo",
-      "version": "1.12.0",
-      "sha256": "1ghkh0j4sh7bv6zz73bdbdyjqhyc1q53flzzpq0khr98hl4rn6dv",
+      "version": "1.13.0",
+      "sha256": "0dv3s7dn9d1ssm6al4fsjr6702hlmlcw8z60qgsvzi3m226rpv5s",
       "depends": ["knitr", "limma", "wrMisc"]
     },
     "wrTopDownFrag": {
@@ -125727,9 +130023,9 @@
     },
     "wrappedtools": {
       "name": "wrappedtools",
-      "version": "0.9.5",
-      "sha256": "1rpbfsh8cs07icc8440rmcmgwzjwrax86hk7hx7zwmsjigap3pxi",
-      "depends": ["DescTools", "boot", "broom", "coin", "dplyr", "flextable", "forcats", "ggplot2", "glue", "kableExtra", "knitr", "lifecycle", "purrr", "rlang", "rlist", "stringr", "tibble", "tidyr"]
+      "version": "0.9.6",
+      "sha256": "0bp21x84rbmv5v0kv6bw41m6lq8mck24xv4ngkn2jywdjfpw3f8n",
+      "depends": ["DescTools", "boot", "broom", "coin", "dplyr", "flextable", "forcats", "ggplot2", "glue", "kableExtra", "knitr", "lifecycle", "nortest", "purrr", "rlang", "rlist", "stringr", "tibble", "tidyr"]
     },
     "wrappr": {
       "name": "wrappr",
@@ -125757,8 +130053,8 @@
     },
     "writexl": {
       "name": "writexl",
-      "version": "1.5.0",
-      "sha256": "1kkd17xw7giy1k2azw1xnagka7ihicp17bi7nzlm3gqay1cdqlz2",
+      "version": "1.5.1",
+      "sha256": "14wv9l927bh57jbdxcf8wb429mz85x5bnsm31i2j3m0db0ikf4ax",
       "depends": []
     },
     "wrswoR": {
@@ -125829,8 +130125,8 @@
     },
     "wxgenR": {
       "name": "wxgenR",
-      "version": "1.4.1",
-      "sha256": "057wvdkanzwc900fcfn26bs29sq4xsbvmp4xm6bvh21iy2ijj96d",
+      "version": "1.4.2",
+      "sha256": "1m879478lvidcs1f844f5552kbgdxxbphk67w9pxgjx9mx8cmcxn",
       "depends": ["doParallel", "dplyr", "foreach", "lubridate", "magrittr", "msm", "plyr", "sm"]
     },
     "wyz_code_metaTesting": {
@@ -125899,12 +130195,6 @@
       "sha256": "07mib63zbvffr4w8klpv017d13wvqy3mwrpssr0vydcj8475gjfx",
       "depends": ["RCurl", "countrycode", "haven"]
     },
-    "xVA": {
-      "name": "xVA",
-      "version": "1.1",
-      "sha256": "06y9qhly14y5r8d1g85jdzz8x5lwzfjkiy5zak6146mknl4nzz11",
-      "depends": ["SACCR", "Trading", "data_table"]
-    },
     "xadmix": {
       "name": "xadmix",
       "version": "1.0.0",
@@ -125925,8 +130215,8 @@
     },
     "xaringanthemer": {
       "name": "xaringanthemer",
-      "version": "0.4.2",
-      "sha256": "074lq9m61647ac7crjmpf8qjj4l60ps0ic4c4b83g47drar79v2z",
+      "version": "0.4.3",
+      "sha256": "006cqs42r4i6s73kf59n9yg7zwpliq9wsxac473rq48yal7nja46",
       "depends": ["colorspace", "glue", "purrr", "whisker"]
     },
     "xdcclarge": {
@@ -126015,8 +130305,8 @@
     },
     "xfun": {
       "name": "xfun",
-      "version": "0.47",
-      "sha256": "0jrc4g799nhyra8n202107mx7h42yzz4n4yblf3fdwjdpzyp964r",
+      "version": "0.49",
+      "sha256": "0xdkn58bj8f0gx10wwl5ak8plk5d4jvv1sh12swahjyabj4h48fd",
       "depends": []
     },
     "xgb2sql": {
@@ -126033,8 +130323,8 @@
     },
     "xgrove": {
       "name": "xgrove",
-      "version": "0.1-7",
-      "sha256": "0sfnylzpgqsg7jvcy9yjywj13zl6np59qiciw0yr8fm4d91sxwnh",
+      "version": "0.1-13",
+      "sha256": "1x2fwg7n0k1lxjy53la5xacphx14ak49v3wd5cha2qsrsm9pdrl0",
       "depends": ["dplyr", "gbm", "rpart", "rpart_plot"]
     },
     "xgxr": {
@@ -126139,6 +130429,12 @@
       "sha256": "13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs",
       "depends": ["base64enc", "curl", "xml2"]
     },
+    "xmlwriter": {
+      "name": "xmlwriter",
+      "version": "0.1.1",
+      "sha256": "1gk74blg5ghnhk51lj3q6m5vzzpl19m5zqy1bg0lz6ibivzvy9mg",
+      "depends": ["Rcpp"]
+    },
     "xmpdf": {
       "name": "xmpdf",
       "version": "0.2.1",
@@ -126183,14 +130479,14 @@
     },
     "xplorerr": {
       "name": "xplorerr",
-      "version": "0.1.2",
-      "sha256": "0sca6nngjs6f51di4dgzx868p75bzas0msr0kgivavsv6rj5fz0r",
+      "version": "0.2.0",
+      "sha256": "0qff0ng5grigwq0185s7dl4k4xzfwwry9ssad3bd6nnvrnpggs29",
       "depends": ["Rcpp", "shiny"]
     },
     "xportr": {
       "name": "xportr",
-      "version": "0.4.0",
-      "sha256": "0yxd94qr30lq8pmkc7cfxccnq5ln1sawk8bxpv1v29hgafnr2wgv",
+      "version": "0.4.1",
+      "sha256": "1s0wz7zs8g2j88a0vxi2zywb4a8sysjk5h71fslg5xnxkqm5jx2m",
       "depends": ["checkmate", "cli", "dplyr", "glue", "haven", "lifecycle", "magrittr", "purrr", "readr", "rlang", "stringr", "tidyselect"]
     },
     "xpose": {
@@ -126205,6 +130501,12 @@
       "sha256": "0scq6brd7sn1ybmacxlpdlmkwxbn9sc2gpzw6438fwfjss6sza8s",
       "depends": ["crayon", "dplyr", "ggplot2", "magrittr", "nlmixr2est", "rlang", "stringr", "tibble", "tidyr", "vpc", "xpose"]
     },
+    "xpose_xtras": {
+      "name": "xpose.xtras",
+      "version": "0.0.2",
+      "sha256": "0zrwjm2m692f4lv1wiyjmmyc7qcr1wihf3fygp0n8jvb590wspk6",
+      "depends": ["GGally", "assertthat", "cli", "colorspace", "conflicted", "dplyr", "forcats", "ggplot2", "glue", "lifecycle", "magrittr", "pmxcv", "purrr", "readr", "rlang", "stringr", "tibble", "tidyr", "tidyselect", "vctrs", "xpose"]
+    },
     "xpose4": {
       "name": "xpose4",
       "version": "4.7.3",
@@ -126231,8 +130533,8 @@
     },
     "xslt": {
       "name": "xslt",
-      "version": "1.4.5",
-      "sha256": "03blm5sa4dw44i2gp015y349hw424r2ykwdn992dblwn6k6sgqxk",
+      "version": "1.5.0",
+      "sha256": "15va9annf8hsx6zdf1xmi14jfa8hm614jqhrba05mqg5873hj9vh",
       "depends": ["Rcpp", "xml2"]
     },
     "xsp": {
@@ -126255,8 +130557,8 @@
     },
     "xts": {
       "name": "xts",
-      "version": "0.14.0",
-      "sha256": "1nfgbwzibzjni2p8ssvrsyhf75y1g53j1z6kp8ashxlqzbp1d2yj",
+      "version": "0.14.1",
+      "sha256": "0kvz75dygr1riyijxsz8vx86fk6yyghilgc9l74lqx405yrnpaax",
       "depends": ["zoo"]
     },
     "xtsum": {
@@ -126309,8 +130611,8 @@
     },
     "yaImpute": {
       "name": "yaImpute",
-      "version": "1.0-34",
-      "sha256": "0wwaibplh4p8lwz5ck63jrdg9jaxr1w9q8xwpf048y6abz4rij5l",
+      "version": "1.0-34.1",
+      "sha256": "1ph8cg23pdv2rjbz9ddg8znpzxl8ij1aizgqi7dxqbb8hzc1k6b7",
       "depends": []
     },
     "yacca": {
@@ -126327,8 +130629,8 @@
     },
     "yahoofinancer": {
       "name": "yahoofinancer",
-      "version": "0.3.0",
-      "sha256": "197pidwi69hqrw6qpjg5d2y5mqp2rma4p8wsr2h51957qqql4z5d",
+      "version": "0.4.0",
+      "sha256": "1qs358lxl3pycy64f3dxc74g5kz5yrl8m2lq0w6kn0zdbligy459",
       "depends": ["R6", "curl", "httr", "jsonlite", "lubridate", "magrittr", "purrr", "stringr"]
     },
     "yaml": {
@@ -126339,8 +130641,8 @@
     },
     "yamlet": {
       "name": "yamlet",
-      "version": "1.0.3",
-      "sha256": "06nkxzc5g6asznib73g22710i5dvk4vmmjg2yvnxnf27fyx1s6aq",
+      "version": "1.2.0",
+      "sha256": "0ia9z8410raa54fm2jzh95zr8szbwicp7jg80pj818mbg1xi8lhn",
       "depends": ["csv", "dplyr", "encode", "ggplot2", "knitr", "pillar", "rlang", "scales", "spork", "tidyr", "units", "vctrs", "xtable", "yaml"]
     },
     "yamlme": {
@@ -126411,8 +130713,8 @@
     },
     "ymd": {
       "name": "ymd",
-      "version": "0.1.1",
-      "sha256": "03lsq0prm4pzqmaiap5yddnpfl544ippp8vmdrvnc3d8n9fi6fg2",
+      "version": "0.1.4",
+      "sha256": "0xw8qf9dzih6jwrld45dhy47pmvsphk9fwkccygmm153x724aama",
       "depends": []
     },
     "ymlthis": {
@@ -126423,8 +130725,8 @@
     },
     "ympes": {
       "name": "ympes",
-      "version": "1.3.0",
-      "sha256": "12bs2b4gb4767sbkpvykspm5ip62y88bk3rxbmn6l23i3k2j1fl4",
+      "version": "1.7.0",
+      "sha256": "0sdfbdlz7sjjmwn9kg2lbbmy3k2w8x0wbvyil8dxhzqpc4nc6pzq",
       "depends": []
     },
     "yodel": {
@@ -126471,9 +130773,9 @@
     },
     "yulab_utils": {
       "name": "yulab.utils",
-      "version": "0.1.6",
-      "sha256": "1v5y6i7s98lcw82rq815nznr9r1jqhpkb3vlqd6xixr52jnyg6sq",
-      "depends": ["cli", "digest", "fs", "httr2", "rlang"]
+      "version": "0.1.8",
+      "sha256": "1dhjd64iha5v34jlcak487vjdwc1yw23a6xdpv76fg88ywwj8j8w",
+      "depends": ["cli", "digest", "fs", "rlang"]
     },
     "yum": {
       "name": "yum",
@@ -126621,8 +130923,8 @@
     },
     "zipangu": {
       "name": "zipangu",
-      "version": "0.3.2",
-      "sha256": "0l5jhv0xl0rh7z546zn2p3gaci1v7d9d3ha6040kixclkmhb5dp6",
+      "version": "0.3.3",
+      "sha256": "1m68y8r691zdvg2n1mknhz6y58spiipdi7ip3za1laq2yzbg6wqq",
       "depends": ["arabic2kansuji", "dplyr", "lifecycle", "lubridate", "magrittr", "memoise", "purrr", "rlang", "stringi", "stringr", "tibble"]
     },
     "zipcodeR": {
@@ -126741,8 +131043,8 @@
     },
     "zoomerjoin": {
       "name": "zoomerjoin",
-      "version": "0.1.5",
-      "sha256": "09k18igddp4lwakd0k8vg767sahw5rq6ww9fkwhxwh6rxlx4bj2y",
+      "version": "0.2.0",
+      "sha256": "0bj5rmagm9f7qz0d6y698ipwcns4l2iz1mwcvn6dccpj2fnhn6m6",
       "depends": ["collapse", "dplyr", "tibble", "tidyr"]
     },
     "zoomr": {
@@ -126920,13 +131222,6 @@
       "depends": ["maptools", "raster", "rgdal", "sp", "withr"],
       "broken": true
     },
-    "ARDECO": {
-      "name": "ARDECO",
-      "version": "1.0.1",
-      "sha256": "1m249r65kh18v57wlhg9fv26fla5sbxqfqm725f95677ck852jf2",
-      "depends": ["dplyr", "ghql", "httr", "jsonlite", "rjstat", "tidyr"],
-      "broken": true
-    },
     "AROC": {
       "name": "AROC",
       "version": "1.0-4",
@@ -127207,6 +131502,13 @@
       "depends": ["HI", "lme4", "locfit", "secr"],
       "broken": true
     },
+    "BBSSL": {
+      "name": "BBSSL",
+      "version": "0.1.0",
+      "sha256": "0vb3afbx8p3frliy92sf2wlmx32rasxj39i8d023m2dvsblbh50x",
+      "depends": ["Matrix", "glmnet", "greybox", "mvnfast", "rmutil", "statmod", "svMisc", "truncnorm"],
+      "broken": true
+    },
     "BBcor": {
       "name": "BBcor",
       "version": "1.0.3",
@@ -127235,6 +131537,13 @@
       "depends": ["ggplot2", "reshape2"],
       "broken": true
     },
+    "BENMMI": {
+      "name": "BENMMI",
+      "version": "4.3-7",
+      "sha256": "1v96g4l1zkpvvx8jdifnafyaz4ml8v1bxbl97r1n5n6mgw88gk77",
+      "depends": ["benthos", "dplyr", "ggplot2", "jsonlite", "knitr", "markdown", "purrr", "readr", "tidyr", "xtable"],
+      "broken": true
+    },
     "BEST": {
       "name": "BEST",
       "version": "0.5.4",
@@ -127333,6 +131642,13 @@
       "depends": ["DIME", "hash"],
       "broken": true
     },
+    "BOSO": {
+      "name": "BOSO",
+      "version": "1.0.4",
+      "sha256": "1g7277xw9bgq575x7fhjwpja6sfbg51di7hawxhmc57kvvmpx032",
+      "depends": ["MASS", "Matrix"],
+      "broken": true
+    },
     "BPEC": {
       "name": "BPEC",
       "version": "1.3.1",
@@ -127424,6 +131740,13 @@
       "depends": ["fields", "igraph", "Matrix", "mvnfast", "Rcpp", "RcppArmadillo", "spam"],
       "broken": true
     },
+    "BayesMassBal": {
+      "name": "BayesMassBal",
+      "version": "1.1.0",
+      "sha256": "1cgcx8kvn0bmn8kmq8ri3k98yx085d2qndislbwhn833ws6vkl88",
+      "depends": ["HDInterval", "LaplacesDemon", "Matrix", "Rdpack", "coda", "pracma", "tmvtnorm"],
+      "broken": true
+    },
     "BayesNI": {
       "name": "BayesNI",
       "version": "0.1",
@@ -127557,13 +131880,6 @@
       "depends": ["cluster", "dbscan", "factoextra", "gplots", "RColorBrewer"],
       "broken": true
     },
-    "Bios2cor": {
-      "name": "Bios2cor",
-      "version": "2.2.1",
-      "sha256": "0xj7ab9a463p4a67y0hlv6mfd08xf8didkn2mwrfa7gxjqqvix4z",
-      "depends": ["bigmemory", "bio3d", "circular", "igraph"],
-      "broken": true
-    },
     "BiplotML": {
       "name": "BiplotML",
       "version": "1.1.0",
@@ -127648,6 +131964,13 @@
       "depends": ["bio_infer", "car", "gdata", "gmodels", "JavaGD", "JGR", "lattice", "MASS", "quantreg", "rJava", "rpart", "XML"],
       "broken": true
     },
+    "CAMAN": {
+      "name": "CAMAN",
+      "version": "0.78",
+      "sha256": "10llppi2k3jq36mpig2djaf5kdx3ils2i1zvcypdry8xpkz80h9l",
+      "depends": ["mvtnorm", "sp"],
+      "broken": true
+    },
     "CARE1": {
       "name": "CARE1",
       "version": "1.1.0",
@@ -127844,6 +132167,13 @@
       "depends": [],
       "broken": true
     },
+    "CRF": {
+      "name": "CRF",
+      "version": "0.4-3",
+      "sha256": "0jlcc1ffd2z7sz1szbi4vrp5rihmcp18bsw27x02ivi6l21nyivf",
+      "depends": ["Matrix"],
+      "broken": true
+    },
     "CSCDRNA": {
       "name": "CSCDRNA",
       "version": "1.0.3",
@@ -127858,13 +132188,6 @@
       "depends": ["elasticnet", "fabia", "FactoMineR", "pls", "randomcoloR", "snowFT"],
       "broken": true
     },
-    "CSTE": {
-      "name": "CSTE",
-      "version": "2.0.0",
-      "sha256": "0r38pvd83aw9zrq43malw50vlbnknh3b53x3ydj0wxrk95wsmy46",
-      "depends": ["dfoptim", "fda", "locpol", "Rcpp", "survival"],
-      "broken": true
-    },
     "CSUV": {
       "name": "CSUV",
       "version": "0.1.1",
@@ -128089,11 +132412,11 @@
       "depends": ["ggplot2", "metafor"],
       "broken": true
     },
-    "ConjointChecks": {
-      "name": "ConjointChecks",
-      "version": "0.0.9",
-      "sha256": "097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1",
-      "depends": [],
+    "ConnectednessApproach": {
+      "name": "ConnectednessApproach",
+      "version": "1.0.3",
+      "sha256": "1vbnj2r4x8pfzdagky33xz9kpb23d7vz5ddgms8fp15zjilsz2nw",
+      "depends": ["L1pack", "MASS", "PerformanceAnalytics", "car", "frequencyConnectedness", "glmnet", "igraph", "moments", "progress", "quantreg", "riskParityPortfolio", "rmgarch", "rugarch", "urca", "xts", "zoo"],
       "broken": true
     },
     "CopulaDTA": {
@@ -128117,6 +132440,20 @@
       "depends": ["mcc"],
       "broken": true
     },
+    "Corbi": {
+      "name": "Corbi",
+      "version": "0.6-2",
+      "sha256": "13lbh6fcfrpgz459mjdnfkd8kys2350s8j0vv9ps18092264gh42",
+      "depends": ["CRF", "MASS", "Matrix", "igraph"],
+      "broken": true
+    },
+    "CoronaNetR": {
+      "name": "CoronaNetR",
+      "version": "0.3.0",
+      "sha256": "1qqlkcbwmr9g8rnsgb7dd1npd09sva11y6fy1g7l4wdvmpw07ymh",
+      "depends": ["R_utils", "httr", "readr"],
+      "broken": true
+    },
     "CorporaCoCo": {
       "name": "CorporaCoCo",
       "version": "2.0",
@@ -128285,13 +132622,6 @@
       "depends": ["Matrix"],
       "broken": true
     },
-    "DMCfun": {
-      "name": "DMCfun",
-      "version": "3.5.4",
-      "sha256": "0kw0hzg5hwj76yz02ws62dmji7ggjm5isnh4blfhw55fsn7b6aic",
-      "depends": ["BH", "DEoptim", "dplyr", "pbapply", "Rcpp", "tidyr"],
-      "broken": true
-    },
     "DMLLZU": {
       "name": "DMLLZU",
       "version": "0.1.1",
@@ -128369,6 +132699,13 @@
       "depends": ["dygraphs", "htmltools", "ncdf4", "raster", "rgdal"],
       "broken": true
     },
+    "DWLasso": {
+      "name": "DWLasso",
+      "version": "1.1",
+      "sha256": "1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z",
+      "depends": ["Matrix", "glmnet", "hglasso"],
+      "broken": true
+    },
     "Data2LD": {
       "name": "Data2LD",
       "version": "3.2.1",
@@ -128607,6 +132944,13 @@
       "depends": [],
       "broken": true
     },
+    "DynamicGP": {
+      "name": "DynamicGP",
+      "version": "1.1-9",
+      "sha256": "00hf3r39b9xid129kzgdnwdfrwrspxkz7dydgna3c5lrl7670paz",
+      "depends": ["lhs"],
+      "broken": true
+    },
     "EBASS": {
       "name": "EBASS",
       "version": "0.1",
@@ -128614,6 +132958,13 @@
       "depends": [],
       "broken": true
     },
+    "EBglmnet": {
+      "name": "EBglmnet",
+      "version": "6.0",
+      "sha256": "014rpci2lcrqaldir2ds1fvzbvkj6n00n9xzl5m0f60zzg9cckjm",
+      "depends": [],
+      "broken": true
+    },
     "ECctmc": {
       "name": "ECctmc",
       "version": "0.2.5",
@@ -128621,6 +132972,13 @@
       "depends": ["Rcpp", "RcppArmadillo"],
       "broken": true
     },
+    "EDA": {
+      "name": "EDA",
+      "version": "1.3",
+      "sha256": "08zqykvga7w07iy00c94q03mrxmjv649ggk7lmksjzy5j3wgyb6d",
+      "depends": ["ggplot2"],
+      "broken": true
+    },
     "EDFIR": {
       "name": "EDFIR",
       "version": "1.0",
@@ -128628,6 +132986,20 @@
       "depends": ["geometry", "lpSolve", "MASS", "vertexenum"],
       "broken": true
     },
+    "EDMeasure": {
+      "name": "EDMeasure",
+      "version": "1.2.0",
+      "sha256": "1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv",
+      "depends": ["dHSIC", "energy", "rBayesianOptimization"],
+      "broken": true
+    },
+    "EEAaq": {
+      "name": "EEAaq",
+      "version": "0.0.3",
+      "sha256": "0qs6sqiqwl33bjz9k8hlfsqaawq3cc0ygm73pc8h200c5jwdk94n",
+      "depends": ["aweek", "curl", "dplyr", "ggplot2", "ggpubr", "gifski", "gstat", "htmlwidgets", "leaflet", "lubridate", "mondate", "raster", "readr", "sf", "stringr", "tibble", "tictoc", "tidyr"],
+      "broken": true
+    },
     "EIAdata": {
       "name": "EIAdata",
       "version": "0.1.3",
@@ -128796,6 +133168,13 @@
       "depends": ["dplyr", "flextable", "highcharter", "httr", "httr2", "jsonlite", "magrittr", "rlang", "rvest", "stringr", "xts"],
       "broken": true
     },
+    "EurosarcBayes": {
+      "name": "EurosarcBayes",
+      "version": "1.1",
+      "sha256": "12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm",
+      "depends": ["VGAM", "clinfun", "data_table", "plyr", "shiny"],
+      "broken": true
+    },
     "EvalEst": {
       "name": "EvalEst",
       "version": "2021.2-1",
@@ -128880,11 +133259,11 @@
       "depends": [],
       "broken": true
     },
-    "FLSSS": {
-      "name": "FLSSS",
-      "version": "9.1.3",
-      "sha256": "1mjjnasc5f3l44dch7wjxl0b6jbcyjkk6m5b3xgjrir5qyy7fmdk",
-      "depends": ["Rcpp", "RcppParallel"],
+    "FLLat": {
+      "name": "FLLat",
+      "version": "1.2-1",
+      "sha256": "0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1",
+      "depends": ["gplots"],
       "broken": true
     },
     "FPCA2D": {
@@ -129055,6 +133434,13 @@
       "depends": ["RankAggreg"],
       "broken": true
     },
+    "FuzzyStatTraEOO": {
+      "name": "FuzzyStatTraEOO",
+      "version": "1.0",
+      "sha256": "0jxjnmsznab0nf6nrjvdcy2gjmzn7fa0va993f7ylasr2pjawgsd",
+      "depends": ["R6"],
+      "broken": true
+    },
     "FuzzyToolkitUoN": {
       "name": "FuzzyToolkitUoN",
       "version": "1.0",
@@ -129139,11 +133525,11 @@
       "depends": ["rgl", "tkrplot"],
       "broken": true
     },
-    "GISTools": {
-      "name": "GISTools",
-      "version": "0.7-4",
-      "sha256": "06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs",
-      "depends": ["maptools", "MASS", "RColorBrewer", "rgeos", "sp"],
+    "GLIDE": {
+      "name": "GLIDE",
+      "version": "1.0.5",
+      "sha256": "01164gh0j4g0hambiq92bxrd3j3z2psg19faj32mvhmn4c3k2m8i",
+      "depends": ["MASS", "doParallel", "foreach"],
       "broken": true
     },
     "GMZTests": {
@@ -129160,6 +133546,13 @@
       "depends": ["GANPA", "WGCNA"],
       "broken": true
     },
+    "GPIC": {
+      "name": "GPIC",
+      "version": "0.1.0",
+      "sha256": "1v44hkzf3wh09j5pcfmsc8h5jzmqa501bwkmdwwjb7pz64976r23",
+      "depends": [],
+      "broken": true
+    },
     "GPoM_FDLyapu": {
       "name": "GPoM.FDLyapu",
       "version": "1.0",
@@ -129209,6 +133602,13 @@
       "depends": ["circlize", "dendextend", "dplyr", "DT", "ggplot2", "igraph", "Matrix", "psych", "raster", "Rcpp", "stringi", "stringr", "tibble", "tidyr", "tmod", "withr"],
       "broken": true
     },
+    "GUIDE": {
+      "name": "GUIDE",
+      "version": "1.2.7",
+      "sha256": "0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v",
+      "depends": ["rpanel", "tkrplot"],
+      "broken": true
+    },
     "GWG": {
       "name": "GWG",
       "version": "1.0",
@@ -129230,6 +133630,13 @@
       "depends": [],
       "broken": true
     },
+    "GaMaBioMD": {
+      "name": "GaMaBioMD",
+      "version": "0.2.0",
+      "sha256": "15rx6xycnxldaxyjhcgysfz7zj6cjwlfkjjm6jyhxxvw4h2nw75m",
+      "depends": ["Biostrings", "ape", "dendextend", "dplyr", "ggplot2", "heatmaply", "magrittr", "reshape2", "traits"],
+      "broken": true
+    },
     "GapAnalysis": {
       "name": "GapAnalysis",
       "version": "1.0.2",
@@ -129314,13 +133721,6 @@
       "depends": ["MASS", "Matrix"],
       "broken": true
     },
-    "GeoFIS": {
-      "name": "GeoFIS",
-      "version": "1.0.4",
-      "sha256": "095lwn9kldhs8nhpp0b6fzhwn5b8ar8511b4144xjks70f7kg7ym",
-      "depends": ["BH", "data_tree", "FisPro", "foreach", "nnls", "R6", "Rcpp", "Rdpack", "rgeos", "sp"],
-      "broken": true
-    },
     "GeoLight": {
       "name": "GeoLight",
       "version": "2.0.0",
@@ -129496,6 +133896,13 @@
       "depends": ["nnet"],
       "broken": true
     },
+    "HKprocess": {
+      "name": "HKprocess",
+      "version": "0.1-1",
+      "sha256": "0kn84ccaypknxymynp6lnr8asd85rlzbk073z7511rriyz96hyj7",
+      "depends": ["MCMCpack", "gtools"],
+      "broken": true
+    },
     "HLSM": {
       "name": "HLSM",
       "version": "0.9.0",
@@ -129510,13 +133917,6 @@
       "depends": [],
       "broken": true
     },
-    "HMMcopula": {
-      "name": "HMMcopula",
-      "version": "1.0.4",
-      "sha256": "1gmvav02r3miaq4jx05qjcgzw5qv6w1j77vck5gpps8p38zcp34m",
-      "depends": ["copula", "doParallel", "foreach", "matrixcalc", "mvtnorm"],
-      "broken": true
-    },
     "HMVD": {
       "name": "HMVD",
       "version": "1.0",
@@ -129545,11 +133945,18 @@
       "depends": [],
       "broken": true
     },
-    "HSAR": {
-      "name": "HSAR",
-      "version": "0.5.1",
-      "sha256": "03ryscvgiiwjcqk6gy3251nqqk43x508kz3ibw35hi84m2s7fsxj",
-      "depends": ["Rcpp", "RcppArmadillo", "spatialreg", "spdep"],
+    "HS": {
+      "name": "HS",
+      "version": "1.1",
+      "sha256": "1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp",
+      "depends": ["data_table", "ggplot2", "ggpubr", "partitions", "reshape2", "tidyr", "zoo"],
+      "broken": true
+    },
+    "HTSSIP": {
+      "name": "HTSSIP",
+      "version": "1.4.1",
+      "sha256": "1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3",
+      "depends": ["DESeq2", "ape", "coenocliner", "dplyr", "ggplot2", "igraph", "lazyeval", "magrittr", "phyloseq", "plyr", "stringr", "tidyr", "vegan"],
       "broken": true
     },
     "HW_pval": {
@@ -129727,6 +134134,13 @@
       "depends": ["data_table", "httr", "tibble"],
       "broken": true
     },
+    "IDSA": {
+      "name": "IDSA",
+      "version": "2.1",
+      "sha256": "0ld2359ksnw9jrjicnqikh5r321mfy2i7vzlhh9phm60k0qf5j98",
+      "depends": ["GD", "ggplot2", "kableExtra", "reshape2"],
+      "broken": true
+    },
     "IFAA": {
       "name": "IFAA",
       "version": "1.1.2",
@@ -129762,6 +134176,13 @@
       "depends": ["httr", "jsonlite", "plyr"],
       "broken": true
     },
+    "IPDFileCheck": {
+      "name": "IPDFileCheck",
+      "version": "0.8.1",
+      "sha256": "0xab1z8fj7clz00bk230krlmfmywwv4bwdvn2w8b4l0hgh9b9a8z",
+      "depends": ["dplyr", "eeptools", "effsize", "gtsummary", "hash", "kableExtra", "lubridate", "stringr", "testthat", "tidyselect"],
+      "broken": true
+    },
     "IPMRF": {
       "name": "IPMRF",
       "version": "1.2",
@@ -129839,13 +134260,6 @@
       "depends": ["coda", "maptools", "MASS", "ncdf4", "raster", "Rcpp", "RcppArmadillo", "rgeos", "sp"],
       "broken": true
     },
-    "IgorR": {
-      "name": "IgorR",
-      "version": "0.8.1",
-      "sha256": "1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx",
-      "depends": ["bitops"],
-      "broken": true
-    },
     "ImaginR": {
       "name": "ImaginR",
       "version": "0.1.7",
@@ -130112,6 +134526,13 @@
       "depends": ["fdapace", "survival"],
       "broken": true
     },
+    "LDLcalc": {
+      "name": "LDLcalc",
+      "version": "2.1",
+      "sha256": "0bw0a7dh8j215y09n17w1zvnx72s9i5pv509wayl46wl2v6zz4rx",
+      "depends": ["RColorBrewer", "caret", "caretEnsemble", "corrplot", "data_table", "ggplot2", "janitor", "lares", "lattice", "moments", "philentropy", "resample"],
+      "broken": true
+    },
     "LDOD": {
       "name": "LDOD",
       "version": "1.0",
@@ -130175,6 +134596,13 @@
       "depends": ["BB", "Bolstad2", "moments", "optimx", "Rmpfr", "sn"],
       "broken": true
     },
+    "LOGANTree": {
+      "name": "LOGANTree",
+      "version": "0.1.1",
+      "sha256": "0zbll6bb9c3zrmnw8ccknfi6my4pkv0pq4hq742w393nni3dlahq",
+      "depends": ["ROCR", "caret", "caretEnsemble", "dplyr", "gbm", "ggplot2", "rpart_plot", "tibble"],
+      "broken": true
+    },
     "LOGICOIL": {
       "name": "LOGICOIL",
       "version": "0.99.0",
@@ -130182,13 +134610,6 @@
       "depends": ["nnet"],
       "broken": true
     },
-    "LPDynR": {
-      "name": "LPDynR",
-      "version": "1.0.4",
-      "sha256": "1ghiy5cc3s4bc2vrl2kxhpa9hvcp37hbdx56mligggk504w6mphy",
-      "depends": ["data_table", "dplyr", "magrittr", "terra", "virtualspecies"],
-      "broken": true
-    },
     "LPStimeSeries": {
       "name": "LPStimeSeries",
       "version": "1.0-5",
@@ -130385,6 +134806,20 @@
       "depends": [],
       "broken": true
     },
+    "MBNMAdose": {
+      "name": "MBNMAdose",
+      "version": "0.4.3",
+      "sha256": "1dqh7z6wpnryl9djfsacbdm4b4my08kh4l63vd31xs742sywv6i0",
+      "depends": ["R2jags", "Rdpack", "checkmate", "dplyr", "igraph", "magrittr", "reshape2", "rjags", "scales"],
+      "broken": true
+    },
+    "MBNMAtime": {
+      "name": "MBNMAtime",
+      "version": "0.2.4",
+      "sha256": "1ny438dy62zrafyf7nng2hq5v311l1zc5xd39452fgq6ij0rnrni",
+      "depends": ["R2jags", "Rdpack", "checkmate", "dplyr", "gridExtra", "knitr", "magrittr", "reshape2", "rjags"],
+      "broken": true
+    },
     "MC2toPath": {
       "name": "MC2toPath",
       "version": "0.0.16",
@@ -130588,6 +135023,13 @@
       "depends": ["assertthat", "bitops", "data_table", "gdalUtilities", "geojsonio", "httr", "jsonlite", "raster", "sf", "stringr", "xml2", "xts"],
       "broken": true
     },
+    "MOSS": {
+      "name": "MOSS",
+      "version": "0.2.2",
+      "sha256": "0gjsyv74hhjknlnplc8157mmypnfy1yjrs400pz0p4744k5c8c7s",
+      "depends": ["Rtsne", "cluster", "dbscan"],
+      "broken": true
+    },
     "MOrder": {
       "name": "MOrder",
       "version": "0.1",
@@ -130602,13 +135044,6 @@
       "depends": ["changepoint", "glmnet", "HDPenReg", "R_utils", "spikeslab"],
       "broken": true
     },
-    "MPCR": {
-      "name": "MPCR",
-      "version": "1.1.2",
-      "sha256": "0hq6df8rz7hi1s4kpcxlx21kppn70fjki8wfy6gi8kna8bmayyf7",
-      "depends": ["Rcpp"],
-      "broken": true
-    },
     "MPINet": {
       "name": "MPINet",
       "version": "1.0",
@@ -130637,11 +135072,11 @@
       "depends": [],
       "broken": true
     },
-    "MRCV": {
-      "name": "MRCV",
-      "version": "0.3-3",
-      "sha256": "0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf",
-      "depends": ["tables"],
+    "MRG": {
+      "name": "MRG",
+      "version": "0.3.1",
+      "sha256": "1n72qcmc7fn4rbxhkdjj1nxkq82kq3rsflg64dry31misfss41qy",
+      "depends": ["dplyr", "magrittr", "plyr", "purrr", "rlang", "sf", "sjmisc", "stars", "terra", "tidyr", "tidyselect", "vardpoor"],
       "broken": true
     },
     "MRH": {
@@ -130679,13 +135114,6 @@
       "depends": ["rgl"],
       "broken": true
     },
-    "MSinference": {
-      "name": "MSinference",
-      "version": "0.1.0",
-      "sha256": "1016i5khs5sh90ywffwkl1jjj3j08iw9hs1zhw08xz9p6sj6qz9n",
-      "depends": ["doParallel", "foreach", "Rcpp", "Rdpack"],
-      "broken": true
-    },
     "MVB": {
       "name": "MVB",
       "version": "1.1",
@@ -130707,6 +135135,13 @@
       "depends": ["glmnet"],
       "broken": true
     },
+    "MXM": {
+      "name": "MXM",
+      "version": "1.5.5",
+      "sha256": "15r4jnf1l2nrf67xkpvzg2h7yxxhjlkr454n691ssss9z0zpsgcl",
+      "depends": ["Hmisc", "MASS", "Rfast", "Rfast2", "bigmemory", "coxme", "doParallel", "dplyr", "energy", "foreach", "geepack", "knitr", "lme4", "nnet", "ordinal", "quantreg", "relations", "survival", "visNetwork"],
+      "broken": true
+    },
     "MaXact": {
       "name": "MaXact",
       "version": "0.2.1",
@@ -130721,13 +135156,6 @@
       "depends": ["prismatic", "raster", "rgdal"],
       "broken": true
     },
-    "MantaID": {
-      "name": "MantaID",
-      "version": "1.0.2",
-      "sha256": "01rc9p4ydq7s2iwqc017ijdbw8w8n0s82f0j69gsl6m5fbqm9a4k",
-      "depends": ["biomaRt", "caret", "data_table", "dplyr", "ggcorrplot", "ggplot2", "keras", "magrittr", "mlr3", "mlr3tuning", "paradox", "purrr", "RColorBrewer", "reshape2", "scutr", "stringr", "tibble", "tidyr", "tidyselect"],
-      "broken": true
-    },
     "MapeBay": {
       "name": "MapeBay",
       "version": "0.1.0",
@@ -130770,13 +135198,6 @@
       "depends": ["grr", "Matrix"],
       "broken": true
     },
-    "MaxMC": {
-      "name": "MaxMC",
-      "version": "0.1.1",
-      "sha256": "0n6m5h8n3gwmlqq563rpdx4l8ldzl6jx3ga50ygvlnamdj3wjqgm",
-      "depends": ["GA", "GenSA", "NMOF", "pso", "scales"],
-      "broken": true
-    },
     "MedOr": {
       "name": "MedOr",
       "version": "0.1",
@@ -130840,6 +135261,20 @@
       "depends": ["ChemmineR", "cmmr", "data_table", "DBI", "enviPat", "gsubfn", "Hmisc", "httr", "jsonlite", "KEGGREST", "pacman", "pbapply", "progress", "R_utils", "rcdk", "RCurl", "Rdisop", "readxl", "reshape2", "rJava", "RJSONIO", "rlist", "RSQLite", "rvest", "SPARQL", "stringi", "stringr", "webchem", "WikidataQueryServiceR", "XML", "xml2", "zip"],
       "broken": true
     },
+    "MetaIntegrator": {
+      "name": "MetaIntegrator",
+      "version": "2.1.3",
+      "sha256": "1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx",
+      "depends": ["AnnotationDbi", "Biobase", "BiocManager", "COCONUT", "DBI", "DT", "GEOmetadb", "GEOquery", "HGNChelper", "Metrics", "RMySQL", "ROCR", "RSQLite", "Rmisc", "boot", "data_table", "dplyr", "ggplot2", "ggpubr", "gplots", "httpuv", "magrittr", "manhattanly", "multtest", "pheatmap", "plotly", "plyr", "pracma", "preprocessCore", "readr", "reshape2", "rmarkdown", "rmeta", "stringr", "zoo"],
+      "broken": true
+    },
+    "MetaLonDA": {
+      "name": "MetaLonDA",
+      "version": "1.1.8",
+      "sha256": "0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g",
+      "depends": ["DESeq2", "doParallel", "edgeR", "ggplot2", "gss", "metagenomeSeq", "plyr", "pracma", "zoo"],
+      "broken": true
+    },
     "MetaPath": {
       "name": "MetaPath",
       "version": "1.0",
@@ -130973,13 +135408,6 @@
       "depends": ["prodlim"],
       "broken": true
     },
-    "MonotoneHazardRatio": {
-      "name": "MonotoneHazardRatio",
-      "version": "0.1.1",
-      "sha256": "19c3521czz7kdwcc1vg1x17y57w0qh498y93xgbxxlmidzb0p4nk",
-      "depends": ["fdrtool", "KernSmooth", "survival", "twostageTE"],
-      "broken": true
-    },
     "MorseGen": {
       "name": "MorseGen",
       "version": "1.2",
@@ -131197,13 +135625,6 @@
       "depends": [],
       "broken": true
     },
-    "NetSci": {
-      "name": "NetSci",
-      "version": "1.0.0",
-      "sha256": "1fliilk5z7lldkry5kijwab0k6ysqy87fcfrnwyywxkpxxrv1578",
-      "depends": ["binr", "cubature", "dplyr", "igraph", "magrittr", "Rfast", "wTO"],
-      "broken": true
-    },
     "NoiseFiltersR": {
       "name": "NoiseFiltersR",
       "version": "0.1.0",
@@ -131246,13 +135667,6 @@
       "depends": ["histogram", "optimx"],
       "broken": true
     },
-    "OBsMD": {
-      "name": "OBsMD",
-      "version": "11.1",
-      "sha256": "0gxx3ja4ii5ql1ss43g23jrbwzg3193wchqmrdm0iq7g33mmd16y",
-      "depends": [],
-      "broken": true
-    },
     "OData": {
       "name": "OData",
       "version": "0.6",
@@ -131316,13 +135730,6 @@
       "depends": ["cluster", "distances", "doParallel", "doRNG", "foreach", "plyr", "Rfast"],
       "broken": true
     },
-    "OasisR": {
-      "name": "OasisR",
-      "version": "3.1.0",
-      "sha256": "0jni6l3fbrd3pz34lis6zf6pqm3r29z32mxvkdfp4x9ncg68dlrs",
-      "depends": ["lwgeom", "measurements", "outliers", "seg", "sf", "spdep"],
-      "broken": true
-    },
     "OjaNP": {
       "name": "OjaNP",
       "version": "1.0-0",
@@ -131365,6 +135772,13 @@
       "depends": [],
       "broken": true
     },
+    "OpenTreeChronograms": {
+      "name": "OpenTreeChronograms",
+      "version": "2022.1.28",
+      "sha256": "0si5aaami2x705fmzp9357h1nwhdm3sb829cbvf7zfyicqyaihkg",
+      "depends": ["ape", "geiger", "knitcitations", "paleotree", "plyr", "rotl", "stringr", "taxize", "treebase", "usethis"],
+      "broken": true
+    },
     "OptInterim": {
       "name": "OptInterim",
       "version": "3.0.1",
@@ -131435,6 +135849,13 @@
       "depends": ["cluster", "GO_db"],
       "broken": true
     },
+    "PANPRSnext": {
+      "name": "PANPRSnext",
+      "version": "1.2.0",
+      "sha256": "1s9kv58af7hj65qxcnrsfjrh8xfqhm5m4kpg279li5b4g4cpnqx9",
+      "depends": ["Rcpp", "RcppArmadillo", "gtools"],
+      "broken": true
+    },
     "PAutilities": {
       "name": "PAutilities",
       "version": "1.1.0",
@@ -131533,6 +135954,13 @@
       "depends": [],
       "broken": true
     },
+    "PRISMAstatement": {
+      "name": "PRISMAstatement",
+      "version": "1.1.1",
+      "sha256": "1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z",
+      "depends": ["DiagrammeR"],
+      "broken": true
+    },
     "PROTOLIDAR": {
       "name": "PROTOLIDAR",
       "version": "0.1",
@@ -131547,6 +135975,13 @@
       "depends": ["knitr", "MCMCglmm", "pedigree", "plotrix"],
       "broken": true
     },
+    "PUPAIM": {
+      "name": "PUPAIM",
+      "version": "0.3.1",
+      "sha256": "1sypmlpjsdn2rm6pci64xv6ibixz43zhjaw0k8q9jp3cajbb11qh",
+      "depends": ["Metrics", "ggplot2", "nls2"],
+      "broken": true
+    },
     "PWD": {
       "name": "PWD",
       "version": "1.0",
@@ -131666,6 +136101,13 @@
       "depends": ["Matrix", "semver"],
       "broken": true
     },
+    "PlaneGeometry": {
+      "name": "PlaneGeometry",
+      "version": "1.6.0",
+      "sha256": "0v4484kh8aqni0n6nfd9c1wiw62fj439647xb583pbmxi5ja58hq",
+      "depends": ["CVXR", "Carlson", "R6", "fitConic", "rcdd", "sdpt3r", "stringr", "uniformly"],
+      "broken": true
+    },
     "Plasmode": {
       "name": "Plasmode",
       "version": "0.1.0",
@@ -131673,13 +136115,6 @@
       "depends": ["arm", "epiDisplay", "foreign", "gbm", "glm2", "lattice", "latticeExtra", "lme4", "MASS", "Matrix", "mgcv", "nlme", "nnet", "RColorBrewer", "survey", "survival", "twang", "xtable"],
       "broken": true
     },
-    "Platypus": {
-      "name": "Platypus",
-      "version": "3.5.0",
-      "sha256": "03ymh011wyhlc4pisnrac1nijfw08gc793dj2pzwxzkcwk7g3q99",
-      "depends": ["Biostrings", "cowplot", "dplyr", "ggplot2", "ggtree", "jsonlite", "knitr", "magrittr", "Matrix", "plyr", "reshape2", "seqinr", "Seurat", "SeuratObject", "stringr", "tibble", "tidyr", "useful"],
-      "broken": true
-    },
     "PlotRegionHighlighter": {
       "name": "PlotRegionHighlighter",
       "version": "1.0",
@@ -131890,6 +136325,13 @@
       "depends": [],
       "broken": true
     },
+    "R2SWF": {
+      "name": "R2SWF",
+      "version": "0.9-9",
+      "sha256": "0bd1lh8f16mvgvrzk080jpqajzl0fzmiq5d2f2k3lgf0hda0x4gl",
+      "depends": ["sysfonts"],
+      "broken": true
+    },
     "R330": {
       "name": "R330",
       "version": "1.0",
@@ -131918,6 +136360,13 @@
       "depends": ["boot", "doParallel", "fastcmprsk", "foreach", "glmnet", "lars"],
       "broken": true
     },
+    "RAFS": {
+      "name": "RAFS",
+      "version": "0.2.4",
+      "sha256": "02s4p7hsjm2znj5rcfrd2cqwynd03p8zbby8qxnfxr3hp5ggq7hr",
+      "depends": ["MDFS", "fastcluster", "splitTools"],
+      "broken": true
+    },
     "RAM": {
       "name": "RAM",
       "version": "1.2.1.7",
@@ -132191,6 +136640,13 @@
       "depends": ["distr", "distrEx", "RandVar", "ROptEstOld"],
       "broken": true
     },
+    "RPANDA": {
+      "name": "RPANDA",
+      "version": "2.3",
+      "sha256": "12cah5vw9jcpnprnfhqwdh11fkn68djzgvdv2hr23yppa8nfn9zc",
+      "depends": ["BB", "GUniFrac", "Matrix", "ParallelLogger", "RColorBrewer", "R_utils", "Rmpfr", "TESS", "ape", "bipartite", "cluster", "coda", "deSolve", "fields", "fpc", "geiger", "glassoFast", "igraph", "mvMORPH", "mvtnorm", "phangorn", "phytools", "picante", "pracma", "pspline", "pvclust", "raster", "vegan"],
+      "broken": true
+    },
     "RPCLR": {
       "name": "RPCLR",
       "version": "1.0",
@@ -132590,13 +137046,6 @@
       "depends": [],
       "broken": true
     },
-    "RefBasedMI": {
-      "name": "RefBasedMI",
-      "version": "0.1.1",
-      "sha256": "0gn80inzb9ldh85ihwn7jzpg6ccjhzb2f56qzk2w2wcd86s9j6lh",
-      "depends": ["assertthat", "data_table", "Hmisc", "mice", "norm2", "pastecs"],
-      "broken": true
-    },
     "RefFreeEWAS": {
       "name": "RefFreeEWAS",
       "version": "2.2",
@@ -132646,6 +137095,13 @@
       "depends": ["blavaan", "lavaan", "MASS", "mice", "quadprog", "rjags", "runjags"],
       "broken": true
     },
+    "ResearchAssociate": {
+      "name": "ResearchAssociate",
+      "version": "1.0.1",
+      "sha256": "00j339ngc72gn2gyn1irjmazrv6l5nbsy3z25r6j1zrjwsbay15p",
+      "depends": ["XML", "ggplot2", "plyr", "rentrez"],
+      "broken": true
+    },
     "Rga4gh": {
       "name": "Rga4gh",
       "version": "0.1.1",
@@ -132653,6 +137109,13 @@
       "depends": ["httr", "jsonlite"],
       "broken": true
     },
+    "Rgb": {
+      "name": "Rgb",
+      "version": "1.7.5",
+      "sha256": "1hj7hxvj785qg4j52bvwgczv21fhz2fjncvxn2fahsb4hdkrvfrm",
+      "depends": [],
+      "broken": true
+    },
     "Rhpc": {
       "name": "Rhpc",
       "version": "0.21-247",
@@ -132779,13 +137242,6 @@
       "depends": ["Rcpp", "RcppArmadillo", "Rdpack"],
       "broken": true
     },
-    "Rraven": {
-      "name": "Rraven",
-      "version": "1.0.13",
-      "sha256": "0nlqr1hzbzbz4rb3hjy01iw8czhaqvwmy9hh728fgl5vajwqwn8g",
-      "depends": ["NatureSounds", "pbapply", "seewave", "tuneR", "warbleR"],
-      "broken": true
-    },
     "Rrdrand": {
       "name": "Rrdrand",
       "version": "0.1-16",
@@ -132870,6 +137326,13 @@
       "depends": ["spanel"],
       "broken": true
     },
+    "SACCR": {
+      "name": "SACCR",
+      "version": "3.2",
+      "sha256": "1sp8hjpwzyczj85saps6a6yw30yh5098ig2xmlf79jvzv86nqgn1",
+      "depends": ["Trading", "data_tree", "jsonlite"],
+      "broken": true
+    },
     "SACOBRA": {
       "name": "SACOBRA",
       "version": "1.2",
@@ -133059,6 +137522,13 @@
       "depends": [],
       "broken": true
     },
+    "SIPmg": {
+      "name": "SIPmg",
+      "version": "1.4.1",
+      "sha256": "1f3jirfnxxbrkala5kk0hkkm8gn2zciva6xy459vc80y058hr7z1",
+      "depends": ["DESeq2", "HTSSIP", "MASS", "data_table", "dplyr", "ggplot2", "ggpubr", "lazyeval", "magrittr", "phyloseq", "plyr", "purrr", "rlang", "stringr", "tibble", "tidyr"],
+      "broken": true
+    },
     "SIfEK": {
       "name": "SIfEK",
       "version": "0.1.0",
@@ -133227,6 +137697,13 @@
       "depends": ["bigstatsr", "chickn", "doParallel", "doRNG", "foreach", "glmnet", "pracma", "Rcpp", "RcppArmadillo", "RcppParallel", "Rdpack", "reshape2", "rmio"],
       "broken": true
     },
+    "SSLASSO": {
+      "name": "SSLASSO",
+      "version": "1.2-2",
+      "sha256": "0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv",
+      "depends": [],
+      "broken": true
+    },
     "SSN": {
       "name": "SSN",
       "version": "1.1.17",
@@ -133262,13 +137739,6 @@
       "depends": [],
       "broken": true
     },
-    "SVMMaj": {
-      "name": "SVMMaj",
-      "version": "0.2.9.1",
-      "sha256": "08f9sndcjgmmxl3zlbq86d8z0dbciv0ab1v9zx80svka7ckfv9z3",
-      "depends": ["dplyr", "ggplot2", "gridExtra", "kernlab", "reshape2", "scales"],
-      "broken": true
-    },
     "SVMMatch": {
       "name": "SVMMatch",
       "version": "1.1",
@@ -133297,6 +137767,13 @@
       "depends": [],
       "broken": true
     },
+    "SecDim": {
+      "name": "SecDim",
+      "version": "3.2",
+      "sha256": "04l4qpw409dj5i494vmf7vmksis6910599gh259nbyv0pdfw5svr",
+      "depends": ["RcppArmadillo", "geosphere"],
+      "broken": true
+    },
     "SecKW": {
       "name": "SecKW",
       "version": "0.2",
@@ -133353,13 +137830,6 @@
       "depends": ["sp"],
       "broken": true
     },
-    "SegEnvIneq": {
-      "name": "SegEnvIneq",
-      "version": "1.1",
-      "sha256": "0vkjkg2x9fziymhv3j3m0n23vm3g7jq4w12jgg5c37k6gyp1sqqj",
-      "depends": ["OasisR", "outliers", "sf", "spdep"],
-      "broken": true
-    },
     "SelvarMix": {
       "name": "SelvarMix",
       "version": "1.2.1",
@@ -133668,6 +138138,13 @@
       "depends": ["MASS", "Matrix", "proxy", "Rcpp", "RcppArmadillo", "Rglpk", "sampling", "transport"],
       "broken": true
     },
+    "StrucDiv": {
+      "name": "StrucDiv",
+      "version": "0.2.1",
+      "sha256": "1mzkcij7mrmjj5ccmy0l3xbb75w0bi7vc2cxap3qkycqm1ajk1dr",
+      "depends": ["Rcpp", "RcppProgress", "doParallel", "foreach", "glue", "raster"],
+      "broken": true
+    },
     "StructFDR": {
       "name": "StructFDR",
       "version": "1.4",
@@ -133794,6 +138271,13 @@
       "depends": ["adabag", "SPOT", "testit", "twiddler"],
       "broken": true
     },
+    "TDboost": {
+      "name": "TDboost",
+      "version": "1.5",
+      "sha256": "1lx5g6yrp43m0dhhs0iig9chlvqbbim5xq5i2bxy4frs2afka22g",
+      "depends": ["lattice"],
+      "broken": true
+    },
     "TERAplusB": {
       "name": "TERAplusB",
       "version": "1.0",
@@ -133822,11 +138306,11 @@
       "depends": ["caret", "HMM", "randomForest", "signal", "stringr"],
       "broken": true
     },
-    "TMTI": {
-      "name": "TMTI",
-      "version": "1.0.1",
-      "sha256": "080k4lmwspxi6salv4zq9lipwcah3zr6vfc0lrll1z8gynk8arq9",
-      "depends": ["Rcpp"],
+    "TOmicsVis": {
+      "name": "TOmicsVis",
+      "version": "2.0.0",
+      "sha256": "0s46i8wnvvs15xwb0g62rpn864b27hbx0lrjpcv2wb1s27iz1wv3",
+      "depends": ["Biobase", "ComplexHeatmap", "GGally", "Mfuzz", "RColorBrewer", "Rtsne", "UpSetR", "WGCNA", "circlize", "clusterProfiler", "cowplot", "dplyr", "e1071", "factoextra", "ggcorrplot", "ggforce", "ggnewscale", "ggplot2", "ggplotify", "ggpolypath", "ggpubr", "ggrepel", "ggsci", "igraph", "pheatmap", "plotrix", "randomcoloR", "reshape2", "shiny", "stringr", "survival", "survminer", "tidyr", "umap", "vegan", "venn"],
       "broken": true
     },
     "TREXr": {
@@ -133962,13 +138446,6 @@
       "depends": [],
       "broken": true
     },
-    "TauStar": {
-      "name": "TauStar",
-      "version": "1.1.4",
-      "sha256": "06bb6570mqzfbjw2qp4bjl4a1bdpwsvcr0vw2y4l1x444m670ds1",
-      "depends": ["Rcpp", "RcppArmadillo"],
-      "broken": true
-    },
     "Taxonstand": {
       "name": "Taxonstand",
       "version": "2.4",
@@ -133976,6 +138453,13 @@
       "depends": ["pbapply"],
       "broken": true
     },
+    "Thermistor": {
+      "name": "Thermistor",
+      "version": "1.1.0",
+      "sha256": "0jdc5x3pylqbfxyhxhfsfd5lqiqd9qpn08w6svm0w7clbsp54bph",
+      "depends": ["ggplot2"],
+      "broken": true
+    },
     "Thinknum": {
       "name": "Thinknum",
       "version": "1.3.0",
@@ -134053,6 +138537,13 @@
       "depends": ["coda", "doBy", "dplyr", "forcats", "ggplot2", "ggridges", "multcomp", "Rcpp", "RcppEigen", "RcppGSL", "scales", "shiny", "tidyverse"],
       "broken": true
     },
+    "Trading": {
+      "name": "Trading",
+      "version": "3.0",
+      "sha256": "1xf3qr6g8vxdwrx57pazr79k86d3mdhqaps0vj8iz4dr172gms8k",
+      "depends": ["PerformanceAnalytics", "RcppAlgos", "data_table", "ggplot2", "readxl", "reticulate"],
+      "broken": true
+    },
     "TraitStats": {
       "name": "TraitStats",
       "version": "1.0.2",
@@ -134095,6 +138586,13 @@
       "depends": [],
       "broken": true
     },
+    "TwoPhaseInd": {
+      "name": "TwoPhaseInd",
+      "version": "1.1.2",
+      "sha256": "1ifdj17rlr8nd0pqpcqi6835ymdhngif279i27s6lvwha924l81c",
+      "depends": ["survival"],
+      "broken": true
+    },
     "TwoRegression": {
       "name": "TwoRegression",
       "version": "1.0.0",
@@ -134277,6 +138775,13 @@
       "depends": ["AlgDesign", "permute"],
       "broken": true
     },
+    "Vdgraph": {
+      "name": "Vdgraph",
+      "version": "2.2-7",
+      "sha256": "0kqcwlw8dsxb1jlp412m9a372kz26sampv56saxalf8rcyd3s2jp",
+      "depends": [],
+      "broken": true
+    },
     "VecStatGraphs2D": {
       "name": "VecStatGraphs2D",
       "version": "1.8",
@@ -134298,6 +138803,13 @@
       "depends": ["igraph", "snowfall"],
       "broken": true
     },
+    "W4MRUtils": {
+      "name": "W4MRUtils",
+      "version": "1.0.0",
+      "sha256": "1hzr2p3kp9k2y154a2p9qc9shyqpkh0m5ylk2f9ivm4m0f3ifqdp",
+      "depends": ["rlang"],
+      "broken": true
+    },
     "WCQ": {
       "name": "WCQ",
       "version": "0.2",
@@ -134312,6 +138824,13 @@
       "depends": ["doParallel", "foreach", "quantreg"],
       "broken": true
     },
+    "WES": {
+      "name": "WES",
+      "version": "1.0.0",
+      "sha256": "11dsn0dkc0z313x8md6qhkafk9cnbp4v64a895d54b27329ryzis",
+      "depends": ["HDInterval", "RCurl", "XML", "chirps", "data_table", "dplyr", "elevatr", "exactextractr", "foreach", "glue", "httr", "jsonlite", "openmeteo", "raster", "rworldmap", "sf", "sp", "stars", "whitebox", "zoo"],
+      "broken": true
+    },
     "WLasso": {
       "name": "WLasso",
       "version": "1.0",
@@ -134333,6 +138852,13 @@
       "depends": [],
       "broken": true
     },
+    "WMWssp": {
+      "name": "WMWssp",
+      "version": "0.4.0",
+      "sha256": "16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47",
+      "depends": [],
+      "broken": true
+    },
     "WPC": {
       "name": "WPC",
       "version": "1.0",
@@ -134375,6 +138901,13 @@
       "depends": [],
       "broken": true
     },
+    "WpProj": {
+      "name": "WpProj",
+      "version": "0.2.1",
+      "sha256": "17vczldqgqc8wl6yyz06zc3jdkgcxdf2s28bh83vzj98i1521ls2",
+      "depends": ["BH", "Matrix", "ROI", "ROI_plugin_ecos", "ROI_plugin_lpsolve", "RSpectra", "Rcpp", "RcppCGAL", "RcppEigen", "RcppProgress", "doParallel", "doRNG", "dplyr", "foreach", "ggplot2", "ggridges", "ggsci", "glmnet", "lifecycle", "magrittr", "oem", "quantreg", "rlang", "rqPen", "slam"],
+      "broken": true
+    },
     "XHWE": {
       "name": "XHWE",
       "version": "1.0",
@@ -134564,13 +139097,6 @@
       "depends": ["assertthat", "dplyr", "lubridate", "stringr"],
       "broken": true
     },
-    "affluenceIndex": {
-      "name": "affluenceIndex",
-      "version": "2.1",
-      "sha256": "0vcg4gphs0yxdxsgw7kj9r3hvjpfs2z8sjvllvfw9ki3y7jy5jb8",
-      "depends": ["spatstat", "spatstat_geom"],
-      "broken": true
-    },
     "agroclim": {
       "name": "agroclim",
       "version": "0.3.0",
@@ -134613,6 +139139,13 @@
       "depends": ["clusterCrit", "dplyr", "ggplot2", "Hmisc", "kml", "signal"],
       "broken": true
     },
+    "algaeClassify": {
+      "name": "algaeClassify",
+      "version": "2.0.3",
+      "sha256": "0rqfvjd4sbj85mvnhx1lpmx973cjz44y834p7dr0jnm3dbj1fs3g",
+      "depends": ["RCurl", "curl", "jsonlite", "lubridate", "ritis"],
+      "broken": true
+    },
     "alignfigR": {
       "name": "alignfigR",
       "version": "0.1.1",
@@ -134711,41 +139244,6 @@
       "depends": ["dplyr", "forcats", "geosphere", "ggplot2", "httr", "leaflet", "leaflet_extras", "lubridate", "maptools", "raster", "rgdal", "scales", "shiny", "shinyBS", "shinycssloaders", "shinyjs", "shinythemes", "shinyWidgets", "sp", "tibble", "tidyr", "zoo"],
       "broken": true
     },
-    "anominate": {
-      "name": "anominate",
-      "version": "0.6",
-      "sha256": "01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02",
-      "depends": ["coda", "MCMCpack", "pscl", "wnominate"],
-      "broken": true
-    },
-    "antaresEditObject": {
-      "name": "antaresEditObject",
-      "version": "0.7.0",
-      "sha256": "1v9lhaw2cs4ggfpwi1zdlganks3xrnlsycziv0h3zi5zg45mar7v",
-      "depends": ["antaresRead", "assertthat", "cli", "data_table", "doFuture", "doParallel", "future", "httr", "jsonlite", "lifecycle", "memuse", "pbapply", "plyr", "progressr", "whisker", "yaml"],
-      "broken": true
-    },
-    "antaresProcessing": {
-      "name": "antaresProcessing",
-      "version": "0.18.1",
-      "sha256": "1dlq850xqh9534ws88ma3vv5r79cbabn6r6a2jmicxx116s7wjrz",
-      "depends": ["antaresRead", "data_table"],
-      "broken": true
-    },
-    "antaresRead": {
-      "name": "antaresRead",
-      "version": "2.7.0",
-      "sha256": "0rgb2glphf6f4vw1hrjxm1f2lhdsx1zag6r0bqgvmzkqipvp97zk",
-      "depends": ["bit64", "data_table", "doParallel", "httr", "jsonlite", "lifecycle", "lubridate", "memuse", "pbapply", "plyr", "purrr", "shiny", "stringi", "stringr"],
-      "broken": true
-    },
-    "antaresViz": {
-      "name": "antaresViz",
-      "version": "0.18.0",
-      "sha256": "1lffsxv8fy3yq6rx6520rizp9f74d8bd78by5n209yr9yhw1629r",
-      "depends": ["antaresProcessing", "antaresRead", "assertthat", "data_table", "dygraphs", "geojsonio", "htmltools", "htmlwidgets", "leaflet", "leaflet_minicharts", "lubridate", "manipulateWidget", "plotly", "rAmCharts", "sf", "shiny", "sp", "spMaps", "webshot"],
-      "broken": true
-    },
     "aof": {
       "name": "aof",
       "version": "0.1.2",
@@ -134767,6 +139265,13 @@
       "depends": ["httr", "jsonlite", "rvest"],
       "broken": true
     },
+    "approxOT": {
+      "name": "approxOT",
+      "version": "1.1.1",
+      "sha256": "1l0grr9158d0lscnxd191h3vbal93sl25r982c5w32iyajcjn71h",
+      "depends": ["BH", "Rcpp", "RcppCGAL", "RcppEigen"],
+      "broken": true
+    },
     "apricom": {
       "name": "apricom",
       "version": "1.0.0",
@@ -134781,13 +139286,6 @@
       "depends": [],
       "broken": true
     },
-    "apt": {
-      "name": "apt",
-      "version": "3.0",
-      "sha256": "14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm",
-      "depends": ["car", "erer", "urca"],
-      "broken": true
-    },
     "aptg": {
       "name": "aptg",
       "version": "0.1.1",
@@ -134795,6 +139293,20 @@
       "depends": ["ape", "brranching", "phytools", "taxize", "xml2"],
       "broken": true
     },
+    "arcgis": {
+      "name": "arcgis",
+      "version": "0.1.1",
+      "sha256": "04k22569xsdl8bsi3r1bfwcdrjcdypm4b6sbjyf7yrglyyyqlpq3",
+      "depends": ["arcgisgeocode", "arcgislayers", "arcgisplaces", "arcgisutils", "cli", "httr2"],
+      "broken": true
+    },
+    "arcgisplaces": {
+      "name": "arcgisplaces",
+      "version": "0.1.0",
+      "sha256": "09xfwahdqf8v772g7gxalgzyd77diwzy6snlfjsrnli4f0svlzwi",
+      "depends": ["arcgisutils", "cli", "httr2", "rlang", "wk"],
+      "broken": true
+    },
     "arcos": {
       "name": "arcos",
       "version": "1.27",
@@ -135019,6 +139531,13 @@
       "depends": ["checkmate", "cli", "glue", "httr", "jsonlite", "magrittr", "ows4R", "R6", "sf", "stringr"],
       "broken": true
     },
+    "autoGO": {
+      "name": "autoGO",
+      "version": "0.9.1",
+      "sha256": "19gy5gk214vqnil2wky2fpia1dlhcc4vwnws4fl2f0xq9as2nrq9",
+      "depends": ["ComplexHeatmap", "DESeq2", "GSVA", "RColorBrewer", "SummarizedExperiment", "ape", "dichromat", "dplyr", "enrichR", "ggplot2", "ggrepel", "imguR", "openxlsx", "purrr", "readr", "reshape2", "stringr", "textshape", "tidyr", "tidyselect"],
+      "broken": true
+    },
     "autocart": {
       "name": "autocart",
       "version": "1.4.5",
@@ -135075,13 +139594,6 @@
       "depends": [],
       "broken": true
     },
-    "baRulho": {
-      "name": "baRulho",
-      "version": "1.0.6",
-      "sha256": "17g3xs0lxdpbbi52x27r00vfdgxdhjblyy939scm3c5z01fhxxnb",
-      "depends": ["fftw", "pbapply", "seewave", "tuneR", "warbleR"],
-      "broken": true
-    },
     "babar": {
       "name": "babar",
       "version": "1.0",
@@ -135152,13 +139664,6 @@
       "depends": ["investr", "scales"],
       "broken": true
     },
-    "basicspace": {
-      "name": "basicspace",
-      "version": "0.24",
-      "sha256": "1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h",
-      "depends": [],
-      "broken": true
-    },
     "bastah": {
       "name": "bastah",
       "version": "1.0.7",
@@ -135173,6 +139678,13 @@
       "depends": ["chk", "cli", "furrr", "hms", "hmstimer", "yesno"],
       "broken": true
     },
+    "bayesGAM": {
+      "name": "bayesGAM",
+      "version": "0.0.2",
+      "sha256": "13zs68d26c66hkm8mfhcygk8rw6sdg4rf4a4az254lf2xvypbh5d",
+      "depends": ["BH", "MASS", "Rcpp", "RcppEigen", "RcppParallel", "SemiPar", "StanHeaders", "bayesplot", "boot", "cluster", "corrplot", "geometry", "ggplot2", "gridExtra", "loo", "mlbench", "rstan", "rstantools"],
+      "broken": true
+    },
     "bayesbr": {
       "name": "bayesbr",
       "version": "0.0.1.0",
@@ -135285,6 +139797,13 @@
       "depends": ["coda", "rjags"],
       "broken": true
     },
+    "bdvis": {
+      "name": "bdvis",
+      "version": "0.2.37",
+      "sha256": "0mhvc1lbnkbawx3yj9h8h4l6bwawg1dfgyjvllhknyldxy8a7bjk",
+      "depends": ["chron", "ggplot2", "lattice", "maps", "plotrix", "plyr", "sf", "sqldf", "taxize", "treemap"],
+      "broken": true
+    },
     "bdynsys": {
       "name": "bdynsys",
       "version": "1.3",
@@ -135341,6 +139860,20 @@
       "depends": ["checkmate"],
       "broken": true
     },
+    "bggAnalytics": {
+      "name": "bggAnalytics",
+      "version": "0.2.1",
+      "sha256": "0c761f04vr63zsavj3vzxxab30zn4p5zpi5gyfkqplm96brpkg3m",
+      "depends": ["R6", "checkmate", "data_table", "pryr", "stringr", "xml2"],
+      "broken": true
+    },
+    "bhpm": {
+      "name": "bhpm",
+      "version": "1.7",
+      "sha256": "0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp",
+      "depends": ["coda"],
+      "broken": true
+    },
     "biasbetareg": {
       "name": "biasbetareg",
       "version": "1.0",
@@ -135369,13 +139902,6 @@
       "depends": ["assertthat", "bigstatsr", "furrr", "proxy"],
       "broken": true
     },
-    "biglmm": {
-      "name": "biglmm",
-      "version": "0.9-2",
-      "sha256": "1zj1h2hszps3w913j2dk4cyj5jsqkkxsm3pcjlc4jnq810j100l6",
-      "depends": ["DBI"],
-      "broken": true
-    },
     "bimetallic": {
       "name": "bimetallic",
       "version": "1.0",
@@ -135446,6 +139972,13 @@
       "depends": ["bioinactivation", "corrplot", "dplyr", "FME", "ggplot2", "rlang", "tidyr", "tidyselect", "tidyverse"],
       "broken": true
     },
+    "bioPN": {
+      "name": "bioPN",
+      "version": "1.2.0",
+      "sha256": "0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8",
+      "depends": [],
+      "broken": true
+    },
     "bioassays": {
       "name": "bioassays",
       "version": "1.0.1",
@@ -135495,6 +140028,13 @@
       "depends": ["dplyr", "rlang", "stringr", "tidycensus", "tigris", "wru"],
       "broken": true
     },
+    "bite": {
+      "name": "bite",
+      "version": "0.3",
+      "sha256": "00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps",
+      "depends": ["MASS", "ape", "coda", "phytools", "sm", "vioplot", "xml2"],
+      "broken": true
+    },
     "bitsqueezr": {
       "name": "bitsqueezr",
       "version": "0.1.1",
@@ -135537,6 +140077,13 @@
       "depends": ["arm", "dplyr", "ldbounds", "magrittr", "tibble"],
       "broken": true
     },
+    "blockTools": {
+      "name": "blockTools",
+      "version": "0.6.5",
+      "sha256": "0c62s4p477d9lxxninn18hrf348rph7w8w1jsqzqpm333dcamvhi",
+      "depends": ["MASS", "dplyr", "tibble"],
+      "broken": true
+    },
     "blockcpd": {
       "name": "blockcpd",
       "version": "1.0.0",
@@ -135614,6 +140161,13 @@
       "depends": ["doParallel", "foreach", "gRain", "gRbase", "raster", "rgdal", "sf"],
       "broken": true
     },
+    "bold": {
+      "name": "bold",
+      "version": "1.3.0",
+      "sha256": "0pwglcykyl5dnhqs8jg4hzih286v17w5dafkg3ahqk3c73a13b8f",
+      "depends": ["crul", "data_table", "jsonlite", "stringi", "xml2"],
+      "broken": true
+    },
     "bookdownplus": {
       "name": "bookdownplus",
       "version": "1.5.8",
@@ -135831,13 +140385,6 @@
       "depends": ["matrixStats", "mvtnorm", "nlme", "tmvtnorm", "xts", "zoo"],
       "broken": true
     },
-    "cascadess": {
-      "name": "cascadess",
-      "version": "0.1.0",
-      "sha256": "105m5w8rb8bkzmlc5nwb4g0wl8jgvz63jxq665x4jfq0z78qiwgd",
-      "depends": ["crayon", "htmltools", "magrittr", "rlang"],
-      "broken": true
-    },
     "caschrono": {
       "name": "caschrono",
       "version": "2.4",
@@ -136244,13 +140791,6 @@
       "depends": ["Rcpp", "RcppEigen"],
       "broken": true
     },
-    "climate": {
-      "name": "climate",
-      "version": "1.0.5",
-      "sha256": "17hfxav8j0zyyl1839sj7nysv08j5z7xwz3p42di16cyx57czm4w",
-      "depends": ["curl", "data_table", "httr", "XML"],
-      "broken": true
-    },
     "climdex_pcic": {
       "name": "climdex.pcic",
       "version": "1.1-11",
@@ -136272,6 +140812,13 @@
       "depends": [],
       "broken": true
     },
+    "clogitLasso": {
+      "name": "clogitLasso",
+      "version": "1.1",
+      "sha256": "1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0",
+      "depends": ["foreach", "lassoshooting"],
+      "broken": true
+    },
     "clpAPI": {
       "name": "clpAPI",
       "version": "1.3.1",
@@ -136293,11 +140840,11 @@
       "depends": ["caret", "doParallel", "DoseFinding", "DT", "foreach", "IsoGene", "MCPMod", "multcomp", "ORCME", "ORIClust", "pheatmap", "RColorBrewer", "readr", "shiny"],
       "broken": true
     },
-    "clustcurv": {
-      "name": "clustcurv",
-      "version": "2.0.1",
-      "sha256": "1xkl84pd1a3phl5yfm21yr5c0gbmmg1wk9b0lyl2x8466v5hl53q",
-      "depends": ["doParallel", "doRNG", "foreach", "ggfortify", "ggplot2", "Gmedian", "npregfast", "RColorBrewer", "survival"],
+    "clusterCons": {
+      "name": "clusterCons",
+      "version": "1.2",
+      "sha256": "1k1y6cqpb5fyi2mbx2i4jbiwz0fni44lnq0xnv3pl0x3dpscwh6q",
+      "depends": ["RColorBrewer", "apcluster", "cluster", "lattice"],
       "broken": true
     },
     "clusterGenomics": {
@@ -136405,6 +140952,13 @@
       "depends": ["stringr"],
       "broken": true
     },
+    "compHclust": {
+      "name": "compHclust",
+      "version": "1.0-3",
+      "sha256": "0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj",
+      "depends": [],
+      "broken": true
+    },
     "compactr": {
       "name": "compactr",
       "version": "0.1",
@@ -136482,6 +141036,13 @@
       "depends": ["evd"],
       "broken": true
     },
+    "condusco": {
+      "name": "condusco",
+      "version": "0.1.0",
+      "sha256": "0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s",
+      "depends": ["DBI", "assertthat", "bigrquery", "jsonlite"],
+      "broken": true
+    },
     "confoundr": {
       "name": "confoundr",
       "version": "1.2",
@@ -136671,6 +141232,13 @@
       "depends": [],
       "broken": true
     },
+    "cpp11tesseract": {
+      "name": "cpp11tesseract",
+      "version": "5.3.2",
+      "sha256": "1vpfx3crgcxgnavd0qb4pkw5zgvqnn40563b1vvydwgcp5q5yja2",
+      "depends": ["cpp11", "curl", "digest", "pdftools"],
+      "broken": true
+    },
     "cptec": {
       "name": "cptec",
       "version": "0.1.1",
@@ -136692,6 +141260,13 @@
       "depends": [],
       "broken": true
     },
+    "cregg": {
+      "name": "cregg",
+      "version": "0.4.0",
+      "sha256": "1a34jhdk4r9ywsrc5dc8wq5am3059cli60f6n2n8j04ls13fvlkd",
+      "depends": ["ggplot2", "ggstance", "lmtest", "sandwich", "scales", "survey"],
+      "broken": true
+    },
     "crestr": {
       "name": "crestr",
       "version": "1.2.0",
@@ -136818,6 +141393,13 @@
       "depends": [],
       "broken": true
     },
+    "cwbtools": {
+      "name": "cwbtools",
+      "version": "0.4.2",
+      "sha256": "1aanda6rj60rkkbkxijj4r4bx0caiyr9ifw0pg6nabv4fwfnlb4x",
+      "depends": ["R6", "RcppCWB", "cli", "curl", "data_table", "fs", "httr", "jsonlite", "lifecycle", "pbapply", "rstudioapi", "stringi", "xml2", "zen4R"],
+      "broken": true
+    },
     "cwhmisc": {
       "name": "cwhmisc",
       "version": "6.6",
@@ -136832,6 +141414,13 @@
       "depends": ["MASS", "matlab", "permute"],
       "broken": true
     },
+    "cycleRtools": {
+      "name": "cycleRtools",
+      "version": "1.1.1",
+      "sha256": "1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0",
+      "depends": ["Rcpp", "xml2"],
+      "broken": true
+    },
     "cyphid": {
       "name": "cyphid",
       "version": "1.1",
@@ -136860,13 +141449,6 @@
       "depends": ["coda", "dglm", "dplyr", "ggmcmc", "rlang", "tidyr"],
       "broken": true
     },
-    "dampack": {
-      "name": "dampack",
-      "version": "1.0.1",
-      "sha256": "0mh3x0xgcipbd9341x3sfapysrd9m8aaakc1f53vwjj31c8vayqc",
-      "depends": ["dplyr", "ellipse", "ggplot2", "ggrepel", "mgcv", "reshape2", "scales", "stringr", "triangle", "truncnorm"],
-      "broken": true
-    },
     "dapr": {
       "name": "dapr",
       "version": "0.0.3",
@@ -136944,6 +141526,13 @@
       "depends": ["curl", "dplyr", "httr", "magrittr", "plyr", "rlang", "stringr"],
       "broken": true
     },
+    "datagovsgR": {
+      "name": "datagovsgR",
+      "version": "1.0.1",
+      "sha256": "1z3zrvz9dc9a06kp8agrgvx1l6g5hq2cmmn6xpabp68pkw4jdpc6",
+      "depends": ["data_table", "dplyr", "httr", "purrr", "stringr"],
+      "broken": true
+    },
     "datamap": {
       "name": "datamap",
       "version": "0.1-1",
@@ -136965,13 +141554,6 @@
       "depends": ["config", "future", "httr", "iterators", "jsonlite", "jsonvalidate", "purrr", "R_utils", "R6", "readr", "rlist", "stringr", "tableschema_r", "urltools", "V8"],
       "broken": true
     },
-    "dataset": {
-      "name": "dataset",
-      "version": "0.3.0",
-      "sha256": "0isk6c16sli3wb2x9kf09virrn31j2r9y8mim8s8x9kyglz3r7j3",
-      "depends": ["assertthat", "ISOcodes"],
-      "broken": true
-    },
     "datastructures": {
       "name": "datastructures",
       "version": "0.2.9",
@@ -136986,6 +141568,13 @@
       "depends": ["arrow", "diffdfs", "dplyr", "lubridate", "magrittr", "purrr", "rlang", "tidyr"],
       "broken": true
     },
+    "datelife": {
+      "name": "datelife",
+      "version": "0.6.8",
+      "sha256": "154nmpvslnizd03jaxbhkc7vjzjx7j18zlwmrpx2qidqk424k1i9",
+      "depends": ["BiocManager", "abind", "ape", "bold", "cluster", "compare", "curl", "data_table", "geiger", "httr", "ips", "knitcitations", "paleotree", "phangorn", "phylobase", "phylocomr", "phytools", "plyr", "rotl", "stringr", "taxize", "treebase"],
+      "broken": true
+    },
     "dave": {
       "name": "dave",
       "version": "2.0",
@@ -137126,13 +141715,6 @@
       "depends": ["countrycode", "data_table", "httr", "rlang", "stringr"],
       "broken": true
     },
-    "dendrometeR": {
-      "name": "dendrometeR",
-      "version": "1.0.0",
-      "sha256": "1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs",
-      "depends": ["forecast", "pspline", "zoo"],
-      "broken": true
-    },
     "denpro": {
       "name": "denpro",
       "version": "0.9.2",
@@ -137140,6 +141722,13 @@
       "depends": [],
       "broken": true
     },
+    "depmix": {
+      "name": "depmix",
+      "version": "0.9.16",
+      "sha256": "1vi9fi131ni34z9p3x6pdp6y9v0y0nx71zg1q8898frhqwbwhd9c",
+      "depends": ["MASS"],
+      "broken": true
+    },
     "depth": {
       "name": "depth",
       "version": "2.1-1.1",
@@ -137203,11 +141792,11 @@
       "depends": ["forecast", "future", "future_apply", "testthat"],
       "broken": true
     },
-    "dhis2r": {
-      "name": "dhis2r",
-      "version": "0.1.1",
-      "sha256": "019qrkcssxmvmhla3vfjq9m0vwv9j9h7njr2sjpmk4cqcdxvcbjn",
-      "depends": ["attempt", "curl", "dplyr", "httr2", "R6"],
+    "dhlabR": {
+      "name": "dhlabR",
+      "version": "1.0.6",
+      "sha256": "185gp7bgaw0rhl29f2gijsqx3da3mzzp06hmi187ywv8i6lsi750",
+      "depends": ["dplyr", "httr", "jsonlite", "purrr", "tibble", "zoo"],
       "broken": true
     },
     "dialectR": {
@@ -137238,6 +141827,13 @@
       "depends": [],
       "broken": true
     },
+    "dietr": {
+      "name": "dietr",
+      "version": "1.1.5-1",
+      "sha256": "10b290iccx5wa3krjssy29j4p2wz0qkks0a8ih4mhxnry554xjb7",
+      "depends": ["rfishbase"],
+      "broken": true
+    },
     "diffMeshGP": {
       "name": "diffMeshGP",
       "version": "0.1.0",
@@ -137259,6 +141855,13 @@
       "depends": ["data_table", "dplyr", "igraph", "Matrix", "progress", "Rcpp", "sf", "tidyverse"],
       "broken": true
     },
+    "diffudist": {
+      "name": "diffudist",
+      "version": "1.0.1",
+      "sha256": "0s8k949l7fvdy0c1zlrk4zr5dnxksq67spwg8mpdsyc2xchh7b5c",
+      "depends": ["Matrix", "RColorBrewer", "Rcpp", "RcppEigen", "expm", "ggdendro", "ggplot2", "igraph", "reshape2", "rlang", "viridis"],
+      "broken": true
+    },
     "diffusr": {
       "name": "diffusr",
       "version": "0.1.4",
@@ -137266,6 +141869,13 @@
       "depends": ["igraph", "Rcpp", "RcppEigen"],
       "broken": true
     },
+    "digitalDLSorteR": {
+      "name": "digitalDLSorteR",
+      "version": "1.0.1",
+      "sha256": "05wcvv68p55hxf9babr19528khky1pmgfbvm502qhk7ba1arzivf",
+      "depends": ["Matrix", "S4Vectors", "SingleCellExperiment", "SummarizedExperiment", "dplyr", "ggplot2", "ggpubr", "grr", "gtools", "keras", "pbapply", "reshape2", "reticulate", "rlang", "scran", "scuttle", "tensorflow", "tidyr", "zinbwave"],
+      "broken": true
+    },
     "dils": {
       "name": "dils",
       "version": "0.8.1",
@@ -137280,6 +141890,13 @@
       "depends": ["caracas", "hash", "reticulate"],
       "broken": true
     },
+    "diproperm": {
+      "name": "diproperm",
+      "version": "0.2.0",
+      "sha256": "0qh8zzpbsjfwh8q833n5pchb6dakqdza77ab7vmsidfbzndka11m",
+      "depends": ["DWDLargeR", "Matrix", "SparseM", "dplyr", "e1071", "ggplot2", "gridExtra", "lemon", "sampling", "usethis"],
+      "broken": true
+    },
     "discgolf": {
       "name": "discgolf",
       "version": "0.2.0",
@@ -137574,13 +142191,6 @@
       "depends": ["data_table", "mvtnorm", "nloptr", "numDeriv", "Rcpp"],
       "broken": true
     },
-    "dycdtools": {
-      "name": "dycdtools",
-      "version": "0.4.3",
-      "sha256": "06hm00mfkkg5yxpf30xb4i21bna0hpa0g86vx9qz9vf7f7cvdwjx",
-      "depends": ["dplyr", "ggplot2", "lubridate", "ncdf4", "R_utils", "RColorBrewer", "tidyr"],
-      "broken": true
-    },
     "dynamicGraph": {
       "name": "dynamicGraph",
       "version": "0.2.2.6",
@@ -137602,6 +142212,13 @@
       "depends": ["deSolve", "lubridate", "maptools", "raster", "rgdal", "rgeos", "sp", "topmodel", "xts", "zoo"],
       "broken": true
     },
+    "dyncomp": {
+      "name": "dyncomp",
+      "version": "0.0.2-1",
+      "sha256": "13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11",
+      "depends": ["zoo"],
+      "broken": true
+    },
     "dynfeature": {
       "name": "dynfeature",
       "version": "1.0.1",
@@ -137658,6 +142275,13 @@
       "depends": ["digest", "ggplot2", "gridExtra", "gsl", "moments", "optimx", "polynom", "Rmpfr", "RSQLite", "stabledist", "xtable", "xts", "yaml", "zoo"],
       "broken": true
     },
+    "edbuildmapr": {
+      "name": "edbuildmapr",
+      "version": "0.3.1",
+      "sha256": "0hc5vfpilqxva88dzgp57j9cgsq64r75vhm3hhl8lhi2wwapwk1d",
+      "depends": ["dplyr", "magrittr", "sf", "spdep", "stringr", "tibble", "tidyselect", "tmap"],
+      "broken": true
+    },
     "edbuildr": {
       "name": "edbuildr",
       "version": "0.3.0",
@@ -137700,6 +142324,13 @@
       "depends": ["data_table", "edgeR"],
       "broken": true
     },
+    "edmcr": {
+      "name": "edmcr",
+      "version": "0.2.0",
+      "sha256": "06ms8zyygkgq3divall8paiiw5blqxfgml8iy339zfyiwfxabw5a",
+      "depends": ["MASS", "Matrix", "igraph", "lbfgs", "nloptr", "sdpt3r", "truncnorm", "vegan"],
+      "broken": true
+    },
     "edrGraphicalTools": {
       "name": "edrGraphicalTools",
       "version": "2.2",
@@ -137770,13 +142401,6 @@
       "depends": [],
       "broken": true
     },
-    "elaborator": {
-      "name": "elaborator",
-      "version": "1.1",
-      "sha256": "1kq3qqqywpzrk1ichsljvfijhsybmj7s0scmswmwi2crqi67gzp8",
-      "depends": ["bsplus", "dendextend", "dplyr", "forcats", "haven", "purrr", "RColorBrewer", "reshape2", "rlang", "seriation", "shape", "shiny", "shinydashboard", "shinyWidgets", "tidyr"],
-      "broken": true
-    },
     "elasticIsing": {
       "name": "elasticIsing",
       "version": "0.2",
@@ -137868,6 +142492,13 @@
       "depends": ["dplyr", "magrittr", "tidyr"],
       "broken": true
     },
+    "enrichR": {
+      "name": "enrichR",
+      "version": "3.2",
+      "sha256": "1g97q6vqwvb2l02y61343sblarqi433gjl3qmlyxjxq2lnjrnak1",
+      "depends": ["WriteXLS", "curl", "ggplot2", "httr", "rjson"],
+      "broken": true
+    },
     "ensModelVis": {
       "name": "ensModelVis",
       "version": "0.1.0",
@@ -137917,6 +142548,13 @@
       "depends": ["aster", "aster2", "caTools", "MASS"],
       "broken": true
     },
+    "eodhd": {
+      "name": "eodhd",
+      "version": "1.0.4",
+      "sha256": "0hm66d9dm3l87pdkv7154x7gp24v1d1aqm22p6bkzqwis1vc1rph",
+      "depends": ["httr"],
+      "broken": true
+    },
     "epcc": {
       "name": "epcc",
       "version": "1.4.7",
@@ -137973,6 +142611,13 @@
       "depends": ["Biostrings", "dplyr", "fs", "httr", "janitor", "purrr", "readr", "rlang", "seqinr", "stringr", "tibble", "tidyverse"],
       "broken": true
     },
+    "epoc": {
+      "name": "epoc",
+      "version": "0.2.6-1.1",
+      "sha256": "1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna",
+      "depends": ["Matrix", "elasticnet", "irr", "lassoshooting", "survival"],
+      "broken": true
+    },
     "eqs2lavaan": {
       "name": "eqs2lavaan",
       "version": "3.0",
@@ -137987,11 +142632,18 @@
       "depends": ["qtl"],
       "broken": true
     },
-    "erer": {
-      "name": "erer",
-      "version": "3.1",
-      "sha256": "03pdq3p5c5f20959hgk5q2cx5x10bpgf0qg4z1nvsf31vc5ni77v",
-      "depends": ["lmtest", "systemfit", "tseries", "urca"],
+    "erboost": {
+      "name": "erboost",
+      "version": "1.4",
+      "sha256": "1fq55pq4y6b4jdjagg8b9q05hx7l5i51z98bdgbmn5b7y99vm0hy",
+      "depends": ["lattice"],
+      "broken": true
+    },
+    "erfe": {
+      "name": "erfe",
+      "version": "0.0.1",
+      "sha256": "1v6xca2zwdg494mdb97dwg2xlqsr51919plylnl04d8dgg5adhz9",
+      "depends": ["Matrix", "mvtnorm"],
       "broken": true
     },
     "ergm_userterms": {
@@ -138393,6 +143045,13 @@
       "depends": ["bbmle", "fields", "RSpectra"],
       "broken": true
     },
+    "fastMatMR": {
+      "name": "fastMatMR",
+      "version": "1.2.5",
+      "sha256": "0lh2nrfj8pbhl56pg0icw0ln2bg411sjdkjb76lar3rsb67ifxvb",
+      "depends": ["cpp11"],
+      "broken": true
+    },
     "fastclime": {
       "name": "fastclime",
       "version": "1.4.1",
@@ -138400,6 +143059,13 @@
       "depends": ["igraph", "lattice", "MASS", "Matrix"],
       "broken": true
     },
+    "fastdigest": {
+      "name": "fastdigest",
+      "version": "0.6-4",
+      "sha256": "1809y57cvck6gssrwnycgqjnka6jxx17dbf927cvwih4v58abdmj",
+      "depends": [],
+      "broken": true
+    },
     "fasteraster": {
       "name": "fasteraster",
       "version": "1.1.1",
@@ -138435,6 +143101,13 @@
       "depends": [],
       "broken": true
     },
+    "faux": {
+      "name": "faux",
+      "version": "1.2.1",
+      "sha256": "143yc71cfsxnczi719ygrsynxry60nh8263gg8vwp3qrc80j80lh",
+      "depends": ["dplyr", "ggplot2", "jsonlite", "lme4", "rlang", "truncnorm"],
+      "broken": true
+    },
     "fbRanks": {
       "name": "fbRanks",
       "version": "2.0",
@@ -138449,13 +143122,6 @@
       "depends": ["combinat", "glmnet", "MASS"],
       "broken": true
     },
-    "fcl": {
-      "name": "fcl",
-      "version": "0.1.0",
-      "sha256": "0rskl9q7z5k5q17m3c5w4pdc96m6fdag7nkkjmyyh43wbm4bjb0a",
-      "depends": ["xts", "ymd"],
-      "broken": true
-    },
     "fdakma": {
       "name": "fdakma",
       "version": "1.3.1",
@@ -138498,6 +143164,13 @@
       "depends": ["data_table"],
       "broken": true
     },
+    "fedregs": {
+      "name": "fedregs",
+      "version": "1.0.0",
+      "sha256": "171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn",
+      "depends": ["dplyr", "httr", "magrittr", "purrr", "rvest", "stringi", "tidyr", "tidytext", "xml2"],
+      "broken": true
+    },
     "feedeR": {
       "name": "feedeR",
       "version": "0.0.10",
@@ -138645,6 +143318,13 @@
       "depends": [],
       "broken": true
     },
+    "fixedincome": {
+      "name": "fixedincome",
+      "version": "0.0.5",
+      "sha256": "16wxd12hid468d1rfczyrb2ffnja0vx9mnqdg9dhdp0nlj78xx99",
+      "depends": ["bizdays", "ggplot2", "scales"],
+      "broken": true
+    },
     "flair": {
       "name": "flair",
       "version": "0.0.2",
@@ -138687,6 +143367,13 @@
       "depends": [],
       "broken": true
     },
+    "flowr": {
+      "name": "flowr",
+      "version": "0.9.11",
+      "sha256": "1cbbfrvgzqclvbhy20vjwgxbvnn3ljh0k1k54jf2si10bfw3zzi5",
+      "depends": ["diagram", "params", "readr", "whisker"],
+      "broken": true
+    },
     "fm_index": {
       "name": "fm.index",
       "version": "0.1.1",
@@ -138694,6 +143381,20 @@
       "depends": ["Rcpp", "stringi"],
       "broken": true
     },
+    "fmbasics": {
+      "name": "fmbasics",
+      "version": "0.3.0",
+      "sha256": "1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0",
+      "depends": ["assertthat", "fmdates", "lubridate", "tibble"],
+      "broken": true
+    },
+    "fmdates": {
+      "name": "fmdates",
+      "version": "0.1.4",
+      "sha256": "1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0",
+      "depends": ["assertthat", "lubridate"],
+      "broken": true
+    },
     "foieGras": {
       "name": "foieGras",
       "version": "0.7-6",
@@ -138729,6 +143430,13 @@
       "depends": ["rgl"],
       "broken": true
     },
+    "foolbox": {
+      "name": "foolbox",
+      "version": "0.1.1",
+      "sha256": "06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3",
+      "depends": ["magrittr", "rlang"],
+      "broken": true
+    },
     "forensic": {
       "name": "forensic",
       "version": "0.2",
@@ -138743,6 +143451,13 @@
       "depends": ["tcltk2", "tkrplot"],
       "broken": true
     },
+    "forestdata": {
+      "name": "forestdata",
+      "version": "0.2.1",
+      "sha256": "0aw4sm3blby3d01l6r4g8p0r343ydwd0sn9hpgvl1hg8csqz6iq7",
+      "depends": ["archive", "crayon", "dplyr", "foreign", "lifecycle", "purrr", "rlang", "rvest", "sf", "stringi", "stringr", "terra", "tibble", "tidyr"],
+      "broken": true
+    },
     "foster": {
       "name": "foster",
       "version": "0.1.1",
@@ -138904,13 +143619,6 @@
       "depends": ["KEGGREST", "minval", "sybil"],
       "broken": true
     },
-    "g3viz": {
-      "name": "g3viz",
-      "version": "1.1.5",
-      "sha256": "0pjn1rgqbrkbdrcnf01j9lm3257fnp7b0p5p3hyhg8srd990wp61",
-      "depends": ["cBioPortalData", "htmlwidgets", "jsonlite", "stringr"],
-      "broken": true
-    },
     "gDefrag": {
       "name": "gDefrag",
       "version": "0.3",
@@ -139072,13 +143780,6 @@
       "depends": ["class", "cluster", "survival"],
       "broken": true
     },
-    "genetic_algo_optimizeR": {
-      "name": "genetic.algo.optimizeR",
-      "version": "0.2.6",
-      "sha256": "08jc17nwvycfgkzqisgyj741ykwsm0q8kh3f464zzwp5s6612ajy",
-      "depends": ["biocViews", "dplyr", "ggplot2", "magrittr", "rsconnect", "stringr", "tinytex"],
-      "broken": true
-    },
     "genius": {
       "name": "genius",
       "version": "2.2.3",
@@ -139100,11 +143801,11 @@
       "depends": ["colorspace", "doBy", "plyr", "reshape2", "zoo"],
       "broken": true
     },
-    "geodetector": {
-      "name": "geodetector",
-      "version": "1.0-4",
-      "sha256": "00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l",
-      "depends": ["maptools", "rgdal", "rgeos", "sp"],
+    "genular": {
+      "name": "genular",
+      "version": "1.0.1",
+      "sha256": "0i77sxynwanm2rwc0dw3yq1j0vmha6mbjjcvmv1vkgdf8xq1aqmz",
+      "depends": ["dplyr", "httr", "jsonlite", "tidyr"],
       "broken": true
     },
     "geofabrik": {
@@ -139121,6 +143822,20 @@
       "depends": ["fda"],
       "broken": true
     },
+    "geohabnet": {
+      "name": "geohabnet",
+      "version": "2.1.3",
+      "sha256": "16a1qvmlynsvws3kl1l1apds8gxgf4yx1c7z92qcp73kilbmgp3x",
+      "depends": ["beepr", "config", "easycsv", "future", "future_apply", "geodata", "geosphere", "ggplot2", "igraph", "magrittr", "memoise", "patchwork", "rlang", "rnaturalearth", "stringr", "terra", "viridisLite", "yaml"],
+      "broken": true
+    },
+    "geoidep": {
+      "name": "geoidep",
+      "version": "0.3.0",
+      "sha256": "1cjga1s2ffxhk0ki7rfmacwr39qi738pxaphvfg6nfgxm09j42v8",
+      "depends": ["archive", "cli", "dplyr", "httr", "jsonlite", "sf", "tidyr"],
+      "broken": true
+    },
     "geojsonlint": {
       "name": "geojsonlint",
       "version": "0.4.0",
@@ -139177,13 +143892,6 @@
       "depends": ["abind", "chron", "curl", "dplyr", "ggplot2", "glue", "magrittr", "png", "progress", "purrr", "raster", "readr", "rgdal", "rgeos", "rgl", "rlang", "sf", "slippymath", "sp", "stringr", "tibble", "tidyr"],
       "broken": true
     },
-    "gesca": {
-      "name": "gesca",
-      "version": "1.0.4",
-      "sha256": "1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv",
-      "depends": [],
-      "broken": true
-    },
     "getMet": {
       "name": "getMet",
       "version": "0.3.2",
@@ -139338,6 +144046,13 @@
       "depends": ["dplyr", "ggplot2", "rlang"],
       "broken": true
     },
+    "ggpicrust2": {
+      "name": "ggpicrust2",
+      "version": "1.7.3",
+      "sha256": "0zjlsvzl2f74fvqw4ijnai23qwhlcpgd5p8z9dclnwnsgdbm6hcq",
+      "depends": ["ALDEx2", "DESeq2", "GGally", "MicrobiomeStat", "SummarizedExperiment", "aplot", "circlize", "dplyr", "edgeR", "ggh4x", "ggplot2", "ggprism", "limma", "metagenomeSeq", "patchwork", "readr", "tibble", "tidyr"],
+      "broken": true
+    },
     "ggsn": {
       "name": "ggsn",
       "version": "0.5.0",
@@ -139471,6 +144186,20 @@
       "depends": ["dplyr", "fastlogranktest", "pbmcapply", "PWEALL", "rlang", "survival"],
       "broken": true
     },
+    "good": {
+      "name": "good",
+      "version": "1.0.2",
+      "sha256": "06lzr8kb0pb5k10md23dlzkzx4qk8ajriwinj4mqhgd51manm3nk",
+      "depends": ["copula", "maxLik", "plyr"],
+      "broken": true
+    },
+    "googleCloudRunner": {
+      "name": "googleCloudRunner",
+      "version": "0.5.0",
+      "sha256": "14nynl56gc8aj03wxbj243fz80j1wxd93ywfaivy1cgyfi3rid6z",
+      "depends": ["assertthat", "cli", "curl", "googleAuthR", "googleCloudStorageR", "googlePubsubR", "httr", "jose", "jsonlite", "openssl", "plumber", "usethis", "withr", "yaml"],
+      "broken": true
+    },
     "googlePrintr": {
       "name": "googlePrintr",
       "version": "0.0.1",
@@ -139688,6 +144417,13 @@
       "depends": ["abind", "boot", "dplyr", "R6", "Rcpp", "stringr"],
       "broken": true
     },
+    "hansard": {
+      "name": "hansard",
+      "version": "0.8.0",
+      "sha256": "00mcy58nhlphb0v0wchbaw1qamm0435s09nxxw6rr5z872rhyf5a",
+      "depends": ["dplyr", "jsonlite", "lubridate", "snakecase", "tibble", "tidyr"],
+      "broken": true
+    },
     "happybiRthday": {
       "name": "happybiRthday",
       "version": "0.0.1",
@@ -139772,6 +144508,13 @@
       "depends": ["dplyr", "ggplot2", "rlang", "sqldf", "stringr"],
       "broken": true
     },
+    "helminthR": {
+      "name": "helminthR",
+      "version": "1.0.10",
+      "sha256": "0ssw0smxc5zx3d189fq8c6kdg6d7db1sd5iblhz54pg41j9fvqhq",
+      "depends": ["httr", "magrittr", "plyr", "rvest", "taxize", "xml2"],
+      "broken": true
+    },
     "hergm": {
       "name": "hergm",
       "version": "4.1-10",
@@ -140052,13 +144795,6 @@
       "depends": ["ada", "AUC", "doParallel", "e1071", "FNN", "foreach", "genalg", "GenSA", "glmnet", "kernelFactory", "NMOF", "nnet", "nnls", "pso", "quadprog", "randomForest", "reportr", "Rmalschains", "ROCR", "rotationForest", "rpart", "soma", "tabuSearch"],
       "broken": true
     },
-    "hydflood": {
-      "name": "hydflood",
-      "version": "0.5.7",
-      "sha256": "18gw2jipssaid5q004gyvfk56vgvajv69kd0f6zh2fp7sgq5w33d",
-      "depends": ["hyd1d", "raster", "Rdpack", "sf", "terra"],
-      "broken": true
-    },
     "hydroApps": {
       "name": "hydroApps",
       "version": "0.1-1",
@@ -140108,6 +144844,13 @@
       "depends": ["caTools", "dfoptim", "OpenImageR", "pbapply", "raster", "rgdal"],
       "broken": true
     },
+    "hypersampleplan": {
+      "name": "hypersampleplan",
+      "version": "0.1.1",
+      "sha256": "1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq",
+      "depends": [],
+      "broken": true
+    },
     "hypothesestest": {
       "name": "hypothesestest",
       "version": "1.0",
@@ -140171,6 +144914,13 @@
       "depends": ["AUC", "data_table", "doParallel", "dplyr", "foreach", "Matrix", "RColorBrewer", "Rcpp"],
       "broken": true
     },
+    "iRafNet": {
+      "name": "iRafNet",
+      "version": "1.1-1",
+      "sha256": "0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb",
+      "depends": ["ROCR"],
+      "broken": true
+    },
     "iSDM": {
       "name": "iSDM",
       "version": "1.0",
@@ -140213,27 +144963,6 @@
       "depends": [],
       "broken": true
     },
-    "icesDatsu": {
-      "name": "icesDatsu",
-      "version": "1.1.0",
-      "sha256": "0vprh8y6x28q33b6zx9qhq991q0aqn5rhccf44k8211n5dwa555k",
-      "depends": ["httr", "icesConnect", "jsonlite"],
-      "broken": true
-    },
-    "icesDatsuQC": {
-      "name": "icesDatsuQC",
-      "version": "1.0.1",
-      "sha256": "0pspd702vg2k7fza9jvj7hdnpjlg4k41mwiq45k7bsr0cbksggsg",
-      "depends": ["icesDatsu", "sqldf"],
-      "broken": true
-    },
-    "icesSD": {
-      "name": "icesSD",
-      "version": "2.0.0",
-      "sha256": "1k0i79hh63bmsqw5m6ym2h3dydrjji57lkysp5n9x293lgh04pf2",
-      "depends": ["httr", "icesConnect"],
-      "broken": true
-    },
     "icesVMS": {
       "name": "icesVMS",
       "version": "1.1.4",
@@ -140248,6 +144977,20 @@
       "depends": ["igraph", "magick", "rgdal"],
       "broken": true
     },
+    "icrf": {
+      "name": "icrf",
+      "version": "2.0.2",
+      "sha256": "1apd9klng8dhd9z9nzqzpx8i84rvpwgyam9mzyh8jk6vd49cgjaf",
+      "depends": [],
+      "broken": true
+    },
+    "icsw": {
+      "name": "icsw",
+      "version": "1.0.0",
+      "sha256": "0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6",
+      "depends": [],
+      "broken": true
+    },
     "idbg": {
       "name": "idbg",
       "version": "1.0",
@@ -140276,6 +145019,13 @@
       "depends": ["doParallel", "foreach", "survival"],
       "broken": true
     },
+    "idmodelr": {
+      "name": "idmodelr",
+      "version": "0.4.0",
+      "sha256": "11h7l1iv21jxmjwmg0klwiadvwpn1bj055y4a7fqfgsbbqraxlsj",
+      "depends": ["deSolve", "dplyr", "furrr", "future", "ggplot2", "magrittr", "purrr", "rlang", "stringr", "tibble", "tidyr", "viridis"],
+      "broken": true
+    },
     "iemisc": {
       "name": "iemisc",
       "version": "1.0.5",
@@ -140318,6 +145068,13 @@
       "depends": ["date", "demography", "forecast", "rainbow", "survival"],
       "broken": true
     },
+    "image_dlib": {
+      "name": "image.dlib",
+      "version": "0.1.1",
+      "sha256": "0wrg6cwnrqwvgs5w1wjhc8ald7fij76xr2qbv6yb217v13ahwskm",
+      "depends": ["Rcpp"],
+      "broken": true
+    },
     "imfr": {
       "name": "imfr",
       "version": "0.1.9.1",
@@ -140332,13 +145089,6 @@
       "depends": [],
       "broken": true
     },
-    "imputeMissings": {
-      "name": "imputeMissings",
-      "version": "0.0.3",
-      "sha256": "1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z",
-      "depends": ["randomForest"],
-      "broken": true
-    },
     "imputePSF": {
       "name": "imputePSF",
       "version": "0.1.0",
@@ -140388,6 +145138,13 @@
       "depends": ["sandwich"],
       "broken": true
     },
+    "infoelectoral": {
+      "name": "infoelectoral",
+      "version": "1.0.2",
+      "sha256": "1ni00y4wni9dgpaj6x2p50bgmzfh2ybr350ywqmnwz5q30r9kjsm",
+      "depends": ["dplyr", "httr", "stringr"],
+      "broken": true
+    },
     "informR": {
       "name": "informR",
       "version": "1.0-5",
@@ -140409,13 +145166,6 @@
       "depends": ["ltm"],
       "broken": true
     },
-    "inldata": {
-      "name": "inldata",
-      "version": "1.2.3",
-      "sha256": "0155mx8nx5g1vp3mcfar0n4qbxqyvs0fzqnmd8skrrygfk1aw0y5",
-      "depends": ["checkmate", "sf", "stringi", "terra"],
-      "broken": true
-    },
     "inlmisc": {
       "name": "inlmisc",
       "version": "0.5.5",
@@ -140430,11 +145180,11 @@
       "depends": ["cli", "crayon", "doSNOW", "dplyr", "forcats", "foreach", "ggplot2", "glue", "mvtnorm", "optimizeR", "reshape2", "rlang", "scales"],
       "broken": true
     },
-    "insee": {
-      "name": "insee",
-      "version": "1.1.5",
-      "sha256": "1f6y19dysm0mh3fkrwnqcgi5j1lzy08m3ij3wrx26q2vgwv5lkfg",
-      "depends": ["crayon", "dplyr", "httr", "openssl", "purrr", "rappdirs", "rlang", "stringr", "tibble", "tidyselect", "xml2"],
+    "insectDisease": {
+      "name": "insectDisease",
+      "version": "1.2.2",
+      "sha256": "1ncj5fgmx19caf8m2p3ij5iamk941m9y725gs0nqpa9m6zfnzgf8",
+      "depends": ["plyr", "taxize"],
       "broken": true
     },
     "insiderTrades": {
@@ -140451,13 +145201,6 @@
       "depends": ["raster"],
       "broken": true
     },
-    "intSDM": {
-      "name": "intSDM",
-      "version": "2.0.2",
-      "sha256": "01gsq853vxkch69pmgypd4h5yfq1fnawa7qlamxglcxy6zmn3269",
-      "depends": ["blockCV", "geodata", "ggplot2", "giscoR", "inlabru", "PointedSDMs", "R6", "rgbif", "sf", "terra", "tidyterra"],
-      "broken": true
-    },
     "intdag": {
       "name": "intdag",
       "version": "1.0.1",
@@ -140535,6 +145278,13 @@
       "depends": ["Biostrings"],
       "broken": true
     },
+    "iopspackage": {
+      "name": "iopspackage",
+      "version": "2.1.0",
+      "sha256": "1l51h8ljcqdrbcn10d0x98ycnz8xd9da4r6y4wc8dbkvaafynm42",
+      "depends": ["dplyr", "economiccomplexity", "openxlsx", "readxl", "tidyr", "usethis"],
+      "broken": true
+    },
     "ipmisc": {
       "name": "ipmisc",
       "version": "6.0.2",
@@ -140626,6 +145376,13 @@
       "depends": ["Formula", "ucminf"],
       "broken": true
     },
+    "ivdesc": {
+      "name": "ivdesc",
+      "version": "1.1.1",
+      "sha256": "0b28xghncvq182kl19m8k1frnr2cqj7nvnhcd831kfd84bk2sz13",
+      "depends": ["knitr", "purrr", "rsample"],
+      "broken": true
+    },
     "ivfixed": {
       "name": "ivfixed",
       "version": "1.0",
@@ -140759,6 +145516,13 @@
       "depends": ["coin", "Formula", "survival"],
       "broken": true
     },
+    "kbal": {
+      "name": "kbal",
+      "version": "0.1.1",
+      "sha256": "0ri50qvkzbcarh9s05jw6h4mvdrcirl194jfii7smfd7fbw7iahk",
+      "depends": ["RSpectra", "Rcpp", "RcppParallel", "dplyr"],
+      "broken": true
+    },
     "kcirt": {
       "name": "kcirt",
       "version": "0.6.0",
@@ -140780,6 +145544,13 @@
       "depends": ["ape", "distory", "ggplot2"],
       "broken": true
     },
+    "kdpee": {
+      "name": "kdpee",
+      "version": "1.0.0",
+      "sha256": "1vrpr1rkk0ypl5yi3cjgw0fglyx9r2fbcq21n172ax0w3kdyflgk",
+      "depends": ["checkmate"],
+      "broken": true
+    },
     "kdtools": {
       "name": "kdtools",
       "version": "0.6.0",
@@ -140815,13 +145586,6 @@
       "depends": ["benchmarkme", "directlabels", "dplyr", "ggplot2", "gridExtra", "Hmisc", "pbapply", "reshape2", "rgdal", "wordspace"],
       "broken": true
     },
-    "kernstadapt": {
-      "name": "kernstadapt",
-      "version": "0.0.2",
-      "sha256": "0hbzc0xqlgs3kbblm247hkaic7s9a5slz22slh5dz9ddgfdy1z21",
-      "depends": ["misc3d", "sparr", "spatstat_explore", "spatstat_geom", "spatstat_random", "spatstat_utils"],
-      "broken": true
-    },
     "kineticF": {
       "name": "kineticF",
       "version": "1.0",
@@ -140927,6 +145691,13 @@
       "depends": ["rgdal", "sp"],
       "broken": true
     },
+    "landscapetools": {
+      "name": "landscapetools",
+      "version": "0.5.0",
+      "sha256": "11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1",
+      "depends": ["Rcpp", "ggplot2", "raster", "tibble"],
+      "broken": true
+    },
     "largeList": {
       "name": "largeList",
       "version": "0.3.1",
@@ -140955,6 +145726,13 @@
       "depends": ["glasso", "glmnet", "Matrix"],
       "broken": true
     },
+    "lassoshooting": {
+      "name": "lassoshooting",
+      "version": "0.1.5-1.1",
+      "sha256": "1hc05irjwcw54hdrdbwsxfr5b0qq7dysvybzm04jyixqs5b2m8wx",
+      "depends": [],
+      "broken": true
+    },
     "latticeDensity": {
       "name": "latticeDensity",
       "version": "1.2.6",
@@ -141487,6 +146265,13 @@
       "depends": ["foreign", "lattice", "sp"],
       "broken": true
     },
+    "maraca": {
+      "name": "maraca",
+      "version": "0.7",
+      "sha256": "0sy5vmgkbcr1gi7l0hkdzdmibkgs1yvbgj14sfi4jc8zabwbpkz2",
+      "depends": ["checkmate", "dplyr", "ggplot2", "hce", "lifecycle", "patchwork", "tidyr"],
+      "broken": true
+    },
     "marl": {
       "name": "marl",
       "version": "1.0",
@@ -141592,13 +146377,6 @@
       "depends": ["randtoolbox", "snow"],
       "broken": true
     },
-    "mcbette": {
-      "name": "mcbette",
-      "version": "1.15.2",
-      "sha256": "1ckbz9i3zmm8r4y7cx0n9d2jqzx8lmf497ywqmx8bq3mprqxnb5p",
-      "depends": ["babette", "beastier", "beautier", "curl", "devtools", "mauricer", "Rmpfr", "testit", "txtplot"],
-      "broken": true
-    },
     "mcc": {
       "name": "mcc",
       "version": "1.0",
@@ -141697,18 +146475,11 @@
       "depends": ["ggplot2", "jmvcore", "lavaan", "R6"],
       "broken": true
     },
-    "medrxivr": {
-      "name": "medrxivr",
-      "version": "0.0.5",
-      "sha256": "19gakl39n2jch84sv35jkk4g2c0k4h3ch3l3hz1w5p94mn2jlgqr",
-      "depends": ["bib2df", "curl", "data_table", "dplyr", "httr", "jsonlite", "lubridate", "progress", "purrr", "rlang", "stringr", "tibble", "vroom"],
-      "broken": true
-    },
-    "mergedblocks": {
-      "name": "mergedblocks",
-      "version": "1.1.0",
-      "sha256": "0hgfyb99hdph4rx32072v40j3z56bwl8lvpxqmms783b997alaml",
-      "depends": ["randomizeR"],
+    "merlin": {
+      "name": "merlin",
+      "version": "0.1.0",
+      "sha256": "11in84pxgz76l2cfpd7m03fai1gwdhp2rzrn3pbwrpywgq210pmj",
+      "depends": ["MASS", "randtoolbox", "statmod", "survival"],
       "broken": true
     },
     "met": {
@@ -141753,6 +146524,13 @@
       "depends": ["data_table", "ggplot2", "plotROC"],
       "broken": true
     },
+    "metacoder": {
+      "name": "metacoder",
+      "version": "0.3.7",
+      "sha256": "0f7y7yzkqblqal71lp2kip8lzismdzlj3cpw0mb15hvca9dz12x4",
+      "depends": ["GA", "R6", "RCurl", "Rcpp", "ape", "cowplot", "crayon", "dplyr", "ggfittext", "ggplot2", "igraph", "lazyeval", "magrittr", "readr", "rlang", "seqinr", "stringr", "taxize", "tibble", "vegan"],
+      "broken": true
+    },
     "metacor": {
       "name": "metacor",
       "version": "1.0-2.1",
@@ -141767,6 +146545,13 @@
       "depends": ["ggplot2", "gridExtra"],
       "broken": true
     },
+    "metaumbrella": {
+      "name": "metaumbrella",
+      "version": "1.0.11",
+      "sha256": "02x7f26c4flcj07i5jj2xpnx2y8zlvna7zxyillkq33pvh0yw95v",
+      "depends": ["meta", "powerSurvEpi", "pwr", "readxl", "withr", "writexl", "xtable"],
+      "broken": true
+    },
     "meteogRam": {
       "name": "meteogRam",
       "version": "1.0",
@@ -141865,6 +146650,13 @@
       "depends": ["htmlwidgets", "knitr"],
       "broken": true
     },
+    "minimapR": {
+      "name": "minimapR",
+      "version": "0.0.1.0",
+      "sha256": "1cf0mp0mc3zalsi4fa2khz139hky0vjzj0cfay70prh5cll7dm3b",
+      "depends": ["Rsamtools", "git2r", "pafr"],
+      "broken": true
+    },
     "minimaxdesign": {
       "name": "minimaxdesign",
       "version": "0.1.5",
@@ -142040,13 +146832,6 @@
       "depends": [],
       "broken": true
     },
-    "mlmc": {
-      "name": "mlmc",
-      "version": "1.0.0",
-      "sha256": "01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a",
-      "depends": ["ggplot2", "Rcpp"],
-      "broken": true
-    },
     "mlmmm": {
       "name": "mlmmm",
       "version": "0.3-1.2",
@@ -142222,11 +147007,11 @@
       "depends": [],
       "broken": true
     },
-    "morse": {
-      "name": "morse",
-      "version": "3.3.2",
-      "sha256": "0534k96fhfdkfr3dh6q85fmsqqld7xv1zxvikwcb6z6by3nr9cpp",
-      "depends": ["coda", "deSolve", "dplyr", "epitools", "ggplot2", "gridExtra", "magrittr", "reshape2", "rjags", "tibble", "tidyr", "zoo"],
+    "morpheus": {
+      "name": "morpheus",
+      "version": "1.0-4",
+      "sha256": "0y9immrs87yghp0j1h0vp1fhiah5wddfj6pj2hgcqch1imxprhy7",
+      "depends": ["MASS", "jointDiag", "pracma"],
       "broken": true
     },
     "mortyr": {
@@ -142320,6 +147105,13 @@
       "depends": ["animation", "lattice", "latticeExtra", "raster", "rasterVis", "sp", "viridis", "zoo"],
       "broken": true
     },
+    "mra": {
+      "name": "mra",
+      "version": "2.16.11",
+      "sha256": "0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0",
+      "depends": [],
+      "broken": true
+    },
     "mregions": {
       "name": "mregions",
       "version": "0.1.8",
@@ -142383,6 +147175,13 @@
       "depends": ["BH", "Matrix", "Rcpp", "RcppArmadillo", "RcppProgress", "sglOptim"],
       "broken": true
     },
+    "msmtools": {
+      "name": "msmtools",
+      "version": "2.0.1",
+      "sha256": "09an9bpr0gnqbglb8kj4x8bb7f5dm2lc3d01wx6dh7j1d99vrrdk",
+      "depends": ["data_table", "ggplot2", "msm", "patchwork", "scales", "survival"],
+      "broken": true
+    },
     "mssm": {
       "name": "mssm",
       "version": "0.1.6",
@@ -142558,6 +147357,13 @@
       "depends": ["expm", "Familias", "IBDsim", "paramlink"],
       "broken": true
     },
+    "mvPot": {
+      "name": "mvPot",
+      "version": "0.1.6",
+      "sha256": "18cx02wg6nkgmh2ba2gp37z838xr70w354wbkfgl5jnyirl5g9xz",
+      "depends": ["MASS", "evd", "gmp", "numbers"],
+      "broken": true
+    },
     "mvc": {
       "name": "mvc",
       "version": "1.3",
@@ -142572,6 +147378,13 @@
       "depends": ["Rcpp", "RcppArmadillo"],
       "broken": true
     },
+    "mverse": {
+      "name": "mverse",
+      "version": "0.1.0",
+      "sha256": "1qj77s98j05j8d1k1w3h56c7z2i1j973mflhklxhb3xxc7plyk3y",
+      "depends": ["broom", "cowplot", "dplyr", "ggplot2", "ggraph", "igraph", "magrittr", "multiverse", "rlang", "stringr", "tidyr", "tidyselect"],
+      "broken": true
+    },
     "mvprpb": {
       "name": "mvprpb",
       "version": "1.0.4",
@@ -142593,11 +147406,11 @@
       "depends": ["Rcpp", "shiny"],
       "broken": true
     },
-    "mwcsr": {
-      "name": "mwcsr",
-      "version": "0.1.8",
-      "sha256": "0vyvxw708c2m832jwsnfd8jfig5qbnixfl85frpch1c9qqp3238p",
-      "depends": ["igraph", "Rcpp"],
+    "myTAI": {
+      "name": "myTAI",
+      "version": "0.9.3",
+      "sha256": "0fd6srvwzqir8zif56cnyi02c952fgc67xzc17wn7xvmvljfvh4x",
+      "depends": ["RColorBrewer", "Rcpp", "RcppArmadillo", "cpp11", "doParallel", "dplyr", "edgeR", "fitdistrplus", "foreach", "ggplot2", "gridExtra", "nortest", "readr", "reshape2", "scales", "taxize", "tibble"],
       "broken": true
     },
     "myepisodes": {
@@ -142677,13 +147490,6 @@
       "depends": ["distrEx", "rgl"],
       "broken": true
     },
-    "nbody": {
-      "name": "nbody",
-      "version": "1.33",
-      "sha256": "1ky07bi830z3c2fvxq0fmicsllm736b510q4zphff4rwljx1awf2",
-      "depends": ["magicaxis", "Rcpp"],
-      "broken": true
-    },
     "ncg": {
       "name": "ncg",
       "version": "0.1.1",
@@ -142775,6 +147581,27 @@
       "depends": [],
       "broken": true
     },
+    "neurocInstall": {
+      "name": "neurocInstall",
+      "version": "0.12.0",
+      "sha256": "1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf",
+      "depends": ["devtools"],
+      "broken": true
+    },
+    "neuronorm": {
+      "name": "neuronorm",
+      "version": "1.0.2",
+      "sha256": "1bypspygib963n255q6j5pmm14sw67ipmkq54faz8w2i3mdb845v",
+      "depends": ["fslr", "knitr", "oro_nifti"],
+      "broken": true
+    },
+    "nhanesA": {
+      "name": "nhanesA",
+      "version": "1.1",
+      "sha256": "10vbgwz0m94yqjydrylyl699j92yr1f7j9cc23q9v4grg7zspk0b",
+      "depends": ["foreign", "plyr", "rvest", "stringr", "xml2"],
+      "broken": true
+    },
     "nhlscrape": {
       "name": "nhlscrape",
       "version": "0.1.3",
@@ -142859,6 +147686,13 @@
       "depends": ["FNN", "NeuralNetTools", "nnet", "pracma"],
       "broken": true
     },
+    "noaaoceans": {
+      "name": "noaaoceans",
+      "version": "0.3.0",
+      "sha256": "0pxsddzkrprzjch173shhmd7c2h6rh5xzs3n5bbs97l51ni8m60m",
+      "depends": ["httr", "jsonlite", "rvest", "xml2"],
+      "broken": true
+    },
     "nodeHarvest": {
       "name": "nodeHarvest",
       "version": "0.7-3",
@@ -142943,6 +147777,13 @@
       "depends": ["corpcor", "DBI", "httr", "lubridate", "magic", "matlab", "Matrix", "RCurl", "RMySQL", "vars", "xts", "zoo"],
       "broken": true
     },
+    "npcopTest": {
+      "name": "npcopTest",
+      "version": "1.03",
+      "sha256": "1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr",
+      "depends": [],
+      "broken": true
+    },
     "npm": {
       "name": "npm",
       "version": "1.0.0",
@@ -143041,6 +147882,13 @@
       "depends": [],
       "broken": true
     },
+    "observer": {
+      "name": "observer",
+      "version": "0.1.2",
+      "sha256": "1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m",
+      "depends": ["bazar", "bit", "dplyr", "lazyeval", "magrittr", "tibble"],
+      "broken": true
+    },
     "occTest": {
       "name": "occTest",
       "version": "0.1.1",
@@ -143062,6 +147910,13 @@
       "depends": ["bayesm", "coda"],
       "broken": true
     },
+    "odbr": {
+      "name": "odbr",
+      "version": "0.1.0",
+      "sha256": "03bdhmya86whrzijc8h6gvd4yzmivdskm42a80n4ryqn4szfyrpd",
+      "depends": ["R_utils", "data_table", "fs", "haven", "piggyback", "sf", "usethis"],
+      "broken": true
+    },
     "odeintr": {
       "name": "odeintr",
       "version": "1.7.1",
@@ -143083,13 +147938,6 @@
       "depends": ["doParallel", "foreach", "forecast", "MASS", "Rcpp", "RcppArmadillo"],
       "broken": true
     },
-    "ohun": {
-      "name": "ohun",
-      "version": "1.0.1",
-      "sha256": "103s9sv70p9hw6q55j98wri5bxqazfn9hxpk1mm39x7navx3qzvp",
-      "depends": ["checkmate", "cli", "fftw", "ggplot2", "igraph", "rlang", "seewave", "sf", "tuneR", "warbleR"],
-      "broken": true
-    },
     "okmesonet": {
       "name": "okmesonet",
       "version": "0.1.5",
@@ -143167,13 +148015,6 @@
       "depends": ["crul", "dplyr", "jsonlite", "maptools", "rappdirs", "readr", "tibble", "xml2"],
       "broken": true
     },
-    "openscoring": {
-      "name": "openscoring",
-      "version": "1.0.1",
-      "sha256": "0cyay8gahv8xyssyjhc18myvzi060rvlkakf69w2xpfkrfjsk2rf",
-      "depends": ["cli", "glue", "httr", "jsonlite", "lifecycle", "rlang", "stringr"],
-      "broken": true
-    },
     "opensensmapr": {
       "name": "opensensmapr",
       "version": "0.6.0",
@@ -143216,13 +148057,6 @@
       "depends": ["AUC", "data_table", "ggplot2", "knitr", "plyr", "scales", "stringr", "XML"],
       "broken": true
     },
-    "optimCheck": {
-      "name": "optimCheck",
-      "version": "1.0",
-      "sha256": "1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n",
-      "depends": [],
-      "broken": true
-    },
     "optimr": {
       "name": "optimr",
       "version": "2019-12.16",
@@ -143265,6 +148099,13 @@
       "depends": ["glue", "rlang"],
       "broken": true
     },
+    "orcutt": {
+      "name": "orcutt",
+      "version": "2.3",
+      "sha256": "0pj7pqzbcg4gp35nsz3avyawmx69dgj0l2w0x8ypw5qwl4zhmnyk",
+      "depends": ["lmtest"],
+      "broken": true
+    },
     "orderbook": {
       "name": "orderbook",
       "version": "1.03",
@@ -143405,6 +148246,13 @@
       "depends": [],
       "broken": true
     },
+    "packDAMipd": {
+      "name": "packDAMipd",
+      "version": "1.1.0",
+      "sha256": "0y81ap4nhvfc5k0xfcbghnf32svgkx8p01g0md3hzhyfvmgjffqm",
+      "depends": ["IPDFileCheck", "ISLR", "MASS", "SurvRegCensCov", "broom", "car", "data_table", "dplyr", "effects", "flextable", "ggplot2", "ggpubr", "gvlma", "hash", "haven", "labelled", "lme4", "lmtest", "purrr", "readxl", "relaimpo", "reshape2", "rlang", "stringr", "survival", "survminer", "systemfit", "tidyr", "valueEQ5D"],
+      "broken": true
+    },
     "packS4": {
       "name": "packS4",
       "version": "0.9.3",
@@ -143475,13 +148323,6 @@
       "depends": ["GCD", "ggplot2", "lattice", "locfit", "plyr", "raster", "rgdal"],
       "broken": true
     },
-    "paleopop": {
-      "name": "paleopop",
-      "version": "2.1.5",
-      "sha256": "1mq7skw5k3b9gc2jkjsdq96ih3qwywwdsq1948101cl0ryh3aadn",
-      "depends": ["poems", "R6", "sf", "trend"],
-      "broken": true
-    },
     "palmid": {
       "name": "palmid",
       "version": "0.0.3",
@@ -143524,6 +148365,13 @@
       "depends": ["checkmate", "data_table", "dictionar6", "R6", "set6"],
       "broken": true
     },
+    "params": {
+      "name": "params",
+      "version": "0.7.3",
+      "sha256": "0zii9nxgl2z46vyqn2l0kdjmib90534ybpizck74mp2wp1vh9ndj",
+      "depends": ["RcppTOML", "glue", "purrr", "readr", "whisker"],
+      "broken": true
+    },
     "parboost": {
       "name": "parboost",
       "version": "0.1.4",
@@ -143671,6 +148519,13 @@
       "depends": ["doParallel", "foreach", "ggplot2", "pec", "PermAlgo", "prodlim", "Rcpp", "RcppArmadillo", "riskRegression", "survival"],
       "broken": true
     },
+    "pct": {
+      "name": "pct",
+      "version": "0.9.9",
+      "sha256": "15rshwdrfkr0ahnywss0qqbcyfxakknv9ffvb58nzc960c97zmy8",
+      "depends": ["boot", "crul", "readr", "sf", "stplanr"],
+      "broken": true
+    },
     "pds3": {
       "name": "pds3",
       "version": "0.5.0",
@@ -143776,6 +148631,13 @@
       "depends": ["grImport"],
       "broken": true
     },
+    "pfa": {
+      "name": "pfa",
+      "version": "1.1",
+      "sha256": "0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31",
+      "depends": ["POET", "lars", "quantreg"],
+      "broken": true
+    },
     "pfocal": {
       "name": "pfocal",
       "version": "1.0.0",
@@ -143804,6 +148666,13 @@
       "depends": ["calibrate"],
       "broken": true
     },
+    "phyloclim": {
+      "name": "phyloclim",
+      "version": "0.9.5",
+      "sha256": "107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs",
+      "depends": ["ape", "raster", "sp"],
+      "broken": true
+    },
     "phyloland": {
       "name": "phyloland",
       "version": "1.3",
@@ -143811,6 +148680,13 @@
       "depends": ["ape"],
       "broken": true
     },
+    "physiology": {
+      "name": "physiology",
+      "version": "1.2.1",
+      "sha256": "1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb",
+      "depends": ["Rcpp"],
+      "broken": true
+    },
     "physx": {
       "name": "physx",
       "version": "1.0",
@@ -143881,6 +148757,13 @@
       "depends": ["ggplot2", "hexbin", "MASS", "mgcv", "plyr", "XML2R"],
       "broken": true
     },
+    "pkgmaker": {
+      "name": "pkgmaker",
+      "version": "0.32.10",
+      "sha256": "0cr95vmsb4gkl917wg4wwq8jihvwasdg18qzhk2cq224lrrh8awp",
+      "depends": ["assertthat", "codetools", "digest", "registry", "stringr", "withr", "xtable"],
+      "broken": true
+    },
     "pkgstats": {
       "name": "pkgstats",
       "version": "0.1.1",
@@ -143909,6 +148792,13 @@
       "depends": ["cubature", "dielectric", "ggplot2", "plyr", "Rcpp", "RcppArmadillo", "reshape2", "statmod"],
       "broken": true
     },
+    "plantecowrap": {
+      "name": "plantecowrap",
+      "version": "1.0.4",
+      "sha256": "0syxf63xy5whzw03ys5cxyw7689mr7ihgmqddv53jb8rlbwm84p8",
+      "depends": ["ggplot2", "minpack_lm", "plantecophys", "tidyr"],
+      "broken": true
+    },
     "plmm": {
       "name": "plmm",
       "version": "0.1-1",
@@ -143993,6 +148883,13 @@
       "depends": ["dplyr", "lubridate", "magrittr", "pillar", "rlang", "tibble", "tidyr", "tidyselect", "vctrs"],
       "broken": true
     },
+    "pmlbr": {
+      "name": "pmlbr",
+      "version": "0.2.1",
+      "sha256": "06kac7h4skccs48ixyjnxxry38dci9cgkckfvkpzaqhzzlbvmn0g",
+      "depends": ["FNN"],
+      "broken": true
+    },
     "pmpp": {
       "name": "pmpp",
       "version": "0.1.1",
@@ -144021,13 +148918,6 @@
       "depends": ["assertthat", "DBI", "dplyr", "lubridate", "magrittr", "odbc", "plogr", "RPostgres", "rstudioapi", "shiny", "stringr", "tibble"],
       "broken": true
     },
-    "poems": {
-      "name": "poems",
-      "version": "1.1.0",
-      "sha256": "123sq2ixm8qzj6jc95skwl6rr4hiy7dcf34x4mrhqv5sf7k41yzs",
-      "depends": ["abc", "doParallel", "foreach", "gdistance", "geosphere", "lhs", "metRology", "R6", "raster", "trend"],
-      "broken": true
-    },
     "poio": {
       "name": "poio",
       "version": "0.0-4",
@@ -144175,6 +149065,13 @@
       "depends": [],
       "broken": true
     },
+    "preferably": {
+      "name": "preferably",
+      "version": "0.4.1",
+      "sha256": "11xvh0a8m2lpmrrrrn95axqgz9rdipn63zd7c505a8spzwf6dvm5",
+      "depends": ["knitr", "pkgdown"],
+      "broken": true
+    },
     "presser": {
       "name": "presser",
       "version": "1.1.0",
@@ -144469,6 +149366,13 @@
       "depends": ["curl", "jsonlite", "Rmpfr"],
       "broken": true
     },
+    "qtlmt": {
+      "name": "qtlmt",
+      "version": "0.1-6",
+      "sha256": "023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c",
+      "depends": [],
+      "broken": true
+    },
     "quad": {
       "name": "quad",
       "version": "1.0",
@@ -144707,6 +149611,13 @@
       "depends": ["knitr", "nnls"],
       "broken": true
     },
+    "rRAP": {
+      "name": "rRAP",
+      "version": "1.1",
+      "sha256": "1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb",
+      "depends": ["MASS", "lars", "lassoshooting"],
+      "broken": true
+    },
     "rRofex": {
       "name": "rRofex",
       "version": "2.0.6",
@@ -144861,6 +149772,20 @@
       "depends": ["clipr", "dplyr", "jsonlite", "rvest", "stringr", "xml2"],
       "broken": true
     },
+    "raybevel": {
+      "name": "raybevel",
+      "version": "0.1.3",
+      "sha256": "0431mk0lslqwffknarb7zm2nbgv564d3karf9davc7w1xgnf11fj",
+      "depends": ["BH", "Rcpp", "RcppCGAL", "RcppThread", "decido", "digest", "progress", "rayvertex", "sf"],
+      "broken": true
+    },
+    "rb3": {
+      "name": "rb3",
+      "version": "0.0.11",
+      "sha256": "1nxh4a3ihjdm1xp3sam9pqh56q2yic97fssm00g7djdfcxq6y0fy",
+      "depends": ["XML", "ascii", "base64enc", "bizdays", "cli", "digest", "dplyr", "httr", "jsonlite", "proto", "purrr", "readr", "readxl", "rlang", "rvest", "stringr", "tidyr", "yaml"],
+      "broken": true
+    },
     "rbace": {
       "name": "rbace",
       "version": "0.2.2",
@@ -145113,6 +150038,13 @@
       "depends": ["imager"],
       "broken": true
     },
+    "refdb": {
+      "name": "refdb",
+      "version": "0.1.1",
+      "sha256": "1g30n7jvn532nhbn4mrfkfym40vw1ha0q8yi3d3d3v86gyr5ga4n",
+      "depends": ["ape", "bioseq", "bold", "dplyr", "ggplot2", "ggraph", "igraph", "leaflet", "readr", "rentrez", "rlang", "rmarkdown", "stringr", "taxize", "tibble", "tidyr", "xml2", "yaml"],
+      "broken": true
+    },
     "refnr": {
       "name": "refnr",
       "version": "0.1.0",
@@ -145281,6 +150213,13 @@
       "depends": ["sp"],
       "broken": true
     },
+    "rgeoboundaries": {
+      "name": "rgeoboundaries",
+      "version": "1.3",
+      "sha256": "1hw96fq781zfyy0gq0flpizd6aq0av2hpvrcsvyh43n3vjfhy2n3",
+      "depends": ["countrycode", "crul", "glue", "hoardr", "jsonlite", "lifecycle", "memoise", "sf"],
+      "broken": true
+    },
     "rgeolocate": {
       "name": "rgeolocate",
       "version": "1.4.2",
@@ -145484,6 +150423,13 @@
       "depends": [],
       "broken": true
     },
+    "rngSetSeed": {
+      "name": "rngSetSeed",
+      "version": "0.3-3",
+      "sha256": "1ymhrfv83nr2mkqncbi7k8h43xxz53r50vp215hakh093n5im71k",
+      "depends": [],
+      "broken": true
+    },
     "rngwell19937": {
       "name": "rngwell19937",
       "version": "0.6-0",
@@ -145533,13 +150479,6 @@
       "depends": ["forecast", "Rcpp"],
       "broken": true
     },
-    "robustarima": {
-      "name": "robustarima",
-      "version": "0.2.6",
-      "sha256": "137x9w3fq523bw2wix7bwc255mq7kvqa047chcnb2prihn9d6as7",
-      "depends": ["splusTimeDate", "splusTimeSeries"],
-      "broken": true
-    },
     "robustgam": {
       "name": "robustgam",
       "version": "0.1.7",
@@ -145715,13 +150654,6 @@
       "depends": ["crul", "data_table", "httr", "jsonlite", "plyr", "stringr"],
       "broken": true
     },
-    "rsofun": {
-      "name": "rsofun",
-      "version": "4.4",
-      "sha256": "1vq5hrjqq3ppki5rxd2gl3219p3cxg5ajgr14ynxkyg9sdbmnsb0",
-      "depends": ["BayesianTools", "dplyr", "GenSA", "magrittr", "multidplyr", "purrr", "tidyr"],
-      "broken": true
-    },
     "rsqliteadmin": {
       "name": "rsqliteadmin",
       "version": "1.0.1",
@@ -145757,11 +150689,11 @@
       "depends": ["assertthat", "dplyr", "forcats", "ggplot2", "magrittr", "moveVis", "pbapply", "raster", "RStoolbox", "sf", "sp", "tidyr"],
       "broken": true
     },
-    "rusquant": {
-      "name": "rusquant",
-      "version": "1.1.1",
-      "sha256": "02saxymlmjmbzczhn2ihyn09106005wi39f2q9dyasrzi7n6v6pk",
-      "depends": ["base64enc", "data_table", "httr", "jose", "jsonlite", "quantmod", "rvest", "stringr", "XML", "xts"],
+    "rusda": {
+      "name": "rusda",
+      "version": "1.0.8",
+      "sha256": "0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338",
+      "depends": ["RCurl", "XML", "foreach", "httr", "plyr", "stringr", "taxize", "testthat"],
       "broken": true
     },
     "ruta": {
@@ -145792,6 +150724,27 @@
       "depends": ["matlab"],
       "broken": true
     },
+    "rxode2et": {
+      "name": "rxode2et",
+      "version": "2.0.13",
+      "sha256": "1pprky6j5vzijichr7kzfavc8ly3k272xnzvwix60v77z9zn5kyw",
+      "depends": ["Rcpp", "checkmate", "cli", "crayon", "lotri", "magrittr", "rxode2parse", "rxode2random"],
+      "broken": true
+    },
+    "rxode2parse": {
+      "name": "rxode2parse",
+      "version": "2.0.19",
+      "sha256": "01q3chhq7nl1jl50w623m1nik9jdrizpc4hi792ynsr27lsqlhcx",
+      "depends": ["BH", "Rcpp", "RcppEigen", "StanHeaders", "checkmate", "crayon", "data_table", "digest", "dparser", "knitr", "qs", "rex", "symengine"],
+      "broken": true
+    },
+    "rxode2random": {
+      "name": "rxode2random",
+      "version": "2.1.1",
+      "sha256": "1zrddjq1i2wfx6ai4wwp1l0vnyk5i19dcr7f2q3f66jhlj9fqp27",
+      "depends": ["BH", "Rcpp", "RcppArmadillo", "checkmate", "lotri", "rxode2parse", "sitmo"],
+      "broken": true
+    },
     "ryouready": {
       "name": "ryouready",
       "version": "0.4",
@@ -145820,6 +150773,13 @@
       "depends": [],
       "broken": true
     },
+    "sacRebleu": {
+      "name": "sacRebleu",
+      "version": "0.1.3",
+      "sha256": "0piapn7srrfc4qmwkpjrsfyhz253pl69ppm3y9flqlffki5b5zx1",
+      "depends": ["Rcpp", "checkmate", "tok"],
+      "broken": true
+    },
     "saccades": {
       "name": "saccades",
       "version": "0.1-1",
@@ -145841,20 +150801,6 @@
       "depends": ["coda", "rjags", "stringr"],
       "broken": true
     },
-    "saeHB_spatial": {
-      "name": "saeHB.spatial",
-      "version": "0.1.0",
-      "sha256": "0fqc3c5y4rwfpgfbwfsrdhqlwjbal28wi9djm1vlncr8phkzfpln",
-      "depends": ["coda", "rjags", "stringr"],
-      "broken": true
-    },
-    "saeHB_twofold": {
-      "name": "saeHB.twofold",
-      "version": "0.1.1",
-      "sha256": "1fdrh4h9y6blvib7d0hn1dhccz7rrmyf84a3g49chshiympkp6nv",
-      "depends": ["coda", "data_table", "rjags", "stringr"],
-      "broken": true
-    },
     "saeHB_zinb": {
       "name": "saeHB.zinb",
       "version": "0.1.1",
@@ -146065,6 +151011,13 @@
       "depends": ["raster", "shiny", "sp"],
       "broken": true
     },
+    "sdpt3r": {
+      "name": "sdpt3r",
+      "version": "0.3",
+      "sha256": "02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5",
+      "depends": ["Matrix"],
+      "broken": true
+    },
     "sdtoolkit": {
       "name": "sdtoolkit",
       "version": "2.33-1",
@@ -146072,13 +151025,6 @@
       "depends": [],
       "broken": true
     },
-    "seAMLess": {
-      "name": "seAMLess",
-      "version": "0.1.0",
-      "sha256": "18rpka0qq6hh7v241bv5k8ln03qk90lpf3ak2plq861lnf3p0wxb",
-      "depends": ["Biobase", "ggplot2", "ggtern", "randomForest"],
-      "broken": true
-    },
     "seagull": {
       "name": "seagull",
       "version": "1.1.0",
@@ -146142,6 +151088,13 @@
       "depends": ["kutils", "lavaan", "plyr", "stationery", "xtable"],
       "broken": true
     },
+    "semTests": {
+      "name": "semTests",
+      "version": "0.5.0",
+      "sha256": "0qf3z5vy4lqb2mp28gzkd1l3px1y1hn6l2mm77mvvijvklb3n26b",
+      "depends": ["CompQuadForm", "future_apply", "lavaan", "progressr"],
+      "broken": true
+    },
     "semdiag": {
       "name": "semdiag",
       "version": "0.1.2",
@@ -146170,13 +151123,6 @@
       "depends": ["dplyr", "rlang", "tidyr", "wrapr"],
       "broken": true
     },
-    "seq2R": {
-      "name": "seq2R",
-      "version": "2.0.0",
-      "sha256": "1ynhmfch8w2s0mh55km6v9afn0z3p43ckg79cz08d2z25lv5syrj",
-      "depends": ["seqinr"],
-      "broken": true
-    },
     "seqCBS": {
       "name": "seqCBS",
       "version": "1.2.1",
@@ -146226,6 +151172,13 @@
       "depends": ["copynumber", "iotools", "pbapply", "readr", "seqminer", "squash"],
       "broken": true
     },
+    "serocalculator": {
+      "name": "serocalculator",
+      "version": "1.0.3",
+      "sha256": "1cxwii35gp9dybjp2989wbmsrv9f3s1qxrrsl4s57lj3q1by2kpk",
+      "depends": ["Rcpp", "cli", "doParallel", "dplyr", "foreach", "ggplot2", "ggpubr", "lifecycle", "magrittr", "mixtools", "rlang", "rngtools", "scales", "tibble", "tidyr"],
+      "broken": true
+    },
     "seroincidence": {
       "name": "seroincidence",
       "version": "2.0.0",
@@ -146268,6 +151221,13 @@
       "depends": [],
       "broken": true
     },
+    "sgapi": {
+      "name": "sgapi",
+      "version": "1.0.2",
+      "sha256": "0q0qamhzsn4421wzbjfqlwrs2w4qj61ynvjh9pjv7fkk89szh7xx",
+      "depends": ["dplyr", "httr", "magrittr", "readr", "sf", "xml2"],
+      "broken": true
+    },
     "sglOptim": {
       "name": "sglOptim",
       "version": "1.3.8",
@@ -146296,6 +151256,13 @@
       "depends": ["commonsMath", "rscala"],
       "broken": true
     },
+    "shiny_worker": {
+      "name": "shiny.worker",
+      "version": "0.0.1",
+      "sha256": "1l30dx46s3q1x9nd42r6dracd3lqkjk80r9jyjqy8lmdsq48300i",
+      "depends": ["R6", "future", "shiny"],
+      "broken": true
+    },
     "shinybootstrap2": {
       "name": "shinybootstrap2",
       "version": "0.2.1",
@@ -146429,6 +151396,13 @@
       "depends": ["cli", "dplyr", "knitr", "magrittr", "modeltime", "parsnip", "purrr", "rlang", "rsample", "tibble", "tidyr", "tune"],
       "broken": true
     },
+    "skynet": {
+      "name": "skynet",
+      "version": "1.4.3",
+      "sha256": "08a5p3rk0qhsxawdxj5sfw07rdk56x6viy37w1b0hxqaxxxv239i",
+      "depends": ["RCurl", "data_table", "dplyr", "geosphere", "ggplot2", "ggrepel", "httr", "igraph", "leaflet", "maps", "stringr"],
+      "broken": true
+    },
     "slga": {
       "name": "slga",
       "version": "1.2.0",
@@ -146534,6 +151508,13 @@
       "depends": ["DescTools", "devtools", "dplyr", "ggplot2", "raster", "rlang", "scales", "sp", "statmod", "stringr", "tidyr", "usethis"],
       "broken": true
     },
+    "soilassessment": {
+      "name": "soilassessment",
+      "version": "0.2.6",
+      "sha256": "0cgyji88q3r6b57q32nk8xgxb4q29678h8zgh9ywxhr3mr40i0qv",
+      "depends": ["FuzzyAHP", "Hmisc", "caret", "deSolve", "e1071", "googledrive", "nnet", "png", "randomForest", "raster", "sf", "soiltexture", "sp", "terra"],
+      "broken": true
+    },
     "someKfwer": {
       "name": "someKfwer",
       "version": "1.2",
@@ -146576,6 +151557,13 @@
       "depends": ["assertthat", "cluster", "dplyr", "gplots", "gtools", "R6", "Rcpp", "reshape2", "SPIn", "tensorA"],
       "broken": true
     },
+    "spNetwork": {
+      "name": "spNetwork",
+      "version": "0.4.4.3",
+      "sha256": "18g885w54d5hx9pwbqwz28gs723h9wpnfhr4a0yl37j5i3rasccx",
+      "depends": ["BH", "Rcpp", "RcppArmadillo", "RcppProgress", "Rdpack", "abind", "cubature", "data_table", "dbscan", "future_apply", "ggplot2", "igraph", "progressr", "sf", "sfheaders", "spdep"],
+      "broken": true
+    },
     "space": {
       "name": "space",
       "version": "0.1-1.1",
@@ -146604,6 +151592,13 @@
       "depends": [],
       "broken": true
     },
+    "sparseGAM": {
+      "name": "sparseGAM",
+      "version": "1.0",
+      "sha256": "0qqfsgrp0ll11mws0s54g5nsqxwn2j5kbs60q2zrviv6n8bs8xf0",
+      "depends": ["MASS", "grpreg", "pracma"],
+      "broken": true
+    },
     "sparsebn": {
       "name": "sparsebn",
       "version": "0.1.2",
@@ -146618,6 +151613,13 @@
       "depends": ["Matrix", "nnet"],
       "broken": true
     },
+    "spathial": {
+      "name": "spathial",
+      "version": "0.1.2",
+      "sha256": "1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb",
+      "depends": ["MASS", "Rtsne", "class", "igraph", "irlba", "knitr", "matrixStats", "pracma", "rmarkdown"],
+      "broken": true
+    },
     "spatialfusion": {
       "name": "spatialfusion",
       "version": "0.6-6",
@@ -146709,6 +151711,13 @@
       "depends": ["sp", "XML"],
       "broken": true
     },
+    "sphereTessellation": {
+      "name": "sphereTessellation",
+      "version": "1.2.0",
+      "sha256": "1b8wxbh44qd0rznjln3icp9k4jy598rva9kwcgzscpjm5j86r97w",
+      "depends": ["BH", "Polychrome", "Rcpp", "RcppCGAL", "RcppEigen", "colorsGen", "rgl"],
+      "broken": true
+    },
     "spiR": {
       "name": "spiR",
       "version": "0.2.1",
@@ -146737,20 +151746,6 @@
       "depends": ["corpcor", "matrixStats"],
       "broken": true
     },
-    "splusTimeDate": {
-      "name": "splusTimeDate",
-      "version": "2.5.4",
-      "sha256": "131g7vd6kqr4vx58myciwlvkvpbblvzhj4qw0l57a45mwa90sqy3",
-      "depends": [],
-      "broken": true
-    },
-    "splusTimeSeries": {
-      "name": "splusTimeSeries",
-      "version": "1.5.5",
-      "sha256": "0j62vb601036zj1zj68qhgmg0bbrbrpz8bak0g6n5qf25yr9y09x",
-      "depends": ["splusTimeDate"],
-      "broken": true
-    },
     "spm12r": {
       "name": "spm12r",
       "version": "2.8.3",
@@ -146835,6 +151830,13 @@
       "depends": ["plot3D"],
       "broken": true
     },
+    "spt": {
+      "name": "spt",
+      "version": "2.5.1",
+      "sha256": "04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn",
+      "depends": [],
+      "broken": true
+    },
     "sptm": {
       "name": "sptm",
       "version": "2019.11-25",
@@ -146863,6 +151865,13 @@
       "depends": ["dplyr", "Hmisc", "janitor", "lubridate", "naniar", "plyr", "polite", "rlang", "rvest", "stringr", "tibble", "tidyr"],
       "broken": true
     },
+    "srlTS": {
+      "name": "srlTS",
+      "version": "0.1.1",
+      "sha256": "1alqywbp36adgnak1s78mcwfg0gcg90a9412nypylsk6bfa7wgsv",
+      "depends": ["RcppRoll", "dplyr", "ncvreg", "rlang", "yardstick"],
+      "broken": true
+    },
     "ssd": {
       "name": "ssd",
       "version": "0.3",
@@ -146912,6 +151921,13 @@
       "depends": ["data_table", "doParallel", "EmiStatR", "foreach", "ggplot2", "hydroGOF", "lattice", "lmom", "mAr", "moments", "msm", "xts", "zoo"],
       "broken": true
     },
+    "stabreg": {
+      "name": "stabreg",
+      "version": "0.1.2",
+      "sha256": "1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia",
+      "depends": ["numDeriv"],
+      "broken": true
+    },
     "stackoverflow": {
       "name": "stackoverflow",
       "version": "0.7.0",
@@ -146954,6 +151970,13 @@
       "depends": [],
       "broken": true
     },
+    "stationery": {
+      "name": "stationery",
+      "version": "1.1",
+      "sha256": "1n5mzk6ibb8j4vy2ca3bj0jm2bk2qg5x6nsch2hwcyspm3gym4jl",
+      "depends": ["knitr", "kutils", "rmarkdown"],
+      "broken": true
+    },
     "stickr": {
       "name": "stickr",
       "version": "0.3.1",
@@ -146975,6 +151998,13 @@
       "depends": ["MASS", "numDeriv"],
       "broken": true
     },
+    "stochvolTMB": {
+      "name": "stochvolTMB",
+      "version": "0.2.0",
+      "sha256": "07m3qz8j1sw37lrxzmbkbifd3nsdvd2blbca8vr1aq5bbafr1g1b",
+      "depends": ["MASS", "RcppEigen", "TMB", "data_table", "ggplot2", "sn"],
+      "broken": true
+    },
     "stockfish": {
       "name": "stockfish",
       "version": "1.0.0",
@@ -147157,6 +152187,13 @@
       "depends": [],
       "broken": true
     },
+    "survival666": {
+      "name": "survival666",
+      "version": "0.5",
+      "sha256": "11vs546lrbxnhpxjmwxhh2hnp6kwcf4hzgigi3x9525hr8n9cy01",
+      "depends": ["ggplot2", "survival", "survminer"],
+      "broken": true
+    },
     "survtmle": {
       "name": "survtmle",
       "version": "1.1.1",
@@ -147332,6 +152369,20 @@
       "depends": ["digest", "raster", "sp"],
       "broken": true
     },
+    "taxize": {
+      "name": "taxize",
+      "version": "0.9.100",
+      "sha256": "0afdjcwkkpkc5kgk558jccnw6jzs6mswd4i86c316pgb8py7irg2",
+      "depends": ["R6", "ape", "bold", "cli", "conditionz", "crayon", "crul", "data_table", "foreach", "jsonlite", "natserv", "phangorn", "ritis", "rotl", "rredlist", "tibble", "wikitaxa", "worrms", "xml2", "zoo"],
+      "broken": true
+    },
+    "taxizedb": {
+      "name": "taxizedb",
+      "version": "0.3.1",
+      "sha256": "157xpbmqp3l0blf6n7cb0qswj12v39rhvx0zkbrc2w73g601naj5",
+      "depends": ["DBI", "RSQLite", "curl", "dbplyr", "dplyr", "hoardr", "magrittr", "readr", "rlang", "tibble"],
+      "broken": true
+    },
     "taxonbridge": {
       "name": "taxonbridge",
       "version": "1.2.2",
@@ -147458,13 +152509,6 @@
       "depends": ["DiPs", "MASS", "plyr", "rcbalance"],
       "broken": true
     },
-    "threeBrain": {
-      "name": "threeBrain",
-      "version": "1.0.1",
-      "sha256": "0pg5azxjqvwjl6235f0vnic04rz8vvaski0ac17mjn5ny1l0qnc1",
-      "depends": ["digest", "dipsaus", "freesurferformats", "gifti", "htmlwidgets", "jsonlite", "oro_nifti", "R6", "ravetools", "servr", "shiny", "stringr", "xml2"],
-      "broken": true
-    },
     "threeboost": {
       "name": "threeboost",
       "version": "1.1",
@@ -147514,6 +152558,13 @@
       "depends": ["dplyr", "furrr", "future", "httr", "jsonlite", "labelled", "magrittr", "purrr", "stringr", "tidyr", "xml2"],
       "broken": true
     },
+    "tidysynth": {
+      "name": "tidysynth",
+      "version": "0.2.0",
+      "sha256": "1arvjv3w6my47xwrzxrnpb2npskhqb9xmqhszgrxcqa55s1x6p15",
+      "depends": ["dplyr", "forcats", "ggplot2", "kernlab", "magrittr", "optimx", "rgenoud", "rlang", "tibble", "tidyr"],
+      "broken": true
+    },
     "tidytags": {
       "name": "tidytags",
       "version": "1.1.1",
@@ -147535,6 +152586,13 @@
       "depends": ["gss", "lattice", "mgcv", "pheatmap", "reshape"],
       "broken": true
     },
+    "timeless": {
+      "name": "timeless",
+      "version": "0.2.3",
+      "sha256": "0wq98ngwn9ajgxmc1ybfgzmxr21jsvjqsc3crrkska7vpzxpjy11",
+      "depends": [],
+      "broken": true
+    },
     "timeline": {
       "name": "timeline",
       "version": "0.9",
@@ -147633,6 +152691,20 @@
       "depends": ["Formula", "generics", "margins", "numDeriv", "prediction", "Rdpack", "tibble"],
       "broken": true
     },
+    "tok": {
+      "name": "tok",
+      "version": "0.1.3",
+      "sha256": "0grnqf0k8vlyfsy8nwaawbyd91l6j8kyvny3cnn8xjgws0pyslli",
+      "depends": ["R6", "cli"],
+      "broken": true
+    },
+    "topmodel": {
+      "name": "topmodel",
+      "version": "0.7.5",
+      "sha256": "1bhzjy2ja4953a5wx8s3cz3v0ip6lym193faqxxabxjklgbsp416",
+      "depends": [],
+      "broken": true
+    },
     "tosls": {
       "name": "tosls",
       "version": "1.0",
@@ -147682,6 +152754,13 @@
       "depends": ["curl", "data_table", "getPass", "plyr", "RCurl", "reshape2", "suppdata", "taxize", "units", "XML"],
       "broken": true
     },
+    "traits": {
+      "name": "traits",
+      "version": "0.5.1",
+      "sha256": "1jkap9qh3m2hxwib0h3vqzs2rc0dfnk875nbsr682sad8mx8i01h",
+      "depends": ["crul", "data_table", "hoardr", "httr", "jsonlite", "readr", "rvest", "taxize", "tibble", "xml2"],
+      "broken": true
+    },
     "trajeR": {
       "name": "trajeR",
       "version": "0.9.0.5",
@@ -147689,6 +152768,20 @@
       "depends": ["capushe", "MASS", "minpack_lm", "numDeriv", "Rcpp", "RcppArmadillo", "ucminf"],
       "broken": true
     },
+    "trampoline": {
+      "name": "trampoline",
+      "version": "0.1.1",
+      "sha256": "05inq5j8gvnpww6z21dzc57vilsm4gx3m274fpsamp54q85mi68s",
+      "depends": ["coro", "fastmap", "rlang"],
+      "broken": true
+    },
+    "tranSurv": {
+      "name": "tranSurv",
+      "version": "1.2.2",
+      "sha256": "17rvzjcn76z5niw1jappiadbkf66a9x0m7p3251lgb7qrnvpx3gk",
+      "depends": ["SQUAREM", "rootSolve", "survival", "truncSP"],
+      "broken": true
+    },
     "transcribeR": {
       "name": "transcribeR",
       "version": "0.0.0",
@@ -147710,6 +152803,13 @@
       "depends": ["httr", "RCurl", "RJSONIO", "textcat"],
       "broken": true
     },
+    "translated": {
+      "name": "translated",
+      "version": "0.1.1",
+      "sha256": "12jd0dzbhliajg2x88kqwxpvrd1xy64sd551rsvbklfc3n7fqx09",
+      "depends": ["glue", "jsonlite"],
+      "broken": true
+    },
     "translation_ko": {
       "name": "translation.ko",
       "version": "0.0.1.5.2",
@@ -147724,13 +152824,6 @@
       "depends": ["dplyr", "lubridate", "quantmod", "xts", "zoo"],
       "broken": true
     },
-    "treeclim": {
-      "name": "treeclim",
-      "version": "2.0.6.0",
-      "sha256": "0zdn766vxgycisjyjw7nh7hs817kqhdihyla3fhpzykw9pxnw0b2",
-      "depends": ["abind", "boot", "ggplot2", "lmodel2", "lmtest", "np", "plyr", "Rcpp", "RcppArmadillo"],
-      "broken": true
-    },
     "treecm": {
       "name": "treecm",
       "version": "1.2.2",
@@ -147738,6 +152831,13 @@
       "depends": ["plyr"],
       "broken": true
     },
+    "treedata_table": {
+      "name": "treedata.table",
+      "version": "0.1.0",
+      "sha256": "0dhnb8if5wq6hzhjg40cw80sacigqmlm7nplm1f1ay5cqx1ynfi7",
+      "depends": ["ape", "data_table", "geiger", "lazyeval"],
+      "broken": true
+    },
     "treeducken": {
       "name": "treeducken",
       "version": "1.1.0",
@@ -148158,11 +153258,11 @@
       "depends": ["broom", "cowplot", "dplyr", "DT", "forcats", "ggplot2", "gridExtra", "gt", "gtable", "kableExtra", "knitr", "lifecycle", "rlang", "survival", "tibble", "tidycmprsk", "tidyr"],
       "broken": true
     },
-    "visualpred": {
-      "name": "visualpred",
-      "version": "0.1.0",
-      "sha256": "19jq9h9kiv4vbzqz8zrv5gqb1bprq5jy7mcxvdwpfnna2rja6q4z",
-      "depends": ["data_table", "dplyr", "e1071", "FactoMineR", "gbm", "ggplot2", "ggrepel", "magrittr", "MASS", "MBA", "mltools", "nnet", "pROC", "randomForest"],
+    "visae": {
+      "name": "visae",
+      "version": "0.2.0",
+      "sha256": "0ycwb380z8nb646w7w42952lwvdi8prmph7yv1lraswvp4wjfx3p",
+      "depends": ["DT", "ca", "dplyr", "ggplot2", "ggrepel", "magrittr", "rlang", "shiny", "shinyjs", "tidyr"],
       "broken": true
     },
     "vlad": {
@@ -148263,13 +153363,6 @@
       "depends": [],
       "broken": true
     },
-    "warbleR": {
-      "name": "warbleR",
-      "version": "1.1.30",
-      "sha256": "1fdlivdqawk4g9xb1zc4hdbdd0v44kpdzfb8z75i09zg2nqhgpw1",
-      "depends": ["bioacoustics", "cli", "dtw", "fftw", "knitr", "monitoR", "NatureSounds", "pbapply", "Rcpp", "RCurl", "rjson", "seewave", "testthat", "tuneR"],
-      "broken": true
-    },
     "water": {
       "name": "water",
       "version": "0.8",
@@ -148368,13 +153461,6 @@
       "depends": ["ggplot2", "glue", "hellno", "httr", "pageviews", "rvest", "stringr", "xml2"],
       "broken": true
     },
-    "wikiprofiler": {
-      "name": "wikiprofiler",
-      "version": "0.1.3",
-      "sha256": "1az2phwgy8aqbl9sxvsq1madrdlrw7zshq9fhw5q580xx0lfhkmk",
-      "depends": ["ggplot2", "ggplotify", "gson", "rsvg", "yulab_utils"],
-      "broken": true
-    },
     "wildrwolf": {
       "name": "wildrwolf",
       "version": "0.6.1",
@@ -148466,13 +153552,6 @@
       "depends": ["httr", "plyr"],
       "broken": true
     },
-    "woylier": {
-      "name": "woylier",
-      "version": "0.0.5",
-      "sha256": "1xa2qdkkqnd6c98a15rfsa3m8jil7gipr4mann3dhkf0zl59g0a4",
-      "depends": ["dplyr", "geozoo", "tibble", "tourr"],
-      "broken": true
-    },
     "wux": {
       "name": "wux",
       "version": "2.2-1",
@@ -148508,6 +153587,13 @@
       "depends": ["colourpicker", "data_table", "jpeg", "lubridate", "moments", "raster", "RCurl", "rgdal", "rjson", "shiny", "shinyjs", "sp", "stringr", "tiff"],
       "broken": true
     },
+    "xVA": {
+      "name": "xVA",
+      "version": "1.1",
+      "sha256": "06y9qhly14y5r8d1g85jdzz8x5lwzfjkiy5zak6146mknl4nzz11",
+      "depends": ["SACCR", "Trading", "data_table"],
+      "broken": true
+    },
     "xbreed": {
       "name": "xbreed",
       "version": "1.0.1.1",

From d955fd520a9acaeba72869b210e855f7a0de84f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:50:24 +0000
Subject: [PATCH 0446/1504] python312Packages.griffe: 1.5.1 -> 1.5.4

---
 pkgs/development/python-modules/griffe/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix
index aed63cf3ef41..524e77f9ea72 100644
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.5.1";
+  version = "1.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "griffe";
-    rev = "refs/tags/${version}";
-    hash = "sha256-DeXmKswapXPYGTiJLq2yvCwJywCNl79XYHSau0VCCIY=";
+    tag = version;
+    hash = "sha256-F1/SjWy32d/CU86ZR/PK0QPiRMEbUNNeomZOBP/3K/k=";
   };
 
   build-system = [ pdm-backend ];

From b7cb1ebcb9c7c991986c08f8da23b67ce75f2e4b Mon Sep 17 00:00:00 2001
From: Ben Millwood <thebenmachine+git@gmail.com>
Date: Sat, 30 Nov 2024 15:19:53 +0000
Subject: [PATCH 0447/1504] rubyPackages.gettext: init at 3.4.9

---
 .../ruby-modules/with-packages/Gemfile        |  1 +
 pkgs/top-level/ruby-packages.nix              | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
index b668a9b8862a..99d59f734563 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -58,6 +58,7 @@ gem 'ffi'
 gem 'ffi-rzmq-core'
 gem 'fog-dnsimple'
 gem 'gdk_pixbuf2'
+gem 'gettext'
 gem 'gio2'
 gem 'git'
 gem 'github-pages'
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 8e8904bd9a20..5c6a9e9966be 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -1113,6 +1113,16 @@
     };
     version = "1.1.0";
   };
+  forwardable = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi";
+      type = "gem";
+    };
+    version = "1.3.3";
+  };
   forwardable-extended = {
     groups = ["default"];
     platforms = [];
@@ -1155,6 +1165,17 @@
     };
     version = "3.0.1";
   };
+  gettext = {
+    dependencies = ["erubi" "locale" "prime" "racc" "text"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19";
+      type = "gem";
+    };
+    version = "3.4.9";
+  };
   gio2 = {
     dependencies = ["fiddle" "gobject-introspection"];
     groups = ["default"];
@@ -2141,6 +2162,16 @@
     };
     version = "0.5.0";
   };
+  locale = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj";
+      type = "gem";
+    };
+    version = "2.1.4";
+  };
   loofah = {
     dependencies = ["crass" "nokogiri"];
     groups = ["default"];
@@ -2748,6 +2779,17 @@
     };
     version = "1.2.1";
   };
+  prime = {
+    dependencies = ["forwardable" "singleton"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
   prism = {
     groups = ["default"];
     platforms = [];
@@ -3600,6 +3642,16 @@
     };
     version = "4.0.0";
   };
+  singleton = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
   slather = {
     dependencies = ["clamp" "xcodeproj"];
     groups = ["default"];
@@ -3779,6 +3831,16 @@
     };
     version = "1.6.0";
   };
+  text = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
   thor = {
     groups = ["default"];
     platforms = [];

From 013bba020a7f6df53eb0b9f995a4496f68a4791d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 01:14:42 +0000
Subject: [PATCH 0448/1504] gtklock-userinfo-module: 4.0.0 -> 4.0.1

---
 pkgs/by-name/gt/gtklock-userinfo-module/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtklock-userinfo-module/package.nix b/pkgs/by-name/gt/gtklock-userinfo-module/package.nix
index 8bf94d73610e..ff02d4f3766d 100644
--- a/pkgs/by-name/gt/gtklock-userinfo-module/package.nix
+++ b/pkgs/by-name/gt/gtklock-userinfo-module/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtklock-userinfo-module";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "jovanlanik";
     repo = "gtklock-userinfo-module";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-d9S0Tj7aII2JQ5/PZmt8HaUIb5caoD4GND0PGvuRMn8=";
+    hash = "sha256-4k50UBy3FplTL0/utFQ7tKi0eGofmgXr1iFVTN/SGok=";
   };
 
   nativeBuildInputs = [

From 31ff5c6c897c9ddd0dc2800ee611d86452574f05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 01:45:37 +0000
Subject: [PATCH 0449/1504] python312Packages.wagtail-localize: 1.10 -> 1.11.1

---
 .../development/python-modules/wagtail-localize/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix
index 43aa722abdaa..bd492a5171b8 100644
--- a/pkgs/development/python-modules/wagtail-localize/default.nix
+++ b/pkgs/development/python-modules/wagtail-localize/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "wagtail-localize";
-  version = "1.10";
+  version = "1.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "wagtail-localize";
     owner = "wagtail";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-khGzJj7LBxz5WPU8l20CmQjC9p5umk6spSyMMHBBguc=";
+    tag = "v${version}";
+    hash = "sha256-HBc5t74zA7kUE8pvaYRZtslVInWrTw0UkmrGd+xaW0Q=";
   };
 
   build-system = [ flit-core ];

From 81630d0f7be8d7dd688ff1bf0175f4b7eb408947 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 02:07:51 +0000
Subject: [PATCH 0450/1504] python312Packages.django-hijack: 3.7.0 -> 3.7.1

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

diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index a0568b478ce2..de9b0f9f9ed2 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "django-hijack";
-  version = "3.7.0";
+  version = "3.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-hijack";
     repo = "django-hijack";
     rev = "refs/tags/${version}";
-    hash = "sha256-WQ6s5s4Gccog78++tZX2IZ1605OHGhYSb2aTuU7LyBc=";
+    hash = "sha256-3P7SCKS+ThBRNfXpN17N1y5vhYYWRL2JGVBOUHRdhK8=";
   };
 
   build-system = [

From f99b8d30f3e0ee30a6b1582899f6b31a62a3f5a1 Mon Sep 17 00:00:00 2001
From: l1npengtul <l1npengtul@protonmail.com>
Date: Fri, 20 Dec 2024 14:08:32 +0900
Subject: [PATCH 0451/1504] cargo-3ds: init at 0.1.3

---
 pkgs/by-name/ca/cargo-3ds/package.nix | 35 +++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ca/cargo-3ds/package.nix

diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix
new file mode 100644
index 000000000000..780a40e3d66b
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-3ds/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-3ds";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "rust3ds";
+    repo = "cargo-3ds";
+    tag = "v${version}";
+    hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90=";
+  };
+
+  cargoHash = "sha256-Gt8TJ6VTvpqtpQuD4WYN45/gccfgnw13sKeMqHboTm8=";
+
+  # Integration tests do not run in Nix build environment due to needing to
+  # create and build Cargo workspaces.
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cargo command to work with Nintendo 3DS project binaries";
+    homepage = "https://github.com/rust3ds/cargo-3ds";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ l1npengtul ];
+  };
+}

From ed4bda45fed3c0c5958f551f59d3f14bc85315e5 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Mon, 23 Dec 2024 20:56:25 -0600
Subject: [PATCH 0452/1504] dell-command-configure: fix missing include in
 wrapper

Also removes unused `rec`.
---
 pkgs/by-name/de/dell-command-configure/package.nix   | 2 +-
 pkgs/by-name/de/dell-command-configure/wrapper-lib.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/de/dell-command-configure/package.nix b/pkgs/by-name/de/dell-command-configure/package.nix
index 52e79a25082e..d7df3dcf31ea 100644
--- a/pkgs/by-name/de/dell-command-configure/package.nix
+++ b/pkgs/by-name/de/dell-command-configure/package.nix
@@ -70,7 +70,7 @@ let
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   inherit version;
   pname = "dell-command-configure";
 
diff --git a/pkgs/by-name/de/dell-command-configure/wrapper-lib.c b/pkgs/by-name/de/dell-command-configure/wrapper-lib.c
index f93bcd58ab75..90ea786f727b 100755
--- a/pkgs/by-name/de/dell-command-configure/wrapper-lib.c
+++ b/pkgs/by-name/de/dell-command-configure/wrapper-lib.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 static const char from[] =  "/usr/lib/ext/dell/omreg.cfg";
 static const char to[] = "@to@";

From aa9a6d605ee1eb4724d16a1cb58e55b7e150c4e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:02:10 +0000
Subject: [PATCH 0453/1504] lilex: 2.530 -> 2.600

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

diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix
index 1e7c316babe7..b7067502cdb6 100644
--- a/pkgs/by-name/li/lilex/package.nix
+++ b/pkgs/by-name/li/lilex/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "lilex";
-  version = "2.530";
+  version = "2.600";
 
   src = fetchurl {
     url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
-    hash = "sha256-sBn8DaXj7OXHNaoEAhjTuMmUVUbS0zNZi1h7EjembEo=";
+    hash = "sha256-G8zm35aSiXrnGgYePSwLMBzwSnd9mfCinHZSG1qBH0w=";
   };
 
   nativeBuildInputs = [ unzip ];

From 4d527a2a22c6f943522330f607ec6d7ddaf6d287 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:29:17 +0000
Subject: [PATCH 0454/1504] python312Packages.gotenberg-client: 0.7.0 -> 0.8.2

---
 .../development/python-modules/gotenberg-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 10d29ac87177..196385c2413a 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "gotenberg-client";
-  version = "0.7.0";
+  version = "0.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "gotenberg-client";
-    rev = "refs/tags/${version}";
-    hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M=";
+    tag = version;
+    hash = "sha256-EMukzSY8nfm1L1metGhiEc9VqnI/vaLz7ITgbZi0fBw=";
   };
 
   nativeBuildInputs = [ hatchling ];

From dee63cb9ec3ec5080b01efb80fd76c7a25ad203e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:48:28 +0000
Subject: [PATCH 0455/1504] python312Packages.tika-client: 0.7.0 -> 0.8.1

---
 pkgs/development/python-modules/tika-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index 7b1614e9c256..56f98fcf93fc 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "tika-client";
-  version = "0.7.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "tika-client";
-    rev = "refs/tags/${version}";
-    hash = "sha256-0cv2HaquIUQOb5CPkCxSYvXDzu3OV7WKIT80jI+pjpY=";
+    tag = version;
+    hash = "sha256-UXd6GnwwFVUbBXhskBXDQaYlURQyrhgvMsncOwaLT1o=";
   };
 
   build-system = [ hatchling ];

From c445caabf1a7bcd9dae489c3188c5a1f9bb67100 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:51:39 +0000
Subject: [PATCH 0456/1504] python312Packages.craft-cli: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix
index ff5b86d6adec..dcd466c6877b 100644
--- a/pkgs/development/python-modules/craft-cli/default.nix
+++ b/pkgs/development/python-modules/craft-cli/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "craft-cli";
-  version = "2.12.0";
+  version = "2.13.0";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-cli";
     rev = "refs/tags/${version}";
-    hash = "sha256-edN0eEXBaYDUqSc7Xv22MpG9wkHqI6x1HtRkQ468yH8=";
+    hash = "sha256-IqK+eU2z63yDMJrHAhETHWoTz5lWK1er9bwYH9Oml18=";
   };
 
   postPatch = ''

From 552fcd0015230194f2dfbc0c5270a9388a2e3c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:54:24 +0000
Subject: [PATCH 0457/1504] python312Packages.greatfet: 2024.0.3 -> 2024.0.4

---
 pkgs/development/python-modules/greatfet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix
index 1e7385851094..bbe8269f1203 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "greatfet";
-  version = "2024.0.3";
+  version = "2024.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "greatfet";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-jdOTEOotLiIxA9TxmFGOjP8IZ/8xo7mzXSJRg3A5Ri4=";
+    tag = "v${version}";
+    hash = "sha256-3ClM4UzVIDEkVBrFwzvLokbxUHXqdQWyNVqcFtiXCOQ=";
   };
 
   sourceRoot = "${src.name}/host";

From 0939c4c45c9bd178b2c8b1425fcb938126d37ce9 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 23 Dec 2024 10:08:06 -0500
Subject: [PATCH 0458/1504] colo: init at 0.4.1

---
 pkgs/by-name/co/colo/package.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/co/colo/package.nix

diff --git a/pkgs/by-name/co/colo/package.nix b/pkgs/by-name/co/colo/package.nix
new file mode 100644
index 000000000000..cd84c3f1cef8
--- /dev/null
+++ b/pkgs/by-name/co/colo/package.nix
@@ -0,0 +1,26 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  lib,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "colo";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "Aloso";
+    repo = "colo";
+    tag = "v${version}";
+    hash = "sha256-ocGzZR4gM2sInXccbHxh7Vf0kcZTZOnVW0KM6zp/pR8=";
+  };
+
+  cargoHash = "sha256-HjEYC7FUHpxNWy/nUVO65O3f/RdT9hYZc3TpcqP3SSM=";
+
+  meta = {
+    description = "Displays colors in various color spaces";
+    homepage = "https://aloso.github.io/colo";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ llakala ];
+  };
+}

From 51755d45fa7aebbd41533aeb4d3f26db974609d6 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Fri, 27 Dec 2024 16:24:50 +1100
Subject: [PATCH 0459/1504] rPackages.rhdf5: fix build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1e5420467e12..d7a5e1917bc9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1822,6 +1822,7 @@ let
 
     rhdf5= old.rhdf5.overrideAttrs (attrs: {
       patches = [ ./patches/rhdf5.patch ];
+      env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
     });
 
     rmarkdown = old.rmarkdown.overrideAttrs (_: {

From 618f0264e86256bcd146cde937779ab95d864e0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 06:12:43 +0000
Subject: [PATCH 0460/1504] python312Packages.django-admin-datta: 1.0.15 ->
 1.0.16

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

diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix
index 7ec5744cdc00..c24693033e2f 100644
--- a/pkgs/development/python-modules/django-admin-datta/default.nix
+++ b/pkgs/development/python-modules/django-admin-datta/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "django-admin-datta";
-  version = "1.0.15";
+  version = "1.0.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QVobNrSZyDMldrhSccPnBEfXrwphVgtJ03yBHfTpits=";
+    hash = "sha256-ef7SwKRbzuUWuwf24p5hxLXllEdCwqixoMEFy33f3Tc=";
   };
 
   propagatedBuildInputs = [ django ];

From 8a14cf90433ce40055b332a4efc827f6fef1fb1d Mon Sep 17 00:00:00 2001
From: Lucas David Traverso <lucas6246@gmail.com>
Date: Fri, 27 Dec 2024 03:22:29 -0300
Subject: [PATCH 0461/1504] dotbot: 1.20.1 -> 1.20.4

---
 pkgs/by-name/do/dotbot/0001-fix-build.patch | 30 ---------------------
 pkgs/by-name/do/dotbot/package.nix          | 11 +++-----
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/do/dotbot/0001-fix-build.patch

diff --git a/pkgs/by-name/do/dotbot/0001-fix-build.patch b/pkgs/by-name/do/dotbot/0001-fix-build.patch
deleted file mode 100644
index d960db1a5846..000000000000
--- a/pkgs/by-name/do/dotbot/0001-fix-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c82a6e988594e6bb703df1f39d31451ea5be6967 Mon Sep 17 00:00:00 2001
-From: wxt <3264117476@qq.com>
-Date: Sun, 3 Nov 2024 16:23:50 +0800
-Subject: [PATCH]  fix build
-
----
- tests/conftest.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 162781b..d13808d 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -47,11 +47,12 @@ def wrap_function(function, function_path, arg_index, kwarg_key, root):
- 
-         msg = "The '{0}' argument to {1}() must be an absolute path"
-         msg = msg.format(kwarg_key, function_path)
-+        value = os.path.join(value)
-         assert value == os.path.abspath(value), msg
- 
-         msg = "The '{0}' argument to {1}() must be rooted in {2}"
-         msg = msg.format(kwarg_key, function_path, root)
--        assert value[: len(str(root))] == str(root), msg
-+        assert value[: len(str(root))] == str(root) or value.find("pytest-cache")!=-1, msg
- 
-         return function(*args, **kwargs)
- 
--- 
-2.46.1
-
diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix
index bdf9ecd8eeaf..7bb4b99872d5 100644
--- a/pkgs/by-name/do/dotbot/package.nix
+++ b/pkgs/by-name/do/dotbot/package.nix
@@ -6,25 +6,20 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dotbot";
-  version = "1.20.1";
+  version = "1.20.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anishathalye";
     repo = "dotbot";
-    rev = "v${version}";
-    hash = "sha256-Gy+LVGG/BAqXoM6GDuKBkGKxxAkmoYtBRA33y/ihdRE=";
+    tag = "v${version}";
+    hash = "sha256-GnzN8z7LP9rVD0DnKkPxJ0BxiO1YDY7MyMWBt1CAh6g=";
   };
 
   preCheck = ''
     patchShebangs bin/dotbot
   '';
 
-  patches = [
-    # ignore pytest-cache because it was not at /tmp/nix-shell and it was used by pytest itself not our program
-    ./0001-fix-build.patch
-  ];
-
   nativeBuildInputs = with python3Packages; [ setuptools ];
 
   propagatedBuildInputs = with python3Packages; [ pyyaml ];

From 29c3471b7c632a06f540dcebbc4bd1a25a39aabd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 07:28:25 +0000
Subject: [PATCH 0462/1504] python312Packages.limnoria: 2024.8.26 -> 2024.12.20

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

diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 3e53e25e0b1d..74ddf2035eb7 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "limnoria";
-  version = "2024.8.26";
+  version = "2024.12.20";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X1Nvm7bccwHn9KIKQuRb+mLzUwEdeiLNkzyxKa2Jk8Y=";
+    hash = "sha256-e8YvB29tggssX8aMRSoLvprsSBWeKVKfhDrSZeA2rCQ=";
   };
 
   build-system = [ setuptools ];

From 19eceaac408662fdc06d210286e45ec85db52e14 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 27 Dec 2024 07:42:54 +0800
Subject: [PATCH 0463/1504] venera: add update script

---
 pkgs/by-name/ve/venera/package.nix |  2 ++
 pkgs/by-name/ve/venera/update.sh   | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 pkgs/by-name/ve/venera/update.sh

diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index e2c93b092fd0..e82ac37b8e9b 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -65,6 +65,8 @@ flutter327.buildFlutterApplication rec {
     install -Dm0644 ./debian/gui/venera.png $out/share/pixmaps/venera.png
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Comic reader that support reading local and network comics";
     homepage = "https://github.com/venera-app/venera";
diff --git a/pkgs/by-name/ve/venera/update.sh b/pkgs/by-name/ve/venera/update.sh
new file mode 100755
index 000000000000..b44451a186e1
--- /dev/null
+++ b/pkgs/by-name/ve/venera/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nixVersions.latest bash coreutils nix-update
+
+set -eou pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/venera-app/venera/releases/latest | jq --raw-output .tag_name)
+latestVersion=$(echo "$latestTag" | sed 's/^v//')
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; venera.version or (lib.getVersion venera)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+    echo "package is up-to-date: $currentVersion"
+    exit 0
+fi
+
+nix-update venera
+
+curl https://raw.githubusercontent.com/venera-app/venera/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json

From 64b06b0a1948233098e60d25be150effb6bffd9c Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 27 Dec 2024 18:31:44 +0530
Subject: [PATCH 0464/1504] nixos/swapspace: add installWrapper option

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
Co-authored-by: Luflosi <luflosi@luflosi.de>
---
 nixos/modules/services/system/swapspace.nix | 29 ++++++++++++++++++---
 nixos/tests/swapspace.nix                   |  7 +++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/system/swapspace.nix b/nixos/modules/services/system/swapspace.nix
index 9dfea492cd67..4fe0ca3a3b07 100644
--- a/nixos/modules/services/system/swapspace.nix
+++ b/nixos/modules/services/system/swapspace.nix
@@ -9,11 +9,27 @@ let
   cfg = config.services.swapspace;
   inherit (lib)
     types
+    mkIf
     mkOption
     mkPackageOption
     mkEnableOption
     ;
-  configFile = pkgs.writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);
+  inherit (pkgs)
+    makeWrapper
+    runCommand
+    writeText
+    ;
+  configFile = writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);
+  userWrapper =
+    runCommand "swapspace"
+      {
+        buildInputs = [ makeWrapper ];
+      }
+      ''
+        mkdir -p "$out/bin"
+        makeWrapper '${lib.getExe cfg.package}' "$out/bin/swapspace" \
+          --add-flags "-c '${configFile}'"
+      '';
 in
 {
   options.services.swapspace = {
@@ -28,6 +44,13 @@ in
       ];
       description = "Any extra arguments to pass to swapspace";
     };
+    installWrapper = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        This will add swapspace wrapped with the generated config, to environment.systemPackages
+      '';
+    };
     settings = mkOption {
       type = types.submodule {
         options = {
@@ -92,8 +115,8 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ (if cfg.installWrapper then userWrapper else cfg.package) ];
     systemd.packages = [ cfg.package ];
     systemd.services.swapspace = {
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/tests/swapspace.nix b/nixos/tests/swapspace.nix
index ab0174629eb8..89153d3e30a4 100644
--- a/nixos/tests/swapspace.nix
+++ b/nixos/tests/swapspace.nix
@@ -1,10 +1,10 @@
 import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+  { lib, ... }:
 
   {
     name = "swapspace";
 
-    meta = with pkgs.lib.maintainers; {
+    meta = with lib.maintainers; {
       maintainers = [
         Luflosi
         phanirithvij
@@ -38,6 +38,9 @@ import ./make-test-python.nix (
       machine.wait_for_unit("swapspace.service")
       machine.wait_for_unit("root-swapfile.swap")
 
+      # ensure swapspace wrapper command runs
+      machine.succeed("swapspace --inspect")
+
       swamp = False
       with subtest("swapspace works"):
         machine.execute("mkdir /root/memfs")

From eb90b7b3812c0c453dd45ebe8da10c80ed48eb36 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 27 Dec 2024 23:06:38 +0800
Subject: [PATCH 0465/1504] nezha-theme-admin: 1.2.0 -> 1.4.4

---
 .../ne/nezha-theme-admin/package-lock.json    | 7114 +++++++++++++++++
 pkgs/by-name/ne/nezha-theme-admin/package.nix |   13 +-
 2 files changed, 7121 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/ne/nezha-theme-admin/package-lock.json

diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
new file mode 100644
index 000000000000..8ac35d6f0c6c
--- /dev/null
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -0,0 +1,7114 @@
+{
+    "name": "admin-frontend",
+    "version": "0.0.0",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "admin-frontend",
+            "version": "0.0.0",
+            "dependencies": {
+                "@hookform/resolvers": "^3.9.1",
+                "@radix-ui/react-alert-dialog": "^1.1.2",
+                "@radix-ui/react-avatar": "^1.1.1",
+                "@radix-ui/react-checkbox": "^1.1.2",
+                "@radix-ui/react-dialog": "^1.1.2",
+                "@radix-ui/react-dropdown-menu": "^2.1.2",
+                "@radix-ui/react-label": "^2.1.0",
+                "@radix-ui/react-navigation-menu": "^1.2.1",
+                "@radix-ui/react-popover": "^1.1.2",
+                "@radix-ui/react-scroll-area": "^1.2.1",
+                "@radix-ui/react-select": "^2.1.2",
+                "@radix-ui/react-separator": "^1.1.0",
+                "@radix-ui/react-slot": "^1.1.1",
+                "@radix-ui/react-tabs": "^1.1.1",
+                "@tanstack/react-table": "^8.20.5",
+                "@trivago/prettier-plugin-sort-imports": "^5.2.0",
+                "@types/luxon": "^3.4.2",
+                "@xterm/addon-attach": "^0.11.0",
+                "@xterm/addon-fit": "^0.10.0",
+                "@xterm/xterm": "^5.5.0",
+                "class-variance-authority": "^0.7.0",
+                "clsx": "^2.1.1",
+                "cmdk": "^1.0.0",
+                "copy-to-clipboard": "^3.3.3",
+                "framer-motion": "^11.14.1",
+                "i18next": "^24.0.2",
+                "i18next-browser-languagedetector": "^8.0.0",
+                "jotai-zustand": "^0.6.0",
+                "lucide-react": "^0.454.0",
+                "luxon": "^3.5.0",
+                "next-themes": "^0.3.0",
+                "prettier-plugin-tailwindcss": "^0.6.9",
+                "react": "^18.3.1",
+                "react-dom": "^18.3.1",
+                "react-hook-form": "^7.53.1",
+                "react-i18next": "^15.1.2",
+                "react-router-dom": "^6.27.0",
+                "react-virtuoso": "^4.12.0",
+                "sonner": "^1.6.1",
+                "swr": "^2.2.5",
+                "tailwind-merge": "^2.5.4",
+                "tailwindcss-animate": "^1.0.7",
+                "vaul": "^1.1.1",
+                "zod": "^3.23.8",
+                "zustand": "^5.0.1"
+            },
+            "devDependencies": {
+                "@eslint/js": "^9.13.0",
+                "@types/node": "^22.8.6",
+                "@types/react": "^18.3.12",
+                "@types/react-dom": "^18.3.1",
+                "@vitejs/plugin-react": "^4.3.3",
+                "autoprefixer": "^10.4.20",
+                "eslint": "^9.13.0",
+                "eslint-plugin-react-hooks": "^5.0.0",
+                "eslint-plugin-react-refresh": "^0.4.14",
+                "globals": "^15.11.0",
+                "postcss": "^8.4.47",
+                "swagger-typescript-api": "^13.0.22",
+                "tailwindcss": "^3.4.14",
+                "typescript": "~5.6.2",
+                "typescript-eslint": "^8.11.0",
+                "vite": "^5.4.10"
+            }
+        },
+        "node_modules/@alloc/quick-lru": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+            "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@ampproject/remapping": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/code-frame": {
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.25.9",
+                "js-tokens": "^4.0.0",
+                "picocolors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/compat-data": {
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+            "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+            "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.26.0",
+                "@babel/generator": "^7.26.0",
+                "@babel/helper-compilation-targets": "^7.25.9",
+                "@babel/helper-module-transforms": "^7.26.0",
+                "@babel/helpers": "^7.26.0",
+                "@babel/parser": "^7.26.0",
+                "@babel/template": "^7.25.9",
+                "@babel/traverse": "^7.25.9",
+                "@babel/types": "^7.26.0",
+                "convert-source-map": "^2.0.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/babel"
+            }
+        },
+        "node_modules/@babel/generator": {
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+            "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.26.2",
+                "@babel/types": "^7.26.0",
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jsesc": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+            "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/compat-data": "^7.25.9",
+                "@babel/helper-validator-option": "^7.25.9",
+                "browserslist": "^4.24.0",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-imports": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+            "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/traverse": "^7.25.9",
+                "@babel/types": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-transforms": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+            "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.25.9",
+                "@babel/traverse": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-plugin-utils": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+            "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helpers": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+            "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/template": "^7.25.9",
+                "@babel/types": "^7.26.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+            "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.26.0"
+            },
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-react-jsx-self": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz",
+            "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-react-jsx-source": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz",
+            "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/runtime": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+            "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+            "license": "MIT",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/template": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+            "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.25.9",
+                "@babel/parser": "^7.25.9",
+                "@babel/types": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+            "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.25.9",
+                "@babel/generator": "^7.25.9",
+                "@babel/parser": "^7.25.9",
+                "@babel/template": "^7.25.9",
+                "@babel/types": "^7.25.9",
+                "debug": "^4.3.1",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse/node_modules/globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+            "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@esbuild/aix-ppc64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "aix"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+            "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint-community/regexpp": {
+            "version": "4.12.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/@eslint/config-array": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
+            "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/object-schema": "^2.1.4",
+                "debug": "^4.3.1",
+                "minimatch": "^3.1.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/core": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
+            "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/eslintrc": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
+            "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^6.12.4",
+                "debug": "^4.3.2",
+                "espree": "^10.0.1",
+                "globals": "^14.0.0",
+                "ignore": "^5.2.0",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^3.1.2",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint/eslintrc/node_modules/globals": {
+            "version": "14.0.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+            "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@eslint/js": {
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz",
+            "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/object-schema": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
+            "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/plugin-kit": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+            "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "levn": "^0.4.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@exodus/schemasafe": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
+            "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@floating-ui/core": {
+            "version": "1.6.8",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
+            "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+            "license": "MIT",
+            "dependencies": {
+                "@floating-ui/utils": "^0.2.8"
+            }
+        },
+        "node_modules/@floating-ui/dom": {
+            "version": "1.6.12",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz",
+            "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==",
+            "license": "MIT",
+            "dependencies": {
+                "@floating-ui/core": "^1.6.0",
+                "@floating-ui/utils": "^0.2.8"
+            }
+        },
+        "node_modules/@floating-ui/react-dom": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
+            "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+            "license": "MIT",
+            "dependencies": {
+                "@floating-ui/dom": "^1.0.0"
+            },
+            "peerDependencies": {
+                "react": ">=16.8.0",
+                "react-dom": ">=16.8.0"
+            }
+        },
+        "node_modules/@floating-ui/utils": {
+            "version": "0.2.8",
+            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+            "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
+            "license": "MIT"
+        },
+        "node_modules/@hookform/resolvers": {
+            "version": "3.9.1",
+            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.9.1.tgz",
+            "integrity": "sha512-ud2HqmGBM0P0IABqoskKWI6PEf6ZDDBZkFqe2Vnl+mTHCEHzr3ISjjZyCwTjC/qpL25JC9aIDkloQejvMeq0ug==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react-hook-form": "^7.0.0"
+            }
+        },
+        "node_modules/@humanfs/core": {
+            "version": "0.19.1",
+            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node": {
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@humanfs/core": "^0.19.1",
+                "@humanwhocodes/retry": "^0.3.0"
+            },
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanwhocodes/module-importer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=12.22"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/retry": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@isaacs/cliui": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^5.1.2",
+                "string-width-cjs": "npm:string-width@^4.2.0",
+                "strip-ansi": "^7.0.1",
+                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+                "wrap-ansi": "^8.1.0",
+                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/set-array": "^1.2.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "license": "MIT"
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.25",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/@radix-ui/number": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz",
+            "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==",
+            "license": "MIT"
+        },
+        "node_modules/@radix-ui/primitive": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.0.tgz",
+            "integrity": "sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==",
+            "license": "MIT"
+        },
+        "node_modules/@radix-ui/react-alert-dialog": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.2.tgz",
+            "integrity": "sha512-eGSlLzPhKO+TErxkiGcCZGuvbVMnLA1MTnyBksGOeGRGkxHiiJUujsjmNTdWTm4iHVSRaUao9/4Ur671auMghQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-dialog": "1.1.2",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-slot": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-arrow": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.0.tgz",
+            "integrity": "sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-primitive": "2.0.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-avatar": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.1.tgz",
+            "integrity": "sha512-eoOtThOmxeoizxpX6RiEsQZ2wj5r4+zoeqAwO0cBaFQGjJwIH3dIX0OCxNrCyrrdxG+vBweMETh3VziQG7c1kw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-checkbox": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.2.tgz",
+            "integrity": "sha512-/i0fl686zaJbDQLNKrkCbMyDm6FQMt4jg323k7HuqitoANm9sE23Ql8yOK3Wusk34HSLKDChhMux05FnP6KUkw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "@radix-ui/react-use-previous": "1.1.0",
+                "@radix-ui/react-use-size": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-collection": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.0.tgz",
+            "integrity": "sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.0",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-slot": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-context": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz",
+            "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-compose-refs": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz",
+            "integrity": "sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-context": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
+            "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-dialog": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.2.tgz",
+            "integrity": "sha512-Yj4dZtqa2o+kG61fzB0H2qUvmwBA2oyQroGLyNtBj1beo1khoQ3q1a2AO8rrQYjd8256CO9+N8L9tvsS+bnIyA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-dismissable-layer": "1.1.1",
+                "@radix-ui/react-focus-guards": "1.1.1",
+                "@radix-ui/react-focus-scope": "1.1.0",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-portal": "1.1.2",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-slot": "1.1.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "aria-hidden": "^1.1.1",
+                "react-remove-scroll": "2.6.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-direction": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
+            "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-dismissable-layer": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz",
+            "integrity": "sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-escape-keydown": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-dropdown-menu": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.2.tgz",
+            "integrity": "sha512-GVZMR+eqK8/Kes0a36Qrv+i20bAPXSn8rCBTHx30w+3ECnR5o3xixAlqcVaYvLeyKUsm0aqyhWfmUcqufM8nYA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-menu": "2.1.2",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-focus-guards": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz",
+            "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-focus-scope": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz",
+            "integrity": "sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-id": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",
+            "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-use-layout-effect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-label": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.0.tgz",
+            "integrity": "sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-primitive": "2.0.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-menu": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.2.tgz",
+            "integrity": "sha512-lZ0R4qR2Al6fZ4yCCZzu/ReTFrylHFxIqy7OezIpWF4bL0o9biKo0pFIvkaew3TyZ9Fy5gYVrR5zCGZBVbO1zg==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-collection": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-direction": "1.1.0",
+                "@radix-ui/react-dismissable-layer": "1.1.1",
+                "@radix-ui/react-focus-guards": "1.1.1",
+                "@radix-ui/react-focus-scope": "1.1.0",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-popper": "1.2.0",
+                "@radix-ui/react-portal": "1.1.2",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-roving-focus": "1.1.0",
+                "@radix-ui/react-slot": "1.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "aria-hidden": "^1.1.1",
+                "react-remove-scroll": "2.6.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-navigation-menu": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.1.tgz",
+            "integrity": "sha512-egDo0yJD2IK8L17gC82vptkvW1jLeni1VuqCyzY727dSJdk5cDjINomouLoNk8RVF7g2aNIfENKWL4UzeU9c8Q==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-collection": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-direction": "1.1.0",
+                "@radix-ui/react-dismissable-layer": "1.1.1",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0",
+                "@radix-ui/react-use-previous": "1.1.0",
+                "@radix-ui/react-visually-hidden": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-popover": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.2.tgz",
+            "integrity": "sha512-u2HRUyWW+lOiA2g0Le0tMmT55FGOEWHwPFt1EPfbLly7uXQExFo5duNKqG2DzmFXIdqOeNd+TpE8baHWJCyP9w==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-dismissable-layer": "1.1.1",
+                "@radix-ui/react-focus-guards": "1.1.1",
+                "@radix-ui/react-focus-scope": "1.1.0",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-popper": "1.2.0",
+                "@radix-ui/react-portal": "1.1.2",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-slot": "1.1.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "aria-hidden": "^1.1.1",
+                "react-remove-scroll": "2.6.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-popper": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.0.tgz",
+            "integrity": "sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg==",
+            "license": "MIT",
+            "dependencies": {
+                "@floating-ui/react-dom": "^2.0.0",
+                "@radix-ui/react-arrow": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.0",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0",
+                "@radix-ui/react-use-rect": "1.1.0",
+                "@radix-ui/react-use-size": "1.1.0",
+                "@radix-ui/rect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-context": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz",
+            "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-portal": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.2.tgz",
+            "integrity": "sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-presence": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.1.tgz",
+            "integrity": "sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-primitive": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz",
+            "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-slot": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-roving-focus": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.0.tgz",
+            "integrity": "sha512-EA6AMGeq9AEeQDeSH0aZgG198qkfHSbvWTf1HvoDmOB5bBG/qTxjYMWUKMnYiV6J/iP/J8MEFSuB2zRU2n7ODA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-collection": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.0",
+                "@radix-ui/react-direction": "1.1.0",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-context": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz",
+            "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-scroll-area": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.1.tgz",
+            "integrity": "sha512-FnM1fHfCtEZ1JkyfH/1oMiTcFBQvHKl4vD9WnpwkLgtF+UmnXMCad6ECPTaAjcDjam+ndOEJWgHyKDGNteWSHw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/number": "1.1.0",
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-direction": "1.1.0",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-select": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.2.tgz",
+            "integrity": "sha512-rZJtWmorC7dFRi0owDmoijm6nSJH1tVw64QGiNIZ9PNLyBDtG+iAq+XGsya052At4BfarzY/Dhv9wrrUr6IMZA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/number": "1.1.0",
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-collection": "1.1.0",
+                "@radix-ui/react-compose-refs": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-direction": "1.1.0",
+                "@radix-ui/react-dismissable-layer": "1.1.1",
+                "@radix-ui/react-focus-guards": "1.1.1",
+                "@radix-ui/react-focus-scope": "1.1.0",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-popper": "1.2.0",
+                "@radix-ui/react-portal": "1.1.2",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-slot": "1.1.0",
+                "@radix-ui/react-use-callback-ref": "1.1.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0",
+                "@radix-ui/react-use-layout-effect": "1.1.0",
+                "@radix-ui/react-use-previous": "1.1.0",
+                "@radix-ui/react-visually-hidden": "1.1.0",
+                "aria-hidden": "^1.1.1",
+                "react-remove-scroll": "2.6.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
+            "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-separator": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.0.tgz",
+            "integrity": "sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-primitive": "2.0.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-slot": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz",
+            "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-compose-refs": "1.1.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-slot/node_modules/@radix-ui/react-compose-refs": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz",
+            "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-tabs": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.1.tgz",
+            "integrity": "sha512-3GBUDmP2DvzmtYLMsHmpA1GtR46ZDZ+OreXM/N+kkQJOPIgytFWWTfDQmBQKBvaFS0Vno0FktdbVzN28KGrMdw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.0",
+                "@radix-ui/react-context": "1.1.1",
+                "@radix-ui/react-direction": "1.1.0",
+                "@radix-ui/react-id": "1.1.0",
+                "@radix-ui/react-presence": "1.1.1",
+                "@radix-ui/react-primitive": "2.0.0",
+                "@radix-ui/react-roving-focus": "1.1.0",
+                "@radix-ui/react-use-controllable-state": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-callback-ref": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
+            "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-controllable-state": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",
+            "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-use-callback-ref": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-escape-keydown": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",
+            "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-use-callback-ref": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-layout-effect": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",
+            "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-previous": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz",
+            "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-rect": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz",
+            "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/rect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-use-size": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz",
+            "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-use-layout-effect": "1.1.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-visually-hidden": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.0.tgz",
+            "integrity": "sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-primitive": "2.0.0"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/rect": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
+            "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==",
+            "license": "MIT"
+        },
+        "node_modules/@remix-run/router": {
+            "version": "1.20.0",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz",
+            "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@rollup/rollup-android-arm-eabi": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz",
+            "integrity": "sha512-ufb2CH2KfBWPJok95frEZZ82LtDl0A6QKTa8MoM+cWwDZvVGl5/jNb79pIhRvAalUu+7LD91VYR0nwRD799HkQ==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@rollup/rollup-android-arm64": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.3.tgz",
+            "integrity": "sha512-iAHpft/eQk9vkWIV5t22V77d90CRofgR2006UiCjHcHJFVI1E0oBkQIAbz+pLtthFw3hWEmVB4ilxGyBf48i2Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@rollup/rollup-darwin-arm64": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz",
+            "integrity": "sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@rollup/rollup-darwin-x64": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.3.tgz",
+            "integrity": "sha512-KO0pN5x3+uZm1ZXeIfDqwcvnQ9UEGN8JX5ufhmgH5Lz4ujjZMAnxQygZAVGemFWn+ZZC0FQopruV4lqmGMshow==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@rollup/rollup-freebsd-arm64": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.3.tgz",
+            "integrity": "sha512-CsC+ZdIiZCZbBI+aRlWpYJMSWvVssPuWqrDy/zi9YfnatKKSLFCe6fjna1grHuo/nVaHG+kiglpRhyBQYRTK4A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-freebsd-x64": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.3.tgz",
+            "integrity": "sha512-F0nqiLThcfKvRQhZEzMIXOQG4EeX61im61VYL1jo4eBxv4aZRmpin6crnBJQ/nWnCsjH5F6J3W6Stdm0mBNqBg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.3.tgz",
+            "integrity": "sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.3.tgz",
+            "integrity": "sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm64-gnu": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.3.tgz",
+            "integrity": "sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm64-musl": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.3.tgz",
+            "integrity": "sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.3.tgz",
+            "integrity": "sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.3.tgz",
+            "integrity": "sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-s390x-gnu": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.3.tgz",
+            "integrity": "sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-x64-gnu": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.3.tgz",
+            "integrity": "sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-x64-musl": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.3.tgz",
+            "integrity": "sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-arm64-msvc": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.3.tgz",
+            "integrity": "sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-ia32-msvc": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.3.tgz",
+            "integrity": "sha512-9SjYp1sPyxJsPWuhOCX6F4jUMXGbVVd5obVpoVEi8ClZqo52ViZewA6eFz85y8ezuOA+uJMP5A5zo6Oz4S5rVQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-x64-msvc": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.3.tgz",
+            "integrity": "sha512-HGZgRFFYrMrP3TJlq58nR1xy8zHKId25vhmm5S9jETEfDf6xybPxsavFTJaufe2zgOGYJBskGlj49CwtEuFhWQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@tanstack/react-table": {
+            "version": "8.20.5",
+            "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.5.tgz",
+            "integrity": "sha512-WEHopKw3znbUZ61s9i0+i9g8drmDo6asTWbrQh8Us63DAk/M0FkmIqERew6P71HI75ksZ2Pxyuf4vvKh9rAkiA==",
+            "license": "MIT",
+            "dependencies": {
+                "@tanstack/table-core": "8.20.5"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/tannerlinsley"
+            },
+            "peerDependencies": {
+                "react": ">=16.8",
+                "react-dom": ">=16.8"
+            }
+        },
+        "node_modules/@tanstack/table-core": {
+            "version": "8.20.5",
+            "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz",
+            "integrity": "sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/tannerlinsley"
+            }
+        },
+        "node_modules/@trivago/prettier-plugin-sort-imports": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.0.tgz",
+            "integrity": "sha512-yEIJ7xMKYQwyNRjxSdi4Gs37iszikAjxfky+3hu9bn24u8eHLJNDMAoOTyowp8p6EpSl8IQMdkfBx+WnJTttsw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@babel/generator": "^7.26.2",
+                "@babel/parser": "^7.26.2",
+                "@babel/traverse": "^7.25.9",
+                "@babel/types": "^7.26.0",
+                "javascript-natural-sort": "^0.7.1",
+                "lodash": "^4.17.21"
+            },
+            "engines": {
+                "node": ">18.12"
+            },
+            "peerDependencies": {
+                "@vue/compiler-sfc": "3.x",
+                "prettier": "2.x - 3.x",
+                "prettier-plugin-svelte": "3.x",
+                "svelte": "4.x"
+            },
+            "peerDependenciesMeta": {
+                "@vue/compiler-sfc": {
+                    "optional": true
+                },
+                "prettier-plugin-svelte": {
+                    "optional": true
+                },
+                "svelte": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@types/babel__core": {
+            "version": "7.20.5",
+            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+            "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
+                "@types/babel__generator": "*",
+                "@types/babel__template": "*",
+                "@types/babel__traverse": "*"
+            }
+        },
+        "node_modules/@types/babel__generator": {
+            "version": "7.6.8",
+            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__template": {
+            "version": "7.4.4",
+            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+            "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.1.0",
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__traverse": {
+            "version": "7.20.6",
+            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+            "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.20.7"
+            }
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/json-schema": {
+            "version": "7.0.15",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+            "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/luxon": {
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
+            "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "22.8.6",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.6.tgz",
+            "integrity": "sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~6.19.8"
+            }
+        },
+        "node_modules/@types/prop-types": {
+            "version": "15.7.13",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
+            "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==",
+            "devOptional": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/react": {
+            "version": "18.3.12",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
+            "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
+            "devOptional": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/prop-types": "*",
+                "csstype": "^3.0.2"
+            }
+        },
+        "node_modules/@types/react-dom": {
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz",
+            "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==",
+            "devOptional": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/react": "*"
+            }
+        },
+        "node_modules/@types/swagger-schema-official": {
+            "version": "2.0.25",
+            "resolved": "https://registry.npmjs.org/@types/swagger-schema-official/-/swagger-schema-official-2.0.25.tgz",
+            "integrity": "sha512-T92Xav+Gf/Ik1uPW581nA+JftmjWPgskw/WBf4TJzxRG/SJ+DfNnNE+WuZ4mrXuzflQMqMkm1LSYjzYW7MB1Cg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
+            "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.10.0",
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/type-utils": "8.12.2",
+                "@typescript-eslint/utils": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
+                "graphemer": "^1.4.0",
+                "ignore": "^5.3.1",
+                "natural-compare": "^1.4.0",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+                "eslint": "^8.57.0 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@typescript-eslint/parser": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+            "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
+            "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/type-utils": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
+            "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/typescript-estree": "8.12.2",
+                "@typescript-eslint/utils": "8.12.2",
+                "debug": "^4.3.4",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@typescript-eslint/types": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
+            "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
+            "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/visitor-keys": "8.12.2",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+            "version": "7.6.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+            "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@typescript-eslint/utils": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
+            "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.4.0",
+                "@typescript-eslint/scope-manager": "8.12.2",
+                "@typescript-eslint/types": "8.12.2",
+                "@typescript-eslint/typescript-estree": "8.12.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
+            "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.12.2",
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@vitejs/plugin-react": {
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.3.tgz",
+            "integrity": "sha512-NooDe9GpHGqNns1i8XDERg0Vsg5SSYRhRxxyTGogUdkdNt47jal+fbuYi+Yfq6pzRCKXyoPcWisfxE6RIM3GKA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.25.2",
+                "@babel/plugin-transform-react-jsx-self": "^7.24.7",
+                "@babel/plugin-transform-react-jsx-source": "^7.24.7",
+                "@types/babel__core": "^7.20.5",
+                "react-refresh": "^0.14.2"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.2.0 || ^5.0.0"
+            }
+        },
+        "node_modules/@xterm/addon-attach": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@xterm/addon-attach/-/addon-attach-0.11.0.tgz",
+            "integrity": "sha512-JboCN0QAY6ZLY/SSB/Zl2cQ5zW1Eh4X3fH7BnuR1NB7xGRhzbqU2Npmpiw/3zFlxDaU88vtKzok44JKi2L2V2Q==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@xterm/xterm": "^5.0.0"
+            }
+        },
+        "node_modules/@xterm/addon-fit": {
+            "version": "0.10.0",
+            "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
+            "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
+            "license": "MIT",
+            "peerDependencies": {
+                "@xterm/xterm": "^5.0.0"
+            }
+        },
+        "node_modules/@xterm/xterm": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
+            "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==",
+            "license": "MIT"
+        },
+        "node_modules/acorn": {
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+            "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-jsx": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
+        },
+        "node_modules/ajv": {
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+            "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/any-promise": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+            "license": "MIT"
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "license": "ISC",
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/arg": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+            "license": "MIT"
+        },
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+            "dev": true,
+            "license": "Python-2.0"
+        },
+        "node_modules/aria-hidden": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
+            "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+            "license": "MIT",
+            "dependencies": {
+                "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/autoprefixer": {
+            "version": "10.4.20",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+            "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "browserslist": "^4.23.3",
+                "caniuse-lite": "^1.0.30001646",
+                "fraction.js": "^4.3.7",
+                "normalize-range": "^0.1.2",
+                "picocolors": "^1.0.1",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "bin": {
+                "autoprefixer": "bin/autoprefixer"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "license": "MIT"
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "license": "MIT",
+            "dependencies": {
+                "fill-range": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/browserslist": {
+            "version": "4.24.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
+                "node-releases": "^2.0.18",
+                "update-browserslist-db": "^1.1.1"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/call-me-maybe": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
+            "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase-css": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001676",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz",
+            "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "CC-BY-4.0"
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "license": "MIT",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/chokidar/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/class-variance-authority": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.0.tgz",
+            "integrity": "sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "clsx": "2.0.0"
+            },
+            "funding": {
+                "url": "https://joebell.co.uk"
+            }
+        },
+        "node_modules/class-variance-authority/node_modules/clsx": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
+            "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/client-only": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
+            "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
+            "license": "MIT"
+        },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/cliui/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cliui/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/clsx": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+            "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/cmdk": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.0.tgz",
+            "integrity": "sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-dialog": "1.0.5",
+                "@radix-ui/react-primitive": "1.0.3"
+            },
+            "peerDependencies": {
+                "react": "^18.0.0",
+                "react-dom": "^18.0.0"
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/primitive": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz",
+            "integrity": "sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-compose-refs": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
+            "integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-context": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.1.tgz",
+            "integrity": "sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-dialog": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz",
+            "integrity": "sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/primitive": "1.0.1",
+                "@radix-ui/react-compose-refs": "1.0.1",
+                "@radix-ui/react-context": "1.0.1",
+                "@radix-ui/react-dismissable-layer": "1.0.5",
+                "@radix-ui/react-focus-guards": "1.0.1",
+                "@radix-ui/react-focus-scope": "1.0.4",
+                "@radix-ui/react-id": "1.0.1",
+                "@radix-ui/react-portal": "1.0.4",
+                "@radix-ui/react-presence": "1.0.1",
+                "@radix-ui/react-primitive": "1.0.3",
+                "@radix-ui/react-slot": "1.0.2",
+                "@radix-ui/react-use-controllable-state": "1.0.1",
+                "aria-hidden": "^1.1.1",
+                "react-remove-scroll": "2.5.5"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-dismissable-layer": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz",
+            "integrity": "sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/primitive": "1.0.1",
+                "@radix-ui/react-compose-refs": "1.0.1",
+                "@radix-ui/react-primitive": "1.0.3",
+                "@radix-ui/react-use-callback-ref": "1.0.1",
+                "@radix-ui/react-use-escape-keydown": "1.0.3"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-focus-guards": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz",
+            "integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-focus-scope": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz",
+            "integrity": "sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-compose-refs": "1.0.1",
+                "@radix-ui/react-primitive": "1.0.3",
+                "@radix-ui/react-use-callback-ref": "1.0.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-id": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz",
+            "integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-use-layout-effect": "1.0.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-portal": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.4.tgz",
+            "integrity": "sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-primitive": "1.0.3"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-presence": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.1.tgz",
+            "integrity": "sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-compose-refs": "1.0.1",
+                "@radix-ui/react-use-layout-effect": "1.0.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-primitive": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
+            "integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-slot": "1.0.2"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-slot": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+            "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-compose-refs": "1.0.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-use-callback-ref": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz",
+            "integrity": "sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-use-controllable-state": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz",
+            "integrity": "sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-use-callback-ref": "1.0.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-use-escape-keydown": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz",
+            "integrity": "sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10",
+                "@radix-ui/react-use-callback-ref": "1.0.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/@radix-ui/react-use-layout-effect": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz",
+            "integrity": "sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8 || ^17.0 || ^18.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cmdk/node_modules/react-remove-scroll": {
+            "version": "2.5.5",
+            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
+            "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
+            "license": "MIT",
+            "dependencies": {
+                "react-remove-scroll-bar": "^2.3.3",
+                "react-style-singleton": "^2.2.1",
+                "tslib": "^2.1.0",
+                "use-callback-ref": "^1.3.0",
+                "use-sidecar": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "license": "MIT"
+        },
+        "node_modules/commander": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/consola": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
+            "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^14.18.0 || >=16.10.0"
+            }
+        },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/copy-to-clipboard": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
+            "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
+            "license": "MIT",
+            "dependencies": {
+                "toggle-selection": "^1.0.6"
+            }
+        },
+        "node_modules/cosmiconfig": {
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+            "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "env-paths": "^2.2.1",
+                "import-fresh": "^3.3.0",
+                "js-yaml": "^4.1.0",
+                "parse-json": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/d-fischer"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.9.5"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "license": "MIT",
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "devOptional": true,
+            "license": "MIT"
+        },
+        "node_modules/debug": {
+            "version": "4.3.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+            "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/deep-is": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/detect-node-es": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+            "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+            "license": "MIT"
+        },
+        "node_modules/didyoumean": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+            "license": "Apache-2.0"
+        },
+        "node_modules/dlv": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+            "license": "MIT"
+        },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "license": "MIT"
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.5.50",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+            "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "license": "MIT"
+        },
+        "node_modules/env-paths": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "node_modules/es6-promise": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+            "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/esbuild": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/aix-ppc64": "0.21.5",
+                "@esbuild/android-arm": "0.21.5",
+                "@esbuild/android-arm64": "0.21.5",
+                "@esbuild/android-x64": "0.21.5",
+                "@esbuild/darwin-arm64": "0.21.5",
+                "@esbuild/darwin-x64": "0.21.5",
+                "@esbuild/freebsd-arm64": "0.21.5",
+                "@esbuild/freebsd-x64": "0.21.5",
+                "@esbuild/linux-arm": "0.21.5",
+                "@esbuild/linux-arm64": "0.21.5",
+                "@esbuild/linux-ia32": "0.21.5",
+                "@esbuild/linux-loong64": "0.21.5",
+                "@esbuild/linux-mips64el": "0.21.5",
+                "@esbuild/linux-ppc64": "0.21.5",
+                "@esbuild/linux-riscv64": "0.21.5",
+                "@esbuild/linux-s390x": "0.21.5",
+                "@esbuild/linux-x64": "0.21.5",
+                "@esbuild/netbsd-x64": "0.21.5",
+                "@esbuild/openbsd-x64": "0.21.5",
+                "@esbuild/sunos-x64": "0.21.5",
+                "@esbuild/win32-arm64": "0.21.5",
+                "@esbuild/win32-ia32": "0.21.5",
+                "@esbuild/win32-x64": "0.21.5"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint": {
+            "version": "9.13.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz",
+            "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/regexpp": "^4.11.0",
+                "@eslint/config-array": "^0.18.0",
+                "@eslint/core": "^0.7.0",
+                "@eslint/eslintrc": "^3.1.0",
+                "@eslint/js": "9.13.0",
+                "@eslint/plugin-kit": "^0.2.0",
+                "@humanfs/node": "^0.16.5",
+                "@humanwhocodes/module-importer": "^1.0.1",
+                "@humanwhocodes/retry": "^0.3.1",
+                "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
+                "ajv": "^6.12.4",
+                "chalk": "^4.0.0",
+                "cross-spawn": "^7.0.2",
+                "debug": "^4.3.2",
+                "escape-string-regexp": "^4.0.0",
+                "eslint-scope": "^8.1.0",
+                "eslint-visitor-keys": "^4.1.0",
+                "espree": "^10.2.0",
+                "esquery": "^1.5.0",
+                "esutils": "^2.0.2",
+                "fast-deep-equal": "^3.1.3",
+                "file-entry-cache": "^8.0.0",
+                "find-up": "^5.0.0",
+                "glob-parent": "^6.0.2",
+                "ignore": "^5.2.0",
+                "imurmurhash": "^0.1.4",
+                "is-glob": "^4.0.0",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "lodash.merge": "^4.6.2",
+                "minimatch": "^3.1.2",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.9.3",
+                "text-table": "^0.2.0"
+            },
+            "bin": {
+                "eslint": "bin/eslint.js"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            },
+            "peerDependencies": {
+                "jiti": "*"
+            },
+            "peerDependenciesMeta": {
+                "jiti": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-plugin-react-hooks": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0.tgz",
+            "integrity": "sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-react-refresh": {
+            "version": "0.4.14",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.14.tgz",
+            "integrity": "sha512-aXvzCTK7ZBv1e7fahFuR3Z/fyQQSIQ711yPgYRj+Oj64tyTgO4iQIDmYXDBqvSWQ/FA4OSCsXOStlF+noU0/NA==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "eslint": ">=7"
+            }
+        },
+        "node_modules/eslint-scope": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+            "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/espree": {
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.14.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/esquery": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "estraverse": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/esrecurse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eta": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/eta/-/eta-2.2.0.tgz",
+            "integrity": "sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/eta-dev/eta?sponsor=1"
+            }
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-glob": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-glob/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-levenshtein": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-safe-stringify": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+            "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fastq": {
+            "version": "1.17.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+            "license": "ISC",
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/file-entry-cache": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+            "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flat-cache": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "license": "MIT",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^6.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/flat-cache": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+            "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flatted": "^3.2.9",
+                "keyv": "^4.5.4"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/flatted": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+            "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/foreground-child": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+            "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+            "license": "ISC",
+            "dependencies": {
+                "cross-spawn": "^7.0.0",
+                "signal-exit": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/fraction.js": {
+            "version": "4.3.7",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+            "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "type": "patreon",
+                "url": "https://github.com/sponsors/rawify"
+            }
+        },
+        "node_modules/framer-motion": {
+            "version": "11.14.4",
+            "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.14.4.tgz",
+            "integrity": "sha512-NQuzr9JbeJDMQmy0FFLhLzk9h1kAjVC1tGE/HY4ubF02B95EBm2lpA21LE3Od/OpXqXgp0zl5Hdqu25hliBRsA==",
+            "license": "MIT",
+            "dependencies": {
+                "motion-dom": "^11.14.3",
+                "motion-utils": "^11.14.3",
+                "tslib": "^2.4.0"
+            },
+            "peerDependencies": {
+                "@emotion/is-prop-valid": "*",
+                "react": "^18.0.0 || ^19.0.0",
+                "react-dom": "^18.0.0 || ^19.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@emotion/is-prop-valid": {
+                    "optional": true
+                },
+                "react": {
+                    "optional": true
+                },
+                "react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-nonce": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+            "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/glob": {
+            "version": "10.4.5",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+            "license": "ISC",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/glob/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/glob/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/globals": {
+            "version": "15.11.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
+            "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/graphemer": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/html-parse-stringify": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+            "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+            "license": "MIT",
+            "dependencies": {
+                "void-elements": "3.1.0"
+            }
+        },
+        "node_modules/http2-client": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz",
+            "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/i18next": {
+            "version": "24.0.2",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.0.2.tgz",
+            "integrity": "sha512-D88xyIGcWAKwBTAs4RSqASi8NXR/NhCVSTM4LDbdoU8qb/5dcEZjNCLDhtQBB7Epw/Cp1w2vH/3ujoTbqLSs5g==",
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://locize.com"
+                },
+                {
+                    "type": "individual",
+                    "url": "https://locize.com/i18next.html"
+                },
+                {
+                    "type": "individual",
+                    "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.23.2"
+            },
+            "peerDependencies": {
+                "typescript": "^5"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/i18next-browser-languagedetector": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.0.tgz",
+            "integrity": "sha512-zhXdJXTTCoG39QsrOCiOabnWj2jecouOqbchu3EfhtSHxIB5Uugnm9JaizenOy39h7ne3+fLikIjeW88+rgszw==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.23.2"
+            }
+        },
+        "node_modules/ignore": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+            "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.19"
+            }
+        },
+        "node_modules/invariant": {
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+            "license": "MIT",
+            "dependencies": {
+                "loose-envify": "^1.0.0"
+            }
+        },
+        "node_modules/is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "license": "MIT",
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.15.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+            "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "license": "ISC"
+        },
+        "node_modules/jackspeak": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
+        "node_modules/javascript-natural-sort": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+            "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
+            "license": "MIT"
+        },
+        "node_modules/jiti": {
+            "version": "1.21.6",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+            "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+            "license": "MIT",
+            "bin": {
+                "jiti": "bin/jiti.js"
+            }
+        },
+        "node_modules/jotai": {
+            "version": "2.10.1",
+            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.10.1.tgz",
+            "integrity": "sha512-4FycO+BOTl2auLyF2Chvi6KTDqdsdDDtpaL/WHQMs8f3KS1E3loiUShQzAzFA/sMU5cJ0hz/RT1xum9YbG/zaA==",
+            "license": "MIT",
+            "peer": true,
+            "engines": {
+                "node": ">=12.20.0"
+            },
+            "peerDependencies": {
+                "@types/react": ">=17.0.0",
+                "react": ">=17.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jotai-zustand": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/jotai-zustand/-/jotai-zustand-0.6.0.tgz",
+            "integrity": "sha512-82LVFVZZXWsqpcfvDf4Yk6Gaq2RFezU0USfAA3O9WrxqflZNGlh0BkpUGzzYpdmDuDJIcYU7Rr1582UgI4DAiw==",
+            "license": "MIT",
+            "peerDependencies": {
+                "jotai": ">=2.0.0"
+            }
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "license": "MIT"
+        },
+        "node_modules/js-yaml": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/jsesc": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+            "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+            "license": "MIT",
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/keyv": {
+            "version": "4.5.4",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/levn": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1",
+                "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/lilconfig": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/lines-and-columns": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+            "license": "MIT"
+        },
+        "node_modules/locate-path": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "license": "MIT"
+        },
+        "node_modules/lodash.merge": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/loose-envify": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+            "license": "MIT",
+            "dependencies": {
+                "js-tokens": "^3.0.0 || ^4.0.0"
+            },
+            "bin": {
+                "loose-envify": "cli.js"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "yallist": "^3.0.2"
+            }
+        },
+        "node_modules/lucide-react": {
+            "version": "0.454.0",
+            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.454.0.tgz",
+            "integrity": "sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ==",
+            "license": "ISC",
+            "peerDependencies": {
+                "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
+            }
+        },
+        "node_modules/luxon": {
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+            "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+            "license": "MIT",
+            "dependencies": {
+                "braces": "^3.0.3",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/minipass": {
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/motion-dom": {
+            "version": "11.14.3",
+            "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.14.3.tgz",
+            "integrity": "sha512-lW+D2wBy5vxLJi6aCP0xyxTxlTfiu+b+zcpVbGVFUxotwThqhdpPRSmX8xztAgtZMPMeU0WGVn/k1w4I+TbPqA==",
+            "license": "MIT"
+        },
+        "node_modules/motion-utils": {
+            "version": "11.14.3",
+            "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.14.3.tgz",
+            "integrity": "sha512-Xg+8xnqIJTpr0L/cidfTTBFkvRw26ZtGGuIhA94J9PQ2p4mEa06Xx7QVYZH0BP+EpMSaDlu+q0I0mmvwADPsaQ==",
+            "license": "MIT"
+        },
+        "node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "license": "MIT"
+        },
+        "node_modules/mz": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+            "license": "MIT",
+            "dependencies": {
+                "any-promise": "^1.0.0",
+                "object-assign": "^4.0.1",
+                "thenify-all": "^1.0.0"
+            }
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.7",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/next-themes": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz",
+            "integrity": "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^16.8 || ^17 || ^18",
+                "react-dom": "^16.8 || ^17 || ^18"
+            }
+        },
+        "node_modules/node-fetch": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "whatwg-url": "^5.0.0"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
+            },
+            "peerDependencies": {
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/node-fetch-h2": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz",
+            "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "http2-client": "^1.2.5"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
+            }
+        },
+        "node_modules/node-readfiles": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz",
+            "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es6-promise": "^3.2.1"
+            }
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.18",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-range": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/oas-kit-common": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
+            "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "fast-safe-stringify": "^2.0.7"
+            }
+        },
+        "node_modules/oas-linter": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.2.tgz",
+            "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@exodus/schemasafe": "^1.0.0-rc.2",
+                "should": "^13.2.1",
+                "yaml": "^1.10.0"
+            },
+            "funding": {
+                "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+            }
+        },
+        "node_modules/oas-linter/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/oas-resolver": {
+            "version": "2.5.6",
+            "resolved": "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.6.tgz",
+            "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "node-fetch-h2": "^2.3.0",
+                "oas-kit-common": "^1.0.8",
+                "reftools": "^1.1.9",
+                "yaml": "^1.10.0",
+                "yargs": "^17.0.1"
+            },
+            "bin": {
+                "resolve": "resolve.js"
+            },
+            "funding": {
+                "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+            }
+        },
+        "node_modules/oas-resolver/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/oas-schema-walker": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz",
+            "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "funding": {
+                "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+            }
+        },
+        "node_modules/oas-validator": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.8.tgz",
+            "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "call-me-maybe": "^1.0.1",
+                "oas-kit-common": "^1.0.8",
+                "oas-linter": "^3.2.2",
+                "oas-resolver": "^2.5.6",
+                "oas-schema-walker": "^1.1.5",
+                "reftools": "^1.1.9",
+                "should": "^13.2.1",
+                "yaml": "^1.10.0"
+            },
+            "funding": {
+                "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+            }
+        },
+        "node_modules/oas-validator/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object-hash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/optionator": {
+            "version": "0.9.4",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+            "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "deep-is": "^0.1.3",
+                "fast-levenshtein": "^2.0.6",
+                "levn": "^0.4.1",
+                "prelude-ls": "^1.2.1",
+                "type-check": "^0.4.0",
+                "word-wrap": "^1.2.5"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+            "license": "BlueOak-1.0.0"
+        },
+        "node_modules/parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-json": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "license": "MIT"
+        },
+        "node_modules/path-scurry": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^10.2.0",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/path-scurry/node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "license": "ISC"
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/pirates": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.4.47",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.1.0",
+                "source-map-js": "^1.2.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-import": {
+            "version": "15.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+            "license": "MIT",
+            "dependencies": {
+                "postcss-value-parser": "^4.0.0",
+                "read-cache": "^1.0.0",
+                "resolve": "^1.1.7"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.0"
+            }
+        },
+        "node_modules/postcss-js": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+            "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+            "license": "MIT",
+            "dependencies": {
+                "camelcase-css": "^2.0.1"
+            },
+            "engines": {
+                "node": "^12 || ^14 || >= 16"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/postcss/"
+            },
+            "peerDependencies": {
+                "postcss": "^8.4.21"
+            }
+        },
+        "node_modules/postcss-load-config": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+            "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "lilconfig": "^3.0.0",
+                "yaml": "^2.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            },
+            "peerDependencies": {
+                "postcss": ">=8.0.9",
+                "ts-node": ">=9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "postcss": {
+                    "optional": true
+                },
+                "ts-node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/postcss-load-config/node_modules/lilconfig": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+            "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antonk52"
+            }
+        },
+        "node_modules/postcss-nested": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+            "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "postcss-selector-parser": "^6.1.1"
+            },
+            "engines": {
+                "node": ">=12.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.14"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+            "license": "MIT",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "license": "MIT"
+        },
+        "node_modules/prelude-ls": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/prettier": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+            "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+            "license": "MIT",
+            "bin": {
+                "prettier": "bin/prettier.cjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/prettier-plugin-tailwindcss": {
+            "version": "0.6.9",
+            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.9.tgz",
+            "integrity": "sha512-r0i3uhaZAXYP0At5xGfJH876W3HHGHDp+LCRUJrs57PBeQ6mYHMwr25KH8NPX44F2yGTvdnH7OqCshlQx183Eg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.21.3"
+            },
+            "peerDependencies": {
+                "@ianvs/prettier-plugin-sort-imports": "*",
+                "@prettier/plugin-pug": "*",
+                "@shopify/prettier-plugin-liquid": "*",
+                "@trivago/prettier-plugin-sort-imports": "*",
+                "@zackad/prettier-plugin-twig-melody": "*",
+                "prettier": "^3.0",
+                "prettier-plugin-astro": "*",
+                "prettier-plugin-css-order": "*",
+                "prettier-plugin-import-sort": "*",
+                "prettier-plugin-jsdoc": "*",
+                "prettier-plugin-marko": "*",
+                "prettier-plugin-multiline-arrays": "*",
+                "prettier-plugin-organize-attributes": "*",
+                "prettier-plugin-organize-imports": "*",
+                "prettier-plugin-sort-imports": "*",
+                "prettier-plugin-style-order": "*",
+                "prettier-plugin-svelte": "*"
+            },
+            "peerDependenciesMeta": {
+                "@ianvs/prettier-plugin-sort-imports": {
+                    "optional": true
+                },
+                "@prettier/plugin-pug": {
+                    "optional": true
+                },
+                "@shopify/prettier-plugin-liquid": {
+                    "optional": true
+                },
+                "@trivago/prettier-plugin-sort-imports": {
+                    "optional": true
+                },
+                "@zackad/prettier-plugin-twig-melody": {
+                    "optional": true
+                },
+                "prettier-plugin-astro": {
+                    "optional": true
+                },
+                "prettier-plugin-css-order": {
+                    "optional": true
+                },
+                "prettier-plugin-import-sort": {
+                    "optional": true
+                },
+                "prettier-plugin-jsdoc": {
+                    "optional": true
+                },
+                "prettier-plugin-marko": {
+                    "optional": true
+                },
+                "prettier-plugin-multiline-arrays": {
+                    "optional": true
+                },
+                "prettier-plugin-organize-attributes": {
+                    "optional": true
+                },
+                "prettier-plugin-organize-imports": {
+                    "optional": true
+                },
+                "prettier-plugin-sort-imports": {
+                    "optional": true
+                },
+                "prettier-plugin-style-order": {
+                    "optional": true
+                },
+                "prettier-plugin-svelte": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/punycode": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/react": {
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+            "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+            "license": "MIT",
+            "dependencies": {
+                "loose-envify": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/react-dom": {
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+            "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+            "license": "MIT",
+            "dependencies": {
+                "loose-envify": "^1.1.0",
+                "scheduler": "^0.23.2"
+            },
+            "peerDependencies": {
+                "react": "^18.3.1"
+            }
+        },
+        "node_modules/react-hook-form": {
+            "version": "7.53.1",
+            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.1.tgz",
+            "integrity": "sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/react-hook-form"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17 || ^18 || ^19"
+            }
+        },
+        "node_modules/react-i18next": {
+            "version": "15.1.3",
+            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.1.3.tgz",
+            "integrity": "sha512-J11oA30FbM3NZegUZjn8ySK903z6PLBz/ZuBYyT1JMR0QPrW6PFXvl1WoUhortdGi9dM0m48/zJQlPskVZXgVw==",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.25.0",
+                "html-parse-stringify": "^3.0.1"
+            },
+            "peerDependencies": {
+                "i18next": ">= 23.2.3",
+                "react": ">= 16.8.0"
+            },
+            "peerDependenciesMeta": {
+                "react-dom": {
+                    "optional": true
+                },
+                "react-native": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/react-refresh": {
+            "version": "0.14.2",
+            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+            "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/react-remove-scroll": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz",
+            "integrity": "sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==",
+            "license": "MIT",
+            "dependencies": {
+                "react-remove-scroll-bar": "^2.3.6",
+                "react-style-singleton": "^2.2.1",
+                "tslib": "^2.1.0",
+                "use-callback-ref": "^1.3.0",
+                "use-sidecar": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/react-remove-scroll-bar": {
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz",
+            "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==",
+            "license": "MIT",
+            "dependencies": {
+                "react-style-singleton": "^2.2.1",
+                "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/react-router": {
+            "version": "6.27.0",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz",
+            "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==",
+            "license": "MIT",
+            "dependencies": {
+                "@remix-run/router": "1.20.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "react": ">=16.8"
+            }
+        },
+        "node_modules/react-router-dom": {
+            "version": "6.27.0",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz",
+            "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==",
+            "license": "MIT",
+            "dependencies": {
+                "@remix-run/router": "1.20.0",
+                "react-router": "6.27.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "react": ">=16.8",
+                "react-dom": ">=16.8"
+            }
+        },
+        "node_modules/react-style-singleton": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
+            "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
+            "license": "MIT",
+            "dependencies": {
+                "get-nonce": "^1.0.0",
+                "invariant": "^2.2.4",
+                "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/react-virtuoso": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.12.0.tgz",
+            "integrity": "sha512-oHrKlU7xHsrnBQ89ecZoMPAK0tHnI9s1hsFW3KKg5ZGeZ5SWvbGhg/QFJFY4XETAzoCUeu+Xaxn1OUb/PGtPlA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "react": ">=16 || >=17 || >= 18",
+                "react-dom": ">=16 || >=17 || >= 18"
+            }
+        },
+        "node_modules/read-cache": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+            "license": "MIT",
+            "dependencies": {
+                "pify": "^2.3.0"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "license": "MIT",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/reftools": {
+            "version": "1.1.9",
+            "resolved": "https://registry.npmjs.org/reftools/-/reftools-1.1.9.tgz",
+            "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "funding": {
+                "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+            }
+        },
+        "node_modules/regenerator-runtime": {
+            "version": "0.14.1",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+            "license": "MIT"
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resolve": {
+            "version": "1.22.8",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.13.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "license": "MIT",
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/rollup": {
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.3.tgz",
+            "integrity": "sha512-HBW896xR5HGmoksbi3JBDtmVzWiPAYqp7wip50hjQ67JbDz61nyoMPdqu1DvVW9asYb2M65Z20ZHsyJCMqMyDg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "1.0.6"
+            },
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=18.0.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "@rollup/rollup-android-arm-eabi": "4.24.3",
+                "@rollup/rollup-android-arm64": "4.24.3",
+                "@rollup/rollup-darwin-arm64": "4.24.3",
+                "@rollup/rollup-darwin-x64": "4.24.3",
+                "@rollup/rollup-freebsd-arm64": "4.24.3",
+                "@rollup/rollup-freebsd-x64": "4.24.3",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.24.3",
+                "@rollup/rollup-linux-arm-musleabihf": "4.24.3",
+                "@rollup/rollup-linux-arm64-gnu": "4.24.3",
+                "@rollup/rollup-linux-arm64-musl": "4.24.3",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.24.3",
+                "@rollup/rollup-linux-riscv64-gnu": "4.24.3",
+                "@rollup/rollup-linux-s390x-gnu": "4.24.3",
+                "@rollup/rollup-linux-x64-gnu": "4.24.3",
+                "@rollup/rollup-linux-x64-musl": "4.24.3",
+                "@rollup/rollup-win32-arm64-msvc": "4.24.3",
+                "@rollup/rollup-win32-ia32-msvc": "4.24.3",
+                "@rollup/rollup-win32-x64-msvc": "4.24.3",
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/scheduler": {
+            "version": "0.23.2",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+            "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+            "license": "MIT",
+            "dependencies": {
+                "loose-envify": "^1.1.0"
+            }
+        },
+        "node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/should": {
+            "version": "13.2.3",
+            "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
+            "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "should-equal": "^2.0.0",
+                "should-format": "^3.0.3",
+                "should-type": "^1.4.0",
+                "should-type-adaptors": "^1.0.1",
+                "should-util": "^1.0.0"
+            }
+        },
+        "node_modules/should-equal": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+            "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "should-type": "^1.4.0"
+            }
+        },
+        "node_modules/should-format": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+            "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "should-type": "^1.3.0",
+                "should-type-adaptors": "^1.0.1"
+            }
+        },
+        "node_modules/should-type": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+            "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/should-type-adaptors": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+            "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "should-type": "^1.3.0",
+                "should-util": "^1.0.0"
+            }
+        },
+        "node_modules/should-util": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
+            "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/signal-exit": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/sonner": {
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.6.1.tgz",
+            "integrity": "sha512-0iD+eDJHyJitl069BC6wVDykQD56FMKk4TD6XkcCcikcDYaGsFKlSU0mZQXYWKPpFof3jlV/u4vGZc2KCqz8OQ==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
+                "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "license": "MIT",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/string-width-cjs": {
+            "name": "string-width",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/string-width-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-json-comments": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/sucrase": {
+            "version": "3.35.0",
+            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
+            "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "commander": "^4.0.0",
+                "glob": "^10.3.10",
+                "lines-and-columns": "^1.1.6",
+                "mz": "^2.7.0",
+                "pirates": "^4.0.1",
+                "ts-interface-checker": "^0.1.9"
+            },
+            "bin": {
+                "sucrase": "bin/sucrase",
+                "sucrase-node": "bin/sucrase-node"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/swagger-schema-official": {
+            "version": "2.0.0-bab6bed",
+            "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz",
+            "integrity": "sha512-rCC0NWGKr/IJhtRuPq/t37qvZHI/mH4I4sxflVM+qgVe5Z2uOCivzWaVbuioJaB61kvm5UvB7b49E+oBY0M8jA==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/swagger-typescript-api": {
+            "version": "13.0.22",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.22.tgz",
+            "integrity": "sha512-LVLOWvozOE3izesDrfmhOpwr6XsCRGsrfJuAXsaHkzQxYPAcpSRIAzodmz1hcGJ8BOPiBCKocH1LQ96F0lmmAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/swagger-schema-official": "^2.0.25",
+                "consola": "^3.2.3",
+                "cosmiconfig": "^9.0.0",
+                "didyoumean": "^1.2.2",
+                "eta": "^2.2.0",
+                "js-yaml": "^4.1.0",
+                "lodash": "^4.17.21",
+                "nanoid": "^3.3.7",
+                "prettier": "~3.3.3",
+                "swagger-schema-official": "2.0.0-bab6bed",
+                "swagger2openapi": "^7.0.8",
+                "typescript": "~5.5.4"
+            },
+            "bin": {
+                "sta": "dist/cli.js",
+                "swagger-typescript-api": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/swagger-typescript-api/node_modules/typescript": {
+            "version": "5.5.4",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+            "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/swagger2openapi": {
+            "version": "7.0.8",
+            "resolved": "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
+            "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "call-me-maybe": "^1.0.1",
+                "node-fetch": "^2.6.1",
+                "node-fetch-h2": "^2.3.0",
+                "node-readfiles": "^0.2.0",
+                "oas-kit-common": "^1.0.8",
+                "oas-resolver": "^2.5.6",
+                "oas-schema-walker": "^1.1.5",
+                "oas-validator": "^5.0.8",
+                "reftools": "^1.1.9",
+                "yaml": "^1.10.0",
+                "yargs": "^17.0.1"
+            },
+            "bin": {
+                "boast": "boast.js",
+                "oas-validate": "oas-validate.js",
+                "swagger2openapi": "swagger2openapi.js"
+            },
+            "funding": {
+                "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+            }
+        },
+        "node_modules/swagger2openapi/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/swr": {
+            "version": "2.2.5",
+            "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.5.tgz",
+            "integrity": "sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==",
+            "license": "MIT",
+            "dependencies": {
+                "client-only": "^0.0.1",
+                "use-sync-external-store": "^1.2.0"
+            },
+            "peerDependencies": {
+                "react": "^16.11.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
+        "node_modules/tailwind-merge": {
+            "version": "2.5.4",
+            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz",
+            "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==",
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/dcastil"
+            }
+        },
+        "node_modules/tailwindcss": {
+            "version": "3.4.14",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
+            "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
+            "license": "MIT",
+            "dependencies": {
+                "@alloc/quick-lru": "^5.2.0",
+                "arg": "^5.0.2",
+                "chokidar": "^3.5.3",
+                "didyoumean": "^1.2.2",
+                "dlv": "^1.1.3",
+                "fast-glob": "^3.3.0",
+                "glob-parent": "^6.0.2",
+                "is-glob": "^4.0.3",
+                "jiti": "^1.21.0",
+                "lilconfig": "^2.1.0",
+                "micromatch": "^4.0.5",
+                "normalize-path": "^3.0.0",
+                "object-hash": "^3.0.0",
+                "picocolors": "^1.0.0",
+                "postcss": "^8.4.23",
+                "postcss-import": "^15.1.0",
+                "postcss-js": "^4.0.1",
+                "postcss-load-config": "^4.0.1",
+                "postcss-nested": "^6.0.1",
+                "postcss-selector-parser": "^6.0.11",
+                "resolve": "^1.22.2",
+                "sucrase": "^3.32.0"
+            },
+            "bin": {
+                "tailwind": "lib/cli.js",
+                "tailwindcss": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/tailwindcss-animate": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz",
+            "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==",
+            "license": "MIT",
+            "peerDependencies": {
+                "tailwindcss": ">=3.0.0 || insiders"
+            }
+        },
+        "node_modules/text-table": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+            "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/thenify": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+            "license": "MIT",
+            "dependencies": {
+                "any-promise": "^1.0.0"
+            }
+        },
+        "node_modules/thenify-all": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+            "license": "MIT",
+            "dependencies": {
+                "thenify": ">= 3.1.0 < 4"
+            },
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "license": "MIT",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/toggle-selection": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+            "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==",
+            "license": "MIT"
+        },
+        "node_modules/tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/ts-api-utils": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz",
+            "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=16"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.2.0"
+            }
+        },
+        "node_modules/ts-interface-checker": {
+            "version": "0.1.13",
+            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+            "license": "Apache-2.0"
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "license": "0BSD"
+        },
+        "node_modules/type-check": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "5.6.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+            "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+            "devOptional": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/typescript-eslint": {
+            "version": "8.12.2",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.12.2.tgz",
+            "integrity": "sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/eslint-plugin": "8.12.2",
+                "@typescript-eslint/parser": "8.12.2",
+                "@typescript-eslint/utils": "8.12.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "6.19.8",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/uri-js": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "node_modules/use-callback-ref": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz",
+            "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==",
+            "license": "MIT",
+            "dependencies": {
+                "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/use-sidecar": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
+            "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",
+            "license": "MIT",
+            "dependencies": {
+                "detect-node-es": "^1.1.0",
+                "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/use-sync-external-store": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz",
+            "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "license": "MIT"
+        },
+        "node_modules/vaul": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/vaul/-/vaul-1.1.1.tgz",
+            "integrity": "sha512-+ejzF6ffQKPcfgS7uOrGn017g39F8SO4yLPXbBhpC7a0H+oPqPna8f1BUfXaz8eU4+pxbQcmjxW+jWBSbxjaFg==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/react-dialog": "^1.1.1"
+            },
+            "peerDependencies": {
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0"
+            }
+        },
+        "node_modules/vite": {
+            "version": "5.4.10",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz",
+            "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "esbuild": "^0.21.3",
+                "postcss": "^8.4.43",
+                "rollup": "^4.20.0"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            },
+            "peerDependencies": {
+                "@types/node": "^18.0.0 || >=20.0.0",
+                "less": "*",
+                "lightningcss": "^1.21.0",
+                "sass": "*",
+                "sass-embedded": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/void-elements": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+            "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+            "dev": true,
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/word-wrap": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+            "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/yaml": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+            "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+            "license": "ISC",
+            "bin": {
+                "yaml": "bin.mjs"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "17.7.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/yargs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/zod": {
+            "version": "3.23.8",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+            "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/colinhacks"
+            }
+        },
+        "node_modules/zustand": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.1.tgz",
+            "integrity": "sha512-pRET7Lao2z+n5R/HduXMio35TncTlSW68WsYBq2Lg1ASspsNGjpwLAsij3RpouyV6+kHMwwwzP0bZPD70/Jx/w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.20.0"
+            },
+            "peerDependencies": {
+                "@types/react": ">=18.0.0",
+                "immer": ">=9.0.6",
+                "react": ">=18.0.0",
+                "use-sync-external-store": ">=1.2.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "immer": {
+                    "optional": true
+                },
+                "react": {
+                    "optional": true
+                },
+                "use-sync-external-store": {
+                    "optional": true
+                }
+            }
+        }
+    }
+}
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix
index 4e81519e817c..5c72ddb70406 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix
@@ -2,22 +2,25 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  nix-update-script,
 }:
 
 buildNpmPackage rec {
   pname = "nezha-theme-admin";
-  version = "1.2.0";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-BnpcCkI6lIno5W3ZemQQf1UVa6bpwmIJ5KXg6BQ5Ur0=";
+    hash = "sha256-V9Vdvh66oH8cKd8vtKDHbKU5bpgSrjvgKvGo5R9E0Ao=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
-  npmDepsHash = "sha256-iXSks0LOTdbrSJdnSvzXW53wZanWjyDnL9ODcaBqpHI=";
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  npmDepsHash = "sha256-I9oV0avnALw5BUD4hyO2FORtU59KINLWT7widUPsZtE=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 
@@ -32,8 +35,6 @@ buildNpmPackage rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Nezha monitoring admin frontend";
     homepage = "https://github.com/nezhahq/admin-frontend";

From db564a83f581a7f4baebcc00b6386b686f94a3ee Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 27 Dec 2024 16:05:39 +0100
Subject: [PATCH 0466/1504] ente-auth: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index e4888eacd8f6..ba8ad3271e3c 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -17,14 +17,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-G0CqVZr3aJ1XFaM2bkfeXB1ok6m7kRTamMwWdLm61G8=";
+    hash = "sha256-pg2ivtTsMtDRNmxp2SQwI2n94qg60q8JfIWoO/rEUJE=";
   };
 
   sourceRoot = "${src.name}/auth";

From a2daa05aac564a01cf7b570b18571d1de1841a5a Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 16:51:48 +0100
Subject: [PATCH 0467/1504] rPackages.arcgisutils: fixed build

---
 pkgs/development/r-modules/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d7a5e1917bc9..f97e92aad67f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1150,6 +1150,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    arcgisutils = old.arcgisutils.overrideAttrs (_: {
+      postPatch = "patchShebangs configure";
+    });
+
    gmailr = old.gmailr.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From 96b338e2fe2951ccbbad1eafeb1e706f98df129e Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 17:03:42 +0100
Subject: [PATCH 0468/1504] rPackages.adbcpostgresql: fixed build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d7a5e1917bc9..40da1aac72b5 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -604,6 +604,7 @@ let
 
   packagesWithBuildInputs = {
     # sort -t '=' -k 2
+    adbcpostgresql = with pkgs; [ readline.dev zlib.dev openssl.dev libkrb5.dev openpam ];
     asciicast = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev libdeflate ];
     island = [ pkgs.gsl.dev ];
     svKomodo = [ pkgs.which ];

From 4a820752053511cffc267b935b812f307e7a55fc Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 17:24:25 +0100
Subject: [PATCH 0469/1504] rPackages.cpp11qpdf: fixed build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d7a5e1917bc9..232b1ead45c5 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -353,6 +353,7 @@ let
     Biostrings = [ pkgs.zlib ];
     CellBarcode = [ pkgs.zlib ];
     cld3 = [ pkgs.protobuf ];
+    cpp11qpdf = with pkgs; [ zlib.dev libjpeg ];
     bnpmr = [ pkgs.gsl ];
     caviarpd = [ pkgs.cargo ];
     cairoDevice = [ pkgs.gtk2.dev ];

From f1561d442153349018c71d22674684c91130290c Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 17:30:47 +0100
Subject: [PATCH 0470/1504] rPackages.fastpng: fixed build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d7a5e1917bc9..06eae3316213 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -370,6 +370,7 @@ let
     exactextractr = [ pkgs.geos ];
     EMCluster = [ pkgs.lapack ];
     fangs = [ pkgs.cargo ];
+    fastpng = [ pkgs.zlib.dev ];
     fcl = [ pkgs.cargo ];
     fftw = [ pkgs.fftw.dev ];
     fftwtools = with pkgs; [ fftw.dev pkg-config ];

From 978987c798c63335513db18f0afc937f1de091ff Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 17:39:35 +0100
Subject: [PATCH 0471/1504] rPackages.gifski: fixed build

---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d7a5e1917bc9..c991f47f9ce9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1043,7 +1043,7 @@ let
       cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
         src = attrs.src;
         sourceRoot = "gifski/src/myrustlib";
-        hash = "sha256-e6nuiQU22GiO2I+bu0muyICGrdkCLSZUDHDz2mM2hz0=";
+        hash = "sha256-tVbuYzGdBzWVeQ26Imq6y5gA0R/CjuNCZtQgfd3/qwA=";
       };
 
       cargoRoot = "src/myrustlib";

From 4fc5016dec2b3d8ec8c430ac4bf21f6345f250bc Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 27 Dec 2024 17:42:32 +0100
Subject: [PATCH 0472/1504] rPackages.ymd: fixed build

---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d7a5e1917bc9..e1f69d8d45a9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -494,7 +494,7 @@ let
     clustermq = [ pkgs.zeromq ];
     SAVE = with pkgs; [ zlib bzip2 icu xz pcre ];
     salso = [ pkgs.cargo ];
-    ymd = [ pkgs.cargo ];
+    ymd = with pkgs; [ cargo rustc ];
     arcpbf = [ pkgs.cargo ];
     sdcTable = with pkgs; [ gmp glpk ];
     seewave = with pkgs; [ fftw.dev libsndfile.dev ];

From 9441fffddad53958f89a44b83744ed653c99ad9a Mon Sep 17 00:00:00 2001
From: Dlurak <84224239+Dlurak@users.noreply.github.com>
Date: Fri, 27 Dec 2024 18:21:57 +0100
Subject: [PATCH 0473/1504] maintainers: add dlurak

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8bb8e723ac7e..4253d2bc7e07 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5848,6 +5848,11 @@
     githubId = 283316;
     name = "Dane Lipscombe";
   };
+  dlurak = {
+    github = "dlurak";
+    githubId = 84224239;
+    name = "dlurak";
+  };
   dmadisetti = {
     email = "nix@madisetti.me";
     github = "dmadisetti";

From b3564df51c1e2c4b7b507f206aafe633ddabf168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 20 Dec 2024 13:33:19 +0100
Subject: [PATCH 0474/1504] famistudio: stdenv -> stdenvNoCC

---
 pkgs/by-name/fa/famistudio/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index 9961002befab..ea767ab610d6 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -1,5 +1,5 @@
 {
-  stdenv,
+  stdenvNoCC,
   lib,
   buildDotnetModule,
   dotnetCorePackages,
@@ -17,12 +17,12 @@
 
 let
   csprojName =
-    if stdenv.hostPlatform.isLinux then
+    if stdenvNoCC.hostPlatform.isLinux then
       "FamiStudio.Linux"
-    else if stdenv.hostPlatform.isDarwin then
+    else if stdenvNoCC.hostPlatform.isDarwin then
       "FamiStudio.Mac"
     else
-      throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}";
+      throw "Don't know how to build FamiStudio for ${stdenvNoCC.hostPlatform.system}";
 in
 buildDotnetModule (finalAttrs: {
   pname = "famistudio";
@@ -37,7 +37,7 @@ buildDotnetModule (finalAttrs: {
 
   postPatch =
     let
-      libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}";
+      libname = library: "${library}${stdenvNoCC.hostPlatform.extensions.sharedLibrary}";
       buildNativeWrapper =
         args:
         callPackage ./build-native-wrapper.nix (
@@ -50,7 +50,7 @@ buildDotnetModule (finalAttrs: {
       nativeWrapperToReplaceFormat =
         args:
         let
-          libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib";
+          libPrefix = lib.optionalString stdenvNoCC.hostPlatform.isLinux "lib";
         in
         {
           package = buildNativeWrapper args;
@@ -71,14 +71,14 @@ buildDotnetModule (finalAttrs: {
             ourName = "librtmidi";
           }
         ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
+        ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
           {
             package = openal;
             expectedName = "libopenal32";
             ourName = "libopenal";
           }
         ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
           {
             package = portaudio;
             expectedName = "libportaudio.2";
@@ -133,7 +133,7 @@ buildDotnetModule (finalAttrs: {
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
   dotnetFlags = [ "-p:TargetFramework=net8.0" ];
 
-  runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [
+  runtimeDeps = lib.optionals stdenvNoCC.hostPlatform.isLinux [
     libglvnd
   ];
 

From 5a7454f56436e7250d7126a2eb376c6e3f918d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 20 Dec 2024 13:37:56 +0100
Subject: [PATCH 0475/1504] famistudio: simpler update script

---
 pkgs/by-name/fa/famistudio/package.nix |  7 ++++++-
 pkgs/by-name/fa/famistudio/update.sh   | 23 -----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100755 pkgs/by-name/fa/famistudio/update.sh

diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index ea767ab610d6..7b3e14abe957 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -13,6 +13,8 @@
   openal,
   portaudio,
   rtmidi,
+  _experimental-update-script-combinators,
+  gitUpdater,
 }:
 
 let
@@ -152,7 +154,10 @@ buildDotnetModule (finalAttrs: {
       --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
   '';
 
-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (gitUpdater { }).command
+    (finalAttrs.passthru.fetch-deps)
+  ];
 
   meta = {
     homepage = "https://famistudio.org/";
diff --git a/pkgs/by-name/fa/famistudio/update.sh b/pkgs/by-name/fa/famistudio/update.sh
deleted file mode 100755
index 15657955c025..000000000000
--- a/pkgs/by-name/fa/famistudio/update.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq common-updater-scripts
-set -eo pipefail
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-deps_file="$(realpath "./deps.nix")"
-
-new_version="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
-    -s "https://api.github.com/repos/BleuBleu/FamiStudio/releases?per_page=1" | jq -r '.[0].tag_name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
-if [[ "$new_version" == "$old_version" ]]; then
-    echo "Up to date"
-    exit 0
-fi
-
-cd ../../../..
-
-if [[ "$1" != "--deps-only" ]]; then
-    update-source-version famistudio "$new_version"
-fi
-
-$(nix-build . -A famistudio.fetch-deps --no-out-link) "$deps_file"

From f48c700012b8d79922142c1ef6f898d0bcb26963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 20 Dec 2024 13:40:56 +0100
Subject: [PATCH 0476/1504] famistudio: 4.2.1 -> 4.3.0

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

diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index 7b3e14abe957..cd115bbcc338 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "famistudio";
-  version = "4.2.1";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc=";
+    hash = "sha256-Ldht7w1qgLTiqbRUJJvFQgl1VW6k+14w/jz58kAeMl0=";
   };
 
   postPatch =
@@ -132,8 +132,6 @@ buildDotnetModule (finalAttrs: {
   projectFile = "FamiStudio/${csprojName}.csproj";
   nugetDeps = ./deps.json;
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.runtime_8_0;
-  dotnetFlags = [ "-p:TargetFramework=net8.0" ];
 
   runtimeDeps = lib.optionals stdenvNoCC.hostPlatform.isLinux [
     libglvnd

From ee9d0ed38543cd031081f0cb7aec2b51aadc9715 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 27 Dec 2024 23:18:47 +0400
Subject: [PATCH 0477/1504] =?UTF-8?q?tootik:=200.13.0=20=E2=86=92=200.14.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix
index 031464ed5c06..a551d674785d 100644
--- a/pkgs/by-name/to/tootik/package.nix
+++ b/pkgs/by-name/to/tootik/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tootik";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "tootik";
-    rev = version;
-    hash = "sha256-YVfxyfPYaGbfGdWtcoJhrMBV+1FI0x7m5OA1oOdPFDo=";
+    tag = version;
+    hash = "sha256-9R/3rvFJTXvIfJF698yZ0wMmsN2T3I/Kj1nfOOZoOkI=";
   };
 
-  vendorHash = "sha256-8GHyMF/WfoQOnoF0qHHC3aMTuNeB8eVynmXJf6CD+Es=";
+  vendorHash = "sha256-ADor2SEEPkWZVwpNEeb8ijUPAA6jZfD7QXJIIZ6BdD0=";
 
   nativeBuildInputs = [ openssl ];
 

From 5abe8bcffb796e3a58f7b3634f3f490bbd19fd3a Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 27 Dec 2024 20:35:18 +0100
Subject: [PATCH 0478/1504]  koreader: 2024.04 -> 2024.11

---
 pkgs/by-name/ko/koreader/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index a68d94b92287..169b083878ad 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -11,13 +11,14 @@
   luajit,
   sdcv,
   SDL2,
+  nix-update-script,
 }:
 let
   luajit_lua52 = luajit.override { enable52Compat = true; };
 in
 stdenv.mkDerivation rec {
   pname = "koreader";
-  version = "2024.04";
+  version = "2024.11";
 
   src =
     {
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
-        hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw=";
+        hash = "sha256-ibehFrOcJqhM+CMAcHDn3Xwy6CueB8kdnoYMMDe/2Js=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -78,6 +79,10 @@ stdenv.mkDerivation rec {
     }
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     homepage = "https://github.com/koreader/koreader";
     changelog = "https://github.com/koreader/koreader/releases/tag/v${version}";
@@ -93,6 +98,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       contrun
       neonfuz
+      liberodark
     ];
   };
 }

From 4a485393d00532ffecfc241fa0f41181d0b8d222 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <bct@diffeq.com>
Date: Fri, 27 Dec 2024 13:54:14 -0700
Subject: [PATCH 0479/1504] lubelogger: 1.3.8 -> 1.4.1

---
 pkgs/by-name/lu/lubelogger/deps.json   | 20 ++++++++++----------
 pkgs/by-name/lu/lubelogger/package.nix |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/lu/lubelogger/deps.json b/pkgs/by-name/lu/lubelogger/deps.json
index 5a9dc48bba66..b27469702b66 100644
--- a/pkgs/by-name/lu/lubelogger/deps.json
+++ b/pkgs/by-name/lu/lubelogger/deps.json
@@ -1,8 +1,8 @@
 [
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.3.0",
-    "hash": "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0="
+    "version": "2.4.0",
+    "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA="
   },
   {
     "pname": "CsvHelper",
@@ -16,8 +16,8 @@
   },
   {
     "pname": "MailKit",
-    "version": "4.5.0",
-    "hash": "sha256-quU88XNBF+tzb1yr7+lSfx90kmvZpbX43+YJtdYgPzk="
+    "version": "4.8.0",
+    "hash": "sha256-ONvrVOwjxyNrIQM8FMzT5mLzlU56Kc8oOwkzegNAiXM="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -51,18 +51,18 @@
   },
   {
     "pname": "MimeKit",
-    "version": "4.5.0",
-    "hash": "sha256-Nsk3Br9yLOC5wDLtRQyw04Kq205y5QCISpyiB13mwLU="
+    "version": "4.8.0",
+    "hash": "sha256-4EB54ktBXuq5QRID9i8E7FzU7YZTE4wwH+2yr7ivi/Q="
   },
   {
     "pname": "Npgsql",
-    "version": "8.0.3",
-    "hash": "sha256-weBGo/IXKI5ufixBCuWG7OqDSyIqvGV07oxrG0XnQIQ="
+    "version": "8.0.5",
+    "hash": "sha256-vGIznPqwfhg8wY9bt5XlinyNWMr5kJ2jJZHDXc73uhI="
   },
   {
     "pname": "System.Formats.Asn1",
-    "version": "8.0.0",
-    "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="
+    "version": "8.0.1",
+    "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
   },
   {
     "pname": "System.IdentityModel.Tokens.Jwt",
diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix
index 30be2f60a375..74c964920e3e 100644
--- a/pkgs/by-name/lu/lubelogger/package.nix
+++ b/pkgs/by-name/lu/lubelogger/package.nix
@@ -6,17 +6,17 @@
 
 buildDotnetModule rec {
   pname = "lubelogger";
-  version = "1.3.8";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "hargata";
     repo = "lubelog";
     rev = "v${version}";
-    hash = "sha256-f9lj2Er0gQpptzmLpZsxR8hSU6kJlJkwHwpZ7wAq6bk=";
+    hash = "sha256-Ee9jwbZNc5M9edGkPvbO7xaraYXVMbVazVOU6DV6nFc=";
   };
 
   projectFile = "CarCareTracker.sln";
-  nugetDeps = ./deps.json; # File generated with `nix-build -A package.passthru.fetch-deps`.
+  nugetDeps = ./deps.json; # File generated with `nix-build -A lubelogger.passthru.fetch-deps`.
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;

From 01ea54baa838c9cef64f62c4f4b896391adbbb7d Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 27 Dec 2024 23:12:56 +0100
Subject: [PATCH 0480/1504] python3Packages.loguru: 0.7.2 -> 0.7.3 & cleanups

---
 .../python-modules/loguru/default.nix         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix
index d3776308759c..5fa1a0251bc5 100644
--- a/pkgs/development/python-modules/loguru/default.nix
+++ b/pkgs/development/python-modules/loguru/default.nix
@@ -3,37 +3,42 @@
   stdenv,
   buildPythonPackage,
   colorama,
+  exceptiongroup,
   fetchFromGitHub,
+  flit-core,
   freezegun,
+  pytest-mypy-plugins,
+  pytest-xdist,
   pytestCheckHook,
   pythonOlder,
-  pytest-xdist,
 }:
 
 buildPythonPackage rec {
   pname = "loguru";
-  version = "0.7.2";
-  format = "setuptools";
+  version = "0.7.3";
+
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Delgan";
     repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw=";
+    tag = version;
+    hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4=";
   };
 
+  build-system = [ flit-core ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-xdist # massive speedup, not tested by upstream
     colorama
     freezegun
-  ];
+    pytest-mypy-plugins
+  ] ++ lib.optional (pythonOlder "3.10") exceptiongroup;
 
-  disabledTestPaths = [
-    "tests/test_type_hinting.py" # avoid dependency on mypy
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
 
   disabledTests =
     [
@@ -52,12 +57,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "loguru" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python logging made (stupidly) simple";
     homepage = "https://github.com/Delgan/loguru";
     changelog = "https://github.com/delgan/loguru/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       jakewaksbaum
       rmcgibbo
     ];

From 678fae38c73075b5309e4ab79e2f27e9c932e134 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:00:07 +0800
Subject: [PATCH 0481/1504] keyguard: add update script

---
 pkgs/by-name/ke/keyguard/package.nix |  2 ++
 pkgs/by-name/ke/keyguard/update.sh   | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100755 pkgs/by-name/ke/keyguard/update.sh

diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 477dc9e3fff1..827a05718a1a 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -60,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
     useBwrap = false;
   };
 
+  passthru.updateScript = ./update.sh;
+
   doCheck = false;
 
   gradleFlags = [ "-Dorg.gradle.java.home=${jdk17}" ];
diff --git a/pkgs/by-name/ke/keyguard/update.sh b/pkgs/by-name/ke/keyguard/update.sh
new file mode 100755
index 000000000000..57df067cd413
--- /dev/null
+++ b/pkgs/by-name/ke/keyguard/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts
+
+set -eou pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+
+latest=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/AChep/keyguard-app/releases/latest)
+latestTag=$(echo "$latest" | jq -r ".tag_name")
+latestName=$(echo "$latest" | jq -r ".name")
+latestVersion=$(echo "$latestName" | awk -F'v|-' '{print $2}')
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; keyguard.version" | tr -d '"')
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/AChep/keyguard-app/archive/refs/tags/${latestTag}.tar.gz"))
+update-source-version keyguard $latestVersion $hash
+
+sed -i "s/tag = \"r[0-9]\+\";/tag = \"$latestTag\";/g" "$ROOT/package.nix"
+
+$(nix-build -A keyguard.mitmCache.updateScript)

From 1721806b16a14ef047cff87c6cf1dc5b0e252112 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:00:31 +0800
Subject: [PATCH 0482/1504] keyguard: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 827a05718a1a..787b18bb6d11 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyguard";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "AChep";
     repo = "keyguard-app";
-    tag = "r20241221";
-    hash = "sha256-AeomyFazONZatbxT6qaTt+/5eBAkgWYwti62CD98jkg=";
+    tag = "r20241223";
+    hash = "sha256-7fMSpTKEEjSXfYotZ/qxX1m+i8GheCLboo+XoA3gTbc=";
   };
 
   gradleBuildTask = ":desktopApp:createDistributable";

From 3dfa9a5456a3855646173d5eddc16f8beba0e903 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 27 Dec 2024 07:51:58 +0800
Subject: [PATCH 0483/1504] kazumi: add update script

---
 pkgs/by-name/ka/kazumi/package.nix |  2 ++
 pkgs/by-name/ka/kazumi/update.sh   | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100755 pkgs/by-name/ka/kazumi/update.sh

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 531a79a30abd..73be2b92282d 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -107,6 +107,8 @@ flutter327.buildFlutterApplication rec {
     install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Watch Animes online with danmaku support";
     homepage = "https://github.com/Predidit/Kazumi";
diff --git a/pkgs/by-name/ka/kazumi/update.sh b/pkgs/by-name/ka/kazumi/update.sh
new file mode 100755
index 000000000000..a63eea668a66
--- /dev/null
+++ b/pkgs/by-name/ka/kazumi/update.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq yq nixVersions.latest bash coreutils nix-update
+
+set -eou pipefail
+
+ROOT="$(dirname "$(readlink -f "$0")")"
+
+latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/Predidit/Kazumi/releases/latest | jq --raw-output .tag_name)
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; kazumi.version or (lib.getVersion kazumi)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+    echo "package is up-to-date: $currentVersion"
+    exit 0
+fi
+
+nix-update kazumi
+
+curl https://raw.githubusercontent.com/Predidit/Kazumi/${latestVersion}/pubspec.lock | yq . >$ROOT/pubspec.lock.json

From e2811854de48a71bc2c0162b41954c823ea39291 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 27 Dec 2024 08:03:34 +0800
Subject: [PATCH 0484/1504] kazumi: 1.4.7 -> 1.4.8

---
 pkgs/by-name/ka/kazumi/package.nix       | 20 +++++++--------
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 32 ++++++++++++------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 73be2b92282d..37a1adeea323 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -14,13 +14,13 @@
 }:
 flutter327.buildFlutterApplication rec {
   pname = "kazumi";
-  version = "1.4.7";
+  version = "1.4.8";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-/sr2CQ9ntwfR2QCgidQE3kwBSIG+qfpSR/XhRPpmBm0=";
+    hash = "sha256-E1JOBdOfb2WyTDU0nOu1SCFSfv5O4VKj+9Go8wcMips=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -92,14 +92,14 @@ flutter327.buildFlutterApplication rec {
   gitHashes = {
     desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
     webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
-    media_kit = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_libs_android_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_libs_ios_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_libs_linux = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_libs_macos_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_libs_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_libs_windows_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
-    media_kit_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
+    media_kit = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_libs_android_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_libs_ios_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_libs_linux = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_libs_macos_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_libs_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_libs_windows_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
+    media_kit_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths=";
   };
 
   postInstall = ''
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 2857660189ff..fa5df857d3cf 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -886,7 +886,7 @@
       "description": {
         "path": "media_kit",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -897,7 +897,7 @@
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -908,7 +908,7 @@
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -919,7 +919,7 @@
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -930,7 +930,7 @@
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -941,7 +941,7 @@
       "description": {
         "path": "libs/universal/media_kit_libs_video",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -952,7 +952,7 @@
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -963,7 +963,7 @@
       "description": {
         "path": "media_kit_video",
         "ref": "main",
-        "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
+        "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1083,21 +1083,21 @@
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus",
-        "sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce",
+        "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.1"
+      "version": "8.1.2"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
+        "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "path": {
       "dependency": "transitive",
@@ -1849,21 +1849,21 @@
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484",
+        "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.8"
+      "version": "1.2.10"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16",
+        "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "watcher": {
       "dependency": "transitive",

From cff5c37e92e04657e69ff85193410f8602c1c152 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 27 Dec 2024 22:22:12 +0000
Subject: [PATCH 0485/1504] freeplane: add copyDesktopItems

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

diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix
index a92d25976e3f..6ba59f984aa4 100644
--- a/pkgs/by-name/fr/freeplane/package.nix
+++ b/pkgs/by-name/fr/freeplane/package.nix
@@ -7,6 +7,7 @@
   jdk17,
   gradle_8,
   which,
+  copyDesktopItems,
 }:
 
 let
@@ -31,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     makeBinaryWrapper
     jdk
     gradle
+    copyDesktopItems
   ];
 
   mitmCache = gradle.fetchDeps {

From c1b4e523c78982f1be99d58406939beae25c9f68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 23:21:06 +0000
Subject: [PATCH 0486/1504] jmol: 16.3.5 -> 16.3.7

---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 1b84dcbb8108..c7f0403cf90a 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "16.3.5";
+  version = "16.3.7";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    hash = "sha256-6fjVVjNnJZMyOZnQQms8NsgzQa7+GLRQwaUw2WHpD98=";
+    hash = "sha256-SQuIjwafPipQy9C2yJQ2CIFV/lSAnHkp1jYnPK1BWcQ=";
   };
 
   patchPhase = ''

From 592da03a8e4b4f455007a6d460b11af72b654914 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 23 Dec 2024 01:50:22 -0800
Subject: [PATCH 0487/1504] arpack: use openblas on darwin

Change 07cdea2ae5005c6396eafd9d87e1cdec6c0c2a4b uncovered a bug in how
we build arpack on darwin with the Accelerate. Disable the Accelerate
framework and use openblas the default nixpkgs blas/lapack
implementation.
---
 pkgs/by-name/ar/arpack/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index d8da13ac5680..f4c45e7de2f8 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
     "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
     "-DMPI=${if useMpi then "ON" else "OFF"}"
     "-DICB=ON"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # prevent cmake from using Accelerate, which causes single precision tests
+    # to segfault
+    "-DBLA_VENDOR=Generic"
   ];
 
   preCheck = ''

From c52b77e1659c49d8bdefe48978c3b7b15d14e172 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 06:51:35 +0000
Subject: [PATCH 0488/1504] python312Packages.minio: 7.2.12 -> 7.2.13

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

diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 4c086580a467..f78839c9b84b 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "minio";
-  version = "7.2.12";
+  version = "7.2.13";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio-py";
-    rev = "refs/tags/${version}";
-    hash = "sha256-8CthbR62TZ7MFC3OCwtbHtGwmlQeFLgBtkyRX1P5SYU=";
+    tag = version;
+    hash = "sha256-RauPMoqVp4xnS4CXLH0HVTjA8o/BstoEWKWFHvjVllA=";
   };
 
   postPatch = ''

From dae5df7bdcaed5aa8f1a96f9d5adff029cdb4be7 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Dec 2024 16:25:53 +0800
Subject: [PATCH 0489/1504] clash-verge-rev: fix wrong patch for lib/

---
 pkgs/by-name/cl/clash-verge-rev/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index bfa128cf7728..1990b67ac865 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -108,16 +108,16 @@ stdenv.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,share,lib/clash-verge/resources}
+    mkdir -p $out/{bin,share,lib/Clash\ Verge/resources}
     cp -r ${unwrapped}/share/* $out/share
     cp -r ${unwrapped}/bin/clash-verge $out/bin/clash-verge
     # This can't be symbol linked. It will find mihomo in its runtime path
     ln -s ${service}/bin/clash-verge-service $out/bin/clash-verge-service
     ln -s ${mihomo}/bin/mihomo $out/bin/verge-mihomo
     # people who want to use alpha build show override mihomo themselves. The alpha core entry was removed in clash-verge.
-    ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/clash-verge/resources/geoip.dat
-    ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/clash-verge/resources/geosite.dat
-    ln -s ${dbip-country-lite.mmdb} $out/lib/clash-verge/resources/Country.mmdb
+    ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/Clash\ Verge/resources/geoip.dat
+    ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/Clash\ Verge/resources/geosite.dat
+    ln -s ${dbip-country-lite.mmdb} $out/lib/Clash\ Verge/resources/Country.mmdb
     runHook postInstall
   '';
 }

From 00baa26ab41dfa7b6eb304467e94fcc2d9d5e592 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 21:43:56 -0800
Subject: [PATCH 0490/1504] arpack: minor cleanups

use ninja, cmakeBool and remove unneeded install_name_tool usage in
postFixup as the library name is already properly set by the build
---
 pkgs/by-name/ar/arpack/package.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index f4c45e7de2f8..28c4c77c5dd3 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake, ninja
 , gfortran, blas, lapack, eigen
 , useMpi ? false
 , mpi
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0=";
   };
 
-  nativeBuildInputs = [ cmake gfortran ];
+  nativeBuildInputs = [ cmake gfortran ninja ];
   buildInputs = assert (blas.isILP64 == lapack.isILP64); [
     blas
     lapack
@@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
-    "-DMPI=${if useMpi then "ON" else "OFF"}"
-    "-DICB=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+    (lib.cmakeBool "ICB" true)
+    (lib.cmakeBool "INTERFACE64" blas.isILP64)
+    (lib.cmakeBool "MPI" useMpi)
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # prevent cmake from using Accelerate, which causes single precision tests
     # to segfault
@@ -48,10 +48,6 @@ stdenv.mkDerivation rec {
     export OMP_NUM_THREADS=2
   '';
 
-  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib
-  '';
-
   passthru = {
     inherit (blas) isILP64;
     tests = {

From 89e9ea24c773e80a19962fe489c017c4df959b2d Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 21:44:48 -0800
Subject: [PATCH 0491/1504] arpack: Enable eigenvalue-problems solver based on
 ICB and eigen

The arpack package included the eigen library and added it to the build
inputs but neglected to enable its use by setting `EIGEN=ON` in the
build flags.  Enable support for eigenvalue-problems solver based on ICB
and eigen and disable parallel checking as the tests fail when run in
parallel.
---
 pkgs/by-name/ar/arpack/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index 28c4c77c5dd3..3023e9a3e9b5 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -30,10 +30,14 @@ stdenv.mkDerivation rec {
 
   nativeCheckInputs = lib.optional useMpi openssh;
 
+  # a couple tests fail when run in parallel
   doCheck = true;
+  enableParallelChecking = false;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+    (lib.cmakeBool "EIGEN" true)
+    (lib.cmakeBool "EXAMPLES" true)
     (lib.cmakeBool "ICB" true)
     (lib.cmakeBool "INTERFACE64" blas.isILP64)
     (lib.cmakeBool "MPI" useMpi)
@@ -43,11 +47,6 @@ stdenv.mkDerivation rec {
     "-DBLA_VENDOR=Generic"
   ];
 
-  preCheck = ''
-    # Prevent tests from using all cores
-    export OMP_NUM_THREADS=2
-  '';
-
   passthru = {
     inherit (blas) isILP64;
     tests = {

From 2f215b76aeda958c64130fe4f2805e8e754d988f Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 22:14:47 -0800
Subject: [PATCH 0492/1504] arpack: add option to use macOS Accelerate

Copy darwin flags `-ff2c -fno-second-underscore` from workflow to use
Accelerate without segfaulting / failing tests and enable the Accelerate
framework when `useAccel` is true.
https://github.com/opencollab/arpack-ng/blob/804fa3149a0f773064198a8e883bd021832157ca/.github/workflows/jobs.yml#L184-L192
---
 pkgs/by-name/ar/arpack/package.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ar/arpack/package.nix b/pkgs/by-name/ar/arpack/package.nix
index 3023e9a3e9b5..4e059b3ea95c 100644
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -4,11 +4,13 @@
 , mpi
 , openssh
 , igraph
+, useAccel ? false #use Accelerate framework on darwin
 }:
 
 # MPI version can only be built with LP64 interface.
 # See https://github.com/opencollab/arpack-ng#readme
 assert useMpi -> !blas.isILP64;
+assert useAccel -> stdenv.hostPlatform.isDarwin;
 
 stdenv.mkDerivation rec {
   pname = "arpack";
@@ -22,11 +24,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake gfortran ninja ];
-  buildInputs = assert (blas.isILP64 == lapack.isILP64); [
-    blas
-    lapack
+  buildInputs = [
     eigen
-  ] ++ lib.optional useMpi mpi;
+  ] ++ lib.optionals (!useAccel) (assert (blas.isILP64 == lapack.isILP64); [
+    blas lapack
+  ]) ++ lib.optional useMpi mpi;
 
   nativeCheckInputs = lib.optional useMpi openssh;
 
@@ -34,21 +36,26 @@ stdenv.mkDerivation rec {
   doCheck = true;
   enableParallelChecking = false;
 
+  env = lib.optionalAttrs useAccel {
+    # Without these flags some tests will fail / segfault when using Accelerate
+    # framework. They were pulled from the CI Workflow
+    # https://github.com/opencollab/arpack-ng/blob/804fa3149a0f773064198a8e883bd021832157ca/.github/workflows/jobs.yml#L184-L192
+    FFLAGS = "-ff2c -fno-second-underscore";
+  };
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
     (lib.cmakeBool "EIGEN" true)
     (lib.cmakeBool "EXAMPLES" true)
     (lib.cmakeBool "ICB" true)
-    (lib.cmakeBool "INTERFACE64" blas.isILP64)
+    (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
     (lib.cmakeBool "MPI" useMpi)
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # prevent cmake from using Accelerate, which causes single precision tests
-    # to segfault
-    "-DBLA_VENDOR=Generic"
+    "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
   ];
 
   passthru = {
-    inherit (blas) isILP64;
+    isILP64 = !useAccel && blas.isILP64;
     tests = {
       inherit igraph;
     };

From 061e93f3574377ccc7ad0d6289486c6bd9ff9264 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Dec 2024 16:26:10 +0800
Subject: [PATCH 0493/1504] clash-verge-rev: add missing patch for kde

---
 pkgs/by-name/cl/clash-verge-rev/package.nix   | 4 ++++
 pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index 1990b67ac865..c90218f2f36c 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -70,6 +70,10 @@ let
   meta = {
     description = "Clash GUI based on tauri";
     homepage = "https://github.com/clash-verge-rev/clash-verge-rev";
+    longDescription = ''
+      Clash GUI based on tauri
+      Setting NixOS option `programs.clash-verge.enable = true` is recommended.
+    '';
     license = lib.licenses.gpl3Only;
     mainProgram = "clash-verge";
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index 644a5f2871a9..181ddafafd5c 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -10,6 +10,8 @@
   libsoup,
   rustPlatform,
   makeDesktopItem,
+  libsForQt5,
+  kdePackages,
   meta,
   webkitgtk_4_1,
   openssl,
@@ -32,7 +34,11 @@ rustPlatform.buildRustPackage {
         --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
 
       substituteInPlace $cargoDepsCopy/sysproxy-*/src/linux.rs \
-        --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"'
+        --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' \
+        --replace-fail '"kreadconfig5"' '"${libsForQt5.kconfig}/bin/kreadconfig5"' \
+        --replace-fail '"kreadconfig6"' '"${kdePackages.kconfig}/bin/kreadconfig6"' \
+        --replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \
+        --replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"'
 
       substituteInPlace ./tauri.conf.json \
         --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \

From 25a67f8af198d1f06c090810bfb62e5d27286b55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 09:15:03 +0000
Subject: [PATCH 0494/1504] nagios: 4.5.8 -> 4.5.9

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

diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix
index a3afea87550f..1863ec630458 100644
--- a/pkgs/by-name/na/nagios/package.nix
+++ b/pkgs/by-name/na/nagios/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nagios";
-  version = "4.5.8";
+  version = "4.5.9";
 
   src = fetchFromGitHub {
     owner = "NagiosEnterprises";
     repo = "nagioscore";
     rev = "refs/tags/nagios-${finalAttrs.version}";
-    hash = "sha256-DOtZMq4KFBWYbaBhlSM8PgjTNHJu5o6dCd1dE2qt7lA=";
+    hash = "sha256-aOHdMZJCrGeJ3XA3+ed3JUb7X1FdfdGiT2ytzBDAT4c=";
   };
 
   patches = [ ./nagios.patch ];

From a707b1a78e32296b97bc7c1f5dc4c12d96daded5 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sat, 28 Dec 2024 11:07:04 +0100
Subject: [PATCH 0495/1504] rPackages.arcgisgeocode: fixed build

---
 pkgs/development/r-modules/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 038fc761baec..b87d25a3b23e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1156,6 +1156,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    arcgisgeocode = old.arcgisgeocode.overrideAttrs (_: {
+      postPatch = "patchShebangs configure";
+    });
+
    gmailr = old.gmailr.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From 751b5940f34486844da0f16f527033a8302c1edd Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sat, 28 Dec 2024 11:10:39 +0100
Subject: [PATCH 0496/1504] rPackages.b64: fixed build

---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 038fc761baec..247d303875bf 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1195,7 +1195,7 @@ let
     });
 
     b64 = old.b64.overrideAttrs (attrs: {
-      nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs;
+      nativeBuildInputs = with pkgs; [ cargo rustc ] ++ attrs.nativeBuildInputs;
       postPatch = "patchShebangs configure";
     });
 

From fd78de769a608aaadea5fce8f02aef8901457c3b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:29:25 +0000
Subject: [PATCH 0497/1504] xfce.catfish: 4.18.0 -> 4.20.0

https://gitlab.xfce.org/apps/catfish/-/compare/catfish-4.18.0...catfish-4.20.0

* Ported to meson.
---
 .../xfce/applications/catfish/default.nix     | 80 ++++++++-----------
 1 file changed, 34 insertions(+), 46 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix
index 5eeec6ccfa1e..4c3bd14bc2a9 100644
--- a/pkgs/desktops/xfce/applications/catfish/default.nix
+++ b/pkgs/desktops/xfce/applications/catfish/default.nix
@@ -1,77 +1,65 @@
 {
+  stdenv,
   lib,
   fetchFromGitLab,
-  gitUpdater,
-  file,
-  which,
-  intltool,
+  desktop-file-utils,
   gobject-introspection,
-  findutils,
-  xdg-utils,
-  dconf,
-  gtk3,
-  python3Packages,
-  xfconf,
+  meson,
+  ninja,
+  pkg-config,
   wrapGAppsHook3,
+  glib,
+  gtk3,
+  python3,
+  xfconf,
+  shared-mime-info,
+  xdg-utils,
+  gitUpdater,
 }:
 
-python3Packages.buildPythonApplication rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "catfish";
-  version = "4.18.0";
+  version = "4.20.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.xfce.org";
     owner = "apps";
-    repo = pname;
-    rev = "${pname}-${version}";
-    sha256 = "sha256-hfbIgSFn48++eGrJXzhXRxhWkrjgTYsr7BX/n0EXhGo=";
+    repo = "catfish";
+    rev = "catfish-${finalAttrs.version}";
+    hash = "sha256-7ERE6R714OuqTjeNZw3K6HvQTA8OIglG6+8Kiawwzu8=";
   };
 
   nativeBuildInputs = [
-    python3Packages.distutils-extra
-    file
-    which
-    intltool
-    gobject-introspection # for setup hook populating GI_TYPELIB_PATH
+    desktop-file-utils
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
     wrapGAppsHook3
   ];
 
   buildInputs = [
+    glib
     gtk3
-    dconf
-    python3Packages.pyxdg
-    python3Packages.ptyprocess
-    python3Packages.pycairo
-  ];
-
-  propagatedBuildInputs = [
-    python3Packages.dbus-python
-    python3Packages.pygobject3
-    python3Packages.pexpect
-    xdg-utils
-    findutils
+    (python3.withPackages (p: [
+      p.dbus-python
+      p.pygobject3
+      p.pexpect
+    ]))
     xfconf
   ];
 
-  # Explicitly set the prefix dir in "setup.py" because setuptools is
-  # not using "$out" as the prefix when installing catfish data. In
-  # particular the variable "__catfish_data_directory__" in
-  # "catfishconfig.py" is being set to a subdirectory in the python
-  # path in the store.
   postPatch = ''
-    sed -i "/^        if self.root/i\\        self.prefix = \"$out\"" setup.py
+    substituteInPlace catfish/CatfishWindow.py \
+      --replace-fail "/usr/share/mime" "${shared-mime-info}/share/mime"
   '';
 
-  # Disable check because there is no test in the source distribution
-  doCheck = false;
-
-  dontWrapGApps = true;
-
   preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    # For xdg-mime and xdg-open.
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xdg-utils ]}")
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "${pname}-"; };
+  passthru.updateScript = gitUpdater { rev-prefix = "catfish-"; };
 
   meta = with lib; {
     homepage = "https://docs.xfce.org/apps/catfish/start";
@@ -87,4 +75,4 @@ python3Packages.buildPythonApplication rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ ] ++ teams.xfce.members;
   };
-}
+})

From 117f967463a99ab6b854f07c575f4f84a5940794 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:29:37 +0000
Subject: [PATCH 0498/1504] xfce.gigolo: 0.5.3 -> 0.5.4

https://gitlab.xfce.org/apps/gigolo/-/compare/gigolo-0.5.3...gigolo-0.5.4
---
 pkgs/desktops/xfce/applications/gigolo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix
index 4a2edb70f230..c9207e85ccd5 100644
--- a/pkgs/desktops/xfce/applications/gigolo/default.nix
+++ b/pkgs/desktops/xfce/applications/gigolo/default.nix
@@ -8,10 +8,10 @@
 mkXfceDerivation {
   category = "apps";
   pname = "gigolo";
-  version = "0.5.3";
+  version = "0.5.4";
   odd-unstable = false;
 
-  sha256 = "sha256-dxaFuKbSqhj/l5JV31cI+XzgdghfbcVwVtwmRiZeff8=";
+  sha256 = "sha256-gRv1ZQLgwwzFERnco2Dm2PkT/BNDIZU6fX+HdhiRCJk=";
 
   buildInputs = [
     gtk3

From cad618f82ab365c40288a32a2b0745f9fbb96a6f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:29:49 +0000
Subject: [PATCH 0499/1504] xfce.parole: 4.18.1 -> 4.18.2

https://gitlab.xfce.org/apps/parole/-/compare/parole-4.18.1...parole-4.18.2
---
 pkgs/desktops/xfce/applications/parole/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix
index 4d2f5bfe80bf..c6ec0f2be8e3 100644
--- a/pkgs/desktops/xfce/applications/parole/default.nix
+++ b/pkgs/desktops/xfce/applications/parole/default.nix
@@ -18,14 +18,9 @@
 mkXfceDerivation {
   category = "apps";
   pname = "parole";
-  version = "4.18.1";
+  version = "4.18.2";
 
-  sha256 = "sha256-g+Wy90tHpCeylbU7aUa8578ehmuyWI5WlCK7YdJKlNQ=";
-
-  postPatch = ''
-    substituteInPlace src/plugins/mpris2/Makefile.am \
-      --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
-  '';
+  sha256 = "sha256-C4dGiMYn51YuASsQeQs3Cbc+KkPqcOrsCMS+dYfP+Ps=";
 
   buildInputs = with gst_all_1; [
     dbus

From 166b204de05501727137b8894962d1df19ad3876 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:29:53 +0000
Subject: [PATCH 0500/1504] xfce.ristretto: 0.13.2 -> 0.13.3

https://gitlab.xfce.org/apps/ristretto/-/compare/ristretto-0.13.2...ristretto-0.13.3
---
 pkgs/desktops/xfce/applications/ristretto/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
index 389fe02773be..bc13fa546489 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -16,10 +16,10 @@
 mkXfceDerivation {
   category = "apps";
   pname = "ristretto";
-  version = "0.13.2";
+  version = "0.13.3";
   odd-unstable = false;
 
-  sha256 = "sha256-FKgNKQ2l4FGvEvmppf+RTxMXU6TfsZVFBVii4zr4ASc=";
+  sha256 = "sha256-cJMHRN4Wl6Fm0yoVqe0h30ZUlE1+Hw1uEDBHfHXBbC0=";
 
   buildInputs = [
     glib
@@ -30,8 +30,6 @@ mkXfceDerivation {
     xfconf
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
   postInstall = ''
     # Pull in JXL and WebP support for ristretto.
     # In postInstall to run before gappsWrapperArgsHook.

From 3b5405bc79a8e0a3e397b9be299c1733119a1dce Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:30:43 +0000
Subject: [PATCH 0501/1504] xfce.xfce4-panel-profiles: 1.0.14 -> 1.0.15

https://gitlab.xfce.org/apps/xfce4-panel-profiles/-/compare/xfce4-panel-profiles-1.0.14...xfce4-panel-profiles-1.0.15
---
 .../xfce/applications/xfce4-panel-profiles/default.nix      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
index b11057c5b566..32203b7a5d28 100644
--- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitLab,
   gettext,
   gobject-introspection,
-  intltool,
   wrapGAppsHook3,
   glib,
   gtk3,
@@ -21,20 +20,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-panel-profiles";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchFromGitLab {
     domain = "gitlab.xfce.org";
     owner = "apps";
     repo = "xfce4-panel-profiles";
     rev = "xfce4-panel-profiles-${finalAttrs.version}";
-    sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8=";
+    sha256 = "sha256-UxXxj0lxJhaMv5cQoyz+glJiLwvIFfpPu27TCNDhoL0=";
   };
 
   nativeBuildInputs = [
     gettext
     gobject-introspection
-    intltool
     wrapGAppsHook3
   ];
 

From c475fbb48fda8d8acc5296e6a39f696d0ab03355 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:30:51 +0000
Subject: [PATCH 0502/1504] xfce.xfce4-taskmanager: 1.5.7 -> 1.5.8

https://gitlab.xfce.org/apps/xfce4-taskmanager/-/compare/xfce4-taskmanager-1.5.7...xfce4-taskmanager-1.5.8
---
 pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index f4f65792ea93..80637f141d62 100644
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
@@ -14,10 +14,10 @@
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-taskmanager";
-  version = "1.5.7";
+  version = "1.5.8";
   odd-unstable = false;
 
-  sha256 = "sha256-znadP7rrP/IxH22U1D9p6IHZ1J1JfXoCVk8iKUgrkJw=";
+  sha256 = "sha256-A2L41YdIpFnbAjQOp+/sJu1oUX9V7jxLsWY7b21frjY=";
 
   nativeBuildInputs = [
     exo

From 3e2f1e8a1f4c15553a117951c200933e97237dce Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:31:15 +0000
Subject: [PATCH 0503/1504] xfce.xfce4-terminal: 1.1.3 -> 1.1.4

https://gitlab.xfce.org/apps/xfce4-terminal/-/compare/xfce4-terminal-1.1.3...xfce4-terminal-1.1.4
---
 pkgs/desktops/xfce/applications/xfce4-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
index 3cab5bcf8ddc..0d6277a0d8e0 100644
--- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
@@ -18,10 +18,10 @@
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-terminal";
-  version = "1.1.3";
+  version = "1.1.4";
   odd-unstable = false;
 
-  sha256 = "sha256-CUIQf22Lmb6MNPd2wk8LlHFNUhdIoC1gzVV6RDP2PfY=";
+  sha256 = "sha256-WrmffY8kC9tBorvtEb8q6DmHKX5d7HnvbxtBbpy4LJs=";
 
   nativeBuildInputs = [
     libxslt

From 9dc6db70f879d2ee152e77d9a18f2c338b3ee5d4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 03:31:19 +0000
Subject: [PATCH 0504/1504] xfce.xfce4-volumed-pulse: 0.2.4 -> 0.2.5

https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/compare/xfce4-volumed-pulse-0.2.4...xfce4-volumed-pulse-0.2.5
---
 .../xfce/applications/xfce4-volumed-pulse/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
index 3195b0b33c76..c53994322916 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
@@ -11,9 +11,9 @@
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-volumed-pulse";
-  version = "0.2.4";
+  version = "0.2.5";
 
-  sha256 = "sha256-NDIJRjKV5aoM2sLhZ6WmoynOc4yz55KpuiTJDMLMA5Y=";
+  sha256 = "sha256-A7PM4zHL4hkhsZjYEPuEiujP1ofP7V/QVqDNgGoGIm8=";
 
   buildInputs = [
     gtk3

From 78e9387d2420e7354a3ba84002ebdb3b73110869 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 11:36:38 +0800
Subject: [PATCH 0505/1504] xfce.xfmpc: 0.3.1-2024-05-29 -> 0.3.2

https://gitlab.xfce.org/apps/xfmpc/-/compare/cf40dffec6e9b80abb1f1aa6d7dceef4790173dc...xfmpc-0.3.2
---
 pkgs/desktops/xfce/applications/xfmpc/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfmpc/default.nix b/pkgs/desktops/xfce/applications/xfmpc/default.nix
index 85088a61937e..03f7acb3e663 100644
--- a/pkgs/desktops/xfce/applications/xfmpc/default.nix
+++ b/pkgs/desktops/xfce/applications/xfmpc/default.nix
@@ -12,10 +12,8 @@
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfmpc";
-  # Last release is too old
-  version = "0.3.1-2024-05-29";
-  rev = "cf40dffec6e9b80abb1f1aa6d7dceef4790173dc";
-  sha256 = "sha256-moCWSLGBJuWM4/lRJi6D3w38iJeCntLo3Vl/eVfu7lw=";
+  version = "0.3.2";
+  sha256 = "sha256-V5YHvhcWv6IUPe8W1VtuPagj3uU3s+ikgu3ZnRF48O4=";
 
   nativeBuildInputs = [
     vala
@@ -33,7 +31,7 @@ mkXfceDerivation rec {
   meta = with lib; {
     description = "MPD client written in GTK";
     homepage = "https://docs.xfce.org/apps/xfmpc/start";
-    changelog = "https://gitlab.xfce.org/apps/xfmpc/-/blob/${rev}/NEWS";
+    changelog = "https://gitlab.xfce.org/apps/xfmpc/-/blob/xfmpc-${version}/NEWS";
     maintainers = with maintainers; [ doronbehar ] ++ teams.xfce.members;
     mainProgram = "xfmpc";
   };

From e97955fce64f04ed2db075399ba1c942c1112deb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 28 Dec 2024 14:34:11 +0100
Subject: [PATCH 0506/1504] threema-desktop: 2.5.3 -> 2.5.7

This fixes the build otherwise broken with nodejs 22 in the old version.

Alternative to #368813
---
 pkgs/by-name/th/threema-desktop/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix
index 8125a18a2ae7..1ed7fe3c9350 100644
--- a/pkgs/by-name/th/threema-desktop/package.nix
+++ b/pkgs/by-name/th/threema-desktop/package.nix
@@ -10,26 +10,26 @@
 }:
 
 let
-  version = "1.2.41";
+  version = "1.2.46";
   electronSrc = fetchFromGitHub {
     owner = "threema-ch";
     repo = "threema-web-electron";
     rev = "refs/tags/${version}";
-    hash = "sha256-gV64rNBwQxPpREi0NFzfCA7lSO65/h0CVRw2EcbFedM=";
+    hash = "sha256-Qv40l6TyYZL9WcRQeIYUgMFsJrr0XYC2nmtYBgQKXvY=";
   };
 
   threema-web = buildNpmPackage rec {
     pname = "threema-web";
-    version = "2.5.3";
+    version = "2.5.7";
 
     src = fetchFromGitHub {
       owner = "threema-ch";
       repo = "threema-web";
       rev = "refs/tags/v${version}";
-      hash = "sha256-RIYyDoEck+a0kPUzTpdNLdyd4+ZYGjjkAlkCp9/S7FY=";
+      hash = "sha256-WuPOOchFZtnLVoB+i4LKFkeSujYXpQN8RLrt9xG9/W0=";
     };
 
-    npmDepsHash = "sha256-OqiPpjIdLwBfxEmbI+YFmYGt3beMqXyGZc9FCwbng4U=";
+    npmDepsHash = "sha256-eJIVX2W0Fgk/OmkaN2cR+qFoHTOmu4RmluR3BEuPOAU=";
     npmBuildScript = "dist";
 
     nativeBuildInputs = [
@@ -54,7 +54,7 @@ let
     inherit version;
     src = electronSrc;
     sourceRoot = "${src.name}/app";
-    npmDepsHash = "sha256-AaUxnvrVCgKWCtMzeXexVBxs/NuVwWH67x4eBGAcsxk=";
+    npmDepsHash = "sha256-CRYcmly8S+waeCf2fRWM2o3IuBVdpk2gZ/djHhxLLTQ=";
     env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     dontNpmBuild = true;
     prePatch = ''
@@ -73,7 +73,7 @@ buildNpmPackage rec {
   inherit version;
   src = electronSrc;
 
-  npmDepsHash = "sha256-f/Oy9cHBc9k54MDSeilPcTJe0txOS2sqNt2UCUf5+M8=";
+  npmDepsHash = "sha256-OdxDAy9ybBUEFuQQtihEvUXCVtVtveksLlOBD8F1RP0=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

From aa103048c0bb17dbea901a0b4b767865e72d58c0 Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Sat, 28 Dec 2024 15:40:15 +0100
Subject: [PATCH 0507/1504] autofs: patch cryus_sals function pointer types

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

diff --git a/pkgs/by-name/au/autofs5/package.nix b/pkgs/by-name/au/autofs5/package.nix
index f570fcdb32f3..3b053f0d0165 100644
--- a/pkgs/by-name/au/autofs5/package.nix
+++ b/pkgs/by-name/au/autofs5/package.nix
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
       url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-crash-in-make_options_string.patch";
       hash = "sha256-YjTdJ50iNhJ2UjFdrKYEFNt04z0PfmElbFa4GuSskLA=";
     })
+    (fetchpatch {
+      url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-Fix-incompatible-function-pointer-types-in-cyrus-sasl-module.patch";
+      hash = "sha256-erLlqZtVmYqUOsk3S7S50yA0VB8Gzibsv+X50+gcA58=";
+    })
   ];
 
   preConfigure = ''

From f1673fdce8e4c3429ed0e49e91bcf8dc39942c3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 15:47:29 +0000
Subject: [PATCH 0508/1504] discord-development: 0.0.56 -> 0.0.60

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 11f0059d6ae5..2d0e4413d46a 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -12,7 +12,7 @@ let
         stable = "0.0.78";
         ptb = "0.0.124";
         canary = "0.0.549";
-        development = "0.0.56";
+        development = "0.0.60";
       }
     else
       {
@@ -38,7 +38,7 @@ let
       };
       development = fetchurl {
         url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-pxoFT1P/F/0Mhy5sECZlzIxrHK+/Y8Sy5BvgvNYRfM4=";
+        hash = "sha256-SL+lWMSXC1Y11Sk59sE7F8n04DED2365RKKeKFU8R6o=";
       };
     };
     x86_64-darwin = {

From c225f5e642c9590616d32c42e6642ee51be26463 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sat, 28 Dec 2024 20:00:21 +0300
Subject: [PATCH 0509/1504] angie: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix
index 5da1105e90db..ed23cecaf332 100644
--- a/pkgs/servers/http/angie/default.nix
+++ b/pkgs/servers/http/angie/default.nix
@@ -9,12 +9,12 @@
 }@args:
 
 callPackage ../nginx/generic.nix args rec {
-  version = "1.8.0";
+  version = "1.8.1";
   pname = if withQuic then "angieQuic" else "angie";
 
   src = fetchurl {
     url = "https://download.angie.software/files/angie-${version}.tar.gz";
-    hash = "sha256-UbAylZB0ukki5AZ7XUgSLIQHekT3h8IqLyy/c/mBGwE=";
+    hash = "sha256-2zC2kEXPmkDxRJEYFEFNnhtNQ3D2aT0Aj0AX3LQ3C0w=";
   };
 
   configureFlags =

From 25569750ccc0c692128e667a77585d6d27ff7e57 Mon Sep 17 00:00:00 2001
From: Daniel Coonce <1077480+coonce@users.noreply.github.com>
Date: Sat, 28 Dec 2024 09:58:06 -0600
Subject: [PATCH 0510/1504] jellyseerr: pin nodejs_20

---
 pkgs/by-name/je/jellyseerr/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix
index 10ced98b0050..58e6507f0513 100644
--- a/pkgs/by-name/je/jellyseerr/package.nix
+++ b/pkgs/by-name/je/jellyseerr/package.nix
@@ -4,12 +4,16 @@
   fetchFromGitHub,
   stdenv,
   makeWrapper,
-  nodejs,
+  nodejs_20,
   python3,
   sqlite,
   nix-update-script,
 }:
 
+let
+  nodejs = nodejs_20;
+  pnpm = pnpm_9.override { inherit nodejs; };
+in
 stdenv.mkDerivation rec {
   pname = "jellyseerr";
   version = "2.1.0";
@@ -21,7 +25,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-5kaeqhjUy9Lgx4/uFcGRlAo+ROEOdTWc2m49rq8R8Hs=";
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
     hash = "sha256-xu6DeaBArQmnqEnIgjc1DTZujQebSkjuai9tMHeQWCk=";
   };
@@ -32,7 +36,7 @@ stdenv.mkDerivation rec {
     python3
     nodejs
     makeWrapper
-    pnpm_9.configHook
+    pnpm.configHook
   ];
 
   preBuild = ''

From 9e3db9e5f923f07f9ec7341e6466686b05606e6e Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Fri, 27 Dec 2024 11:07:34 -0600
Subject: [PATCH 0511/1504] octave: Do not --enable-link-all-dependencies on
 Darwin

It seems like upstream Octave removed the requirement that Darwin
default to linking all of its dependencies[1]. Some packages (ltfat)
cannot link against Octave for some reason. Removing this optinal
configure flag fixes this issue.

[1] https://github.com/gnu-octave/octave/commit/d4479bd8aef35911e07851ef3aee89ef3954604b
---
 pkgs/development/interpreters/octave/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 9b0fb1eeeb9b..204b96fb0712 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
       "--with-lapack=lapack"
       (if use64BitIdx then "--enable-64" else "--disable-64")
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ]
     ++ lib.optionals enableReadline [ "--enable-readline" ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ]
     ++ lib.optionals enableQt [ "--with-qt=5" ];

From 4bc519f1a5c4ef398ffab76240b683c60cc73101 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Sat, 28 Dec 2024 15:19:14 -0600
Subject: [PATCH 0512/1504] ijq: fetch source from newly preferred primary
 repository host

Codeberg is now the preferred host for the ijq project leaving both
GitHub and Sourcehut as mirrors (for now).

See https://codeberg.org/gpanders/ijq/commit/b908e71d22c3b84396fc0a234224fca400a2d73d
---
 pkgs/by-name/ij/ijq/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ij/ijq/package.nix b/pkgs/by-name/ij/ijq/package.nix
index 7a4486a3c997..02ff350787d0 100644
--- a/pkgs/by-name/ij/ijq/package.nix
+++ b/pkgs/by-name/ij/ijq/package.nix
@@ -1,6 +1,6 @@
 {
   buildGoModule,
-  fetchFromSourcehut,
+  fetchFromGitea,
   lib,
   jq,
   installShellFiles,
@@ -13,8 +13,9 @@ buildGoModule rec {
   pname = "ijq";
   version = "1.1.2";
 
-  src = fetchFromSourcehut {
-    owner = "~gpanders";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "gpanders";
     repo = "ijq";
     rev = "v${version}";
     hash = "sha256-7vG9T+gC6HeSGwFDf3m7nM0hBz32n6ATiM30AKNC1Og=";
@@ -49,7 +50,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Interactive wrapper for jq";
     mainProgram = "ijq";
-    homepage = "https://git.sr.ht/~gpanders/ijq";
+    homepage = "https://codeberg.org/gpanders/ijq";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
       justinas

From e3e65b595b5286045e821a52d61245842a31d07e Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sat, 28 Dec 2024 22:21:16 +0100
Subject: [PATCH 0513/1504] rPackages.rtiktoken: fixed build

---
 pkgs/development/r-modules/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 47583da1f554..72637eb44fbc 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1169,6 +1169,14 @@ let
       postPatch = "patchShebangs configure";
     });
 
+   rtiktoken = old.rtiktoken.overrideAttrs (attrs: {
+      postPatch = "patchShebangs configure";
+      nativeBuildInputs = attrs.nativeBuildInputs ++ [
+        pkgs.cargo
+        pkgs.rustc
+      ];
+    });
+
     purrr = old.purrr.overrideAttrs (attrs: {
       patchPhase = "patchShebangs configure";
     });

From a2b3275ee15e2176d7ad792975274e2f9762068b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 22:46:06 +0000
Subject: [PATCH 0514/1504] atlantis: 0.30.0 -> 0.32.0

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

diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index 8ad81295734b..735d5871b6d0 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -6,20 +6,20 @@
 
 buildGoModule rec {
   pname = "atlantis";
-  version = "0.30.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
     rev = "v${version}";
-    hash = "sha256-hM4IycRE3/jiwFLqkU/jz9sPP9KTfeu8ouIJlqgPxmk=";
+    hash = "sha256-7D7msKDnHym3uiMJur2kCRf6MurwkMEKI+aYcwqOVX0=";
   };
   ldflags = [
     "-X=main.version=${version}"
     "-X=main.date=1970-01-01T00:00:00Z"
   ];
 
-  vendorHash = "sha256-uH+Q5NXBL1+LFa6tw3x2CE1B5QElqK9KuFeYQpCFAW0=";
+  vendorHash = "sha256-wPsEE6sR1GDD3Npdcf/JmeZc451+x9UBE8+DwXkj/qE=";
 
   subPackages = [ "." ];
 

From 5a3237d176fd8e063925b95564b43ac8fdbbdfd0 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 29 Dec 2024 00:16:13 +0100
Subject: [PATCH 0515/1504] rPackages.orthGS: fixed build

---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 47583da1f554..ec122cc4f3bc 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -907,6 +907,7 @@ let
     "margaret"
     "MSnID"
     "OmnipathR"
+    "orthGS"
     "precommit"
     "protGear"
     "PCRA"

From 5f3eb7e6d8dcd75b9731d91a7db744c851c37fa5 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 29 Dec 2024 00:51:12 +0100
Subject: [PATCH 0516/1504] megapixels: 1.8.2 -> 1.8.3

https://gitlab.com/megapixels-org/Megapixels/-/tags/1.8.3
---
 pkgs/by-name/me/megapixels/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix
index 1bb0de25e5f5..e64b018136c2 100644
--- a/pkgs/by-name/me/megapixels/package.nix
+++ b/pkgs/by-name/me/megapixels/package.nix
@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "megapixels";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitLab {
     owner = "megapixels-org";
     repo = "Megapixels";
     rev = finalAttrs.version;
-    hash = "sha256-odsOYrk//ZhodsumLpJjhPDcwF1gkE/no166u+IDxSY=";
+    hash = "sha256-ZXr0gmO72zKHwORn4p8zKuGcdICvb5+L/Q9d/ty8zwA=";
   };
 
   nativeBuildInputs = [

From f5e3bb7954391c7255ca9757b09dc7b71b485c2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 00:10:06 +0000
Subject: [PATCH 0517/1504] deck: 1.40.3 -> 1.42.1

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

diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index 567db1610467..29d1c94b8308 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "deck";
-  version = "1.40.3";
+  version = "1.42.1";
 
   src = fetchFromGitHub {
     owner = "Kong";
     repo = "deck";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n6WASCtDwBX4FASSWI17JpU7rDXIeSidPWhj/MB2tUs=";
+    hash = "sha256-+HXTBTE8oEvyEwzwJbM0snVV0sKcKFHFnHB1iJ+4LJc=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -27,7 +27,7 @@ buildGoModule rec {
   ];
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-csoSvu7uce1diB4EsQCRRt08mX+rJoxfZqAtaoo0x4M=";
+  vendorHash = "sha256-YFEiv+mbU8ZE9u1lL4cZUo+7sVSu9P1UEkuKyAGwlkg=";
 
   postInstall = ''
     installShellCompletion --cmd deck \

From 1a056e8bfe1db4d3045414dc6e732a96f6579d58 Mon Sep 17 00:00:00 2001
From: William G Underwood <42812654+WGUNDERWOOD@users.noreply.github.com>
Date: Sun, 29 Dec 2024 00:17:56 +0000
Subject: [PATCH 0518/1504] tex-fmt: 0.4.7 -> 0.5.1

---
 pkgs/by-name/te/tex-fmt/package.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix
index f1a44bfda5fc..8a48ffb6f6f3 100644
--- a/pkgs/by-name/te/tex-fmt/package.nix
+++ b/pkgs/by-name/te/tex-fmt/package.nix
@@ -2,24 +2,36 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tex-fmt";
-  version = "0.4.7";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "WGUNDERWOOD";
     repo = "tex-fmt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jVrd3yZ07+ppsdt+8sNKX1rdmU+UiRCyx80EMXdoK54=";
+    hash = "sha256-LeoV500tnvnvl869NXi4b4LpBvX1FclYJzYAcC0QVRo=";
   };
 
-  cargoHash = "sha256-XQ1oEF+axp8pC6OkLlab1qI7RJeAyeSb58oChgaaS1s=";
+  cargoHash = "sha256-jjBPGrdCJ3zk/kuIImEXkZTI5+492yekt5+iNyYhHGM=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage man/tex-fmt.1
+    installShellCompletion \
+      --bash completion/tex-fmt.bash \
+      --fish completion/tex-fmt.fish \
+      --zsh completion/_tex-fmt
+  '';
 
   meta = {
     description = "LaTeX formatter written in Rust";
     homepage = "https://github.com/WGUNDERWOOD/tex-fmt";
+    changelog = "https://github.com/WGUNDERWOOD/tex-fmt/releases/tag/v${version}";
     license = lib.licenses.mit;
     mainProgram = "tex-fmt";
     maintainers = with lib.maintainers; [ wgunderwood ];

From 091abbd4c2fabcd78e1e511036b7a54be21797fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 00:21:36 +0000
Subject: [PATCH 0519/1504] babashka-unwrapped: 1.12.195 -> 1.12.196

---
 pkgs/development/interpreters/babashka/clojure-tools.nix | 4 ++--
 pkgs/development/interpreters/babashka/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/development/interpreters/babashka/clojure-tools.nix
index 916748365ce5..adfdd5ffdfff 100644
--- a/pkgs/development/interpreters/babashka/clojure-tools.nix
+++ b/pkgs/development/interpreters/babashka/clojure-tools.nix
@@ -7,10 +7,10 @@
 }:
 clojure.overrideAttrs (previousAttrs: {
   pname = "babashka-clojure-tools";
-  version = "1.12.0.1479";
+  version = "1.12.0.1488";
 
   src = fetchurl {
     url = previousAttrs.src.url;
-    hash = "sha256-KlFcRXVd8e3zeP36+zgCUcdzbeLbFffb5V7XKV8NKWw=";
+    hash = "sha256-vBm+ABC+8EIcJv077HvDvKCMGSgo1ZoVGEVCLcRCB0I=";
   };
 })
diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
index 6b4bf1d04eb2..77cc9975ec10 100644
--- a/pkgs/development/interpreters/babashka/default.nix
+++ b/pkgs/development/interpreters/babashka/default.nix
@@ -9,11 +9,11 @@
 let
   babashka-unwrapped = buildGraalvmNativeImage rec {
     pname = "babashka-unwrapped";
-    version = "1.12.195";
+    version = "1.12.196";
 
     src = fetchurl {
       url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
-      sha256 = "sha256-1bZaWg1AtStF1uuoY8Z0V4s0fMSchSTR/pTSWdEzcuw=";
+      sha256 = "sha256-11HrLQi/BYX+LqqUAN3mZx13775dzXCDFxpJP33bKQY=";
     };
 
     graalvmDrv = graalvmPackages.graalvm-ce;

From a9803a28afd318ffe36b947a3a3761da072f87c5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 28 Dec 2024 20:52:30 -0500
Subject: [PATCH 0520/1504] python312Packages.transforms3d: 0.4.1 -> 0.4.2

Unbreaks the package due to added numpy 2.x support.
---
 .../python-modules/transforms3d/default.nix   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix
index 154badcbaa3a..4550649e6392 100644
--- a/pkgs/development/python-modules/transforms3d/default.nix
+++ b/pkgs/development/python-modules/transforms3d/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
+  versioneer,
   pytestCheckHook,
   numpy,
   scipy,
@@ -11,32 +13,39 @@
 
 buildPythonPackage rec {
   pname = "transforms3d";
-  version = "0.4.1";
-  format = "setuptools";
+  version = "0.4.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "matthew-brett";
     repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-GgnjvwAfyxnDfBGvgMFIPPbR88BWFiNGrScVORygq94=";
+    tag = version;
+    hash = "sha256-9wICu7zNYF54e6xcDpZxqctB4GVu5Knf79Z36016Rpw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [
     numpy
-    sympy
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     scipy
+    sympy
   ];
+
   pythonImportsCheck = [ "transforms3d" ];
 
   meta = with lib; {
     homepage = "https://matthew-brett.github.io/transforms3d";
     description = "Convert between various geometric transformations";
+    changelog = "https://github.com/matthew-brett/transforms3d/blob/main/Changelog";
     license = licenses.bsd2;
     maintainers = with maintainers; [ bcdarwin ];
   };

From 198b211e5b1f139cb63cfbd0143840fea67d9215 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 29 Dec 2024 03:41:58 +0100
Subject: [PATCH 0521/1504] alpaca: 2.9.0 -> 3.1.0

---
 pkgs/by-name/al/alpaca/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 7b8d12bbcca2..8071c0f789d9 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "2.9.0";
+  version = "3.1.0";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
-    rev = "refs/tags/${version}";
-    hash = "sha256-ionioPA69haDIyXjqU84nuTNtI32jOnhd6oCTRI6vcA=";
+    tag = version;
+    hash = "sha256-KPab5TU+Ra1o0FWpD5pkhtP7ylno903GQTqqWlir26s=";
   };
 
   nativeBuildInputs = [
@@ -49,10 +49,11 @@ python3Packages.buildPythonApplication rec {
     requests
     pillow
     pypdf
-    pytube
     html2text
     youtube-transcript-api
     pydbus
+    odfpy
+    pyicu
   ];
 
   dontWrapGApps = true;

From 56bcf2418dcdd26ae451ba254debe2eeffb450c1 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 29 Dec 2024 03:42:26 +0100
Subject: [PATCH 0522/1504] alpaca: add myself as maintainer

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

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 8071c0f789d9..eb2462d6c9b1 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -85,7 +85,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://jeffser.com/alpaca";
     license = lib.licenses.gpl3Plus;
     mainProgram = "alpaca";
-    maintainers = with lib.maintainers; [ aleksana ];
+    maintainers = with lib.maintainers; [
+      aleksana
+      Gliczy
+    ];
     platforms = lib.platforms.linux;
   };
 }

From 855d65cca9e5b0324b734c878846209a0da8b6a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 03:04:59 +0000
Subject: [PATCH 0523/1504] python312Packages.pymdown-extensions: 10.11.2 ->
 10.13

---
 .../python-modules/pymdown-extensions/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix
index 38774edd1971..0dfa35e4307c 100644
--- a/pkgs/development/python-modules/pymdown-extensions/default.nix
+++ b/pkgs/development/python-modules/pymdown-extensions/default.nix
@@ -45,14 +45,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pymdown-extensions";
-  version = "10.11.2";
+  version = "10.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facelessuser";
     repo = "pymdown-extensions";
-    rev = "refs/tags/${version}";
-    hash = "sha256-1AuN2kp7L6w8RvKky3IoX4ht9uQL6o2nm6dTDo/INC0=";
+    tag = version;
+    hash = "sha256-uReUfJaGRQ4gMel5szTZJ5fsgJxeeNCy2I7zPf+rvts=";
   };
 
   build-system = [ hatchling ];

From 4d4744639fa3f48b54d5ef22bb56a0efdfd6ca16 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 29 Dec 2024 04:51:48 +0100
Subject: [PATCH 0524/1504] simple64: 2024.11.1 -> 2024.12.1

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

diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix
index c430277fbfb5..a844560167bb 100644
--- a/pkgs/by-name/si/simple64/package.nix
+++ b/pkgs/by-name/si/simple64/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "simple64";
-  version = "2024.11.1";
+  version = "2024.12.1";
 
   src = fetchFromGitHub {
     owner = "simple64";
     repo = "simple64";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-wWBW+iYPY+5C3pvyyFYb4iIK8GlAyCbaAzr2Q5RL+n8=";
+    hash = "sha256-rvoUyvhpbibXbAreu6twTeeVRTCbhJiJuyKaJz0uT5k=";
   };
 
   patches = [

From 0ca77fdadf357739b53f4ccba52a80057a7cca52 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 29 Dec 2024 04:52:03 +0100
Subject: [PATCH 0525/1504] simple64-netplay-server: 2024.10.1 -> 2024.12.2

---
 pkgs/by-name/si/simple64-netplay-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix
index 079997fca19b..2e11c69e54a7 100644
--- a/pkgs/by-name/si/simple64-netplay-server/package.nix
+++ b/pkgs/by-name/si/simple64-netplay-server/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "simple64-netplay-server";
-  version = "2024.10.1";
+  version = "2024.12.2";
 
   src = fetchFromGitHub {
     owner = "simple64";
     repo = "simple64-netplay-server";
     rev = "refs/tags/v${version}";
-    hash = "sha256-p9hHVf1LD95w280ScUkxHKmBJLJ9eiH3WEYV+kaALgQ=";
+    hash = "sha256-B0elTjklyXGpBAoqPN1HHeC9FIXsggKNKiDVvl8xgeU=";
   };
 
-  vendorHash = "sha256-HeYA/nR0NuP/fPMJXGGuN2eP6vB4yj1yWFfFDyp34QE=";
+  vendorHash = "sha256-1gySXbp1N0lnWToVQU3N9zQxl9Z0e9ICCeAIKwSoxaY=";
 
   meta = {
     description = "Dedicated server for simple64 netplay";

From 0382b1ef9fba16f4006d6035d26adf43e0ca66df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 05:24:02 +0000
Subject: [PATCH 0526/1504] quarkus: 3.17.3 -> 3.17.5

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

diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index da50bae84d08..fff7e8a56536 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.17.3";
+  version = "3.17.5";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Nm0tu4YYjD1NH4n0qV1YZl7ZXfN5jccFV6EPn5mPu+8=";
+    hash = "sha256-EFSL1FDbpZ7uue+MHeeKp+2+Hp4Hi7lCOIBww4/k9yE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0c7cb01f2b21498a7b16110bdb6640ea0ebc6a75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 06:55:06 +0000
Subject: [PATCH 0527/1504] lms: 3.61.0 -> 3.62.1

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

diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index e15ae8944531..91a16490a424 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lms";
-  version = "3.61.0";
+  version = "3.62.1";
 
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
     rev = "v${version}";
-    hash = "sha256-q2LnJhIQYdjvVk+fQQ2tjoEw046DUR1o+RUG2bp/w3M=";
+    hash = "sha256-LzDEK17Gh/r3tXGRItQfOeTCD9yGcRzIYMBX77MuwAU=";
   };
 
   strictDeps = true;

From 36ed099418ee4c1b3657201ebb66fc7d6ee02a4a Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 29 Dec 2024 16:07:53 +0800
Subject: [PATCH 0528/1504] byzanz: fix build

---
 pkgs/by-name/by/byzanz/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/by/byzanz/package.nix b/pkgs/by-name/by/byzanz/package.nix
index 36e477751c88..c12ea0e7777c 100644
--- a/pkgs/by-name/by/byzanz/package.nix
+++ b/pkgs/by-name/by/byzanz/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
   env.NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [
     "-Wno-error=deprecated-declarations"
     "-Wno-error=incompatible-pointer-types"
+    "-Wno-error=discarded-qualifiers"
   ];
 
   nativeBuildInputs = [
@@ -61,11 +62,11 @@ stdenv.mkDerivation {
       wrapGAppsHook3
     ]);
 
-  meta = with lib; {
+  meta = {
     description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";
     homepage = "https://github.com/GNOME/byzanz";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
   };
 }

From 67c5a83f65f7c2bb2dc6b118242cee5506a6e6ed Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sun, 29 Dec 2024 09:13:43 +0100
Subject: [PATCH 0529/1504] python312Packages.openusd: fix build on darwin

Due to an update to Clang 19 the compiler got stricter
and will fail with

```
error: no member named '_Set' in 'SdfChildrenProxy<_View>'
```

Upstream has merged an fix, which this commit will pull

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/development/python-modules/openusd/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index c9e0213dce4e..959014e2513b 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -74,6 +74,19 @@ buildPythonPackage rec {
       url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1";
       hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI=";
     })
+    # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442
+    # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1
+    (fetchpatch {
+      name = "explicitly-adding-template-keyword.patch";
+      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/274cf7c6fe1c121d095acd38dd1a33214e0c8448.patch?full_index=1";
+      hash = "sha256-nlw7o2jVWV9f1Lzl32UXcRVXcWnfyMNv9Mp4SVgFvyw=";
+    })
+    # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 2
+    (fetchpatch {
+      name = "fix-removes-unused-path.patch";
+      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/5a6437e44269534bfde0c35cc2c7bdef087b70e8.patch?full_index=1";
+      hash = "sha256-X2v14U0pJjd4IMD8viXK2/onVFqUabJTXwDGRFKDZ+g=";
+    })
   ];
 
   env.OSL_LOCATION = "${osl}";

From 2d60a8c9f3be494e7af61727ecb8ec03984629d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 08:26:41 +0000
Subject: [PATCH 0530/1504] checkstyle: 10.20.2 -> 10.21.1

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

diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix
index 625d4a2c0701..c872896c4105 100644
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -1,12 +1,12 @@
 { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "10.20.2";
+  version = "10.21.1";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-PBm1fBCo4S8pQId19p3gIr7zEXJ5V1tYr0qHdOk0yL4=";
+    sha256 = "sha256-u8248qMMHRBxWk7VpFripdLQSbcAL3ApLtCQa6TyMJ4=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From c63c882c9544fd5aa5be27b92829852616d250ee Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Sun, 29 Dec 2024 03:40:16 +0700
Subject: [PATCH 0531/1504] ocamlPackages.raylib: init at 1.4.0 with
 ocamlPackages.patch init at 2.0.0

---
 .../ocaml-modules/patch/default.nix           | 37 +++++++++++++++++
 .../ocaml-modules/raylib/default.nix          | 40 +++++++++++++++++++
 .../ocaml-modules/raylib/raygui.nix           | 18 +++++++++
 pkgs/top-level/ocaml-packages.nix             |  6 +++
 4 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/patch/default.nix
 create mode 100644 pkgs/development/ocaml-modules/raylib/default.nix
 create mode 100644 pkgs/development/ocaml-modules/raylib/raygui.nix

diff --git a/pkgs/development/ocaml-modules/patch/default.nix b/pkgs/development/ocaml-modules/patch/default.nix
new file mode 100644
index 000000000000..623a79a692ef
--- /dev/null
+++ b/pkgs/development/ocaml-modules/patch/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  gitUpdater,
+  alcotest,
+  crowbar,
+}:
+
+buildDunePackage rec {
+  pname = "patch";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "hannesm";
+    repo = "patch";
+    tag = "v${version}";
+    hash = "sha256-xqcUZaKlbyXF2//MbCom7/pGA2ej6KHYI3rizXwoqTY=";
+  };
+
+  checkInputs = [
+    alcotest
+    crowbar
+  ];
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
+    description = "Patch library purely in OCaml";
+    longDescription = ''
+      This is a library which parses unified diff and git diff output, and can apply a patch in memory.
+    '';
+    homepage = "https://github.com/hannesm/patch";
+    maintainers = with lib.maintainers; [ r17x ];
+    license = lib.licenses.isc;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix
new file mode 100644
index 000000000000..b733001945dc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/raylib/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  dune-configurator,
+  ctypes,
+  integers,
+  patch,
+  gitUpdater,
+}:
+
+buildDunePackage rec {
+  pname = "raylib";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "tjammer";
+    repo = "raylib-ocaml";
+    tag = version;
+    hash = "sha256-Fh79YnmboQF5Kn3VF//JKLaIFKl8QJWVOqRexTzxF0U=";
+    # enable submodules for vendored raylib sources
+    fetchSubmodules = true;
+  };
+
+  propagatedBuildInputs = [
+    dune-configurator
+    ctypes
+    integers
+    patch
+  ];
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
+    description = "OCaml bindings for Raylib (5.0.0)";
+    homepage = "https://tjammer.github.io/raylib-ocaml";
+    maintainers = with lib.maintainers; [ r17x ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/raylib/raygui.nix b/pkgs/development/ocaml-modules/raylib/raygui.nix
new file mode 100644
index 000000000000..baa2003683dd
--- /dev/null
+++ b/pkgs/development/ocaml-modules/raylib/raygui.nix
@@ -0,0 +1,18 @@
+{
+  buildDunePackage,
+  raylib,
+}:
+
+buildDunePackage {
+  pname = "raygui";
+
+  inherit (raylib) src version;
+
+  propagatedBuildInputs = [
+    raylib
+  ];
+
+  meta = raylib.meta // {
+    description = "OCaml bindings for raygui";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b48159bcc67d..84d0d4032c01 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1489,6 +1489,8 @@ let
 
     parse-argv = callPackage ../development/ocaml-modules/parse-argv { };
 
+    patch = callPackage ../development/ocaml-modules/patch { };
+
     path_glob = callPackage ../development/ocaml-modules/path_glob { };
 
     pbkdf = callPackage ../development/ocaml-modules/pbkdf { };
@@ -1652,6 +1654,10 @@ let
 
     randomconv = callPackage ../development/ocaml-modules/randomconv { };
 
+    raylib = callPackage ../development/ocaml-modules/raylib { };
+
+    raygui = callPackage ../development/ocaml-modules/raylib/raygui.nix { };
+
     rdbg = callPackage ../development/ocaml-modules/rdbg { };
 
     re = callPackage ../development/ocaml-modules/re { };

From c3815f5de2139fb0f2bf3f3b5dd1a144e3443c96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 10:22:09 +0000
Subject: [PATCH 0532/1504] python312Packages.python-gitlab: 4.12.2 -> 5.3.0

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

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 6b9323e44e47..375624790411 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "python-gitlab";
-  version = "4.12.2";
+  version = "5.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_gitlab";
     inherit version;
-    hash = "sha256-jBQKJgOtjv9/yrbz+qv1/Iuquo3vEl6zCaMtaqOiOlY=";
+    hash = "sha256-GPEHZLasFK0MtSUu1mAlvf5ijOdHsau7z+dqgirGuuc=";
   };
 
   build-system = [ setuptools ];

From f6edfae3d7fc86b75f712a48aec7c24ac2e37771 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 29 Dec 2024 11:55:20 +0100
Subject: [PATCH 0533/1504] faircamp: 0.21.0 -> 1.0.0

Diff: https://codeberg.org/simonrepp/faircamp/compare/0.21.0...1.0.0
---
 pkgs/by-name/fa/faircamp/Cargo.lock  | 420 +++++++++++++--------------
 pkgs/by-name/fa/faircamp/package.nix |   6 +-
 2 files changed, 204 insertions(+), 222 deletions(-)

diff --git a/pkgs/by-name/fa/faircamp/Cargo.lock b/pkgs/by-name/fa/faircamp/Cargo.lock
index da90a4b5fd70..be03b759e5b0 100644
--- a/pkgs/by-name/fa/faircamp/Cargo.lock
+++ b/pkgs/by-name/fa/faircamp/Cargo.lock
@@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -205,7 +205,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -217,12 +217,6 @@ dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -358,15 +352,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -385,7 +379,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -394,6 +388,15 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "atomic-polyfill"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
+dependencies = [
+ "critical-section",
+]
+
 [[package]]
 name = "audiopus_sys"
 version = "0.2.2"
@@ -449,7 +452,7 @@ dependencies = [
  "addr2line",
  "cfg-if",
  "libc",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
  "windows-targets 0.52.6",
@@ -499,9 +502,9 @@ dependencies = [
 
 [[package]]
 name = "bitstream-io"
-version = "2.5.3"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
+checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
 
 [[package]]
 name = "block-buffer"
@@ -544,9 +547,9 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
+checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
 
 [[package]]
 name = "bumpalo"
@@ -556,9 +559,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 
 [[package]]
 name = "byteorder"
@@ -574,15 +577,15 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "bytestring"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72"
+checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f"
 dependencies = [
  "bytes",
 ]
@@ -610,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.28"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "jobserver",
  "libc",
@@ -643,9 +646,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -668,9 +671,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -678,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -697,14 +700,14 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "claxon"
@@ -745,9 +748,9 @@ dependencies = [
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "convert_case"
@@ -784,9 +787,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -815,6 +818,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -873,13 +882,13 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -892,7 +901,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -920,7 +929,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -931,17 +940,17 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "enolib"
-version = "0.4.2"
-source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.2#b97102e1890d91f184469f9c778d07df7d117adc"
+version = "0.5.0"
+source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.5.0#011a93092e5127c9354d643e9ac51ff592cf59f2"
 
 [[package]]
 name = "equivalent"
@@ -951,15 +960,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "exr"
-version = "1.72.0"
+version = "1.73.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
 dependencies = [
  "bit_field",
- "flume",
  "half",
  "lebe",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "rayon-core",
  "smallvec",
  "zune-inflate",
@@ -967,7 +975,7 @@ dependencies = [
 
 [[package]]
 name = "faircamp"
-version = "0.21.0"
+version = "1.0.0"
 dependencies = [
  "actix-files",
  "actix-web",
@@ -1018,18 +1026,18 @@ dependencies = [
 
 [[package]]
 name = "fdeflate"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
 
 [[package]]
 name = "fixed"
-version = "1.28.0"
+version = "1.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a"
+checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048"
 dependencies = [
  "az",
  "bytemuck",
@@ -1039,21 +1047,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
-]
-
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "spin",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1169,9 +1168,9 @@ dependencies = [
 
 [[package]]
 name = "hash32"
-version = "0.3.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
 dependencies = [
  "byteorder",
 ]
@@ -1187,17 +1186,20 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "heapless"
-version = "0.8.0"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
 dependencies = [
+ "atomic-polyfill",
  "hash32",
+ "rustc_version",
+ "spin",
  "stable_deref_trait",
 ]
 
@@ -1207,12 +1209,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1410,14 +1406,14 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "id3"
-version = "1.14.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9"
+checksum = "9d1df50e6c625115513974d5efc34c4bc55524145e14cb2297e909ab5ece0d49"
 dependencies = [
  "bitflags 2.6.0",
  "byteorder",
@@ -1480,24 +1476,24 @@ dependencies = [
 
 [[package]]
 name = "imgref"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "impl-more"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"
+checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0"
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1523,7 +1519,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1543,9 +1539,9 @@ dependencies = [
 
 [[package]]
 name = "iso_currency"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f402cc74ed2fec6f6fed285d45645a8c7c82e1d1fa694898864ef7c0cb047785"
+checksum = "21cb463eec852038d9685e2095fb8fae12661c5ab8f13462c2530233ec31ef78"
 dependencies = [
  "iso_country",
  "proc-macro2",
@@ -1563,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jni"
@@ -1578,7 +1574,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror 1.0.64",
+ "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
@@ -1606,10 +1602,11 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1644,19 +1641,18 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
 dependencies = [
  "arbitrary",
  "cc",
- "once_cell",
 ]
 
 [[package]]
@@ -1671,9 +1667,9 @@ dependencies = [
 
 [[package]]
 name = "litemap"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "local-channel"
@@ -1781,15 +1777,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -1802,11 +1789,10 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
  "log",
  "wasi",
@@ -1911,7 +1897,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2028,15 +2014,15 @@ checksum = "afbb993947f111397c2bc536944f8dac7f54a4e73383d478efe1990b56404b60"
 
 [[package]]
 name = "pacmog"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9aec65fa4371bb2526d0ecd63fc90294f7d0dc370a8645adeb32042af57e641"
+checksum = "1f24fb9dc847fa21adf6fe1cbf98239cd27ba02b80c1503a89672b3808b82f5a"
 dependencies = [
+ "anyhow",
  "arbitrary-int",
  "fixed",
  "heapless",
  "nom",
- "thiserror 2.0.3",
 ]
 
 [[package]]
@@ -2086,9 +2072,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2104,15 +2090,15 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
-version = "0.17.14"
+version = "0.17.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
+checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2132,30 +2118,30 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
 dependencies = [
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2260,7 +2246,7 @@ dependencies = [
  "rand_chacha",
  "simd_helpers",
  "system-deps",
- "thiserror 1.0.64",
+ "thiserror 1.0.69",
  "v_frame",
  "wasm-bindgen",
 ]
@@ -2311,9 +2297,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2323,9 +2309,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2419,29 +2405,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -2538,9 +2524,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2592,9 +2578,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2609,7 +2595,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2633,42 +2619,42 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.64",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.4",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2684,9 +2670,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2705,9 +2691,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2740,9 +2726,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.41.1"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2764,14 +2750,14 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2816,9 +2802,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -2827,16 +2813,16 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "translations"
-version = "0.0.0"
+version = "1.0.0"
 dependencies = [
  "base64",
  "indoc",
@@ -2850,24 +2836,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "url"
-version = "2.5.3"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2945,9 +2928,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2956,24 +2939,23 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2981,28 +2963,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3010,9 +2992,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923"
+checksum = "ea9fe1ebb156110ff855242c1101df158b822487e4957b0556d9ffce9db0f535"
 dependencies = [
  "block2",
  "core-foundation",
@@ -3221,9 +3203,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "yoke"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -3233,13 +3215,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -3261,27 +3243,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -3302,7 +3284,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3324,14 +3306,14 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zip"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352"
 dependencies = [
  "aes",
  "arbitrary",
@@ -3349,7 +3331,7 @@ dependencies = [
  "pbkdf2",
  "rand",
  "sha1",
- "thiserror 1.0.64",
+ "thiserror 2.0.4",
  "time",
  "zeroize",
  "zopfli",
diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix
index 81684a7c5f9e..a079515ef11b 100644
--- a/pkgs/by-name/fa/faircamp/package.nix
+++ b/pkgs/by-name/fa/faircamp/package.nix
@@ -17,20 +17,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "faircamp";
-  version = "0.21.0";
+  version = "1.0.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "simonrepp";
     repo = "faircamp";
     rev = version;
-    hash = "sha256-1awOzIvWUaqsmtg0XP4BNCRZP+d26JTjn+3Lcvo/WcI=";
+    hash = "sha256-Pdt3HjjM4lR6CW3T10eMCvZWV29rbspGKHV7yEUA2U0=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "enolib-0.4.2" = "sha256-FJuWKcwjoi/wKfTzxghobNWblhnKRdUvHOejhpCF7kY=";
+      "enolib-0.5.0" = "sha256-NauWYmn1bUAJrIKJ2JN2XjcLsQehE3cjAxBOQ+Nme70=";
     };
   };
 

From 992480bd6cb7014820dbd2780da357d97f265506 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 11:18:26 +0000
Subject: [PATCH 0534/1504] allegro5: 5.2.10.0 -> 5.2.10.1

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

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index a8f320029d62..c190aeaae5fc 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation rec {
   pname = "allegro";
-  version = "5.2.10.0";
+  version = "5.2.10.1";
 
   src = fetchFromGitHub {
     owner = "liballeg";
     repo = "allegro5";
     rev = version;
-    sha256 = "sha256-p01h1AX1vPlBm+ksnTMVQxEIz6q9s/f7R9twbR50YMs=";
+    sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo=";
   };
 
   nativeBuildInputs = [

From d59220576b1e618040d55775a7e3b6f76a406fe7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 29 Dec 2024 12:22:39 +0100
Subject: [PATCH 0535/1504] python312Packages.meshtastic: 2.5.6post1 -> 2.5.9

Diff: https://github.com/meshtastic/Meshtastic-python/compare/None...2.5.9

Changelog: https://github.com/meshtastic/python/releases/tag/2.5.9
---
 .../python-modules/meshtastic/default.nix     | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 6e6a91298036..6bb0c67f39a2 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -1,21 +1,23 @@
 {
   lib,
+  argcomplete,
   bleak,
   buildPythonPackage,
   dash-bootstrap-components,
+  dash,
   dotmap,
   fetchFromGitHub,
   hypothesis,
   packaging,
+  pandas-stubs,
+  pandas,
   parse,
-  pexpect,
   platformdirs,
   poetry-core,
   ppk2-api,
   print-color,
   protobuf,
   pyarrow,
-  pyparsing,
   pypubsub,
   pyqrcode,
   pyserial,
@@ -27,22 +29,21 @@
   riden,
   setuptools,
   tabulate,
-  timeago,
-  webencodings,
+  wcwidth,
 }:
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.6post1";
+  version = "2.5.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     tag = version;
-    hash = "sha256-mt+6fPUAxyw3JFG9WyLdNbP00NJbDTeQc84EbccMt9I=";
+    hash = "sha256-q5hGAe3kJk1E/u2l8uCMyHHVuQmlwODkyZDiqxFn3Bo=";
   };
 
   pythonRelaxDeps = [
@@ -54,36 +55,43 @@ buildPythonPackage rec {
 
   dependencies = [
     bleak
-    dotmap
     packaging
-    parse
-    pexpect
-    platformdirs
-    ppk2-api
-    print-color
     protobuf
-    pyarrow
-    pyparsing
     pypubsub
-    pyqrcode
     pyserial
     pyyaml
     requests
     setuptools
     tabulate
-    timeago
-    webencodings
   ];
 
   optional-dependencies = {
+    analysis = [
+      dash
+      dash-bootstrap-components
+      pandas
+      pandas-stubs
+    ];
+    cli = [
+      argcomplete
+      dotmap
+      print-color
+      pyqrcode
+      wcwidth
+    ];
+    powermon = [
+      parse
+      platformdirs
+      ppk2-api
+      pyarrow
+      riden
+    ];
     tunnel = [ pytap2 ];
   };
 
   nativeCheckInputs = [
-    dash-bootstrap-components
     hypothesis
     pytestCheckHook
-    riden
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
@@ -117,7 +125,7 @@ buildPythonPackage rec {
     description = "Python API for talking to Meshtastic devices";
     homepage = "https://github.com/meshtastic/Meshtastic-python";
     changelog = "https://github.com/meshtastic/python/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

From 913c5d2636eb4865e48ddad749c1b4b77a7b96dc Mon Sep 17 00:00:00 2001
From: Deadbeef <ent3rm4n@gmail.com>
Date: Sun, 29 Dec 2024 19:34:39 +0800
Subject: [PATCH 0536/1504] cnijfilter2: add patch to fix missing import

---
 pkgs/by-name/cn/cnijfilter2/package.nix              |  1 +
 .../cn/cnijfilter2/patches/add_missing_import.patch  | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch

diff --git a/pkgs/by-name/cn/cnijfilter2/package.nix b/pkgs/by-name/cn/cnijfilter2/package.nix
index c040987773cd..b3a2e4f8afa6 100644
--- a/pkgs/by-name/cn/cnijfilter2/package.nix
+++ b/pkgs/by-name/cn/cnijfilter2/package.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
 
   patches = [
     ./patches/get_protocol.patch
+    ./patches/add_missing_import.patch
   ];
 
   # lgmon3's --enable-libdir flag is used soley for specifying in which
diff --git a/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch b/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch
new file mode 100644
index 000000000000..298416e27706
--- /dev/null
+++ b/pkgs/by-name/cn/cnijfilter2/patches/add_missing_import.patch
@@ -0,0 +1,12 @@
+diff --git a/lgmon3/src/keytext.c b/lgmon3/src/keytext.c
+index 8c15ff8..b80bbe5 100644
+--- a/lgmon3/src/keytext.c
++++ b/lgmon3/src/keytext.c
+@@ -37,6 +37,7 @@
+ #include <unistd.h>
+ #include <libxml/parser.h>	/* Ver.2.80 */
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "keytext.h"
+ 

From 141e773ab8e0ee707db1abdc5c26d91cd0dd35bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 12:42:23 +0000
Subject: [PATCH 0537/1504] moon: 1.30.5 -> 1.30.6

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

diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index c1f066ea60e4..6476251a4ca1 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "moon";
-  version = "1.30.5";
+  version = "1.30.6";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yH/NK5i0RL71TPgPkpLJuqx7YBdFVVGTEc5Hb1uBcak=";
+    hash = "sha256-rucRenc/mHFkl4pqXdf0b7enGqTRxuJkP+TjDzAX3ww=";
   };
 
-  cargoHash = "sha256-wQ7JFccDCE7riMTsqlYI2CHMHEZVuRLgB5EwvNV4QsM=";
+  cargoHash = "sha256-zOGMci7G6TaZnmlc1FgrB571LDykY21h60HbE8/ffhE=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";

From 2cd1ea0fa23a1cd8149fb1738348a260721922ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 12:56:36 +0000
Subject: [PATCH 0538/1504] kmetronome: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix
index a7de91b61e5e..bcb5914bebf3 100644
--- a/pkgs/applications/audio/kmetronome/default.nix
+++ b/pkgs/applications/audio/kmetronome/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kmetronome";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-51uFAPR0xsY3z9rFc8SdSGu4ae/VzUmC1qC8RGdt48Y=";
+    hash = "sha256-FJVmSMu0KDoq8DHRxxGyHQQflPCvH1h+WdsV9wcPAPA=";
   };
 
   nativeBuildInputs = [

From b779916dbc061d9943e7b308f58c1b3a44ad9b92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 13:31:33 +0000
Subject: [PATCH 0539/1504] grpc_cli: 1.68.2 -> 1.69.0

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

diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix
index 61738a5d3a5f..9682fadc552d 100644
--- a/pkgs/by-name/gr/grpc_cli/package.nix
+++ b/pkgs/by-name/gr/grpc_cli/package.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation rec {
   pname = "grpc_cli";
-  version = "1.68.2";
+  version = "1.69.0";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    hash = "sha256-GxD/1qoLIjQzgYyNuK4zLvBZtOcV+w+KamnUS2qcesw=";
+    hash = "sha256-rRiPUcr6of/sjqB+qr7eOkKVFGTnu8UjluULmcn8df4=";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [

From e1b6c3f112f72337c7bd51d091702b02d0e5dce9 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:02:05 +0800
Subject: [PATCH 0540/1504] python3Packages.pyopengl-accelerate: fix build with
 numpy 2 and gcc 14

---
 .../python-modules/pyopengl-accelerate/default.nix     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
index f32d555d7589..c138af55ea6a 100644
--- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix
+++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix
@@ -19,6 +19,11 @@ buildPythonPackage rec {
     hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA=";
   };
 
+  postPatch = ''
+    substituteInPlace src/numpy_formathandler.pyx \
+      --replace-fail 'Py_intptr_t' 'npy_intp'
+  '';
+
   nativeBuildInputs = [
     cython
     numpy
@@ -26,6 +31,11 @@ buildPythonPackage rec {
     wheel
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=int-conversion"
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
   meta = {
     description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x";
     homepage = "https://pyopengl.sourceforge.net/";

From 2f7b0a4969b8c9efe456c8f9477e2f748f6e7b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 13:55:01 +0000
Subject: [PATCH 0541/1504] seer: 2.4 -> 2.5

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

diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix
index a36609835a07..7b959c4fa102 100644
--- a/pkgs/development/tools/misc/seer/default.nix
+++ b/pkgs/development/tools/misc/seer/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seer";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "epasveer";
     repo = "seer";
     rev = "v${version}";
-    sha256 = "sha256-ZvoRC34496fUldL3jOdxcO/TVmfPNmmr2GkJG4gJXzk=";
+    sha256 = "sha256-+3yghoK8fAM6UFomv1Ga05kxwsLcoL2CpuIDXkFfWHc=";
   };
 
   preConfigure = ''

From 95cafc46cc55a84fe3f7b02f45591fd74eea6634 Mon Sep 17 00:00:00 2001
From: Korrat <korrat@protonmail.com>
Date: Sun, 29 Dec 2024 09:58:10 +0100
Subject: [PATCH 0542/1504] ardour: switch to librdf_raptor2

Since both lrdf and librdf_rasqal propagate librdf_raptor2, this patch
removes the direct dependency.
---
 pkgs/applications/audio/ardour/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index b81b3a1283d3..f923356b5604 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -29,7 +29,6 @@
 , libltc
 , libogg
 , libpulseaudio
-, librdf_raptor
 , librdf_rasqal
 , libsamplerate
 , libsigcxx
@@ -133,7 +132,6 @@ stdenv.mkDerivation rec {
     libltc
     libogg
     libpulseaudio
-    librdf_raptor
     librdf_rasqal
     libsamplerate
     libsigcxx

From 876c262b74e38b85d3609942221bb018bcec3935 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:36:17 +0200
Subject: [PATCH 0543/1504] swiftlint: 0.57.0 -> 0.57.1

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

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 7ea7c372a069..2bebed9b3f87 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "swiftlint";
-  version = "0.57.0";
+  version = "0.57.1";
 
   src = fetchurl {
     url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip";
-    hash = "sha256-m1+5hPze016ryyoQrs8CCbcLjWY3ONMn4Zgh6sReuBA=";
+    hash = "sha256-qi4Pj4JyVF5Vk+vt14cttREy/OxOrXbQAbvhevaceuU=";
   };
 
   dontPatch = true;

From 9fb5922b8f5d56ba4ee0baa7bf7ed61af37f6b29 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:36:17 +0200
Subject: [PATCH 0544/1504] swiftlint: add `versionCheckHook`

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

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 2bebed9b3f87..6d755ac864a7 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   unzip,
   nix-update-script,
+  versionCheckHook,
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "swiftlint";
@@ -28,6 +29,9 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

From 4f96192d63be78a26a7e4728070078652a782825 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:36:17 +0200
Subject: [PATCH 0545/1504] swiftlint: remove `with lib;`

---
 pkgs/by-name/sw/swiftlint/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 6d755ac864a7..cf2d6dcc76ef 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -34,13 +34,16 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "A tool to enforce Swift style and conventions";
     homepage = "https://realm.github.io/SwiftLint/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "swiftlint";
-    maintainers = with maintainers; [ matteopacini ];
-    platforms = platforms.darwin;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [
+      matteopacini
+      DimitarNestorov
+    ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
 }

From 36836da3efb42aabe836d7dadf9b2f903fab88a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 15:47:19 +0000
Subject: [PATCH 0546/1504] pyenv: 2.4.23 -> 2.5.0

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

diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 1389fe87c783..86fac71de875 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.4.23";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4IqHJpnGQKo/1U/Zkzg0mzm4xFbDC28F9ixgw+C0hAc=";
+    hash = "sha256-2khf1yGq+SXyOC7NAcjfzvscGg9Kay/8fMM7b0WMh8A=";
   };
 
   nativeBuildInputs = [

From 9e85f4b4a99b81712225f4fe4a055a34f28cfba6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 15:49:18 +0000
Subject: [PATCH 0547/1504] python312Packages.githubkit: 0.12.1 -> 0.12.3

---
 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 1937656cba93..7cf3361a6604 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.12.1";
+  version = "0.12.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     tag = "v${version}";
-    hash = "sha256-ewPCALnkGDhzxn3P9GO5QUaFZDhqsbQNeCmyTCXd7kE=";
+    hash = "sha256-sI24tSvwbh+zPTPVjkNlBg7TM6D5qMxfeF4pfj+6Q+E=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From 1c93585769c04402a1e8ec7a86e9bbfb560ab53b Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:11:28 +0200
Subject: [PATCH 0548/1504] betterdisplay: init at 3.2.1

---
 pkgs/by-name/be/betterdisplay/package.nix | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/be/betterdisplay/package.nix

diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix
new file mode 100644
index 000000000000..cd8b19725270
--- /dev/null
+++ b/pkgs/by-name/be/betterdisplay/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  undmg,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "betterdisplay";
+  version = "3.2.1";
+
+  src = fetchurl {
+    url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg";
+    hash = "sha256-UQLVRCeUznTqT6qDR6sZRZ5xMVgs0Th2iRRpnF0pqVI=";
+  };
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  buildInputs = [ undmg ];
+
+  sourceRoot = ".";
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    mv BetterDisplay.app $out/Applications
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more";
+    homepage = "https://betterdisplay.pro/";
+    changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}";
+    license = [ lib.licenses.unfree ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ DimitarNestorov ];
+    platforms = lib.platforms.darwin;
+  };
+})

From 3ff50a219b1a218a1bbaf601ffde2a5c53bf6db3 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 29 Dec 2024 21:55:11 +0530
Subject: [PATCH 0549/1504] actions/no-channel-pr: re run when base branch is
 updated

Additionally, no permissions are needed so set it to an empty set
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 .github/workflows/no-channel.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml
index 90c38f22c007..623a011c6e73 100644
--- a/.github/workflows/no-channel.yml
+++ b/.github/workflows/no-channel.yml
@@ -1,18 +1,17 @@
 name: "No channel PR"
 
 on:
-  pull_request:
+  pull_request_target:
+    # Re-run should be triggered when the base branch is updated, instead of silently failing
+    types: [opened, synchronize, reopened, edited]
     branches:
       - 'nixos-**'
       - 'nixpkgs-**'
 
-permissions:
-  contents: read
+permissions: {}
 
 jobs:
   fail:
-    permissions:
-      contents: none
     name: "This PR is is targeting a channel branch"
     runs-on: ubuntu-latest
     steps:

From c84d5ff719e52ac4a5efa4880143b685ea4f65a0 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m@matteopacini.me>
Date: Sun, 29 Dec 2024 18:12:52 +0000
Subject: [PATCH 0550/1504] pcsx2-bin: 2.3.10 -> 2.3.82

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

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index 11d008c559f2..220c2b162148 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pcsx2-bin";
-  version = "2.3.10";
+  version = "2.3.82";
 
   src = fetchurl {
     url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
-    hash = "sha256-szQgGIBH+h/mH18zY3RQGiyhoYwQ07+rq/zX3uNfgME=";
+    hash = "sha256-Jcp6qXnEAtX5KYf4TkRD+FmZimh2G8B72lTligLPRfI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e14050d0c94dc929543f7e4502fda8539d36536f Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Sun, 15 Dec 2024 17:24:14 +0100
Subject: [PATCH 0551/1504] radicale: 3.3.1 -> 3.3.3

Changelog: https://github.com/Kozea/Radicale/blob/refs/tags/v3.3.2/CHANGELOG.md
Changelog: https://github.com/Kozea/Radicale/blob/refs/tags/v3.3.3/CHANGELOG.md
---
 pkgs/by-name/ra/radicale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index cba1ab45c9a4..d06626f0d3e3 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.3.1";
+  version = "3.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vHg5faXx7ILiI3tpQ38yxF96DzS7EZCSRHfIW9QbI9Q=";
+    hash = "sha256-KRVByUXiTx5sX7LDgtOlVky8UH5HThaaldvOpeeHd7k=";
   };
 
   build-system = with python3.pkgs; [

From d579fa9b61ae4f9abade65409086d55f9fdc5889 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 29 Dec 2024 19:46:46 +0100
Subject: [PATCH 0552/1504] python312Packages.dash: 2.18.1 -> 2.18.2, relax
 deps to fix build

---
 pkgs/development/python-modules/dash/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index d514c8b454e7..2710e90cccd1 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "2.18.1";
+  version = "2.18.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "dash";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2LwM1lrJNdekoDN+wDHgaSlGOnpK618r65UHj7cP59E=";
+    hash = "sha256-qbvsYlf3byaT/4b+/BDvCgnaBKthL/J79y0CWh5Yid4=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +53,7 @@ buildPythonPackage rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock";
-    hash = "sha256-L/or8jO6uEypI5krwy/ElIxa6jJrXGsCRZ9mh+0kcGA=";
+    hash = "sha256-Nvm9BS55q/HW9ArpHD01F5Rmx8PLS3yqaz1yDK8Sg68=";
   };
 
   # as of writing this yarnConfigHook has no parameter that changes in which directory it will be run
@@ -88,6 +88,11 @@ buildPythonPackage rec {
     nest-asyncio
   ];
 
+  pythonRelaxDeps = [
+    "werkzeug"
+    "flask"
+  ];
+
   optional-dependencies = {
     celery = [
       celery

From ccae0fb542f198a04333f842d677956a5eb1ff44 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Sun, 29 Dec 2024 21:36:40 +0100
Subject: [PATCH 0553/1504] rPackages.pingr: fixed build

---
 pkgs/development/r-modules/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c121eed1ba15..9c6c7b32f75d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1166,6 +1166,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    pingr = old.pingr.overrideAttrs (_: {
+      postPatch = "patchShebangs configure";
+    });
+
     heck = old.heck.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });

From 79b1e564ee00247c4ab365f0e71f6898ba07e956 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 00:31:11 +0000
Subject: [PATCH 0554/1504] btrfs-list: 2.3 -> 2.4

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

diff --git a/pkgs/by-name/bt/btrfs-list/package.nix b/pkgs/by-name/bt/btrfs-list/package.nix
index cbe4f01a4423..597f326df58e 100644
--- a/pkgs/by-name/bt/btrfs-list/package.nix
+++ b/pkgs/by-name/bt/btrfs-list/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "btrfs-list";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "btrfs-list";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cWzDRop0cyrjVIJzuZxTqELgec66GiPAUJY1xIBr3OY=";
+    hash = "sha256-K6/xFR4Qmr6ynH5rZfOTN8nkl99iqcJPmKPwtp9FYyc=";
   };
 
   buildInputs = [ perl ];

From ce5d7b0f1416dd4e0fc1a991cbd7f30fbd468fe1 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Wed, 4 Dec 2024 09:45:32 +0900
Subject: [PATCH 0555/1504] static-web-server: 2.33.1 -> 2.34.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/st/static-web-server/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index d612eb51c97e..083a61cf39ea 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -2,7 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  fetchpatch,
   stdenv,
   darwin,
   nixosTests,
@@ -10,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.33.1";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-2vkRLQ4FKw/gkv4GuwFVcL8oDV4cNuKualQVc/X2B/Y=";
+    hash = "sha256-rHY1UVLAojGEbVdTRNshvcvxI4pYaU2nRUkmYWSTvvw=";
   };
 
-  cargoHash = "sha256-wRDYzm6mYze9CX+Ug53M3wuf3Ry6l3NGTDyCL7rbdc8=";
+  cargoHash = "sha256-lT+rwKXqFnFIxjD9DQQf1GY9pqrkUIT7PEsH4i8DM+g=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From d9c5f0c38bbb669770ea089b3c29c172b5b56549 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Mon, 30 Dec 2024 11:03:41 +0900
Subject: [PATCH 0556/1504] static-web-server: add misilelab to maintainers

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/st/static-web-server/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 083a61cf39ea..32e0cb296c6e 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -44,7 +44,10 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with maintainers; [
+      figsoda
+      misilelab
+    ];
     mainProgram = "static-web-server";
   };
 }

From 322fb91a1c68004e9826e8c98ebb4a406cc12a41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 02:57:06 +0000
Subject: [PATCH 0557/1504] llama-cpp: 4367 -> 4397

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 74369e968aa8..1f500426aa36 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "4367";
+  version = "4397";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     rev = "refs/tags/b${finalAttrs.version}";
-    hash = "sha256-N7uNIb6bkTsTx/kgbnc7mahYUIeV1ks4piwwgoXauRM=";
+    hash = "sha256-zPWx8gdai8OfoBCr2X2oJYg45ipLselYZMrL+MbQ1AY=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 6047878f5b8726984d263a85f7d91af484211efd Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Sun, 8 Dec 2024 17:43:32 -0800
Subject: [PATCH 0558/1504] maintainers: add Jaculabilis

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe22dbee1134..5f1d9063e13c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10110,6 +10110,12 @@
     githubId = 45084216;
     keys = [ { fingerprint = "1BF9 8D10 E0D0 0B41 5723  5836 4C13 3A84 E646 9228"; } ];
   };
+  jaculabilis = {
+    name = "Tim Van Baak";
+    email = "tim.vanbaak@gmail.com";
+    github = "Jaculabilis";
+    githubId = 10787844;
+  };
   jaduff = {
     email = "jdduffpublic@proton.me";
     github = "jaduff";

From 6a64387ced615dc99d761f2e728394995eda5046 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Sun, 8 Dec 2024 17:44:09 -0800
Subject: [PATCH 0559/1504] immich-public-proxy: init at 1.5.4

---
 .../im/immich-public-proxy/package.nix        | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/im/immich-public-proxy/package.nix

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
new file mode 100644
index 000000000000..1ac698179c4b
--- /dev/null
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+  nodejs,
+}:
+buildNpmPackage rec {
+  pname = "immich-public-proxy";
+  version = "1.5.4";
+  src = fetchFromGitHub {
+    owner = "alangrainger";
+    repo = "immich-public-proxy";
+    rev = "v${version}";
+    hash = "sha256-GoAUR8s2tRHpXD/yk42u6DDvkI97XAUlF9Zsq8pb/1M=";
+  };
+
+  sourceRoot = "${src.name}/app";
+
+  npmDepsHash = "sha256-BN7g+31ijH8r9rsv5zzjnE8PT7ozAswoyZNJ0XqXGyw=";
+
+  # patch in absolute nix store paths so the process doesn't need to cwd in $out
+  postPatch = ''
+    substituteInPlace src/index.ts --replace-fail \
+      "const app = express()" \
+      "const app = express()
+    // Set the views path to the nix output
+    app.set('views', '$out/lib/node_modules/immich-public-proxy/views')" \
+    --replace-fail \
+      "static('public'" \
+      "static('$out/lib/node_modules/immich-public-proxy/public'"
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Share your Immich photos and albums in a safe way without exposing your Immich instance to the public";
+    homepage = "https://github.com/alangrainger/immich-public-proxy";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ jaculabilis ];
+    inherit (nodejs.meta) platforms;
+    mainProgram = "immich-public-proxy";
+  };
+}

From 62780717634cef75a7435dcf25c4d14afe4e6c1d Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Fri, 29 Nov 2024 11:26:07 -0800
Subject: [PATCH 0560/1504] nixos/immich-public-proxy: init module

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/web-apps/immich-public-proxy.nix |  98 ++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/web-apps/immich-public-proxy.nix  | 105 ++++++++++++++++++
 .../im/immich-public-proxy/package.nix        |   4 +
 6 files changed, 211 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/immich-public-proxy.nix
 create mode 100644 nixos/tests/web-apps/immich-public-proxy.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index f974d5836b17..20229a34bdeb 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 @@
 
 - [Actual Budget](https://actualbudget.org/), a local-first personal finance app. Available as [services.actual](#opt-services.actual.enable).
 
+- [immich-public-proxy](https://github.com/alangrainger/immich-public-proxy), a proxy for sharing Immich albums without exposing the Immich API. Available as [services.immich-public-proxy](#opt-services.immich-public-proxy.enable).
+
 - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
 
 - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b91d90994fea..7de85e13c615 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1484,6 +1484,7 @@
   ./services/web-apps/icingaweb2/module-monitoring.nix
   ./services/web-apps/ifm.nix
   ./services/web-apps/immich.nix
+  ./services/web-apps/immich-public-proxy.nix
   ./services/web-apps/invidious.nix
   ./services/web-apps/invoiceplane.nix
   ./services/web-apps/isso.nix
diff --git a/nixos/modules/services/web-apps/immich-public-proxy.nix b/nixos/modules/services/web-apps/immich-public-proxy.nix
new file mode 100644
index 000000000000..85238e1cbacf
--- /dev/null
+++ b/nixos/modules/services/web-apps/immich-public-proxy.nix
@@ -0,0 +1,98 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.immich-public-proxy;
+  format = pkgs.formats.json { };
+  inherit (lib)
+    types
+    mkIf
+    mkOption
+    mkEnableOption
+    ;
+in
+{
+  options.services.immich-public-proxy = {
+    enable = mkEnableOption "Immich Public Proxy";
+    package = lib.mkPackageOption pkgs "immich-public-proxy" { };
+
+    immichUrl = mkOption {
+      type = types.str;
+      description = "URL of the Immich instance";
+    };
+
+    port = mkOption {
+      type = types.port;
+      default = 3000;
+      description = "The port that IPP will listen on.";
+    };
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Whether to open the IPP port in the firewall";
+    };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType = format.type;
+      };
+      default = { };
+      description = ''
+        Configuration for IPP. See <https://github.com/alangrainger/immich-public-proxy/blob/main/README.md#additional-configuration> for options and defaults.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.immich-public-proxy = {
+      description = "Immich public proxy for sharing albums publicly without exposing your Immich instance";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        IMMICH_URL = cfg.immichUrl;
+        IPP_PORT = builtins.toString cfg.port;
+        IPP_CONFIG = "${format.generate "config.json" cfg.settings}";
+      };
+      serviceConfig = {
+        ExecStart = lib.getExe cfg.package;
+        SyslogIdentifier = "ipp";
+        User = "ipp";
+        Group = "ipp";
+        DynamicUser = true;
+        Type = "simple";
+        Restart = "on-failure";
+        RestartSec = 3;
+
+        # Hardening
+        CapabilityBoundingSet = "";
+        NoNewPrivileges = true;
+        PrivateUsers = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_UNIX"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+
+    meta.maintainers = with lib.maintainers; [ jaculabilis ];
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2952c67d19c2..c89c8b6b541a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -467,6 +467,7 @@ in {
   ifm = handleTest ./ifm.nix {};
   iftop = handleTest ./iftop.nix {};
   immich = handleTest ./web-apps/immich.nix {};
+  immich-public-proxy = handleTest ./web-apps/immich-public-proxy.nix {};
   incron = handleTest ./incron.nix {};
   incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; inherit system pkgs; });
   incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
diff --git a/nixos/tests/web-apps/immich-public-proxy.nix b/nixos/tests/web-apps/immich-public-proxy.nix
new file mode 100644
index 000000000000..5f2034b29442
--- /dev/null
+++ b/nixos/tests/web-apps/immich-public-proxy.nix
@@ -0,0 +1,105 @@
+import ../make-test-python.nix (
+  { pkgs, lib, ... }:
+  {
+    name = "immich-public-proxy";
+
+    nodes.machine =
+      { pkgs, ... }@args:
+      {
+        environment.systemPackages = [
+          pkgs.imagemagick
+          pkgs.immich-cli
+        ];
+        services.immich = {
+          enable = true;
+          port = 2283;
+          # disable a lot of features that aren't needed for this test
+          machine-learning.enable = false;
+          settings = {
+            backup.database.enabled = false;
+            machineLearning.enabled = false;
+            map.enabled = false;
+            reverseGeocoding.enabled = false;
+            metadata.faces.import = false;
+            newVersionCheck.enabled = false;
+            notifications.smtp.enabled = false;
+          };
+        };
+        services.immich-public-proxy = {
+          enable = true;
+          immichUrl = "http://localhost:2283";
+          port = 8002;
+          settings.ipp.responseHeaders."X-NixOS" = "Rules";
+        };
+      };
+
+    testScript = ''
+      import json
+
+      machine.wait_for_unit("immich-server.service")
+      machine.wait_for_unit("immich-public-proxy.service")
+      machine.wait_for_open_port(2283)
+      machine.wait_for_open_port(8002)
+
+      # The proxy should be up
+      machine.succeed("curl -sf http://localhost:8002")
+
+      # Verify the static assets are served
+      machine.succeed("curl -sf http://localhost:8002/robots.txt")
+      machine.succeed("curl -sf http://localhost:8002/share/static/style.css")
+
+      # Check that the response header in the settings is sent
+      res = machine.succeed("""
+        curl -sD - http://localhost:8002 -o /dev/null
+      """)
+      assert "x-nixos: rules" in res.lower(), res
+
+      # Log in to Immich and create an access key
+      machine.succeed("""
+        curl -sf --json '{ "email": "test@example.com", "name": "Admin", "password": "admin" }' http://localhost:2283/api/auth/admin-sign-up
+      """)
+      res = machine.succeed("""
+        curl -sf --json '{ "email": "test@example.com", "password": "admin" }' http://localhost:2283/api/auth/login
+      """)
+      token = json.loads(res)['accessToken']
+      res = machine.succeed("""
+        curl -sf -H 'Cookie: immich_access_token=%s' --json '{ "name": "API Key", "permissions": ["all"] }' http://localhost:2283/api/api-keys
+      """ % token)
+      key = json.loads(res)['secret']
+      machine.succeed(f"immich login http://localhost:2283/api {key}")
+      res = machine.succeed("immich server-info")
+      print(res)
+
+      # Upload some blank images to a new album
+      # If there's only one image, the proxy serves the image directly
+      machine.succeed("magick -size 800x600 canvas:white /tmp/white.png")
+      machine.succeed("immich upload -A '✨ Reproducible Moments ✨' /tmp/white.png")
+      machine.succeed("magick -size 800x600 canvas:black /tmp/black.png")
+      machine.succeed("immich upload -A '✨ Reproducible Moments ✨' /tmp/black.png")
+      res = machine.succeed("immich server-info")
+      print(res)
+
+      # Get the new album id
+      res = machine.succeed("""
+        curl -sf -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/albums
+      """ % token)
+      album_id = json.loads(res)[0]['id']
+
+      # Create a shared link
+      res = machine.succeed("""
+        curl -sf -H 'Cookie: immich_access_token=%s' --json '{ "albumId": "%s", "type": "ALBUM" }' http://localhost:2283/api/shared-links
+      """ % (token, album_id))
+      share_key = json.loads(res)['key']
+
+      # Access the share
+      machine.succeed("""
+        curl -sf http://localhost:2283/share/%s
+      """ % share_key)
+
+      # Access the share through the proxy
+      machine.succeed("""
+        curl -sf http://localhost:8002/share/%s
+      """ % share_key)
+    '';
+  }
+)
diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index 1ac698179c4b..36335b395960 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -3,6 +3,7 @@
   buildNpmPackage,
   fetchFromGitHub,
   nix-update-script,
+  nixosTests,
   nodejs,
 }:
 buildNpmPackage rec {
@@ -32,6 +33,9 @@ buildNpmPackage rec {
   '';
 
   passthru = {
+    tests = {
+      inherit (nixosTests) immich-public-proxy;
+    };
     updateScript = nix-update-script { };
   };
 

From 1ff89263cfd1aae98b19f9d844bd815feb5fa7a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 04:35:39 +0000
Subject: [PATCH 0561/1504] tabby: 0.20.0 -> 0.22.0

---
 pkgs/by-name/ta/tabby/Cargo.lock  | 321 +++++++++++++++++++++++-------
 pkgs/by-name/ta/tabby/package.nix |   4 +-
 2 files changed, 251 insertions(+), 74 deletions(-)

diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock
index 0866c3a0bd3e..2ea6f16ddb2d 100644
--- a/pkgs/by-name/ta/tabby/Cargo.lock
+++ b/pkgs/by-name/ta/tabby/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -41,7 +41,7 @@ dependencies = [
 
 [[package]]
 name = "aim-downloader"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "async-stream",
  "clap",
@@ -201,7 +201,7 @@ dependencies = [
  "rand 0.8.5",
  "reqwest",
  "reqwest-eventsource",
- "secrecy",
+ "secrecy 0.8.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -308,7 +308,7 @@ dependencies = [
  "sync_wrapper 1.0.1",
  "tokio",
  "tokio-tungstenite",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -352,7 +352,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "serde",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -376,8 +376,8 @@ dependencies = [
  "once_cell",
  "pin-project",
  "tokio",
- "tower",
- "tower-http",
+ "tower 0.4.13",
+ "tower-http 0.5.2",
 ]
 
 [[package]]
@@ -444,9 +444,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -637,6 +637,17 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
+[[package]]
+name = "clocksource"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "129026dd5a8a9592d96916258f3a5379589e513ea5e86aeb0bd2530286e44e9e"
+dependencies = [
+ "libc",
+ "time",
+ "winapi",
+]
+
 [[package]]
 name = "cmake"
 version = "0.1.50"
@@ -728,10 +739,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
+name = "core-foundation"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
@@ -1291,6 +1312,16 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
+[[package]]
+name = "fslock"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -1475,7 +1506,7 @@ version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
  "libgit2-sys",
  "log",
@@ -1691,7 +1722,7 @@ dependencies = [
 
 [[package]]
 name = "hash-ids"
-version = "0.20.0"
+version = "0.22.0"
 
 [[package]]
 name = "hashbrown"
@@ -1875,13 +1906,14 @@ dependencies = [
 
 [[package]]
 name = "http-api-bindings"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-openai",
  "async-stream",
  "async-trait",
  "futures",
+ "leaky-bucket",
  "ollama-api-bindings",
  "reqwest",
  "reqwest-eventsource",
@@ -1890,6 +1922,7 @@ dependencies = [
  "tabby-common",
  "tabby-inference",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -1998,12 +2031,29 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.3.1",
  "hyper-util",
- "log",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.22.4",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.25.0",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.3.1",
+ "hyper-util",
+ "log",
+ "rustls 0.23.20",
+ "rustls-native-certs 0.8.1",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.1",
  "tower-service",
 ]
 
@@ -2051,7 +2101,7 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tower-service",
  "tracing",
 ]
@@ -2353,6 +2403,17 @@ dependencies = [
  "spin 0.5.2",
 ]
 
+[[package]]
+name = "leaky-bucket"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a396bb213c2d09ed6c5495fd082c991b6ab39c9daf4fff59e6727f85c73e4c5"
+dependencies = [
+ "parking_lot",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "lettre"
 version = "0.11.7"
@@ -2538,7 +2599,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "llama-cpp-server"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -2832,7 +2893,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.0",
  "security-framework-sys",
  "tempfile",
 ]
@@ -3027,9 +3088,9 @@ dependencies = [
 
 [[package]]
 name = "octocrab"
-version = "0.38.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367"
+checksum = "7b97f949a7cb04608441c2ddb28e15a377e8b5142c2d1835ad2686d434de8558"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -3044,29 +3105,30 @@ dependencies = [
  "http-body 1.0.0",
  "http-body-util",
  "hyper 1.3.1",
- "hyper-rustls",
+ "hyper-rustls 0.27.3",
  "hyper-timeout",
  "hyper-util",
  "jsonwebtoken",
  "once_cell",
  "percent-encoding",
  "pin-project",
- "secrecy",
+ "secrecy 0.10.3",
  "serde",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
  "snafu",
  "tokio",
- "tower",
- "tower-http",
+ "tower 0.5.2",
+ "tower-http 0.6.2",
  "tracing",
  "url",
+ "web-time",
 ]
 
 [[package]]
 name = "ollama-api-bindings"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -3123,7 +3185,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3729,13 +3791,24 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "ratelimit"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36ea961700fd7260e7fa3701c8287d901b2172c51f9c1421fa0f21d7f7e184b7"
+dependencies = [
+ "clocksource",
+ "parking_lot",
+ "thiserror",
+]
+
 [[package]]
 name = "raw-cpuid"
 version = "11.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -3787,7 +3860,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -3871,7 +3944,7 @@ dependencies = [
  "http-body 1.0.0",
  "http-body-util",
  "hyper 1.3.1",
- "hyper-rustls",
+ "hyper-rustls 0.26.0",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -3883,8 +3956,8 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.22.4",
+ "rustls-native-certs 0.7.0",
  "rustls-pemfile",
  "rustls-pki-types",
  "serde",
@@ -3894,7 +3967,7 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls",
+ "tokio-rustls 0.25.0",
  "tokio-util",
  "tower-service",
  "url",
@@ -4050,7 +4123,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4071,6 +4144,21 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.7.0"
@@ -4081,7 +4169,19 @@ dependencies = [
  "rustls-pemfile",
  "rustls-pki-types",
  "schannel",
- "security-framework",
+ "security-framework 2.11.0",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.0.1",
 ]
 
 [[package]]
@@ -4096,15 +4196,15 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4178,14 +4278,36 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.5.0",
- "core-foundation",
+ "bitflags 2.6.0",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -4193,9 +4315,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -4332,6 +4454,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d"
 dependencies = [
+ "fslock",
  "futures",
  "log",
  "once_cell",
@@ -4682,7 +4805,7 @@ source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a
 dependencies = [
  "atoi",
  "base64 0.21.7",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -4724,7 +4847,7 @@ source = "git+https://github.com/wsxiaoys/sqlx?rev=8ca573c#8ca573cc0e323a637261a
 dependencies = [
  "atoi",
  "base64 0.21.7",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "byteorder",
  "chrono",
  "crc",
@@ -4964,7 +5087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
 
@@ -4980,7 +5103,7 @@ dependencies = [
 
 [[package]]
 name = "tabby"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -5020,7 +5143,7 @@ dependencies = [
  "tantivy",
  "thiserror",
  "tokio",
- "tower-http",
+ "tower-http 0.5.2",
  "tracing",
  "tracing-subscriber",
  "utoipa",
@@ -5031,7 +5154,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-common"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5059,7 +5182,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-crawler"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -5078,7 +5201,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-db"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -5096,7 +5219,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-db-macros"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "quote",
  "syn 2.0.66",
@@ -5104,7 +5227,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-download"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "aim-downloader",
  "anyhow",
@@ -5116,7 +5239,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-git"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -5137,7 +5260,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-index"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -5179,7 +5302,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-index-cli"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -5191,7 +5314,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-inference"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -5201,7 +5324,7 @@ dependencies = [
  "derive_builder",
  "futures",
  "reqwest",
- "secrecy",
+ "secrecy 0.8.0",
  "tabby-common",
  "tracing",
  "trie-rs",
@@ -5209,7 +5332,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-schema"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -5236,7 +5359,7 @@ dependencies = [
 
 [[package]]
 name = "tabby-webserver"
-version = "0.20.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -5247,6 +5370,7 @@ dependencies = [
  "axum",
  "axum-extra",
  "bincode",
+ "cached",
  "chrono",
  "cron",
  "fs_extra",
@@ -5265,6 +5389,7 @@ dependencies = [
  "octocrab",
  "pin-project",
  "querystring",
+ "ratelimit",
  "reqwest",
  "rust-embed",
  "serde",
@@ -5653,11 +5778,21 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls",
+ "rustls 0.22.4",
  "rustls-pki-types",
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+dependencies = [
+ "rustls 0.23.20",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-serde"
 version = "0.8.0"
@@ -5755,6 +5890,22 @@ dependencies = [
  "pin-project",
  "pin-project-lite",
  "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 1.0.1",
+ "tokio",
  "tokio-util",
  "tower-layer",
  "tower-service",
@@ -5767,16 +5918,31 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "bytes",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
+dependencies = [
+ "bitflags 2.6.0",
  "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
- "http-body-util",
  "iri-string",
  "pin-project-lite",
- "tokio",
- "tower",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -5784,15 +5950,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -6498,6 +6664,17 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.3"
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index c8635f87d0b3..cc90c9be65dc 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -31,7 +31,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
 
   pname = "tabby";
-  version = "0.20.0";
+  version = "0.22.0";
 
   availableAccelerations = flatten [
     (optional cudaSupport "cuda")
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage {
     owner = "TabbyML";
     repo = "tabby";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vhl5oNVYY3pizoA0PuV4c9UXH3F2L+WiXQMOM0Pqxks=";
+    hash = "sha256-fzbJjoBJ6zOw1ABN9PitbW2usm4NgqVfMWSAvRAVHj0=";
     fetchSubmodules = true;
   };
 

From 57008e12267612c26bce96a83646d7b7a154747e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 06:14:33 +0000
Subject: [PATCH 0562/1504] nextdns: 1.43.5 -> 1.44.3

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

diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix
index 0b901e2b4170..e37efbdf95e0 100644
--- a/pkgs/by-name/ne/nextdns/package.nix
+++ b/pkgs/by-name/ne/nextdns/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nextdns";
-  version = "1.43.5";
+  version = "1.44.3";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${version}";
-    sha256 = "sha256-XQ3dFv+JZ8x/SpaPhrauO8EfcpGrm9vbmQ7LLY1dQuE=";
+    sha256 = "sha256-fSYnR8yfgfOx8E9gGq82xAsvrMdujcwYq/qY/NF8LcM=";
   };
 
-  vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY=";
+  vendorHash = "sha256-DKYWuCnpoJXJHBd6G9DFFzAPbekO+vaCPuBc4UTuxHg=";
 
   ldflags = [
     "-s"

From c6496737d34776ce04de868da09c90d3d6bead12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 07:16:21 +0000
Subject: [PATCH 0563/1504] k6: 0.55.1 -> 0.55.2

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

diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 6cc6563f41c6..150347afe0f3 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "k6";
-  version = "0.55.1";
+  version = "0.55.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-29lb8vCMe6BcGeSlfMQm3w+UsD9n3FCljRiT51QNiLU=";
+    hash = "sha256-BuZsz5+vp4obL/Gj/gJSgA0xxdYmqd+MKggS62Jo+bM=";
   };
 
   subPackages = [ "./" ];

From 4cb1802986df40bf983f0d1257b4749765f0be41 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:09 +0100
Subject: [PATCH 0564/1504] azure-cli-extensions.qumulo: 1.0.0 -> 2.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index b6e9b9477a59..04ae89449754 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -841,9 +841,9 @@
   },
   "qumulo": {
     "pname": "qumulo",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-1.0.0-py3-none-any.whl",
-    "hash": "sha256-mXP1gKP8IMwv5VWKHP3BDd/GVnmC0S83AIu/7Hqvz5s=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-2.0.0-py3-none-any.whl",
+    "hash": "sha256-fsUZyd0s+Rv1Sy6Lm2iq2xNMsrv+xU6KLLCOo6DkfmI=",
     "description": "Microsoft Azure Command-Line Tools Qumulo Extension"
   },
   "quota": {

From 0ef3a7271f2f82534c0c0e418e3ffcda789f050c Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:11 +0100
Subject: [PATCH 0565/1504] azure-cli-extensions.managednetworkfabric: 6.4.0 ->
 7.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 04ae89449754..ad9850e69f1e 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -645,10 +645,10 @@
   },
   "managednetworkfabric": {
     "pname": "managednetworkfabric",
-    "version": "6.4.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-6.4.0-py3-none-any.whl",
-    "hash": "sha256-nUEHjgZUqq42pfDyg/Ud6YzENgWCkgU2VCVG7TTKC8Q=",
-    "description": "Support for managednetworkfabric commands based on 2023-06-15 API version"
+    "version": "7.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-7.0.0-py3-none-any.whl",
+    "hash": "sha256-I+K24xxpm8DoyNsvqjv9Yi1ewVZeCDCVIizYUB7TKW8=",
+    "description": "Support for managednetworkfabric commands based on 2024-02-15-preview API version"
   },
   "managementpartner": {
     "pname": "managementpartner",

From 2bc1bc7002e3ac6b8007a5ae76450490f8bb0063 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:13 +0100
Subject: [PATCH 0566/1504] azure-cli-extensions.networkcloud: 2.0.0b6 -> 2.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index ad9850e69f1e..b71275415a1e 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -729,9 +729,9 @@
   },
   "networkcloud": {
     "pname": "networkcloud",
-    "version": "2.0.0b6",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b6-py3-none-any.whl",
-    "hash": "sha256-1T+IepVTU7DLHQ7CfcEltQG+/lryktzUFB7RY9O9hzM=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0-py3-none-any.whl",
+    "hash": "sha256-8ntKTSkGJwdhHJCeClEd7A0cUgRed8sV/l7qP5jAQhQ=",
     "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version"
   },
   "new-relic": {

From d9f4358b36095018856b7efb92a6120710c48327 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 25 Dec 2024 21:54:15 +0100
Subject: [PATCH 0567/1504] azure-cli-extensions.stack-hci-vm: 1.4.3 -> 1.5.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index b71275415a1e..bf4c4b52064d 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -953,9 +953,9 @@
   },
   "stack-hci-vm": {
     "pname": "stack-hci-vm",
-    "version": "1.4.3",
-    "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl",
-    "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=",
+    "version": "1.5.0",
+    "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.5.0-py3-none-any.whl",
+    "hash": "sha256-otixJPDbQp0+eugYFcVEzgAjGrFkDCHdqRUwT3WQ+Pg=",
     "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
   },
   "standbypool": {

From 53add6c0c30200663cd21beb06672ec2c8afc176 Mon Sep 17 00:00:00 2001
From: cy <hi@cything.io>
Date: Fri, 27 Dec 2024 20:13:12 -0500
Subject: [PATCH 0568/1504] nixos/borgbackup: support specific warning codes
 when failOnWarnings=false

---
 nixos/modules/services/backup/borgbackup.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index a9a4564ad86b..c1594ff2086a 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -44,8 +44,8 @@ let
     borgWrapper () {
       local result
       borg "$@" && result=$? || result=$?
-      if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 ]]; then
-        echo "ignoring warning return value 1"
+      if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 || ("$result" -ge 100 && "$result" -le 127) ]]; then
+        echo "ignoring warning return value $result"
         return 0
       else
         return "$result"

From dd3a668da22e994158387dc5da54d0a3757ba931 Mon Sep 17 00:00:00 2001
From: Louis Thevenet <louis.tvnt@gmail.com>
Date: Mon, 30 Dec 2024 09:24:35 +0100
Subject: [PATCH 0569/1504] television: 0.7.1 -> 0.8.1

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

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index 41a6044f39d0..f51564c41c38 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "television";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "television";
     rev = "refs/tags/" + version;
-    hash = "sha256-CvwJWut3N8TbeTVYnRg+6QHLXxwrDYWK1277uo2yxB8=";
+    hash = "sha256-+HLNZvCrpVe+lw7i5uAU6nyO/tTPth6In9qn03S/SX8=";
   };
 
-  cargoHash = "sha256-NNJoWCl/hqAF1QWEFUTnsRnN9gSLs8kyYpUbvmbmWIo=";
+  cargoHash = "sha256-A+vXptX+2xEWmxJfO8nqmp0esWHZUx1HIvTLIna/x+U=";
 
   passthru = {
     tests.version = testers.testVersion {

From 78ca1422a5f25788a0486ee1e836068d42f69e67 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:17:33 +0300
Subject: [PATCH 0570/1504] avro-cpp: 1.11.3 -> 1.12.0

This is a major change to the public API. Now avro-cpp public headers
depend on fmt as well as boost. The build system tries to do FetchContent
on fmtlib unconditionally, which requires patching to circumvent.
Looks like the least painful thing to do is to propagate both boost and fmt and hope
that dependant packages don't break too much.
---
 .../0001-get-rid-of-fmt-fetchcontent.patch    | 21 ++++++++++++++++
 pkgs/by-name/av/avro-cpp/package.nix          | 25 +++++++------------
 2 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch

diff --git a/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch b/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch
new file mode 100644
index 000000000000..09ff008d332c
--- /dev/null
+++ b/pkgs/by-name/av/avro-cpp/0001-get-rid-of-fmt-fetchcontent.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19059a41b..6e3ae0ad7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,15 +82,7 @@ endif ()
+ find_package (Boost 1.38 REQUIRED
+     COMPONENTS filesystem iostreams program_options regex system)
+ 
+-include(FetchContent)
+-FetchContent_Declare(
+-        fmt
+-        GIT_REPOSITORY  https://github.com/fmtlib/fmt.git
+-        GIT_TAG         10.2.1
+-        GIT_PROGRESS    TRUE
+-        USES_TERMINAL_DOWNLOAD TRUE
+-)
+-FetchContent_MakeAvailable(fmt)
++find_package(fmt REQUIRED)
+ 
+ find_package(Snappy)
+ if (SNAPPY_FOUND)
diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix
index f82ef1924dbe..a21d247bb272 100644
--- a/pkgs/by-name/av/avro-cpp/package.nix
+++ b/pkgs/by-name/av/avro-cpp/package.nix
@@ -2,41 +2,34 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   cmake,
   boost,
   python3,
+  fmt,
 }:
 
 stdenv.mkDerivation rec {
   pname = "avro-c++";
-  version = "1.11.3";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
-    hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64=";
+    hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs=";
   };
+
   patches = [
-    # This patch fixes boost compatibility and can be removed when
-    # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920
-    (fetchpatch {
-      name = "fix-boost-compatibility.patch";
-      url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch";
-      hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A=";
-    })
+    ./0001-get-rid-of-fmt-fetchcontent.patch
   ];
-  patchFlags = [ "-p3" ];
 
   nativeBuildInputs = [
     cmake
     python3
   ];
-  buildInputs = [ boost ];
 
-  preConfigure = ''
-    substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
-    substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE"
-  '';
+  propagatedBuildInputs = [
+    boost
+    fmt
+  ];
 
   meta = {
     description = "C++ library which implements parts of the Avro Specification";

From def661a1ae187db45baaf52162e3aa01624dedd9 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:38:22 +0300
Subject: [PATCH 0571/1504] avro-cpp: enable tests

Unit tests are built unconditionally by the build system.
Might as well run them, since they take very little time to execute.
---
 pkgs/by-name/av/avro-cpp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix
index a21d247bb272..753b374e9039 100644
--- a/pkgs/by-name/av/avro-cpp/package.nix
+++ b/pkgs/by-name/av/avro-cpp/package.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     fmt
   ];
 
+  doCheck = true;
+
   meta = {
     description = "C++ library which implements parts of the Avro Specification";
     mainProgram = "avrogencpp";

From ba1797363431e25f95466ab2cb9d357c5a0bce4a Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:45:38 +0300
Subject: [PATCH 0572/1504] avro-cpp: use versionCheckHook

---
 pkgs/by-name/av/avro-cpp/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix
index 753b374e9039..b0bd09a65756 100644
--- a/pkgs/by-name/av/avro-cpp/package.nix
+++ b/pkgs/by-name/av/avro-cpp/package.nix
@@ -6,6 +6,7 @@
   boost,
   python3,
   fmt,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -33,6 +34,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/avrogencpp";
+  versionCheckProgramArg = [ "--version" ];
+
   meta = {
     description = "C++ library which implements parts of the Avro Specification";
     mainProgram = "avrogencpp";

From 56cf732519b67b2f869b104f94f9164b005e559c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 17:16:15 +0000
Subject: [PATCH 0573/1504] python312Packages.tree-sitter-javascript: 0.21.3 ->
 0.23.1

---
 .../python-modules/tree-sitter-javascript/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix
index 8987a233ae37..07a5d35ef751 100644
--- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-javascript";
-  version = "0.21.3";
+  version = "0.23.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter-javascript";
-    rev = "v${version}";
-    hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4=";
+    tag = "v${version}";
+    hash = "sha256-apgWWYD0XOvH5c3BY7kAF7UYtwPJaEvJzC5aWvJ9YQ8=";
   };
 
   build-system = [

From efe567f41af0f25ba63447c8f10170c267d2801a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 29 Dec 2024 22:44:33 +0200
Subject: [PATCH 0574/1504] python312Packages.tree-sitter: fix failing
 test_properties

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

diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index 4ee037d37f84..88c7a1996e3a 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -26,6 +27,12 @@ buildPythonPackage rec {
     hash = "sha256-RWnt1g7WN5CDbgWY5YSTuPFZomoxtRgDaSLkG9y2B6w=";
     fetchSubmodules = true;
   };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/tree-sitter/py-tree-sitter/commit/a85342e16d28c78a1cf1e14c74f4598cd2a5f3e0.patch";
+      hash = "sha256-gm79KciA/KoDqrRfWuSB3GOD1jBx6Skd1olt4zoofaw=";
+    })
+  ];
 
   build-system = [ setuptools ];
 

From a8f727fc31d78741086d195ae6ca4d65a792667d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 11:01:47 +0100
Subject: [PATCH 0575/1504] python312Packages.knx-frontend: 2024.11.16.205004
 -> 2024.12.26.233449

Changelog: https://github.com/XKNX/knx-frontend/releases/tag/2024.12.26.233449
---
 pkgs/development/python-modules/knx-frontend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index 243be4b8eb15..e6c86aa2048c 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2024.11.16.205004";
+  version = "2024.12.26.233449";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-CsKtCTLsBpW3IMTdT8YBsnWLBt/huZGejyyBmusT6zc=";
+    hash = "sha256-PlV1CFUtKdUMXnnyeil6c+N7VBmsjmOSs8uYziGrZ9s=";
   };
 
   build-system = [ setuptools ];

From 3a69b9fa0dbc0254f6e342957bc02f02b8c8a1a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 11:02:01 +0000
Subject: [PATCH 0576/1504] dolt: 1.44.0 -> 1.45.1

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index da061e9bd60d..0c68cc60bb73 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.44.0";
+  version = "1.45.1";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-sumd663G9Tztkuo21w7AE7ylzH2GnwNIL+/cGQz1SX8=";
+    sha256 = "sha256-O5y3AdFOtxNwpt8uGkTC7XHY1M/6Cv3vTyeHyVlTRGw=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-bHLudlThXd4ttgmDyVwGD+SI9KJxIMo2iZARREZUSxk=";
+  vendorHash = "sha256-h9HE90mOaDid2/uZcDBKZdbi6K1P2o27LZDnLAm+XSE=";
   proxyVendor = true;
   doCheck = false;
 

From b9b070ae8225cdcf148f9fb9b9c7a102dc1c6aaa Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:35 +0100
Subject: [PATCH 0577/1504] nixos/services.manticore: remove `with lib;`

---
 nixos/modules/services/search/manticore.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/search/manticore.nix b/nixos/modules/services/search/manticore.nix
index 76cb16bee0d1..e69c6d8c59f2 100644
--- a/nixos/modules/services/search/manticore.nix
+++ b/nixos/modules/services/search/manticore.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.manticore;
@@ -14,7 +11,7 @@ let
 
   toSphinx =
     {
-      mkKeyValue ? generators.mkKeyValueDefault { } "=",
+      mkKeyValue ? lib.generators.mkKeyValueDefault { } "=",
       listsAsDuplicateKeys ? true,
     }:
     attrsOfAttrs:
@@ -22,7 +19,7 @@ let
       # map function to string for each key val
       mapAttrsToStringsSep =
         sep: mapFn: attrs:
-        concatStringsSep sep (mapAttrsToList mapFn attrs);
+        lib.concatStringsSep sep (lib.mapAttrsToList mapFn attrs);
       mkSection =
         sectName: sectValues:
         ''
@@ -46,9 +43,9 @@ in
   options = {
     services.manticore = {
 
-      enable = mkEnableOption "Manticoresearch";
+      enable = lib.mkEnableOption "Manticoresearch";
 
-      settings = mkOption {
+      settings = lib.mkOption {
         default = {
           searchd = {
             listen = [
@@ -67,10 +64,10 @@ in
           <https://manual.manticoresearch.com/Server%20settings>
           for more information.
         '';
-        type = types.submodule {
+        type = lib.types.submodule {
           freeformType = format.type;
         };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             searchd = {
                 listen = [
@@ -90,7 +87,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     systemd = {
       packages = [ pkgs.manticoresearch ];

From 90934eae5038a7e6ae801ec9207b15a35ba583af Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:35 +0100
Subject: [PATCH 0578/1504] nixos/services.meilisearch: remove `with lib;`

---
 nixos/modules/services/search/meilisearch.nix | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix
index ed51e67a0da8..1a1465b8e222 100644
--- a/nixos/modules/services/search/meilisearch.nix
+++ b/nixos/modules/services/search/meilisearch.nix
@@ -4,16 +4,13 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.meilisearch;
 
 in
 {
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     Br1ght0ne
     happysalada
   ];
@@ -22,37 +19,37 @@ in
   ###### interface
 
   options.services.meilisearch = {
-    enable = mkEnableOption "MeiliSearch - a RESTful search API";
+    enable = lib.mkEnableOption "MeiliSearch - a RESTful search API";
 
-    package = mkPackageOption pkgs "meilisearch" {
+    package = lib.mkPackageOption pkgs "meilisearch" {
       extraDescription = ''
         Use this if you require specific features to be enabled. The default package has no features.
       '';
     };
 
-    listenAddress = mkOption {
+    listenAddress = lib.mkOption {
       description = "MeiliSearch listen address.";
       default = "127.0.0.1";
-      type = types.str;
+      type = lib.types.str;
     };
 
-    listenPort = mkOption {
+    listenPort = lib.mkOption {
       description = "MeiliSearch port to listen on.";
       default = 7700;
-      type = types.port;
+      type = lib.types.port;
     };
 
-    environment = mkOption {
+    environment = lib.mkOption {
       description = "Defines the running environment of MeiliSearch.";
       default = "development";
-      type = types.enum [
+      type = lib.types.enum [
         "development"
         "production"
       ];
     };
 
     # TODO change this to LoadCredentials once possible
-    masterKeyEnvironmentFile = mkOption {
+    masterKeyEnvironmentFile = lib.mkOption {
       description = ''
         Path to file which contains the master key.
         By doing so, all routes will be protected and will require a key to be accessed.
@@ -61,10 +58,10 @@ in
         MEILI_MASTER_KEY=my_secret_key
       '';
       default = null;
-      type = with types; nullOr path;
+      type = with lib.types; nullOr path;
     };
 
-    noAnalytics = mkOption {
+    noAnalytics = lib.mkOption {
       description = ''
         Deactivates analytics.
         Analytics allow MeiliSearch to know how many users are using MeiliSearch,
@@ -72,10 +69,10 @@ in
         This process is entirely anonymous.
       '';
       default = true;
-      type = types.bool;
+      type = lib.types.bool;
     };
 
-    logLevel = mkOption {
+    logLevel = lib.mkOption {
       description = ''
         Defines how much detail should be present in MeiliSearch's logs.
         MeiliSearch currently supports four log levels, listed in order of increasing verbosity:
@@ -86,10 +83,10 @@ in
           Useful when diagnosing issues and debugging
       '';
       default = "INFO";
-      type = types.str;
+      type = lib.types.str;
     };
 
-    maxIndexSize = mkOption {
+    maxIndexSize = lib.mkOption {
       description = ''
         Sets the maximum size of the index.
         Value must be given in bytes or explicitly stating a base unit.
@@ -97,10 +94,10 @@ in
         Default is 100 GiB
       '';
       default = "107374182400";
-      type = types.str;
+      type = lib.types.str;
     };
 
-    payloadSizeLimit = mkOption {
+    payloadSizeLimit = lib.mkOption {
       description = ''
         Sets the maximum size of accepted JSON payloads.
         Value must be given in bytes or explicitly stating a base unit.
@@ -108,14 +105,14 @@ in
         Default is ~ 100 MB
       '';
       default = "104857600";
-      type = types.str;
+      type = lib.types.str;
     };
 
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     # used to restore dumps
     environment.systemPackages = [ cfg.package ];
@@ -127,7 +124,7 @@ in
       environment = {
         MEILI_DB_PATH = "/var/lib/meilisearch";
         MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}";
-        MEILI_NO_ANALYTICS = boolToString cfg.noAnalytics;
+        MEILI_NO_ANALYTICS = lib.boolToString cfg.noAnalytics;
         MEILI_ENV = cfg.environment;
         MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps";
         MEILI_LOG_LEVEL = cfg.logLevel;
@@ -137,7 +134,7 @@ in
         ExecStart = "${cfg.package}/bin/meilisearch";
         DynamicUser = true;
         StateDirectory = "meilisearch";
-        EnvironmentFile = mkIf (cfg.masterKeyEnvironmentFile != null) cfg.masterKeyEnvironmentFile;
+        EnvironmentFile = lib.mkIf (cfg.masterKeyEnvironmentFile != null) cfg.masterKeyEnvironmentFile;
       };
     };
   };

From 418f49af7458fb8063a8ce004beaf9a032b14164 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:35 +0100
Subject: [PATCH 0579/1504] nixos/services.opensearch: remove `with lib;`

---
 nixos/modules/services/search/opensearch.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix
index 59e04114eb69..6630dd017db6 100644
--- a/nixos/modules/services/search/opensearch.nix
+++ b/nixos/modules/services/search/opensearch.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.opensearch;
 
@@ -28,7 +25,7 @@ in
 {
 
   options.services.opensearch = {
-    enable = mkEnableOption "OpenSearch";
+    enable = lib.mkEnableOption "OpenSearch";
 
     package = lib.mkPackageOption pkgs "OpenSearch" {
       default = [ "opensearch" ];
@@ -113,13 +110,13 @@ in
         rootLogger.level = info
         rootLogger.appenderRef.console.ref = console
       '';
-      type = types.str;
+      type = lib.types.str;
     };
 
     dataDir = lib.mkOption {
       type = lib.types.path;
       default = "/var/lib/opensearch";
-      apply = converge (removeSuffix "/");
+      apply = lib.converge (lib.removeSuffix "/");
       description = ''
         Data directory for OpenSearch. If you change this, you need to
         manually create the directory. You also need to create the
@@ -173,7 +170,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.opensearch = {
       description = "OpenSearch Daemon";
       wantedBy = [ "multi-user.target" ];
@@ -194,7 +191,7 @@ in
                   set -o errexit -o pipefail -o nounset -o errtrace
                   shopt -s inherit_errexit
                 ''
-                + (optionalString (!config.boot.isContainer) ''
+                + (lib.optionalString (!config.boot.isContainer) ''
                   # Only set vm.max_map_count if lower than ES required minimum
                   # This avoids conflict if configured via boot.kernel.sysctl
                   if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then
@@ -268,7 +265,7 @@ in
           TimeoutStartSec = "infinity";
           DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir;
         }
-        // (optionalAttrs (usingDefaultDataDir) {
+        // (lib.optionalAttrs (usingDefaultDataDir) {
           StateDirectory = "opensearch";
           StateDirectoryMode = "0700";
         });

From 0c00abec83397b854556ba8193875344b6472e6a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:35 +0100
Subject: [PATCH 0580/1504] nixos/services.qdrant: remove `with lib;`

---
 nixos/modules/services/search/qdrant.nix | 70 ++++++++++++------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/search/qdrant.nix b/nixos/modules/services/search/qdrant.nix
index 3b2ce4f6fd5c..665dad648a69 100644
--- a/nixos/modules/services/search/qdrant.nix
+++ b/nixos/modules/services/search/qdrant.nix
@@ -4,8 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
 let
 
   cfg = config.services.qdrant;
@@ -17,9 +15,9 @@ in
 
   options = {
     services.qdrant = {
-      enable = mkEnableOption "Vector Search Engine for the next generation of AI applications";
+      enable = lib.mkEnableOption "Vector Search Engine for the next generation of AI applications";
 
-      settings = mkOption {
+      settings = lib.mkOption {
         description = ''
           Configuration for Qdrant
           Refer to <https://github.com/qdrant/qdrant/blob/master/config/config.yaml> for details on supported values.
@@ -43,7 +41,7 @@ in
           telemetry_disabled = true;
         };
 
-        defaultText = literalExpression ''
+        defaultText = lib.literalExpression ''
           {
             storage = {
               storage_path = "/var/lib/qdrant/storage";
@@ -64,41 +62,41 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.qdrant.settings = {
-      service.static_content_dir = mkDefault pkgs.qdrant-web-ui;
-      storage.storage_path = mkDefault "/var/lib/qdrant/storage";
-      storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots";
+      service.static_content_dir = lib.mkDefault pkgs.qdrant-web-ui;
+      storage.storage_path = lib.mkDefault "/var/lib/qdrant/storage";
+      storage.snapshots_path = lib.mkDefault "/var/lib/qdrant/snapshots";
       # The following default values are the same as in the default config,
       # they are just written here for convenience.
-      storage.on_disk_payload = mkDefault true;
-      storage.wal.wal_capacity_mb = mkDefault 32;
-      storage.wal.wal_segments_ahead = mkDefault 0;
-      storage.performance.max_search_threads = mkDefault 0;
-      storage.performance.max_optimization_threads = mkDefault 1;
-      storage.optimizers.deleted_threshold = mkDefault 0.2;
-      storage.optimizers.vacuum_min_vector_number = mkDefault 1000;
-      storage.optimizers.default_segment_number = mkDefault 0;
-      storage.optimizers.max_segment_size_kb = mkDefault null;
-      storage.optimizers.memmap_threshold_kb = mkDefault null;
-      storage.optimizers.indexing_threshold_kb = mkDefault 20000;
-      storage.optimizers.flush_interval_sec = mkDefault 5;
-      storage.optimizers.max_optimization_threads = mkDefault 1;
-      storage.hnsw_index.m = mkDefault 16;
-      storage.hnsw_index.ef_construct = mkDefault 100;
-      storage.hnsw_index.full_scan_threshold_kb = mkDefault 10000;
-      storage.hnsw_index.max_indexing_threads = mkDefault 0;
-      storage.hnsw_index.on_disk = mkDefault false;
-      storage.hnsw_index.payload_m = mkDefault null;
-      service.max_request_size_mb = mkDefault 32;
-      service.max_workers = mkDefault 0;
-      service.http_port = mkDefault 6333;
-      service.grpc_port = mkDefault 6334;
-      service.enable_cors = mkDefault true;
-      cluster.enabled = mkDefault false;
+      storage.on_disk_payload = lib.mkDefault true;
+      storage.wal.wal_capacity_mb = lib.mkDefault 32;
+      storage.wal.wal_segments_ahead = lib.mkDefault 0;
+      storage.performance.max_search_threads = lib.mkDefault 0;
+      storage.performance.max_optimization_threads = lib.mkDefault 1;
+      storage.optimizers.deleted_threshold = lib.mkDefault 0.2;
+      storage.optimizers.vacuum_min_vector_number = lib.mkDefault 1000;
+      storage.optimizers.default_segment_number = lib.mkDefault 0;
+      storage.optimizers.max_segment_size_kb = lib.mkDefault null;
+      storage.optimizers.memmap_threshold_kb = lib.mkDefault null;
+      storage.optimizers.indexing_threshold_kb = lib.mkDefault 20000;
+      storage.optimizers.flush_interval_sec = lib.mkDefault 5;
+      storage.optimizers.max_optimization_threads = lib.mkDefault 1;
+      storage.hnsw_index.m = lib.mkDefault 16;
+      storage.hnsw_index.ef_construct = lib.mkDefault 100;
+      storage.hnsw_index.full_scan_threshold_kb = lib.mkDefault 10000;
+      storage.hnsw_index.max_indexing_threads = lib.mkDefault 0;
+      storage.hnsw_index.on_disk = lib.mkDefault false;
+      storage.hnsw_index.payload_m = lib.mkDefault null;
+      service.max_request_size_mb = lib.mkDefault 32;
+      service.max_workers = lib.mkDefault 0;
+      service.http_port = lib.mkDefault 6333;
+      service.grpc_port = lib.mkDefault 6334;
+      service.enable_cors = lib.mkDefault true;
+      cluster.enabled = lib.mkDefault false;
       # the following have been altered for security
-      service.host = mkDefault "127.0.0.1";
-      telemetry_disabled = mkDefault true;
+      service.host = lib.mkDefault "127.0.0.1";
+      telemetry_disabled = lib.mkDefault true;
     };
 
     systemd.services.qdrant = {

From ed344f1d2a05bc9dde22fa87abeffedd36a63527 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0581/1504] nixos/services.quickwit: remove `with lib;`

---
 nixos/modules/services/search/quickwit.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/search/quickwit.nix b/nixos/modules/services/search/quickwit.nix
index c55b32154b53..c8b1c1c516e9 100644
--- a/nixos/modules/services/search/quickwit.nix
+++ b/nixos/modules/services/search/quickwit.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.quickwit;
 
@@ -19,7 +16,7 @@ in
 {
 
   options.services.quickwit = {
-    enable = mkEnableOption "Quickwit";
+    enable = lib.mkEnableOption "Quickwit";
 
     package = lib.mkPackageOption pkgs "Quickwit" {
       default = [ "quickwit" ];
@@ -83,7 +80,7 @@ in
     dataDir = lib.mkOption {
       type = lib.types.path;
       default = "/var/lib/quickwit";
-      apply = converge (removeSuffix "/");
+      apply = lib.converge (lib.removeSuffix "/");
       description = ''
         Data directory for Quickwit. If you change this, you need to
         manually create the directory. You also need to create the
@@ -130,7 +127,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.quickwit = {
       description = "Quickwit";
       wantedBy = [ "multi-user.target" ];
@@ -143,7 +140,7 @@ in
         {
           ExecStart = ''
             ${cfg.package}/bin/quickwit run --config ${quickwitYml} \
-            ${escapeShellArgs cfg.extraFlags}
+            ${lib.escapeShellArgs cfg.extraFlags}
           '';
           User = cfg.user;
           Group = cfg.group;
@@ -186,7 +183,7 @@ in
             "@chown"
           ];
         }
-        // (optionalAttrs (usingDefaultDataDir) {
+        // (lib.optionalAttrs (usingDefaultDataDir) {
           StateDirectory = "quickwit";
           StateDirectoryMode = "0700";
         });

From e89c367895ae22e06e1c4a85638b5577a84c7b71 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0582/1504] nixos/services.certmgr: remove `with lib;`

---
 nixos/modules/services/security/certmgr.nix | 71 ++++++++++-----------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix
index f3164072b6b5..4a156539b438 100644
--- a/nixos/modules/services/security/certmgr.nix
+++ b/nixos/modules/services/security/certmgr.nix
@@ -4,15 +4,12 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.certmgr;
 
-  specs = mapAttrsToList (n: v: rec {
+  specs = lib.mapAttrsToList (n: v: rec {
     name = n + ".json";
-    path = if isAttrs v then pkgs.writeText name (builtins.toJSON v) else v;
+    path = if lib.isAttrs v then pkgs.writeText name (builtins.toJSON v) else v;
   }) cfg.specs;
 
   allSpecs = pkgs.linkFarm "certmgr.d" specs;
@@ -29,59 +26,59 @@ let
   );
 
   specPaths = map dirOf (
-    concatMap (
+    lib.concatMap (
       spec:
-      if isAttrs spec then
-        collect isString (filterAttrsRecursive (n: v: isAttrs v || n == "path") spec)
+      if lib.isAttrs spec then
+        lib.collect lib.isString (lib.filterAttrsRecursive (n: v: lib.isAttrs v || n == "path") spec)
       else
         [ spec ]
-    ) (attrValues cfg.specs)
+    ) (lib.attrValues cfg.specs)
   );
 
   preStart = ''
-    ${concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map escapeShellArg specPaths)}
+    ${lib.concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map lib.escapeShellArg specPaths)}
     ${cfg.package}/bin/certmgr -f ${certmgrYaml} check
   '';
 in
 {
   options.services.certmgr = {
-    enable = mkEnableOption "certmgr";
+    enable = lib.mkEnableOption "certmgr";
 
-    package = mkPackageOption pkgs "certmgr" { };
+    package = lib.mkPackageOption pkgs "certmgr" { };
 
-    defaultRemote = mkOption {
-      type = types.str;
+    defaultRemote = lib.mkOption {
+      type = lib.types.str;
       default = "127.0.0.1:8888";
       description = "The default CA host:port to use.";
     };
 
-    validMin = mkOption {
+    validMin = lib.mkOption {
       default = "72h";
-      type = types.str;
+      type = lib.types.str;
       description = "The interval before a certificate expires to start attempting to renew it.";
     };
 
-    renewInterval = mkOption {
+    renewInterval = lib.mkOption {
       default = "30m";
-      type = types.str;
+      type = lib.types.str;
       description = "How often to check certificate expirations and how often to update the cert_next_expires metric.";
     };
 
-    metricsAddress = mkOption {
+    metricsAddress = lib.mkOption {
       default = "127.0.0.1";
-      type = types.str;
+      type = lib.types.str;
       description = "The address for the Prometheus HTTP endpoint.";
     };
 
-    metricsPort = mkOption {
+    metricsPort = lib.mkOption {
       default = 9488;
-      type = types.ints.u16;
+      type = lib.types.ints.u16;
       description = "The port for the Prometheus HTTP endpoint.";
     };
 
-    specs = mkOption {
+    specs = lib.mkOption {
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           exampleCert =
           let
@@ -119,17 +116,17 @@ in
         }
       '';
       type =
-        with types;
+        with lib.types;
         attrsOf (
           either path (submodule {
             options = {
-              service = mkOption {
+              service = lib.mkOption {
                 type = nullOr str;
                 default = null;
                 description = "The service on which to perform \<action\> after fetching.";
               };
 
-              action = mkOption {
+              action = lib.mkOption {
                 type = addCheck str (
                   x:
                   cfg.svcManager == "command"
@@ -144,22 +141,22 @@ in
               };
 
               # These ought all to be specified according to certmgr spec def.
-              authority = mkOption {
+              authority = lib.mkOption {
                 type = attrs;
                 description = "certmgr spec authority object.";
               };
 
-              certificate = mkOption {
+              certificate = lib.mkOption {
                 type = nullOr attrs;
                 description = "certmgr spec certificate object.";
               };
 
-              private_key = mkOption {
+              private_key = lib.mkOption {
                 type = nullOr attrs;
                 description = "certmgr spec private_key object.";
               };
 
-              request = mkOption {
+              request = lib.mkOption {
                 type = nullOr attrs;
                 description = "certmgr spec request object.";
               };
@@ -173,9 +170,9 @@ in
       '';
     };
 
-    svcManager = mkOption {
+    svcManager = lib.mkOption {
       default = "systemd";
-      type = types.enum [
+      type = lib.types.enum [
         "circus"
         "command"
         "dummy"
@@ -193,7 +190,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     assertions = [
       {
         assertion = cfg.specs != { };
@@ -201,10 +198,10 @@ in
       }
       {
         assertion =
-          !any (hasAttrByPath [
+          !lib.any (lib.hasAttrByPath [
             "authority"
             "auth_key"
-          ]) (attrValues cfg.specs);
+          ]) (lib.attrValues cfg.specs);
         message = ''
           Inline services.certmgr.specs are added to the Nix store rendering them world readable.
           Specify paths as specs, if you want to use include auth_key - or use the auth_key_file option."
@@ -214,7 +211,7 @@ in
 
     systemd.services.certmgr = {
       description = "certmgr";
-      path = mkIf (cfg.svcManager == "command") [ pkgs.bash ];
+      path = lib.mkIf (cfg.svcManager == "command") [ pkgs.bash ];
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];

From 03977fb5852dbce03a39207000c6b719040f6562 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0583/1504] nixos/services.cfssl: remove `with lib;`

---
 nixos/modules/services/security/cfssl.nix | 105 +++++++++++-----------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix
index 9e22121f97f6..574649de75a9 100644
--- a/nixos/modules/services/security/cfssl.nix
+++ b/nixos/modules/services/security/cfssl.nix
@@ -5,19 +5,16 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.cfssl;
 in
 {
   options.services.cfssl = {
-    enable = mkEnableOption "the CFSSL CA api-server";
+    enable = lib.mkEnableOption "the CFSSL CA api-server";
 
-    dataDir = mkOption {
+    dataDir = lib.mkOption {
       default = "/var/lib/cfssl";
-      type = types.path;
+      type = lib.types.path;
       description = ''
         The work directory for CFSSL.
 
@@ -30,51 +27,51 @@ in
       '';
     };
 
-    address = mkOption {
+    address = lib.mkOption {
       default = "127.0.0.1";
-      type = types.str;
+      type = lib.types.str;
       description = "Address to bind.";
     };
 
-    port = mkOption {
+    port = lib.mkOption {
       default = 8888;
-      type = types.port;
+      type = lib.types.port;
       description = "Port to bind.";
     };
 
-    ca = mkOption {
-      defaultText = literalExpression ''"''${cfg.dataDir}/ca.pem"'';
-      type = types.str;
+    ca = lib.mkOption {
+      defaultText = lib.literalExpression ''"''${cfg.dataDir}/ca.pem"'';
+      type = lib.types.str;
       description = "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'.";
     };
 
-    caKey = mkOption {
-      defaultText = literalExpression ''"file:''${cfg.dataDir}/ca-key.pem"'';
-      type = types.str;
+    caKey = lib.mkOption {
+      defaultText = lib.literalExpression ''"file:''${cfg.dataDir}/ca-key.pem"'';
+      type = lib.types.str;
       description = "CA private key -- accepts '[file:]fname' or 'env:varname'.";
     };
 
-    caBundle = mkOption {
+    caBundle = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Path to root certificate store.";
     };
 
-    intBundle = mkOption {
+    intBundle = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Path to intermediate certificate store.";
     };
 
-    intDir = mkOption {
+    intDir = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Intermediates directory.";
     };
 
-    metadata = mkOption {
+    metadata = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = ''
         Metadata file for root certificate presence.
         The content of the file is a json dictionary (k,v): each key k is
@@ -83,81 +80,81 @@ in
       '';
     };
 
-    remote = mkOption {
+    remote = lib.mkOption {
       default = null;
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Remote CFSSL server.";
     };
 
-    configFile = mkOption {
+    configFile = lib.mkOption {
       default = null;
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Path to configuration file. Do not put this in nix-store as it might contain secrets.";
     };
 
-    responder = mkOption {
+    responder = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Certificate for OCSP responder.";
     };
 
-    responderKey = mkOption {
+    responderKey = lib.mkOption {
       default = null;
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Private key for OCSP responder certificate. Do not put this in nix-store.";
     };
 
-    tlsKey = mkOption {
+    tlsKey = lib.mkOption {
       default = null;
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Other endpoint's CA private key. Do not put this in nix-store.";
     };
 
-    tlsCert = mkOption {
+    tlsCert = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Other endpoint's CA to set up TLS protocol.";
     };
 
-    mutualTlsCa = mkOption {
+    mutualTlsCa = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Mutual TLS - require clients be signed by this CA.";
     };
 
-    mutualTlsCn = mkOption {
+    mutualTlsCn = lib.mkOption {
       default = null;
-      type = types.nullOr types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Mutual TLS - regex for whitelist of allowed client CNs.";
     };
 
-    tlsRemoteCa = mkOption {
+    tlsRemoteCa = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "CAs to trust for remote TLS requests.";
     };
 
-    mutualTlsClientCert = mkOption {
+    mutualTlsClientCert = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Mutual TLS - client certificate to call remote instance requiring client certs.";
     };
 
-    mutualTlsClientKey = mkOption {
+    mutualTlsClientKey = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Mutual TLS - client key to call remote instance requiring client certs. Do not put this in nix-store.";
     };
 
-    dbConfig = mkOption {
+    dbConfig = lib.mkOption {
       default = null;
-      type = types.nullOr types.path;
+      type = lib.types.nullOr lib.types.path;
       description = "Certificate db configuration file. Path must be writeable.";
     };
 
-    logLevel = mkOption {
+    logLevel = lib.mkOption {
       default = 1;
-      type = types.enum [
+      type = lib.types.enum [
         0
         1
         2
@@ -169,7 +166,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     users.groups.cfssl = {
       gid = config.ids.gids.cfssl;
     };
@@ -223,7 +220,7 @@ in
               (opt "loglevel" (toString logLevel))
             ];
         }
-        (mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) {
+        (lib.mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) {
           StateDirectory = baseNameOf cfg.dataDir;
           StateDirectoryMode = 700;
         })
@@ -231,8 +228,8 @@ in
     };
 
     services.cfssl = {
-      ca = mkDefault "${cfg.dataDir}/ca.pem";
-      caKey = mkDefault "${cfg.dataDir}/ca-key.pem";
+      ca = lib.mkDefault "${cfg.dataDir}/ca.pem";
+      caKey = lib.mkDefault "${cfg.dataDir}/ca-key.pem";
     };
   };
 }

From 8dbe32532163414bb085e1b188753b74d6cc656b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0584/1504] nixos/services.clamav: remove `with lib;`

---
 nixos/modules/services/security/clamav.nix | 91 +++++++++++-----------
 1 file changed, 45 insertions(+), 46 deletions(-)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 2b0929599723..d4d2fe4689dc 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -1,13 +1,12 @@
 { config, lib, pkgs, ... }:
-with lib;
 let
   clamavUser = "clamav";
   stateDir = "/var/lib/clamav";
   clamavGroup = clamavUser;
   cfg = config.services.clamav;
 
-  toKeyValue = generators.toKeyValue {
-    mkKeyValue = generators.mkKeyValueDefault { } " ";
+  toKeyValue = lib.generators.toKeyValue {
+    mkKeyValue = lib.generators.mkKeyValueDefault { } " ";
     listsAsDuplicateKeys = true;
   };
 
@@ -19,19 +18,19 @@ let
 in
 {
   imports = [
-    (mkRemovedOptionModule [ "services" "clamav" "updater" "config" ] "Use services.clamav.updater.settings instead.")
-    (mkRemovedOptionModule [ "services" "clamav" "updater" "extraConfig" ] "Use services.clamav.updater.settings instead.")
-    (mkRemovedOptionModule [ "services" "clamav" "daemon" "extraConfig" ] "Use services.clamav.daemon.settings instead.")
+    (lib.mkRemovedOptionModule [ "services" "clamav" "updater" "config" ] "Use services.clamav.updater.settings instead.")
+    (lib.mkRemovedOptionModule [ "services" "clamav" "updater" "extraConfig" ] "Use services.clamav.updater.settings instead.")
+    (lib.mkRemovedOptionModule [ "services" "clamav" "daemon" "extraConfig" ] "Use services.clamav.daemon.settings instead.")
   ];
 
   options = {
     services.clamav = {
-      package = mkPackageOption pkgs "clamav" { };
+      package = lib.mkPackageOption pkgs "clamav" { };
       daemon = {
-        enable = mkEnableOption "ClamAV clamd daemon";
+        enable = lib.mkEnableOption "ClamAV clamd daemon";
 
-        settings = mkOption {
-          type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
+        settings = lib.mkOption {
+          type = with lib.types; attrsOf (oneOf [ bool int str (listOf str) ]);
           default = { };
           description = ''
             ClamAV configuration. Refer to <https://linux.die.net/man/5/clamd.conf>,
@@ -40,18 +39,18 @@ in
         };
       };
       updater = {
-        enable = mkEnableOption "ClamAV freshclam updater";
+        enable = lib.mkEnableOption "ClamAV freshclam updater";
 
-        frequency = mkOption {
-          type = types.int;
+        frequency = lib.mkOption {
+          type = lib.types.int;
           default = 12;
           description = ''
             Number of database checks per day.
           '';
         };
 
-        interval = mkOption {
-          type = types.str;
+        interval = lib.mkOption {
+          type = lib.types.str;
           default = "hourly";
           description = ''
             How often freshclam is invoked. See systemd.time(7) for more
@@ -59,8 +58,8 @@ in
           '';
         };
 
-        settings = mkOption {
-          type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
+        settings = lib.mkOption {
+          type = with lib.types; attrsOf (oneOf [ bool int str (listOf str) ]);
           default = { };
           description = ''
             freshclam configuration. Refer to <https://linux.die.net/man/5/freshclam.conf>,
@@ -69,10 +68,10 @@ in
         };
       };
       fangfrisch = {
-        enable = mkEnableOption "ClamAV fangfrisch updater";
+        enable = lib.mkEnableOption "ClamAV fangfrisch updater";
 
-        interval = mkOption {
-          type = types.str;
+        interval = lib.mkOption {
+          type = lib.types.str;
           default = "hourly";
           description = ''
             How often freshclam is invoked. See systemd.time(7) for more
@@ -80,9 +79,9 @@ in
           '';
         };
 
-        settings = mkOption {
+        settings = lib.mkOption {
           type = lib.types.submodule {
-            freeformType = with types; attrsOf (attrsOf (oneOf [ str int bool ]));
+            freeformType = with lib.types; attrsOf (attrsOf (oneOf [ str int bool ]));
           };
           default = { };
           example = {
@@ -100,10 +99,10 @@ in
       };
 
       scanner = {
-        enable = mkEnableOption "ClamAV scanner";
+        enable = lib.mkEnableOption "ClamAV scanner";
 
-        interval = mkOption {
-          type = types.str;
+        interval = lib.mkOption {
+          type = lib.types.str;
           default = "*-*-* 04:00:00";
           description = ''
             How often clamdscan is invoked. See systemd.time(7) for more
@@ -112,8 +111,8 @@ in
           '';
         };
 
-        scanDirectories = mkOption {
-          type = with types; listOf str;
+        scanDirectories = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ "/home" "/var/lib" "/tmp" "/etc" "/var/tmp" ];
           description = ''
             List of directories to scan.
@@ -124,7 +123,7 @@ in
     };
   };
 
-  config = mkIf (cfg.updater.enable || cfg.daemon.enable) {
+  config = lib.mkIf (cfg.updater.enable || cfg.daemon.enable) {
     environment.systemPackages = [ cfg.package ];
 
     users.users.${clamavUser} = {
@@ -153,12 +152,12 @@ in
     };
 
     services.clamav.fangfrisch.settings = {
-      DEFAULT.db_url = mkDefault "sqlite:////var/lib/clamav/fangfrisch_db.sqlite";
-      DEFAULT.local_directory = mkDefault stateDir;
-      DEFAULT.log_level = mkDefault "INFO";
-      urlhaus.enabled = mkDefault "yes";
-      urlhaus.max_size = mkDefault "2MB";
-      sanesecurity.enabled = mkDefault "yes";
+      DEFAULT.db_url = lib.mkDefault "sqlite:////var/lib/clamav/fangfrisch_db.sqlite";
+      DEFAULT.local_directory = lib.mkDefault stateDir;
+      DEFAULT.log_level = lib.mkDefault "INFO";
+      urlhaus.enabled = lib.mkDefault "yes";
+      urlhaus.max_size = lib.mkDefault "2MB";
+      sanesecurity.enabled = lib.mkDefault "yes";
     };
 
     environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
@@ -168,10 +167,10 @@ in
       description = "ClamAV Antivirus Slice";
     };
 
-    systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
+    systemd.services.clamav-daemon = lib.mkIf cfg.daemon.enable {
       description = "ClamAV daemon (clamd)";
-      after = optionals cfg.updater.enable [ "clamav-freshclam.service" ];
-      wants = optionals cfg.updater.enable [ "clamav-freshclam.service" ];
+      after = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ];
+      wants = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ];
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ clamdConfigFile ];
 
@@ -189,7 +188,7 @@ in
       };
     };
 
-    systemd.timers.clamav-freshclam = mkIf cfg.updater.enable {
+    systemd.timers.clamav-freshclam = lib.mkIf cfg.updater.enable {
       description = "Timer for ClamAV virus database updater (freshclam)";
       wantedBy = [ "timers.target" ];
       timerConfig = {
@@ -198,7 +197,7 @@ in
       };
     };
 
-    systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
+    systemd.services.clamav-freshclam = lib.mkIf cfg.updater.enable {
       description = "ClamAV virus database updater (freshclam)";
       restartTriggers = [ freshclamConfigFile ];
       requires = [ "network-online.target" ];
@@ -217,7 +216,7 @@ in
       };
     };
 
-    systemd.services.clamav-fangfrisch-init = mkIf cfg.fangfrisch.enable {
+    systemd.services.clamav-fangfrisch-init = lib.mkIf cfg.fangfrisch.enable {
       wantedBy = [ "multi-user.target" ];
       # if the sqlite file can be found assume the database has already been initialised
       script = ''
@@ -239,7 +238,7 @@ in
       };
     };
 
-    systemd.timers.clamav-fangfrisch = mkIf cfg.fangfrisch.enable {
+    systemd.timers.clamav-fangfrisch = lib.mkIf cfg.fangfrisch.enable {
       description = "Timer for ClamAV virus database updater (fangfrisch)";
       wantedBy = [ "timers.target" ];
       timerConfig = {
@@ -248,7 +247,7 @@ in
       };
     };
 
-    systemd.services.clamav-fangfrisch = mkIf cfg.fangfrisch.enable {
+    systemd.services.clamav-fangfrisch = lib.mkIf cfg.fangfrisch.enable {
       description = "ClamAV virus database updater (fangfrisch)";
       restartTriggers = [ fangfrischConfigFile ];
       requires = [ "network-online.target" ];
@@ -266,7 +265,7 @@ in
       };
     };
 
-    systemd.timers.clamdscan = mkIf cfg.scanner.enable {
+    systemd.timers.clamdscan = lib.mkIf cfg.scanner.enable {
       description = "Timer for ClamAV virus scanner";
       wantedBy = [ "timers.target" ];
       timerConfig = {
@@ -275,10 +274,10 @@ in
       };
     };
 
-    systemd.services.clamdscan = mkIf cfg.scanner.enable {
+    systemd.services.clamdscan = lib.mkIf cfg.scanner.enable {
       description = "ClamAV virus scanner";
-      after = optionals cfg.updater.enable [ "clamav-freshclam.service" ];
-      wants = optionals cfg.updater.enable [ "clamav-freshclam.service" ];
+      after = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ];
+      wants = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ];
 
       serviceConfig = {
         Type = "oneshot";

From cd46072e35386adaa180ee8af8447e17645c2753 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0585/1504] nixos/services.endlessh-go: remove `with lib;`

---
 .../modules/services/security/endlessh-go.nix | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix
index 8a22c01390a6..a44652e8afd8 100644
--- a/nixos/modules/services/security/endlessh-go.nix
+++ b/nixos/modules/services/security/endlessh-go.nix
@@ -4,20 +4,17 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.endlessh-go;
 in
 {
   options.services.endlessh-go = {
-    enable = mkEnableOption "endlessh-go service";
+    enable = lib.mkEnableOption "endlessh-go service";
 
-    package = mkPackageOption pkgs "endlessh-go" { };
+    package = lib.mkPackageOption pkgs "endlessh-go" { };
 
-    listenAddress = mkOption {
-      type = types.str;
+    listenAddress = lib.mkOption {
+      type = lib.types.str;
       default = "0.0.0.0";
       example = "[::]";
       description = ''
@@ -25,8 +22,8 @@ in
       '';
     };
 
-    port = mkOption {
-      type = types.port;
+    port = lib.mkOption {
+      type = lib.types.port;
       default = 2222;
       example = 22;
       description = ''
@@ -38,10 +35,10 @@ in
     };
 
     prometheus = {
-      enable = mkEnableOption "Prometheus integration";
+      enable = lib.mkEnableOption "Prometheus integration";
 
-      listenAddress = mkOption {
-        type = types.str;
+      listenAddress = lib.mkOption {
+        type = lib.types.str;
         default = "0.0.0.0";
         example = "[::]";
         description = ''
@@ -50,8 +47,8 @@ in
         '';
       };
 
-      port = mkOption {
-        type = types.port;
+      port = lib.mkOption {
+        type = lib.types.port;
         default = 2112;
         example = 9119;
         description = ''
@@ -61,8 +58,8 @@ in
       };
     };
 
-    extraOptions = mkOption {
-      type = with types; listOf str;
+    extraOptions = lib.mkOption {
+      type = with lib.types; listOf str;
       default = [ ];
       example = [
         "-conn_type=tcp4"
@@ -73,8 +70,8 @@ in
       '';
     };
 
-    openFirewall = mkOption {
-      type = types.bool;
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Whether to open a firewall port for the SSH listener.
@@ -82,7 +79,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.endlessh-go = {
       description = "SSH tarpit";
       requires = [ "network.target" ];
@@ -90,7 +87,7 @@ in
       serviceConfig =
         let
           needsPrivileges = cfg.port < 1024 || cfg.prometheus.port < 1024;
-          capabilities = [ "" ] ++ optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ];
+          capabilities = [ "" ] ++ lib.optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ];
           rootDirectory = "/run/endlessh-go";
         in
         {
@@ -155,5 +152,5 @@ in
     networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ];
   };
 
-  meta.maintainers = with maintainers; [ azahi ];
+  meta.maintainers = with lib.maintainers; [ azahi ];
 }

From 57fa81efce06f607aaa0c234714b9ba080eaf49e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0586/1504] nixos/services.endlessh: remove `with lib;`

---
 nixos/modules/services/security/endlessh.nix | 23 +++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/security/endlessh.nix b/nixos/modules/services/security/endlessh.nix
index 479e27d18ccd..cac6de5c3cf3 100644
--- a/nixos/modules/services/security/endlessh.nix
+++ b/nixos/modules/services/security/endlessh.nix
@@ -4,18 +4,15 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.endlessh;
 in
 {
   options.services.endlessh = {
-    enable = mkEnableOption "endlessh service";
+    enable = lib.mkEnableOption "endlessh service";
 
-    port = mkOption {
-      type = types.port;
+    port = lib.mkOption {
+      type = lib.types.port;
       default = 2222;
       example = 22;
       description = ''
@@ -26,8 +23,8 @@ in
       '';
     };
 
-    extraOptions = mkOption {
-      type = with types; listOf str;
+    extraOptions = lib.mkOption {
+      type = with lib.types; listOf str;
       default = [ ];
       example = [
         "-6"
@@ -39,8 +36,8 @@ in
       '';
     };
 
-    openFirewall = mkOption {
-      type = types.bool;
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Whether to open a firewall port for the SSH listener.
@@ -48,7 +45,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.endlessh = {
       description = "SSH tarpit";
       requires = [ "network.target" ];
@@ -56,7 +53,7 @@ in
       serviceConfig =
         let
           needsPrivileges = cfg.port < 1024;
-          capabilities = [ "" ] ++ optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ];
+          capabilities = [ "" ] ++ lib.optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ];
           rootDirectory = "/run/endlessh";
         in
         {
@@ -115,5 +112,5 @@ in
     networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ];
   };
 
-  meta.maintainers = with maintainers; [ azahi ];
+  meta.maintainers = with lib.maintainers; [ azahi ];
 }

From f22a652424ab579c3e90fb7c948dcb4c44a69d72 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0587/1504] nixos/services.fail2ban: remove `with lib;`

---
 nixos/modules/services/security/fail2ban.nix | 151 +++++++++----------
 1 file changed, 74 insertions(+), 77 deletions(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index d006f08f121a..83a65111756b 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -4,47 +4,44 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.fail2ban;
 
   settingsFormat = pkgs.formats.keyValue { };
 
   configFormat = pkgs.formats.ini {
-    mkKeyValue = generators.mkKeyValueDefault { } " = ";
+    mkKeyValue = lib.generators.mkKeyValueDefault { } " = ";
   };
 
   mkJailConfig =
     name: attrs:
-    optionalAttrs (name != "DEFAULT") { inherit (attrs) enabled; }
-    // optionalAttrs (attrs.filter != null) {
-      filter = if (builtins.isString filter) then filter else name;
+    lib.optionalAttrs (name != "DEFAULT") { inherit (attrs) enabled; }
+    // lib.optionalAttrs (attrs.filter != null) {
+      filter = if (builtins.isString lib.filter) then lib.filter else name;
     }
     // attrs.settings;
 
   mkFilter =
     name: attrs:
-    nameValuePair "fail2ban/filter.d/${name}.conf" {
+    lib.nameValuePair "fail2ban/filter.d/${name}.conf" {
       source = configFormat.generate "filter.d/${name}.conf" attrs.filter;
     };
 
   fail2banConf = configFormat.generate "fail2ban.local" cfg.daemonSettings;
 
-  strJails = filterAttrs (_: builtins.isString) cfg.jails;
-  attrsJails = filterAttrs (_: builtins.isAttrs) cfg.jails;
+  strJails = lib.filterAttrs (_: builtins.isString) cfg.jails;
+  attrsJails = lib.filterAttrs (_: builtins.isAttrs) cfg.jails;
 
   jailConf =
     let
       configFile = configFormat.generate "jail.local" (
-        { INCLUDES.before = "paths-nixos.conf"; } // (mapAttrs mkJailConfig attrsJails)
+        { INCLUDES.before = "paths-nixos.conf"; } // (lib.mapAttrs mkJailConfig attrsJails)
       );
-      extraConfig = concatStringsSep "\n" (
-        attrValues (
-          mapAttrs (
+      extraConfig = lib.concatStringsSep "\n" (
+        lib.attrValues (
+          lib.mapAttrs (
             name: def:
-            optionalString (def != "") ''
+            lib.optionalString (def != "") ''
               [${name}]
               ${def}
             ''
@@ -74,12 +71,12 @@ in
 {
 
   imports = [
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "fail2ban"
       "daemonConfig"
     ] "The daemon is now configured through the attribute set `services.fail2ban.daemonSettings`.")
-    (mkRemovedOptionModule [ "services" "fail2ban" "extraSettings" ]
+    (lib.mkRemovedOptionModule [ "services" "fail2ban" "extraSettings" ]
       "The extra default configuration can now be set using `services.fail2ban.jails.DEFAULT.settings`."
     )
   ];
@@ -88,9 +85,9 @@ in
 
   options = {
     services.fail2ban = {
-      enable = mkOption {
+      enable = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = ''
           Whether to enable the fail2ban service.
 
@@ -99,20 +96,20 @@ in
         '';
       };
 
-      package = mkPackageOption pkgs "fail2ban" {
+      package = lib.mkPackageOption pkgs "fail2ban" {
         example = "fail2ban_0_11";
       };
 
-      packageFirewall = mkOption {
+      packageFirewall = lib.mkOption {
         default = config.networking.firewall.package;
-        defaultText = literalExpression "config.networking.firewall.package";
-        type = types.package;
+        defaultText = lib.literalExpression "config.networking.firewall.package";
+        type = lib.types.package;
         description = "The firewall package used by fail2ban service. Defaults to the package for your firewall (iptables or nftables).";
       };
 
-      extraPackages = mkOption {
+      extraPackages = lib.mkOption {
         default = [ ];
-        type = types.listOf types.package;
+        type = lib.types.listOf lib.types.package;
         example = lib.literalExpression "[ pkgs.ipset ]";
         description = ''
           Extra packages to be made available to the fail2ban service. The example contains
@@ -120,23 +117,23 @@ in
         '';
       };
 
-      bantime = mkOption {
+      bantime = lib.mkOption {
         default = "10m";
-        type = types.str;
+        type = lib.types.str;
         example = "1h";
         description = "Number of seconds that a host is banned.";
       };
 
-      maxretry = mkOption {
+      maxretry = lib.mkOption {
         default = 3;
-        type = types.ints.unsigned;
+        type = lib.types.ints.unsigned;
         description = "Number of failures before a host gets banned.";
       };
 
-      banaction = mkOption {
+      banaction = lib.mkOption {
         default = if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport";
-        defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"'';
-        type = types.str;
+        defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"'';
+        type = lib.types.str;
         description = ''
           Default banning action (e.g. iptables, iptables-new, iptables-multiport,
           iptables-ipset-proto6-allports, shorewall, etc). It is used to
@@ -145,10 +142,10 @@ in
         '';
       };
 
-      banaction-allports = mkOption {
+      banaction-allports = lib.mkOption {
         default = if config.networking.nftables.enable then "nftables-allports" else "iptables-allports";
-        defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-allports" else "iptables-allports"'';
-        type = types.str;
+        defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables-allports" else "iptables-allports"'';
+        type = lib.types.str;
         description = ''
           Default banning action (e.g. iptables, iptables-new, iptables-multiport,
           shorewall, etc) for "allports" jails. It is used to define action_* variables. Can be overridden
@@ -156,18 +153,18 @@ in
         '';
       };
 
-      bantime-increment.enable = mkOption {
+      bantime-increment.enable = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = ''
           "bantime.increment" allows to use database for searching of previously banned ip's to increase
           a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32 ...
         '';
       };
 
-      bantime-increment.rndtime = mkOption {
+      bantime-increment.rndtime = lib.mkOption {
         default = null;
-        type = types.nullOr types.str;
+        type = lib.types.nullOr lib.types.str;
         example = "8m";
         description = ''
           "bantime.rndtime" is the max number of seconds using for mixing with random time
@@ -175,18 +172,18 @@ in
         '';
       };
 
-      bantime-increment.maxtime = mkOption {
+      bantime-increment.maxtime = lib.mkOption {
         default = null;
-        type = types.nullOr types.str;
+        type = lib.types.nullOr lib.types.str;
         example = "48h";
         description = ''
           "bantime.maxtime" is the max number of seconds using the ban time can reach (don't grows further)
         '';
       };
 
-      bantime-increment.factor = mkOption {
+      bantime-increment.factor = lib.mkOption {
         default = null;
-        type = types.nullOr types.str;
+        type = lib.types.nullOr lib.types.str;
         example = "4";
         description = ''
           "bantime.factor" is a coefficient to calculate exponent growing of the formula or common multiplier,
@@ -194,9 +191,9 @@ in
         '';
       };
 
-      bantime-increment.formula = mkOption {
+      bantime-increment.formula = lib.mkOption {
         default = null;
-        type = types.nullOr types.str;
+        type = lib.types.nullOr lib.types.str;
         example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)";
         description = ''
           "bantime.formula" used by default to calculate next value of ban time, default value below,
@@ -204,9 +201,9 @@ in
         '';
       };
 
-      bantime-increment.multipliers = mkOption {
+      bantime-increment.multipliers = lib.mkOption {
         default = null;
-        type = types.nullOr types.str;
+        type = lib.types.nullOr lib.types.str;
         example = "1 2 4 8 16 32 64";
         description = ''
           "bantime.multipliers" used to calculate next value of ban time instead of formula, corresponding
@@ -216,9 +213,9 @@ in
         '';
       };
 
-      bantime-increment.overalljails = mkOption {
+      bantime-increment.overalljails = lib.mkOption {
         default = null;
-        type = types.nullOr types.bool;
+        type = lib.types.nullOr lib.types.bool;
         example = true;
         description = ''
           "bantime.overalljails" (if true) specifies the search of IP in the database will be executed
@@ -226,9 +223,9 @@ in
         '';
       };
 
-      ignoreIP = mkOption {
+      ignoreIP = lib.mkOption {
         default = [ ];
-        type = types.listOf types.str;
+        type = lib.types.listOf lib.types.str;
         example = [
           "192.168.0.0/16"
           "2001:DB8::42"
@@ -239,10 +236,10 @@ in
         '';
       };
 
-      daemonSettings = mkOption {
+      daemonSettings = lib.mkOption {
         inherit (configFormat) type;
 
-        defaultText = literalExpression ''
+        defaultText = lib.literalExpression ''
           {
             Definition = {
               logtarget = "SYSLOG";
@@ -258,9 +255,9 @@ in
         '';
       };
 
-      jails = mkOption {
+      jails = lib.mkOption {
         default = { };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             apache-nohome-iptables = {
               settings = {
@@ -287,26 +284,26 @@ in
           };
         '';
         type =
-          with types;
+          with lib.types;
           attrsOf (
             either lines (
               submodule (
                 { name, ... }:
                 {
                   options = {
-                    enabled = mkEnableOption "this jail" // {
+                    enabled = lib.mkEnableOption "this jail" // {
                       default = true;
                       readOnly = name == "DEFAULT";
                     };
 
-                    filter = mkOption {
+                    filter = lib.mkOption {
                       type = nullOr (either str configFormat.type);
 
                       default = null;
                       description = "Content of the filter used for this jail.";
                     };
 
-                    settings = mkOption {
+                    settings = lib.mkOption {
                       inherit (settingsFormat) type;
 
                       default = { };
@@ -344,7 +341,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     assertions = [
       {
         assertion = cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null;
@@ -354,7 +351,7 @@ in
       }
     ];
 
-    warnings = mkIf (!config.networking.firewall.enable && !config.networking.nftables.enable) [
+    warnings = lib.mkIf (!config.networking.firewall.enable && !config.networking.nftables.enable) [
       "fail2ban can not be used without a firewall"
     ];
 
@@ -371,14 +368,14 @@ in
         "fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf";
         "fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf";
       }
-      // (mapAttrs' mkFilter (
-        filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails
+      // (lib.mapAttrs' mkFilter (
+        lib.filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails
       ));
 
     systemd.packages = [ cfg.package ];
     systemd.services.fail2ban = {
       wantedBy = [ "multi-user.target" ];
-      partOf = optional config.networking.firewall.enable "firewall.service";
+      partOf = lib.optional config.networking.firewall.enable "firewall.service";
 
       restartTriggers = [
         fail2banConf
@@ -423,29 +420,29 @@ in
 
     # Defaults for the daemon settings
     services.fail2ban.daemonSettings.Definition = {
-      logtarget = mkDefault "SYSLOG";
-      socket = mkDefault "/run/fail2ban/fail2ban.sock";
-      pidfile = mkDefault "/run/fail2ban/fail2ban.pid";
-      dbfile = mkDefault "/var/lib/fail2ban/fail2ban.sqlite3";
+      logtarget = lib.mkDefault "SYSLOG";
+      socket = lib.mkDefault "/run/fail2ban/fail2ban.sock";
+      pidfile = lib.mkDefault "/run/fail2ban/fail2ban.pid";
+      dbfile = lib.mkDefault "/var/lib/fail2ban/fail2ban.sqlite3";
     };
 
     # Add some reasonable default jails.  The special "DEFAULT" jail
     # sets default values for all other jails.
-    services.fail2ban.jails = mkMerge [
+    services.fail2ban.jails = lib.mkMerge [
       {
         DEFAULT.settings =
-          (optionalAttrs cfg.bantime-increment.enable (
+          (lib.optionalAttrs cfg.bantime-increment.enable (
             {
               "bantime.increment" = cfg.bantime-increment.enable;
             }
-            // (mapAttrs' (name: nameValuePair "bantime.${name}") (
-              filterAttrs (n: v: v != null && n != "enable") cfg.bantime-increment
+            // (lib.mapAttrs' (name: lib.nameValuePair "bantime.${name}") (
+              lib.filterAttrs (n: v: v != null && n != "enable") cfg.bantime-increment
             ))
           ))
           // {
             # Miscellaneous options
             inherit (cfg) banaction maxretry bantime;
-            ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}'';
+            ignoreip = ''127.0.0.1/8 ${lib.optionalString config.networking.enableIPv6 "::1"} ${lib.concatStringsSep " " cfg.ignoreIP}'';
             backend = "systemd";
             # Actions
             banaction_allports = cfg.banaction-allports;
@@ -453,15 +450,15 @@ in
       }
 
       # Block SSH if there are too many failing connection attempts.
-      (mkIf config.services.openssh.enable {
-        sshd.settings.port = mkDefault (
-          concatMapStringsSep "," builtins.toString config.services.openssh.ports
+      (lib.mkIf config.services.openssh.enable {
+        sshd.settings.port = lib.mkDefault (
+          lib.concatMapStringsSep "," builtins.toString config.services.openssh.ports
         );
       })
     ];
 
     # Benefits from verbose sshd logging to observe failed login attempts,
     # so we set that here unless the user overrode it.
-    services.openssh.settings.LogLevel = mkDefault "VERBOSE";
+    services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE";
   };
 }

From 4d9366e1980b4c6e0ccbdca793b5ed08e481ad05 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0588/1504] nixos/services.fprintd: remove `with lib;`

---
 nixos/modules/services/security/fprintd.nix | 23 +++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix
index 87c3f1f6f9e4..ea6d6189d248 100644
--- a/nixos/modules/services/security/fprintd.nix
+++ b/nixos/modules/services/security/fprintd.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.fprintd;
@@ -18,12 +15,12 @@ in
 
     services.fprintd = {
 
-      enable = mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling";
+      enable = lib.mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling";
 
-      package = mkOption {
-        type = types.package;
+      package = lib.mkOption {
+        type = lib.types.package;
         default = fprintdPkg;
-        defaultText = literalExpression "if config.services.fprintd.tod.enable then pkgs.fprintd-tod else pkgs.fprintd";
+        defaultText = lib.literalExpression "if config.services.fprintd.tod.enable then pkgs.fprintd-tod else pkgs.fprintd";
         description = ''
           fprintd package to use.
         '';
@@ -31,11 +28,11 @@ in
 
       tod = {
 
-        enable = mkEnableOption "Touch OEM Drivers library support";
+        enable = lib.mkEnableOption "Touch OEM Drivers library support";
 
-        driver = mkOption {
-          type = types.package;
-          example = literalExpression "pkgs.libfprint-2-tod1-goodix";
+        driver = lib.mkOption {
+          type = lib.types.package;
+          example = lib.literalExpression "pkgs.libfprint-2-tod1-goodix";
           description = ''
             Touch OEM Drivers (TOD) package to use.
           '';
@@ -47,7 +44,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     services.dbus.packages = [ cfg.package ];
 
@@ -55,7 +52,7 @@ in
 
     systemd.packages = [ cfg.package ];
 
-    systemd.services.fprintd.environment = mkIf cfg.tod.enable {
+    systemd.services.fprintd.environment = lib.mkIf cfg.tod.enable {
       FP_TOD_DRIVERS_DIR = "${cfg.tod.driver}${cfg.tod.driver.driverPath}";
     };
 

From 1c7eaa7b7ab0e3a5745910896a8db7106c272ac6 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:36 +0100
Subject: [PATCH 0589/1504] nixos/services.haka: remove `with lib;`

---
 nixos/modules/services/security/haka.nix | 50 +++++++++++-------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index 05bb6025e5ec..a9ec240c50cf 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -1,14 +1,10 @@
 # This module defines global configuration for Haka.
-
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.haka;
@@ -23,14 +19,14 @@ let
       else
         "${haka}/share/haka/sample/${cfg.configFile}"
     }
-    ${optionalString (builtins.lessThan 0 cfg.threads) "thread = ${cfg.threads}"}
+    ${lib.optionalString (builtins.lessThan 0 cfg.threads) "thread = ${cfg.threads}"}
 
     [packet]
-    ${optionalString cfg.pcap ''module = "packet/pcap"''}
-    ${optionalString cfg.nfqueue ''module = "packet/nqueue"''}
-    ${optionalString cfg.dump.enable ''dump = "yes"''}
-    ${optionalString cfg.dump.enable ''dump_input = "${cfg.dump.input}"''}
-    ${optionalString cfg.dump.enable ''dump_output = "${cfg.dump.output}"''}
+    ${lib.optionalString cfg.pcap ''module = "packet/pcap"''}
+    ${lib.optionalString cfg.nfqueue ''module = "packet/nqueue"''}
+    ${lib.optionalString cfg.dump.enable ''dump = "yes"''}
+    ${lib.optionalString cfg.dump.enable ''dump_input = "${cfg.dump.input}"''}
+    ${lib.optionalString cfg.dump.enable ''dump_output = "${cfg.dump.output}"''}
 
     interfaces = "${lib.strings.concatStringsSep "," cfg.interfaces}"
 
@@ -62,14 +58,14 @@ in
 
     services.haka = {
 
-      enable = mkEnableOption "Haka";
+      enable = lib.mkEnableOption "Haka";
 
-      package = mkPackageOption pkgs "haka" { };
+      package = lib.mkPackageOption pkgs "haka" { };
 
-      configFile = mkOption {
+      configFile = lib.mkOption {
         default = "empty.lua";
         example = "/srv/haka/myfilter.lua";
-        type = types.str;
+        type = lib.types.str;
         description = ''
           Specify which configuration file Haka uses.
           It can be absolute path or a path relative to the sample directory of
@@ -77,46 +73,46 @@ in
         '';
       };
 
-      interfaces = mkOption {
+      interfaces = lib.mkOption {
         default = [ "eth0" ];
         example = [ "any" ];
-        type = with types; listOf str;
+        type = with lib.types; listOf str;
         description = ''
           Specify which interface(s) Haka listens to.
           Use 'any' to listen to all interfaces.
         '';
       };
 
-      threads = mkOption {
+      threads = lib.mkOption {
         default = 0;
         example = 4;
-        type = types.int;
+        type = lib.types.int;
         description = ''
           The number of threads that will be used.
           All system threads are used by default.
         '';
       };
 
-      pcap = mkOption {
+      pcap = lib.mkOption {
         default = true;
-        type = types.bool;
+        type = lib.types.bool;
         description = "Whether to enable pcap";
       };
 
-      nfqueue = mkEnableOption "nfqueue";
+      nfqueue = lib.mkEnableOption "nfqueue";
 
-      dump.enable = mkEnableOption "dump";
-      dump.input = mkOption {
+      dump.enable = lib.mkEnableOption "dump";
+      dump.input = lib.mkOption {
         default = "/tmp/input.pcap";
         example = "/path/to/file.pcap";
-        type = types.path;
+        type = lib.types.path;
         description = "Path to file where incoming packets are dumped";
       };
 
-      dump.output = mkOption {
+      dump.output = lib.mkOption {
         default = "/tmp/output.pcap";
         example = "/path/to/file.pcap";
-        type = types.path;
+        type = lib.types.path;
         description = "Path to file where outgoing packets are dumped";
       };
     };
@@ -124,7 +120,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     assertions = [
       {

From f155ae804a185c3c7b3ab4b0de2fe8af89e5327e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0590/1504] nixos/services.haveged: remove `with lib;`

---
 nixos/modules/services/security/haveged.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix
index 778877825bb6..3e0a9f224cc8 100644
--- a/nixos/modules/services/security/haveged.nix
+++ b/nixos/modules/services/security/haveged.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.haveged;
 
@@ -20,14 +17,14 @@ in
 
     services.haveged = {
 
-      enable = mkEnableOption ''
+      enable = lib.mkEnableOption ''
         haveged entropy daemon, which refills /dev/random when low.
         NOTE: does nothing on kernels newer than 5.6
       '';
       # source for the note https://github.com/jirka-h/haveged/issues/57
 
-      refill_threshold = mkOption {
-        type = types.int;
+      refill_threshold = lib.mkOption {
+        type = lib.types.int;
         default = 1024;
         description = ''
           The number of bits of available entropy beneath which
@@ -39,7 +36,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     # https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service
     systemd.services.haveged = {

From 83ccb2a1bfdb998e93696889e19b127b5c7cdf62 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0591/1504] nixos/services.hologram-agent: remove `with lib;`

---
 .../services/security/hologram-agent.nix        | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index e28efd1d12f6..21bedc4fabd2 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -4,9 +4,6 @@
   lib,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.hologram-agent;
 
@@ -19,20 +16,20 @@ in
 {
   options = {
     services.hologram-agent = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to enable the Hologram agent for AWS instance credentials";
       };
 
-      dialAddress = mkOption {
-        type = types.str;
+      dialAddress = lib.mkOption {
+        type = lib.types.str;
         default = "localhost:3100";
         description = "Hologram server and port.";
       };
 
-      httpPort = mkOption {
-        type = types.str;
+      httpPort = lib.mkOption {
+        type = lib.types.str;
         default = "80";
         description = "Port for metadata service to listen on.";
       };
@@ -40,7 +37,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     boot.kernelModules = [ "dummy" ];
 
     networking.interfaces.dummy0.ipv4.addresses = [

From 3bb7989e0ddd78d28835d22a041ae8d65b02c7ff Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0592/1504] nixos/services.hologram-server: remove `with lib;`

---
 .../services/security/hologram-server.nix     | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index 58e2e58e9c0b..70f9b0e250db 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -4,9 +4,6 @@
   lib,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.hologram-server;
 
@@ -38,93 +35,93 @@ in
 {
   options = {
     services.hologram-server = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to enable the Hologram server for AWS instance credentials";
       };
 
-      listenAddress = mkOption {
-        type = types.str;
+      listenAddress = lib.mkOption {
+        type = lib.types.str;
         default = "0.0.0.0:3100";
         description = "Address and port to listen on";
       };
 
-      ldapHost = mkOption {
-        type = types.str;
+      ldapHost = lib.mkOption {
+        type = lib.types.str;
         description = "Address of the LDAP server to use";
       };
 
-      ldapInsecure = mkOption {
-        type = types.bool;
+      ldapInsecure = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to connect to LDAP over SSL or not";
       };
 
-      ldapUserAttr = mkOption {
-        type = types.str;
+      ldapUserAttr = lib.mkOption {
+        type = lib.types.str;
         default = "cn";
         description = "The LDAP attribute for usernames";
       };
 
-      ldapBaseDN = mkOption {
-        type = types.str;
+      ldapBaseDN = lib.mkOption {
+        type = lib.types.str;
         description = "The base DN for your Hologram users";
       };
 
-      ldapBindDN = mkOption {
-        type = types.str;
+      ldapBindDN = lib.mkOption {
+        type = lib.types.str;
         description = "DN of account to use to query the LDAP server";
       };
 
-      ldapBindPassword = mkOption {
-        type = types.str;
+      ldapBindPassword = lib.mkOption {
+        type = lib.types.str;
         description = "Password of account to use to query the LDAP server";
       };
 
-      enableLdapRoles = mkOption {
-        type = types.bool;
+      enableLdapRoles = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to assign user roles based on the user's LDAP group memberships";
       };
 
-      groupClassAttr = mkOption {
-        type = types.str;
+      groupClassAttr = lib.mkOption {
+        type = lib.types.str;
         default = "groupOfNames";
         description = "The objectclass attribute to search for groups when enableLdapRoles is true";
       };
 
-      roleAttr = mkOption {
-        type = types.str;
+      roleAttr = lib.mkOption {
+        type = lib.types.str;
         default = "businessCategory";
         description = "Which LDAP group attribute to search for authorized role ARNs";
       };
 
-      awsAccount = mkOption {
-        type = types.str;
+      awsAccount = lib.mkOption {
+        type = lib.types.str;
         description = "AWS account number";
       };
 
-      awsDefaultRole = mkOption {
-        type = types.str;
+      awsDefaultRole = lib.mkOption {
+        type = lib.types.str;
         description = "AWS default role";
       };
 
-      statsAddress = mkOption {
-        type = types.str;
+      statsAddress = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Address of statsd server";
       };
 
-      cacheTimeoutSeconds = mkOption {
-        type = types.int;
+      cacheTimeoutSeconds = lib.mkOption {
+        type = lib.types.int;
         default = 3600;
         description = "How often (in seconds) to refresh the LDAP cache";
       };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.hologram-server = {
       description = "Provide EC2 instance credentials to machines outside of EC2";
       after = [ "network.target" ];

From bd92ad1747ccfb73ee38cfe349aa0a7b1db2585d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0593/1504] nixos/services.infnoise: remove `with lib;`

---
 nixos/modules/services/security/infnoise.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/security/infnoise.nix b/nixos/modules/services/security/infnoise.nix
index 36dce8bb3e03..0a71f16d9ffa 100644
--- a/nixos/modules/services/security/infnoise.nix
+++ b/nixos/modules/services/security/infnoise.nix
@@ -4,38 +4,35 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.infnoise;
 in
 {
   options = {
     services.infnoise = {
-      enable = mkEnableOption "the Infinite Noise TRNG driver";
+      enable = lib.mkEnableOption "the Infinite Noise TRNG driver";
 
-      fillDevRandom = mkOption {
+      fillDevRandom = lib.mkOption {
         description = ''
           Whether to run the infnoise driver as a daemon to refill /dev/random.
 
           If disabled, you can use the `infnoise` command-line tool to
           manually obtain randomness.
         '';
-        type = types.bool;
+        type = lib.types.bool;
         default = true;
       };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.infnoise ];
 
     services.udev.extraRules = ''
       SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", SYMLINK+="infnoise", TAG+="systemd", GROUP="dialout", MODE="0664", ENV{SYSTEMD_WANTS}="infnoise.service"
     '';
 
-    systemd.services.infnoise = mkIf cfg.fillDevRandom {
+    systemd.services.infnoise = lib.mkIf cfg.fillDevRandom {
       description = "Infinite Noise TRNG driver";
 
       bindsTo = [ "dev-infnoise.device" ];

From bc6eb177b423b0cf8c52801328e71af0769e9330 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0594/1504] nixos/services.munge: remove `with lib;`

---
 nixos/modules/services/security/munge.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix
index 16481f116532..00fb0a1e1ac3 100644
--- a/nixos/modules/services/security/munge.nix
+++ b/nixos/modules/services/security/munge.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.munge;
@@ -20,11 +17,11 @@ in
   options = {
 
     services.munge = {
-      enable = mkEnableOption "munge service";
+      enable = lib.mkEnableOption "munge service";
 
-      password = mkOption {
+      password = lib.mkOption {
         default = "/etc/munge/munge.key";
-        type = types.path;
+        type = lib.types.path;
         description = ''
           The path to a daemon's secret key.
         '';
@@ -36,7 +33,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.munge ];
 

From fe23e335d553104211719cb40a65387b7fa65478 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0595/1504] nixos/services.nginx.sso: remove `with lib;`

---
 nixos/modules/services/security/nginx-sso.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/security/nginx-sso.nix b/nixos/modules/services/security/nginx-sso.nix
index 7afa0054c9d5..548a44e83ee2 100644
--- a/nixos/modules/services/security/nginx-sso.nix
+++ b/nixos/modules/services/security/nginx-sso.nix
@@ -1,21 +1,18 @@
 { config, lib, pkgs, utils, ... }:
-
-with lib;
-
 let
   cfg = config.services.nginx.sso;
   format = pkgs.formats.yaml { };
   configPath = "/var/lib/nginx-sso/config.yaml";
 in {
   options.services.nginx.sso = {
-    enable = mkEnableOption "nginx-sso service";
+    enable = lib.mkEnableOption "nginx-sso service";
 
-    package = mkPackageOption pkgs "nginx-sso" { };
+    package = lib.mkPackageOption pkgs "nginx-sso" { };
 
-    configuration = mkOption {
+    configuration = lib.mkOption {
       type = format.type;
       default = {};
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           listen = { addr = "127.0.0.1"; port = 8080; };
 
@@ -48,7 +45,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.nginx-sso = {
       description = "Nginx SSO Backend";
       after = [ "network.target" ];

From a8d331716ca5f23a1955487309981877339bbb6a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0596/1504] nixos/services.opensnitch: remove `with lib;`

---
 .../modules/services/security/opensnitch.nix  | 77 +++++++++----------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix
index 10b44052ac6e..897cf2587bac 100644
--- a/nixos/modules/services/security/opensnitch.nix
+++ b/nixos/modules/services/security/opensnitch.nix
@@ -4,14 +4,11 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.opensnitch;
   format = pkgs.formats.json { };
 
-  predefinedRules = flip mapAttrs cfg.rules (
+  predefinedRules = lib.flip lib.mapAttrs cfg.rules (
     name: cfg: {
       file = pkgs.writeText "rule" (builtins.toJSON cfg);
     }
@@ -21,11 +18,11 @@ in
 {
   options = {
     services.opensnitch = {
-      enable = mkEnableOption "Opensnitch application firewall";
+      enable = lib.mkEnableOption "Opensnitch application firewall";
 
-      rules = mkOption {
+      rules = lib.mkOption {
         default = { };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             "tor" = {
               "name" = "tor";
@@ -50,28 +47,28 @@ in
           for available options.
         '';
 
-        type = types.submodule {
+        type = lib.types.submodule {
           freeformType = format.type;
         };
       };
 
-      settings = mkOption {
-        type = types.submodule {
+      settings = lib.mkOption {
+        type = lib.types.submodule {
           freeformType = format.type;
 
           options = {
             Server = {
 
-              Address = mkOption {
-                type = types.str;
+              Address = lib.mkOption {
+                type = lib.types.str;
                 description = ''
                   Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is
                   mandatory) or TCP socket (192.168.1.100:50051).
                 '';
               };
 
-              LogFile = mkOption {
-                type = types.path;
+              LogFile = lib.mkOption {
+                type = lib.types.path;
                 description = ''
                   File to write logs to (use /dev/stdout to write logs to standard
                   output).
@@ -80,8 +77,8 @@ in
 
             };
 
-            DefaultAction = mkOption {
-              type = types.enum [
+            DefaultAction = lib.mkOption {
+              type = lib.types.enum [
                 "allow"
                 "deny"
               ];
@@ -91,15 +88,15 @@ in
               '';
             };
 
-            InterceptUnknown = mkOption {
-              type = types.bool;
+            InterceptUnknown = lib.mkOption {
+              type = lib.types.bool;
               description = ''
                 Whether to intercept spare connections.
               '';
             };
 
-            ProcMonitorMethod = mkOption {
-              type = types.enum [
+            ProcMonitorMethod = lib.mkOption {
+              type = lib.types.enum [
                 "ebpf"
                 "proc"
                 "ftrace"
@@ -110,8 +107,8 @@ in
               '';
             };
 
-            LogLevel = mkOption {
-              type = types.enum [
+            LogLevel = lib.mkOption {
+              type = lib.types.enum [
                 0
                 1
                 2
@@ -124,8 +121,8 @@ in
               '';
             };
 
-            Firewall = mkOption {
-              type = types.enum [
+            Firewall = lib.mkOption {
+              type = lib.types.enum [
                 "iptables"
                 "nftables"
               ];
@@ -136,15 +133,15 @@ in
 
             Stats = {
 
-              MaxEvents = mkOption {
-                type = types.int;
+              MaxEvents = lib.mkOption {
+                type = lib.types.int;
                 description = ''
                   Max events to send to the GUI.
                 '';
               };
 
-              MaxStats = mkOption {
-                type = types.int;
+              MaxStats = lib.mkOption {
+                type = lib.types.int;
                 description = ''
                   Max stats per item to keep in backlog.
                 '';
@@ -152,14 +149,14 @@ in
 
             };
 
-            Ebpf.ModulesPath = mkOption {
-              type = types.path;
+            Ebpf.ModulesPath = lib.mkOption {
+              type = lib.types.path;
               default =
                 if cfg.settings.ProcMonitorMethod == "ebpf" then
                   "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd"
                 else
                   null;
-              defaultText = literalExpression ''
+              defaultText = lib.literalExpression ''
                 if cfg.settings.ProcMonitorMethod == "ebpf" then
                   "\\$\\{config.boot.kernelPackages.opensnitch-ebpf\\}/etc/opensnitchd"
                 else null;
@@ -170,8 +167,8 @@ in
               '';
             };
 
-            Rules.Path = mkOption {
-              type = types.path;
+            Rules.Path = lib.mkOption {
+              type = lib.types.path;
               default = "/var/lib/opensnitch/rules";
               description = ''
                 Path to the directory where firewall rules can be found and will
@@ -189,10 +186,10 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected
-    services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (
+    services.opensnitch.settings = lib.mapAttrs (_: v: lib.mkDefault v) (
       builtins.fromJSON (
         builtins.unsafeDiscardStringContext (
           builtins.readFile "${pkgs.opensnitch}/etc/opensnitchd/default-config.json"
@@ -210,9 +207,9 @@ in
             "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}"
           ];
         };
-        preStart = mkIf (cfg.rules != { }) (
+        preStart = lib.mkIf (cfg.rules != { }) (
           let
-            rules = flip mapAttrsToList predefinedRules (
+            rules = lib.flip lib.mapAttrsToList predefinedRules (
               file: content: {
                 inherit (content) file;
                 local = "${cfg.settings.Rules.Path}/${file}.json";
@@ -225,11 +222,11 @@ in
             # declared in `cfg.rules` (i.e. all networks that were "removed" from
             # `cfg.rules`).
             find ${cfg.settings.Rules.Path} -type l -lname '${builtins.storeDir}/*' ${
-              optionalString (rules != { }) ''
-                -not \( ${concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules} \) \
+              lib.optionalString (rules != { }) ''
+                -not \( ${lib.concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules} \) \
               ''
             } -delete
-            ${concatMapStrings (
+            ${lib.concatMapStrings (
               { file, local }:
               ''
                 ln -sf '${file}' "${local}"

From 9db6d6f09049463703dd6c1554d4985d10cb603c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 22:24:12 +0100
Subject: [PATCH 0597/1504] nixos/services.opensnitch: fmt

---
 nixos/modules/services/security/opensnitch.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix
index 897cf2587bac..97700987025d 100644
--- a/nixos/modules/services/security/opensnitch.nix
+++ b/nixos/modules/services/security/opensnitch.nix
@@ -223,7 +223,9 @@ in
             # `cfg.rules`).
             find ${cfg.settings.Rules.Path} -type l -lname '${builtins.storeDir}/*' ${
               lib.optionalString (rules != { }) ''
-                -not \( ${lib.concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules} \) \
+                -not \( ${
+                  lib.concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules
+                } \) \
               ''
             } -delete
             ${lib.concatMapStrings (

From 59dacf1e5302fe839a68e756efe3a6c0bd1dcc59 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:37 +0100
Subject: [PATCH 0598/1504] nixos/services.passSecretService: remove `with
 lib;`

---
 .../modules/services/security/pass-secret-service.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/security/pass-secret-service.nix b/nixos/modules/services/security/pass-secret-service.nix
index 499a934d1366..e9d8432161fa 100644
--- a/nixos/modules/services/security/pass-secret-service.nix
+++ b/nixos/modules/services/security/pass-secret-service.nix
@@ -4,25 +4,22 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.passSecretService;
 in
 {
   options.services.passSecretService = {
-    enable = mkEnableOption "pass secret service";
+    enable = lib.mkEnableOption "pass secret service";
 
-    package = mkPackageOption pkgs "pass-secret-service" {
+    package = lib.mkPackageOption pkgs "pass-secret-service" {
       example = "pass-secret-service.override { python3 = pkgs.python310 }";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.packages = [ cfg.package ];
     services.dbus.packages = [ cfg.package ];
   };
 
-  meta.maintainers = with maintainers; [ aidalgol ];
+  meta.maintainers = with lib.maintainers; [ aidalgol ];
 }

From ace688110ef763e4b798a9d1c7c5f117bf2c098f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0599/1504] nixos/services.physlock: remove `with lib;`

---
 nixos/modules/services/security/physlock.nix | 53 +++++++++-----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 0a6536f4dc6b..0c004c340df8 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.physlock;
 in
@@ -19,8 +16,8 @@ in
 
     services.physlock = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable the {command}`physlock` screen locking mechanism.
@@ -35,8 +32,8 @@ in
         '';
       };
 
-      allowAnyUser = mkOption {
-        type = types.bool;
+      allowAnyUser = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to allow any user to lock the screen. This will install a
@@ -46,24 +43,24 @@ in
         '';
       };
 
-      disableSysRq = mkOption {
-        type = types.bool;
+      disableSysRq = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Whether to disable SysRq when locked with physlock.
         '';
       };
 
-      lockMessage = mkOption {
-        type = types.str;
+      lockMessage = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           Message to show on physlock login terminal.
         '';
       };
 
-      muteKernelMessages = mkOption {
-        type = types.bool;
+      muteKernelMessages = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Disable kernel messages on console while physlock is running.
@@ -72,24 +69,24 @@ in
 
       lockOn = {
 
-        suspend = mkOption {
-          type = types.bool;
+        suspend = lib.mkOption {
+          type = lib.types.bool;
           default = true;
           description = ''
             Whether to lock screen with physlock just before suspend.
           '';
         };
 
-        hibernate = mkOption {
-          type = types.bool;
+        hibernate = lib.mkOption {
+          type = lib.types.bool;
           default = true;
           description = ''
             Whether to lock screen with physlock just before hibernate.
           '';
         };
 
-        extraTargets = mkOption {
-          type = types.listOf types.str;
+        extraTargets = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
           default = [ ];
           example = [ "display-manager.service" ];
           description = ''
@@ -110,7 +107,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable (mkMerge [
+  config = lib.mkIf cfg.enable (lib.mkMerge [
     {
 
       # for physlock -l and physlock -L
@@ -120,18 +117,18 @@ in
         enable = true;
         description = "Physlock";
         wantedBy =
-          optional cfg.lockOn.suspend "suspend.target"
-          ++ optional cfg.lockOn.hibernate "hibernate.target"
+          lib.optional cfg.lockOn.suspend "suspend.target"
+          ++ lib.optional cfg.lockOn.hibernate "hibernate.target"
           ++ cfg.lockOn.extraTargets;
         before =
-          optional cfg.lockOn.suspend "systemd-suspend.service"
-          ++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
-          ++ optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service"
+          lib.optional cfg.lockOn.suspend "systemd-suspend.service"
+          ++ lib.optional cfg.lockOn.hibernate "systemd-hibernate.service"
+          ++ lib.optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service"
           ++ cfg.lockOn.extraTargets;
         serviceConfig = {
           Type = "forking";
-          ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.muteKernelMessages "m"}${optionalString cfg.disableSysRq "s"}${
-            optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""
+          ExecStart = "${pkgs.physlock}/bin/physlock -d${lib.optionalString cfg.muteKernelMessages "m"}${lib.optionalString cfg.disableSysRq "s"}${
+            lib.optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""
           }";
         };
       };
@@ -140,7 +137,7 @@ in
 
     }
 
-    (mkIf cfg.allowAnyUser {
+    (lib.mkIf cfg.allowAnyUser {
 
       security.wrappers.physlock = {
         setuid = true;

From c75c02d0eca26efe9afc1dca08c56e632a1c6386 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 22:24:44 +0100
Subject: [PATCH 0600/1504] nixos/services.physlock: fmt

---
 nixos/modules/services/security/physlock.nix | 70 +++++++++++---------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 0c004c340df8..32167b624f7f 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -107,46 +107,50 @@ in
 
   ###### implementation
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    {
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
 
-      # for physlock -l and physlock -L
-      environment.systemPackages = [ pkgs.physlock ];
+        # for physlock -l and physlock -L
+        environment.systemPackages = [ pkgs.physlock ];
 
-      systemd.services.physlock = {
-        enable = true;
-        description = "Physlock";
-        wantedBy =
-          lib.optional cfg.lockOn.suspend "suspend.target"
-          ++ lib.optional cfg.lockOn.hibernate "hibernate.target"
-          ++ cfg.lockOn.extraTargets;
-        before =
-          lib.optional cfg.lockOn.suspend "systemd-suspend.service"
-          ++ lib.optional cfg.lockOn.hibernate "systemd-hibernate.service"
-          ++ lib.optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service"
-          ++ cfg.lockOn.extraTargets;
-        serviceConfig = {
-          Type = "forking";
-          ExecStart = "${pkgs.physlock}/bin/physlock -d${lib.optionalString cfg.muteKernelMessages "m"}${lib.optionalString cfg.disableSysRq "s"}${
-            lib.optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""
-          }";
+        systemd.services.physlock = {
+          enable = true;
+          description = "Physlock";
+          wantedBy =
+            lib.optional cfg.lockOn.suspend "suspend.target"
+            ++ lib.optional cfg.lockOn.hibernate "hibernate.target"
+            ++ cfg.lockOn.extraTargets;
+          before =
+            lib.optional cfg.lockOn.suspend "systemd-suspend.service"
+            ++ lib.optional cfg.lockOn.hibernate "systemd-hibernate.service"
+            ++ lib.optional (
+              cfg.lockOn.hibernate || cfg.lockOn.suspend
+            ) "systemd-suspend-then-hibernate.service"
+            ++ cfg.lockOn.extraTargets;
+          serviceConfig = {
+            Type = "forking";
+            ExecStart = "${pkgs.physlock}/bin/physlock -d${lib.optionalString cfg.muteKernelMessages "m"}${lib.optionalString cfg.disableSysRq "s"}${
+              lib.optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""
+            }";
+          };
         };
-      };
 
-      security.pam.services.physlock = { };
+        security.pam.services.physlock = { };
 
-    }
+      }
 
-    (lib.mkIf cfg.allowAnyUser {
+      (lib.mkIf cfg.allowAnyUser {
 
-      security.wrappers.physlock = {
-        setuid = true;
-        owner = "root";
-        group = "root";
-        source = "${pkgs.physlock}/bin/physlock";
-      };
+        security.wrappers.physlock = {
+          setuid = true;
+          owner = "root";
+          group = "root";
+          source = "${pkgs.physlock}/bin/physlock";
+        };
 
-    })
-  ]);
+      })
+    ]
+  );
 
 }

From f956ab771b6fd386c28c5195fa4b59790a217295 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0601/1504] nixos/services.sks: remove `with lib;`

---
 nixos/modules/services/security/sks.nix | 33 +++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 2c0067325936..db38ca425210 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.sks;
   sksPkg = cfg.package;
@@ -16,7 +13,7 @@ let
 
 in
 {
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     calbrecht
     jcumming
   ];
@@ -25,15 +22,15 @@ in
 
     services.sks = {
 
-      enable = mkEnableOption ''
+      enable = lib.mkEnableOption ''
         SKS (synchronizing key server for OpenPGP) and start the database
         server. You need to create "''${dataDir}/dump/*.gpg" for the initial
         import'';
 
-      package = mkPackageOption pkgs "sks" { };
+      package = lib.mkPackageOption pkgs "sks" { };
 
-      dataDir = mkOption {
-        type = types.path;
+      dataDir = lib.mkOption {
+        type = lib.types.path;
         default = "/var/db/sks";
         example = "/var/lib/sks";
         # TODO: The default might change to "/var/lib/sks" as this is more
@@ -46,8 +43,8 @@ in
         '';
       };
 
-      extraDbConfig = mkOption {
-        type = types.str;
+      extraDbConfig = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           Set contents of the files "KDB/DB_CONFIG" and "PTree/DB_CONFIG" within
@@ -60,28 +57,28 @@ in
         '';
       };
 
-      hkpAddress = mkOption {
+      hkpAddress = lib.mkOption {
         default = [
           "127.0.0.1"
           "::1"
         ];
-        type = types.listOf types.str;
+        type = lib.types.listOf lib.types.str;
         description = ''
           Domain names, IPv4 and/or IPv6 addresses to listen on for HKP
           requests.
         '';
       };
 
-      hkpPort = mkOption {
+      hkpPort = lib.mkOption {
         default = 11371;
-        type = types.ints.u16;
+        type = lib.types.ints.u16;
         description = "HKP port to listen on.";
       };
 
-      webroot = mkOption {
-        type = types.nullOr types.path;
+      webroot = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = "${sksPkg.webSamples}/OpenPKG";
-        defaultText = literalExpression ''"''${package.webSamples}/OpenPKG"'';
+        defaultText = lib.literalExpression ''"''${package.webSamples}/OpenPKG"'';
         description = ''
           Source directory (will be symlinked, if not null) for the files the
           built-in webserver should serve. SKS (''${pkgs.sks.webSamples})
@@ -96,7 +93,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     users = {
       users.sks = {

From 5d738347e5d76a2cc851839b54da4a74f4dad812 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0602/1504] nixos/services.sshguard: remove `with lib;`

---
 nixos/modules/services/security/sshguard.nix | 53 +++++++++-----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
index ab768f787a66..49d27ad61eb6 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixos/modules/services/security/sshguard.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.sshguard;
 
@@ -19,7 +16,7 @@ let
           "-o cat"
           "-n1"
         ]
-        ++ (map (name: "-t ${escapeShellArg name}") cfg.services)
+        ++ (map (name: "-t ${lib.escapeShellArg name}") cfg.services)
       );
       backend = if config.networking.nftables.enable then "sshg-fw-nft-sets" else "sshg-fw-ipset";
     in
@@ -36,40 +33,40 @@ in
   options = {
 
     services.sshguard = {
-      enable = mkOption {
+      enable = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = "Whether to enable the sshguard service.";
       };
 
-      attack_threshold = mkOption {
+      attack_threshold = lib.mkOption {
         default = 30;
-        type = types.int;
+        type = lib.types.int;
         description = ''
           Block attackers when their cumulative attack score exceeds threshold. Most attacks have a score of 10.
         '';
       };
 
-      blacklist_threshold = mkOption {
+      blacklist_threshold = lib.mkOption {
         default = null;
         example = 120;
-        type = types.nullOr types.int;
+        type = lib.types.nullOr lib.types.int;
         description = ''
           Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file.
         '';
       };
 
-      blacklist_file = mkOption {
+      blacklist_file = lib.mkOption {
         default = "/var/lib/sshguard/blacklist.db";
-        type = types.path;
+        type = lib.types.path;
         description = ''
           Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file.
         '';
       };
 
-      blocktime = mkOption {
+      blocktime = lib.mkOption {
         default = 120;
-        type = types.int;
+        type = lib.types.int;
         description = ''
           Block attackers for initially blocktime seconds after exceeding threshold. Subsequent blocks increase by a factor of 1.5.
 
@@ -77,33 +74,33 @@ in
         '';
       };
 
-      detection_time = mkOption {
+      detection_time = lib.mkOption {
         default = 1800;
-        type = types.int;
+        type = lib.types.int;
         description = ''
           Remember potential attackers for up to detection_time seconds before resetting their score.
         '';
       };
 
-      whitelist = mkOption {
+      whitelist = lib.mkOption {
         default = [ ];
         example = [
           "198.51.100.56"
           "198.51.100.2"
         ];
-        type = types.listOf types.str;
+        type = lib.types.listOf lib.types.str;
         description = ''
           Whitelist a list of addresses, hostnames, or address blocks.
         '';
       };
 
-      services = mkOption {
+      services = lib.mkOption {
         default = [ "sshd" ];
         example = [
           "sshd"
           "exim"
         ];
-        type = types.listOf types.str;
+        type = lib.types.listOf lib.types.str;
         description = ''
           Systemd services sshguard should receive logs of.
         '';
@@ -113,7 +110,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.etc."sshguard.conf".source = configFile;
 
@@ -122,7 +119,7 @@ in
 
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      partOf = optional config.networking.firewall.enable "firewall.service";
+      partOf = lib.optional config.networking.firewall.enable "firewall.service";
 
       restartTriggers = [ configFile ];
 
@@ -149,21 +146,21 @@ in
       # of the ipsets. So instead, we create both the ipsets and
       # firewall rules before sshguard starts.
       preStart =
-        optionalString config.networking.firewall.enable ''
+        lib.optionalString config.networking.firewall.enable ''
           ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet
           ${pkgs.iptables}/bin/iptables  -I INPUT -m set --match-set sshguard4 src -j DROP
         ''
-        + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
+        + lib.optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
           ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6
           ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP
         '';
 
       postStop =
-        optionalString config.networking.firewall.enable ''
+        lib.optionalString config.networking.firewall.enable ''
           ${pkgs.iptables}/bin/iptables  -D INPUT -m set --match-set sshguard4 src -j DROP
           ${pkgs.ipset}/bin/ipset -quiet destroy sshguard4
         ''
-        + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
+        + lib.optionalString (config.networking.firewall.enable && config.networking.enableIPv6) ''
           ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP
           ${pkgs.ipset}/bin/ipset -quiet destroy sshguard6
         '';
@@ -179,11 +176,11 @@ in
                 "-a ${toString cfg.attack_threshold}"
                 "-p ${toString cfg.blocktime}"
                 "-s ${toString cfg.detection_time}"
-                (optionalString (
+                (lib.optionalString (
                   cfg.blacklist_threshold != null
                 ) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file}")
               ]
-              ++ (map (name: "-w ${escapeShellArg name}") cfg.whitelist)
+              ++ (map (name: "-w ${lib.escapeShellArg name}") cfg.whitelist)
             );
           in
           "${pkgs.sshguard}/bin/sshguard ${args}";

From 5bbc04afb045e9e965b751ac3c9ae4edadf24cf8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0603/1504] nixos/services.sslmate-agent: remove `with lib;`

---
 nixos/modules/services/security/sslmate-agent.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/sslmate-agent.nix b/nixos/modules/services/security/sslmate-agent.nix
index 081f4c077841..52e39c03b67f 100644
--- a/nixos/modules/services/security/sslmate-agent.nix
+++ b/nixos/modules/services/security/sslmate-agent.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.sslmate-agent;
 
@@ -16,11 +13,11 @@ in
 
   options = {
     services.sslmate-agent = {
-      enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server";
+      enable = lib.mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ sslmate-agent ];
 
     systemd = {

From 4beedae4a124fc282808756add5292277b9c3c1d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0604/1504] nixos/services.tang: remove `with lib;`

---
 nixos/modules/services/security/tang.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/security/tang.nix b/nixos/modules/services/security/tang.nix
index 3d65a5cf6ead..6bf03d107def 100644
--- a/nixos/modules/services/security/tang.nix
+++ b/nixos/modules/services/security/tang.nix
@@ -4,23 +4,22 @@
   pkgs,
   ...
 }:
-with lib;
 let
   cfg = config.services.tang;
 in
 {
   options.services.tang = {
-    enable = mkEnableOption "tang";
+    enable = lib.mkEnableOption "tang";
 
-    package = mkOption {
-      type = types.package;
+    package = lib.mkOption {
+      type = lib.types.package;
       default = pkgs.tang;
-      defaultText = literalExpression "pkgs.tang";
+      defaultText = lib.literalExpression "pkgs.tang";
       description = "The tang package to use.";
     };
 
-    listenStream = mkOption {
-      type = with types; listOf str;
+    listenStream = lib.mkOption {
+      type = with lib.types; listOf str;
       default = [ "7654" ];
       example = [
         "198.168.100.1:7654"
@@ -33,9 +32,9 @@ in
       '';
     };
 
-    ipAddressAllow = mkOption {
+    ipAddressAllow = lib.mkOption {
       example = [ "192.168.1.0/24" ];
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       description = ''
         Whitelist a list of address prefixes.
         Preferably, internal addresses should be used.
@@ -43,7 +42,7 @@ in
     };
 
   };
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
     systemd.services."tangd@" = {

From a5b40fbc8b28da578a691a87325e2ac557da5a67 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0605/1504] nixos/services.tor: remove `with lib;`

---
 nixos/modules/services/security/tor.nix | 277 ++++++++++++------------
 1 file changed, 137 insertions(+), 140 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 7c7d1a66c774..9db27b4d398c 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -5,10 +5,7 @@
   pkgs,
   ...
 }:
-
 with builtins;
-with lib;
-
 let
   cfg = config.services.tor;
   opt = options.services.tor;
@@ -44,33 +41,33 @@ let
       ]);
   optionBool =
     optionName:
-    mkOption {
-      type = with types; nullOr bool;
+    lib.mkOption {
+      type = with lib.types; nullOr bool;
       default = null;
       description = (descriptionGeneric optionName);
     };
   optionInt =
     optionName:
-    mkOption {
-      type = with types; nullOr int;
+    lib.mkOption {
+      type = with lib.types; nullOr int;
       default = null;
       description = (descriptionGeneric optionName);
     };
   optionString =
     optionName:
-    mkOption {
-      type = with types; nullOr str;
+    lib.mkOption {
+      type = with lib.types; nullOr str;
       default = null;
       description = (descriptionGeneric optionName);
     };
   optionStrings =
     optionName:
-    mkOption {
-      type = with types; listOf str;
+    lib.mkOption {
+      type = with lib.types; listOf str;
       default = [ ];
       description = (descriptionGeneric optionName);
     };
-  optionAddress = mkOption {
+  optionAddress = lib.mkOption {
     type = with types; nullOr str;
     default = null;
     example = "0.0.0.0";
@@ -78,14 +75,14 @@ let
       IPv4 or IPv6 (if between brackets) address.
     '';
   };
-  optionUnix = mkOption {
+  optionUnix = lib.mkOption {
     type = with types; nullOr path;
     default = null;
     description = ''
       Unix domain socket path to use.
     '';
   };
-  optionPort = mkOption {
+  optionPort = lib.mkOption {
     type =
       with types;
       nullOr (oneOf [
@@ -96,13 +93,13 @@ let
   };
   optionPorts =
     optionName:
-    mkOption {
-      type = with types; listOf port;
+    lib.mkOption {
+      type = with lib.types; listOf port;
       default = [ ];
       description = (descriptionGeneric optionName);
     };
   optionIsolablePort =
-    with types;
+    with lib.types;
     oneOf [
       port
       (enum [ "auto" ])
@@ -114,14 +111,14 @@ let
               addr = optionAddress;
               port = optionPort;
               flags = optionFlags;
-              SessionGroup = mkOption {
+              SessionGroup = lib.mkOption {
                 type = nullOr int;
                 default = null;
               };
             }
-            // genAttrs isolateFlags (
+            // lib.genAttrs isolateFlags (
               name:
-              mkOption {
+              lib.mkOption {
                 type = types.bool;
                 default = false;
               }
@@ -136,9 +133,9 @@ let
     ];
   optionIsolablePorts =
     optionName:
-    mkOption {
+    lib.mkOption {
       default = [ ];
-      type = with types; either optionIsolablePort (listOf optionIsolablePort);
+      type = with lib.types; either optionIsolablePort (listOf optionIsolablePort);
       description = (descriptionGeneric optionName);
     };
   isolateFlags = [
@@ -171,7 +168,7 @@ let
         "WorldWritable"
       ] ++ isolateFlags;
     in
-    with types;
+    with lib.types;
     oneOf [
       port
       (submodule (
@@ -183,19 +180,19 @@ let
               addr = optionAddress;
               port = optionPort;
               flags = optionFlags;
-              SessionGroup = mkOption {
+              SessionGroup = lib.mkOption {
                 type = nullOr int;
                 default = null;
               };
             }
-            // genAttrs flags (
+            // lib.genAttrs flags (
               name:
-              mkOption {
+              lib.mkOption {
                 type = types.bool;
                 default = false;
               }
             );
-          config = mkIf doConfig {
+          config = lib.mkIf doConfig {
             # Only add flags in SOCKSPort to avoid duplicates
             flags =
               filter (name: config.${name} == true) flags
@@ -204,17 +201,17 @@ let
         }
       ))
     ];
-  optionFlags = mkOption {
+  optionFlags = lib.mkOption {
     type = with types; listOf str;
     default = [ ];
   };
   optionORPort =
     optionName:
-    mkOption {
+    lib.mkOption {
       default = [ ];
       example = 443;
       type =
-        with types;
+        with lib.types;
         oneOf [
           port
           (enum [ "auto" ])
@@ -238,9 +235,9 @@ let
                     port = optionPort;
                     flags = optionFlags;
                   }
-                  // genAttrs flags (
+                  // lib.genAttrs flags (
                     name:
-                    mkOption {
+                    lib.mkOption {
                       type = types.bool;
                       default = false;
                     }
@@ -256,15 +253,15 @@ let
     };
   optionBandwidth =
     optionName:
-    mkOption {
-      type = with types; nullOr (either int str);
+    lib.mkOption {
+      type = with lib.types; nullOr (either int str);
       default = null;
       description = (descriptionGeneric optionName);
     };
   optionPath =
     optionName:
-    mkOption {
-      type = with types; nullOr path;
+    lib.mkOption {
+      type = with lib.types; nullOr path;
       default = null;
       description = (descriptionGeneric optionName);
     };
@@ -323,119 +320,119 @@ let
 in
 {
   imports = [
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "client" "dns" "automapHostsSuffixes" ]
       [ "services" "tor" "settings" "AutomapHostsSuffixes" ]
     )
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "dns"
       "isolationOptions"
     ] "Use services.tor.settings.DNSPort instead.")
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "dns"
       "listenAddress"
     ] "Use services.tor.settings.DNSPort instead.")
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "privoxy"
       "enable"
     ] "Use services.privoxy.enable and services.privoxy.enableTor instead.")
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "socksIsolationOptions"
     ] "Use services.tor.settings.SOCKSPort instead.")
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "socksListenAddressFaster"
     ] "Use services.tor.settings.SOCKSPort instead.")
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "client" "socksPolicy" ]
       [ "services" "tor" "settings" "SocksPolicy" ]
     )
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "transparentProxy"
       "isolationOptions"
     ] "Use services.tor.settings.TransPort instead.")
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "client"
       "transparentProxy"
       "listenAddress"
     ] "Use services.tor.settings.TransPort instead.")
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "controlPort" ]
       [ "services" "tor" "settings" "ControlPort" ]
     )
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "extraConfig"
     ] "Please use services.tor.settings instead.")
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "hiddenServices" ]
       [ "services" "tor" "relay" "onionServices" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "accountingMax" ]
       [ "services" "tor" "settings" "AccountingMax" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "accountingStart" ]
       [ "services" "tor" "settings" "AccountingStart" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "address" ]
       [ "services" "tor" "settings" "Address" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "bandwidthBurst" ]
       [ "services" "tor" "settings" "BandwidthBurst" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "bandwidthRate" ]
       [ "services" "tor" "settings" "BandwidthRate" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "bridgeTransports" ]
       [ "services" "tor" "settings" "ServerTransportPlugin" "transports" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "contactInfo" ]
       [ "services" "tor" "settings" "ContactInfo" ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "exitPolicy" ]
       [ "services" "tor" "settings" "ExitPolicy" ]
     )
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "tor"
       "relay"
       "isBridge"
     ] "Use services.tor.relay.role instead.")
-    (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
-    (mkRenamedOptionModule
+    (lib.mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "nickname" ]
       [ "services" "tor" "settings" "Nickname" ]
     )
-    (mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ])
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ])
+    (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "portSpec" ]
       [ "services" "tor" "settings" "ORPort" ]
     )
@@ -443,17 +440,17 @@ in
 
   options = {
     services.tor = {
-      enable = mkEnableOption ''
+      enable = lib.mkEnableOption ''
         Tor daemon.
                 By default, the daemon is run without
                 relay, exit, bridge or client connectivity'';
 
-      openFirewall = mkEnableOption "opening of the relay port(s) in the firewall";
+      openFirewall = lib.mkEnableOption "opening of the relay port(s) in the firewall";
 
-      package = mkPackageOption pkgs "tor" { };
+      package = lib.mkPackageOption pkgs "tor" { };
 
       enableGeoIP =
-        mkEnableOption ''
+        lib.mkEnableOption ''
           use of GeoIP databases.
                   Disabling this will disable by-country statistics for bridges and relays
                   and some client and third-party software functionality''
@@ -461,19 +458,19 @@ in
           default = true;
         };
 
-      controlSocket.enable = mkEnableOption ''
+      controlSocket.enable = lib.mkEnableOption ''
         control socket,
                 created in `${runDir}/control`'';
 
       client = {
-        enable = mkEnableOption ''
+        enable = lib.mkEnableOption ''
           the routing of application connections.
                     You might want to disable this if you plan running a dedicated Tor relay'';
 
-        transparentProxy.enable = mkEnableOption "transparent proxy";
-        dns.enable = mkEnableOption "DNS resolver";
+        transparentProxy.enable = lib.mkEnableOption "transparent proxy";
+        dns.enable = lib.mkEnableOption "DNS resolver";
 
-        socksListenAddress = mkOption {
+        socksListenAddress = lib.mkOption {
           type = optionSOCKSPort false;
           default = {
             addr = "127.0.0.1";
@@ -491,7 +488,7 @@ in
           '';
         };
 
-        onionServices = mkOption {
+        onionServices = lib.mkOption {
           description = (descriptionGeneric "HiddenServiceDir");
           default = { };
           example = {
@@ -499,11 +496,11 @@ in
               clientAuthorizations = [ "/run/keys/tor/alice.prv.x25519" ];
             };
           };
-          type = types.attrsOf (
-            types.submodule (
+          type = lib.types.attrsOf (
+            lib.types.submodule (
               { name, config, ... }:
               {
-                options.clientAuthorizations = mkOption {
+                options.clientAuthorizations = lib.mkOption {
                   description = ''
                     Clients' authorizations for a v3 onion service,
                     as a list of files containing each one private key, in the format:
@@ -512,7 +509,7 @@ in
                     ```
                     ${descriptionGeneric "_client_authorization"}
                   '';
-                  type = with types; listOf path;
+                  type = with lib.types; listOf path;
                   default = [ ];
                   example = [ "/run/keys/tor/alice.prv.x25519" ];
                 };
@@ -523,7 +520,7 @@ in
       };
 
       relay = {
-        enable = mkEnableOption "tor relaying" // {
+        enable = lib.mkEnableOption "tor relaying" // {
           description = ''
             Whether to enable relaying of Tor traffic for others.
 
@@ -538,8 +535,8 @@ in
           '';
         };
 
-        role = mkOption {
-          type = types.enum [
+        role = lib.mkOption {
+          type = lib.types.enum [
             "exit"
             "relay"
             "bridge"
@@ -629,7 +626,7 @@ in
           '';
         };
 
-        onionServices = mkOption {
+        onionServices = lib.mkOption {
           description = (descriptionGeneric "HiddenServiceDir");
           default = { };
           example = {
@@ -640,12 +637,12 @@ in
               ];
             };
           };
-          type = types.attrsOf (
-            types.submodule (
+          type = lib.types.attrsOf (
+            lib.types.submodule (
               { name, config, ... }:
               {
-                options.path = mkOption {
-                  type = types.path;
+                options.path = lib.mkOption {
+                  type = lib.types.path;
                   description = ''
                     Path where to store the data files of the hidden service.
                     If the {option}`secretKey` is null
@@ -653,8 +650,8 @@ in
                     otherwise to `${runDir}/onion/$onion`.
                   '';
                 };
-                options.secretKey = mkOption {
-                  type = with types; nullOr path;
+                options.secretKey = lib.mkOption {
+                  type = with lib.types; nullOr path;
                   default = null;
                   example = "/run/keys/tor/onion/expyuzz4wqqyqhjn/hs_ed25519_secret_key";
                   description = ''
@@ -665,16 +662,16 @@ in
                     from this file if they do not exist.
                   '';
                 };
-                options.authorizeClient = mkOption {
+                options.authorizeClient = lib.mkOption {
                   description = (descriptionGeneric "HiddenServiceAuthorizeClient");
                   default = null;
-                  type = types.nullOr (
-                    types.submodule (
+                  type = lib.types.nullOr (
+                    lib.types.submodule (
                       { ... }:
                       {
                         options = {
-                          authType = mkOption {
-                            type = types.enum [
+                          authType = lib.mkOption {
+                            type = lib.types.enum [
                               "basic"
                               "stealth"
                             ];
@@ -684,8 +681,8 @@ in
                               that also hides service activity from unauthorized clients.
                             '';
                           };
-                          clientNames = mkOption {
-                            type = with types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+");
+                          clientNames = lib.mkOption {
+                            type = with lib.types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+");
                             description = ''
                               Only clients that are listed here are authorized to access the hidden service.
                               Generated authorization data can be found in {file}`${stateDir}/onion/$name/hostname`.
@@ -698,7 +695,7 @@ in
                     )
                   );
                 };
-                options.authorizedClients = mkOption {
+                options.authorizedClients = lib.mkOption {
                   description = ''
                     Authorized clients for a v3 onion service,
                     as a list of public key, in the format:
@@ -707,14 +704,14 @@ in
                     ```
                     ${descriptionGeneric "_client_authorization"}
                   '';
-                  type = with types; listOf str;
+                  type = with lib.types; listOf str;
                   default = [ ];
                   example = [ "descriptor:x25519:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ];
                 };
-                options.map = mkOption {
+                options.map = lib.mkOption {
                   description = (descriptionGeneric "HiddenServicePort");
                   type =
-                    with types;
+                    with lib.types;
                     listOf (oneOf [
                       port
                       (submodule (
@@ -722,7 +719,7 @@ in
                         {
                           options = {
                             port = optionPort;
-                            target = mkOption {
+                            target = lib.mkOption {
                               default = null;
                               type = nullOr (
                                 submodule (
@@ -752,25 +749,25 @@ in
                       v
                   );
                 };
-                options.version = mkOption {
+                options.version = lib.mkOption {
                   description = (descriptionGeneric "HiddenServiceVersion");
                   type =
-                    with types;
+                    with lib.types;
                     nullOr (enum [
                       2
                       3
                     ]);
                   default = null;
                 };
-                options.settings = mkOption {
+                options.settings = lib.mkOption {
                   description = ''
                     Settings of the onion service.
                     ${descriptionGeneric "_hidden_service_options"}
                   '';
                   default = { };
-                  type = types.submodule {
+                  type = lib.types.submodule {
                     freeformType =
-                      with types;
+                      with lib.types;
                       (attrsOf (
                         nullOr (oneOf [
                           str
@@ -784,20 +781,20 @@ in
                       };
                     options.HiddenServiceAllowUnknownPorts = optionBool "HiddenServiceAllowUnknownPorts";
                     options.HiddenServiceDirGroupReadable = optionBool "HiddenServiceDirGroupReadable";
-                    options.HiddenServiceExportCircuitID = mkOption {
+                    options.HiddenServiceExportCircuitID = lib.mkOption {
                       description = (descriptionGeneric "HiddenServiceExportCircuitID");
-                      type = with types; nullOr (enum [ "haproxy" ]);
+                      type = with lib.types; nullOr (enum [ "haproxy" ]);
                       default = null;
                     };
-                    options.HiddenServiceMaxStreams = mkOption {
+                    options.HiddenServiceMaxStreams = lib.mkOption {
                       description = (descriptionGeneric "HiddenServiceMaxStreams");
-                      type = with types; nullOr (ints.between 0 65535);
+                      type = with lib.types; nullOr (ints.between 0 65535);
                       default = null;
                     };
                     options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit";
-                    options.HiddenServiceNumIntroductionPoints = mkOption {
+                    options.HiddenServiceNumIntroductionPoints = lib.mkOption {
                       description = (descriptionGeneric "HiddenServiceNumIntroductionPoints");
-                      type = with types; nullOr (ints.between 0 20);
+                      type = with lib.types; nullOr (ints.between 0 20);
                       default = null;
                     };
                     options.HiddenServiceSingleHopMode = optionBool "HiddenServiceSingleHopMode";
@@ -822,15 +819,15 @@ in
         };
       };
 
-      settings = mkOption {
+      settings = lib.mkOption {
         description = ''
           See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en)
           for documentation.
         '';
         default = { };
-        type = types.submodule {
+        type = lib.types.submodule {
           freeformType =
-            with types;
+            with lib.types;
             (attrsOf (
               nullOr (oneOf [
                 str
@@ -872,10 +869,10 @@ in
           options.CellStatistics = optionBool "CellStatistics";
           options.ClientAutoIPv6ORPort = optionBool "ClientAutoIPv6ORPort";
           options.ClientDNSRejectInternalAddresses = optionBool "ClientDNSRejectInternalAddresses";
-          options.ClientOnionAuthDir = mkOption {
+          options.ClientOnionAuthDir = lib.mkOption {
             description = (descriptionGeneric "ClientOnionAuthDir");
             default = null;
-            type = with types; nullOr path;
+            type = with lib.types; nullOr path;
           };
           options.ClientPreferIPv6DirPort = optionBool "ClientPreferIPv6DirPort"; # default is null and like "auto"
           options.ClientPreferIPv6ORPort = optionBool "ClientPreferIPv6ORPort"; # default is null and like "auto"
@@ -885,12 +882,12 @@ in
           options.ConnDirectionStatistics = optionBool "ConnDirectionStatistics";
           options.ConstrainedSockets = optionBool "ConstrainedSockets";
           options.ContactInfo = optionString "ContactInfo";
-          options.ControlPort = mkOption rec {
+          options.ControlPort = lib.mkOption rec {
             description = (descriptionGeneric "ControlPort");
             default = [ ];
             example = [ { port = 9051; } ];
             type =
-              with types;
+              with lib.types;
               oneOf [
                 port
                 (enum [ "auto" ])
@@ -914,9 +911,9 @@ in
                           addr = optionAddress;
                           port = optionPort;
                         }
-                        // genAttrs flags (
+                        // lib.genAttrs flags (
                           name:
-                          mkOption {
+                          lib.mkOption {
                             type = types.bool;
                             default = false;
                           }
@@ -946,9 +943,9 @@ in
           options.DormantOnFirstStartup = optionBool "DormantOnFirstStartup";
           options.DormantTimeoutDisabledByIdleStreams = optionBool "DormantTimeoutDisabledByIdleStreams";
           options.DirCache = optionBool "DirCache";
-          options.DirPolicy = mkOption {
+          options.DirPolicy = lib.mkOption {
             description = (descriptionGeneric "DirPolicy");
-            type = with types; listOf str;
+            type = with lib.types; listOf str;
             default = [ ];
             example = [ "accept *:*" ];
           };
@@ -973,11 +970,11 @@ in
           options.ExitPolicyRejectPrivate = optionBool "ExitPolicyRejectPrivate";
           options.ExitPortStatistics = optionBool "ExitPortStatistics";
           options.ExitRelay = optionBool "ExitRelay"; # default is null and like "auto"
-          options.ExtORPort = mkOption {
+          options.ExtORPort = lib.mkOption {
             description = (descriptionGeneric "ExtORPort");
             default = null;
             type =
-              with types;
+              with lib.types;
               nullOr (oneOf [
                 port
                 (enum [ "auto" ])
@@ -1009,20 +1006,20 @@ in
           options.GeoIPFile = optionPath "GeoIPFile";
           options.GeoIPv6File = optionPath "GeoIPv6File";
           options.GuardfractionFile = optionPath "GuardfractionFile";
-          options.HidServAuth = mkOption {
+          options.HidServAuth = lib.mkOption {
             description = (descriptionGeneric "HidServAuth");
             default = [ ];
             type =
-              with types;
+              with lib.types;
               listOf (oneOf [
                 (submodule {
                   options = {
-                    onion = mkOption {
+                    onion = lib.mkOption {
                       type = strMatching "[a-z2-7]{16}\\.onion";
                       description = "Onion address.";
                       example = "xxxxxxxxxxxxxxxx.onion";
                     };
-                    auth = mkOption {
+                    auth = lib.mkOption {
                       type = strMatching "[A-Za-z0-9+/]{22}";
                       description = "Authentication cookie.";
                     };
@@ -1062,10 +1059,10 @@ in
           options.PidFile = optionPath "PidFile";
           options.ProtocolWarnings = optionBool "ProtocolWarnings";
           options.PublishHidServDescriptors = optionBool "PublishHidServDescriptors";
-          options.PublishServerDescriptor = mkOption {
+          options.PublishServerDescriptor = lib.mkOption {
             description = (descriptionGeneric "PublishServerDescriptor");
             type =
-              with types;
+              with lib.types;
               nullOr (enum [
                 false
                 true
@@ -1091,17 +1088,17 @@ in
           options.ServerDNSRandomizeCase = optionBool "ServerDNSRandomizeCase";
           options.ServerDNSResolvConfFile = optionPath "ServerDNSResolvConfFile";
           options.ServerDNSSearchDomains = optionBool "ServerDNSSearchDomains";
-          options.ServerTransportPlugin = mkOption {
+          options.ServerTransportPlugin = lib.mkOption {
             description = (descriptionGeneric "ServerTransportPlugin");
             default = null;
             type =
-              with types;
+              with lib.types;
               nullOr (
                 submodule (
                   { ... }:
                   {
                     options = {
-                      transports = mkOption {
+                      transports = lib.mkOption {
                         description = "List of pluggable transports.";
                         type = listOf str;
                         example = [
@@ -1111,7 +1108,7 @@ in
                           "scramblesuit"
                         ];
                       };
-                      exec = mkOption {
+                      exec = lib.mkOption {
                         type = types.str;
                         description = "Command of pluggable transport.";
                       };
@@ -1120,31 +1117,31 @@ in
                 )
               );
           };
-          options.ShutdownWaitLength = mkOption {
-            type = types.int;
+          options.ShutdownWaitLength = lib.mkOption {
+            type = lib.types.int;
             default = 30;
             description = (descriptionGeneric "ShutdownWaitLength");
           };
           options.SocksPolicy = optionStrings "SocksPolicy" // {
             example = [ "accept *:*" ];
           };
-          options.SOCKSPort = mkOption {
+          options.SOCKSPort = lib.mkOption {
             description = (descriptionGeneric "SOCKSPort");
             default = lib.optionals cfg.settings.HiddenServiceNonAnonymousMode [ { port = 0; } ];
-            defaultText = literalExpression ''
+            defaultText = lib.literalExpression ''
               if config.${opt.settings}.HiddenServiceNonAnonymousMode == true
               then [ { port = 0; } ]
               else [ ]
             '';
             example = [ { port = 9090; } ];
-            type = types.listOf (optionSOCKSPort true);
+            type = lib.types.listOf (optionSOCKSPort true);
           };
           options.TestingTorNetwork = optionBool "TestingTorNetwork";
           options.TransPort = optionIsolablePorts "TransPort";
-          options.TransProxyType = mkOption {
+          options.TransProxyType = lib.mkOption {
             description = (descriptionGeneric "TransProxyType");
             type =
-              with types;
+              with lib.types;
               nullOr (enum [
                 "default"
                 "TPROXY"
@@ -1168,7 +1165,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     # Not sure if `cfg.relay.role == "private-bridge"` helps as tor
     # sends a lot of stats
     warnings =
@@ -1295,7 +1292,7 @@ in
       ))
     ];
 
-    networking.firewall = mkIf cfg.openFirewall {
+    networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts =
         concatMap
           (

From d9297314fe789983077c22eedd425004d272d188 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 22:25:27 +0100
Subject: [PATCH 0606/1504] nixos/services.tor: fmt

---
 nixos/modules/services/security/tor.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 9db27b4d398c..eb36e727fb0c 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -426,12 +426,20 @@ in
       "relay"
       "isBridge"
     ] "Use services.tor.relay.role instead.")
-    (lib.mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
+    (lib.mkRemovedOptionModule [
+      "services"
+      "tor"
+      "relay"
+      "isExit"
+    ] "Use services.tor.relay.role instead.")
     (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "nickname" ]
       [ "services" "tor" "settings" "Nickname" ]
     )
-    (lib.mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ])
+    (lib.mkRenamedOptionModule
+      [ "services" "tor" "relay" "port" ]
+      [ "services" "tor" "settings" "ORPort" ]
+    )
     (lib.mkRenamedOptionModule
       [ "services" "tor" "relay" "portSpec" ]
       [ "services" "tor" "settings" "ORPort" ]

From edf46e7668859cb071f4c9b12c4c6edc73118a0b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0607/1504] nixos/services.tor.tsocks: remove `with lib;`

---
 nixos/modules/services/security/torify.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index aa60618b4299..dec02ee33ff5 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
@@ -4,7 +4,6 @@
   pkgs,
   ...
 }:
-with lib;
 let
 
   cfg = config.services.tor;
@@ -29,8 +28,8 @@ in
 
     services.tor.tsocks = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to build tsocks wrapper script to relay application traffic via Tor.
@@ -45,8 +44,8 @@ in
         '';
       };
 
-      server = mkOption {
-        type = types.str;
+      server = lib.mkOption {
+        type = lib.types.str;
         default = "localhost:9050";
         example = "192.168.0.20";
         description = ''
@@ -54,8 +53,8 @@ in
         '';
       };
 
-      config = mkOption {
-        type = types.lines;
+      config = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = ''
           Extra configuration. Contents will be added verbatim to TSocks
@@ -69,13 +68,13 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.tsocks.enable {
+  config = lib.mkIf cfg.tsocks.enable {
 
     environment.systemPackages = [ torify ]; # expose it to the users
 
     services.tor.tsocks.config = ''
-      server = ${toString (head (splitString ":" cfg.tsocks.server))}
-      server_port = ${toString (tail (splitString ":" cfg.tsocks.server))}
+      server = ${toString (lib.head (lib.splitString ":" cfg.tsocks.server))}
+      server_port = ${toString (lib.tail (lib.splitString ":" cfg.tsocks.server))}
 
       local = 127.0.0.0/255.128.0.0
       local = 127.128.0.0/255.192.0.0

From ee9d6cd0d3a13427bc989ac8373e6f6ce48265d1 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0608/1504] nixos/services.tor.torsocks: remove `with lib;`

---
 nixos/modules/services/security/torsocks.nix | 41 +++++++++-----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix
index 32047f613d9f..e556ab44e1e2 100644
--- a/nixos/modules/services/security/torsocks.nix
+++ b/nixos/modules/services/security/torsocks.nix
@@ -1,14 +1,11 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   cfg = config.services.tor.torsocks;
-  optionalNullStr = b: v: optionalString (b != null) v;
+  optionalNullStr = b: v: lib.optionalString (b != null) v;
 
   configFile = server: ''
-    TorAddress ${toString (head (splitString ":" server))}
-    TorPort    ${toString (tail (splitString ":" server))}
+    TorAddress ${toString (lib.head (lib.splitString ":" server))}
+    TorPort    ${toString (lib.tail (lib.splitString ":" server))}
 
     OnionAddrRange ${cfg.onionAddrRange}
 
@@ -34,18 +31,18 @@ in
 {
   options = {
     services.tor.torsocks = {
-      enable = mkOption {
-        type        = types.bool;
+      enable = lib.mkOption {
+        type        = lib.types.bool;
         default     = config.services.tor.enable && config.services.tor.client.enable;
-        defaultText = literalExpression "config.services.tor.enable && config.services.tor.client.enable";
+        defaultText = lib.literalExpression "config.services.tor.enable && config.services.tor.client.enable";
         description = ''
           Whether to build `/etc/tor/torsocks.conf`
           containing the specified global torsocks configuration.
         '';
       };
 
-      server = mkOption {
-        type    = types.str;
+      server = lib.mkOption {
+        type    = lib.types.str;
         default = "127.0.0.1:9050";
         example = "192.168.0.20:1234";
         description = ''
@@ -54,8 +51,8 @@ in
         '';
       };
 
-      fasterServer = mkOption {
-        type    = types.str;
+      fasterServer = lib.mkOption {
+        type    = lib.types.str;
         default = "127.0.0.1:9063";
         example = "192.168.0.20:1234";
         description = ''
@@ -64,8 +61,8 @@ in
         '';
       };
 
-      onionAddrRange = mkOption {
-        type    = types.str;
+      onionAddrRange = lib.mkOption {
+        type    = lib.types.str;
         default = "127.42.42.0/24";
         description = ''
           Tor hidden sites do not have real IP addresses. This
@@ -77,8 +74,8 @@ in
         '';
       };
 
-      socks5Username = mkOption {
-        type    = types.nullOr types.str;
+      socks5Username = lib.mkOption {
+        type    = lib.types.nullOr lib.types.str;
         default = null;
         example = "bob";
         description = ''
@@ -87,8 +84,8 @@ in
         '';
       };
 
-      socks5Password = mkOption {
-        type    = types.nullOr types.str;
+      socks5Password = lib.mkOption {
+        type    = lib.types.nullOr lib.types.str;
         default = null;
         example = "sekret";
         description = ''
@@ -97,8 +94,8 @@ in
         '';
       };
 
-      allowInbound = mkOption {
-        type    = types.bool;
+      allowInbound = lib.mkOption {
+        type    = lib.types.bool;
         default = false;
         description = ''
           Set Torsocks to accept inbound connections. If set to
@@ -110,7 +107,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.torsocks (wrapTorsocks "torsocks-faster" cfg.fasterServer) ];
 
     environment.etc."tor/torsocks.conf" =

From 4bcc603cd873e55088afec33ddf9be1beeac1c86 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:38 +0100
Subject: [PATCH 0609/1504] nixos/services.usbguard: remove `with lib;`

---
 nixos/modules/services/security/usbguard.nix | 66 ++++++++++----------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index d73d1c65747b..80780510e21c 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -4,14 +4,12 @@
   pkgs,
   ...
 }:
-
-with lib;
 let
   cfg = config.services.usbguard;
 
   # valid policy options
   policy = (
-    types.enum [
+    lib.types.enum [
       "allow"
       "block"
       "reject"
@@ -30,13 +28,13 @@ let
     PresentDevicePolicy=${cfg.presentDevicePolicy}
     PresentControllerPolicy=${cfg.presentControllerPolicy}
     InsertedDevicePolicy=${cfg.insertedDevicePolicy}
-    RestoreControllerDeviceState=${boolToString cfg.restoreControllerDeviceState}
+    RestoreControllerDeviceState=${lib.boolToString cfg.restoreControllerDeviceState}
     # this does not seem useful for endusers to change
     DeviceManagerBackend=uevent
-    IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers}
-    IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups}
+    IPCAllowedUsers=${lib.concatStringsSep " " cfg.IPCAllowedUsers}
+    IPCAllowedGroups=${lib.concatStringsSep " " cfg.IPCAllowedGroups}
     IPCAccessControlFiles=/var/lib/usbguard/IPCAccessControl.d/
-    DeviceRulesWithPort=${boolToString cfg.deviceRulesWithPort}
+    DeviceRulesWithPort=${lib.boolToString cfg.deviceRulesWithPort}
     # HACK: that way audit logs still land in the journal
     AuditFilePath=/dev/null
   '';
@@ -50,16 +48,16 @@ in
 
   options = {
     services.usbguard = {
-      enable = mkEnableOption "USBGuard daemon";
+      enable = lib.mkEnableOption "USBGuard daemon";
 
-      package = mkPackageOption pkgs "usbguard" {
+      package = lib.mkPackageOption pkgs "usbguard" {
         extraDescription = ''
           If you do not need the Qt GUI, use `pkgs.usbguard-nox` to save disk space.
         '';
       };
 
-      ruleFile = mkOption {
-        type = types.nullOr types.path;
+      ruleFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = "/var/lib/usbguard/rules.conf";
         example = "/run/secrets/usbguard-rules";
         description = ''
@@ -71,8 +69,8 @@ in
         '';
 
       };
-      rules = mkOption {
-        type = types.nullOr types.lines;
+      rules = lib.mkOption {
+        type = lib.types.nullOr lib.types.lines;
         default = null;
         example = ''
           allow with-interface equals { 08:*:* }
@@ -92,8 +90,8 @@ in
         '';
       };
 
-      implicitPolicyTarget = mkOption {
-        type = types.enum [
+      implicitPolicyTarget = lib.mkOption {
+        type = lib.types.enum [
           "allow"
           "block"
           "reject"
@@ -106,7 +104,7 @@ in
         '';
       };
 
-      presentDevicePolicy = mkOption {
+      presentDevicePolicy = lib.mkOption {
         type = policy;
         default = "apply-policy";
         description = ''
@@ -117,7 +115,7 @@ in
         '';
       };
 
-      presentControllerPolicy = mkOption {
+      presentControllerPolicy = lib.mkOption {
         type = policy;
         default = "keep";
         description = ''
@@ -126,8 +124,8 @@ in
         '';
       };
 
-      insertedDevicePolicy = mkOption {
-        type = types.enum [
+      insertedDevicePolicy = lib.mkOption {
+        type = lib.types.enum [
           "block"
           "reject"
           "apply-policy"
@@ -139,8 +137,8 @@ in
         '';
       };
 
-      restoreControllerDeviceState = mkOption {
-        type = types.bool;
+      restoreControllerDeviceState = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           The  USBGuard  daemon  modifies  some attributes of controller
@@ -151,8 +149,8 @@ in
         '';
       };
 
-      IPCAllowedUsers = mkOption {
-        type = types.listOf types.str;
+      IPCAllowedUsers = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         default = [ "root" ];
         example = [
           "root"
@@ -163,8 +161,8 @@ in
         '';
       };
 
-      IPCAllowedGroups = mkOption {
-        type = types.listOf types.str;
+      IPCAllowedGroups = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         default = [ ];
         example = [ "wheel" ];
         description = ''
@@ -173,21 +171,21 @@ in
         '';
       };
 
-      deviceRulesWithPort = mkOption {
-        type = types.bool;
+      deviceRulesWithPort = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Generate device specific rules including the "via-port" attribute.
         '';
       };
 
-      dbus.enable = mkEnableOption "USBGuard dbus daemon";
+      dbus.enable = lib.mkEnableOption "USBGuard dbus daemon";
     };
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ cfg.package ];
 
@@ -239,7 +237,7 @@ in
         };
       };
 
-      usbguard-dbus = mkIf cfg.dbus.enable {
+      usbguard-dbus = lib.mkIf cfg.dbus.enable {
         description = "USBGuard D-Bus Service";
 
         wantedBy = [ "multi-user.target" ];
@@ -261,7 +259,7 @@ in
         groupCheck =
           (lib.concatStrings (map (g: "subject.isInGroup(\"${g}\") || ") cfg.IPCAllowedGroups)) + "false";
       in
-      optionalString cfg.dbus.enable ''
+      lib.optionalString cfg.dbus.enable ''
         polkit.addRule(function(action, subject) {
             if ((action.id == "org.usbguard.Policy1.listRules" ||
                  action.id == "org.usbguard.Policy1.appendRule" ||
@@ -278,15 +276,15 @@ in
       '';
   };
   imports = [
-    (mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ]
+    (lib.mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ]
       "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d."
     )
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "usbguard"
       "auditFilePath"
     ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.")
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "usbguard" "implictPolicyTarget" ]
       [ "services" "usbguard" "implicitPolicyTarget" ]
     )

From 10e015d823432e9f266cb2ffc8ba791ef49b38f6 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0610/1504] nixos/services.vault-agent: remove `with lib;`

---
 .../modules/services/security/vault-agent.nix | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/security/vault-agent.nix b/nixos/modules/services/security/vault-agent.nix
index ca5576804a7b..37f52f9d5bf6 100644
--- a/nixos/modules/services/security/vault-agent.nix
+++ b/nixos/modules/services/security/vault-agent.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   format = pkgs.formats.json { };
   commonOptions =
@@ -14,26 +11,26 @@ let
       pkgName,
       flavour ? pkgName,
     }:
-    mkOption {
+    lib.mkOption {
       default = { };
       description = ''
         Attribute set of ${flavour} instances.
         Creates independent `${flavour}-''${name}.service` systemd units for each instance defined here.
       '';
       type =
-        with types;
+        with lib.types;
         attrsOf (
           submodule (
             { name, ... }:
             {
               options = {
-                enable = mkEnableOption "this ${flavour} instance" // {
+                enable = lib.mkEnableOption "this ${flavour} instance" // {
                   default = true;
                 };
 
-                package = mkPackageOption pkgs pkgName { };
+                package = lib.mkPackageOption pkgs pkgName { };
 
-                user = mkOption {
+                user = lib.mkOption {
                   type = types.str;
                   default = "root";
                   description = ''
@@ -41,7 +38,7 @@ let
                   '';
                 };
 
-                group = mkOption {
+                group = lib.mkOption {
                   type = types.str;
                   default = "root";
                   description = ''
@@ -49,12 +46,12 @@ let
                   '';
                 };
 
-                settings = mkOption {
+                settings = lib.mkOption {
                   type = types.submodule {
                     freeformType = format.type;
 
                     options = {
-                      pid_file = mkOption {
+                      pid_file = lib.mkOption {
                         default = "/run/${flavour}/${name}.pid";
                         type = types.str;
                         description = ''
@@ -62,7 +59,7 @@ let
                         '';
                       };
 
-                      template = mkOption {
+                      template = lib.mkOption {
                         default = null;
                         type = with types; nullOr (listOf (attrsOf anything));
                         description =
@@ -116,7 +113,7 @@ let
     let
       configFile = format.generate "${name}.json" instance.settings;
     in
-    mkIf (instance.enable) {
+    lib.mkIf (instance.enable) {
       description = "${flavour} daemon - ${name}";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
@@ -127,8 +124,8 @@ let
         User = instance.user;
         Group = instance.group;
         RuntimeDirectory = flavour;
-        ExecStart = "${getExe instance.package} ${
-          optionalString ((getName instance.package) == "vault") "agent"
+        ExecStart = "${lib.getExe instance.package} ${
+          lib.optionalString ((lib.getName instance.package) == "vault") "agent"
         } -config ${configFile}";
         ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
         KillSignal = "SIGINT";
@@ -146,17 +143,17 @@ in
     };
   };
 
-  config = mkMerge (
+  config = lib.mkMerge (
     map
       (
         flavour:
         let
           cfg = config.services.${flavour};
         in
-        mkIf (cfg.instances != { }) {
-          systemd.services = mapAttrs' (
+        lib.mkIf (cfg.instances != { }) {
+          systemd.services = lib.mapAttrs' (
             name: instance:
-            nameValuePair "${flavour}-${name}" (createAgentInstance {
+            lib.nameValuePair "${flavour}-${name}" (createAgentInstance {
               inherit name instance flavour;
             })
           ) cfg.instances;
@@ -168,7 +165,7 @@ in
       ]
   );
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     emilylange
     tcheronneau
   ];

From c24987c6ade7ef9a1d46261bf754005e5f496fcb Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0611/1504] nixos/services.vault: remove `with lib;`

---
 nixos/modules/services/security/vault.nix | 75 +++++++++++------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index cab8937a8615..46a915b92a86 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -5,9 +5,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.vault;
   opt = options.services.vault;
@@ -32,10 +29,10 @@ let
       }
     ''}
     storage "${cfg.storageBackend}" {
-      ${optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''}
-      ${optionalString (cfg.storageConfig != null) cfg.storageConfig}
+      ${lib.optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''}
+      ${lib.optionalString (cfg.storageConfig != null) cfg.storageConfig}
     }
-    ${optionalString (cfg.telemetryConfig != "") ''
+    ${lib.optionalString (cfg.telemetryConfig != "") ''
       telemetry {
         ${cfg.telemetryConfig}
       }
@@ -44,10 +41,10 @@ let
   '';
 
   allConfigPaths = [ configFile ] ++ cfg.extraSettingsPaths;
-  configOptions = escapeShellArgs (
+  configOptions = lib.escapeShellArgs (
     lib.optional cfg.dev "-dev"
     ++ lib.optional (cfg.dev && cfg.devRootTokenID != null) "-dev-root-token-id=${cfg.devRootTokenID}"
-    ++ (concatMap (p: [
+    ++ (lib.concatMap (p: [
       "-config"
       p
     ]) allConfigPaths)
@@ -58,56 +55,56 @@ in
 {
   options = {
     services.vault = {
-      enable = mkEnableOption "Vault daemon";
+      enable = lib.mkEnableOption "Vault daemon";
 
-      package = mkPackageOption pkgs "vault" { };
+      package = lib.mkPackageOption pkgs "vault" { };
 
-      dev = mkOption {
-        type = types.bool;
+      dev = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           In this mode, Vault runs in-memory and starts unsealed. This option is not meant production but for development and testing i.e. for nixos tests.
         '';
       };
 
-      devRootTokenID = mkOption {
-        type = types.nullOr types.str;
+      devRootTokenID = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         description = ''
           Initial root token. This only applies when {option}`services.vault.dev` is true
         '';
       };
 
-      address = mkOption {
-        type = types.str;
+      address = lib.mkOption {
+        type = lib.types.str;
         default = "127.0.0.1:8200";
         description = "The name of the ip interface to listen to";
       };
 
-      tlsCertFile = mkOption {
-        type = types.nullOr types.str;
+      tlsCertFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "/path/to/your/cert.pem";
         description = "TLS certificate file. TLS will be disabled unless this option is set";
       };
 
-      tlsKeyFile = mkOption {
-        type = types.nullOr types.str;
+      tlsKeyFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "/path/to/your/key.pem";
         description = "TLS private key file. TLS will be disabled unless this option is set";
       };
 
-      listenerExtraConfig = mkOption {
-        type = types.lines;
+      listenerExtraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = ''
           tls_min_version = "tls12"
         '';
         description = "Extra text appended to the listener section.";
       };
 
-      storageBackend = mkOption {
-        type = types.enum [
+      storageBackend = lib.mkOption {
+        type = lib.types.enum [
           "inmem"
           "file"
           "consul"
@@ -127,11 +124,11 @@ in
         description = "The name of the type of storage backend";
       };
 
-      storagePath = mkOption {
-        type = types.nullOr types.path;
+      storagePath = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default =
           if cfg.storageBackend == "file" || cfg.storageBackend == "raft" then "/var/lib/vault" else null;
-        defaultText = literalExpression ''
+        defaultText = lib.literalExpression ''
           if config.${opt.storageBackend} == "file" || cfg.storageBackend == "raft"
           then "/var/lib/vault"
           else null
@@ -139,8 +136,8 @@ in
         description = "Data directory for file backend";
       };
 
-      storageConfig = mkOption {
-        type = types.nullOr types.lines;
+      storageConfig = lib.mkOption {
+        type = lib.types.nullOr lib.types.lines;
         default = null;
         description = ''
           HCL configuration to insert in the storageBackend section.
@@ -152,20 +149,20 @@ in
         '';
       };
 
-      telemetryConfig = mkOption {
-        type = types.lines;
+      telemetryConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Telemetry configuration";
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Extra text appended to {file}`vault.hcl`.";
       };
 
-      extraSettingsPaths = mkOption {
-        type = types.listOf types.path;
+      extraSettingsPaths = lib.mkOption {
+        type = lib.types.listOf lib.types.path;
         default = [ ];
         description = ''
           Configuration files to load besides the immutable one defined by the NixOS module.
@@ -196,7 +193,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     assertions = [
       {
         assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null);
@@ -219,7 +216,7 @@ in
     };
     users.groups.vault.gid = config.ids.gids.vault;
 
-    systemd.tmpfiles.rules = optional (
+    systemd.tmpfiles.rules = lib.optional (
       cfg.storagePath != null
     ) "d '${cfg.storagePath}' 0700 vault vault - -";
 
@@ -229,7 +226,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [
         "network.target"
-      ] ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
+      ] ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
       restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients.
 
@@ -255,7 +252,7 @@ in
         Restart = "on-failure";
       };
 
-      unitConfig.RequiresMountsFor = optional (cfg.storagePath != null) cfg.storagePath;
+      unitConfig.RequiresMountsFor = lib.optional (cfg.storagePath != null) cfg.storagePath;
     };
   };
 

From cae64813e8dbc3c3b329d9f94e2d9f9256a2053d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 22:25:53 +0100
Subject: [PATCH 0612/1504] nixos/services.vault: fmt

---
 nixos/modules/services/security/vault.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index 46a915b92a86..f3a7eddebaf1 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -224,9 +224,11 @@ in
       description = "Vault server daemon";
 
       wantedBy = [ "multi-user.target" ];
-      after = [
-        "network.target"
-      ] ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
+      after =
+        [
+          "network.target"
+        ]
+        ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service";
 
       restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients.
 

From 1f4bd3abb7469d1a601173f24fff535075540b31 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0613/1504] nixos/services.yubikey-agent: remove `with lib;`

---
 .../modules/services/security/yubikey-agent.nix  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix
index c746730ca51d..872e605f6881 100644
--- a/nixos/modules/services/security/yubikey-agent.nix
+++ b/nixos/modules/services/security/yubikey-agent.nix
@@ -1,21 +1,17 @@
 # Global configuration for yubikey-agent.
-
 {
   config,
   lib,
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.yubikey-agent;
 in
 {
   ###### interface
 
-  meta.maintainers = with maintainers; [
+  meta.maintainers = with lib.maintainers; [
     philandstuff
     rawkode
   ];
@@ -23,8 +19,8 @@ in
   options = {
 
     services.yubikey-agent = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to start yubikey-agent when you log in.  Also sets
@@ -35,17 +31,17 @@ in
         '';
       };
 
-      package = mkPackageOption pkgs "yubikey-agent" { };
+      package = lib.mkPackageOption pkgs "yubikey-agent" { };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
     systemd.packages = [ cfg.package ];
 
     # This overrides the systemd user unit shipped with the
     # yubikey-agent package
-    systemd.user.services.yubikey-agent = mkIf (config.programs.gnupg.agent.pinentryPackage != null) {
+    systemd.user.services.yubikey-agent = lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null) {
       path = [ config.programs.gnupg.agent.pinentryPackage ];
       wantedBy = [ "default.target" ];
     };

From 3ef002a0ebe5c12d646ac77b82468f1e4b5e26d8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 22:26:16 +0100
Subject: [PATCH 0614/1504] nixos/services.yubikey-agent: fmt

---
 nixos/modules/services/security/yubikey-agent.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix
index 872e605f6881..0cfc34b13553 100644
--- a/nixos/modules/services/security/yubikey-agent.nix
+++ b/nixos/modules/services/security/yubikey-agent.nix
@@ -41,10 +41,12 @@ in
 
     # This overrides the systemd user unit shipped with the
     # yubikey-agent package
-    systemd.user.services.yubikey-agent = lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null) {
-      path = [ config.programs.gnupg.agent.pinentryPackage ];
-      wantedBy = [ "default.target" ];
-    };
+    systemd.user.services.yubikey-agent =
+      lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null)
+        {
+          path = [ config.programs.gnupg.agent.pinentryPackage ];
+          wantedBy = [ "default.target" ];
+        };
 
     # Yubikey-agent expects pcsd to be running in order to function.
     services.pcscd.enable = true;

From fb31348d4dff29ae614ef0072fe978ae7bb96c72 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0615/1504] nixos/services.automatic-timezoned: remove `with
 lib;`

---
 nixos/modules/services/system/automatic-timezoned.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/system/automatic-timezoned.nix b/nixos/modules/services/system/automatic-timezoned.nix
index aa84a8887c87..8fc87fb93cd0 100644
--- a/nixos/modules/services/system/automatic-timezoned.nix
+++ b/nixos/modules/services/system/automatic-timezoned.nix
@@ -4,17 +4,14 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.automatic-timezoned;
 in
 {
   options = {
     services.automatic-timezoned = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Enable `automatic-timezoned`, simple daemon for keeping the system
@@ -28,11 +25,11 @@ in
           to make the choice deliberate. An error will be presented otherwise.
         '';
       };
-      package = mkPackageOption pkgs "automatic-timezoned" { };
+      package = lib.mkPackageOption pkgs "automatic-timezoned" { };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     # This will give users an error if they have set an explicit time
     # zone, rather than having the service silently override it.
     time.timeZone = null;

From 81f97e6d28c44e90475b2396298bac4c0852b9bf Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0616/1504] nixos/services.cachix-agent: remove `with lib;`

---
 .../services/system/cachix-agent/default.nix  | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix
index e4df9ae5cc9c..a75bd6f7b287 100644
--- a/nixos/modules/services/system/cachix-agent/default.nix
+++ b/nixos/modules/services/system/cachix-agent/default.nix
@@ -4,9 +4,6 @@
   lib,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.cachix-agent;
 in
@@ -14,37 +11,37 @@ in
   meta.maintainers = [ lib.maintainers.domenkozar ];
 
   options.services.cachix-agent = {
-    enable = mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/";
+    enable = lib.mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/";
 
-    name = mkOption {
-      type = types.str;
+    name = lib.mkOption {
+      type = lib.types.str;
       description = "Agent name, usually same as the hostname";
       default = config.networking.hostName;
       defaultText = "config.networking.hostName";
     };
 
-    verbose = mkOption {
-      type = types.bool;
+    verbose = lib.mkOption {
+      type = lib.types.bool;
       description = "Enable verbose output";
       default = false;
     };
 
-    profile = mkOption {
-      type = types.nullOr types.str;
+    profile = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
       default = null;
       description = "Profile name, defaults to 'system' (NixOS).";
     };
 
-    host = mkOption {
-      type = types.nullOr types.str;
+    host = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
       default = null;
       description = "Cachix uri to use.";
     };
 
-    package = mkPackageOption pkgs "cachix" { };
+    package = lib.mkPackageOption pkgs "cachix" { };
 
-    credentialsFile = mkOption {
-      type = types.path;
+    credentialsFile = lib.mkOption {
+      type = lib.types.path;
       default = "/etc/cachix-agent.token";
       description = ''
         Required file that needs to contain CACHIX_AGENT_TOKEN=...
@@ -52,7 +49,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.cachix-agent = {
       description = "Cachix Deploy Agent";
       wants = [ "network-online.target" ];
@@ -76,7 +73,7 @@ in
           ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${
             lib.optionalString (cfg.host != null) "--host ${cfg.host}"
           } \
-            deploy agent ${cfg.name} ${optionalString (cfg.profile != null) cfg.profile}
+            deploy agent ${cfg.name} ${lib.optionalString (cfg.profile != null) cfg.profile}
         '';
       };
     };

From 354e3ac4e2ce8279488668d1d06dc95cdc145262 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0617/1504] nixos/services.cachix-watch-store: remove `with
 lib;`

---
 .../services/system/cachix-watch-store.nix    | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix
index 3505fe3a9a09..32fc5eec3964 100644
--- a/nixos/modules/services/system/cachix-watch-store.nix
+++ b/nixos/modules/services/system/cachix-watch-store.nix
@@ -4,9 +4,6 @@
   lib,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.cachix-watch-store;
 in
@@ -17,56 +14,56 @@ in
   ];
 
   options.services.cachix-watch-store = {
-    enable = mkEnableOption "Cachix Watch Store: https://docs.cachix.org";
+    enable = lib.mkEnableOption "Cachix Watch Store: https://docs.cachix.org";
 
-    cacheName = mkOption {
-      type = types.str;
+    cacheName = lib.mkOption {
+      type = lib.types.str;
       description = "Cachix binary cache name";
     };
 
-    cachixTokenFile = mkOption {
-      type = types.path;
+    cachixTokenFile = lib.mkOption {
+      type = lib.types.path;
       description = ''
         Required file that needs to contain the cachix auth token.
       '';
     };
 
-    signingKeyFile = mkOption {
-      type = types.nullOr types.path;
+    signingKeyFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
       description = ''
         Optional file containing a self-managed signing key to sign uploaded store paths.
       '';
       default = null;
     };
 
-    compressionLevel = mkOption {
-      type = types.nullOr types.int;
+    compressionLevel = lib.mkOption {
+      type = lib.types.nullOr lib.types.int;
       description = "The compression level for ZSTD compression (between 0 and 16)";
       default = null;
     };
 
-    jobs = mkOption {
-      type = types.nullOr types.int;
+    jobs = lib.mkOption {
+      type = lib.types.nullOr lib.types.int;
       description = "Number of threads used for pushing store paths";
       default = null;
     };
 
-    host = mkOption {
-      type = types.nullOr types.str;
+    host = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
       default = null;
       description = "Cachix host to connect to";
     };
 
-    verbose = mkOption {
-      type = types.bool;
+    verbose = lib.mkOption {
+      type = lib.types.bool;
       description = "Enable verbose output";
       default = false;
     };
 
-    package = mkPackageOption pkgs "cachix" { };
+    package = lib.mkPackageOption pkgs "cachix" { };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.cachix-watch-store-agent = {
       description = "Cachix watch store Agent";
       wants = [ "network-online.target" ];

From 128623b2f167738923573566940e2089856475bc Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0618/1504] nixos/services.cloud-init: remove `with lib;`

---
 nixos/modules/services/system/cloud-init.nix | 61 ++++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index d9ec130add91..cf8585dc90bb 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.cloud-init;
   path =
@@ -31,8 +28,8 @@ in
 {
   options = {
     services.cloud-init = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Enable the cloud-init service. This services reads
@@ -50,35 +47,35 @@ in
         '';
       };
 
-      btrfs.enable = mkOption {
-        type = types.bool;
+      btrfs.enable = lib.mkOption {
+        type = lib.types.bool;
         default = hasFs "btrfs";
-        defaultText = literalExpression ''hasFs "btrfs"'';
+        defaultText = lib.literalExpression ''hasFs "btrfs"'';
         description = ''
           Allow the cloud-init service to operate `btrfs` filesystem.
         '';
       };
 
-      ext4.enable = mkOption {
-        type = types.bool;
+      ext4.enable = lib.mkOption {
+        type = lib.types.bool;
         default = hasFs "ext4";
-        defaultText = literalExpression ''hasFs "ext4"'';
+        defaultText = lib.literalExpression ''hasFs "ext4"'';
         description = ''
           Allow the cloud-init service to operate `ext4` filesystem.
         '';
       };
 
-      xfs.enable = mkOption {
-        type = types.bool;
+      xfs.enable = lib.mkOption {
+        type = lib.types.bool;
         default = hasFs "xfs";
-        defaultText = literalExpression ''hasFs "xfs"'';
+        defaultText = lib.literalExpression ''hasFs "xfs"'';
         description = ''
           Allow the cloud-init service to operate `xfs` filesystem.
         '';
       };
 
-      network.enable = mkOption {
-        type = types.bool;
+      network.enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Allow the cloud-init service to configure network interfaces
@@ -86,26 +83,26 @@ in
         '';
       };
 
-      extraPackages = mkOption {
-        type = types.listOf types.package;
+      extraPackages = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
         default = [ ];
         description = ''
           List of additional packages to be available within cloud-init jobs.
         '';
       };
 
-      settings = mkOption {
+      settings = lib.mkOption {
         description = ''
           Structured cloud-init configuration.
         '';
-        type = types.submodule {
+        type = lib.types.submodule {
           freeformType = settingsFormat.type;
         };
         default = { };
       };
 
-      config = mkOption {
-        type = types.str;
+      config = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           raw cloud-init configuration.
@@ -118,20 +115,20 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.cloud-init.settings = {
-      system_info = mkDefault {
+      system_info = lib.mkDefault {
         distro = "nixos";
         network = {
           renderers = [ "networkd" ];
         };
       };
 
-      users = mkDefault [ "root" ];
-      disable_root = mkDefault false;
-      preserve_hostname = mkDefault false;
+      users = lib.mkDefault [ "root" ];
+      disable_root = lib.mkDefault false;
+      preserve_hostname = lib.mkDefault false;
 
-      cloud_init_modules = mkDefault [
+      cloud_init_modules = lib.mkDefault [
         "migrator"
         "seed_random"
         "bootcmd"
@@ -145,7 +142,7 @@ in
         "users-groups"
       ];
 
-      cloud_config_modules = mkDefault [
+      cloud_config_modules = lib.mkDefault [
         "disk_setup"
         "mounts"
         "ssh-import-id"
@@ -156,7 +153,7 @@ in
         "ssh"
       ];
 
-      cloud_final_modules = mkDefault [
+      cloud_final_modules = lib.mkDefault [
         "rightscale_userdata"
         "scripts-vendor"
         "scripts-per-once"
@@ -174,7 +171,7 @@ in
     environment.etc."cloud/cloud.cfg" =
       if cfg.config == "" then { source = cfgfile; } else { text = cfg.config; };
 
-    systemd.network.enable = mkIf cfg.network.enable true;
+    systemd.network.enable = lib.mkIf cfg.network.enable true;
 
     systemd.services.cloud-init-local = {
       description = "Initial cloud-init job (pre-networking)";
@@ -272,5 +269,5 @@ in
     };
   };
 
-  meta.maintainers = [ maintainers.zimbatm ];
+  meta.maintainers = [ lib.maintainers.zimbatm ];
 }

From 08f1e99c34d9236fb1a2447b178ac33f899ddbca Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:39 +0100
Subject: [PATCH 0619/1504] nixos/services.localtimed: remove `with lib;`

---
 nixos/modules/services/system/localtimed.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/system/localtimed.nix b/nixos/modules/services/system/localtimed.nix
index 745d767d0744..404cdaba7b42 100644
--- a/nixos/modules/services/system/localtimed.nix
+++ b/nixos/modules/services/system/localtimed.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.localtimed;
 in
@@ -15,8 +12,8 @@ in
 
   options = {
     services.localtimed = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Enable `localtimed`, a simple daemon for keeping the
@@ -29,12 +26,12 @@ in
           to make the choice deliberate. An error will be presented otherwise.
         '';
       };
-      package = mkPackageOption pkgs "localtime" { };
-      geoclue2Package = mkPackageOption pkgs "Geoclue2" { default = "geoclue2-with-demo-agent"; };
+      package = lib.mkPackageOption pkgs "localtime" { };
+      geoclue2Package = lib.mkPackageOption pkgs "Geoclue2" { default = "geoclue2-with-demo-agent"; };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     # This will give users an error if they have set an explicit time
     # zone, rather than having the service silently override it.
     time.timeZone = null;

From 0a49bde2427d988307a9858870ae25636dae2be5 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0620/1504] nixos/nix: remove `with lib;`

---
 nixos/modules/services/system/nix-daemon.nix | 66 +++++++++-----------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix
index 4a761048c713..3e5b0d16fca0 100644
--- a/nixos/modules/services/system/nix-daemon.nix
+++ b/nixos/modules/services/system/nix-daemon.nix
@@ -1,6 +1,5 @@
 /*
   Declares what makes the nix-daemon work on systemd.
-
   See also
    - nixos/modules/config/nix.nix: the nix.conf
    - nixos/modules/config/nix-remote-build.nix: the nix.conf
@@ -11,16 +10,13 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.nix;
 
   nixPackage = cfg.package.out;
 
-  isNixAtLeast = versionAtLeast (getVersion nixPackage);
+  isNixAtLeast = lib.versionAtLeast (lib.getVersion nixPackage);
 
   makeNixBuildUser = nr: {
     name = "nixbld${toString nr}";
@@ -39,13 +35,13 @@ let
     };
   };
 
-  nixbldUsers = listToAttrs (map makeNixBuildUser (range 1 cfg.nrBuildUsers));
+  nixbldUsers = lib.listToAttrs (map makeNixBuildUser (lib.range 1 cfg.nrBuildUsers));
 
 in
 
 {
   imports = [
-    (mkRenamedOptionModuleWith {
+    (lib.mkRenamedOptionModuleWith {
       sinceRelease = 2205;
       from = [
         "nix"
@@ -56,7 +52,7 @@ in
         "daemonIOSchedPriority"
       ];
     })
-    (mkRenamedOptionModuleWith {
+    (lib.mkRenamedOptionModuleWith {
       sinceRelease = 2211;
       from = [
         "nix"
@@ -67,7 +63,7 @@ in
         "readOnlyNixStore"
       ];
     })
-    (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.")
+    (lib.mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.")
   ];
 
   ###### interface
@@ -76,8 +72,8 @@ in
 
     nix = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Whether to enable Nix.
@@ -85,17 +81,17 @@ in
         '';
       };
 
-      package = mkOption {
-        type = types.package;
+      package = lib.mkOption {
+        type = lib.types.package;
         default = pkgs.nix;
-        defaultText = literalExpression "pkgs.nix";
+        defaultText = lib.literalExpression "pkgs.nix";
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';
       };
 
-      daemonCPUSchedPolicy = mkOption {
-        type = types.enum [
+      daemonCPUSchedPolicy = lib.mkOption {
+        type = lib.types.enum [
           "other"
           "batch"
           "idle"
@@ -128,8 +124,8 @@ in
         '';
       };
 
-      daemonIOSchedClass = mkOption {
-        type = types.enum [
+      daemonIOSchedClass = lib.mkOption {
+        type = lib.types.enum [
           "best-effort"
           "idle"
         ];
@@ -154,8 +150,8 @@ in
         '';
       };
 
-      daemonIOSchedPriority = mkOption {
-        type = types.int;
+      daemonIOSchedPriority = lib.mkOption {
+        type = lib.types.int;
         default = 4;
         example = 1;
         description = ''
@@ -168,15 +164,15 @@ in
       };
 
       # Environment variables for running Nix.
-      envVars = mkOption {
-        type = types.attrs;
+      envVars = lib.mkOption {
+        type = lib.types.attrs;
         internal = true;
         default = { };
         description = "Environment variables used by Nix.";
       };
 
-      nrBuildUsers = mkOption {
-        type = types.int;
+      nrBuildUsers = lib.mkOption {
+        type = lib.types.int;
         description = ''
           Number of `nixbld` user accounts created to
           perform secure concurrent builds.  If you receive an error
@@ -189,19 +185,19 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [
       nixPackage
       pkgs.nix-info
-    ] ++ optional (config.programs.bash.completion.enable) pkgs.nix-bash-completions;
+    ] ++ lib.optional (config.programs.bash.completion.enable) pkgs.nix-bash-completions;
 
     systemd.packages = [ nixPackage ];
 
-    systemd.tmpfiles = mkMerge [
-      (mkIf (isNixAtLeast "2.8") {
+    systemd.tmpfiles = lib.mkMerge [
+      (lib.mkIf (isNixAtLeast "2.8") {
         packages = [ nixPackage ];
       })
-      (mkIf (!isNixAtLeast "2.8") {
+      (lib.mkIf (!isNixAtLeast "2.8") {
         rules = [
           "d /nix/var/nix/daemon-socket 0755 root root - -"
         ];
@@ -215,7 +211,7 @@ in
         nixPackage
         pkgs.util-linux
         config.programs.ssh.package
-      ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
+      ] ++ lib.optionals cfg.distributedBuilds [ pkgs.gzip ];
 
       environment =
         cfg.envVars
@@ -274,20 +270,20 @@ in
     # Set up the environment variables for running Nix.
     environment.sessionVariables = cfg.envVars;
 
-    nix.nrBuildUsers = mkDefault (
+    nix.nrBuildUsers = lib.mkDefault (
       if cfg.settings.auto-allocate-uids or false then
         0
       else
-        max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs)
+        lib.max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs)
     );
 
     users.users = nixbldUsers;
 
-    services.displayManager.hiddenUsers = attrNames nixbldUsers;
+    services.displayManager.hiddenUsers = lib.attrNames nixbldUsers;
 
     # Legacy configuration conversion.
-    nix.settings = mkMerge [
-      (mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; })
+    nix.settings = lib.mkMerge [
+      (lib.mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; })
     ];
 
   };

From 710d6186c13110f3630f2659c1e9c026eacfcbbd Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0621/1504] nixos/services.nscd: remove `with lib;`

---
 nixos/modules/services/system/nscd.nix | 31 ++++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index c5b14e23fdda..ad5ccbcd335a 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   nssModulesPath = config.system.nssModules.path;
@@ -22,8 +19,8 @@ in
 
     services.nscd = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Whether to enable the Name Service Cache Daemon.
@@ -32,8 +29,8 @@ in
         '';
       };
 
-      enableNsncd = mkOption {
-        type = types.bool;
+      enableNsncd = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Whether to use nsncd instead of nscd from glibc.
@@ -42,24 +39,24 @@ in
         '';
       };
 
-      user = mkOption {
-        type = types.str;
+      user = lib.mkOption {
+        type = lib.types.str;
         default = "nscd";
         description = ''
           User account under which nscd runs.
         '';
       };
 
-      group = mkOption {
-        type = types.str;
+      group = lib.mkOption {
+        type = lib.types.str;
         default = "nscd";
         description = ''
           User group under which nscd runs.
         '';
       };
 
-      config = mkOption {
-        type = types.lines;
+      config = lib.mkOption {
+        type = lib.types.lines;
         default = builtins.readFile ./nscd.conf;
         description = ''
           Configuration to use for Name Service Cache Daemon.
@@ -67,8 +64,8 @@ in
         '';
       };
 
-      package = mkOption {
-        type = types.package;
+      package = lib.mkOption {
+        type = lib.types.package;
         default =
           if pkgs.stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.bin else pkgs.glibc.bin;
         defaultText = lib.literalExpression ''
@@ -88,7 +85,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.etc."nscd.conf".text = cfg.config;
 
     users.users.${cfg.user} = {
@@ -125,7 +122,7 @@ in
           config.environment.etc."nsswitch.conf".source
           config.environment.etc."nscd.conf".source
         ]
-        ++ optionals config.users.mysql.enable [
+        ++ lib.optionals config.users.mysql.enable [
           config.environment.etc."libnss-mysql.cfg".source
           config.environment.etc."libnss-mysql-root.cfg".source
         ]

From e8c85ce9ab346d93e01b781718b1c7f27592a705 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0622/1504] nixos/services.saslauthd: remove `with lib;`

---
 nixos/modules/services/system/saslauthd.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix
index 17dae880a0ef..333cc5a4ba11 100644
--- a/nixos/modules/services/system/saslauthd.nix
+++ b/nixos/modules/services/system/saslauthd.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.saslauthd;
@@ -21,18 +18,18 @@ in
 
     services.saslauthd = {
 
-      enable = mkEnableOption "saslauthd, the Cyrus SASL authentication daemon";
+      enable = lib.mkEnableOption "saslauthd, the Cyrus SASL authentication daemon";
 
-      package = mkPackageOption pkgs [ "cyrus_sasl" "bin" ] { };
+      package = lib.mkPackageOption pkgs [ "cyrus_sasl" "bin" ] { };
 
-      mechanism = mkOption {
-        type = types.str;
+      mechanism = lib.mkOption {
+        type = lib.types.str;
         default = "pam";
         description = "Auth mechanism to use";
       };
 
-      config = mkOption {
-        type = types.lines;
+      config = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Configuration to use for Cyrus SASL authentication daemon.";
       };
@@ -43,7 +40,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     systemd.services.saslauthd = {
       description = "Cyrus SASL authentication daemon";

From c05dd62835f0ddff584f6c75acbcc6a43d770199 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0623/1504] nixos/services.uptimed: remove `with lib;`

---
 nixos/modules/services/system/uptimed.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index b0c4daa3c186..faa949c3089b 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.uptimed;
   stateDir = "/var/lib/uptimed";
@@ -14,8 +11,8 @@ in
 {
   options = {
     services.uptimed = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Enable `uptimed`, allowing you to track
@@ -25,7 +22,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.uptimed ];
 

From 16c697e1e338f64d881cc795b959c4df38706258 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0624/1504] nixos/services.deluge: remove `with lib;`

---
 nixos/modules/services/torrent/deluge.nix | 89 +++++++++++------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 90573fea57b3..4d7d59175ded 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -1,16 +1,13 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   cfg = config.services.deluge;
   cfg_web = config.services.deluge.web;
-  isDeluge1 = versionOlder cfg.package.version "2.0.0";
+  isDeluge1 = lib.versionOlder cfg.package.version "2.0.0";
 
   openFilesLimit = 4096;
   listenPortsDefault = [ 6881 6889 ];
 
-  listToRange = x: { from = elemAt x 0; to = elemAt x 1; };
+  listToRange = x: { from = lib.elemAt x 0; to = lib.elemAt x 1; };
 
   configDir = "${cfg.dataDir}/.config/deluge";
   configFile = pkgs.writeText "core.conf" (builtins.toJSON cfg.config);
@@ -37,20 +34,20 @@ in {
   options = {
     services = {
       deluge = {
-        enable = mkEnableOption "Deluge daemon";
+        enable = lib.mkEnableOption "Deluge daemon";
 
-        openFilesLimit = mkOption {
+        openFilesLimit = lib.mkOption {
           default = openFilesLimit;
-          type = types.either types.int types.str;
+          type = lib.types.either lib.types.int lib.types.str;
           description = ''
             Number of files to allow deluged to open.
           '';
         };
 
-        config = mkOption {
-          type = types.attrs;
+        config = lib.mkOption {
+          type = lib.types.attrs;
           default = {};
-          example = literalExpression ''
+          example = lib.literalExpression ''
             {
               download_location = "/srv/torrents/";
               max_upload_speed = "1000.0";
@@ -70,8 +67,8 @@ in {
           '';
         };
 
-        declarative = mkOption {
-          type = types.bool;
+        declarative = lib.mkOption {
+          type = lib.types.bool;
           default = false;
           description = ''
             Whether to use a declarative deluge configuration.
@@ -83,9 +80,9 @@ in {
           '';
         };
 
-        openFirewall = mkOption {
+        openFirewall = lib.mkOption {
           default = false;
-          type = types.bool;
+          type = lib.types.bool;
           description = ''
             Whether to open the firewall for the ports in
             {option}`services.deluge.config.listen_ports`. It only takes effet if
@@ -99,16 +96,16 @@ in {
           '';
         };
 
-        dataDir = mkOption {
-          type = types.path;
+        dataDir = lib.mkOption {
+          type = lib.types.path;
           default = "/var/lib/deluge";
           description = ''
             The directory where deluge will create files.
           '';
         };
 
-        authFile = mkOption {
-          type = types.path;
+        authFile = lib.mkOption {
+          type = lib.types.path;
           example = "/run/keys/deluge-auth";
           description = ''
             The file managing the authentication for deluge, the format of this
@@ -121,24 +118,24 @@ in {
           '';
         };
 
-        user = mkOption {
-          type = types.str;
+        user = lib.mkOption {
+          type = lib.types.str;
           default = "deluge";
           description = ''
             User account under which deluge runs.
           '';
         };
 
-        group = mkOption {
-          type = types.str;
+        group = lib.mkOption {
+          type = lib.types.str;
           default = "deluge";
           description = ''
             Group under which deluge runs.
           '';
         };
 
-        extraPackages = mkOption {
-          type = types.listOf types.package;
+        extraPackages = lib.mkOption {
+          type = lib.types.listOf lib.types.package;
           default = [];
           description = ''
             Extra packages available at runtime to enable Deluge's plugins. For example,
@@ -147,22 +144,22 @@ in {
           '';
         };
 
-        package = mkPackageOption pkgs "deluge-2_x" { };
+        package = lib.mkPackageOption pkgs "deluge-2_x" { };
       };
 
       deluge.web = {
-        enable = mkEnableOption "Deluge Web daemon";
+        enable = lib.mkEnableOption "Deluge Web daemon";
 
-        port = mkOption {
-          type = types.port;
+        port = lib.mkOption {
+          type = lib.types.port;
           default = 8112;
           description = ''
             Deluge web UI port.
           '';
         };
 
-        openFirewall = mkOption {
-          type = types.bool;
+        openFirewall = lib.mkOption {
+          type = lib.types.bool;
           default = false;
           description = ''
             Open ports in the firewall for deluge web daemon
@@ -172,10 +169,10 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
-    services.deluge.package = mkDefault (
-      if versionAtLeast config.system.stateVersion "20.09" then
+    services.deluge.package = lib.mkDefault (
+      if lib.versionAtLeast config.system.stateVersion "20.09" then
         pkgs.deluge-2_x
       else
         # deluge-1_x is no longer packaged and this will resolve to an error
@@ -201,13 +198,13 @@ in {
       "${cfg.dataDir}/.config".d = defaultConfig;
       "${cfg.dataDir}/.config/deluge".d = defaultConfig;
     }
-    // optionalAttrs (cfg.config ? download_location) {
+    // lib.optionalAttrs (cfg.config ? download_location) {
       ${cfg.config.download_location}.d = defaultConfig;
     }
-    // optionalAttrs (cfg.config ? torrentfiles_location) {
+    // lib.optionalAttrs (cfg.config ? torrentfiles_location) {
       ${cfg.config.torrentfiles_location}.d = defaultConfig;
     }
-    // optionalAttrs (cfg.config ? move_completed_path) {
+    // lib.optionalAttrs (cfg.config ? move_completed_path) {
       ${cfg.config.move_completed_path}.d = defaultConfig;
     };
 
@@ -233,7 +230,7 @@ in {
       preStart = preStart;
     };
 
-    systemd.services.delugeweb = mkIf cfg_web.enable {
+    systemd.services.delugeweb = lib.mkIf cfg_web.enable {
       after = [ "network.target" "deluged.service"];
       requires = [ "deluged.service" ];
       description = "Deluge BitTorrent WebUI";
@@ -242,7 +239,7 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${cfg.package}/bin/deluge-web \
-            ${optionalString (!isDeluge1) "--do-not-daemonize"} \
+            ${lib.optionalString (!isDeluge1) "--do-not-daemonize"} \
             --config ${configDir} \
             --port ${toString cfg.web.port}
         '';
@@ -251,19 +248,19 @@ in {
       };
     };
 
-    networking.firewall = mkMerge [
-      (mkIf (cfg.declarative && cfg.openFirewall && !(cfg.config.random_port or true)) {
-        allowedTCPPortRanges = singleton (listToRange (cfg.config.listen_ports or listenPortsDefault));
-        allowedUDPPortRanges = singleton (listToRange (cfg.config.listen_ports or listenPortsDefault));
+    networking.firewall = lib.mkMerge [
+      (lib.mkIf (cfg.declarative && cfg.openFirewall && !(cfg.config.random_port or true)) {
+        allowedTCPPortRanges = lib.singleton (listToRange (cfg.config.listen_ports or listenPortsDefault));
+        allowedUDPPortRanges = lib.singleton (listToRange (cfg.config.listen_ports or listenPortsDefault));
       })
-      (mkIf (cfg.web.openFirewall) {
+      (lib.mkIf (cfg.web.openFirewall) {
         allowedTCPPorts = [ cfg.web.port ];
       })
     ];
 
     environment.systemPackages = [ cfg.package ];
 
-    users.users = mkIf (cfg.user == "deluge") {
+    users.users = lib.mkIf (cfg.user == "deluge") {
       deluge = {
         group = cfg.group;
         uid = config.ids.uids.deluge;
@@ -272,7 +269,7 @@ in {
       };
     };
 
-    users.groups = mkIf (cfg.group == "deluge") {
+    users.groups = lib.mkIf (cfg.group == "deluge") {
       deluge = {
         gid = config.ids.gids.deluge;
       };

From 2718eb3e96af4c5d3895a978b0b94e2af9fb8997 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0625/1504] nixos/services.flexget: remove `with lib;`

---
 nixos/modules/services/torrent/flexget.nix | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index 35ade70d8b63..0e5d8d667676 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -4,63 +4,60 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.flexget;
   pkg = cfg.package;
   ymlFile = pkgs.writeText "flexget.yml" ''
     ${cfg.config}
 
-    ${optionalString cfg.systemScheduler "schedules: no"}
+    ${lib.optionalString cfg.systemScheduler "schedules: no"}
   '';
   configFile = "${toString cfg.homeDir}/flexget.yml";
 in
 {
   options = {
     services.flexget = {
-      enable = mkEnableOption "FlexGet daemon";
+      enable = lib.mkEnableOption "FlexGet daemon";
 
-      package = mkPackageOption pkgs "flexget" { };
+      package = lib.mkPackageOption pkgs "flexget" { };
 
-      user = mkOption {
+      user = lib.mkOption {
         default = "deluge";
         example = "some_user";
-        type = types.str;
+        type = lib.types.str;
         description = "The user under which to run flexget.";
       };
 
-      homeDir = mkOption {
+      homeDir = lib.mkOption {
         default = "/var/lib/deluge";
         example = "/home/flexget";
-        type = types.path;
+        type = lib.types.path;
         description = "Where files live.";
       };
 
-      interval = mkOption {
+      interval = lib.mkOption {
         default = "10m";
         example = "1h";
-        type = types.str;
+        type = lib.types.str;
         description = "When to perform a {command}`flexget` run. See {command}`man 7 systemd.time` for the format.";
       };
 
-      systemScheduler = mkOption {
+      systemScheduler = lib.mkOption {
         default = true;
         example = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = "When true, execute the runs via the flexget-runner.timer. If false, you have to specify the settings yourself in the YML file.";
       };
 
-      config = mkOption {
+      config = lib.mkOption {
         default = "";
-        type = types.lines;
+        type = lib.types.lines;
         description = "The YAML configuration for FlexGet.";
       };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ pkg ];
 
@@ -81,7 +78,7 @@ in
         wantedBy = [ "multi-user.target" ];
       };
 
-      flexget-runner = mkIf cfg.systemScheduler {
+      flexget-runner = lib.mkIf cfg.systemScheduler {
         description = "FlexGet Runner";
         after = [ "flexget.service" ];
         wants = [ "flexget.service" ];
@@ -94,7 +91,7 @@ in
       };
     };
 
-    systemd.timers.flexget-runner = mkIf cfg.systemScheduler {
+    systemd.timers.flexget-runner = lib.mkIf cfg.systemScheduler {
       description = "Run FlexGet every ${cfg.interval}";
       wantedBy = [ "timers.target" ];
       timerConfig = {

From fd713acb0a5fa68a25e7d31ec7bf5c1f14e04c4f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0626/1504] nixos/services.magnetico: remove `with lib;`

---
 nixos/modules/services/torrent/magnetico.nix | 49 +++++++++-----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix
index fda552aff8fd..51a4dc4c715f 100644
--- a/nixos/modules/services/torrent/magnetico.nix
+++ b/nixos/modules/services/torrent/magnetico.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.magnetico;
 
@@ -22,7 +19,7 @@ let
       );
 
   # default options in magneticod/main.go
-  dbURI = concatStrings [
+  dbURI = lib.concatStrings [
     "sqlite3://${dataDir}/database.sqlite3"
     "?_journal_mode=WAL"
     "&_busy_timeout=3000"
@@ -63,10 +60,10 @@ in
   ###### interface
 
   options.services.magnetico = {
-    enable = mkEnableOption "Magnetico, Bittorrent DHT crawler";
+    enable = lib.mkEnableOption "Magnetico, Bittorrent DHT crawler";
 
-    crawler.address = mkOption {
-      type = types.str;
+    crawler.address = lib.mkOption {
+      type = lib.types.str;
       default = "0.0.0.0";
       example = "1.2.3.4";
       description = ''
@@ -74,8 +71,8 @@ in
       '';
     };
 
-    crawler.port = mkOption {
-      type = types.port;
+    crawler.port = lib.mkOption {
+      type = lib.types.port;
       default = 0;
       description = ''
         Port to be used for indexing DHT nodes.
@@ -84,8 +81,8 @@ in
       '';
     };
 
-    crawler.maxNeighbors = mkOption {
-      type = types.ints.positive;
+    crawler.maxNeighbors = lib.mkOption {
+      type = lib.types.ints.positive;
       default = 1000;
       description = ''
         Maximum number of simultaneous neighbors of an indexer.
@@ -95,24 +92,24 @@ in
       '';
     };
 
-    crawler.maxLeeches = mkOption {
-      type = types.ints.positive;
+    crawler.maxLeeches = lib.mkOption {
+      type = lib.types.ints.positive;
       default = 200;
       description = ''
         Maximum number of simultaneous leeches.
       '';
     };
 
-    crawler.extraOptions = mkOption {
-      type = types.listOf types.str;
+    crawler.extraOptions = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       description = ''
         Extra command line arguments to pass to magneticod.
       '';
     };
 
-    web.address = mkOption {
-      type = types.str;
+    web.address = lib.mkOption {
+      type = lib.types.str;
       default = "localhost";
       example = "1.2.3.4";
       description = ''
@@ -120,16 +117,16 @@ in
       '';
     };
 
-    web.port = mkOption {
-      type = types.port;
+    web.port = lib.mkOption {
+      type = lib.types.port;
       default = 8080;
       description = ''
         Port the web interface will listen to.
       '';
     };
 
-    web.credentials = mkOption {
-      type = types.attrsOf types.str;
+    web.credentials = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
       default = { };
       example = lib.literalExpression ''
         {
@@ -156,8 +153,8 @@ in
       '';
     };
 
-    web.credentialsFile = mkOption {
-      type = types.nullOr types.path;
+    web.credentialsFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
       default = null;
       description = ''
         The path to the file holding the credentials to access the web
@@ -174,8 +171,8 @@ in
       '';
     };
 
-    web.extraOptions = mkOption {
-      type = types.listOf types.str;
+    web.extraOptions = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       description = ''
         Extra command line arguments to pass to magneticow.
@@ -186,7 +183,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     users.users.magnetico = {
       description = "Magnetico daemons user";

From 4db4628f76a3721de945936f0b98bf69fd4d9aaf Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:40 +0100
Subject: [PATCH 0627/1504] nixos/services.opentracker: remove `with lib;`

---
 nixos/modules/services/torrent/opentracker.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix
index 518830d4c279..22938e9359d4 100644
--- a/nixos/modules/services/torrent/opentracker.nix
+++ b/nixos/modules/services/torrent/opentracker.nix
@@ -4,19 +4,17 @@
   pkgs,
   ...
 }:
-
-with lib;
 let
   cfg = config.services.opentracker;
 in
 {
   options.services.opentracker = {
-    enable = mkEnableOption "opentracker";
+    enable = lib.mkEnableOption "opentracker";
 
-    package = mkPackageOption pkgs "opentracker" { };
+    package = lib.mkPackageOption pkgs "opentracker" { };
 
-    extraOptions = mkOption {
-      type = types.separatedString " ";
+    extraOptions = lib.mkOption {
+      type = lib.types.separatedString " ";
       description = ''
         Configuration Arguments for opentracker
         See https://erdgeist.org/arts/software/opentracker/ for all params

From 336a76b1956375162be31bb79fa08ebe70cfd41d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 29 Dec 2024 21:50:41 +0100
Subject: [PATCH 0628/1504] nixos/services.peerflix: remove `with lib;`

---
 nixos/modules/services/torrent/peerflix.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix
index abfbae6b7780..ff1aba7b9efc 100644
--- a/nixos/modules/services/torrent/peerflix.nix
+++ b/nixos/modules/services/torrent/peerflix.nix
@@ -5,9 +5,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.peerflix;
   opt = options.services.peerflix;
@@ -25,29 +22,29 @@ in
   ###### interface
 
   options.services.peerflix = {
-    enable = mkOption {
+    enable = lib.mkOption {
       description = "Whether to enable peerflix service.";
       default = false;
-      type = types.bool;
+      type = lib.types.bool;
     };
 
-    stateDir = mkOption {
+    stateDir = lib.mkOption {
       description = "Peerflix state directory.";
       default = "/var/lib/peerflix";
-      type = types.path;
+      type = lib.types.path;
     };
 
-    downloadDir = mkOption {
+    downloadDir = lib.mkOption {
       description = "Peerflix temporary download directory.";
       default = "${cfg.stateDir}/torrents";
-      defaultText = literalExpression ''"''${config.${opt.stateDir}}/torrents"'';
-      type = types.path;
+      defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/torrents"'';
+      type = lib.types.path;
     };
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.tmpfiles.rules = [
       "d '${cfg.stateDir}' - peerflix - - -"
     ];

From 7e504761f0eb133c7899a4fac4ec47450ae593a1 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Mon, 30 Dec 2024 12:18:47 +0100
Subject: [PATCH 0629/1504] doc: fix fetchDebianPatch example

---
 doc/build-helpers/fetchers.chapter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 567d47a1499b..fd7b41f64c70 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -728,7 +728,7 @@ buildPythonPackage rec {
     (fetchDebianPatch {
       inherit pname version;
       debianRevision = "5";
-      name = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
+      patch = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
       hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0=";
     })
   ];

From 35a0745ba5323910efed309e44e2d4bb1c2ea5c5 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Mon, 30 Dec 2024 07:27:24 -0500
Subject: [PATCH 0630/1504] usbkvm: fix non-null vendorHash for release tarball

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

diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index 4a24905574e6..19547c8fcacf 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -28,7 +28,7 @@ let
 
     inherit src;
     sourceRoot = "source/ms-tools";
-    vendorHash = "sha256-imHpsos7RDpATSZFWRxug67F7VgjRTT1SkLt7cWk6tU=";
+    vendorHash = null; # dependencies are vendored in the release tarball
 
     buildInputs = [
       hidapi

From c1f8b214cc4a8d826643d4557161f345452a9b0e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 28 Dec 2024 19:17:27 +0000
Subject: [PATCH 0631/1504] foundationdb: 7.1.32 -> 7.3.42
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Includes fixes for GCC 14 and using non‐vendored libraries.
---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 .../services/databases/foundationdb.md        |   4 +-
 pkgs/servers/foundationdb/cmake.nix           |  27 ++--
 pkgs/servers/foundationdb/default.nix         |  10 +-
 .../don-t-run-tests-requiring-doctest.patch   | 128 ------------------
 .../patches/fix-open-with-O_CREAT.patch       |  25 ----
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   4 +-
 pkgs/top-level/python-aliases.nix             |   1 +
 pkgs/top-level/python-packages.nix            |   2 +-
 10 files changed, 26 insertions(+), 178 deletions(-)
 delete mode 100644 pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch
 delete mode 100644 pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 39e75a30446e..c47101b1b1ff 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -141,6 +141,8 @@
 
 - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.
 
+- `foundationdb` was upgraded to 7.3.
+
 - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years.
 
 - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md
index 9f7addc9c140..3cf17f1e6362 100644
--- a/nixos/modules/services/databases/foundationdb.md
+++ b/nixos/modules/services/databases/foundationdb.md
@@ -18,7 +18,7 @@ To enable FoundationDB, add the following to your
 ```nix
 {
   services.foundationdb.enable = true;
-  services.foundationdb.package = pkgs.foundationdb71; # FoundationDB 7.1.x
+  services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.r3.x
 }
 ```
 
@@ -68,7 +68,7 @@ necessary Python modules).
 ```ShellSession
 a@link> cat fdb-status.py
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python pythonPackages.foundationdb71
+#! nix-shell -i python -p python pythonPackages.foundationdb73
 
 import fdb
 import json
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 015177d558c0..42a9b38ea781 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -2,7 +2,7 @@
 
 { lib, fetchFromGitHub
 , cmake, ninja, python3, openjdk8, mono, pkg-config
-, msgpack-cxx, toml11
+, msgpack-cxx, toml11, jemalloc, doctest
 
 , gccStdenv, llvmPackages
 , useClang ? false
@@ -37,7 +37,9 @@ let
           inherit rev hash;
         };
 
-        buildInputs = [ ssl boost msgpack-cxx toml11 ];
+        buildInputs = [ ssl boost msgpack-cxx toml11 jemalloc ];
+
+        checkInputs = [ doctest ];
 
         nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ]
           ++ lib.optionals useClang [ llvmPackages.lld ];
@@ -55,9 +57,7 @@ let
             # >   Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a
             "-DSSD_ROCKSDB_EXPERIMENTAL=FALSE"
 
-            # FoundationDB's CMake is hardcoded to pull in jemalloc as an external
-            # project at build time.
-            "-DUSE_JEMALLOC=FALSE"
+            "-DBUILD_DOCUMENTATION=FALSE"
 
             # LTO brings up overall build time, but results in much smaller
             # binaries for all users and the cache.
@@ -68,8 +68,8 @@ let
             # Same with LLD when Clang is available.
             (lib.optionalString useClang    "-DUSE_LD=LLD")
             (lib.optionalString (!useClang) "-DUSE_LD=GOLD")
-          ] ++ lib.optionals (lib.versionOlder version "7.2.0")
-          [ # FIXME: why can't openssl be found automatically?
+
+            # FIXME: why can't openssl be found automatically?
             "-DOPENSSL_USE_STATIC_LIBS=FALSE"
             "-DOPENSSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so"
             "-DOPENSSL_SSL_LIBRARY=${ssl.out}/lib/libssl.so"
@@ -77,19 +77,16 @@ let
 
         hardeningDisable = [ "fortify" ];
 
-        env.NIX_CFLAGS_COMPILE = toString [
-          # Needed with GCC 12
-          "-Wno-error=missing-template-keyword"
-          # Needed to compile on aarch64
-          (lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc")
-        ];
-
         inherit patches;
 
-        # allow using any msgpack-cxx version
         postPatch = ''
+          # allow using any msgpack-cxx version
           substituteInPlace cmake/GetMsgpack.cmake \
             --replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)'
+
+          # Use our doctest package
+          substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \
+            --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include'
         '';
 
         # the install phase for cmake is pretty wonky right now since it's not designed to
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 95b4aeddcedf..4962b521f372 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -15,23 +15,23 @@
   pkg-config,
   msgpack-cxx,
   toml11,
+  jemalloc,
+  doctest,
 }@args:
 
 let
   cmakeBuild = import ./cmake.nix args;
 in
 {
-  foundationdb71 = cmakeBuild {
-    version = "7.1.32";
-    hash = "sha256-CNJ4w1ECadj2KtcfbBPBQpXQeq9BAiw54hUgRTWPFzY=";
+  foundationdb73 = cmakeBuild {
+    version = "7.3.42";
+    hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
     boost = boost178;
     ssl = openssl;
 
     patches = [
       ./patches/disable-flowbench.patch
-      ./patches/don-t-run-tests-requiring-doctest.patch
       ./patches/don-t-use-static-boost-libs.patch
-      ./patches/fix-open-with-O_CREAT.patch
       # GetMsgpack: add 4+ versions of upstream
       # https://github.com/apple/foundationdb/pull/10935
       (fetchpatch {
diff --git a/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch b/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch
deleted file mode 100644
index 702245bd52ff..000000000000
--- a/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 10c502fd36df24f1fdbdeff446982ff5247ba20e Mon Sep 17 00:00:00 2001
-From: Jente Hidskes Ankarberg <jente@griffin.sh>
-Date: Thu, 9 Feb 2023 12:40:21 +0100
-Subject: [PATCH] Don't run tests requiring doctest
-
-Doctest is unconditionally pulled in as an external project, which we can't do
----
- bindings/c/CMakeLists.txt | 59 ---------------------------------------
- 1 file changed, 59 deletions(-)
-
-diff --git bindings/c/CMakeLists.txt bindings/c/CMakeLists.txt
-index b1a187b99..25b626819 100644
---- a/bindings/c/CMakeLists.txt
-+++ b/bindings/c/CMakeLists.txt
-@@ -84,7 +84,6 @@ if(NOT WIN32)
-     test/mako/mako.h
-     test/mako/utils.c
-     test/mako/utils.h)
--  add_subdirectory(test/unit/third_party)
-   find_package(Threads REQUIRED)
-   set(UNIT_TEST_SRCS
-     test/unit/unit_tests.cpp
-@@ -93,10 +92,6 @@ if(NOT WIN32)
- 
-   set(UNIT_TEST_VERSION_510_SRCS test/unit/unit_tests_version_510.cpp)
-   set(TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS test/unit/trace_partial_file_suffix_test.cpp)
--  set(DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS
--    test/unit/disconnected_timeout_tests.cpp
--    test/unit/fdb_api.cpp
--    test/unit/fdb_api.hpp)
- 
-   set(API_TESTER_SRCS
-     test/apitester/fdb_c_api_tester.cpp
-@@ -128,11 +123,7 @@ if(NOT WIN32)
-     add_library(fdb_c_txn_size_test OBJECT test/txn_size_test.c test/test.h)
-     add_library(fdb_c_client_memory_test OBJECT test/client_memory_test.cpp test/unit/fdb_api.cpp test/unit/fdb_api.hpp)
-     add_library(mako OBJECT ${MAKO_SRCS})
--    add_library(fdb_c_setup_tests OBJECT test/unit/setup_tests.cpp)
--    add_library(fdb_c_unit_tests OBJECT ${UNIT_TEST_SRCS})
--    add_library(fdb_c_unit_tests_version_510 OBJECT ${UNIT_TEST_VERSION_510_SRCS})
-     add_library(trace_partial_file_suffix_test OBJECT ${TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS})
--    add_library(disconnected_timeout_unit_tests OBJECT ${DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS})
-     add_library(fdb_c_api_tester OBJECT ${API_TESTER_SRCS})
-   else()
-     add_executable(fdb_c_performance_test test/performance_test.c test/test.h)
-@@ -140,11 +131,7 @@ if(NOT WIN32)
-     add_executable(fdb_c_txn_size_test test/txn_size_test.c test/test.h)
-     add_executable(fdb_c_client_memory_test test/client_memory_test.cpp test/unit/fdb_api.cpp test/unit/fdb_api.hpp)
-     add_executable(mako ${MAKO_SRCS})
--    add_executable(fdb_c_setup_tests test/unit/setup_tests.cpp)
--    add_executable(fdb_c_unit_tests ${UNIT_TEST_SRCS})
--    add_executable(fdb_c_unit_tests_version_510 ${UNIT_TEST_VERSION_510_SRCS})
-     add_executable(trace_partial_file_suffix_test ${TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS})
--    add_executable(disconnected_timeout_unit_tests ${DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS})
-     add_executable(fdb_c_api_tester ${API_TESTER_SRCS})
-     strip_debug_symbols(fdb_c_performance_test)
-     strip_debug_symbols(fdb_c_ryw_benchmark)
-@@ -155,20 +142,7 @@ if(NOT WIN32)
-   target_link_libraries(fdb_c_ryw_benchmark PRIVATE fdb_c Threads::Threads)
-   target_link_libraries(fdb_c_txn_size_test PRIVATE fdb_c Threads::Threads)
-   target_link_libraries(fdb_c_client_memory_test PRIVATE fdb_c Threads::Threads)
--
--  add_dependencies(fdb_c_setup_tests doctest)
--  add_dependencies(fdb_c_unit_tests doctest)
--  add_dependencies(fdb_c_unit_tests_version_510 doctest)
--  add_dependencies(disconnected_timeout_unit_tests doctest)
--  target_include_directories(fdb_c_setup_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
--  target_include_directories(fdb_c_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
--  target_include_directories(fdb_c_unit_tests_version_510 PUBLIC ${DOCTEST_INCLUDE_DIR})
--  target_include_directories(disconnected_timeout_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
--  target_link_libraries(fdb_c_setup_tests PRIVATE fdb_c Threads::Threads)
--  target_link_libraries(fdb_c_unit_tests PRIVATE fdb_c Threads::Threads fdbclient)
--  target_link_libraries(fdb_c_unit_tests_version_510 PRIVATE fdb_c Threads::Threads)
-   target_link_libraries(trace_partial_file_suffix_test PRIVATE fdb_c Threads::Threads flow)
--  target_link_libraries(disconnected_timeout_unit_tests PRIVATE fdb_c Threads::Threads)
- 
- if(USE_SANITIZER)
-   target_link_libraries(fdb_c_api_tester PRIVATE fdb_c toml11_target Threads::Threads fmt::fmt boost_asan)
-@@ -203,46 +177,13 @@ endif()
-     DEPENDS fdb_c
-     COMMENT "Copy libfdb_c to use as external client for test")
-   add_custom_target(external_client DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so)
--  add_dependencies(fdb_c_unit_tests external_client)
--  add_dependencies(disconnected_timeout_unit_tests external_client)
-   add_dependencies(fdb_c_api_tester external_client)
- 
--  add_fdbclient_test(
--    NAME fdb_c_setup_tests
--    COMMAND $<TARGET_FILE:fdb_c_setup_tests>)
--  add_fdbclient_test(
--    NAME fdb_c_unit_tests
--    COMMAND $<TARGET_FILE:fdb_c_unit_tests>
--            @CLUSTER_FILE@
--            fdb)
--  add_fdbclient_test(
--    NAME fdb_c_unit_tests_version_510
--    COMMAND $<TARGET_FILE:fdb_c_unit_tests_version_510>
--            @CLUSTER_FILE@
--            fdb)
-   add_fdbclient_test(
-     NAME trace_partial_file_suffix_test
-     COMMAND $<TARGET_FILE:trace_partial_file_suffix_test>
-             @CLUSTER_FILE@
-             fdb)
--  add_fdbclient_test(
--    NAME fdb_c_external_client_unit_tests
--    COMMAND $<TARGET_FILE:fdb_c_unit_tests>
--            @CLUSTER_FILE@
--            fdb
--            ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so
--            )
--  add_unavailable_fdbclient_test(
--    NAME disconnected_timeout_unit_tests
--    COMMAND $<TARGET_FILE:disconnected_timeout_unit_tests>
--            @CLUSTER_FILE@
--            )
--  add_unavailable_fdbclient_test(
--    NAME disconnected_timeout_external_client_unit_tests
--    COMMAND $<TARGET_FILE:disconnected_timeout_unit_tests>
--            @CLUSTER_FILE@
--            ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so
--            )
-   add_fdbclient_test(
-     NAME fdb_c_api_tests
-     DISABLE_LOG_DUMP
--- 
-2.37.1 (Apple Git-137.1)
-
diff --git a/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch b/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch
deleted file mode 100644
index 23a642cb28fd..000000000000
--- a/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 533d064ce028a7ebd0ef3a845cb69f10ca04b09f Mon Sep 17 00:00:00 2001
-From: Jente Hidskes Ankarberg <jente@griffin.sh>
-Date: Fri, 17 Feb 2023 00:07:20 +0100
-Subject: [PATCH 2/2] fix open with O_CREAT
-
----
- fdbbackup/FileDecoder.actor.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git fdbbackup/FileDecoder.actor.cpp fdbbackup/FileDecoder.actor.cpp
-index 71f693259..547147ea0 100644
---- a/fdbbackup/FileDecoder.actor.cpp
-+++ b/fdbbackup/FileDecoder.actor.cpp
-@@ -433,7 +433,7 @@ public:
- 					platform::createDirectory(path);
- 				}
- 			}
--			self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC);
-+			self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
- 			if (self->lfd == -1) {
- 				TraceEvent(SevError, "OpenLocalFileFailed").detail("File", self->file.fileName);
- 				throw platform_error();
--- 
-2.38.1
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 39f79cb6efe0..3d51373e780a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -403,6 +403,7 @@ mapAliases {
   fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12
   foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17
   forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
+  foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28
 
   fractal-next = fractal; # added 2023-11-25
   framework-system-tools = framework-tool; # added 2023-12-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86ce4f1eb9a2..2832235302bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3413,10 +3413,10 @@ with pkgs;
   fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
 
   inherit (fdbPackages)
-    foundationdb71
+    foundationdb73
   ;
 
-  foundationdb = foundationdb71;
+  foundationdb = foundationdb73;
 
   fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..0821a1968fc0 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -233,6 +233,7 @@ mapAliases ({
   foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
   foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
   foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
+  foundationdb71 = throw "foundationdb71 has been removed, use foundationdb73 instead"; # added 2024-12-28
   functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
   functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16
   fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1056a924484e..f793a2d92bd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4903,7 +4903,7 @@ self: super: with self; {
 
   formulaic = callPackage ../development/python-modules/formulaic { };
 
-  foundationdb71 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb71; };
+  foundationdb73 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb73; };
 
   fountains = callPackage ../development/python-modules/fountains { };
 

From e28c1469642d1b4219fde849de6df2712bc3f181 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 28 Dec 2024 22:25:33 +0000
Subject: [PATCH 0632/1504] foundationdb: unpin Boost

---
 pkgs/servers/foundationdb/cmake.nix   | 5 +++++
 pkgs/servers/foundationdb/default.nix | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 42a9b38ea781..56470052a64d 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -87,6 +87,11 @@ let
           # Use our doctest package
           substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \
             --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include'
+
+          # Upstream upgraded to Boost 1.86 with no code changes; see:
+          # <https://github.com/apple/foundationdb/pull/11788>
+          substituteInPlace cmake/CompileBoost.cmake \
+            --replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost '
         '';
 
         # the install phase for cmake is pretty wonky right now since it's not designed to
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 4962b521f372..35937a8302af 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -11,7 +11,7 @@
   openjdk8,
   mono,
   openssl,
-  boost178,
+  boost,
   pkg-config,
   msgpack-cxx,
   toml11,
@@ -26,7 +26,7 @@ in
   foundationdb73 = cmakeBuild {
     version = "7.3.42";
     hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
-    boost = boost178;
+    inherit boost;
     ssl = openssl;
 
     patches = [

From 3c5ffd9fa4f86d7cbd8ed59aa1f9e8b26bb5d085 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 28 Dec 2024 22:28:55 +0000
Subject: [PATCH 0633/1504] foundationdb: unpin OpenJDK

---
 pkgs/servers/foundationdb/cmake.nix   | 4 ++--
 pkgs/servers/foundationdb/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 56470052a64d..2d88687b00cc 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -1,7 +1,7 @@
 # This builder is for FoundationDB CMake build system.
 
 { lib, fetchFromGitHub
-, cmake, ninja, python3, openjdk8, mono, pkg-config
+, cmake, ninja, python3, openjdk, mono, pkg-config
 , msgpack-cxx, toml11, jemalloc, doctest
 
 , gccStdenv, llvmPackages
@@ -41,7 +41,7 @@ let
 
         checkInputs = [ doctest ];
 
-        nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ]
+        nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ]
           ++ lib.optionals useClang [ llvmPackages.lld ];
 
         separateDebugInfo = true;
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 35937a8302af..5a48c9337243 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -8,7 +8,7 @@
   cmake,
   ninja,
   python3,
-  openjdk8,
+  openjdk,
   mono,
   openssl,
   boost,

From 8417d0294f4261db5eddf614284d88fa8bf8ba07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 12:40:58 +0000
Subject: [PATCH 0634/1504] jan: 0.5.11 -> 0.5.12

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index c7badcedf789..e7c8416b9924 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -5,10 +5,10 @@
 
 let
   pname = "jan";
-  version = "0.5.11";
+  version = "0.5.12";
   src = fetchurl {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
-    hash = "sha256-dIXo7roUTu8wLdnqs1bCA9eVBC+UQMZtqSMwql9egWk=";
+    hash = "sha256-tIylP5VOt53wK/KfgsK6HiMX0YhuiJMDLn0L9XY6aJQ=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From eef440c26fba55c4802557b7a66a5db7bd5962e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 12:42:15 +0000
Subject: [PATCH 0635/1504] qtractor: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix
index c3c0c0d5875d..e107adce1fea 100644
--- a/pkgs/by-name/qt/qtractor/package.nix
+++ b/pkgs/by-name/qt/qtractor/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
-    hash = "sha256-p2Fuads2uTiEIXRS7sqe8Fa3XEKwW1ND/pPnUhFlLdY=";
+    hash = "sha256-jBJ8qruWBeukuW7zzi9rRayJL+FC1e3f+O3cb6QfdiE=";
   };
 
   nativeBuildInputs = [

From b54549515f576939b5043a92988211635e9dee63 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 30 Dec 2024 13:04:26 +0000
Subject: [PATCH 0636/1504] arc-browser: 1.73.0-56815 -> 1.74.0-57065

Changelog: https://arc.net/e/5358013E-071A-4C95-82C5-F6E4D1F725FA
---
 pkgs/by-name/ar/arc-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index f1045b0cdb47..fd67cb00283f 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.73.0-56815";
+  version = "1.74.0-57065";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-PbYX3p6QFnwDgah6ehHW83uSyC7itLfaE+ECC/mbYAU=";
+    hash = "sha256-muTTHJOQKY/oqGJ4OXgoyOhgAo0hW6Y12Dknq/KWTMw=";
   };
 
   nativeBuildInputs = [ undmg ];

From 5037a45d4113d8b8022a1f85e3bb75243efe1a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Sun, 29 Dec 2024 15:48:45 +0000
Subject: [PATCH 0637/1504] tandoor-recipes: add jvanbruegge as maintainer

---
 nixos/modules/services/misc/tandoor-recipes.nix   | 2 +-
 pkgs/applications/misc/tandoor-recipes/common.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix
index 1baa60f9f9cd..3355e4ab98e0 100644
--- a/nixos/modules/services/misc/tandoor-recipes.nix
+++ b/nixos/modules/services/misc/tandoor-recipes.nix
@@ -31,7 +31,7 @@ let
   '';
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = with lib.maintainers; [ jvanbruegge ];
 
   options.services.tandoor-recipes = {
     enable = lib.mkOption {
diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix
index 57f687d522e6..75109f6bef59 100644
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -14,6 +14,6 @@ rec {
   meta = with lib; {
     homepage = "https://tandoor.dev/";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ jvanbruegge ];
   };
 }

From afc8eddc2547a9a5525421e37a814b83cac33b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Sun, 29 Dec 2024 15:58:49 +0000
Subject: [PATCH 0638/1504] tandoor-recipes: fix build

---
 .../misc/tandoor-recipes/default.nix          | 96 ++++++-------------
 .../misc/tandoor-recipes/frontend.nix         |  6 +-
 2 files changed, 33 insertions(+), 69 deletions(-)

diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix
index b6d99325f120..be9e72dd8a57 100644
--- a/pkgs/applications/misc/tandoor-recipes/default.nix
+++ b/pkgs/applications/misc/tandoor-recipes/default.nix
@@ -1,52 +1,15 @@
 { callPackage
 , nixosTests
-, python311
-, fetchFromGitHub
+, python3
 }:
 let
-  # python-ldap-3.4.4 does not work with python3(12)
-  python = python311.override {
-    self = python;
-    packageOverrides = self: super: {
-      validators = super.validators.overridePythonAttrs (_: rec {
-        version = "0.20.0";
-        src = fetchFromGitHub {
-          owner = "python-validators";
-          repo = "validators";
-          rev = version;
-          hash = "sha256-ZnLyTHlsrXthGnaPzlV2ga/UTm5SSEHLTwC/tobiPak=";
-        };
-        propagatedBuildInputs = [ super.decorator super.six ];
-      });
-
-      djangorestframework = super.djangorestframework.overridePythonAttrs (oldAttrs: rec {
-        version = "3.14.0";
-        src = oldAttrs.src.override {
-          rev = version;
-          hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4=";
-        };
-        nativeCheckInputs = with super; [
-          pytest7CheckHook
-          pytest-django
-        ];
-      });
-
-      # python3.11-extruct-0.16.0 doesn't work with lxml-5.2.2
-      lxml = super.lxml.overridePythonAttrs (oldAttrs: rec {
-        version = "5.1.0";
-        src = oldAttrs.src.override {
-          rev = version;
-          hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY=";
-        };
-      });
-    };
-  };
+  python = python3;
 
   common = callPackage ./common.nix { };
 
   frontend = callPackage ./frontend.nix { };
 in
-python.pkgs.pythonPackages.buildPythonPackage rec {
+python.pkgs.pythonPackages.buildPythonPackage {
   pname = "tandoor-recipes";
 
   inherit (common) version src;
@@ -62,50 +25,51 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = with python.pkgs; [
-    aiohttp
-    beautifulsoup4
-    bleach
-    bleach-allowlist
-    boto3
-    cryptography
     django
-    django-allauth
+    cryptography
     django-annoying
-    django-auth-ldap
     django-cleanup
-    django-cors-headers
     django-crispy-forms
     django-crispy-bootstrap4
-    django-hcaptcha
-    django-js-reverse
-    django-oauth-toolkit
-    django-prometheus
-    django-scopes
-    django-storages
     django-tables2
-    django-webpack-loader
-    django-treebeard
     djangorestframework
     drf-writable-nested
+    django-oauth-toolkit
+    bleach
     gunicorn
-    icalendar
-    jinja2
     lxml
     markdown
-    microdata
     pillow
     psycopg2
-    pyppeteer
     python-dotenv
-    pytube
-    pyyaml
-    recipe-scrapers
     requests
     six
-    uritemplate
-    validators
     webdavclient3
     whitenoise
+    icalendar
+    pyyaml
+    uritemplate
+    beautifulsoup4
+    microdata
+    jinja2
+    django-webpack-loader
+    django-js-reverse
+    django-allauth
+    recipe-scrapers
+    django-scopes
+    django-treebeard
+    django-cors-headers
+    django-storages
+    boto3
+    django-prometheus
+    django-hcaptcha
+    python-ldap
+    django-auth-ldap
+    pyppeteer
+    pytubefix
+    aiohttp
+    inflection
+    redis
   ];
 
   configurePhase = ''
diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix
index 0248e5ffbae0..1e0735d15fe7 100644
--- a/pkgs/applications/misc/tandoor-recipes/frontend.nix
+++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix
@@ -3,7 +3,7 @@
   fetchYarnDeps,
   fixup-yarn-lock,
   callPackage,
-  nodejs,
+  nodejs_20,
   yarn,
 }:
 let
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     fixup-yarn-lock
-    nodejs
-    yarn
+    nodejs_20
+    (yarn.override { nodejs = nodejs_20; })
   ];
 
   configurePhase = ''

From 2a9a4592271769749c0da32819a6f757e2f821eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Sun, 29 Dec 2024 15:59:19 +0000
Subject: [PATCH 0639/1504] tandoor-recipes: fix update script to use nixpkgs
 root as workdir

This is what e.g. ./maintainers/scripts/update.nix expects
---
 pkgs/applications/misc/tandoor-recipes/update.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh
index 63021d76f6b7..f197ead847e4 100755
--- a/pkgs/applications/misc/tandoor-recipes/update.sh
+++ b/pkgs/applications/misc/tandoor-recipes/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
+#!nix-shell -I nixpkgs=./ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
 
 # shellcheck shell=bash
 
@@ -36,6 +36,7 @@ popd
 # Use friendlier hashes
 yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash")
 
-sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
-sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix
-sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix
+common="./pkgs/applications/misc/tandoor-recipes/common.nix"
+sed -i -E -e "s#version = \".*\"#version = \"$version\"#" $common
+sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" $common
+sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" $common

From b36c4cd2261db2e718c988e8a3a41cc96ad8b2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Sun, 29 Dec 2024 16:14:40 +0000
Subject: [PATCH 0640/1504] tandoor-recipes: 1.5.19 -> 1.5.25

---
 pkgs/applications/misc/tandoor-recipes/common.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix
index 75109f6bef59..b0a3dbf1e7e9 100644
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -1,15 +1,15 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.5.19";
+  version = "1.5.25";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     rev = version;
-    hash = "sha256-HsBy2HzxBpnwh2RqFQJG0HYReWI0a7E7KsJ5TD+GokY=";
+    hash = "sha256-Yw68wxLqoyPRQmP/krSaxByv24CKh7Y7O07NU+dL5mo=";
   };
 
-  yarnHash = "sha256-BnOw9QRXRRoM+CW6OGbjWhLo4h6JX3ZR1kJd8Z/w02M=";
+  yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ=";
 
   meta = with lib; {
     homepage = "https://tandoor.dev/";

From a5b038c5e945a3ca6f31696081b976042fbb3077 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Dec 2024 14:13:23 +0100
Subject: [PATCH 0641/1504] almanah: Fix build

Missing header was uncovered by gcc update.
---
 pkgs/by-name/al/almanah/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/al/almanah/package.nix b/pkgs/by-name/al/almanah/package.nix
index 6529d736bc1b..6cb95674d289 100644
--- a/pkgs/by-name/al/almanah/package.nix
+++ b/pkgs/by-name/al/almanah/package.nix
@@ -57,6 +57,13 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch";
       sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE=";
     })
+
+    # Add missing GtkSourceView include
+    # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/23
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/533f30c7e60437cbea7ca5ae901e768922c1a710.patch";
+      hash = "sha256-Ekhn4nRMC+fXLn4kqNwyCAg2cZru5QUcdzR1yJbcZGc=";
+    })
   ];
 
   nativeBuildInputs = [

From 64ceac859688965ecc1b1c792e3cfaa53ed97dc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 13:13:36 +0000
Subject: [PATCH 0642/1504] hacompanion: 1.0.15 -> 1.0.17

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

diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix
index d9dcc554151e..5e0529074157 100644
--- a/pkgs/by-name/ha/hacompanion/package.nix
+++ b/pkgs/by-name/ha/hacompanion/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "hacompanion";
-  version = "1.0.15";
+  version = "1.0.17";
 
   src = fetchFromGitHub {
     owner = "tobias-kuendig";
     repo = "hacompanion";
     rev = "v${version}";
-    hash = "sha256-FR2IowbaHXr9x/eMt+NCuGusMwX2iVxPOuWEkhH2GFM=";
+    hash = "sha256-TGYBNsHM92B65LsBwVp9mZgdYkJAvQFyIqknRFqXFaQ=";
   };
 
-  vendorHash = "sha256-ZZ8nxN+zUeFhSXyoHLMgzeFllnIkKdoVnbVK5KjrLEQ=";
+  vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
 
   meta = {
     changelog = "https://github.com/tobias-kuendig/hacompanion/releases/tag/v${version}";

From 205802ea4001b5d661f8450533cb51247760f1cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 13:45:49 +0000
Subject: [PATCH 0643/1504] python312Packages.oci: 2.139.0 -> 2.141.1

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

diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 7bc6e2f1da4d..eb3346301a59 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "oci";
-  version = "2.139.0";
+  version = "2.141.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "oracle";
     repo = "oci-python-sdk";
     tag = "v${version}";
-    hash = "sha256-FjP68c1h97KwCCuqLVB677YyR4/HMstGfwlLUqdtNLU=";
+    hash = "sha256-D2iaEK25ryU1oRRahnlC3wuEIxtyjR6rAa7TXFTaRi4=";
   };
 
   pythonRelaxDeps = [

From 3520763800a4766c2c800985d39f1634b460699a Mon Sep 17 00:00:00 2001
From: Nabeen Tiwaree <nabeen0x01@gmail.com>
Date: Mon, 30 Dec 2024 10:03:23 -0500
Subject: [PATCH 0644/1504] Update pkgs/by-name/rw/rwalk/package.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/rw/rwalk/package.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index 72ea23c1fadc..e76362f508c8 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -19,13 +19,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rEecl8KdPqPreCRq8CZCBfpedInYD7+gfCwCst+VS90=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-
-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-  '';
+  cargoHash = "...";
 
   nativeBuildInputs = [
     pkg-config

From b9cc3de65b0d54852b840083eff3756513c6dfa1 Mon Sep 17 00:00:00 2001
From: Nabeen Tiwaree <nabeen0x01@gmail.com>
Date: Mon, 30 Dec 2024 10:03:36 -0500
Subject: [PATCH 0645/1504] Update pkgs/by-name/rw/rwalk/package.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/rw/rwalk/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index e76362f508c8..c547eaba905a 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -28,9 +28,6 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     [
       openssl
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.Security
     ];
 
   env = {

From e71336029a3e10310d7b67b8e3359b2a63aa9be2 Mon Sep 17 00:00:00 2001
From: Nabeen Tiwaree <nabeen0x01@gmail.com>
Date: Mon, 30 Dec 2024 10:03:46 -0500
Subject: [PATCH 0646/1504] Update pkgs/by-name/rw/rwalk/package.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/rw/rwalk/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index c547eaba905a..541b8da37d70 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "A blazingly fast web directory scanner written in Rust";
     homepage = "https://github.com/cestef/rwalk";
-    changelog = "https://github.com/cestef/rwalk/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/cestef/rwalk/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pwnwriter ];
     mainProgram = "rwalk";

From 6773cf93145373a606e95e6daee982a9c3bcf1f9 Mon Sep 17 00:00:00 2001
From: Nabeen Tiwaree <nabeen0x01@gmail.com>
Date: Mon, 30 Dec 2024 10:03:56 -0500
Subject: [PATCH 0647/1504] Update pkgs/by-name/rw/rwalk/package.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/rw/rwalk/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index 541b8da37d70..fdfee841305f 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A blazingly fast web directory scanner written in Rust";
+    description = "Blazingly fast web directory scanner written in Rust";
     homepage = "https://github.com/cestef/rwalk";
     changelog = "https://github.com/cestef/rwalk/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;

From 328da3a39d153f3da6a81530e3e8639b7a53f4ad Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:38 +0100
Subject: [PATCH 0648/1504] nixos/services.colord: remove `with lib;`

---
 nixos/modules/services/x11/colord.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix
index 1a9ade712739..7b8b1bb48c66 100644
--- a/nixos/modules/services/x11/colord.nix
+++ b/nixos/modules/services/x11/colord.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.colord;
@@ -17,12 +14,12 @@ in
   options = {
 
     services.colord = {
-      enable = mkEnableOption "colord, the color management daemon";
+      enable = lib.mkEnableOption "colord, the color management daemon";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.colord ];
 

From 6fe2a04f0d7cc7e9bbecffcc00280adae8354f1e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0649/1504] nixos/services.xserver.desktopManager.cde: remove
 `with lib;`

---
 nixos/modules/services/x11/desktop-managers/cde.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix
index 8dae3ce0d886..908431f329ef 100644
--- a/nixos/modules/services/x11/desktop-managers/cde.nix
+++ b/nixos/modules/services/x11/desktop-managers/cde.nix
@@ -4,19 +4,16 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.cde;
 in
 {
   options.services.xserver.desktopManager.cde = {
-    enable = mkEnableOption "Common Desktop Environment";
+    enable = lib.mkEnableOption "Common Desktop Environment";
 
-    extraPackages = mkOption {
-      type = with types; listOf package;
+    extraPackages = lib.mkOption {
+      type = with lib.types; listOf package;
       default = with pkgs.xorg; [
         xclock
         bitmap
@@ -29,7 +26,7 @@ in
         xwd
         xwud
       ];
-      defaultText = literalExpression ''
+      defaultText = lib.literalExpression ''
         with pkgs.xorg; [
           xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud
         ]
@@ -40,7 +37,7 @@ in
     };
   };
 
-  config = mkIf (xcfg.enable && cfg.enable) {
+  config = lib.mkIf (xcfg.enable && cfg.enable) {
     environment.systemPackages = cfg.extraPackages;
 
     services.rpcbind.enable = true;

From b48d0ec75778feada71aeb70091c49d3ea89b3e3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0650/1504] nixos/services.xserver.desktopManager.cinnamon:
 remove `with lib;`

---
 .../x11/desktop-managers/cinnamon.nix         | 89 +++++++++----------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index c64c2293a439..43103a663092 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, utils, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.desktopManager.cinnamon;
@@ -18,16 +15,16 @@ in
 {
   options = {
     services.cinnamon = {
-      apps.enable = mkEnableOption "Cinnamon default applications";
+      apps.enable = lib.mkEnableOption "Cinnamon default applications";
     };
 
     services.xserver.desktopManager.cinnamon = {
-      enable = mkEnableOption "the cinnamon desktop manager";
+      enable = lib.mkEnableOption "the cinnamon desktop manager";
 
-      sessionPath = mkOption {
+      sessionPath = lib.mkOption {
         default = [];
-        type = types.listOf types.package;
-        example = literalExpression "[ pkgs.gpaste ]";
+        type = lib.types.listOf lib.types.package;
+        example = lib.literalExpression "[ pkgs.gpaste ]";
         description = ''
           Additional list of packages to be added to the session search path.
           Useful for GSettings-conditional autostart.
@@ -36,53 +33,53 @@ in
         '';
       };
 
-      extraGSettingsOverrides = mkOption {
+      extraGSettingsOverrides = lib.mkOption {
         default = "";
-        type = types.lines;
+        type = lib.types.lines;
         description = "Additional gsettings overrides.";
       };
 
-      extraGSettingsOverridePackages = mkOption {
+      extraGSettingsOverridePackages = lib.mkOption {
         default = [];
-        type = types.listOf types.path;
+        type = lib.types.listOf lib.types.path;
         description = "List of packages for which gsettings are overridden.";
       };
     };
 
-    environment.cinnamon.excludePackages = mkOption {
+    environment.cinnamon.excludePackages = lib.mkOption {
       default = [];
-      example = literalExpression "[ pkgs.blueman ]";
-      type = types.listOf types.package;
+      example = lib.literalExpression "[ pkgs.blueman ]";
+      type = lib.types.listOf lib.types.package;
       description = "Which packages cinnamon should exclude from the default environment";
     };
 
   };
 
-  config = mkMerge [
-    (mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
-        enable = mkDefault true;
+        enable = lib.mkDefault true;
 
         # Taken from mint-artwork.gschema.override
-        theme = mkIf (notExcluded pkgs.mint-themes) {
-          name = mkDefault "Mint-Y-Aqua";
-          package = mkDefault pkgs.mint-themes;
+        theme = lib.mkIf (notExcluded pkgs.mint-themes) {
+          name = lib.mkDefault "Mint-Y-Aqua";
+          package = lib.mkDefault pkgs.mint-themes;
         };
-        iconTheme = mkIf (notExcluded pkgs.mint-y-icons) {
-          name = mkDefault "Mint-Y-Sand";
-          package = mkDefault pkgs.mint-y-icons;
+        iconTheme = lib.mkIf (notExcluded pkgs.mint-y-icons) {
+          name = lib.mkDefault "Mint-Y-Sand";
+          package = lib.mkDefault pkgs.mint-y-icons;
         };
-        cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) {
-          name = mkDefault "Bibata-Modern-Classic";
-          package = mkDefault pkgs.mint-cursor-themes;
+        cursorTheme = lib.mkIf (notExcluded pkgs.mint-cursor-themes) {
+          name = lib.mkDefault "Bibata-Modern-Classic";
+          package = lib.mkDefault pkgs.mint-cursor-themes;
         };
       };
 
       # Have to take care of GDM + Cinnamon on Wayland users
       environment.extraInit = ''
-        ${concatMapStrings (p: ''
+        ${lib.concatMapStrings (p: ''
           if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
             export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
           fi
@@ -95,30 +92,30 @@ in
       '';
 
       # Default services
-      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
-      hardware.bluetooth.enable = mkDefault true;
+      services.blueman.enable = lib.mkDefault (notExcluded pkgs.blueman);
+      hardware.bluetooth.enable = lib.mkDefault true;
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
-      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+      services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
       services.dbus.packages = with pkgs; [
         cinnamon-common
         cinnamon-screensaver
         nemo-with-extensions
         xapp
       ];
-      services.cinnamon.apps.enable = mkDefault true;
+      services.cinnamon.apps.enable = lib.mkDefault true;
       services.gnome.evolution-data-server.enable = true;
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
-      services.power-profiles-daemon.enable = mkDefault true;
-      services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
-      services.touchegg.enable = mkDefault true;
+      services.power-profiles-daemon.enable = lib.mkDefault true;
+      services.switcherooControl.enable = lib.mkDefault true; # xapp-gpu-offload-helper
+      services.touchegg.enable = lib.mkDefault true;
       services.udisks2.enable = true;
-      services.upower.enable = mkDefault config.powerManagement.enable;
-      services.libinput.enable = mkDefault true;
+      services.upower.enable = lib.mkDefault config.powerManagement.enable;
+      services.libinput.enable = lib.mkDefault true;
       services.xserver.updateDbusEnvironment = true;
-      networking.networkmanager.enable = mkDefault true;
+      networking.networkmanager.enable = lib.mkDefault true;
 
       # Enable colord server
       services.colord.enable = true;
@@ -204,9 +201,9 @@ in
         pkgs.xdg-desktop-portal-gtk
       ];
 
-      services.orca.enable = mkDefault (notExcluded pkgs.orca);
+      services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
 
-      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
+      xdg.portal.configPackages = lib.mkDefault [ pkgs.cinnamon-common ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
@@ -217,8 +214,8 @@ in
       ];
 
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = mkDefault true;
-      programs.zsh.vteIntegration = mkDefault true;
+      programs.bash.vteIntegration = lib.mkDefault true;
+      programs.zsh.vteIntegration = lib.mkDefault true;
 
       # Default Fonts
       fonts.packages = with pkgs; [
@@ -227,10 +224,10 @@ in
       ];
     })
 
-    (mkIf serviceCfg.apps.enable {
-      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);
-      programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
-      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
+    (lib.mkIf serviceCfg.apps.enable {
+      programs.gnome-disks.enable = lib.mkDefault (notExcluded pkgs.gnome-disk-utility);
+      programs.gnome-terminal.enable = lib.mkDefault (notExcluded pkgs.gnome-terminal);
+      programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller);
 
       environment.systemPackages = with pkgs; utils.removePackagesByName [
         # cinnamon team apps

From 5fac14d6a43840a04b034cdb32711ec429376dee Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0651/1504] nixos/services.xserver.desktopManager.deepin:
 remove `with lib;`

---
 .../services/x11/desktop-managers/deepin.nix  | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index ca9fb229df97..76ffb71bb2a4 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -5,9 +5,6 @@
   utils,
   ...
 }:
-
-with lib;
-
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.deepin;
@@ -21,68 +18,68 @@ in
   options = {
 
     services.xserver.desktopManager.deepin = {
-      enable = mkEnableOption "Deepin desktop manager";
-      extraGSettingsOverrides = mkOption {
+      enable = lib.mkEnableOption "Deepin desktop manager";
+      extraGSettingsOverrides = lib.mkOption {
         default = "";
-        type = types.lines;
+        type = lib.types.lines;
         description = "Additional gsettings overrides.";
       };
-      extraGSettingsOverridePackages = mkOption {
+      extraGSettingsOverridePackages = lib.mkOption {
         default = [ ];
-        type = types.listOf types.path;
+        type = lib.types.listOf lib.types.path;
         description = "List of packages for which gsettings are overridden.";
       };
     };
 
-    environment.deepin.excludePackages = mkOption {
+    environment.deepin.excludePackages = lib.mkOption {
       default = [ ];
-      type = types.listOf types.package;
+      type = lib.types.listOf lib.types.package;
       description = "List of default packages to exclude from the configuration";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ];
-    services.displayManager.defaultSession = mkDefault "dde-x11";
+    services.displayManager.defaultSession = lib.mkDefault "dde-x11";
 
     # Update the DBus activation environment after launching the desktop manager.
     services.xserver.displayManager.sessionCommands = ''
       ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all
     '';
 
-    hardware.bluetooth.enable = mkDefault true;
+    hardware.bluetooth.enable = lib.mkDefault true;
     security.polkit.enable = true;
 
-    services.deepin.dde-daemon.enable = mkForce true;
-    services.deepin.dde-api.enable = mkForce true;
-    services.deepin.app-services.enable = mkForce true;
+    services.deepin.dde-daemon.enable = lib.mkForce true;
+    services.deepin.dde-api.enable = lib.mkForce true;
+    services.deepin.app-services.enable = lib.mkForce true;
 
-    services.colord.enable = mkDefault true;
-    services.accounts-daemon.enable = mkDefault true;
-    services.gvfs.enable = mkDefault true;
-    services.gnome.glib-networking.enable = mkDefault true;
-    services.gnome.gnome-keyring.enable = mkDefault true;
-    services.bamf.enable = mkDefault true;
+    services.colord.enable = lib.mkDefault true;
+    services.accounts-daemon.enable = lib.mkDefault true;
+    services.gvfs.enable = lib.mkDefault true;
+    services.gnome.glib-networking.enable = lib.mkDefault true;
+    services.gnome.gnome-keyring.enable = lib.mkDefault true;
+    services.bamf.enable = lib.mkDefault true;
 
-    services.libinput.enable = mkDefault true;
+    services.libinput.enable = lib.mkDefault true;
     services.udisks2.enable = true;
-    services.upower.enable = mkDefault config.powerManagement.enable;
-    networking.networkmanager.enable = mkDefault true;
-    programs.dconf.enable = mkDefault true;
-    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
+    services.upower.enable = lib.mkDefault config.powerManagement.enable;
+    networking.networkmanager.enable = lib.mkDefault true;
+    programs.dconf.enable = lib.mkDefault true;
+    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt;
 
     fonts.packages = with pkgs; [ noto-fonts ];
     xdg.mime.enable = true;
     xdg.menus.enable = true;
     xdg.icons.enable = true;
-    xdg.portal.enable = mkDefault true;
-    xdg.portal.extraPortals = mkDefault [
+    xdg.portal.enable = lib.mkDefault true;
+    xdg.portal.extraPortals = lib.mkDefault [
       pkgs.xdg-desktop-portal-gtk
     ];
 
     # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259
-    xdg.portal.config.deepin.default = mkDefault [ "gtk" ];
+    xdg.portal.config.deepin.default = lib.mkDefault [ "gtk" ];
 
     environment.sessionVariables = {
       NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

From e0836261f2de158bd8fb2714de241f84e812dcda Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0652/1504] 
 nixos/services.xserver.desktopManager.enlightenment: remove `with lib;`

---
 .../x11/desktop-managers/enlightenment.nix        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 05ed81e57992..8acd66a1bcdc 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -4,9 +4,6 @@
   lib,
   ...
 }:
-
-with lib;
-
 let
 
   e = pkgs.enlightenment;
@@ -23,11 +20,11 @@ in
 
 {
   meta = {
-    maintainers = teams.enlightenment.members;
+    maintainers = lib.teams.enlightenment.members;
   };
 
   imports = [
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "e19" "enable" ]
       [ "services" "xserver" "desktopManager" "enlightenment" "enable" ]
     )
@@ -35,15 +32,15 @@ in
 
   options = {
 
-    services.xserver.desktopManager.enlightenment.enable = mkOption {
-      type = types.bool;
+    services.xserver.desktopManager.enlightenment.enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = "Enable the Enlightenment desktop environment.";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = with pkgs; [
       enlightenment.econnman
@@ -105,7 +102,7 @@ in
 
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
-    services.libinput.enable = mkDefault true;
+    services.libinput.enable = lib.mkDefault true;
 
     services.dbus.packages = [ e.efl ];
 

From 3ba85539d7802abc2631ce007df36a77fc91b732 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0653/1504] nixos/services.xserver.desktopManager.kodi: remove
 `with lib;`

---
 nixos/modules/services/x11/desktop-managers/kodi.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index 0dd2f8ffb829..0330c5b353e1 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.desktopManager.kodi;
 in
@@ -14,19 +11,19 @@ in
 {
   options = {
     services.xserver.desktopManager.kodi = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Enable the kodi multimedia center.";
       };
 
-      package = mkPackageOption pkgs "kodi" {
+      package = lib.mkPackageOption pkgs "kodi" {
         example = "kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])";
       };
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver.desktopManager.session = [
       {
         name = "kodi";

From 93da453c9e851e6d40078ac0f12e9f195b802bc3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0654/1504] nixos/services.xserver.desktopManager.lumina:
 remove `with lib;`

---
 .../modules/services/x11/desktop-managers/lumina.nix  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index 74fabced3af3..9931ecffddcb 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   xcfg = config.services.xserver;
@@ -16,20 +13,20 @@ in
 
 {
   meta = {
-    maintainers = teams.lumina.members;
+    maintainers = lib.teams.lumina.members;
   };
 
   options = {
 
-    services.xserver.desktopManager.lumina.enable = mkOption {
-      type = types.bool;
+    services.xserver.desktopManager.lumina.enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = "Enable the Lumina desktop manager";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     services.displayManager.sessionPackages = [
       pkgs.lumina.lumina

From dab162464324e263d9c899c3271c7105b4a20b7e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0655/1504] nixos/services.xserver.desktopManager.lxqt: remove
 `with lib;`

---
 .../services/x11/desktop-managers/lxqt.nix    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index ac86c385bcc8..a5af6fa57930 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, utils, ... }:
-
-with lib;
-
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.lxqt;
@@ -10,29 +7,29 @@ in
 
 {
   meta = {
-    maintainers = teams.lxqt.members;
+    maintainers = lib.teams.lxqt.members;
   };
 
   options = {
 
-    services.xserver.desktopManager.lxqt.enable = mkOption {
-      type = types.bool;
+    services.xserver.desktopManager.lxqt.enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = "Enable the LXQt desktop manager";
     };
 
-    environment.lxqt.excludePackages = mkOption {
+    environment.lxqt.excludePackages = lib.mkOption {
       default = [];
-      example = literalExpression "[ pkgs.lxqt.qterminal ]";
-      type = types.listOf types.package;
+      example = lib.literalExpression "[ pkgs.lxqt.qterminal ]";
+      type = lib.types.listOf lib.types.package;
       description = "Which LXQt packages to exclude from the default environment";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = singleton {
+    services.xserver.desktopManager.session = lib.singleton {
       name = "lxqt";
       bgSupport = true;
       start = ''
@@ -62,19 +59,19 @@ in
     # Link some extra directories in /run/current-system/software/share
     environment.pathsToLink = [ "/share" ];
 
-    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
+    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt;
 
     # virtual file systems support for PCManFM-QT
     services.gvfs.enable = true;
 
     services.upower.enable = config.powerManagement.enable;
 
-    services.libinput.enable = mkDefault true;
+    services.libinput.enable = lib.mkDefault true;
 
-    xdg.portal.lxqt.enable = mkDefault true;
+    xdg.portal.lxqt.enable = lib.mkDefault true;
 
     # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804
-    xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ];
+    xdg.portal.config.lxqt.default = lib.mkDefault [ "lxqt" "gtk" ];
   };
 
 }

From 60f9b34caea659098c7e6def23551a11b06004e9 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0656/1504] nixos/services.xserver.desktopManager.mate: remove
 `with lib;`

---
 .../services/x11/desktop-managers/mate.nix    | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index e5144bc9d102..6bb3fad79dac 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -5,9 +5,6 @@
   utils,
   ...
 }:
-
-with lib;
-
 let
 
   xcfg = config.services.xserver;
@@ -19,48 +16,48 @@ in
   options = {
 
     services.xserver.desktopManager.mate = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Enable the MATE desktop environment";
       };
 
-      debug = mkEnableOption "mate-session debug messages";
+      debug = lib.mkEnableOption "mate-session debug messages";
 
-      extraPanelApplets = mkOption {
+      extraPanelApplets = lib.mkOption {
         default = [ ];
-        example = literalExpression "with pkgs.mate; [ mate-applets ]";
-        type = types.listOf types.package;
+        example = lib.literalExpression "with pkgs.mate; [ mate-applets ]";
+        type = lib.types.listOf lib.types.package;
         description = "Extra applets to add to mate-panel.";
       };
 
-      extraCajaExtensions = mkOption {
+      extraCajaExtensions = lib.mkOption {
         default = [ ];
         example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]";
-        type = types.listOf types.package;
+        type = lib.types.listOf lib.types.package;
         description = "Extra extensions to add to caja.";
       };
 
-      enableWaylandSession = mkEnableOption "MATE Wayland session";
+      enableWaylandSession = lib.mkEnableOption "MATE Wayland session";
     };
 
-    environment.mate.excludePackages = mkOption {
+    environment.mate.excludePackages = lib.mkOption {
       default = [ ];
-      example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
-      type = types.listOf types.package;
+      example = lib.literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
+      type = lib.types.listOf lib.types.package;
       description = "Which MATE packages to exclude from the default environment";
     };
 
   };
 
-  config = mkMerge [
-    (mkIf (cfg.enable || cfg.enableWaylandSession) {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enable || cfg.enableWaylandSession) {
       services.displayManager.sessionPackages = [
         pkgs.mate.mate-session-manager
       ];
 
       # Debugging
-      environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
+      environment.sessionVariables.MATE_SESSION_DEBUG = lib.mkIf cfg.debug "1";
 
       environment.systemPackages = utils.removePackagesByName (
         pkgs.mate.basePackages
@@ -83,11 +80,11 @@ in
 
       programs.dconf.enable = true;
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = mkDefault true;
-      programs.zsh.vteIntegration = mkDefault true;
+      programs.bash.vteIntegration = lib.mkDefault true;
+      programs.zsh.vteIntegration = lib.mkDefault true;
 
       # Mate uses this for printing
-      programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+      programs.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
 
       services.gnome.at-spi2-core.enable = true;
       services.gnome.glib-networking.enable = true;
@@ -95,15 +92,15 @@ in
       services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
       services.gvfs.enable = true;
       services.upower.enable = config.powerManagement.enable;
-      services.libinput.enable = mkDefault true;
+      services.libinput.enable = lib.mkDefault true;
 
       security.pam.services.mate-screensaver.unixAuth = true;
 
-      xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ];
+      xdg.portal.configPackages = lib.mkDefault [ pkgs.mate.mate-desktop ];
 
       environment.pathsToLink = [ "/share" ];
     })
-    (mkIf cfg.enableWaylandSession {
+    (lib.mkIf cfg.enableWaylandSession {
       programs.wayfire.enable = true;
       programs.wayfire.plugins = [ pkgs.wayfirePlugins.firedecor ];
 

From 5d5963f8e6e07a6c4d54ee3d4f089fb751212aa6 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 16:57:13 +0100
Subject: [PATCH 0657/1504] nixos/services.xserver.desktopManager.mate: fmt

---
 nixos/modules/services/x11/desktop-managers/mate.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 6bb3fad79dac..1f908bbf512a 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -84,7 +84,9 @@ in
       programs.zsh.vteIntegration = lib.mkDefault true;
 
       # Mate uses this for printing
-      programs.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
+      programs.system-config-printer.enable = (
+        lib.mkIf config.services.printing.enable (lib.mkDefault true)
+      );
 
       services.gnome.at-spi2-core.enable = true;
       services.gnome.glib-networking.enable = true;

From 0737eac7e02f15b4a633e4dfe4f723d2ff73364c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:39 +0100
Subject: [PATCH 0658/1504] 
 nixos/services.xserver.desktopManager.runXdgAutostartIfNone: remove `with
 lib;`

---
 nixos/modules/services/x11/desktop-managers/none.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix
index d4b7e3b392da..0e5caf37300a 100644
--- a/nixos/modules/services/x11/desktop-managers/none.nix
+++ b/nixos/modules/services/x11/desktop-managers/none.nix
@@ -4,14 +4,13 @@
   pkgs,
   ...
 }:
-with lib;
 let
   runXdgAutostart = config.services.xserver.desktopManager.runXdgAutostartIfNone;
 in
 {
   options = {
-    services.xserver.desktopManager.runXdgAutostartIfNone = mkOption {
-      type = types.bool;
+    services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Whether to run XDG autostart files for sessions without a desktop manager
@@ -27,18 +26,18 @@ in
     };
   };
 
-  config = mkMerge [
+  config = lib.mkMerge [
     {
       services.xserver.desktopManager.session = [
         {
           name = "none";
-          start = optionalString runXdgAutostart ''
+          start = lib.optionalString runXdgAutostart ''
             /run/current-system/systemd/bin/systemctl --user start xdg-autostart-if-no-desktop-manager.target
           '';
         }
       ];
     }
-    (mkIf runXdgAutostart {
+    (lib.mkIf runXdgAutostart {
       systemd.user.targets.xdg-autostart-if-no-desktop-manager = {
         description = "Run XDG autostart files";
         # From `plasma-workspace`, `share/systemd/user/plasma-workspace@.target`.

From fa4e66d55061b7f0018a476b5d5c18aae0498071 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0659/1504] nixos/services.xserver.desktopManager.pantheon:
 remove `with lib;`

---
 .../x11/desktop-managers/pantheon.nix         | 103 +++++++++---------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 14e7e25252de..ebb6f25c6db6 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -1,7 +1,4 @@
 { config, lib, utils, pkgs, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.desktopManager.pantheon;
@@ -19,7 +16,7 @@ in
 
   meta = {
     doc = ./pantheon.md;
-    maintainers = teams.pantheon.members;
+    maintainers = lib.teams.pantheon.members;
   };
 
   options = {
@@ -27,24 +24,24 @@ in
     services.pantheon = {
 
       contractor = {
-         enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
+         enable = lib.mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
       };
 
-      apps.enable = mkEnableOption "Pantheon default applications";
+      apps.enable = lib.mkEnableOption "Pantheon default applications";
 
     };
 
     services.xserver.desktopManager.pantheon = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Enable the pantheon desktop manager";
       };
 
-      sessionPath = mkOption {
+      sessionPath = lib.mkOption {
         default = [];
-        type = types.listOf types.package;
-        example = literalExpression "[ pkgs.gpaste ]";
+        type = lib.types.listOf lib.types.package;
+        example = lib.literalExpression "[ pkgs.gpaste ]";
         description = ''
           Additional list of packages to be added to the session search path.
           Useful for GSettings-conditional autostart.
@@ -53,46 +50,46 @@ in
         '';
       };
 
-      extraWingpanelIndicators = mkOption {
+      extraWingpanelIndicators = lib.mkOption {
         default = null;
-        type = with types; nullOr (listOf package);
+        type = with lib.types; nullOr (listOf package);
         description = "Indicators to add to Wingpanel.";
       };
 
-      extraSwitchboardPlugs = mkOption {
+      extraSwitchboardPlugs = lib.mkOption {
         default = null;
-        type = with types; nullOr (listOf package);
+        type = with lib.types; nullOr (listOf package);
         description = "Plugs to add to Switchboard.";
       };
 
-      extraGSettingsOverrides = mkOption {
+      extraGSettingsOverrides = lib.mkOption {
         default = "";
-        type = types.lines;
+        type = lib.types.lines;
         description = "Additional gsettings overrides.";
       };
 
-      extraGSettingsOverridePackages = mkOption {
+      extraGSettingsOverridePackages = lib.mkOption {
         default = [];
-        type = types.listOf types.path;
+        type = lib.types.listOf lib.types.path;
         description = "List of packages for which gsettings are overridden.";
       };
 
-      debug = mkEnableOption "gnome-session debug messages";
+      debug = lib.mkEnableOption "gnome-session debug messages";
 
     };
 
-    environment.pantheon.excludePackages = mkOption {
+    environment.pantheon.excludePackages = lib.mkOption {
       default = [];
-      example = literalExpression "[ pkgs.pantheon.elementary-camera ]";
-      type = types.listOf types.package;
+      example = lib.literalExpression "[ pkgs.pantheon.elementary-camera ]";
+      type = lib.types.listOf lib.types.package;
       description = "Which packages pantheon should exclude from the default environment";
     };
 
   };
 
 
-  config = mkMerge [
-    (mkIf cfg.enable {
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
       services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [
         pkgs.pantheon.pantheon-agent-geoclue2
       ] config.environment.pantheon.excludePackages;
@@ -101,21 +98,21 @@ in
 
       # Ensure lightdm is used when Pantheon is enabled
       # Without it screen locking will be nonfunctional because of the use of lightlocker
-      warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
+      warnings = lib.optional (config.services.xserver.displayManager.lightdm.enable != true)
         ''
           Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
         '';
 
-      services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
+      services.xserver.displayManager.lightdm.greeters.pantheon.enable = lib.mkDefault true;
 
       # Without this, elementary LightDM greeter will pre-select non-existent `default` session
       # https://github.com/elementary/greeter/issues/368
-      services.displayManager.defaultSession = mkDefault "pantheon";
+      services.displayManager.defaultSession = lib.mkDefault "pantheon";
 
       services.xserver.displayManager.sessionCommands = ''
         if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
             true
-            ${concatMapStrings (p: ''
+            ${lib.concatMapStrings (p: ''
               if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
                 export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
               fi
@@ -129,38 +126,38 @@ in
       '';
 
       # Default services
-      hardware.bluetooth.enable = mkDefault true;
+      hardware.bluetooth.enable = lib.mkDefault true;
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
       services.bamf.enable = true;
-      services.colord.enable = mkDefault true;
-      services.fwupd.enable = mkDefault true;
+      services.colord.enable = lib.mkDefault true;
+      services.fwupd.enable = lib.mkDefault true;
       # TODO: Enable once #177946 is resolved
       # services.packagekit.enable = mkDefault true;
-      services.power-profiles-daemon.enable = mkDefault true;
-      services.touchegg.enable = mkDefault true;
+      services.power-profiles-daemon.enable = lib.mkDefault true;
+      services.touchegg.enable = lib.mkDefault true;
       services.touchegg.package = pkgs.pantheon.touchegg;
-      services.tumbler.enable = mkDefault true;
-      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+      services.tumbler.enable = lib.mkDefault true;
+      services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
       services.dbus.packages = with pkgs.pantheon; [
         switchboard-plug-power
         elementary-default-settings # accountsservice extensions
       ];
-      services.pantheon.apps.enable = mkDefault true;
-      services.pantheon.contractor.enable = mkDefault true;
+      services.pantheon.apps.enable = lib.mkDefault true;
+      services.pantheon.contractor.enable = lib.mkDefault true;
       services.gnome.at-spi2-core.enable = true;
       services.gnome.evolution-data-server.enable = true;
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
-      services.gnome.rygel.enable = mkDefault true;
+      services.gnome.rygel.enable = lib.mkDefault true;
       services.udisks2.enable = true;
       services.upower.enable = config.powerManagement.enable;
-      services.libinput.enable = mkDefault true;
-      services.switcherooControl.enable = mkDefault true;
+      services.libinput.enable = lib.mkDefault true;
+      services.switcherooControl.enable = lib.mkDefault true;
       services.xserver.updateDbusEnvironment = true;
-      services.zeitgeist.enable = mkDefault true;
-      services.geoclue2.enable = mkDefault true;
+      services.zeitgeist.enable = lib.mkDefault true;
+      services.geoclue2.enable = lib.mkDefault true;
       # pantheon has pantheon-agent-geoclue2
       services.geoclue2.enableDemoAgent = false;
       services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = {
@@ -173,7 +170,7 @@ in
         # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
         pkgs.pantheon.mutter
       ];
-      services.orca.enable = mkDefault (notExcluded pkgs.orca);
+      services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
       systemd.packages = with pkgs; [
         gnome-session
         pantheon.gala
@@ -181,7 +178,7 @@ in
         pantheon.elementary-session-settings
       ];
       programs.dconf.enable = true;
-      networking.networkmanager.enable = mkDefault true;
+      networking.networkmanager.enable = lib.mkDefault true;
 
       systemd.user.targets."gnome-session-x11-services".wants = [
         "org.gnome.SettingsDaemon.XSettings.service"
@@ -246,12 +243,12 @@ in
         xdg-desktop-portal-pantheon
       ]);
 
-      xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ];
+      xdg.portal.configPackages = lib.mkDefault [ pkgs.pantheon.elementary-default-settings ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
 
-      environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
+      environment.sessionVariables.GNOME_SESSION_DEBUG = lib.mkIf cfg.debug "1";
 
       environment.pathsToLink = [
         # FIXME: modules should link subdirs of `/share` rather than relying on this
@@ -265,8 +262,8 @@ in
       programs.nm-applet.indicator = false;
 
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = mkDefault true;
-      programs.zsh.vteIntegration = mkDefault true;
+      programs.bash.vteIntegration = lib.mkDefault true;
+      programs.zsh.vteIntegration = lib.mkDefault true;
 
       # Default Fonts
       fonts.packages = with pkgs; [
@@ -282,9 +279,9 @@ in
       };
     })
 
-    (mkIf serviceCfg.apps.enable {
-      programs.evince.enable = mkDefault (notExcluded pkgs.evince);
-      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
+    (lib.mkIf serviceCfg.apps.enable {
+      programs.evince.enable = lib.mkDefault (notExcluded pkgs.evince);
+      programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller);
 
       environment.systemPackages = utils.removePackagesByName ([
         pkgs.gnome-font-viewer
@@ -315,7 +312,7 @@ in
       ];
     })
 
-    (mkIf serviceCfg.contractor.enable {
+    (lib.mkIf serviceCfg.contractor.enable {
       environment.systemPackages = with pkgs.pantheon; [
         contractor
         file-roller-contract

From 61ad8be6822b932399523ce7c32279a1661deb04 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0660/1504] nixos/services.xserver.desktopManager.retroarch:
 remove `with lib;`

---
 .../services/x11/desktop-managers/retroarch.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix
index 445de823e03f..9f292087a073 100644
--- a/nixos/modules/services/x11/desktop-managers/retroarch.nix
+++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix
@@ -4,23 +4,20 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.desktopManager.retroarch;
 
 in
 {
   options.services.xserver.desktopManager.retroarch = {
-    enable = mkEnableOption "RetroArch";
+    enable = lib.mkEnableOption "RetroArch";
 
-    package = mkPackageOption pkgs "retroarch" {
+    package = lib.mkPackageOption pkgs "retroarch" {
       example = "retroarch-full";
     };
 
-    extraArgs = mkOption {
-      type = types.listOf types.str;
+    extraArgs = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "--verbose"
@@ -30,12 +27,12 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver.desktopManager.session = [
       {
         name = "RetroArch";
         start = ''
-          ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} &
+          ${cfg.package}/bin/retroarch -f ${lib.escapeShellArgs cfg.extraArgs} &
           waitPID=$!
         '';
       }
@@ -44,5 +41,5 @@ in
     environment.systemPackages = [ cfg.package ];
   };
 
-  meta.maintainers = with maintainers; [ j0hax ];
+  meta.maintainers = with lib.maintainers; [ j0hax ];
 }

From ee971f5c8f1881e62ae3547407fc86f1777cee8f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0661/1504] nixos/services.xserver.desktopManager.surf-display:
 remove `with lib;`

---
 .../x11/desktop-managers/surf-display.nix     | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 519388cf11a5..7eb088cce11e 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.desktopManager.surf-display;
 
@@ -51,18 +48,18 @@ in
 {
   options = {
     services.xserver.desktopManager.surf-display = {
-      enable = mkEnableOption "surf-display as a kiosk browser session";
+      enable = lib.mkEnableOption "surf-display as a kiosk browser session";
 
-      defaultWwwUri = mkOption {
-        type = types.str;
+      defaultWwwUri = lib.mkOption {
+        type = lib.types.str;
         default = "${pkgs.surf-display}/share/surf-display/empty-page.html";
-        defaultText = literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"'';
+        defaultText = lib.literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"'';
         example = "https://www.example.com/";
         description = "Default URI to display.";
       };
 
-      inactivityInterval = mkOption {
-        type = types.int;
+      inactivityInterval = lib.mkOption {
+        type = lib.types.int;
         default = 300;
         example = 0;
         description = ''
@@ -75,16 +72,16 @@ in
         '';
       };
 
-      screensaverSettings = mkOption {
-        type = types.separatedString " ";
+      screensaverSettings = lib.mkOption {
+        type = lib.types.separatedString " ";
         default = "";
         description = ''
           Screensaver settings, see `man 1 xset` for possible options.
         '';
       };
 
-      pointerButtonMap = mkOption {
-        type = types.str;
+      pointerButtonMap = lib.mkOption {
+        type = lib.types.str;
         default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
         description = ''
           Disable right and middle pointer device click in browser sessions
@@ -93,15 +90,15 @@ in
         '';
       };
 
-      hideIdlePointer = mkOption {
-        type = types.str;
+      hideIdlePointer = lib.mkOption {
+        type = lib.types.str;
         default = "yes";
         example = "no";
         description = "Hide idle mouse pointer.";
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         example = ''
           # Enforce fixed resolution for all displays (default: not set):
@@ -124,7 +121,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.displayManager.sessionPackages = [
       pkgs.surf-display
     ];

From 4b798ee63e85e8607a6e61ea7f755121737ac84c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0662/1504] nixos/services.xserver.desktopManager.xfce: remove
 `with lib;`

---
 .../services/x11/desktop-managers/xfce.nix    | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 05f252731f72..e5d23ab2259b 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, utils, ... }:
-
-with lib;
-
 let
   cfg = config.services.xserver.desktopManager.xfce;
   excludePackages = config.environment.xfce.excludePackages;
@@ -9,70 +6,70 @@ let
 in
 {
   meta = {
-    maintainers = teams.xfce.members;
+    maintainers = lib.teams.xfce.members;
   };
 
   imports = [
     # added 2019-08-18
     # needed to preserve some semblance of UI familarity
     # with original XFCE module
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
       [ "services" "xserver" "displayManager" "sessionCommands" ])
 
     # added 2019-11-04
     # xfce4-14 module removed and promoted to xfce.
     # Needed for configs that used xfce4-14 module to migrate to this one.
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "enable" ]
       [ "services" "xserver" "desktopManager" "xfce" "enable" ])
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ]
       [ "services" "xserver" "desktopManager" "xfce" "noDesktop" ])
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ]
       [ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ])
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ]
       [ "services" "xserver" "displayManager" "sessionCommands" ])
-    (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
+    (lib.mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
 
     # added 2022-06-26
     # thunar has its own module
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce" "thunarPlugins" ]
       [ "programs" "thunar" "plugins" ])
   ];
 
   options = {
     services.xserver.desktopManager.xfce = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Enable the Xfce desktop environment.";
       };
 
-      noDesktop = mkOption {
-        type = types.bool;
+      noDesktop = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Don't install XFCE desktop components (xfdesktop and panel).";
       };
 
-      enableXfwm = mkOption {
-        type = types.bool;
+      enableXfwm = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Enable the XFWM (default) window manager.";
       };
 
-      enableScreensaver = mkOption {
-        type = types.bool;
+      enableScreensaver = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Enable the XFCE screensaver.";
       };
 
-      enableWaylandSession = mkEnableOption "the experimental Xfce Wayland session";
+      enableWaylandSession = lib.mkEnableOption "the experimental Xfce Wayland session";
 
-      waylandSessionCompositor = mkOption {
+      waylandSessionCompositor = lib.mkOption {
         type = lib.types.str;
         default = "";
         example = "wayfire";
@@ -87,15 +84,15 @@ in
       };
     };
 
-    environment.xfce.excludePackages = mkOption {
+    environment.xfce.excludePackages = lib.mkOption {
       default = [];
-      example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]";
-      type = types.listOf types.package;
+      example = lib.literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]";
+      type = lib.types.listOf lib.types.package;
       description = "Which packages XFCE should exclude from the default environment";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = utils.removePackagesByName (with pkgs; [
       glib # for gsettings
       gtk3.out # gtk-update-icon-cache
@@ -147,10 +144,10 @@ in
         xfce.xfdesktop
       ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
 
-    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
+    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;
     programs.xfconf.enable = true;
     programs.thunar.enable = true;
-    programs.labwc.enable = mkDefault (cfg.enableWaylandSession && (
+    programs.labwc.enable = lib.mkDefault (cfg.enableWaylandSession && (
       cfg.waylandSessionCompositor == "" || lib.substring 0 5 cfg.waylandSessionCompositor == "labwc"));
 
     environment.pathsToLink = [
@@ -173,7 +170,7 @@ in
 
     # Copied from https://gitlab.xfce.org/xfce/xfce4-session/-/blob/xfce4-session-4.19.2/xfce-wayland.desktop.in
     # to maintain consistent l10n state with X11 session file and to support the waylandSessionCompositor option.
-    services.displayManager.sessionPackages = optionals cfg.enableWaylandSession [
+    services.displayManager.sessionPackages = lib.optionals cfg.enableWaylandSession [
       ((pkgs.writeTextDir "share/wayland-sessions/xfce-wayland.desktop" ''
         [Desktop Entry]
         Version=1.0
@@ -198,16 +195,16 @@ in
     services.gnome.glib-networking.enable = true;
     services.gvfs.enable = true;
     services.tumbler.enable = true;
-    services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
-    services.libinput.enable = mkDefault true; # used in xfce4-settings-manager
-    services.colord.enable = mkDefault true;
+    services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
+    services.libinput.enable = lib.mkDefault true; # used in xfce4-settings-manager
+    services.colord.enable = lib.mkDefault true;
 
     # Enable default programs
     programs.dconf.enable = true;
 
     # Shell integration for VTE terminals
-    programs.bash.vteIntegration = mkDefault true;
-    programs.zsh.vteIntegration = mkDefault true;
+    programs.bash.vteIntegration = lib.mkDefault true;
+    programs.zsh.vteIntegration = lib.mkDefault true;
 
     # Systemd services
     systemd.packages = utils.removePackagesByName (with pkgs.xfce; [
@@ -216,6 +213,6 @@ in
 
     security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
 
-    xdg.portal.configPackages = mkDefault [ pkgs.xfce.xfce4-session ];
+    xdg.portal.configPackages = lib.mkDefault [ pkgs.xfce.xfce4-session ];
   };
 }

From dcd408ab4aac66db2a40c8d4aa3edcc0bfc2f439 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0663/1504] nixos/services.xserver.desktopManager.xterm: remove
 `with lib;`

---
 .../services/x11/desktop-managers/xterm.nix       | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index c4db014db796..562401c9d057 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.desktopManager.xterm;
@@ -17,18 +14,18 @@ in
 {
   options = {
 
-    services.xserver.desktopManager.xterm.enable = mkOption {
-      type = types.bool;
-      default = versionOlder config.system.stateVersion "19.09" && xSessionEnabled;
-      defaultText = literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;'';
+    services.xserver.desktopManager.xterm.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = lib.versionOlder config.system.stateVersion "19.09" && xSessionEnabled;
+      defaultText = lib.literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;'';
       description = "Enable a xterm terminal as a desktop manager.";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = singleton {
+    services.xserver.desktopManager.session = lib.singleton {
       name = "xterm";
       start = ''
         ${pkgs.xterm}/bin/xterm -ls &

From 0a91efc713add71e9ce992eb7e468e1b26063f33 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0664/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.enso: remove `with
 lib;`

---
 .../lightdm-greeters/enso-os.nix              | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
index 85de2ce62849..797294397447 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
@@ -4,8 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
 let
   dmcfg = config.services.xserver.displayManager;
   ldmcfg = dmcfg.lightdm;
@@ -29,8 +27,8 @@ in
 {
   options = {
     services.xserver.displayManager.lightdm.greeters.enso = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable enso-os-greeter as the lightdm greeter
@@ -38,17 +36,17 @@ in
       };
 
       theme = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.gnome-themes-extra;
-          defaultText = literalExpression "pkgs.gnome-themes-extra";
+          defaultText = lib.literalExpression "pkgs.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the theme to use for the lightdm-enso-os-greeter
@@ -57,17 +55,17 @@ in
       };
 
       iconTheme = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.papirus-icon-theme;
-          defaultText = literalExpression "pkgs.papirus-icon-theme";
+          defaultText = lib.literalExpression "pkgs.papirus-icon-theme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "ePapirus";
           description = ''
             Name of the icon theme to use for the lightdm-enso-os-greeter
@@ -76,17 +74,17 @@ in
       };
 
       cursorTheme = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.capitaine-cursors;
-          defaultText = literalExpression "pkgs.capitaine-cursors";
+          defaultText = lib.literalExpression "pkgs.capitaine-cursors";
           description = ''
             The package path that contains the cursor theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "capitane-cursors";
           description = ''
             Name of the cursor theme to use for the lightdm-enso-os-greeter
@@ -94,24 +92,24 @@ in
         };
       };
 
-      blur = mkOption {
-        type = types.bool;
+      blur = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether or not to enable blur
         '';
       };
 
-      brightness = mkOption {
-        type = types.int;
+      brightness = lib.mkOption {
+        type = lib.types.int;
         default = 7;
         description = ''
           Brightness
         '';
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the greeter.conf
@@ -121,7 +119,7 @@ in
     };
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
     environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
 
     environment.systemPackages = [
@@ -131,14 +129,14 @@ in
     ];
 
     services.xserver.displayManager.lightdm = {
-      greeter = mkDefault {
+      greeter = lib.mkDefault {
         package = pkgs.lightdm-enso-os-greeter.xgreeters;
         name = "pantheon-greeter";
       };
 
       greeters = {
         gtk = {
-          enable = mkDefault false;
+          enable = lib.mkDefault false;
         };
       };
     };

From 2b59e102bad9db456c13876893ddfd2b1a88f420 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0665/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.gtk: remove `with
 lib;`

---
 .../display-managers/lightdm-greeters/gtk.nix | 63 +++++++++----------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 468ab09c66a5..0852bc666a5c 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -27,9 +24,9 @@ let
     cursor-theme-name = ${cfg.cursorTheme.name}
     cursor-theme-size = ${toString cfg.cursorTheme.size}
     background = ${ldmcfg.background}
-    ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
-    ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"}
-    ${optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"}
+    ${lib.optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
+    ${lib.optionalString (cfg.indicators != null) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"}
+    ${lib.optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"}
     ${cfg.extraConfig}
   '';
 
@@ -39,8 +36,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.gtk = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Whether to enable lightdm-gtk-greeter as the lightdm greeter.
@@ -49,17 +46,17 @@ in
 
       theme = {
 
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.gnome-themes-extra;
-          defaultText = literalExpression "pkgs.gnome-themes-extra";
+          defaultText = lib.literalExpression "pkgs.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the theme to use for the lightdm-gtk-greeter.
@@ -70,17 +67,17 @@ in
 
       iconTheme = {
 
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the icon theme to use for the lightdm-gtk-greeter.
@@ -91,25 +88,25 @@ in
 
       cursorTheme = {
 
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the cursor theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the cursor theme to use for the lightdm-gtk-greeter.
           '';
         };
 
-        size = mkOption {
-          type = types.int;
+        size = lib.mkOption {
+          type = lib.types.int;
           default = 16;
           description = ''
             Size of the cursor theme to use for the lightdm-gtk-greeter.
@@ -117,8 +114,8 @@ in
         };
       };
 
-      clock-format = mkOption {
-        type = types.nullOr types.str;
+      clock-format = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "%F";
         description = ''
@@ -129,8 +126,8 @@ in
         '';
       };
 
-      indicators = mkOption {
-        type = types.nullOr (types.listOf types.str);
+      indicators = lib.mkOption {
+        type = lib.types.nullOr (lib.types.listOf lib.types.str);
         default = null;
         example = [
           "~host"
@@ -155,8 +152,8 @@ in
         '';
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the lightdm-gtk-greeter.conf
@@ -168,9 +165,9 @@ in
 
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
 
-    services.xserver.displayManager.lightdm.greeter = mkDefault {
+    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
       package = pkgs.lightdm-gtk-greeter.xgreeters;
       name = "lightdm-gtk-greeter";
     };

From 1253a9438782651cf25347f6fa63282b3d50200c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 16:57:42 +0100
Subject: [PATCH 0666/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.gtk: fmt

---
 .../services/x11/display-managers/lightdm-greeters/gtk.nix    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 0852bc666a5c..e903efea28d8 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -25,7 +25,9 @@ let
     cursor-theme-size = ${toString cfg.cursorTheme.size}
     background = ${ldmcfg.background}
     ${lib.optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
-    ${lib.optionalString (cfg.indicators != null) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"}
+    ${lib.optionalString (
+      cfg.indicators != null
+    ) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"}
     ${lib.optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"}
     ${cfg.extraConfig}
   '';

From f8865e84017ed97d55098804b44edb308e0c58aa Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:40 +0100
Subject: [PATCH 0667/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.mini: remove `with
 lib;`

---
 .../lightdm-greeters/mini.nix                 | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index a3fca737a2b2..f81b711179e6 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -56,8 +53,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.mini = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable lightdm-mini-greeter as the lightdm greeter.
@@ -68,16 +65,16 @@ in
         '';
       };
 
-      user = mkOption {
-        type = types.str;
+      user = lib.mkOption {
+        type = lib.types.str;
         default = "root";
         description = ''
           The user to login as.
         '';
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the lightdm-mini-greeter.conf
@@ -89,11 +86,11 @@ in
 
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
-    services.xserver.displayManager.lightdm.greeter = mkDefault {
+    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
       package = pkgs.lightdm-mini-greeter.xgreeters;
       name = "lightdm-mini-greeter";
     };

From 2882d6bc3231febbc15baa42df0d93e25203bc96 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0668/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.mobile: remove `with
 lib;`

---
 .../x11/display-managers/lightdm-greeters/mobile.nix      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix
index 5d8edbe7c59e..b7c6a9b4ae68 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix
@@ -4,8 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
 let
   dmcfg = config.services.xserver.displayManager;
   ldmcfg = dmcfg.lightdm;
@@ -14,14 +12,14 @@ in
 {
   options = {
     services.xserver.displayManager.lightdm.greeters.mobile = {
-      enable = mkEnableOption "lightdm-mobile-greeter as the lightdm greeter";
+      enable = lib.mkEnableOption "lightdm-mobile-greeter as the lightdm greeter";
     };
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
-    services.xserver.displayManager.lightdm.greeter = mkDefault {
+    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
       package = pkgs.lightdm-mobile-greeter.xgreeters;
       name = "lightdm-mobile-greeter";
     };

From 6a56bdff4109e78662c292b923d4f3148fc61a2f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0669/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.pantheon: remove `with
 lib;`

---
 .../display-managers/lightdm-greeters/pantheon.nix    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index f598fd1171a2..8ad6a108dddf 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -23,8 +20,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.pantheon = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable elementary-greeter as the lightdm greeter.
@@ -35,11 +32,11 @@ in
 
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
-    services.xserver.displayManager.lightdm.greeter = mkDefault {
+    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
       package = pkgs.pantheon.elementary-greeter.xgreeters;
       name = "io.elementary.greeter";
     };

From 62a2f3303b0daee70c405159022fe4c81c1e82b9 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0670/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.slick: remove `with
 lib;`

---
 .../lightdm-greeters/slick.nix                | 61 +++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
index e2d83ce5dcb4..f90363d58ac2 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   ldmcfg = config.services.xserver.displayManager.lightdm;
   cfg = ldmcfg.greeters.slick;
@@ -26,27 +23,27 @@ let
     font-name=${cfg.font.name}
     cursor-theme-name=${cfg.cursorTheme.name}
     cursor-theme-size=${toString cfg.cursorTheme.size}
-    draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds}
+    draw-user-backgrounds=${lib.boolToString cfg.draw-user-backgrounds}
     ${cfg.extraConfig}
   '';
 in
 {
   options = {
     services.xserver.displayManager.lightdm.greeters.slick = {
-      enable = mkEnableOption "lightdm-slick-greeter as the lightdm greeter";
+      enable = lib.mkEnableOption "lightdm-slick-greeter as the lightdm greeter";
 
       theme = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.gnome-themes-extra;
-          defaultText = literalExpression "pkgs.gnome-themes-extra";
+          defaultText = lib.literalExpression "pkgs.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the theme to use for the lightdm-slick-greeter.
@@ -55,17 +52,17 @@ in
       };
 
       iconTheme = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the icon theme to use for the lightdm-slick-greeter.
@@ -74,17 +71,17 @@ in
       };
 
       font = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.ubuntu-classic;
-          defaultText = literalExpression "pkgs.ubuntu-classic";
+          defaultText = lib.literalExpression "pkgs.ubuntu-classic";
           description = ''
             The package path that contains the font given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Ubuntu 11";
           description = ''
             Name of the font to use.
@@ -93,25 +90,25 @@ in
       };
 
       cursorTheme = {
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the cursor theme given in the name option.
           '';
         };
 
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           default = "Adwaita";
           description = ''
             Name of the cursor theme to use for the lightdm-slick-greeter.
           '';
         };
 
-        size = mkOption {
-          type = types.int;
+        size = lib.mkOption {
+          type = lib.types.int;
           default = 24;
           description = ''
             Size of the cursor theme to use for the lightdm-slick-greeter.
@@ -119,10 +116,10 @@ in
         };
       };
 
-      draw-user-backgrounds = mkEnableOption "draw user backgrounds";
+      draw-user-backgrounds = lib.mkEnableOption "draw user backgrounds";
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the lightdm-slick-greeter.conf
@@ -132,10 +129,10 @@ in
     };
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
     services.xserver.displayManager.lightdm = {
       greeters.gtk.enable = false;
-      greeter = mkDefault {
+      greeter = lib.mkDefault {
         package = pkgs.lightdm-slick-greeter.xgreeters;
         name = "lightdm-slick-greeter";
       };

From 4214af11a933406c7ddfbecaf297e624a1aa2b9a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0671/1504] 
 nixos/services.xserver.displayManager.lightdm.greeters.tiny: remove `with
 lib;`

---
 .../lightdm-greeters/tiny.nix                 | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
index 4780468533de..73e144ddccf9 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -19,8 +16,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.tiny = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable lightdm-tiny-greeter as the lightdm greeter.
@@ -32,16 +29,16 @@ in
       };
 
       label = {
-        user = mkOption {
-          type = types.str;
+        user = lib.mkOption {
+          type = lib.types.str;
           default = "Username";
           description = ''
             The string to represent the user_text label.
           '';
         };
 
-        pass = mkOption {
-          type = types.str;
+        pass = lib.mkOption {
+          type = lib.types.str;
           default = "Password";
           description = ''
             The string to represent the pass_text label.
@@ -49,8 +46,8 @@ in
         };
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = ''
           Section to describe style and ui.
@@ -61,7 +58,7 @@ in
 
   };
 
-  config = mkIf (ldmcfg.enable && cfg.enable) {
+  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
@@ -73,10 +70,10 @@ in
           static const char *pass_text = "${cfg.label.pass}";
           static const char *session = "${dmcfg.defaultSession}";
         '';
-        config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig);
+        config = lib.optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig);
         package = pkgs.lightdm-tiny-greeter.override { conf = config; };
       in
-      mkDefault {
+      lib.mkDefault {
         package = package.xgreeters;
         name = "lightdm-tiny-greeter";
       };

From a439faa883c4a152f52f69c2e3c1973274209d0b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0672/1504] nixos/services.xserver.displayManager.lightdm:
 remove `with lib;`

---
 .../services/x11/display-managers/lightdm.nix | 59 +++++++++----------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3e964ef53266..3ac91f860f6d 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   xcfg = config.services.xserver;
@@ -22,7 +19,7 @@ let
   # lightdm runs with clearenv(), but we need a few things in the environment for X to startup
   xserverWrapper = writeScript "xserver-wrapper" ''
     #! ${pkgs.bash}/bin/bash
-    ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
+    ${lib.concatMapStrings (n: "export ${n}=\"${lib.getAttr n xEnv}\"\n") (lib.attrNames xEnv)}
 
     display=$(echo "$@" | xargs -n 1 | grep -P ^:\\d\$ | head -n 1 | sed s/^://)
     if [ -z "$display" ]
@@ -36,13 +33,13 @@ let
   usersConf = writeText "users.conf" ''
     [UserList]
     minimum-uid=1000
-    hidden-users=${concatStringsSep " " dmcfg.hiddenUsers}
+    hidden-users=${lib.concatStringsSep " " dmcfg.hiddenUsers}
     hidden-shells=/run/current-system/sw/bin/nologin
   '';
 
   lightdmConf = writeText "lightdm.conf" ''
     [LightDM]
-    ${optionalString cfg.greeter.enable ''
+    ${lib.optionalString cfg.greeter.enable ''
       greeter-user = ${config.users.users.lightdm.name}
       greeters-directory = ${cfg.greeter.package}
     ''}
@@ -52,15 +49,15 @@ let
     [Seat:*]
     xserver-command = ${xserverWrapper}
     session-wrapper = ${dmcfg.sessionData.wrapper}
-    ${optionalString cfg.greeter.enable ''
+    ${lib.optionalString cfg.greeter.enable ''
       greeter-session = ${cfg.greeter.name}
     ''}
-    ${optionalString dmcfg.autoLogin.enable ''
+    ${lib.optionalString dmcfg.autoLogin.enable ''
       autologin-user = ${dmcfg.autoLogin.user}
       autologin-user-timeout = ${toString cfg.autoLogin.timeout}
       autologin-session = ${sessionData.autologinSession}
     ''}
-    ${optionalString (xcfg.displayManager.setupCommands != "") ''
+    ${lib.optionalString (xcfg.displayManager.setupCommands != "") ''
       display-setup-script=${pkgs.writeScript "lightdm-display-setup" ''
         #!${pkgs.bash}/bin/bash
         ${xcfg.displayManager.setupCommands}
@@ -87,7 +84,7 @@ in
     ./lightdm-greeters/tiny.nix
     ./lightdm-greeters/slick.nix
     ./lightdm-greeters/mobile.nix
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ]
       [
         "services"
@@ -96,7 +93,7 @@ in
         "enable"
       ]
     )
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "user" ]
       [
         "services"
@@ -111,8 +108,8 @@ in
 
     services.xserver.displayManager.lightdm = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable lightdm as the display manager.
@@ -120,24 +117,24 @@ in
       };
 
       greeter = {
-        enable = mkOption {
-          type = types.bool;
+        enable = lib.mkOption {
+          type = lib.types.bool;
           default = true;
           description = ''
             If set to false, run lightdm in greeterless mode. This only works if autologin
             is enabled and autoLogin.timeout is zero.
           '';
         };
-        package = mkOption {
-          type = types.package;
+        package = lib.mkOption {
+          type = lib.types.package;
           description = ''
             The LightDM greeter to login via. The package should be a directory
             containing a .desktop file matching the name in the 'name' option.
           '';
 
         };
-        name = mkOption {
-          type = types.str;
+        name = lib.mkOption {
+          type = lib.types.str;
           description = ''
             The name of a .desktop file in the directory specified
             in the 'package' option.
@@ -145,8 +142,8 @@ in
         };
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         example = ''
           user-authority-in-system-dir = true
@@ -154,17 +151,17 @@ in
         description = "Extra lines to append to LightDM section.";
       };
 
-      background = mkOption {
-        type = types.either types.path (types.strMatching "^#[0-9]\{6\}$");
+      background = lib.mkOption {
+        type = lib.types.either lib.types.path (lib.types.strMatching "^#[0-9]\{6\}$");
         # Manual cannot depend on packages, we are actually setting the default in config below.
-        defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath";
+        defaultText = lib.literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath";
         description = ''
           The background image or color to use.
         '';
       };
 
-      extraSeatDefaults = mkOption {
-        type = types.lines;
+      extraSeatDefaults = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         example = ''
           greeter-show-manual-login=true
@@ -173,8 +170,8 @@ in
       };
 
       # Configuration for automatic login specific to LightDM
-      autoLogin.timeout = mkOption {
-        type = types.int;
+      autoLogin.timeout = lib.mkOption {
+        type = lib.types.int;
         default = 0;
         description = ''
           Show the greeter for this many seconds before automatic login occurs.
@@ -184,7 +181,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     assertions = [
       {
@@ -210,12 +207,12 @@ in
 
     # Keep in sync with the defaultText value from the option definition.
     services.xserver.displayManager.lightdm.background =
-      mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath;
+      lib.mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath;
 
     # Set default session in session chooser to a specified values – basically ignore session history.
     # Auto-login is already covered by a config value.
     services.displayManager.preStart =
-      optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null)
+      lib.optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null)
         ''
           ${setSessionScript}/bin/set-session ${dmcfg.defaultSession}
         '';

From 61ea1027157a8ebe5b619a0e4e6e3d163d7936ec Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0673/1504] nixos/services.xserver.displayManager.slim: remove
 `with lib;`

---
 nixos/modules/services/x11/display-managers/slim.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index c5963b0be7ec..8c522d4a9e93 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -4,13 +4,10 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 {
   # added 2019-11-11
   imports = [
-    (mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] ''
+    (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] ''
       The SLIM project is abandoned and their last release was in 2013.
       Because of this it poses a security risk to your system.
       Other issues include it not fully supporting systemd and logind sessions.

From 1c0fdc5be00239649973ca8d4fd5bbf9dda9315a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0674/1504] nixos/services.xserver.displayManager.startx:
 remove `with lib;`

---
 .../modules/services/x11/display-managers/startx.nix  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix
index a990c9ed5ea5..e6e61318c19f 100644
--- a/nixos/modules/services/x11/display-managers/startx.nix
+++ b/nixos/modules/services/x11/display-managers/startx.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.displayManager.startx;
@@ -19,8 +16,8 @@ in
 
   options = {
     services.xserver.displayManager.startx = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable the dummy "startx" pseudo-display manager,
@@ -36,7 +33,7 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver = {
       exportConfiguration = true;
     };
@@ -46,7 +43,7 @@ in
     #
     # To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do
     # not specify a log file when running X
-    services.xserver.logFile = mkDefault null;
+    services.xserver.logFile = lib.mkDefault null;
 
     # Implement xserverArgs via xinit's system-wide xserverrc
     environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" ''

From 2e19baf26b29c970b7915698a2bd431ae1563883 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0675/1504] nixos/services.xserver.displayManager.xpra: remove
 `with lib;`

---
 .../services/x11/display-managers/xpra.nix    | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
index 67b1751ba8ec..c75a293b3654 100644
--- a/nixos/modules/services/x11/display-managers/xpra.nix
+++ b/nixos/modules/services/x11/display-managers/xpra.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   cfg = config.services.xserver.displayManager.xpra;
   dmcfg = config.services.xserver.displayManager;
@@ -13,46 +10,46 @@ in
 
   options = {
     services.xserver.displayManager.xpra = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to enable xpra as display manager.";
       };
 
-      bindTcp = mkOption {
+      bindTcp = lib.mkOption {
         default = "127.0.0.1:10000";
         example = "0.0.0.0:10000";
-        type = types.nullOr types.str;
+        type = lib.types.nullOr lib.types.str;
         description = "Bind xpra to TCP";
       };
 
-      desktop = mkOption {
-        type = types.nullOr types.str;
+      desktop = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "gnome-shell";
         description = "Start a desktop environment instead of seamless mode";
       };
 
-      auth = mkOption {
-        type = types.str;
+      auth = lib.mkOption {
+        type = lib.types.str;
         default = "pam";
         example = "password:value=mysecret";
         description = "Authentication to use when connecting to xpra";
       };
 
-      pulseaudio = mkEnableOption "pulseaudio audio streaming";
+      pulseaudio = lib.mkEnableOption "pulseaudio audio streaming";
 
-      extraOptions = mkOption {
+      extraOptions = lib.mkOption {
         description = "Extra xpra options";
         default = [];
-        type = types.listOf types.str;
+        type = lib.types.listOf lib.types.str;
       };
     };
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver.videoDrivers = ["dummy"];
 
     services.xserver.monitorSection = ''
@@ -227,7 +224,7 @@ in
     '';
 
     services.displayManager.execCmd = ''
-      ${optionalString (cfg.pulseaudio)
+      ${lib.optionalString (cfg.pulseaudio)
         "export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"}
       exec ${pkgs.xpra}/bin/xpra ${if cfg.desktop == null then "start" else "start-desktop --start=${cfg.desktop}"} \
         --daemon=off \
@@ -239,20 +236,20 @@ in
         --speaker=yes \
         --mdns=no \
         --pulseaudio=no \
-        ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
+        ${lib.optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
         --socket-dirs=/run/xpra \
-        --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \
-        ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
+        --xvfb="xpra_Xdummy ${lib.concatStringsSep " " dmcfg.xserverArgs}" \
+        ${lib.optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
         --auth=${cfg.auth} \
-        ${concatStringsSep " " cfg.extraOptions}
+        ${lib.concatStringsSep " " cfg.extraOptions}
     '';
 
     services.xserver.terminateOnReset = false;
 
     environment.systemPackages = [pkgs.xpra];
 
-    services.pulseaudio.enable = mkDefault cfg.pulseaudio;
-    services.pulseaudio.systemWide = mkDefault cfg.pulseaudio;
+    services.pulseaudio.enable = lib.mkDefault cfg.pulseaudio;
+    services.pulseaudio.systemWide = lib.mkDefault cfg.pulseaudio;
   };
 
 }

From 4c8347ad68f5ded7986bb33ca6ef8026b5a34b1e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:41 +0100
Subject: [PATCH 0676/1504] nixos/services.xserver.xkb.extraLayouts: remove
 `with lib;`

---
 nixos/modules/services/x11/extra-layouts.nix | 39 +++++++++-----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix
index 0327609c25cd..e5e294a5c175 100644
--- a/nixos/modules/services/x11/extra-layouts.nix
+++ b/nixos/modules/services/x11/extra-layouts.nix
@@ -4,29 +4,26 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   layouts = config.services.xserver.xkb.extraLayouts;
 
   layoutOpts = {
     options = {
-      description = mkOption {
-        type = types.str;
+      description = lib.mkOption {
+        type = lib.types.str;
         description = "A short description of the layout.";
       };
 
-      languages = mkOption {
-        type = types.listOf types.str;
+      languages = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         description = ''
           A list of languages provided by the layout.
           (Use ISO 639-2 codes, for example: "eng" for english)
         '';
       };
 
-      compatFile = mkOption {
-        type = types.nullOr types.path;
+      compatFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
           The path to the xkb compat file.
@@ -36,8 +33,8 @@ let
         '';
       };
 
-      geometryFile = mkOption {
-        type = types.nullOr types.path;
+      geometryFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
           The path to the xkb geometry file.
@@ -47,8 +44,8 @@ let
         '';
       };
 
-      keycodesFile = mkOption {
-        type = types.nullOr types.path;
+      keycodesFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
           The path to the xkb keycodes file.
@@ -58,8 +55,8 @@ let
         '';
       };
 
-      symbolsFile = mkOption {
-        type = types.nullOr types.path;
+      symbolsFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
           The path to the xkb symbols file.
@@ -69,8 +66,8 @@ let
         '';
       };
 
-      typesFile = mkOption {
-        type = types.nullOr types.path;
+      typesFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
           The path to the xkb types file.
@@ -111,10 +108,10 @@ in
   ###### interface
 
   options.services.xserver.xkb = {
-    extraLayouts = mkOption {
-      type = types.attrsOf (types.submodule layoutOpts);
+    extraLayouts = lib.mkOption {
+      type = lib.types.attrsOf (lib.types.submodule layoutOpts);
       default = { };
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           mine = {
             description = "My custom xkb layout.";
@@ -136,7 +133,7 @@ in
 
   ###### implementation
 
-  config = mkIf (layouts != { }) {
+  config = lib.mkIf (layouts != { }) {
 
     environment.sessionVariables = {
       # runtime override supported by multiple libraries e. g. libxkbcommon

From 620887f332ad2860af0eb32066cd617f575c1df6 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0677/1504] nixos/services.fractalart: remove `with lib;`

---
 nixos/modules/services/x11/fractalart.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/x11/fractalart.nix b/nixos/modules/services/x11/fractalart.nix
index 9ec64abc9049..1f6f7d9eaccb 100644
--- a/nixos/modules/services/x11/fractalart.nix
+++ b/nixos/modules/services/x11/fractalart.nix
@@ -4,39 +4,38 @@
   pkgs,
   ...
 }:
-with lib;
 let
   cfg = config.services.fractalart;
 in
 {
   options.services.fractalart = {
-    enable = mkOption {
-      type = types.bool;
+    enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       example = true;
       description = "Enable FractalArt for generating colorful wallpapers on login";
     };
 
-    width = mkOption {
-      type = types.nullOr types.int;
+    width = lib.mkOption {
+      type = lib.types.nullOr lib.types.int;
       default = null;
       example = 1920;
       description = "Screen width";
     };
 
-    height = mkOption {
-      type = types.nullOr types.int;
+    height = lib.mkOption {
+      type = lib.types.nullOr lib.types.int;
       default = null;
       example = 1080;
       description = "Screen height";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.haskellPackages.FractalArt ];
     services.xserver.displayManager.sessionCommands =
       "${pkgs.haskellPackages.FractalArt}/bin/FractalArt --no-bg -f .background-image"
-      + optionalString (cfg.width != null) " -w ${toString cfg.width}"
-      + optionalString (cfg.height != null) " -h ${toString cfg.height}";
+      + lib.optionalString (cfg.width != null) " -w ${toString cfg.width}"
+      + lib.optionalString (cfg.height != null) " -h ${toString cfg.height}";
   };
 }

From ae638c0c4cacbadea6f1a04c33ce575147865e90 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0678/1504] nixos/services.xserver.cmt: remove `with lib;`

---
 nixos/modules/services/x11/hardware/cmt.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix
index 23f07e5de06e..8d037f038625 100644
--- a/nixos/modules/services/x11/hardware/cmt.nix
+++ b/nixos/modules/services/x11/hardware/cmt.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.cmt;
@@ -18,13 +15,13 @@ in
   options = {
 
     services.xserver.cmt = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks.";
       };
-      models = mkOption {
-        type = types.enum [
+      models = lib.mkOption {
+        type = lib.types.enum [
           "atlas"
           "banjo"
           "candy"
@@ -83,7 +80,7 @@ in
     }; # closes services
   }; # closes options
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     services.xserver.modules = [ pkgs.xf86_input_cmt ];
 

From 19ac519ddaa3029918c7badd74bf9e47df06a57b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0679/1504] nixos/services.xserver.digimend: remove `with lib;`

---
 nixos/modules/services/x11/hardware/digimend.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixos/modules/services/x11/hardware/digimend.nix
index 693db5e90720..a8cc2a7f9937 100644
--- a/nixos/modules/services/x11/hardware/digimend.nix
+++ b/nixos/modules/services/x11/hardware/digimend.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.digimend;
@@ -21,13 +18,13 @@ in
 
     services.xserver.digimend = {
 
-      enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
+      enable = lib.mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
 
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     # digimend drivers use xsetwacom and wacom X11 drivers
     services.xserver.wacom.enable = true;

From ef32b6d67ae37f1d8ed220f0acd19f7a12c52afe Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0680/1504] nixos/services.xserver.synaptics: remove `with
 lib;`

---
 .../services/x11/hardware/synaptics.nix       | 109 +++++++++---------
 1 file changed, 53 insertions(+), 56 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index f943242f7bae..914f80d2da1f 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -5,9 +5,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.synaptics;
   opt = options.services.xserver.synaptics;
@@ -35,14 +32,14 @@ in
 
     services.xserver.synaptics = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to enable touchpad support. Deprecated: Consider services.libinput.enable.";
       };
 
-      dev = mkOption {
-        type = types.nullOr types.str;
+      dev = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "/dev/input/event0";
         description = ''
@@ -51,73 +48,73 @@ in
         '';
       };
 
-      accelFactor = mkOption {
-        type = types.nullOr types.str;
+      accelFactor = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = "0.001";
         description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
       };
 
-      minSpeed = mkOption {
-        type = types.nullOr types.str;
+      minSpeed = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = "0.6";
         description = "Cursor speed factor for precision finger motion.";
       };
 
-      maxSpeed = mkOption {
-        type = types.nullOr types.str;
+      maxSpeed = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = "1.0";
         description = "Cursor speed factor for highest-speed finger motion.";
       };
 
-      scrollDelta = mkOption {
-        type = types.nullOr types.int;
+      scrollDelta = lib.mkOption {
+        type = lib.types.nullOr lib.types.int;
         default = null;
         example = 75;
         description = "Move distance of the finger for a scroll event.";
       };
 
-      twoFingerScroll = mkOption {
-        type = types.bool;
+      twoFingerScroll = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll.";
       };
 
-      horizTwoFingerScroll = mkOption {
-        type = types.bool;
+      horizTwoFingerScroll = lib.mkOption {
+        type = lib.types.bool;
         default = cfg.twoFingerScroll;
-        defaultText = literalExpression "config.${opt.twoFingerScroll}";
+        defaultText = lib.literalExpression "config.${opt.twoFingerScroll}";
         description = "Whether to enable horizontal two-finger drag-scrolling.";
       };
 
-      vertTwoFingerScroll = mkOption {
-        type = types.bool;
+      vertTwoFingerScroll = lib.mkOption {
+        type = lib.types.bool;
         default = cfg.twoFingerScroll;
-        defaultText = literalExpression "config.${opt.twoFingerScroll}";
+        defaultText = lib.literalExpression "config.${opt.twoFingerScroll}";
         description = "Whether to enable vertical two-finger drag-scrolling.";
       };
 
-      horizEdgeScroll = mkOption {
-        type = types.bool;
+      horizEdgeScroll = lib.mkOption {
+        type = lib.types.bool;
         default = !cfg.horizTwoFingerScroll;
-        defaultText = literalExpression "! config.${opt.horizTwoFingerScroll}";
+        defaultText = lib.literalExpression "! config.${opt.horizTwoFingerScroll}";
         description = "Whether to enable horizontal edge drag-scrolling.";
       };
 
-      vertEdgeScroll = mkOption {
-        type = types.bool;
+      vertEdgeScroll = lib.mkOption {
+        type = lib.types.bool;
         default = !cfg.vertTwoFingerScroll;
-        defaultText = literalExpression "! config.${opt.vertTwoFingerScroll}";
+        defaultText = lib.literalExpression "! config.${opt.vertTwoFingerScroll}";
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
-      tapButtons = mkOption {
-        type = types.bool;
+      tapButtons = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Whether to enable tap buttons.";
       };
 
-      buttonsMap = mkOption {
-        type = types.listOf types.int;
+      buttonsMap = lib.mkOption {
+        type = lib.types.listOf lib.types.int;
         default = [
           1
           2
@@ -132,8 +129,8 @@ in
         apply = map toString;
       };
 
-      fingersMap = mkOption {
-        type = types.listOf types.int;
+      fingersMap = lib.mkOption {
+        type = lib.types.listOf lib.types.int;
         default = [
           1
           2
@@ -148,34 +145,34 @@ in
         apply = map toString;
       };
 
-      palmDetect = mkOption {
-        type = types.bool;
+      palmDetect = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = "Whether to enable palm detection (hardware support required)";
       };
 
-      palmMinWidth = mkOption {
-        type = types.nullOr types.int;
+      palmMinWidth = lib.mkOption {
+        type = lib.types.nullOr lib.types.int;
         default = null;
         example = 5;
         description = "Minimum finger width at which touch is considered a palm";
       };
 
-      palmMinZ = mkOption {
-        type = types.nullOr types.int;
+      palmMinZ = lib.mkOption {
+        type = lib.types.nullOr lib.types.int;
         default = null;
         example = 20;
         description = "Minimum finger pressure at which touch is considered a palm";
       };
 
-      horizontalScroll = mkOption {
-        type = types.bool;
+      horizontalScroll = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Whether to enable horizontal scrolling (on touchpad)";
       };
 
-      additionalOptions = mkOption {
-        type = types.str;
+      additionalOptions = lib.mkOption {
+        type = lib.types.str;
         default = "";
         example = ''
           Option "RTCornerButton" "2"
@@ -190,7 +187,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     services.xserver.modules = [ pkg.out ];
 
@@ -203,12 +200,12 @@ in
       Section "InputClass"
         Identifier "synaptics touchpad catchall"
         MatchIsTouchpad "on"
-        ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
+        ${lib.optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
         Driver "synaptics"
-        ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''}
-        ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''}
-        ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''}
-        ${optionalString cfg.tapButtons tapConfig}
+        ${lib.optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''}
+        ${lib.optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''}
+        ${lib.optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''}
+        ${lib.optionalString cfg.tapButtons tapConfig}
         Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
         Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
         Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
@@ -216,19 +213,19 @@ in
         Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
         Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
         Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
-        ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
-        ${optionalString (
+        ${lib.optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
+        ${lib.optionalString (
           cfg.palmMinWidth != null
         ) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''}
-        ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
-        ${optionalString (
+        ${lib.optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
+        ${lib.optionalString (
           cfg.scrollDelta != null
         ) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''}
         ${
           if !cfg.horizontalScroll then
             ''Option "HorizScrollDelta" "0"''
           else
-            (optionalString (
+            (lib.optionalString (
               cfg.scrollDelta != null
             ) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'')
         }

From 39e4529bdd705fd56a37fdefb1db37b31c77894b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0681/1504] nixos/services.xserver.wacom: remove `with lib;`

---
 nixos/modules/services/x11/hardware/wacom.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
index 3707b7f41575..c4e6ed941583 100644
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.wacom;
@@ -19,8 +16,8 @@ in
 
     services.xserver.wacom = {
 
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to enable the Wacom touchscreen/digitizer/tablet.
@@ -37,7 +34,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom
 

From 68590cbb863a8746780e684879dee6820586e4f8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0682/1504] nixos/services.xserver.imwheel: remove `with lib;`

---
 nixos/modules/services/x11/imwheel.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix
index 2898af201a7e..c674555a60f3 100644
--- a/nixos/modules/services/x11/imwheel.nix
+++ b/nixos/modules/services/x11/imwheel.nix
@@ -4,17 +4,16 @@
   pkgs,
   ...
 }:
-with lib;
 let
   cfg = config.services.xserver.imwheel;
 in
 {
   options = {
     services.xserver.imwheel = {
-      enable = mkEnableOption "IMWheel service";
+      enable = lib.mkEnableOption "IMWheel service";
 
-      extraOptions = mkOption {
-        type = types.listOf types.str;
+      extraOptions = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         default = [ "--buttons=45" ];
         example = [ "--debug" ];
         description = ''
@@ -23,10 +22,10 @@ in
         '';
       };
 
-      rules = mkOption {
-        type = types.attrsOf types.str;
+      rules = lib.mkOption {
+        type = lib.types.attrsOf lib.types.str;
         default = { };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             ".*" = '''
               None,      Up,   Button4, 8
@@ -49,11 +48,11 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.imwheel ];
 
     environment.etc."X11/imwheel/imwheelrc".source = pkgs.writeText "imwheelrc" (
-      concatStringsSep "\n\n" (mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules)
+      lib.concatStringsSep "\n\n" (lib.mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules)
     );
 
     systemd.user.services.imwheel = {
@@ -63,7 +62,7 @@ in
       serviceConfig = {
         ExecStart =
           "${pkgs.imwheel}/bin/imwheel "
-          + escapeShellArgs (
+          + lib.escapeShellArgs (
             [
               "--detach"
               "--kill"

From f8e4c2bb77617662fb8c56ea26352510411c9203 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0683/1504] nixos/services.picom: remove `with lib;`

---
 nixos/modules/services/x11/picom.nix | 131 +++++++++++++--------------
 1 file changed, 64 insertions(+), 67 deletions(-)

diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index 237d78484286..41d2acda063d 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -5,9 +5,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.picom;
@@ -15,46 +12,46 @@ let
 
   pairOf =
     x:
-    with types;
+    with lib.types;
     addCheck (listOf x) (y: length y == 2) // { description = "pair of ${x.description}"; };
 
-  mkDefaultAttrs = mapAttrs (n: v: mkDefault v);
+  mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v);
 
   # Basically a tinkered lib.generators.mkKeyValueDefault
   # It either serializes a top-level definition "key: { values };"
   # or an expression "key = { values };"
   mkAttrsString =
     top:
-    mapAttrsToList (
+    lib.mapAttrsToList (
       k: v:
       let
-        sep = if (top && isAttrs v) then ":" else "=";
+        sep = if (top && lib.isAttrs v) then ":" else "=";
       in
-      "${escape [ sep ] k}${sep}${mkValueString v};"
+      "${lib.escape [ sep ] k}${sep}${mkValueString v};"
     );
 
   # This serializes a Nix expression to the libconfig format.
   mkValueString =
     v:
-    if types.bool.check v then
-      boolToString v
-    else if types.int.check v then
+    if lib.types.bool.check v then
+      lib.boolToString v
+    else if lib.types.int.check v then
       toString v
-    else if types.float.check v then
+    else if lib.types.float.check v then
       toString v
-    else if types.str.check v then
-      "\"${escape [ "\"" ] v}\""
+    else if lib.types.str.check v then
+      "\"${lib.escape [ "\"" ] v}\""
     else if builtins.isList v then
-      "[ ${concatMapStringsSep " , " mkValueString v} ]"
-    else if types.attrs.check v then
-      "{ ${concatStringsSep " " (mkAttrsString false v)} }"
+      "[ ${lib.concatMapStringsSep " , " mkValueString v} ]"
+    else if lib.types.attrs.check v then
+      "{ ${lib.concatStringsSep " " (mkAttrsString false v)} }"
     else
       throw ''
         invalid expression used in option services.picom.settings:
         ${v}
       '';
 
-  toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings);
+  toConf = attrs: lib.concatStringsSep "\n" (mkAttrsString true cfg.settings);
 
   configFile = pkgs.writeText "picom.conf" (toConf cfg.settings);
 
@@ -62,38 +59,38 @@ in
 {
 
   imports = [
-    (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
-    (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
+    (lib.mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
+    (lib.mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
       This option corresponds to `refresh-rate`, which has been unused
       since picom v6 and was subsequently removed by upstream.
       See https://github.com/yshui/picom/commit/bcbc410
     '')
-    (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] ''
+    (lib.mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] ''
       This option was removed by upstream since picom v10.
     '')
   ];
 
   options.services.picom = {
-    enable = mkOption {
-      type = types.bool;
+    enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Whether or not to enable Picom as the X.org composite manager.
       '';
     };
 
-    package = mkPackageOption pkgs "picom" { };
+    package = lib.mkPackageOption pkgs "picom" { };
 
-    fade = mkOption {
-      type = types.bool;
+    fade = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Fade windows in and out.
       '';
     };
 
-    fadeDelta = mkOption {
-      type = types.ints.positive;
+    fadeDelta = lib.mkOption {
+      type = lib.types.ints.positive;
       default = 10;
       example = 5;
       description = ''
@@ -101,8 +98,8 @@ in
       '';
     };
 
-    fadeSteps = mkOption {
-      type = pairOf (types.numbers.between 0.01 1);
+    fadeSteps = lib.mkOption {
+      type = pairOf (lib.types.numbers.between 0.01 1);
       default = [
         0.028
         0.03
@@ -116,8 +113,8 @@ in
       '';
     };
 
-    fadeExclude = mkOption {
-      type = types.listOf types.str;
+    fadeExclude = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "window_type *= 'menu'"
@@ -130,16 +127,16 @@ in
       '';
     };
 
-    shadow = mkOption {
-      type = types.bool;
+    shadow = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Draw window shadows.
       '';
     };
 
-    shadowOffsets = mkOption {
-      type = pairOf types.int;
+    shadowOffsets = lib.mkOption {
+      type = pairOf lib.types.int;
       default = [
         (-15)
         (-15)
@@ -153,8 +150,8 @@ in
       '';
     };
 
-    shadowOpacity = mkOption {
-      type = types.numbers.between 0 1;
+    shadowOpacity = lib.mkOption {
+      type = lib.types.numbers.between 0 1;
       default = 0.75;
       example = 0.8;
       description = ''
@@ -162,8 +159,8 @@ in
       '';
     };
 
-    shadowExclude = mkOption {
-      type = types.listOf types.str;
+    shadowExclude = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "window_type *= 'menu'"
@@ -176,8 +173,8 @@ in
       '';
     };
 
-    activeOpacity = mkOption {
-      type = types.numbers.between 0 1;
+    activeOpacity = lib.mkOption {
+      type = lib.types.numbers.between 0 1;
       default = 1.0;
       example = 0.8;
       description = ''
@@ -185,8 +182,8 @@ in
       '';
     };
 
-    inactiveOpacity = mkOption {
-      type = types.numbers.between 0.1 1;
+    inactiveOpacity = lib.mkOption {
+      type = lib.types.numbers.between 0.1 1;
       default = 1.0;
       example = 0.8;
       description = ''
@@ -194,8 +191,8 @@ in
       '';
     };
 
-    menuOpacity = mkOption {
-      type = types.numbers.between 0 1;
+    menuOpacity = lib.mkOption {
+      type = lib.types.numbers.between 0 1;
       default = 1.0;
       example = 0.8;
       description = ''
@@ -203,8 +200,8 @@ in
       '';
     };
 
-    wintypes = mkOption {
-      type = types.attrs;
+    wintypes = lib.mkOption {
+      type = lib.types.attrs;
       default = {
         popup_menu = {
           opacity = cfg.menuOpacity;
@@ -213,7 +210,7 @@ in
           opacity = cfg.menuOpacity;
         };
       };
-      defaultText = literalExpression ''
+      defaultText = lib.literalExpression ''
         {
           popup_menu = { opacity = config.${opt.menuOpacity}; };
           dropdown_menu = { opacity = config.${opt.menuOpacity}; };
@@ -225,8 +222,8 @@ in
       '';
     };
 
-    opacityRules = mkOption {
-      type = types.listOf types.str;
+    opacityRules = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a"
@@ -237,8 +234,8 @@ in
       '';
     };
 
-    backend = mkOption {
-      type = types.enum [
+    backend = lib.mkOption {
+      type = lib.types.enum [
         "egl"
         "glx"
         "xrender"
@@ -250,9 +247,9 @@ in
       '';
     };
 
-    vSync = mkOption {
+    vSync = lib.mkOption {
       type =
-        with types;
+        with lib.types;
         either bool (enum [
           "none"
           "drm"
@@ -268,9 +265,9 @@ in
           res = x != "none";
           msg =
             "The type of services.picom.vSync has changed to bool:"
-            + " interpreting ${x} as ${boolToString res}";
+            + " interpreting ${x} as ${lib.boolToString res}";
         in
-        if isBool x then x else warn msg res;
+        if lib.isBool x then x else lib.warn msg res;
 
       description = ''
         Enable vertical synchronization. Chooses the best method
@@ -280,7 +277,7 @@ in
     };
 
     settings =
-      with types;
+      with lib.types;
       let
         scalar =
           oneOf [
@@ -313,10 +310,10 @@ in
         };
 
       in
-      mkOption {
+      lib.mkOption {
         type = topLevel;
         default = { };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           blur =
             { method = "gaussian";
               size = 10;
@@ -331,19 +328,19 @@ in
       };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.picom.settings = mkDefaultAttrs {
       # fading
       fading = cfg.fade;
       fade-delta = cfg.fadeDelta;
-      fade-in-step = elemAt cfg.fadeSteps 0;
-      fade-out-step = elemAt cfg.fadeSteps 1;
+      fade-in-step = lib.elemAt cfg.fadeSteps 0;
+      fade-out-step = lib.elemAt cfg.fadeSteps 1;
       fade-exclude = cfg.fadeExclude;
 
       # shadows
       shadow = cfg.shadow;
-      shadow-offset-x = elemAt cfg.shadowOffsets 0;
-      shadow-offset-y = elemAt cfg.shadowOffsets 1;
+      shadow-offset-x = lib.elemAt cfg.shadowOffsets 0;
+      shadow-offset-y = lib.elemAt cfg.shadowOffsets 1;
       shadow-opacity = cfg.shadowOpacity;
       shadow-exclude = cfg.shadowExclude;
 
@@ -366,12 +363,12 @@ in
       partOf = [ "graphical-session.target" ];
 
       # Temporarily fixes corrupt colours with Mesa 18
-      environment = mkIf (cfg.backend == "glx") {
+      environment = lib.mkIf (cfg.backend == "glx") {
         allow_rgb10_configs = "false";
       };
 
       serviceConfig = {
-        ExecStart = "${getExe cfg.package} --config ${configFile}";
+        ExecStart = "${lib.getExe cfg.package} --config ${configFile}";
         RestartSec = 3;
         Restart = "always";
       };

From 3c25e33c2fa77e6fc52ccdd80585289a7f18d7be Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:42 +0100
Subject: [PATCH 0684/1504] nixos/services.redshift: remove `with lib;`

---
 nixos/modules/services/x11/redshift.nix | 45 ++++++++++++-------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 661053c20016..849780b53a77 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.redshift;
@@ -16,32 +13,32 @@ in
 {
 
   imports = [
-    (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] (
+    (lib.mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] (
       config:
       let
-        value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
+        value = lib.getAttrFromPath [ "services" "redshift" "latitude" ] config;
       in
       if value == null then
         throw "services.redshift.latitude is set to null, you can remove this"
       else
         builtins.fromJSON value
     ))
-    (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] (
+    (lib.mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] (
       config:
       let
-        value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
+        value = lib.getAttrFromPath [ "services" "redshift" "longitude" ] config;
       in
       if value == null then
         throw "services.redshift.longitude is set to null, you can remove this"
       else
         builtins.fromJSON value
     ))
-    (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
+    (lib.mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
   ];
 
   options.services.redshift = {
-    enable = mkOption {
-      type = types.bool;
+    enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Enable Redshift to change your screen's colour temperature depending on
@@ -50,16 +47,16 @@ in
     };
 
     temperature = {
-      day = mkOption {
-        type = types.int;
+      day = lib.mkOption {
+        type = lib.types.int;
         default = 5500;
         description = ''
           Colour temperature to use during the day, between
           `1000` and `25000` K.
         '';
       };
-      night = mkOption {
-        type = types.int;
+      night = lib.mkOption {
+        type = lib.types.int;
         default = 3700;
         description = ''
           Colour temperature to use at night, between
@@ -69,16 +66,16 @@ in
     };
 
     brightness = {
-      day = mkOption {
-        type = types.str;
+      day = lib.mkOption {
+        type = lib.types.str;
         default = "1";
         description = ''
           Screen brightness to apply during the day,
           between `0.1` and `1.0`.
         '';
       };
-      night = mkOption {
-        type = types.str;
+      night = lib.mkOption {
+        type = lib.types.str;
         default = "1";
         description = ''
           Screen brightness to apply during the night,
@@ -87,10 +84,10 @@ in
       };
     };
 
-    package = mkPackageOption pkgs "redshift" { };
+    package = lib.mkPackageOption pkgs "redshift" { };
 
-    executable = mkOption {
-      type = types.str;
+    executable = lib.mkOption {
+      type = lib.types.str;
       default = "/bin/redshift";
       example = "/bin/redshift-gtk";
       description = ''
@@ -98,8 +95,8 @@ in
       '';
     };
 
-    extraOptions = mkOption {
-      type = types.listOf types.str;
+    extraOptions = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "-v"
@@ -112,7 +109,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     # needed so that .desktop files are installed, which geoclue cares about
     environment.systemPackages = [ cfg.package ];
 

From c395f4a881bf11f7901a8d1fdff522e4aef35e25 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0685/1504] nixos/services.touchegg: remove `with lib;`

---
 nixos/modules/services/x11/touchegg.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix
index def3dac738e0..e641e5cf4727 100644
--- a/nixos/modules/services/x11/touchegg.nix
+++ b/nixos/modules/services/x11/touchegg.nix
@@ -4,27 +4,24 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.touchegg;
 
 in
 {
   meta = {
-    maintainers = teams.pantheon.members;
+    maintainers = lib.teams.pantheon.members;
   };
 
   ###### interface
   options.services.touchegg = {
-    enable = mkEnableOption "touchegg, a multi-touch gesture recognizer";
+    enable = lib.mkEnableOption "touchegg, a multi-touch gesture recognizer";
 
-    package = mkPackageOption pkgs "touchegg" { };
+    package = lib.mkPackageOption pkgs "touchegg" { };
   };
 
   ###### implementation
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.touchegg = {
       description = "Touchegg Daemon";
       serviceConfig = {

From 81af5e84de65e2a62fc036663f6241a4e4daf14c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0686/1504] nixos/services.unclutter-xfixes: remove `with lib;`

---
 .../modules/services/x11/unclutter-xfixes.nix | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index 48adb3665f38..32ff1577d5a5 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.unclutter-xfixes;
 
@@ -14,29 +11,29 @@ in
 {
   options.services.unclutter-xfixes = {
 
-    enable = mkOption {
+    enable = lib.mkOption {
       description = "Enable unclutter-xfixes to hide your mouse cursor when inactive.";
-      type = types.bool;
+      type = lib.types.bool;
       default = false;
     };
 
-    package = mkPackageOption pkgs "unclutter-xfixes" { };
+    package = lib.mkPackageOption pkgs "unclutter-xfixes" { };
 
-    timeout = mkOption {
+    timeout = lib.mkOption {
       description = "Number of seconds before the cursor is marked inactive.";
-      type = types.int;
+      type = lib.types.int;
       default = 1;
     };
 
-    threshold = mkOption {
+    threshold = lib.mkOption {
       description = "Minimum number of pixels considered cursor movement.";
-      type = types.int;
+      type = lib.types.int;
       default = 1;
     };
 
-    extraOptions = mkOption {
+    extraOptions = lib.mkOption {
       description = "More arguments to pass to the unclutter-xfixes command.";
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "exclude-root"
@@ -46,7 +43,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.user.services.unclutter-xfixes = {
       description = "unclutter-xfixes";
       wantedBy = [ "graphical-session.target" ];
@@ -55,7 +52,7 @@ in
         ${cfg.package}/bin/unclutter \
           --timeout ${toString cfg.timeout} \
           --jitter ${toString (cfg.threshold - 1)} \
-          ${concatMapStrings (x: " --" + x) cfg.extraOptions} \
+          ${lib.concatMapStrings (x: " --" + x) cfg.extraOptions} \
       '';
       serviceConfig.RestartSec = 3;
       serviceConfig.Restart = "always";

From 907513b013779e4e4bd68b3e2dc22f02606fe3d7 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0687/1504] nixos/services.unclutter: remove `with lib;`

---
 nixos/modules/services/x11/unclutter.nix | 39 +++++++++++-------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index bb11c8639783..7da1f611373a 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.unclutter;
 
@@ -14,42 +11,42 @@ in
 {
   options.services.unclutter = {
 
-    enable = mkOption {
+    enable = lib.mkOption {
       description = "Enable unclutter to hide your mouse cursor when inactive";
-      type = types.bool;
+      type = lib.types.bool;
       default = false;
     };
 
-    package = mkPackageOption pkgs "unclutter" { };
+    package = lib.mkPackageOption pkgs "unclutter" { };
 
-    keystroke = mkOption {
+    keystroke = lib.mkOption {
       description = "Wait for a keystroke before hiding the cursor";
-      type = types.bool;
+      type = lib.types.bool;
       default = false;
     };
 
-    timeout = mkOption {
+    timeout = lib.mkOption {
       description = "Number of seconds before the cursor is marked inactive";
-      type = types.int;
+      type = lib.types.int;
       default = 1;
     };
 
-    threshold = mkOption {
+    threshold = lib.mkOption {
       description = "Minimum number of pixels considered cursor movement";
-      type = types.int;
+      type = lib.types.int;
       default = 1;
     };
 
-    excluded = mkOption {
+    excluded = lib.mkOption {
       description = "Names of windows where unclutter should not apply";
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [ "" ];
     };
 
-    extraOptions = mkOption {
+    extraOptions = lib.mkOption {
       description = "More arguments to pass to the unclutter command";
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [
         "noevent"
@@ -58,7 +55,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.user.services.unclutter = {
       description = "unclutter";
       wantedBy = [ "graphical-session.target" ];
@@ -67,9 +64,9 @@ in
         ${cfg.package}/bin/unclutter \
           -idle ${toString cfg.timeout} \
           -jitter ${toString (cfg.threshold - 1)} \
-          ${optionalString cfg.keystroke "-keystroke"} \
-          ${concatMapStrings (x: " -" + x) cfg.extraOptions} \
-          -not ${concatStringsSep " " cfg.excluded} \
+          ${lib.optionalString cfg.keystroke "-keystroke"} \
+          ${lib.concatMapStrings (x: " -" + x) cfg.extraOptions} \
+          -not ${lib.concatStringsSep " " cfg.excluded} \
       '';
       serviceConfig.PassEnvironment = "DISPLAY";
       serviceConfig.RestartSec = 3;
@@ -78,7 +75,7 @@ in
   };
 
   imports = [
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "unclutter" "threeshold" ]
       [ "services" "unclutter" "threshold" ]
     )

From cfd241e856eb25376ece04f94da0ed542c778165 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0688/1504] nixos/services.urxvtd: remove `with lib;`

---
 nixos/modules/services/x11/urxvtd.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index 5f8212a3c9ce..b015374bfd28 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -4,18 +4,14 @@
   pkgs,
   ...
 }:
-
 # maintainer: siddharthist
-
-with lib;
-
 let
   cfg = config.services.urxvtd;
 in
 {
   options.services.urxvtd = {
-    enable = mkOption {
-      type = types.bool;
+    enable = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run
@@ -23,10 +19,10 @@ in
       '';
     };
 
-    package = mkPackageOption pkgs "rxvt-unicode" { };
+    package = lib.mkPackageOption pkgs "rxvt-unicode" { };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.user.services.urxvtd = {
       description = "urxvt terminal daemon";
       wantedBy = [ "graphical-session.target" ];

From 15928daf29c9b2ca60541f6523c3e3cb9b134815 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0689/1504] nixos/services.xserver.windowManager.2bwm: remove
 `with lib;`

---
 nixos/modules/services/x11/window-managers/2bwm.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix
index ce01fcb17a10..0bafdfee3e7b 100644
--- a/nixos/modules/services/x11/window-managers/2bwm.nix
+++ b/nixos/modules/services/x11/window-managers/2bwm.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.windowManager."2bwm";
@@ -18,14 +15,14 @@ in
   ###### interface
 
   options = {
-    services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm";
+    services.xserver.windowManager."2bwm".enable = lib.mkEnableOption "2bwm";
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
-    services.xserver.windowManager.session = singleton {
+    services.xserver.windowManager.session = lib.singleton {
       name = "2bwm";
       start = ''
         ${pkgs._2bwm}/bin/2bwm &

From 77cce31b626c4a9ca9de2acb9b62a503eb0b57c5 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0690/1504] nixos/services.xserver.windowManager.afterstep:
 remove `with lib;`

---
 nixos/modules/services/x11/window-managers/afterstep.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix
index d88be7db3757..7ea546442d6f 100644
--- a/nixos/modules/services/x11/window-managers/afterstep.nix
+++ b/nixos/modules/services/x11/window-managers/afterstep.nix
@@ -4,21 +4,18 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.windowManager.afterstep;
 in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep";
+    services.xserver.windowManager.afterstep.enable = lib.mkEnableOption "afterstep";
   };
 
   ###### implementation
-  config = mkIf cfg.enable {
-    services.xserver.windowManager.session = singleton {
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.session = lib.singleton {
       name = "afterstep";
       start = ''
         ${pkgs.afterstep}/bin/afterstep &

From 380a81dd86cd3f7a0e54dba43643fa4432e98677 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0691/1504] nixos/services.xserver.windowManager.awesome:
 remove `with lib;`

---
 .../services/x11/window-managers/awesome.nix  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index 8b3d781c4c21..ee9e0cbf816e 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.windowManager.awesome;
@@ -25,20 +22,20 @@ in
 
     services.xserver.windowManager.awesome = {
 
-      enable = mkEnableOption "Awesome window manager";
+      enable = lib.mkEnableOption "Awesome window manager";
 
-      luaModules = mkOption {
+      luaModules = lib.mkOption {
         default = [ ];
-        type = types.listOf types.package;
+        type = lib.types.listOf lib.types.package;
         description = "List of lua packages available for being used in the Awesome configuration.";
-        example = literalExpression "[ pkgs.luaPackages.vicious ]";
+        example = lib.literalExpression "[ pkgs.luaPackages.vicious ]";
       };
 
-      package = mkPackageOption pkgs "awesome" { };
+      package = lib.mkPackageOption pkgs "awesome" { };
 
-      noArgb = mkOption {
+      noArgb = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = "Disable client transparency support, which can be greatly detrimental to performance in some setups";
       };
     };
@@ -47,9 +44,9 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
-    services.xserver.windowManager.session = singleton {
+    services.xserver.windowManager.session = lib.singleton {
       name = "awesome";
       start = ''
         ${awesome}/bin/awesome ${lib.optionalString cfg.noArgb "--no-argb"} ${makeSearchPath cfg.luaModules} &

From f85316041af5428c05aa186e3bd8d45bb6b5c627 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:43 +0100
Subject: [PATCH 0692/1504] nixos/services.xserver.windowManager.berry: remove
 `with lib;`

---
 nixos/modules/services/x11/window-managers/berry.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/berry.nix b/nixos/modules/services/x11/window-managers/berry.nix
index ba094d0e3efc..8fdd4e0f79a8 100644
--- a/nixos/modules/services/x11/window-managers/berry.nix
+++ b/nixos/modules/services/x11/window-managers/berry.nix
@@ -4,21 +4,18 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.windowManager.berry;
 in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.berry.enable = mkEnableOption "berry";
+    services.xserver.windowManager.berry.enable = lib.mkEnableOption "berry";
   };
 
   ###### implementation
-  config = mkIf cfg.enable {
-    services.xserver.windowManager.session = singleton {
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.session = lib.singleton {
       name = "berry";
       start = ''
         ${pkgs.berry}/bin/berry &

From acc4e7ea1ff02cef807b7536d77d336308c098b5 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:44 +0100
Subject: [PATCH 0693/1504] nixos/services.xserver.windowManager.bspwm: remove
 `with lib;`

---
 .../services/x11/window-managers/bspwm.nix    | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 46201036f05a..5a173da6b23b 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.windowManager.bspwm;
 in
@@ -14,14 +11,14 @@ in
 {
   options = {
     services.xserver.windowManager.bspwm = {
-      enable = mkEnableOption "bspwm";
+      enable = lib.mkEnableOption "bspwm";
 
-      package = mkPackageOption pkgs "bspwm" {
+      package = lib.mkPackageOption pkgs "bspwm" {
         example = "bspwm-unstable";
       };
-      configFile = mkOption {
-        type = with types; nullOr path;
-        example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
+      configFile = lib.mkOption {
+        type = with lib.types; nullOr path;
+        example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
         default = null;
         description = ''
           Path to the bspwm configuration file.
@@ -30,12 +27,12 @@ in
       };
 
       sxhkd = {
-        package = mkPackageOption pkgs "sxhkd" {
+        package = lib.mkPackageOption pkgs "sxhkd" {
           example = "sxhkd-unstable";
         };
-        configFile = mkOption {
-          type = with types; nullOr path;
-          example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
+        configFile = lib.mkOption {
+          type = with lib.types; nullOr path;
+          example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
           default = null;
           description = ''
             Path to the sxhkd configuration file.
@@ -46,15 +43,15 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    services.xserver.windowManager.session = singleton {
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.session = lib.singleton {
       name = "bspwm";
       start = ''
         export _JAVA_AWT_WM_NONREPARENTING=1
         SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${
-          optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
+          lib.optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
         } &
-        ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
+        ${cfg.package}/bin/bspwm ${lib.optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
         waitPID=$!
       '';
     };
@@ -62,17 +59,17 @@ in
   };
 
   imports = [
-    (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
+    (lib.mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
       "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm."
     )
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "xserver"
       "windowManager"
       "bspwm"
       "startThroughSession"
     ] "bspwm package does not provide bspwm-session anymore.")
-    (mkRemovedOptionModule [
+    (lib.mkRemovedOptionModule [
       "services"
       "xserver"
       "windowManager"

From 7ed890b292df9e94df189dedaf23512d2d6e62fd Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:44 +0100
Subject: [PATCH 0694/1504] nixos/services.xserver.windowManager.clfswm: remove
 `with lib;`

---
 nixos/modules/services/x11/window-managers/clfswm.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix
index b50b60849495..03eaf6e4911e 100644
--- a/nixos/modules/services/x11/window-managers/clfswm.nix
+++ b/nixos/modules/services/x11/window-managers/clfswm.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.windowManager.clfswm;
 in
@@ -14,13 +11,13 @@ in
 {
   options = {
     services.xserver.windowManager.clfswm = {
-      enable = mkEnableOption "clfswm";
-      package = mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { };
+      enable = lib.mkEnableOption "clfswm";
+      package = lib.mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { };
     };
   };
 
-  config = mkIf cfg.enable {
-    services.xserver.windowManager.session = singleton {
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.session = lib.singleton {
       name = "clfswm";
       start = ''
         ${cfg.package}/bin/clfswm &

From 9a87ab9c017eeb7d188697303bb1a18dc351cc35 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:44 +0100
Subject: [PATCH 0695/1504] nixos/services.xserver.windowManager.cwm: remove
 `with lib;`

---
 nixos/modules/services/x11/window-managers/cwm.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/cwm.nix b/nixos/modules/services/x11/window-managers/cwm.nix
index d2be487b0d4c..2f32cc4e7449 100644
--- a/nixos/modules/services/x11/window-managers/cwm.nix
+++ b/nixos/modules/services/x11/window-managers/cwm.nix
@@ -4,18 +4,15 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.windowManager.cwm;
 in
 {
   options = {
-    services.xserver.windowManager.cwm.enable = mkEnableOption "cwm";
+    services.xserver.windowManager.cwm.enable = lib.mkEnableOption "cwm";
   };
-  config = mkIf cfg.enable {
-    services.xserver.windowManager.session = singleton {
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.session = lib.singleton {
       name = "cwm";
       start = ''
         cwm &

From 01cb6f9822ad4c24bc380ff364651d6a2810ccea Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:44 +0100
Subject: [PATCH 0696/1504] nixos/services.xserver.windowManager.dwm: remove
 `with lib;`

---
 nixos/modules/services/x11/window-managers/dwm.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix
index c81a834a0679..1ee79a94016d 100644
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
 
   cfg = config.services.xserver.windowManager.dwm;
@@ -14,8 +11,8 @@ in
 
   options = {
     services.xserver.windowManager.dwm = {
-      enable = mkEnableOption "dwm";
-      package = mkPackageOption pkgs "dwm" {
+      enable = lib.mkEnableOption "dwm";
+      package = lib.mkPackageOption pkgs "dwm" {
         example = ''
           pkgs.dwm.overrideAttrs (oldAttrs: rec {
             patches = [
@@ -33,9 +30,9 @@ in
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
-    services.xserver.windowManager.session = singleton
+    services.xserver.windowManager.session = lib.singleton
       { name = "dwm";
         start =
           ''

From b12278959f5012e21686106db1369a93106d503d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 30 Dec 2024 14:44:44 +0100
Subject: [PATCH 0697/1504] nixos/services.xserver.windowManager.e16: remove
 `with lib;`

---
 nixos/modules/services/x11/window-managers/e16.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/e16.nix b/nixos/modules/services/x11/window-managers/e16.nix
index b1ed3ea66417..e7f2f61f3885 100644
--- a/nixos/modules/services/x11/window-managers/e16.nix
+++ b/nixos/modules/services/x11/window-managers/e16.nix
@@ -4,21 +4,18 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   cfg = config.services.xserver.windowManager.e16;
 in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.e16.enable = mkEnableOption "e16";
+    services.xserver.windowManager.e16.enable = lib.mkEnableOption "e16";
   };
 
   ###### implementation
-  config = mkIf cfg.enable {
-    services.xserver.windowManager.session = singleton {
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.session = lib.singleton {
       name = "E16";
       start = ''
         ${pkgs.e16}/bin/e16 &

From e67cc49668c782ea2e0e250ea832237b1a4aa725 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:01:40 +0900
Subject: [PATCH 0698/1504] pybugz: migrate from python312Packages.bugz

---
 .../bugz/default.nix => by-name/py/pybugz/package.nix}        | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{development/python-modules/bugz/default.nix => by-name/py/pybugz/package.nix} (88%)

diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/by-name/py/pybugz/package.nix
similarity index 88%
rename from pkgs/development/python-modules/bugz/default.nix
rename to pkgs/by-name/py/pybugz/package.nix
index c44c9c5fdc73..20b23147e2dc 100644
--- a/pkgs/development/python-modules/bugz/default.nix
+++ b/pkgs/by-name/py/pybugz/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitHub,
+  python3Packages,
 }:
 
-buildPythonPackage {
+python3Packages.buildPythonApplication {
   pname = "bugz-0.9.3";
   version = "0.13";
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..bf272fbb5ec5 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -90,6 +90,7 @@ mapAliases ({
   boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22
   bsblan = python-bsblan; # added 2022-11-04
   btchip = btchip-python; # added 2023-03-03
+  bugz = throw "use pkgs.pybugz instead"; # added 2024-12-31
   bugzilla = python-bugzilla; # added 2024-10-17
   buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07
   buildbot-ui = throw "use pkgs.buildbot-ui instead"; # added 2022-04-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67e850576181..3de77224827f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1952,8 +1952,6 @@ self: super: with self; {
 
   bugwarrior = callPackage ../development/python-modules/bugwarrior { };
 
-  bugz = callPackage ../development/python-modules/bugz { };
-
   buienradar = callPackage ../development/python-modules/buienradar { };
 
   build = callPackage ../development/python-modules/build { };

From 13cbc8e445e24f17add20a96a483b464f19040d8 Mon Sep 17 00:00:00 2001
From: Mostafa Khaled <mostafa.khaled.5422@gmail.com>
Date: Mon, 30 Dec 2024 18:10:00 +0200
Subject: [PATCH 0699/1504] maintainers: add MostafaKhaled

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe22dbee1134..bfb7abdcf1b7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15270,6 +15270,12 @@
     githubId = 44561540;
     name = "Synth Morxemplum";
   };
+  MostafaKhaled = {
+    email = "mostafa.khaled.5422@gmail.com";
+    github = "mostafa-khaled775";
+    githubId = 112074172;
+    name = "Mostafa Khaled";
+  };
   MostAwesomeDude = {
     email = "cds@corbinsimpson.com";
     github = "MostAwesomeDude";

From 5e540e33f035bdd700a1a768c099df2c880c86b8 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:06:38 +0900
Subject: [PATCH 0700/1504] pybugz: refactor

---
 pkgs/by-name/py/pybugz/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/py/pybugz/package.nix b/pkgs/by-name/py/pybugz/package.nix
index 20b23147e2dc..e7d4170797a8 100644
--- a/pkgs/by-name/py/pybugz/package.nix
+++ b/pkgs/by-name/py/pybugz/package.nix
@@ -4,24 +4,30 @@
   python3Packages,
 }:
 
-python3Packages.buildPythonApplication {
-  pname = "bugz-0.9.3";
+python3Packages.buildPythonApplication rec {
+  pname = "pybugz";
   version = "0.13";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "williamh";
     repo = "pybugz";
-    rev = "0.13";
-    sha256 = "1nw07q7r078dp82rcrhvvnhmnaqjx6f8a6cdjgrsiy6fryrx9dwz";
+    tag = version;
+    hash = "sha256-n7fUs8/O+Kjzk40ZhZzpEitbod0bZpYFug0dkA8+gNs=";
   };
 
+  build-system = [ python3Packages.setuptools ];
+
+  pythonImportsCheck = [ "bugz" ];
+
+  # no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/williamh/pybugz";
     description = "Command line interface for Bugzilla";
     mainProgram = "bugz";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
   };
 }

From 7d9d7d3a3c063faa824d814c486688f7da59aa9b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:07:26 +0900
Subject: [PATCH 0701/1504] pybugz: 0.13 -> 0.14

Diff: https://github.com/williamh/pybugz/compare/0.13...0.14
---
 pkgs/by-name/py/pybugz/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/py/pybugz/package.nix b/pkgs/by-name/py/pybugz/package.nix
index e7d4170797a8..d4f35743f7a8 100644
--- a/pkgs/by-name/py/pybugz/package.nix
+++ b/pkgs/by-name/py/pybugz/package.nix
@@ -6,17 +6,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pybugz";
-  version = "0.13";
+  version = "0.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "williamh";
     repo = "pybugz";
     tag = version;
-    hash = "sha256-n7fUs8/O+Kjzk40ZhZzpEitbod0bZpYFug0dkA8+gNs=";
+    hash = "sha256-rhiCQPSh987QEM4aMd3R/7e6l+pm2eJDE7f5LckIuho=";
   };
 
-  build-system = [ python3Packages.setuptools ];
+  build-system = [ python3Packages.flit-core ];
 
   pythonImportsCheck = [ "bugz" ];
 

From 1fdba131451fc1a98207241b03440d0fa871b81f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 16:20:55 +0000
Subject: [PATCH 0702/1504] python312Packages.redshift-connector: 2.1.3 ->
 2.1.5

---
 .../python-modules/redshift-connector/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix
index 6273cd695f39..af6ffede5aed 100644
--- a/pkgs/development/python-modules/redshift-connector/default.nix
+++ b/pkgs/development/python-modules/redshift-connector/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "redshift-connector";
-  version = "2.1.3";
+  version = "2.1.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-redshift-python-driver";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-NjUgmvmy0buBFpXjcEsZU0F2JNeXE3GBpkaxClvo4T0=";
+    tag = "v${version}";
+    hash = "sha256-q8OF8osAfnAXL1BSgnhE3vQpLHfD/8vPeU2+wCCGSQs=";
   };
 
   # remove addops as they add test directory and coverage parameters to pytest

From e6f67cc25941bef6496e9f24dba1a6ecab2f63ad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 30 Dec 2024 17:29:02 +0100
Subject: [PATCH 0703/1504] nixos/matrix-synapse: configure PYTHONMALLOC when
 using jemalloc

Per a synapse FAQ entry[1] this should be set in combination with\
jemalloc to make sure that jemalloc can accurately calculate memory
usage.

[1] https://github.com/element-hq/synapse/blob/develop/docs/usage/administration/admin_faq.md#help-synapse-is-slow-and-eats-all-my-ramcpu
---
 nixos/modules/services/matrix/synapse.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 2b0eb43605d8..5ed02623953d 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -1462,6 +1462,7 @@ in
         baseServiceConfig = {
           environment = optionalAttrs (cfg.withJemalloc) {
             LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
+            PYTHONMALLOC = "malloc";
           };
           serviceConfig = {
             Type = "notify";

From 77da7694cc7758e980037b67022d8bb25216355d Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:29:25 +0900
Subject: [PATCH 0704/1504] python312Packages.zc-buildout: 3.0.1 -> 3.3

Diff: https://github.com/buildout/buildout/compare/3.0.1...3.3
---
 pkgs/development/python-modules/buildout/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index a653318ffe6f..b2197c501758 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "zc-buildout";
-  version = "3.0.1";
+  version = "3.3";
 
   src = fetchFromGitHub {
     owner = "buildout";
     repo = "buildout";
-    rev = version;
-    sha256 = "J/ymUCFhl7EviHMEYSUCTky0ULRT8aL4gNCGxrbqJi0=";
+    tag = version;
+    hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k=";
   };
 
   propagatedBuildInputs = [

From f632dcd105f70d91ecd7f49f5be7a46574415c8c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:36:12 +0900
Subject: [PATCH 0705/1504] python312Packages.zc-buildout: refactor

---
 .../{buildout => zc-buildout}/default.nix      | 18 +++++++++---------
 pkgs/top-level/python-packages.nix             |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/development/python-modules/{buildout => zc-buildout}/default.nix (74%)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/zc-buildout/default.nix
similarity index 74%
rename from pkgs/development/python-modules/buildout/default.nix
rename to pkgs/development/python-modules/zc-buildout/default.nix
index b2197c501758..fa947a007b2a 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/zc-buildout/default.nix
@@ -4,12 +4,12 @@
   lib,
   pip,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "zc-buildout";
   version = "3.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "buildout";
@@ -18,22 +18,22 @@ buildPythonPackage rec {
     hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k=";
   };
 
-  propagatedBuildInputs = [
-    setuptools
-    pip
-    wheel
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pip ];
 
   doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg"
 
   pythonImportsCheck = [ "zc.buildout" ];
 
-  meta = with lib; {
+  pythonNamespaces = [ "zc" ];
+
+  meta = {
     description = "Software build and configuration system";
     mainProgram = "buildout";
     downloadPage = "https://github.com/buildout/buildout";
     homepage = "https://www.buildout.org";
-    license = licenses.zpl21;
-    maintainers = with maintainers; [ gotcha ];
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ gotcha ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67e850576181..3587848deb2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18368,7 +18368,7 @@ self: super: with self; {
 
   zarr = callPackage ../development/python-modules/zarr { };
 
-  zc-buildout = callPackage ../development/python-modules/buildout { };
+  zc-buildout = callPackage ../development/python-modules/zc-buildout { };
 
   zc-lockfile = callPackage ../development/python-modules/zc-lockfile { };
 

From e0057621728c5ed06031d12f9c7cbdab5168b40d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 16:43:38 +0000
Subject: [PATCH 0706/1504] tt-rss: 0-unstable-2024-12-20 ->
 0-unstable-2024-12-22

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

diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index 058d8019b4d6..fb7320fa6aec 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tt-rss";
-  version = "0-unstable-2024-12-20";
+  version = "0-unstable-2024-12-22";
 
   src = fetchgit {
     url = "https://git.tt-rss.org/fox/tt-rss.git";
-    rev = "7b727156780236cb639c52e45d07cc80c1f2b0d3";
-    hash = "sha256-b3z1cfM0El6yW7sCq8FSoN0sNa07HA4zLSUrEFX8ICM=";
+    rev = "fc89d2e6333d6d828f2b07a53be53677caf3d638";
+    hash = "sha256-z+sWplOExqtkWPEBJ+WOb4CPDX1iLj14KwrGSojFp0A=";
   };
 
   installPhase = ''

From dc2b24a4017c704dae06e36ec88d3202c3084b73 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Mon, 30 Dec 2024 16:52:43 +0000
Subject: [PATCH 0707/1504] ugrep: 7.1.1 -> 7.1.2

Changes: https://github.com/Genivia/ugrep/releases/tag/v7.1.2
---
 pkgs/by-name/ug/ugrep/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix
index 75721981a943..e21f7dfba3cf 100644
--- a/pkgs/by-name/ug/ugrep/package.nix
+++ b/pkgs/by-name/ug/ugrep/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ugrep";
-  version = "7.1.1";
+  version = "7.1.2";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "ugrep";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-l/AHt0OLI76AEOOziFXdfQdJlx6HqdFoEJ27YhwUJnQ=";
+    hash = "sha256-Gujz4o3EhpUs/GtUBXdimJR06yX1zu6joZkG/9aXrU4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 51d11cae99b17623777bc53bb27d8d1799a0ceeb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 30 Dec 2024 17:55:33 +0100
Subject: [PATCH 0708/1504] nixos/matrix-synapse: enable jemalloc by default

The official docker image has been defaulting to the jemalloc memory
allocator for years.
---
 nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++
 nixos/modules/services/matrix/synapse.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 1fbd5aad9230..aa690a1493d9 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -295,6 +295,8 @@
 
 - `services.avahi.ipv6` now defaults to true.
 
+- For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
+
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
 - Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added.
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 5ed02623953d..48372d9c4874 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -705,7 +705,7 @@ in
 
         withJemalloc = mkOption {
           type = types.bool;
-          default = false;
+          default = true;
           description = ''
             Whether to preload jemalloc to reduce memory fragmentation and overall usage.
           '';

From 22a3cd5735eb99cf0fb7ad8395b2dee3f7cfb124 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 17:09:41 +0000
Subject: [PATCH 0709/1504] gatus: 5.14.0 -> 5.15.0

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

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index b069e8f46638..1f28d30a323d 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.14.0";
+  version = "5.15.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-WYD456l1XdyqhBzsMvruvn24DYspCYt9m7rzqd3dSK4=";
+    hash = "sha256-etML4syyN1fEFewWk0L0p76TTeCMwFG4ifZKPS18CTc=";
   };
 
-  vendorHash = "sha256-UeKQwqDHj1DFjlnGAl8asW7OpmClGi9aB/IbMzR9WvU=";
+  vendorHash = "sha256-o6G4XLgEHI+ey/49+H+F9zTBq6L2shjkrJNnDLYFM+Q=";
 
   subPackages = [ "." ];
 

From a1210cfcaa126e0de4f4206677202f82477d607a Mon Sep 17 00:00:00 2001
From: Mostafa Khaled <mostafa.khaled.5422@gmail.com>
Date: Mon, 30 Dec 2024 18:10:19 +0200
Subject: [PATCH 0710/1504] lm4flash: init at 0.1.3

---
 pkgs/by-name/lm/lm4flash/package.nix | 57 ++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/lm/lm4flash/package.nix

diff --git a/pkgs/by-name/lm/lm4flash/package.nix b/pkgs/by-name/lm/lm4flash/package.nix
new file mode 100644
index 000000000000..ca94fa67ff78
--- /dev/null
+++ b/pkgs/by-name/lm/lm4flash/package.nix
@@ -0,0 +1,57 @@
+{
+  fetchFromGitHub,
+  stdenv,
+  libusb1,
+  pkg-config,
+  lib,
+  writeText,
+}:
+let
+  stellaris-udev-rules = writeText "61.stellpad.rules" ''
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="0666"
+  '';
+in
+stdenv.mkDerivation rec {
+  pname = "lm4flash";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "utzig";
+    repo = "lm4tools";
+    tag = "v${version}";
+    hash = "sha256-ZjuCH/XjQEgg6KHAvb95/BkAy+C2OdbtBb/i6K30+uo=";
+  };
+  sourceRoot = "${src.name}/lm4flash";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libusb1
+  ];
+
+  buildFlags = [ "release" ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    install -Dm644 "${stellaris-udev-rules}" "$out/etc/udev/rules.d/61.stellpad.rules"
+  '';
+
+  meta = {
+    description = "Command-line firmware flashing tool for the Stellaris Launchpad";
+    longDescription = ''
+      Command-line firmware flashing tool using libusb-1.0 to communicate with
+      the Stellaris Launchpad ICDI. Works on all Linux, Mac OS X, Windows, and
+      BSD systems.
+    '';
+    homepage = "https://github.com/utzig/lm4tools";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "lm4flash";
+    maintainers = with lib.maintainers; [ MostafaKhaled ];
+    platforms = lib.platforms.all;
+  };
+}

From d76046c8a298a5df3bb635e82ce98cc53896fe3e Mon Sep 17 00:00:00 2001
From: Ad <me@skissue.xyz>
Date: Thu, 28 Nov 2024 22:49:49 -0500
Subject: [PATCH 0711/1504] tree-sitter-grammars: add hyprlang

---
 .../tools/parsing/tree-sitter/grammars/default.nix   |  1 +
 .../tree-sitter/grammars/tree-sitter-hyprlang.json   | 12 ++++++++++++
 .../development/tools/parsing/tree-sitter/update.nix |  4 ++++
 3 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index f67e28ff950f..161faf250d6c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -44,6 +44,7 @@
   tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json;
   tree-sitter-html = lib.importJSON ./tree-sitter-html.json;
   tree-sitter-http = lib.importJSON ./tree-sitter-http.json;
+  tree-sitter-hyprlang = lib.importJSON ./tree-sitter-hyprlang.json;
   tree-sitter-janet-simple = lib.importJSON ./tree-sitter-janet-simple.json;
   tree-sitter-java = lib.importJSON ./tree-sitter-java.json;
   tree-sitter-javascript = lib.importJSON ./tree-sitter-javascript.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json
new file mode 100644
index 000000000000..f63d8243613a
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hyprlang.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang",
+  "rev": "86025136c12cd1058985479a6b1935829077f1af",
+  "date": "2024-02-10T18:00:17+03:00",
+  "path": "/nix/store/q5csx65ydwbz66bgjjpa6c1yvy3zy6vq-tree-sitter-hyprlang",
+  "sha256": "0z84nl1mb77rwqq86ggaiqdd2lwg3nxrlkbhsn8zhcqnaphq0wfl",
+  "hash": "sha256-1HGA4VUWM/iR1XBNmrsdj1PRGo7qPYMw5vmcVQO1BH0=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 6ce9ddf849fc..b323af069d21 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -462,6 +462,10 @@ let
       orga = "kaermorchen";
       repo = "tree-sitter-twig";
     };
+    "tree-sitter-hyprlang" = {
+      orga = "tree-sitter-grammars";
+      repo = "tree-sitter-hyprlang";
+    };
   };
 
   allGrammars =

From 2f11e237682f116b592c7adff26ea3ba33a9cef0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 20:30:06 +0000
Subject: [PATCH 0712/1504] python312Packages.qtile-bonsai: 0.4.0 -> 0.5.0

---
 pkgs/development/python-modules/qtile-bonsai/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qtile-bonsai/default.nix b/pkgs/development/python-modules/qtile-bonsai/default.nix
index d8dbd3a8d680..38f10c885182 100644
--- a/pkgs/development/python-modules/qtile-bonsai/default.nix
+++ b/pkgs/development/python-modules/qtile-bonsai/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "qtile-bonsai";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aravinda0";
     repo = "qtile-bonsai";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-IWy/YEVdZc+UgIKl75ZpOkOIvpS5hCX0ihQenUOuJHo=";
+    tag = "v${version}";
+    hash = "sha256-1wiBrLQDdQGsoZAT5XUzmuloVo90y+GZu1bqPrbQl48=";
   };
 
   build-system = [

From 4f2ebe9e6479dc02bbb37a932618642b89be9af3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 22:38:44 +0100
Subject: [PATCH 0713/1504] python312Packages.aiomealie: 0.9.4 -> 0.9.5

Diff: https://github.com/joostlek/python-mealie/compare/refs/tags/v0.9.4...v0.9.5

Changelog: https://github.com/joostlek/python-mealie/releases/tag/v0.9.5
---
 pkgs/development/python-modules/aiomealie/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index a795c97e66c4..af7b7643fbc3 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -2,6 +2,7 @@
   lib,
   aiohttp,
   aioresponses,
+  awesomeversion,
   buildPythonPackage,
   fetchFromGitHub,
   mashumaro,
@@ -17,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiomealie";
-  version = "0.9.4";
+  version = "0.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,13 +27,14 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-mealie";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Sl2n78R/twx4+liob4k0B1pskonYD7B00lo9hz45qIs=";
+    hash = "sha256-hcHXX95d9T/jJMqHkikWN8ZdM5MRxJxhH575U3KDXxY=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
     aiohttp
+    awesomeversion
     mashumaro
     orjson
     yarl

From 465ffab65d0680ea64052d9a9990788966675d10 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Mon, 30 Dec 2024 21:34:18 +0000
Subject: [PATCH 0714/1504] nixos/taskserver: fix systemd shellcheck warning

The taskserver-init systemd unit fails to build with
systemd.enableStrictShellChecks enabled, due to using the potentially
unsafe `mkdir -m`.  Fix that by moving directory creation out to
systemd.tmpfiles.
---
 nixos/modules/services/misc/taskserver/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 64ff7437fb08..592514718940 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -498,16 +498,16 @@ in
         ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" else "${cfg.pki.manual.ca.cert}";
       };
 
+      systemd.tmpfiles.rules = [
+        "d ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}"
+        "z ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}"
+      ];
+
       systemd.services.taskserver-init = {
         wantedBy = [ "taskserver.service" ];
         before = [ "taskserver.service" ];
         description = "Initialize Taskserver Data Directory";
 
-        preStart = ''
-          mkdir -m 0770 -p "${cfg.dataDir}"
-          chown "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
-        '';
-
         script = ''
           ${taskd} init
           touch "${cfg.dataDir}/.is_initialized"

From 79bf56ec91ede1c218c6405d130755e002453178 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Mon, 30 Dec 2024 21:55:19 +0000
Subject: [PATCH 0715/1504] nixos/taskserver: fix test deprecation warning

---
 nixos/tests/taskserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix
index bd4dac40da87..31dfea00435c 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixos/tests/taskserver.nix
@@ -114,7 +114,7 @@ import ./make-test-python.nix (
     testScript =
       { nodes, ... }:
       let
-        cfg = nodes.server.config.services.taskserver;
+        cfg = nodes.server.services.taskserver;
         portStr = toString cfg.listenPort;
         specialisations = "${nodes.server.system.build.toplevel}/specialisation";
         newServerSystem = "${specialisations}/manual_config";

From 46858a2be45002b872ca8d04f95eb28afd77a805 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 22:01:45 +0000
Subject: [PATCH 0716/1504] codeium: 1.30.2 -> 1.30.18

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

diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix
index 26ba1b6f8c1d..9fbcada3199e 100644
--- a/pkgs/by-name/co/codeium/package.nix
+++ b/pkgs/by-name/co/codeium/package.nix
@@ -23,10 +23,10 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-xbMiPmFGte4I6p+Zt4HaLL4MuHoMs++gf5iVPl7+h70=";
-      aarch64-linux = "sha256-2bu8cI0u8Q3mCxZFoM0W/gQ4BipLUIoVe2e0a16ZQco=";
-      x86_64-darwin = "sha256-lGRqxZxIpioTA5I9lsWIQ8S7AN8AXR7NGgSMCNN3cQI=";
-      aarch64-darwin = "sha256-MGqT4Jhq81rvnMhQtg+N0C4ElOfUvLpVBq7EtwKztOE=";
+      x86_64-linux = "sha256-/VkobDCai9+Lac0TCzm9gg/pNFDA1T2OJiad3qdz/2o=";
+      aarch64-linux = "sha256-glJRQIFSs5D7b3BVblaL0o8Rndh3QuCup45AfRWymG0=";
+      x86_64-darwin = "sha256-TBCgbaJ5Yyp+I8VCljYf3tlNnVaLkfwusJMlfY+Rggo=";
+      aarch64-darwin = "sha256-MfJ/zIfmKJN4Fe6a50NwAqvetxB/W+BriQ+5mEIhWMg=";
     }
     .${system} or throwSystem;
 
@@ -35,7 +35,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "codeium";
-  version = "1.30.2";
+  version = "1.30.18";
   src = fetchurl {
     name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
     url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

From 1f50def18fa93a39c408b384906e976901081f70 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 30 Dec 2024 23:08:07 +0100
Subject: [PATCH 0717/1504] fetchgit: passthru `tag`

---
 pkgs/build-support/fetchgit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index f2b4726fef09..fd267fe34de8 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -120,6 +120,7 @@ stdenvNoCC.mkDerivation {
 
   passthru = {
     gitRepoUrl = url;
+    inherit tag;
   };
 }
 ))

From 39ddc9215590f713b6f05104e5e05569579216db Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 30 Dec 2024 23:08:36 +0100
Subject: [PATCH 0718/1504] fetchFromGitHub: passthru `rev` based on `tag`

---
 pkgs/build-support/fetchgithub/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index ed24a6239449..6d580b2e0656 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -59,12 +59,14 @@ let
 
   gitRepoUrl = "${baseUrl}.git";
 
+  revWithTag = if tag != null then "refs/tags/${tag}" else rev;
+
   fetcherArgs = (if useFetchGit
     then {
       inherit tag rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl;
     } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
     else {
-      url = "${baseUrl}/archive/${if tag != null then "refs/tags/${tag}" else rev}.tar.gz";
+      url = "${baseUrl}/archive/${revWithTag}.tar.gz";
 
       passthru = {
         inherit gitRepoUrl;
@@ -73,5 +75,5 @@ let
   ) // privateAttrs // passthruAttrs // { inherit name; };
 in
 
-fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo tag; }
+fetcher fetcherArgs // { meta = newMeta; inherit owner repo tag; rev = revWithTag; }
 )

From f7eba55589c7af76539f7532f16f077a29c9a26b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 30 Dec 2024 23:09:49 +0100
Subject: [PATCH 0719/1504] fetchFromGitLab: passthru `rev` based on `tag`

---
 pkgs/build-support/fetchgitlab/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index aef76270d5ec..c060352d1a9f 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -37,10 +37,9 @@ lib.makeOverridable (
         repo
       ]
     );
+    revWithTag = if tag != null then "refs/tags/" + tag else rev;
     escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
-    escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] (
-      if tag != null then "refs/tags/" + tag else rev
-    );
+    escapedRevWithTag = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] revWithTag;
     passthruAttrs = removeAttrs args [
       "protocol"
       "domain"
@@ -77,7 +76,7 @@ lib.makeOverridable (
           }
         else
           {
-            url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
+            url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRevWithTag}";
 
             passthru = {
               inherit gitRepoUrl;
@@ -95,9 +94,9 @@ lib.makeOverridable (
     meta.homepage = "${protocol}://${domain}/${slug}/";
     inherit
       tag
-      rev
       owner
       repo
       ;
+    rev = revWithTag;
   }
 )

From c24cf895bab315be0f1fc32c9ea68fb6d83586ca Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Mon, 30 Dec 2024 15:50:27 -0300
Subject: [PATCH 0720/1504] flexget: 3.13.2 -> 3.13.5

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/fl/flexget/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index e16386bcf7a7..58d027701ec9 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.13.2";
+  version = "3.13.5";
   pyproject = true;
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${version}";
-    hash = "sha256-UjKYHZwAOOv3Adj13r2zJkVmxwEpJLQk87UslddX9Qk=";
+    hash = "sha256-R6E5NWnrnezJsDm+Nnqgibv4e6mXVrOrKaCl/MBqUnY=";
   };
 
   # relax dep constrains, keep environment constraints

From dc3a0821fe3a906bf49df2934cb691b072e2f4be Mon Sep 17 00:00:00 2001
From: Nabeen Tiwaree <nabeen0x01@gmail.com>
Date: Mon, 30 Dec 2024 10:04:06 -0500
Subject: [PATCH 0721/1504] Update pkgs/by-name/rw/rwalk/package.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/rw/rwalk/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index fdfee841305f..3a6f657f94ea 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -25,15 +25,20 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ];
+  buildInputs = [
+    openssl
+  ];
 
   env = {
     OPENSSL_NO_VENDOR = true;
   };
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   meta = {
     description = "Blazingly fast web directory scanner written in Rust";
     homepage = "https://github.com/cestef/rwalk";

From e7ff77d1264a41febd148c9a9120e6bc53536acd Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 18 Nov 2024 16:21:37 +0100
Subject: [PATCH 0722/1504] rstudio: format with nixfmt

---
 pkgs/applications/editors/rstudio/default.nix | 270 ++++++++++--------
 1 file changed, 157 insertions(+), 113 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index ff0c468fc509..4ef6e6951298 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,38 +1,39 @@
-{ lib
-, stdenv
-, mkDerivation
-, fetchurl
-, fetchFromGitHub
-, makeDesktopItem
-, copyDesktopItems
-, cmake
-, boost183
-, zlib
-, openssl
-, R
-, qtbase
-, qtxmlpatterns
-, qtsensors
-, qtwebengine
-, qtwebchannel
-, quarto
-, libuuid
-, hunspellDicts
-, unzip
-, ant
-, jdk
-, gnumake
-, pandoc
-, llvmPackages
-, yaml-cpp
-, soci
-, postgresql
-, nodejs
-, qmake
-, server ? false # build server version
-, sqlite
-, pam
-, nixosTests
+{
+  lib,
+  stdenv,
+  mkDerivation,
+  fetchurl,
+  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  cmake,
+  boost183,
+  zlib,
+  openssl,
+  R,
+  qtbase,
+  qtxmlpatterns,
+  qtsensors,
+  qtwebengine,
+  qtwebchannel,
+  quarto,
+  libuuid,
+  hunspellDicts,
+  unzip,
+  ant,
+  jdk,
+  gnumake,
+  pandoc,
+  llvmPackages,
+  yaml-cpp,
+  soci,
+  postgresql,
+  nodejs,
+  qmake,
+  server ? false, # build server version
+  sqlite,
+  pam,
+  nixosTests,
 }:
 
 let
@@ -41,9 +42,7 @@ let
   RSTUDIO_VERSION_MAJOR = lib.versions.major version;
   RSTUDIO_VERSION_MINOR = lib.versions.minor version;
   RSTUDIO_VERSION_PATCH = lib.versions.patch version;
-  RSTUDIO_VERSION_SUFFIX = "+" + toString (
-    lib.tail (lib.splitString "+" version)
-  );
+  RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
 
   src = fetchFromGitHub {
     owner = "rstudio";
@@ -75,54 +74,73 @@ let
 
   description = "Set of integrated tools for the R language";
 in
-(if server then stdenv.mkDerivation else mkDerivation)
-  (rec {
-    inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH RSTUDIO_VERSION_SUFFIX;
+(if server then stdenv.mkDerivation else mkDerivation) (
+  rec {
+    inherit
+      pname
+      version
+      src
+      RSTUDIO_VERSION_MAJOR
+      RSTUDIO_VERSION_MINOR
+      RSTUDIO_VERSION_PATCH
+      RSTUDIO_VERSION_SUFFIX
+      ;
 
-    nativeBuildInputs = [
-      cmake
-      unzip
-      ant
-      jdk
-      pandoc
-      nodejs
-    ] ++ lib.optionals (!server) [
-      copyDesktopItems
-    ];
+    nativeBuildInputs =
+      [
+        cmake
+        unzip
+        ant
+        jdk
+        pandoc
+        nodejs
+      ]
+      ++ lib.optionals (!server) [
+        copyDesktopItems
+      ];
 
-    buildInputs = [
-      boost183
-      zlib
-      openssl
-      R
-      libuuid
-      yaml-cpp
-      soci
-      postgresql
-      quarto
-    ] ++ (if server then [
-      sqlite.dev
-      pam
-    ] else [
-      qtbase
-      qtxmlpatterns
-      qtsensors
-      qtwebengine
-      qtwebchannel
-    ]);
+    buildInputs =
+      [
+        boost183
+        zlib
+        openssl
+        R
+        libuuid
+        yaml-cpp
+        soci
+        postgresql
+        quarto
+      ]
+      ++ (
+        if server then
+          [
+            sqlite.dev
+            pam
+          ]
+        else
+          [
+            qtbase
+            qtxmlpatterns
+            qtsensors
+            qtwebengine
+            qtwebchannel
+          ]
+      );
 
-    cmakeFlags = [
-      "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
-      "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
-      "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
-      "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
-      "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
-      "-DQUARTO_ENABLED=TRUE"
-      "-DPANDOC_VERSION=${pandoc.version}"
-      "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
-    ] ++ lib.optionals (!server) [
-      "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
-    ];
+    cmakeFlags =
+      [
+        "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
+        "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
+        "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
+        "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
+        "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
+        "-DQUARTO_ENABLED=TRUE"
+        "-DPANDOC_VERSION=${pandoc.version}"
+        "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
+      ]
+      ++ lib.optionals (!server) [
+        "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
+      ];
 
     # Hack RStudio to only use the input R and provided libclang.
     patches = [
@@ -162,32 +180,31 @@ in
     # These dicts contain identically-named dict files, so we only keep the
     # -large versions in case of clashes
     largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
-    otherDicts = lib.filter
-      (d: !(lib.hasAttr "dictFileName" d &&
-        lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts)))
-      hunspellDictionaries;
+    otherDicts = lib.filter (
+      d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
+    ) hunspellDictionaries;
     dictionaries = largeDicts ++ otherDicts;
 
     preConfigure = ''
-      mkdir dependencies/dictionaries
-      for dict in ${builtins.concatStringsSep " " dictionaries}; do
-        for i in "$dict/share/hunspell/"*; do
-          ln -s $i dependencies/dictionaries/
-        done
-      done
+       mkdir dependencies/dictionaries
+       for dict in ${builtins.concatStringsSep " " dictionaries}; do
+         for i in "$dict/share/hunspell/"*; do
+           ln -s $i dependencies/dictionaries/
+         done
+       done
 
-      unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
+       unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
 
-     # As of Chocolate Cosmos, node 18.20.3 is used for runtime
-     # 18.18.2 is still used for build
-     # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
-     mkdir -p dependencies/common/node/18.20.3
+      # As of Chocolate Cosmos, node 18.20.3 is used for runtime
+      # 18.18.2 is still used for build
+      # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
+      mkdir -p dependencies/common/node/18.20.3
 
-      mkdir -p dependencies/pandoc/${pandoc.version}
-      cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
+       mkdir -p dependencies/pandoc/${pandoc.version}
+       cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
 
-      cp -r ${rsconnectSrc} dependencies/rsconnect
-      ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
+       cp -r ${rsconnectSrc} dependencies/rsconnect
+       ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
     '';
 
     postInstall = ''
@@ -198,9 +215,12 @@ in
         ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
       ''}
 
-      for f in {${if server
-        then "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
-        else "diagnostics,rpostback,rstudio"}}; do
+      for f in {${
+        if server then
+          "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
+        else
+          "diagnostics,rpostback,rstudio"
+      }}; do
         ln -s $out/lib/rstudio/bin/$f $out/bin
       done
 
@@ -216,16 +236,22 @@ in
       inherit description;
       homepage = "https://www.rstudio.com/";
       license = lib.licenses.agpl3Only;
-      maintainers = with lib.maintainers; [ ciil cfhammill ];
+      maintainers = with lib.maintainers; [
+        ciil
+        cfhammill
+      ];
       mainProgram = "rstudio" + lib.optionalString server "-server";
       platforms = lib.platforms.linux;
     };
 
     passthru = {
       inherit server;
-      tests = { inherit (nixosTests) rstudio-server; };
+      tests = {
+        inherit (nixosTests) rstudio-server;
+      };
     };
-  } // lib.optionalAttrs (!server) {
+  }
+  // lib.optionalAttrs (!server) {
     qtWrapperArgs = [
       "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
     ];
@@ -240,11 +266,29 @@ in
         comment = description;
         categories = [ "Development" ];
         mimeTypes = [
-          "text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown"
-          "text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project"
-          "text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html"
-          "text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src"
+          "text/x-r-source"
+          "text/x-r"
+          "text/x-R"
+          "text/x-r-doc"
+          "text/x-r-sweave"
+          "text/x-r-markdown"
+          "text/x-r-html"
+          "text/x-r-presentation"
+          "application/x-r-data"
+          "application/x-r-project"
+          "text/x-r-history"
+          "text/x-r-profile"
+          "text/x-tex"
+          "text/x-markdown"
+          "text/html"
+          "text/css"
+          "text/javascript"
+          "text/x-chdr"
+          "text/x-csrc"
+          "text/x-c++hdr"
+          "text/x-c++src"
         ];
       })
     ];
-  })
+  }
+)

From 3f9546f9f23debe64de94100782815ae5f6f4d80 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 18 Nov 2024 16:28:11 +0100
Subject: [PATCH 0723/1504] rstudio: don't use libsForQt5.callPackage

---
 pkgs/applications/editors/rstudio/default.nix | 23 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 4ef6e6951298..0a48250d3e84 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
   fetchFromGitHub,
   makeDesktopItem,
@@ -11,11 +10,7 @@
   zlib,
   openssl,
   R,
-  qtbase,
-  qtxmlpatterns,
-  qtsensors,
-  qtwebengine,
-  qtwebchannel,
+  libsForQt5,
   quarto,
   libuuid,
   hunspellDicts,
@@ -29,7 +24,6 @@
   soci,
   postgresql,
   nodejs,
-  qmake,
   server ? false, # build server version
   sqlite,
   pam,
@@ -74,7 +68,7 @@ let
 
   description = "Set of integrated tools for the R language";
 in
-(if server then stdenv.mkDerivation else mkDerivation) (
+stdenv.mkDerivation (
   rec {
     inherit
       pname
@@ -97,6 +91,7 @@ in
       ]
       ++ lib.optionals (!server) [
         copyDesktopItems
+        libsForQt5.wrapQtAppsHook
       ];
 
     buildInputs =
@@ -119,11 +114,11 @@ in
           ]
         else
           [
-            qtbase
-            qtxmlpatterns
-            qtsensors
-            qtwebengine
-            qtwebchannel
+            libsForQt5.qtbase
+            libsForQt5.qtxmlpatterns
+            libsForQt5.qtsensors
+            libsForQt5.qtwebengine
+            libsForQt5.qtwebchannel
           ]
       );
 
@@ -139,7 +134,7 @@ in
         "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
       ]
       ++ lib.optionals (!server) [
-        "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
+        "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
       ];
 
     # Hack RStudio to only use the input R and provided libclang.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ba5a100d6..efb836890d14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15295,7 +15295,7 @@ with pkgs;
     backend = "wayland";
   };
 
-  rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
+  rstudio = callPackage ../applications/editors/rstudio {
     jdk = jdk8;
   };
 

From b43523d57662d2f56b7281d4a1df693607f843bc Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 8 Dec 2024 15:34:07 +0100
Subject: [PATCH 0724/1504] rstudio: clean up by moving values around

---
 pkgs/applications/editors/rstudio/default.nix | 402 +++++++++---------
 1 file changed, 192 insertions(+), 210 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 0a48250d3e84..659793a48512 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -31,20 +31,6 @@
 }:
 
 let
-  pname = "RStudio";
-  version = "2024.04.2+764";
-  RSTUDIO_VERSION_MAJOR = lib.versions.major version;
-  RSTUDIO_VERSION_MINOR = lib.versions.minor version;
-  RSTUDIO_VERSION_PATCH = lib.versions.patch version;
-  RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
-
-  src = fetchFromGitHub {
-    owner = "rstudio";
-    repo = "rstudio";
-    rev = "v" + version;
-    hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw=";
-  };
-
   mathJaxSrc = fetchurl {
     url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
     hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY=";
@@ -66,224 +52,220 @@ let
     hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g=";
   };
 
-  description = "Set of integrated tools for the R language";
+  hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
+  # These dicts contain identically-named dict files, so we only keep the
+  # -large versions in case of clashes
+  largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
+  otherDicts = lib.filter (
+    d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
+  ) hunspellDictionaries;
+  dictionaries = largeDicts ++ otherDicts;
 in
-stdenv.mkDerivation (
-  rec {
-    inherit
-      pname
-      version
-      src
-      RSTUDIO_VERSION_MAJOR
-      RSTUDIO_VERSION_MINOR
-      RSTUDIO_VERSION_PATCH
-      RSTUDIO_VERSION_SUFFIX
-      ;
+stdenv.mkDerivation rec {
+  pname = "RStudio";
+  version = "2024.04.2+764";
 
-    nativeBuildInputs =
-      [
-        cmake
-        unzip
-        ant
-        jdk
-        pandoc
-        nodejs
-      ]
-      ++ lib.optionals (!server) [
-        copyDesktopItems
-        libsForQt5.wrapQtAppsHook
-      ];
+  RSTUDIO_VERSION_MAJOR = lib.versions.major version;
+  RSTUDIO_VERSION_MINOR = lib.versions.minor version;
+  RSTUDIO_VERSION_PATCH = lib.versions.patch version;
+  RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
 
-    buildInputs =
-      [
-        boost183
-        zlib
-        openssl
-        R
-        libuuid
-        yaml-cpp
-        soci
-        postgresql
-        quarto
-      ]
-      ++ (
-        if server then
-          [
-            sqlite.dev
-            pam
-          ]
-        else
-          [
-            libsForQt5.qtbase
-            libsForQt5.qtxmlpatterns
-            libsForQt5.qtsensors
-            libsForQt5.qtwebengine
-            libsForQt5.qtwebchannel
-          ]
-      );
+  src = fetchFromGitHub {
+    owner = "rstudio";
+    repo = "rstudio";
+    rev = "v" + version;
+    hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw=";
+  };
 
-    cmakeFlags =
-      [
-        "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
-        "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
-        "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
-        "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
-        "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
-        "-DQUARTO_ENABLED=TRUE"
-        "-DPANDOC_VERSION=${pandoc.version}"
-        "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
-      ]
-      ++ lib.optionals (!server) [
-        "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
-      ];
-
-    # Hack RStudio to only use the input R and provided libclang.
-    patches = [
-      ./r-location.patch
-      ./clang-location.patch
-      ./use-system-node.patch
-      ./fix-resources-path.patch
-      ./pandoc-nix-path.patch
-      ./use-system-quarto.patch
-      ./ignore-etc-os-release.patch
+  nativeBuildInputs =
+    [
+      cmake
+      unzip
+      ant
+      jdk
+      pandoc
+      nodejs
+    ]
+    ++ lib.optionals (!server) [
+      copyDesktopItems
+      libsForQt5.wrapQtAppsHook
     ];
 
-    postPatch = ''
-      substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R}
+  buildInputs =
+    [
+      boost183
+      zlib
+      openssl
+      R
+      libuuid
+      yaml-cpp
+      soci
+      postgresql
+      quarto
+    ]
+    ++ lib.optionals server [
+      sqlite.dev
+      pam
+    ]
+    ++ lib.optionals (!server) [
+      libsForQt5.qtbase
+      libsForQt5.qtxmlpatterns
+      libsForQt5.qtsensors
+      libsForQt5.qtwebengine
+      libsForQt5.qtwebchannel
+    ];
 
-      substituteInPlace src/gwt/build.xml \
-        --replace-fail '@node@' ${nodejs} \
-        --replace-fail './lib/quarto' ${quartoSrc}
+  cmakeFlags =
+    [
+      "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
+      "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
+      "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
+      "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
+      "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
+      "-DQUARTO_ENABLED=TRUE"
+      "-DPANDOC_VERSION=${pandoc.version}"
+      "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
+    ]
+    ++ lib.optionals (!server) [
+      "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
+    ];
 
-      substituteInPlace src/cpp/conf/rsession-dev.conf \
-        --replace-fail '@node@' ${nodejs}
+  # Hack RStudio to only use the input R and provided libclang.
+  patches = [
+    ./r-location.patch
+    ./clang-location.patch
+    ./use-system-node.patch
+    ./fix-resources-path.patch
+    ./pandoc-nix-path.patch
+    ./use-system-quarto.patch
+    ./ignore-etc-os-release.patch
+  ];
 
-      substituteInPlace src/cpp/core/libclang/LibClang.cpp \
-        --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \
-        --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so
+  postPatch = ''
+    substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R}
 
-      substituteInPlace src/cpp/session/CMakeLists.txt \
-        --replace-fail '@pandoc@' ${pandoc} \
-        --replace-fail '@quarto@' ${quarto}
+    substituteInPlace src/gwt/build.xml \
+      --replace-fail '@node@' ${nodejs} \
+      --replace-fail './lib/quarto' ${quartoSrc}
 
-      substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
-        --replace-fail '@pandoc@' ${pandoc}/bin \
-        --replace-fail '@quarto@' ${quarto}
-    '';
+    substituteInPlace src/cpp/conf/rsession-dev.conf \
+      --replace-fail '@node@' ${nodejs}
 
-    hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
-    # These dicts contain identically-named dict files, so we only keep the
-    # -large versions in case of clashes
-    largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
-    otherDicts = lib.filter (
-      d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
-    ) hunspellDictionaries;
-    dictionaries = largeDicts ++ otherDicts;
+    substituteInPlace src/cpp/core/libclang/LibClang.cpp \
+      --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \
+      --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so
 
-    preConfigure = ''
-       mkdir dependencies/dictionaries
-       for dict in ${builtins.concatStringsSep " " dictionaries}; do
-         for i in "$dict/share/hunspell/"*; do
-           ln -s $i dependencies/dictionaries/
-         done
+    substituteInPlace src/cpp/session/CMakeLists.txt \
+      --replace-fail '@pandoc@' ${pandoc} \
+      --replace-fail '@quarto@' ${quarto}
+
+    substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
+      --replace-fail '@pandoc@' ${pandoc}/bin \
+      --replace-fail '@quarto@' ${quarto}
+  '';
+
+  preConfigure = ''
+     mkdir dependencies/dictionaries
+     for dict in ${builtins.concatStringsSep " " dictionaries}; do
+       for i in "$dict/share/hunspell/"*; do
+         ln -s $i dependencies/dictionaries/
        done
+     done
 
-       unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
+     unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
 
-      # As of Chocolate Cosmos, node 18.20.3 is used for runtime
-      # 18.18.2 is still used for build
-      # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
-      mkdir -p dependencies/common/node/18.20.3
+    # As of Chocolate Cosmos, node 18.20.3 is used for runtime
+    # 18.18.2 is still used for build
+    # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
+    mkdir -p dependencies/common/node/18.20.3
 
-       mkdir -p dependencies/pandoc/${pandoc.version}
-       cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
+     mkdir -p dependencies/pandoc/${pandoc.version}
+     cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
 
-       cp -r ${rsconnectSrc} dependencies/rsconnect
-       ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
-    '';
+     cp -r ${rsconnectSrc} dependencies/rsconnect
+     ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
+  '';
 
-    postInstall = ''
-      mkdir -p $out/bin $out/share
+  postInstall = ''
+    mkdir -p $out/bin $out/share
 
-      ${lib.optionalString (!server) ''
-        mkdir -p $out/share/icons/hicolor/48x48/apps
-        ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
-      ''}
+    ${lib.optionalString (!server) ''
+      mkdir -p $out/share/icons/hicolor/48x48/apps
+      ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
+    ''}
 
-      for f in {${
-        if server then
-          "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
-        else
-          "diagnostics,rpostback,rstudio"
-      }}; do
-        ln -s $out/lib/rstudio/bin/$f $out/bin
-      done
+    for f in {${
+      if server then
+        "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
+      else
+        "diagnostics,rpostback,rstudio"
+    }}; do
+      ln -s $out/lib/rstudio/bin/$f $out/bin
+    done
 
-      for f in .gitignore .Rbuildignore LICENSE README; do
-        find . -name $f -delete
-      done
+    for f in .gitignore .Rbuildignore LICENSE README; do
+      find . -name $f -delete
+    done
 
-      rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
-    '';
+    rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
+  '';
 
-    meta = {
-      broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-      inherit description;
-      homepage = "https://www.rstudio.com/";
-      license = lib.licenses.agpl3Only;
-      maintainers = with lib.maintainers; [
-        ciil
-        cfhammill
+  qtWrapperArgs = lib.optionals (!server) [
+    "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
+  ];
+
+  passthru = {
+    inherit server;
+    tests = {
+      inherit (nixosTests) rstudio-server;
+    };
+  };
+
+  meta = {
+    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
+    description = "Set of integrated tools for the R language";
+    homepage = "https://www.rstudio.com/";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      ciil
+      cfhammill
+    ];
+    mainProgram = "rstudio" + lib.optionalString server "-server";
+    platforms = lib.platforms.linux;
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "RStudio";
+      exec = "rstudio %F";
+      icon = "rstudio";
+      desktopName = "RStudio";
+      genericName = "IDE";
+      comment = meta.description;
+      categories = [ "Development" ];
+      mimeTypes = [
+        "text/x-r-source"
+        "text/x-r"
+        "text/x-R"
+        "text/x-r-doc"
+        "text/x-r-sweave"
+        "text/x-r-markdown"
+        "text/x-r-html"
+        "text/x-r-presentation"
+        "application/x-r-data"
+        "application/x-r-project"
+        "text/x-r-history"
+        "text/x-r-profile"
+        "text/x-tex"
+        "text/x-markdown"
+        "text/html"
+        "text/css"
+        "text/javascript"
+        "text/x-chdr"
+        "text/x-csrc"
+        "text/x-c++hdr"
+        "text/x-c++src"
       ];
-      mainProgram = "rstudio" + lib.optionalString server "-server";
-      platforms = lib.platforms.linux;
-    };
-
-    passthru = {
-      inherit server;
-      tests = {
-        inherit (nixosTests) rstudio-server;
-      };
-    };
-  }
-  // lib.optionalAttrs (!server) {
-    qtWrapperArgs = [
-      "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
-    ];
-
-    desktopItems = [
-      (makeDesktopItem {
-        name = pname;
-        exec = "rstudio %F";
-        icon = "rstudio";
-        desktopName = "RStudio";
-        genericName = "IDE";
-        comment = description;
-        categories = [ "Development" ];
-        mimeTypes = [
-          "text/x-r-source"
-          "text/x-r"
-          "text/x-R"
-          "text/x-r-doc"
-          "text/x-r-sweave"
-          "text/x-r-markdown"
-          "text/x-r-html"
-          "text/x-r-presentation"
-          "application/x-r-data"
-          "application/x-r-project"
-          "text/x-r-history"
-          "text/x-r-profile"
-          "text/x-tex"
-          "text/x-markdown"
-          "text/html"
-          "text/css"
-          "text/javascript"
-          "text/x-chdr"
-          "text/x-csrc"
-          "text/x-c++hdr"
-          "text/x-c++src"
-        ];
-      })
-    ];
-  }
-)
+    })
+  ];
+}

From e8cc15f2b53ac8c572d785a49479ab6b678b6d10 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 8 Dec 2024 15:45:51 +0100
Subject: [PATCH 0725/1504] rstudio: refactor patches and deps, use lib.cmake*

---
 .../editors/rstudio/clang-location.patch      |  52 ++---
 pkgs/applications/editors/rstudio/default.nix | 204 +++++++-----------
 .../dont-assume-pandoc-in-quarto.patch        |  48 +++++
 .../editors/rstudio/dont-yarn-install.patch   |  16 ++
 .../editors/rstudio/pandoc-nix-path.patch     |  18 --
 .../editors/rstudio/use-system-node.patch     |  81 -------
 .../editors/rstudio/use-system-quarto.patch   |  46 ----
 7 files changed, 157 insertions(+), 308 deletions(-)
 create mode 100644 pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch
 create mode 100644 pkgs/applications/editors/rstudio/dont-yarn-install.patch
 delete mode 100644 pkgs/applications/editors/rstudio/pandoc-nix-path.patch
 delete mode 100644 pkgs/applications/editors/rstudio/use-system-node.patch
 delete mode 100644 pkgs/applications/editors/rstudio/use-system-quarto.patch

diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/pkgs/applications/editors/rstudio/clang-location.patch
index ea82678d1181..45e5e90cd3d6 100644
--- a/pkgs/applications/editors/rstudio/clang-location.patch
+++ b/pkgs/applications/editors/rstudio/clang-location.patch
@@ -1,38 +1,23 @@
+diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp
+index f166a43b37..d8024b2ce7 100644
 --- a/src/cpp/core/libclang/LibClang.cpp
 +++ b/src/cpp/core/libclang/LibClang.cpp
-@@ -62,7 +62,7 @@
- 
-    // we need to add in the associated libclang headers as
-    // they are not discovered / used by default during compilation
--   FilePath llvmPath = s_libraryPath.getParent().getParent();
-+   FilePath llvmPath("@libclang@");
-    boost::format fmt("%1%/lib/clang/%2%/include");
-    fmt % llvmPath.getAbsolutePath() % version.asString();
-    std::string includePath = fmt.str();
-@@ -74,47 +74,7 @@
- 
- std::vector<std::string> systemClangVersions()
- {
--   std::vector<std::string> clangVersions;
--   
--#if defined(__APPLE__)
--   // NOTE: the version of libclang.dylib bundled with Xcode
--   // doesn't seem to work well when loaded as a library
--   // (there seems to be extra orchestration required to get
--   // include paths set up; easier to just depend on command
--   // line tools since we request their installation in other
--   // contexts as well)
--   clangVersions = {
+@@ -84,34 +84,13 @@ std::vector<std::string> systemClangVersions()
+    // line tools since we request their installation in other
+    // contexts as well)
+    clangVersions = {
 -      "/Library/Developer/CommandLineTools/usr/lib/libclang.dylib"
--   };
--#elif defined(__unix__)
--   // default set of versions
--   clangVersions = {
++      "@libclang@/lib/libclang.dylib"
+    };
+ #elif defined(__unix__)
+    // default set of versions
+    clangVersions = {
 -      "/usr/lib/libclang.so",
 -      "/usr/lib/llvm/libclang.so",
 -      "/usr/lib64/libclang.so",
 -      "/usr/lib64/llvm/libclang.so",
--   };
++      "@libclang@/lib/libclang.so",
+    };
 -   
 -   // iterate through the set of available 'llvm' directories
 -   for (const char* prefix : {"/usr/lib", "/usr/lib64"})
@@ -51,11 +36,6 @@
 -         if (path.getFilename().find("llvm") == 0)
 -            clangVersions.push_back(path.completePath("lib/libclang.so.1").getAbsolutePath());
 -   }
--#endif
--   
--   return clangVersions;
-+    return std::vector<std::string> { "@libclang.so@" };
- }
- 
- 
-
+ #endif
+    
+    return clangVersions;
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 659793a48512..867742d3b785 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,10 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchzip,
   fetchFromGitHub,
-  makeDesktopItem,
-  copyDesktopItems,
+  replaceVars,
   cmake,
   boost183,
   zlib,
@@ -14,7 +13,6 @@
   quarto,
   libuuid,
   hunspellDicts,
-  unzip,
   ant,
   jdk,
   gnumake,
@@ -22,25 +20,20 @@
   llvmPackages,
   yaml-cpp,
   soci,
-  postgresql,
-  nodejs,
-  server ? false, # build server version
   sqlite,
+  nodejs,
+  yarn,
+  yarnConfigHook,
+  fetchYarnDeps,
+  server ? false, # build server version
   pam,
   nixosTests,
 }:
 
 let
-  mathJaxSrc = fetchurl {
+  mathJaxSrc = fetchzip {
     url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
-    hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY=";
-  };
-
-  rsconnectSrc = fetchFromGitHub {
-    owner = "rstudio";
-    repo = "rsconnect";
-    rev = "v1.2.2";
-    hash = "sha256-wvM9Bm7Nb6yU9z0o+uF5lB2kdgjOW5wZSk6y48NPF2U=";
+    hash = "sha256-J7SZK/9q3HcXTD7WFHxvh++ttuCd89Vc4SEBrUEU0AI=";
   };
 
   # Ideally, rev should match the rstudio release name.
@@ -73,21 +66,20 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rstudio";
     repo = "rstudio";
-    rev = "v" + version;
+    rev = "refs/tags/v${version}";
     hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw=";
   };
 
   nativeBuildInputs =
     [
       cmake
-      unzip
       ant
       jdk
-      pandoc
       nodejs
+      yarn
+      yarnConfigHook
     ]
     ++ lib.optionals (!server) [
-      copyDesktopItems
       libsForQt5.wrapQtAppsHook
     ];
 
@@ -100,13 +92,9 @@ stdenv.mkDerivation rec {
       libuuid
       yaml-cpp
       soci
-      postgresql
-      quarto
-    ]
-    ++ lib.optionals server [
       sqlite.dev
-      pam
     ]
+    ++ lib.optionals server [ pam ]
     ++ lib.optionals (!server) [
       libsForQt5.qtbase
       libsForQt5.qtxmlpatterns
@@ -117,97 +105,94 @@ stdenv.mkDerivation rec {
 
   cmakeFlags =
     [
-      "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
-      "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
-      "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
-      "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
-      "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
-      "-DQUARTO_ENABLED=TRUE"
-      "-DPANDOC_VERSION=${pandoc.version}"
-      "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
+      (lib.cmakeFeature "RSTUDIO_TARGET" (if server then "Server" else "Desktop"))
+      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_SOCI" true)
+      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_BOOST" true)
+      (lib.cmakeBool "RSTUDIO_USE_SYSTEM_YAML_CPP" true)
+      (lib.cmakeBool "RSTUDIO_DISABLE_CHECK_FOR_UPDATES" true)
+      (lib.cmakeBool "QUARTO_ENABLED" true)
+      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib/rstudio")
     ]
     ++ lib.optionals (!server) [
-      "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
+      (lib.cmakeFeature "QT_QMAKE_EXECUTABLE" "${libsForQt5.qmake}/bin/qmake")
+      (lib.cmakeBool "RSTUDIO_INSTALL_FREEDESKTOP" true)
     ];
 
-  # Hack RStudio to only use the input R and provided libclang.
   patches = [
-    ./r-location.patch
-    ./clang-location.patch
-    ./use-system-node.patch
+    # Hack RStudio to only use the input R and provided libclang.
+    (replaceVars ./r-location.patch {
+      R = lib.getBin R;
+    })
+    (replaceVars ./clang-location.patch {
+      libclang = lib.getLib llvmPackages.libclang;
+    })
+
     ./fix-resources-path.patch
-    ./pandoc-nix-path.patch
-    ./use-system-quarto.patch
     ./ignore-etc-os-release.patch
+    ./dont-yarn-install.patch
+    ./dont-assume-pandoc-in-quarto.patch
   ];
 
   postPatch = ''
-    substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R}
+    # fix .desktop Exec field
+    substituteInPlace src/node/desktop/resources/freedesktop/rstudio.desktop.in \
+      --replace-fail "''${CMAKE_INSTALL_PREFIX}/rstudio" "rstudio"
 
-    substituteInPlace src/gwt/build.xml \
-      --replace-fail '@node@' ${nodejs} \
-      --replace-fail './lib/quarto' ${quartoSrc}
-
-    substituteInPlace src/cpp/conf/rsession-dev.conf \
-      --replace-fail '@node@' ${nodejs}
-
-    substituteInPlace src/cpp/core/libclang/LibClang.cpp \
-      --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \
-      --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so
-
-    substituteInPlace src/cpp/session/CMakeLists.txt \
-      --replace-fail '@pandoc@' ${pandoc} \
-      --replace-fail '@quarto@' ${quarto}
-
-    substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
-      --replace-fail '@pandoc@' ${pandoc}/bin \
-      --replace-fail '@quarto@' ${quarto}
+    # set install path of freedesktop files
+    substituteInPlace src/{cpp,node}/desktop/CMakeLists.txt \
+      --replace-fail "/usr/share" "$out/share"
   '';
 
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = quartoSrc + "/yarn.lock";
+    hash = "sha256-Qw8O1Jzl2EO0DEF3Jrw/cIT9t22zs3jyKgDA5XZbuGA=";
+  };
+
+  dontYarnInstallDeps = true; # will call manually in preConfigure
+
   preConfigure = ''
-     mkdir dependencies/dictionaries
-     for dict in ${builtins.concatStringsSep " " dictionaries}; do
-       for i in "$dict/share/hunspell/"*; do
-         ln -s $i dependencies/dictionaries/
-       done
-     done
+    # set up node_modules directory inside quarto so that panmirror can be built
+    mkdir src/gwt/lib/quarto
+    cp -r --no-preserve=all ${quartoSrc}/* src/gwt/lib/quarto
+    pushd src/gwt/lib/quarto
+    yarnConfigHook
+    popd
 
-     unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
+    ### set up dependencies that will be copied into the result
+    # note: only the directory names have to match upstream, the actual versions don't
+    # note: symlinks are preserved
 
-    # As of Chocolate Cosmos, node 18.20.3 is used for runtime
-    # 18.18.2 is still used for build
-    # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
-    mkdir -p dependencies/common/node/18.20.3
+    mkdir dependencies/dictionaries
+    for dict in ${builtins.concatStringsSep " " dictionaries}; do
+      for i in "$dict/share/hunspell/"*; do
+        ln -s $i dependencies/dictionaries/
+      done
+    done
 
-     mkdir -p dependencies/pandoc/${pandoc.version}
-     cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
+    ln -s ${quarto} dependencies/quarto
 
-     cp -r ${rsconnectSrc} dependencies/rsconnect
-     ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
+    # version in dependencies/common/install-mathjax
+    ln -s ${mathJaxSrc} dependencies/mathjax-27
+
+    # version in CMakeGlobals.txt (PANDOC_VERSION)
+    mkdir -p dependencies/pandoc/2.18
+    ln -s ${lib.getBin pandoc}/bin/* dependencies/pandoc/2.18
+
+    # version in CMakeGlobals.txt (RSTUDIO_INSTALLED_NODE_VERSION)
+    mkdir -p dependencies/common/node
+    ln -s ${nodejs} dependencies/common/node/18.20.3
   '';
 
   postInstall = ''
-    mkdir -p $out/bin $out/share
+    mkdir -p $out/bin
 
-    ${lib.optionalString (!server) ''
-      mkdir -p $out/share/icons/hicolor/48x48/apps
-      ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
+    ${lib.optionalString server ''
+      ln -s $out/lib/rstudio/bin/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin
     ''}
 
-    for f in {${
-      if server then
-        "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
-      else
-        "diagnostics,rpostback,rstudio"
-    }}; do
-      ln -s $out/lib/rstudio/bin/$f $out/bin
-    done
-
-    for f in .gitignore .Rbuildignore LICENSE README; do
-      find . -name $f -delete
-    done
-
-    rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
+    ${lib.optionalString (!server) ''
+      ln -s $out/lib/rstudio/bin/{diagnostics,rpostback,rstudio} $out/bin
+    ''}
   '';
 
   qtWrapperArgs = lib.optionals (!server) [
@@ -233,39 +218,4 @@ stdenv.mkDerivation rec {
     mainProgram = "rstudio" + lib.optionalString server "-server";
     platforms = lib.platforms.linux;
   };
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "RStudio";
-      exec = "rstudio %F";
-      icon = "rstudio";
-      desktopName = "RStudio";
-      genericName = "IDE";
-      comment = meta.description;
-      categories = [ "Development" ];
-      mimeTypes = [
-        "text/x-r-source"
-        "text/x-r"
-        "text/x-R"
-        "text/x-r-doc"
-        "text/x-r-sweave"
-        "text/x-r-markdown"
-        "text/x-r-html"
-        "text/x-r-presentation"
-        "application/x-r-data"
-        "application/x-r-project"
-        "text/x-r-history"
-        "text/x-r-profile"
-        "text/x-tex"
-        "text/x-markdown"
-        "text/html"
-        "text/css"
-        "text/javascript"
-        "text/x-chdr"
-        "text/x-csrc"
-        "text/x-c++hdr"
-        "text/x-c++src"
-      ];
-    })
-  ];
 }
diff --git a/pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch b/pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch
new file mode 100644
index 000000000000..b86ec4079da2
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/dont-assume-pandoc-in-quarto.patch
@@ -0,0 +1,48 @@
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 0202e84..596b9f8 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -59,11 +59,7 @@ endif()
+ 
+ 
+ # install pandoc
+-# - by default, we use quarto + quarto's bundled pandoc
+-# - if quarto is not enabled, use pandoc fallback
+-if(QUARTO_ENABLED)
+-   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools")
+-elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
++if(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
+    set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
+ else()
+    set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}")
+@@ -733,11 +729,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
+                PATTERN ".gitignore"
+                EXCLUDE)
+       endif()
+-   else()
+-      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
+-              DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
+-              USE_SOURCE_PERMISSIONS)
+    endif()
++   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
++           DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
++           USE_SOURCE_PERMISSIONS)
+ 
+    # install embedded packages
+    foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+diff --git a/src/cpp/session/include/session/SessionConstants.hpp b/src/cpp/session/include/session/SessionConstants.hpp
+index e6aef22..57491ec 100644
+--- a/src/cpp/session/include/session/SessionConstants.hpp
++++ b/src/cpp/session/include/session/SessionConstants.hpp
+@@ -147,11 +147,7 @@
+ #define kSessionTmpDirEnvVar       "RS_SESSION_TMP_DIR"
+ #define kSessionTmpDir             "rstudio-rsession"
+ 
+-#ifdef QUARTO_ENABLED
+-# define kDefaultPandocPath        "bin/quarto/bin/tools"
+-#else
+ # define kDefaultPandocPath        "bin/pandoc"
+-#endif
+ 
+ #define kDefaultNodePath           "bin/node"
+ #define kDefaultQuartoPath         "bin/quarto"
diff --git a/pkgs/applications/editors/rstudio/dont-yarn-install.patch b/pkgs/applications/editors/rstudio/dont-yarn-install.patch
new file mode 100644
index 000000000000..72a5e1c9050b
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/dont-yarn-install.patch
@@ -0,0 +1,16 @@
+diff --git a/src/gwt/build.xml b/src/gwt/build.xml
+index 27ffe33..4218678 100644
+--- a/src/gwt/build.xml
++++ b/src/gwt/build.xml
+@@ -139,11 +139,6 @@
+       <echo message="panmirror minify: ${panmirror.minify}"/>
+ 
+       <mkdir dir="${panmirror.build.dir}"/>
+-      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
+-         <arg value="install"/>
+-         <arg value="--network-timeout"/>
+-         <arg value="240000"/>
+-      </exec>
+       <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
+          <arg value="build"/>
+          <arg value="--minify"/>
diff --git a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/pkgs/applications/editors/rstudio/pandoc-nix-path.patch
deleted file mode 100644
index 2782a5a0d7a2..000000000000
--- a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/cpp/session/include/session/SessionConstants.hpp
-+++ b/src/cpp/session/include/session/SessionConstants.hpp
-@@ -142,13 +142,13 @@
- #define kSessionTmpDir             "rstudio-rsession"
- 
- #ifdef QUARTO_ENABLED
--# define kDefaultPandocPath        "bin/quarto/bin/tools"
-+# define kDefaultPandocPath        "@pandoc@"
- #else
- # define kDefaultPandocPath        "bin/pandoc"
- #endif
- 
- #define kDefaultNodePath           "bin/node"
--#define kDefaultQuartoPath         "bin/quarto"
-+#define kDefaultQuartoPath         "@quarto@"
- #define kDefaultRsclangPath        "bin/rsclang"
- 
- #ifdef _WIN32
diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch
deleted file mode 100644
index 5e8b2170da10..000000000000
--- a/pkgs/applications/editors/rstudio/use-system-node.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf
-index d18362b..98cdd4c 100644
---- a/src/cpp/conf/rsession-dev.conf
-+++ b/src/cpp/conf/rsession-dev.conf
-@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}
- external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR}
- external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR}
- external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang
--external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/18.18.2/bin/node
-+external-node-path=@node@/bin/node
- 
- # enable copilot
- copilot-enabled=1
-diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index 033d605..f1ee63d 100644
---- a/src/gwt/build.xml
-+++ b/src/gwt/build.xml
-@@ -87,29 +87,7 @@
-    <!-- ensure version matches RSTUDIO_NODE_VERSION -->
-    <property name="node.version" value="18.18.2"/>
-    <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
--   <!-- use yarn from system but will prefer yarn from dependencies if available -->
--   <condition property="yarn.bin" value="yarn">
--     <not>
--        <os family="windows" />
--     </not>
--   </condition>
--   <available
--      property="yarn.bin"
--      value="${node.dir}/bin/yarn"
--      file="${node.dir}/bin/yarn"/>
--   <condition property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd">
--     <os family="windows" />
--   </condition>
--   <!-- use yarn from /opt/rstudio-tools if installed (typical for Docker) -->
--   <available
--      property="yarn.bin"
--      value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"
--      file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/>
--   <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
--   <available
--      property="yarn.bin"
--      value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"
--      file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/>
-+   <property name="node.bin" value="@node@/bin/node"/>
-
-    <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
-    <property name="panmirror.build.dir" value="./www/js/panmirror"/>
-@@ -133,28 +111,11 @@
-             <isset property="panmirror.minify" />
-          </not>
-       </condition>
--
--      <echo message="yarn location: ${yarn.bin}"/>
--      <echo message="panmirror location: ${panmirror.dir}"/>
--      <echo message="panmirror minify: ${panmirror.minify}"/>
--
-       <mkdir dir="${panmirror.build.dir}"/>
--      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
--         <arg value="install"/>
--         <arg value="--network-timeout"/>
--         <arg value="240000"/>
--      </exec>
--      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
--         <arg value="build"/>
--         <arg value="--minify"/>
--         <arg value="${panmirror.minify}"/>
--         <arg value="--sourcemap"/>
--         <arg value="true"/>
--         <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/>
-+     <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}">
-+          <arg value="fuse"/>
-+          <arg value="${panmirror.target}"/>
-       </exec>
--      <copy todir="${panmirror.build.dir}">
--         <fileset dir="${panmirror.dir}/dist-rstudio"/>
--      </copy>
-    </target>
-
-    <target name="javac" description="Compile java source">
-    
diff --git a/pkgs/applications/editors/rstudio/use-system-quarto.patch b/pkgs/applications/editors/rstudio/use-system-quarto.patch
deleted file mode 100644
index 89653219dbea..000000000000
--- a/pkgs/applications/editors/rstudio/use-system-quarto.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/cpp/session/CMakeLists.txt
-+++ b/src/cpp/session/CMakeLists.txt
-@@ -36,18 +36,14 @@
-    else()
-       set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries")
-    endif()
--   
-+
-    if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27")
-       set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27")
-    else()
-       set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
-    endif()
- 
--   if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto")
--      set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto")
--   else()
--      set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto")
--   endif()
-+   set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@")
- 
- endif()
- 
-@@ -56,7 +52,7 @@
- # - by default, we use quarto + quarto's bundled pandoc
- # - if quarto is not enabled, use pandoc fallback
- if(QUARTO_ENABLED)
--   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools")
-+   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin")
- elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
-    set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
- else()
-@@ -66,11 +62,9 @@
- 
- # validate our dependencies exist
- foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
--            RSTUDIO_DEPENDENCIES_MATHJAX_DIR
--            RSTUDIO_DEPENDENCIES_PANDOC_DIR
--            RSTUDIO_DEPENDENCIES_QUARTO_DIR)
-+            RSTUDIO_DEPENDENCIES_MATHJAX_DIR)
-+
- 
-- 
-    # skip quarto if not enabled
-    if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
-       continue()

From 3ce431ad7af33578901f4013f56d85e293b6dcfa Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 18 Dec 2024 23:56:21 +0100
Subject: [PATCH 0726/1504] rstudioWrapper: only symlink share directory if not
 server

---
 pkgs/development/r-modules/wrapper-rstudio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index 8088098484f8..3c85657141d1 100644
--- a/pkgs/development/r-modules/wrapper-rstudio.nix
+++ b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -37,8 +37,7 @@ runCommand (rstudio.name + "-wrapper")
   }
   (
     ''
-      mkdir -p $out/bin
-      ln -s ${rstudio}/share $out
+      mkdir -p $out
       echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
       echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR
       echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR
@@ -56,6 +55,7 @@ runCommand (rstudio.name + "-wrapper")
         ''
       else
         ''
+          ln -s ${rstudio}/share $out
           makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \
             --set R_PROFILE_USER $out/$fixLibsR
         ''

From c7ccfc5f9ff3904c22c905c7bc0ef46fc03faa7e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Dec 2024 21:58:00 +0100
Subject: [PATCH 0727/1504] nixos/nextcloud: drop default for `dbtype` setting

Closes #355606

To quote the system requirements[1]:

> Database: SQLite 3.16+ (only recommended for testing and minimal-instances)

As discussed[2], this would already fail at eval-time for everyone and
makes all sqlite users aware that this is probably not the best choice.
Doing that regardless, is now an explicit decision.

[1] https://docs.nextcloud.com/server/30/admin_manual/installation/system_requirements.html
[2] https://github.com/NixOS/nixpkgs/pull/369242#discussion_r1899706512
---
 nixos/doc/manual/release-notes/rl-2505.section.md | 5 +++++
 nixos/modules/services/web-apps/nextcloud.nix     | 1 -
 nixos/tests/nextcloud/basic.nix                   | 1 +
 nixos/tests/nextcloud/with-objectstore.nix        | 2 ++
 4 files changed, 8 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 f974d5836b17..1b1d58e01358 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -111,6 +111,11 @@
 
 - `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI
 
+- [](#opt-services.nextcloud.config.dbtype) is unset by default, the previous default was `sqlite`.
+  This was done because `sqlite` is not a reasonable default since it's
+  [not recommended by upstream](https://docs.nextcloud.com/server/30/admin_manual/installation/system_requirements.html)
+  and thus doesn't qualify as default.
+
 - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:
   ```diff
   -services.asusd.asusdConfig = '''file contents'''
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index eae005bca545..595244d8de9c 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -416,7 +416,6 @@ in {
     config = {
       dbtype = mkOption {
         type = types.enum [ "sqlite" "pgsql" "mysql" ];
-        default = "sqlite";
         description = "Database type.";
       };
       dbname = mkOption {
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index f8306503d85f..217f22714c1c 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -59,6 +59,7 @@ runTest (
 
           services.nextcloud = {
             enable = true;
+            config.dbtype = "sqlite";
             datadir = "/var/lib/nextcloud-data";
             autoUpdateApps = {
               enable = true;
diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix
index 48e1edea67ba..5f24fc48851c 100644
--- a/nixos/tests/nextcloud/with-objectstore.nix
+++ b/nixos/tests/nextcloud/with-objectstore.nix
@@ -36,6 +36,8 @@ runTest (
           networking.firewall.allowedTCPPorts = [ 9000 ];
           environment.systemPackages = [ pkgs.minio-client ];
 
+          services.nextcloud.config.dbtype = "sqlite";
+
           services.nextcloud.config.objectstore.s3 = {
             enable = true;
             bucket = "nextcloud";

From 70ad61967afdc6e565b27ad86e0903f2153dc2f2 Mon Sep 17 00:00:00 2001
From: DamiDoug <75175586+damidoug@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:05:32 +0100
Subject: [PATCH 0728/1504] maintainers: add damidoug

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 73c6ad194cb5..1e95ef7e8522 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4911,6 +4911,12 @@
     github = "damhiya";
     githubId = 13533446;
   };
+  damidoug = {
+    email = "contact@damidoug.dev";
+    github = "damidoug";
+    githubId = 75175586;
+    name = "Douglas Damiano";
+  };
   DamienCassou = {
     email = "damien@cassou.me";
     github = "DamienCassou";

From 58d41c40081a918db2f6dbef535fd9c69eb337cd Mon Sep 17 00:00:00 2001
From: DamiDoug <75175586+damidoug@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:34:57 +0100
Subject: [PATCH 0729/1504] =?UTF-8?q?spotube:=203.8.3=20=E2=86=92=203.9.0?=
 =?UTF-8?q?=20|=20add=20aarch64-linux=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/sp/spotube/package.nix | 60 +++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix
index 3a06aab24701..d181f0f06a0f 100644
--- a/pkgs/by-name/sp/spotube/package.nix
+++ b/pkgs/by-name/sp/spotube/package.nix
@@ -22,7 +22,7 @@
 
 let
   pname = "spotube";
-  version = "3.8.3";
+  version = "3.9.0";
 
   meta = {
     description = "Open source, cross-platform Spotify client compatible across multiple platforms";
@@ -40,24 +40,50 @@ let
       "x86_64-linux"
       "x86_64-darwin"
       "aarch64-darwin"
+      "aarch64-linux"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 
-  fetchArtifact =
-    { filename, hash }:
-    fetchurl {
-      url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}";
-      inherit hash;
+  sources =
+    let
+      fetchArtifact =
+        { filename, hash }:
+        fetchurl {
+          url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}";
+          inherit hash;
+        };
+    in
+    {
+      "aarch64-linux" = fetchArtifact {
+        filename = "Spotube-linux-aarch64.deb";
+        hash = "sha256-KBuUAgUU6c/rBkkbpYjSarzckIoi+gRtCkumvtaoras=";
+      };
+      "x86_64-linux" = fetchArtifact {
+        filename = "Spotube-linux-x86_64.deb";
+        hash = "sha256-vzzK3csyKYP6fKKIoysziBsc2tqrg5LXS/6KoXBtNVI=";
+      };
+      "x86_64-darwin" = fetchArtifact {
+        filename = "Spotube-macos-universal.dmg";
+        hash = "sha256-wwIIKY+bmMJZigc2AK/QMg142uvZ+D6LOddzedJM5f8=";
+      };
+      "aarch64-darwin" = fetchArtifact {
+        filename = "Spotube-macos-universal.dmg";
+        hash = "sha256-wwIIKY+bmMJZigc2AK/QMg142uvZ+D6LOddzedJM5f8=";
+      };
     };
 
+  src = sources.${stdenv.hostPlatform.system};
+
   darwin = stdenv.mkDerivation {
-    inherit pname version meta;
+    inherit
+      pname
+      version
+      meta
+      src
+      ;
 
-    src = fetchArtifact {
-      filename = "Spotube-macos-universal.dmg";
-      hash = "sha256-N1H/Vy5QQi8zAqiqAi5aTnUQcKC/EgL3GUhEfnCkaAQ=";
-    };
+    passthru = { inherit sources; };
 
     sourceRoot = ".";
 
@@ -76,12 +102,14 @@ let
   };
 
   linux = stdenv.mkDerivation {
-    inherit pname version meta;
+    inherit
+      pname
+      version
+      meta
+      src
+      ;
 
-    src = fetchArtifact {
-      filename = "Spotube-linux-x86_64.deb";
-      hash = "sha256-x75ie9FXunClMT+YZVFlvl2VSDl933QYMRpEYjJ8YhY=";
-    };
+    passthru = { inherit sources; };
 
     nativeBuildInputs = [
       autoPatchelfHook

From 6978b4b5bdeac0ae6415fe80e3f83621510e6cde Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Dec 2024 22:56:09 +0100
Subject: [PATCH 0730/1504] nixos/nextcloud: increase pool settings

Also link to upstream docs about PHP-FPM tuning[1].
These seem a little more reasonable performance-wise, but are still
conservative enough for small setups.

[1] https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm
---
 nixos/doc/manual/release-notes/rl-2505.section.md |  4 ++++
 nixos/modules/services/web-apps/nextcloud.nix     | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 1b1d58e01358..529ea9cbef8c 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -116,6 +116,10 @@
   [not recommended by upstream](https://docs.nextcloud.com/server/30/admin_manual/installation/system_requirements.html)
   and thus doesn't qualify as default.
 
+- Nextcloud's default FPM pool settings have been increased according to upstream recommentations. It's advised
+  to review the new defaults and description of
+  [](#opt-services.nextcloud.poolSettings).
+
 - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:
   ```diff
   -services.asusd.asusdConfig = '''file contents'''
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 595244d8de9c..64c17aa44b4a 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -374,14 +374,18 @@ in {
       type = with types; attrsOf (oneOf [ str int bool ]);
       default = {
         "pm" = "dynamic";
-        "pm.max_children" = "32";
-        "pm.start_servers" = "2";
-        "pm.min_spare_servers" = "2";
-        "pm.max_spare_servers" = "4";
+        "pm.max_children" = "120";
+        "pm.start_servers" = "12";
+        "pm.min_spare_servers" = "6";
+        "pm.max_spare_servers" = "18";
         "pm.max_requests" = "500";
       };
       description = ''
-        Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives.
+        Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on
+        configuration directives. The above are recommended for a server with 4GiB of RAM.
+
+        It's advisable to read the [section about PHPFPM tuning in the upstream manual](https://docs.nextcloud.com/server/30/admin_manual/installation/server_tuning.html#tune-php-fpm)
+        and consider customizing the values.
       '';
     };
 

From b95a9171dd50a87a2a8b789ca812a545d2d8158b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 30 Dec 2024 23:54:35 +0100
Subject: [PATCH 0731/1504] nixos/nextcloud: don't use pg14 for tests

This currently fails to build, so we just update it now to make sure all
tests are green with the current changes.
---
 nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
index 6b0dd71f85ef..74343a22b7ae 100644
--- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
+++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
@@ -69,14 +69,13 @@ runTest (
 
           services.postgresql = {
             enable = true;
-            package = pkgs.postgresql_14;
           };
           systemd.services.postgresql.postStart = pkgs.lib.mkAfter ''
             password=$(cat ${config.services.nextcloud.config.dbpassFile})
             ${config.services.postgresql.package}/bin/psql <<EOF
               CREATE ROLE ${adminuser} WITH LOGIN PASSWORD '$password' CREATEDB;
               CREATE DATABASE nextcloud;
-              GRANT ALL PRIVILEGES ON DATABASE nextcloud TO ${adminuser};
+              ALTER DATABASE nextcloud OWNER to ${adminuser};
             EOF
           '';
 

From 2dcf60e6a55a81fca0c3021b908ed7c96e580129 Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Mon, 30 Dec 2024 23:21:10 +0000
Subject: [PATCH 0732/1504] sby: 0.47 -> 0.48

Its tag naming was changed the same as Yosys, so r-ryantm couldn't
update it either.

This also gets sby working with Yosys 0.48; I didn't notice it being
broken in #368946 because I only ran `nixpkgs-review` on macOS where sby
doesn't build due to broken dependencies anyway. Sorry!
---
 pkgs/by-name/sb/sby/package.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index ca9687a2e70d..8cd9215be74d 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.47";
+  version = "0.48";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
-    rev = "yosys-${version}";
-    hash = "sha256-Il2pXw2doaoZrVme2p0dSUUa8dCQtJJrmYitn1MkTD4=";
+    tag = "v${version}";
+    hash = "sha256-icOlWutvajHMCi2YUIGU4v5S63YobXw4fYYUvPoSzo4=";
   };
 
   nativeBuildInputs = [ bash ];
@@ -89,12 +89,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version-regex"
-      "yosys-([0-9].*)"
-    ];
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "SymbiYosys, a front-end for Yosys-based formal verification flows";

From d40763befd8336ce89353f16876bcc016ed1f5d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 00:39:25 +0000
Subject: [PATCH 0733/1504] qctools: 1.3.1 -> 1.4

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

diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix
index 2d80efcc6487..a2a6d6658367 100644
--- a/pkgs/applications/video/qctools/default.nix
+++ b/pkgs/applications/video/qctools/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qctools";
-  version = "1.3.1";
+  version = "1.4";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/${pname}/${version}/${pname}_${version}.tar.xz";
-    hash = "sha256-ClF8KiVjV2JTCjz/ueioojhiHZf8UW9WONaJrIx4Npo=";
+    hash = "sha256-1WqCP/4PV8hQT8ubPxHGTwZrRnOPm+msEPBGR4gkWhA=";
   };
 
   sourceRoot = "${pname}/Project/QtCreator";

From 957283740fd45175d3196de1e9ece123c18dd6bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 00:39:26 +0000
Subject: [PATCH 0734/1504] dwm-status: 1.8.1 -> 1.9.0

---
 pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 5448906937f8..c7509ae6e973 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -32,13 +32,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "dwm-status";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "Gerschtli";
     repo = pname;
     rev = version;
-    sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y=";
+    sha256 = "sha256-OFwI4evwbXLO4ufjrh5SZia79bwbAKVoSm/IPCDku68=";
   };
 
   nativeBuildInputs = [
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     xorg.libX11
   ];
 
-  cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
+  cargoHash = "sha256-CNhRMJZJMMKh5L308a93YL0kJLkt6DdlmILMVPQV90Q=";
 
   postInstall = lib.optionalString (bins != [ ]) ''
     wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"

From e530fcb4c609e8b033828af171d86f68e120f358 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 00:49:48 +0000
Subject: [PATCH 0735/1504] vscode-extensions.timonwong.shellcheck: 0.37.1 ->
 0.37.3

---
 .../vscode/extensions/timonwong.shellcheck/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
index 469d04dbebb4..a37e7d54c7d2 100644
--- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "shellcheck";
     publisher = "timonwong";
-    version = "0.37.1";
-    sha256 = "sha256-JSS0GY76+C5xmkQ0PNjt2Nu/uTUkfiUqmPL51r64tl0=";
+    version = "0.37.3";
+    sha256 = "sha256-bVddcoj0zO+pWySg7JOGXqLJeJnoet3Lo/I1ctd0znk=";
   };
   nativeBuildInputs = [
     jq

From 34b5b9a5fe29553e2156dd5b39bf2d5d0dd94f85 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 30 Dec 2024 18:29:22 -0500
Subject: [PATCH 0736/1504] thunderbird: fix darwin build

Add patches for bundled libraries (rnp and libsexpp) to handle clang 19
lack of char_traits for unsigned char.
---
 ...emented-char_traits-for-SEXP-octet_t.patch | 262 ++++++++++++++++++
 ...-lookup-against-basic_string-uint8_t.patch | 100 +++++++
 .../mailreaders/thunderbird/packages.nix      |   6 +
 3 files changed, 368 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch b/pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch
new file mode 100644
index 000000000000..d2d48446b4e0
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/0001-Implemented-char_traits-for-SEXP-octet_t.patch
@@ -0,0 +1,262 @@
+From 46744a14ffc235330bb99cebfaf294829c31bba4 Mon Sep 17 00:00:00 2001
+From: "Maxim [maxirmx] Samsonov" <m.samsonov@computer.org>
+Date: Mon, 3 Jun 2024 13:39:47 +0300
+Subject: [PATCH] Implemented char_traits for SEXP octet_t
+
+---
+ comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h                    |  95 ++++++++++++++++++-
+ comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp              | 116 ++++++++++++++++++++++++
+ comm/third_party/rnp/src/libsexpp/version.txt                             |   2 +-
+ 3 files changed, 208 insertions(+), 7 deletions(-)
+ create mode 100644 tests/src/traits-tests.cpp
+
+diff --git a/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h b/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h
+index bb6ae4e..3ffb735 100644
+--- a/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h
++++ b/comm/third_party/rnp/src/libsexpp/include/sexpp/sexp.h
+@@ -44,8 +44,93 @@
+ #include "sexp-public.h"
+ #include "sexp-error.h"
+ 
++// We are implementing char traits for octet_t with trhe following restrictions
++//  -- limit visibility so that other traits for unsigned char are still possible
++//  -- create template specializatio in std workspace (use workspace specialization
++//     is not specified and causes issues at least with gcc 4.8
++
+ namespace sexp {
++using octet_t = uint8_t;
++} // namespace sexp
++
++namespace std {
++
++template <> struct char_traits<sexp::octet_t> {
++    typedef sexp::octet_t  char_type;
++    typedef int            int_type;
++    typedef std::streampos pos_type;
++    typedef std::streamoff off_type;
++    typedef mbstate_t      state_type;
++
++    static void assign(char_type &__c1, const char_type &__c2) noexcept { __c1 = __c2; }
++
++    static constexpr bool eq(const char_type &__c1, const char_type &__c2) noexcept
++    {
++        return __c1 == __c2;
++    }
++
++    static constexpr bool lt(const char_type &__c1, const char_type &__c2) noexcept
++    {
++        return __c1 < __c2;
++    }
++
++    static int compare(const char_type *__s1, const char_type *__s2, size_t __n)
++    {
++        return memcmp(__s1, __s2, __n);
++    }
++
++    static size_t length(const char_type *__s)
++    {
++        return strlen(reinterpret_cast<const char *>(__s));
++    }
++
++    static const char_type *find(const char_type *__s, size_t __n, const char_type &__a)
++    {
++        return static_cast<const char_type *>(memchr(__s, __a, __n));
++    }
++
++    static char_type *move(char_type *__s1, const char_type *__s2, size_t __n)
++    {
++        return static_cast<char_type *>(memmove(__s1, __s2, __n));
++    }
++
++    static char_type *copy(char_type *__s1, const char_type *__s2, size_t __n)
++    {
++        return static_cast<char_type *>(memcpy(__s1, __s2, __n));
++    }
++
++    static char_type *assign(char_type *__s, size_t __n, char_type __a)
++    {
++        return static_cast<char_type *>(memset(__s, __a, __n));
++    }
++
++    static constexpr char_type to_char_type(const int_type &__c) noexcept
++    {
++        return static_cast<char_type>(__c);
++    }
++
++    // To keep both the byte 0xff and the eof symbol 0xffffffff
++    // from ending up as 0xffffffff.
++    static constexpr int_type to_int_type(const char_type &__c) noexcept
++    {
++        return static_cast<int_type>(static_cast<unsigned char>(__c));
++    }
++
++    static constexpr bool eq_int_type(const int_type &__c1, const int_type &__c2) noexcept
++    {
++        return __c1 == __c2;
++    }
++
++    static constexpr int_type eof() noexcept { return static_cast<int_type>(0xFFFFFFFF); }
+ 
++    static constexpr int_type not_eof(const int_type &__c) noexcept
++    {
++        return (__c == eof()) ? 0 : __c;
++    }
++};
++} // namespace std
++
++namespace sexp {
+ /*
+  * SEXP octet_t definitions
+  * We maintain some presumable redundancy with ctype
+@@ -99,14 +184,14 @@ class sexp_input_stream_t;
+  * SEXP simple string
+  */
+ 
+-typedef uint8_t octet_t;
++using octet_traits = std::char_traits<octet_t>;
++using octet_string = std::basic_string<octet_t, octet_traits>;
+ 
+-class SEXP_PUBLIC_SYMBOL sexp_simple_string_t : public std::basic_string<octet_t>,
+-                                                private sexp_char_defs_t {
++class SEXP_PUBLIC_SYMBOL sexp_simple_string_t : public octet_string, private sexp_char_defs_t {
+   public:
+     sexp_simple_string_t(void) = default;
+-    sexp_simple_string_t(const octet_t *dt) : std::basic_string<octet_t>{dt} {}
+-    sexp_simple_string_t(const octet_t *bt, size_t ln) : std::basic_string<octet_t>{bt, ln} {}
++    sexp_simple_string_t(const octet_t *dt) : octet_string{dt} {}
++    sexp_simple_string_t(const octet_t *bt, size_t ln) : octet_string{bt, ln} {}
+     sexp_simple_string_t &append(int c)
+     {
+         (*this) += (octet_t)(c & 0xFF);
+diff --git a/comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp b/comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp
+new file mode 100644
+index 0000000..52e1019
+--- /dev/null
++++ b/comm/third_party/rnp/src/libsexpp/tests/src/traits-tests.cpp
+@@ -0,0 +1,116 @@
++/**
++ *
++ * Copyright 2024 Ribose Inc. (https://www.ribose.com)
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy of
++ * this software and associated documentation files (the "Software"), to deal in
++ * the Software without restriction, including without limitation the rights to
++ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
++ * the Software, and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all
++ * copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
++ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
++ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#include "sexp-tests.h"
++
++using namespace sexp;
++
++namespace {
++
++TEST(OctetTraitsTest, Assign)
++{
++    octet_t a = 0x12;
++    octet_t b = 0x34;
++    octet_traits::assign(a, b);
++    EXPECT_EQ(a, b);
++}
++
++TEST(OctetTraitsTest, Eq)
++{
++    octet_t a = 0x12;
++    octet_t b = 0x12;
++    EXPECT_TRUE(octet_traits::eq(a, b));
++}
++
++TEST(OctetTraitsTest, Lt)
++{
++    octet_t a = 0x12;
++    octet_t b = 0x34;
++    EXPECT_TRUE(octet_traits::lt(a, b));
++}
++
++TEST(OctetTraitsTest, Compare)
++{
++    octet_t s1[] = {0x12, 0x34, 0x56};
++    octet_t s2[] = {0x12, 0x34, 0x57};
++    EXPECT_LT(octet_traits::compare(s1, s2, 3), 0);
++}
++
++TEST(OctetTraitsTest, Find)
++{
++    octet_t s[] = {0x12, 0x34, 0x56};
++    octet_t a = 0x34;
++    EXPECT_EQ(octet_traits::find(s, 3, a), s + 1);
++}
++
++TEST(OctetTraitsTest, Move)
++{
++    octet_t s1[] = {0x12, 0x34, 0x56};
++    octet_t s2[3];
++    octet_traits::move(s2, s1, 3);
++    EXPECT_EQ(memcmp(s1, s2, 3), 0);
++}
++
++TEST(OctetTraitsTest, Copy)
++{
++    octet_t s1[] = {0x12, 0x34, 0x56};
++    octet_t s2[3];
++    octet_traits::copy(s2, s1, 3);
++    EXPECT_EQ(memcmp(s1, s2, 3), 0);
++}
++
++TEST(OctetTraitsTest, AssignMultiple)
++{
++    octet_t s[3];
++    octet_t a = 0x12;
++    octet_traits::assign(s, 3, a);
++    for (int i = 0; i < 3; i++) {
++        EXPECT_EQ(s[i], a);
++    }
++}
++
++TEST(OctetTraitsTest, ToCharType)
++{
++    octet_traits::int_type a = 0x12;
++    EXPECT_EQ(octet_traits::to_char_type(a), 0x12);
++}
++
++TEST(OctetTraitsTest, ToIntType)
++{
++    octet_t a = 0x12;
++    EXPECT_EQ(octet_traits::to_int_type(a), 0x12);
++}
++
++TEST(OctetTraitsTest, EqIntType)
++{
++    octet_traits::int_type a = 0x12;
++    octet_traits::int_type b = 0x12;
++    EXPECT_TRUE(octet_traits::eq_int_type(a, b));
++}
++
++TEST(OctetTraitsTest, NotEof)
++{
++    octet_traits::int_type a = 0x12;
++    EXPECT_EQ(octet_traits::not_eof(a), 0x12);
++}
++} // namespace
+diff --git a/comm/third_party/rnp/src/libsexpp/version.txt b/comm/third_party/rnp/src/libsexpp/version.txt
+index 1e9b46b..6201b5f 100644
+--- a/comm/third_party/rnp/src/libsexpp/version.txt
++++ b/comm/third_party/rnp/src/libsexpp/version.txt
+@@ -1 +1 @@
+-0.8.7
++0.8.8
+-- 
+2.47.0
+
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch b/pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch
new file mode 100644
index 000000000000..210accf06312
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/0001-Removed-lookup-against-basic_string-uint8_t.patch
@@ -0,0 +1,100 @@
+From 20419f739f632fb30666650544f0055e8d4f1afa Mon Sep 17 00:00:00 2001
+From: Maxim Samsonov <m.samsonov@computer.org>
+Date: Wed, 19 Jun 2024 16:52:08 +0300
+Subject: [PATCH] Removed lookup against basic_string<uint8_t>
+
+---
+ comm/third_party/rnp/src/lib/types.h                |  5 +----
+ comm/third_party/rnp/src/lib/utils.cpp              | 17 +----------------
+ comm/third_party/rnp/src/librekey/key_store_g10.cpp |  8 ++++----
+ 3 files changed, 7 insertions(+), 25 deletions(-)
+
+diff --git a/comm/third_party/rnp/src/lib/types.h b/comm/third_party/rnp/src/lib/types.h
+index f0c25d3d..a7eac3a1 100644
+--- a/comm/third_party/rnp/src/lib/types.h
++++ b/comm/third_party/rnp/src/lib/types.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017-2021, [Ribose Inc](https://www.ribose.com).
++ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com).
+  * Copyright (c) 2009 The NetBSD Foundation, Inc.
+  * All rights reserved.
+  *
+@@ -71,9 +71,6 @@ class id_str_pair {
+     static int         lookup(const id_str_pair           pair[],
+                               const std::vector<uint8_t> &bytes,
+                               int                         notfound = 0);
+-    static int         lookup(const id_str_pair                 pair[],
+-                              const std::basic_string<uint8_t> &bytes,
+-                              int                               notfound = 0);
+ };
+ 
+ /** pgp_fingerprint_t */
+diff --git a/comm/third_party/rnp/src/lib/utils.cpp b/comm/third_party/rnp/src/lib/utils.cpp
+index 3c6216c6..fd526379 100644
+--- a/comm/third_party/rnp/src/lib/utils.cpp
++++ b/comm/third_party/rnp/src/lib/utils.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2021, [Ribose Inc](https://www.ribose.com).
++ * Copyright (c) 2021, 2024 [Ribose Inc](https://www.ribose.com).
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -63,18 +63,3 @@ id_str_pair::lookup(const id_str_pair pair[], const std::vector<uint8_t> &bytes,
+     }
+     return notfound;
+ }
+-
+-int
+-id_str_pair::lookup(const id_str_pair                 pair[],
+-                    const std::basic_string<uint8_t> &bytes,
+-                    int                               notfound)
+-{
+-    while (pair && pair->str) {
+-        if ((strlen(pair->str) == bytes.size()) &&
+-            !memcmp(pair->str, bytes.data(), bytes.size())) {
+-            return pair->id;
+-        }
+-        pair++;
+-    }
+-    return notfound;
+-}
+diff --git a/comm/third_party/rnp/src/librekey/key_store_g10.cpp b/comm/third_party/rnp/src/librekey/key_store_g10.cpp
+index e646f02f..21136866 100644
+--- a/comm/third_party/rnp/src/librekey/key_store_g10.cpp
++++ b/comm/third_party/rnp/src/librekey/key_store_g10.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017-2022, [Ribose Inc](https://www.ribose.com).
++ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com).
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -311,12 +311,12 @@ read_curve(const sexp_list_t *list, const std::string &name, pgp_ec_key_t &key)
+ 
+     const auto &bytes = data->get_string();
+     pgp_curve_t curve = static_cast<pgp_curve_t>(
+-      id_str_pair::lookup(g10_curve_aliases, data->get_string(), PGP_CURVE_UNKNOWN));
++      id_str_pair::lookup(g10_curve_aliases, (const char *) bytes.data(), PGP_CURVE_UNKNOWN));
+     if (curve != PGP_CURVE_UNKNOWN) {
+         key.curve = curve;
+         return true;
+     }
+-    RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (char *) bytes.data());
++    RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (const char *) bytes.data());
+     return false;
+ }
+ 
+@@ -807,7 +807,7 @@ g23_parse_seckey(pgp_key_pkt_t &seckey,
+ 
+     auto &           alg_bt = alg_s_exp->sexp_string_at(0)->get_string();
+     pgp_pubkey_alg_t alg = static_cast<pgp_pubkey_alg_t>(
+-      id_str_pair::lookup(g10_alg_aliases, alg_bt.c_str(), PGP_PKA_NOTHING));
++      id_str_pair::lookup(g10_alg_aliases, (const char *) alg_bt.data(), PGP_PKA_NOTHING));
+     if (alg == PGP_PKA_NOTHING) {
+         RNP_LOG(
+           "Unsupported algorithm: '%.*s'", (int) alg_bt.size(), (const char *) alg_bt.data());
+-- 
+2.47.0
+
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index ef1c62e808d7..3d0f43119390 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -42,6 +42,12 @@ let
       extraPatches = [
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         ./no-buildconfig.patch
+        # clang-19 fixes for char_traits build issue
+        # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
+        # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
+        # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
+        ./0001-Removed-lookup-against-basic_string-uint8_t.patch
+        ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
       ];
 
       extraPassthru = {

From 4ba90bd09ac84a034832abeb4e4bcc25dd7f83f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 01:03:44 +0000
Subject: [PATCH 0737/1504] harper: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index ac067d4369ed..d60c74fedb68 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "elijah-potter";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-2Frt0vpCGnF3pZREY+ynPkdCLf2zsde49cEsNrqFUtY=";
+    hash = "sha256-X1mTqaqOqeAM7mq3nNrE2ULZ1zaAxZIqp0p1wdlDwgk=";
   };
 
-  cargoHash = "sha256-S3N9cn8Y4j5epvndvivgKyhjQQ5mNg89iSOlOx1Jmo0=";
+  cargoHash = "sha256-0RJ0Kpht4gqZTBdjld1Wi5r9FN5RB74KboxODmlHoko=";
 
   meta = {
     description = "Grammar Checker for Developers";

From ad7b4fec433c5c754cb83bd1b5cc1c52c439dc5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 01:30:26 +0000
Subject: [PATCH 0738/1504] cpm-cmake: 0.40.3 -> 0.40.5

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

diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix
index 3ff17c3ae404..65805f5db4ff 100644
--- a/pkgs/by-name/cp/cpm-cmake/package.nix
+++ b/pkgs/by-name/cp/cpm-cmake/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cpm-cmake";
-  version = "0.40.3";
+  version = "0.40.5";
 
   src = fetchFromGitHub {
     owner = "cpm-cmake";
     repo = "cpm.cmake";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3V4XLfhDy6TIOcfSJjkvTRCxo/e5/Kt/+xxAXlZo0XM=";
+    hash = "sha256-wJsQNLCwWl4RiheDK36m3O8N4fmdmNazEo4gLdbTEzQ=";
   };
 
   postPatch = ''

From 64d92223837995405512693b43c46fb5e3235806 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 01:31:44 +0000
Subject: [PATCH 0739/1504] coroot-node-agent: 1.22.2 -> 1.23.1

---
 pkgs/by-name/co/coroot-node-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index 2cad39afda69..fd2b3631417a 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "coroot-node-agent";
-  version = "1.22.2";
+  version = "1.23.1";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
     rev = "v${version}";
-    hash = "sha256-b9JI0q6CF4D+sdfuwTkouAwJF/ghJByzsQBehwXttoU=";
+    hash = "sha256-kisYm0bM+IZJ9qRx1lDlcFtZIdjsNfu6Ao75q84ruDM=";
   };
 
-  vendorHash = "sha256-OZj3t8eFDbk2zZ+zGlgV8o9VC4/vYalIEm2dhD2JwK8=";
+  vendorHash = "sha256-EXI4xpo4j/EzugW8zyu0Dvk2i6bYFBIF+SsL6GZ+J2Q=";
 
   buildInputs = [ systemdLibs ];
 

From 8ab44677903d3daa07c2292c9634210bdfaf9b75 Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Tue, 31 Dec 2024 07:04:30 +0530
Subject: [PATCH 0740/1504] bpftrace: 0.21.2 -> 0.21.3, fix broken build

---
 pkgs/by-name/bp/bpftrace/package.nix | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 129f62375eed..abca163aa370 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpftrace";
-  version = "0.21.2";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "bpftrace";
     repo = "bpftrace";
     rev = "v${version}";
-    hash = "sha256-/2m+5iFE7R+ZEc/VcgWAhkLD/jEK88roUUOUyYODi0U=";
+    hash = "sha256-cmKm2g1lzl625t4z7ZM04QgqDubBsCMqtibXmg+3y9w=";
   };
 
   buildInputs = with llvmPackages; [
@@ -52,31 +52,15 @@ stdenv.mkDerivation rec {
     util-linux
   ];
 
-  # tests aren't built, due to gtest shenanigans. see:
-  #
-  #     https://github.com/bpftrace/bpftrace/issues/161#issuecomment-453606728
-  #     https://github.com/bpftrace/bpftrace/pull/363
-  #
   cmakeFlags = [
-    "-DBUILD_TESTING=FALSE"
     "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
     "-DINSTALL_TOOL_DOCS=OFF"
     "-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include"
   ];
 
-  patches = [
-    (fetchpatch {
-      name = "runqlat-bt-no-includes.patch";
-      url = "https://github.com/bpftrace/bpftrace/pull/3262.patch";
-      hash = "sha256-9yqaZeG1Uf2cC9Aa40c2QUTQRl8n2NO1nq278hf9P4M=";
-    })
-    (fetchpatch {
-      name = "kheaders-not-found-message-only-on-error.patch";
-      url = "https://github.com/bpftrace/bpftrace/pull/3265.patch";
-      hash = "sha256-8AICMzwq5Evy9+hmZhFjccw/HmgZ9t+YIoHApjLv6Uc=";
-      excludes = [ "CHANGELOG.md" ];
-    })
-  ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace "set(MAX_LLVM_MAJOR 18)" "set(MAX_LLVM_MAJOR 19)"
+  '';
 
   # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
   # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working.
@@ -107,6 +91,7 @@ stdenv.mkDerivation rec {
       thoughtpolice
       martinetd
       mfrw
+      illustris
     ];
     platforms = platforms.linux;
   };

From 35a4f7eee0a2f27eeeed989b4a492b2281711a2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 01:41:25 +0000
Subject: [PATCH 0741/1504] percona-server_8_0: 8.0.39-30 -> 8.0.40-31

---
 pkgs/servers/sql/percona-server/8_0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index e7b948f4e8db..1ff63364c6a0 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.0.39-30";
+  version = "8.0.40-31";
 
   src = fetchurl {
     url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Ag+9tzmWpdF5vxWOFUsn65oJXIkb0HmoMbif7HcSoP8=";
+    hash = "sha256-ExhnDY4XbCTfdAGfdI9fIz4nh/hl3T1B1heQq1p3LE4=";
   };
 
   nativeBuildInputs = [

From 477dff34d5488a17a3cb617f0cd47c198def9200 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 01:43:24 +0000
Subject: [PATCH 0742/1504] ivyterm: 1.0.0 -> 1.0.4

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

diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix
index 56cac36495a3..fc81b227be60 100644
--- a/pkgs/by-name/iv/ivyterm/package.nix
+++ b/pkgs/by-name/iv/ivyterm/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ivyterm";
-  version = "1.0.0";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "Tomiyou";
     repo = "ivyterm";
     tag = "v${version}";
-    hash = "sha256-2wOTUJRFtT7lJ8Km7J7qT6CIRi7wZmNAp1UHfrksyss=";
+    hash = "sha256-zp0crxn8dF/6Bxru08qmfjs12VOqKaxDxU3xlD6Gosk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SyyXpV4BfXFm5SHsrXHVNXFm8xM1gBv9lBRXuHVN+lQ=";
+  cargoHash = "sha256-Vm6EP/t6y6Ijb6RnHebdf1qMIAwoMjh0RJ77xyYV1ZM=";
 
   nativeBuildInputs = [
     pkg-config

From 3c65f3d84651fd1b120db0d26bc140f6275aafec Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 19:42:51 +0000
Subject: [PATCH 0743/1504] flattenReferencesGraph: avoid `lib.fileset`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I am not sure `nix-gitignore.gitignoreSource` fares any better
with chroot stores, but so far it’s always been `lib.fileset`
that has caused issues with the installer ISO, and a blanket ban on
`lib.fileset` seems like the simplest remedy unless it turns out that
one of the other source filtering helpers causes issues.

This could probably be omitted entirely as it’s just an aid for
development convenience, anyway.

This reverts commit ba5a5fac7bb68edfb1de329ca037ebe0d4094560.
This reverts commit 9ae0f7757760d269c0f3865aed98a3dfaafd6d3d.
---
 pkgs/by-name/fl/flattenReferencesGraph/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fl/flattenReferencesGraph/package.nix b/pkgs/by-name/fl/flattenReferencesGraph/package.nix
index 9adb9a320e0c..c3c7edb17609 100644
--- a/pkgs/by-name/fl/flattenReferencesGraph/package.nix
+++ b/pkgs/by-name/fl/flattenReferencesGraph/package.nix
@@ -1,25 +1,19 @@
 {
   callPackage,
-  lib,
+  nix-gitignore,
   python3Packages,
 }:
 let
-  inherit (lib) fileset;
   helpers = callPackage ./helpers.nix { };
   pythonPackages = python3Packages;
+
 in
 pythonPackages.buildPythonApplication {
   version = "0.1.0";
   pname = "flatten-references-graph";
 
-  src = fileset.toSource {
-    root = ./src;
-    fileset = fileset.unions [
-      ./src/.flake8
-      ./src/flatten_references_graph
-      ./src/setup.py
-    ];
-  };
+  # Note: this uses only ./src/.gitignore
+  src = nix-gitignore.gitignoreSource [ ] ./src;
 
   propagatedBuildInputs = with pythonPackages; [
     igraph

From 976bfb0801bcc10b113ccd83cb3df070a11e79e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 02:23:51 +0000
Subject: [PATCH 0744/1504] supabase-cli: 2.1.3 -> 2.2.1

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

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index ae158afb75c1..4be308889b2e 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.1.3";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-z29xiaKd/xyZU9s+QyMrb5+g4zsqJ1QpRYJooCTxFqw=";
+    hash = "sha256-m7v31fG3ASbOFGv+IsV5IwnKyr+31i4yAAVpawvFHpo=";
   };
 
-  vendorHash = "sha256-sn8W10HhBLl4MqfnjUZKx6/wlKDBzMNi2EOc+OPtrFo=";
+  vendorHash = "sha256-QIt7a+NVd3hubxKOA2kGjouBO5ve7qmIRTIVRpsXmdk=";
 
   ldflags = [
     "-s"

From d1a62051ae2900236f90ccda72e8adbfe35f46e4 Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Tue, 31 Dec 2024 03:29:30 +0100
Subject: [PATCH 0745/1504] streamlink: 7.0.0 -> 7.1.1

Changes:
https://github.com/streamlink/streamlink/releases/tag/7.1.0
https://github.com/streamlink/streamlink/releases/tag/7.1.1

7.1.0 dropped typing-extensions as runtime dependency
---
 pkgs/by-name/st/streamlink/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix
index 54f951e84751..b9482571febe 100644
--- a/pkgs/by-name/st/streamlink/package.nix
+++ b/pkgs/by-name/st/streamlink/package.nix
@@ -8,12 +8,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "streamlink";
-  version = "7.0.0";
+  version = "7.1.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UaQGKGLmeV1pQEbKbnBUnW0TWDxkDRUFlmgEsOA/7/I=";
+    hash = "sha256-wYge0LulNhLZedmpGLfewFb8k80gKlsHoIDlVo29q0w=";
   };
 
   patches = [
@@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec {
     requests
     trio
     trio-websocket
-    typing-extensions
     urllib3
     websocket-client
   ];

From 2eae7d63e29c74afb9bca17746528dc62ba5486d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 20:09:11 +0000
Subject: [PATCH 0746/1504] nixpkgs-manual: avoid `lib.fileset`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I don’t love this, and I’m not convinced it doesn’t have the
same pitfalls as filesets, but see the `flattenReferencesGraph`
commit for reasoning.

It may be better to ban the relevant builtins entirely and just move
things into subdirectories when needed, but I didn’t want to do
more surgery to this part of the tree than necessary to solve the
immediate problem.
---
 doc/doc-support/lib-function-docs.nix |  7 +++----
 doc/doc-support/package.nix           | 26 ++++++++++++++++----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix
index 51b4601975c3..9a2f0667dd60 100644
--- a/doc/doc-support/lib-function-docs.nix
+++ b/doc/doc-support/lib-function-docs.nix
@@ -90,10 +90,7 @@
 stdenvNoCC.mkDerivation {
   name = "nixpkgs-lib-docs";
 
-  src = lib.fileset.toSource {
-    root = ../..;
-    fileset = ../../lib;
-  };
+  src = ../../lib;
 
   nativeBuildInputs = [
     nixdoc
@@ -101,6 +98,8 @@ stdenvNoCC.mkDerivation {
   ];
 
   installPhase = ''
+    cd ..
+
     export NIX_STATE_DIR=$(mktemp -d)
     nix-instantiate --eval --strict --json ${./lib-function-locations.nix} \
       --arg nixpkgsPath "./." \
diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index c2bbdf09e533..bc5566f3cbd3 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -25,16 +25,22 @@ stdenvNoCC.mkDerivation (
 
     nativeBuildInputs = [ nixos-render-docs ];
 
-    src = lib.fileset.toSource {
-      root = ../.;
-      fileset = lib.fileset.unions [
-        (lib.fileset.fileFilter (file: file.hasExt "md" || file.hasExt "md.in") ../.)
-        ../style.css
-        ../anchor-use.js
-        ../anchor.min.js
-        ../manpage-urls.json
-        ../redirects.json
-      ];
+    src = lib.cleanSourceWith {
+      src = ../.;
+      filter =
+        path: type:
+        type == "directory"
+        || lib.hasSuffix ".md" path
+        || lib.hasSuffix ".md.in" path
+        || lib.elem path (
+          map toString [
+            ../style.css
+            ../anchor-use.js
+            ../anchor.min.js
+            ../manpage-urls.json
+            ../redirects.json
+          ]
+        );
     };
 
     postPatch = ''

From f6ce575a03505ef90dbb864009058ac8d1392c3f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 31 Dec 2024 00:14:30 +0000
Subject: [PATCH 0747/1504] nixos/test-driver: avoid `lib.fileset`

---
 nixos/lib/test-driver/default.nix                    | 12 +-----------
 .../lib/test-driver/nixos-test-driver-docstrings.nix |  2 +-
 .../lib/test-driver/{ => src}/extract-docstrings.py  |  0
 nixos/lib/test-driver/{ => src}/pyproject.toml       |  0
 .../test-driver/{ => src}/test_driver/__init__.py    |  0
 .../lib/test-driver/{ => src}/test_driver/driver.py  |  0
 .../lib/test-driver/{ => src}/test_driver/logger.py  |  0
 .../lib/test-driver/{ => src}/test_driver/machine.py |  0
 .../{ => src}/test_driver/polling_condition.py       |  0
 nixos/lib/test-driver/{ => src}/test_driver/py.typed |  0
 nixos/lib/test-driver/{ => src}/test_driver/qmp.py   |  0
 nixos/lib/test-driver/{ => src}/test_driver/vlan.py  |  0
 12 files changed, 2 insertions(+), 12 deletions(-)
 rename nixos/lib/test-driver/{ => src}/extract-docstrings.py (100%)
 rename nixos/lib/test-driver/{ => src}/pyproject.toml (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/__init__.py (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/driver.py (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/logger.py (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/machine.py (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/polling_condition.py (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/py.typed (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/qmp.py (100%)
 rename nixos/lib/test-driver/{ => src}/test_driver/vlan.py (100%)

diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix
index 35471f74949c..f22744806d48 100644
--- a/nixos/lib/test-driver/default.nix
+++ b/nixos/lib/test-driver/default.nix
@@ -14,22 +14,12 @@
   extraPythonPackages ? (_: [ ]),
   nixosTests,
 }:
-let
-  fs = lib.fileset;
-in
 python3Packages.buildPythonApplication {
   pname = "nixos-test-driver";
   version = "1.1";
   pyproject = true;
 
-  src = fs.toSource {
-    root = ./.;
-    fileset = fs.unions [
-      ./pyproject.toml
-      ./test_driver
-      ./extract-docstrings.py
-    ];
-  };
+  src = ./src;
 
   build-system = with python3Packages; [
     setuptools
diff --git a/nixos/lib/test-driver/nixos-test-driver-docstrings.nix b/nixos/lib/test-driver/nixos-test-driver-docstrings.nix
index b76da9ac5fb2..b6450685e047 100644
--- a/nixos/lib/test-driver/nixos-test-driver-docstrings.nix
+++ b/nixos/lib/test-driver/nixos-test-driver-docstrings.nix
@@ -11,6 +11,6 @@ in
 
 runCommand "nixos-test-driver-docstrings" env ''
   mkdir $out
-  python3 ${./extract-docstrings.py} ${./test_driver/machine.py} \
+  python3 ${./src/extract-docstrings.py} ${./src/test_driver/machine.py} \
     > $out/machine-methods.md
 ''
diff --git a/nixos/lib/test-driver/extract-docstrings.py b/nixos/lib/test-driver/src/extract-docstrings.py
similarity index 100%
rename from nixos/lib/test-driver/extract-docstrings.py
rename to nixos/lib/test-driver/src/extract-docstrings.py
diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/src/pyproject.toml
similarity index 100%
rename from nixos/lib/test-driver/pyproject.toml
rename to nixos/lib/test-driver/src/pyproject.toml
diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/__init__.py
rename to nixos/lib/test-driver/src/test_driver/__init__.py
diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/driver.py
rename to nixos/lib/test-driver/src/test_driver/driver.py
diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/src/test_driver/logger.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/logger.py
rename to nixos/lib/test-driver/src/test_driver/logger.py
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/machine.py
rename to nixos/lib/test-driver/src/test_driver/machine.py
diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/src/test_driver/polling_condition.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/polling_condition.py
rename to nixos/lib/test-driver/src/test_driver/polling_condition.py
diff --git a/nixos/lib/test-driver/test_driver/py.typed b/nixos/lib/test-driver/src/test_driver/py.typed
similarity index 100%
rename from nixos/lib/test-driver/test_driver/py.typed
rename to nixos/lib/test-driver/src/test_driver/py.typed
diff --git a/nixos/lib/test-driver/test_driver/qmp.py b/nixos/lib/test-driver/src/test_driver/qmp.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/qmp.py
rename to nixos/lib/test-driver/src/test_driver/qmp.py
diff --git a/nixos/lib/test-driver/test_driver/vlan.py b/nixos/lib/test-driver/src/test_driver/vlan.py
similarity index 100%
rename from nixos/lib/test-driver/test_driver/vlan.py
rename to nixos/lib/test-driver/src/test_driver/vlan.py

From 6ff076b1b121970ed13a38ffee0f58b540d417e8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 19:24:54 +0000
Subject: [PATCH 0748/1504] tests.makeBinaryWrapper: avoid `lib.fileset`

---
 .../make-binary-wrapper/{ => add-flags}/add-flags.c   |  0
 .../{ => add-flags}/add-flags.cmdline                 |  0
 .../make-binary-wrapper/{ => add-flags}/add-flags.env |  0
 pkgs/test/make-binary-wrapper/{ => argv0}/argv0.c     |  0
 .../make-binary-wrapper/{ => argv0}/argv0.cmdline     |  0
 pkgs/test/make-binary-wrapper/{ => argv0}/argv0.env   |  0
 pkgs/test/make-binary-wrapper/{ => basic}/basic.c     |  0
 .../make-binary-wrapper/{ => basic}/basic.cmdline     |  0
 pkgs/test/make-binary-wrapper/{ => basic}/basic.env   |  0
 pkgs/test/make-binary-wrapper/{ => chdir}/chdir.c     |  0
 .../make-binary-wrapper/{ => chdir}/chdir.cmdline     |  0
 pkgs/test/make-binary-wrapper/{ => chdir}/chdir.env   |  0
 .../{ => combination}/combination.c                   |  0
 .../{ => combination}/combination.cmdline             |  0
 .../{ => combination}/combination.env                 |  0
 pkgs/test/make-binary-wrapper/default.nix             | 11 +----------
 pkgs/test/make-binary-wrapper/{ => env}/env.c         |  0
 pkgs/test/make-binary-wrapper/{ => env}/env.cmdline   |  0
 pkgs/test/make-binary-wrapper/{ => env}/env.env       |  0
 .../{ => inherit-argv0}/inherit-argv0.c               |  0
 .../{ => inherit-argv0}/inherit-argv0.cmdline         |  0
 .../{ => inherit-argv0}/inherit-argv0.env             |  0
 .../{ => invalid-env}/invalid-env.c                   |  0
 .../{ => invalid-env}/invalid-env.cmdline             |  0
 .../{ => overlength-strings}/overlength-strings.c     |  0
 .../overlength-strings.cmdline                        |  0
 .../{ => overlength-strings}/overlength-strings.env   |  0
 pkgs/test/make-binary-wrapper/{ => prefix}/prefix.c   |  0
 .../make-binary-wrapper/{ => prefix}/prefix.cmdline   |  0
 pkgs/test/make-binary-wrapper/{ => prefix}/prefix.env |  0
 pkgs/test/make-binary-wrapper/{ => suffix}/suffix.c   |  0
 .../make-binary-wrapper/{ => suffix}/suffix.cmdline   |  0
 pkgs/test/make-binary-wrapper/{ => suffix}/suffix.env |  0
 33 files changed, 1 insertion(+), 10 deletions(-)
 rename pkgs/test/make-binary-wrapper/{ => add-flags}/add-flags.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => add-flags}/add-flags.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => add-flags}/add-flags.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => argv0}/argv0.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => argv0}/argv0.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => argv0}/argv0.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => basic}/basic.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => basic}/basic.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => basic}/basic.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => chdir}/chdir.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => chdir}/chdir.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => chdir}/chdir.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => combination}/combination.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => combination}/combination.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => combination}/combination.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => env}/env.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => env}/env.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => env}/env.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => inherit-argv0}/inherit-argv0.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => inherit-argv0}/inherit-argv0.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => inherit-argv0}/inherit-argv0.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => invalid-env}/invalid-env.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => invalid-env}/invalid-env.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => overlength-strings}/overlength-strings.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => overlength-strings}/overlength-strings.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => overlength-strings}/overlength-strings.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => prefix}/prefix.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => prefix}/prefix.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => prefix}/prefix.env (100%)
 rename pkgs/test/make-binary-wrapper/{ => suffix}/suffix.c (100%)
 rename pkgs/test/make-binary-wrapper/{ => suffix}/suffix.cmdline (100%)
 rename pkgs/test/make-binary-wrapper/{ => suffix}/suffix.env (100%)

diff --git a/pkgs/test/make-binary-wrapper/add-flags.c b/pkgs/test/make-binary-wrapper/add-flags/add-flags.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/add-flags.c
rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.c
diff --git a/pkgs/test/make-binary-wrapper/add-flags.cmdline b/pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/add-flags.cmdline
rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.cmdline
diff --git a/pkgs/test/make-binary-wrapper/add-flags.env b/pkgs/test/make-binary-wrapper/add-flags/add-flags.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/add-flags.env
rename to pkgs/test/make-binary-wrapper/add-flags/add-flags.env
diff --git a/pkgs/test/make-binary-wrapper/argv0.c b/pkgs/test/make-binary-wrapper/argv0/argv0.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/argv0.c
rename to pkgs/test/make-binary-wrapper/argv0/argv0.c
diff --git a/pkgs/test/make-binary-wrapper/argv0.cmdline b/pkgs/test/make-binary-wrapper/argv0/argv0.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/argv0.cmdline
rename to pkgs/test/make-binary-wrapper/argv0/argv0.cmdline
diff --git a/pkgs/test/make-binary-wrapper/argv0.env b/pkgs/test/make-binary-wrapper/argv0/argv0.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/argv0.env
rename to pkgs/test/make-binary-wrapper/argv0/argv0.env
diff --git a/pkgs/test/make-binary-wrapper/basic.c b/pkgs/test/make-binary-wrapper/basic/basic.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/basic.c
rename to pkgs/test/make-binary-wrapper/basic/basic.c
diff --git a/pkgs/test/make-binary-wrapper/basic.cmdline b/pkgs/test/make-binary-wrapper/basic/basic.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/basic.cmdline
rename to pkgs/test/make-binary-wrapper/basic/basic.cmdline
diff --git a/pkgs/test/make-binary-wrapper/basic.env b/pkgs/test/make-binary-wrapper/basic/basic.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/basic.env
rename to pkgs/test/make-binary-wrapper/basic/basic.env
diff --git a/pkgs/test/make-binary-wrapper/chdir.c b/pkgs/test/make-binary-wrapper/chdir/chdir.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/chdir.c
rename to pkgs/test/make-binary-wrapper/chdir/chdir.c
diff --git a/pkgs/test/make-binary-wrapper/chdir.cmdline b/pkgs/test/make-binary-wrapper/chdir/chdir.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/chdir.cmdline
rename to pkgs/test/make-binary-wrapper/chdir/chdir.cmdline
diff --git a/pkgs/test/make-binary-wrapper/chdir.env b/pkgs/test/make-binary-wrapper/chdir/chdir.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/chdir.env
rename to pkgs/test/make-binary-wrapper/chdir/chdir.env
diff --git a/pkgs/test/make-binary-wrapper/combination.c b/pkgs/test/make-binary-wrapper/combination/combination.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/combination.c
rename to pkgs/test/make-binary-wrapper/combination/combination.c
diff --git a/pkgs/test/make-binary-wrapper/combination.cmdline b/pkgs/test/make-binary-wrapper/combination/combination.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/combination.cmdline
rename to pkgs/test/make-binary-wrapper/combination/combination.cmdline
diff --git a/pkgs/test/make-binary-wrapper/combination.env b/pkgs/test/make-binary-wrapper/combination/combination.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/combination.env
rename to pkgs/test/make-binary-wrapper/combination/combination.env
diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix
index 036b70f7594e..6f086de299a0 100644
--- a/pkgs/test/make-binary-wrapper/default.nix
+++ b/pkgs/test/make-binary-wrapper/default.nix
@@ -20,16 +20,7 @@ let
     runCommand "make-binary-wrapper-test-${testname}" env ''
       mkdir -p tmp/foo # for the chdir test
 
-      source=${
-        lib.fileset.toSource {
-          root = ./.;
-          fileset = lib.fileset.unions [
-            (./. + "/${testname}.cmdline")
-            (./. + "/${testname}.c")
-            (lib.fileset.maybeMissing (./. + "/${testname}.env"))
-          ];
-        }
-      }
+      source=${./${testname}}
 
       params=$(<"$source/${testname}.cmdline")
       eval "makeCWrapper /send/me/flags $params" > wrapper.c
diff --git a/pkgs/test/make-binary-wrapper/env.c b/pkgs/test/make-binary-wrapper/env/env.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/env.c
rename to pkgs/test/make-binary-wrapper/env/env.c
diff --git a/pkgs/test/make-binary-wrapper/env.cmdline b/pkgs/test/make-binary-wrapper/env/env.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/env.cmdline
rename to pkgs/test/make-binary-wrapper/env/env.cmdline
diff --git a/pkgs/test/make-binary-wrapper/env.env b/pkgs/test/make-binary-wrapper/env/env.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/env.env
rename to pkgs/test/make-binary-wrapper/env/env.env
diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.c b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/inherit-argv0.c
rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.c
diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.cmdline b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/inherit-argv0.cmdline
rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.cmdline
diff --git a/pkgs/test/make-binary-wrapper/inherit-argv0.env b/pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/inherit-argv0.env
rename to pkgs/test/make-binary-wrapper/inherit-argv0/inherit-argv0.env
diff --git a/pkgs/test/make-binary-wrapper/invalid-env.c b/pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/invalid-env.c
rename to pkgs/test/make-binary-wrapper/invalid-env/invalid-env.c
diff --git a/pkgs/test/make-binary-wrapper/invalid-env.cmdline b/pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/invalid-env.cmdline
rename to pkgs/test/make-binary-wrapper/invalid-env/invalid-env.cmdline
diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.c b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/overlength-strings.c
rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.c
diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.cmdline b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/overlength-strings.cmdline
rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.cmdline
diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.env b/pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/overlength-strings.env
rename to pkgs/test/make-binary-wrapper/overlength-strings/overlength-strings.env
diff --git a/pkgs/test/make-binary-wrapper/prefix.c b/pkgs/test/make-binary-wrapper/prefix/prefix.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/prefix.c
rename to pkgs/test/make-binary-wrapper/prefix/prefix.c
diff --git a/pkgs/test/make-binary-wrapper/prefix.cmdline b/pkgs/test/make-binary-wrapper/prefix/prefix.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/prefix.cmdline
rename to pkgs/test/make-binary-wrapper/prefix/prefix.cmdline
diff --git a/pkgs/test/make-binary-wrapper/prefix.env b/pkgs/test/make-binary-wrapper/prefix/prefix.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/prefix.env
rename to pkgs/test/make-binary-wrapper/prefix/prefix.env
diff --git a/pkgs/test/make-binary-wrapper/suffix.c b/pkgs/test/make-binary-wrapper/suffix/suffix.c
similarity index 100%
rename from pkgs/test/make-binary-wrapper/suffix.c
rename to pkgs/test/make-binary-wrapper/suffix/suffix.c
diff --git a/pkgs/test/make-binary-wrapper/suffix.cmdline b/pkgs/test/make-binary-wrapper/suffix/suffix.cmdline
similarity index 100%
rename from pkgs/test/make-binary-wrapper/suffix.cmdline
rename to pkgs/test/make-binary-wrapper/suffix/suffix.cmdline
diff --git a/pkgs/test/make-binary-wrapper/suffix.env b/pkgs/test/make-binary-wrapper/suffix/suffix.env
similarity index 100%
rename from pkgs/test/make-binary-wrapper/suffix.env
rename to pkgs/test/make-binary-wrapper/suffix/suffix.env

From f6cc18e0e46a4d3c9cace01eb698ac9c26cbed78 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 31 Dec 2024 00:42:35 +0000
Subject: [PATCH 0749/1504] tests.haskell.cabalSdist: avoid `lib.fileset`

---
 pkgs/test/haskell/cabalSdist/default.nix       | 18 +++---------------
 .../cabalSdist/{local => }/generated.nix       |  5 +++--
 2 files changed, 6 insertions(+), 17 deletions(-)
 rename pkgs/test/haskell/cabalSdist/{local => }/generated.nix (64%)

diff --git a/pkgs/test/haskell/cabalSdist/default.nix b/pkgs/test/haskell/cabalSdist/default.nix
index d9dc2bada6e2..147602126ded 100644
--- a/pkgs/test/haskell/cabalSdist/default.nix
+++ b/pkgs/test/haskell/cabalSdist/default.nix
@@ -6,18 +6,7 @@
 }:
 
 let
-  src = lib.fileset.toSource {
-    root = ./local;
-    fileset = lib.fileset.unions [
-      ./local/app
-      ./local/CHANGELOG.md
-      ./local/local.cabal
-    ];
-  };
-  # This prevents the source from depending on the formatting of the ./local/generated.nix file
-  localRaw = haskell.lib.compose.overrideSrc {
-    inherit src;
-  } (haskellPackages.callPackage ./local/generated.nix { });
+  localRaw = haskellPackages.callPackage ./generated.nix { };
 in
 lib.recurseIntoAttrs rec {
 
@@ -28,7 +17,6 @@ lib.recurseIntoAttrs rec {
 
   localFromCabalSdist = haskellPackages.buildFromCabalSdist localRaw;
 
-  # NOTE: ./local refers to the "./." path in `./local/generated.nix`.
   # This test makes sure that localHasNoDirectReference can actually fail if
   # it doesn't do anything. If this test fails, either the test setup was broken,
   # or Haskell packaging has changed the way `src` is treated in such a way that
@@ -39,7 +27,7 @@ lib.recurseIntoAttrs rec {
         drvPath = builtins.unsafeDiscardOutputDependency localRaw.drvPath;
       }
       ''
-        grep ${src} $drvPath >/dev/null
+        grep ${localRaw.src} $drvPath >/dev/null
         touch $out
       '';
 
@@ -49,7 +37,7 @@ lib.recurseIntoAttrs rec {
         drvPath = builtins.unsafeDiscardOutputDependency localFromCabalSdist.drvPath;
       }
       ''
-        grep -v ${src} $drvPath >/dev/null
+        grep -v ${localRaw.src} $drvPath >/dev/null
         touch $out
       '';
 }
diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/generated.nix
similarity index 64%
rename from pkgs/test/haskell/cabalSdist/local/generated.nix
rename to pkgs/test/haskell/cabalSdist/generated.nix
index f0f52a03e0d0..0cf12d6d565d 100644
--- a/pkgs/test/haskell/cabalSdist/local/generated.nix
+++ b/pkgs/test/haskell/cabalSdist/generated.nix
@@ -1,4 +1,4 @@
-# nix run ../../../../..#cabal2nix -- ./.
+# nix run ../../../../..#cabal2nix -- ./local
 {
   mkDerivation,
   base,
@@ -7,10 +7,11 @@
 mkDerivation {
   pname = "local";
   version = "0.1.0.0";
-  src = ./.; # also referred to as ./local in the test; these are the same path constants
+  src = ./local;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [ base ];
   description = "Nixpkgs test case";
   license = lib.licenses.mit;
+  mainProgram = "local";
 }

From 77def225cb60ae7c35ae9c82034aababed016f50 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 31 Dec 2024 00:52:44 +0000
Subject: [PATCH 0750/1504] tests.haskell.setBuildTarget: avoid `lib.fileset`

---
 pkgs/test/haskell/setBuildTarget/default.nix       | 14 +++-----------
 pkgs/test/haskell/setBuildTarget/{ => src}/Bar.hs  |  0
 pkgs/test/haskell/setBuildTarget/{ => src}/Foo.hs  |  0
 .../test/haskell/setBuildTarget/{ => src}/Setup.hs |  0
 .../{ => src}/haskell-setBuildTarget.cabal         |  0
 5 files changed, 3 insertions(+), 11 deletions(-)
 rename pkgs/test/haskell/setBuildTarget/{ => src}/Bar.hs (100%)
 rename pkgs/test/haskell/setBuildTarget/{ => src}/Foo.hs (100%)
 rename pkgs/test/haskell/setBuildTarget/{ => src}/Setup.hs (100%)
 rename pkgs/test/haskell/setBuildTarget/{ => src}/haskell-setBuildTarget.cabal (100%)

diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix
index 012bce8541e6..68f9b25dba75 100644
--- a/pkgs/test/haskell/setBuildTarget/default.nix
+++ b/pkgs/test/haskell/setBuildTarget/default.nix
@@ -1,7 +1,7 @@
 { pkgs, haskellPackages }:
 
 let
-  # This can be regenerated by running `cabal2nix .` in the current directory.
+  # This can be regenerated by running `cabal2nix ./src` in the current directory.
   pkgDef =
     {
       mkDerivation,
@@ -11,19 +11,11 @@ let
     mkDerivation {
       pname = "haskell-setBuildTarget";
       version = "0.1.0.0";
-      src = lib.fileset.toSource {
-        root = ./.;
-        fileset = lib.fileset.unions [
-          ./haskell-setBuildTarget.cabal
-          ./Bar.hs
-          ./Foo.hs
-          ./Setup.hs
-        ];
-      };
+      src = ./src;
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [ base ];
-      license = lib.licenses.bsd3;
+      license = "unknown";
     };
 
   drv = haskellPackages.callPackage pkgDef { };
diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/src/Bar.hs
similarity index 100%
rename from pkgs/test/haskell/setBuildTarget/Bar.hs
rename to pkgs/test/haskell/setBuildTarget/src/Bar.hs
diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/src/Foo.hs
similarity index 100%
rename from pkgs/test/haskell/setBuildTarget/Foo.hs
rename to pkgs/test/haskell/setBuildTarget/src/Foo.hs
diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/src/Setup.hs
similarity index 100%
rename from pkgs/test/haskell/setBuildTarget/Setup.hs
rename to pkgs/test/haskell/setBuildTarget/src/Setup.hs
diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal
similarity index 100%
rename from pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal
rename to pkgs/test/haskell/setBuildTarget/src/haskell-setBuildTarget.cabal

From 44475aafe3c1f67f7a1f304632c9271c61589a02 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 31 Dec 2024 01:02:53 +0000
Subject: [PATCH 0751/1504] tests.testers.shellcheck: avoid `lib.fileset`

---
 .../testers/shellcheck/{ => src}/example.sh          |  0
 pkgs/build-support/testers/shellcheck/tester.nix     | 11 ++++++-----
 pkgs/build-support/testers/shellcheck/tests.nix      | 12 ++----------
 3 files changed, 8 insertions(+), 15 deletions(-)
 rename pkgs/build-support/testers/shellcheck/{ => src}/example.sh (100%)

diff --git a/pkgs/build-support/testers/shellcheck/example.sh b/pkgs/build-support/testers/shellcheck/src/example.sh
similarity index 100%
rename from pkgs/build-support/testers/shellcheck/example.sh
rename to pkgs/build-support/testers/shellcheck/src/example.sh
diff --git a/pkgs/build-support/testers/shellcheck/tester.nix b/pkgs/build-support/testers/shellcheck/tester.nix
index 131a64a85157..caa4f51f9927 100644
--- a/pkgs/build-support/testers/shellcheck/tester.nix
+++ b/pkgs/build-support/testers/shellcheck/tester.nix
@@ -2,6 +2,7 @@
 {
   lib,
   stdenv,
+  runCommand,
   shellcheck,
 }:
 
@@ -10,7 +11,7 @@
 # Tests: ./tests.nix
 { src }:
 let
-  inherit (lib) fileset pathType isPath;
+  inherit (lib) pathType isPath;
 in
 stdenv.mkDerivation {
   name = "run-shellcheck";
@@ -18,10 +19,10 @@ stdenv.mkDerivation {
     if
       isPath src && pathType src == "regular" # note that for strings this would have been IFD, which we prefer to avoid
     then
-      fileset.toSource {
-        root = dirOf src;
-        fileset = src;
-      }
+      runCommand "testers-shellcheck-src" { } ''
+        mkdir $out
+        cp ${src} $out
+      ''
     else
       src;
   nativeBuildInputs = [ shellcheck ];
diff --git a/pkgs/build-support/testers/shellcheck/tests.nix b/pkgs/build-support/testers/shellcheck/tests.nix
index 0128670dbe70..4a9ebdf9ffb1 100644
--- a/pkgs/build-support/testers/shellcheck/tests.nix
+++ b/pkgs/build-support/testers/shellcheck/tests.nix
@@ -6,9 +6,6 @@
   testers,
   runCommand,
 }:
-let
-  inherit (lib) fileset;
-in
 lib.recurseIntoAttrs {
 
   example-dir =
@@ -16,12 +13,7 @@ lib.recurseIntoAttrs {
       {
         failure = testers.testBuildFailure (
           testers.shellcheck {
-            src = fileset.toSource {
-              root = ./.;
-              fileset = fileset.unions [
-                ./example.sh
-              ];
-            };
+            src = ./src;
           }
         );
       }
@@ -37,7 +29,7 @@ lib.recurseIntoAttrs {
       {
         failure = testers.testBuildFailure (
           testers.shellcheck {
-            src = ./example.sh;
+            src = ./src/example.sh;
           }
         );
       }

From ba42e09bf2dca362e84500f1169b921164bbb8de Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 31 Dec 2024 00:03:59 +0000
Subject: [PATCH 0752/1504] yarn2nix-moretea: avoid `lib.fileset`

---
 .../yarn2nix-moretea/{yarn2nix => }/default.nix    | 14 +++-----------
 .../{yarn2nix => }/internal/fixup_bin.js           |  0
 .../{yarn2nix => }/internal/fixup_yarn_lock.js     |  0
 .../{yarn2nix => }/nix/expectShFunctions.sh        |  0
 .../tools/yarn2nix-moretea/{yarn2nix => }/yarn.nix |  0
 pkgs/top-level/all-packages.nix                    |  2 +-
 6 files changed, 4 insertions(+), 12 deletions(-)
 rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/default.nix (98%)
 rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/internal/fixup_bin.js (100%)
 rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/internal/fixup_yarn_lock.js (100%)
 rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/nix/expectShFunctions.sh (100%)
 rename pkgs/development/tools/yarn2nix-moretea/{yarn2nix => }/yarn.nix (100%)

diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix
similarity index 98%
rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
rename to pkgs/development/tools/yarn2nix-moretea/default.nix
index 3cc5e31c3c15..94048c28f88b 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/default.nix
@@ -398,15 +398,7 @@ in rec {
     });
 
   yarn2nix = mkYarnPackage {
-    src = lib.fileset.toSource {
-      root = ./.;
-      fileset = lib.fileset.unions [
-        ./bin
-        ./lib
-        ./package.json
-        ./yarn.lock
-      ];
-    };
+    src = ./yarn2nix;
 
     # yarn2nix is the only package that requires the yarnNix option.
     # All the other projects can auto-generate that file.
@@ -415,7 +407,7 @@ in rec {
     # Using the filter above and importing package.json from the filtered
     # source results in an error in restricted mode. To circumvent this,
     # we import package.json from the unfiltered source
-    packageJSON = ./package.json;
+    packageJSON = ./yarn2nix/package.json;
 
     yarnFlags = defaultYarnFlags ++ [ "--ignore-scripts" "--production=true" ];
 
@@ -446,7 +438,7 @@ in rec {
     mkdir -p $out/lib
     mkdir -p $out/bin
 
-    cp ${./lib/urlToName.js} $out/lib/urlToName.js
+    cp ${./yarn2nix/lib/urlToName.js} $out/lib/urlToName.js
     cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock
 
     patchShebangs $out
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js
similarity index 100%
rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_bin.js
rename to pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js
similarity index 100%
rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js
rename to pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh b/pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh
similarity index 100%
rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh
rename to pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn.nix
similarity index 100%
rename from pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix
rename to pkgs/development/tools/yarn2nix-moretea/yarn.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2d42a1fdc98..6761f05b422d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5679,7 +5679,7 @@ with pkgs;
 
   yarn-berry = callPackage ../development/tools/yarn-berry { };
 
-  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
+  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; };
 
   inherit (yarn2nix-moretea)
     yarn2nix

From 4e30014c062cec5059552c0dfc4a4656d7d59dd4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 23:17:08 +0000
Subject: [PATCH 0753/1504] shopify-cli: avoid `lib.fileset`

---
 .../sh/shopify-cli/{ => manifests}/package-lock.json      | 0
 pkgs/by-name/sh/shopify-cli/{ => manifests}/package.json  | 0
 pkgs/by-name/sh/shopify-cli/package.nix                   | 8 +-------
 pkgs/by-name/sh/shopify-cli/update.sh                     | 5 +++++
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/by-name/sh/shopify-cli/{ => manifests}/package-lock.json (100%)
 rename pkgs/by-name/sh/shopify-cli/{ => manifests}/package.json (100%)

diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
similarity index 100%
rename from pkgs/by-name/sh/shopify-cli/package-lock.json
rename to pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json
similarity index 100%
rename from pkgs/by-name/sh/shopify-cli/package.json
rename to pkgs/by-name/sh/shopify-cli/manifests/package.json
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index b49e430de8be..a45f65ce7506 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -6,13 +6,7 @@ buildNpmPackage {
   pname = "shopify";
   version = version;
 
-  src = lib.fileset.toSource {
-    root = ./.;
-    fileset = with lib.fileset; unions [
-      ./package.json
-      ./package-lock.json
-    ];
-  };
+  src = ./manifests;
 
   npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk=";
   dontNpmBuild = true;
diff --git a/pkgs/by-name/sh/shopify-cli/update.sh b/pkgs/by-name/sh/shopify-cli/update.sh
index 6421f59a3a17..a63a81b59057 100755
--- a/pkgs/by-name/sh/shopify-cli/update.sh
+++ b/pkgs/by-name/sh/shopify-cli/update.sh
@@ -18,6 +18,8 @@ if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
     exit 0
 fi
 
+pushd manifests
+
 # Update the package.json
 sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json
 
@@ -25,6 +27,9 @@ sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json
 rm -f package-lock.json
 npm i --package-lock-only
 npm_hash=$(prefetch-npm-deps package-lock.json)
+
+popd
+
 sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$npm_hash\";|" package.nix
 
 popd

From 34a6c331e79081db4d133fc6692105552bbeb52b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 21:48:15 +0000
Subject: [PATCH 0754/1504] purescm: avoid `lib.fileset`

---
 pkgs/by-name/pu/purescm/README.rst            |  4 ++--
 .../pu/purescm/{ => manifests}/.gitignore     |  0
 .../purescm/{ => manifests}/package-lock.json |  0
 .../pu/purescm/{ => manifests}/package.json   |  0
 pkgs/by-name/pu/purescm/package.nix           | 19 +++----------------
 5 files changed, 5 insertions(+), 18 deletions(-)
 rename pkgs/by-name/pu/purescm/{ => manifests}/.gitignore (100%)
 rename pkgs/by-name/pu/purescm/{ => manifests}/package-lock.json (100%)
 rename pkgs/by-name/pu/purescm/{ => manifests}/package.json (100%)

diff --git a/pkgs/by-name/pu/purescm/README.rst b/pkgs/by-name/pu/purescm/README.rst
index 635d4b46d811..ff34f3913009 100644
--- a/pkgs/by-name/pu/purescm/README.rst
+++ b/pkgs/by-name/pu/purescm/README.rst
@@ -14,6 +14,6 @@ Suggested additional ``buildInputs``
 To update this package
 ======================
 
-#. Bump the ``./package.json`` version pin
-#. Run ``nix-shell -p nodejs --command "npm i --package-lock-only"``
+#. Bump the ``./manifests/package.json`` version pin
+#. Run ``(cd manifests && nix-shell -p nodejs --command "npm i --package-lock-only")``
 #. Update ``npmDeps.hash`` in the ``package.nix``
diff --git a/pkgs/by-name/pu/purescm/.gitignore b/pkgs/by-name/pu/purescm/manifests/.gitignore
similarity index 100%
rename from pkgs/by-name/pu/purescm/.gitignore
rename to pkgs/by-name/pu/purescm/manifests/.gitignore
diff --git a/pkgs/by-name/pu/purescm/package-lock.json b/pkgs/by-name/pu/purescm/manifests/package-lock.json
similarity index 100%
rename from pkgs/by-name/pu/purescm/package-lock.json
rename to pkgs/by-name/pu/purescm/manifests/package-lock.json
diff --git a/pkgs/by-name/pu/purescm/package.json b/pkgs/by-name/pu/purescm/manifests/package.json
similarity index 100%
rename from pkgs/by-name/pu/purescm/package.json
rename to pkgs/by-name/pu/purescm/manifests/package.json
diff --git a/pkgs/by-name/pu/purescm/package.nix b/pkgs/by-name/pu/purescm/package.nix
index faee196e3eb9..9dd16d489a0c 100644
--- a/pkgs/by-name/pu/purescm/package.nix
+++ b/pkgs/by-name/pu/purescm/package.nix
@@ -8,7 +8,7 @@
 let
   inherit (lib) fileset;
 
-  packageLock = builtins.fromJSON (builtins.readFile ./package-lock.json);
+  packageLock = builtins.fromJSON (builtins.readFile ./manifests/package-lock.json);
 
   pname = "purescm";
   version = packageLock.packages."node_modules/${pname}".version;
@@ -16,24 +16,11 @@ let
   package = buildNpmPackage {
     inherit pname version;
 
-    src = fileset.toSource {
-      root = ./.;
-      fileset = fileset.unions [
-        ./package.json
-        ./package-lock.json
-        ./.gitignore
-      ];
-    };
+    src = ./manifests;
     dontNpmBuild = true;
 
     npmDeps = fetchNpmDeps {
-      src = fileset.toSource {
-        root = ./.;
-        fileset = fileset.unions [
-          ./package-lock.json
-          ./package.json
-        ];
-      };
+      src = ./manifests;
       hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o=";
     };
 

From bc419f5949c49e1779da9ffecb201e42fc819b71 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 21:40:19 +0000
Subject: [PATCH 0755/1504] python312Packages.waitress-django: avoid
 `lib.fileset`

---
 .../python-modules/waitress-django/default.nix       | 12 +-----------
 .../waitress-django/{ => src}/setup.py               |  3 +--
 2 files changed, 2 insertions(+), 13 deletions(-)
 rename pkgs/development/python-modules/waitress-django/{ => src}/setup.py (76%)

diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix
index 9358f20e1a33..cb0c46abb611 100644
--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/pkgs/development/python-modules/waitress-django/default.nix
@@ -6,22 +6,12 @@
   waitress,
 }:
 
-let
-  fs = lib.fileset;
-in
-
 buildPythonPackage {
   pname = "waitress-django";
   version = "1.0.0";
   pyproject = true;
 
-  src = fs.toSource {
-    root = ./.;
-    fileset = fs.unions [
-      ./setup.py
-      ./src
-    ];
-  };
+  src = ./src;
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/pkgs/development/python-modules/waitress-django/src/setup.py
similarity index 76%
rename from pkgs/development/python-modules/waitress-django/setup.py
rename to pkgs/development/python-modules/waitress-django/src/setup.py
index 16fde78f42a9..65f51237b589 100644
--- a/pkgs/development/python-modules/waitress-django/setup.py
+++ b/pkgs/development/python-modules/waitress-django/src/setup.py
@@ -7,6 +7,5 @@ setup( name         = "waitress-django"
      , description  = "A waitress WSGI server serving django"
      , author       = "Bas van Dijk"
      , author_email = "v.dijk.bas@gmail.com"
-     , package_dir  = {"" : "src"}
-     , scripts      = ["src/waitress-serve-django"]
+     , scripts      = ["waitress-serve-django"]
      )

From a38901aa8539613589598f59f567b9001199badd Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 20:00:27 +0000
Subject: [PATCH 0756/1504] cudaPackages.saxpy: avoid `lib.fileset`

---
 pkgs/development/cuda-modules/saxpy/default.nix          | 9 +--------
 .../cuda-modules/saxpy/{ => src}/CMakeLists.txt          | 0
 pkgs/development/cuda-modules/saxpy/{ => src}/saxpy.cu   | 0
 3 files changed, 1 insertion(+), 8 deletions(-)
 rename pkgs/development/cuda-modules/saxpy/{ => src}/CMakeLists.txt (100%)
 rename pkgs/development/cuda-modules/saxpy/{ => src}/saxpy.cu (100%)

diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix
index 57b6120ccea9..c1d1711fc997 100644
--- a/pkgs/development/cuda-modules/saxpy/default.nix
+++ b/pkgs/development/cuda-modules/saxpy/default.nix
@@ -18,19 +18,12 @@ let
     libcublas
     ;
   inherit (lib) getDev getLib getOutput;
-  fs = lib.fileset;
 in
 backendStdenv.mkDerivation {
   pname = "saxpy";
   version = "unstable-2023-07-11";
 
-  src = fs.toSource {
-    root = ./.;
-    fileset = fs.unions [
-      ./CMakeLists.txt
-      ./saxpy.cu
-    ];
-  };
+  src = ./src;
 
   __structuredAttrs = true;
   strictDeps = true;
diff --git a/pkgs/development/cuda-modules/saxpy/CMakeLists.txt b/pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt
similarity index 100%
rename from pkgs/development/cuda-modules/saxpy/CMakeLists.txt
rename to pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt
diff --git a/pkgs/development/cuda-modules/saxpy/saxpy.cu b/pkgs/development/cuda-modules/saxpy/src/saxpy.cu
similarity index 100%
rename from pkgs/development/cuda-modules/saxpy/saxpy.cu
rename to pkgs/development/cuda-modules/saxpy/src/saxpy.cu

From 0f5701886f993d535df35150d537ea9ca8913932 Mon Sep 17 00:00:00 2001
From: pca006132 <john.lck40@gmail.com>
Date: Mon, 30 Dec 2024 13:48:33 +0800
Subject: [PATCH 0757/1504] python312Packages.manifold3d: 3.0.0 -> 3.0.1

---
 pkgs/development/python-modules/manifold3d/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix
index cb0468c6bff4..d9585ee525b7 100644
--- a/pkgs/development/python-modules/manifold3d/default.nix
+++ b/pkgs/development/python-modules/manifold3d/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "manifold3d";
-  version = "3.0.0";
+  version = "3.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     rev = "refs/tags/v${version}";
-    hash = "sha256-02bZAPA4mnWzS9NYVcSW0JE7BidrwzNKBO2nl7BxiiE=";
+    hash = "sha256-wbeWxAeKyqjEPemc2e5n357gwq83pQlASOvMd0ZCE7g=";
   };
 
   dontUseCmakeConfigure = true;
@@ -64,6 +64,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/elalish/manifold";
     changelog = "https://github.com/elalish/manifold/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ pbsds ];
+    maintainers = with lib.maintainers; [
+      pbsds
+      pca006132
+    ];
   };
 }

From fb4eb8a49b57a345212ae9bb9e2ba8080d6fc741 Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Mon, 30 Dec 2024 21:48:20 -0500
Subject: [PATCH 0758/1504] genpass: add missing zlib dependency

---
 pkgs/tools/security/genpass/default.nix | 11 +++--------
 pkgs/top-level/all-packages.nix         |  4 +---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index 009f59619a34..5fd2fd3b0b72 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -1,11 +1,8 @@
 {
   lib,
-  stdenv,
   fetchgit,
   rustPlatform,
-  CoreFoundation,
-  libiconv,
-  Security,
+  zlib,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "genpass";
@@ -19,10 +16,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreFoundation
-    libiconv
-    Security
+  buildInputs = [
+    zlib
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ba5a100d6..aa543c363350 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1804,9 +1804,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  genpass = callPackage ../tools/security/genpass {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
+  genpass = callPackage ../tools/security/genpass { };
 
   gammaray = qt6Packages.callPackage ../development/tools/gammaray { };
 

From c05c30a34e408c276dd8d74de099ba14578d120e Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Mon, 30 Dec 2024 21:50:53 -0500
Subject: [PATCH 0759/1504] git-trim: add missing zlib dependency

---
 .../version-management/git-trim/default.nix   | 20 ++++++-------------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix
index 1827123ebd7e..1f0171acc674 100644
--- a/pkgs/applications/version-management/git-trim/default.nix
+++ b/pkgs/applications/version-management/git-trim/default.nix
@@ -1,14 +1,11 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
   openssl,
   libgit2,
-  IOKit,
-  CoreFoundation,
-  Security,
+  zlib,
   fetchpatch,
 }:
 
@@ -37,16 +34,11 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [
-      openssl
-      libgit2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      IOKit
-      CoreFoundation
-      Security
-    ];
+  buildInputs = [
+    openssl
+    libgit2
+    zlib
+  ];
 
   postInstall = ''
     install -Dm644 -t $out/share/man/man1/ docs/git-trim.1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ba5a100d6..7511a4048e4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1261,9 +1261,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-trim = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-trim {
-    inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Security;
-  };
+  git-trim = callPackage ../applications/version-management/git-trim { };
 
   git-up = callPackage ../applications/version-management/git-up {
     pythonPackages = python3Packages;

From 427c240f5df6cfd7686ba5993678cc1e9534f8be Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Dec 2024 04:13:40 +0100
Subject: [PATCH 0760/1504] gpaste: Fix GNOME Shell extension not finding
 typelib

The extension started failing with:

    Error: Requiring GPaste, version 2: Typelib file for namespace 'GPaste', version '2' not found

Turns out I broke the name of the placeholder variable in e75decf46b045e79e80eed06301fa74ac15c583c.

Not sure how this had been working for me until now.
---
 pkgs/by-name/gp/gpaste/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix
index 1322bae6269b..7b8259509aa6 100644
--- a/pkgs/by-name/gp/gpaste/package.nix
+++ b/pkgs/by-name/gp/gpaste/package.nix
@@ -72,10 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
     mv "$extensionDir/"{prefs,.prefs-wrapped}.js
     substitute "${./wrapper.js}" "$extensionDir/extension.js" \
       --subst-var-by originalName "extension" \
-      --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
+      --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0"
     substitute "${./wrapper.js}" "$extensionDir/prefs.js" \
       --subst-var-by originalName "prefs" \
-      --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0"
+      --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0"
   '';
 
   meta = with lib; {

From 980477eaee7b9e90ec436061da08daa9b6d4e9d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 03:20:56 +0000
Subject: [PATCH 0761/1504] reindeer: 2024.12.16.00 -> 2024.12.30.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 822855445785..146b685ffbc6 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2024.12.16.00";
+  version = "2024.12.30.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yM+iVX+5caiSW6K45EbkHgHEhceIvauCIYwlLTYpzbQ=";
+    hash = "sha256-o8PHtGG3Ndz6Ei9ZBoAdeNmBb70m4c+jCvHCGOjaA+w=";
   };
 
-  cargoHash = "sha256-TWu2p6d/jec7zZpFP8Gly4RdgkL18yU2VWsFHVZLDJY=";
+  cargoHash = "sha256-guRi+kYLjPHFLm4eN3kJ2kHYIBZ5JXMb3ii8416e+IA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 4418f26ed1e232739c720b10418281a4a39fd652 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 03:24:39 +0000
Subject: [PATCH 0762/1504] tflint-plugins.tflint-ruleset-aws: 0.36.0 -> 0.37.0

---
 .../tools/analysis/tflint-plugins/tflint-ruleset-aws.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index 850f1d0d158c..36dce0297e6e 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "tflint-ruleset-aws";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cGtxxSHdl7xtBdhQ591Xt6udUwwO6uAtudt1Hj4LzZQ=";
+    hash = "sha256-7xS1V7Ec3eWiVjMB/4MLeKlGxNKRYeHVFc61dpoBU/8=";
   };
 
-  vendorHash = "sha256-1T50kynzbL1p/9N8lmkxFmTHujDNTaTRcWnJVrWVslQ=";
+  vendorHash = "sha256-XUGcRky0GMV2RSahUk6k/KWkWvxdCLi/7TpXn2MdNoM=";
 
   # upstream Makefile also does a  go test $(go list ./... | grep -v integration)
   preCheck = ''

From 3231baeef13b9c5ae47d0125596ba48d38513b34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 03:35:40 +0000
Subject: [PATCH 0763/1504] where-is-my-sddm-theme: 1.11.0 -> 1.12.0

---
 pkgs/by-name/wh/where-is-my-sddm-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 9862909bf575..86ce1076ec61 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -34,13 +34,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
   stdenvNoCC.mkDerivation
   (finalAttrs: {
     pname = "where-is-my-sddm-theme";
-    version = "1.11.0";
+    version = "1.12.0";
 
     src = fetchFromGitHub {
       owner = "stepanzubkov";
       repo = "where-is-my-sddm-theme";
       rev = "refs/tags/v${finalAttrs.version}";
-      hash = "sha256-EzO+MTz1PMmgeKyw65aasetmjUCpvilcvePt6HJZrpo=";
+      hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
     };
 
     propagatedUserEnvPkgs =

From 6cd4b0b79f6b4871c207d30856f97c267c7c5a1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 04:00:29 +0000
Subject: [PATCH 0764/1504] kodiPackages.formula1: 2.0.2 -> 2.0.3

---
 pkgs/applications/video/kodi/addons/formula1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix
index 9dc809c571c2..ce7733db7f55 100644
--- a/pkgs/applications/video/kodi/addons/formula1/default.nix
+++ b/pkgs/applications/video/kodi/addons/formula1/default.nix
@@ -10,11 +10,11 @@
 buildKodiAddon rec {
   pname = "formula1";
   namespace = "plugin.video.formula1";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    sha256 = "sha256-aClAgkJKvixeKzrwgEsfDhPXiFv9+ULLmb8c9QTaUgM=";
+    sha256 = "sha256-T2q7/bbzarjbqmLQR5g5lBnO0mdrwrWX5/c5GZ48nKM=";
   };
 
   propagatedBuildInputs = [

From 09c94e9e1afde81af5aad32039de5f20a5538f98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 05:24:59 +0000
Subject: [PATCH 0765/1504] mud: 1.0.10 -> 1.0.11

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

diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix
index 94b56792d72e..a8109b0208df 100644
--- a/pkgs/by-name/mu/mud/package.nix
+++ b/pkgs/by-name/mu/mud/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mud";
-  version = "1.0.10";
+  version = "1.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jasursadikov";
     repo = "mud";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-UPlAA63iANuChpqWLUDHQrcRjYkHvLcwXW/lVrAfY20=";
+    tag = "v${version}";
+    hash = "sha256-HnYBHfburJuA/yRV4Nb8HApi7kfkONh5N9t221GOxMw=";
   };
 
   build-system = with python3Packages; [

From 54412039d5fb353915ee62332f2c50a1d0d29061 Mon Sep 17 00:00:00 2001
From: Ushitora Anqou <ushitora@anqou.net>
Date: Tue, 31 Dec 2024 14:44:59 +0900
Subject: [PATCH 0766/1504] libgda: fix build with GCC 14

---
 pkgs/development/libraries/libgda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index cc0306810d5e..8de4af61686b 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
     "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
   enableParallelBuilding = true;
 

From c8751b2c5da01e8645c525f0b1a8ce74cac1a6c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 06:16:16 +0000
Subject: [PATCH 0767/1504] python312Packages.ancp-bids: 0.2.5 -> 0.2.6

---
 pkgs/development/python-modules/ancp-bids/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix
index 8dd6dc28eeec..9b8c610dfcfd 100644
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ancp-bids";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ANCPLabOldenburg";
     repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-bfHphFecPHKoVow8v+20LuQt6X1BGGtoTK4T9vhIkSc=";
+    tag = version;
+    hash = "sha256-JxF1W4yMPFIQXPH7QHfcHssWMP/Uci07e66WE5qVJx4=";
   };
 
   build-system = [ setuptools ];

From 9f579229fc59199ee742ce8e8bbba32f0210a51e Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 30 Dec 2024 20:09:35 -0800
Subject: [PATCH 0768/1504] lib3mf: 2.2.0 -> 2.3.2

https://github.com/3MFConsortium/lib3mf/releases/tag/v2.3.2
---
 pkgs/by-name/li/lib3mf/package.nix            | 42 ++++++++++++-------
 .../by-name/li/lib3mf/upgrade-to-cpp-14.patch | 18 --------
 2 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index c61a747bec0e..c332654c2b15 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -6,26 +6,25 @@
   ninja,
   automaticcomponenttoolkit,
   pkg-config,
+  fast-float,
   libzip,
   gtest,
   openssl,
   libuuid,
-  libossp_uuid,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
   pname = "lib3mf";
-  version = "2.2.0";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "3MFConsortium";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc=";
+    tag = "v${version}";
+    hash = "sha256-XEwrJINiNpI2+1wXxczirci8VJsUVs5iDUAMS6jWuNk=";
   };
 
-  patches = [ ./upgrade-to-cpp-14.patch ];
-
   nativeBuildInputs = [
     cmake
     ninja
@@ -49,22 +48,37 @@ stdenv.mkDerivation rec {
     libzip
     gtest
     openssl
-  ] ++ (if stdenv.hostPlatform.isDarwin then [ libossp_uuid ] else [ libuuid ]);
+    zlib
+  ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
 
   postPatch = ''
-    # This lets us build the tests properly on aarch64-darwin.
-    substituteInPlace CMakeLists.txt \
-      --replace 'SET(CMAKE_OSX_ARCHITECTURES "x86_64")' ""
-
     # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
     sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in
 
     # replace bundled binaries
-    for i in AutomaticComponentToolkit/bin/act.*; do
-      ln -sf ${automaticcomponenttoolkit}/bin/act $i
-    done
+    rm -r AutomaticComponentToolkit
+    ln -s ${automaticcomponenttoolkit}/bin AutomaticComponentToolkit
+
+    # unvendor Libraries
+    rm -r Libraries/{fast_float,googletest,libressl,libzip,zlib}
+
+    cat <<"EOF" >> Tests/CPP_Bindings/CMakeLists.txt
+    find_package(GTest REQUIRED)
+    target_link_libraries(''${TESTNAME} PRIVATE GTest::gtest)
+    EOF
+
+    mkdir Libraries/fast_float
+    ln -s ${lib.getInclude fast-float}/include/fast_float Libraries/fast_float/Include
+
+    # functions are no longer in openssl, remove them from test cleanup function
+    substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \
+      --replace-warn "RAND_cleanup();" "" \
+      --replace-warn "EVP_cleanup();" "" \
+      --replace-warn "CRYPTO_cleanup_all_ex_data();" ""
   '';
 
+  doCheck = true;
+
   meta = with lib; {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
diff --git a/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch b/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch
deleted file mode 100644
index a453571838d0..000000000000
--- a/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f719beb7..a20f84eb8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-   # using GCC
-   add_definitions(-DBUILD_DLL)
-   add_compile_options(-Wall)
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
-+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
- elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-   # using GCC
-   add_definitions(-DBUILD_DLL)
-   add_compile_options(-Wall) 
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
-   set(CMAKE_MACOSX_RPATH ON)
- endif()

From c34b1985c78c25cc928ea3f60b1b04e7a7308ef0 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 30 Dec 2024 22:29:03 -0800
Subject: [PATCH 0769/1504] openscad: unpin cgal_4; fix darwin

---
 .../graphics/openscad/default.nix             | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index a3f11641ed4d..008b83ecd099 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -14,7 +14,7 @@
   libGL,
   glew,
   opencsg,
-  cgal_4,
+  cgal,
   mpfr,
   gmp,
   glib,
@@ -62,11 +62,32 @@ mkDerivation rec {
       url = "https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch";
       sha256 = "sha256-KNEVu10E2d4G2x+FJcuHo2tjD8ygMRuhUcW9NbN98bM=";
     })
+    (fetchpatch {
+      # needed for cgal_5
+      name = "cgalutils-tess.cc-cgal-5.patch";
+      url = "https://github.com/openscad/openscad/commit/3a81c1fb9b663ebbedd6eb044e7276357b1f30a1.patch";
+      hash = "sha256-JdBznXkewx5ybY92Ss0h7UnMZ7d3IQbFRaDCDjb1bRA=";
+    })
+    (fetchpatch {
+      # needed for cgal_5
+      name = "cgalutils-tess.cc-cgal-5_4.patch";
+      url = "https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b.patch";
+      hash = "sha256-Fu8dnjNIwZKCI6ukOeHYK8NiJwoA0XtqT8dg8sVevG8=";
+    })
+    (fetchpatch {
+      # needed for cgal_5. Removes dead code
+      name = "cgalutils-polyhedron.cc-cgal-5_3.patch";
+      url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch";
+      hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4=";
+    })
   ];
 
   postPatch = ''
     substituteInPlace src/FileModule.cc \
       --replace-fail 'fs::is_regular' 'fs::is_regular_file'
+
+    substituteInPlace src/openscad.cc \
+      --replace-fail 'boost::join' 'boost::algorithm::join'
   '';
 
   nativeBuildInputs = [
@@ -84,7 +105,7 @@ mkDerivation rec {
       boost
       glew
       opencsg
-      cgal_4
+      cgal
       mpfr
       gmp
       glib

From 8359653f6bb0c1b1533e6d0b2f7998c37f7c6760 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 07:27:53 +0000
Subject: [PATCH 0770/1504] gh-contribs: 0.9.0 -> 0.10.1

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

diff --git a/pkgs/by-name/gh/gh-contribs/package.nix b/pkgs/by-name/gh/gh-contribs/package.nix
index d3f769ea1b87..46d11241d4f9 100644
--- a/pkgs/by-name/gh/gh-contribs/package.nix
+++ b/pkgs/by-name/gh/gh-contribs/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "gh-contribs";
-  version = "0.9.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "MintArchit";
     repo = "gh-contribs";
     rev = "v${version}";
-    hash = "sha256-yPJ9pmnbqR+fXH02Q5VMn0v2MuDQbPUpNzKw1awmKVE=";
+    hash = "sha256-fqyxq/lpMcLXOYY0MNI5uv8Go2erpg7dEIsEI+ExSVI=";
   };
 
   nativeBuildInputs = [

From dd18086a20c98a6afe1b8b75aee6ba53c9e596c0 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Mon, 30 Dec 2024 23:39:20 -0800
Subject: [PATCH 0771/1504] manifold: platforms.linux -> platforms.unix

builds fine on darwin
---
 pkgs/by-name/ma/manifold/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index e4c0a608a05a..0b185bc3b041 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
       hzeller
       pca006132
     ];
-    platforms = lib.platforms.linux; # currently issues with Darwin
+    platforms = lib.platforms.unix;
   };
 })

From 73c5ff49b746d370de4f17fea0428e0c007a9fea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 07:44:55 +0000
Subject: [PATCH 0772/1504] ladybird: 0-unstable-2024-12-23 ->
 0-unstable-2024-12-30

---
 pkgs/applications/networking/browsers/ladybird/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index a8bdb51c2f08..81c3d4acca1e 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -48,13 +48,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2024-12-23";
+  version = "0-unstable-2024-12-30";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "d5bbf8dcf803c429afab76610dfba3b1ee23f0ae";
-    hash = "sha256-Kew/MFFCq6sTXt8jfXC78kpQNHAjX8cQyLWO3+MeikU=";
+    rev = "4324439006a6df1179440ce4f415b67658919957";
+    hash = "sha256-vg2Nb85+fegs7Idika9Mbq+f27wrIO48pWQSUidLKwE=";
   };
 
   postPatch = ''

From 5594c47eb25ff63f1619952f45cac27313471fd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 08:36:02 +0000
Subject: [PATCH 0773/1504] stardust-xr-protostar: 0-unstable-2024-07-19 ->
 0-unstable-2024-12-29

---
 pkgs/by-name/st/stardust-xr-protostar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stardust-xr-protostar/package.nix b/pkgs/by-name/st/stardust-xr-protostar/package.nix
index 237b5c204edc..5f5dc13a71b1 100644
--- a/pkgs/by-name/st/stardust-xr-protostar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-protostar/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stardust-xr-protostar";
-  version = "0-unstable-2024-07-19";
+  version = "0-unstable-2024-12-29";
 
   src = fetchFromGitHub {
     owner = "stardustxr";
     repo = "protostar";
-    rev = "39499a061af74c3a2d5e1e46e4ad21aca5727219";
-    hash = "sha256-TPpkjTOZVtyVZdK65C951DpEzfI9aaRMXclZ31dAk9s=";
+    rev = "9b73eb1e128b49a6d40a27a4cde7715d8cbd2674";
+    hash = "sha256-9KJO1Z3Aq0+hh9QqufWBxpMmfFOmdgMUJxfgGZMg2n4=";
   };
 
   env.STARDUST_RES_PREFIXES = "${src}/res";

From ad981657df8022fc54cebdd795a89b97858d11ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 08:37:24 +0000
Subject: [PATCH 0774/1504] stardust-xr-gravity: 0-unstable-2024-08-21 ->
 0-unstable-2024-12-29

---
 pkgs/by-name/st/stardust-xr-gravity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stardust-xr-gravity/package.nix b/pkgs/by-name/st/stardust-xr-gravity/package.nix
index 8728f943ce8b..a4b8bb615dc0 100644
--- a/pkgs/by-name/st/stardust-xr-gravity/package.nix
+++ b/pkgs/by-name/st/stardust-xr-gravity/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stardust-xr-gravity";
-  version = "0-unstable-2024-08-21";
+  version = "0-unstable-2024-12-29";
 
   src = fetchFromGitHub {
     owner = "stardustxr";
     repo = "gravity";
-    rev = "96787ed3139717ea6061f6e259e9fed3e483274a";
-    hash = "sha256-R87u7CX2n7iOOEEB3cHae2doqCn/skChHgeU+RNsHVk=";
+    rev = "eca5e835cd3abee69984ce6312610644801457a9";
+    hash = "sha256-upw0MjGccSI1B10wabKPMGrEo7ATfg4a7Hzaucbf99w=";
   };
 
   cargoLock = {

From efb58f120074c2fd94dfbc368c55daa5282224e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 08:37:26 +0000
Subject: [PATCH 0775/1504] stardust-xr-magnetar: 0-unstable-2024-08-31 ->
 0-unstable-2024-12-29

---
 pkgs/by-name/st/stardust-xr-magnetar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
index 5494dd52d49a..e6803e4da4a0 100644
--- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stardust-xr-magnetar";
-  version = "0-unstable-2024-08-31";
+  version = "0-unstable-2024-12-29";
 
   src = fetchFromGitHub {
     owner = "stardustxr";
     repo = "magnetar";
-    rev = "48064b84b71d27ceea00b5d2f19dcbf21d75f554";
-    hash = "sha256-x1yHf5ceCws4C8NuoB/+kHwZK09vnn4IOFgduhjl4O8=";
+    rev = "d00c5ecf0bcaf2b4382ec3b4f3373ea5b761ee7b";
+    hash = "sha256-2I6BRjw5t68OMc93cis4/qnyYT9OBYIr1S+ZF8LmFCc=";
   };
 
   cargoLock = {

From 7456e368369ab767c42db2688dc250b4378d7178 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 00:09:42 -0800
Subject: [PATCH 0776/1504] libspnav: set install_name at link time; fix darwin

install_name_tool fails due to a lack of space to write the full path
name into the library. Set the correct path at link time and eliminate
the install_name_tool step.
---
 pkgs/by-name/li/libspnav/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix
index 92d3baa5541c..51a4805581ac 100644
--- a/pkgs/by-name/li/libspnav/package.nix
+++ b/pkgs/by-name/li/libspnav/package.nix
@@ -3,7 +3,6 @@
   lib,
   fetchFromGitHub,
   libX11,
-  fixDarwinDylibNames,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,14 +16,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ=";
   };
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ libX11 ];
 
   configureFlags = [ "--disable-debug" ];
-  makeFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "AR=${stdenv.cc.targetPrefix}ar"
-  ];
+  makeFlags =
+    [
+      "CC=${stdenv.cc.targetPrefix}cc"
+      "AR=${stdenv.cc.targetPrefix}ar"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "shared=-dynamiclib"
+      "shared+=-Wl,-install_name,$(out)/lib/$(lib_so)"
+    ];
 
   preInstall = ''
     mkdir -p $out/{lib,include}

From aaffc2cce575f9177394bd12631f2420544daa9c Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 30 Dec 2024 10:36:29 +0100
Subject: [PATCH 0777/1504] liblas: fix build with boost 1.86

Disable setting of C++98 standard which was dropped in boost 1.84.0.

Co-authored-by: Reno Dakota <paparodeo@proton.me
---
 pkgs/by-name/li/libLAS/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/li/libLAS/package.nix b/pkgs/by-name/li/libLAS/package.nix
index 5bec9b5f2075..79c067673f5f 100644
--- a/pkgs/by-name/li/libLAS/package.nix
+++ b/pkgs/by-name/li/libLAS/package.nix
@@ -45,6 +45,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # Disable setting of C++98 standard which was dropped in boost 1.84.0
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} -std=c++98 -ansi")' '#'
+  '';
+
   nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [
     boost

From a3d1a8cdc32746f0ed766b453cefc42dcbb7d56b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 09:34:35 +0000
Subject: [PATCH 0778/1504] lief: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix
index 3560dc08eb7f..ef7b160cdd1a 100644
--- a/pkgs/development/libraries/lief/default.nix
+++ b/pkgs/development/libraries/lief/default.nix
@@ -11,13 +11,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "lief";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "lief-project";
     repo = "LIEF";
     rev = version;
-    sha256 = "sha256-TwNrwOY8JVQvZ0GJXeW0hr21vCFXQcFj4VnGQQnisNY=";
+    sha256 = "sha256-Mq3IC1EbJpAwqHpiByFwdWl/rUOvv+oOtLgJ6dx7/P0=";
   };
 
   outputs = [ "out" "py" ];

From e3566e5863553d6951804ece1aa5659146abbaeb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 11:07:57 +0100
Subject: [PATCH 0779/1504] ldeep: 1.0.77 -> 1.0.78

Diff: https://github.com/franc-pentest/ldeep/compare/None...1.0.78

Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.78
---
 pkgs/by-name/ld/ldeep/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix
index c8820a7a7da0..6fee78ff4f0d 100644
--- a/pkgs/by-name/ld/ldeep/package.nix
+++ b/pkgs/by-name/ld/ldeep/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ldeep";
-  version = "1.0.77";
+  version = "1.0.78";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "franc-pentest";
     repo = "ldeep";
     tag = version;
-    hash = "sha256-JC5XsKNcWAJBJzlZehWnxYYp+GdxLrwSv7oB16KGcCE=";
+    hash = "sha256-ExAZrlrsx6ijTeUSiPNL06wY4gWUuCNajpyXqpq785I=";
   };
 
   pythonRelaxDeps = [

From 03d33b719b001972265f552c31ac38334cf2f601 Mon Sep 17 00:00:00 2001
From: antipatico <antipatico@users.noreply.github.com>
Date: Sat, 31 Aug 2024 14:00:53 +0200
Subject: [PATCH 0780/1504] maintainers: add antipatico

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 22c5f4804ab2..6fb85cb7ffed 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1632,6 +1632,12 @@
     matrix = "@anthonyrsl:matrix.org";
     keys = [ { fingerprint = "472D 368A F107 F443 F3A5  C712 9DC4 987B 1A55 E75E"; } ];
   };
+  antipatico = {
+    email = "code@bootkit.dev";
+    github = "antipatico";
+    githubId = 14838767;
+    name = "Jacopo Scannella";
+  };
   antoinerg = {
     email = "roygobeil.antoine@gmail.com";
     github = "antoinerg";

From cb31bc8b795444324cac889a5627a5058086d449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20H=C3=A4ring?= <tim.haering@gmail.com>
Date: Mon, 30 Dec 2024 11:30:56 +0100
Subject: [PATCH 0781/1504] goocanvas2: fix gcc14 compilation

---
 pkgs/development/libraries/goocanvas/2.x.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 9d0007b1ff28..0491a02ab860 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   pkg-config,
   gettext,
   gtk-doc,
@@ -41,6 +42,16 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  # add fedora patch to fix gcc-14 build
+  # https://src.fedoraproject.org/rpms/goocanvas2/tree/main
+  patches = [
+    (fetchpatch {
+      name = "goocanvas-2.0.4-Fix-building-with-GCC-14.patch";
+      hash = "sha256-9uqqC1uKZF9TDz5dfDTKSRCmjEiuvqkLnZ9w6U+q2TI=";
+      url = "https://src.fedoraproject.org/rpms/goocanvas2/raw/e799612a277262a0c6bd03db10a6ee9ca7871b9c/f/goocanvas-2.0.4-Fix-building-with-GCC-14.patch";
+    })
+  ];
+
   configureFlags = [
     "--disable-python"
   ];

From d94c8482f238a1324bfc2638a352272458777a9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:35:24 +0100
Subject: [PATCH 0782/1504] python312Packages.cyclopts: 3.1.2 -> 3.1.3

Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.1.2...v3.1.3

Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.1.3
---
 pkgs/development/python-modules/cyclopts/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 7948762c3e21..f17dbf935164 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5LJSo7DlzId0gd8Egv+JAbLk59tSl2HbwjyGm0qy5nI=";
+    hash = "sha256-N53obWs924HqxELxO1Ax4Jy+u+e4KT+FSbX4UhR+pJg=";
   };
 
   build-system = [
@@ -54,6 +54,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "cyclopts" ];
 
+  disabledTests = [
+    # Assertion error
+    "test_pydantic_error_msg"
+  ];
+
   meta = with lib; {
     description = "Module to create CLIs based on Python type hints";
     homepage = "https://github.com/BrianPugh/cyclopts";

From e898d774401882fbaf2f0c006873510de4e5752b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:37:59 +0100
Subject: [PATCH 0783/1504] python312Packages.ollama: move pydantic toi
 run-time deps

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

diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index be11a601cc26..5d9867a9d718 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -35,11 +35,13 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies = [ httpx ];
+  dependencies = [
+    httpx
+    pydantic
+  ];
 
   nativeCheckInputs = [
     pillow
-    pydantic
     pytest-asyncio
     pytest-httpserver
     pytestCheckHook

From cb48707630dd99cf830f3a2a2a6975ea4a2f5a82 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:38:55 +0100
Subject: [PATCH 0784/1504] python312Packages.ollama: 0.4.4 -> 0.4.5

Diff: https://github.com/ollama/ollama-python/compare/refs/tags/v0.4.4...v0.4.5

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

diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index 5d9867a9d718..cd0c6c5c66d4 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "ollama";
-  version = "0.4.4";
+  version = "0.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "ollama";
     repo = "ollama-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GW/4adrU6/4cM96U6A8Btgv7Qt1jtSFJr9F8+zwTEpk=";
+    hash = "sha256-8Y3CRd+VXABuMpaqfJ5mYQhQ+U4Qk7EcjSnPd/hsebY=";
   };
 
   postPatch = ''

From 28243f67679f0e39d6d293b6b118ac2b1f8d775a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:52:37 +0100
Subject: [PATCH 0785/1504] python312Packages.onvif-zeep-async: 3.1.12 ->
 3.1.13

Diff: https://github.com/openvideolibs/python-onvif-zeep-async/compare/refs/tags/v3.1.12...v3.1.13

Changelog: https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/v3.1.13
---
 .../onvif-zeep-async/default.nix              | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index 8da15eabe811..58f02971c949 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -2,25 +2,30 @@
   lib,
   buildPythonPackage,
   ciso8601,
-  fetchPypi,
+  fetchFromGitHub,
   httpx,
   pythonOlder,
+  setuptools,
   zeep,
 }:
 
 buildPythonPackage rec {
   pname = "onvif-zeep-async";
-  version = "3.1.12";
-  format = "setuptools";
+  version = "3.1.13";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-TXSwrWnDXzntXZN/u09QB3BsIa6tpf6LpGFKEyA/GH8=";
+  src = fetchFromGitHub {
+    owner = "openvideolibs";
+    repo = "python-onvif-zeep-async";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Z9LtKcgyebmdrChRz0QwiQdnrtcIVeCtKQAvL9gBMY4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     ciso8601
     httpx
     zeep
@@ -33,9 +38,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "ONVIF Client Implementation in Python";
-    mainProgram = "onvif-cli";
     homepage = "https://github.com/hunterjm/python-onvif-zeep-async";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/v${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "onvif-cli";
   };
 }

From fff77f299b8c7ec43d46d802afbe87c079fb5a7a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:56:43 +0100
Subject: [PATCH 0786/1504] python312Packages.playwrightcapture: 1.27.4 ->
 1.27.5

Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.4...v1.27.5

Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.27.5
---
 pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 764f75c56471..02f2035d9c02 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.27.4";
+  version = "1.27.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1K/e7pJtfNSuQ1GlNT2m8P7zEXqC1zUP1M8acbW2kOY=";
+    hash = "sha256-TnK7CeW4mJGS77tzYkBQJbLn+niZEMWScpLLaWLmQAA=";
   };
 
   pythonRelaxDeps = [

From bdddc01368c999336b77a829c09ed1968afba3ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:59:18 +0100
Subject: [PATCH 0787/1504] python312Packages.slixmpp: 1.8.5 -> 1.8.6

Changelog: https://codeberg.org/poezio/slixmpp/releases/tag/slix-1.8.6
---
 pkgs/development/python-modules/slixmpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index e487f91d05a7..c86de6bd6157 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "slixmpp";
-  version = "1.8.5";
+  version = "1.8.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dePwrUhVX39ckijnBmwdQ1izPWQLT753PsNLA7f66aM=";
+    hash = "sha256-YK/Kp8laD7nn8RWctwRkpVWIBterrinNMeP8iD+biws=";
   };
 
   propagatedBuildInputs = [

From c330eb238a27327235819930cc6cd32ac6d355bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 13:01:10 +0100
Subject: [PATCH 0788/1504] python312Packages.tencentcloud-sdk-python: 3.0.1291
 -> 3.0.1292

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1291...3.0.1292

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1292/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index b3d177f36e9e..77cb84f65ed1 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1291";
+  version = "3.0.1292";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-Kc+gnY1swnN2Rle/JHPJlopziYbCIFijRKVZx5Phs8w=";
+    hash = "sha256-ESLSp/EtppSs+tkaSYU2CTadLTUYIvtlpyHI9fQs1es=";
   };
 
   build-system = [ setuptools ];

From 65c8af3bb29962f65b05c8faeb74fb787f42e13d Mon Sep 17 00:00:00 2001
From: RatCornu <balthazar.patiachvili@crans.org>
Date: Tue, 31 Dec 2024 12:45:36 +0100
Subject: [PATCH 0789/1504] hexpatch: init at 1.9.4

---
 pkgs/by-name/he/hexpatch/package.nix | 57 ++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/he/hexpatch/package.nix

diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
new file mode 100644
index 000000000000..973d44fa9364
--- /dev/null
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  cmake,
+  python3,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hexpatch";
+  version = "1.9.4";
+
+  src = fetchFromGitHub {
+    owner = "Etto48";
+    repo = "HexPatch";
+    tag = "v${version}";
+    hash = "sha256-tVJp8ZFHaHM6Yhty0n5W4ZDKG/L5+8ZcbbTnw2yLEOI=";
+  };
+
+  cargoHash = "sha256-oKZjLS4+blGMt3K6in4i7JLqKZ8uWAv/uBFU9VT0Ha8=";
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  postFixup = ''
+    ln -s $out/bin/hex-patch $out/bin/hexpatch
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    upateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Binary patcher and editor written in Rust with a terminal user interface";
+    longDescription = ''
+      HexPatch is a binary patcher and editor with a terminal user interface (TUI),
+      capable of disassembling instructions and assembling patches. It supports a
+      variety of architectures and file formats, and can edit remote files
+      via SSH.
+    '';
+    homepage = "https://etto48.github.io/HexPatch/";
+    changelog = "https://github.com/Etto48/HexPatch/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ratcornu ];
+    mainProgram = "hexpatch";
+  };
+}

From 0dcdae9d406614801d0cb8687c1bc5e71fb7a4a5 Mon Sep 17 00:00:00 2001
From: V3RM1N <niklas.choinowski@gmail.com>
Date: Tue, 31 Dec 2024 13:09:58 +0100
Subject: [PATCH 0790/1504] linuxPackages.nvidiaPackages.stable: use
 'production' (#365711)

update nvidia-x11 default.nix to use 'production' for stable version on non-i686-linux systems
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5232106bf7b6..cabb72ff1096 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -54,7 +54,7 @@ rec {
   # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt
 
   # Policy: use the highest stable version as the default (on our master).
-  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
+  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
 
   production = generic {
     version = "550.142";

From a995a36af12b517853e73ab7a4a1cfea5b5943f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 12:35:39 +0000
Subject: [PATCH 0791/1504] clickhouse-backup: 2.6.4 -> 2.6.5

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

diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix
index 5f9b04a38e07..51238ea60be2 100644
--- a/pkgs/by-name/cl/clickhouse-backup/package.nix
+++ b/pkgs/by-name/cl/clickhouse-backup/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "clickhouse-backup";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "Altinity";
     repo = "clickhouse-backup";
     rev = "v${version}";
-    hash = "sha256-e5PeMe4mk91PpEP0f+08Hr+Q97WfVGE7PDN4DI+9Quw=";
+    hash = "sha256-tRZo2PQYCzryd593MTzrHOzVxM58ONz61A6eekyr1wo=";
   };
 
-  vendorHash = "sha256-2F3H+Sbrw4Q782Y6gE3KvnXXmiZdSLrJr6AVBHSg9gA=";
+  vendorHash = "sha256-skL0yF0sVj3yza0LseNLfUn3jxPXuOFS/1FfHg0/H7Q=";
 
   ldflags = [
     "-X main.version=${version}"

From ec8ab9d7715482cf333fe5c38c08ff5e5540d995 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sun, 29 Dec 2024 22:30:54 -0300
Subject: [PATCH 0792/1504] pam_ldap: src from GitHub, fix license, add
 changelog, finalAttrs

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/pa/pam_ldap/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pa/pam_ldap/package.nix b/pkgs/by-name/pa/pam_ldap/package.nix
index 98f0c1b493f5..7da79331c360 100644
--- a/pkgs/by-name/pa/pam_ldap/package.nix
+++ b/pkgs/by-name/pa/pam_ldap/package.nix
@@ -1,18 +1,21 @@
 {
+  lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   pam,
   openldap,
   perl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pam_ldap";
   version = "186";
 
-  src = fetchurl {
-    url = "https://www.padl.com/download/pam_ldap-${version}.tar.gz";
-    sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8";
+  src = fetchFromGitHub {
+    owner = "PADL";
+    repo = "pam_ldap";
+    rev = "d1c2e08e4b023708648e2d720add19da6caf77d0";
+    hash = "sha256-W0n01HqWZaEoVShXJyND3xGe+snClGm+GZRw7P4fX10=";
   };
 
   postPatch = ''
@@ -33,11 +36,12 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.padl.com/OSS/pam_ldap.html";
     description = "LDAP backend for PAM";
+    changelog = "https://github.com/PADL/pam_ldap/blob/master/ChangeLog";
     longDescription = ''
       The pam_ldap module provides the means for Solaris and Linux servers and
       workstations to authenticate against LDAP directories, and to change their
       passwords in the directory.'';
-    license = "LGPL";
+    license = lib.licenses.gpl2;
     inherit (pam.meta) platforms;
   };
-}
+})

From dfa8f01ba4ed947a3305be09bb054c3c2e5e03ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 12:46:04 +0000
Subject: [PATCH 0793/1504] fig2dev: 3.2.9 -> 3.2.9a

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

diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix
index 1a02390498df..ea50385d213a 100644
--- a/pkgs/by-name/fi/fig2dev/package.nix
+++ b/pkgs/by-name/fi/fig2dev/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fig2dev";
-  version = "3.2.9";
+  version = "3.2.9a";
 
   src = fetchurl {
     url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
-    hash = "sha256-FeJGyNE8xy3iXggxQDitUM59Le+pzxr8Fy/X9ZMgkLE=";
+    hash = "sha256-YeGFOTF2hS8DuQGzsFsZ+8Wtglj/FC89pucLG4NRMyY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c596b4c6ee07e407611434e47152837a63ef05c0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Dec 2024 08:49:29 +0100
Subject: [PATCH 0794/1504] phpExtensions.yaml: 2.2.3 -> 2.2.4

---
 pkgs/development/php-packages/yaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix
index bb890a7fd350..fecc29777ad7 100644
--- a/pkgs/development/php-packages/yaml/default.nix
+++ b/pkgs/development/php-packages/yaml/default.nix
@@ -7,8 +7,8 @@
 buildPecl {
   pname = "yaml";
 
-  version = "2.2.3";
-  sha256 = "sha256-WTfrlyLd9tZGJnmc+gJFmP8kUuoVeZLk5nMxolP5AjY=";
+  version = "2.2.4";
+  sha256 = "sha256-jrNTuvh/FbG2Ksbrcci1iWhZWKH+iw49IqxZVg0OiRM=";
 
   configureFlags = [ "--with-yaml=${libyaml.dev}" ];
 

From fe2048d2343b349b241573f50d73a7404f7be82c Mon Sep 17 00:00:00 2001
From: schrobingus <brent.monning.jr@gmail.com>
Date: Thu, 5 Dec 2024 09:47:23 -0800
Subject: [PATCH 0795/1504] macmon: 0.3.3 -> 0.5.1

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

diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix
index 3b63efd27bf6..a32b017c0523 100644
--- a/pkgs/by-name/ma/macmon/package.nix
+++ b/pkgs/by-name/ma/macmon/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "macmon";
-  version = "0.3.3";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "vladkens";
     repo = "macmon";
     rev = "v${version}";
-    hash = "sha256-COpEjK1LUwGzhSgD09D4gx+MtS2hT0qt06rTPT8JQiQ=";
+    hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE=";
   };
 
-  cargoHash = "sha256-DTkpFGl8kTWttFGKTCpny2L0IRrCgpnnXaKIFoxWrW4=";
+  cargoHash = "sha256-mE6PGWjaCFpqVoE1zISOqwt6o5SakjJM4sPRtU90lPA=";
 
   meta = {
     homepage = "https://github.com/vladkens/macmon";

From 125226c402b4c5e5624820ce3598937b0f35c5a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 12:55:51 +0000
Subject: [PATCH 0796/1504] svdtools: 0.3.20 -> 0.3.21

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

diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix
index 909a54ae12fd..73d04f6f8f31 100644
--- a/pkgs/by-name/sv/svdtools/package.nix
+++ b/pkgs/by-name/sv/svdtools/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svdtools";
-  version = "0.3.20";
+  version = "0.3.21";
 
   src = fetchCrate {
     inherit version pname;
-    hash = "sha256-Sh3VnitkR72009kcD9u42UrDB1FKbHYllHGzM07eUTU=";
+    hash = "sha256-0ciEhtCJEerzyAcB/3xXnaStXBTi5SWcMplGlft9eeY=";
   };
 
-  cargoHash = "sha256-9QiDbJMWf4OWEVOVrz4uiyjmLHNhZg0VbM1/VKTjO9M=";
+  cargoHash = "sha256-+YBFjsPY3w+zjLtIB9GQXkuGy1ZHNT86clsQYiXeTJU=";
 
   meta = with lib; {
     description = "Tools to handle vendor-supplied, often buggy SVD files";

From 4dc54944730bb719cae22668d587ebfa104b2661 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 30 Dec 2024 14:54:02 -0700
Subject: [PATCH 0797/1504] zsync: fix build

---
 pkgs/by-name/zs/zsync/package.nix             | 40 ++++++++++++++-----
 .../read-blocksums-declaration-fix.patch      | 13 ++++++
 .../zs/zsync/remove-inexisting-rsumtest.patch | 17 ++++++++
 3 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
 create mode 100644 pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch

diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index d4f57f0a750c..d0ea03519de4 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -1,26 +1,46 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "zsync";
-  version = "0.6.2";
+  version = "0.6.2-unstable-2017-04-25";
 
-  src = fetchurl {
-    url = "http://zsync.moria.org.uk/download/zsync-${version}.tar.bz2";
-    hash = "sha256-C51TQzOHqk8EY0psY6XvqCAwcPIpivcqcF+b492mWvI=";
+  src = fetchFromGitHub {
+    owner = "cph6";
+    repo = "zsync";
+    rev = "6cfe374f8f2310cbd624664ca98e5bb28244ba7a";
+    hash = "sha256-SnCzNDMyhMx+2JmgsrjtYDa31Ki1EWix9iBfaduDnro=";
   };
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    # Suppress error "call to undeclared library function 'strcasecmp'" during compilation.
-    # The function is found by the linker correctly, so this doesn't introduce any issues.
-    NIX_CFLAGS_COMPILE = " -Wno-implicit-function-declaration";
-  };
+  sourceRoot = "${src.name}/c";
+
+  patches = [
+    ./remove-inexisting-rsumtest.patch
+    ./read-blocksums-declaration-fix.patch
+  ];
 
   makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
 
+  # Suppress error "call to undeclared library function 'strcasecmp'" during compilation.
+  # The function is found by the linker correctly, so this doesn't introduce any issues.
+  # Also supress errors that come from incompatible pointer types due to GCC 14 changes.
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isClang [
+      "-Wno-implicit-function-declaration"
+    ]
+    ++ lib.optionals stdenv.cc.isGNU [
+      "-Wno-error=incompatible-pointer-types"
+    ]
+  );
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   meta = with lib; {
     homepage = "http://zsync.moria.org.uk/";
     description = "File distribution system using the rsync algorithm";
diff --git a/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch b/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
new file mode 100644
index 000000000000..d4e8e638af49
--- /dev/null
+++ b/pkgs/by-name/zs/zsync/read-blocksums-declaration-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/libzsync/zsync.c b/libzsync/zsync.c
+index 793a426..783c349 100644
+--- a/libzsync/zsync.c
++++ b/libzsync/zsync.c
+@@ -116,7 +116,7 @@ struct zsync_state {
+ };
+ 
+ static int zsync_read_blocksums(struct zsync_state *zs, FILE * f,
+-                                int rsum_bytes, int checksum_bytes,
++                                int rsum_bytes, unsigned int checksum_bytes,
+                                 int seq_matches);
+ static int zsync_sha1(struct zsync_state *zs, int fh);
+ static int zsync_recompress(struct zsync_state *zs);
diff --git a/pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch b/pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch
new file mode 100644
index 000000000000..2e16b58d1f8a
--- /dev/null
+++ b/pkgs/by-name/zs/zsync/remove-inexisting-rsumtest.patch
@@ -0,0 +1,17 @@
+diff --git a/c/librcksum/Makefile.am b/c/librcksum/Makefile.am
+index 0216e49..f4fce72 100644
+--- a/librcksum/Makefile.am
++++ b/librcksum/Makefile.am
+@@ -2,9 +2,8 @@
+ 
+ noinst_LIBRARIES = librcksum.a
+ 
+-TESTS = md4test rsumtest
+-noinst_PROGRAMS = md4test rsumtest
++TESTS = md4test
++noinst_PROGRAMS = md4test
+ 
+ md4test_SOURCES = md4test.c md4.h md4.c
+-rsumtest_SOURCES = rsum.c rsumtest.c hash.c range.c state.c md4.c ../progress.c
+ librcksum_a_SOURCES = internal.h rcksum.h md4.h rsum.c hash.c state.c range.c md4.c
+

From 071f88331374e1120c58cc29cc7b4d8c60c79548 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 30 Dec 2024 14:55:41 -0700
Subject: [PATCH 0798/1504] zsync: add ryand56 as maintainer

---
 pkgs/by-name/zs/zsync/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index d0ea03519de4..359707c0731f 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -41,11 +41,14 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with lib; {
-    homepage = "http://zsync.moria.org.uk/";
+  meta = {
+    homepage = "https://github.com/cph6/zsync";
     description = "File distribution system using the rsync algorithm";
-    license = licenses.artistic2;
-    maintainers = with maintainers; [ viric ];
-    platforms = with platforms; all;
+    license = lib.licenses.artistic2;
+    maintainers = with lib.maintainers; [
+      viric
+      ryand56
+    ];
+    platforms = with lib.platforms; all;
   };
 }

From ea0737c3e7beba4924e4209c1998679055f31c85 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Tue, 31 Dec 2024 14:04:56 +0100
Subject: [PATCH 0799/1504] prowlarr: add pizzapim to maintainers

---
 pkgs/servers/prowlarr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index b248f7749160..2439ee91e2cb 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
     homepage = "https://wiki.servarr.com/prowlarr";
     changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ pizzapim ];
     mainProgram = "Prowlarr";
     platforms = [
       "aarch64-darwin"

From 3548c24dce87d41aa423014b40914924385246ea Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 31 Dec 2024 10:10:50 -0300
Subject: [PATCH 0800/1504] pam_ldap: add update script

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/pa/pam_ldap/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/pa/pam_ldap/package.nix b/pkgs/by-name/pa/pam_ldap/package.nix
index 7da79331c360..78238155c7ae 100644
--- a/pkgs/by-name/pa/pam_ldap/package.nix
+++ b/pkgs/by-name/pa/pam_ldap/package.nix
@@ -5,6 +5,7 @@
   pam,
   openldap,
   perl,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     openldap
   ];
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     homepage = "https://www.padl.com/OSS/pam_ldap.html";
     description = "LDAP backend for PAM";

From e26e47eb81aa6b4495936cbb1b63c728be4df9f7 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Tue, 31 Dec 2024 10:11:53 -0300
Subject: [PATCH 0801/1504] pam_ldap: 186 -> 0-unstable-2024-02-22

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/pa/pam_ldap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/pam_ldap/package.nix b/pkgs/by-name/pa/pam_ldap/package.nix
index 78238155c7ae..6bd6d4b72822 100644
--- a/pkgs/by-name/pa/pam_ldap/package.nix
+++ b/pkgs/by-name/pa/pam_ldap/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pam_ldap";
-  version = "186";
+  version = "0-unstable-2024-02-22";
 
   src = fetchFromGitHub {
     owner = "PADL";
     repo = "pam_ldap";
-    rev = "d1c2e08e4b023708648e2d720add19da6caf77d0";
-    hash = "sha256-W0n01HqWZaEoVShXJyND3xGe+snClGm+GZRw7P4fX10=";
+    rev = "656448f091cbeb9efb3ece08e6868e40b8e7b6f8";
+    hash = "sha256-o2RBewxhaXcMW9KIRwlxFv6YaWxaBngafvjEYxFchX4=";
   };
 
   postPatch = ''

From 4cb18b646a48cef8df60bd16fd1c5478d1c16886 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 14:02:36 +0100
Subject: [PATCH 0802/1504] python312Packages.ansible-compat: 24.9.1 -> 24.10.0

Changelog: https://github.com/ansible/ansible-compat/releases/tag/v24.10.0
---
 .../python-modules/ansible-compat/default.nix | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix
index 68eb5fb6a75e..b31b55082467 100644
--- a/pkgs/development/python-modules/ansible-compat/default.nix
+++ b/pkgs/development/python-modules/ansible-compat/default.nix
@@ -1,33 +1,38 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  ansible-core,
-  coreutils,
-  flaky,
-  pytest-mock,
-  pytestCheckHook,
-  pyyaml,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
   setuptools-scm,
+
+  # dependencies
+  pyyaml,
   subprocess-tee,
-  pythonOlder,
+
+  # tests
+  coreutils,
+  ansible-core,
+  flaky,
+  git,
+  pytest-mock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "ansible-compat";
-  version = "24.9.1";
+  version = "24.10.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
-  src = fetchPypi {
-    pname = "ansible_compat";
-    inherit version;
-    hash = "sha256-n/ICReG9nemyOjZ5AlJKsOEfvPt0GDGZbaXaW2Crld8=";
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = "ansible-compat";
+    tag = "v${version}";
+    hash = "sha256-cc97ENpoRoaYaGbnGeHU5z+ijCS8PLWtgXpQ0F3b5rk=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
@@ -40,26 +45,26 @@ buildPythonPackage rec {
   preCheck = ''
     export HOME=$(mktemp -d)
     substituteInPlace test/test_runtime.py \
-      --replace-fail "printenv" "${coreutils}/bin/printenv"
+      --replace-fail "printenv" "${lib.getExe' coreutils "printenv"}"
   '';
 
   nativeCheckInputs = [
     ansible-core
     flaky
+    git
     pytest-mock
     pytestCheckHook
   ];
 
   disabledTests = [
     # require network
+    "test_install_collection_from_disk"
+    "test_install_collection_git"
+    "test_load_plugins"
     "test_prepare_environment_with_collections"
     "test_prerun_reqs_v1"
     "test_prerun_reqs_v2"
-    "test_require_collection_wrong_version"
-    "test_require_collection"
-    "test_install_collection"
-    "test_install_collection_dest"
-    "test_upgrade_collection"
+    "test_require_collection_install"
     "test_require_collection_no_cache_dir"
     "test_runtime_has_playbook"
     "test_runtime_plugins"
@@ -68,11 +73,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ansible_compat" ];
 
-  meta = with lib; {
+  meta = {
     description = "Function collection that help interacting with various versions of Ansible";
     homepage = "https://github.com/ansible/ansible-compat";
     changelog = "https://github.com/ansible/ansible-compat/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dawidd6 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dawidd6 ];
   };
 }

From f3f3f7bae6c47c8cc251ef49938f7cb1e067ef20 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 31 Dec 2024 14:31:32 +0100
Subject: [PATCH 0803/1504] xpilot-ng: fix build

---
 pkgs/games/xpilot/default.nix                |   3 +
 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch | 168 +++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch

diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
index bdc41a27de8a..8e011af62f29 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/games/xpilot/default.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     zlib
     libXxf86misc
   ];
+
+  patches = [ ./xpilot-ng-gcc-14-fix.patch ];
+
   meta = with lib; {
     description = "Multiplayer X11 space combat game";
     homepage = "http://xpilot.sf.net/";
diff --git a/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch
new file mode 100644
index 000000000000..e66ed96971fe
--- /dev/null
+++ b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch
@@ -0,0 +1,168 @@
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/proto.h xpilot-ng-4.7.3-fixed/src/mapedit/proto.h
+--- xpilot-ng-4.7.3/src/mapedit/proto.h	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/mapedit/proto.h	2024-12-31 14:25:55.790083767 +0100
+@@ -73,15 +73,15 @@
+ int ResizeWidth(HandlerInfo_t info);
+ int ResizeHeight(HandlerInfo_t info);
+ int OpenPreferencesPopup(HandlerInfo_t info);
+-int OpenMapInfoPopup(void);
+-int OpenRobotsPopup(void);
+-int OpenVisibilityPopup(void);
+-int OpenCannonsPopup(void);
+-int OpenRoundsPopup(void);
+-int OpenInitItemsPopup(void);
+-int OpenMaxItemsPopup(void);
+-int OpenProbsPopup(void);
+-int OpenScoringPopup(void);
++int OpenMapInfoPopup(HandlerInfo_t info);
++int OpenRobotsPopup(HandlerInfo_t info);
++int OpenVisibilityPopup(HandlerInfo_t info);
++int OpenCannonsPopup(HandlerInfo_t info);
++int OpenRoundsPopup(HandlerInfo_t info);
++int OpenInitItemsPopup(HandlerInfo_t info);
++int OpenMaxItemsPopup(HandlerInfo_t info);
++int OpenProbsPopup(HandlerInfo_t info);
++int OpenScoringPopup(HandlerInfo_t info);
+ int ValidateCoordHandler(HandlerInfo_t info);
+ int ShowHoles(HandlerInfo_t info);
+ char MapData(int x, int y);
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/tools.c xpilot-ng-4.7.3-fixed/src/mapedit/tools.c
+--- xpilot-ng-4.7.3/src/mapedit/tools.c	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/mapedit/tools.c	2024-12-31 14:26:29.168082279 +0100
+@@ -747,7 +747,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenMapInfoPopup()
++int OpenMapInfoPopup(HandlerInfo_t info)
+ {
+     Window *temp;
+ 
+@@ -790,7 +790,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenRobotsPopup()
++int OpenRobotsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, robots);
+     return 0;
+@@ -801,7 +801,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenVisibilityPopup()
++int OpenVisibilityPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, visibility);
+     return 0;
+@@ -812,7 +812,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenCannonsPopup()
++int OpenCannonsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, cannons);
+     return 0;
+@@ -823,7 +823,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenRoundsPopup()
++int OpenRoundsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, rounds);
+     return 0;
+@@ -834,7 +834,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenInitItemsPopup()
++int OpenInitItemsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, inititems);
+     return 0;
+@@ -845,7 +845,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenMaxItemsPopup()
++int OpenMaxItemsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, maxitems);
+     return 0;
+@@ -856,7 +856,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenProbsPopup()
++int OpenProbsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, probs);
+     return 0;
+@@ -867,7 +867,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenScoringPopup()
++int OpenScoringPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, scoring);
+     return 0;
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/suibotdef.c xpilot-ng-4.7.3-fixed/src/server/suibotdef.c
+--- xpilot-ng-4.7.3/src/server/suibotdef.c	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/server/suibotdef.c	2024-12-31 14:07:28.316133143 +0100
+@@ -338,12 +338,6 @@
+ 
+ /* } */
+ 
+-struct collans {
+-    int line;
+-    int point;
+-    clvec_t moved;
+-};
+-
+ static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2);
+ static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2){ /* Wall between two given points?*/
+   
+@@ -405,7 +399,7 @@
+   /* ignore if there is enough time to deal with this object  later */
+   if((time_until_closest < 0) || (time_until_closest > maxtime))
+     /*option instead of fixed value: options.dodgetime))*/
+-    return;
++    return false;
+ 
+   /* get the square of the distance */
+   sqdistance =
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.c xpilot-ng-4.7.3-fixed/src/server/walls.c
+--- xpilot-ng-4.7.3/src/server/walls.c	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/server/walls.c	2024-12-31 14:09:46.086127001 +0100
+@@ -54,12 +54,6 @@
+ #error "This code assumes that negative numbers round upwards."
+ #endif
+ 
+-struct collans {
+-    int line;
+-    int point;
+-    clvec_t moved;
+-};
+-
+ struct tl2 {
+     int base;
+     int x;
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.h xpilot-ng-4.7.3-fixed/src/server/walls.h
+--- xpilot-ng-4.7.3/src/server/walls.h	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/server/walls.h	2024-12-31 14:04:50.198140193 +0100
+@@ -187,4 +187,11 @@
+ 
+ extern int num_polys, num_pstyles, num_estyles, num_bstyles;
+ 
++struct collans {
++    int line;
++    int point;
++    clvec_t moved;
++};
++
++extern void Move_point(const move_t *move, struct collans *answer);
+ #endif

From 740ec536a957b302ceedce84d7a9db6cc23f7b8e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 14:36:51 +0100
Subject: [PATCH 0804/1504] python312Packages.ansible-runner: fix

---
 .../python-modules/ansible-runner/default.nix | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 11d0f37773e4..d4f047917fb6 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -1,24 +1,31 @@
 {
   lib,
   stdenv,
-  ansible-core,
   buildPythonPackage,
-  fetchPypi,
-  glibcLocales,
-  importlib-metadata,
-  mock,
-  openssh,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
   packaging,
   pexpect,
+  python-daemon,
+  pyyaml,
+  pythonOlder,
+  importlib-metadata,
+
+  # tests
+  ansible-core,
+  glibcLocales,
+  mock,
+  openssh,
   pytest-mock,
   pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
-  python-daemon,
-  pyyaml,
-  setuptools,
-  setuptools-scm,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -26,11 +33,11 @@ buildPythonPackage rec {
   version = "2.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-gtArJUiDDzelNRe2XII8SvNxBpQGx9ITtckEHUXgxbY=";
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = "ansible-runner";
+    tag = version;
+    hash = "sha256-lmaYTdJ7NlaCJ5/CVds6Xzwbe45QXbtS3h8gi5xqvUc=";
   };
 
   postPatch = ''
@@ -53,13 +60,15 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     ansible-core # required to place ansible CLI onto the PATH in tests
     glibcLocales
-    pytestCheckHook
+    mock
+    openssh
     pytest-mock
     pytest-timeout
     pytest-xdist
-    mock
-    openssh
+    pytestCheckHook
+    versionCheckHook
   ];
+  versionCheckProgramArg = [ "--version" ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
@@ -77,10 +86,11 @@ buildPythonPackage rec {
     # Failed: DID NOT RAISE <class 'RuntimeError'>
     "test_validate_pattern"
     # Assertion error
+    "test_callback_plugin_censoring_does_not_overwrite"
     "test_get_role_list"
     "test_include_role_from_collection_events"
+    "test_module_level_no_log"
     "test_resolved_actions"
-    "test_callback_plugin_censoring_does_not_overwrite"
   ];
 
   disabledTestPaths =
@@ -98,11 +108,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ansible_runner" ];
 
-  meta = with lib; {
+  meta = {
     description = "Helps when interfacing with Ansible";
     homepage = "https://github.com/ansible/ansible-runner";
     changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
     mainProgram = "ansible-runner";
   };

From f669cc12bdee81ef986864602b766084943694e7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 14:37:12 +0100
Subject: [PATCH 0805/1504] python312Packages.ansible-runner: add GaetanLepage
 as maintainer

---
 pkgs/development/python-modules/ansible-runner/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index d4f047917fb6..073ca70b75ee 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -113,7 +113,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/ansible/ansible-runner";
     changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "ansible-runner";
   };
 }

From fde138989e7005225ab1832ea9a1115af2959b80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 13:42:15 +0000
Subject: [PATCH 0806/1504] fluent-bit: 3.2.3 -> 3.2.4

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

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 388996131179..93638c5efab3 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5Oyw3nHlAyywF+G0UiGyi1v+jAr8eyKt/1cDT5FdJXQ=";
+    hash = "sha256-oTCGjDmGVovsfj+4fjIKy/xpiuYc0Q44LYwYPI4dSF8=";
   };
 
   # optional only to avoid linux rebuild

From 5ed1ffa763c554bc48ec1625d2a56c70749ef04a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 13:44:12 +0000
Subject: [PATCH 0807/1504] intentrace: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix
index 8297f930b66a..1a8b19a2dccc 100644
--- a/pkgs/by-name/in/intentrace/package.nix
+++ b/pkgs/by-name/in/intentrace/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.4.1";
+  version = "0.4.2";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage {
     owner = "sectordistrict";
     repo = "intentrace";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9BlCDtWnBDJuo6ovDi347jAQSOG8LizJAyQ/xN+HJ0w=";
+    hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ=";
   };
 
-  cargoHash = "sha256-eJlAQpkI+RgfpDJGP9evWH28nU891PF4jeRpf2Os4Ts=";
+  cargoHash = "sha256-LkLSPFCfQxBb5DJZ67I7xPxzIYqTzKccyLW0S65/MLU=";
 
   meta = {
     description = "Prettified Linux syscall tracing tool (like strace)";

From 6ae1d01bcd55a739f3593e28dd8d2bf7dbd8fd69 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 14:41:39 +0100
Subject: [PATCH 0808/1504] cppcheck: improve and skip failing tests on darwin

---
 pkgs/by-name/cp/cppcheck/package.nix | 41 ++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index 2f355e33d958..7e57a23270e8 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -3,14 +3,20 @@
   stdenv,
   fetchFromGitHub,
 
+  # nativeBuildInputs
   docbook_xml_dtd_45,
   docbook_xsl,
   installShellFiles,
   libxslt,
-  pcre,
   pkg-config,
   python3,
   which,
+
+  # buildInputs
+  pcre,
+
+  versionCheckHook,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "danmar";
     repo = "cppcheck";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-awmWfVl7gMLROEkjYdSpbXnFaWQwEX9Ah8B9E0OOFm0=";
   };
 
@@ -58,10 +64,25 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
   doInstallCheck = true;
 
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre'
-  '';
+  postPatch =
+    ''
+      substituteInPlace Makefile \
+        --replace-fail 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre'
+    ''
+    # Expected:
+    # Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid
+    #
+    # Actual:
+    # Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1invalid
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace test/testmathlib.cpp \
+        --replace-fail \
+          'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");' \
+          "" \
+        --replace-fail \
+          'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");' \
+          ""
+    '';
 
   postBuild = ''
     make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
@@ -71,6 +92,10 @@ stdenv.mkDerivation (finalAttrs: {
     installManPage cppcheck.1
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
   installCheckPhase = ''
     runHook preInstallCheck
 
@@ -80,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstallCheck
   '';
 
+  passthru = {
+    updateScript = gitUpdater { };
+  };
+
   meta = {
     description = "Static analysis tool for C/C++ code";
     longDescription = ''

From ca4582d41ffb3a635900be6d4c2a27cfb6858df3 Mon Sep 17 00:00:00 2001
From: pwnwriter <hi@pwnwriter.me>
Date: Tue, 31 Dec 2024 09:03:08 -0500
Subject: [PATCH 0809/1504] rwalk: remove lockfile, fixed package with correct
 hash

---
 pkgs/by-name/rw/rwalk/Cargo.lock  | 3263 -----------------------------
 pkgs/by-name/rw/rwalk/package.nix |   15 +-
 2 files changed, 10 insertions(+), 3268 deletions(-)
 delete mode 100644 pkgs/by-name/rw/rwalk/Cargo.lock

diff --git a/pkgs/by-name/rw/rwalk/Cargo.lock b/pkgs/by-name/rw/rwalk/Cargo.lock
deleted file mode 100644
index 5dd721af76dd..000000000000
--- a/pkgs/by-name/rw/rwalk/Cargo.lock
+++ /dev/null
@@ -1,3263 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "const-random",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi-str"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cf4578926a981ab0ca955dc023541d19de37112bc24c1a197bd806d3d86ad1d"
-dependencies = [
- "ansitok",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "ansitok"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83"
-dependencies = [
- "nom 7.1.3",
- "vte 0.10.1",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
-dependencies = [
- "anstyle",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "async-trait"
-version = "0.1.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "backtrace"
-version = "0.3.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "better-panic"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036"
-dependencies = [
- "backtrace",
- "console",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "bytecount"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
-
-[[package]]
-name = "cc"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "4.5.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap-markdown"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ebc67e6266e14f8b31541c2f204724fa2ac7ad5c17d6f5908fbb92a60f42cff"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
- "terminal_size",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_complete_nushell"
-version = "4.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677"
-dependencies = [
- "clap",
- "clap_complete",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
-
-[[package]]
-name = "clipboard-win"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
-dependencies = [
- "error-code",
-]
-
-[[package]]
-name = "color-eyre"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
-dependencies = [
- "backtrace",
- "color-spantrace",
- "eyre",
- "indenter",
- "once_cell",
- "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
-
-[[package]]
-name = "colored"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
-dependencies = [
- "lazy_static 1.5.0",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "config"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
-dependencies = [
- "lazy_static 1.5.0",
- "nom 5.1.3",
- "rust-ini",
- "serde 1.0.216",
- "serde-hjson",
- "serde_json",
- "toml 0.5.11",
- "yaml-rust",
-]
-
-[[package]]
-name = "console"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
-dependencies = [
- "encode_unicode",
- "libc",
- "once_cell",
- "unicode-width 0.2.0",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "const-random"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom",
- "once_cell",
- "tiny-keccak",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "cssparser"
-version = "0.31.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "phf 0.11.2",
- "smallvec",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
-dependencies = [
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "csv"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde 1.0.216",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "directories"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "dtoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "ego-tree"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encode_unicode"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
-
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "error-code"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
-
-[[package]]
-name = "eyre"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "fd-lock"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
-dependencies = [
- "cfg-if",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "home"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http 1.2.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.2.0",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-rest-file"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d2f9d7798b724494ce3c33694afb86fb67bc33bcd03877c6f38953a180c05f"
-dependencies = [
- "http 0.2.12",
- "regex",
- "serde 1.0.216",
- "serde_json",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
-
-[[package]]
-name = "human-panic"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7"
-dependencies = [
- "anstream",
- "anstyle",
- "backtrace",
- "os_info",
- "serde 1.0.216",
- "serde_derive",
- "toml 0.8.19",
- "uuid",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.2.0",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.2.0",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexmap"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "indicatif"
-version = "0.17.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
-dependencies = [
- "console",
- "number_prefix",
- "portable-atomic",
- "unicode-segmentation",
- "unicode-width 0.2.0",
- "web-time",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
-
-[[package]]
-name = "js-sys"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.169"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "litemap"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
- "serde 1.0.216",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "markup5ever"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
-dependencies = [
- "log",
- "phf 0.11.2",
- "phf_codegen 0.11.2",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "merge"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9"
-dependencies = [
- "merge_derive",
- "num-traits 0.2.19",
-]
-
-[[package]]
-name = "merge_derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
-[[package]]
-name = "nibble_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-dependencies = [
- "spin",
-]
-
-[[package]]
-name = "nom"
-version = "5.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-dependencies = [
- "num-traits 0.2.19",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-src"
-version = "300.4.1+3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
-dependencies = [
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits 0.2.19",
-]
-
-[[package]]
-name = "os_info"
-version = "3.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce"
-dependencies = [
- "log",
- "serde 1.0.216",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
-[[package]]
-name = "papergrid"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb"
-dependencies = [
- "ansi-str",
- "ansitok",
- "bytecount",
- "fnv",
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros",
- "phf_shared 0.11.2",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
-dependencies = [
- "phf_generator 0.11.2",
- "phf_shared 0.11.2",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared 0.11.2",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
-dependencies = [
- "phf_generator 0.11.2",
- "phf_shared 0.11.2",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
-
-[[package]]
-name = "portable-atomic"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "ptree"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270"
-dependencies = [
- "ansi_term",
- "atty",
- "config",
- "directories",
- "petgraph",
- "serde 1.0.216",
- "serde-value",
- "tint",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "reqwest"
-version = "0.12.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
-dependencies = [
- "base64",
- "bytes",
- "futures-core",
- "futures-util",
- "http 1.2.0",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde 1.0.216",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-registry",
-]
-
-[[package]]
-name = "rhai"
-version = "1.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0277a46f29fe3b3eb10821ca2c65a4751b686b6c84422aae31695ba167b0fbc"
-dependencies = [
- "ahash",
- "bitflags 2.6.0",
- "instant",
- "no-std-compat",
- "num-traits 0.2.19",
- "once_cell",
- "rhai_codegen",
- "serde 1.0.216",
- "smallvec",
- "smartstring",
- "thin-vec",
-]
-
-[[package]]
-name = "rhai_codegen"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "rust-ini"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustix"
-version = "0.38.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
-
-[[package]]
-name = "rustyline"
-version = "13.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "clipboard-win",
- "fd-lock",
- "home",
- "libc",
- "log",
- "memchr",
- "nix",
- "radix_trie",
- "unicode-segmentation",
- "unicode-width 0.1.14",
- "utf8parse",
- "winapi",
-]
-
-[[package]]
-name = "rwalk"
-version = "0.8.7"
-dependencies = [
- "async-trait",
- "better-panic",
- "clap",
- "clap-markdown",
- "clap_complete",
- "clap_complete_nushell",
- "color-eyre",
- "colored",
- "csv",
- "dirs",
- "env_logger",
- "futures",
- "http-rest-file",
- "human-panic",
- "indicatif",
- "itertools",
- "lazy_static 1.5.0",
- "log",
- "md5",
- "merge",
- "num_cpus",
- "parking_lot",
- "ptree",
- "regex",
- "reqwest",
- "rhai",
- "rustyline",
- "scraper",
- "serde 1.0.216",
- "serde_json",
- "strip-ansi-escapes",
- "strsim",
- "tabled",
- "tokio",
- "toml 0.8.19",
- "url",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "scraper"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761fb705fdf625482d2ed91d3f0559dcfeab2798fe2771c69560a774865d0802"
-dependencies = [
- "ahash",
- "cssparser",
- "ego-tree",
- "getopts",
- "html5ever",
- "once_cell",
- "selectors",
- "tendril",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "selectors"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
-dependencies = [
- "bitflags 2.6.0",
- "cssparser",
- "derive_more",
- "fxhash",
- "log",
- "new_debug_unreachable",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "precomputed-hash",
- "servo_arc",
- "smallvec",
-]
-
-[[package]]
-name = "serde"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-
-[[package]]
-name = "serde"
-version = "1.0.216"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-hjson"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
-dependencies = [
- "lazy_static 1.5.0",
- "num-traits 0.1.43",
- "regex",
- "serde 0.8.23",
-]
-
-[[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float",
- "serde 1.0.216",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.216"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.133"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde 1.0.216",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde 1.0.216",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde 1.0.216",
-]
-
-[[package]]
-name = "servo_arc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
-dependencies = [
- "stable_deref_trait",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static 1.5.0",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-dependencies = [
- "serde 1.0.216",
-]
-
-[[package]]
-name = "smartstring"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "serde 1.0.216",
- "static_assertions",
- "version_check",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "string_cache"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared 0.10.0",
- "precomputed-hash",
- "serde 1.0.216",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "strip-ansi-escapes"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa"
-dependencies = [
- "vte 0.11.1",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "tabled"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e"
-dependencies = [
- "ansi-str",
- "ansitok",
- "papergrid",
- "tabled_derive",
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "tabled_derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
-dependencies = [
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "thin-vec"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
-dependencies = [
- "serde 1.0.216",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tint"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7af24570664a3074673dbbf69a65bdae0ae0b72f2949b1adfbacb736ee4d6896"
-dependencies = [
- "lazy_static 0.2.11",
-]
-
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
-[[package]]
-name = "tokio"
-version = "1.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde 1.0.216",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde 1.0.216",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde 1.0.216",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
-dependencies = [
- "indexmap",
- "serde 1.0.216",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-error"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unicode-width"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
-
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "vte"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
-dependencies = [
- "arrayvec",
- "utf8parse",
- "vte_generate_state_changes",
-]
-
-[[package]]
-name = "vte"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197"
-dependencies = [
- "utf8parse",
- "vte_generate_state_changes",
-]
-
-[[package]]
-name = "vte_generate_state_changes"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
-dependencies = [
- "cfg-if",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
-
-[[package]]
-name = "web-sys"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde 1.0.216",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "synstructure",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "synstructure",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix
index 3a6f657f94ea..8413f3cdc1c8 100644
--- a/pkgs/by-name/rw/rwalk/package.nix
+++ b/pkgs/by-name/rw/rwalk/package.nix
@@ -4,22 +4,22 @@
   fetchFromGitHub,
   pkg-config,
   openssl,
-  stdenv,
-  darwin,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rwalk";
-  version = "0.8.7";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "cestef";
     repo = "rwalk";
     tag = "v${version}";
-    hash = "sha256-rEecl8KdPqPreCRq8CZCBfpedInYD7+gfCwCst+VS90=";
+    hash = "sha256-W42b3fUezMpOPaNmTogUbgn67nCiKteCkkYUAux9Ng4=";
   };
 
-  cargoHash = "...";
+  cargoHash = "sha256-R5L19GMOjbXMVfjCuergxVZvAHCTLVkf3rmdvYJCMLU=";
 
   nativeBuildInputs = [
     pkg-config
@@ -36,9 +36,14 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
+
   versionCheckProgramArg = [ "--version" ];
   doInstallCheck = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Blazingly fast web directory scanner written in Rust";
     homepage = "https://github.com/cestef/rwalk";

From 0e7e95ea80a3b058646d482987f3b52dd319be5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 14:14:38 +0000
Subject: [PATCH 0810/1504] emacsPackages.lsp-bridge: 0-unstable-2024-12-20 ->
 0-unstable-2024-12-27

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

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
index 119a7467a3ce..d78656572273 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -31,13 +31,13 @@ let
 in
 melpaBuild {
   pname = "lsp-bridge";
-  version = "0-unstable-2024-12-20";
+  version = "0-unstable-2024-12-27";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "acebc35d9fed200bfb8237087074a50fcb0d71d2";
-    hash = "sha256-PwielZ2uTW+snP2D0p1pwSCTRQ83EO1sU90lMrd0pvE=";
+    rev = "402e65f372bb4268c0cd0514a12f0b0e9649c4af";
+    hash = "sha256-iUOjc/iEJMsR87Kk96729luQx34b924zlZejA2oPNZ0=";
   };
 
   patches = [

From 15332b265d59a2517d63528d88a399f0b777775e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 15:08:44 +0100
Subject: [PATCH 0811/1504] clazy: 1.12 -> 1.13

Diff: https://github.com/KDE/clazy/compare/v1.12...1.13

Changelog: https://github.com/KDE/clazy/blob/1.13/Changelog
---
 .../tools/analysis/clazy/default.nix          | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix
index b1578dc3f860..ceaa4a8ea65a 100644
--- a/pkgs/development/tools/analysis/clazy/default.nix
+++ b/pkgs/development/tools/analysis/clazy/default.nix
@@ -5,17 +5,19 @@
   llvmPackages,
   cmake,
   makeWrapper,
+  versionCheckHook,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clazy";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "clazy";
-    rev = "v${version}";
-    sha256 = "sha256-Fex0BAmCZUYcNJriHHt/QPi5IgSH/yhnpGCFFZMMD/g=";
+    tag = finalAttrs.version;
+    hash = "sha256-cNckRQ3+9HjJ1xYIDkosEP7K66+G0J3K9wt4OWLokLs=";
   };
 
   buildInputs = [
@@ -45,12 +47,22 @@ stdenv.mkDerivation rec {
       --suffix CPLUS_INCLUDE_PATH : "${llvmPackages.clang}/resource-root/include"
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = gitUpdater { };
+  };
+
   meta = {
     description = "Qt-oriented static code analyzer based on the Clang framework";
     homepage = "https://github.com/KDE/clazy";
+    changelog = "https://github.com/KDE/clazy/blob/${finalAttrs.version}/Changelog";
     license = lib.licenses.lgpl2Plus;
     maintainers = [ lib.maintainers.cadkin ];
     platforms = lib.platforms.linux;
   };
-
-}
+})

From bc269b93b00e6c576da545bbfca431c37afd9401 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 15:30:53 +0100
Subject: [PATCH 0812/1504] python312Packages.ansible-compat: remove unneeded
 git from nativeCheckInputs

---
 pkgs/development/python-modules/ansible-compat/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix
index b31b55082467..16e9924ef09f 100644
--- a/pkgs/development/python-modules/ansible-compat/default.nix
+++ b/pkgs/development/python-modules/ansible-compat/default.nix
@@ -15,7 +15,6 @@
   coreutils,
   ansible-core,
   flaky,
-  git,
   pytest-mock,
   pytestCheckHook,
 }:
@@ -51,7 +50,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     ansible-core
     flaky
-    git
     pytest-mock
     pytestCheckHook
   ];

From df28e19d177abd14270df1e8c88378d2fe410c00 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 11:55:06 +0100
Subject: [PATCH 0813/1504] solc: 0.8.21 -> 0.8.28

Diff: https://github.com/ethereum/solidity/compare/v0.8.21...v0.8.28

Changelog: https://github.com/ethereum/solidity/releases/tag/v0.8.28
---
 pkgs/by-name/so/solc/package.nix | 77 ++++++++++++++++----------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix
index db9dada8db20..d36dc55bb69d 100644
--- a/pkgs/by-name/so/solc/package.nix
+++ b/pkgs/by-name/so/solc/package.nix
@@ -9,6 +9,7 @@
   jq,
   ncurses,
   python3,
+  versionCheckHook,
   z3Support ? true,
   z3_4_11 ? null,
   cvc4Support ? gccStdenv.hostPlatform.isLinux,
@@ -27,34 +28,24 @@ assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0";
 assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
 
 let
-  jsoncppVersion = "1.9.3";
-  jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
-  jsoncpp = fetchzip {
-    url = jsoncppUrl;
-    sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq";
-  };
-
-  range3Version = "0.12.0";
-  range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz";
-  range3 = fetchzip {
-    url = range3Url;
-    sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
-  };
-
-  fmtlibVersion = "8.0.1";
-  fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz";
-  fmtlib = fetchzip {
-    url = fmtlibUrl;
-    sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
-  };
-
   pname = "solc";
-  version = "0.8.21";
-  meta = with lib; {
+
+  version = "0.8.28";
+  linuxHash = "sha256-kosJ10stylGK5NUtsnMM7I+OfhR40TXPQDvnggOFLLc=";
+  darwinHash = "sha256-gVFbDlPeqiZtVJVFzKrApalubU6CAcd/ZzsscQl22eo=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  meta = {
     description = "Compiler for Ethereum smart contract language Solidity";
     homepage = "https://github.com/ethereum/solidity";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/ethereum/solidity/releases/tag/v${version}";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
       dbrock
       akru
       lionello
@@ -65,23 +56,21 @@ let
   solc =
     if gccStdenv.hostPlatform.isLinux then
       gccStdenv.mkDerivation rec {
-        inherit pname version meta;
+        inherit
+          pname
+          version
+          nativeInstallCheckInputs
+          versionCheckProgramArg
+          doInstallCheck
+          meta
+          ;
 
         # upstream suggests avoid using archive generated by github
         src = fetchzip {
           url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-          sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk=";
+          hash = linuxHash;
         };
 
-        postPatch = ''
-          substituteInPlace cmake/jsoncpp.cmake \
-            --replace "${jsoncppUrl}" ${jsoncpp}
-          substituteInPlace cmake/range-v3.cmake \
-            --replace "${range3Url}" ${range3}
-          substituteInPlace cmake/fmtlib.cmake \
-            --replace "${fmtlibUrl}" ${fmtlib}
-        '';
-
         cmakeFlags =
           [
             "-DBoost_USE_STATIC_LIBS=OFF"
@@ -143,9 +132,12 @@ let
           popd
         '';
 
-        doInstallCheck = true;
         installCheckPhase = ''
+          runHook preInstallCheck
+
           $out/bin/solc --version > /dev/null
+
+          runHook postInstallCheck
         '';
 
         passthru.tests = {
@@ -156,11 +148,18 @@ let
       }
     else
       gccStdenv.mkDerivation rec {
-        inherit pname version meta;
+        inherit
+          pname
+          version
+          nativeInstallCheckInputs
+          versionCheckProgramArg
+          doInstallCheck
+          meta
+          ;
 
         src = pkgs.fetchurl {
           url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";
-          sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI=";
+          hash = darwinHash;
         };
         dontUnpack = true;
 

From 3b085fd66da985920f650ddb625497620cfc8748 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 31 Dec 2024 13:06:12 +0100
Subject: [PATCH 0814/1504] solc: fix build on GCC 14

---
 pkgs/by-name/so/solc/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix
index d36dc55bb69d..b104d8130f37 100644
--- a/pkgs/by-name/so/solc/package.nix
+++ b/pkgs/by-name/so/solc/package.nix
@@ -71,6 +71,15 @@ let
           hash = linuxHash;
         };
 
+        # Fix build with GCC 14
+        # Submitted upstream: https://github.com/ethereum/solidity/pull/15685
+        postPatch = ''
+          substituteInPlace test/yulPhaser/Chromosome.cpp \
+            --replace-fail \
+              "BOOST_TEST(abs" \
+              "BOOST_TEST(fabs"
+        '';
+
         cmakeFlags =
           [
             "-DBoost_USE_STATIC_LIBS=OFF"

From b24078ce1d0a8cef251bfe1d23f92f1ba9aa0372 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 31 Dec 2024 15:28:56 +0100
Subject: [PATCH 0815/1504] mplayer: 1.5-unstable-2024-07-03 ->
 1.5-unstable-2024-12-21

---
 pkgs/applications/video/mplayer/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index f84c8e5c18ef..bf94c7c1d9f1 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -120,12 +120,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "mplayer";
-  version = "1.5-unstable-2024-07-03";
+  version = "1.5-unstable-2024-12-21";
 
   src = fetchsvn {
     url = "svn://svn.mplayerhq.hu/mplayer/trunk";
-    rev = "38637";
-    hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE=";
+    rev = "38668";
+    hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY=";
   };
 
   prePatch = ''
@@ -276,7 +276,8 @@ stdenv.mkDerivation rec {
     description = "Movie player that supports many video formats";
     homepage = "http://mplayerhq.hu";
     license = licenses.gpl2Only;
-    maintainers = [ ];
+    # Picking it up: no idea about the origin of some choices (but seems fine)
+    maintainers = [ maintainers.raskin ];
     platforms = [
       "i686-linux"
       "x86_64-linux"

From 675ae46d5d0b2ecf9416b46ba7bc5477edcb0ff3 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 31 Dec 2024 15:28:56 +0100
Subject: [PATCH 0816/1504] mplayer: 1.5-unstable-2024-07-03 ->
 1.5-unstable-2024-12-21

---
 pkgs/applications/video/mplayer/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index f84c8e5c18ef..bf94c7c1d9f1 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -120,12 +120,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "mplayer";
-  version = "1.5-unstable-2024-07-03";
+  version = "1.5-unstable-2024-12-21";
 
   src = fetchsvn {
     url = "svn://svn.mplayerhq.hu/mplayer/trunk";
-    rev = "38637";
-    hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE=";
+    rev = "38668";
+    hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY=";
   };
 
   prePatch = ''
@@ -276,7 +276,8 @@ stdenv.mkDerivation rec {
     description = "Movie player that supports many video formats";
     homepage = "http://mplayerhq.hu";
     license = licenses.gpl2Only;
-    maintainers = [ ];
+    # Picking it up: no idea about the origin of some choices (but seems fine)
+    maintainers = [ maintainers.raskin ];
     platforms = [
       "i686-linux"
       "x86_64-linux"

From 3a8ff68623f62859026343669e65a3002d22b6ba Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 31 Dec 2024 14:31:32 +0100
Subject: [PATCH 0817/1504] xpilot-ng: fix build

---
 pkgs/games/xpilot/default.nix                |   3 +
 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch | 168 +++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch

diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
index bdc41a27de8a..8e011af62f29 100644
--- a/pkgs/games/xpilot/default.nix
+++ b/pkgs/games/xpilot/default.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     zlib
     libXxf86misc
   ];
+
+  patches = [ ./xpilot-ng-gcc-14-fix.patch ];
+
   meta = with lib; {
     description = "Multiplayer X11 space combat game";
     homepage = "http://xpilot.sf.net/";
diff --git a/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch
new file mode 100644
index 000000000000..e66ed96971fe
--- /dev/null
+++ b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch
@@ -0,0 +1,168 @@
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/proto.h xpilot-ng-4.7.3-fixed/src/mapedit/proto.h
+--- xpilot-ng-4.7.3/src/mapedit/proto.h	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/mapedit/proto.h	2024-12-31 14:25:55.790083767 +0100
+@@ -73,15 +73,15 @@
+ int ResizeWidth(HandlerInfo_t info);
+ int ResizeHeight(HandlerInfo_t info);
+ int OpenPreferencesPopup(HandlerInfo_t info);
+-int OpenMapInfoPopup(void);
+-int OpenRobotsPopup(void);
+-int OpenVisibilityPopup(void);
+-int OpenCannonsPopup(void);
+-int OpenRoundsPopup(void);
+-int OpenInitItemsPopup(void);
+-int OpenMaxItemsPopup(void);
+-int OpenProbsPopup(void);
+-int OpenScoringPopup(void);
++int OpenMapInfoPopup(HandlerInfo_t info);
++int OpenRobotsPopup(HandlerInfo_t info);
++int OpenVisibilityPopup(HandlerInfo_t info);
++int OpenCannonsPopup(HandlerInfo_t info);
++int OpenRoundsPopup(HandlerInfo_t info);
++int OpenInitItemsPopup(HandlerInfo_t info);
++int OpenMaxItemsPopup(HandlerInfo_t info);
++int OpenProbsPopup(HandlerInfo_t info);
++int OpenScoringPopup(HandlerInfo_t info);
+ int ValidateCoordHandler(HandlerInfo_t info);
+ int ShowHoles(HandlerInfo_t info);
+ char MapData(int x, int y);
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/tools.c xpilot-ng-4.7.3-fixed/src/mapedit/tools.c
+--- xpilot-ng-4.7.3/src/mapedit/tools.c	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/mapedit/tools.c	2024-12-31 14:26:29.168082279 +0100
+@@ -747,7 +747,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenMapInfoPopup()
++int OpenMapInfoPopup(HandlerInfo_t info)
+ {
+     Window *temp;
+ 
+@@ -790,7 +790,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenRobotsPopup()
++int OpenRobotsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, robots);
+     return 0;
+@@ -801,7 +801,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenVisibilityPopup()
++int OpenVisibilityPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, visibility);
+     return 0;
+@@ -812,7 +812,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenCannonsPopup()
++int OpenCannonsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, cannons);
+     return 0;
+@@ -823,7 +823,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenRoundsPopup()
++int OpenRoundsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, rounds);
+     return 0;
+@@ -834,7 +834,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenInitItemsPopup()
++int OpenInitItemsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, inititems);
+     return 0;
+@@ -845,7 +845,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenMaxItemsPopup()
++int OpenMaxItemsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, maxitems);
+     return 0;
+@@ -856,7 +856,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenProbsPopup()
++int OpenProbsPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, probs);
+     return 0;
+@@ -867,7 +867,7 @@
+ /* Arguments :                                                             */
+ /* Purpose :                                                               */
+ /***************************************************************************/
+-int OpenScoringPopup()
++int OpenScoringPopup(HandlerInfo_t info)
+ {
+     XMapWindow(display, scoring);
+     return 0;
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/suibotdef.c xpilot-ng-4.7.3-fixed/src/server/suibotdef.c
+--- xpilot-ng-4.7.3/src/server/suibotdef.c	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/server/suibotdef.c	2024-12-31 14:07:28.316133143 +0100
+@@ -338,12 +338,6 @@
+ 
+ /* } */
+ 
+-struct collans {
+-    int line;
+-    int point;
+-    clvec_t moved;
+-};
+-
+ static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2);
+ static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2){ /* Wall between two given points?*/
+   
+@@ -405,7 +399,7 @@
+   /* ignore if there is enough time to deal with this object  later */
+   if((time_until_closest < 0) || (time_until_closest > maxtime))
+     /*option instead of fixed value: options.dodgetime))*/
+-    return;
++    return false;
+ 
+   /* get the square of the distance */
+   sqdistance =
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.c xpilot-ng-4.7.3-fixed/src/server/walls.c
+--- xpilot-ng-4.7.3/src/server/walls.c	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/server/walls.c	2024-12-31 14:09:46.086127001 +0100
+@@ -54,12 +54,6 @@
+ #error "This code assumes that negative numbers round upwards."
+ #endif
+ 
+-struct collans {
+-    int line;
+-    int point;
+-    clvec_t moved;
+-};
+-
+ struct tl2 {
+     int base;
+     int x;
+diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.h xpilot-ng-4.7.3-fixed/src/server/walls.h
+--- xpilot-ng-4.7.3/src/server/walls.h	2010-03-05 02:03:49.000000000 +0100
++++ xpilot-ng-4.7.3-fixed/src/server/walls.h	2024-12-31 14:04:50.198140193 +0100
+@@ -187,4 +187,11 @@
+ 
+ extern int num_polys, num_pstyles, num_estyles, num_bstyles;
+ 
++struct collans {
++    int line;
++    int point;
++    clvec_t moved;
++};
++
++extern void Move_point(const move_t *move, struct collans *answer);
+ #endif

From c0ee061183e7040a18ee9c8b70cee935d9a98a2d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Dec 2024 20:42:49 +0800
Subject: [PATCH 0818/1504] pantheon.switchboard-plug-applications: 8.0.0 ->
 8.1.0

https://github.com/elementary/switchboard-plug-applications/compare/8.0.0...8.1.0
---
 .../pantheon/apps/switchboard-plugs/applications/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index f8d5db7c8b8a..2a7f5c78df6f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-dExMuPZJl/l7lRIY8kkmuRcQaPS39VBfE0dRrINLWx8=";
+    sha256 = "sha256-jdSdzOHu1u/8N/eN6D9MjR/9K7n+rfmuBpyRSweb6lA=";
   };
 
   nativeBuildInputs = [

From 8725e466ef2bcc5be69106c16dbf69b9ef989273 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 30 Dec 2024 15:36:05 +0000
Subject: [PATCH 0819/1504] release: forbid use of `lib.fileset` in Nixpkgs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Due to Nix bug <https://github.com/NixOS/nix/issues/11503>,
`builtins.filterSource` and chroot stores interact in a confusing
and broken way that breaks `lib.fileset`. This means that uses of
the API inside Nixpkgs keep breaking the NixOS installer, blocking
the channel. The resulting error messages are inscrutable (they look
like “the installer test is trying to download `curl`…?” and
eventually bottom out in a derivation that has the wrong `outPath`
because of the chroot store causing an incorrect `lib.fileset` result).

Whenever this happens, someone (well, in practice K900 or I)
has to bisect the change that introduced it and remove the use of
`lib.fileset`. This has happened at least three times in the past
four months (I believe I might actually be missing one here, but
these are the ones I remember and could easily dig up):

* <https://github.com/NixOS/nixpkgs/pull/340046>
* <https://github.com/NixOS/nixpkgs/pull/352491>
* <https://github.com/NixOS/nixpkgs/pull/369459>

The options I see here are:

1. Forbid use of `lib.fileset` within Nixpkgs until the Nix bug is
   fixed. This is the approach taken here. External users of Nixpkgs
   can continue to use the API as normal, but using it from within
   something that affects any release jobset `outPath`s will cause an
   evaluation failure with a hopefully‐helpful error message.

2. Forbid `lib.fileset` and also all of the other library APIs that use
   `builtins.filterSource`. I’m happy to do this, but so far none of
   those have broken the installer, so I decided to start small and
   worry about the others if they end up causing a problem in practice.

3. Forbid `builtins.filterSource` directly. This is hard and would
   require more invasive `builtins.scopedImport` crimes to do at
   evaluation time. I think this would realistically have to be done in
   something like nixpkgs-vet instead and I didn’t have much luck
   shoehorning a check like this into that codebase when I tried.

4. Fix the Nix bug. This would be great! But also it doesn’t seem to be
   happening any time soon, it seems difficult to fix in a way that
   doesn’t subtly break compatibility with the previous semantics, and
   arguably the fix would need backporting all the way back to 2.3
   given our minimum version policy.

5. Do nothing; have people continue to innocuously use `lib.fileset`
   throughout Nixpkgs, breaking the installer whenever one of them
   sneaks in to that closure, causing the channel to be blocked and
   requiring expensive bisections to narrow down the inscrutable test
   failure to the package using `lib.fileset`, which then needs moving
   back off it. This sucks for the people who keep having to track it
   down, holds back important channel bumps, and the criteria for when
   it’s okay to use `lib.fileset` are not realistically possible to
   teach to all contributors.

I'd be happy to work on (2) as an alternative; (3) would be difficult
and seems like overkill, (4) is not really something I trust myself
to do and wouldn’t address the immediate problem, and (5) isn’t
sustainable. I think that the current approach here is the best
trade‐off for now, as `lib.fileset` seems to be the only prominent
user of the `builtins.filterSource` API that works with full store
paths, exposing it to the Nix bug. It’s unfortunate to lose the
nice API, but since we can’t rely on it to produce correct results
and the channels keep getting blocked as a result, I don’t think
we really have an alternative right now.
---
 pkgs/top-level/default.nix                    | 23 +++++++++++++++++-
 pkgs/top-level/release-cross.nix              |  5 +++-
 pkgs/top-level/release-cuda.nix               |  2 ++
 pkgs/top-level/release-lib.nix                |  5 +++-
 pkgs/top-level/release-outpaths.nix           |  2 ++
 pkgs/top-level/release-python.nix             |  2 ++
 pkgs/top-level/release-small.nix              |  2 ++
 .../release-unfree-redistributable.nix        |  2 ++
 pkgs/top-level/release.nix                    | 24 +++++++++++--------
 9 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 5c224802d5bf..fd443ac773ff 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -27,6 +27,10 @@
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
 
+, # Temporary hack to let Nixpkgs forbid internal use of `lib.fileset`
+  # until <https://github.com/NixOS/nix/issues/11503> is fixed.
+  __allowFileset ? true
+
 , # List of overlays layers used to extend Nixpkgs.
   overlays ? []
 
@@ -47,7 +51,24 @@ let # Rename the function arguments
   crossSystem0 = crossSystem;
 
 in let
-  lib = import ../../lib;
+  pristineLib = import ../../lib;
+
+  lib =
+    if __allowFileset then
+      pristineLib
+    else
+      pristineLib.extend (_: _: {
+        fileset = abort ''
+
+          The use of `lib.fileset` is currently forbidden in Nixpkgs due to the
+          upstream Nix bug <https://github.com/NixOS/nix/issues/11503>. This
+          causes difficult‐to‐debug errors when combined with chroot stores,
+          such as in the NixOS installer.
+
+          For packages that require source to be vendored inside Nixpkgs,
+          please use a subdirectory of the package instead.
+        '';
+      });
 
   inherit (lib) throwIfNot;
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 1ce8f8f709e2..492a7503a03d 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -17,7 +17,10 @@
 , # Strip most of attributes when evaluating to spare memory usage
   scrubJobs ? true
 , # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
+  nixpkgsArgs ? {
+    config = { allowUnfree = false; inHydra = true; };
+    __allowFileset = false;
+  }
 }:
 
 let
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 945f0e6d2954..a19bc6f8ecaa 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -43,6 +43,8 @@ in
       "${variant}Support" = true;
       inHydra = true;
     };
+
+    __allowFileset = false;
   },
   ...
 }@args:
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index c7581c47d341..a2821386ce3e 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -3,7 +3,10 @@
 , packageSet ? (import ../..)
 , scrubJobs ? true
 , # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-  nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
+  nixpkgsArgs ? {
+    config = { allowUnfree = false; inHydra = true; };
+    __allowFileset = false;
+  }
 }:
 
 let
diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix
index 0b70ea631244..e6caabec04e9 100644
--- a/pkgs/top-level/release-outpaths.nix
+++ b/pkgs/top-level/release-outpaths.nix
@@ -57,6 +57,8 @@ let
 
             inHydra = true;
           };
+
+          __allowFileset = false;
         };
       };
   recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index a6222acaad53..161a6ddb68c3 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -15,6 +15,8 @@
       allowUnfree = false;
       inHydra = true;
     };
+
+    __allowFileset = false;
   },
 }:
 
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 42cf6e79b732..511cef6a0d8a 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -19,6 +19,8 @@
       allowUnfree = false;
       inHydra = true;
     };
+
+    __allowFileset = false;
   },
 }:
 
diff --git a/pkgs/top-level/release-unfree-redistributable.nix b/pkgs/top-level/release-unfree-redistributable.nix
index 96384e9fb020..45940c4d02cc 100644
--- a/pkgs/top-level/release-unfree-redistributable.nix
+++ b/pkgs/top-level/release-unfree-redistributable.nix
@@ -37,6 +37,8 @@
       cudaSupport = true;
       inHydra = true;
     };
+
+    __allowFileset = false;
   },
   # We only build the full package set on infrequently releasing channels.
   full ? false,
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 0140f0bd9d6a..78bdf1491125 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -28,16 +28,20 @@
   # Strip most of attributes when evaluating to spare memory usage
 , scrubJobs ? true
   # Attributes passed to nixpkgs. Don't build packages marked as unfree.
-, nixpkgsArgs ? { config = {
-    allowUnfree = false;
-    inHydra = true;
-    # Exceptional unsafe packages that we still build and distribute,
-    # so users choosing to allow don't have to rebuild them every time.
-    permittedInsecurePackages = [
-      "olm-3.2.16" # see PR #347899
-      "kanidm_1_3-1.3.3"
-    ];
-  }; }
+, nixpkgsArgs ? {
+    config = {
+      allowUnfree = false;
+      inHydra = true;
+      # Exceptional unsafe packages that we still build and distribute,
+      # so users choosing to allow don't have to rebuild them every time.
+      permittedInsecurePackages = [
+        "olm-3.2.16" # see PR #347899
+        "kanidm_1_3-1.3.3"
+      ];
+    };
+
+    __allowFileset = false;
+  }
 
   # This flag, if set to true, will inhibit the use of `mapTestOn`
   # and `release-lib.packagePlatforms`.  Generally, it causes the

From 66ca2175e0aede0b81f44cf0911299678f49e057 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 23:02:07 +0800
Subject: [PATCH 0820/1504] pantheon.switchboard-plug-mouse-touchpad: 8.0.1 ->
 8.0.2

https://github.com/elementary/switchboard-plug-mouse-touchpad/compare/8.0.1...8.0.2
---
 .../apps/switchboard-plugs/mouse-touchpad/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 2780d98dd38e..4f0d896dc290 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-mouse-touchpad";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-aOJnjHCyc1tSyF7AuW5nXUXcvzBnZ+pwU91Mk+veusg=";
+    sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk=";
   };
 
   patches = [

From 96f930534f59ec54a2c76391a9cbc4ec80a9a44e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 31 Dec 2024 16:02:46 +0100
Subject: [PATCH 0821/1504] buildHomeAssistantComponent: fix output dirname
 with manifest in repo root

---
 pkgs/servers/home-assistant/build-custom-component/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix
index 02f1d01a1170..a3b5b5d5e834 100644
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@@ -32,7 +32,7 @@ home-assistant.python.pkgs.buildPythonPackage (
       mkdir $out
       if [[ -f ./manifest.json ]]; then
         mkdir $out/custom_components
-        cp -R $(realpath .)  $out/custom_components/
+        cp -R "$(realpath .)" "$out/custom_components/${domain}"
       else
         cp -r ./custom_components/ $out/
       fi

From 8112df3f902c2db910367c3b3c5295d3ba2bd674 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 20 Dec 2024 22:42:58 +0100
Subject: [PATCH 0822/1504] gdal: switch to openexr_3

There are several CVEs affecting openexr v2 and it seems to disturb
people. As gdal supports openexr v3, let's live in the future and
upgrade this dep.

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index d88527b138c2..f4d02c2c72aa 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -60,7 +60,7 @@
   libxml2,
   lz4,
   netcdf,
-  openexr,
+  openexr_3,
   openjpeg,
   openssl,
   pcre2,
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
       nonDarwinDeps = lib.optionals (!stdenv.hostPlatform.isDarwin) (
         [
           # tests for formats enabled by these packages fail on macos
-          openexr
+          openexr_3
           xercesc
         ]
         ++ arrowDeps

From 2417a5e2b5eac5d6575add01fe974de4d2681c48 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 13:38:38 +0000
Subject: [PATCH 0823/1504] xfce.thunar-archive-plugin: 0.5.2 -> 0.5.3

https://gitlab.xfce.org/thunar-plugins/thunar-archive-plugin/-/compare/thunar-archive-plugin-0.5.2...thunar-archive-plugin-0.5.3
---
 pkgs/desktops/xfce/thunar-plugins/archive/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index bdcca89a918e..93340bdb623e 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -5,20 +5,18 @@
   thunar,
   exo,
   libxfce4util,
-  intltool,
   gettext,
 }:
 
 mkXfceDerivation {
   category = "thunar-plugins";
   pname = "thunar-archive-plugin";
-  version = "0.5.2";
+  version = "0.5.3";
   odd-unstable = false;
 
-  sha256 = "sha256-vbuFosj2qxDus7vu9WfRiFpLwnTRnmLVGCDa0tNQecU=";
+  sha256 = "sha256-9EjEQml/Xdj/jCtC4ZuGdmpeNnOqUWJOqoVzLuxzG6s=";
 
   nativeBuildInputs = [
-    intltool
     gettext
   ];
 

From 978bbf27dabaac39d87a9e4ae8196833b7dd0bdb Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 13:38:43 +0000
Subject: [PATCH 0824/1504] xfce.thunar-media-tags-plugin: 0.4.0 -> 0.5.0

https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/-/compare/thunar-media-tags-plugin-0.4.0...thunar-media-tags-plugin-0.5.0
---
 pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
index a69eb7cd1e86..586498da7dbd 100644
--- a/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/media-tags/default.nix
@@ -5,7 +5,6 @@
   gtk3,
   thunar,
   libxfce4util,
-  intltool,
   gettext,
   taglib,
 }:
@@ -13,13 +12,12 @@
 mkXfceDerivation {
   category = "thunar-plugins";
   pname = "thunar-media-tags-plugin";
-  version = "0.4.0";
+  version = "0.5.0";
   odd-unstable = false;
 
-  sha256 = "sha256-2WA7EtDmNl8XP0wK00iyQcSqV3mnfHNJZTKhBJ/YWPQ=";
+  sha256 = "sha256-71YBA1deR8aV8hoZ4F0TP+Q5sdcVQAB9n3B+pcpJMSQ=";
 
   nativeBuildInputs = [
-    intltool
     gettext
   ];
 

From d9615b137e42e42af22abc6d8ca343cac6a30d1b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 13:39:01 +0000
Subject: [PATCH 0825/1504] xfce.thunar: 4.20.0 -> 4.20.1

https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.20.0...thunar-4.20.1
---
 pkgs/desktops/xfce/core/thunar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 74318b3622d3..23e6799845ca 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -23,9 +23,9 @@
 let unwrapped = mkXfceDerivation {
   category = "xfce";
   pname = "thunar";
-  version = "4.20.0";
+  version = "4.20.1";
 
-  sha256 = "sha256-TCroFesFD0IKGdfuootd1BwEsWVECE2XQfUovJqPEh0=";
+  sha256 = "sha256-+Iz9tkP8foEtor1HFBB1/fyMXdLm3mXCoP9j9bug8po=";
 
   nativeBuildInputs = [
     docbook_xsl

From bdb288a90d2c634c22e6c08a6c8004a0837e4d25 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 13:39:37 +0000
Subject: [PATCH 0826/1504] xfce.xfce4-notes-plugin: 1.11.0 -> 1.11.1

https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/compare/xfce4-notes-plugin-1.11.0...xfce4-notes-plugin-1.11.1
---
 .../xfce/panel-plugins/xfce4-notes-plugin/default.nix       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
index f9be9c3d68e8..654f6d7ebeba 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix
@@ -4,6 +4,7 @@
   vala,
   glib,
   gtk3,
+  gtksourceview4,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
@@ -13,8 +14,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-notes-plugin";
-  version = "1.11.0";
-  sha256 = "sha256-hAGgJIZaUjrizuriW2yX4uOKqRxpZ6BiUhnj4u3BOBA=";
+  version = "1.11.1";
+  sha256 = "sha256-LeKQCsnHVataTP0rYn09x0Ddx8lMtVC0WW/jje7yXag=";
   odd-unstable = false;
 
   nativeBuildInputs = [
@@ -24,6 +25,7 @@ mkXfceDerivation {
   buildInputs = [
     glib
     gtk3
+    gtksourceview4
     libxfce4ui
     libxfce4util
     xfce4-panel

From d3ebeea249dc4b82edd0cf734f714ea531b1e32a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 13:40:26 +0000
Subject: [PATCH 0827/1504] xfce.xfce4-windowck-plugin: 0.5.1 -> 0.5.2

https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/compare/xfce4-windowck-plugin-0.5.1...xfce4-windowck-plugin-0.5.2
---
 .../xfce4-windowck-plugin/default.nix              | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
index 970ad85a4199..d3ee36b6effb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@@ -2,10 +2,13 @@
   stdenv,
   lib,
   fetchurl,
-  intltool,
+  gettext,
   pkg-config,
+  glib,
+  gtk3,
   libwnck,
   libxfce4ui,
+  libxfce4util,
   xfce4-panel,
   xfconf,
   gitUpdater,
@@ -13,22 +16,25 @@
 
 stdenv.mkDerivation rec {
   pname = "xfce4-windowck-plugin";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchurl {
     # Use dist tarballs to avoid pulling extra deps and generating images ourselves.
     url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor version}/xfce4-windowck-plugin-${version}.tar.bz2";
-    sha256 = "sha256-p4FEi3gemE072lmw2qsNGE1M7CJSMW9zcKxKmO/kgfQ=";
+    sha256 = "sha256-3E7V3JS9Bd5UlUQfDKuyYKs+H2ziex+skuN/kJwM/go=";
   };
 
   nativeBuildInputs = [
-    intltool
+    gettext
     pkg-config
   ];
 
   buildInputs = [
+    glib
+    gtk3
     libwnck
     libxfce4ui
+    libxfce4util
     xfce4-panel
     xfconf
   ];

From a2ce386e3e1857e0e61f5aa54703ec0fc6a35d28 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 13:40:33 +0000
Subject: [PATCH 0828/1504] xfce.xfce4-xkb-plugin: 0.8.3 -> 0.8.5

https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/compare/xfce4-xkb-plugin-0.8.3...xfce4-xkb-plugin-0.8.5
---
 pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index b4c33dad6701..3bbeeee710d3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
@@ -16,8 +16,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-xkb-plugin";
-  version = "0.8.3";
-  sha256 = "sha256-qWxjULrBpueQS3gxwRg49cQ3ovlQ8iWvYZ6Z/THm+/s=";
+  version = "0.8.5";
+  sha256 = "sha256-oG3+OudjJIXfGII16bYaIGy4QMno00HX3kX+8H0VUcU=";
 
   buildInputs = [
     garcon

From d9f318abd0f3dabd13f829c23c339bac8e2cd60a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 22:21:10 +0800
Subject: [PATCH 0829/1504] xfce.xfconf: Explicitly add perl

This builds because xfce.xfce4-dev-tools propagates intltool, which
propagates perl. But since Xfce is actively getting rid of intltool
let's get ready for it.
---
 pkgs/desktops/xfce/core/xfconf/default.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 82a33a4b458e..8ca8990c17b7 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -1,8 +1,11 @@
-{ lib
-, mkXfceDerivation
-, libxfce4util
-, gobject-introspection
-, vala
+{
+  lib,
+  mkXfceDerivation,
+  gobject-introspection,
+  perl,
+  vala,
+  libxfce4util,
+  glib,
 }:
 
 mkXfceDerivation {
@@ -12,10 +15,16 @@ mkXfceDerivation {
 
   sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw=";
 
-  nativeBuildInputs = [ gobject-introspection vala ];
+  nativeBuildInputs = [
+    gobject-introspection
+    perl
+    vala
+  ];
 
   buildInputs = [ libxfce4util ];
 
+  propagatedBuildInputs = [ glib ];
+
   meta = with lib; {
     description = "Simple client-server configuration storage and query system for Xfce";
     mainProgram = "xfconf-query";

From 267ff42cd70f34971bc1cf59efc2fa827faf00f9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 22:24:18 +0800
Subject: [PATCH 0830/1504] xfce.libxfce4ui: Explicitly add perl

This builds because xfce.xfce4-dev-tools propagates intltool, which
propagates perl. But since Xfce is actively getting rid of intltool
let's get ready for it.
---
 pkgs/desktops/xfce/core/libxfce4ui/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
index 780c3ca990f8..12c2d2968159 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
@@ -2,6 +2,7 @@
   mkXfceDerivation,
   lib,
   gobject-introspection,
+  perl,
   vala,
   libICE,
   libSM,
@@ -23,6 +24,7 @@ mkXfceDerivation {
 
   nativeBuildInputs = [
     gobject-introspection
+    perl
     vala
   ];
 

From 258d7b7f8b3b532bd2dd7adf9d4e0033659b83e7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 22:29:35 +0800
Subject: [PATCH 0831/1504] xfce.exo: Move perl to nativeBuildInputs

* exo-compose-mail has been removed (both here and xfce4-settings).
* Xfce is actively getting rid of intltool and to get ready for it,
  make-exo-alias.pl requires perl.
---
 pkgs/desktops/xfce/core/exo/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix
index 8567100f076b..935d7fd23cf3 100644
--- a/pkgs/desktops/xfce/core/exo/default.nix
+++ b/pkgs/desktops/xfce/core/exo/default.nix
@@ -1,5 +1,14 @@
-{ lib, mkXfceDerivation, docbook_xsl, glib, libxslt, gtk3
-, libxfce4ui, libxfce4util, perl }:
+{
+  lib,
+  mkXfceDerivation,
+  docbook_xsl,
+  glib,
+  libxslt,
+  gtk3,
+  libxfce4ui,
+  libxfce4util,
+  perl,
+}:
 
 mkXfceDerivation {
   category = "xfce";
@@ -11,6 +20,7 @@ mkXfceDerivation {
   nativeBuildInputs = [
     libxslt
     docbook_xsl
+    perl
   ];
 
   buildInputs = [
@@ -18,7 +28,6 @@ mkXfceDerivation {
     glib
     libxfce4ui
     libxfce4util
-    (perl.withPackages(ps: with ps; [ URI ])) # for $out/lib/xfce4/exo/exo-compose-mail
   ];
 
   meta = with lib; {

From 19a2e43800aa2c833ba47376e71a50da44780623 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 22:31:42 +0800
Subject: [PATCH 0832/1504] xfce.xfce4-panel: Explicitly add perl

This builds because xfce.xfce4-dev-tools propagates intltool, which
propagates perl. But since Xfce is actively getting rid of intltool
let's get ready for it.
---
 pkgs/desktops/xfce/core/xfce4-panel/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index cf664c9c6e7d..e3680e2da761 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -11,6 +11,7 @@
 , libxfce4ui
 , libxfce4util
 , libxfce4windowing
+, perl
 , tzdata
 , vala
 , wayland
@@ -26,6 +27,7 @@ mkXfceDerivation {
 
   nativeBuildInputs = [
     gobject-introspection
+    perl
     vala
   ];
 

From 6fba45b6e5a3130eb8f37250bc5f7d012ad09856 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:23:50 +0100
Subject: [PATCH 0833/1504] antora-ui-default: update hash

Fixes: 518ba1789aa2 ("antora-ui-default: 0-unstable-2024-09-20 -> 0-unstable-2024-12-26")
---
 pkgs/by-name/an/antora-ui-default/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 329841bd4d43..33c7346ebf9f 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   srcFetchFromGitLab = {
-    hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM=";
+    hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
     owner = "trueNAHO";
     repo = "antora-ui-default";
     rev = "11f563294248e9b64124b9289d639e349f2e9f5f";

From f974f1168bdb70dd40646c04feaa24ce7b4aab8a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 23:25:58 +0800
Subject: [PATCH 0834/1504] pantheon.elementary-terminal: Backport shortcut
 fixes

This fixes unexpected behaviour with Ctrl+K / Ctrl+L.
---
 .../apps/elementary-terminal/default.nix         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 62a0861432d7..ac0ad40d8455 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   nix-update-script,
   pkg-config,
   meson,
@@ -30,6 +31,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns=";
   };
 
+  patches = [
+    # Fix clear and reset actions when ongoing foreground process
+    # https://github.com/elementary/terminal/pull/823
+    (fetchpatch {
+      url = "https://github.com/elementary/terminal/commit/3c84bcb98ecdadb4d5e0c7a8f52fb5238f5e92f0.patch";
+      hash = "sha256-XViJR+vj+qy2A1nZa3Pdo8uY24tS4ZqZKjTAyPN9sPA=";
+    })
+    # Only reset/clear screen when <Shift> is pressed
+    # https://github.com/elementary/terminal/pull/827
+    (fetchpatch {
+      url = "https://github.com/elementary/terminal/commit/91b93d883c2b8a8549d9743292d6a564e3b2d3cb.patch";
+      hash = "sha256-3opiRhQLJCYFDwDjEbm0CZ9y8CF/6biU+cJk1Ideyks=";
+    })
+  ];
+
   nativeBuildInputs = [
     desktop-file-utils
     meson

From d8df2a77ec0b564bcc409bf1b7218e6e7a5e43f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 15:29:03 +0000
Subject: [PATCH 0835/1504] pdfium-binaries: 6899 -> 6927

---
 pkgs/by-name/pd/pdfium-binaries/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix
index 5cff417d0494..872ecb73e9a7 100644
--- a/pkgs/by-name/pd/pdfium-binaries/package.nix
+++ b/pkgs/by-name/pd/pdfium-binaries/package.nix
@@ -4,7 +4,7 @@
   stdenv,
 }:
 let
-  version = "6899";
+  version = "6927";
   src =
     let
       inherit (stdenv.hostPlatform) system;
@@ -16,10 +16,10 @@ let
         aarch64-darwin = "mac-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-JPXgjdGfQK1BztK3opqKfg5P2lAnmkcVj3qk2Ck8vHg=";
-        aarch64-linux = "sha256-za1d1jKM3LdeBFttBBHQ+Nx1O4KC6FFwotuRHTj8tFk=";
-        x86_64-darwin = "sha256-K2Sr4z4+WWmK9OxvkZB0k9LQDxCNnUvL0RArG5v2aYs=";
-        aarch64-darwin = "sha256-wLa61Af4G47AE99M+uPlBjR2rdP5yUenoW9gsrOmZpw=";
+        x86_64-linux = "sha256-hx9+3/CD2xdsu/jm3St3UPXpAzySrgtC14UTQ5pkHPg=";
+        aarch64-linux = "sha256-CEtviohWUR2/gUBGFq6dkMb0U68CVaTopcI5Xgv7Bks=";
+        x86_64-darwin = "sha256-H4fVtDUuqJxeh37oMXcVuCpGth/WLXk8p8/3PfjWYgM=";
+        aarch64-darwin = "sha256-FlyG1Qcl4G3ZVZoVJE3U2CNJoXKr8+1O747XjDq/Eog=";
       };
     in
     fetchzip {

From 79029e1c300fe2535a49f868d1893a234e2482c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 15:31:30 +0000
Subject: [PATCH 0836/1504] vopono: 0.10.10 -> 0.10.11

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

diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix
index 85070ac840cd..f4f6a63c2ca3 100644
--- a/pkgs/by-name/vo/vopono/package.nix
+++ b/pkgs/by-name/vo/vopono/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vopono";
-  version = "0.10.10";
+  version = "0.10.11";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-HjubzbRsmRU33oI1p1kzCFUjC2YQJhVqljd/FHzAnMw=";
+    hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY=";
   };
 
-  cargoHash = "sha256-YBDB1g8cUOo1hS8Fi03Bvpe63bolbPmhGbvT16G73js=";
+  cargoHash = "sha256-/z4qBBY/Htlv55vNKj2c1frWsUFTRweJh/G0T2jHLr4=";
 
   meta = with lib; {
     description = "Run applications through VPN connections in network namespaces";

From 87055703b3623c27bdd0a25c9515a839e844445e Mon Sep 17 00:00:00 2001
From: Marko Muller <mx2uller@pm.me>
Date: Tue, 31 Dec 2024 17:10:21 +0100
Subject: [PATCH 0837/1504] maintainers: add mx2uller

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d1690081b374..b201b7338ba7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14508,6 +14508,12 @@
     githubId = 38578268;
     name = "Morgan Wolfe";
   };
+  mx2uller = {
+    email = "mx2uller@pm.me";
+    github = "mx2uller";
+    githubId = 93703653;
+    name = "Marko Müller";
+  };
   mxkrsv = {
     email = "mxkrsv@disroot.org";
     github = "mxkrsv";

From b5045fb4c79d6e3e7b2c52ebb0afb46a4774a3db Mon Sep 17 00:00:00 2001
From: Marko Muller <mx2uller@pm.me>
Date: Tue, 31 Dec 2024 17:12:08 +0100
Subject: [PATCH 0838/1504] sview: init at 20_08

---
 pkgs/by-name/sv/sview/package.nix | 85 +++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 pkgs/by-name/sv/sview/package.nix

diff --git a/pkgs/by-name/sv/sview/package.nix b/pkgs/by-name/sv/sview/package.nix
new file mode 100644
index 000000000000..7f62b2195278
--- /dev/null
+++ b/pkgs/by-name/sv/sview/package.nix
@@ -0,0 +1,85 @@
+{
+  fetchFromGitHub,
+  fetchurl,
+  ffmpeg_4,
+  fontconfig,
+  gtk2,
+  lib,
+  libconfig,
+  libGL,
+  libXpm,
+  makeFontsConf,
+  makeWrapper,
+  nanum,
+  openal,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sview";
+  version = "20_08";
+
+  src = fetchFromGitHub {
+    owner = "gkv311";
+    repo = "sview";
+    tag = version;
+    hash = "sha256-mbEacdBQchziXoZ5vJUiEpa/iHeXeaozte2aXs50/Fo=";
+  };
+
+  droidSansFallback = fetchurl {
+    url = "https://raw.githubusercontent.com/aosp-mirror/platform_frameworks_base/2d8961d99f3aa559dbd4b78b716ab36c456b43e1/data/fonts/DroidSansFallbackFull.ttf";
+    sha256 = "sha256-I5IBVTBDi6/Ejt/ErubZ3iOH9iemE02Ks9/MmdIcgkA=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
+    ffmpeg_4
+    gtk2
+    libconfig
+    libGL
+    libXpm
+    openal
+  ];
+
+  fontsConf = makeFontsConf {
+    fontDirectories = [
+      nanum
+      "placeholder"
+    ];
+  };
+
+  installPhase = ''
+    runHook preInstall
+    make install APP_PREFIX=$out DISABLE_UPDATER=1
+    mkdir -p $out/share/sView/fonts
+    cp ${droidSansFallback} $out/share/sView/fonts/DroidSansFallbackFull.ttf
+    cp '${fontsConf}' $out/share/sView/fonts/fonts.conf
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    substituteInPlace $out/share/sView/fonts/fonts.conf \
+      --replace-warn "placeholder" "$out/share/sView/fonts/";
+    wrapProgram $out/bin/sView \
+      --set StShare $out/share/sView \
+      --set FONTCONFIG_FILE $out/share/sView/fonts/fonts.conf
+  '';
+
+  meta = with lib; {
+    description = "Viewer for 3D stereoscopic videos and images";
+    homepage = "https://www.sview.ru/en/";
+    license = with licenses; [
+      cc-by-40
+      gpl3Only
+      asl20
+    ];
+    maintainers = with maintainers; [ mx2uller ];
+    mainProgram = "sView";
+    platforms = platforms.linux;
+  };
+}

From 3b2c5ddf974e7aeb7754df968b7e6d41b1d243e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 17:14:58 +0100
Subject: [PATCH 0839/1504] python312Packages.ohmepy: init at 1.2.3

Module for interacting with the Ohme API

https://github.com/dan-r/ohmepy
---
 .../python-modules/ohmepy/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/ohmepy/default.nix

diff --git a/pkgs/development/python-modules/ohmepy/default.nix b/pkgs/development/python-modules/ohmepy/default.nix
new file mode 100644
index 000000000000..c02b87574931
--- /dev/null
+++ b/pkgs/development/python-modules/ohmepy/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ohmepy";
+  version = "1.2.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "dan-r";
+    repo = "ohmepy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hCwaB6YXtNHCNOyjRxDSonBdTpKqX9GmLwFMvrY9UpI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "ohme" ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Module for interacting with the Ohme API";
+    homepage = "https://github.com/dan-r/ohmepy";
+    changelog = "https://github.com/dan-r/ohmepy/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..73a9855a23f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4879,6 +4879,8 @@ self: super: with self; {
 
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };
 
+  ohmepy = callPackage ../development/python-modules/ohmepy { };
+
   openstep-parser = callPackage ../development/python-modules/openstep-parser { };
 
   openstep-plist = callPackage ../development/python-modules/openstep-plist { };

From a476cb19a61342cb52a971f108d070cbf53fd59f Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 26 Dec 2024 17:14:24 +0100
Subject: [PATCH 0840/1504] torzu: init at unstable 12.15.24

---
 pkgs/by-name/to/torzu/fix-debugger.patch     |  53 ++++
 pkgs/by-name/to/torzu/fix-udp-client.patch   |  30 +++
 pkgs/by-name/to/torzu/fix-udp-protocol.patch |  13 +
 pkgs/by-name/to/torzu/package.nix            | 244 +++++++++++++++++++
 4 files changed, 340 insertions(+)
 create mode 100644 pkgs/by-name/to/torzu/fix-debugger.patch
 create mode 100644 pkgs/by-name/to/torzu/fix-udp-client.patch
 create mode 100644 pkgs/by-name/to/torzu/fix-udp-protocol.patch
 create mode 100644 pkgs/by-name/to/torzu/package.nix

diff --git a/pkgs/by-name/to/torzu/fix-debugger.patch b/pkgs/by-name/to/torzu/fix-debugger.patch
new file mode 100644
index 000000000000..87d4e0cc118f
--- /dev/null
+++ b/pkgs/by-name/to/torzu/fix-debugger.patch
@@ -0,0 +1,53 @@
+diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp
+index e86aae8460..a4dca23770 100644
+--- a/src/core/debugger/debugger.cpp
++++ b/src/core/debugger/debugger.cpp
+@@ -5,7 +5,13 @@
+ #include <mutex>
+ #include <thread>
+ 
+-#include <boost/asio.hpp>
++// Use basic asio functionality only
++#define BOOST_ASIO_STANDALONE
++#include <boost/asio/basic_io_object.hpp>
++#include <boost/asio/ip/tcp.hpp>
++#include <boost/asio/write.hpp>
++#include <boost/asio/read.hpp>
++
+ #include <boost/process/async_pipe.hpp>
+ 
+ #include "common/logging/log.h"
+@@ -21,17 +27,22 @@
+ 
+ template <typename Readable, typename Buffer, typename Callback>
+ static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) {
+-    static_assert(std::is_trivial_v<Buffer>);
+-    auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))};
+-    r.async_read_some(
+-        boost_buffer, [&, c](const boost::system::error_code& error, size_t bytes_read) {
+-            if (!error.failed()) {
+-                const u8* buffer_start = reinterpret_cast<const u8*>(&buffer);
+-                std::span<const u8> received_data{buffer_start, buffer_start + bytes_read};
+-                c(received_data);
+-                AsyncReceiveInto(r, buffer, c);
+-            }
+-        });
++    try {
++            static_assert(std::is_trivial_v<Buffer>);
++            auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))};
++            r.async_read_some(
++                boost_buffer,
++                [&, c](const boost::system::error_code& error, size_t bytes_read) {
++                    if (!error) {
++                        const u8* buffer_start = reinterpret_cast<const u8*>(&buffer);
++                        std::span<const u8> received_data{buffer_start, buffer_start + bytes_read};
++                        c(received_data);
++                        AsyncReceiveInto(r, buffer, c);
++                    }
++                });
++        } catch (const std::exception& e) {
++            LOG_ERROR(Debug_GDBStub, "AsyncReceiveInto error: {}", e.what());
++        }
+ }
+ 
+ template <typename Callback>
diff --git a/pkgs/by-name/to/torzu/fix-udp-client.patch b/pkgs/by-name/to/torzu/fix-udp-client.patch
new file mode 100644
index 000000000000..103b1001ee2a
--- /dev/null
+++ b/pkgs/by-name/to/torzu/fix-udp-client.patch
@@ -0,0 +1,30 @@
+diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
+index 60821b31a6..8f9c047218 100644
+--- a/src/input_common/drivers/udp_client.cpp
++++ b/src/input_common/drivers/udp_client.cpp
+@@ -2,7 +2,15 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ #include <random>
+-#include <boost/asio.hpp>
++// Include only needed asio components
++#include <boost/asio/io_context.hpp>
++#include <boost/asio/ip/udp.hpp>
++#include <boost/asio/basic_waitable_timer.hpp>
++#include <boost/asio/write.hpp>
++#include <boost/asio/buffer.hpp>
++#include <boost/asio/basic_socket.hpp>
++#include <boost/asio/ip/address.hpp>
++#include <boost/asio/ip/address_v4.hpp>
+ #include <fmt/format.h>
+ 
+ #include "common/logging/log.h"
+@@ -113,7 +121,7 @@ private:
+     }
+ 
+     SocketCallback callback;
+-    boost::asio::io_service io_service;
++    boost::asio::io_context io_service;
+     boost::asio::basic_waitable_timer<clock> timer;
+     udp::socket socket;
+ 
diff --git a/pkgs/by-name/to/torzu/fix-udp-protocol.patch b/pkgs/by-name/to/torzu/fix-udp-protocol.patch
new file mode 100644
index 000000000000..65c4862825fc
--- /dev/null
+++ b/pkgs/by-name/to/torzu/fix-udp-protocol.patch
@@ -0,0 +1,13 @@
+diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h
+index db08fc62c5..ea223ea937 100644
+--- a/src/input_common/helpers/udp_protocol.h
++++ b/src/input_common/helpers/udp_protocol.h
+@@ -69,7 +69,7 @@ Message<T> CreateMessage(const u32 magic, const T data, const u32 sender_id) {
+     };
+     Message<T> message{header, data};
+     crc.process_bytes(&message, sizeof(Message<T>));
+-    message.header.crc = crc.checksum();
++    message.header.crc = static_cast<u32_le>(crc.checksum());
+     return message;
+ }
+ 
diff --git a/pkgs/by-name/to/torzu/package.nix b/pkgs/by-name/to/torzu/package.nix
new file mode 100644
index 000000000000..06cd23badc4e
--- /dev/null
+++ b/pkgs/by-name/to/torzu/package.nix
@@ -0,0 +1,244 @@
+{
+  lib,
+  stdenv,
+  SDL2,
+  autoconf,
+  boost,
+  catch2_3,
+  cmake,
+  fetchFromGitHub,
+  cpp-jwt,
+  cubeb,
+  discord-rpc,
+  enet,
+  fetchgit,
+  fetchurl,
+  ffmpeg-headless,
+  fmt,
+  glslang,
+  libopus,
+  libusb1,
+  libva,
+  lz4,
+  python3,
+  unzip,
+  nix-update-script,
+  nlohmann_json,
+  nv-codec-headers-12,
+  pkg-config,
+  qt6,
+  vulkan-headers,
+  vulkan-loader,
+  yasm,
+  simpleini,
+  zlib,
+  vulkan-memory-allocator,
+  zstd,
+}:
+
+let
+  inherit (qt6)
+    qtbase
+    qtmultimedia
+    qtwayland
+    wrapQtAppsHook
+    qttools
+    qtwebengine
+    ;
+
+  compat-list = stdenv.mkDerivation {
+    pname = "yuzu-compatibility-list";
+    version = "unstable-2024-02-26";
+
+    src = fetchFromGitHub {
+      owner = "flathub";
+      repo = "org.yuzu_emu.yuzu";
+      rev = "9c2032a3c7e64772a8112b77ed8b660242172068";
+      hash = "sha256-ITh/W4vfC9w9t+TJnPeTZwWifnhTNKX54JSSdpgaoBk=";
+    };
+
+    buildCommand = ''
+      cp $src/compatibility_list.json $out
+    '';
+  };
+
+  nx_tzdb = stdenv.mkDerivation rec {
+    pname = "nx_tzdb";
+    version = "221202";
+
+    src = fetchurl {
+      url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip";
+      hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c=";
+    };
+
+    nativeBuildInputs = [ unzip ];
+
+    buildCommand = ''
+      unzip $src -d $out
+    '';
+
+  };
+
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "torzu";
+  version = "unstable-2024-12-15";
+
+  src = fetchgit {
+    url = "https://notabug.org/litucks/torzu";
+    rev = "02cfee3f184e6fdcc3b483ef399fb5d2bb1e8ec7";
+    hash = "sha256-hAWMFzTNJGFcrXov5LKMdW9YWhsu7wueATmiuS7EVkI=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # Remove coroutines from debugger to fix boost::asio compatibility issues
+    ./fix-debugger.patch
+    # Add explicit cast for CRC checksum value
+    ./fix-udp-protocol.patch
+    # Use specific boost::asio includes and update to modern io_context
+    ./fix-udp-client.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    glslang
+    pkg-config
+    python3
+    qttools
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    # vulkan-headers must come first, so the older propagated versions
+    # don't get picked up by accident
+    vulkan-headers
+
+    boost
+    catch2_3
+    cpp-jwt
+    cubeb
+    discord-rpc
+    # intentionally omitted: dynarmic - prefer vendored version for compatibility
+    enet
+
+    # ffmpeg deps (also includes vendored)
+    # we do not use internal ffmpeg because cuda errors
+    autoconf
+    yasm
+    libva # for accelerated video decode on non-nvidia
+    nv-codec-headers-12 # for accelerated video decode on nvidia
+    ffmpeg-headless
+    # end ffmpeg deps
+
+    fmt
+    # intentionally omitted: gamemode - loaded dynamically at runtime
+    # intentionally omitted: httplib - upstream requires an older version than what we have
+    libopus
+    libusb1
+    # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
+    lz4
+    nlohmann_json
+    qtbase
+    qtmultimedia
+    qtwayland
+    qtwebengine
+    # intentionally omitted: renderdoc - heavy, developer only
+    SDL2
+    # intentionally omitted: stb - header only libraries, vendor uses git snapshot
+    vulkan-memory-allocator
+    # intentionally omitted: xbyak - prefer vendored version for compatibility
+    zlib
+    zstd
+  ];
+
+  # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
+  # making the build fail, as that path does not exist
+  dontFixCmake = true;
+
+  cmakeFlags = [
+    # actually has a noticeable performance impact
+    (lib.cmakeBool "YUZU_ENABLE_LTO" true)
+    (lib.cmakeBool "YUZU_TESTS" false)
+
+    (lib.cmakeBool "ENABLE_QT6" true)
+    (lib.cmakeBool "ENABLE_QT_TRANSLATION" true)
+
+    # use system libraries
+    # NB: "external" here means "from the externals/ directory in the source",
+    # so "off" means "use system"
+    (lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false)
+    (lib.cmakeBool "YUZU_USE_EXTERNAL_VULKAN_HEADERS" true)
+    "-DVulkan_INCLUDE_DIRS=${vulkan-headers}/include"
+
+    # # don't use system ffmpeg, suyu uses internal APIs
+    # (lib.cmakeBool "YUZU_USE_BUNDLED_FFMPEG" true)
+
+    # don't check for missing submodules
+    (lib.cmakeBool "YUZU_CHECK_SUBMODULES" false)
+
+    # enable some optional features
+    (lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true)
+    (lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true)
+    (lib.cmakeBool "USE_DISCORD_PRESENCE" true)
+
+    # We dont want to bother upstream with potentially outdated compat reports
+    (lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false)
+    (lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically
+  ];
+
+  env = {
+    # Does some handrolled SIMD
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1";
+  };
+
+  qtWrapperArgs = [
+    # Fixes vulkan detection.
+    # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
+    "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
+  ];
+
+  # Setting this through cmakeFlags does not work.
+  # https://github.com/NixOS/nixpkgs/issues/114044
+  preConfigure = lib.concatStringsSep "\n" [
+    ''
+      cmakeFlagsArray+=(
+        "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}"
+        "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}"
+      )
+    ''
+    # provide pre-downloaded tz data
+    ''
+      mkdir -p build/externals/nx_tzdb
+      ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
+    ''
+  ];
+
+  postConfigure = ''
+    ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
+  '';
+
+  postInstall = "
+    install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules
+  ";
+
+  meta = {
+    description = "Fork of yuzu, an open-source Nintendo Switch emulator";
+    homepage = "https://notabug.org/litucks/torzu";
+    mainProgram = "yuzu";
+    platforms = lib.platforms.linux;
+    badPlatforms = [
+      # Several conversion errors, probably caused by the update to GCC 14
+      "aarch64-linux"
+    ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    license = with lib.licenses; [
+      gpl3Plus
+      # Icons
+      asl20
+      mit
+      cc0
+    ];
+  };
+})

From a2c878df507a14a866923dece6043bcb591ae3d1 Mon Sep 17 00:00:00 2001
From: toinux <26522723+itzwam@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:28:57 +0100
Subject: [PATCH 0841/1504] nixos/keepalived: add package option (#346462)

KeepAlived: Support pkg override without overlaying

Co-authored-by: Antoine 'Toinux' Lesieur <toinux@nixos.local>
Co-authored-by: Arne Keller <arne.keller@posteo.de>
---
 nixos/modules/services/networking/keepalived/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix
index 01cb8817a94d..109633280d1e 100644
--- a/nixos/modules/services/networking/keepalived/default.nix
+++ b/nixos/modules/services/networking/keepalived/default.nix
@@ -153,6 +153,8 @@ in
         '';
       };
 
+      package = lib.mkPackageOption pkgs "keepalived" { };
+
       openFirewall = mkOption {
         type = types.bool;
         default = false;
@@ -334,7 +336,7 @@ in
           umask 077
           ${pkgs.envsubst}/bin/envsubst -i "${keepalivedConf}" > ${finalConfigFile}
         '');
-        ExecStart = "${pkgs.keepalived}/sbin/keepalived"
+        ExecStart = "${lib.getExe cfg.package}"
           + " -f ${finalConfigFile}"
           + " -p ${pidFile}"
           + optionalString cfg.snmp.enable " --snmp";

From 1f9c0c6655afb5a170b856ea09ef22da0119aea4 Mon Sep 17 00:00:00 2001
From: antipatico <antipatico@users.noreply.github.com>
Date: Sat, 31 Aug 2024 14:37:14 +0200
Subject: [PATCH 0842/1504] lovely-injector: init at 0.6.0

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

diff --git a/pkgs/by-name/lo/lovely-injector/package.nix b/pkgs/by-name/lo/lovely-injector/package.nix
new file mode 100644
index 000000000000..e680cb7e25b0
--- /dev/null
+++ b/pkgs/by-name/lo/lovely-injector/package.nix
@@ -0,0 +1,39 @@
+{
+  fetchFromGitHub,
+  rustPlatform,
+  lib,
+}:
+let
+  version = "0.6.0";
+  lovelyInjector = fetchFromGitHub {
+    owner = "vgskye";
+    repo = "lovely-injector";
+    rev = "3224915f4d47b557c34b5012797cf92d4cc629af";
+    hash = "sha256-fzkuuu6pmvqeJa7qlX8jhtCLC4oYRLUm1hqHTRiYEX8=";
+  };
+in
+rustPlatform.buildRustPackage rec {
+  pname = "lovely-injector";
+  inherit version;
+  src = lovelyInjector;
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-Mkmj+ENdUge1V1cVAQOV2K01sYKEyhxTse0f5o6H6Xc=";
+  # no tests
+  doCheck = false;
+  # lovely-injector depends on nightly rust features
+  env.RUSTC_BOOTSTRAP = 1;
+
+  meta = {
+    description = "Runtime lua injector for games built with LÖVE";
+    longDescription = ''
+      Lovely is a lua injector which embeds code into a LÖVE 2d game at runtime.
+      Unlike executable patchers, mods can be installed, updated, and removed over and over again without requiring a partial or total game reinstallation.
+      This is accomplished through in-process lua API detouring and an easy to use (and distribute) patch system.
+    '';
+    license = lib.licenses.mit;
+    homepage = "https://github.com/ethangreen-dev/lovely-injector";
+    downloadPage = "https://github.com/ethangreen-dev/lovely-injector/releases";
+    maintainers = [ lib.maintainers.antipatico ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}

From 24c766e018f1ae89ff264491b94101caa9bb5450 Mon Sep 17 00:00:00 2001
From: antipatico <antipatico@users.noreply.github.com>
Date: Tue, 31 Dec 2024 11:41:28 +0100
Subject: [PATCH 0843/1504] balatro: init at 1.0.1n

---
 pkgs/by-name/ba/balatro/globals.patch | 15 +++++
 pkgs/by-name/ba/balatro/package.nix   | 79 +++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/by-name/ba/balatro/globals.patch
 create mode 100644 pkgs/by-name/ba/balatro/package.nix

diff --git a/pkgs/by-name/ba/balatro/globals.patch b/pkgs/by-name/ba/balatro/globals.patch
new file mode 100644
index 000000000000..b896a1deb61a
--- /dev/null
+++ b/pkgs/by-name/ba/balatro/globals.patch
@@ -0,0 +1,15 @@
+--- result/share/balatro/globals.lua    1970-01-01 01:00:01.000000000 +0100
++++ result/share/balatro/globals.lua    1970-01-01 01:00:01.000000000 +0100
+@@ -56,6 +56,12 @@ function Game:set_globals()
+         self.F_CRASH_REPORTS = false
+     end
+ 
++    if love.system.getOS() == 'Linux' then
++        self.F_SAVE_TIMER = 5
++        self.F_DISCORD = true
++        self.F_ENGLISH_ONLY = false
++    end
++
+     if love.system.getOS() == 'Nintendo Switch' then
+         self.F_HIDE_BETA_LANGS = true
+         self.F_BASIC_CREDITS = true
diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix
new file mode 100644
index 000000000000..181cd305411b
--- /dev/null
+++ b/pkgs/by-name/ba/balatro/package.nix
@@ -0,0 +1,79 @@
+{
+  stdenv,
+  lib,
+  love,
+  lovely-injector,
+  p7zip,
+  copyDesktopItems,
+  makeWrapper,
+  makeDesktopItem,
+  requireFile,
+  withMods ? true,
+  withLinuxPatch ? true,
+}:
+let
+  version = "1.0.1n";
+  balatroExe = requireFile {
+    name = "Balatro-${version}.exe";
+    url = "https://store.steampowered.com/app/2379780/Balatro/";
+    # Use `nix hash file --sri --type sha256` to get the correct hash
+    hash = "sha256-mJ5pL+Qj3+ldOLFcQc64dM0edTeQSePIYpp5EuwxKXo=";
+  };
+in
+stdenv.mkDerivation {
+  pname = "balatro";
+  inherit version;
+  nativeBuildInputs = [
+    p7zip
+    copyDesktopItems
+    makeWrapper
+  ];
+  buildInputs = [ love ] ++ lib.optional withMods lovely-injector;
+  dontUnpack = true;
+  desktopItems = [
+    (makeDesktopItem {
+      name = "balatro";
+      desktopName = "Balatro";
+      exec = "balatro";
+      keywords = [ "Game" ];
+      categories = [ "Game" ];
+      icon = "balatro";
+    })
+  ];
+  buildPhase = ''
+    runHook preBuild
+    tmpdir=$(mktemp -d)
+    7z x ${balatroExe} -o$tmpdir -y
+    ${if withLinuxPatch then "patch $tmpdir/globals.lua -i ${./globals.patch}" else ""}
+    patchedExe=$(mktemp -u).zip
+    7z a $patchedExe $tmpdir/*
+    runHook postBuild
+  '';
+
+  # The `cat` bit is a hack suggested by whitelje (https://github.com/ethangreen-dev/lovely-injector/pull/66#issuecomment-2319615509)
+  # to make it so that lovely will pick up Balatro as the game name. The `LD_PRELOAD` bit is used to load lovely and it is the
+  # 'official' way of doing it.
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 $tmpdir/resources/textures/2x/balatro.png -t $out/share/icons/
+
+    cat ${lib.getExe love} $patchedExe > $out/share/Balatro
+    chmod +x $out/share/Balatro
+
+    makeWrapper $out/share/Balatro $out/bin/balatro ${lib.optionalString withMods "--prefix LD_PRELOAD : '${lovely-injector}/lib/liblovely.so'"}
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Poker roguelike";
+    longDescription = ''
+      Balatro is a hypnotically satisfying deckbuilder where you play illegal poker hands,
+      discover game-changing jokers, and trigger adrenaline-pumping, outrageous combos.
+    '';
+    license = lib.licenses.unfree;
+    homepage = "https://store.steampowered.com/app/2379780/Balatro/";
+    maintainers = [ lib.maintainers.antipatico ];
+    platforms = love.meta.platforms;
+    mainProgram = "balatro";
+  };
+}

From 948991e084f3ada450fc693350d8a2d0b590117e Mon Sep 17 00:00:00 2001
From: Ngoc Nguyen <ngoc@kotozna.com>
Date: Wed, 1 Jan 2025 01:48:05 +0900
Subject: [PATCH 0844/1504] maccy: add myself as maintainer

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

diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix
index acb9d4ff260c..feee61c5220a 100644
--- a/pkgs/by-name/ma/maccy/package.nix
+++ b/pkgs/by-name/ma/maccy/package.nix
@@ -32,7 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://maccy.app";
     license = licenses.mit;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ emilytrau ];
+    maintainers = with maintainers; [
+      emilytrau
+      baongoc124
+    ];
     platforms = platforms.darwin;
   };
 })

From 7d16d84fbc59ca385702bb7b416c20b0e9e974f4 Mon Sep 17 00:00:00 2001
From: Ngoc Nguyen <ngoc@kotozna.com>
Date: Wed, 1 Jan 2025 01:48:43 +0900
Subject: [PATCH 0845/1504] maccy: 0.31.0 -> 2.3.0

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

diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix
index feee61c5220a..f651c2f9d4ce 100644
--- a/pkgs/by-name/ma/maccy/package.nix
+++ b/pkgs/by-name/ma/maccy/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "maccy";
-  version = "0.31.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip";
-    hash = "sha256-vjfFtlX0b3howUc2bTR/pqXwnzjXpK6qPR8+81sANTs=";
+    hash = "sha256-Prr0t3OvPWUnUQ3cTE3D+jj1ASKKmDvGZInKlT1WsJ0=";
   };
 
   dontUnpack = true;

From f88c4744bdba0183ce5a362d456001ab6cd91259 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:59:43 +0100
Subject: [PATCH 0846/1504] mangayomi: remove unnecessary dependencies

---
 pkgs/by-name/ma/mangayomi/package.nix | 56 ---------------------------
 1 file changed, 56 deletions(-)

diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix
index d88a2169d943..5c94734957f0 100644
--- a/pkgs/by-name/ma/mangayomi/package.nix
+++ b/pkgs/by-name/ma/mangayomi/package.nix
@@ -5,34 +5,6 @@
   pkg-config,
   webkitgtk_4_1,
   mpv,
-  libass,
-  ffmpeg,
-  libplacebo,
-  libunwind,
-  shaderc,
-  vulkan-loader,
-  lcms,
-  libdovi,
-  libdvdnav,
-  libdvdread,
-  mujs,
-  libbluray,
-  lua,
-  rubberband,
-  libuchardet,
-  zimg,
-  alsa-lib,
-  openal,
-  pipewire,
-  libpulseaudio,
-  libcaca,
-  libdrm,
-  libgbm,
-  libXScrnSaver,
-  nv-codec-headers-11,
-  libXpresent,
-  libva,
-  libvdpau,
   rustPlatform,
   stdenv,
   copyDesktopItems,
@@ -103,34 +75,6 @@ flutter324.buildFlutterApplication {
   buildInputs = [
     webkitgtk_4_1
     mpv
-    libass
-    ffmpeg
-    libplacebo
-    libunwind
-    shaderc
-    vulkan-loader
-    lcms
-    libdovi
-    libdvdnav
-    libdvdread
-    mujs
-    libbluray
-    lua
-    rubberband
-    libuchardet
-    zimg
-    alsa-lib
-    openal
-    pipewire
-    libpulseaudio
-    libcaca
-    libdrm
-    libgbm
-    libXScrnSaver
-    libXpresent
-    nv-codec-headers-11
-    libva
-    libvdpau
   ];
 
   desktopItems = [

From fe268b5b30b0ad27c6cd32afcec9e812bc30d1a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 17:16:30 +0000
Subject: [PATCH 0847/1504] bodyclose: 0-unstable-2024-10-17 ->
 0-unstable-2024-12-22

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

diff --git a/pkgs/by-name/bo/bodyclose/package.nix b/pkgs/by-name/bo/bodyclose/package.nix
index ed791e7546c6..a563e6d4782c 100644
--- a/pkgs/by-name/bo/bodyclose/package.nix
+++ b/pkgs/by-name/bo/bodyclose/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "bodyclose";
-  version = "0-unstable-2024-10-17";
+  version = "0-unstable-2024-12-22";
 
   src = fetchFromGitHub {
     owner = "timakin";
     repo = "bodyclose";
-    rev = "adbc21e6bf369ca6d936dbb140733f34867639bd";
-    hash = "sha256-GNZNzXEZnIxep5BS1sBZsMl876FwwIkOBwHAMk/73fo=";
+    rev = "1db5c5ca4d6719fe28430df1ae8d337ee2ac09c7";
+    hash = "sha256-s5bWvpV6gHGEsuiNXJl2ZuyDaffD82/rCbusov3zsyw=";
   };
 
   vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8=";

From 09f55c6a81f425473cc9f0560dd16f129ae40110 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Dec 2024 14:21:55 +0100
Subject: [PATCH 0848/1504] transmission_3-gtk: Fix build with GCC 14

---
 pkgs/by-name/tr/transmission_3/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
index bfe4b98aa2f1..96530f98f980 100644
--- a/pkgs/by-name/tr/transmission_3/package.nix
+++ b/pkgs/by-name/tr/transmission_3/package.nix
@@ -138,6 +138,11 @@ stdenv.mkDerivation (finalAttrs: {
     EOF
   '';
 
+  env = {
+    # Fix GCC 14 build
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  };
+
   passthru.tests = {
     apparmor = nixosTests.transmission_3; # starts the service with apparmor enabled
     smoke-test = nixosTests.bittorrent;

From 7d780b94f30f8398762707614deea081f2b393ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 17:35:08 +0000
Subject: [PATCH 0849/1504] anyrun: 0-unstable-2024-11-08 ->
 0-unstable-2024-12-27

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

diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index 5153009bde93..645cc1d42784 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "anyrun";
-  version = "0-unstable-2024-11-08";
+  version = "0-unstable-2024-12-27";
 
   src = fetchFromGitHub {
     owner = "kirottu";
     repo = "anyrun";
-    rev = "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc";
-    hash = "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=";
+    rev = "06017e753c8886d5296768dca80745ee09402a2d";
+    hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=";
   };
 
-  cargoHash = "sha256-DgUNSRr2Hs+GeYeR2ex8WiwotmT12G1cjSvQVK2py3c=";
+  cargoHash = "sha256-DtU5Jtx46M+aP1oSdZt+aJH5jqNdNU9G7klzwsVjcZU=";
 
   strictDeps = true;
   enableParallelBuilding = true;

From 88bf350b1d3de0f3d674b699b372f4366b95dcbf Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 31 Dec 2024 17:31:26 +0100
Subject: [PATCH 0850/1504] tftp-hpa: 5.2 -> 5.2-untagged-2024-06-10

---
 pkgs/by-name/tf/tftp-hpa/package.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/tf/tftp-hpa/package.nix b/pkgs/by-name/tf/tftp-hpa/package.nix
index f9946be7423a..8a41255c8398 100644
--- a/pkgs/by-name/tf/tftp-hpa/package.nix
+++ b/pkgs/by-name/tf/tftp-hpa/package.nix
@@ -1,15 +1,18 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchgit,
+  autoconf,
+  automake,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tftp-hpa";
-  version = "5.2";
-  src = fetchurl {
-    url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz";
-    sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
+  version = "5.2-untagged-2024-06-10";
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git";
+    hash = "sha256-lTMldYO/cZdLj0UjOPPBHfYf2GBG0O+5lhP9ikqn3tY=";
+    rev = "2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1";
   };
 
   # Workaround build failure on -fno-common toolchains like upstream
@@ -18,6 +21,15 @@ stdenv.mkDerivation rec {
   #     `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
   meta = with lib; {
     description = "TFTP tools - a lot of fixes on top of BSD TFTP";
     maintainers = with maintainers; [ raskin ];

From eb5573ad6263822f2b2dd24adc1baf65ec1875f9 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 31 Dec 2024 13:20:56 -0500
Subject: [PATCH 0851/1504] termscp: darwin fix

---
 pkgs/by-name/te/termscp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix
index 812d30c14d85..a0ee8fcd7d91 100644
--- a/pkgs/by-name/te/termscp/package.nix
+++ b/pkgs/by-name/te/termscp/package.nix
@@ -53,6 +53,7 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
       "--skip=system::watcher::test::should_poll_file_removed"
       "--skip=system::watcher::test::should_poll_file_update"
+      "--skip=system::watcher::test::should_poll_nothing"
     ];
 
   passthru = {

From f69b3fc343fa6e540e1e0383e2c387b0c05e59df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 18:39:27 +0000
Subject: [PATCH 0852/1504] simplex-chat-desktop: 6.2.1 -> 6.2.3

---
 pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index c1767f1388fd..347f2428a0a8 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.2.1";
+  version = "6.2.3";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-JEe4dmbb/T2A4+t1ycvgJofes2CkEphytFMnWJgpZ7s=";
+    hash = "sha256-yS3KnR9JLUEwtV8e2J5l4WW+XNHWg7PDOKtlfT/zfUE=";
   };
 
   appimageContents = appimageTools.extract {

From cbdee318dac44cee1262de92951dcd977576558d Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Mon, 30 Dec 2024 15:50:58 -0300
Subject: [PATCH 0853/1504] flexget: minor tweaks, enable tests on linux

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/fl/flexget/package.nix           | 76 ++++++++++++++++---
 .../python-modules/flask-restx/default.nix    |  3 +
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 58d027701ec9..7ca46e9e1cdb 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -1,10 +1,11 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
+  stdenv,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "flexget";
   version = "3.13.5";
   pyproject = true;
@@ -20,9 +21,9 @@ python3.pkgs.buildPythonApplication rec {
   # relax dep constrains, keep environment constraints
   pythonRelaxDeps = true;
 
-  build-system = with python3.pkgs; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml
     # and https://github.com/Flexget/Flexget/blob/develop/requirements.txt
     apscheduler
@@ -40,6 +41,7 @@ python3.pkgs.buildPythonApplication rec {
     pyrss2gen
     python-dateutil
     pyyaml
+    rarfile
     rebulk
     requests
     rich
@@ -66,6 +68,7 @@ python3.pkgs.buildPythonApplication rec {
     deluge-client
     cloudscraper
     python-telegram-bot
+    boto3
   ];
 
   pythonImportsCheck = [
@@ -93,14 +96,69 @@ python3.pkgs.buildPythonApplication rec {
     "flexget.plugins.services.pogcal_acquired"
   ];
 
-  # ~400 failures
-  doCheck = false;
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    python3Packages.pytest-vcr
+    python3Packages.paramiko
+  ];
 
-  meta = with lib; {
+  doCheck = !stdenv.isDarwin;
+
+  disabledTests = [
+    # reach the Internet
+    "TestExistsMovie"
+    "TestImdb"
+    "TestImdbLookup"
+    "TestImdbParser"
+    "TestInputHtml"
+    "TestInputSites"
+    "TestNfoLookupWithMovies"
+    "TestNpoWatchlistInfo"
+    "TestNpoWatchlistLanguageTheTVDBLookup"
+    "TestNpoWatchlistPremium"
+    "TestPlex"
+    "TestRadarrListActions"
+    "TestRssOnline"
+    "TestSeriesRootAPI"
+    "TestSftpDownload"
+    "TestSftpList"
+    "TestSonarrListActions"
+    "TestSubtitleList"
+    "TestTMDBMovieLookupAPI"
+    "TestTVDBEpisodeABSLookupAPI"
+    "TestTVDBEpisodeAirDateLookupAPI"
+    "TestTVDBEpisodeLookupAPI"
+    "TestTVDBExpire"
+    "TestTVDBFavorites"
+    "TestTVDBLanguages"
+    "TestTVDBList"
+    "TestTVDBLookup"
+    "TestTVDBLookup"
+    "TestTVDBSeriesActorsLookupAPI"
+    "TestTVDBSeriesLookupAPI"
+    "TestTVDSearchIMDBLookupAPI"
+    "TestTVDSearchNameLookupAPI"
+    "TestTVDSearchZAP2ITLookupAPI"
+    "TestTVMAzeSeriesLookupAPI"
+    "TestTVMazeSeasonLookup"
+    "TestTVMazeShowLookup"
+    "TestTVMazeUnicodeLookup"
+    "TestTaskParsing::test_selected_parser_cleared"
+    "TestTheTVDBLanguages"
+    "TestTheTVDBList"
+    "TestTmdbLookup"
+    "TestURLRewriters"
+    "TestURLRewriters::test_ettv"
+    # others
+    "TestRegexp"
+    "TestYamlLists"
+  ];
+
+  meta = {
     homepage = "https://flexget.com/";
     changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}";
     description = "Multipurpose automation tool for all of your media";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pbsds ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pbsds ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix
index a817e75cb91b..2a40ee42ea4c 100644
--- a/pkgs/development/python-modules/flask-restx/default.nix
+++ b/pkgs/development/python-modules/flask-restx/default.nix
@@ -17,6 +17,7 @@
   pytest-flask,
   pytest-mock,
   pytest-benchmark,
+  pytest-vcr,
   pytestCheckHook,
   setuptools,
 }:
@@ -55,6 +56,7 @@ buildPythonPackage rec {
     pytest-benchmark
     pytest-flask
     pytest-mock
+    pytest-vcr
     pytestCheckHook
   ];
 
@@ -70,6 +72,7 @@ buildPythonPackage rec {
     ];
 
   disabledTests = [
+    "test_specs_endpoint_host_and_subdomain"
     # broken in werkzeug 2.3 upgrade
     "test_media_types_method"
     "test_media_types_q"

From bef289e3d0bf103d7ebd21ce3f8f5c45ebd346c8 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 31 Dec 2024 10:48:36 -0800
Subject: [PATCH 0854/1504] nixos/xfce: fix after #369419 removed with lib

---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index e5d23ab2259b..32c41449a248 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -127,22 +127,22 @@ in
       xfce.xfce4-taskmanager
       xfce.xfce4-terminal
     ] # TODO: NetworkManager doesn't belong here
-      ++ optional config.networking.networkmanager.enable networkmanagerapplet
-      ++ optional config.powerManagement.enable xfce.xfce4-power-manager
-      ++ optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [
+      ++ lib.optional config.networking.networkmanager.enable networkmanagerapplet
+      ++ lib.optional config.powerManagement.enable xfce.xfce4-power-manager
+      ++ lib.optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [
         pavucontrol
         # volume up/down keys support:
         # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
         # but can only be used with xfce4-panel, so for no-desktop usage we still include
         # xfce4-volumed-pulse
         (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)
-      ] ++ optionals cfg.enableXfwm [
+      ] ++ lib.optionals cfg.enableXfwm [
         xfce.xfwm4
         xfce.xfwm4-themes
-      ] ++ optionals (!cfg.noDesktop) [
+      ] ++ lib.optionals (!cfg.noDesktop) [
         xfce.xfce4-panel
         xfce.xfdesktop
-      ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
+      ] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
 
     programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;
     programs.xfconf.enable = true;

From bf28e24140352e2e8cb952097febff0e94ea6a1e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Dec 2024 04:18:29 +0100
Subject: [PATCH 0855/1504] python3.pkgs.pydrive2: Mark as broken

It does not currently work due to pyopenssl incompatibility.
---
 pkgs/development/python-modules/pydrive2/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix
index a8e300cf5747..a03c4a2c51a3 100644
--- a/pkgs/development/python-modules/pydrive2/default.nix
+++ b/pkgs/development/python-modules/pydrive2/default.nix
@@ -57,6 +57,10 @@ buildPythonPackage rec {
     description = "Google Drive API Python wrapper library";
     homepage = "https://github.com/iterative/PyDrive2";
     changelog = "https://github.com/iterative/PyDrive2/releases/tag/${version}";
+    # Not compatible with pyopenssl 24.3.0
+    # https://github.com/iterative/PyDrive2/issues/361
+    # TODO: re-enable it in `duplicity` when fixed
+    broken = true;
     license = licenses.asl20;
     maintainers = with maintainers; [ sei40kr ];
   };

From ea6117d6c3c64ea522473a6b7915c67ff7ae36c9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Dec 2024 04:15:22 +0100
Subject: [PATCH 0856/1504] duplicity: Disable pydrive2 support

It does not currently work due to pyopenssl incompatibility.
---
 pkgs/by-name/du/duplicity/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 6417b0b8f1db..1b2e9ed23c2b 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -88,7 +88,8 @@ let
         paramiko
         pyasn1
         pycrypto
-        pydrive2
+        # Currently marked as broken.
+        # pydrive2
         future
       ]
       ++ paramiko.optional-dependencies.invoke;

From 4fafd05b75c6f2accbe347c7708834c3c7b01209 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 22 Dec 2024 03:15:09 +0100
Subject: [PATCH 0857/1504] glib: Format the expression

- Format with `nixfmt-rfc-style`.
- Move `outputs` and `setupHook` to top.
- Move `strictDeps` above `inputs`.
- Move `nativeCheckInputs` next to the rest of the inputs.
- Move `env` above phases.
- Expand `env.NIX_CFLAGS_COMPILE` to a nested attribute set.
---
 pkgs/development/libraries/glib/default.nix | 435 ++++++++++++--------
 1 file changed, 254 insertions(+), 181 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index e8a44bde7edb..53cb4efe2f13 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,34 +1,47 @@
-{ config
-, lib
-, stdenv
-, fetchurl
-, gettext
-, meson
-, ninja
-, pkg-config
-, perl
-, python3
-, python3Packages
-, libiconv, zlib, libffi, pcre2, elfutils, gnome, libselinux, bash, gnum4, libxslt
-, docutils, gi-docgen
-# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
-, util-linuxMinimal ? null
-, buildPackages
+{
+  config,
+  lib,
+  stdenv,
+  fetchurl,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  perl,
+  python3,
+  python3Packages,
+  libiconv,
+  zlib,
+  libffi,
+  pcre2,
+  elfutils,
+  gnome,
+  libselinux,
+  bash,
+  gnum4,
+  libxslt,
+  docutils,
+  gi-docgen,
+  # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
+  util-linuxMinimal ? null,
+  buildPackages,
 
-# this is just for tests (not in the closure of any regular package)
-, dbus, tzdata
-, desktop-file-utils, shared-mime-info
-, darwin
-, makeHardcodeGsettingsPatch
-, testers
-, gobject-introspection
-, libsystemtap
-, libsysprof-capture
-, mesonEmulatorHook
-, withIntrospection ?
-  stdenv.hostPlatform.emulatorAvailable buildPackages &&
-  lib.meta.availableOn stdenv.hostPlatform gobject-introspection &&
-  stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian
+  # this is just for tests (not in the closure of any regular package)
+  dbus,
+  tzdata,
+  desktop-file-utils,
+  shared-mime-info,
+  darwin,
+  makeHardcodeGsettingsPatch,
+  testers,
+  gobject-introspection,
+  libsystemtap,
+  libsysprof-capture,
+  mesonEmulatorHook,
+  withIntrospection ?
+    stdenv.hostPlatform.emulatorAvailable buildPackages
+    && lib.meta.availableOn stdenv.hostPlatform gobject-introspection
+    && stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian,
 }:
 
 assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null;
@@ -40,183 +53,238 @@ let
     x11Support = false;
   };
 
-  librarySuffix = if (stdenv.hostPlatform.extensions.library == ".so") then "2.0.so.0"
-                  else if (stdenv.hostPlatform.extensions.library == ".dylib") then "2.0.0.dylib"
-                  else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a"
-                  else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll"
-                  else "2.0-0.lib";
+  librarySuffix =
+    if (stdenv.hostPlatform.extensions.library == ".so") then
+      "2.0.so.0"
+    else if (stdenv.hostPlatform.extensions.library == ".dylib") then
+      "2.0.0.dylib"
+    else if (stdenv.hostPlatform.extensions.library == ".a") then
+      "2.0.a"
+    else if (stdenv.hostPlatform.extensions.library == ".dll") then
+      "2.0-0.dll"
+    else
+      "2.0-0.lib";
 
   systemtap' = buildPackages.linuxPackages.systemtap.override { withStap = false; };
+
   withDtrace =
-    lib.meta.availableOn stdenv.buildPlatform systemtap' &&
-    # dtrace support requires sys/sdt.h header
-    lib.meta.availableOn stdenv.hostPlatform libsystemtap;
+    lib.meta.availableOn stdenv.buildPlatform systemtap'
+    &&
+      # dtrace support requires sys/sdt.h header
+      lib.meta.availableOn stdenv.hostPlatform libsystemtap;
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
   version = "2.82.1";
 
+  outputs = [
+    "bin"
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  setupHook = ./setup-hook.sh;
+
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
     hash = "sha256-R4Y0RAv1LuTsRCjVWHhzmMC+awQ8UhvrMIM0s9tEiaY=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    ./darwin-compilation.patch
-  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
-    ./quark_init_on_demand.patch
-    ./gobject_init_on_demand.patch
-  ] ++ [
-    # This patch lets GLib's GDesktopAppInfo API watch and notice changes
-    # to the Nix user and system profiles.  That way, the list of available
-    # applications shown by the desktop environment is immediately updated
-    # when the user installs or removes any
-    # (see <https://issues.guix.gnu.org/35594>).
+  patches =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      ./darwin-compilation.patch
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isMusl [
+      ./quark_init_on_demand.patch
+      ./gobject_init_on_demand.patch
+    ]
+    ++ [
+      # This patch lets GLib's GDesktopAppInfo API watch and notice changes
+      # to the Nix user and system profiles.  That way, the list of available
+      # applications shown by the desktop environment is immediately updated
+      # when the user installs or removes any
+      # (see <https://issues.guix.gnu.org/35594>).
 
-    # It does so by monitoring /nix/var/nix/profiles (for changes to the system
-    # profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user
-    # profile) as well as /etc/profiles/per-user (for chanes to the user
-    # environment profile) and crawling their share/applications sub-directory when
-    # changes happen.
-    ./glib-appinfo-watch.patch
+      # It does so by monitoring /nix/var/nix/profiles (for changes to the system
+      # profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user
+      # profile) as well as /etc/profiles/per-user (for chanes to the user
+      # environment profile) and crawling their share/applications sub-directory when
+      # changes happen.
+      ./glib-appinfo-watch.patch
 
-    ./schema-override-variable.patch
+      ./schema-override-variable.patch
 
-    # Add support for Pantheon’s terminal emulator.
-    ./elementary-terminal-support.patch
+      # Add support for Pantheon’s terminal emulator.
+      ./elementary-terminal-support.patch
 
-    # GLib contains many binaries used for different purposes;
-    # we will install them to different outputs:
-    # 1. Tools for desktop environment and introspection ($bin)
-    #    * gapplication (non-darwin)
-    #    * gdbus
-    #    * gi-compile-repository
-    #    * gi-decompile-typelib
-    #    * gi-inspect-typelib
-    #    * gio
-    #    * gio-launch-desktop (symlink to $out)
-    #    * gsettings
-    # 2. Development/build tools ($dev)
-    #    * gdbus-codegen
-    #    * gio-querymodules
-    #    * glib-compile-resources
-    #    * glib-compile-schemas
-    #    * glib-genmarshal
-    #    * glib-gettextize
-    #    * glib-mkenums
-    #    * gobject-query
-    #    * gresource
-    #    * gtester
-    #    * gtester-report
-    # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
-    #    * gio-launch-desktop
-    ./split-dev-programs.patch
+      # GLib contains many binaries used for different purposes;
+      # we will install them to different outputs:
+      # 1. Tools for desktop environment and introspection ($bin)
+      #    * gapplication (non-darwin)
+      #    * gdbus
+      #    * gi-compile-repository
+      #    * gi-decompile-typelib
+      #    * gi-inspect-typelib
+      #    * gio
+      #    * gio-launch-desktop (symlink to $out)
+      #    * gsettings
+      # 2. Development/build tools ($dev)
+      #    * gdbus-codegen
+      #    * gio-querymodules
+      #    * glib-compile-resources
+      #    * glib-compile-schemas
+      #    * glib-genmarshal
+      #    * glib-gettextize
+      #    * glib-mkenums
+      #    * gobject-query
+      #    * gresource
+      #    * gtester
+      #    * gtester-report
+      # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
+      #    * gio-launch-desktop
+      ./split-dev-programs.patch
 
-    # Tell Meson to install gdb scripts next to the lib
-    # GDB only looks there and in ${gdb}/share/gdb/auto-load,
-    # and by default meson installs in to $out/share/gdb/auto-load
-    # which does not help
-    ./gdb_script.patch
-  ];
-
-  outputs = [ "bin" "out" "dev" "devdoc" ];
-
-  setupHook = ./setup-hook.sh;
-
-  buildInputs = [
-    finalAttrs.setupHook
-  ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
-    libsysprof-capture
-  ] ++ [
-    pcre2
-  ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
-    bash gnum4 # install glib-gettextize and m4 macros for other apps to use
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
-    elfutils
-  ] ++ lib.optionals withDtrace [
-    libsystemtap
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libselinux
-    util-linuxMinimal # for libmount
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-    AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
-  ]);
+      # Tell Meson to install gdb scripts next to the lib
+      # GDB only looks there and in ${gdb}/share/gdb/auto-load,
+      # and by default meson installs in to $out/share/gdb/auto-load
+      # which does not help
+      ./gdb_script.patch
+    ];
 
   strictDeps = true;
 
+  buildInputs =
+    [
+      finalAttrs.setupHook
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
+      libsysprof-capture
+    ]
+    ++ [
+      pcre2
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
+      bash
+      gnum4 # install glib-gettextize and m4 macros for other apps to use
+    ]
+    ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+      elfutils
+    ]
+    ++ lib.optionals withDtrace [
+      libsystemtap
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libselinux
+      util-linuxMinimal # for libmount
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        AppKit
+        Carbon
+        Cocoa
+        CoreFoundation
+        CoreServices
+        Foundation
+      ]
+    );
+
   depsBuildBuild = [
     pkg-config # required to find native gi-docgen
   ];
 
-  nativeBuildInputs = [
-    docutils # for rst2man, rst2html5
-    meson
-    ninja
-    pkg-config
-    perl
-    python3
-    python3Packages.packaging # mostly used to make meson happy
-    python3Packages.wrapPython # for patchPythonScript
+  nativeBuildInputs =
+    [
+      docutils # for rst2man, rst2html5
+      meson
+      ninja
+      pkg-config
+      perl
+      python3
+      python3Packages.packaging # mostly used to make meson happy
+      python3Packages.wrapPython # for patchPythonScript
+      gettext
+      libxslt
+    ]
+    ++ lib.optionals withIntrospection [
+      gi-docgen
+      gobject-introspection'
+    ]
+    ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+      mesonEmulatorHook
+    ]
+    ++ lib.optionals withDtrace [
+      systemtap' # for dtrace
+    ];
+
+  propagatedBuildInputs = [
+    zlib
+    libffi
     gettext
-    libxslt
-  ] ++ lib.optionals withIntrospection [
-    gi-docgen
-    gobject-introspection'
-  ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    mesonEmulatorHook
-  ] ++ lib.optionals withDtrace [
-    systemtap' # for dtrace
+    libiconv
   ];
 
-  propagatedBuildInputs = [ zlib libffi gettext libiconv ];
-
-  mesonFlags = [
-    "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315
-    "-Ddocumentation=true" # gvariant specification can be built without gi-docgen
-    (lib.mesonEnable "dtrace" withDtrace)
-    (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled
-    "-Dnls=enabled"
-    "-Ddevbindir=${placeholder "dev"}/bin"
-    (lib.mesonEnable "introspection" withIntrospection)
-    # FIXME: Fails when linking target glib/tests/libconstructor-helper.so
-    # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
-    "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
-  ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [
-    "-Dlibelf=disabled"
-  ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
-    "-Db_lundef=false"
-    "-Dxattr=false"
-    "-Dsysprof=disabled"  # sysprof-capture does not build on FreeBSD
+  nativeCheckInputs = [
+    tzdata
+    desktop-file-utils
+    shared-mime-info
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=nonnull"
-    # Default for release buildtype but passed manually because
-    # we're using plain
-    "-DG_DISABLE_CAST_CHECKS"
-  ];
+  mesonFlags =
+    [
+      "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315
+      "-Ddocumentation=true" # gvariant specification can be built without gi-docgen
+      (lib.mesonEnable "dtrace" withDtrace)
+      (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled
+      "-Dnls=enabled"
+      "-Ddevbindir=${placeholder "dev"}/bin"
+      (lib.mesonEnable "introspection" withIntrospection)
+      # FIXME: Fails when linking target glib/tests/libconstructor-helper.so
+      # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
+      "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+    ]
+    ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [
+      "-Dlibelf=disabled"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+      "-Db_lundef=false"
+      "-Dxattr=false"
+      "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD
+    ];
 
-  postPatch = ''
-    patchShebangs glib/gen-unicode-tables.pl
-    patchShebangs glib/tests/gen-casefold-txt.py
-    patchShebangs glib/tests/gen-casemap-txt.py
-    patchShebangs tools/gen-visibility-macros.py
-    patchShebangs tests
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=nonnull"
+      # Default for release buildtype but passed manually because
+      # we're using plain
+      "-DG_DISABLE_CAST_CHECKS"
+    ];
+  };
 
-    # Needs machine-id, comment the test
-    sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
-    sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c
-    # All gschemas fail to pass the test, upstream bug?
-    sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
-    # Cannot reproduce the failing test_associations on hydra
-    sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
-    # Needed because of libtool wrappers
-    sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
-  '' + lib.optionalString stdenv.hostPlatform.isWindows ''
-    substituteInPlace gio/win32/meson.build \
-      --replace "libintl, " ""
-  '';
+  postPatch =
+    ''
+      patchShebangs glib/gen-unicode-tables.pl
+      patchShebangs glib/tests/gen-casefold-txt.py
+      patchShebangs glib/tests/gen-casemap-txt.py
+      patchShebangs tools/gen-visibility-macros.py
+      patchShebangs tests
+
+      # Needs machine-id, comment the test
+      sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
+      sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c
+      # All gschemas fail to pass the test, upstream bug?
+      sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
+      # Cannot reproduce the failing test_associations on hydra
+      sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
+      # Needed because of libtool wrappers
+      sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
+    ''
+    + lib.optionalString stdenv.hostPlatform.isWindows ''
+      substituteInPlace gio/win32/meson.build \
+        --replace "libintl, " ""
+    '';
 
   postConfigure = ''
     patchShebangs gio/gdbus-2.0/codegen/gdbus-codegen gobject/glib-{genmarshal,mkenums}
@@ -258,8 +326,6 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput "share/doc" "$devdoc"
   '';
 
-  nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ];
-
   # Conditional necessary to break infinite recursion with passthru.tests
   preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false ''
     export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
@@ -302,7 +368,9 @@ stdenv.mkDerivation (finalAttrs: {
     getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name;
 
     tests = {
-      withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
+      withChecks = finalAttrs.finalPackage.overrideAttrs (_: {
+        doCheck = true;
+      });
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
 
@@ -326,15 +394,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     description = "C library of programming buildings blocks";
-    homepage    = "https://gitlab.gnome.org/GNOME/glib";
-    license     = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]);
+    homepage = "https://gitlab.gnome.org/GNOME/glib";
+    license = licenses.lgpl21Plus;
+    maintainers =
+      teams.gnome.members
+      ++ (with maintainers; [
+        lovek323
+        raskin
+      ]);
     pkgConfigModules = [
       "gio-2.0"
       "gobject-2.0"
       "gthread-2.0"
     ];
-    platforms   = platforms.unix ++ platforms.windows;
+    platforms = platforms.unix ++ platforms.windows;
 
     longDescription = ''
       GLib provides the core application building blocks for libraries

From 34f5f7e1ba7b1591ada85bc61aec28f7aa06442a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 22 Dec 2024 03:17:16 +0100
Subject: [PATCH 0858/1504] glib: move to by-name

---
 .../libraries => by-name/gl}/glib/darwin-compilation.patch      | 0
 .../gl}/glib/elementary-terminal-support.patch                  | 0
 .../{development/libraries => by-name/gl}/glib/gdb_script.patch | 0
 .../libraries => by-name/gl}/glib/glib-appinfo-watch.patch      | 0
 .../libraries => by-name/gl}/glib/gobject_init_on_demand.patch  | 0
 .../libraries/glib/default.nix => by-name/gl/glib/package.nix}  | 0
 .../libraries => by-name/gl}/glib/quark_init_on_demand.patch    | 0
 .../gl}/glib/schema-override-variable.patch                     | 0
 pkgs/{development/libraries => by-name/gl}/glib/setup-hook.sh   | 0
 .../libraries => by-name/gl}/glib/split-dev-programs.patch      | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 11 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/libraries => by-name/gl}/glib/darwin-compilation.patch (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/elementary-terminal-support.patch (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/gdb_script.patch (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/glib-appinfo-watch.patch (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/gobject_init_on_demand.patch (100%)
 rename pkgs/{development/libraries/glib/default.nix => by-name/gl/glib/package.nix} (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/quark_init_on_demand.patch (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/schema-override-variable.patch (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/setup-hook.sh (100%)
 rename pkgs/{development/libraries => by-name/gl}/glib/split-dev-programs.patch (100%)

diff --git a/pkgs/development/libraries/glib/darwin-compilation.patch b/pkgs/by-name/gl/glib/darwin-compilation.patch
similarity index 100%
rename from pkgs/development/libraries/glib/darwin-compilation.patch
rename to pkgs/by-name/gl/glib/darwin-compilation.patch
diff --git a/pkgs/development/libraries/glib/elementary-terminal-support.patch b/pkgs/by-name/gl/glib/elementary-terminal-support.patch
similarity index 100%
rename from pkgs/development/libraries/glib/elementary-terminal-support.patch
rename to pkgs/by-name/gl/glib/elementary-terminal-support.patch
diff --git a/pkgs/development/libraries/glib/gdb_script.patch b/pkgs/by-name/gl/glib/gdb_script.patch
similarity index 100%
rename from pkgs/development/libraries/glib/gdb_script.patch
rename to pkgs/by-name/gl/glib/gdb_script.patch
diff --git a/pkgs/development/libraries/glib/glib-appinfo-watch.patch b/pkgs/by-name/gl/glib/glib-appinfo-watch.patch
similarity index 100%
rename from pkgs/development/libraries/glib/glib-appinfo-watch.patch
rename to pkgs/by-name/gl/glib/glib-appinfo-watch.patch
diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/by-name/gl/glib/gobject_init_on_demand.patch
similarity index 100%
rename from pkgs/development/libraries/glib/gobject_init_on_demand.patch
rename to pkgs/by-name/gl/glib/gobject_init_on_demand.patch
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/by-name/gl/glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/glib/default.nix
rename to pkgs/by-name/gl/glib/package.nix
diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/by-name/gl/glib/quark_init_on_demand.patch
similarity index 100%
rename from pkgs/development/libraries/glib/quark_init_on_demand.patch
rename to pkgs/by-name/gl/glib/quark_init_on_demand.patch
diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/pkgs/by-name/gl/glib/schema-override-variable.patch
similarity index 100%
rename from pkgs/development/libraries/glib/schema-override-variable.patch
rename to pkgs/by-name/gl/glib/schema-override-variable.patch
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/by-name/gl/glib/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/glib/setup-hook.sh
rename to pkgs/by-name/gl/glib/setup-hook.sh
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/by-name/gl/glib/split-dev-programs.patch
similarity index 100%
rename from pkgs/development/libraries/glib/split-dev-programs.patch
rename to pkgs/by-name/gl/glib/split-dev-programs.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679e0a50c3a8..c69e89c67938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9252,7 +9252,7 @@ with pkgs;
 
   grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
 
-  glib = callPackage ../development/libraries/glib (let
+  glib = callPackage ../by-name/gl/glib/package.nix (let
     glib-untested = glib.overrideAttrs { doCheck = false; };
   in {
     # break dependency cycles

From 570c92c6032b9fa772d1f8b0d97a6fd208cd9b81 Mon Sep 17 00:00:00 2001
From: Sagi Sarussi <me@sagis.dev>
Date: Tue, 31 Dec 2024 21:21:02 +0200
Subject: [PATCH 0859/1504] gpu-screen-recorder{-,gtk}: 4.2.3 -> 5.0.0

---
 pkgs/applications/video/gpu-screen-recorder/default.nix       | 4 ++--
 .../video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix
index 93603de2d829..2c9a7c2edbe8 100644
--- a/pkgs/applications/video/gpu-screen-recorder/default.nix
+++ b/pkgs/applications/video/gpu-screen-recorder/default.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpu-screen-recorder";
-  version = "4.2.3";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-M2bk1WwLlbwspEoPIRMix17ihi72UuRWwiKBdPfim2M=";
+    hash = "sha256-w1dtFLSY71UileoF4b1QLKIHYWPE5c2KmsHyRPtn+sA=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
index 92863147becf..b399f39fefd8 100644
--- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
+++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpu-screen-recorder-gtk";
-  version = "4.2.3";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-pMUjglgRM51hjPbt6VP0aqM0oo7IiyPXTY/kLwwdR/k=";
+    hash = "sha256-uXbiuA1XPWZVwQGLh47rKzCZSEUEPWqYALqMuCGA7do=";
   };
 
   sourceRoot = ".";

From 68891b69f167489906dd634168e58b4bbb3281a6 Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Tue, 31 Dec 2024 19:21:06 +0000
Subject: [PATCH 0860/1504] sby: cleanup

---
 pkgs/by-name/sb/sby/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 8cd9215be74d..922056fc94fb 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     hash = "sha256-icOlWutvajHMCi2YUIGU4v5S63YobXw4fYYUvPoSzo4=";
   };
 
-  nativeBuildInputs = [ bash ];
-  buildInputs = [
-    pythonEnv
+  nativeCheckInputs = [
+    python3
+    python3.pkgs.xmlschema
     yosys
     boolector
     yices
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs docs/source/conf.py \
+    patchShebangs --build \
+      docs/source/conf.py \
       docs/source/conf.diff \
       tests/autotune/*.sh \
       tests/keepgoing/*.sh \
@@ -64,8 +65,6 @@ stdenv.mkDerivation rec {
       --replace-fail '/usr/bin/env python3' '${pythonEnv}/bin/python'
     substituteInPlace sbysrc/sby_autotune.py \
       --replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
-    substituteInPlace tests/make/required_tools.py \
-      --replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
   '';
 
   dontBuild = true;

From a46eb8266a241677a2b11be343be4cdd7236c52a Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 31 Dec 2024 19:27:52 +0000
Subject: [PATCH 0861/1504] doc/packages/build-support: remove stray backtick

This corrects a start/end error in the formatting of code in one of the
examples.
---
 doc/packages/build-support.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/packages/build-support.md b/doc/packages/build-support.md
index cf6a13384753..80392f4d121e 100644
--- a/doc/packages/build-support.md
+++ b/doc/packages/build-support.md
@@ -98,5 +98,5 @@ substituteAllFiles {
 }
 ```
 
-in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and` `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`.
+in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`.
 :::

From 8dfd8ed94fbd20fe7f071c84855266d465233086 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 18:29:26 +0000
Subject: [PATCH 0862/1504] python312Packages.libtmux: 0.39.0 -> 0.40.1

---
 pkgs/development/python-modules/libtmux/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 24e7e7572806..17eaedbed5d1 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.39.0";
+  version = "0.40.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JqOxJD34DL5Iku3Ov8JzwSVThqDg41PQ/v1Dz6ex4ro=";
+    tag = "v${version}";
+    hash = "sha256-rddjRBofI5M28wvlBwH2VwuIgmulThxbfxiJSOCNkPY=";
   };
 
   postPatch = ''

From 18bcb1ef6e5397826e4bfae8ae95f1f88bf59f4f Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Wed, 1 Jan 2025 03:47:18 +0800
Subject: [PATCH 0863/1504] waveterm: 0.10.1 -> 0.10.4 (#367119)

---
 pkgs/by-name/wa/waveterm/package.nix | 101 ++++++++++-----------------
 pkgs/by-name/wa/waveterm/update.sh   |  12 ++--
 2 files changed, 41 insertions(+), 72 deletions(-)

diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 8d70107b3a77..f5d131b67dfb 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  makeDesktopItem,
-  copyDesktopItems,
+  dpkg,
   autoPatchelfHook,
   atk,
   at-spi2-atk,
@@ -28,44 +27,19 @@
   wrapGAppsHook3,
   udev,
   libGL,
-  fetchzip,
   unzip,
+  makeWrapper,
 }:
 let
   selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
   pname = "waveterm";
-  version = "0.10.1";
+  version = "0.10.4";
+
   passthru.updateScript = ./update.sh;
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "waveterm";
-      exec = "waveterm --no-sandbox %U";
-      icon = fetchurl {
-        url = "https://raw.githubusercontent.com/wavetermdev/waveterm/refs/tags/v${version}/build/appicon.png";
-        hash = "sha256-qob27/64C9XPBtXghxg5/g0qRaiOUOpuFYL1n7/aEB0=";
-      };
-      startupWMClass = "Wave";
-      comment = "Open-Source AI-Native Terminal Built for Seamless Workflows";
-      desktopName = "Wave";
-      genericName = "Terminal Emulator";
-      categories = [
-        "Development"
-        "Utility"
-        "TerminalEmulator"
-      ];
-      keywords = [
-        "developer"
-        "terminal"
-        "emulator"
-      ];
-    })
-  ];
-
-  meta = {
+  metaCommon = {
     description = "Open-source, cross-platform terminal for seamless workflows";
     homepage = "https://www.waveterm.dev";
-    mainProgram = "waveterm";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     platforms = [
@@ -78,35 +52,28 @@ let
   };
 
   linux = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      desktopItems
-      meta
-      passthru
-      ;
+    inherit pname version passthru;
 
     src =
       let
         arch = selectSystem {
-          x86_64-linux = "x64";
+          x86_64-linux = "amd64";
           aarch64-linux = "arm64";
         };
-        hash = selectSystem {
-          x86_64-linux = "sha256-zv8ndwMt4VqsdJEEdfXzK4rnyslxF/gwnFdUu5OavNY=";
-          aarch64-linux = "sha256-6EFk1CDPeYc1KWeIxBQEsMLA9tYpnSxjG+yRg5CkGZA=";
-        };
       in
-      fetchzip {
-        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.zip";
-        inherit hash;
-        stripRoot = false;
+      fetchurl {
+        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb";
+        hash = selectSystem {
+          x86_64-linux = "sha256-dwBnRuskajMpfaBQ5zr19+CQ3A/qen2RtxmV7GnXx0E=";
+          aarch64-linux = "sha256-HfzvbAV8RkmuwvuBtgvHgzAslbejlPJJJO7juGSMm1o=";
+        };
       };
 
     nativeBuildInputs = [
-      copyDesktopItems
+      dpkg
       autoPatchelfHook
       wrapGAppsHook3
+      makeWrapper
     ];
 
     buildInputs = [
@@ -139,30 +106,31 @@ let
     installPhase = ''
       runHook preInstall
 
-      mkdir $out
-      cp -r . $out/waveterm
+      cp -r opt $out
+      cp -r usr/share $out/share
+      substituteInPlace $out/share/applications/waveterm.desktop \
+        --replace-fail "/opt/Wave/" ""
 
       runHook postInstall
     '';
 
     preFixup = ''
       mkdir $out/bin
-      makeWrapper $out/waveterm/waveterm $out/bin/waveterm \
+      makeWrapper $out/Wave/waveterm $out/bin/waveterm \
         --prefix LD_LIBRARY_PATH : "${
           lib.makeLibraryPath [
             libGL
           ]
         }"
     '';
+
+    meta = metaCommon // {
+      mainProgram = "waveterm";
+    };
   };
 
-  darwin = stdenv.mkDerivation rec {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
+  darwin = stdenv.mkDerivation {
+    inherit pname version passthru;
 
     src =
       let
@@ -170,30 +138,31 @@ let
           x86_64-darwin = "x64";
           aarch64-darwin = "arm64";
         };
-        hash = selectSystem {
-          x86_64-darwin = "sha256-7TCDg0TU0Bx9WLwLiQRcyzrFTlmkXYQIpya2SUiEXoc=";
-          aarch64-darwin = "sha256-pVxPmTz1bCKREUOvA3Jrf7kiOI5iLzqgnutblEqc4IA=";
-        };
       in
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
-        inherit hash;
+        hash = selectSystem {
+          x86_64-darwin = "sha256-iQimmHhpojimZvJtPgOExLaEu/io6BrWWkTsx/1avjY=";
+          aarch64-darwin = "sha256-4txsd3aKIcsjSvx+XeDm7a6M9YRkZNLUuvv5adLOVx8=";
+        };
       };
 
     nativeBuildInputs = [
       unzip
     ];
 
-    sourceRoot = "Wave.app";
-
     installPhase = ''
       runHook preInstall
 
       mkdir -p $out/Applications
-      cp -r . $out/Applications/Wave.app
+      cp -r . "$out/Applications/Wave.app"
 
       runHook postInstall
     '';
+
+    meta = metaCommon // {
+      mainProgram = "Wave";
+    };
   };
 in
 if stdenv.hostPlatform.isDarwin then darwin else linux
diff --git a/pkgs/by-name/wa/waveterm/update.sh b/pkgs/by-name/wa/waveterm/update.sh
index 37eadc1edee6..e04f4c805dbd 100755
--- a/pkgs/by-name/wa/waveterm/update.sh
+++ b/pkgs/by-name/wa/waveterm/update.sh
@@ -16,19 +16,19 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
 fi
 
 for i in \
-    "x86_64-linux waveterm-linux-x64" \
-    "aarch64-linux waveterm-linux-arm64"; do
+    "x86_64-linux amd64" \
+    "aarch64-linux arm64"; do
     set -- $i
-    prefetch=$(nix-prefetch-url --unpack "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip")
+    prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/waveterm-linux-$2-$latestVersion.deb")
     hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch)
     update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version
 done
 
 for i in \
-    "x86_64-darwin Wave-darwin-x64" \
-    "aarch64-darwin Wave-darwin-arm64"; do
+    "x86_64-darwin x64" \
+    "aarch64-darwin arm64"; do
     set -- $i
-    prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip")
+    prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/Wave-darwin-$2-$latestVersion.zip")
     hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch)
     update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version
 done

From 77e361e9f854ff3a71e1a14f77c6d75b4b65488b Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Tue, 31 Dec 2024 19:47:34 +0000
Subject: [PATCH 0864/1504] element-web: escape JSON string

Previously, if any part of the configuration (either key or value)
contained a single quote ('), the build would fail.
---
 pkgs/by-name/el/element-web/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/el/element-web/package.nix b/pkgs/by-name/el/element-web/package.nix
index 165761f2a25c..b43013d179d1 100644
--- a/pkgs/by-name/el/element-web/package.nix
+++ b/pkgs/by-name/el/element-web/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   jq,
   element-web-unwrapped,
@@ -22,7 +23,7 @@ else
       mkdir -p $out
       ln -s ${element-web-unwrapped}/* $out
       rm $out/config.json
-      jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json"
+      jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" ${lib.escapeShellArg (builtins.toJSON conf)} > "$out/config.json"
 
       runHook postInstall
     '';

From 325d741a06f08db843d44fb376ab39d457d5309a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 19:55:58 +0000
Subject: [PATCH 0865/1504] hyprutils: 0.2.6 -> 0.3.0

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

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index de29c5adcf52..fec3042b5a4d 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.2.6";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=";
+    hash = "sha256-5Wvsn+0/Hu6eUUToK9hBWwRlbg1i++lc9or4yPYBUuk=";
   };
 
   nativeBuildInputs = [

From 7c52e7a08b9c509362e005969c77fff1274418b8 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Tue, 31 Dec 2024 13:44:03 -0500
Subject: [PATCH 0866/1504] caddy: 2.8.4 -> 2.9.0

---
 pkgs/by-name/ca/caddy/package.nix | 81 ++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 337fda2c0d2e..760ec1d8e7ae 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -1,20 +1,21 @@
-{ lib
-, buildGoModule
-, callPackage
-, fetchFromGitHub
-, nixosTests
-, caddy
-, testers
-, installShellFiles
-, stdenv
+{
+  lib,
+  buildGoModule,
+  callPackage,
+  fetchFromGitHub,
+  nixosTests,
+  caddy,
+  testers,
+  installShellFiles,
+  stdenv,
 }:
 let
-  version = "2.8.4";
+  version = "2.9.0";
   dist = fetchFromGitHub {
     owner = "caddyserver";
     repo = "dist";
-    rev = "v${version}";
-    hash = "sha256-O4s7PhSUTXoNEIi+zYASx8AgClMC5rs7se863G6w+l0=";
+    tag = "v${version}";
+    hash = "sha256-3QcpmPUhZZ8oN/CUbCh/A1D0B59o1RxWPyMbA/WoRcU=";
   };
 in
 buildGoModule {
@@ -24,11 +25,11 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "caddyserver";
     repo = "caddy";
-    rev = "v${version}";
-    hash = "sha256-CBfyqtWp3gYsYwaIxbfXO3AYaBiM7LutLC7uZgYXfkQ=";
+    tag = "v${version}";
+    hash = "sha256-ea1Cch0LOGVGO9CVvS61EHVwJule4HZRizpQYP1QA2w=";
   };
 
-  vendorHash = "sha256-1Api8bBZJ1/oYk4ZGIiwWCSraLzK9L+hsKXkFtk6iVM=";
+  vendorHash = "sha256-HEQCNOv4vO5QsbmoT0acRoaJ4sB0dzF1zcR38778nBI=";
 
   subPackages = [ "cmd/caddy" ];
 
@@ -39,29 +40,35 @@ buildGoModule {
   ];
 
   # matches upstream since v2.8.0
-  tags = [ "nobadger" ];
+  tags = [
+    "nobadger"
+    "nomysql"
+    "nopgx"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall = ''
-    install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
+  postInstall =
+    ''
+      install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
 
-    substituteInPlace $out/lib/systemd/system/caddy.service \
-      --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
-    substituteInPlace $out/lib/systemd/system/caddy-api.service \
-      --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
-  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    # Generating man pages and completions fail on cross-compilation
-    # https://github.com/NixOS/nixpkgs/issues/308283
+      substituteInPlace $out/lib/systemd/system/caddy.service \
+        --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
+      substituteInPlace $out/lib/systemd/system/caddy-api.service \
+        --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      # Generating man pages and completions fail on cross-compilation
+      # https://github.com/NixOS/nixpkgs/issues/308283
 
-    $out/bin/caddy manpage --directory manpages
-    installManPage manpages/*
+      $out/bin/caddy manpage --directory manpages
+      installManPage manpages/*
 
-    installShellCompletion --cmd caddy \
-      --bash <($out/bin/caddy completion bash) \
-      --fish <($out/bin/caddy completion fish) \
-      --zsh <($out/bin/caddy completion zsh)
-  '';
+      installShellCompletion --cmd caddy \
+        --bash <($out/bin/caddy completion bash) \
+        --fish <($out/bin/caddy completion fish) \
+        --zsh <($out/bin/caddy completion zsh)
+    '';
 
   passthru = {
     tests = {
@@ -74,11 +81,15 @@ buildGoModule {
     withPlugins = callPackage ./plugins.nix { inherit caddy; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://caddyserver.com";
     description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "caddy";
-    maintainers = with maintainers; [ Br1ght0ne techknowlogick ];
+    maintainers = with lib.maintainers; [
+      Br1ght0ne
+      stepbrobd
+      techknowlogick
+    ];
   };
 }

From 3165d9371639d7f32b5fc0c4af4a1d2d3a6c8d3c Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 18:30:57 +0000
Subject: [PATCH 0867/1504] tmuxp: 1.49.0 -> 1.50.1

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

diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix
index 07d32d620870..f91ea26b971f 100644
--- a/pkgs/by-name/tm/tmuxp/package.nix
+++ b/pkgs/by-name/tm/tmuxp/package.nix
@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.49.0";
+  version = "1.50.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Fip2HnwIa03khiYlL5FkhVo84oS0OSD9f79bEFLBoNc=";
+    hash = "sha256-v7k0S0dMmpmwZkCJhPKiE+sEtVkOL+tE4Io66EIEXP0=";
   };
 
   build-system = with python3Packages; [

From 519418a36670c2a8069d189c34d39e0fea60e4bc Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:25:04 +0100
Subject: [PATCH 0868/1504] codeblocks: fix darwin build

---
 pkgs/by-name/co/codeblocks/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix
index a62b5d690346..a9cfa5d99d17 100644
--- a/pkgs/by-name/co/codeblocks/package.nix
+++ b/pkgs/by-name/co/codeblocks/package.nix
@@ -118,6 +118,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch";
       hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI=";
     })
+    (fetchpatch {
+      name = "fix-build-with-clang-2.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/edc6b145bcdcaf2823ef9c7da51a211f65d6f5d0.patch";
+      hash = "sha256-GuttBL4gp1IBn3ia2O8wtOR6xOSGrzwCKXwFLI3RO5o=";
+    })
     (fetchpatch {
       name = "fix-normalize.patch";
       url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch";

From 2a5b75f46986c527717fb1a40e932abf8bac9b5b Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 18:30:50 +0000
Subject: [PATCH 0869/1504] robotframework-tidy: 4.14.0 -> 4.15.0

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

diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix
index f2a0b694ea25..405c41fcb087 100644
--- a/pkgs/by-name/ro/robotframework-tidy/package.nix
+++ b/pkgs/by-name/ro/robotframework-tidy/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "robotframework-tidy";
-  version = "4.14.0";
+  version = "4.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MarketSquare";
     repo = "robotframework-tidy";
-    rev = "refs/tags/${version}";
-    hash = "sha256-FsZraD0Kn9e6J0XzJsm4m0dIXHi86AWGad13ggqm3h4=";
+    tag = version;
+    hash = "sha256-PNf0K1+kjijvJ53UCKkC2LyjBJOroDPdtYjcXbRU1VI=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 860472df032c79678cd3dcb1109f6ea33aa1e634 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Mon, 30 Dec 2024 19:40:11 +0100
Subject: [PATCH 0870/1504] qownnotes: move package to by-name directory

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 .../qo/qownnotes/package.nix}                 | 24 +++++++------------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 9 insertions(+), 19 deletions(-)
 rename pkgs/{applications/office/qownnotes/default.nix => by-name/qo/qownnotes/package.nix} (89%)

diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/by-name/qo/qownnotes/package.nix
similarity index 89%
rename from pkgs/applications/office/qownnotes/default.nix
rename to pkgs/by-name/qo/qownnotes/package.nix
index 12da21cfd6fe..f3b8d8fc3e08 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -1,15 +1,9 @@
 { lib
 , stdenv
 , fetchurl
+, qt6Packages
 , cmake
-, qttools
-, qtbase
-, qtdeclarative
-, qtsvg
-, qtwayland
-, qtwebsockets
 , makeWrapper
-, wrapQtAppsHook
 , botan2
 , pkg-config
 , nixosTests
@@ -22,7 +16,7 @@ let
   appname = "QOwnNotes";
   version = "24.12.7";
 in
-stdenv.mkDerivation {
+qt6Packages.stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
@@ -32,19 +26,19 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
     pkg-config
     installShellFiles
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtwebsockets
+    qt6Packages.qtbase
+    qt6Packages.qtdeclarative
+    qt6Packages.qtsvg
+    qt6Packages.qtwebsockets
     botan2
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
 
   cmakeFlags = [
     "-DQON_QT6_BUILD=ON"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2036862232f..0ab8656290ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4951,10 +4951,6 @@ with pkgs;
 
   qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { };
 
-  qownnotes = qt6Packages.callPackage ../applications/office/qownnotes {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
-
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };

From 37c70872d669f87bcf50e4dbb740573f333f1f7b Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Mon, 30 Dec 2024 20:00:20 +0100
Subject: [PATCH 0871/1504] qownnotes: format with nixfmt

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 pkgs/by-name/qo/qownnotes/package.nix | 76 +++++++++++++++------------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index f3b8d8fc3e08..78608b0b53e0 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, fetchurl
-, qt6Packages
-, cmake
-, makeWrapper
-, botan2
-, pkg-config
-, nixosTests
-, installShellFiles
-, xvfb-run
+{
+  lib,
+  stdenv,
+  fetchurl,
+  qt6Packages,
+  cmake,
+  makeWrapper,
+  botan2,
+  pkg-config,
+  nixosTests,
+  installShellFiles,
+  xvfb-run,
 }:
 
 let
@@ -24,13 +25,16 @@ qt6Packages.stdenv.mkDerivation {
     hash = "sha256-48puEyScG6EIrsXZpFc62dl4a23p+TO2buzuwq9m3Sw=";
   };
 
-  nativeBuildInputs = [
-    cmake
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
-    pkg-config
-    installShellFiles
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
+  nativeBuildInputs =
+    [
+      cmake
+      qt6Packages.qttools
+      qt6Packages.wrapQtAppsHook
+      pkg-config
+      installShellFiles
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
   buildInputs = [
     qt6Packages.qtbase
@@ -46,30 +50,31 @@ qt6Packages.stdenv.mkDerivation {
   ];
 
   # Install shell completion on Linux (with xvfb-run)
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
+  postInstall =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
       installShellCompletion --cmd ${appname} \
         --bash <(xvfb-run $out/bin/${appname} --completion bash) \
         --fish <(xvfb-run $out/bin/${appname} --completion fish)
       installShellCompletion --cmd ${pname} \
         --bash <(xvfb-run $out/bin/${appname} --completion bash) \
         --fish <(xvfb-run $out/bin/${appname} --completion fish)
-  ''
-  # Install shell completion on macOS
-  + lib.optionalString stdenv.isDarwin ''
+    ''
+    # Install shell completion on macOS
+    + lib.optionalString stdenv.isDarwin ''
       installShellCompletion --cmd ${pname} \
         --bash <($out/bin/${appname} --completion bash) \
         --fish <($out/bin/${appname} --completion fish)
-  ''
-  # Create a lowercase symlink for Linux
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    ln -s $out/bin/${appname} $out/bin/${pname}
-  ''
-  # Rename application for macOS as lowercase binary
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Prevent "same file" error
-    mv $out/bin/${appname} $out/bin/${pname}.bin
-    mv $out/bin/${pname}.bin $out/bin/${pname}
-  '';
+    ''
+    # Create a lowercase symlink for Linux
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      ln -s $out/bin/${appname} $out/bin/${pname}
+    ''
+    # Rename application for macOS as lowercase binary
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Prevent "same file" error
+      mv $out/bin/${appname} $out/bin/${pname}.bin
+      mv $out/bin/${pname}.bin $out/bin/${pname}
+    '';
 
   # Tests QOwnNotes using the NixOS module by launching xterm:
   passthru.tests.basic-nixos-module-functionality = nixosTests.qownnotes;
@@ -80,7 +85,10 @@ qt6Packages.stdenv.mkDerivation {
     changelog = "https://www.qownnotes.org/changelog.html";
     downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ pbek totoroot ];
+    maintainers = with maintainers; [
+      pbek
+      totoroot
+    ];
     platforms = platforms.unix;
   };
 }

From 621f68c05afc29559fd28e2a772cae1c141cafa3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 20:46:04 +0000
Subject: [PATCH 0872/1504] irust: 1.71.29 -> 1.71.30

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

diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix
index 5291ee8675fb..2df1c45e7a4e 100644
--- a/pkgs/by-name/ir/irust/package.nix
+++ b/pkgs/by-name/ir/irust/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "irust";
-  version = "1.71.29";
+  version = "1.71.30";
 
   src = fetchFromGitHub {
     owner = "sigmaSd";
     repo = "IRust";
     rev = "irust@${version}";
-    hash = "sha256-UKq9sFLhgx1eg0jKhb47NH/HaSdwegh1gES7naXXup0=";
+    hash = "sha256-moYHi+hkL2I3jm3eBfaXuK4Zz84Pq2X50V5lKyIMecM=";
   };
 
-  cargoHash = "sha256-GW2IqWyFkohFTzCqxJoj/U9gi/IrSfG0bXQl7OFc+kI=";
+  cargoHash = "sha256-Ecz4JulISoDMrRloqbOP1T+mwoWDV+COwJR/+0fPNXc=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From c314e80587f9617258be0225497473fbdcc34ae4 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Tue, 31 Dec 2024 02:22:14 -0800
Subject: [PATCH 0873/1504] ceph: fix python build

`trustme` 1.2+ doesn't work with the old pinned version of
`cryptography` that `ceph` needs. This vendors the previous version of
`trustme`, which does work. How I got this:

```shell
git show fd30f2796b08596646c9a43fd439c4177f53c0ac~:pkgs/development/python-modules/trustme/default.nix > pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix
```

I then added a warning on the top of the file, and updated the maintiner
to myself.

This fixes https://github.com/NixOS/nixpkgs/issues/359723

Unfortunately, the build goes on to fail trying to compile ceph itself.
I see a bunch of errors that look like this. Hopefully someone more
familiar with C++ can help figure this out:

    /build/ceph-19.2.0/src/osd/osd_types.h: In lambda function:
    /build/ceph-19.2.0/src/common/dout.h:196:73: error: call to non-'constexpr' function 'virtual unsigned int DoutPrefixProvider::get_subsys() const'
      196 |     dout_impl(pdpp->get_cct(), ceph::dout::need_dynamic(pdpp->get_subsys()), v) \
          |                                                         ~~~~~~~~~~~~~~~~^~
    /build/ceph-19.2.0/src/common/dout.h:167:58: note: in definition of macro 'dout_impl'
      167 |       return (cctX->_conf->subsys.template should_gather<sub, v>());    \
          |                                                          ^~~
    /build/ceph-19.2.0/src/osd/osd_types.h:3704:3: note: in expansion of macro 'ldpp_dout'
     3704 |   ldpp_dout(dpp, 10) << "build_prior all_probe " << all_probe << dendl;
          |   ^~~~~~~~~
    /build/ceph-19.2.0/src/common/dout.h:63:20: note: 'virtual unsigned int DoutPrefixProvider::get_subsys() const' declared here
       63 |   virtual unsigned get_subsys() const = 0;
          |                    ^~~~~~~~~~

I've filed https://github.com/NixOS/nixpkgs/issues/369777 so we can fix
this in a follow up PR.
---
 pkgs/tools/filesystems/ceph/default.nix       | 12 +++--
 .../ceph/old-python-packages/trustme.nix      | 52 +++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 5fde26dee5bc..ddaa688be613 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -240,13 +240,12 @@ let
         });
 
         # We pin the older `cryptography` 40 here;
-        # this also forces us to pin an older `pyopenssl` because the current one
-        # is not compatible with older `cryptography`, see:
-        #     https://github.com/pyca/pyopenssl/blob/d9752e44127ba36041b045417af8a0bf16ec4f1e/CHANGELOG.rst#2320-2023-05-30
+        # this also forces us to pin other packages, see below
         cryptography = self.callPackage ./old-python-packages/cryptography.nix { };
 
         # This is the most recent version of `pyopenssl` that's still compatible with `cryptography` 40.
         # See https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602
+        # and https://github.com/pyca/pyopenssl/blob/d9752e44127ba36041b045417af8a0bf16ec4f1e/CHANGELOG.rst#2320-2023-05-30
         pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
           version = "23.1.1";
           src = fetchPypi {
@@ -262,7 +261,12 @@ let
           ];
         });
 
-        fastapi = super.fastapi.overridePythonAttrs (old: rec {
+        # This is the most recent version of `trustme` that's still compatible with `cryptography` 40.
+        # See https://github.com/NixOS/nixpkgs/issues/359723
+        # and https://github.com/python-trio/trustme/commit/586f7759d5c27beb44da60615a71848eb2a5a490
+        trustme = self.callPackage ./old-python-packages/trustme.nix { };
+
+        fastapi = super.fastapi.overridePythonAttrs (old: {
           # Flaky test:
           #     ResourceWarning: Unclosed <MemoryObjectSendStream>
           # Unclear whether it's flaky in general or only in this overridden package set.
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix b/pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix
new file mode 100644
index 000000000000..31578bcb8d7d
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix
@@ -0,0 +1,52 @@
+# This older version only exists because `ceph` needs it, see its package.
+{
+  lib,
+  buildPythonPackage,
+  cryptography,
+  fetchPypi,
+  idna,
+  pyopenssl,
+  pytestCheckHook,
+  pythonOlder,
+  service-identity,
+}:
+
+buildPythonPackage rec {
+  pname = "trustme";
+  version = "1.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-U3Wtf7QnB0vslWWS4NTuKkz02miTThukvPQhcSa8ReY=";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+    idna
+  ];
+
+  nativeCheckInputs = [
+    pyopenssl
+    pytestCheckHook
+    service-identity
+  ];
+
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [ "trustme" ];
+
+  meta = with lib; {
+    description = "High quality TLS certs while you wait, for the discerning tester";
+    homepage = "https://github.com/python-trio/trustme";
+    changelog = "https://trustme.readthedocs.io/en/latest/#change-history";
+    license = with licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with maintainers; [ jfly ];
+  };
+}

From 6b5473f7a2073f8e522dbbc5caeeda222a23c710 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:56:23 +0100
Subject: [PATCH 0874/1504] bossa: move to pkgs/by-name

---
 .../arduino.nix => by-name/bo/bossa-arduino/package.nix}      | 0
 pkgs/{development/embedded => by-name/bo}/bossa/bin2c.c       | 0
 .../bossa/default.nix => by-name/bo/bossa/package.nix}        | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 4 deletions(-)
 rename pkgs/{development/embedded/bossa/arduino.nix => by-name/bo/bossa-arduino/package.nix} (100%)
 rename pkgs/{development/embedded => by-name/bo}/bossa/bin2c.c (100%)
 rename pkgs/{development/embedded/bossa/default.nix => by-name/bo/bossa/package.nix} (100%)

diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/by-name/bo/bossa-arduino/package.nix
similarity index 100%
rename from pkgs/development/embedded/bossa/arduino.nix
rename to pkgs/by-name/bo/bossa-arduino/package.nix
diff --git a/pkgs/development/embedded/bossa/bin2c.c b/pkgs/by-name/bo/bossa/bin2c.c
similarity index 100%
rename from pkgs/development/embedded/bossa/bin2c.c
rename to pkgs/by-name/bo/bossa/bin2c.c
diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/by-name/bo/bossa/package.nix
similarity index 100%
rename from pkgs/development/embedded/bossa/default.nix
rename to pkgs/by-name/bo/bossa/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ba5a100d6..69a117607478 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7861,10 +7861,6 @@ with pkgs;
 
   black-macchiato = with python3Packages; toPythonApplication black-macchiato;
 
-  bossa = callPackage ../development/embedded/bossa { };
-
-  bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
-
   buck = callPackage ../development/tools/build-managers/buck {
     python3 = python311;
   };

From b7e0a69827b8902beff8eeebb26e4b400a6a1232 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:58:20 +0100
Subject: [PATCH 0875/1504] bossa: fix darwin build

---
 pkgs/by-name/bo/bossa/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index 05c2d3faddfc..1a108f0a712d 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -5,7 +5,6 @@
   wxGTK32,
   libX11,
   readline,
-  darwin,
   fetchpatch,
 }:
 
@@ -48,15 +47,11 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ bin2c ];
-  buildInputs =
-    [
-      wxGTK32
-      libX11
-      readline
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Cocoa
-    ];
+  buildInputs = [
+    wxGTK32
+    libX11
+    readline
+  ];
 
   makeFlags = [
     "WXVERSION=3.2"
@@ -65,7 +60,15 @@ stdenv.mkDerivation rec {
     "bin/bossash"
     "bin/bossa"
   ];
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-Wno-error=deprecated-declarations"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "-Wno-error=vla-cxx-extension"
+    ]
+  );
 
   installPhase = ''
     mkdir -p $out/bin

From 354b423fcc3e4076f52a061c3f7376384ab551ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 14:22:50 +0000
Subject: [PATCH 0876/1504] libportal: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index 832146707d16..5b76dc8ccdcd 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -21,7 +21,7 @@ assert
 
 stdenv.mkDerivation rec {
   pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
-  version = "0.8.1";
+  version = "0.9.0";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "flatpak";
     repo = "libportal";
     rev = version;
-    sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc=";
+    sha256 = "sha256-uKblVaJB3s01En/T3ofT8uZHHarPKAO1qyLidLZ/b/g=";
   };
 
   depsBuildBuild = [

From ec3661ed7ace0effe7193e97d6c99f275b4340d3 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 26 Dec 2024 18:33:25 +0100
Subject: [PATCH 0877/1504] nixos/opensnitch: fix eval on non-ebpf
 ProcMonitorMethod

---
 nixos/modules/services/security/opensnitch.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix
index 97700987025d..c56501c98a5f 100644
--- a/nixos/modules/services/security/opensnitch.nix
+++ b/nixos/modules/services/security/opensnitch.nix
@@ -150,7 +150,7 @@ in
             };
 
             Ebpf.ModulesPath = lib.mkOption {
-              type = lib.types.path;
+              type = lib.types.nullOr lib.types.path;
               default =
                 if cfg.settings.ProcMonitorMethod == "ebpf" then
                   "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd"
@@ -202,10 +202,16 @@ in
       services.opensnitchd = {
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
-          ExecStart = [
-            ""
-            "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}"
-          ];
+          ExecStart =
+            let
+              preparedSettings = removeAttrs cfg.settings (
+                lib.optional (cfg.settings.ProcMonitorMethod != "ebpf") "Ebpf"
+              );
+            in
+            [
+              ""
+              "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" preparedSettings}"
+            ];
         };
         preStart = lib.mkIf (cfg.rules != { }) (
           let

From d14a2126152231bfe77fad807eb11fbc044f6d93 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Thu, 26 Dec 2024 22:04:37 +0100
Subject: [PATCH 0878/1504] nixos/tests/opensnitch: test all possible values
 for ProcMonitorMethod

---
 nixos/tests/opensnitch.nix | 107 +++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 45 deletions(-)

diff --git a/nixos/tests/opensnitch.nix b/nixos/tests/opensnitch.nix
index 4781cc485dbe..dbb536e9a769 100644
--- a/nixos/tests/opensnitch.nix
+++ b/nixos/tests/opensnitch.nix
@@ -1,5 +1,13 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
+  let
+    monitorMethods = [
+      "ebpf"
+      "proc"
+      "ftrace"
+      "audit"
+    ];
+  in
   {
     name = "opensnitch";
 
@@ -7,10 +15,9 @@ import ./make-test-python.nix (
       maintainers = [ onny ];
     };
 
-    nodes = {
-      server =
-        { ... }:
-        {
+    nodes =
+      {
+        server = {
           networking.firewall.allowedTCPPorts = [ 80 ];
           services.caddy = {
             enable = true;
@@ -19,50 +26,60 @@ import ./make-test-python.nix (
             '';
           };
         };
-
-      clientBlocked =
-        { ... }:
-        {
-          services.opensnitch = {
-            enable = true;
-            settings.DefaultAction = "deny";
-          };
-        };
-
-      clientAllowed =
-        { ... }:
-        {
-          services.opensnitch = {
-            enable = true;
-            settings.DefaultAction = "deny";
-            rules = {
-              curl = {
-                name = "curl";
-                enabled = true;
-                action = "allow";
-                duration = "always";
-                operator = {
-                  type = "simple";
-                  sensitive = false;
-                  operand = "process.path";
-                  data = "${pkgs.curl}/bin/curl";
+      }
+      // (lib.listToAttrs (
+        map (
+          m:
+          lib.nameValuePair "client_blocked_${m}" {
+            services.opensnitch = {
+              enable = true;
+              settings.DefaultAction = "deny";
+              settings.ProcMonitorMethod = m;
+            };
+          }
+        ) monitorMethods
+      ))
+      // (lib.listToAttrs (
+        map (
+          m:
+          lib.nameValuePair "client_allowed_${m}" {
+            services.opensnitch = {
+              enable = true;
+              settings.DefaultAction = "deny";
+              settings.ProcMonitorMethod = m;
+              rules = {
+                curl = {
+                  name = "curl";
+                  enabled = true;
+                  action = "allow";
+                  duration = "always";
+                  operator = {
+                    type = "simple";
+                    sensitive = false;
+                    operand = "process.path";
+                    data = "${pkgs.curl}/bin/curl";
+                  };
                 };
               };
             };
-          };
-        };
-    };
+          }
+        ) monitorMethods
+      ));
 
-    testScript = ''
-      start_all()
-      server.wait_for_unit("caddy.service")
-      server.wait_for_open_port(80)
+    testScript =
+      ''
+        start_all()
+        server.wait_for_unit("caddy.service")
+        server.wait_for_open_port(80)
+      ''
+      + lib.concatLines (
+        map (m: ''
+          client_blocked_${m}.wait_for_unit("opensnitchd.service")
+          client_blocked_${m}.fail("curl http://server")
 
-      clientBlocked.wait_for_unit("opensnitchd.service")
-      clientBlocked.fail("curl http://server")
-
-      clientAllowed.wait_for_unit("opensnitchd.service")
-      clientAllowed.succeed("curl http://server")
-    '';
+          client_allowed_${m}.wait_for_unit("opensnitchd.service")
+          client_allowed_${m}.succeed("curl http://server")
+        '') monitorMethods
+      );
   }
 )

From 2d1c6aadb7f9ced96d1af7cb4893659033184775 Mon Sep 17 00:00:00 2001
From: michaelBelsanti <quasigod-io@proton.me>
Date: Sun, 29 Dec 2024 20:55:09 -0500
Subject: [PATCH 0879/1504] buildFHSEnvBubblewrap: bind /etc/dconf

allows custom dconf profiles to be opened
---
 pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
index 3a340c4766c4..12881e4a0bac 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
@@ -124,6 +124,8 @@ let
         "ssl/certs"
         "ca-certificates"
         "pki"
+        # Custom dconf profiles
+        "dconf"
       ];
     in
     map (path: "/etc/${path}") files;

From 5aa8ed779b545f9786698226ce83f6ad8ddfe485 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 21:14:30 +0000
Subject: [PATCH 0880/1504] asak: 0.3.4 -> 0.3.5

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

diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix
index fdfce87a92f9..4270ee0a7034 100644
--- a/pkgs/by-name/as/asak/package.nix
+++ b/pkgs/by-name/as/asak/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "asak";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "chaosprint";
     repo = "asak";
     tag = "v${version}";
-    hash = "sha256-Kq1WdVcTRdz6vJxUDd0bqb2bfrNGCl611upwYploR7w=";
+    hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI=";
   };
 
-  cargoHash = "sha256-SS4BDhORiTV/HZhL3F9zwF8oBu/VFVYhF5Jzp2j0QFI=";
+  cargoHash = "sha256-lMqInjFnOfr/GPSfIf1yp2vQjdk9UYdkWA616P8p0FE=";
 
   nativeBuildInputs = [
     pkg-config

From f5e32616832f9b056e4588334cf880091bc25c50 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:15:09 +0100
Subject: [PATCH 0881/1504] workflows: remove 24.05 merges

---
 .github/workflows/periodic-merge-24h.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 813d6a988efd..08570d60e1d4 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -35,10 +35,6 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
-          - from: release-24.05
-            into: staging-next-24.05
-          - from: staging-next-24.05
-            into: staging-24.05
           - from: release-24.11
             into: staging-next-24.11
           - from: staging-next-24.11

From 2927d4b6babe4876b50bfe1036ea1b37552124a4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 22:15:23 +0100
Subject: [PATCH 0882/1504] lib/trivial: update oldestSupportedRelease

---
 lib/trivial.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 0e196018961c..d3ed7d9eda9e 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -416,7 +416,7 @@ in {
   */
   oldestSupportedRelease =
     # Update on master only. Do not backport.
-    2405;
+    2411;
 
   /**
     Whether a feature is supported in all supported releases (at the time of

From bef31a9d8f384907167220de0a22b985415d9c39 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 31 Dec 2024 16:23:43 -0500
Subject: [PATCH 0883/1504] Revert "ghostty: rename `package.nix` to
 `linux.nix`"

This reverts commit 0bc91a7b06dfdfca1c033d25f718b120d5a572e6.
---
 pkgs/by-name/gh/ghostty/linux.nix   | 178 --------------------------
 pkgs/by-name/gh/ghostty/package.nix | 190 ++++++++++++++++++++++++----
 2 files changed, 167 insertions(+), 201 deletions(-)
 delete mode 100644 pkgs/by-name/gh/ghostty/linux.nix

diff --git a/pkgs/by-name/gh/ghostty/linux.nix b/pkgs/by-name/gh/ghostty/linux.nix
deleted file mode 100644
index ce2d6010f2b0..000000000000
--- a/pkgs/by-name/gh/ghostty/linux.nix
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  pname,
-  version,
-  outputs,
-  meta,
-  lib,
-  stdenv,
-  bzip2,
-  callPackage,
-  fetchFromGitHub,
-  fontconfig,
-  freetype,
-  glib,
-  glslang,
-  harfbuzz,
-  libGL,
-  libX11,
-  libadwaita,
-  ncurses,
-  nixosTests,
-  oniguruma,
-  pandoc,
-  pkg-config,
-  removeReferencesTo,
-  versionCheckHook,
-  wrapGAppsHook4,
-  zig_0_13,
-  # Usually you would override `zig.hook` with this, but we do that internally
-  # since upstream recommends a non-default level
-  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options
-  optimizeLevel ? "ReleaseFast",
-  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106
-  withAdwaita ? true,
-}:
-
-let
-  zig_hook = zig_0_13.hook.overrideAttrs {
-    zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
-  };
-
-  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/apprt.zig#L72-L76
-  appRuntime = if stdenv.hostPlatform.isLinux then "gtk" else "none";
-  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/font/main.zig#L94
-  fontBackend = if stdenv.hostPlatform.isDarwin then "coretext" else "fontconfig_freetype";
-  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52
-  renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl";
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  inherit
-    pname
-    version
-    outputs
-    meta
-    ;
-
-  src = fetchFromGitHub {
-    owner = "ghostty-org";
-    repo = "ghostty";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=";
-  };
-
-  # Avoid using runtime hacks to help find X11
-  postPatch = lib.optionalString (appRuntime == "gtk") ''
-    substituteInPlace src/apprt/gtk/x11.zig \
-      --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");'
-  '';
-
-  deps = callPackage ./deps.nix {
-    name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs =
-    [
-      ncurses
-      pandoc
-      pkg-config
-      removeReferencesTo
-      zig_hook
-    ]
-    ++ lib.optionals (appRuntime == "gtk") [
-      glib # Required for `glib-compile-schemas`
-      wrapGAppsHook4
-    ];
-
-  buildInputs =
-    [
-      glslang
-      oniguruma
-    ]
-    ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita
-    ++ lib.optional (appRuntime == "gtk") libX11
-    ++ lib.optional (renderer == "opengl") libGL
-    ++ lib.optionals (fontBackend == "fontconfig_freetype") [
-      bzip2
-      fontconfig
-      freetype
-      harfbuzz
-    ];
-
-  zigBuildFlags =
-    [
-      "--system"
-      "${finalAttrs.deps}"
-      "-Dversion-string=${finalAttrs.version}"
-
-      "-Dapp-runtime=${appRuntime}"
-      "-Dfont-backend=${fontBackend}"
-      "-Dgtk-adwaita=${lib.boolToString withAdwaita}"
-      "-Drenderer=${renderer}"
-    ]
-    ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
-      inherit glslang;
-    };
-
-  zigCheckFlags = finalAttrs.zigBuildFlags;
-
-  # Unit tests currently fail inside the sandbox
-  doCheck = false;
-
-  /**
-    Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them
-
-    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/os/resourcesdir.zig#L11-L52
-    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L745-L750
-    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L818-L834
-
-    terminfo and shell integration should also be installable on remote machines
-
-    ```nix
-    { pkgs, ... }: {
-      environment.systemPackages = [ pkgs.ghostty.terminfo ];
-
-      programs.bash = {
-        interactiveShellInit = ''
-          if [[ "$TERM" == "xterm-ghostty" ]]; then
-            builtin source ${pkgs.ghostty.shell_integration}/bash/ghostty.bash
-          fi
-        '';
-      };
-    }
-    ```
-  */
-  postFixup = ''
-    ln -s $man/share/man $out/share/man
-
-    moveToOutput share/terminfo $terminfo
-    ln -s $terminfo/share/terminfo $out/share/terminfo
-
-    mv $out/share/ghostty/shell-integration $shell_integration
-    ln -s $shell_integration $out/share/ghostty/shell-integration
-
-    mv $out/share/vim/vimfiles $vim
-    rmdir $out/share/vim
-    ln -s $vim $out/share/vim-plugins
-
-    remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped
-  '';
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-
-  doInstallCheck = true;
-
-  versionCheckProgramArg = [ "--version" ];
-
-  passthru = {
-    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      inherit (nixosTests) allTerminfo;
-      nixos = nixosTests.terminal-emulators.ghostty;
-    };
-  };
-
-})
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index faa55c552978..7242ba82c9da 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -1,12 +1,51 @@
 {
-  stdenvNoCC,
-  callPackage,
   lib,
+  stdenv,
+  bzip2,
+  callPackage,
+  fetchFromGitHub,
+  fontconfig,
+  freetype,
+  glib,
+  glslang,
+  harfbuzz,
+  libGL,
+  libX11,
+  libadwaita,
+  ncurses,
+  nixosTests,
+  oniguruma,
+  pandoc,
+  pkg-config,
+  removeReferencesTo,
+  versionCheckHook,
+  wrapGAppsHook4,
+  zig_0_13,
+  # Usually you would override `zig.hook` with this, but we do that internally
+  # since upstream recommends a non-default level
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options
+  optimizeLevel ? "ReleaseFast",
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106
+  withAdwaita ? true,
 }:
 
 let
+  zig_hook = zig_0_13.hook.overrideAttrs {
+    zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
+  };
+
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/apprt.zig#L72-L76
+  appRuntime = if stdenv.hostPlatform.isLinux then "gtk" else "none";
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/font/main.zig#L94
+  fontBackend = if stdenv.hostPlatform.isDarwin then "coretext" else "fontconfig_freetype";
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52
+  renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl";
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "ghostty";
   version = "1.0.0";
+
   outputs = [
     "out"
     "man"
@@ -14,6 +53,129 @@ let
     "terminfo"
     "vim"
   ];
+
+  src = fetchFromGitHub {
+    owner = "ghostty-org";
+    repo = "ghostty";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=";
+  };
+
+  # Avoid using runtime hacks to help find X11
+  postPatch = lib.optionalString (appRuntime == "gtk") ''
+    substituteInPlace src/apprt/gtk/x11.zig \
+      --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");'
+  '';
+
+  deps = callPackage ./deps.nix {
+    name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs =
+    [
+      ncurses
+      pandoc
+      pkg-config
+      removeReferencesTo
+      zig_hook
+    ]
+    ++ lib.optionals (appRuntime == "gtk") [
+      glib # Required for `glib-compile-schemas`
+      wrapGAppsHook4
+    ];
+
+  buildInputs =
+    [
+      glslang
+      oniguruma
+    ]
+    ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita
+    ++ lib.optional (appRuntime == "gtk") libX11
+    ++ lib.optional (renderer == "opengl") libGL
+    ++ lib.optionals (fontBackend == "fontconfig_freetype") [
+      bzip2
+      fontconfig
+      freetype
+      harfbuzz
+    ];
+
+  zigBuildFlags =
+    [
+      "--system"
+      "${finalAttrs.deps}"
+      "-Dversion-string=${finalAttrs.version}"
+
+      "-Dapp-runtime=${appRuntime}"
+      "-Dfont-backend=${fontBackend}"
+      "-Dgtk-adwaita=${lib.boolToString withAdwaita}"
+      "-Drenderer=${renderer}"
+    ]
+    ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
+      inherit glslang;
+    };
+
+  zigCheckFlags = finalAttrs.zigBuildFlags;
+
+  # Unit tests currently fail inside the sandbox
+  doCheck = false;
+
+  /**
+    Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them
+
+    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/os/resourcesdir.zig#L11-L52
+    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L745-L750
+    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L818-L834
+
+    terminfo and shell integration should also be installable on remote machines
+
+    ```nix
+    { pkgs, ... }: {
+      environment.systemPackages = [ pkgs.ghostty.terminfo ];
+
+      programs.bash = {
+        interactiveShellInit = ''
+          if [[ "$TERM" == "xterm-ghostty" ]]; then
+            builtin source ${pkgs.ghostty.shell_integration}/bash/ghostty.bash
+          fi
+        '';
+      };
+    }
+    ```
+  */
+  postFixup = ''
+    ln -s $man/share/man $out/share/man
+
+    moveToOutput share/terminfo $terminfo
+    ln -s $terminfo/share/terminfo $out/share/terminfo
+
+    mv $out/share/ghostty/shell-integration $shell_integration
+    ln -s $shell_integration $out/share/ghostty/shell-integration
+
+    mv $out/share/vim/vimfiles $vim
+    rmdir $out/share/vim
+    ln -s $vim $out/share/vim-plugins
+
+
+    remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
+  passthru = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit (nixosTests) allTerminfo;
+      nixos = nixosTests.terminal-emulators.ghostty;
+    };
+  };
+
   meta = {
     description = "Fast, native, feature-rich terminal emulator pushing modern features";
     longDescription = ''
@@ -31,7 +193,6 @@ let
       jcollie
       pluiedev
       getchoo
-      DimitarNestorov
     ];
     outputsToInstall = [
       "out"
@@ -40,24 +201,7 @@ let
       "terminfo"
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # Issues finding the SDK in the sandbox
+    broken = stdenv.hostPlatform.isDarwin;
   };
-in
-
-if stdenvNoCC.hostPlatform.isDarwin then
-  callPackage ./darwin.nix {
-    inherit
-      pname
-      version
-      outputs
-      meta
-      ;
-  }
-else
-  callPackage ./linux.nix {
-    inherit
-      pname
-      version
-      outputs
-      meta
-      ;
-  }
+})

From 41551596d7865c478bd6251f4316544bc87dfe71 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 31 Dec 2024 16:24:34 -0500
Subject: [PATCH 0884/1504] Revert "ghostty: add darwin package"

This reverts commit 67fff2ff2f1c42380793d1ac544479aa5a57179c.
---
 pkgs/by-name/gh/ghostty/darwin.nix | 62 ------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 pkgs/by-name/gh/ghostty/darwin.nix

diff --git a/pkgs/by-name/gh/ghostty/darwin.nix b/pkgs/by-name/gh/ghostty/darwin.nix
deleted file mode 100644
index adb3ec14988e..000000000000
--- a/pkgs/by-name/gh/ghostty/darwin.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  pname,
-  version,
-  outputs,
-  meta,
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  _7zz,
-  makeWrapper,
-}:
-
-stdenvNoCC.mkDerivation (finalAttrs: {
-  inherit pname version outputs;
-
-  src = fetchurl {
-    url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";
-    sha256 = "sha256-CR96Kz9BYKFtfVKygiEku51XFJk4FfYqfXACeYQ3JlI=";
-  };
-
-  nativeBuildInputs = [
-    _7zz
-    makeWrapper
-  ];
-
-  sourceRoot = ".";
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/Applications
-    mv Ghostty.app $out/Applications/
-    makeWrapper $out/Applications/Ghostty.app/Contents/MacOS/ghostty $out/bin/ghostty
-
-    runHook postInstall
-  '';
-
-  postFixup =
-    let
-      resources = "$out/Applications/Ghostty.app/Contents/Resources";
-    in
-    ''
-      mkdir -p $man/share
-      ln -s ${resources}/man $man/share/man
-
-      mkdir -p $terminfo/share
-      ln -s ${resources}/terminfo $terminfo/share/terminfo
-
-      mkdir -p $shell_integration
-      for folder in "${resources}/ghostty/shell-integration"/*; do
-        ln -s $folder $shell_integration/$(basename "$folder")
-      done
-
-      mkdir -p $vim
-      for folder in "${resources}/vim/vimfiles"/*; do
-        ln -s $folder $vim/$(basename "$folder")
-      done
-    '';
-
-  meta = meta // {
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-  };
-})

From 12279de652bbc5f2acf833092a7ded68395ccb13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 21:36:44 +0000
Subject: [PATCH 0885/1504] open-in-mpv: 2.4.0 -> 2.4.2

---
 pkgs/by-name/op/open-in-mpv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/open-in-mpv/package.nix b/pkgs/by-name/op/open-in-mpv/package.nix
index 219f708b10e4..2bd21ae35ab0 100644
--- a/pkgs/by-name/op/open-in-mpv/package.nix
+++ b/pkgs/by-name/op/open-in-mpv/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "open-in-mpv";
-  version = "2.4.0";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "Baldomo";
     repo = "open-in-mpv";
     rev = "v${version}";
-    hash = "sha256-EkWz28X+pPfSjinYEMP2y1YiZ46HdnjRGjXRDwO28PY=";
+    hash = "sha256-5Hu/BXUMI8CSOvE09I0YXfQ6BuIRA37yLlSTqWrrqy0=";
   };
 
   vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c=";

From b6b551fe22e2ba24ccfab50f2c8b3c95ef732c8d Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 31 Dec 2024 14:04:42 -0800
Subject: [PATCH 0886/1504] Revert "treewide/nixos: remove `with lib;` part 12"

---
 nixos/modules/services/x11/colord.nix         |   7 +-
 .../services/x11/desktop-managers/cde.nix     |  13 +-
 .../x11/desktop-managers/cinnamon.nix         |  89 ++++++------
 .../services/x11/desktop-managers/deepin.nix  |  57 ++++----
 .../x11/desktop-managers/enlightenment.nix    |  15 +-
 .../services/x11/desktop-managers/kodi.nix    |  11 +-
 .../services/x11/desktop-managers/lumina.nix  |  11 +-
 .../services/x11/desktop-managers/lxqt.nix    |  27 ++--
 .../services/x11/desktop-managers/mate.nix    |  47 ++++---
 .../services/x11/desktop-managers/none.nix    |  11 +-
 .../x11/desktop-managers/pantheon.nix         | 103 +++++++-------
 .../x11/desktop-managers/retroarch.nix        |  17 ++-
 .../x11/desktop-managers/surf-display.nix     |  33 +++--
 .../services/x11/desktop-managers/xfce.nix    |  65 ++++-----
 .../services/x11/desktop-managers/xterm.nix   |  15 +-
 .../lightdm-greeters/enso-os.nix              |  54 ++++----
 .../display-managers/lightdm-greeters/gtk.nix |  65 ++++-----
 .../lightdm-greeters/mini.nix                 |  19 +--
 .../lightdm-greeters/mobile.nix               |   8 +-
 .../lightdm-greeters/pantheon.nix             |  11 +-
 .../lightdm-greeters/slick.nix                |  61 ++++----
 .../lightdm-greeters/tiny.nix                 |  25 ++--
 .../services/x11/display-managers/lightdm.nix |  59 ++++----
 .../services/x11/display-managers/slim.nix    |   5 +-
 .../services/x11/display-managers/startx.nix  |  11 +-
 .../services/x11/display-managers/xpra.nix    |  41 +++---
 nixos/modules/services/x11/extra-layouts.nix  |  39 +++---
 nixos/modules/services/x11/fractalart.nix     |  19 +--
 nixos/modules/services/x11/hardware/cmt.nix   |  13 +-
 .../services/x11/hardware/digimend.nix        |   7 +-
 .../services/x11/hardware/synaptics.nix       | 109 ++++++++-------
 nixos/modules/services/x11/hardware/wacom.nix |   9 +-
 nixos/modules/services/x11/imwheel.nix        |  19 +--
 nixos/modules/services/x11/picom.nix          | 131 +++++++++---------
 nixos/modules/services/x11/redshift.nix       |  45 +++---
 nixos/modules/services/x11/touchegg.nix       |  11 +-
 .../modules/services/x11/unclutter-xfixes.nix |  25 ++--
 nixos/modules/services/x11/unclutter.nix      |  39 +++---
 nixos/modules/services/x11/urxvtd.nix         |  12 +-
 .../services/x11/window-managers/2bwm.nix     |   9 +-
 .../x11/window-managers/afterstep.nix         |   9 +-
 .../services/x11/window-managers/awesome.nix  |  21 +--
 .../services/x11/window-managers/berry.nix    |   9 +-
 .../services/x11/window-managers/bspwm.nix    |  35 ++---
 .../services/x11/window-managers/clfswm.nix   |  11 +-
 .../services/x11/window-managers/cwm.nix      |   9 +-
 .../services/x11/window-managers/dwm.nix      |  11 +-
 .../services/x11/window-managers/e16.nix      |   9 +-
 48 files changed, 807 insertions(+), 674 deletions(-)

diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix
index 7b8b1bb48c66..1a9ade712739 100644
--- a/nixos/modules/services/x11/colord.nix
+++ b/nixos/modules/services/x11/colord.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.colord;
@@ -14,12 +17,12 @@ in
   options = {
 
     services.colord = {
-      enable = lib.mkEnableOption "colord, the color management daemon";
+      enable = mkEnableOption "colord, the color management daemon";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.colord ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix
index 908431f329ef..8dae3ce0d886 100644
--- a/nixos/modules/services/x11/desktop-managers/cde.nix
+++ b/nixos/modules/services/x11/desktop-managers/cde.nix
@@ -4,16 +4,19 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.cde;
 in
 {
   options.services.xserver.desktopManager.cde = {
-    enable = lib.mkEnableOption "Common Desktop Environment";
+    enable = mkEnableOption "Common Desktop Environment";
 
-    extraPackages = lib.mkOption {
-      type = with lib.types; listOf package;
+    extraPackages = mkOption {
+      type = with types; listOf package;
       default = with pkgs.xorg; [
         xclock
         bitmap
@@ -26,7 +29,7 @@ in
         xwd
         xwud
       ];
-      defaultText = lib.literalExpression ''
+      defaultText = literalExpression ''
         with pkgs.xorg; [
           xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud
         ]
@@ -37,7 +40,7 @@ in
     };
   };
 
-  config = lib.mkIf (xcfg.enable && cfg.enable) {
+  config = mkIf (xcfg.enable && cfg.enable) {
     environment.systemPackages = cfg.extraPackages;
 
     services.rpcbind.enable = true;
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 43103a663092..c64c2293a439 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -1,4 +1,7 @@
 { config, lib, pkgs, utils, ... }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.desktopManager.cinnamon;
@@ -15,16 +18,16 @@ in
 {
   options = {
     services.cinnamon = {
-      apps.enable = lib.mkEnableOption "Cinnamon default applications";
+      apps.enable = mkEnableOption "Cinnamon default applications";
     };
 
     services.xserver.desktopManager.cinnamon = {
-      enable = lib.mkEnableOption "the cinnamon desktop manager";
+      enable = mkEnableOption "the cinnamon desktop manager";
 
-      sessionPath = lib.mkOption {
+      sessionPath = mkOption {
         default = [];
-        type = lib.types.listOf lib.types.package;
-        example = lib.literalExpression "[ pkgs.gpaste ]";
+        type = types.listOf types.package;
+        example = literalExpression "[ pkgs.gpaste ]";
         description = ''
           Additional list of packages to be added to the session search path.
           Useful for GSettings-conditional autostart.
@@ -33,53 +36,53 @@ in
         '';
       };
 
-      extraGSettingsOverrides = lib.mkOption {
+      extraGSettingsOverrides = mkOption {
         default = "";
-        type = lib.types.lines;
+        type = types.lines;
         description = "Additional gsettings overrides.";
       };
 
-      extraGSettingsOverridePackages = lib.mkOption {
+      extraGSettingsOverridePackages = mkOption {
         default = [];
-        type = lib.types.listOf lib.types.path;
+        type = types.listOf types.path;
         description = "List of packages for which gsettings are overridden.";
       };
     };
 
-    environment.cinnamon.excludePackages = lib.mkOption {
+    environment.cinnamon.excludePackages = mkOption {
       default = [];
-      example = lib.literalExpression "[ pkgs.blueman ]";
-      type = lib.types.listOf lib.types.package;
+      example = literalExpression "[ pkgs.blueman ]";
+      type = types.listOf types.package;
       description = "Which packages cinnamon should exclude from the default environment";
     };
 
   };
 
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
+  config = mkMerge [
+    (mkIf cfg.enable {
       services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];
 
       services.xserver.displayManager.lightdm.greeters.slick = {
-        enable = lib.mkDefault true;
+        enable = mkDefault true;
 
         # Taken from mint-artwork.gschema.override
-        theme = lib.mkIf (notExcluded pkgs.mint-themes) {
-          name = lib.mkDefault "Mint-Y-Aqua";
-          package = lib.mkDefault pkgs.mint-themes;
+        theme = mkIf (notExcluded pkgs.mint-themes) {
+          name = mkDefault "Mint-Y-Aqua";
+          package = mkDefault pkgs.mint-themes;
         };
-        iconTheme = lib.mkIf (notExcluded pkgs.mint-y-icons) {
-          name = lib.mkDefault "Mint-Y-Sand";
-          package = lib.mkDefault pkgs.mint-y-icons;
+        iconTheme = mkIf (notExcluded pkgs.mint-y-icons) {
+          name = mkDefault "Mint-Y-Sand";
+          package = mkDefault pkgs.mint-y-icons;
         };
-        cursorTheme = lib.mkIf (notExcluded pkgs.mint-cursor-themes) {
-          name = lib.mkDefault "Bibata-Modern-Classic";
-          package = lib.mkDefault pkgs.mint-cursor-themes;
+        cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) {
+          name = mkDefault "Bibata-Modern-Classic";
+          package = mkDefault pkgs.mint-cursor-themes;
         };
       };
 
       # Have to take care of GDM + Cinnamon on Wayland users
       environment.extraInit = ''
-        ${lib.concatMapStrings (p: ''
+        ${concatMapStrings (p: ''
           if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
             export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
           fi
@@ -92,30 +95,30 @@ in
       '';
 
       # Default services
-      services.blueman.enable = lib.mkDefault (notExcluded pkgs.blueman);
-      hardware.bluetooth.enable = lib.mkDefault true;
+      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
+      hardware.bluetooth.enable = mkDefault true;
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
-      services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
+      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs; [
         cinnamon-common
         cinnamon-screensaver
         nemo-with-extensions
         xapp
       ];
-      services.cinnamon.apps.enable = lib.mkDefault true;
+      services.cinnamon.apps.enable = mkDefault true;
       services.gnome.evolution-data-server.enable = true;
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
-      services.power-profiles-daemon.enable = lib.mkDefault true;
-      services.switcherooControl.enable = lib.mkDefault true; # xapp-gpu-offload-helper
-      services.touchegg.enable = lib.mkDefault true;
+      services.power-profiles-daemon.enable = mkDefault true;
+      services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
+      services.touchegg.enable = mkDefault true;
       services.udisks2.enable = true;
-      services.upower.enable = lib.mkDefault config.powerManagement.enable;
-      services.libinput.enable = lib.mkDefault true;
+      services.upower.enable = mkDefault config.powerManagement.enable;
+      services.libinput.enable = mkDefault true;
       services.xserver.updateDbusEnvironment = true;
-      networking.networkmanager.enable = lib.mkDefault true;
+      networking.networkmanager.enable = mkDefault true;
 
       # Enable colord server
       services.colord.enable = true;
@@ -201,9 +204,9 @@ in
         pkgs.xdg-desktop-portal-gtk
       ];
 
-      services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
+      services.orca.enable = mkDefault (notExcluded pkgs.orca);
 
-      xdg.portal.configPackages = lib.mkDefault [ pkgs.cinnamon-common ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
@@ -214,8 +217,8 @@ in
       ];
 
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = lib.mkDefault true;
-      programs.zsh.vteIntegration = lib.mkDefault true;
+      programs.bash.vteIntegration = mkDefault true;
+      programs.zsh.vteIntegration = mkDefault true;
 
       # Default Fonts
       fonts.packages = with pkgs; [
@@ -224,10 +227,10 @@ in
       ];
     })
 
-    (lib.mkIf serviceCfg.apps.enable {
-      programs.gnome-disks.enable = lib.mkDefault (notExcluded pkgs.gnome-disk-utility);
-      programs.gnome-terminal.enable = lib.mkDefault (notExcluded pkgs.gnome-terminal);
-      programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller);
+    (mkIf serviceCfg.apps.enable {
+      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility);
+      programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
+      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
 
       environment.systemPackages = with pkgs; utils.removePackagesByName [
         # cinnamon team apps
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index 76ffb71bb2a4..ca9fb229df97 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -5,6 +5,9 @@
   utils,
   ...
 }:
+
+with lib;
+
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.deepin;
@@ -18,68 +21,68 @@ in
   options = {
 
     services.xserver.desktopManager.deepin = {
-      enable = lib.mkEnableOption "Deepin desktop manager";
-      extraGSettingsOverrides = lib.mkOption {
+      enable = mkEnableOption "Deepin desktop manager";
+      extraGSettingsOverrides = mkOption {
         default = "";
-        type = lib.types.lines;
+        type = types.lines;
         description = "Additional gsettings overrides.";
       };
-      extraGSettingsOverridePackages = lib.mkOption {
+      extraGSettingsOverridePackages = mkOption {
         default = [ ];
-        type = lib.types.listOf lib.types.path;
+        type = types.listOf types.path;
         description = "List of packages for which gsettings are overridden.";
       };
     };
 
-    environment.deepin.excludePackages = lib.mkOption {
+    environment.deepin.excludePackages = mkOption {
       default = [ ];
-      type = lib.types.listOf lib.types.package;
+      type = types.listOf types.package;
       description = "List of default packages to exclude from the configuration";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ];
-    services.displayManager.defaultSession = lib.mkDefault "dde-x11";
+    services.displayManager.defaultSession = mkDefault "dde-x11";
 
     # Update the DBus activation environment after launching the desktop manager.
     services.xserver.displayManager.sessionCommands = ''
       ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all
     '';
 
-    hardware.bluetooth.enable = lib.mkDefault true;
+    hardware.bluetooth.enable = mkDefault true;
     security.polkit.enable = true;
 
-    services.deepin.dde-daemon.enable = lib.mkForce true;
-    services.deepin.dde-api.enable = lib.mkForce true;
-    services.deepin.app-services.enable = lib.mkForce true;
+    services.deepin.dde-daemon.enable = mkForce true;
+    services.deepin.dde-api.enable = mkForce true;
+    services.deepin.app-services.enable = mkForce true;
 
-    services.colord.enable = lib.mkDefault true;
-    services.accounts-daemon.enable = lib.mkDefault true;
-    services.gvfs.enable = lib.mkDefault true;
-    services.gnome.glib-networking.enable = lib.mkDefault true;
-    services.gnome.gnome-keyring.enable = lib.mkDefault true;
-    services.bamf.enable = lib.mkDefault true;
+    services.colord.enable = mkDefault true;
+    services.accounts-daemon.enable = mkDefault true;
+    services.gvfs.enable = mkDefault true;
+    services.gnome.glib-networking.enable = mkDefault true;
+    services.gnome.gnome-keyring.enable = mkDefault true;
+    services.bamf.enable = mkDefault true;
 
-    services.libinput.enable = lib.mkDefault true;
+    services.libinput.enable = mkDefault true;
     services.udisks2.enable = true;
-    services.upower.enable = lib.mkDefault config.powerManagement.enable;
-    networking.networkmanager.enable = lib.mkDefault true;
-    programs.dconf.enable = lib.mkDefault true;
-    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt;
+    services.upower.enable = mkDefault config.powerManagement.enable;
+    networking.networkmanager.enable = mkDefault true;
+    programs.dconf.enable = mkDefault true;
+    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
 
     fonts.packages = with pkgs; [ noto-fonts ];
     xdg.mime.enable = true;
     xdg.menus.enable = true;
     xdg.icons.enable = true;
-    xdg.portal.enable = lib.mkDefault true;
-    xdg.portal.extraPortals = lib.mkDefault [
+    xdg.portal.enable = mkDefault true;
+    xdg.portal.extraPortals = mkDefault [
       pkgs.xdg-desktop-portal-gtk
     ];
 
     # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259
-    xdg.portal.config.deepin.default = lib.mkDefault [ "gtk" ];
+    xdg.portal.config.deepin.default = mkDefault [ "gtk" ];
 
     environment.sessionVariables = {
       NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 8acd66a1bcdc..05ed81e57992 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -4,6 +4,9 @@
   lib,
   ...
 }:
+
+with lib;
+
 let
 
   e = pkgs.enlightenment;
@@ -20,11 +23,11 @@ in
 
 {
   meta = {
-    maintainers = lib.teams.enlightenment.members;
+    maintainers = teams.enlightenment.members;
   };
 
   imports = [
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "e19" "enable" ]
       [ "services" "xserver" "desktopManager" "enlightenment" "enable" ]
     )
@@ -32,15 +35,15 @@ in
 
   options = {
 
-    services.xserver.desktopManager.enlightenment.enable = lib.mkOption {
-      type = lib.types.bool;
+    services.xserver.desktopManager.enlightenment.enable = mkOption {
+      type = types.bool;
       default = false;
       description = "Enable the Enlightenment desktop environment.";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = with pkgs; [
       enlightenment.econnman
@@ -102,7 +105,7 @@ in
 
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
-    services.libinput.enable = lib.mkDefault true;
+    services.libinput.enable = mkDefault true;
 
     services.dbus.packages = [ e.efl ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index 0330c5b353e1..0dd2f8ffb829 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.desktopManager.kodi;
 in
@@ -11,19 +14,19 @@ in
 {
   options = {
     services.xserver.desktopManager.kodi = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable the kodi multimedia center.";
       };
 
-      package = lib.mkPackageOption pkgs "kodi" {
+      package = mkPackageOption pkgs "kodi" {
         example = "kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])";
       };
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.xserver.desktopManager.session = [
       {
         name = "kodi";
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index 9931ecffddcb..74fabced3af3 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   xcfg = config.services.xserver;
@@ -13,20 +16,20 @@ in
 
 {
   meta = {
-    maintainers = lib.teams.lumina.members;
+    maintainers = teams.lumina.members;
   };
 
   options = {
 
-    services.xserver.desktopManager.lumina.enable = lib.mkOption {
-      type = lib.types.bool;
+    services.xserver.desktopManager.lumina.enable = mkOption {
+      type = types.bool;
       default = false;
       description = "Enable the Lumina desktop manager";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     services.displayManager.sessionPackages = [
       pkgs.lumina.lumina
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index a5af6fa57930..ac86c385bcc8 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -1,4 +1,7 @@
 { config, lib, pkgs, utils, ... }:
+
+with lib;
+
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.lxqt;
@@ -7,29 +10,29 @@ in
 
 {
   meta = {
-    maintainers = lib.teams.lxqt.members;
+    maintainers = teams.lxqt.members;
   };
 
   options = {
 
-    services.xserver.desktopManager.lxqt.enable = lib.mkOption {
-      type = lib.types.bool;
+    services.xserver.desktopManager.lxqt.enable = mkOption {
+      type = types.bool;
       default = false;
       description = "Enable the LXQt desktop manager";
     };
 
-    environment.lxqt.excludePackages = lib.mkOption {
+    environment.lxqt.excludePackages = mkOption {
       default = [];
-      example = lib.literalExpression "[ pkgs.lxqt.qterminal ]";
-      type = lib.types.listOf lib.types.package;
+      example = literalExpression "[ pkgs.lxqt.qterminal ]";
+      type = types.listOf types.package;
       description = "Which LXQt packages to exclude from the default environment";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = lib.singleton {
+    services.xserver.desktopManager.session = singleton {
       name = "lxqt";
       bgSupport = true;
       start = ''
@@ -59,19 +62,19 @@ in
     # Link some extra directories in /run/current-system/software/share
     environment.pathsToLink = [ "/share" ];
 
-    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt;
+    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
 
     # virtual file systems support for PCManFM-QT
     services.gvfs.enable = true;
 
     services.upower.enable = config.powerManagement.enable;
 
-    services.libinput.enable = lib.mkDefault true;
+    services.libinput.enable = mkDefault true;
 
-    xdg.portal.lxqt.enable = lib.mkDefault true;
+    xdg.portal.lxqt.enable = mkDefault true;
 
     # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804
-    xdg.portal.config.lxqt.default = lib.mkDefault [ "lxqt" "gtk" ];
+    xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ];
   };
 
 }
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 1f908bbf512a..e5144bc9d102 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -5,6 +5,9 @@
   utils,
   ...
 }:
+
+with lib;
+
 let
 
   xcfg = config.services.xserver;
@@ -16,48 +19,48 @@ in
   options = {
 
     services.xserver.desktopManager.mate = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable the MATE desktop environment";
       };
 
-      debug = lib.mkEnableOption "mate-session debug messages";
+      debug = mkEnableOption "mate-session debug messages";
 
-      extraPanelApplets = lib.mkOption {
+      extraPanelApplets = mkOption {
         default = [ ];
-        example = lib.literalExpression "with pkgs.mate; [ mate-applets ]";
-        type = lib.types.listOf lib.types.package;
+        example = literalExpression "with pkgs.mate; [ mate-applets ]";
+        type = types.listOf types.package;
         description = "Extra applets to add to mate-panel.";
       };
 
-      extraCajaExtensions = lib.mkOption {
+      extraCajaExtensions = mkOption {
         default = [ ];
         example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]";
-        type = lib.types.listOf lib.types.package;
+        type = types.listOf types.package;
         description = "Extra extensions to add to caja.";
       };
 
-      enableWaylandSession = lib.mkEnableOption "MATE Wayland session";
+      enableWaylandSession = mkEnableOption "MATE Wayland session";
     };
 
-    environment.mate.excludePackages = lib.mkOption {
+    environment.mate.excludePackages = mkOption {
       default = [ ];
-      example = lib.literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
-      type = lib.types.listOf lib.types.package;
+      example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
+      type = types.listOf types.package;
       description = "Which MATE packages to exclude from the default environment";
     };
 
   };
 
-  config = lib.mkMerge [
-    (lib.mkIf (cfg.enable || cfg.enableWaylandSession) {
+  config = mkMerge [
+    (mkIf (cfg.enable || cfg.enableWaylandSession) {
       services.displayManager.sessionPackages = [
         pkgs.mate.mate-session-manager
       ];
 
       # Debugging
-      environment.sessionVariables.MATE_SESSION_DEBUG = lib.mkIf cfg.debug "1";
+      environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
 
       environment.systemPackages = utils.removePackagesByName (
         pkgs.mate.basePackages
@@ -80,13 +83,11 @@ in
 
       programs.dconf.enable = true;
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = lib.mkDefault true;
-      programs.zsh.vteIntegration = lib.mkDefault true;
+      programs.bash.vteIntegration = mkDefault true;
+      programs.zsh.vteIntegration = mkDefault true;
 
       # Mate uses this for printing
-      programs.system-config-printer.enable = (
-        lib.mkIf config.services.printing.enable (lib.mkDefault true)
-      );
+      programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
 
       services.gnome.at-spi2-core.enable = true;
       services.gnome.glib-networking.enable = true;
@@ -94,15 +95,15 @@ in
       services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
       services.gvfs.enable = true;
       services.upower.enable = config.powerManagement.enable;
-      services.libinput.enable = lib.mkDefault true;
+      services.libinput.enable = mkDefault true;
 
       security.pam.services.mate-screensaver.unixAuth = true;
 
-      xdg.portal.configPackages = lib.mkDefault [ pkgs.mate.mate-desktop ];
+      xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ];
 
       environment.pathsToLink = [ "/share" ];
     })
-    (lib.mkIf cfg.enableWaylandSession {
+    (mkIf cfg.enableWaylandSession {
       programs.wayfire.enable = true;
       programs.wayfire.plugins = [ pkgs.wayfirePlugins.firedecor ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix
index 0e5caf37300a..d4b7e3b392da 100644
--- a/nixos/modules/services/x11/desktop-managers/none.nix
+++ b/nixos/modules/services/x11/desktop-managers/none.nix
@@ -4,13 +4,14 @@
   pkgs,
   ...
 }:
+with lib;
 let
   runXdgAutostart = config.services.xserver.desktopManager.runXdgAutostartIfNone;
 in
 {
   options = {
-    services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkOption {
-      type = lib.types.bool;
+    services.xserver.desktopManager.runXdgAutostartIfNone = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Whether to run XDG autostart files for sessions without a desktop manager
@@ -26,18 +27,18 @@ in
     };
   };
 
-  config = lib.mkMerge [
+  config = mkMerge [
     {
       services.xserver.desktopManager.session = [
         {
           name = "none";
-          start = lib.optionalString runXdgAutostart ''
+          start = optionalString runXdgAutostart ''
             /run/current-system/systemd/bin/systemctl --user start xdg-autostart-if-no-desktop-manager.target
           '';
         }
       ];
     }
-    (lib.mkIf runXdgAutostart {
+    (mkIf runXdgAutostart {
       systemd.user.targets.xdg-autostart-if-no-desktop-manager = {
         description = "Run XDG autostart files";
         # From `plasma-workspace`, `share/systemd/user/plasma-workspace@.target`.
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index ebb6f25c6db6..14e7e25252de 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -1,4 +1,7 @@
 { config, lib, utils, pkgs, ... }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.desktopManager.pantheon;
@@ -16,7 +19,7 @@ in
 
   meta = {
     doc = ./pantheon.md;
-    maintainers = lib.teams.pantheon.members;
+    maintainers = teams.pantheon.members;
   };
 
   options = {
@@ -24,24 +27,24 @@ in
     services.pantheon = {
 
       contractor = {
-         enable = lib.mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
+         enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
       };
 
-      apps.enable = lib.mkEnableOption "Pantheon default applications";
+      apps.enable = mkEnableOption "Pantheon default applications";
 
     };
 
     services.xserver.desktopManager.pantheon = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable the pantheon desktop manager";
       };
 
-      sessionPath = lib.mkOption {
+      sessionPath = mkOption {
         default = [];
-        type = lib.types.listOf lib.types.package;
-        example = lib.literalExpression "[ pkgs.gpaste ]";
+        type = types.listOf types.package;
+        example = literalExpression "[ pkgs.gpaste ]";
         description = ''
           Additional list of packages to be added to the session search path.
           Useful for GSettings-conditional autostart.
@@ -50,46 +53,46 @@ in
         '';
       };
 
-      extraWingpanelIndicators = lib.mkOption {
+      extraWingpanelIndicators = mkOption {
         default = null;
-        type = with lib.types; nullOr (listOf package);
+        type = with types; nullOr (listOf package);
         description = "Indicators to add to Wingpanel.";
       };
 
-      extraSwitchboardPlugs = lib.mkOption {
+      extraSwitchboardPlugs = mkOption {
         default = null;
-        type = with lib.types; nullOr (listOf package);
+        type = with types; nullOr (listOf package);
         description = "Plugs to add to Switchboard.";
       };
 
-      extraGSettingsOverrides = lib.mkOption {
+      extraGSettingsOverrides = mkOption {
         default = "";
-        type = lib.types.lines;
+        type = types.lines;
         description = "Additional gsettings overrides.";
       };
 
-      extraGSettingsOverridePackages = lib.mkOption {
+      extraGSettingsOverridePackages = mkOption {
         default = [];
-        type = lib.types.listOf lib.types.path;
+        type = types.listOf types.path;
         description = "List of packages for which gsettings are overridden.";
       };
 
-      debug = lib.mkEnableOption "gnome-session debug messages";
+      debug = mkEnableOption "gnome-session debug messages";
 
     };
 
-    environment.pantheon.excludePackages = lib.mkOption {
+    environment.pantheon.excludePackages = mkOption {
       default = [];
-      example = lib.literalExpression "[ pkgs.pantheon.elementary-camera ]";
-      type = lib.types.listOf lib.types.package;
+      example = literalExpression "[ pkgs.pantheon.elementary-camera ]";
+      type = types.listOf types.package;
       description = "Which packages pantheon should exclude from the default environment";
     };
 
   };
 
 
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
+  config = mkMerge [
+    (mkIf cfg.enable {
       services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [
         pkgs.pantheon.pantheon-agent-geoclue2
       ] config.environment.pantheon.excludePackages;
@@ -98,21 +101,21 @@ in
 
       # Ensure lightdm is used when Pantheon is enabled
       # Without it screen locking will be nonfunctional because of the use of lightlocker
-      warnings = lib.optional (config.services.xserver.displayManager.lightdm.enable != true)
+      warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
         ''
           Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
         '';
 
-      services.xserver.displayManager.lightdm.greeters.pantheon.enable = lib.mkDefault true;
+      services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
 
       # Without this, elementary LightDM greeter will pre-select non-existent `default` session
       # https://github.com/elementary/greeter/issues/368
-      services.displayManager.defaultSession = lib.mkDefault "pantheon";
+      services.displayManager.defaultSession = mkDefault "pantheon";
 
       services.xserver.displayManager.sessionCommands = ''
         if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
             true
-            ${lib.concatMapStrings (p: ''
+            ${concatMapStrings (p: ''
               if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
                 export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
               fi
@@ -126,38 +129,38 @@ in
       '';
 
       # Default services
-      hardware.bluetooth.enable = lib.mkDefault true;
+      hardware.bluetooth.enable = mkDefault true;
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
       services.bamf.enable = true;
-      services.colord.enable = lib.mkDefault true;
-      services.fwupd.enable = lib.mkDefault true;
+      services.colord.enable = mkDefault true;
+      services.fwupd.enable = mkDefault true;
       # TODO: Enable once #177946 is resolved
       # services.packagekit.enable = mkDefault true;
-      services.power-profiles-daemon.enable = lib.mkDefault true;
-      services.touchegg.enable = lib.mkDefault true;
+      services.power-profiles-daemon.enable = mkDefault true;
+      services.touchegg.enable = mkDefault true;
       services.touchegg.package = pkgs.pantheon.touchegg;
-      services.tumbler.enable = lib.mkDefault true;
-      services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
+      services.tumbler.enable = mkDefault true;
+      services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
       services.dbus.packages = with pkgs.pantheon; [
         switchboard-plug-power
         elementary-default-settings # accountsservice extensions
       ];
-      services.pantheon.apps.enable = lib.mkDefault true;
-      services.pantheon.contractor.enable = lib.mkDefault true;
+      services.pantheon.apps.enable = mkDefault true;
+      services.pantheon.contractor.enable = mkDefault true;
       services.gnome.at-spi2-core.enable = true;
       services.gnome.evolution-data-server.enable = true;
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
-      services.gnome.rygel.enable = lib.mkDefault true;
+      services.gnome.rygel.enable = mkDefault true;
       services.udisks2.enable = true;
       services.upower.enable = config.powerManagement.enable;
-      services.libinput.enable = lib.mkDefault true;
-      services.switcherooControl.enable = lib.mkDefault true;
+      services.libinput.enable = mkDefault true;
+      services.switcherooControl.enable = mkDefault true;
       services.xserver.updateDbusEnvironment = true;
-      services.zeitgeist.enable = lib.mkDefault true;
-      services.geoclue2.enable = lib.mkDefault true;
+      services.zeitgeist.enable = mkDefault true;
+      services.geoclue2.enable = mkDefault true;
       # pantheon has pantheon-agent-geoclue2
       services.geoclue2.enableDemoAgent = false;
       services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = {
@@ -170,7 +173,7 @@ in
         # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
         pkgs.pantheon.mutter
       ];
-      services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
+      services.orca.enable = mkDefault (notExcluded pkgs.orca);
       systemd.packages = with pkgs; [
         gnome-session
         pantheon.gala
@@ -178,7 +181,7 @@ in
         pantheon.elementary-session-settings
       ];
       programs.dconf.enable = true;
-      networking.networkmanager.enable = lib.mkDefault true;
+      networking.networkmanager.enable = mkDefault true;
 
       systemd.user.targets."gnome-session-x11-services".wants = [
         "org.gnome.SettingsDaemon.XSettings.service"
@@ -243,12 +246,12 @@ in
         xdg-desktop-portal-pantheon
       ]);
 
-      xdg.portal.configPackages = lib.mkDefault [ pkgs.pantheon.elementary-default-settings ];
+      xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
 
-      environment.sessionVariables.GNOME_SESSION_DEBUG = lib.mkIf cfg.debug "1";
+      environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
 
       environment.pathsToLink = [
         # FIXME: modules should link subdirs of `/share` rather than relying on this
@@ -262,8 +265,8 @@ in
       programs.nm-applet.indicator = false;
 
       # Shell integration for VTE terminals
-      programs.bash.vteIntegration = lib.mkDefault true;
-      programs.zsh.vteIntegration = lib.mkDefault true;
+      programs.bash.vteIntegration = mkDefault true;
+      programs.zsh.vteIntegration = mkDefault true;
 
       # Default Fonts
       fonts.packages = with pkgs; [
@@ -279,9 +282,9 @@ in
       };
     })
 
-    (lib.mkIf serviceCfg.apps.enable {
-      programs.evince.enable = lib.mkDefault (notExcluded pkgs.evince);
-      programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller);
+    (mkIf serviceCfg.apps.enable {
+      programs.evince.enable = mkDefault (notExcluded pkgs.evince);
+      programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
 
       environment.systemPackages = utils.removePackagesByName ([
         pkgs.gnome-font-viewer
@@ -312,7 +315,7 @@ in
       ];
     })
 
-    (lib.mkIf serviceCfg.contractor.enable {
+    (mkIf serviceCfg.contractor.enable {
       environment.systemPackages = with pkgs.pantheon; [
         contractor
         file-roller-contract
diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix
index 9f292087a073..445de823e03f 100644
--- a/nixos/modules/services/x11/desktop-managers/retroarch.nix
+++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix
@@ -4,20 +4,23 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.desktopManager.retroarch;
 
 in
 {
   options.services.xserver.desktopManager.retroarch = {
-    enable = lib.mkEnableOption "RetroArch";
+    enable = mkEnableOption "RetroArch";
 
-    package = lib.mkPackageOption pkgs "retroarch" {
+    package = mkPackageOption pkgs "retroarch" {
       example = "retroarch-full";
     };
 
-    extraArgs = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+    extraArgs = mkOption {
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "--verbose"
@@ -27,12 +30,12 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.xserver.desktopManager.session = [
       {
         name = "RetroArch";
         start = ''
-          ${cfg.package}/bin/retroarch -f ${lib.escapeShellArgs cfg.extraArgs} &
+          ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} &
           waitPID=$!
         '';
       }
@@ -41,5 +44,5 @@ in
     environment.systemPackages = [ cfg.package ];
   };
 
-  meta.maintainers = with lib.maintainers; [ j0hax ];
+  meta.maintainers = with maintainers; [ j0hax ];
 }
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 7eb088cce11e..519388cf11a5 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.desktopManager.surf-display;
 
@@ -48,18 +51,18 @@ in
 {
   options = {
     services.xserver.desktopManager.surf-display = {
-      enable = lib.mkEnableOption "surf-display as a kiosk browser session";
+      enable = mkEnableOption "surf-display as a kiosk browser session";
 
-      defaultWwwUri = lib.mkOption {
-        type = lib.types.str;
+      defaultWwwUri = mkOption {
+        type = types.str;
         default = "${pkgs.surf-display}/share/surf-display/empty-page.html";
-        defaultText = lib.literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"'';
+        defaultText = literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"'';
         example = "https://www.example.com/";
         description = "Default URI to display.";
       };
 
-      inactivityInterval = lib.mkOption {
-        type = lib.types.int;
+      inactivityInterval = mkOption {
+        type = types.int;
         default = 300;
         example = 0;
         description = ''
@@ -72,16 +75,16 @@ in
         '';
       };
 
-      screensaverSettings = lib.mkOption {
-        type = lib.types.separatedString " ";
+      screensaverSettings = mkOption {
+        type = types.separatedString " ";
         default = "";
         description = ''
           Screensaver settings, see `man 1 xset` for possible options.
         '';
       };
 
-      pointerButtonMap = lib.mkOption {
-        type = lib.types.str;
+      pointerButtonMap = mkOption {
+        type = types.str;
         default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
         description = ''
           Disable right and middle pointer device click in browser sessions
@@ -90,15 +93,15 @@ in
         '';
       };
 
-      hideIdlePointer = lib.mkOption {
-        type = lib.types.str;
+      hideIdlePointer = mkOption {
+        type = types.str;
         default = "yes";
         example = "no";
         description = "Hide idle mouse pointer.";
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         example = ''
           # Enforce fixed resolution for all displays (default: not set):
@@ -121,7 +124,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.displayManager.sessionPackages = [
       pkgs.surf-display
     ];
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 32c41449a248..e1273aa7b7d1 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -1,4 +1,7 @@
 { config, lib, pkgs, utils, ... }:
+
+with lib;
+
 let
   cfg = config.services.xserver.desktopManager.xfce;
   excludePackages = config.environment.xfce.excludePackages;
@@ -6,70 +9,70 @@ let
 in
 {
   meta = {
-    maintainers = lib.teams.xfce.members;
+    maintainers = teams.xfce.members;
   };
 
   imports = [
     # added 2019-08-18
     # needed to preserve some semblance of UI familarity
     # with original XFCE module
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
       [ "services" "xserver" "displayManager" "sessionCommands" ])
 
     # added 2019-11-04
     # xfce4-14 module removed and promoted to xfce.
     # Needed for configs that used xfce4-14 module to migrate to this one.
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "enable" ]
       [ "services" "xserver" "desktopManager" "xfce" "enable" ])
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ]
       [ "services" "xserver" "desktopManager" "xfce" "noDesktop" ])
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ]
       [ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ])
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ]
       [ "services" "xserver" "displayManager" "sessionCommands" ])
-    (lib.mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
+    (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
 
     # added 2022-06-26
     # thunar has its own module
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "desktopManager" "xfce" "thunarPlugins" ]
       [ "programs" "thunar" "plugins" ])
   ];
 
   options = {
     services.xserver.desktopManager.xfce = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable the Xfce desktop environment.";
       };
 
-      noDesktop = lib.mkOption {
-        type = lib.types.bool;
+      noDesktop = mkOption {
+        type = types.bool;
         default = false;
         description = "Don't install XFCE desktop components (xfdesktop and panel).";
       };
 
-      enableXfwm = lib.mkOption {
-        type = lib.types.bool;
+      enableXfwm = mkOption {
+        type = types.bool;
         default = true;
         description = "Enable the XFWM (default) window manager.";
       };
 
-      enableScreensaver = lib.mkOption {
-        type = lib.types.bool;
+      enableScreensaver = mkOption {
+        type = types.bool;
         default = true;
         description = "Enable the XFCE screensaver.";
       };
 
-      enableWaylandSession = lib.mkEnableOption "the experimental Xfce Wayland session";
+      enableWaylandSession = mkEnableOption "the experimental Xfce Wayland session";
 
-      waylandSessionCompositor = lib.mkOption {
+      waylandSessionCompositor = mkOption {
         type = lib.types.str;
         default = "";
         example = "wayfire";
@@ -84,15 +87,15 @@ in
       };
     };
 
-    environment.xfce.excludePackages = lib.mkOption {
+    environment.xfce.excludePackages = mkOption {
       default = [];
-      example = lib.literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]";
-      type = lib.types.listOf lib.types.package;
+      example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]";
+      type = types.listOf types.package;
       description = "Which packages XFCE should exclude from the default environment";
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = utils.removePackagesByName (with pkgs; [
       glib # for gsettings
       gtk3.out # gtk-update-icon-cache
@@ -144,10 +147,10 @@ in
         xfce.xfdesktop
       ] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
 
-    programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;
+    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
     programs.xfconf.enable = true;
     programs.thunar.enable = true;
-    programs.labwc.enable = lib.mkDefault (cfg.enableWaylandSession && (
+    programs.labwc.enable = mkDefault (cfg.enableWaylandSession && (
       cfg.waylandSessionCompositor == "" || lib.substring 0 5 cfg.waylandSessionCompositor == "labwc"));
 
     environment.pathsToLink = [
@@ -170,7 +173,7 @@ in
 
     # Copied from https://gitlab.xfce.org/xfce/xfce4-session/-/blob/xfce4-session-4.19.2/xfce-wayland.desktop.in
     # to maintain consistent l10n state with X11 session file and to support the waylandSessionCompositor option.
-    services.displayManager.sessionPackages = lib.optionals cfg.enableWaylandSession [
+    services.displayManager.sessionPackages = optionals cfg.enableWaylandSession [
       ((pkgs.writeTextDir "share/wayland-sessions/xfce-wayland.desktop" ''
         [Desktop Entry]
         Version=1.0
@@ -195,16 +198,16 @@ in
     services.gnome.glib-networking.enable = true;
     services.gvfs.enable = true;
     services.tumbler.enable = true;
-    services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true));
-    services.libinput.enable = lib.mkDefault true; # used in xfce4-settings-manager
-    services.colord.enable = lib.mkDefault true;
+    services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+    services.libinput.enable = mkDefault true; # used in xfce4-settings-manager
+    services.colord.enable = mkDefault true;
 
     # Enable default programs
     programs.dconf.enable = true;
 
     # Shell integration for VTE terminals
-    programs.bash.vteIntegration = lib.mkDefault true;
-    programs.zsh.vteIntegration = lib.mkDefault true;
+    programs.bash.vteIntegration = mkDefault true;
+    programs.zsh.vteIntegration = mkDefault true;
 
     # Systemd services
     systemd.packages = utils.removePackagesByName (with pkgs.xfce; [
@@ -213,6 +216,6 @@ in
 
     security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
 
-    xdg.portal.configPackages = lib.mkDefault [ pkgs.xfce.xfce4-session ];
+    xdg.portal.configPackages = mkDefault [ pkgs.xfce.xfce4-session ];
   };
 }
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index 562401c9d057..c4db014db796 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.desktopManager.xterm;
@@ -14,18 +17,18 @@ in
 {
   options = {
 
-    services.xserver.desktopManager.xterm.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = lib.versionOlder config.system.stateVersion "19.09" && xSessionEnabled;
-      defaultText = lib.literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;'';
+    services.xserver.desktopManager.xterm.enable = mkOption {
+      type = types.bool;
+      default = versionOlder config.system.stateVersion "19.09" && xSessionEnabled;
+      defaultText = literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;'';
       description = "Enable a xterm terminal as a desktop manager.";
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = lib.singleton {
+    services.xserver.desktopManager.session = singleton {
       name = "xterm";
       start = ''
         ${pkgs.xterm}/bin/xterm -ls &
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
index 797294397447..85de2ce62849 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
@@ -4,6 +4,8 @@
   pkgs,
   ...
 }:
+
+with lib;
 let
   dmcfg = config.services.xserver.displayManager;
   ldmcfg = dmcfg.lightdm;
@@ -27,8 +29,8 @@ in
 {
   options = {
     services.xserver.displayManager.lightdm.greeters.enso = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable enso-os-greeter as the lightdm greeter
@@ -36,17 +38,17 @@ in
       };
 
       theme = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.gnome-themes-extra;
-          defaultText = lib.literalExpression "pkgs.gnome-themes-extra";
+          defaultText = literalExpression "pkgs.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the theme to use for the lightdm-enso-os-greeter
@@ -55,17 +57,17 @@ in
       };
 
       iconTheme = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.papirus-icon-theme;
-          defaultText = lib.literalExpression "pkgs.papirus-icon-theme";
+          defaultText = literalExpression "pkgs.papirus-icon-theme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "ePapirus";
           description = ''
             Name of the icon theme to use for the lightdm-enso-os-greeter
@@ -74,17 +76,17 @@ in
       };
 
       cursorTheme = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.capitaine-cursors;
-          defaultText = lib.literalExpression "pkgs.capitaine-cursors";
+          defaultText = literalExpression "pkgs.capitaine-cursors";
           description = ''
             The package path that contains the cursor theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "capitane-cursors";
           description = ''
             Name of the cursor theme to use for the lightdm-enso-os-greeter
@@ -92,24 +94,24 @@ in
         };
       };
 
-      blur = lib.mkOption {
-        type = lib.types.bool;
+      blur = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether or not to enable blur
         '';
       };
 
-      brightness = lib.mkOption {
-        type = lib.types.int;
+      brightness = mkOption {
+        type = types.int;
         default = 7;
         description = ''
           Brightness
         '';
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the greeter.conf
@@ -119,7 +121,7 @@ in
     };
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
     environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
 
     environment.systemPackages = [
@@ -129,14 +131,14 @@ in
     ];
 
     services.xserver.displayManager.lightdm = {
-      greeter = lib.mkDefault {
+      greeter = mkDefault {
         package = pkgs.lightdm-enso-os-greeter.xgreeters;
         name = "pantheon-greeter";
       };
 
       greeters = {
         gtk = {
-          enable = lib.mkDefault false;
+          enable = mkDefault false;
         };
       };
     };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index e903efea28d8..468ab09c66a5 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -24,11 +27,9 @@ let
     cursor-theme-name = ${cfg.cursorTheme.name}
     cursor-theme-size = ${toString cfg.cursorTheme.size}
     background = ${ldmcfg.background}
-    ${lib.optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
-    ${lib.optionalString (
-      cfg.indicators != null
-    ) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"}
-    ${lib.optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"}
+    ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"}
+    ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"}
+    ${optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"}
     ${cfg.extraConfig}
   '';
 
@@ -38,8 +39,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.gtk = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Whether to enable lightdm-gtk-greeter as the lightdm greeter.
@@ -48,17 +49,17 @@ in
 
       theme = {
 
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.gnome-themes-extra;
-          defaultText = lib.literalExpression "pkgs.gnome-themes-extra";
+          defaultText = literalExpression "pkgs.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the theme to use for the lightdm-gtk-greeter.
@@ -69,17 +70,17 @@ in
 
       iconTheme = {
 
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the icon theme to use for the lightdm-gtk-greeter.
@@ -90,25 +91,25 @@ in
 
       cursorTheme = {
 
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the cursor theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the cursor theme to use for the lightdm-gtk-greeter.
           '';
         };
 
-        size = lib.mkOption {
-          type = lib.types.int;
+        size = mkOption {
+          type = types.int;
           default = 16;
           description = ''
             Size of the cursor theme to use for the lightdm-gtk-greeter.
@@ -116,8 +117,8 @@ in
         };
       };
 
-      clock-format = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
+      clock-format = mkOption {
+        type = types.nullOr types.str;
         default = null;
         example = "%F";
         description = ''
@@ -128,8 +129,8 @@ in
         '';
       };
 
-      indicators = lib.mkOption {
-        type = lib.types.nullOr (lib.types.listOf lib.types.str);
+      indicators = mkOption {
+        type = types.nullOr (types.listOf types.str);
         default = null;
         example = [
           "~host"
@@ -154,8 +155,8 @@ in
         '';
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the lightdm-gtk-greeter.conf
@@ -167,9 +168,9 @@ in
 
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
 
-    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
+    services.xserver.displayManager.lightdm.greeter = mkDefault {
       package = pkgs.lightdm-gtk-greeter.xgreeters;
       name = "lightdm-gtk-greeter";
     };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index f81b711179e6..a3fca737a2b2 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -53,8 +56,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.mini = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable lightdm-mini-greeter as the lightdm greeter.
@@ -65,16 +68,16 @@ in
         '';
       };
 
-      user = lib.mkOption {
-        type = lib.types.str;
+      user = mkOption {
+        type = types.str;
         default = "root";
         description = ''
           The user to login as.
         '';
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the lightdm-mini-greeter.conf
@@ -86,11 +89,11 @@ in
 
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
-    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
+    services.xserver.displayManager.lightdm.greeter = mkDefault {
       package = pkgs.lightdm-mini-greeter.xgreeters;
       name = "lightdm-mini-greeter";
     };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix
index b7c6a9b4ae68..5d8edbe7c59e 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix
@@ -4,6 +4,8 @@
   pkgs,
   ...
 }:
+
+with lib;
 let
   dmcfg = config.services.xserver.displayManager;
   ldmcfg = dmcfg.lightdm;
@@ -12,14 +14,14 @@ in
 {
   options = {
     services.xserver.displayManager.lightdm.greeters.mobile = {
-      enable = lib.mkEnableOption "lightdm-mobile-greeter as the lightdm greeter";
+      enable = mkEnableOption "lightdm-mobile-greeter as the lightdm greeter";
     };
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
-    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
+    services.xserver.displayManager.lightdm.greeter = mkDefault {
       package = pkgs.lightdm-mobile-greeter.xgreeters;
       name = "lightdm-mobile-greeter";
     };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 8ad6a108dddf..f598fd1171a2 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -20,8 +23,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.pantheon = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable elementary-greeter as the lightdm greeter.
@@ -32,11 +35,11 @@ in
 
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
-    services.xserver.displayManager.lightdm.greeter = lib.mkDefault {
+    services.xserver.displayManager.lightdm.greeter = mkDefault {
       package = pkgs.pantheon.elementary-greeter.xgreeters;
       name = "io.elementary.greeter";
     };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
index f90363d58ac2..e2d83ce5dcb4 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   ldmcfg = config.services.xserver.displayManager.lightdm;
   cfg = ldmcfg.greeters.slick;
@@ -23,27 +26,27 @@ let
     font-name=${cfg.font.name}
     cursor-theme-name=${cfg.cursorTheme.name}
     cursor-theme-size=${toString cfg.cursorTheme.size}
-    draw-user-backgrounds=${lib.boolToString cfg.draw-user-backgrounds}
+    draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds}
     ${cfg.extraConfig}
   '';
 in
 {
   options = {
     services.xserver.displayManager.lightdm.greeters.slick = {
-      enable = lib.mkEnableOption "lightdm-slick-greeter as the lightdm greeter";
+      enable = mkEnableOption "lightdm-slick-greeter as the lightdm greeter";
 
       theme = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.gnome-themes-extra;
-          defaultText = lib.literalExpression "pkgs.gnome-themes-extra";
+          defaultText = literalExpression "pkgs.gnome-themes-extra";
           description = ''
             The package path that contains the theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the theme to use for the lightdm-slick-greeter.
@@ -52,17 +55,17 @@ in
       };
 
       iconTheme = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the icon theme to use for the lightdm-slick-greeter.
@@ -71,17 +74,17 @@ in
       };
 
       font = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.ubuntu-classic;
-          defaultText = lib.literalExpression "pkgs.ubuntu-classic";
+          defaultText = literalExpression "pkgs.ubuntu-classic";
           description = ''
             The package path that contains the font given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Ubuntu 11";
           description = ''
             Name of the font to use.
@@ -90,25 +93,25 @@ in
       };
 
       cursorTheme = {
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           default = pkgs.adwaita-icon-theme;
-          defaultText = lib.literalExpression "pkgs.adwaita-icon-theme";
+          defaultText = literalExpression "pkgs.adwaita-icon-theme";
           description = ''
             The package path that contains the cursor theme given in the name option.
           '';
         };
 
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           default = "Adwaita";
           description = ''
             Name of the cursor theme to use for the lightdm-slick-greeter.
           '';
         };
 
-        size = lib.mkOption {
-          type = lib.types.int;
+        size = mkOption {
+          type = types.int;
           default = 24;
           description = ''
             Size of the cursor theme to use for the lightdm-slick-greeter.
@@ -116,10 +119,10 @@ in
         };
       };
 
-      draw-user-backgrounds = lib.mkEnableOption "draw user backgrounds";
+      draw-user-backgrounds = mkEnableOption "draw user backgrounds";
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the lightdm-slick-greeter.conf
@@ -129,10 +132,10 @@ in
     };
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
     services.xserver.displayManager.lightdm = {
       greeters.gtk.enable = false;
-      greeter = lib.mkDefault {
+      greeter = mkDefault {
         package = pkgs.lightdm-slick-greeter.xgreeters;
         name = "lightdm-slick-greeter";
       };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
index 73e144ddccf9..4780468533de 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   dmcfg = config.services.xserver.displayManager;
@@ -16,8 +19,8 @@ in
 
     services.xserver.displayManager.lightdm.greeters.tiny = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable lightdm-tiny-greeter as the lightdm greeter.
@@ -29,16 +32,16 @@ in
       };
 
       label = {
-        user = lib.mkOption {
-          type = lib.types.str;
+        user = mkOption {
+          type = types.str;
           default = "Username";
           description = ''
             The string to represent the user_text label.
           '';
         };
 
-        pass = lib.mkOption {
-          type = lib.types.str;
+        pass = mkOption {
+          type = types.str;
           default = "Password";
           description = ''
             The string to represent the pass_text label.
@@ -46,8 +49,8 @@ in
         };
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Section to describe style and ui.
@@ -58,7 +61,7 @@ in
 
   };
 
-  config = lib.mkIf (ldmcfg.enable && cfg.enable) {
+  config = mkIf (ldmcfg.enable && cfg.enable) {
 
     services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
 
@@ -70,10 +73,10 @@ in
           static const char *pass_text = "${cfg.label.pass}";
           static const char *session = "${dmcfg.defaultSession}";
         '';
-        config = lib.optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig);
+        config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig);
         package = pkgs.lightdm-tiny-greeter.override { conf = config; };
       in
-      lib.mkDefault {
+      mkDefault {
         package = package.xgreeters;
         name = "lightdm-tiny-greeter";
       };
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3ac91f860f6d..3e964ef53266 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   xcfg = config.services.xserver;
@@ -19,7 +22,7 @@ let
   # lightdm runs with clearenv(), but we need a few things in the environment for X to startup
   xserverWrapper = writeScript "xserver-wrapper" ''
     #! ${pkgs.bash}/bin/bash
-    ${lib.concatMapStrings (n: "export ${n}=\"${lib.getAttr n xEnv}\"\n") (lib.attrNames xEnv)}
+    ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
 
     display=$(echo "$@" | xargs -n 1 | grep -P ^:\\d\$ | head -n 1 | sed s/^://)
     if [ -z "$display" ]
@@ -33,13 +36,13 @@ let
   usersConf = writeText "users.conf" ''
     [UserList]
     minimum-uid=1000
-    hidden-users=${lib.concatStringsSep " " dmcfg.hiddenUsers}
+    hidden-users=${concatStringsSep " " dmcfg.hiddenUsers}
     hidden-shells=/run/current-system/sw/bin/nologin
   '';
 
   lightdmConf = writeText "lightdm.conf" ''
     [LightDM]
-    ${lib.optionalString cfg.greeter.enable ''
+    ${optionalString cfg.greeter.enable ''
       greeter-user = ${config.users.users.lightdm.name}
       greeters-directory = ${cfg.greeter.package}
     ''}
@@ -49,15 +52,15 @@ let
     [Seat:*]
     xserver-command = ${xserverWrapper}
     session-wrapper = ${dmcfg.sessionData.wrapper}
-    ${lib.optionalString cfg.greeter.enable ''
+    ${optionalString cfg.greeter.enable ''
       greeter-session = ${cfg.greeter.name}
     ''}
-    ${lib.optionalString dmcfg.autoLogin.enable ''
+    ${optionalString dmcfg.autoLogin.enable ''
       autologin-user = ${dmcfg.autoLogin.user}
       autologin-user-timeout = ${toString cfg.autoLogin.timeout}
       autologin-session = ${sessionData.autologinSession}
     ''}
-    ${lib.optionalString (xcfg.displayManager.setupCommands != "") ''
+    ${optionalString (xcfg.displayManager.setupCommands != "") ''
       display-setup-script=${pkgs.writeScript "lightdm-display-setup" ''
         #!${pkgs.bash}/bin/bash
         ${xcfg.displayManager.setupCommands}
@@ -84,7 +87,7 @@ in
     ./lightdm-greeters/tiny.nix
     ./lightdm-greeters/slick.nix
     ./lightdm-greeters/mobile.nix
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ]
       [
         "services"
@@ -93,7 +96,7 @@ in
         "enable"
       ]
     )
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "user" ]
       [
         "services"
@@ -108,8 +111,8 @@ in
 
     services.xserver.displayManager.lightdm = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable lightdm as the display manager.
@@ -117,24 +120,24 @@ in
       };
 
       greeter = {
-        enable = lib.mkOption {
-          type = lib.types.bool;
+        enable = mkOption {
+          type = types.bool;
           default = true;
           description = ''
             If set to false, run lightdm in greeterless mode. This only works if autologin
             is enabled and autoLogin.timeout is zero.
           '';
         };
-        package = lib.mkOption {
-          type = lib.types.package;
+        package = mkOption {
+          type = types.package;
           description = ''
             The LightDM greeter to login via. The package should be a directory
             containing a .desktop file matching the name in the 'name' option.
           '';
 
         };
-        name = lib.mkOption {
-          type = lib.types.str;
+        name = mkOption {
+          type = types.str;
           description = ''
             The name of a .desktop file in the directory specified
             in the 'package' option.
@@ -142,8 +145,8 @@ in
         };
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         example = ''
           user-authority-in-system-dir = true
@@ -151,17 +154,17 @@ in
         description = "Extra lines to append to LightDM section.";
       };
 
-      background = lib.mkOption {
-        type = lib.types.either lib.types.path (lib.types.strMatching "^#[0-9]\{6\}$");
+      background = mkOption {
+        type = types.either types.path (types.strMatching "^#[0-9]\{6\}$");
         # Manual cannot depend on packages, we are actually setting the default in config below.
-        defaultText = lib.literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath";
+        defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath";
         description = ''
           The background image or color to use.
         '';
       };
 
-      extraSeatDefaults = lib.mkOption {
-        type = lib.types.lines;
+      extraSeatDefaults = mkOption {
+        type = types.lines;
         default = "";
         example = ''
           greeter-show-manual-login=true
@@ -170,8 +173,8 @@ in
       };
 
       # Configuration for automatic login specific to LightDM
-      autoLogin.timeout = lib.mkOption {
-        type = lib.types.int;
+      autoLogin.timeout = mkOption {
+        type = types.int;
         default = 0;
         description = ''
           Show the greeter for this many seconds before automatic login occurs.
@@ -181,7 +184,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     assertions = [
       {
@@ -207,12 +210,12 @@ in
 
     # Keep in sync with the defaultText value from the option definition.
     services.xserver.displayManager.lightdm.background =
-      lib.mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath;
+      mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath;
 
     # Set default session in session chooser to a specified values – basically ignore session history.
     # Auto-login is already covered by a config value.
     services.displayManager.preStart =
-      lib.optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null)
+      optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null)
         ''
           ${setSessionScript}/bin/set-session ${dmcfg.defaultSession}
         '';
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 8c522d4a9e93..c5963b0be7ec 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -4,10 +4,13 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 {
   # added 2019-11-11
   imports = [
-    (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] ''
+    (mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] ''
       The SLIM project is abandoned and their last release was in 2013.
       Because of this it poses a security risk to your system.
       Other issues include it not fully supporting systemd and logind sessions.
diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix
index e6e61318c19f..a990c9ed5ea5 100644
--- a/nixos/modules/services/x11/display-managers/startx.nix
+++ b/nixos/modules/services/x11/display-managers/startx.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.displayManager.startx;
@@ -16,8 +19,8 @@ in
 
   options = {
     services.xserver.displayManager.startx = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the dummy "startx" pseudo-display manager,
@@ -33,7 +36,7 @@ in
 
   ###### implementation
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.xserver = {
       exportConfiguration = true;
     };
@@ -43,7 +46,7 @@ in
     #
     # To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do
     # not specify a log file when running X
-    services.xserver.logFile = lib.mkDefault null;
+    services.xserver.logFile = mkDefault null;
 
     # Implement xserverArgs via xinit's system-wide xserverrc
     environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" ''
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
index c75a293b3654..67b1751ba8ec 100644
--- a/nixos/modules/services/x11/display-managers/xpra.nix
+++ b/nixos/modules/services/x11/display-managers/xpra.nix
@@ -1,4 +1,7 @@
 { config, lib, pkgs, ... }:
+
+with lib;
+
 let
   cfg = config.services.xserver.displayManager.xpra;
   dmcfg = config.services.xserver.displayManager;
@@ -10,46 +13,46 @@ in
 
   options = {
     services.xserver.displayManager.xpra = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable xpra as display manager.";
       };
 
-      bindTcp = lib.mkOption {
+      bindTcp = mkOption {
         default = "127.0.0.1:10000";
         example = "0.0.0.0:10000";
-        type = lib.types.nullOr lib.types.str;
+        type = types.nullOr types.str;
         description = "Bind xpra to TCP";
       };
 
-      desktop = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
+      desktop = mkOption {
+        type = types.nullOr types.str;
         default = null;
         example = "gnome-shell";
         description = "Start a desktop environment instead of seamless mode";
       };
 
-      auth = lib.mkOption {
-        type = lib.types.str;
+      auth = mkOption {
+        type = types.str;
         default = "pam";
         example = "password:value=mysecret";
         description = "Authentication to use when connecting to xpra";
       };
 
-      pulseaudio = lib.mkEnableOption "pulseaudio audio streaming";
+      pulseaudio = mkEnableOption "pulseaudio audio streaming";
 
-      extraOptions = lib.mkOption {
+      extraOptions = mkOption {
         description = "Extra xpra options";
         default = [];
-        type = lib.types.listOf lib.types.str;
+        type = types.listOf types.str;
       };
     };
   };
 
   ###### implementation
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.xserver.videoDrivers = ["dummy"];
 
     services.xserver.monitorSection = ''
@@ -224,7 +227,7 @@ in
     '';
 
     services.displayManager.execCmd = ''
-      ${lib.optionalString (cfg.pulseaudio)
+      ${optionalString (cfg.pulseaudio)
         "export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"}
       exec ${pkgs.xpra}/bin/xpra ${if cfg.desktop == null then "start" else "start-desktop --start=${cfg.desktop}"} \
         --daemon=off \
@@ -236,20 +239,20 @@ in
         --speaker=yes \
         --mdns=no \
         --pulseaudio=no \
-        ${lib.optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
+        ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
         --socket-dirs=/run/xpra \
-        --xvfb="xpra_Xdummy ${lib.concatStringsSep " " dmcfg.xserverArgs}" \
-        ${lib.optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
+        --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \
+        ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
         --auth=${cfg.auth} \
-        ${lib.concatStringsSep " " cfg.extraOptions}
+        ${concatStringsSep " " cfg.extraOptions}
     '';
 
     services.xserver.terminateOnReset = false;
 
     environment.systemPackages = [pkgs.xpra];
 
-    services.pulseaudio.enable = lib.mkDefault cfg.pulseaudio;
-    services.pulseaudio.systemWide = lib.mkDefault cfg.pulseaudio;
+    services.pulseaudio.enable = mkDefault cfg.pulseaudio;
+    services.pulseaudio.systemWide = mkDefault cfg.pulseaudio;
   };
 
 }
diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix
index e5e294a5c175..0327609c25cd 100644
--- a/nixos/modules/services/x11/extra-layouts.nix
+++ b/nixos/modules/services/x11/extra-layouts.nix
@@ -4,26 +4,29 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   layouts = config.services.xserver.xkb.extraLayouts;
 
   layoutOpts = {
     options = {
-      description = lib.mkOption {
-        type = lib.types.str;
+      description = mkOption {
+        type = types.str;
         description = "A short description of the layout.";
       };
 
-      languages = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
+      languages = mkOption {
+        type = types.listOf types.str;
         description = ''
           A list of languages provided by the layout.
           (Use ISO 639-2 codes, for example: "eng" for english)
         '';
       };
 
-      compatFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      compatFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
         description = ''
           The path to the xkb compat file.
@@ -33,8 +36,8 @@ let
         '';
       };
 
-      geometryFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      geometryFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
         description = ''
           The path to the xkb geometry file.
@@ -44,8 +47,8 @@ let
         '';
       };
 
-      keycodesFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      keycodesFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
         description = ''
           The path to the xkb keycodes file.
@@ -55,8 +58,8 @@ let
         '';
       };
 
-      symbolsFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      symbolsFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
         description = ''
           The path to the xkb symbols file.
@@ -66,8 +69,8 @@ let
         '';
       };
 
-      typesFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      typesFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
         description = ''
           The path to the xkb types file.
@@ -108,10 +111,10 @@ in
   ###### interface
 
   options.services.xserver.xkb = {
-    extraLayouts = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule layoutOpts);
+    extraLayouts = mkOption {
+      type = types.attrsOf (types.submodule layoutOpts);
       default = { };
-      example = lib.literalExpression ''
+      example = literalExpression ''
         {
           mine = {
             description = "My custom xkb layout.";
@@ -133,7 +136,7 @@ in
 
   ###### implementation
 
-  config = lib.mkIf (layouts != { }) {
+  config = mkIf (layouts != { }) {
 
     environment.sessionVariables = {
       # runtime override supported by multiple libraries e. g. libxkbcommon
diff --git a/nixos/modules/services/x11/fractalart.nix b/nixos/modules/services/x11/fractalart.nix
index 1f6f7d9eaccb..9ec64abc9049 100644
--- a/nixos/modules/services/x11/fractalart.nix
+++ b/nixos/modules/services/x11/fractalart.nix
@@ -4,38 +4,39 @@
   pkgs,
   ...
 }:
+with lib;
 let
   cfg = config.services.fractalart;
 in
 {
   options.services.fractalart = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
+    enable = mkOption {
+      type = types.bool;
       default = false;
       example = true;
       description = "Enable FractalArt for generating colorful wallpapers on login";
     };
 
-    width = lib.mkOption {
-      type = lib.types.nullOr lib.types.int;
+    width = mkOption {
+      type = types.nullOr types.int;
       default = null;
       example = 1920;
       description = "Screen width";
     };
 
-    height = lib.mkOption {
-      type = lib.types.nullOr lib.types.int;
+    height = mkOption {
+      type = types.nullOr types.int;
       default = null;
       example = 1080;
       description = "Screen height";
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.haskellPackages.FractalArt ];
     services.xserver.displayManager.sessionCommands =
       "${pkgs.haskellPackages.FractalArt}/bin/FractalArt --no-bg -f .background-image"
-      + lib.optionalString (cfg.width != null) " -w ${toString cfg.width}"
-      + lib.optionalString (cfg.height != null) " -h ${toString cfg.height}";
+      + optionalString (cfg.width != null) " -w ${toString cfg.width}"
+      + optionalString (cfg.height != null) " -h ${toString cfg.height}";
   };
 }
diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix
index 8d037f038625..23f07e5de06e 100644
--- a/nixos/modules/services/x11/hardware/cmt.nix
+++ b/nixos/modules/services/x11/hardware/cmt.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.cmt;
@@ -15,13 +18,13 @@ in
   options = {
 
     services.xserver.cmt = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks.";
       };
-      models = lib.mkOption {
-        type = lib.types.enum [
+      models = mkOption {
+        type = types.enum [
           "atlas"
           "banjo"
           "candy"
@@ -80,7 +83,7 @@ in
     }; # closes services
   }; # closes options
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     services.xserver.modules = [ pkgs.xf86_input_cmt ];
 
diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixos/modules/services/x11/hardware/digimend.nix
index a8cc2a7f9937..693db5e90720 100644
--- a/nixos/modules/services/x11/hardware/digimend.nix
+++ b/nixos/modules/services/x11/hardware/digimend.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.digimend;
@@ -18,13 +21,13 @@ in
 
     services.xserver.digimend = {
 
-      enable = lib.mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
+      enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
 
     };
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     # digimend drivers use xsetwacom and wacom X11 drivers
     services.xserver.wacom.enable = true;
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 914f80d2da1f..f943242f7bae 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.synaptics;
   opt = options.services.xserver.synaptics;
@@ -32,14 +35,14 @@ in
 
     services.xserver.synaptics = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable touchpad support. Deprecated: Consider services.libinput.enable.";
       };
 
-      dev = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
+      dev = mkOption {
+        type = types.nullOr types.str;
         default = null;
         example = "/dev/input/event0";
         description = ''
@@ -48,73 +51,73 @@ in
         '';
       };
 
-      accelFactor = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
+      accelFactor = mkOption {
+        type = types.nullOr types.str;
         default = "0.001";
         description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
       };
 
-      minSpeed = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
+      minSpeed = mkOption {
+        type = types.nullOr types.str;
         default = "0.6";
         description = "Cursor speed factor for precision finger motion.";
       };
 
-      maxSpeed = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
+      maxSpeed = mkOption {
+        type = types.nullOr types.str;
         default = "1.0";
         description = "Cursor speed factor for highest-speed finger motion.";
       };
 
-      scrollDelta = lib.mkOption {
-        type = lib.types.nullOr lib.types.int;
+      scrollDelta = mkOption {
+        type = types.nullOr types.int;
         default = null;
         example = 75;
         description = "Move distance of the finger for a scroll event.";
       };
 
-      twoFingerScroll = lib.mkOption {
-        type = lib.types.bool;
+      twoFingerScroll = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll.";
       };
 
-      horizTwoFingerScroll = lib.mkOption {
-        type = lib.types.bool;
+      horizTwoFingerScroll = mkOption {
+        type = types.bool;
         default = cfg.twoFingerScroll;
-        defaultText = lib.literalExpression "config.${opt.twoFingerScroll}";
+        defaultText = literalExpression "config.${opt.twoFingerScroll}";
         description = "Whether to enable horizontal two-finger drag-scrolling.";
       };
 
-      vertTwoFingerScroll = lib.mkOption {
-        type = lib.types.bool;
+      vertTwoFingerScroll = mkOption {
+        type = types.bool;
         default = cfg.twoFingerScroll;
-        defaultText = lib.literalExpression "config.${opt.twoFingerScroll}";
+        defaultText = literalExpression "config.${opt.twoFingerScroll}";
         description = "Whether to enable vertical two-finger drag-scrolling.";
       };
 
-      horizEdgeScroll = lib.mkOption {
-        type = lib.types.bool;
+      horizEdgeScroll = mkOption {
+        type = types.bool;
         default = !cfg.horizTwoFingerScroll;
-        defaultText = lib.literalExpression "! config.${opt.horizTwoFingerScroll}";
+        defaultText = literalExpression "! config.${opt.horizTwoFingerScroll}";
         description = "Whether to enable horizontal edge drag-scrolling.";
       };
 
-      vertEdgeScroll = lib.mkOption {
-        type = lib.types.bool;
+      vertEdgeScroll = mkOption {
+        type = types.bool;
         default = !cfg.vertTwoFingerScroll;
-        defaultText = lib.literalExpression "! config.${opt.vertTwoFingerScroll}";
+        defaultText = literalExpression "! config.${opt.vertTwoFingerScroll}";
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
-      tapButtons = lib.mkOption {
-        type = lib.types.bool;
+      tapButtons = mkOption {
+        type = types.bool;
         default = true;
         description = "Whether to enable tap buttons.";
       };
 
-      buttonsMap = lib.mkOption {
-        type = lib.types.listOf lib.types.int;
+      buttonsMap = mkOption {
+        type = types.listOf types.int;
         default = [
           1
           2
@@ -129,8 +132,8 @@ in
         apply = map toString;
       };
 
-      fingersMap = lib.mkOption {
-        type = lib.types.listOf lib.types.int;
+      fingersMap = mkOption {
+        type = types.listOf types.int;
         default = [
           1
           2
@@ -145,34 +148,34 @@ in
         apply = map toString;
       };
 
-      palmDetect = lib.mkOption {
-        type = lib.types.bool;
+      palmDetect = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable palm detection (hardware support required)";
       };
 
-      palmMinWidth = lib.mkOption {
-        type = lib.types.nullOr lib.types.int;
+      palmMinWidth = mkOption {
+        type = types.nullOr types.int;
         default = null;
         example = 5;
         description = "Minimum finger width at which touch is considered a palm";
       };
 
-      palmMinZ = lib.mkOption {
-        type = lib.types.nullOr lib.types.int;
+      palmMinZ = mkOption {
+        type = types.nullOr types.int;
         default = null;
         example = 20;
         description = "Minimum finger pressure at which touch is considered a palm";
       };
 
-      horizontalScroll = lib.mkOption {
-        type = lib.types.bool;
+      horizontalScroll = mkOption {
+        type = types.bool;
         default = true;
         description = "Whether to enable horizontal scrolling (on touchpad)";
       };
 
-      additionalOptions = lib.mkOption {
-        type = lib.types.str;
+      additionalOptions = mkOption {
+        type = types.str;
         default = "";
         example = ''
           Option "RTCornerButton" "2"
@@ -187,7 +190,7 @@ in
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     services.xserver.modules = [ pkg.out ];
 
@@ -200,12 +203,12 @@ in
       Section "InputClass"
         Identifier "synaptics touchpad catchall"
         MatchIsTouchpad "on"
-        ${lib.optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
+        ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
         Driver "synaptics"
-        ${lib.optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''}
-        ${lib.optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''}
-        ${lib.optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''}
-        ${lib.optionalString cfg.tapButtons tapConfig}
+        ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''}
+        ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''}
+        ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''}
+        ${optionalString cfg.tapButtons tapConfig}
         Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
         Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
         Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
@@ -213,19 +216,19 @@ in
         Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
         Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
         Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
-        ${lib.optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
-        ${lib.optionalString (
+        ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
+        ${optionalString (
           cfg.palmMinWidth != null
         ) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''}
-        ${lib.optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
-        ${lib.optionalString (
+        ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
+        ${optionalString (
           cfg.scrollDelta != null
         ) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''}
         ${
           if !cfg.horizontalScroll then
             ''Option "HorizScrollDelta" "0"''
           else
-            (lib.optionalString (
+            (optionalString (
               cfg.scrollDelta != null
             ) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'')
         }
diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
index c4e6ed941583..3707b7f41575 100644
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.wacom;
@@ -16,8 +19,8 @@ in
 
     services.xserver.wacom = {
 
-      enable = lib.mkOption {
-        type = lib.types.bool;
+      enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the Wacom touchscreen/digitizer/tablet.
@@ -34,7 +37,7 @@ in
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom
 
diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix
index c674555a60f3..2898af201a7e 100644
--- a/nixos/modules/services/x11/imwheel.nix
+++ b/nixos/modules/services/x11/imwheel.nix
@@ -4,16 +4,17 @@
   pkgs,
   ...
 }:
+with lib;
 let
   cfg = config.services.xserver.imwheel;
 in
 {
   options = {
     services.xserver.imwheel = {
-      enable = lib.mkEnableOption "IMWheel service";
+      enable = mkEnableOption "IMWheel service";
 
-      extraOptions = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
+      extraOptions = mkOption {
+        type = types.listOf types.str;
         default = [ "--buttons=45" ];
         example = [ "--debug" ];
         description = ''
@@ -22,10 +23,10 @@ in
         '';
       };
 
-      rules = lib.mkOption {
-        type = lib.types.attrsOf lib.types.str;
+      rules = mkOption {
+        type = types.attrsOf types.str;
         default = { };
-        example = lib.literalExpression ''
+        example = literalExpression ''
           {
             ".*" = '''
               None,      Up,   Button4, 8
@@ -48,11 +49,11 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.imwheel ];
 
     environment.etc."X11/imwheel/imwheelrc".source = pkgs.writeText "imwheelrc" (
-      lib.concatStringsSep "\n\n" (lib.mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules)
+      concatStringsSep "\n\n" (mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules)
     );
 
     systemd.user.services.imwheel = {
@@ -62,7 +63,7 @@ in
       serviceConfig = {
         ExecStart =
           "${pkgs.imwheel}/bin/imwheel "
-          + lib.escapeShellArgs (
+          + escapeShellArgs (
             [
               "--detach"
               "--kill"
diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index 41d2acda063d..237d78484286 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.picom;
@@ -12,46 +15,46 @@ let
 
   pairOf =
     x:
-    with lib.types;
+    with types;
     addCheck (listOf x) (y: length y == 2) // { description = "pair of ${x.description}"; };
 
-  mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v);
+  mkDefaultAttrs = mapAttrs (n: v: mkDefault v);
 
   # Basically a tinkered lib.generators.mkKeyValueDefault
   # It either serializes a top-level definition "key: { values };"
   # or an expression "key = { values };"
   mkAttrsString =
     top:
-    lib.mapAttrsToList (
+    mapAttrsToList (
       k: v:
       let
-        sep = if (top && lib.isAttrs v) then ":" else "=";
+        sep = if (top && isAttrs v) then ":" else "=";
       in
-      "${lib.escape [ sep ] k}${sep}${mkValueString v};"
+      "${escape [ sep ] k}${sep}${mkValueString v};"
     );
 
   # This serializes a Nix expression to the libconfig format.
   mkValueString =
     v:
-    if lib.types.bool.check v then
-      lib.boolToString v
-    else if lib.types.int.check v then
+    if types.bool.check v then
+      boolToString v
+    else if types.int.check v then
       toString v
-    else if lib.types.float.check v then
+    else if types.float.check v then
       toString v
-    else if lib.types.str.check v then
-      "\"${lib.escape [ "\"" ] v}\""
+    else if types.str.check v then
+      "\"${escape [ "\"" ] v}\""
     else if builtins.isList v then
-      "[ ${lib.concatMapStringsSep " , " mkValueString v} ]"
-    else if lib.types.attrs.check v then
-      "{ ${lib.concatStringsSep " " (mkAttrsString false v)} }"
+      "[ ${concatMapStringsSep " , " mkValueString v} ]"
+    else if types.attrs.check v then
+      "{ ${concatStringsSep " " (mkAttrsString false v)} }"
     else
       throw ''
         invalid expression used in option services.picom.settings:
         ${v}
       '';
 
-  toConf = attrs: lib.concatStringsSep "\n" (mkAttrsString true cfg.settings);
+  toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings);
 
   configFile = pkgs.writeText "picom.conf" (toConf cfg.settings);
 
@@ -59,38 +62,38 @@ in
 {
 
   imports = [
-    (lib.mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
-    (lib.mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
+    (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
+    (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
       This option corresponds to `refresh-rate`, which has been unused
       since picom v6 and was subsequently removed by upstream.
       See https://github.com/yshui/picom/commit/bcbc410
     '')
-    (lib.mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] ''
+    (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] ''
       This option was removed by upstream since picom v10.
     '')
   ];
 
   options.services.picom = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
+    enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Whether or not to enable Picom as the X.org composite manager.
       '';
     };
 
-    package = lib.mkPackageOption pkgs "picom" { };
+    package = mkPackageOption pkgs "picom" { };
 
-    fade = lib.mkOption {
-      type = lib.types.bool;
+    fade = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Fade windows in and out.
       '';
     };
 
-    fadeDelta = lib.mkOption {
-      type = lib.types.ints.positive;
+    fadeDelta = mkOption {
+      type = types.ints.positive;
       default = 10;
       example = 5;
       description = ''
@@ -98,8 +101,8 @@ in
       '';
     };
 
-    fadeSteps = lib.mkOption {
-      type = pairOf (lib.types.numbers.between 0.01 1);
+    fadeSteps = mkOption {
+      type = pairOf (types.numbers.between 0.01 1);
       default = [
         0.028
         0.03
@@ -113,8 +116,8 @@ in
       '';
     };
 
-    fadeExclude = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+    fadeExclude = mkOption {
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "window_type *= 'menu'"
@@ -127,16 +130,16 @@ in
       '';
     };
 
-    shadow = lib.mkOption {
-      type = lib.types.bool;
+    shadow = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Draw window shadows.
       '';
     };
 
-    shadowOffsets = lib.mkOption {
-      type = pairOf lib.types.int;
+    shadowOffsets = mkOption {
+      type = pairOf types.int;
       default = [
         (-15)
         (-15)
@@ -150,8 +153,8 @@ in
       '';
     };
 
-    shadowOpacity = lib.mkOption {
-      type = lib.types.numbers.between 0 1;
+    shadowOpacity = mkOption {
+      type = types.numbers.between 0 1;
       default = 0.75;
       example = 0.8;
       description = ''
@@ -159,8 +162,8 @@ in
       '';
     };
 
-    shadowExclude = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+    shadowExclude = mkOption {
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "window_type *= 'menu'"
@@ -173,8 +176,8 @@ in
       '';
     };
 
-    activeOpacity = lib.mkOption {
-      type = lib.types.numbers.between 0 1;
+    activeOpacity = mkOption {
+      type = types.numbers.between 0 1;
       default = 1.0;
       example = 0.8;
       description = ''
@@ -182,8 +185,8 @@ in
       '';
     };
 
-    inactiveOpacity = lib.mkOption {
-      type = lib.types.numbers.between 0.1 1;
+    inactiveOpacity = mkOption {
+      type = types.numbers.between 0.1 1;
       default = 1.0;
       example = 0.8;
       description = ''
@@ -191,8 +194,8 @@ in
       '';
     };
 
-    menuOpacity = lib.mkOption {
-      type = lib.types.numbers.between 0 1;
+    menuOpacity = mkOption {
+      type = types.numbers.between 0 1;
       default = 1.0;
       example = 0.8;
       description = ''
@@ -200,8 +203,8 @@ in
       '';
     };
 
-    wintypes = lib.mkOption {
-      type = lib.types.attrs;
+    wintypes = mkOption {
+      type = types.attrs;
       default = {
         popup_menu = {
           opacity = cfg.menuOpacity;
@@ -210,7 +213,7 @@ in
           opacity = cfg.menuOpacity;
         };
       };
-      defaultText = lib.literalExpression ''
+      defaultText = literalExpression ''
         {
           popup_menu = { opacity = config.${opt.menuOpacity}; };
           dropdown_menu = { opacity = config.${opt.menuOpacity}; };
@@ -222,8 +225,8 @@ in
       '';
     };
 
-    opacityRules = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+    opacityRules = mkOption {
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a"
@@ -234,8 +237,8 @@ in
       '';
     };
 
-    backend = lib.mkOption {
-      type = lib.types.enum [
+    backend = mkOption {
+      type = types.enum [
         "egl"
         "glx"
         "xrender"
@@ -247,9 +250,9 @@ in
       '';
     };
 
-    vSync = lib.mkOption {
+    vSync = mkOption {
       type =
-        with lib.types;
+        with types;
         either bool (enum [
           "none"
           "drm"
@@ -265,9 +268,9 @@ in
           res = x != "none";
           msg =
             "The type of services.picom.vSync has changed to bool:"
-            + " interpreting ${x} as ${lib.boolToString res}";
+            + " interpreting ${x} as ${boolToString res}";
         in
-        if lib.isBool x then x else lib.warn msg res;
+        if isBool x then x else warn msg res;
 
       description = ''
         Enable vertical synchronization. Chooses the best method
@@ -277,7 +280,7 @@ in
     };
 
     settings =
-      with lib.types;
+      with types;
       let
         scalar =
           oneOf [
@@ -310,10 +313,10 @@ in
         };
 
       in
-      lib.mkOption {
+      mkOption {
         type = topLevel;
         default = { };
-        example = lib.literalExpression ''
+        example = literalExpression ''
           blur =
             { method = "gaussian";
               size = 10;
@@ -328,19 +331,19 @@ in
       };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     services.picom.settings = mkDefaultAttrs {
       # fading
       fading = cfg.fade;
       fade-delta = cfg.fadeDelta;
-      fade-in-step = lib.elemAt cfg.fadeSteps 0;
-      fade-out-step = lib.elemAt cfg.fadeSteps 1;
+      fade-in-step = elemAt cfg.fadeSteps 0;
+      fade-out-step = elemAt cfg.fadeSteps 1;
       fade-exclude = cfg.fadeExclude;
 
       # shadows
       shadow = cfg.shadow;
-      shadow-offset-x = lib.elemAt cfg.shadowOffsets 0;
-      shadow-offset-y = lib.elemAt cfg.shadowOffsets 1;
+      shadow-offset-x = elemAt cfg.shadowOffsets 0;
+      shadow-offset-y = elemAt cfg.shadowOffsets 1;
       shadow-opacity = cfg.shadowOpacity;
       shadow-exclude = cfg.shadowExclude;
 
@@ -363,12 +366,12 @@ in
       partOf = [ "graphical-session.target" ];
 
       # Temporarily fixes corrupt colours with Mesa 18
-      environment = lib.mkIf (cfg.backend == "glx") {
+      environment = mkIf (cfg.backend == "glx") {
         allow_rgb10_configs = "false";
       };
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} --config ${configFile}";
+        ExecStart = "${getExe cfg.package} --config ${configFile}";
         RestartSec = 3;
         Restart = "always";
       };
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 849780b53a77..661053c20016 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.redshift;
@@ -13,32 +16,32 @@ in
 {
 
   imports = [
-    (lib.mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] (
+    (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] (
       config:
       let
-        value = lib.getAttrFromPath [ "services" "redshift" "latitude" ] config;
+        value = getAttrFromPath [ "services" "redshift" "latitude" ] config;
       in
       if value == null then
         throw "services.redshift.latitude is set to null, you can remove this"
       else
         builtins.fromJSON value
     ))
-    (lib.mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] (
+    (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] (
       config:
       let
-        value = lib.getAttrFromPath [ "services" "redshift" "longitude" ] config;
+        value = getAttrFromPath [ "services" "redshift" "longitude" ] config;
       in
       if value == null then
         throw "services.redshift.longitude is set to null, you can remove this"
       else
         builtins.fromJSON value
     ))
-    (lib.mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
+    (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ])
   ];
 
   options.services.redshift = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
+    enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Enable Redshift to change your screen's colour temperature depending on
@@ -47,16 +50,16 @@ in
     };
 
     temperature = {
-      day = lib.mkOption {
-        type = lib.types.int;
+      day = mkOption {
+        type = types.int;
         default = 5500;
         description = ''
           Colour temperature to use during the day, between
           `1000` and `25000` K.
         '';
       };
-      night = lib.mkOption {
-        type = lib.types.int;
+      night = mkOption {
+        type = types.int;
         default = 3700;
         description = ''
           Colour temperature to use at night, between
@@ -66,16 +69,16 @@ in
     };
 
     brightness = {
-      day = lib.mkOption {
-        type = lib.types.str;
+      day = mkOption {
+        type = types.str;
         default = "1";
         description = ''
           Screen brightness to apply during the day,
           between `0.1` and `1.0`.
         '';
       };
-      night = lib.mkOption {
-        type = lib.types.str;
+      night = mkOption {
+        type = types.str;
         default = "1";
         description = ''
           Screen brightness to apply during the night,
@@ -84,10 +87,10 @@ in
       };
     };
 
-    package = lib.mkPackageOption pkgs "redshift" { };
+    package = mkPackageOption pkgs "redshift" { };
 
-    executable = lib.mkOption {
-      type = lib.types.str;
+    executable = mkOption {
+      type = types.str;
       default = "/bin/redshift";
       example = "/bin/redshift-gtk";
       description = ''
@@ -95,8 +98,8 @@ in
       '';
     };
 
-    extraOptions = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
+    extraOptions = mkOption {
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "-v"
@@ -109,7 +112,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     # needed so that .desktop files are installed, which geoclue cares about
     environment.systemPackages = [ cfg.package ];
 
diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix
index e641e5cf4727..def3dac738e0 100644
--- a/nixos/modules/services/x11/touchegg.nix
+++ b/nixos/modules/services/x11/touchegg.nix
@@ -4,24 +4,27 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.touchegg;
 
 in
 {
   meta = {
-    maintainers = lib.teams.pantheon.members;
+    maintainers = teams.pantheon.members;
   };
 
   ###### interface
   options.services.touchegg = {
-    enable = lib.mkEnableOption "touchegg, a multi-touch gesture recognizer";
+    enable = mkEnableOption "touchegg, a multi-touch gesture recognizer";
 
-    package = lib.mkPackageOption pkgs "touchegg" { };
+    package = mkPackageOption pkgs "touchegg" { };
   };
 
   ###### implementation
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     systemd.services.touchegg = {
       description = "Touchegg Daemon";
       serviceConfig = {
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index 32ff1577d5a5..48adb3665f38 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.unclutter-xfixes;
 
@@ -11,29 +14,29 @@ in
 {
   options.services.unclutter-xfixes = {
 
-    enable = lib.mkOption {
+    enable = mkOption {
       description = "Enable unclutter-xfixes to hide your mouse cursor when inactive.";
-      type = lib.types.bool;
+      type = types.bool;
       default = false;
     };
 
-    package = lib.mkPackageOption pkgs "unclutter-xfixes" { };
+    package = mkPackageOption pkgs "unclutter-xfixes" { };
 
-    timeout = lib.mkOption {
+    timeout = mkOption {
       description = "Number of seconds before the cursor is marked inactive.";
-      type = lib.types.int;
+      type = types.int;
       default = 1;
     };
 
-    threshold = lib.mkOption {
+    threshold = mkOption {
       description = "Minimum number of pixels considered cursor movement.";
-      type = lib.types.int;
+      type = types.int;
       default = 1;
     };
 
-    extraOptions = lib.mkOption {
+    extraOptions = mkOption {
       description = "More arguments to pass to the unclutter-xfixes command.";
-      type = lib.types.listOf lib.types.str;
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "exclude-root"
@@ -43,7 +46,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     systemd.user.services.unclutter-xfixes = {
       description = "unclutter-xfixes";
       wantedBy = [ "graphical-session.target" ];
@@ -52,7 +55,7 @@ in
         ${cfg.package}/bin/unclutter \
           --timeout ${toString cfg.timeout} \
           --jitter ${toString (cfg.threshold - 1)} \
-          ${lib.concatMapStrings (x: " --" + x) cfg.extraOptions} \
+          ${concatMapStrings (x: " --" + x) cfg.extraOptions} \
       '';
       serviceConfig.RestartSec = 3;
       serviceConfig.Restart = "always";
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 7da1f611373a..bb11c8639783 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.unclutter;
 
@@ -11,42 +14,42 @@ in
 {
   options.services.unclutter = {
 
-    enable = lib.mkOption {
+    enable = mkOption {
       description = "Enable unclutter to hide your mouse cursor when inactive";
-      type = lib.types.bool;
+      type = types.bool;
       default = false;
     };
 
-    package = lib.mkPackageOption pkgs "unclutter" { };
+    package = mkPackageOption pkgs "unclutter" { };
 
-    keystroke = lib.mkOption {
+    keystroke = mkOption {
       description = "Wait for a keystroke before hiding the cursor";
-      type = lib.types.bool;
+      type = types.bool;
       default = false;
     };
 
-    timeout = lib.mkOption {
+    timeout = mkOption {
       description = "Number of seconds before the cursor is marked inactive";
-      type = lib.types.int;
+      type = types.int;
       default = 1;
     };
 
-    threshold = lib.mkOption {
+    threshold = mkOption {
       description = "Minimum number of pixels considered cursor movement";
-      type = lib.types.int;
+      type = types.int;
       default = 1;
     };
 
-    excluded = lib.mkOption {
+    excluded = mkOption {
       description = "Names of windows where unclutter should not apply";
-      type = lib.types.listOf lib.types.str;
+      type = types.listOf types.str;
       default = [ ];
       example = [ "" ];
     };
 
-    extraOptions = lib.mkOption {
+    extraOptions = mkOption {
       description = "More arguments to pass to the unclutter command";
-      type = lib.types.listOf lib.types.str;
+      type = types.listOf types.str;
       default = [ ];
       example = [
         "noevent"
@@ -55,7 +58,7 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     systemd.user.services.unclutter = {
       description = "unclutter";
       wantedBy = [ "graphical-session.target" ];
@@ -64,9 +67,9 @@ in
         ${cfg.package}/bin/unclutter \
           -idle ${toString cfg.timeout} \
           -jitter ${toString (cfg.threshold - 1)} \
-          ${lib.optionalString cfg.keystroke "-keystroke"} \
-          ${lib.concatMapStrings (x: " -" + x) cfg.extraOptions} \
-          -not ${lib.concatStringsSep " " cfg.excluded} \
+          ${optionalString cfg.keystroke "-keystroke"} \
+          ${concatMapStrings (x: " -" + x) cfg.extraOptions} \
+          -not ${concatStringsSep " " cfg.excluded} \
       '';
       serviceConfig.PassEnvironment = "DISPLAY";
       serviceConfig.RestartSec = 3;
@@ -75,7 +78,7 @@ in
   };
 
   imports = [
-    (lib.mkRenamedOptionModule
+    (mkRenamedOptionModule
       [ "services" "unclutter" "threeshold" ]
       [ "services" "unclutter" "threshold" ]
     )
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index b015374bfd28..5f8212a3c9ce 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -4,14 +4,18 @@
   pkgs,
   ...
 }:
+
 # maintainer: siddharthist
+
+with lib;
+
 let
   cfg = config.services.urxvtd;
 in
 {
   options.services.urxvtd = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
+    enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run
@@ -19,10 +23,10 @@ in
       '';
     };
 
-    package = lib.mkPackageOption pkgs "rxvt-unicode" { };
+    package = mkPackageOption pkgs "rxvt-unicode" { };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     systemd.user.services.urxvtd = {
       description = "urxvt terminal daemon";
       wantedBy = [ "graphical-session.target" ];
diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix
index 0bafdfee3e7b..ce01fcb17a10 100644
--- a/nixos/modules/services/x11/window-managers/2bwm.nix
+++ b/nixos/modules/services/x11/window-managers/2bwm.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.windowManager."2bwm";
@@ -15,14 +18,14 @@ in
   ###### interface
 
   options = {
-    services.xserver.windowManager."2bwm".enable = lib.mkEnableOption "2bwm";
+    services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm";
   };
 
   ###### implementation
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
-    services.xserver.windowManager.session = lib.singleton {
+    services.xserver.windowManager.session = singleton {
       name = "2bwm";
       start = ''
         ${pkgs._2bwm}/bin/2bwm &
diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix
index 7ea546442d6f..d88be7db3757 100644
--- a/nixos/modules/services/x11/window-managers/afterstep.nix
+++ b/nixos/modules/services/x11/window-managers/afterstep.nix
@@ -4,18 +4,21 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.windowManager.afterstep;
 in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.afterstep.enable = lib.mkEnableOption "afterstep";
+    services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep";
   };
 
   ###### implementation
-  config = lib.mkIf cfg.enable {
-    services.xserver.windowManager.session = lib.singleton {
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
       name = "afterstep";
       start = ''
         ${pkgs.afterstep}/bin/afterstep &
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index ee9e0cbf816e..8b3d781c4c21 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.windowManager.awesome;
@@ -22,20 +25,20 @@ in
 
     services.xserver.windowManager.awesome = {
 
-      enable = lib.mkEnableOption "Awesome window manager";
+      enable = mkEnableOption "Awesome window manager";
 
-      luaModules = lib.mkOption {
+      luaModules = mkOption {
         default = [ ];
-        type = lib.types.listOf lib.types.package;
+        type = types.listOf types.package;
         description = "List of lua packages available for being used in the Awesome configuration.";
-        example = lib.literalExpression "[ pkgs.luaPackages.vicious ]";
+        example = literalExpression "[ pkgs.luaPackages.vicious ]";
       };
 
-      package = lib.mkPackageOption pkgs "awesome" { };
+      package = mkPackageOption pkgs "awesome" { };
 
-      noArgb = lib.mkOption {
+      noArgb = mkOption {
         default = false;
-        type = lib.types.bool;
+        type = types.bool;
         description = "Disable client transparency support, which can be greatly detrimental to performance in some setups";
       };
     };
@@ -44,9 +47,9 @@ in
 
   ###### implementation
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
-    services.xserver.windowManager.session = lib.singleton {
+    services.xserver.windowManager.session = singleton {
       name = "awesome";
       start = ''
         ${awesome}/bin/awesome ${lib.optionalString cfg.noArgb "--no-argb"} ${makeSearchPath cfg.luaModules} &
diff --git a/nixos/modules/services/x11/window-managers/berry.nix b/nixos/modules/services/x11/window-managers/berry.nix
index 8fdd4e0f79a8..ba094d0e3efc 100644
--- a/nixos/modules/services/x11/window-managers/berry.nix
+++ b/nixos/modules/services/x11/window-managers/berry.nix
@@ -4,18 +4,21 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.windowManager.berry;
 in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.berry.enable = lib.mkEnableOption "berry";
+    services.xserver.windowManager.berry.enable = mkEnableOption "berry";
   };
 
   ###### implementation
-  config = lib.mkIf cfg.enable {
-    services.xserver.windowManager.session = lib.singleton {
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
       name = "berry";
       start = ''
         ${pkgs.berry}/bin/berry &
diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 5a173da6b23b..46201036f05a 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.windowManager.bspwm;
 in
@@ -11,14 +14,14 @@ in
 {
   options = {
     services.xserver.windowManager.bspwm = {
-      enable = lib.mkEnableOption "bspwm";
+      enable = mkEnableOption "bspwm";
 
-      package = lib.mkPackageOption pkgs "bspwm" {
+      package = mkPackageOption pkgs "bspwm" {
         example = "bspwm-unstable";
       };
-      configFile = lib.mkOption {
-        type = with lib.types; nullOr path;
-        example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
+      configFile = mkOption {
+        type = with types; nullOr path;
+        example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
         default = null;
         description = ''
           Path to the bspwm configuration file.
@@ -27,12 +30,12 @@ in
       };
 
       sxhkd = {
-        package = lib.mkPackageOption pkgs "sxhkd" {
+        package = mkPackageOption pkgs "sxhkd" {
           example = "sxhkd-unstable";
         };
-        configFile = lib.mkOption {
-          type = with lib.types; nullOr path;
-          example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
+        configFile = mkOption {
+          type = with types; nullOr path;
+          example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
           default = null;
           description = ''
             Path to the sxhkd configuration file.
@@ -43,15 +46,15 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    services.xserver.windowManager.session = lib.singleton {
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
       name = "bspwm";
       start = ''
         export _JAVA_AWT_WM_NONREPARENTING=1
         SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${
-          lib.optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
+          optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
         } &
-        ${cfg.package}/bin/bspwm ${lib.optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
+        ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
         waitPID=$!
       '';
     };
@@ -59,17 +62,17 @@ in
   };
 
   imports = [
-    (lib.mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
+    (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
       "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm."
     )
-    (lib.mkRemovedOptionModule [
+    (mkRemovedOptionModule [
       "services"
       "xserver"
       "windowManager"
       "bspwm"
       "startThroughSession"
     ] "bspwm package does not provide bspwm-session anymore.")
-    (lib.mkRemovedOptionModule [
+    (mkRemovedOptionModule [
       "services"
       "xserver"
       "windowManager"
diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix
index 03eaf6e4911e..b50b60849495 100644
--- a/nixos/modules/services/x11/window-managers/clfswm.nix
+++ b/nixos/modules/services/x11/window-managers/clfswm.nix
@@ -4,6 +4,9 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.windowManager.clfswm;
 in
@@ -11,13 +14,13 @@ in
 {
   options = {
     services.xserver.windowManager.clfswm = {
-      enable = lib.mkEnableOption "clfswm";
-      package = lib.mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { };
+      enable = mkEnableOption "clfswm";
+      package = mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { };
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    services.xserver.windowManager.session = lib.singleton {
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
       name = "clfswm";
       start = ''
         ${cfg.package}/bin/clfswm &
diff --git a/nixos/modules/services/x11/window-managers/cwm.nix b/nixos/modules/services/x11/window-managers/cwm.nix
index 2f32cc4e7449..d2be487b0d4c 100644
--- a/nixos/modules/services/x11/window-managers/cwm.nix
+++ b/nixos/modules/services/x11/window-managers/cwm.nix
@@ -4,15 +4,18 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.windowManager.cwm;
 in
 {
   options = {
-    services.xserver.windowManager.cwm.enable = lib.mkEnableOption "cwm";
+    services.xserver.windowManager.cwm.enable = mkEnableOption "cwm";
   };
-  config = lib.mkIf cfg.enable {
-    services.xserver.windowManager.session = lib.singleton {
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
       name = "cwm";
       start = ''
         cwm &
diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix
index 1ee79a94016d..c81a834a0679 100644
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@@ -1,4 +1,7 @@
 { config, lib, pkgs, ... }:
+
+with lib;
+
 let
 
   cfg = config.services.xserver.windowManager.dwm;
@@ -11,8 +14,8 @@ in
 
   options = {
     services.xserver.windowManager.dwm = {
-      enable = lib.mkEnableOption "dwm";
-      package = lib.mkPackageOption pkgs "dwm" {
+      enable = mkEnableOption "dwm";
+      package = mkPackageOption pkgs "dwm" {
         example = ''
           pkgs.dwm.overrideAttrs (oldAttrs: rec {
             patches = [
@@ -30,9 +33,9 @@ in
 
   ###### implementation
 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
 
-    services.xserver.windowManager.session = lib.singleton
+    services.xserver.windowManager.session = singleton
       { name = "dwm";
         start =
           ''
diff --git a/nixos/modules/services/x11/window-managers/e16.nix b/nixos/modules/services/x11/window-managers/e16.nix
index e7f2f61f3885..b1ed3ea66417 100644
--- a/nixos/modules/services/x11/window-managers/e16.nix
+++ b/nixos/modules/services/x11/window-managers/e16.nix
@@ -4,18 +4,21 @@
   pkgs,
   ...
 }:
+
+with lib;
+
 let
   cfg = config.services.xserver.windowManager.e16;
 in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.e16.enable = lib.mkEnableOption "e16";
+    services.xserver.windowManager.e16.enable = mkEnableOption "e16";
   };
 
   ###### implementation
-  config = lib.mkIf cfg.enable {
-    services.xserver.windowManager.session = lib.singleton {
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
       name = "E16";
       start = ''
         ${pkgs.e16}/bin/e16 &

From 43d9c292916b4f8d21bfda5cedecba3aae07cd39 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 22:07:57 +0000
Subject: [PATCH 0887/1504] python312Packages.open-interpreter: fix build

add `tiktoken` to `pythonRelaxDeps`

> Checking runtime dependencies for open_interpreter-0.3.6-py3-none-any.whl
> - tiktoken<0.8.0,>=0.7.0 not satisfied by version 0.8.0
---
 pkgs/development/python-modules/open-interpreter/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix
index d771128a7903..dcd9ec37333c 100644
--- a/pkgs/development/python-modules/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@@ -53,6 +53,7 @@ buildPythonPackage rec {
     "google-generativeai"
     "psutil"
     "pynput"
+    "tiktoken"
     "yaspin"
   ];
 

From a49bc1e407c9e1270b685013669ccd839cbe7ff0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 22:19:02 +0000
Subject: [PATCH 0888/1504] python312Packages.json-repair: 0.32.0 -> 0.35.0

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

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index a99720cce80d..91cab6837f9b 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.32.0";
+  version = "0.35.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-js2XTplrRZyyVHztA3yGicdjfBFNoUTvjzT/U2NESWQ=";
+    hash = "sha256-39MxXX3bBYLmpaUpNYLWq+8Huoy0zQSyURQiZvXFaZc=";
   };
 
   build-system = [ setuptools ];

From 75679255a870dbec863c0cd76a521b4fe5b0f565 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 22:19:18 +0000
Subject: [PATCH 0889/1504] xzoom: fix gcc-14

include `unistd.h` to fix implicit function declaration errors
---
 pkgs/by-name/xz/xzoom/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xz/xzoom/package.nix b/pkgs/by-name/xz/xzoom/package.nix
index 6f456b8d8129..5cd13fc5a712 100644
--- a/pkgs/by-name/xz/xzoom/package.nix
+++ b/pkgs/by-name/xz/xzoom/package.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    sed -i 1i'#include <unistd.h>' xzoom.c
+  '';
+
   nativeBuildInputs = [
     imake
     gccmakedep

From 8d8d81c67eaf2d7f4ded9495332d72cf8cb00a2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 22:38:45 +0000
Subject: [PATCH 0890/1504] vue-language-server: 2.1.10 -> 2.2.0

---
 .../vu/vue-language-server/package-lock.json  | 291 +++++++++---------
 .../vu/vue-language-server/package.nix        |   6 +-
 2 files changed, 144 insertions(+), 153 deletions(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package-lock.json b/pkgs/by-name/vu/vue-language-server/package-lock.json
index 3eb6b2c4f3e7..023c31b920e5 100644
--- a/pkgs/by-name/vu/vue-language-server/package-lock.json
+++ b/pkgs/by-name/vu/vue-language-server/package-lock.json
@@ -1,20 +1,20 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.1.10",
+	"version": "2.2.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@vue/language-server",
-			"version": "2.1.10",
+			"version": "2.2.0",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "~2.4.8",
-				"@volar/language-server": "~2.4.8",
-				"@volar/test-utils": "~2.4.8",
-				"@vue/language-core": "2.1.10",
-				"@vue/language-service": "2.1.10",
-				"@vue/typescript-plugin": "2.1.10",
+				"@volar/language-core": "~2.4.11",
+				"@volar/language-server": "~2.4.11",
+				"@volar/test-utils": "~2.4.11",
+				"@vue/language-core": "2.2.0",
+				"@vue/language-service": "2.2.0",
+				"@vue/typescript-plugin": "2.2.0",
 				"vscode-languageserver-protocol": "^3.17.5",
 				"vscode-uri": "^3.0.8"
 			},
@@ -41,12 +41,12 @@
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.26.2",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
-			"integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+			"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
 			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.26.0"
+				"@babel/types": "^7.26.3"
 			},
 			"bin": {
 				"parser": "bin/babel-parser.js"
@@ -56,9 +56,9 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
-			"integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+			"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/helper-string-parser": "^7.25.9",
@@ -130,23 +130,23 @@
 			"license": "MIT"
 		},
 		"node_modules/@volar/language-core": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.10.tgz",
-			"integrity": "sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==",
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.11.tgz",
+			"integrity": "sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/source-map": "2.4.10"
+				"@volar/source-map": "2.4.11"
 			}
 		},
 		"node_modules/@volar/language-server": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.10.tgz",
-			"integrity": "sha512-odQsgrJh8hOXfxkSj/BSnpjThb2/KDhbxZnG/XAEx6E3QGDQv4hAOz9GWuKoNs0tkjgwphQGIwDMT1JYaTgRJw==",
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.11.tgz",
+			"integrity": "sha512-W9P8glH1M8LGREJ7yHRCANI5vOvTrRO15EMLdmh5WNF9sZYSEbQxiHKckZhvGIkbeR1WAlTl3ORTrJXUghjk7g==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "2.4.10",
-				"@volar/language-service": "2.4.10",
-				"@volar/typescript": "2.4.10",
+				"@volar/language-core": "2.4.11",
+				"@volar/language-service": "2.4.11",
+				"@volar/typescript": "2.4.11",
 				"path-browserify": "^1.0.1",
 				"request-light": "^0.7.0",
 				"vscode-languageserver": "^9.0.1",
@@ -156,42 +156,42 @@
 			}
 		},
 		"node_modules/@volar/language-service": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.10.tgz",
-			"integrity": "sha512-VxUiWS11rnRzakkqw5x1LPhsz+RBfD0CrrFarLGW2/voliYXEdCuSOM3r8JyNRvMvP4uwhD38ccAdTcULQEAIQ==",
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.11.tgz",
+			"integrity": "sha512-KIb6g8gjUkS2LzAJ9bJCLIjfsJjeRtmXlu7b2pDFGD3fNqdbC53cCAKzgWDs64xtQVKYBU13DLWbtSNFtGuMLQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "2.4.10",
+				"@volar/language-core": "2.4.11",
 				"vscode-languageserver-protocol": "^3.17.5",
 				"vscode-languageserver-textdocument": "^1.0.11",
 				"vscode-uri": "^3.0.8"
 			}
 		},
 		"node_modules/@volar/source-map": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.10.tgz",
-			"integrity": "sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==",
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.11.tgz",
+			"integrity": "sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==",
 			"license": "MIT"
 		},
 		"node_modules/@volar/test-utils": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.10.tgz",
-			"integrity": "sha512-YkjqH9FfkewtS7MKdLo74C9QVpk4ab+0NdBOOnWXd77EtkaxLpEvIgZ2IX7LIi+RvlW8ucXpsYNNSORnzhR6AA==",
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.11.tgz",
+			"integrity": "sha512-ogkLldPqFa/j9302Ns+nWeyTCQv8d4c7iN4t8ziq7j0XeMKWYsTAjLsx/9z0MTNrecBAcocgzEvCricASSq+Hw==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "2.4.10",
-				"@volar/language-server": "2.4.10",
+				"@volar/language-core": "2.4.11",
+				"@volar/language-server": "2.4.11",
 				"vscode-languageserver-textdocument": "^1.0.11",
 				"vscode-uri": "^3.0.8"
 			}
 		},
 		"node_modules/@volar/typescript": {
-			"version": "2.4.10",
-			"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.10.tgz",
-			"integrity": "sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==",
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.11.tgz",
+			"integrity": "sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "2.4.10",
+				"@volar/language-core": "2.4.11",
 				"path-browserify": "^1.0.1",
 				"vscode-uri": "^3.0.8"
 			}
@@ -249,16 +249,16 @@
 			}
 		},
 		"node_modules/@vue/language-core": {
-			"version": "2.1.10",
-			"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.10.tgz",
-			"integrity": "sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz",
+			"integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "~2.4.8",
+				"@volar/language-core": "~2.4.11",
 				"@vue/compiler-dom": "^3.5.0",
 				"@vue/compiler-vue2": "^2.7.16",
 				"@vue/shared": "^3.5.0",
-				"alien-signals": "^0.2.0",
+				"alien-signals": "^0.4.9",
 				"minimatch": "^9.0.3",
 				"muggle-string": "^0.4.1",
 				"path-browserify": "^1.0.1"
@@ -273,19 +273,19 @@
 			}
 		},
 		"node_modules/@vue/language-service": {
-			"version": "2.1.10",
-			"resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.1.10.tgz",
-			"integrity": "sha512-voNteQNU+mHUmyUEdHUpWZW5/kfLQxh1zHs98c5hw6XK6pNxJTghG/k4maka6y5WmfmMCKAsddBpD9kZ7lyAlg==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.2.0.tgz",
+			"integrity": "sha512-2SioOuCyocrVYSMOosHS2Lc4MeV1kwzEgPnd7A8lFUDNby8sjDd7UL1FCgiolygeletZh5Us7o8gvG9khiPygQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/language-core": "~2.4.8",
-				"@volar/language-service": "~2.4.8",
-				"@volar/typescript": "~2.4.8",
+				"@volar/language-core": "~2.4.11",
+				"@volar/language-service": "~2.4.11",
+				"@volar/typescript": "~2.4.11",
 				"@vue/compiler-dom": "^3.5.0",
-				"@vue/language-core": "2.1.10",
+				"@vue/language-core": "2.2.0",
 				"@vue/shared": "^3.5.0",
-				"@vue/typescript-plugin": "2.1.10",
-				"alien-signals": "^0.2.0",
+				"@vue/typescript-plugin": "2.2.0",
+				"alien-signals": "^0.4.9",
 				"path-browserify": "^1.0.1",
 				"volar-service-css": "0.0.62",
 				"volar-service-emmet": "0.0.62",
@@ -307,13 +307,13 @@
 			"license": "MIT"
 		},
 		"node_modules/@vue/typescript-plugin": {
-			"version": "2.1.10",
-			"resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.1.10.tgz",
-			"integrity": "sha512-NrS3BB3l5vuZHU4Vp8l9TbT5pC7VjBfwZKqc24dAXF3Z+dJyGs4mcC3zo59gUggLMQSah8mdXj8xqEfMkrps8w==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.2.0.tgz",
+			"integrity": "sha512-7okpTvJ8blQApgUtfPvkO1tOkxxWt8oScXwsjQRB46QAgZ/0LwWpWG0yB8mvBLkw4mZpSXsp6e3ntnUwRagURA==",
 			"license": "MIT",
 			"dependencies": {
-				"@volar/typescript": "~2.4.8",
-				"@vue/language-core": "2.1.10",
+				"@volar/typescript": "~2.4.11",
+				"@vue/language-core": "2.2.0",
 				"@vue/shared": "^3.5.0"
 			}
 		},
@@ -330,9 +330,9 @@
 			}
 		},
 		"node_modules/alien-signals": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.2.2.tgz",
-			"integrity": "sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==",
+			"version": "0.4.12",
+			"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.12.tgz",
+			"integrity": "sha512-Og0PgAihxlp1R22bsoBsyhhMG4+qhU+fkkLPoGBQkYVc3qt9rYnrwYTf+M6kqUqUZpf3rXDnpL90iKa0QcSVVg==",
 			"license": "MIT"
 		},
 		"node_modules/balanced-match": {
@@ -350,17 +350,27 @@
 				"balanced-match": "^1.0.0"
 			}
 		},
-		"node_modules/call-bind": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+		"node_modules/call-bind-apply-helpers": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+			"integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
 			"license": "MIT",
 			"dependencies": {
-				"es-define-property": "^1.0.0",
 				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2",
-				"get-intrinsic": "^1.2.4",
-				"set-function-length": "^1.2.1"
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/call-bound": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+			"integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"get-intrinsic": "^1.2.6"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -384,21 +394,18 @@
 			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
 			"license": "MIT"
 		},
-		"node_modules/define-data-property": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+		"node_modules/dunder-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
 			"license": "MIT",
 			"dependencies": {
-				"es-define-property": "^1.0.0",
+				"call-bind-apply-helpers": "^1.0.1",
 				"es-errors": "^1.3.0",
-				"gopd": "^1.0.1"
+				"gopd": "^1.2.0"
 			},
 			"engines": {
 				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/emmet": {
@@ -430,13 +437,10 @@
 			}
 		},
 		"node_modules/es-define-property": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
 			"license": "MIT",
-			"dependencies": {
-				"get-intrinsic": "^1.2.4"
-			},
 			"engines": {
 				"node": ">= 0.4"
 			}
@@ -450,6 +454,18 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/es-object-atoms": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+			"integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/estree-walker": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -466,16 +482,21 @@
 			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
+			"integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
 			"license": "MIT",
 			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"dunder-proto": "^1.0.0",
+				"es-define-property": "^1.0.1",
 				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.0.0",
 				"function-bind": "^1.1.2",
-				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3",
-				"hasown": "^2.0.0"
+				"gopd": "^1.2.0",
+				"has-symbols": "^1.1.0",
+				"hasown": "^2.0.2",
+				"math-intrinsics": "^1.0.0"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -485,33 +506,9 @@
 			}
 		},
 		"node_modules/gopd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-			"license": "MIT",
-			"dependencies": {
-				"get-intrinsic": "^1.1.3"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/has-property-descriptors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-			"license": "MIT",
-			"dependencies": {
-				"es-define-property": "^1.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/has-proto": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-			"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -521,9 +518,9 @@
 			}
 		},
 		"node_modules/has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
@@ -579,13 +576,15 @@
 			}
 		},
 		"node_modules/is-regex": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+			"integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
 			"license": "MIT",
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
+				"call-bound": "^1.0.2",
+				"gopd": "^1.2.0",
+				"has-tostringtag": "^1.0.2",
+				"hasown": "^2.0.2"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -600,6 +599,15 @@
 			"integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
 			"license": "MIT"
 		},
+		"node_modules/math-intrinsics": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/minimatch": {
 			"version": "9.0.5",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -681,23 +689,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/set-function-length": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-			"license": "MIT",
-			"dependencies": {
-				"define-data-property": "^1.1.4",
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2",
-				"get-intrinsic": "^1.2.4",
-				"gopd": "^1.0.1",
-				"has-property-descriptors": "^1.0.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/source-map-js": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -870,9 +861,9 @@
 			}
 		},
 		"node_modules/vscode-css-languageservice": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz",
-			"integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==",
+			"version": "6.3.2",
+			"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz",
+			"integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==",
 			"license": "MIT",
 			"dependencies": {
 				"@vscode/l10n": "^0.0.18",
@@ -894,9 +885,9 @@
 			}
 		},
 		"node_modules/vscode-json-languageservice": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.1.tgz",
-			"integrity": "sha512-5czFGNyVPxz3ZJYl8R3a3SuIj5gjhmGF4Wv05MRPvD4DEnHK6b8km4VbNMJNHBlTCh7A0aHzUbPVzo+0C18mCA==",
+			"version": "5.4.2",
+			"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.2.tgz",
+			"integrity": "sha512-2qujUseKRbLEwLXvEOFAxaz3y1ssdNCXXi95LRdG8AFchJHSnmI2qCg9ixoYxbJtSehIrXOmkhV87Y9lIivOgQ==",
 			"license": "MIT",
 			"dependencies": {
 				"@vscode/l10n": "^0.0.18",
diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index e06cee3f7df4..a2d7ae4c71e0 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "vue-language-server";
-  version = "2.1.10";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz";
-    hash = "sha256-xf8EzFGNelC0ebW2jYUBWBZ/tYUHMenv1WlGbpvIVhY=";
+    hash = "sha256-foWKEhK8YE4ZsbejJUKKPNR+G7ZrJWIPEk/1PVe6YRo=";
   };
 
-  npmDepsHash = "sha256-mbHNdTe2OUu64rZ9/8MWmiSG8RxNcjduT2Wm6znS830=";
+  npmDepsHash = "sha256-4wpVJt6C4Yt53NWWq3MZLtzX+Spf3by4bM6hjmF2y6A=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From abcad3a1a6b7e0bb43a580820f3918303ea48236 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 22:41:13 +0000
Subject: [PATCH 0891/1504] remnote: 1.18.19 -> 1.18.26

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index b63a6c93bfae..b2f4e3843252 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.18.19";
+  version = "1.18.26";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-J7bghty2F54pdd/maWMWtG1kDm/sETgY1bR/jMy23e4=";
+    hash = "sha256-G7I2r/jZ3Ht8Is2TagNnyQolasfLlO57qzGcVT4QvkI=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From 4e6e0aec9561b6403560c9c4e7c306ca44c5cfca Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Mon, 30 Dec 2024 12:06:44 +0300
Subject: [PATCH 0892/1504] libserdes: fix build with avro-cpp 1.12.0

Some finagling is required to make the configure scripts cooperate with the required
bump to the minimum C++ standard version. avro-cpp needs at least C++17, but libserdes
is stuck at C++11.
---
 pkgs/by-name/li/libserdes/package.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index 5a8cc69e0016..f42ff147381e 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   perl,
   which,
-  boost,
   rdkafka,
   jansson,
   curl,
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    boost
     rdkafka
     jansson
     curl
@@ -43,10 +41,26 @@ stdenv.mkDerivation rec {
     avro-cpp
   ];
 
-  makeFlags = [ "GEN_PKG_CONFIG=y" ];
+  configureFlags = [
+    # avro-cpp public headers use at least C++17 features, but libserdes configure scripts
+    # basically cap it at C++11. It's really unfortunate that we have to patch the configure scripts for this,
+    # but this seems to be the most sensible way.
+    # - NIX_CFLAGS_COMPILE - fails because of -Werror in compiler checks since --std=... has no effect for C compilers.
+    # - CXXFLAGS without patching configure.self does nothing, because --std=c++11 is appended to the final flags, overriding
+    #   everything specified manually.
+    "--CXXFLAGS=${toString [ "--std=c++17" ]}"
+  ];
+
+  makeFlags = [
+    "GEN_PKG_CONFIG=y"
+  ];
 
   postPatch = ''
     patchShebangs configure lds-gen.pl
+    # Don't append the standard to CXXFLAGS, since we want to set it higher for avro-cpp.
+    substituteInPlace configure.self --replace-fail \
+      'mkl_mkvar_append CXXFLAGS CXXFLAGS "--std=c++11"' \
+      ":" # Do nothing, we set the standard ourselves.
   '';
 
   # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh:

From cb2ded517d19254284358616b079075f922170ad Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Wed, 1 Jan 2025 02:10:39 +0300
Subject: [PATCH 0893/1504] typos: 0.28.4 -> 0.29.0

---
 pkgs/by-name/ty/typos/package.nix | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 47b1df5a651d..7cfcb113aa68 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -2,40 +2,39 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  testers,
+  versionCheckHook,
   nix-update-script,
-  typos,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.28.4";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-rE1JK6bG8yNItzsXEggTqKFuIwlFLDnIlNBUCjb9XOg=";
+    repo = "typos";
+    tag = "v${version}";
+    hash = "sha256-UNm5mQYkB9tiNpmXfxBNLyJDd+nwccflCdJEPaYzHWw=";
   };
 
-  cargoHash = "sha256-DQWOAlVKtB0l0qaHCgsrUl239PcKDnic3kdKoSgOjik=";
+  cargoHash = "sha256-CcRzPlkUqAZ2y+klRtLy+uGbMSpnr724rkcAkOzPHY4=";
 
-  passthru = {
-    tests.version = testers.testVersion { package = typos; };
+  passthru.updateScript = nix-update-script { };
 
-    updateScript = nix-update-script { };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
 
-  meta = with lib; {
+  meta = {
     description = "Source code spell checker";
     mainProgram = "typos";
     homepage = "https://github.com/crate-ci/typos";
-    changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
+    changelog = "https://github.com/crate-ci/typos/blob/v${version}/CHANGELOG.md";
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       mgttlinger
     ];

From 4371757a3926361555e28a061d49c20279f04682 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:26:19 +0100
Subject: [PATCH 0894/1504] xml2rfc: drop support for python 3.8

---
 pkgs/development/python-modules/xml2rfc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index e191168c382e..2e790406baf7 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   version = "3.25.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "ietf-tools";

From b22d47a1b878c611e2efcac41b7fa09b93513e45 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 31 Dec 2024 18:31:16 -0500
Subject: [PATCH 0895/1504] earlyoom: use upstream systemd service and add
 release note

---
 .../manual/release-notes/rl-2505.section.md   |  5 +++
 nixos/modules/services/system/earlyoom.nix    | 45 ++++++++++++-------
 pkgs/by-name/ea/earlyoom/package.nix          | 41 +++++++++--------
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index c9e5123743be..ba8317e9c660 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -127,6 +127,11 @@
 
 - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
 
+- The `earlyoom` service is now using upstream systemd service, which enables
+  hardening and filesystem isolation by default. If you need filesystem write
+  access or want to access home directory via `killHook`, hardening setting can
+  be changed via, e.g. `systemd.services.earlyoom.serviceConfig.ProtectSystem`.
+
 - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
 
 - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index 7e012dee02cb..adf754c6abd6 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -115,6 +115,11 @@ in
         [README](https://github.com/rfjakob/earlyoom#notifications) and
         [the man page](https://github.com/rfjakob/earlyoom/blob/master/MANPAGE.md#-n-pathtoscript)
         for details.
+
+        WARNING: earlyoom is running in a sandbox with ProtectSystem="strict"
+        by default, so filesystem write is also prohibited for the hook.
+        If you want to change these protection rules, override the systemd
+        service via `systemd.services.earlyoom.serviceConfig.ProtectSystem`.
       '';
     };
 
@@ -149,25 +154,33 @@ in
   config = mkIf cfg.enable {
     services.systembus-notify.enable = mkDefault cfg.enableNotifications;
 
+    systemd.packages = [ cfg.package ];
+
     systemd.services.earlyoom = {
-      description = "Early OOM Daemon for Linux";
+      overrideStrategy = "asDropin";
+
       wantedBy = [ "multi-user.target" ];
       path = optionals cfg.enableNotifications [ pkgs.dbus ];
-      serviceConfig = {
-        StandardError = "journal";
-        ExecStart = concatStringsSep " " ([
-          "${lib.getExe cfg.package}"
-          ("-m ${toString cfg.freeMemThreshold}"
-           + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}")
-          ("-s ${toString cfg.freeSwapThreshold}"
-           + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}")
-          "-r ${toString cfg.reportInterval}"
-        ]
-        ++ optionals cfg.enableDebugInfo [ "-d" ]
-        ++ optionals cfg.enableNotifications [ "-n" ]
-        ++ optionals (cfg.killHook != null) [ "-N ${escapeShellArg cfg.killHook}" ]
-        ++ cfg.extraArgs);
-      };
+
+      # We setup `EARLYOOM_ARGS` via drop-ins, so disable the default import
+      # from /etc/default/earlyoom.
+      serviceConfig.EnvironmentFile = "";
+
+      environment.EARLYOOM_ARGS =
+        lib.cli.toGNUCommandLineShell { } {
+          m =
+            "${toString cfg.freeMemThreshold}"
+            + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}";
+          s =
+            "${toString cfg.freeSwapThreshold}"
+            + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}";
+          r = "${toString cfg.reportInterval}";
+          d = cfg.enableDebugInfo;
+          n = cfg.enableNotifications;
+          N = if cfg.killHook != null then cfg.killHook else null;
+        }
+        + " "
+        + lib.escapeShellArgs cfg.extraArgs;
     };
   };
 }
diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix
index fead6ff586e0..ed3f0006b466 100644
--- a/pkgs/by-name/ea/earlyoom/package.nix
+++ b/pkgs/by-name/ea/earlyoom/package.nix
@@ -1,11 +1,13 @@
 {
   lib,
   fetchFromGitHub,
-  installShellFiles,
   pandoc,
   stdenv,
   nixosTests,
-  # Boolean flags
+  fetchpatch,
+  # The man page requires pandoc to build and resides in a separate "man"
+  # output which is pulled in on-demand. There is no need to disabled it unless
+  # pandoc is hard to build on your platform.
   withManpage ? true,
 }:
 
@@ -22,25 +24,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ];
 
-  patches = [ ./0000-fix-dbus-path.patch ];
-
-  nativeBuildInputs = lib.optionals withManpage [
-    installShellFiles
-    pandoc
+  patches = [
+    ./0000-fix-dbus-path.patch
+    # Respect `MANDIR`.
+    (fetchpatch {
+      url = "https://github.com/rfjakob/earlyoom/commit/c5a1799a5ff4b3fd3132d50a510e8c126933cf4a.patch";
+      hash = "sha256-64AkpTMmjiqZ6Byq6687zNIqrQ/IGRGgzzjyyAfcg14=";
+    })
+    # Correctly handle `PREFIX` as a default rather than always-concatenate.
+    (fetchpatch {
+      url = "https://github.com/rfjakob/earlyoom/commit/f7d6f1cc925962fbdcf57b1c2aeeabbf11e2d542.patch";
+      hash = "sha256-DJDeQzcEGJMoMGIi1D/ogMaKG1VQvPZN9jXtUDGjyjk=";
+    })
   ];
 
+  nativeBuildInputs = lib.optionals withManpage [ pandoc ];
+
   makeFlags = [
     "VERSION=${finalAttrs.version}"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -D earlyoom $out/bin/earlyoom
-  '' + lib.optionalString withManpage ''
-    installManPage earlyoom.1
-  '' + ''
-    runHook postInstall
-  '';
+    "PREFIX=${placeholder "out"}"
+  ] ++ lib.optional withManpage "MANDIR=${placeholder "man"}/share/man";
 
   passthru.tests = {
     inherit (nixosTests) earlyoom;
@@ -58,7 +61,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.mit;
     mainProgram = "earlyoom";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      oxalica
+    ];
     platforms = lib.platforms.linux;
   };
 })

From 6ed1504739c59ed02320c3a7b7a2dd4a356393fe Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Thu, 1 Aug 2024 14:30:27 -0400
Subject: [PATCH 0896/1504] nixosTests.earlyoom: add a proper OOM test

---
 nixos/tests/earlyoom.nix | 55 ++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/nixos/tests/earlyoom.nix b/nixos/tests/earlyoom.nix
index b7850ddeaaab..259fb5aa5d44 100644
--- a/nixos/tests/earlyoom.nix
+++ b/nixos/tests/earlyoom.nix
@@ -1,16 +1,43 @@
-import ./make-test-python.nix ({ lib, ... }: {
-  name = "earlyoom";
-  meta = {
-    maintainers = with lib.maintainers; [ ncfavier AndersonTorres ];
-  };
-
-  machine = {
-    services.earlyoom = {
-      enable = true;
+import ./make-test-python.nix (
+  { lib, ... }:
+  {
+    name = "earlyoom";
+    meta = {
+      maintainers = with lib.maintainers; [
+        ncfavier
+        AndersonTorres
+        oxalica
+      ];
     };
-  };
 
-  testScript = ''
-    machine.wait_for_unit("earlyoom.service")
-  '';
-})
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        # Limit VM resource usage.
+        virtualisation.memorySize = 1024;
+
+        services.earlyoom = {
+          enable = true;
+          # Use SIGKILL, or `tail` will catch SIGTERM and exit successfully.
+          freeMemKillThreshold = 90;
+        };
+
+        systemd.services.testbloat = {
+          description = "Create a lot of memory pressure";
+          serviceConfig = {
+            ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero";
+          };
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("earlyoom.service")
+
+      with subtest("earlyoom should kill the bad service"):
+          machine.fail("systemctl start --wait testbloat.service")
+          assert machine.get_unit_info("testbloat.service")["Result"] == "signal"
+          output = machine.succeed('journalctl -u earlyoom.service -b0')
+          assert 'low memory! at or below SIGKILL limits' in output
+    '';
+  }
+)

From acc2ec20ed3cacd5cd62966340d62c9e68188234 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 31 Dec 2024 18:33:18 -0500
Subject: [PATCH 0897/1504] nixos/earlyoom: format and remove dead code

---
 nixos/modules/services/system/earlyoom.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index adf754c6abd6..616dea3eb236 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -1,11 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.services.earlyoom;
 
   inherit (lib)
-    concatStringsSep
-    escapeShellArg
     literalExpression
     mkDefault
     mkEnableOption
@@ -15,7 +18,8 @@ let
     mkRemovedOptionModule
     optionalString
     optionals
-    types;
+    types
+    ;
 in
 {
   meta = {
@@ -132,8 +136,11 @@ in
 
     extraArgs = mkOption {
       type = types.listOf types.str;
-      default = [];
-      example = [ "-g" "--prefer '(^|/)(java|chromium)$'" ];
+      default = [ ];
+      example = [
+        "-g"
+        "--prefer '(^|/)(java|chromium)$'"
+      ];
       description = "Extra command-line arguments to be passed to earlyoom.";
     };
   };

From 86e0d389a86d64d2d52230f72542ce51aa5e79be Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:35:37 +0100
Subject: [PATCH 0898/1504] python312Packages.mkdocs-git-authors-plugin: drop
 support for python 3.7

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 .../python-modules/mkdocs-git-authors-plugin/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix
index 3d9997d25a20..5b249d65626e 100644
--- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   version = "0.9.2";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "timvink";

From 40cac3319a35ad3b2b99c5c11dabc12dc4e72b8a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 01:09:36 +0100
Subject: [PATCH 0899/1504] xnee: fix build

---
 pkgs/by-name/xn/xnee/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/xn/xnee/package.nix b/pkgs/by-name/xn/xnee/package.nix
index 0ff40d245763..adccf198f2ac 100644
--- a/pkgs/by-name/xn/xnee/package.nix
+++ b/pkgs/by-name/xn/xnee/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
+  fetchDebianPatch,
   autoreconfHook,
   pkg-config,
   gtk2,
@@ -31,6 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://savannah.gnu.org/bugs/download.php?file_id=49534";
       hash = "sha256-Ar5SyVIEp8/knDHm+4f0KWAH+A5gGhXGezEqL7xkQhI=";
     })
+    (fetchDebianPatch {
+      inherit (finalAttrs) pname version;
+      debianRevision = "9.2";
+      patch = "fix-implicit-declarations.patch";
+      hash = "sha256-ct/ATuiC6b7rw9n2wsRNKvfj02i7V20bMOzL7pKDd0A=";
+    })
   ];
 
   postPatch =

From 116cb26e3cce7ebce200a0caca8b9094acf7bcff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 15:43:34 +0000
Subject: [PATCH 0900/1504] python312Packages.aiohttp-socks: 0.9.0 -> 0.10.1

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

diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index a742c77d1504..0b2539fa9b28 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   aiohttp,
-  attrs,
   buildPythonPackage,
   fetchPypi,
   python-socks,
@@ -11,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-socks";
-  version = "0.9.0";
+  version = "0.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,14 +18,13 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "aiohttp_socks";
-    hash = "sha256-IhWaGvAmsinP5eoAfgZbs/5WOFqVGoJiOm9FiKZ1gAM=";
+    hash = "sha256-SfLh+AUfKIVxm+sbd+MStaJ8Pktg8LBFo4jxlNmV4Gg=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     aiohttp
-    attrs
     python-socks
   ] ++ python-socks.optional-dependencies.asyncio;
 

From 77bbdc2faa04a9b2f44d18c932b8eb32f56b9137 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 00:36:11 +0000
Subject: [PATCH 0901/1504] calamares-nixos: 3.3.12 -> 3.3.13

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

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 78458fa43b71..73c779d9fe33 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "calamares";
-  version = "3.3.12";
+  version = "3.3.13";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz";
-    sha256 = "sha256-TelcQ0Mm8+5oNIDqvGqb4j7L4BIPme987IMWdLEvMKM=";
+    sha256 = "sha256-5Jz32JTgK6BImM0HcMtXi04k39CAirdmC/lbskVmSNQ=";
   };
 
   # On major changes, or when otherwise required, you *must* :

From 5ded9ec756434c4b04758c2b34bfc9d276b8b865 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 02:43:11 +0000
Subject: [PATCH 0902/1504] python312Packages.returns: 0.23.0 -> 0.24.0

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

diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix
index 27fa225ba7d0..5745751eacde 100644
--- a/pkgs/development/python-modules/returns/default.nix
+++ b/pkgs/development/python-modules/returns/default.nix
@@ -18,16 +18,16 @@
 
 buildPythonPackage rec {
   pname = "returns";
-  version = "0.23.0";
-  format = "pyproject";
+  version = "0.24.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "dry-python";
     repo = "returns";
-    rev = "refs/tags/${version}";
-    hash = "sha256-4ZP/wvPgqQQec/BaXuL9r7BEc2G+LztMdFul0NeEJTc=";
+    tag = version;
+    hash = "sha256-qmBxW1XxUlFpAqf2t2ix01TN5NSxOtnYqLyE5ovZU58=";
   };
 
   postPatch = ''

From 6acee62a3d4e613dde37546ee961c250754db98c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 1 Jan 2025 01:00:53 +0000
Subject: [PATCH 0903/1504] omnisharp-roslyn: 1.39.12 -> 1.39.13

Diff:
https://github.com/OmniSharp/omnisharp-roslyn/compare/v1.39.12...v1.39.13

Changelog:
https://github.com/OmniSharp/omnisharp-roslyn/blob/v1.39.13/CHANGELOG.md
---
 pkgs/by-name/om/omnisharp-roslyn/deps.json   | 171 ++++++++++---------
 pkgs/by-name/om/omnisharp-roslyn/package.nix |  91 +++++-----
 2 files changed, 140 insertions(+), 122 deletions(-)

diff --git a/pkgs/by-name/om/omnisharp-roslyn/deps.json b/pkgs/by-name/om/omnisharp-roslyn/deps.json
index 1d269b684214..f77201713588 100644
--- a/pkgs/by-name/om/omnisharp-roslyn/deps.json
+++ b/pkgs/by-name/om/omnisharp-roslyn/deps.json
@@ -1,18 +1,18 @@
 [
   {
     "pname": "Cake.Scripting.Abstractions",
-    "version": "0.15.0",
-    "hash": "sha256-g/94sPb+uLZWEK83pFq/w924q1iBuJftoJkZ/UlJAVo="
+    "version": "0.16.0",
+    "hash": "sha256-oATZ5EcHQFQNy4BOAaDmtIybP3PlzphD4L2ojEz061k="
   },
   {
     "pname": "Cake.Scripting.Transport",
-    "version": "0.15.0",
-    "hash": "sha256-VY1Lw6cy6k8KOP7A2GLm2V+KuVJ43QrbilEzrZqy9Hc="
+    "version": "0.16.0",
+    "hash": "sha256-JS9CZdwv64g99XLTb5RavKtvMQNooSZOCNLKgKWWNb8="
   },
   {
     "pname": "Cake.Tool",
-    "version": "3.0.0",
-    "hash": "sha256-Z5hkinAqOaWCfMUIaaDfY0uTN1ot71Q1IC1A+xpmSj4="
+    "version": "4.2.0",
+    "hash": "sha256-YWF+MCsMyMa+DBblh+998lorErO7RLqdl9CiCU8bbnE="
   },
   {
     "pname": "Dotnet.Script.DependencyModel",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.4",
-    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
   },
   {
     "pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
@@ -96,33 +96,33 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-UQ0tDpF+OxAgRXIPiJuT7z01Weqn2bLo+kIwkdcMaXs=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.12.0-1.24358.3/microsoft.codeanalysis.common.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-VSPRpTzEXnTNQAxXDOOi6YVS2C6/S2zTKgQR4aNkxME=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.13.0-3.24620.4/microsoft.codeanalysis.common.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-OuB9qEQLc64Ido++o3mAZUZ6IvuB8rTzOf663k/0Kcc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-YGxCN8J3BjSZ9hXYQF0nCL3Welv3UVASeSTkwwFPchc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Features",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-PNPdyFwwsReDd1QC1KmnGrXVMYNPghIShI7il3UEcrA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.features.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-qpNsw5OtTAQFnN6g6tIh6+nsr+zc+/Na+oETR/GWxeM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.features.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-titifcvaYU0rc9ZoEoitT2Wbw/CDRYr7bRm1ecSLDU0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.scripting.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-1D+TjiljZQQJEYIzhdLAbLq8DIvW30vgSDYnDlPoGoU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.scripting.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-9CROWJt789h964idgJ/qqu+rAQkygcwtE2ngyeL/bhE=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.workspaces.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-NT7yDEq4fW8c71xHC3YPsP5vl8AZ9PdKASzxROwhccs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.13.0-3.24620.4/microsoft.codeanalysis.csharp.workspaces.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Elfie",
@@ -131,39 +131,39 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-0kv2XunbYQsbusmRl2WchiskolxwZWThx80ZUzcw3c8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-91ZFqiu4MlteCir6p7YrOtbUMuRNIpNr6jX5qLdmZgM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.aspnetcore.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-gLIJA1zaq4RbRCDhALlIwUBasRbekjFiuLCNyQckegA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-o2+DeY/p5AxMkMnYIiNMyMtrAnazzgfC6cVY8lImz4E=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.omnisharp.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-aXwLNsh6Gmd98rLZ1fWjpNaCCg7TYv70Qc7dRccNk/U=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-LfIgqc7lDoyxbOsGmF4Ji488iXaT1f2ecjZz1662WlM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.13.0-3.24620.4/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Features",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-TCl/MzgHNUBUU56MVSGeOlCUMSTeS8cG5iZkZ/E9ElY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.12.0-1.24358.3/microsoft.codeanalysis.features.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-ITkMz+1b9Q9I5UZk4N5+qKD7FPTBMohLDOqx3e2hShI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.13.0-3.24620.4/microsoft.codeanalysis.features.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-qvmZdcshzsXJLdWev3QyQscNeliEqzOGE3q7L/hR67w=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.12.0-1.24358.3/microsoft.codeanalysis.scripting.common.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-9Pch1BIrhsEwoI3ahgQM4BQBhw1wH9d8X9WB6deM3Sk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.13.0-3.24620.4/microsoft.codeanalysis.scripting.common.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "4.12.0-1.24358.3",
-    "hash": "sha256-9SQ1nAfJsDswOfASVSZ2iV7GoXcsRmNhVcr+Dv266zk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.12.0-1.24358.3/microsoft.codeanalysis.workspaces.common.4.12.0-1.24358.3.nupkg"
+    "version": "4.13.0-3.24620.4",
+    "hash": "sha256-Ex39ayopBTApxMCjevqn1qVFgjEvbst9sf7twW6+osI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.13.0-3.24620.4/microsoft.codeanalysis.workspaces.common.4.13.0-3.24620.4.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -187,8 +187,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "8.0.0",
-    "hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="
+    "version": "8.0.1",
+    "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -235,6 +235,11 @@
     "version": "8.0.0",
     "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
   },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+  },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
     "version": "8.0.0",
@@ -262,13 +267,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "7.0.1",
-    "hash": "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+    "version": "8.0.2",
+    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
@@ -282,8 +287,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.0",
-    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+    "version": "8.0.2",
+    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
@@ -387,57 +392,57 @@
   },
   {
     "pname": "NuGet.Common",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-S0K+RiSHJFzx+qbTJ7KY1Mh/L9hDJfL/F1YjzlhP3ao=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.11.0-rc.110/nuget.common.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-SeN5m2Wuwux9kO+S5qX6bvvYUA22BOZDz6rg2Gk0vQc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.13.0-rc.95/nuget.common.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.Configuration",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-NJzuKWDMUAn8aLt/aB4xht65a9CCnwY0IfnHfFHd/p4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.11.0-rc.110/nuget.configuration.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-vrqUvp0Nse6zITKySrVgnPpkl2+ic8f0d/veYrUeRzM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.13.0-rc.95/nuget.configuration.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.DependencyResolver.Core",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-12oRGUo4L7TslA6iV3OoMayG/t3ToOJ4fdGFh2U8Rxo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.11.0-rc.110/nuget.dependencyresolver.core.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-ttllWdeTVn3JJECrqfCy9lVZKX7DQbgxjKMIBZH3GoI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.13.0-rc.95/nuget.dependencyresolver.core.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.Frameworks",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-FmvFhdCJ/xH92tr+7uMNdimcpFxyW7Y/roPcS0TJX3g=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.11.0-rc.110/nuget.frameworks.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-Dq1YxucNDbrO8L2l8uV1SEOKuL4oVhUjlDeRLrg82Wo=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.13.0-rc.95/nuget.frameworks.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.LibraryModel",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-PYiEmV44XWUCK7Wahs8ZQ8GHcL4yO+fT+Y1OQHna68E=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.11.0-rc.110/nuget.librarymodel.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-zuiuiT6NprcW/UEhndi6vO4J3ONeIGkmRMjkDqdf4QQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.13.0-rc.95/nuget.librarymodel.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.Packaging",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-pnGx4JWJ02X18Qko5TX1DTbbbQj1msdKb0Lrphzyjps=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.11.0-rc.110/nuget.packaging.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-gK0UtXawa2HtdYyug/vTihrj4ZLqCJ8w516kj9Gmq40=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.13.0-rc.95/nuget.packaging.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.ProjectModel",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-xE1Us1qn3qAbLS/1rdZMWfl5tEO5pCQGp+P+VUrLBOQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.11.0-rc.110/nuget.projectmodel.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-Y+3CNqRfoCTzVYgVpJ8Q2kIQcZIbdfit6uVOuqFaMy0=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.13.0-rc.95/nuget.projectmodel.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.Protocol",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-XS8HsEDPoEjBNbfdo1c+PHB6BUOs8IpdfXvkmDsSZD4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.11.0-rc.110/nuget.protocol.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-HyzaY1PmpPGG6J8g+BYdS1ETYZMwahEu7OiyWyjXzu4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.13.0-rc.95/nuget.protocol.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "NuGet.Versioning",
-    "version": "6.11.0-rc.110",
-    "hash": "sha256-eyhOSwBFquzExUis+zGgP5gCO/nVSY5IzXcWeeVz/Ww=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.11.0-rc.110/nuget.versioning.6.11.0-rc.110.nupkg"
+    "version": "6.13.0-rc.95",
+    "hash": "sha256-2em8SYwrFR7wDjBpoSDs3Gfdz7w90IUs8vnGCnxcgF8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.13.0-rc.95/nuget.versioning.6.13.0-rc.95.nupkg"
   },
   {
     "pname": "OmniSharp.Extensions.JsonRpc",
@@ -559,6 +564,11 @@
     "version": "8.0.0",
     "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
   },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "8.0.1",
+    "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
+  },
   {
     "pname": "System.Diagnostics.EventLog",
     "version": "8.0.0",
@@ -574,6 +584,11 @@
     "version": "6.0.0",
     "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
   },
+  {
+    "pname": "System.Formats.Asn1",
+    "version": "8.0.1",
+    "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
+  },
   {
     "pname": "System.IO.Pipelines",
     "version": "7.0.0",
@@ -701,8 +716,8 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.4",
-    "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="
+    "version": "8.0.5",
+    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
   },
   {
     "pname": "System.Threading.Channels",
diff --git a/pkgs/by-name/om/omnisharp-roslyn/package.nix b/pkgs/by-name/om/omnisharp-roslyn/package.nix
index bc90c5d4b4fa..d551a1ddf49c 100644
--- a/pkgs/by-name/om/omnisharp-roslyn/package.nix
+++ b/pkgs/by-name/om/omnisharp-roslyn/package.nix
@@ -1,8 +1,8 @@
 {
-  buildDotnetModule,
-  dotnetCorePackages,
-  fetchFromGitHub,
   lib,
+  dotnetCorePackages,
+  buildDotnetModule,
+  fetchFromGitHub,
   runCommand,
   expect,
 }:
@@ -13,13 +13,13 @@ in
 let
   finalPackage = buildDotnetModule rec {
     pname = "omnisharp-roslyn";
-    version = "1.39.12";
+    version = "1.39.13";
 
     src = fetchFromGitHub {
       owner = "OmniSharp";
       repo = "omnisharp-roslyn";
-      rev = "refs/tags/v${version}";
-      hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
+      tag = "v${version}";
+      hash = "sha256-/U7zpx0jAnvZl7tshGV7wORD/wQUKYgX1kADpyCXHM4=";
     };
 
     projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
@@ -60,49 +60,52 @@ let
     useDotnetFromEnv = true;
     executables = [ "OmniSharp" ];
 
-    passthru.tests =
-      let
-        with-sdk =
-          sdk:
-          runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
-            {
-              nativeBuildInputs = [
-                finalPackage
-                sdk
-                expect
-              ];
-              meta.timeout = 60;
-            }
-            ''
-              HOME=$TMPDIR
-              expect <<"EOF"
-                spawn OmniSharp
-                expect_before timeout {
-                  send_error "timeout!\n"
-                  exit 1
-                }
-                expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
-                expect "{\"Event\":\"started\","
-                send \x03
-                expect eof
-                catch wait result
-                exit [lindex $result 3]
-              EOF
-              touch $out
-            '';
-      in
-      {
-        # Make sure we can run OmniSharp with any supported SDK version, as well as without
-        with-net8-sdk = with-sdk sdk_8_0;
-        with-net9-sdk = with-sdk sdk_9_0;
-        no-sdk = with-sdk null;
-      };
+    passthru = {
+      tests =
+        let
+          with-sdk =
+            sdk:
+            runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
+              {
+                nativeBuildInputs = [
+                  finalPackage
+                  sdk
+                  expect
+                ];
+                meta.timeout = 60;
+              }
+              ''
+                HOME=$TMPDIR
+                expect <<"EOF"
+                  spawn OmniSharp
+                  expect_before timeout {
+                    send_error "timeout!\n"
+                    exit 1
+                  }
+                  expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
+                  expect "{\"Event\":\"started\","
+                  send \x03
+                  expect eof
+                  catch wait result
+                  exit [lindex $result 3]
+                EOF
+                touch $out
+              '';
+        in
+        {
+          # Make sure we can run OmniSharp with any supported SDK version, as well as without
+          with-net8-sdk = with-sdk sdk_8_0;
+          with-net9-sdk = with-sdk sdk_9_0;
+          no-sdk = with-sdk null;
+        };
 
-    passthru.updateScript = ./update.sh;
+      updateScript = ./update.sh;
+    };
 
     meta = {
       description = "OmniSharp based on roslyn workspaces";
       homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
+      changelog = "https://github.com/OmniSharp/omnisharp-roslyn/blob/v${version}/CHANGELOG.md";
       sourceProvenance = with lib.sourceTypes; [
         fromSource
         binaryNativeCode # dependencies

From 4b72571dcc6e1f893bc1c791ff7373830c67a98e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 02:11:36 +0100
Subject: [PATCH 0904/1504] python312Packages.bandit: drop support for python
 3.8

---
 pkgs/development/python-modules/bandit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix
index 686fb846b297..31bf7bbbb09f 100644
--- a/pkgs/development/python-modules/bandit/default.nix
+++ b/pkgs/development/python-modules/bandit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   version = "1.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 79d83ef4cf2b52ae527c1d3ee347147a512a38ef Mon Sep 17 00:00:00 2001
From: Misael Aguayo <aguayo.misael@gmail.com>
Date: Tue, 31 Dec 2024 19:12:14 -0600
Subject: [PATCH 0905/1504] harper: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index d60c74fedb68..679c5686eba7 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "elijah-potter";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-X1mTqaqOqeAM7mq3nNrE2ULZ1zaAxZIqp0p1wdlDwgk=";
+    hash = "sha256-YKfhvwm8TuKpM81qcVgL15AdiQaI7PXvRq1pWThwmo0=";
   };
 
-  cargoHash = "sha256-0RJ0Kpht4gqZTBdjld1Wi5r9FN5RB74KboxODmlHoko=";
+  cargoHash = "sha256-Gf0GJVWefZlMXpnJytAdmM/I9y7bXoCilUZs/HK0Vdw=";
 
   meta = {
     description = "Grammar Checker for Developers";

From c44821d5fcbe4797868daa0838002577105a161f Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Tue, 31 Dec 2024 19:14:08 -0600
Subject: [PATCH 0906/1504] ghostty: 1.0.0 -> 1.0.1 (#369782)

---
 pkgs/by-name/gh/ghostty/deps.nix    | 14 +++++++-------
 pkgs/by-name/gh/ghostty/package.nix | 18 ++++++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix
index 81a99677a703..4653a16a3153 100644
--- a/pkgs/by-name/gh/ghostty/deps.nix
+++ b/pkgs/by-name/gh/ghostty/deps.nix
@@ -1,4 +1,5 @@
 # generated by zon2nix (https://github.com/Cloudef/zig2nix)
+
 {
   lib,
   linkFarm,
@@ -8,14 +9,13 @@
   zig,
   name ? "zig-packages",
 }:
+
 with builtins;
 with lib;
+
 let
   unpackZigArtifact =
-    {
-      name,
-      artifact,
-    }:
+    { name, artifact }:
     runCommandLocal name
       {
         nativeBuildInputs = [ zig ];
@@ -169,11 +169,11 @@ linkFarm name [
     };
   }
   {
-    name = "12204358b2848ffd993d3425055bff0a5ba9b1b60bead763a6dea0517965d7290a6c";
+    name = "1220cc25b537556a42b0948437c791214c229efb78b551c80b1e9b18d70bf0498620";
     path = fetchZigArtifact {
       name = "iterm2_themes";
-      url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/d6c42066b3045292e0b1154ad84ff22d6863ebf7.tar.gz";
-      hash = "sha256-s6us3PkOPmQCtLS9QNPM7BDLt7x+37KbmYF9d4NMD/c=";
+      url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e030599a6a6e19fcd1ea047c7714021170129d56.tar.gz";
+      hash = "sha256-hFGjD0rNfZ7Qd7uJZgVn+FmIVXunbjLT+E1BoXhXoJE=";
     };
   }
   {
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 7242ba82c9da..2db4e3637f6c 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -44,8 +44,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghostty";
-  version = "1.0.0";
-
+  version = "1.0.1";
   outputs = [
     "out"
     "man"
@@ -58,15 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ghostty-org";
     repo = "ghostty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=";
+    hash = "sha256-BiXFNeoL+BYpiqzCuDIrZGQ6JVI8cBOXerJH48CbnxU=";
   };
 
-  # Avoid using runtime hacks to help find X11
-  postPatch = lib.optionalString (appRuntime == "gtk") ''
-    substituteInPlace src/apprt/gtk/x11.zig \
-      --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");'
-  '';
-
   deps = callPackage ./deps.nix {
     name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
   };
@@ -118,8 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   zigCheckFlags = finalAttrs.zigBuildFlags;
 
-  # Unit tests currently fail inside the sandbox
-  doCheck = false;
+  doCheck = true;
 
   /**
     Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them
@@ -186,7 +178,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://ghostty.org/";
     downloadPage = "https://ghostty.org/download";
-
+    changelog = "https://ghostty.org/docs/install/release-notes/${
+      builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
+    }";
     license = lib.licenses.mit;
     mainProgram = "ghostty";
     maintainers = with lib.maintainers; [

From 3374f9891c067f55d21b6d89f9cf998b031b1535 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 01:23:42 +0000
Subject: [PATCH 0907/1504] fishPlugins.forgit: 24.11.0 -> 25.01.0

---
 pkgs/shells/fish/plugins/forgit.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix
index ff883f4f258d..5c6886cba67f 100644
--- a/pkgs/shells/fish/plugins/forgit.nix
+++ b/pkgs/shells/fish/plugins/forgit.nix
@@ -6,13 +6,13 @@
 
 buildFishPlugin rec {
   pname = "forgit";
-  version = "24.11.0";
+  version = "25.01.0";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     rev = version;
-    hash = "sha256-8BMFL3WktkkB8m6asbNeb9swnLWi3jHo012fBXGa8ls=";
+    hash = "sha256-x+Y1o+K6I9DWbn202jNAr40vS71ZAXbS7ztsH+bPGBI=";
   };
 
   postInstall = ''

From 7dab57af5fd8628ab57fa796ef32437c0fffddaf Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 02:31:31 +0100
Subject: [PATCH 0908/1504] python312Packages.dploot: drop support for python
 3.9

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/dploot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix
index d7f86993b7f1..d4577d545cf8 100644
--- a/pkgs/development/python-modules/dploot/default.nix
+++ b/pkgs/development/python-modules/dploot/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   version = "3.0.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;

From 269d5969703af08909447eb39d442ac5aa08b4d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 1 Jan 2025 02:33:23 +0100
Subject: [PATCH 0909/1504] nixos/coturn: restore logging functionality

Due to undetermined hardening changes logging to syslog does not work
anymore, but we don't need it. We're running in a systemd unit so allow
logging to stdout instead.
---
 nixos/modules/services/networking/coturn.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index b50aad89871b..8a0d08f6d9cb 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixos/modules/services/networking/coturn.nix
@@ -36,8 +36,6 @@ let
     ${lib.optionalString (cfg.cert != null) "cert=${cfg.cert}"}
     ${lib.optionalString (cfg.pkey != null) "pkey=${cfg.pkey}"}
     ${lib.optionalString (cfg.dh-file != null) "dh-file=${cfg.dh-file}"}
-    no-stdout-log
-    syslog
     pidfile=${pidfile}
     ${lib.optionalString cfg.secure-stun "secure-stun"}
     ${lib.optionalString cfg.no-cli "no-cli"}

From 4e22b5fc6bca2b55126fd97842d7947814050ae8 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 06:49:39 +0000
Subject: [PATCH 0910/1504] cgal_4: drop

cgal_4 has no consumers in nixpkgs, last update was 2020-02-25 and has
since been replaced by cgal 5. remove it from nixpkgs
---
 .../science/misc/gplates/default.nix          |  6 +-
 pkgs/by-name/op/openscad-unstable/package.nix |  4 +-
 pkgs/development/libraries/CGAL/4.nix         | 61 -------------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  5 +-
 5 files changed, 8 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/development/libraries/CGAL/4.nix

diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 33468a311162..2c49536d993d 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -7,7 +7,7 @@
   doxygen,
   graphviz,
   boost,
-  cgal_5,
+  cgal,
   gdal,
   glew,
   gmp,
@@ -32,7 +32,7 @@ let
     enablePython = true;
     inherit python;
   };
-  cgal = cgal_5.override {
+  cgal' = cgal.override {
     boost = boost';
   };
 in
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost'
-    cgal
+    cgal'
     gdal
     glew
     gmp
diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 498198473291..d9c612e39ba4 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -9,7 +9,7 @@
   bison,
   boost,
   cairo,
-  cgal_5,
+  cgal,
   clipper2,
   double-conversion,
   eigen,
@@ -83,7 +83,7 @@ clangStdenv.mkDerivation rec {
       mimalloc
       boost
       cairo
-      cgal_5
+      cgal
       double-conversion
       eigen
       fontconfig
diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix
deleted file mode 100644
index 5d6ca6e89fbe..000000000000
--- a/pkgs/development/libraries/CGAL/4.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  cmake,
-  boost,
-  gmp,
-  mpfr,
-}:
-
-stdenv.mkDerivation rec {
-  version = "4.14.3";
-  pname = "cgal";
-
-  src = fetchurl {
-    url = "https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${version}/CGAL-${version}.tar.xz";
-    hash = "sha256-W6/nq+hDW+yhehCCBi02M2jsHj8NZYG7DaiwEPs4n+Q=";
-  };
-
-  patches = [
-    ./cgal_path.patch
-
-    # Pull upstream fix for c++17 (gcc-12):
-    #  https://github.com/CGAL/cgal/pull/6109
-    (fetchpatch {
-      name = "gcc-12-prereq.patch";
-      url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch";
-      relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
-      sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo=";
-    })
-    (fetchpatch {
-      name = "gcc-12.patch";
-      url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch";
-      relative = "CGAL_Core"; # Upstream slightly reordered directory structure since.
-      sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M=";
-    })
-  ];
-
-  # note: optional component libCGAL_ImageIO would need zlib and opengl;
-  #   there are also libCGAL_Qt{3,4} omitted ATM
-  buildInputs = [
-    boost
-    gmp
-    mpfr
-  ];
-  nativeBuildInputs = [ cmake ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Computational Geometry Algorithms Library";
-    homepage = "http://cgal.org";
-    license = with licenses; [
-      gpl3Plus
-      lgpl3Plus
-    ];
-    platforms = platforms.all;
-    maintainers = [ maintainers.raskin ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9ae158a5ae5a..f0445cf28187 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -201,6 +201,8 @@ mapAliases {
   cargo-espflash = espflash;
   cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
   certmgr-selfsigned = certmgr; # Added 2023-11-30
+  cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
+  cgal_5 = cgal; # Added 2024-12-30
   challenger = taler-challenger; # Added 2024-09-04
   check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
   check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c69e89c67938..1364b8040f11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8768,10 +8768,7 @@ with pkgs;
     certbot-dns-route53
   ]);
 
-  # CGAL 5 has API changes
-  cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
-  cgal_5 = callPackage ../development/libraries/CGAL { };
-  cgal = cgal_5;
+  cgal = callPackage ../development/libraries/CGAL { };
 
   check = callPackage ../development/libraries/check {
     inherit (darwin.apple_sdk.frameworks) CoreServices;

From 498e1d12d265e69706839b31dd8d2d85cc332570 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 02:43:01 +0100
Subject: [PATCH 0911/1504] python312Packages.bottleneck: drop support for
 python 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/bottleneck/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index d85050c73961..46abe5a8c483 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   version = "1.4.2";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 1f23900df0c9cca61c1b2270df340d6afffce81f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 1 Jan 2025 02:41:43 +0100
Subject: [PATCH 0912/1504] Revert "libportal: 0.8.1 -> 0.9.0"

This reverts commit 354b423fcc3e4076f52a061c3f7376384ab551ff.
---
 pkgs/by-name/li/libportal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index 5b76dc8ccdcd..832146707d16 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -21,7 +21,7 @@ assert
 
 stdenv.mkDerivation rec {
   pname = "libportal" + lib.optionalString (variant != null) "-${variant}";
-  version = "0.9.0";
+  version = "0.8.1";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "flatpak";
     repo = "libportal";
     rev = version;
-    sha256 = "sha256-uKblVaJB3s01En/T3ofT8uZHHarPKAO1qyLidLZ/b/g=";
+    sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc=";
   };
 
   depsBuildBuild = [

From 84653e6908a6537d82fe3661792281341f9f517f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 09:46:49 +0000
Subject: [PATCH 0913/1504] python312Packages.import-expression: 2.1.0.post1 ->
 2.2.1.post1

---
 .../python-modules/import-expression/default.nix           | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 4bed24b4bdae..b7f9e0447007 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -5,12 +5,11 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "import-expression";
-  version = "2.1.0.post1";
+  version = "2.2.1.post1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,13 +17,11 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "import_expression";
     inherit version;
-    hash = "sha256-mclYGeuISXUDrOS1mhpVgDp1439KnHAwzHKIbRtdibQ=";
+    hash = "sha256-HIMb8mvvft82qXs0xoe5Yuer4GEWxm8A4U+aMhhiPU8=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ typing-extensions ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
   pytestFlagsArray = [ "tests.py" ];

From c22bbe775a83407f964cbba6962e0ab767209ba6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 19:01:06 +0000
Subject: [PATCH 0914/1504] python312Packages.types-redis: 4.6.0.20240903 ->
 4.6.0.20241004

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

diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix
index 5878c4bd88a6..1b832700620b 100644
--- a/pkgs/development/python-modules/types-redis/default.nix
+++ b/pkgs/development/python-modules/types-redis/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "types-redis";
-  version = "4.6.0.20240903";
+  version = "4.6.0.20241004";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S6saN42/I8LJXDcN/biajwM5V8T9GlP+5xtSnBgv4Ag=";
+    hash = "sha256-XxfSs/kJGrdThBU7+idmGf+hz2o42mDhDV5nScxbkC4=";
   };
 
   build-system = [ setuptools ];

From 64c4ca10bc72a675aed054182599b18f9033af3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 02:02:58 +0000
Subject: [PATCH 0915/1504] spotifyd: 0.3.5-unstable-2024-10-21 ->
 0.3.5-unstable-2024-12-27

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

diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix
index 45e43876ae0c..627a15215fdc 100644
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -25,16 +25,16 @@
 
 rustPackages.rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.3.5-unstable-2024-10-21";
+  version = "0.3.5-unstable-2024-12-27";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
-    rev = "b25538f5c4dfc5b376927e7edf71c7c988492ace";
-    hash = "sha256-50eUVax3yqwncQUWgCPc0PHVUuUERQ9iORSSajPHB9c=";
+    rev = "c6e6af449b75225224158aeeef64de485db1139e";
+    hash = "sha256-0HDrnEeqynb4vtJBnXyItprJkP+ZOAKIBP68Ht9xr2c=";
   };
 
-  cargoHash = "sha256-3aEBLPyf72o9gF58j9OANpcqD/IClb2alfAEKRFzatU=";
+  cargoHash = "sha256-bRO7cK+BlAUEr6DlK7GSJf/WNoCM4SYq/lZ8e9ENJZw=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 01a5cf08e5c425c5a6d8799ef552a4d652599e06 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 03:04:19 +0100
Subject: [PATCH 0916/1504] python312Packages.line-profiler: drop support for
 python 3.7

---
 pkgs/development/python-modules/line-profiler/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix
index 11d65dd7c148..91e77789b4b1 100644
--- a/pkgs/development/python-modules/line-profiler/default.nix
+++ b/pkgs/development/python-modules/line-profiler/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   version = "4.2.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6" || isPyPy;
+  disabled = pythonOlder "3.8" || isPyPy;
 
   src = fetchPypi {
     pname = "line_profiler";

From 91548962664547ff7210e611072393c6f4a0d88d Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 11:11:30 +0900
Subject: [PATCH 0917/1504] python312Packages.json-repair: move pytestCheckHook
 from nativeBuildInputs to nativeCheckInputs

---
 pkgs/development/python-modules/json-repair/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index 91cab6837f9b..481abb883c86 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  nativeBuildInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTestPaths = [
     "tests/test_performance.py"

From 1be8da7361619929d9de579df5b3aa7e8f52b117 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 11:22:33 +0900
Subject: [PATCH 0918/1504] python312Packages.oci: refactor

---
 pkgs/development/python-modules/oci/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index eb3346301a59..2e2391e5d4b1 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -7,7 +7,6 @@
   fetchFromGitHub,
   pyopenssl,
   python-dateutil,
-  pythonOlder,
   pytz,
   setuptools,
 }:
@@ -15,9 +14,7 @@
 buildPythonPackage rec {
   pname = "oci";
   version = "2.141.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
@@ -31,11 +28,9 @@ buildPythonPackage rec {
     "pyOpenSSL"
   ];
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     certifi
     circuitbreaker
     cryptography
@@ -49,14 +44,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "oci" ];
 
-  meta = with lib; {
+  meta = {
     description = "Oracle Cloud Infrastructure Python SDK";
     homepage = "https://github.com/oracle/oci-python-sdk";
     changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       upl
     ];
-    maintainers = with maintainers; [ ilian ];
+    maintainers = with lib.maintainers; [ ilian ];
   };
 }

From f0579eba7ff37c6e02d2eceac9968818c4e4a4de Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 03:26:44 +0100
Subject: [PATCH 0919/1504] python312Packages.diff-cover: drop support for
 python 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/diff-cover/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index 776c91f244a7..6a21fda8b18b 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   version = "9.2.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     pname = "diff_cover";

From 16677264aeb734f2fdbd47106f9dde02bb6c9944 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 10:10:00 +0800
Subject: [PATCH 0920/1504] nixos/kmonad: add a basic nixos test

---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/kmonad.nix                        | 47 +++++++++++++++++++
 .../haskell-modules/configuration-nix.nix     |  9 +++-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/kmonad.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 613ff1314488..147e9c11612e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -520,6 +520,7 @@ in {
   keyd = handleTest ./keyd.nix {};
   keymap = handleTest ./keymap.nix {};
   kimai = handleTest ./kimai.nix {};
+  kmonad = runTest ./kmonad.nix;
   knot = handleTest ./knot.nix {};
   komga = handleTest ./komga.nix {};
   krb5 = discoverTests (import ./krb5);
diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix
new file mode 100644
index 000000000000..e0150cb99f18
--- /dev/null
+++ b/nixos/tests/kmonad.nix
@@ -0,0 +1,47 @@
+{ lib, ... }:
+
+{
+  name = "kmonad";
+
+  meta = {
+    maintainers = with lib.maintainers; [ linj ];
+  };
+
+  nodes = {
+    machine = {
+      services.kmonad = {
+        enable = true;
+        keyboards = {
+          defaultKbd = {
+            device = "/dev/input/by-id/vm-default-kbd";
+            defcfg = {
+              enable = true;
+              fallthrough = true;
+            };
+            config = ''
+              (defsrc :name default-src
+                1)
+              (deflayer default-layer :source default-src
+                @T2)
+              (defalias
+                T2 2)
+            '';
+          };
+        };
+      };
+
+      # make a determinate symlink to the default vm keyboard for kmonad to use
+      services.udev.extraRules = ''
+        ACTION=="add", KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="QEMU Virtio Keyboard", ATTRS{id/product}=="0001", ATTRS{id/vendor}=="0627", SYMLINK+="input/by-id/vm-default-kbd"
+      '';
+    };
+  };
+
+  testScript = ''
+    service_name = "kmonad-defaultKbd"
+    machine.wait_for_unit(f"{service_name}.service")
+
+    with subtest("kmonad is running"):
+         machine.succeed(f"systemctl status {service_name}")
+  '';
+}
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2a92ef16dc6f..9bf3d526ab87 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1478,7 +1478,14 @@ self: super: builtins.intersectAttrs super {
   # cause actual problems in dependent packages, see https://github.com/lehins/pvar/issues/4
   pvar = dontCheck super.pvar;
 
-  kmonad = enableSeparateBinOutput super.kmonad;
+  kmonad = lib.pipe super.kmonad [
+    enableSeparateBinOutput
+    (overrideCabal (drv: {
+      passthru = lib.recursiveUpdate
+        drv.passthru or { }
+        { tests.nixos = pkgs.nixosTests.kmonad; };
+    }))
+  ];
 
   xmobar = enableSeparateBinOutput super.xmobar;
 

From ffea31ccbb8405044c909750dbff0db60c4d7e6d Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 07:11:12 +0800
Subject: [PATCH 0921/1504] nixos/kmonad: add meta.maintainers

---
 nixos/modules/services/hardware/kmonad.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index fc548d51603e..f59ee69c580b 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -188,4 +188,11 @@ in
       services = lib.mapAttrs' (_: mkService) cfg.keyboards;
     };
   };
+
+  meta = {
+    maintainers = with lib.maintainers; [
+      linj
+      rvdp
+    ];
+  };
 }

From cbf4f6a86dbe355dbdf4f817c9a204fa16e28305 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 06:48:34 +0800
Subject: [PATCH 0922/1504] nixos/kmonad: improve doc

---
 nixos/modules/services/hardware/kmonad.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index f59ee69c580b..2b5157afb6b9 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -35,16 +35,16 @@ let
             Since KMonad runs as an unprivileged user, it may sometimes
             need extra permissions in order to read the keyboard device
             file.  If your keyboard's device file isn't in the input
-            group you'll need to list its group in this option.
+            group, you'll need to list its group in this option.
           '';
         };
 
         defcfg = {
           enable = lib.mkEnableOption ''
-            Automatically generate the defcfg block.
+            automatic generation of the defcfg block.
 
-            When this is option is set to true the config option for
-            this keyboard should not include a defcfg block.
+            When this option is set to true, the config option for
+            this keyboard should not include a defcfg block
           '';
 
           compose = {
@@ -61,9 +61,9 @@ let
             };
           };
 
-          fallthrough = lib.mkEnableOption "Re-emit unhandled key events.";
+          fallthrough = lib.mkEnableOption "re-emitting unhandled key events";
 
-          allowCommands = lib.mkEnableOption "Allow keys to run shell commands.";
+          allowCommands = lib.mkEnableOption "keys to run shell commands";
         };
 
         config = lib.mkOption {
@@ -159,9 +159,9 @@ let
 in
 {
   options.services.kmonad = {
-    enable = lib.mkEnableOption "KMonad: An advanced keyboard manager.";
+    enable = lib.mkEnableOption "KMonad: an advanced keyboard manager";
 
-    package = lib.mkPackageOption pkgs "kmonad" { };
+    package = lib.mkPackageOption pkgs "KMonad" { default = "kmonad"; };
 
     keyboards = lib.mkOption {
       type = lib.types.attrsOf (lib.types.submodule keyboard);

From 23768e2a1233f9695eda51e00c3054439e4ab33f Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 06:49:07 +0800
Subject: [PATCH 0923/1504] nixos/kmonad: simplify config for default keyboard
 name

---
 nixos/modules/services/hardware/kmonad.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 2b5157afb6b9..8fa721a5f233 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -15,6 +15,7 @@ let
       options = {
         name = lib.mkOption {
           type = lib.types.str;
+          default = name;
           example = "laptop-internal";
           description = "Keyboard name.";
         };
@@ -71,10 +72,6 @@ let
           description = "Keyboard configuration.";
         };
       };
-
-      config = {
-        name = lib.mkDefault name;
-      };
     };
 
   # Create a complete KMonad configuration file:

From 657ff03cc341d2de5afa0b99c55c75e7f64b85e2 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 06:49:34 +0800
Subject: [PATCH 0924/1504] nixos/kmonad: make type of delay more strict

---
 nixos/modules/services/hardware/kmonad.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 8fa721a5f233..197a4752ed16 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -56,7 +56,7 @@ let
             };
 
             delay = lib.mkOption {
-              type = lib.types.int;
+              type = lib.types.ints.unsigned;
               default = 5;
               description = "The delay (in milliseconds) between compose key sequences.";
             };

From 28a1740fd1d3d397a322113c99a8a7a5f3a64d5f Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 07:01:45 +0800
Subject: [PATCH 0925/1504] nixos/kmonad: introduce a new helper function
 mkName

---
 nixos/modules/services/hardware/kmonad.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 197a4752ed16..41e4ffe2a6a9 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -74,6 +74,8 @@ let
       };
     };
 
+  mkName = name: "kmonad-" + name;
+
   # Create a complete KMonad configuration file:
   mkCfg =
     keyboard:
@@ -81,7 +83,7 @@ let
       defcfg = ''
         (defcfg
           input  (device-file "${keyboard.device}")
-          output (uinput-sink "kmonad-${keyboard.name}")
+          output (uinput-sink "${mkName keyboard.name}")
           ${lib.optionalString (keyboard.defcfg.compose.key != null) ''
             cmp-seq ${keyboard.defcfg.compose.key}
             cmp-seq-delay ${toString keyboard.defcfg.compose.delay}
@@ -92,7 +94,7 @@ let
       '';
     in
     pkgs.writeTextFile {
-      name = "kmonad-${keyboard.name}.cfg";
+      name = "${mkName keyboard.name}.cfg";
       text = lib.optionalString keyboard.defcfg.enable (defcfg + "\n") + keyboard.config;
       checkPhase = "${cfg.package}/bin/kmonad -d $out";
     };
@@ -102,7 +104,7 @@ let
   mkPath =
     keyboard:
     let
-      name = "kmonad-${keyboard.name}";
+      name = mkName keyboard.name;
     in
     lib.nameValuePair name {
       description = "KMonad trigger for ${keyboard.device}";
@@ -126,7 +128,7 @@ let
         ++ cfg.extraArgs
         ++ [ "${mkCfg keyboard}" ];
     in
-    lib.nameValuePair "kmonad-${keyboard.name}" {
+    lib.nameValuePair (mkName keyboard.name) {
       description = "KMonad for ${keyboard.device}";
       script = lib.escapeShellArgs cmd;
       unitConfig = {

From f83da7d9bd14f07581cc6d8d9e744e49e0aa6203 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 07:02:22 +0800
Subject: [PATCH 0926/1504] nixos/kmonad: use the official suffix for config
 file

Both the official Emacs[1] and Vim[2] plugins use kbd as the config file
suffix.

[1]: https://github.com/kmonad/kbd-mode/blob/b07f3e16043fbb268b3e47fb49abc419e8b7e2d7/kbd-mode.el#L275
[2]: https://github.com/kmonad/kmonad-vim/blob/37978445197ab00edeb5b731e9ca90c2b141723f/ftdetect/kbd.vim#L18
---
 nixos/modules/services/hardware/kmonad.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 41e4ffe2a6a9..cea9aafb377f 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -94,7 +94,7 @@ let
       '';
     in
     pkgs.writeTextFile {
-      name = "${mkName keyboard.name}.cfg";
+      name = "${mkName keyboard.name}.kbd";
       text = lib.optionalString keyboard.defcfg.enable (defcfg + "\n") + keyboard.config;
       checkPhase = "${cfg.package}/bin/kmonad -d $out";
     };

From 8463300edfea65e290d17babd35ab50ab2c06a41 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 07:14:25 +0800
Subject: [PATCH 0927/1504] nixos/kmonad: use lib.getExe

---
 nixos/modules/services/hardware/kmonad.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index cea9aafb377f..db526eb506b8 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -96,7 +96,7 @@ let
     pkgs.writeTextFile {
       name = "${mkName keyboard.name}.kbd";
       text = lib.optionalString keyboard.defcfg.enable (defcfg + "\n") + keyboard.config;
-      checkPhase = "${cfg.package}/bin/kmonad -d $out";
+      checkPhase = "${lib.getExe cfg.package} -d $out";
     };
 
   # Build a systemd path config that starts the service below when a

From 4d5a570267decbac762bf34c1fc00b5b6177fa5c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 03:58:07 +0100
Subject: [PATCH 0928/1504] python312Packages.pyperf: drop support for python
 3.8

---
 pkgs/development/python-modules/pyperf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix
index bc1e12390431..be517c6eca27 100644
--- a/pkgs/development/python-modules/pyperf/default.nix
+++ b/pkgs/development/python-modules/pyperf/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   version = "2.8.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 64f2571324cdab15d831640e75917522de72fdb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 16:49:47 +0000
Subject: [PATCH 0929/1504] python312Packages.simplemma: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix
index 191fbb5df796..197642db2dcd 100644
--- a/pkgs/development/python-modules/simplemma/default.nix
+++ b/pkgs/development/python-modules/simplemma/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "simplemma";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adbar";
     repo = "simplemma";
     rev = "refs/tags/v${version}";
-    hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY=";
+    hash = "sha256-aFN/cOSqsrTJ5GMw0/SM7uoC+T1RhDTQFf8AF00Tz/o=";
   };
 
   build-system = [

From 6a571077240b57f768b60ff5b2c1bcea3489030b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 16:47:31 +0000
Subject: [PATCH 0930/1504] python312Packages.glyphslib: 6.9.0 -> 6.9.5

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

diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 895e9f1ab25e..3f142eb84be4 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "glyphslib";
-  version = "6.9.0";
+  version = "6.9.5";
 
   format = "pyproject";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "googlefonts";
     repo = "glyphsLib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NanqjZZkxrhPaBsR+FrARvsO3vdT2MYnWFtkO0hpbQg=";
+    hash = "sha256-9b4nPiGyBsTplEhfmPdhjalV0fexYXerdRqUbOUXlh0=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From f682765563b9488ac85155fcb127ca6f67451307 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 03:07:23 +0000
Subject: [PATCH 0931/1504] serie: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index e59723c24ec7..b891cff95f45 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-RP9Tv6IrDfawjXCQp0nB0nd7b6IwkdykHcEfGEguFHo=";
+    hash = "sha256-F7AlDuvRYCMhOXyzg9/oTukAEaDJENG0ZEhIlNe+Cic=";
   };
 
-  cargoHash = "sha256-HxIyWlFKDRod5nSENZguNYz/vn+E9Ux0K3dMhX7I/zQ=";
+  cargoHash = "sha256-Ug4dB3Xx0bm4brztpBbf55QdWc+7nyShMYP8kPC/82k=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From f519da9cd9e339344ad91f675e5a2e860a55ea83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 03:10:54 +0000
Subject: [PATCH 0932/1504] skim: 0.15.5 -> 0.15.7

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

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index e819ec8f53b7..85a6edb75686 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.15.5";
+  version = "0.15.7";
 
   outputs = [
     "out"
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ijuzEfoYSVLfWiBq4Wnxy3LbX0viDZZ6FZ4EvvUHf1M=";
+    hash = "sha256-vUKHyrvCGtRKziUqgIbgVP7YdH+UW3PFBECV/mo5RxY=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-JGsKz361hnRoDDq5zpA64jkk8MB3fqrh8xA3l0ZV1Bs=";
+  cargoHash = "sha256-/tfbhNlpx96jlzUYwbucXi+pk1IE2jqxgWYjNU+4mHg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ec16462f08fd6f1ee6983bc5996058e2dccdea0d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 05:02:32 +0100
Subject: [PATCH 0933/1504] python312Packages.djangorestframework-stubs: drop
 support for python 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 .../python-modules/djangorestframework-stubs/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
index f59780e39368..33dfb2f8ae8d 100644
--- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   version = "3.15.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "typeddjango";

From fef16d676635a7868938b3d88a669966543e28d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 07:17:08 +0000
Subject: [PATCH 0934/1504] python312Packages.django-pglock: 1.7.0 -> 1.7.1

---
 .../python-modules/django-pglock/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix
index 7db93173c742..16500e9515e4 100644
--- a/pkgs/development/python-modules/django-pglock/default.nix
+++ b/pkgs/development/python-modules/django-pglock/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "django-pglock";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "Opus10";
+    owner = "AmbitionEng";
     repo = "django-pglock";
     tag = version;
-    hash = "sha256-7PBZvI4OTDIZjjLWnfOwGAdEJr3D6snmR20hPboLvXc=";
+    hash = "sha256-WbifapA2A0grxePozwDSPzREIzmgBV+V5wpA9jeYfJ8=";
   };
 
   build-system = [ poetry-core ];
@@ -30,8 +30,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Postgres advisory locks, table locks, and blocking lock management";
-    homepage = "https://github.com/Opus10/django-pglock";
-    changelog = "https://github.com/Opus10/django-pglock/blob/${version}/CHANGELOG.md";
+    homepage = "https://github.com/AmbitionEng/django-pglock";
+    changelog = "https://github.com/AmbitionEng/django-pglock/blob/${version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };

From 514b5ddc4e8237c102942ffd43bc5c3182df07a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 07:17:33 +0000
Subject: [PATCH 0935/1504] python312Packages.django-pgactivity: 1.7.0 -> 1.7.1

---
 .../python-modules/django-pgactivity/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix
index 7438dd381025..db2044f9b565 100644
--- a/pkgs/development/python-modules/django-pgactivity/default.nix
+++ b/pkgs/development/python-modules/django-pgactivity/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "django-pgactivity";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "Opus10";
+    owner = "AmbitionEng";
     repo = "django-pgactivity";
     tag = version;
-    hash = "sha256-XJDnNMhkoaRQBVsAdDqnFjOobUHi/RaMQZJnI61MuVI=";
+    hash = "sha256-PDJJf0PI5aqFn1HODv6wRSgTCr9ajfpPSDCB8twrFcQ=";
   };
 
   build-system = [ poetry-core ];
@@ -30,8 +30,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "View, filter, and kill Postgres queries";
-    homepage = "https://github.com/Opus10/django-pgactivity";
-    changelog = "https://github.com/Opus10/django-pgactivity/blob/${version}/CHANGELOG.md";
+    homepage = "https://github.com/AmbitionEng/django-pgactivity";
+    changelog = "https://github.com/AmbitionEng/django-pgactivity/blob/${version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };

From 53d760beee14374095f682f983666652fd2ef715 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Dec 2024 10:26:47 +0000
Subject: [PATCH 0936/1504] codeql: 2.19.4 -> 2.20.0

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

diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index 9c3eb34894f3..6a4208c1f72c 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.19.4";
+  version = "2.20.0";
 
   dontConfigure = true;
   dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-eRRZwtrTOWsebDm5uAj/ABFrlbov39e6Xeb+K7WAIG8=";
+    hash = "sha256-c9O4rmAuCBuFeM8R2ha6wBCAnGwYRdapNpPhlSvgYjg=";
   };
 
   nativeBuildInputs = [

From 5bff2873b9c0beb8e911c03531c43e40e3ceb3f3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 05:27:15 +0100
Subject: [PATCH 0937/1504] COPYING: 2024 -> 2025

---
 COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index 40eae096b709..ed4495408b9f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2024 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

From a41de3ac5346c4c10137b31de6f7b55fddbabed0 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 05:32:30 +0100
Subject: [PATCH 0938/1504] python312Packages.fakeredis: drop support for
 python 3.8

---
 pkgs/development/python-modules/fakeredis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 5d40b88886ed..67b7232841ec 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   version = "2.26.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "dsoftwareinc";

From ef133575fe3aba14f0febac4f2bfcd3ebfd20a5d Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 13:35:21 +0900
Subject: [PATCH 0939/1504] python312Packages.flask-sockets: remove

flask-sockets has been removed as the upstream repository was archived in 2022
---
 .../python-modules/flask-sockets/default.nix  | 36 -------------------
 .../python-modules/slack-bolt/default.nix     |  2 --
 .../python-modules/slack-sdk/default.nix      |  2 --
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 5 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/flask-sockets/default.nix

diff --git a/pkgs/development/python-modules/flask-sockets/default.nix b/pkgs/development/python-modules/flask-sockets/default.nix
deleted file mode 100644
index 6879b64fdb75..000000000000
--- a/pkgs/development/python-modules/flask-sockets/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  flask,
-  gevent,
-  gevent-websocket,
-}:
-
-buildPythonPackage rec {
-  pname = "Flask-Sockets";
-  version = "0.2.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "072927da8edca0e81e024f5787e643c87d80b351b714de95d723becb30e0643b";
-  };
-
-  propagatedBuildInputs = [
-    flask
-    gevent
-    gevent-websocket
-  ];
-
-  # upstream doesn't have any tests, single file
-  doCheck = false;
-
-  pythonImportsCheck = [ "flask_sockets" ];
-
-  meta = with lib; {
-    description = "Elegant WebSockets for your Flask apps";
-    homepage = "https://github.com/heroku-python/flask-sockets";
-    license = licenses.mit;
-    maintainers = [ maintainers.prusnak ];
-  };
-}
diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix
index 62ee94e72ba4..fe71e07bd36a 100644
--- a/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/pkgs/development/python-modules/slack-bolt/default.nix
@@ -21,7 +21,6 @@
   falcon,
   fastapi,
   flask,
-  flask-sockets,
   gunicorn,
   moto,
   pyramid,
@@ -73,7 +72,6 @@ buildPythonPackage rec {
       falcon
       fastapi
       flask
-      flask-sockets
       gunicorn
       moto
       pyramid
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index b1f155488f57..f116779a6a08 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -6,7 +6,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   flake8,
-  flask-sockets,
   moto,
   psutil,
   pytest-asyncio,
@@ -49,7 +48,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     flake8
-    flask-sockets
     moto
     psutil
     pytest-asyncio
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..9a392e655c03 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -223,6 +223,7 @@ mapAliases ({
   flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020.";
   flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016.";
   flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017.";
+  flask-sockets = throw "flask-sockets has been removed as the upstream repository was archived in 2022"; # Added 2025-01-01
   flowlogs_reader = flowlogs-reader; # added 2024-01-03
   flufl_bounce = flufl-bounce; # added 2023-11-03
   flufl_i18n = flufl-i18n; # added 2023-11-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..e6abfb58d135 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4736,8 +4736,6 @@ self: super: with self; {
 
   flask-socketio = callPackage ../development/python-modules/flask-socketio { };
 
-  flask-sockets = callPackage ../development/python-modules/flask-sockets { };
-
   flask-sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
 
   flask-sqlalchemy-lite = callPackage ../development/python-modules/flask-sqlalchemy-lite { };

From 17f61f92018795d025b8789829297a2405f56132 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 14:01:07 +0900
Subject: [PATCH 0940/1504] python312Packages.plone-testing: 9.0.1 -> 9.0.3

Diff: https://github.com/plone/plone.testing/compare/9.0.1...9.0.3
---
 .../python-modules/plone-testing/default.nix  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix
index daa68e31afa1..85d9be0ef40b 100644
--- a/pkgs/development/python-modules/plone-testing/default.nix
+++ b/pkgs/development/python-modules/plone-testing/default.nix
@@ -1,33 +1,41 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  six,
+  fetchFromGitHub,
   zope-testing,
   setuptools,
 }:
 
 buildPythonPackage rec {
-  pname = "plone.testing";
-  version = "9.0.1";
+  pname = "plone-testing";
+  version = "9.0.3";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc=";
+  src = fetchFromGitHub {
+    owner = "plone";
+    repo = "plone.testing";
+    tag = version;
+    hash = "sha256-EjKKwLUBhzjtk3stHkdUDsteXQGJcrwdu9EEA4FFK1w=";
   };
 
-  propagatedBuildInputs = [
-    six
+  build-system = [ setuptools ];
+
+  dependencies = [
     setuptools
     zope-testing
   ];
 
+  pythonImportsCheck = [ "plone.testing" ];
+
   # Huge amount of testing dependencies (including Zope2)
   doCheck = false;
 
+  pythonNamespaces = [ "plone" ];
+
   meta = {
     description = "Testing infrastructure for Zope and Plone projects";
     homepage = "https://github.com/plone/plone.testing";
+    changelog = "https://github.com/plone/plone.testing/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.bsd3;
   };
 }

From df8c70a0438eef70a7059a7be754fc37bd1a15a3 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 1 Jan 2025 06:26:50 +0100
Subject: [PATCH 0941/1504] alpaca: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index eb2462d6c9b1..83065ff554ed 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-KPab5TU+Ra1o0FWpD5pkhtP7ylno903GQTqqWlir26s=";
+    hash = "sha256-Mh+LYslVmb4l+ZCB1Si7hxugzHPz/mULUMBNeJI12r0=";
   };
 
   nativeBuildInputs = [

From eb8171e4d1ee7baa54ec6556d75977d09578d31f Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 14:19:39 +0900
Subject: [PATCH 0942/1504] python312Packages.pyviz-comms: 2.2.1 -> 3.0.3

Diff: https://github.com/holoviz/pyviz_comms/compare/v2.2.1...v3.0.3
---
 .../python-modules/pyviz-comms/default.nix    | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix
index a83c27077965..5588b7b5ea14 100644
--- a/pkgs/development/python-modules/pyviz-comms/default.nix
+++ b/pkgs/development/python-modules/pyviz-comms/default.nix
@@ -1,21 +1,37 @@
 {
   buildPythonPackage,
   fetchPypi,
+  hatch-jupyter-builder,
+  hatch-nodejs-version,
+  hatchling,
   lib,
   param,
   panel,
 }:
 
 buildPythonPackage rec {
-  pname = "pyviz_comms";
-  version = "2.2.1";
+  pname = "pyviz-comms";
+  version = "3.0.3";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-omFFuM5D0tk0s8aCbXe5E84QXFKOsuSUyJCz41Jd3zM=";
+    pname = "pyviz_comms";
+    inherit version;
+    hash = "sha256-/eSgF8IhPs7mOppnQUMchF5CpcexWI5Ke6LkNwxYNyg=";
   };
 
-  propagatedBuildInputs = [ param ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"jupyterlab>=4.0.0,<5",' ""
+  '';
+
+  build-system = [
+    hatch-jupyter-builder
+    hatch-nodejs-version
+    hatchling
+  ];
+
+  dependencies = [ param ];
 
   # there are not tests with the package
   doCheck = false;
@@ -26,10 +42,10 @@ buildPythonPackage rec {
     inherit panel;
   };
 
-  meta = with lib; {
-    description = "Launch jobs, organize the output, and dissect the results";
+  meta = {
+    description = "Bidirectional communication for the HoloViz ecosystem";
     homepage = "https://pyviz.org/";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }

From a5877ab314060e603af30a54532995785073757f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sat, 14 Dec 2024 20:39:09 -0800
Subject: [PATCH 0943/1504] flutter327: 3.27.0-0.1.pre -> 3.27.1

---
 .../compilers/flutter/versions/3_27/data.json | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json
index 67aa504685be..cd44befc2230 100644
--- a/pkgs/development/compilers/flutter/versions/3_27/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_27/data.json
@@ -1,33 +1,33 @@
 {
-  "version": "3.27.0-0.1.pre",
-  "engineVersion": "af0f0d559c8a87d912a20971bbd84afc80a54b0f",
+  "version": "3.27.1",
+  "engineVersion": "cb4b5fff73850b2e42bd4de7cb9a4310a78ac40d",
   "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
   "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
-  "channel": "beta",
+  "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=",
-      "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o="
+      "aarch64-linux": "sha256-Qk4pKuuS9ixC2ufuevBGkL+JoMoI4e9l3jtJ6T9uqME=",
+      "x86_64-linux": "sha256-Qk4pKuuS9ixC2ufuevBGkL+JoMoI4e9l3jtJ6T9uqME="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-YFmK7eSt9lK/iEMPC5jxp5Vf2pnDjUDyPVoHzgxc8mA=",
-      "x86_64-linux": "sha256-YFmK7eSt9lK/iEMPC5jxp5Vf2pnDjUDyPVoHzgxc8mA="
+      "aarch64-linux": "sha256-CwoRJUGfp3ZedloMNCtOQvzpbBuyIt2sKPzYENepSH8=",
+      "x86_64-linux": "sha256-CwoRJUGfp3ZedloMNCtOQvzpbBuyIt2sKPzYENepSH8="
     }
   },
-  "dartVersion": "3.6.0-334.3.beta",
+  "dartVersion": "3.6.0",
   "dartHash": {
-    "x86_64-linux": "sha256-xErMxL9HK+MSq++DcSiV95TInMPvKkc9tqQzzMRPYDU=",
-    "aarch64-linux": "sha256-1grsqBcTmfRlMMTB1rWHVVyzZS2RLA10AADkrV4kk9I=",
-    "x86_64-darwin": "sha256-4YwpUjyFXTk6/h5OMbOKwd0gTEX0CmHo0TByVs0milA=",
-    "aarch64-darwin": "sha256-bp2tSs+JDSj3xqurc2NOOfmhbq7u/meFbA7VZPNAyZ8="
+    "x86_64-linux": "sha256-Fte5Fvb2/pW7utKm+j5vVZbFX4Ex2uPWqUWYz+F9Tzc=",
+    "aarch64-linux": "sha256-GiZWwHEccyxM+nfYNyKTeHP4XuctQVR1Rba5bzZfi88=",
+    "x86_64-darwin": "sha256-47ch7I4jtYO2FPxa28sAbiNKvcyFCxwoZetwm7IeCrI=",
+    "aarch64-darwin": "sha256-BqqA1/jx+3vDY053H1klUhxlQernOWY+nFHdbFppcXM="
   },
-  "flutterHash": "sha256-M9zETok2sIJP8V8QlvbQdobhnM0QM6OHiHF5mwUosB4=",
+  "flutterHash": "sha256-WK6Ecaxs2MAlqOyKDPfXg1d4mqyAi7NZ/lFdMZwqkzQ=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=",
-      "aarch64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg=",
-      "x86_64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=",
-      "x86_64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg="
+      "aarch64-darwin": "sha256-6MxPG5SM6qR/kVyFVjOEfLc1SgcHbwCp9ZTg0qnPlJA=",
+      "aarch64-linux": "sha256-x8l6etAf4Rwc6dwnN1ESkgd9Ug6QWZzVacw6r7Bh7fQ=",
+      "x86_64-darwin": "sha256-6MxPG5SM6qR/kVyFVjOEfLc1SgcHbwCp9ZTg0qnPlJA=",
+      "x86_64-linux": "sha256-x8l6etAf4Rwc6dwnN1ESkgd9Ug6QWZzVacw6r7Bh7fQ="
     },
     "fuchsia": {
       "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
@@ -36,38 +36,38 @@
       "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
     },
     "ios": {
-      "aarch64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=",
-      "aarch64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=",
-      "x86_64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=",
-      "x86_64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg="
+      "aarch64-darwin": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=",
+      "aarch64-linux": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=",
+      "x86_64-darwin": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU=",
+      "x86_64-linux": "sha256-56CVLFN8km5lra4r+mD/nARSa+FdvgTiyMkZqn1uucU="
     },
     "linux": {
-      "aarch64-darwin": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=",
-      "aarch64-linux": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=",
-      "x86_64-darwin": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4=",
-      "x86_64-linux": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4="
+      "aarch64-darwin": "sha256-4n4t8RchtHr1VglhREQA+/D5YTMPK41u+wB6nq97YDs=",
+      "aarch64-linux": "sha256-4n4t8RchtHr1VglhREQA+/D5YTMPK41u+wB6nq97YDs=",
+      "x86_64-darwin": "sha256-NmtvMof+onO8ZYrSd8RAao8OsDmnupbAkQhlhF82cNs=",
+      "x86_64-linux": "sha256-NmtvMof+onO8ZYrSd8RAao8OsDmnupbAkQhlhF82cNs="
     },
     "macos": {
-      "aarch64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=",
-      "aarch64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=",
-      "x86_64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=",
-      "x86_64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk="
+      "aarch64-darwin": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=",
+      "aarch64-linux": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=",
+      "x86_64-darwin": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8=",
+      "x86_64-linux": "sha256-I67I2HbhNF1dZ+yXOnFGrqPH49Uq3DOLMeYohAbueL8="
     },
     "universal": {
-      "aarch64-darwin": "sha256-s6v1V/Xjt8OZgbjQLrSx+1NTKG9YpTpydQxtvmu3Bo8=",
-      "aarch64-linux": "sha256-KmwJH7uDLbdGQQsUhdTjjwuGB39cX7db5PncSQVbJ5U=",
-      "x86_64-darwin": "sha256-iL7+1bwMolQWWWLuXxfnBJWayEGk/KtDnXh+oHpBaZg=",
-      "x86_64-linux": "sha256-0oE3278pTid3n6zVXVxXV+nEzffCs2R1vzS61c76P5g="
+      "aarch64-darwin": "sha256-W6X355Fck0op/b6YuR+BOMVl+h+UIQEpaGL/Y7vApzg=",
+      "aarch64-linux": "sha256-k6JykwlucffTtt49QJULea5ldzR58f/qZ8QoCwKCU4g=",
+      "x86_64-darwin": "sha256-CJ6TZnb7X6wHHIf53OK+V+zdVQ7s58sm/T31NogywUA=",
+      "x86_64-linux": "sha256-01GvK8iBy+HrbjYkXnT7hBYpEHxlb8Zc+CS2ax/05KE="
     },
     "web": {
-      "aarch64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=",
-      "aarch64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=",
-      "x86_64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=",
-      "x86_64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg="
+      "aarch64-darwin": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=",
+      "aarch64-linux": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=",
+      "x86_64-darwin": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU=",
+      "x86_64-linux": "sha256-5iw2jKBWOkZYXu03OLUFhRerMr30kyXarc6HjhxhCuU="
     },
     "windows": {
-      "x86_64-darwin": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w=",
-      "x86_64-linux": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w="
+      "x86_64-darwin": "sha256-91KAFNbrJEt5+0joKSqvE+T8jxkN0KZyHkh7tXbH0vQ=",
+      "x86_64-linux": "sha256-91KAFNbrJEt5+0joKSqvE+T8jxkN0KZyHkh7tXbH0vQ="
     }
   },
   "pubspecLock": {

From 1c4557ce2df182f6bc9c46b59132ceac980d27ff Mon Sep 17 00:00:00 2001
From: fumnanya <fmowete@outlook.com>
Date: Tue, 31 Dec 2024 18:57:46 +0100
Subject: [PATCH 0944/1504] xoscope: fix build for gcc14

---
 pkgs/by-name/xo/xoscope/fix-gcc14.patch | 15 +++++++++++++++
 pkgs/by-name/xo/xoscope/package.nix     |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/xo/xoscope/fix-gcc14.patch

diff --git a/pkgs/by-name/xo/xoscope/fix-gcc14.patch b/pkgs/by-name/xo/xoscope/fix-gcc14.patch
new file mode 100644
index 000000000000..8f36a09e7a39
--- /dev/null
+++ b/pkgs/by-name/xo/xoscope/fix-gcc14.patch
@@ -0,0 +1,15 @@
+--- a/configure
++++ b/configure
+@@ -7054,9 +7054,10 @@
+ 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stddef.h>
+ #include <comedilib.h>
+-main() {
+-       comedi_get_cmd_generic_timed(NULL, NULL, NULL, 0, 0);
++void main() {
++       comedi_get_cmd_generic_timed(NULL, 0, NULL, 0, 0);
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
diff --git a/pkgs/by-name/xo/xoscope/package.nix b/pkgs/by-name/xo/xoscope/package.nix
index 03c975184539..d911f997cd76 100644
--- a/pkgs/by-name/xo/xoscope/package.nix
+++ b/pkgs/by-name/xo/xoscope/package.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "0a5ycfc1qdmibvagc82r2mhv2i99m6pndy5i6ixas3j2297g6pgq";
   };
 
+  patches = [ ./fix-gcc14.patch ];
+
   nativeBuildInputs = [
     pkg-config
     gnum4

From 169ee736fcb7e5134d8dd7cc52e7a8eb0786f429 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 15:11:48 +0900
Subject: [PATCH 0945/1504] python312Packages.macaroonbakery: fix version
 string

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

diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix
index e9eb35783996..991c9bfa02a4 100644
--- a/pkgs/development/python-modules/macaroonbakery/default.nix
+++ b/pkgs/development/python-modules/macaroonbakery/default.nix
@@ -28,6 +28,12 @@ buildPythonPackage rec {
     hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";
   };
 
+  # fix version string
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"
+  '';
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [

From 217bf120c02801425afa52c3504e98af0c59e309 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 15:13:30 +0900
Subject: [PATCH 0946/1504] python312Packages.macaroonbakery: refactor

---
 pkgs/development/python-modules/macaroonbakery/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix
index 991c9bfa02a4..f1598d432e1b 100644
--- a/pkgs/development/python-modules/macaroonbakery/default.nix
+++ b/pkgs/development/python-modules/macaroonbakery/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "go-macaroon-bakery";
     repo = "py-macaroon-bakery";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";
   };
 
@@ -34,9 +34,9 @@ buildPythonPackage rec {
       --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     protobuf
     pymacaroons
     pynacl

From c2924cef015556ac42c2b67a4c8660182b40661c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 14:52:40 +0900
Subject: [PATCH 0947/1504] python312Packages.craft-store: 3.0.2 -> 3.1.0

Diff: https://github.com/canonical/craft-store/compare/refs/tags/3.0.2...3.1.0

Changelog: https://github.com/canonical/craft-store/releases/tag/3.1.0
---
 .../python-modules/craft-store/default.nix    | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix
index f9f8f73e8eb0..4c44e30fa514 100644
--- a/pkgs/development/python-modules/craft-store/default.nix
+++ b/pkgs/development/python-modules/craft-store/default.nix
@@ -6,55 +6,67 @@
   setuptools,
   setuptools-scm,
   pytest-check,
+  pytest-httpx,
   pytest-mock,
-  pydantic,
   pyyaml,
   pytestCheckHook,
-  keyring_24,
+  annotated-types,
+  httpx,
+  jaraco-classes,
+  keyring,
   macaroonbakery,
   overrides,
+  pydantic,
   pyxdg,
   requests,
   requests-toolbelt,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "craft-store";
-  version = "3.0.2";
+  version = "3.1.0";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-store";
-    rev = "refs/tags/${version}";
-    hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA=";
+    tag = version;
+    hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==" "setuptools>="
+      --replace-fail "setuptools==75.6.0" "setuptools"
   '';
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "httpx" ];
 
   dependencies = [
-    keyring_24
+    annotated-types
+    httpx
+    jaraco-classes
+    keyring
     macaroonbakery
     overrides
     pydantic
     pyxdg
     requests
     requests-toolbelt
+    typing-extensions
   ];
 
-  pythonRelaxDeps = [ "macaroonbakery" ];
-
   pythonImportsCheck = [ "craft_store" ];
 
   nativeCheckInputs = [
-    pydantic
     pytest-check
+    pytest-httpx
     pytest-mock
     pytestCheckHook
     pyyaml

From 10ef89de4580c972d334ee154dc7cb6e0a50c465 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Tue, 31 Dec 2024 13:20:11 -0600
Subject: [PATCH 0948/1504] nixos/services.tor: remove with lib;

---
 nixos/modules/services/security/tor.nix | 152 +++++++++++++-----------
 1 file changed, 81 insertions(+), 71 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index eb36e727fb0c..0d4d4c88be74 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -29,16 +29,18 @@ let
           in
           p1 != null && 0 < p2 && p2 < 1024
       )
-      (flatten [
-        cfg.settings.ORPort
-        cfg.settings.DirPort
-        cfg.settings.DNSPort
-        cfg.settings.ExtORPort
-        cfg.settings.HTTPTunnelPort
-        cfg.settings.NATDPort
-        cfg.settings.SOCKSPort
-        cfg.settings.TransPort
-      ]);
+      (
+        lib.flatten [
+          cfg.settings.ORPort
+          cfg.settings.DirPort
+          cfg.settings.DNSPort
+          cfg.settings.ExtORPort
+          cfg.settings.HTTPTunnelPort
+          cfg.settings.NATDPort
+          cfg.settings.SOCKSPort
+          cfg.settings.TransPort
+        ]
+      );
   optionBool =
     optionName:
     lib.mkOption {
@@ -68,7 +70,7 @@ let
       description = (descriptionGeneric optionName);
     };
   optionAddress = lib.mkOption {
-    type = with types; nullOr str;
+    type = with lib.types; nullOr str;
     default = null;
     example = "0.0.0.0";
     description = ''
@@ -76,7 +78,7 @@ let
     '';
   };
   optionUnix = lib.mkOption {
-    type = with types; nullOr path;
+    type = with lib.types; nullOr path;
     default = null;
     description = ''
       Unix domain socket path to use.
@@ -84,7 +86,7 @@ let
   };
   optionPort = lib.mkOption {
     type =
-      with types;
+      with lib.types;
       nullOr (oneOf [
         port
         (enum [ "auto" ])
@@ -126,7 +128,7 @@ let
           config = {
             flags =
               filter (name: config.${name} == true) isolateFlags
-              ++ optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
+              ++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
           };
         }
       ))
@@ -196,13 +198,13 @@ let
             # Only add flags in SOCKSPort to avoid duplicates
             flags =
               filter (name: config.${name} == true) flags
-              ++ optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
+              ++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
           };
         }
       ))
     ];
   optionFlags = lib.mkOption {
-    type = with types; listOf str;
+    type = with lib.types; listOf str;
     default = [ ];
   };
   optionORPort =
@@ -273,23 +275,23 @@ let
     else if isBool v then
       (if v then "1" else "0")
     else if v ? "unix" && v.unix != null then
-      "unix:" + v.unix + optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
+      "unix:" + v.unix + lib.optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
     else if v ? "port" && v.port != null then
-      optionalString (v ? "addr" && v.addr != null) "${v.addr}:"
+      lib.optionalString (v ? "addr" && v.addr != null) "${v.addr}:"
       + toString v.port
-      + optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
+      + lib.optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
     else if k == "ServerTransportPlugin" then
-      optionalString (v.transports != [ ]) "${concatStringsSep "," v.transports} exec ${v.exec}"
+      lib.optionalString (v.transports != [ ]) "${concatStringsSep "," v.transports} exec ${v.exec}"
     else if k == "HidServAuth" then
       v.onion + " " + v.auth
     else
-      generators.mkValueStringDefault { } v;
+      lib.generators.mkValueStringDefault { } v;
   genTorrc =
     settings:
-    generators.toKeyValue
+    lib.generators.toKeyValue
       {
         listsAsDuplicateKeys = true;
-        mkKeyValue = k: generators.mkKeyValueDefault { mkValueString = mkValueString k; } " " k;
+        mkKeyValue = k: lib.generators.mkKeyValueDefault { mkValueString = mkValueString k; } " " k;
       }
       (
         lib.mapAttrs (
@@ -311,8 +313,8 @@ let
       );
   torrc = pkgs.writeText "torrc" (
     genTorrc cfg.settings
-    + concatStrings (
-      mapAttrsToList (
+    + lib.concatStrings (
+      lib.mapAttrsToList (
         name: onion: "HiddenServiceDir ${onion.path}\n" + genTorrc onion.settings
       ) cfg.relay.onionServices
     )
@@ -506,7 +508,7 @@ in
           };
           type = lib.types.attrsOf (
             lib.types.submodule (
-              { name, config, ... }:
+              { ... }:
               {
                 options.clientAuthorizations = lib.mkOption {
                   description = ''
@@ -810,7 +812,7 @@ in
                   };
                 };
                 config = {
-                  path = mkDefault ((if config.secretKey == null then stateDir else runDir) + "/onion/${name}");
+                  path = lib.mkDefault ((if config.secretKey == null then stateDir else runDir) + "/onion/${name}");
                   settings.HiddenServiceVersion = config.version;
                   settings.HiddenServiceAuthorizeClient =
                     if config.authorizeClient != null then
@@ -890,7 +892,7 @@ in
           options.ConnDirectionStatistics = optionBool "ConnDirectionStatistics";
           options.ConstrainedSockets = optionBool "ConstrainedSockets";
           options.ContactInfo = optionString "ContactInfo";
-          options.ControlPort = lib.mkOption rec {
+          options.ControlPort = lib.mkOption {
             description = (descriptionGeneric "ControlPort");
             default = [ ];
             example = [ { port = 9051; } ];
@@ -1177,8 +1179,11 @@ in
     # Not sure if `cfg.relay.role == "private-bridge"` helps as tor
     # sends a lot of stats
     warnings =
-      optional
-        (cfg.settings.BridgeRelay && flatten (mapAttrsToList (n: o: o.map) cfg.relay.onionServices) != [ ])
+      lib.optional
+        (
+          cfg.settings.BridgeRelay
+          && lib.flatten (lib.mapAttrsToList (n: o: o.map) cfg.relay.onionServices) != [ ]
+        )
         ''
           Running Tor hidden services on a public relay makes the
           presence of hidden services visible through simple statistical
@@ -1189,16 +1194,16 @@ in
           actually hide your hidden services. In either case, you can
           always create a container/VM with a separate Tor daemon instance.
         ''
-      ++ flatten (
-        mapAttrsToList (
+      ++ lib.flatten (
+        lib.mapAttrsToList (
           n: o:
-          optionals (o.settings.HiddenServiceVersion == 2) [
+          lib.optionals (o.settings.HiddenServiceVersion == 2) [
             (optional (o.settings.HiddenServiceExportCircuitID != null) ''
               HiddenServiceExportCircuitID is used in the HiddenService: ${n}
               but this option is only for v3 hidden services.
             '')
           ]
-          ++ optionals (o.settings.HiddenServiceVersion != 2) [
+          ++ lib.optionals (o.settings.HiddenServiceVersion != 2) [
             (optional (o.settings.HiddenServiceAuthorizeClient != null) ''
               HiddenServiceAuthorizeClient is used in the HiddenService: ${n}
               but this option is only for v2 hidden services.
@@ -1220,12 +1225,12 @@ in
       uid = config.ids.uids.tor;
     };
 
-    services.tor.settings = mkMerge [
-      (mkIf cfg.enableGeoIP {
+    services.tor.settings = lib.mkMerge [
+      (lib.mkIf cfg.enableGeoIP {
         GeoIPFile = "${cfg.package.geoip}/share/tor/geoip";
         GeoIPv6File = "${cfg.package.geoip}/share/tor/geoip6";
       })
-      (mkIf cfg.controlSocket.enable {
+      (lib.mkIf cfg.controlSocket.enable {
         ControlPort = [
           {
             unix = runDir + "/control";
@@ -1234,47 +1239,47 @@ in
           }
         ];
       })
-      (mkIf cfg.relay.enable (
-        optionalAttrs (cfg.relay.role != "exit") {
-          ExitPolicy = mkForce [ "reject *:*" ];
+      (lib.mkIf cfg.relay.enable (
+        lib.optionalAttrs (cfg.relay.role != "exit") {
+          ExitPolicy = lib.mkForce [ "reject *:*" ];
         }
         //
-          optionalAttrs
+          lib.optionalAttrs
             (elem cfg.relay.role [
               "bridge"
               "private-bridge"
             ])
             {
               BridgeRelay = true;
-              ExtORPort.port = mkDefault "auto";
-              ServerTransportPlugin.transports = mkDefault [ "obfs4" ];
-              ServerTransportPlugin.exec = mkDefault "${lib.getExe pkgs.obfs4} managed";
+              ExtORPort.port = lib.mkDefault "auto";
+              ServerTransportPlugin.transports = lib.mkDefault [ "obfs4" ];
+              ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe pkgs.obfs4} managed";
             }
-        // optionalAttrs (cfg.relay.role == "private-bridge") {
+        // lib.optionalAttrs (cfg.relay.role == "private-bridge") {
           ExtraInfoStatistics = false;
           PublishServerDescriptor = false;
         }
       ))
-      (mkIf (!cfg.relay.enable) {
+      (lib.mkIf (!cfg.relay.enable) {
         # Avoid surprises when leaving ORPort/DirPort configurations in cfg.settings,
         # because it would still enable Tor as a relay,
         # which can trigger all sort of problems when not carefully done,
         # like the blocklisting of the machine's IP addresses
         # by some hosting providers...
-        DirPort = mkForce [ ];
-        ORPort = mkForce [ ];
-        PublishServerDescriptor = mkForce false;
+        DirPort = lib.mkForce [ ];
+        ORPort = lib.mkForce [ ];
+        PublishServerDescriptor = lib.mkForce false;
       })
-      (mkIf (!cfg.client.enable) {
+      (lib.mkIf (!cfg.client.enable) {
         # Make sure application connections via SOCKS are disabled
         # when services.tor.client.enable is false
-        SOCKSPort = mkForce [ 0 ];
+        SOCKSPort = lib.mkForce [ 0 ];
       })
-      (mkIf cfg.client.enable (
+      (lib.mkIf cfg.client.enable (
         {
           SOCKSPort = [ cfg.client.socksListenAddress ];
         }
-        // optionalAttrs cfg.client.transparentProxy.enable {
+        // lib.optionalAttrs cfg.client.transparentProxy.enable {
           TransPort = [
             {
               addr = "127.0.0.1";
@@ -1282,7 +1287,7 @@ in
             }
           ];
         }
-        // optionalAttrs cfg.client.dns.enable {
+        // lib.optionalAttrs cfg.client.dns.enable {
           DNSPort = [
             {
               addr = "127.0.0.1";
@@ -1292,8 +1297,8 @@ in
           AutomapHostsOnResolve = true;
         }
         //
-          optionalAttrs
-            (flatten (mapAttrsToList (n: o: o.clientAuthorizations) cfg.client.onionServices) != [ ])
+          lib.optionalAttrs
+            (lib.flatten (lib.mapAttrsToList (n: o: o.clientAuthorizations) cfg.client.onionServices) != [ ])
             {
               ClientOnionAuthDir = runDir + "/ClientOnionAuthDir";
             }
@@ -1305,12 +1310,17 @@ in
         concatMap
           (
             o:
-            if isInt o && o > 0 then [ o ] else optionals (o ? "port" && isInt o.port && o.port > 0) [ o.port ]
+            if isInt o && o > 0 then
+              [ o ]
+            else
+              lib.optionals (o ? "port" && isInt o.port && o.port > 0) [ o.port ]
           )
-          (flatten [
-            cfg.settings.ORPort
-            cfg.settings.DirPort
-          ]);
+          (
+            lib.flatten [
+              cfg.settings.ORPort
+              cfg.settings.DirPort
+            ]
+          );
     };
 
     systemd.services.tor = {
@@ -1332,11 +1342,11 @@ in
             "+"
             + pkgs.writeShellScript "ExecStartPre" (
               concatStringsSep "\n" (
-                flatten (
+                lib.flatten (
                   [ "set -eu" ]
-                  ++ mapAttrsToList (
+                  ++ lib.mapAttrsToList (
                     name: onion:
-                    optional (onion.authorizedClients != [ ]) ''
+                    lib.optional (onion.authorizedClients != [ ]) ''
                       rm -rf ${escapeShellArg onion.path}/authorized_clients
                       install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} ${escapeShellArg onion.path}/authorized_clients
                     ''
@@ -1344,7 +1354,7 @@ in
                       echo ${pubKey} |
                       install -o tor -g tor -m 0400 /dev/stdin ${escapeShellArg onion.path}/authorized_clients/${toString i}.auth
                     '') onion.authorizedClients
-                    ++ optional (onion.secretKey != null) ''
+                    ++ lib.optional (onion.secretKey != null) ''
                       install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path}
                       key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)"
                       case "$key" in
@@ -1354,7 +1364,7 @@ in
                       esac
                     ''
                   ) cfg.relay.onionServices
-                  ++ mapAttrsToList (
+                  ++ lib.mapAttrsToList (
                     name: onion:
                     imap0 (
                       i: prvKeyPath:
@@ -1393,9 +1403,9 @@ in
             "tor"
             "tor/onion"
           ]
-          ++ flatten (
-            mapAttrsToList (
-              name: onion: optional (onion.secretKey == null) "tor/onion/${name}"
+          ++ lib.flatten (
+            lib.mapAttrsToList (
+              name: onion: lib.optional (onion.secretKey == null) "tor/onion/${name}"
             ) cfg.relay.onionServices
           );
         # The following options are only to optimize:
@@ -1410,7 +1420,7 @@ in
             storeDir
             "/etc"
           ]
-          ++ optionals config.services.resolved.enable [
+          ++ lib.optionals config.services.resolved.enable [
             "/run/systemd/resolve/stub-resolv.conf"
             "/run/systemd/resolve/resolv.conf"
           ];
@@ -1423,7 +1433,7 @@ in
         NoNewPrivileges = true;
         PrivateDevices = true;
         PrivateMounts = true;
-        PrivateNetwork = mkDefault false;
+        PrivateNetwork = lib.mkDefault false;
         PrivateTmp = true;
         # Tor cannot currently bind privileged port when PrivateUsers=true,
         # see https://gitlab.torproject.org/legacy/trac/-/issues/20930

From 2fbed58cc3ee18d0c6fe1fda5764fb1150f96951 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 06:19:07 +0000
Subject: [PATCH 0949/1504] hyprlandPlugins.hyprsplit: 0.46.1 -> 0.46.2

---
 .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 0e594ed00297..513f5504ab8e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -9,13 +9,13 @@
 }:
 mkHyprlandPlugin hyprland rec {
   pluginName = "hyprsplit";
-  version = "0.46.1";
+  version = "0.46.2";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Hv8cVJ4lONz0g1zMwdWCL2nBUA/P8ILy7MiFjU26OM4=";
+    hash = "sha256-G+fgzjGNkYl5y6XL9K67ixCPEhb02J45cS9uicdC110=";
   };
 
   nativeBuildInputs = [

From c465daf0fa5d314d9a85112a346c4c49acbca6e1 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 15:19:42 +0900
Subject: [PATCH 0950/1504] python312Packages.keyring_24: remove

keyring_24 has been removed, use keyring instead
---
 .../python-modules/keyring_24/default.nix     | 81 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 pkgs/development/python-modules/keyring_24/default.nix

diff --git a/pkgs/development/python-modules/keyring_24/default.nix b/pkgs/development/python-modules/keyring_24/default.nix
deleted file mode 100644
index 05fbb3178147..000000000000
--- a/pkgs/development/python-modules/keyring_24/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-  installShellFiles,
-  setuptools,
-  setuptools-scm,
-  shtab,
-  importlib-metadata,
-  jaraco-classes,
-  jaraco-context,
-  jaraco-functools,
-  jeepney,
-  secretstorage,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "keyring_24";
-  # nixpkgs-update: no auto update
-  version = "24.3.1";
-  pyproject = true;
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "keyring";
-    hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs=";
-  };
-
-  nativeBuildInputs = [
-    installShellFiles
-    shtab
-  ];
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies =
-    [
-      jaraco-classes
-      jaraco-context
-      jaraco-functools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      jeepney
-      secretstorage
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
-
-  postInstall = ''
-    installShellCompletion --cmd keyring \
-      --bash <($out/bin/keyring --print-completion bash) \
-      --zsh <($out/bin/keyring --print-completion zsh)
-  '';
-
-  pythonImportsCheck = [
-    "keyring"
-    "keyring.backend"
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTestPaths =
-    [ "tests/backends/test_macOS.py" ]
-    # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.
-    ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";
-
-  meta = with lib; {
-    description = "Store and access your passwords safely";
-    homepage = "https://github.com/jaraco/keyring";
-    changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst";
-    license = licenses.mit;
-    mainProgram = "keyring";
-    maintainers = with maintainers; [ jnsgruk ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 83264b2be12a..e029b854387f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -316,6 +316,7 @@ mapAliases ({
   Kajiki = kajiki; # added 2023-02-19
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
+  keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchainplus-sdk = langsmith; # added 2023-08-01
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..00a1779a5c09 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6949,8 +6949,6 @@ self: super: with self; {
 
   keyring = callPackage ../development/python-modules/keyring { };
 
-  keyring_24 = callPackage ../development/python-modules/keyring_24 { };
-
   keyring-pass = callPackage ../development/python-modules/keyring-pass { };
 
   keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };

From b5e6e02b7c7e247f16b29c5968d1623987753d84 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 1 Jan 2025 06:23:56 +0000
Subject: [PATCH 0951/1504] utf8proc: 2.9.0 -> 2.10.0

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

diff --git a/pkgs/by-name/ut/utf8proc/package.nix b/pkgs/by-name/ut/utf8proc/package.nix
index 3d849a5417a9..7a5f5477e059 100644
--- a/pkgs/by-name/ut/utf8proc/package.nix
+++ b/pkgs/by-name/ut/utf8proc/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "utf8proc";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "JuliaStrings";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg=";
+    hash = "sha256-wmtMo6eBK/xxxkIeJfh5Yb293po9cKK+7WjqNPoxM9g=";
   };
 
   nativeBuildInputs = [ cmake ];

From f711bf972b3395a419141ee9be7ff950cebb3a30 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Jan 2025 10:57:26 +0300
Subject: [PATCH 0952/1504] kdePackages: Plasma 6.2.4 -> 6.2.5

---
 pkgs/kde/generated/sources/plasma.json | 404 ++++++++++++-------------
 1 file changed, 202 insertions(+), 202 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 32469681630c..70357307b834 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,332 +1,332 @@
 {
   "bluedevil": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/bluedevil-6.2.4.tar.xz",
-    "hash": "sha256-5mSo3RvlVwNWki7IV4vZGi24ZlamdsHIbbnDzv2+ogI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/bluedevil-6.2.5.tar.xz",
+    "hash": "sha256-Tl9D6d2ddZDimkMhSK1Rq7vTHPMChXMUJfW+jyRE8ro="
   },
   "breeze": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-6.2.4.tar.xz",
-    "hash": "sha256-TZYTiWCC8zZBOrsk74+NhlE/fpmkwLzfL0XNfFu9fCA="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-6.2.5.tar.xz",
+    "hash": "sha256-HTvUSBu3zSdKE6xdWFK+Uf8pdeYghy38IvvVMbrQTiU="
   },
   "breeze-grub": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-grub-6.2.4.tar.xz",
-    "hash": "sha256-gUbx1po18gP1XIZXwzlVkvEiEU+8yXV8/NJXukRQrIs="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-grub-6.2.5.tar.xz",
+    "hash": "sha256-AotNwvjw9mMDnl64Ayh8X549xPXz5f16RPxx1nbcOYk="
   },
   "breeze-gtk": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-gtk-6.2.4.tar.xz",
-    "hash": "sha256-YQwk1Ghr4IqSM3UWtn6fCcfjZd3cPgKXbSSvNkIzvKA="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-gtk-6.2.5.tar.xz",
+    "hash": "sha256-IRXwC7zvjmulckfpxs4WM97fNw+S2gHS/Eqvyhp0018="
   },
   "breeze-plymouth": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-plymouth-6.2.4.tar.xz",
-    "hash": "sha256-IaISI1lhDkM6NiCDYKt4NL/JHHIixqHV7d2ZI9yyDtw="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-plymouth-6.2.5.tar.xz",
+    "hash": "sha256-4D/NjM4Z3pjxstrzlw29WeF/Wfm2iN7/xOSgd6um4Uo="
   },
   "discover": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/discover-6.2.4.tar.xz",
-    "hash": "sha256-YZqKgGcPUtALvmfa6iLR2w18m0S1eGXclyVYBhutFCc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/discover-6.2.5.tar.xz",
+    "hash": "sha256-jMu4gTkqS61UCrC7RlY3oOIG72tT578C5xvI+2RTpKQ="
   },
   "drkonqi": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/drkonqi-6.2.4.tar.xz",
-    "hash": "sha256-qXCmXNwUaQWKfMZS3SzM0NazAq6QapMgjTXYINtXMtg="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/drkonqi-6.2.5.tar.xz",
+    "hash": "sha256-+V7FbHAuscukhBH9FwnYcjhJ43D/jqaZgUgtbzpdXHM="
   },
   "flatpak-kcm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/flatpak-kcm-6.2.4.tar.xz",
-    "hash": "sha256-EPiyGLMv1NCDexfov4duE2ZgR8k4+6I9d730CcOyPoM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/flatpak-kcm-6.2.5.tar.xz",
+    "hash": "sha256-JshyE62aOUorPcZhYFHWfFyqMji6qoipr7mV3YlnOy4="
   },
   "kactivitymanagerd": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kactivitymanagerd-6.2.4.tar.xz",
-    "hash": "sha256-F2csZVAMcx7rPENknPUuyuEVrf0ZQsJFmQVezj5KkNo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kactivitymanagerd-6.2.5.tar.xz",
+    "hash": "sha256-824bvFwQD0w50a8AegPEdOo90VhFkgKf4k+72xz52tY="
   },
   "kde-cli-tools": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kde-cli-tools-6.2.4.tar.xz",
-    "hash": "sha256-EXrLp9aABuApn9aBKLb+VIWekg4OOKTzlJmKuIER2ec="
-  },
-  "kdecoration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kdecoration-6.2.4.tar.xz",
-    "hash": "sha256-rGRbTVgtEQJYaUqeLqK/Zfu9S9WOnen5NUeGOXvE9xo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kde-cli-tools-6.2.5.tar.xz",
+    "hash": "sha256-HdpX90lQYKCGZYeWUZ1o1U9efaThL6bY1L9GFKxygAI="
   },
   "kde-gtk-config": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kde-gtk-config-6.2.4.tar.xz",
-    "hash": "sha256-6AGhYuhZdmGCvM/S1KvXCT273pUYPidq1N6BkhUeVkU="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kde-gtk-config-6.2.5.tar.xz",
+    "hash": "sha256-KD+YA6FfE3NN5imFWPh1QGpcfA6kbp/7pWR/SAv8alg="
+  },
+  "kdecoration": {
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kdecoration-6.2.5.tar.xz",
+    "hash": "sha256-cmxYzUs0/ElUZXhyekR8diQpOK3Vdyks0zS9YL+djyY="
   },
   "kdeplasma-addons": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kdeplasma-addons-6.2.4.tar.xz",
-    "hash": "sha256-0JnCk13XTrL0mWOHG34m+FS+QOTXdz/Jodash5/Rb5E="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kdeplasma-addons-6.2.5.tar.xz",
+    "hash": "sha256-V9E41RAa27gJLEJMWM63Ph0F0Mzj7Eo1RDJ0Tb0X5CY="
   },
   "kgamma": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kgamma-6.2.4.tar.xz",
-    "hash": "sha256-c6dF/GbNFOqm4TNQw4aDpQRRJYh6GPRh6ytk5Q5qGSI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kgamma-6.2.5.tar.xz",
+    "hash": "sha256-Pfdc3LAgrP0hbppyJATTgcik2XJivoX2cEsYnmZWEM4="
   },
   "kglobalacceld": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kglobalacceld-6.2.4.tar.xz",
-    "hash": "sha256-0ikE4sg0LbzPeoGX0mDMDff17KWuZZq4ExVXPbgNNno="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kglobalacceld-6.2.5.tar.xz",
+    "hash": "sha256-lLXMN4DKawdAk8SH7J5sNGD2Na5RRXgPh8D+hITYxsk="
   },
   "kinfocenter": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kinfocenter-6.2.4.tar.xz",
-    "hash": "sha256-a92mBn9tEVaiWKQ6Vtc0EmIP8iSwZAs+pCSt8SIwO6I="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kinfocenter-6.2.5.tar.xz",
+    "hash": "sha256-nth+2zokJWGJ+Nx5yCG49FWJqrcDLY3eeNXZTPBjn/k="
   },
   "kmenuedit": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kmenuedit-6.2.4.tar.xz",
-    "hash": "sha256-F09b+xdGQre3JEXylNQQz6zK9lczUMFK9xHkjchWrfk="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kmenuedit-6.2.5.tar.xz",
+    "hash": "sha256-CQhkX0/CSgCwI9BTfKxt7nt6utdceYC0oBxsCY3taEo="
   },
   "kpipewire": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kpipewire-6.2.4.tar.xz",
-    "hash": "sha256-duRWIGqfbpIssQYUR2oZaC+MJ5V8XImY8dGg2tuUyms="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kpipewire-6.2.5.tar.xz",
+    "hash": "sha256-20LVgfDKQnvYDuamfR+pzvARFCZsmu5/qizsvZc+Yxk="
   },
   "krdp": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/krdp-6.2.4.tar.xz",
-    "hash": "sha256-9iKdH3zPzjTXLmVl2LTL3HbvNXmHlM0u0llPca6DV7s="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/krdp-6.2.5.tar.xz",
+    "hash": "sha256-Go0349uR6AyuniK/HFmGmFxCed4kVrp7xIHHJcNKc/w="
   },
   "kscreen": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kscreen-6.2.4.tar.xz",
-    "hash": "sha256-P2YMmOaYtTqU6rdfVd1W4q/y3HrjTIvmmHVGZZnnsAI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kscreen-6.2.5.tar.xz",
+    "hash": "sha256-YjfEf+cDhNEObyDX8FjGqsylGkk9qSgHf87JGw72lkI="
   },
   "kscreenlocker": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kscreenlocker-6.2.4.tar.xz",
-    "hash": "sha256-Ep0Qw4kiIhaNu/gM29qBCtBiwm3lH3y8JZDmVfVTyxY="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kscreenlocker-6.2.5.tar.xz",
+    "hash": "sha256-Oj7S0EA5TcKoDPJc3SpsQCIUaspU5yxErxbomC6Ljk4="
   },
   "ksshaskpass": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/ksshaskpass-6.2.4.tar.xz",
-    "hash": "sha256-PdkdLhg+9eISmBvSYzkZidKrb8kk+TVROKurB/LKv78="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/ksshaskpass-6.2.5.tar.xz",
+    "hash": "sha256-heccgDfV0hmfhhrnBxifQqfK7S8DdD6oO3Vww0oR63I="
   },
   "ksystemstats": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/ksystemstats-6.2.4.tar.xz",
-    "hash": "sha256-SalO8F5qsOjw/1onIZTzTYpNVy/nn8q2XJbqLsFGDEM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/ksystemstats-6.2.5.tar.xz",
+    "hash": "sha256-7/9W9V5v5e1CMaR6RMjQjT1G/RDXTRhjRO9PL82VlaE="
   },
   "kwallet-pam": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwallet-pam-6.2.4.tar.xz",
-    "hash": "sha256-CwShwte6T9wgoHY3J6XNQ2ItKHRSPdn9gzuRLBEB1eM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwallet-pam-6.2.5.tar.xz",
+    "hash": "sha256-AWjU8jl64omuAnp9ICsP/V+NehmyM+v6ZBe4Q4Qb/UQ="
   },
   "kwayland": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwayland-6.2.4.tar.xz",
-    "hash": "sha256-9P5pl4+OmwxABYAZeC8Tv913DPVF2TJaezeIJvDNNKw="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwayland-6.2.5.tar.xz",
+    "hash": "sha256-KheozlZD/VHDz3h1QgMsEFDaOh+wDcyaMt6iiL0419I="
   },
   "kwayland-integration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwayland-integration-6.2.4.tar.xz",
-    "hash": "sha256-NH+TvNhLkNvMIhGMHYl/T3zWhmTA6H9rhm1SQABv4js="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwayland-integration-6.2.5.tar.xz",
+    "hash": "sha256-Brb7fdzxnHJ3FvR2tyJOIw9Jhsfj02Bm6RiFn9w7RBM="
   },
   "kwin": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwin-6.2.4.tar.xz",
-    "hash": "sha256-1LeOvclDLLHiJGIaxDz7gbktvO4DSv6Qu+tbIvIY8yE="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwin-6.2.5.tar.xz",
+    "hash": "sha256-XMRQpuQRBcjEmSm3JVCzMSN/lqr7KUaQ9HB73F93aEg="
   },
   "kwrited": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwrited-6.2.4.tar.xz",
-    "hash": "sha256-VbZkMQ2Y0uJtMEh49qLn3BWsMrlBB2rmozkeBJw+m2Y="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwrited-6.2.5.tar.xz",
+    "hash": "sha256-BHlPEJF6CpQWeWIBXPuwV8mAIGH/+RsCfeAaPmk315I="
   },
   "layer-shell-qt": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/layer-shell-qt-6.2.4.tar.xz",
-    "hash": "sha256-ABiXp9SZGp6VvnMVLZUTZizH2KUyEXAtkG1Ze3PO2HI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/layer-shell-qt-6.2.5.tar.xz",
+    "hash": "sha256-vAmHAhjfOHw3e60v7UsqjzkSHdvcXGuyikC+DBsADHc="
   },
   "libkscreen": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/libkscreen-6.2.4.tar.xz",
-    "hash": "sha256-PMBtXFYatNvtvFSKRlURnoYcSsKeVl/1hGJz8MdunLQ="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/libkscreen-6.2.5.tar.xz",
+    "hash": "sha256-Xtr2+i7tbdzvS8R59LsV00gay2Ct8BUOn5oTgmB7vLg="
   },
   "libksysguard": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/libksysguard-6.2.4.tar.xz",
-    "hash": "sha256-95n5Dv07Pg6hexlpuwzFdEx3YuoW0SixtNMd+njMWK4="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/libksysguard-6.2.5.tar.xz",
+    "hash": "sha256-lpTz1rUHi02C645u006yDi0QntfCI0xZpkC8MvMcdqs="
   },
   "libplasma": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/libplasma-6.2.4.tar.xz",
-    "hash": "sha256-Zu2hRftX3MWF25f9flQ/LN/HRc64PBbL49CAk59bGxQ="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/libplasma-6.2.5.tar.xz",
+    "hash": "sha256-r3cPX++XhRLHBJGIlRb7dp00DwCgInCYfS0dF3U2WOw="
   },
   "milou": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/milou-6.2.4.tar.xz",
-    "hash": "sha256-tHpjWQSneqgvsC2WoCYQAMyV2gHQdJjqnynUwHQ3dfk="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/milou-6.2.5.tar.xz",
+    "hash": "sha256-gzvK6v4pLoXv81PgmwYx9gOuISHo0db+BhsfYyAXrM8="
   },
   "ocean-sound-theme": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/ocean-sound-theme-6.2.4.tar.xz",
-    "hash": "sha256-e1SSq62KddJC54g5XNoFTez8hdD/IhvOBbkkUY8WMAo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/ocean-sound-theme-6.2.5.tar.xz",
+    "hash": "sha256-AX0yXsZzu4DfykQrdu9xoXLMomkRwoojDMc5KwFdxQU="
   },
   "oxygen": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/oxygen-6.2.4.tar.xz",
-    "hash": "sha256-hmpYvaPzYfKweMRHuViFudOQXYCyhUVIYRk9PoY6FFI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/oxygen-6.2.5.tar.xz",
+    "hash": "sha256-bXct1QnCv9A9f4AeRe/xUfNEFykAuuBbsW2LovjTt9w="
   },
   "oxygen-sounds": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/oxygen-sounds-6.2.4.tar.xz",
-    "hash": "sha256-eWe8OSAwNyWq4bVwAfIZKwaiUIT787joRfXwUaViWN4="
-  },
-  "plasma5support": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma5support-6.2.4.tar.xz",
-    "hash": "sha256-Izu9w/HAuKy7cQ9TxjCDWcMVtpmVj2eEs0Z/RyT5PY0="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/oxygen-sounds-6.2.5.tar.xz",
+    "hash": "sha256-7gg8Zyt2AF3940CQLPAwLKCBs1nKpWZnkzTaln6PdbQ="
   },
   "plasma-activities": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-activities-6.2.4.tar.xz",
-    "hash": "sha256-fJddJCHmeS6MPMpfImEdrFX0Th7IZI35dxLwDLuQfMs="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-activities-6.2.5.tar.xz",
+    "hash": "sha256-d+pznHzlFw2S141vN2XhmjLw4kt0H1JVVdWdx94V5sc="
   },
   "plasma-activities-stats": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-activities-stats-6.2.4.tar.xz",
-    "hash": "sha256-wicYULV7DaboTmEEnD3W1gJE5HSCJFZyqcIg3r8EzLs="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-activities-stats-6.2.5.tar.xz",
+    "hash": "sha256-zduiWSRlHg9d50pvqryJkDAYV7sx9O5KwfadegxIUyw="
   },
   "plasma-browser-integration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-browser-integration-6.2.4.tar.xz",
-    "hash": "sha256-UEvhuwyyKxoTwLdHE1FnL7o6Rr3I5XJNS6QBPo8tY80="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-browser-integration-6.2.5.tar.xz",
+    "hash": "sha256-JdqQUWafIKG/m9iYfZViGy5mQTGjw4cBo8Xi+G2bXc4="
   },
   "plasma-desktop": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-desktop-6.2.4.tar.xz",
-    "hash": "sha256-gfKrQM3sMykYyQsbcyq7KqDAUChU5IuPoG+4K1KSTaM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-desktop-6.2.5.tar.xz",
+    "hash": "sha256-tz0pICAxtwSUhdhOYV170KPKiQ3LLCLYEW64/m/p0Gg="
   },
   "plasma-dialer": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-dialer-6.2.4.tar.xz",
-    "hash": "sha256-sdHANPIayXww+bEsnJmPzaJk02cn0v1GSU5lWuecgWc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-dialer-6.2.5.tar.xz",
+    "hash": "sha256-DWTYOXsRAbqJgyvjbyKazthzFQpUHRECNbXQWawPYEY="
   },
   "plasma-disks": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-disks-6.2.4.tar.xz",
-    "hash": "sha256-cysnzgdv3/7LAbVRhNSVfoWSFhdk5XmDXVnlz/XnJGo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-disks-6.2.5.tar.xz",
+    "hash": "sha256-m1FKt/sL3gyxhxM0zp6oEV2JjdKJDpbuBo6lpCm+f3U="
   },
   "plasma-firewall": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-firewall-6.2.4.tar.xz",
-    "hash": "sha256-mrcISNBhbwjk8nuzHCN0aqNdgA2bdIKR6qB43RmZPVU="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-firewall-6.2.5.tar.xz",
+    "hash": "sha256-8Om32kgaODrEURIQuqmYuMJjYB8YIRsGVfXJ2YFX2mk="
   },
   "plasma-integration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-integration-6.2.4.tar.xz",
-    "hash": "sha256-jT2bAirvQRo2qtpWSTGq1OyB34uO9uP0CR42JSIpXMc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-integration-6.2.5.tar.xz",
+    "hash": "sha256-V5XlIoXe6hCHf9VkdEc9BhBxy0JbqHzvM2aDLVB2Ryk="
   },
   "plasma-mobile": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-mobile-6.2.4.tar.xz",
-    "hash": "sha256-7RmOzJAr3Ow9Zr8ePWBCFFDsP13qdLE5WqaifR7uoK8="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-mobile-6.2.5.tar.xz",
+    "hash": "sha256-rs65urOS/D2f3qWRPCAqEQeMQGB5SSdyJYG9iOxlGNI="
   },
   "plasma-nano": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-nano-6.2.4.tar.xz",
-    "hash": "sha256-X29HKQk7mLclZADJD2m+qgOZ/Qnq3RSN4BBFTYo4WiE="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-nano-6.2.5.tar.xz",
+    "hash": "sha256-czQB7HQ2hPWdrSGa1+ucFW3XMLjhcmv1WA2HlInfGsk="
   },
   "plasma-nm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-nm-6.2.4.tar.xz",
-    "hash": "sha256-9DY/MnzNdX+wE91L8pkqN6WNtrZifPLQEPMNWvr9gyo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-nm-6.2.5.tar.xz",
+    "hash": "sha256-FG12k2zphViDmpp88w+pUbfubNPap8MtcczfFXpPbGg="
   },
   "plasma-pa": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-pa-6.2.4.tar.xz",
-    "hash": "sha256-J2V1s4HCYIAnmlrPh69kJQJtLuvhqQZQc4P18J5oGlc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-pa-6.2.5.tar.xz",
+    "hash": "sha256-UXkzen6sQUWpU7RhRtSJmUXZxDNzrWD3ZpL/xCzxnUc="
   },
   "plasma-sdk": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-sdk-6.2.4.tar.xz",
-    "hash": "sha256-V29qp1HZ0s9mzfCVYs6G7QLLv3PlrlzL0G4B+BY7iHg="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-sdk-6.2.5.tar.xz",
+    "hash": "sha256-dr1i5e89nnF/fEX/WGOHMrgH56UTlCxiRywCsLKuNRE="
   },
   "plasma-systemmonitor": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-systemmonitor-6.2.4.tar.xz",
-    "hash": "sha256-R5a1pXH/Q5b9R1WxsJCyfCP6WWuHFcMs5KAxXRLIBkw="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-systemmonitor-6.2.5.tar.xz",
+    "hash": "sha256-lXXUVi5oIJYnruLzWAcLCRIsw+Cf7lDJBFHfUr8Asso="
   },
   "plasma-thunderbolt": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-thunderbolt-6.2.4.tar.xz",
-    "hash": "sha256-xDXVALHA+iwYSFGtPqIFzWBlGgqqoxqeb82I4K7vtnA="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-thunderbolt-6.2.5.tar.xz",
+    "hash": "sha256-5sOMf+hE66ay04oGzz6fLFHpiYk5ZeFoORfEbZTrJNo="
   },
   "plasma-vault": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-vault-6.2.4.tar.xz",
-    "hash": "sha256-ypk008ov5VYzxCkwIGj4F3i/SmLiIFnuK2qglQ6WhsM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-vault-6.2.5.tar.xz",
+    "hash": "sha256-a35z/DnGu14sBlc++IqJSO6lcGCKjh5J2RI4mu+lC04="
   },
   "plasma-welcome": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-welcome-6.2.4.tar.xz",
-    "hash": "sha256-2QnEefl0eZZCMv2h+AsFOlTDp0jlEnwhG5OHB2LmtlM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-welcome-6.2.5.tar.xz",
+    "hash": "sha256-6aKuDK2C75/q50cfYlYo199wmCVeqO5x+reO1IU5Jho="
   },
   "plasma-workspace": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-workspace-6.2.4.tar.xz",
-    "hash": "sha256-Mqo72inXt2p9rn4fjJeJz+f2CeuHjhp5PbSxSQyjwXQ="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-workspace-6.2.5.tar.xz",
+    "hash": "sha256-uCUR5G9i4bj2C5acgoyNjTL8eShAGnDMKMKfhfRsQS8="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-workspace-wallpapers-6.2.4.tar.xz",
-    "hash": "sha256-63qSncfSVIsO59d3N/sPLrV1cfgjXjmM4bM+kuivqls="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-workspace-wallpapers-6.2.5.tar.xz",
+    "hash": "sha256-2LB6LMPTTRNDTzog6aSW7XUCgFJi47sYnrhG1XTxvIA="
+  },
+  "plasma5support": {
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma5support-6.2.5.tar.xz",
+    "hash": "sha256-ysUkSqKWGtAg7SxDQnOJ4II0guyxeZSLX9ayIWBuiwQ="
   },
   "plymouth-kcm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plymouth-kcm-6.2.4.tar.xz",
-    "hash": "sha256-KfzAFFAn7WHFgelog49vaCtVWwuo4ODtNtmupZ2ZoX0="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plymouth-kcm-6.2.5.tar.xz",
+    "hash": "sha256-rfcELy5wmFWZUMQr1hAm/kYtZs1/u9u5l7RY9plrEEg="
   },
   "polkit-kde-agent-1": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/polkit-kde-agent-1-6.2.4.tar.xz",
-    "hash": "sha256-Et5F4Vcjm1gfIb3Zo+2j/3O8VTALqXmkLJeZ8bd1P40="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/polkit-kde-agent-1-6.2.5.tar.xz",
+    "hash": "sha256-sf+z5ETGxT24Iqj7THUFw48mE6gSrhe+JDTgL1DCk/s="
   },
   "powerdevil": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/powerdevil-6.2.4.tar.xz",
-    "hash": "sha256-F8RA19WWvgd5f2BJhcSyX5KXEoqv1vEbiKSpr+IL3a8="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/powerdevil-6.2.5.tar.xz",
+    "hash": "sha256-cCUDltXvrkvn0yAb6Hjg41/Y2b+zkGYNXgOUgosfRks="
   },
   "print-manager": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/print-manager-6.2.4.tar.xz",
-    "hash": "sha256-4Ly5GtOxnkJZp6NQl/cYedLv5tlmUhl5Az+x6R/GuJU="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/print-manager-6.2.5.tar.xz",
+    "hash": "sha256-BWAW67df4Co/LnG/pnmAbAwNwgvcZ240NFwu0Etf6sw="
   },
   "qqc2-breeze-style": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/qqc2-breeze-style-6.2.4.tar.xz",
-    "hash": "sha256-rAKm2xTlOXlvxSVfUS+o1qSOKkyq2sKD72sZDnBHEXo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/qqc2-breeze-style-6.2.5.tar.xz",
+    "hash": "sha256-OAy2NpbKISYmVlnGGOBWNhk/KOf2pZc0HrkVr13R0Q8="
   },
   "sddm-kcm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/sddm-kcm-6.2.4.tar.xz",
-    "hash": "sha256-foYsQNW82GlD89vlhVg6pVXU+gvDEqf87csxbq3fsdc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/sddm-kcm-6.2.5.tar.xz",
+    "hash": "sha256-+kARFrz8aQ/SVXwWzzlGH6nW4d4NkXpPSf+S431f31Y="
   },
   "spacebar": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/spacebar-6.2.4.tar.xz",
-    "hash": "sha256-vvdBZWaHLdxgLATJhgjSCnK3HMWSz3OAwst0HUusilg="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/spacebar-6.2.5.tar.xz",
+    "hash": "sha256-+La9PZgNuwCvjzMHAw6gXq2m2qzT5fI+wXki5mWPV6I="
   },
   "systemsettings": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/systemsettings-6.2.4.tar.xz",
-    "hash": "sha256-YXnzPDWPm5Zub7eaftYnF6qOdJdZVudasPp4clCHwVY="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/systemsettings-6.2.5.tar.xz",
+    "hash": "sha256-tQIvKUMl29PaFqvvtSoSwBjHOjx47aAy34kXPGmr03U="
   },
   "wacomtablet": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/wacomtablet-6.2.4.tar.xz",
-    "hash": "sha256-P68lefv+ibKaLlRIV7lymRFCmD8i1h4xbwnh1L/PYOM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/wacomtablet-6.2.5.tar.xz",
+    "hash": "sha256-5bNvjj5W1VwphX1tp8HjzsU49wPfihAldmOIoHrPOHs="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/xdg-desktop-portal-kde-6.2.4.tar.xz",
-    "hash": "sha256-2vLYdp0PRSZO8fSLY/UnREYiJXT/gy5A8h0GpMOCLR0="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/xdg-desktop-portal-kde-6.2.5.tar.xz",
+    "hash": "sha256-Hoa/b33EM0AK3pM0dnHsnK2I44JTbdMJMAMORRRiOvE="
   }
 }
\ No newline at end of file

From 55901e028ea58811612640f38ea55bd0dfa4f960 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 07:59:31 +0000
Subject: [PATCH 0953/1504] pack: 0.36.1 -> 0.36.2

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

diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index c9b3daaa1f53..a1255102d26e 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.36.1";
+  version = "0.36.2";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     rev = "v${version}";
-    hash = "sha256-pszPntjdEU6zUwA+NawGI3EWjk0fMOFoBr9NPTOSwig=";
+    hash = "sha256-pITQAGt0aMhEfoauPWxAqnr8JxGi4DcqcmgqtooLkd4=";
   };
 
-  vendorHash = "sha256-4c7tWZ+7L0C0zPjOg/9gJlTXuGacV3uxzxs/TF+7vOo=";
+  vendorHash = "sha256-51Qqq2Jpd1XxUoMN+6j4/VZ4fLCm4I9JwBeTcdSHgQw=";
 
   subPackages = [ "cmd/pack" ];
 

From 346f146fbcf22bf61271d2ef81231f67d65e6364 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 08:00:44 +0000
Subject: [PATCH 0954/1504] codeberg-pages: 6.1 -> 6.2

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

diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix
index 9b424cf6d1b0..5a41ea3ef8ec 100644
--- a/pkgs/by-name/co/codeberg-pages/package.nix
+++ b/pkgs/by-name/co/codeberg-pages/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "codeberg-pages";
-  version = "6.1";
+  version = "6.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Codeberg";
     repo = "pages-server";
     rev = "v${version}";
-    hash = "sha256-zG+OicdwtiHm/Ji+xfB61leCq9Ni0ysXkh4pQRju7IA=";
+    hash = "sha256-VZIrg6Hzn9yP9zdOPGx6HOK64XHeX5xc52hZXwmuMKA=";
   };
 
-  vendorHash = "sha256-OmrkO++2vnIY7ay4q3oplDYDPWH1d5VSpDCBM6nD4rk=";
+  vendorHash = "sha256-pBCVkuCuyUxla6+uZM3SWXApBpMv0rFORP4tffXkuF4=";
 
   postPatch = ''
     # disable httptest

From 0670ce28e7a6e8eaf4ab7d7ce7085305aa66fec9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:30:56 +1000
Subject: [PATCH 0955/1504] television: 0.8.1 -> 0.8.5 (#369881)

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

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index f51564c41c38..9f4e711cbd0f 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "television";
-  version = "0.8.1";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "television";
     rev = "refs/tags/" + version;
-    hash = "sha256-+HLNZvCrpVe+lw7i5uAU6nyO/tTPth6In9qn03S/SX8=";
+    hash = "sha256-LzO6LpKsox5U2IHYZXDDkUbPeZmAa/gBpG6nk78tIzQ=";
   };
 
-  cargoHash = "sha256-A+vXptX+2xEWmxJfO8nqmp0esWHZUx1HIvTLIna/x+U=";
+  cargoHash = "sha256-I0muMgPfk72dnR4iufipjt+C7v6X/IMOdLCH12qHjA8=";
 
   passthru = {
     tests.version = testers.testVersion {

From 9547942d09360e45d6acb144473f316c534ab5ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:34:11 +1000
Subject: [PATCH 0956/1504] gnome-secrets: 10.3 -> 10.4 (#369598)

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

diff --git a/pkgs/by-name/gn/gnome-secrets/package.nix b/pkgs/by-name/gn/gnome-secrets/package.nix
index 5e5fe23166ec..a6b2fb7f2f34 100644
--- a/pkgs/by-name/gn/gnome-secrets/package.nix
+++ b/pkgs/by-name/gn/gnome-secrets/package.nix
@@ -19,7 +19,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gnome-secrets";
-  version = "10.3";
+  version = "10.4";
   format = "other";
 
   src = fetchFromGitLab {
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "secrets";
     rev = version;
-    hash = "sha256-UcTLngBVp5L8Y1LmBxoxPuH5Zag2YfHA2Y+ByPBkh8A=";
+    hash = "sha256-FyBtw7Gkvd5XONkM7OVGxE+S5FpuUIl7KWLFHoQeoN4=";
   };
 
   nativeBuildInputs = [

From 9b79905b2e4be8de2aa386e0866389a167fb1434 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:34:58 +1000
Subject: [PATCH 0957/1504] keypunch: 5.0 -> 5.1 (#369797)

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

diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix
index a9c91fc3d1c5..ed8f60a0b84f 100644
--- a/pkgs/by-name/ke/keypunch/package.nix
+++ b/pkgs/by-name/ke/keypunch/package.nix
@@ -19,18 +19,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keypunch";
-  version = "5.0";
+  version = "5.1";
 
   src = fetchFromGitHub {
     owner = "bragefuglseth";
     repo = "keypunch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oP/rbtX72Ng4GVsXl5s8eESrUlJiJ/n05KArZHVo00c=";
+    hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Uz9YbD4k3o3WOXCoIW41eUdi+HIfZLZJNszr9y3qezI=";
+    hash = "sha256-RufJy5mHuirAO056p5/w63jw5h00E41t+H4VQP3kPks=";
   };
 
   strictDeps = true;

From acd43b89dac819386bdff7cdecde13f871a15c2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 09:42:47 +0100
Subject: [PATCH 0958/1504] python312Packages.tencentcloud-sdk-python: 3.0.1292
 -> 3.0.1293

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1292...3.0.1293

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1293/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 77cb84f65ed1..ff12a6001792 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1292";
+  version = "3.0.1293";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-ESLSp/EtppSs+tkaSYU2CTadLTUYIvtlpyHI9fQs1es=";
+    hash = "sha256-ho1RneF7xRO6Lc7i4BxAVjHA9UZiEZA2+olnasv4RSw=";
   };
 
   build-system = [ setuptools ];

From 5ebfa75b5fdf157b79a6f422ba5bb56c69a050c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 09:46:43 +0100
Subject: [PATCH 0959/1504] wafw00f: 2.2.0 -> 2.3.1

Diff: https://github.com/EnableSecurity/wafw00f/compare/refs/tags/v2.2.0...v2.3.1

Changelog: https://github.com/EnableSecurity/wafw00f/releases/tag/v2.3.1
---
 pkgs/by-name/wa/wafw00f/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix
index 11925b7afd6d..9e325bad1495 100644
--- a/pkgs/by-name/wa/wafw00f/package.nix
+++ b/pkgs/by-name/wa/wafw00f/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wafw00f";
-  version = "2.2.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EnableSecurity";
     repo = "wafw00f";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
+    hash = "sha256-47lzFPMyAJTtreGGazFWUYiu9e9Q1D3QYsrQbwyaQME=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 459a017af313a9f18ed9da598ca2bcd2ae8e19de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 11:06:52 +0100
Subject: [PATCH 0960/1504] python312Packages.aiorussound: 4.2.0 -> 4.3.0

Diff: https://github.com/noahhusby/aiorussound/compare/refs/tags/4.2.0...4.3.0

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

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index 10590636690b..b9fa44ca18fd 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.2.0";
+  version = "4.3.0";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     rev = "refs/tags/${version}";
-    hash = "sha256-NO8FIUaMPZqB+zjMpaCvp/1LMyCH14AhdJMpbt6PwFY=";
+    hash = "sha256-qHplUG9kzpWOxwDq200LBLiX+VCZfhGpJfGCRd4KdGg=";
   };
 
   build-system = [ poetry-core ];

From 1a77b3b360f6f0dc2ef891ebcb58166e0fed88c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:03:12 +0100
Subject: [PATCH 0961/1504] python312Packages.aiorussound: 4.3.0 -> 4.4.0

Diff: https://github.com/noahhusby/aiorussound/compare/refs/tags/4.3.0...4.4.0

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

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index b9fa44ca18fd..67c18c76f2fb 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     rev = "refs/tags/${version}";
-    hash = "sha256-qHplUG9kzpWOxwDq200LBLiX+VCZfhGpJfGCRd4KdGg=";
+    hash = "sha256-y1ArQ4o9RRngJFT3uk3wO/EVZu3kWYXUx2pnTSFUruc=";
   };
 
   build-system = [ poetry-core ];

From 010d40f68be752b36c07ab4e9223ecf6ebef4b53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 11:06:23 +0100
Subject: [PATCH 0962/1504] python312Packages.pylamarzocco: 1.4.3 -> 1.4.5

Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.4.3...v1.4.5

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

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 0571811c19bd..4f57d6ce5653 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "1.4.3";
+  version = "1.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bSwlAaaUVeORDJFWY8I2iIiQ9OvvDrpDBoQ3Ns5NrRM=";
+    hash = "sha256-LUfeRCi5OezkoYL+htJuJ/VyYJeuFTasAeXROcajzyA=";
   };
 
   build-system = [ setuptools ];

From 760f794ef6e63191f35fba4a92aa2498acbbf599 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:04:02 +0100
Subject: [PATCH 0963/1504] python312Packages.pylamarzocco: 1.4.5 -> 1.4.6

Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.4.5...v1.4.6

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

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 4f57d6ce5653..11810895c8a6 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "1.4.5";
+  version = "1.4.6";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LUfeRCi5OezkoYL+htJuJ/VyYJeuFTasAeXROcajzyA=";
+    hash = "sha256-Ntss7erVbpeW6EEeKrkR/anzvTUQhzggNhHi6rOIsFQ=";
   };
 
   build-system = [ setuptools ];

From 7e5f439281110fdb6f68c45a773bb2c7ba20372f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 09:11:00 +0000
Subject: [PATCH 0964/1504] yarn-berry: 4.5.3 -> 4.6.0

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

diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix
index 25cfdab64ad7..2454f163958d 100644
--- a/pkgs/development/tools/yarn-berry/default.nix
+++ b/pkgs/development/tools/yarn-berry/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yarn-berry";
-  version = "4.5.3";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "yarnpkg";
     repo = "berry";
     rev = "@yarnpkg/cli/${finalAttrs.version}";
-    hash = "sha256-ywg+SYjFlWUMQftw1eZE5UY3nfxn6xy1NIawgmH/4vY=";
+    hash = "sha256-POo/VPKC4mPZD73WUJOn5b7fo3ya41ic64iRCscjQ3w=";
   };
 
   buildInputs = [

From e2543131df13fe40b02673b0437c83384109a78d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:11:14 +0100
Subject: [PATCH 0965/1504] python312Packages.pyvlx: 0.2.25 -> 0.2.26

Diff: https://github.com/Julius2342/pyvlx/compare/refs/tags/0.2.25...0.2.26

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

diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix
index 73973a6ad989..4b863cedb242 100644
--- a/pkgs/development/python-modules/pyvlx/default.nix
+++ b/pkgs/development/python-modules/pyvlx/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pyvlx";
-  version = "0.2.25";
+  version = "0.2.26";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Julius2342";
     repo = "pyvlx";
     rev = "refs/tags/${version}";
-    hash = "sha256-c0HlmqLvpIn2GXorOArBKJ0YzvWz1spmhWwm6Gow2iU=";
+    hash = "sha256-JwgElt0FFSGs3v+04AKPwTTpxvn8YzihJeD/+llbSMI=";
   };
 
   build-system = [ setuptools ];

From 84b8f93de353dc15c8300c3e2ed0074b4b25f4a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:13:16 +0100
Subject: [PATCH 0966/1504] python312Packages.aiomisc: 17.5.29 -> 17.5.31

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

diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index 629cf183e8a2..7b7cd32e4a35 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.5.29";
+  version = "17.5.31";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DjOl4eymyD2n1bbDUI+s3iGiWjT/AhRqmTmiZpufLNU=";
+    hash = "sha256-ty2WUMP0S/FNmSHD0ms7putftAFSDqtuP8F4jTA0WpY=";
   };
 
   build-system = [ poetry-core ];

From 05191604c0411b5f3cadffac78c7ce794e075e30 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Wed, 1 Jan 2025 09:29:30 +0000
Subject: [PATCH 0967/1504] mpfi: fix gcc-14 build

https://gitlab.inria.fr/mpfi/mpfi/-/commit/a02e3f9cc10767cc4284a2ef6554f6df85e41982
---
 pkgs/by-name/mp/mpfi/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/mp/mpfi/package.nix b/pkgs/by-name/mp/mpfi/package.nix
index a5ba01b2af84..4076f1840229 100644
--- a/pkgs/by-name/mp/mpfi/package.nix
+++ b/pkgs/by-name/mp/mpfi/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   autoreconfHook,
   texinfo,
   mpfr,
@@ -26,6 +27,15 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${src.name}/mpfi";
 
+  patches = [
+    (fetchpatch {
+      name = "incorrect-types-corrected.patch";
+      url = "https://gitlab.inria.fr/mpfi/mpfi/-/commit/a02e3f9cc10767cc4284a2ef6554f6df85e41982.patch";
+      relative = "mpfi";
+      hash = "sha256-ogUoZbQMkZMF8chSGdDymH/ewzjKSSc7GAMK2Wp58uo=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     texinfo

From 45a5b0b4e59d3e95e7dc1c124574226d5429ee75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:47:19 +0100
Subject: [PATCH 0968/1504] python311Packages.hstspreload: 2024.12.1 ->
 2025.1.1

Diff: https://github.com/sethmlarson/hstspreload/compare/refs/tags/2024.12.1...2025.1.1
---
 pkgs/development/python-modules/hstspreload/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index 9410c3bcc2e3..b1364c887bc5 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "hstspreload";
-  version = "2024.12.1";
+  version = "2025.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "sethmlarson";
     repo = "hstspreload";
     rev = "refs/tags/${version}";
-    hash = "sha256-j1YtT8O4LGpUEOJhACKmz934VTgwM8o7C8ozoqPlsCM=";
+    hash = "sha256-2KtQZroKhRzqFg0xL/gXMA3jP0FgYSPYy1eP3x78rQo=";
   };
 
   build-system = [ setuptools ];

From 413c61994bfd7108c5ed21da48ad58a36801c917 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 10:05:53 +0000
Subject: [PATCH 0969/1504] squeezelite: 2.0.0.1507 -> 2.0.0.1517

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

diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix
index 6ccd30f91a31..638c6784a920 100644
--- a/pkgs/by-name/sq/squeezelite/package.nix
+++ b/pkgs/by-name/sq/squeezelite/package.nix
@@ -40,13 +40,13 @@ stdenv.mkDerivation {
   pname = binName;
   # versions are specified in `squeezelite.h`
   # see https://github.com/ralph-irving/squeezelite/issues/29
-  version = "2.0.0.1507";
+  version = "2.0.0.1517";
 
   src = fetchFromGitHub {
     owner = "ralph-irving";
     repo = "squeezelite";
-    rev = "279ac086053239323f5c4df965342e3be5d10671";
-    hash = "sha256-iMqBQJDy1pkGNHH2aFOtzBn9VK5x+Na4iD2vc3bppTc=";
+    rev = "262994a989dc29ce3be4390c57c6a43373dfdca2";
+    hash = "sha256-QmjjVbE5lQhKMt2Loq7wPV16phcEUUcdiNGdmImkoAI=";
   };
 
   buildInputs =

From 7016fe9d74d694b0bafcb9018dec9c663a902ff1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 10:14:47 +0000
Subject: [PATCH 0970/1504] bonsai: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix
index 186c77f6c81c..a8cb48e55294 100644
--- a/pkgs/by-name/bo/bonsai/package.nix
+++ b/pkgs/by-name/bo/bonsai/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bonsai";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromSourcehut {
     owner = "~stacyharper";
     repo = "bonsai";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ggk+OKaRE+kVa8/ij3znuY3b0dT2F5F1CSse4l0MAA8=";
+    hash = "sha256-WAne0628lELQanUv2lg8Y9QEikZVAT7Xtkndhs8Ozjw=";
   };
 
   nativeBuildInputs = [

From e85853c70f4aacbd633b350d4c8370bd079b411e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 1 Jan 2025 12:00:12 +0100
Subject: [PATCH 0971/1504] osu-lazer-bin: 2024.1224.1 -> 2025.101.0

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 88ce164999ae..8de3f417ef3c 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2024.1224.1";
+  version = "2025.101.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-p/1rmz+CnuVl72wOKJpHFkJv64vKRoMSV15KRUgjhu0=";
+        hash = "sha256-JPRjnpBt9CW4/8ykPbVCM6kv8CXEacqJTt6CPByd1P4=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-jVEjqpKJsFC+rSwSNokKxYarwB4CybWSG8gdtxocFZ4=";
+        hash = "sha256-ryDKe8A8pCycPpupWv+zEtGWFs96sBahLF00hCzUViM=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-9qZ5XNAII2I4PemNGrWuUCY1Syq5PH3NBc2/Jj5tcoQ=";
+        hash = "sha256-GsnTxVpNk2RXHLET6Ugv0/ZOlq8RUkw2ZXqRjkU+dzw=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 85e81cd03e9f10e4a60ee4a0fe493feae6d6c5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 1 Jan 2025 12:01:25 +0100
Subject: [PATCH 0972/1504] osu-lazer: 2024.1224.1 -> 2025.101.0

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

diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index f375bd2a3ddd..a3616ea3b7c5 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2024.1224.1";
+  version = "2025.101.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-T9KYb+fVcCWtb33ImHyoipJqsLr2em4GoYyvsSgIWx0=";
+    hash = "sha256-8sckmwFFL7Vcf947EVxqIRPU/yYrEFVwz+zqwZZ34Mw=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From efe62b612a8b99fd2015f5e2caa386eaafc97c29 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Wed, 1 Jan 2025 20:32:31 +0900
Subject: [PATCH 0973/1504] satyrographos: init at 0.0.2.13

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

diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix
new file mode 100644
index 000000000000..611fdd4331e8
--- /dev/null
+++ b/pkgs/by-name/sa/satyrographos/package.nix
@@ -0,0 +1,50 @@
+{
+  ocamlPackages,
+  fetchFromGitHub,
+  lib,
+}:
+
+let
+  pname = "satyrographos";
+  version = "0.0.2.13";
+  src = fetchFromGitHub {
+    owner = "na4zagin3";
+    repo = "satyrographos";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-f9iJTr4nV7dFCMkI8+zv9qvYWRSw8H/xbbZm2LR9cB4=";
+  };
+in
+ocamlPackages.buildDunePackage {
+  inherit pname version src;
+
+  duneVersion = "3";
+
+  nativeBuildInputs = with ocamlPackages; [
+    menhir
+  ];
+
+  buildInputs = with ocamlPackages; [
+    core_unix
+    fileutils
+    opam-format
+    opam-state
+    ppx_deriving
+    ppx_deriving_yojson
+    ppx_import
+    ppx_jane
+    shexp
+    uri
+    uri-sexp
+    yaml-sexp
+    yojson
+  ];
+
+  meta = {
+    changelog = "https://github.com/na4zagin3/satyrographos/releases/tag/${src.rev}";
+    description = "Package manager for SATySFi";
+    homepage = "https://github.com/na4zagin3/satyrographos";
+    maintainers = with lib.maintainers; [ momeemt ];
+    mainProgram = "satyrographos";
+    license = lib.licenses.lgpl3Plus;
+  };
+}

From a846ccc8806b0c12d9c73b30815e67e5d3621bd3 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Tue, 31 Dec 2024 19:01:57 +0100
Subject: [PATCH 0974/1504] openroad: 2.0-unstable-2024-12-22 ->
 2.0-unstable-2024-12-31

---
 .../science/electronics/openroad/default.nix  | 23 +++++++++-----
 .../electronics/openroad/swig43-compat.patch  | 30 +++++++++++++++++++
 2 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/science/electronics/openroad/swig43-compat.patch

diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix
index e86b68202ceb..4558a9f69b4b 100644
--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/applications/science/electronics/openroad/default.nix
@@ -15,6 +15,7 @@
   clp, # for or-tools
   cudd,
   eigen,
+  gtest,
   glpk,
   lcov,
   lemon-graph,
@@ -43,22 +44,27 @@ let
 in
 mkDerivation rec {
   pname = "openroad";
-  version = "2.0-unstable-2024-12-22";
+  version = "2.0-unstable-2024-12-31";
 
   src = fetchFromGitHub {
     owner = "The-OpenROAD-Project";
     repo = "OpenROAD";
-    rev = "51302eb80b11576a01171d33452c362301d55143";
+    rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9";
     fetchSubmodules = true;
-    hash = "sha256-xFeZo6GjKKee7fTrzN4TNNL8eeTDJXyQGPkIKU/WvIc=";
+    hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o=";
   };
 
+  patches = [
+    ./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451
+  ];
+
   nativeBuildInputs = [
     bison
     cmake
     doxygen
     flex
     git
+    gtest
     pkg-config
     swig
   ];
@@ -95,15 +101,13 @@ mkDerivation rec {
     patchShebangs --build etc/find_messages.py
   '';
 
-  # Enable output images from the placer.
   cmakeFlags = [
-    # Tries to download gtest 1.13 as part of the build. We currently rely on
-    # the regression tests so we can get by without building unit tests.
-    "-DENABLE_TESTS=OFF"
+    "-DENABLE_TESTS=ON"
     "-DUSE_SYSTEM_BOOST=ON"
     "-DUSE_SYSTEM_ABC=OFF"
     "-DUSE_SYSTEM_OPENSTA=OFF"
-    "-DOPENROAD_VERSION=${src.rev}"
+    "-DOPENROAD_VERSION=${version}_${src.rev}"
+    "-DCMAKE_RULE_MESSAGES=OFF"
     "-DTCL_LIBRARY=${tcl}/lib/libtcl.so"
     "-DTCL_HEADER=${tcl}/include/tcl.h"
   ];
@@ -115,6 +119,9 @@ mkDerivation rec {
   # to see if there are any breaking changes in unstable that should be vendored as well.
   doCheck = true;
   checkPhase = ''
+    # Disable two tests that are failing curently.
+    sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake
+    make test
     ../test/regression
   '';
 
diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
new file mode 100644
index 000000000000..97456f84d4d5
--- /dev/null
+++ b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
@@ -0,0 +1,30 @@
+diff --git a/src/odb/src/swig/python/dbtypes.i b/src/odb/src/swig/python/dbtypes.i
+index 37305d55e..d85f2915e 100644
+--- a/src/odb/src/swig/python/dbtypes.i
++++ b/src/odb/src/swig/python/dbtypes.i
+@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
+   swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*");
+   for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {
+     PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);
+-    $result = SWIG_Python_AppendOutput($result, o);
++    $result = SWIG_Python_AppendOutput($result, o, 0);
+   }
+ }
+ 
+@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
+     auto layer = it->second;
+     PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);
+     PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);
+-    $result = SWIG_Python_AppendOutput($result, tuple);
++    $result = SWIG_Python_AppendOutput($result, tuple, 0);
+   }
+ }
+ 
+ %typemap(argout) std::vector<int> &OUTPUT {
+   for(auto it = $1->begin(); it != $1->end(); it++) {
+     PyObject *obj = PyInt_FromLong((long)*it);
+-    $result = SWIG_Python_AppendOutput($result, obj);
++    $result = SWIG_Python_AppendOutput($result, obj, 0);
+   }
+ }
+ 

From b0ad8eafb04bdc948bc3a35ebe3a92cadd56d511 Mon Sep 17 00:00:00 2001
From: Arne Keller <arne.keller@posteo.de>
Date: Wed, 1 Jan 2025 12:57:47 +0100
Subject: [PATCH 0975/1504] megasync: avoid double wrapping

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

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 6d9c23ce13da..8ac1a9099e37 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -122,8 +122,8 @@ mkDerivation rec {
     (lib.cmakeBool "ENABLE_DESIGN_TOKENS_IMPORTER" false) # cannot be fetched
   ];
 
-  postInstall = ''
-    wrapProgram $out/bin/megasync --prefix PATH : ${lib.makeBinPath [ xorg.xrdb ]}
+  preFixup = ''
+    qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xorg.xrdb ]})
   '';
 
   meta = with lib; {

From ef991d736911a57f71099b2b3fbf76d6db6f8c97 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 12:58:30 +0100
Subject: [PATCH 0976/1504] python311Packages.lsassy: 3.1.12 -> 3.1.13

Diff: https://github.com/Hackndo/lsassy/compare/refs/tags/v3.1.12...v3.1.13

Changelog: https://github.com/Hackndo/lsassy/releases/tag/v3.1.13
---
 pkgs/development/python-modules/lsassy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index 5bd9ec7c0df7..52c2e211ade4 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "lsassy";
-  version = "3.1.12";
+  version = "3.1.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Hackndo";
     repo = "lsassy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Idel52GAzir+SVgKfMU+e8Z0EkMf+PBdIcaQd0o8qJE=";
+    hash = "sha256-DdIEDseGLI+hUIaUNPBqpkGGe+F+Z+jZ0g/JzXB8pf8=";
   };
 
   pythonRelaxDeps = [

From e6c9304a2d5ccbea1abd6742b3e879c6495bec8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 12:20:35 +0000
Subject: [PATCH 0977/1504] libtorrent: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 14198f003bbd..3faae47e02ce 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rakshasa-libtorrent";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
     rev = "v${version}";
-    hash = "sha256-MDLAp7KFmVvHL+haWVYwWG8gnLkTh6g19ydRkbu9cIs=";
+    hash = "sha256-FtuVDXH9vIdz+Wz7PLY2lRZkR+j9NYmgaHPDDx2SA98=";
   };
 
   nativeBuildInputs = [

From 87c9626b22879ee03f7300f64249ef251ab73d56 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 5 Apr 2024 00:59:43 +0200
Subject: [PATCH 0978/1504] mesen: init at 2.0.0-unstable-2024-12-25

---
 pkgs/by-name/me/mesen/deps.json               | 272 ++++++++++++++++++
 ...dont-use-alternative-restore-sources.patch |  16 ++
 .../by-name/me/mesen/dont-zip-libraries.patch |  74 +++++
 pkgs/by-name/me/mesen/package.nix             |  82 ++++++
 4 files changed, 444 insertions(+)
 create mode 100644 pkgs/by-name/me/mesen/deps.json
 create mode 100644 pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
 create mode 100644 pkgs/by-name/me/mesen/dont-zip-libraries.patch
 create mode 100644 pkgs/by-name/me/mesen/package.nix

diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json
new file mode 100644
index 000000000000..8b2284636873
--- /dev/null
+++ b/pkgs/by-name/me/mesen/deps.json
@@ -0,0 +1,272 @@
+[
+  {
+    "pname": "Avalonia",
+    "version": "11.2.0",
+    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.1.0",
+    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.2.0",
+    "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.2.0",
+    "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA="
+  },
+  {
+    "pname": "Avalonia.Controls.ProportionalStackPanel",
+    "version": "11.2.0",
+    "hash": "sha256-Y8tX7dBzSl69NOSNdpNGzGetc6wQtKnFy/KRnV0SKhQ="
+  },
+  {
+    "pname": "Avalonia.Controls.Recycling",
+    "version": "11.2.0",
+    "hash": "sha256-ylsPhtILO0pk+5uPZKB5L1o7X8JTiOe48czPPLYLyVs="
+  },
+  {
+    "pname": "Avalonia.Controls.Recycling.Model",
+    "version": "11.2.0",
+    "hash": "sha256-zAleY6ryWIexJAzz4BpT/Xd3iDgNL624YW5sIBJ0Sv8="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.2.0",
+    "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.2.0",
+    "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.2.0",
+    "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo="
+  },
+  {
+    "pname": "Avalonia.MarkupExtension",
+    "version": "11.2.0",
+    "hash": "sha256-BUEMX+YThWmxh9X50bGsFtclLFVSIITMlAf0iq2vApk="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.2.0",
+    "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI="
+  },
+  {
+    "pname": "Avalonia.ReactiveUI",
+    "version": "11.2.0",
+    "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.0",
+    "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.2.0",
+    "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.2.0",
+    "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.2.0",
+    "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.2.0",
+    "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.2.0",
+    "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.0.0",
+    "hash": "sha256-G+PXrc2sr2pdy+JCr3t/Ge6nTDtuoWf1Eypu5HufAxw="
+  },
+  {
+    "pname": "Dock.Avalonia",
+    "version": "11.2.0",
+    "hash": "sha256-Q8YUsH+hfnL9VDMPTJSAms7xb+hr42p7scWqu2c2eD4="
+  },
+  {
+    "pname": "Dock.Model",
+    "version": "11.2.0",
+    "hash": "sha256-+PSgjxvHIJBQRn8naGgSfYyArImVLwy6ftm9FoQc+lA="
+  },
+  {
+    "pname": "Dock.Model.Mvvm",
+    "version": "11.2.0",
+    "hash": "sha256-iO67eWHoxsB51Wx5KIK4dwVkU9qwrja7pYsQWTs/8sA="
+  },
+  {
+    "pname": "Dock.Settings",
+    "version": "11.2.0",
+    "hash": "sha256-esCRl7Trdv2bu2ayLw5kXVtCskXLar1asykkfWnqhug="
+  },
+  {
+    "pname": "DotNet.Bundle",
+    "version": "0.9.13",
+    "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="
+  },
+  {
+    "pname": "DynamicData",
+    "version": "8.3.27",
+    "hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="
+  },
+  {
+    "pname": "DynamicData",
+    "version": "8.4.1",
+    "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
+  },
+  {
+    "pname": "ELFSharp",
+    "version": "2.17.3",
+    "hash": "sha256-8OaAkLxpa5rIhxbmDSnKLeY06jS7nV66LjBjXxHnOb0="
+  },
+  {
+    "pname": "Fody",
+    "version": "6.8.0",
+    "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.2",
+    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.2",
+    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.2",
+    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.3-preview.2.2",
+    "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.2",
+    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "ReactiveUI",
+    "version": "19.5.41",
+    "hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="
+  },
+  {
+    "pname": "ReactiveUI",
+    "version": "20.1.1",
+    "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
+  },
+  {
+    "pname": "ReactiveUI.Fody",
+    "version": "19.5.41",
+    "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.8",
+    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.8",
+    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "Splat",
+    "version": "14.8.12",
+    "hash": "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="
+  },
+  {
+    "pname": "Splat",
+    "version": "15.1.1",
+    "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
+  },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.1",
+    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.20.0",
+    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+  }
+]
diff --git a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
new file mode 100644
index 000000000000..1c194a4a3084
--- /dev/null
+++ b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
@@ -0,0 +1,16 @@
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 2a0eb78..74751bc 100644
+--- a/UI/UI.csproj
++++ b/UI/UI.csproj
+@@ -90,11 +90,6 @@
+ 	  <None Remove="Styles\StartupStyles.xaml" />
+ 	  <None Remove="Utilities\DipSwitchDefinitions.xml" />
+ 	</ItemGroup>
+-	<PropertyGroup>
+-		<RestoreSources>
+-			https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json
+-		</RestoreSources>
+-	</PropertyGroup>
+ 	<ItemGroup>
+ 		<TrimmerRootAssembly Include="Mesen" />
+ 		<TrimmerRootAssembly Include="AvaloniaEdit" />
diff --git a/pkgs/by-name/me/mesen/dont-zip-libraries.patch b/pkgs/by-name/me/mesen/dont-zip-libraries.patch
new file mode 100644
index 000000000000..6aeed6c3e757
--- /dev/null
+++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch
@@ -0,0 +1,74 @@
+diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs
+index 56c1ff1..ed5fe8a 100644
+--- a/UI/Config/ConfigManager.cs
++++ b/UI/Config/ConfigManager.cs
+@@ -51,7 +51,6 @@ namespace Mesen.Config
+ 			} else {
+ 				homeFolder = DefaultDocumentsFolder;
+ 			}
+-			Program.ExtractNativeDependencies(homeFolder);
+ 			_homeFolder = homeFolder;
+ 			Config.Save();
+ 		}
+diff --git a/UI/Program.cs b/UI/Program.cs
+index dfc4ba3..632cef2 100644
+--- a/UI/Program.cs
++++ b/UI/Program.cs
+@@ -54,8 +54,6 @@ namespace Mesen
+ 			Environment.CurrentDirectory = ConfigManager.HomeFolder;
+ 
+ 			if(!File.Exists(ConfigManager.GetConfigFile())) {
+-				//Could not find configuration file, show wizard
+-				ExtractNativeDependencies(ConfigManager.HomeFolder);
+ 				App.ShowConfigWindow = true;
+ 				BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose);
+ 				if(File.Exists(ConfigManager.GetConfigFile())) {
+@@ -68,9 +66,6 @@ namespace Mesen
+ 			//Start loading config file in a separate thread
+ 			Task.Run(() => ConfigManager.LoadConfig());
+ 
+-			//Extract core dll & other native dependencies
+-			ExtractNativeDependencies(ConfigManager.HomeFolder);
+-
+ 			if(CommandLineHelper.IsTestRunner(args)) {
+ 				return TestRunner.Run(args);
+ 			}
+@@ -147,7 +142,7 @@ namespace Mesen
+ 						libraryName = libraryName + ".dylib";
+ 					}
+ 				}
+-				return NativeLibrary.Load(Path.Combine(ConfigManager.HomeFolder, libraryName));
++				return NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, libraryName));
+ 			}
+ 			return IntPtr.Zero;
+ 		}
+diff --git a/UI/UI.csproj b/UI/UI.csproj
+index 053d495..2a0eb78 100644
+--- a/UI/UI.csproj
++++ b/UI/UI.csproj
+@@ -634,7 +634,6 @@
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" />
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" />
+     <EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" />
+-    <EmbeddedResource Include="Dependencies.zip" />
+     <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
+     <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
+   </ItemGroup>
+@@ -644,16 +643,5 @@
+     </AvaloniaXaml>
+   </ItemGroup>
+ 
+-  <Target Name="PreBuildWindows" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='win-x64'">
+-    <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" />
+-  </Target>
+-
+-	<Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64'">
+-    <Exec Command="cd $(OutDir)&#xD;&#xA;rm -rf Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.so Dependencies&#xD;&#xA;cp libSkiaSharp.so Dependencies&#xD;&#xA;cp MesenCore.so Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
+-  </Target>
+-  
+-	<Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'">
+-    <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)&#xD;&#xA;cd $(OutDir)&#xD;&#xA;rm -R Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.dylib Dependencies&#xD;&#xA;cp libSkiaSharp.dylib Dependencies&#xD;&#xA;cp MesenCore.dylib Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
+-  </Target>
+ 
+ </Project>
+
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
new file mode 100644
index 000000000000..43957a1c7004
--- /dev/null
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  clangStdenv,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  wrapGAppsHook3,
+  gtk3,
+  SDL2,
+}:
+
+buildDotnetModule rec {
+  pname = "mesen";
+  version = "2.0.0-unstable-2024-12-25";
+
+  src = fetchFromGitHub {
+    owner = "SourMesen";
+    repo = "Mesen2";
+    rev = "6820db37933002089a04d356d8469481e915a359";
+    hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE=";
+  };
+
+  patches = [
+    # the nightly avalonia repository url is still queried, which errors out
+    # even if we don't actually need any nightly versions
+    ./dont-use-alternative-restore-sources.patch
+    # upstream has a weird library loading mechanism, which we override with a more sane alternative
+    ./dont-zip-libraries.patch
+  ];
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+  projectFile = [ "UI/UI.csproj" ];
+
+  dotnetFlags = [
+    "-p:RuntimeIdentifier=${dotnetCorePackages.systemToDotnetRid clangStdenv.hostPlatform.system}"
+  ];
+
+  executables = [ "Mesen" ];
+
+  nugetDeps = ./deps.json;
+
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
+  runtimeDeps = [ gtk3 ];
+
+  postInstall = ''
+    ln -s ${passthru.core}/lib/MesenCore.* $out/lib/mesen
+  '';
+
+  # according to upstream, compiling with clang creates a faster binary
+  passthru.core = clangStdenv.mkDerivation {
+    pname = "mesen-core";
+    inherit version src;
+
+    enableParallelBuilding = true;
+
+    strictDeps = true;
+
+    nativeBuildInputs = [ SDL2 ];
+
+    buildInputs = [ SDL2 ];
+
+    makeFlags = [ "core" ];
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 InteropDLL/obj.*/MesenCore.* -t $out/lib
+      runHook postInstall
+    '';
+  };
+
+  meta = {
+    badPlatforms = [ "aarch64-linux" ]; # not sure what the issue is
+    description = "Multi-system emulator that supports NES, SNES, Game Boy (Color) and PC Engine games";
+    homepage = "https://www.mesen.ca";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "Mesen";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}

From 1f2141968a4962a65f8caa262f1113d75da8c88a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 12:30:20 +0000
Subject: [PATCH 0979/1504] abracadabra: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index c5d1d649fdb6..30f14f074c94 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     rev = "v${version}";
-    hash = "sha256-bzRXGxSWoiBqvx8r2coNVPQKilOAKFoqBcB4F0uAV8g=";
+    hash = "sha256-PPG71W5HeLr4R8je88K4VXPiSbJn5T7dP3M05C+bkv0=";
   };
 
   nativeBuildInputs = [

From ce7b7b0c6389827d5a8f3e65f4ba589132e048cb Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 31 Dec 2024 21:20:48 +0000
Subject: [PATCH 0980/1504] breakpad: gcc-14 fix

https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d
---
 pkgs/by-name/br/breakpad/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/br/breakpad/package.nix b/pkgs/by-name/br/breakpad/package.nix
index 5539543a33ac..a3bdd857bc40 100644
--- a/pkgs/by-name/br/breakpad/package.nix
+++ b/pkgs/by-name/br/breakpad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchgit,
+  fetchpatch,
   zlib,
 }:
 let
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "gcc-14-fixes.patch";
+      url = "https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d.patch";
+      hash = "sha256-OxodMx7XfKiD9j6b8oFvloslYagSSpQn7BPdpMVOoDY=";
+    })
+  ];
+
   buildInputs = [ zlib ];
 
   postUnpack = ''

From 984ed569b2d7d8ff4a831f6b774464907855e0d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 13:03:38 +0000
Subject: [PATCH 0981/1504] sirikali: 1.7.2 -> 1.8.0

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

diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix
index e122665acb4c..692a27cdb4d8 100644
--- a/pkgs/by-name/si/sirikali/package.nix
+++ b/pkgs/by-name/si/sirikali/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sirikali";
-  version = "1.7.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "sirikali";
     rev = version;
-    hash = "sha256-UtgK+q06J6T6RJ8jQiwzg5yVtgGZaZzmfadNyXxTCIk=";
+    hash = "sha256-zEiX0eAsmfWDXehxetkqXbdXhB53DE5LDyglMBijckI=";
   };
 
   buildInputs =

From 45e2426453f3e43271fae4b2e1b94adfb995b44c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 1 Jan 2025 13:02:58 +0000
Subject: [PATCH 0982/1504] boost{177,178,179,180,181,182,183}: conditionalize
 stacktrace flag

This library was introduced in Boost 1.85.

Fixes: 3e2ceab20157c37566df2f2ea35d4a6dac95732c
---
 pkgs/development/libraries/boost/generic.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 91009c02167e..b3bd289c5ade 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -89,6 +89,8 @@ let
       "link=${link}"
       "-sEXPAT_INCLUDE=${expat.dev}/include"
       "-sEXPAT_LIBPATH=${expat.out}/lib"
+    ]
+    ++ lib.optionals (lib.versionAtLeast version "1.85") [
       (
         # The stacktrace from exception feature causes memory leaks when built
         # with libc++. For all other standard library implementations, i.e.
@@ -99,9 +101,8 @@ let
         else
           "define=BOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK"
       )
-
-      # TODO: make this unconditional
     ]
+    # TODO: make this unconditional
     ++
       lib.optionals
         (

From 3e0fe7132bcac57c0511ad5709dfbf7c988ff466 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 1 Jan 2025 14:10:04 +0100
Subject: [PATCH 0983/1504] passage: fix `passage -c` on darwin

Closes #369314

Same fix as in #24797, but applied to passage. The core issue is that
the current bash code doesn't work properly with a single-binary
coreutils.
---
 pkgs/by-name/pa/passage/package.nix           |  1 +
 .../set-correct-program-name-for-sleep.patch  | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/pa/passage/set-correct-program-name-for-sleep.patch

diff --git a/pkgs/by-name/pa/passage/package.nix b/pkgs/by-name/pa/passage/package.nix
index 42c44cea979a..9971511b5701 100644
--- a/pkgs/by-name/pa/passage/package.nix
+++ b/pkgs/by-name/pa/passage/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./darwin-getopt-path.patch {
       inherit getopt;
     })
+    ./set-correct-program-name-for-sleep.patch
   ];
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/pa/passage/set-correct-program-name-for-sleep.patch b/pkgs/by-name/pa/passage/set-correct-program-name-for-sleep.patch
new file mode 100644
index 000000000000..a71a279c1ef7
--- /dev/null
+++ b/pkgs/by-name/pa/passage/set-correct-program-name-for-sleep.patch
@@ -0,0 +1,50 @@
+From d11261c2ad184daf6e9edd777bc8a3372c277b4b Mon Sep 17 00:00:00 2001
+From: Johannes Frankenau <johannes@frankenau.net>
+Date: Fri, 10 Aug 2018 09:49:57 +0200
+Subject: [PATCH] Patch the clip() function to work even when using
+ single-binary coreutils
+
+---
+ src/platform/cygwin.sh | 4 ++--
+ src/platform/darwin.sh | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh
+index 5a8d5ea..423e0ce 100644
+--- a/src/platform/cygwin.sh
++++ b/src/platform/cygwin.sh
+@@ -3,11 +3,11 @@
+ 
+ clip() {
+ 	local sleep_argv0="password store sleep on display $DISPLAY"
+-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ 	local before="$($BASE64 < /dev/clipboard)"
+ 	echo -n "$1" > /dev/clipboard
+ 	(
+-		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
++		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
+ 		local now="$($BASE64 < /dev/clipboard)"
+ 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
+ 		echo "$before" | $BASE64 -d > /dev/clipboard
+diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
+index 342ecce..9e12837 100644
+--- a/src/platform/darwin.sh
++++ b/src/platform/darwin.sh
+@@ -3,11 +3,11 @@
+ 
+ clip() {
+ 	local sleep_argv0="password store sleep for user $(id -u)"
+-	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ 	local before="$(pbpaste | $BASE64)"
+ 	echo -n "$1" | pbcopy
+ 	(
+-		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
++		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
+ 		local now="$(pbpaste | $BASE64)"
+ 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
+ 		echo "$before" | $BASE64 -d | pbcopy
+-- 
+2.16.4
+

From d259e307136c3acc7eb6523a4f75dbaf08362965 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Dec 2024 07:43:35 +0000
Subject: [PATCH 0984/1504] python312Packages.venusian: 3.1.0 -> 3.1.1

---
 .../python-modules/venusian/default.nix            | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix
index a5f6812a9455..439bc5f58b23 100644
--- a/pkgs/development/python-modules/venusian/default.nix
+++ b/pkgs/development/python-modules/venusian/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  fetchpatch2,
   fetchPypi,
   isPy27,
   pytestCheckHook,
@@ -11,25 +10,16 @@
 
 buildPythonPackage rec {
   pname = "venusian";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-63LNym8xOaFdyA+cldPBD4pUoLqIHu744uxbQtPuOpU=";
+    hash = "sha256-U0+zs1VmkoPrOVRYGTHl0dBx/OYdAp1Y8yGaXjpvDEE=";
   };
 
-  patches = [
-    # https://github.com/Pylons/venusian/pull/92
-    (fetchpatch2 {
-      name = "python313-compat.patch";
-      url = "https://github.com/Pylons/venusian/pull/92/commits/000b36d6968502683615da618afc3677ec8f05fc.patch?full_index=1";
-      hash = "sha256-lH4x3Fc7odV+j/sHw48BDjaZAXo+WN20omnpKPNiF7w=";
-    })
-  ];
-
   nativeBuildInputs = [ setuptools ];
 
   nativeCheckInputs = [

From 61414276b0fbbd0022aacf5d9264fc5295d095c5 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 14:44:18 +0100
Subject: [PATCH 0985/1504] python312Packages.python-utils: drop support for
 python 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/python-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index 864177712984..a74895545bb0 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   version = "3.9.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "WoLpH";

From 32c008dfa2419069b62a69177694a324ad613bc2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 14:44:48 +0100
Subject: [PATCH 0986/1504] python312Packages.logbook: drop support for python
 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/logbook/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix
index bc2bf5460b1a..b7b8e242a530 100644
--- a/pkgs/development/python-modules/logbook/default.nix
+++ b/pkgs/development/python-modules/logbook/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   version = "1.8.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "getlogbook";

From 972b05a0e77aef8af84257486a8bbff1c516d880 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:06:06 -0800
Subject: [PATCH 0987/1504] dbip-asn-lite: 2024-12 -> 2025-01

---
 pkgs/by-name/db/dbip-asn-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix
index 471f81965a7c..b5ca33f49906 100644
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-asn-lite";
-  version = "2024-12";
+  version = "2025-01";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-tzeXJzgTG6AB46dCYqtdECqMm2nh9PfPigMvRif2+cM=";
+    hash = "sha256-cRlhlP5ml+swBZGiLpVH5s7nvPiHUi7qxM2GajoeK+Y=";
   };
 
   dontUnpack = true;

From 7b55a95f4a3048974f8505befefe452dc013d2b7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:06:24 -0800
Subject: [PATCH 0988/1504] dbip-city-lite: 2024-12 -> 2025-01

---
 pkgs/by-name/db/dbip-city-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix
index 57665c88c938..521d3cebf20e 100644
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-city-lite";
-  version = "2024-12";
+  version = "2025-01";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-IkZ6d9CP+AgYXaWmQTfTz2MTHEV7h/f1HiOAGXxBH+g=";
+    hash = "sha256-fBS2JASkZaLNCjNAadNkrctixTkDvpkTUYP0yUHBXnw=";
   };
 
   dontUnpack = true;

From f003ce29e9593c5dc5b203c48f21a062dbf0378c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:06:29 -0800
Subject: [PATCH 0989/1504] dbip-country-lite: 2024-12 -> 2025-01

---
 pkgs/by-name/db/dbip-country-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index d7642c25bd0a..00f29f3674d7 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2024-12";
+  version = "2025-01";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-58g4ch1N1vPPymYx6M7X3Q6l6Sbr5GkEXv/Vi7K9Ivk=";
+    hash = "sha256-PVpqo1t6V0kdVqA1aEgU0UqwhzmLLMHYB6gyoMusVv8=";
   };
 
   dontUnpack = true;

From 88eaedddc76dfb99201fd0e43815e083386c2c2d Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 1 Jan 2025 06:07:43 -0800
Subject: [PATCH 0990/1504] v2ray-domain-list-community: 20241210004721 ->
 20241221105938

Diff: https://github.com/v2fly/domain-list-community/compare/20241210004721...20241221105938
---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 5373233bd890..b7439e413c9a 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20241210004721";
+    version = "20241221105938";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-CiIjD6hI2rdulK/rqViLqB2YotpHd5ftOOxJncIcYS4=";
+      hash = "sha256-k42qnHQY9bfSjyGGtaqKdIxlvU/C7TiN8sD0AiRQmVU=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From f54954240dd3785fc8c57d6c33ffa978b48d2795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 14:17:20 +0000
Subject: [PATCH 0991/1504] cli-tips: 0-unstable-2024-11-14 ->
 0-unstable-2024-12-26

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

diff --git a/pkgs/by-name/cl/cli-tips/package.nix b/pkgs/by-name/cl/cli-tips/package.nix
index 3e8c9dbcaceb..f87fb4a9f1b5 100644
--- a/pkgs/by-name/cl/cli-tips/package.nix
+++ b/pkgs/by-name/cl/cli-tips/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "cli-tips";
-  version = "0-unstable-2024-11-14";
+  version = "0-unstable-2024-12-26";
 
   src = fetchFromGitHub {
     owner = "cli-stuff";
     repo = "cli-tips";
-    rev = "ebc191a54be7e39accd1948c3de8aded438d0495";
-    hash = "sha256-KELgatdL+2M5ktuAHEljIEJ9wqP578dp5tYWYPpP3bg=";
+    rev = "ddb654baa8ffda13e325e2d48f1089c64025153a";
+    hash = "sha256-eRQcYoqDxhsfbOdWGcYABQMcwjwmYQXfAUzTKeKPW8I=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 54e68744f19eef35e2f6798de254f7d01c7b160a Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Wed, 1 Jan 2025 08:49:50 +0000
Subject: [PATCH 0992/1504] givaro: fix gcc-14 build

https://github.com/linbox-team/givaro/commit/b0cf33e1d4437530c7e4b3db90b6c80057a7f2f3
---
 pkgs/development/libraries/givaro/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index 44ef1637443f..b9eaaa96965f 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -31,6 +31,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/linbox-team/givaro/commit/a81d44b3b57c275bcb04ab00db79be02561deaa2.patch";
       hash = "sha256-sSk+VWffoEjZRTJcHRISLHPyW6yuvI1u8knBOfxNUIE=";
     })
+    # https://github.com/linbox-team/givaro/issues/226
+    (fetchpatch {
+      name = "gcc-14.patch";
+      url = "https://github.com/linbox-team/givaro/commit/b0cf33e1d4437530c7e4b3db90b6c80057a7f2f3.patch";
+      includes = [ "src/kernel/integer/random-integer.h" ];
+      hash = "sha256-b2Q8apP9ueEqIUtibTeP47x6TlroRzLgAxuv5ZM1EUw=";
+    })
   ];
 
   enableParallelBuilding = true;

From 63f98d466e679bc763638ffb945d82efb66afe48 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Wed, 1 Jan 2025 00:56:20 -0800
Subject: [PATCH 0993/1504] givaro: fix clang-19 build

https://github.com/linbox-team/givaro/commit/a18baf5227d4f3e81a50850fe98e0d954eaa3ddb
---
 pkgs/development/libraries/givaro/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
index b9eaaa96965f..7bd18824b89d 100644
--- a/pkgs/development/libraries/givaro/default.nix
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
       includes = [ "src/kernel/integer/random-integer.h" ];
       hash = "sha256-b2Q8apP9ueEqIUtibTeP47x6TlroRzLgAxuv5ZM1EUw=";
     })
+    # https://github.com/linbox-team/givaro/issues/232
+    (fetchpatch {
+      name = "clang-19.patch";
+      url = "https://github.com/linbox-team/givaro/commit/a18baf5227d4f3e81a50850fe98e0d954eaa3ddb.patch";
+      hash = "sha256-IR0IHhCqbxgtsST30vxM9ak1nGtt0apxcLUQ1kS1DHw=";
+    })
   ];
 
   enableParallelBuilding = true;

From 211e54889a60754cf224a2b2af9d7f9371d9f032 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 14:22:41 +0000
Subject: [PATCH 0994/1504] ecapture: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 3922bab9b40f..091c65abdaf4 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -21,13 +21,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-ucauZ1nvsiNxeqMcMHbUaKidAGF/XW7hi04W+Bv6I6Q=";
+    hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0=";
     fetchSubmodules = true;
   };
 
@@ -106,7 +106,7 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  vendorHash = "sha256-A+0ASVHMzNcuLsP9F55hvGjflLg68p0ckj6kPbjdg4E=";
+  vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M=";
 
   passthru.updateScript = nix-update-script { };
 

From a7bb27e3cb21f887b1ee11cbda8b163fc61312c2 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Wed, 1 Jan 2025 23:31:34 +0900
Subject: [PATCH 0995/1504] manga-ocr: relax 'numpy<2' constraint (#369936)

Fixes the build failure in #369935

I'll also create an upstream PR for the same.

As best I can tell, relaxing this constraint gives us a perfectly
working package. I've verified the application launches, and basic OCR
functionality works.
---
 pkgs/development/python-modules/manga-ocr/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix
index 892e3b43a20c..3c8ea272b7a5 100644
--- a/pkgs/development/python-modules/manga-ocr/default.nix
+++ b/pkgs/development/python-modules/manga-ocr/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     unidic-lite
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "numpy<2" "numpy"
+  '';
+
   meta = with lib; {
     description = "Optical character recognition for Japanese text, with the main focus being Japanese manga";
     homepage = "https://github.com/kha-white/manga-ocr";

From 37f310fc3b4e34dbc8762654a4ec269cc93b8f51 Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@cy.md>
Date: Wed, 1 Jan 2025 14:32:38 +0000
Subject: [PATCH 0996/1504] btdu: 0.5.1 -> 0.6.0

---
 pkgs/by-name/bt/btdu/dub-lock.json | 8 ++++----
 pkgs/by-name/bt/btdu/package.nix   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bt/btdu/dub-lock.json b/pkgs/by-name/bt/btdu/dub-lock.json
index 9a7ab79a5e04..24c204b95a8f 100644
--- a/pkgs/by-name/bt/btdu/dub-lock.json
+++ b/pkgs/by-name/bt/btdu/dub-lock.json
@@ -1,12 +1,12 @@
 {
   "dependencies": {
     "ae": {
-      "version": "0.0.3236",
-      "sha256": "0by9yclvk795nw7ilwhv7wh17j2dd7xk54phs8s5jxrwpqx10x52"
+      "version": "0.0.3461",
+      "sha256": "1mk075r3bas8s699y6sc4fxbdyjhc9cm6qxcqqaj0di9ijb71fq1"
     },
     "btrfs": {
-      "version": "0.0.18",
-      "sha256": "0m8r4skfiryn2nk4wyb61lpvlga1330crr4y1h0q39g9xl3g6myf"
+      "version": "0.0.21",
+      "sha256": "0j7ksngwn8kilbql6p7hh5jvmrxqsr7pniw2n1qlrwdsms6qv72m"
     },
     "ncurses": {
       "version": "1.0.0",
diff --git a/pkgs/by-name/bt/btdu/package.nix b/pkgs/by-name/bt/btdu/package.nix
index 2bd50fc95878..6612306aa49e 100644
--- a/pkgs/by-name/bt/btdu/package.nix
+++ b/pkgs/by-name/bt/btdu/package.nix
@@ -8,13 +8,13 @@
 
 buildDubPackage rec {
   pname = "btdu";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "CyberShadow";
     repo = "btdu";
     rev = "v${version}";
-    hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE=";
+    hash = "sha256-B8ojxdXibeNEZay9S5lzpB6bTKNB2ZI6AQ3XKUHioE0=";
   };
 
   dubLock = ./dub-lock.json;

From a7ba59ffac8faad88ee95c448f3aca7ae63f0150 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Wed, 1 Jan 2025 15:33:51 +0100
Subject: [PATCH 0997/1504] bash-env-json: 0.9.2 -> 0.10.0 (#369926)

---
 pkgs/by-name/ba/bash-env-json/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/bash-env-json/package.nix b/pkgs/by-name/ba/bash-env-json/package.nix
index 0034f7e0d8bc..ae889291e876 100644
--- a/pkgs/by-name/ba/bash-env-json/package.nix
+++ b/pkgs/by-name/ba/bash-env-json/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bash-env-json";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "tesujimath";
     repo = "bash-env-json";
     rev = finalAttrs.version;
-    hash = "sha256-EYro4pMILnQFpXpFjdzSDuudhqC2EvysYMUmIOvesgo=";
+    hash = "sha256-IHfUIAkpaRyBmzT654bAzpTHUhcrtU643uxkPbveYOM=";
   };
 
   installPhase = ''

From a85e66ab709ee8239d22c5ad57ddddc11cb91312 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 1 Jan 2025 15:34:28 +0100
Subject: [PATCH 0998/1504] vmware-horizon-client: add libpng, fix app

fixes #367060

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 .../networking/remote/vmware-horizon-client/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
index bfbcd8a8ab50..95c41b763900 100644
--- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
@@ -88,6 +88,7 @@ let
       harfbuzz
       liberation_ttf
       libjpeg
+      libpng
       libpulseaudio
       libtiff
       libudev0-shim

From 3daabfe6f9685f6c6dbd112a131ef3a3945efc3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 15:08:05 +0000
Subject: [PATCH 0999/1504] spectra: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/by-name/sp/spectra/package.nix b/pkgs/by-name/sp/spectra/package.nix
index 0cc351f13e2d..fc3a1512923e 100644
--- a/pkgs/by-name/sp/spectra/package.nix
+++ b/pkgs/by-name/sp/spectra/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spectra";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "yixuan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-HaJmMo4jYmO/j53/nHrL3bvdQMAvp4Nuhhe8Yc7pL88=";
+    sha256 = "sha256-ut6nEOpzIoFy+IUWQy9x2pJ4+sA0d/Dt8WaNq5AFCFg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 0540153fd551d94c656657d7cfb96be0a11b36de Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:19:40 +0100
Subject: [PATCH 1000/1504] python312Packages.pyathena: drop support for python
 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/pyathena/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index 6b24ca4deeb0..064899243321 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   version = "3.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 374a8a28e6f6eb44d29ea6d2b9765d1fe01cc8fc Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Wed, 1 Jan 2025 09:42:31 +0000
Subject: [PATCH 1001/1504] linbox: gcc-14 / clang-19 fixes

https://github.com/linbox-team/linbox/commit/b8f2d4ccdc0af4418d14f72caf6c4d01969092a3
https://github.com/linbox-team/linbox/commit/4f7a9bc830696b2f2c0219feaa74e85202700412
https://github.com/linbox-team/linbox/commit/4a1e1395804d4630ec556c61ba3f2cb67e140248
---
 pkgs/by-name/li/linbox/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/li/linbox/package.nix b/pkgs/by-name/li/linbox/package.nix
index be78cb31a315..75675e81c1a6 100644
--- a/pkgs/by-name/li/linbox/package.nix
+++ b/pkgs/by-name/li/linbox/package.nix
@@ -30,6 +30,25 @@ stdenv.mkDerivation rec {
       url = "https://github.com/linbox-team/linbox/commit/4be26e9ef0eaf36a9909e5008940e8bf7dc625b6.patch";
       sha256 = "PX0Tik7blXOV2vHUq92xMxaADkNoNGiax4qrjQyGK6U=";
     })
+    (fetchpatch {
+      name = "gcc-14.patch";
+      url = "https://github.com/linbox-team/linbox/commit/b8f2d4ccdc0af4418d14f72caf6c4d01969092a3.patch";
+      includes = [
+        "linbox/matrix/sparsematrix/sparse-ell-matrix.h"
+        "linbox/matrix/sparsematrix/sparse-ellr-matrix.h"
+      ];
+      hash = "sha256-sqwgHkECexR2uX/SwYP7r9ZGHnGG+i4RXtfnvWsVQlk=";
+    })
+    (fetchpatch {
+      name = "clang-19.patch";
+      url = "https://github.com/linbox-team/linbox/commit/4f7a9bc830696b2f2c0219feaa74e85202700412.patch";
+      hash = "sha256-DoKh8/+2WPbMhN9MhpKmQ5sKmizD9iE81zS/XI0aM9Q=";
+    })
+    (fetchpatch {
+      name = "clang-19.patch";
+      url = "https://github.com/linbox-team/linbox/commit/4a1e1395804d4630ec556c61ba3f2cb67e140248.patch";
+      hash = "sha256-sCe/8hb27RuMxU1XXWsVU5gaGk2V+T6Ee7yrC5G5Hsc=";
+    })
   ];
 
   nativeBuildInputs = [

From 82bdfc5bfb0b47b7256d4f4d278fd255f485a062 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 15:32:53 +0000
Subject: [PATCH 1002/1504] yacreader: 9.14.2 -> 9.15.0

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

diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index af1d7579bbca..692463174da6 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -16,13 +16,13 @@
 
 mkDerivation rec {
   pname = "yacreader";
-  version = "9.14.2";
+  version = "9.15.0";
 
   src = fetchFromGitHub {
     owner = "YACReader";
     repo = pname;
     rev = version;
-    sha256 = "sha256-gQ4Aaapini6j3lCtowFbrfwbe91aFl50hp1EfxTO8uY=";
+    sha256 = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE=";
   };
 
   nativeBuildInputs = [

From 97d8d573562f6247a880e42043cb92ffe782e164 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:35:54 +0100
Subject: [PATCH 1003/1504] python312Packages.django-modelcluster: drop support
 for python 3.8

---
 pkgs/development/python-modules/django-modelcluster/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix
index ed7147e67d22..608c78f8cff4 100644
--- a/pkgs/development/python-modules/django-modelcluster/default.nix
+++ b/pkgs/development/python-modules/django-modelcluster/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   version = "6.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "wagtail";

From 8d0decdd51f4a5afb356ef4b36d35a8af82f7344 Mon Sep 17 00:00:00 2001
From: Arjun31415 <arjunp0710@gmail.com>
Date: Wed, 1 Jan 2025 21:13:19 +0530
Subject: [PATCH 1004/1504] foot: 1.19.0 -> 1.20.0

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

diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix
index d11b75ad2d34..f1f7b5e5021d 100644
--- a/pkgs/by-name/fo/foot/package.nix
+++ b/pkgs/by-name/fo/foot/package.nix
@@ -27,7 +27,7 @@
 }:
 
 let
-  version = "1.19.0";
+  version = "1.20.0";
 
   # build stimuli file for PGO build and the script to generate it
   # independently of the foot's build, so we can cache the result
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
     owner = "dnkl";
     repo = "foot";
     rev = version;
-    hash = "sha256-EY6VNrAxqA20RHLqfusbdxJPfEE7Fchi1W0noHfbxws=";
+    hash = "sha256-bvU8A2y/9ETqgFtBUZ5wp0dXybTCLl32yY/BB6r/pd8=";
   };
 
   separateDebugInfo = true;

From 64459c885e9e3ca49d0a16551669475f5e0a78ad Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:53:20 +0100
Subject: [PATCH 1005/1504] python312Packages.flask-limiter: drop support for
 python 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/flask-limiter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index 7ee04476aafa..6f95eab01b2e 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   version = "3.9.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "alisaifee";

From 4df61545b62b640ddf68f62f640092d77c0fc2f9 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 18:02:51 +0200
Subject: [PATCH 1006/1504] broot: 1.44.3 -> 1.44.4

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

diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index df98fa357568..3fc4650292ac 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.44.3";
+  version = "1.44.4";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-45QNcnx9sEjm02woIpxxLuir4Kep8SPlSZDdiifZNL8=";
+    hash = "sha256-tNmhLEB2L+2KFzsVk8hjh6gB6pxAeHqssr3e/9FFAOA=";
   };
 
-  cargoHash = "sha256-2hqpltfKE8fIFlvXMQfXVT41jPILL/INXQRUHfi1EhY=";
+  cargoHash = "sha256-sQX282C4rYtkbk7koO3ep9O0hPDpYHNYhVKBlYyXqZw=";
 
   nativeBuildInputs = [
     installShellFiles

From 19705d04f17d843474c59b76e0b00e6ee4d18814 Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Wed, 1 Jan 2025 08:10:03 -0800
Subject: [PATCH 1007/1504] navidrome: 0.53.3 -> 0.54.3

- Update to 0.54.3
- Add netgo tag required for build (https://github.com/navidrome/navidrome/issues/700)
- Add patchShebangs step for a script called by UI build
- Add settings option for telemetry

0.54.1 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.54.1
0.54.2 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.54.2
0.54.3 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.54.3

Fixes CVE-2024-56362
---
 nixos/modules/services/audio/navidrome.nix |  6 ++++++
 pkgs/by-name/na/navidrome/package.nix      | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix
index 7b195a94677c..e69bfef48438 100644
--- a/nixos/modules/services/audio/navidrome.nix
+++ b/nixos/modules/services/audio/navidrome.nix
@@ -45,6 +45,12 @@ in
               description = "Port to run Navidrome on.";
               type = port;
             };
+
+            EnableInsightsCollector = mkOption {
+              default = false;
+              description = "Enable anonymous usage data collection, see <https://www.navidrome.org/docs/getting-started/insights/> for details.";
+              type = bool;
+            };
           };
         };
         default = { };
diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index 8925f7ba6807..f09286b36b78 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -18,23 +18,23 @@
 
 buildGo123Module rec {
   pname = "navidrome";
-  version = "0.53.3";
+  version = "0.54.3";
 
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
     rev = "v${version}";
-    hash = "sha256-RLmGjkeBHuvVdxXaGvlIFPI+6beAdtSLukVmwe6Hnag=";
+    hash = "sha256-mOJSgX+1id8tZU8KVjWbf2LycrzdudhUV/9pxKa4yHw=";
   };
 
-  vendorHash = "sha256-XjiRMRfsmcw/4RLZXN36BbzbCKu98BgD3cn89e/vra4=";
+  vendorHash = "sha256-LpSmSbReQ3yHFvHhN/LERWQjf72/ELTjk4qhO4lyzW0=";
 
   npmRoot = "ui";
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/ui";
-    hash = "sha256-0vHInRly5xirjfV7tcYVNVLaMk4YtJeB7Ky0mrDDDnY=";
+    hash = "sha256-PaE1xcZX9wZRcKeqQCXbdhi4cIBWBL8ZQdww6AOB7sQ=";
   };
 
   nativeBuildInputs = [
@@ -61,10 +61,18 @@ buildGo123Module rec {
 
   CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ];
 
+  postPatch = ''
+    patchShebangs ui/bin/update-workbox.sh
+  '';
+
   preBuild = ''
     make buildjs
   '';
 
+  tags = [
+    "netgo"
+  ];
+
   postFixup = lib.optionalString ffmpegSupport ''
     wrapProgram $out/bin/navidrome \
       --prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}

From f65cd8f96e23e62d13f0393663470d03d1717164 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Wed, 1 Jan 2025 16:14:02 +0100
Subject: [PATCH 1008/1504] flint3: 3.0.1 -> 3.1.2, import C99 compliance patch

---
 pkgs/development/libraries/flint/3.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix
index 2f046777a794..b7bb781363b4 100644
--- a/pkgs/development/libraries/flint/3.nix
+++ b/pkgs/development/libraries/flint/3.nix
@@ -23,11 +23,11 @@ assert
 
 stdenv.mkDerivation rec {
   pname = "flint3";
-  version = "3.0.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://www.flintlib.org/flint-${version}.tar.gz";
-    sha256 = "sha256-ezEaAFA6hjiB64F32+uEMi8pOZ89fXLzsaTJuh1XlLQ=";
+    sha256 = "sha256-/bOkMaN0ZINKz/O9wUX0/o0PlR3VMnxMb5P0y6xcJwA=";
   };
 
   patches = [
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
       url = "https://github.com/flintlib/flint/commit/e7d005c369754243cba32bd782ea2a5fc874fde5.diff";
       hash = "sha256-IqEtYEpNVXfoTeerh/0ig+eDqUpAlGdBB3uO8ShYh3o=";
     })
+    # C99 compliance (avoid using I as identifier): https://github.com/flintlib/flint/pull/2027
+    (fetchpatch {
+      name = "flint3-reserved-identifier.patch";
+      url = "https://github.com/flintlib/flint/commit/b579cdd2d45aa1109a764f6838e9888b937e7ac5.patch";
+      hash = "sha256-8GLlA9ACzzxSiYaxLv9+p0oJA5TS7289b0EyoNcsSaU=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -61,7 +67,9 @@ stdenv.mkDerivation rec {
 
   # We're not using autoreconfHook because flint's bootstrap
   # script calls autoreconf, among other things.
-  preConfigurePhase = ''
+  preConfigure = ''
+    # the following configure.ac fix is only needed for flint 3.1.X
+    sed -i 's/if "$ac_cv_prog_cxx_g" = "yes"/if test "$ac_cv_prog_cxx_g" = "yes"/' configure.ac
     echo "Executing bootstrap.sh"
     ./bootstrap.sh
   '';

From c79ac86f7d238d8457ffa085fdc0c925981da571 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:16:42 +0100
Subject: [PATCH 1009/1504] python312Packages.cantools: drop support for python
 3.8

---
 pkgs/development/python-modules/cantools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix
index 282ba38bf99e..44aed0ed2170 100644
--- a/pkgs/development/python-modules/cantools/default.nix
+++ b/pkgs/development/python-modules/cantools/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   version = "40.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 7dbb4ff11deca729da21dd27cde7a6f49e6a9e15 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 1 Jan 2025 11:12:18 -0500
Subject: [PATCH 1010/1504] incus: fix virtual-machines with qemu 9.2

---
 pkgs/by-name/in/incus/1531.diff   | 271 ++++++++++++++++++++++++++++++
 pkgs/by-name/in/incus/package.nix |   5 +-
 2 files changed, 275 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/in/incus/1531.diff

diff --git a/pkgs/by-name/in/incus/1531.diff b/pkgs/by-name/in/incus/1531.diff
new file mode 100644
index 000000000000..fbcdcad438f0
--- /dev/null
+++ b/pkgs/by-name/in/incus/1531.diff
@@ -0,0 +1,271 @@
+diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
+index 1c773213468..fb43917ca96 100644
+--- a/internal/server/instance/drivers/driver_qemu.go
++++ b/internal/server/instance/drivers/driver_qemu.go
+@@ -2393,7 +2393,7 @@ func (d *qemu) deviceAttachPath(deviceName string, configCopy map[string]string,
+ 
+ 	d.logger.Debug("Using PCI bus device to hotplug virtiofs into", logger.Ctx{"device": deviceName, "port": pciDeviceName})
+ 
+-	qemuDev := map[string]string{
++	qemuDev := map[string]any{
+ 		"driver":  "vhost-user-fs-pci",
+ 		"bus":     pciDeviceName,
+ 		"addr":    "00.0",
+@@ -2535,7 +2535,7 @@ func (d *qemu) deviceAttachNIC(deviceName string, configCopy map[string]string,
+ 		return err
+ 	}
+ 
+-	qemuDev := make(map[string]string)
++	qemuDev := make(map[string]any)
+ 
+ 	// PCIe and PCI require a port device name to hotplug the NIC into.
+ 	if slices.Contains([]string{"pcie", "pci"}, qemuBus) {
+@@ -2633,7 +2633,7 @@ func (d *qemu) deviceAttachPCI(deviceName string, configCopy map[string]string,
+ 		return err
+ 	}
+ 
+-	qemuDev := make(map[string]string)
++	qemuDev := make(map[string]any)
+ 	escapedDeviceName := linux.PathNameEncode(devName)
+ 
+ 	d.logger.Debug("Using PCI bus device to hotplug NIC into", logger.Ctx{"device": deviceName, "port": pciDeviceName})
+@@ -3589,7 +3589,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo
+ 					break
+ 				}
+ 
+-				qemuDev := make(map[string]string)
++				qemuDev := make(map[string]any)
+ 				if slices.Contains([]string{"nvme", "virtio-blk"}, busName) {
+ 					// Allocate a PCI(e) port and write it to the config file so QMP can "hotplug" the
+ 					// drive into it later.
+@@ -3600,7 +3600,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo
+ 					qemuDev["addr"] = devAddr
+ 
+ 					if multi {
+-						qemuDev["multifunction"] = "on"
++						qemuDev["multifunction"] = true
+ 					}
+ 				}
+ 
+@@ -3624,7 +3624,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo
+ 
+ 		// Add network device.
+ 		if len(runConf.NetworkInterface) > 0 {
+-			qemuDev := make(map[string]string)
++			qemuDev := make(map[string]any)
+ 			if slices.Contains([]string{"pcie", "pci"}, bus.name) {
+ 				// Allocate a PCI(e) port and write it to the config file so QMP can "hotplug" the
+ 				// NIC into it later.
+@@ -3635,7 +3635,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo
+ 				qemuDev["addr"] = devAddr
+ 
+ 				if multi {
+-					qemuDev["multifunction"] = "on"
++					qemuDev["multifunction"] = true
+ 				}
+ 			}
+ 
+@@ -3860,7 +3860,7 @@ func (d *qemu) addFileDescriptor(fdFiles *[]*os.File, file *os.File) int {
+ }
+ 
+ // addRootDriveConfig adds the qemu config required for adding the root drive.
+-func (d *qemu) addRootDriveConfig(qemuDev map[string]string, mountInfo *storagePools.MountInfo, bootIndexes map[string]int, rootDriveConf deviceConfig.MountEntryItem) (monitorHook, error) {
++func (d *qemu) addRootDriveConfig(qemuDev map[string]any, mountInfo *storagePools.MountInfo, bootIndexes map[string]int, rootDriveConf deviceConfig.MountEntryItem) (monitorHook, error) {
+ 	if rootDriveConf.TargetPath != "/" {
+ 		return nil, fmt.Errorf("Non-root drive config supplied")
+ 	}
+@@ -3992,7 +3992,7 @@ func (d *qemu) addDriveDirConfig(cfg *[]cfgSection, bus *qemuBus, fdFiles *[]*os
+ }
+ 
+ // addDriveConfig adds the qemu config required for adding a supplementary drive.
+-func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]int, driveConf deviceConfig.MountEntryItem) (monitorHook, error) {
++func (d *qemu) addDriveConfig(qemuDev map[string]any, bootIndexes map[string]int, driveConf deviceConfig.MountEntryItem) (monitorHook, error) {
+ 	aioMode := "native" // Use native kernel async IO and O_DIRECT by default.
+ 	cacheMode := "none" // Bypass host cache, use O_DIRECT semantics by default.
+ 	media := "disk"
+@@ -4248,7 +4248,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
+ 	}
+ 
+ 	if qemuDev == nil {
+-		qemuDev = map[string]string{}
++		qemuDev = map[string]any{}
+ 	}
+ 
+ 	qemuDev["id"] = fmt.Sprintf("%s%s", qemuDeviceIDPrefix, escapedDeviceName)
+@@ -4256,8 +4256,8 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
+ 	qemuDev["serial"] = fmt.Sprintf("%s%s", qemuBlockDevIDPrefix, escapedDeviceName)
+ 
+ 	if bus == "virtio-scsi" {
+-		qemuDev["channel"] = "0"
+-		qemuDev["lun"] = "1"
++		qemuDev["channel"] = 0
++		qemuDev["lun"] = 1
+ 		qemuDev["bus"] = "qemu_scsi.0"
+ 
+ 		if media == "disk" {
+@@ -4282,7 +4282,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
+ 	}
+ 
+ 	if bootIndexes != nil {
+-		qemuDev["bootindex"] = strconv.Itoa(bootIndexes[driveConf.DevName])
++		qemuDev["bootindex"] = bootIndexes[driveConf.DevName]
+ 	}
+ 
+ 	monHook := func(m *qmp.Monitor) error {
+@@ -4336,7 +4336,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
+ 		}
+ 
+ 		if driveConf.Limits != nil {
+-			err = m.SetBlockThrottle(qemuDev["id"], int(driveConf.Limits.ReadBytes), int(driveConf.Limits.WriteBytes), int(driveConf.Limits.ReadIOps), int(driveConf.Limits.WriteIOps))
++			err = m.SetBlockThrottle(qemuDev["id"].(string), int(driveConf.Limits.ReadBytes), int(driveConf.Limits.WriteBytes), int(driveConf.Limits.ReadIOps), int(driveConf.Limits.WriteIOps))
+ 			if err != nil {
+ 				return fmt.Errorf("Failed applying limits for disk device %q: %w", driveConf.DevName, err)
+ 			}
+@@ -4351,7 +4351,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
+ 
+ // addNetDevConfig adds the qemu config required for adding a network device.
+ // The qemuDev map is expected to be preconfigured with the settings for an existing port to use for the device.
+-func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIndexes map[string]int, nicConfig []deviceConfig.RunConfigItem) (monitorHook, error) {
++func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]any, bootIndexes map[string]int, nicConfig []deviceConfig.RunConfigItem) (monitorHook, error) {
+ 	reverter := revert.New()
+ 	defer reverter.Fail()
+ 
+@@ -4382,7 +4382,7 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn
+ 	if len(bootIndexes) > 0 {
+ 		bootIndex, found := bootIndexes[devName]
+ 		if found {
+-			qemuDev["bootindex"] = strconv.Itoa(bootIndex)
++			qemuDev["bootindex"] = bootIndex
+ 		}
+ 	}
+ 
+@@ -4400,9 +4400,9 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn
+ 		// Number of vectors is number of vCPUs * 2 (RX/TX) + 2 (config/control MSI-X).
+ 		vectors := 2*queueCount + 2
+ 		if vectors > 0 {
+-			qemuDev["mq"] = "on"
++			qemuDev["mq"] = true
+ 			if slices.Contains([]string{"pcie", "pci"}, busName) {
+-				qemuDev["vectors"] = strconv.Itoa(vectors)
++				qemuDev["vectors"] = vectors
+ 			}
+ 		}
+ 
+@@ -4591,9 +4591,9 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn
+ 			}
+ 
+ 			qemuDev["netdev"] = qemuNetDev["id"].(string)
+-			qemuDev["page-per-vq"] = "on"
+-			qemuDev["iommu_platform"] = "on"
+-			qemuDev["disable-legacy"] = "on"
++			qemuDev["page-per-vq"] = true
++			qemuDev["iommu_platform"] = true
++			qemuDev["disable-legacy"] = true
+ 
+ 			err = m.AddNIC(qemuNetDev, qemuDev)
+ 			if err != nil {
+@@ -4819,7 +4819,7 @@ func (d *qemu) addGPUDevConfig(cfg *[]cfgSection, bus *qemuBus, gpuConfig []devi
+ }
+ 
+ func (d *qemu) addUSBDeviceConfig(usbDev deviceConfig.USBDeviceItem) (monitorHook, error) {
+-	device := map[string]string{
++	qemuDev := map[string]any{
+ 		"id":     fmt.Sprintf("%s%s", qemuDeviceIDPrefix, usbDev.DeviceName),
+ 		"driver": "usb-host",
+ 		"bus":    "qemu_usb.0",
+@@ -4836,18 +4836,18 @@ func (d *qemu) addUSBDeviceConfig(usbDev deviceConfig.USBDeviceItem) (monitorHoo
+ 
+ 		defer func() { _ = f.Close() }()
+ 
+-		info, err := m.SendFileWithFDSet(device["id"], f, false)
++		info, err := m.SendFileWithFDSet(qemuDev["id"].(string), f, false)
+ 		if err != nil {
+ 			return fmt.Errorf("Failed to send file descriptor: %w", err)
+ 		}
+ 
+ 		revert.Add(func() {
+-			_ = m.RemoveFDFromFDSet(device["id"])
++			_ = m.RemoveFDFromFDSet(qemuDev["id"].(string))
+ 		})
+ 
+-		device["hostdevice"] = fmt.Sprintf("/dev/fdset/%d", info.ID)
++		qemuDev["hostdevice"] = fmt.Sprintf("/dev/fdset/%d", info.ID)
+ 
+-		err = m.AddDevice(device)
++		err = m.AddDevice(qemuDev)
+ 		if err != nil {
+ 			return fmt.Errorf("Failed to add device: %w", err)
+ 		}
+@@ -9188,19 +9188,19 @@ func (d *qemu) setCPUs(monitor *qmp.Monitor, count int) error {
+ 
+ 			devID := fmt.Sprintf("cpu%d%d%d", cpu.Props.SocketID, cpu.Props.CoreID, cpu.Props.ThreadID)
+ 
+-			dev := map[string]string{
++			qemuDev := map[string]any{
+ 				"id":      devID,
+ 				"driver":  cpu.Type,
+-				"core-id": fmt.Sprintf("%d", cpu.Props.CoreID),
++				"core-id": cpu.Props.CoreID,
+ 			}
+ 
+ 			// No such thing as sockets and threads on s390x.
+ 			if d.architecture != osarch.ARCH_64BIT_S390_BIG_ENDIAN {
+-				dev["socket-id"] = fmt.Sprintf("%d", cpu.Props.SocketID)
+-				dev["thread-id"] = fmt.Sprintf("%d", cpu.Props.ThreadID)
++				qemuDev["socket-id"] = cpu.Props.SocketID
++				qemuDev["thread-id"] = cpu.Props.ThreadID
+ 			}
+ 
+-			err := monitor.AddDevice(dev)
++			err := monitor.AddDevice(qemuDev)
+ 			if err != nil {
+ 				return fmt.Errorf("Failed to add device: %w", err)
+ 			}
+@@ -9229,12 +9229,12 @@ func (d *qemu) setCPUs(monitor *qmp.Monitor, count int) error {
+ 			}
+ 
+ 			revert.Add(func() {
+-				err := monitor.AddDevice(map[string]string{
++				err := monitor.AddDevice(map[string]any{
+ 					"id":        devID,
+ 					"driver":    cpu.Type,
+-					"socket-id": fmt.Sprintf("%d", cpu.Props.SocketID),
+-					"core-id":   fmt.Sprintf("%d", cpu.Props.CoreID),
+-					"thread-id": fmt.Sprintf("%d", cpu.Props.ThreadID),
++					"socket-id": cpu.Props.SocketID,
++					"core-id":   cpu.Props.CoreID,
++					"thread-id": cpu.Props.ThreadID,
+ 				})
+ 				d.logger.Warn("Failed to add CPU device", logger.Ctx{"err": err})
+ 			})
+diff --git a/internal/server/instance/drivers/qmp/commands.go b/internal/server/instance/drivers/qmp/commands.go
+index 3e9752780c5..d81da8ff4f4 100644
+--- a/internal/server/instance/drivers/qmp/commands.go
++++ b/internal/server/instance/drivers/qmp/commands.go
+@@ -538,7 +538,7 @@ func (m *Monitor) SetMemoryBalloonSizeBytes(sizeBytes int64) error {
+ }
+ 
+ // AddBlockDevice adds a block device.
+-func (m *Monitor) AddBlockDevice(blockDev map[string]any, device map[string]string) error {
++func (m *Monitor) AddBlockDevice(blockDev map[string]any, device map[string]any) error {
+ 	revert := revert.New()
+ 	defer revert.Fail()
+ 
+@@ -624,7 +624,7 @@ func (m *Monitor) RemoveCharDevice(deviceID string) error {
+ }
+ 
+ // AddDevice adds a new device.
+-func (m *Monitor) AddDevice(device map[string]string) error {
++func (m *Monitor) AddDevice(device map[string]any) error {
+ 	if device != nil {
+ 		err := m.Run("device_add", device, nil)
+ 		if err != nil {
+@@ -656,7 +656,7 @@ func (m *Monitor) RemoveDevice(deviceID string) error {
+ }
+ 
+ // AddNIC adds a NIC device.
+-func (m *Monitor) AddNIC(netDev map[string]any, device map[string]string) error {
++func (m *Monitor) AddNIC(netDev map[string]any, device map[string]any) error {
+ 	revert := revert.New()
+ 	defer revert.Fail()
+ 
diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index 551987d1c16e..a0e1c4c3e0c5 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -2,5 +2,8 @@ import ./generic.nix {
   hash = "sha256-Ir+cT+2xA+L4kBXhwA0XXE/D8zjMPGYiwW0VrEdobZ4=";
   version = "6.8.0";
   vendorHash = "sha256-CDLq41AB2Y9nYlTuXZaAOgwXIin9CbqSXCFoigsc14A=";
-  patches = [ ];
+  patches = [
+    # qemu 9.2 support
+    ./1531.diff
+  ];
 }

From 4f045c3182406a53ebca02e2aae8b79a9dadecfc Mon Sep 17 00:00:00 2001
From: rein <manavrj.07@gmail.com>
Date: Wed, 1 Jan 2025 21:09:53 +0530
Subject: [PATCH 1011/1504] maintainers: add qxrein

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6ac51d6214de..d446915faff2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18638,6 +18638,12 @@
     githubId = 40905037;
     name = "qwqawawow";
   };
+  qxrein = {
+    email = "mnv07@proton.me";
+    github = "qxrein";
+    githubId = 101001298;
+    name = "qxrein";
+  };
   qyliss = {
     email = "hi@alyssa.is";
     github = "alyssais";

From 735c7f4c6e22a58d50500b764c0398f389ac8a82 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:29:50 +0100
Subject: [PATCH 1012/1504] python312Packages.numpy-stl: drop support for
 python 3.8

---
 pkgs/development/python-modules/numpy-stl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index 8dd0c8e4b878..7a1e6ce33fab 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   version = "3.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     pname = "numpy_stl";

From 33506f1acd0571708f8a1ce47535c41a141345bf Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 11:39:38 -0500
Subject: [PATCH 1013/1504] beam: create package sets for multiple versions and
 minimal variants

---
 pkgs/top-level/all-packages.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83ceecf7d461..4ed3cf54d85b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7162,7 +7162,16 @@ with pkgs;
 
   inherit (beam.packages.erlang_26) erlang-ls;
 
-  beamPackages = beam.packages.erlang // { __attrsFailEvaluation = true; };
+  beamPackages = dontRecurseIntoAttrs beam27Packages;
+  beamMinimalPackages = dontRecurseIntoAttrs beamMinimal27Packages;
+
+  beam25Packages = recurseIntoAttrs beam.packages.erlang_25;
+  beam26Packages = recurseIntoAttrs beam.packages.erlang_26;
+  beam27Packages = recurseIntoAttrs beam.packages.erlang_27;
+
+  beamMinimal25Packages = recurseIntoAttrs beam_minimal.packages.erlang_25;
+  beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26;
+  beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27;
 
   erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };
 

From b2041ab9becbb7d8fb33c7e01f5abe2c1dcf2ec1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:40:26 +0100
Subject: [PATCH 1014/1504] python312Packages.tablib: drop support for python
 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/tablib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 58df9be707e8..f44b70962c7d 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   version = "3.7.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 4c208b670e2785d989a50928f5ef6760be9ab08b Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 1 Jan 2025 17:51:01 +0100
Subject: [PATCH 1015/1504] codeberg-pages: embed correct version number via
 ldflags

Currently, `pages -v` just shows `pages-server version dev`.
With this, it becomes e.g. `pages-server version 6.2` as it should be.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/co/codeberg-pages/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix
index 5a41ea3ef8ec..fc30528bba88 100644
--- a/pkgs/by-name/co/codeberg-pages/package.nix
+++ b/pkgs/by-name/co/codeberg-pages/package.nix
@@ -27,6 +27,8 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
+    "-X"
+    "codeberg.org/codeberg/pages/server/version.Version=${version}"
   ];
 
   tags = [

From f76083988fe3534f840e33323b7039d65280b63a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 17:52:08 +0100
Subject: [PATCH 1016/1504] urlfinder: init at 0.0.2

Tool for passively gathering URLs without active scanning

https://github.com/projectdiscovery/urlfinder
---
 pkgs/by-name/ur/urlfinder/package.nix | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/ur/urlfinder/package.nix

diff --git a/pkgs/by-name/ur/urlfinder/package.nix b/pkgs/by-name/ur/urlfinder/package.nix
new file mode 100644
index 000000000000..8ffd59e9e326
--- /dev/null
+++ b/pkgs/by-name/ur/urlfinder/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "urlfinder";
+  version = "0.0.2";
+
+  src = fetchFromGitHub {
+    owner = "projectdiscovery";
+    repo = "urlfinder";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hORZzeGNcRTcFsvY8pfs8f1JNpdTJjMdO/lJHR83DfY=";
+  };
+
+  vendorHash = "sha256-Wu9itQfcrwWuzRHtTKk+lF7n6eIzSfATWtI+8xLQQsI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Tool for passively gathering URLs without active scanning";
+    homepage = "https://github.com/projectdiscovery/urlfinder";
+    changelog = "https://github.com/projectdiscovery/urlfinder/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "urlfinder";
+  };
+}

From e4e35bba85036729d6a1a8b29081b6c28567da0b Mon Sep 17 00:00:00 2001
From: rein <manavrj.07@gmail.com>
Date: Wed, 1 Jan 2025 22:23:15 +0530
Subject: [PATCH 1017/1504] pimsync: init at 0.1.0

---
 pkgs/by-name/pi/pimsync/package.nix | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/pi/pimsync/package.nix

diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix
new file mode 100644
index 000000000000..16834e8a6c2b
--- /dev/null
+++ b/pkgs/by-name/pi/pimsync/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromSourcehut,
+  pkg-config,
+  sqlite,
+  scdoc,
+  makeWrapper,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "pimsync";
+  version = "0.1.0";
+
+  src = fetchFromSourcehut {
+    owner = "~whynothugo";
+    repo = "pimsync";
+    rev = "v${version}";
+    hash = "sha256-upOCrpbveSSFrhdHDkTOmja4MLmsgtuoDHMsgXyulWI=";
+  };
+
+  cargoHash = "sha256-QRgyHzIjdI8+OzvM+3sfuxTNMVCdGxrMvQpCnot9iUM=";
+
+  nativeBuildInputs = [
+    pkg-config
+    scdoc
+    makeWrapper
+  ];
+
+  buildInputs = [
+    sqlite
+  ];
+
+  makeFlags = [
+    "build"
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = {
+    description = "Synchronise calendars and contacts";
+    homepage = "https://git.sr.ht/~whynothugo/pimsync";
+    license = lib.licenses.eupl12;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.qxrein ];
+    mainProgram = "pimsync";
+  };
+}

From 46e6ad4a027acfaa06cc6084e2782160f74dfe7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 19:33:29 +0000
Subject: [PATCH 1018/1504] python312Packages.ipyparallel: 8.8.0 -> 9.0.0

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

diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index 90a1aa3971a6..7227eb183c2f 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -2,9 +2,9 @@
   lib,
   buildPythonPackage,
   decorator,
-  entrypoints,
   fetchPypi,
   hatchling,
+  importlib-metadata,
   ipykernel,
   ipython,
   jupyter-client,
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "ipyparallel";
-  version = "8.8.0";
+  version = "9.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JATVn4ajqqO9J79rV993e/9cE2PBxuYEA3WdFu1C3Hs=";
+    hash = "sha256-cGAcuvmhadNQ/+IsgtW73+bf5MTfAoNtmZDpxVm1vLY=";
   };
 
   # We do not need the jupyterlab build dependency, because we do not need to
@@ -41,7 +41,6 @@ buildPythonPackage rec {
 
   dependencies = [
     decorator
-    entrypoints
     ipykernel
     ipython
     jupyter-client
@@ -51,7 +50,7 @@ buildPythonPackage rec {
     tornado
     tqdm
     traitlets
-  ];
+  ] ++ lib.optional (pythonOlder "3.10") importlib-metadata;
 
   # Requires access to cluster
   doCheck = false;

From 08ee1fe844ef2f48d04931229c4925d62f37db18 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 1 Jan 2025 17:55:35 +0100
Subject: [PATCH 1019/1504] home-assistant: pin ollama at 0.3.3

Last version before pydantic 2.0 dependency was added.
---
 pkgs/servers/home-assistant/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c49ceef951eb..f8b3d3f88bfd 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -122,6 +122,17 @@ let
         ];
       });
 
+      ollama = super.ollama.overridePythonAttrs (oldAttrs: rec {
+        version = "0.3.3";
+        src = fetchFromGitHub {
+          owner = "ollama";
+          repo = "ollama-python";
+          tag = "v${version}";
+          hash = "sha256-27OJwPvHBxCdaiHk8EQ2s1OeBzgsrzp1MjgKHNgvz+A=";
+        };
+        dependencies = with self; [ httpx ];
+      });
+
       openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec {
         version = "2.2";
         src = fetchFromGitHub {

From 8bb29c85265fd3851e93637a05d582a07cbd06c5 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 1 Jan 2025 18:10:32 +0100
Subject: [PATCH 1020/1504] homer: 24.11.4 -> 24.12.1

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 ...cifying-custom-sass-compiler-path-by.patch | 184 ++++++++++++++++++
 pkgs/by-name/ho/homer/package.nix             |   8 +-
 pkgs/by-name/ho/homer/sass-embedded.patch     | 133 -------------
 3 files changed, 188 insertions(+), 137 deletions(-)
 create mode 100644 pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
 delete mode 100644 pkgs/by-name/ho/homer/sass-embedded.patch

diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
new file mode 100644
index 000000000000..6c98af6abf8e
--- /dev/null
+++ b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
@@ -0,0 +1,184 @@
+From d4d4a299de39685e59f256c81d8e60ce6efd8b23 Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Wed, 1 Jan 2025 18:02:40 +0100
+Subject: [PATCH] build: enable specifying custom sass compiler path by env-var
+
+Signed-off-by: Felix Buehler <account@buehler.rocks>
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ package.json                |  7 ++++++-
+ patches/sass-embedded.patch | 15 +++++++++++++++
+ pnpm-lock.yaml              | 35 ++++++++++++++++++++---------------
+ 3 files changed, 41 insertions(+), 16 deletions(-)
+ create mode 100644 patches/sass-embedded.patch
+
+diff --git a/package.json b/package.json
+index b66e6ff..94aaa86 100644
+--- a/package.json
++++ b/package.json
+@@ -28,5 +28,10 @@
+     "vite-plugin-pwa": "^0.21.0"
+   },
+   "license": "Apache-2.0",
+-  "packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387"
++  "packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387",
++  "pnpm": {
++    "patchedDependencies": {
++      "sass-embedded": "patches/sass-embedded.patch"
++    }
++  }
+ }
+diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
+new file mode 100644
+index 0000000..f941a8e
+--- /dev/null
++++ b/patches/sass-embedded.patch
+@@ -0,0 +1,15 @@
++diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js
++index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
++--- a/dist/lib/src/compiler-path.js
+++++ b/dist/lib/src/compiler-path.js
++@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
++ }
++ /** The full command for the embedded compiler executable. */
++ exports.compilerCommand = (() => {
+++    const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
+++    if (binPath) {
+++        return [binPath];
+++    }
++     const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
++         ? 'linux-musl'
++         : process.platform;
+diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+index ecc1e3c..a7164d0 100644
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
+@@ -4,6 +4,11 @@ settings:
+   autoInstallPeers: true
+   excludeLinksFromLockfile: false
+ 
++patchedDependencies:
++  sass-embedded:
++    hash: 6wjvcsryx2tfkpottp4wf5nbzi
++    path: patches/sass-embedded.patch
++
+ importers:
+ 
+   .:
+@@ -26,7 +31,7 @@ importers:
+     devDependencies:
+       '@vitejs/plugin-vue':
+         specifier: ^5.2.0
+-        version: 5.2.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)
++        version: 5.2.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)
+       '@vue/eslint-config-prettier':
+         specifier: ^10.0.0
+         version: 10.0.0(eslint@9.15.0)(prettier@3.3.3)
+@@ -44,13 +49,13 @@ importers:
+         version: 3.3.3
+       sass-embedded:
+         specifier: ^1.81.0
+-        version: 1.81.0
++        version: 1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
+       vite:
+         specifier: ^5.4.11
+-        version: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0)
++        version: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
+       vite-plugin-pwa:
+         specifier: ^0.21.0
+-        version: 0.21.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
++        version: 0.21.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
+ 
+ packages:
+ 
+@@ -2548,7 +2553,7 @@ snapshots:
+   '@babel/code-frame@7.25.7':
+     dependencies:
+       '@babel/highlight': 7.25.7
+-      picocolors: 1.1.0
++      picocolors: 1.1.1
+ 
+   '@babel/compat-data@7.25.8': {}
+ 
+@@ -2715,7 +2720,7 @@ snapshots:
+       '@babel/helper-validator-identifier': 7.25.7
+       chalk: 2.4.2
+       js-tokens: 4.0.0
+-      picocolors: 1.1.0
++      picocolors: 1.1.1
+ 
+   '@babel/parser@7.25.8':
+     dependencies:
+@@ -3521,9 +3526,9 @@ snapshots:
+ 
+   '@types/trusted-types@2.0.7': {}
+ 
+-  '@vitejs/plugin-vue@5.2.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)':
++  '@vitejs/plugin-vue@5.2.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)':
+     dependencies:
+-      vite: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0)
++      vite: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
+       vue: 3.5.13
+ 
+   '@vue/compiler-core@3.5.13':
+@@ -4702,7 +4707,7 @@ snapshots:
+   sass-embedded-win32-x64@1.81.0:
+     optional: true
+ 
+-  sass-embedded@1.81.0:
++  sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
+     dependencies:
+       '@bufbuild/protobuf': 2.2.0
+       buffer-builder: 0.2.0
+@@ -4879,7 +4884,7 @@ snapshots:
+   terser@5.35.0:
+     dependencies:
+       '@jridgewell/source-map': 0.3.6
+-      acorn: 8.13.0
++      acorn: 8.14.0
+       commander: 2.20.3
+       source-map-support: 0.5.21
+ 
+@@ -4975,7 +4980,7 @@ snapshots:
+     dependencies:
+       browserslist: 4.24.0
+       escalade: 3.2.0
+-      picocolors: 1.1.0
++      picocolors: 1.1.1
+ 
+   uri-js@4.4.1:
+     dependencies:
+@@ -4987,18 +4992,18 @@ snapshots:
+ 
+   varint@6.0.0: {}
+ 
+-  vite-plugin-pwa@0.21.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
++  vite-plugin-pwa@0.21.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
+     dependencies:
+       debug: 4.3.7
+       pretty-bytes: 6.1.1
+       tinyglobby: 0.2.10
+-      vite: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0)
++      vite: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
+       workbox-build: 7.1.0
+       workbox-window: 7.1.0
+     transitivePeerDependencies:
+       - supports-color
+ 
+-  vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0):
++  vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0):
+     dependencies:
+       esbuild: 0.21.5
+       postcss: 8.4.47
+@@ -5006,7 +5011,7 @@ snapshots:
+     optionalDependencies:
+       fsevents: 2.3.3
+       sass: 1.79.5
+-      sass-embedded: 1.81.0
++      sass-embedded: 1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
+       terser: 5.35.0
+ 
+   vue-eslint-parser@9.4.3(eslint@9.15.0):
+-- 
+2.47.0
+
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index ea5143015c9f..38c31aa492b2 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
-  version = "24.11.4";
+  version = "24.12.1";
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
     rev = "v${version}";
-    hash = "sha256-UaoBdYzTEYB1pkiTYrt4T7GjwMJWXPuW5VSl4MU8DCI=";
+    hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
@@ -23,11 +23,11 @@ stdenvNoCC.mkDerivation rec {
       src
       patches
       ;
-    hash = "sha256-5unoY8lPaX9sZAJEBICpxSddwLV8liK1tbamB2ulvew=";
+    hash = "sha256-+FijxCiI5pr6kp+/99DJJOJSI9w6pbtfW25SUyEcWio=";
   };
 
   # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
-  patches = [ ./sass-embedded.patch ];
+  patches = [ ./0001-build-enable-specifying-custom-sass-compiler-path-by.patch ];
 
   nativeBuildInputs = [
     nodejs
diff --git a/pkgs/by-name/ho/homer/sass-embedded.patch b/pkgs/by-name/ho/homer/sass-embedded.patch
deleted file mode 100644
index a7109354c7f4..000000000000
--- a/pkgs/by-name/ho/homer/sass-embedded.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff --git a/package.json b/package.json
-index f121431..97f1b11 100644
---- a/package.json
-+++ b/package.json
-@@ -28,5 +28,10 @@
-     "vite-plugin-pwa": "^0.20.5"
-   },
-   "license": "Apache-2.0",
--  "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
-+  "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4",
-+  "pnpm": {
-+    "patchedDependencies": {
-+      "sass-embedded": "patches/sass-embedded.patch"
-+    }
-+  }
- }
-diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
-new file mode 100644
-index 0000000..f941a8e
---- /dev/null
-+++ b/patches/sass-embedded.patch
-@@ -0,0 +1,15 @@
-+diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js
-+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
-+--- a/dist/lib/src/compiler-path.js
-++++ b/dist/lib/src/compiler-path.js
-+@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
-+ }
-+ /** The full command for the embedded compiler executable. */
-+ exports.compilerCommand = (() => {
-++    const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
-++    if (binPath) {
-++        return [binPath];
-++    }
-+     const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
-+         ? 'linux-musl'
-+         : process.platform;
-diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index 4c4267a..fd278e1 100644
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -4,6 +4,11 @@ settings:
-   autoInstallPeers: true
-   excludeLinksFromLockfile: false
- 
-+patchedDependencies:
-+  sass-embedded:
-+    hash: 6wjvcsryx2tfkpottp4wf5nbzi
-+    path: patches/sass-embedded.patch
-+
- importers:
- 
-   .:
-@@ -26,7 +31,7 @@ importers:
-     devDependencies:
-       '@vitejs/plugin-vue':
-         specifier: ^5.1.4
--        version: 5.1.4(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)
-+        version: 5.1.4(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)
-       '@vue/eslint-config-prettier':
-         specifier: ^10.0.0
-         version: 10.0.0(eslint@9.12.0)(prettier@3.3.3)
-@@ -44,13 +49,13 @@ importers:
-         version: 3.3.3
-       sass-embedded:
-         specifier: ^1.79.5
--        version: 1.79.5
-+        version: 1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
-       vite:
-         specifier: ^5.4.9
--        version: 5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0)
-+        version: 5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
-       vite-plugin-pwa:
-         specifier: ^0.20.5
--        version: 0.20.5(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
-+        version: 0.20.5(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0)
- 
- packages:
- 
-@@ -3516,9 +3521,9 @@ snapshots:
- 
-   '@types/trusted-types@2.0.7': {}
- 
--  '@vitejs/plugin-vue@5.1.4(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)':
-+  '@vitejs/plugin-vue@5.1.4(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.12)':
-     dependencies:
--      vite: 5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0)
-+      vite: 5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
-       vue: 3.5.12
- 
-   '@vue/compiler-core@3.5.12':
-@@ -4693,7 +4698,7 @@ snapshots:
-   sass-embedded-win32-x64@1.79.5:
-     optional: true
- 
--  sass-embedded@1.79.5:
-+  sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
-     dependencies:
-       '@bufbuild/protobuf': 2.2.0
-       buffer-builder: 0.2.0
-@@ -4975,18 +4980,18 @@ snapshots:
- 
-   varint@6.0.0: {}
- 
--  vite-plugin-pwa@0.20.5(vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
-+  vite-plugin-pwa@0.20.5(vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0):
-     dependencies:
-       debug: 4.3.7
-       pretty-bytes: 6.1.1
-       tinyglobby: 0.2.9
--      vite: 5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0)
-+      vite: 5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0)
-       workbox-build: 7.1.0
-       workbox-window: 7.1.0
-     transitivePeerDependencies:
-       - supports-color
- 
--  vite@5.4.9(sass-embedded@1.79.5)(sass@1.79.5)(terser@5.35.0):
-+  vite@5.4.9(sass-embedded@1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0):
-     dependencies:
-       esbuild: 0.21.5
-       postcss: 8.4.47
-@@ -4994,7 +4999,7 @@ snapshots:
-     optionalDependencies:
-       fsevents: 2.3.3
-       sass: 1.79.5
--      sass-embedded: 1.79.5
-+      sass-embedded: 1.79.5(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
-       terser: 5.35.0
- 
-   vue-eslint-parser@9.4.3(eslint@9.12.0):
--- 
-2.47.0

From aa1a7cc873d18d83e2b8245c76b8909fa53aa25d Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 1 Jan 2025 18:11:12 +0100
Subject: [PATCH 1021/1504] homer: add nix-update-script

For automated updates in the future.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/ho/homer/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 38c31aa492b2..b97ffb1678c9 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -5,6 +5,7 @@
   pnpm,
   nodejs,
   dart-sass,
+  nix-update-script,
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
@@ -53,6 +54,8 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "A very simple static homepage for your server.";
     homepage = "https://homer-demo.netlify.app/";

From 0cc72de8e1643d2dcc294bfa47714f8d4311cb81 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 1 Jan 2025 18:11:24 +0100
Subject: [PATCH 1022/1504] homer: add myself as maintainer

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/ho/homer/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index b97ffb1678c9..221c015814b2 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -61,7 +61,10 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://homer-demo.netlify.app/";
     changelog = "https://github.com/bastienwirtz/homer/releases";
     license = licenses.asl20;
-    maintainers = with maintainers; [ stunkymonkey ];
+    maintainers = with maintainers; [
+      stunkymonkey
+      christoph-heiss
+    ];
     platforms = platforms.all;
   };
 }

From 280715cf39ac9a8b8aec31bb99bd7950b39b5d91 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 12:28:07 +0800
Subject: [PATCH 1023/1504] nixos/kmonad: make sure new config is used after
 nixos-rebuild switch

---
 nixos/modules/services/hardware/kmonad.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index fc548d51603e..acbb202b19a1 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -155,6 +155,19 @@ let
           config.users.groups.uinput.name
         ] ++ keyboard.extraGroups;
       };
+      # make sure the new config is used after nixos-rebuild switch
+      # stopIfChanged controls[0] how a service is "restarted" during
+      # nixos-rebuild switch.  By default, stopIfChanged is true, which stops
+      # the old service and then starts the new service after config updates.
+      # Since we use path-based activation[1] here, the service unit will
+      # immediately[2] be started by the path unit.  Probably that start is
+      # before config updates, whcih causes the service unit to use the old
+      # config after nixos-rebuild switch.  Setting stopIfChanged to false works
+      # around this issue by restarting the service after config updates.
+      # [0]: https://nixos.org/manual/nixos/unstable/#sec-switching-systems
+      # [1]: man 7 daemon
+      # [2]: man 5 systemd.path
+      stopIfChanged = false;
     };
 in
 {

From 3b0d5f365e1b3ba3c648ed4cd321388f7901ceed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmail.com>
Date: Wed, 1 Jan 2025 18:27:45 +0100
Subject: [PATCH 1024/1504] buildGoModule: remove some unnecessary quotes

---
 pkgs/build-support/go/module.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 3a3ae71de508..35bc2a0b42a2 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -130,7 +130,7 @@ in
 
       export GIT_SSL_CAINFO=$NIX_SSL_CERT_FILE
       ${if finalAttrs.proxyVendor then ''
-        mkdir -p "''${GOPATH}/pkg/mod/cache/download"
+        mkdir -p "$GOPATH/pkg/mod/cache/download"
         go mod download
       '' else ''
         if (( "''${NIX_DEBUG:-0}" >= 1 )); then
@@ -148,8 +148,8 @@ in
       runHook preInstall
 
       ${if finalAttrs.proxyVendor then ''
-        rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
-        cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out
+        rm -rf "$GOPATH/pkg/mod/cache/download/sumdb"
+        cp -r --reflink=auto "$GOPATH/pkg/mod/cache/download" $out
       '' else ''
         cp -r --reflink=auto vendor $out
       ''}

From c37781e6e4a63e3a470c90404e357baca0153f92 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 1 Jan 2025 18:34:06 +0100
Subject: [PATCH 1025/1504] open-webui: 0.5.2 -> 0.5.3

diff: https://github.com/open-webui/open-webui/compare/v0.5.2..v0.5.3
changelog: https://github.com/open-webui/open-webui/releases/tag/v0.5.3
---
 pkgs/by-name/op/open-webui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 1469503ef14c..1e30ec4a1934 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -7,19 +7,19 @@
 }:
 let
   pname = "open-webui";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-QQSJaef/0G8elj3c3uVWq9Yh7puNhe0vZc+IVH3rDpE=";
+    hash = "sha256-6jMlEA3GufTXikyg5txyTtpPzIfk6hA9zkg+015UnqY=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-SUrI5nKtW/NoqT2BNRjBM9Aw9KIZL/T6SEtEbazhvPQ=";
+    npmDepsHash = "sha256-2Zu9YlkL3PY2MgN6NAjCVQL2f2CWXP0AsQcOGEs7B1g=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

From 05a9e79220e0f09e13ba74e94ec545dee91ea6e6 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 18:39:04 +0100
Subject: [PATCH 1026/1504] python312Packages.pytest-mypy-plugins: drop support
 for python 3.8

---
 pkgs/development/python-modules/pytest-mypy-plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
index e1f918ea2bca..6a89e77a49f6 100644
--- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
+++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   version = "3.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "typeddjango";

From 959e722044f02ec5b50c04d422efc3172f82c897 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 1 Jan 2025 18:46:43 +0100
Subject: [PATCH 1027/1504] libspf2: fix build

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

diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix
index eee1560f0fe5..b606ab7fef62 100644
--- a/pkgs/by-name/li/libspf2/package.nix
+++ b/pkgs/by-name/li/libspf2/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am
   '';
 
-  CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration";
+  CFLAGS = "-Wno-error=implicit-function-declaration";
 
   doCheck = true;
 

From 973c08ecd4abe6fef2d0ccc32fb34785d304fc5e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:04:58 +0100
Subject: [PATCH 1028/1504] python312Packages.superqt: drop support for python
 3.8

---
 pkgs/development/python-modules/superqt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix
index 10526428a872..b9450b505f78 100644
--- a/pkgs/development/python-modules/superqt/default.nix
+++ b/pkgs/development/python-modules/superqt/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   version = "0.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "pyapp-kit";

From ec936dc9eeb375b4ae6b79c2b07d34402b8e0669 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 01:34:17 +0000
Subject: [PATCH 1029/1504] ocamlPackages.flac: 0.5.0 -> 0.5.1

---
 pkgs/development/ocaml-modules/flac/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix
index 833da22738ea..16283af681ea 100644
--- a/pkgs/development/ocaml-modules/flac/default.nix
+++ b/pkgs/development/ocaml-modules/flac/default.nix
@@ -10,13 +10,13 @@
 
 buildDunePackage rec {
   pname = "flac";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-flac";
     rev = "v${version}";
-    sha256 = "sha256-HRRQd//e6Eh2HuyO+U00ILu5FoBT9jf/nRJzDOie70A=";
+    sha256 = "sha256-68zunpRIX4lrRsKJhDF3Sre6Rp3g+ntP19ObFqG57jE=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -29,7 +29,7 @@ buildDunePackage rec {
   meta = with lib; {
     homepage = "https://github.com/savonet/ocaml-flac";
     description = "Bindings for flac";
-    license = licenses.gpl2Only;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ dandellion ];
   };
 }

From 76fe7e071a784f6cdb90a1d056e622c19d58523d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:26 +0100
Subject: [PATCH 1030/1504] python312Packages.apispec: drop support for python
 3.8

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/apispec/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index 3d6f64302a36..5047cf71959f 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   version = "6.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 760d6269f0ea0fb0bc9f02536f9b267c72102703 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:19:50 +0100
Subject: [PATCH 1031/1504] wxGTK31: use new darwin sdk pattern

---
 .../libraries/wxwidgets/wxGTK31.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 19 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index 1c72e919aed5..fdc8c6703848 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -23,14 +23,6 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_0,
   setfile,
-  AGL,
-  Carbon,
-  Cocoa,
-  Kernel,
-  QTKit,
-  AVFoundation,
-  AVKit,
-  WebKit,
 }:
 
 stdenv.mkDerivation rec {
@@ -68,20 +60,10 @@ stdenv.mkDerivation rec {
     ++ lib.optional withCurl curl
     ++ lib.optional withMesa libGLU
     ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
-    ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       setfile
-      Carbon
-      Cocoa
-      Kernel
-      QTKit
-      AVFoundation
-      AVKit
-      WebKit
     ];
 
-  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;
-
   configureFlags =
     [
       "--disable-precomp-headers"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed3cf54d85b..de141175ed32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10965,7 +10965,6 @@ with pkgs;
 
   wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
     inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
   };
 
   wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {

From 90660e8d394859aa85271345017533a4b3bb3bb4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:19:58 +0100
Subject: [PATCH 1032/1504] wxGTK32: use new darwin sdk pattern

---
 .../libraries/wxwidgets/wxGTK32.nix            | 18 ------------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 19 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
index 84263f4c2f4e..bf53ecc7ad59 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
@@ -25,14 +25,6 @@
 , withWebKit ? true
 , webkitgtk_4_0
 , setfile
-, AGL
-, Carbon
-, Cocoa
-, Kernel
-, QTKit
-, AVFoundation
-, AVKit
-, WebKit
 }:
 let
   catch = fetchFromGitHub {
@@ -81,21 +73,11 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0
-  ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     expat
     setfile
-    Carbon
-    Cocoa
-    Kernel
-    QTKit
-    AVFoundation
-    AVKit
-    WebKit
   ];
 
-  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;
-
   configureFlags = [
     "--disable-precomp-headers"
     # This is the default option, but be explicit
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de141175ed32..33e5f27c60d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10969,7 +10969,6 @@ with pkgs;
 
   wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {
     inherit (darwin.stubs) setfile;
-    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
   };
 
   wxSVG = callPackage ../development/libraries/wxSVG {

From 98fe668bb66b62077edf1b068edee92b5bfe6b84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:40:26 +0000
Subject: [PATCH 1033/1504] notmuch-mailmover: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
index 3380ea217a22..73e5ea5e6632 100644
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "notmuch-mailmover";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "michaeladler";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ionqR60mI/oHnqVqtdIeIU1HeCbXfLGIHqaHDYEZONk=";
+    hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10=";
   };
 
-  cargoHash = "sha256-tUhdfmYAdDlDMez03+ObX9PEU0CML12c5D8N95xiErI=";
+  cargoHash = "sha256-ys8fupS78yxgFBPCCB2JbGADNSEefrEEEGBgzWcLCnI=";
 
   nativeBuildInputs = [
     installShellFiles

From 0f360a3912d102220e655d7a40b9bc8096a9565c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:41:24 +0000
Subject: [PATCH 1034/1504] lock: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index ecc6bc7b2313..6cea78ab8252 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Zd0fVCeE/QTvptoxbyDxcPiBrZ/qZMx/A0tB1wZbX6A=";
+    hash = "sha256-UZt8SlkwhtVRLUMf1uYNLchzkWnL+6e7xLYZ81+YQsw=";
   };
 
   strictDeps = true;

From 3550cccc94a3c60abd05e7015eb94fdbb7cfe76f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:48:46 +0100
Subject: [PATCH 1035/1504] wxGTK31: fix darwin build

---
 pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index fdc8c6703848..0f0595783c3d 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -23,6 +23,7 @@
   withWebKit ? stdenv.hostPlatform.isDarwin,
   webkitgtk_4_0,
   setfile,
+  libpng,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,6 +63,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       setfile
+      libpng
     ];
 
   configureFlags =

From e7e5b31fe4e8cca48c0a22b681f8e1e4eb1cd76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 1 Jan 2025 10:36:52 -0800
Subject: [PATCH 1036/1504] python312Packages.pydevccu: 0.1.8 -> 0.1.9

Diff: https://github.com/SukramJ/pydevccu/compare/refs/tags/0.1.8...0.1.9

Changelog: https://github.com/SukramJ/pydevccu/releases/tag/0.1.9
---
 .../python-modules/pydevccu/default.nix       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix
index b1af673ed6fd..e849fd96974f 100644
--- a/pkgs/development/python-modules/pydevccu/default.nix
+++ b/pkgs/development/python-modules/pydevccu/default.nix
@@ -8,18 +8,23 @@
 
 buildPythonPackage rec {
   pname = "pydevccu";
-  version = "0.1.8";
+  version = "0.1.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
     repo = "pydevccu";
-    rev = "refs/tags/${version}";
-    hash = "sha256-WguSTtWxkiDs5nK5eiaarfD0CBxzIxQR9fxjuW3wMGc=";
+    tag = version;
+    hash = "sha256-s1u9+w0sPpXuqAET4k5VPWP+VoPqB08dZa9oY4UFXc8=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools==75.6.0" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   # Module has no tests
@@ -29,8 +34,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "HomeMatic CCU XML-RPC Server with fake devices";
-    homepage = "https://github.com/danielperna84/pydevccu";
-    changelog = "https://github.com/danielperna84/pydevccu/releases/tag/${version}";
+    homepage = "https://github.com/SukramJ/pydevccu";
+    changelog = "https://github.com/SukramJ/pydevccu/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From c368e0a128a487e37e30fa4b4ac8c2e3fe69c06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 1 Jan 2025 05:24:20 -0800
Subject: [PATCH 1037/1504] python312Packages.hahomematic: 2024.12.5 ->
 2024.12.13

Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2024.12.5...2024.12.13

Changelog: https://github.com/SukramJ/hahomematic/blob/refs/tags/2024.12.13/changelog.md
---
 .../python-modules/hahomematic/default.nix         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 11fb16c44a6f..999001916eb2 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -7,6 +7,7 @@
   orjson,
   pydevccu,
   pytest-aiohttp,
+  pytest-socket,
   pytestCheckHook,
   python-slugify,
   pythonOlder,
@@ -16,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2024.12.5";
+  version = "2024.12.13";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
     repo = "hahomematic";
-    rev = "refs/tags/${version}";
-    hash = "sha256-jC9IXkl80pspqc9m0U6mspp5QSGG6u9Y6ANMK8WAG5s=";
+    tag = version;
+    hash = "sha256-qHB47S5bU+353deoq4B8XwPYfUoU940Y3hl8u3gGrNs=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -48,6 +49,7 @@ buildPythonPackage rec {
     freezegun
     pydevccu
     pytest-aiohttp
+    pytest-socket
     pytestCheckHook
   ];
 
@@ -55,8 +57,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module to interact with HomeMatic devices";
-    homepage = "https://github.com/danielperna84/hahomematic";
-    changelog = "https://github.com/danielperna84/hahomematic/blob/${src.rev}/changelog.md";
+    homepage = "https://github.com/SukramJ/hahomematic";
+    changelog = "https://github.com/SukramJ/hahomematic/blob/${src.tag}/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [
       dotlambda

From 1e0b0c05f70808d6f56375e7e91455c740ec1068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 1 Jan 2025 05:29:00 -0800
Subject: [PATCH 1038/1504] home-assistant-custom-components.homematicip_local:
 1.75.0 -> 1.76.1

Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.75.0...1.76.1

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.76.1/changelog.md
---
 .../homematicip_local/package.nix                  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 29fd801e38aa..643b58e3ae7d 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -7,15 +7,15 @@
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "danielperna84";
+  owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.75.0";
+  version = "1.76.1";
 
   src = fetchFromGitHub {
-    owner = "danielperna84";
+    owner = "SukramJ";
     repo = "custom_homematic";
-    rev = "refs/tags/${version}";
-    hash = "sha256-H5Gf09C9/s2JYVTjgiYNe28mV18mqTiJ0ZDR6rnuojo=";
+    tag = version;
+    hash = "sha256-dBNZFYoi6tA9waV/yPCkgLu+ADxq09UKsOBHWOOBRJY=";
   };
 
   postPatch = ''
@@ -30,9 +30,9 @@ buildHomeAssistantComponent rec {
   ];
 
   meta = {
-    changelog = "https://github.com/danielperna84/custom_homematic/blob/${version}/changelog.md";
+    changelog = "https://github.com/SukramJ/custom_homematic/blob/${src.tag}/changelog.md";
     description = "Custom Home Assistant Component for HomeMatic";
-    homepage = "https://github.com/danielperna84/custom_homematic";
+    homepage = "https://github.com/SukramJ/custom_homematic";
     maintainers = with lib.maintainers; [ dotlambda ];
     license = lib.licenses.mit;
   };

From 648a2754ddfc06e185e25a15ac2f3d9754855e4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 15:13:03 +0000
Subject: [PATCH 1039/1504] upscayl: 2.11.5 -> 2.15.0

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

diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix
index d19f3b4b6a9d..358e1cb6ec14 100644
--- a/pkgs/by-name/up/upscayl/package.nix
+++ b/pkgs/by-name/up/upscayl/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "upscayl";
-  version = "2.11.5";
+  version = "2.15.0";
 
   src = fetchurl {
     url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
-    hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
+    hash = "sha256-ZFlFfliby5nneepELc5gi6zaM5FrcBmohit8YlKqgik=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 01a3482008ad1738e111965cc2588c42741198d1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 07:54:38 +0000
Subject: [PATCH 1040/1504] python312Packages.python-mapnik: unpin Boost

Marked as broken, but compiles successfully and gets to the same
failing test even with Boost unpinned.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 094d52701692..0c0876640148 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13191,7 +13191,7 @@ self: super: with self; {
 
   python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
     inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
-    boost = pkgs.boost182.override {
+    boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };

From dc213dbe001b01ebec8429c70ab721b9ee1a60ec Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 07:54:38 +0000
Subject: [PATCH 1041/1504] python312Packages.rdkit: unpin Boost

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c0876640148..15475d6aae87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13830,7 +13830,7 @@ self: super: with self; {
   rdflib = callPackage ../development/python-modules/rdflib { };
 
   rdkit = callPackage ../development/python-modules/rdkit {
-    boost = pkgs.boost182.override {
+    boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };

From 6f2b12dd6a37561b6e21cc88cfec180f828b39d0 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 07:54:38 +0000
Subject: [PATCH 1042/1504] =?UTF-8?q?python312Packages.ifcopenshell:=20add?=
 =?UTF-8?q?=20upstream=20patch=20for=20Boost=20=E2=89=A5=201.86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../python-modules/ifcopenshell/default.nix   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index c9b5183e4f9e..8f373abdbaff 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -8,13 +8,14 @@
   pytestCheckHook,
   # fetchers
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   # build tools
   cmake,
   swig,
   # native dependencies
   eigen,
-  boost179,
+  boost,
   cgal,
   gmp,
   hdf5,
@@ -65,6 +66,20 @@ buildPythonPackage rec {
     hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ifcopenshell-boost-1.86-mt19937.patch";
+      url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/1fe168d331123920eeb9a96e542fcc1453de57fe.patch";
+      hash = "sha256-oZDEL8cPcEu83lW+qSvCbmDGYpaNNRrptW9MLu2pN70=";
+    })
+
+    (fetchpatch {
+      name = "ifcopenshell-boost-1.86-json.patch";
+      url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/88b861737c7c206d0e7307f90d37467e9585515c.patch";
+      hash = "sha256-zMoQcBWRdtavL0xdsr53SqyG6CZoeon8/mmJhrw85lc=";
+    })
+  ];
+
   nativeBuildInputs = [
     # c++
     cmake
@@ -77,7 +92,7 @@ buildPythonPackage rec {
   buildInputs = [
     # ifcopenshell needs stdc++
     (lib.getLib stdenv.cc.cc)
-    boost179
+    boost
     cgal
     eigen
     gmp

From 97f8479fbfe5da876072f2d7ff27b29bfb7ee2a0 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 1 Jan 2025 14:44:32 -0500
Subject: [PATCH 1043/1504] zed-editor: 0.166.2 -> 0.167.1

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 1c6d977b7658..9f7b0a63f95d 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -93,13 +93,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.166.2";
+  version = "0.167.1";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${version}";
-    hash = "sha256-Z3WdJRn6JpZpZlHq2vjIq1EX1vW4+Gv/XAz2H4WH0Fw=";
+    hash = "sha256-6UwsWOthQHL4+kPogS5DZIg44VPJBT29uIgcxIQJwtU=";
   };
 
   patches = [
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-J5vJ/KV94a+9AqGbNZx6sCzWflOZsyUj3NcqnfaexGE=";
+  cargoHash = "sha256-MT4Ik5m8K1IljnCa1XYrEluz8zHhbEve7cg7Vje8WA4=";
 
   nativeBuildInputs =
     [

From c309e66419ee30d9b9d07773ed4e3f14e4ef42ff Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 1 Jan 2025 19:45:42 +0100
Subject: [PATCH 1044/1504] emacs30.pkgs.aio: Fix build

---
 .../editors/emacs/elisp-packages/melpa-packages.nix            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 02932d6a8ee7..317ed3f73f28 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -761,6 +761,9 @@ let
         # Optimizer error: too much on the stack
         ack-menu = ignoreCompilationError super.ack-menu;
 
+        # https://github.com/skeeto/emacs-aio/issues/31
+        aio = ignoreCompilationError super.aio;
+
         # https://github.com/gongo/airplay-el/issues/2
         airplay = addPackageRequires super.airplay [ self.request-deferred ];
 

From 555208ae092b808d9bd5008468537bc3f5bdd743 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 11:19:35 -0800
Subject: [PATCH 1045/1504] nixos/certmgr: fix eval

---
 nixos/modules/services/security/certmgr.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix
index 4a156539b438..84f17bf87d51 100644
--- a/nixos/modules/services/security/certmgr.nix
+++ b/nixos/modules/services/security/certmgr.nix
@@ -130,7 +130,7 @@ in
                 type = addCheck str (
                   x:
                   cfg.svcManager == "command"
-                  || elem x [
+                  || lib.elem x [
                     "restart"
                     "reload"
                     "nop"

From ef596173f89fb0af8864074cbfd8816c1e056e4b Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 11:19:50 -0800
Subject: [PATCH 1046/1504] nixos/cfssl: fix eval

---
 nixos/modules/services/security/cfssl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix
index 574649de75a9..2d0465d6a0b8 100644
--- a/nixos/modules/services/security/cfssl.nix
+++ b/nixos/modules/services/security/cfssl.nix
@@ -193,7 +193,7 @@ in
           ExecStart =
             with cfg;
             let
-              opt = n: v: optionalString (v != null) ''-${n}="${v}"'';
+              opt = n: v: lib.optionalString (v != null) ''-${n}="${v}"'';
             in
             lib.concatStringsSep " \\\n" [
               "${pkgs.cfssl}/bin/cfssl serve"

From b7090b32162a825ea89192ac461972689a18f1c1 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 11:22:38 -0800
Subject: [PATCH 1047/1504] nixos/cloud-init: fix eval

---
 nixos/modules/services/system/cloud-init.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index cf8585dc90bb..372fa8aac804 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -17,9 +17,9 @@ let
       util-linux
       busybox
     ]
-    ++ optional cfg.btrfs.enable btrfs-progs
-    ++ optional cfg.ext4.enable e2fsprogs
-    ++ optional cfg.xfs.enable xfsprogs
+    ++ lib.optional cfg.btrfs.enable btrfs-progs
+    ++ lib.optional cfg.ext4.enable e2fsprogs
+    ++ lib.optional cfg.xfs.enable xfsprogs
     ++ cfg.extraPackages;
   hasFs = fsName: lib.any (fs: fs.fsType == fsName) (lib.attrValues config.fileSystems);
   settingsFormat = pkgs.formats.yaml { };

From 92ef45ef1103e013de395d6260bda436abec07ee Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 11:59:40 -0800
Subject: [PATCH 1048/1504] nixos/endlessh: fix eval

---
 nixos/modules/services/security/endlessh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/endlessh.nix b/nixos/modules/services/security/endlessh.nix
index cac6de5c3cf3..cd5b9c5c8254 100644
--- a/nixos/modules/services/security/endlessh.nix
+++ b/nixos/modules/services/security/endlessh.nix
@@ -60,7 +60,7 @@ in
           Restart = "always";
           ExecStart =
             with cfg;
-            concatStringsSep " " (
+            lib.concatStringsSep " " (
               [
                 "${pkgs.endlessh}/bin/endlessh"
                 "-p ${toString port}"
@@ -109,7 +109,7 @@ in
         };
     };
 
-    networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ];
+    networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ];
   };
 
   meta.maintainers = with lib.maintainers; [ azahi ];

From 2756e29d887d9358ce2ad4a92dbf0af8a4d7a8fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 20:01:58 +0000
Subject: [PATCH 1049/1504] flyctl: 0.3.53 -> 0.3.56

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

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index d8ce4a9f323b..51fbf03d9172 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.53";
+  version = "0.3.56";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-B6Qku84vUy2KtAWQ3mpbOd1G14xAw0FFuB02fDvFE84=";
+    hash = "sha256-l413128FjVflVKHAYJspK63UP8IomNimIeJi3xyYmxw=";
   };
 
-  vendorHash = "sha256-B7COrPKxTBDdFehBcNKt47I1ZslBHjWc+ibPiCpIocU=";
+  vendorHash = "sha256-/YP9qx6OS2OcPSF1BgEZ4l+nSwg+T5rKOHjdDHlNy+k=";
 
   subPackages = [ "." ];
 

From 18765d044a50ad46192212355ee492bb0b014152 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 12:09:53 -0800
Subject: [PATCH 1050/1504] nixos/tor: fix eval

Resolves #369847
---
 nixos/modules/services/security/tor.nix | 65 ++++++++++++-------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 0d4d4c88be74..6c1554e60caf 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -5,7 +5,6 @@
   pkgs,
   ...
 }:
-with builtins;
 let
   cfg = config.services.tor;
   opt = options.services.tor;
@@ -15,7 +14,7 @@ let
     See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en#${option}).
   '';
   bindsPrivilegedPort =
-    any
+    lib.any
       (
         p0:
         let
@@ -25,7 +24,7 @@ let
           false
         else
           let
-            p2 = if isInt p1 then p1 else toInt p1;
+            p2 = if lib.isInt p1 then p1 else lib.toInt p1;
           in
           p1 != null && 0 < p2 && p2 < 1024
       )
@@ -197,7 +196,7 @@ let
           config = lib.mkIf doConfig {
             # Only add flags in SOCKSPort to avoid duplicates
             flags =
-              filter (name: config.${name} == true) flags
+              lib.filter (name: config.${name} == true) flags
               ++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
           };
         }
@@ -272,16 +271,16 @@ let
     k: v:
     if v == null then
       ""
-    else if isBool v then
+    else if lib.isBool v then
       (if v then "1" else "0")
     else if v ? "unix" && v.unix != null then
-      "unix:" + v.unix + lib.optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
+      "unix:" + v.unix + lib.optionalString (v ? "flags") (" " + lib.concatStringsSep " " v.flags)
     else if v ? "port" && v.port != null then
       lib.optionalString (v ? "addr" && v.addr != null) "${v.addr}:"
       + toString v.port
-      + lib.optionalString (v ? "flags") (" " + concatStringsSep " " v.flags)
+      + lib.optionalString (v ? "flags") (" " + lib.concatStringsSep " " v.flags)
     else if k == "ServerTransportPlugin" then
-      lib.optionalString (v.transports != [ ]) "${concatStringsSep "," v.transports} exec ${v.exec}"
+      lib.optionalString (v.transports != [ ]) "${lib.concatStringsSep "," v.transports} exec ${v.exec}"
     else if k == "HidServAuth" then
       v.onion + " " + v.auth
     else
@@ -298,7 +297,7 @@ let
           k: v:
           # Not necesssary, but prettier rendering
           if
-            elem k [
+            lib.elem k [
               "AutomapHostsSuffixes"
               "DirPolicy"
               "ExitPolicy"
@@ -306,7 +305,7 @@ let
             ]
             && v != [ ]
           then
-            concatStringsSep "," v
+            lib.concatStringsSep "," v
           else
             v
         ) (lib.filterAttrs (k: v: !(v == null || v == "")) settings)
@@ -750,7 +749,7 @@ in
                     ]);
                   apply = map (
                     v:
-                    if isInt v then
+                    if lib.isInt v then
                       {
                         port = v;
                         target = null;
@@ -816,7 +815,7 @@ in
                   settings.HiddenServiceVersion = config.version;
                   settings.HiddenServiceAuthorizeClient =
                     if config.authorizeClient != null then
-                      config.authorizeClient.authType + " " + concatStringsSep "," config.authorizeClient.clientNames
+                      config.authorizeClient.authType + " " + lib.concatStringsSep "," config.authorizeClient.clientNames
                     else
                       null;
                   settings.HiddenServicePort = map (
@@ -998,7 +997,7 @@ in
                   }
                 ))
               ]);
-            apply = p: if isInt p || isString p then { port = p; } else p;
+            apply = p: if lib.isInt p || lib.isString p then { port = p; } else p;
           };
           options.ExtORPortCookieAuthFile = optionPath "ExtORPortCookieAuthFile";
           options.ExtORPortCookieAuthFileGroupReadable = optionBool "ExtORPortCookieAuthFileGroupReadable";
@@ -1198,17 +1197,17 @@ in
         lib.mapAttrsToList (
           n: o:
           lib.optionals (o.settings.HiddenServiceVersion == 2) [
-            (optional (o.settings.HiddenServiceExportCircuitID != null) ''
+            (lib.optional (o.settings.HiddenServiceExportCircuitID != null) ''
               HiddenServiceExportCircuitID is used in the HiddenService: ${n}
               but this option is only for v3 hidden services.
             '')
           ]
           ++ lib.optionals (o.settings.HiddenServiceVersion != 2) [
-            (optional (o.settings.HiddenServiceAuthorizeClient != null) ''
+            (lib.optional (o.settings.HiddenServiceAuthorizeClient != null) ''
               HiddenServiceAuthorizeClient is used in the HiddenService: ${n}
               but this option is only for v2 hidden services.
             '')
-            (optional (o.settings.RendPostPeriod != null) ''
+            (lib.optional (o.settings.RendPostPeriod != null) ''
               RendPostPeriod is used in the HiddenService: ${n}
               but this option is only for v2 hidden services.
             '')
@@ -1245,7 +1244,7 @@ in
         }
         //
           lib.optionalAttrs
-            (elem cfg.relay.role [
+            (lib.elem cfg.relay.role [
               "bridge"
               "private-bridge"
             ])
@@ -1307,13 +1306,13 @@ in
 
     networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts =
-        concatMap
+        lib.concatMap
           (
             o:
-            if isInt o && o > 0 then
+            if lib.isInt o && o > 0 then
               [ o ]
             else
-              lib.optionals (o ? "port" && isInt o.port && o.port > 0) [ o.port ]
+              lib.optionals (o ? "port" && lib.isInt o.port && o.port > 0) [ o.port ]
           )
           (
             lib.flatten [
@@ -1341,40 +1340,40 @@ in
           (
             "+"
             + pkgs.writeShellScript "ExecStartPre" (
-              concatStringsSep "\n" (
+              lib.concatStringsSep "\n" (
                 lib.flatten (
                   [ "set -eu" ]
                   ++ lib.mapAttrsToList (
                     name: onion:
                     lib.optional (onion.authorizedClients != [ ]) ''
-                      rm -rf ${escapeShellArg onion.path}/authorized_clients
-                      install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} ${escapeShellArg onion.path}/authorized_clients
+                      rm -rf ${lib.escapeShellArg onion.path}/authorized_clients
+                      install -d -o tor -g tor -m 0700 ${lib.escapeShellArg onion.path} ${lib.escapeShellArg onion.path}/authorized_clients
                     ''
-                    ++ imap0 (i: pubKey: ''
+                    ++ lib.imap0 (i: pubKey: ''
                       echo ${pubKey} |
-                      install -o tor -g tor -m 0400 /dev/stdin ${escapeShellArg onion.path}/authorized_clients/${toString i}.auth
+                      install -o tor -g tor -m 0400 /dev/stdin ${lib.escapeShellArg onion.path}/authorized_clients/${toString i}.auth
                     '') onion.authorizedClients
                     ++ lib.optional (onion.secretKey != null) ''
-                      install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path}
-                      key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)"
+                      install -d -o tor -g tor -m 0700 ${lib.escapeShellArg onion.path}
+                      key="$(cut -f1 -d: ${lib.escapeShellArg onion.secretKey} | head -1)"
                       case "$key" in
                        ("== ed25519v"*"-secret")
-                        install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;;
+                        install -o tor -g tor -m 0400 ${lib.escapeShellArg onion.secretKey} ${lib.escapeShellArg onion.path}/hs_ed25519_secret_key;;
                        (*) echo >&2 "NixOS does not (yet) support secret key type for onion: ${name}"; exit 1;;
                       esac
                     ''
                   ) cfg.relay.onionServices
                   ++ lib.mapAttrsToList (
                     name: onion:
-                    imap0 (
+                    lib.imap0 (
                       i: prvKeyPath:
                       let
-                        hostname = removeSuffix ".onion" name;
+                        hostname = lib.removeSuffix ".onion" name;
                       in
                       ''
-                        printf "%s:" ${escapeShellArg hostname} | cat - ${escapeShellArg prvKeyPath} |
+                        printf "%s:" ${lib.escapeShellArg hostname} | cat - ${lib.escapeShellArg prvKeyPath} |
                         install -o tor -g tor -m 0700 /dev/stdin \
-                         ${runDir}/ClientOnionAuthDir/${escapeShellArg hostname}.${toString i}.auth_private
+                         ${runDir}/ClientOnionAuthDir/${lib.escapeShellArg hostname}.${toString i}.auth_private
                       ''
                     ) onion.clientAuthorizations
                   ) cfg.client.onionServices
@@ -1417,7 +1416,7 @@ in
         BindPaths = [ stateDir ];
         BindReadOnlyPaths =
           [
-            storeDir
+            builtins.storeDir
             "/etc"
           ]
           ++ lib.optionals config.services.resolved.enable [

From 7bb552f178ab6def1248a49619137f1a13a49a4c Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 12:13:36 -0800
Subject: [PATCH 1051/1504] nixos/magnetico: fix eval

---
 nixos/modules/services/torrent/magnetico.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix
index 51a4dc4c715f..b62613eccdf7 100644
--- a/nixos/modules/services/torrent/magnetico.nix
+++ b/nixos/modules/services/torrent/magnetico.nix
@@ -15,7 +15,7 @@ let
       credentialsFile
     else
       pkgs.writeText "magnetico-credentials" (
-        concatStrings (mapAttrsToList (user: hash: "${user}:${hash}\n") cfg.web.credentials)
+        lib.concatStrings (lib.mapAttrsToList (user: hash: "${user}:${hash}\n") cfg.web.credentials)
       );
 
   # default options in magneticod/main.go
@@ -28,7 +28,7 @@ let
 
   crawlerArgs =
     with cfg.crawler;
-    escapeShellArgs (
+    lib.escapeShellArgs (
       [
         "--database=${dbURI}"
         "--indexer-addr=${address}:${toString port}"
@@ -40,7 +40,7 @@ let
 
   webArgs =
     with cfg.web;
-    escapeShellArgs (
+    lib.escapeShellArgs (
       [
         "--database=${dbURI}"
         (

From c0f2a3cc206838ccf27a98ddf3bd845cdc1509f9 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 12:18:39 -0800
Subject: [PATCH 1052/1504] nixos/endlessh-go: fix eval

---
 nixos/modules/services/security/endlessh-go.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix
index a44652e8afd8..b8b51acc81d0 100644
--- a/nixos/modules/services/security/endlessh-go.nix
+++ b/nixos/modules/services/security/endlessh-go.nix
@@ -94,14 +94,14 @@ in
           Restart = "always";
           ExecStart =
             with cfg;
-            concatStringsSep " " (
+            lib.concatStringsSep " " (
               [
                 (lib.getExe cfg.package)
                 "-logtostderr"
                 "-host=${listenAddress}"
                 "-port=${toString port}"
               ]
-              ++ optionals prometheus.enable [
+              ++ lib.optionals prometheus.enable [
                 "-enable_prometheus"
                 "-prometheus_host=${prometheus.listenAddress}"
                 "-prometheus_port=${toString prometheus.port}"
@@ -149,7 +149,7 @@ in
         };
     };
 
-    networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ];
+    networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ];
   };
 
   meta.maintainers = with lib.maintainers; [ azahi ];

From a97234e2fdc84169e49ad675e66aec37f0500389 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Thu, 2 Jan 2025 08:55:02 +1300
Subject: [PATCH 1053/1504] heroic: fix packaging

Make this package closer to the upstream release build by running the
electron-build task.
---
 pkgs/games/heroic/default.nix | 49 +++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index d3a51d82cb6c..db33d8485684 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   pnpm,
   nodejs,
+  python3,
   makeWrapper,
   electron,
   vulkan-helper,
@@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     nodejs
     pnpm.configHook
+    python3
     makeWrapper
   ];
 
@@ -41,21 +43,25 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-non-steam-shortcuts.patch
   ];
 
-  postPatch = ''
-    # We are not packaging this as an Electron application bundle, so Electron
-    # reports to the application that is is not "packaged", which causes Heroic
-    # to take some incorrect codepaths meant for development environments.
-    substituteInPlace src/**/*.ts --replace-quiet 'app.isPackaged' 'true'
-  '';
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   buildPhase = ''
     runHook preBuild
 
+    # set nodedir to prevent node-gyp from downloading headers
+    # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific
+    mkdir -p $HOME/.node-gyp/${nodejs.version}
+    echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
+    ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
+    export npm_config_nodedir=${nodejs}
+
     pnpm --offline electron-vite build
-    # Remove dev dependencies.
-    pnpm --ignore-scripts prune --prod
-    # Clean up broken symlinks left behind by `pnpm prune`
-    find node_modules/.bin -xtype l -delete
+    pnpm --offline electron-builder \
+      --linux \
+      --dir \
+      -c.asarUnpack="**/*.node" \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
 
     runHook postBuild
   '';
@@ -65,33 +71,32 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/{applications,heroic}
-    cp -r . $out/share/heroic
-    rm -rf $out/share/heroic/{.devcontainer,.vscode,.husky,.idea,.github}
+    mkdir -p "$out/opt/heroic"
+    cp -r dist/linux-unpacked/resources "$out/opt/heroic"
 
-    chmod -R u+w "$out/share/heroic/public/bin" "$out/share/heroic/build/bin"
-    rm -rf "$out/share/heroic/public/bin" "$out/share/heroic/build/bin"
-    mkdir -p "$out/share/heroic/build/bin/x64/linux"
+    cp -r public "$out/opt/heroic/resources/app.asar.unpacked/build"
+    rm -rf "$out/opt/heroic/resources/app.asar.unpacked/build/bin"
+    mkdir -p "$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux"
     ln -s \
       "${lib.getExe gogdl}" \
       "${lib.getExe legendary-gl}" \
       "${lib.getExe nile}" \
       "${lib.getExe comet-gog}" \
       "${lib.getExe vulkan-helper}" \
-      "$out/share/heroic/build/bin/x64/linux/"
+      "$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux"
 
     makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
       --inherit-argv0 \
+      --set ELECTRON_FORCE_IS_PACKAGED 1 \
       --add-flags --disable-gpu-compositing \
-      --add-flags $out/share/heroic \
+      --add-flags $out/opt/heroic/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
-    substituteInPlace "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" \
+    install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop"
+    install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
+    substituteInPlace "$out/share/applications/com.heroicgameslauncher.hgl.desktop" \
       --replace-fail "StartupWMClass=Heroic" "StartupWMClass=heroic" \
       --replace-fail "Exec=heroic-run" "Exec=heroic"
-    mkdir -p "$out/share/applications" "$out/share/icons/hicolor/scalable/apps"
-    ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications"
-    ln -s "$out/share/heroic/src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
 
     runHook postInstall
   '';

From 676d91998d2e43a2dcf74a655ef1481fd1e38c92 Mon Sep 17 00:00:00 2001
From: positiveEV <50848762+positiveEV@users.noreply.github.com>
Date: Wed, 1 Jan 2025 16:30:21 +0100
Subject: [PATCH 1054/1504] ovn: fix missing scripts and wrong paths

Add missing ovs-appctl and ovs-vsctl scripts used by ovn-ctl.

ovs-ctl is looking for ${bindir}/ovs-appctl but I did not find a configure flag for bindir and sbindir in OVS, which default to /usr/local/{bin,sbin}, so I fixed it with sed.

We need to set the --with-dbdir configure flag so that ovn_dbdir does not default to ${ pkgs.ovn }/etc/ovn and is not in the Nix store, as ovn_dbdir contains stateful information.

"--enable-ssl" is the default if I did not misread the autoconf files, but it does not hurt to add it.
---
 pkgs/by-name/ov/ovn/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix
index 2f8512778db7..627a62f85d53 100644
--- a/pkgs/by-name/ov/ovn/package.nix
+++ b/pkgs/by-name/ov/ovn/package.nix
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  configureFlags = [ "--localstatedir=/var" ];
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-dbdir=/var/lib/ovn"
+    "--enable-ssl"
+  ];
 
   enableParallelBuilding = true;
 
@@ -66,7 +70,13 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -vp $out/share/openvswitch/scripts
+    mkdir -vp $out/etc/ovn
+    cp ovs/utilities/ovs-appctl $out/share/openvswitch/scripts
+    cp ovs/utilities/ovs-vsctl $out/share/openvswitch/scripts
     cp ovs/utilities/ovs-lib $out/share/openvswitch/scripts
+    sed -i "s#/usr/local/bin#$out/share/openvswitch/scripts#g" $out/share/openvswitch/scripts/ovs-lib
+    sed -i "s#/usr/local/sbin#$out/share/openvswitch/scripts#g" $out/share/openvswitch/scripts/ovs-lib
+    sed -i '/chown -R $INSTALL_USER:$INSTALL_GROUP $ovn_etcdir/d' $out/share/ovn/scripts/ovn-ctl
   '';
 
   # https://docs.ovn.org/en/latest/topics/testing.html

From 5916b2a824319da05d70dcb415efe5e2a061e5c2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 21:25:52 +0100
Subject: [PATCH 1055/1504] cve-prioritizer: init at 1.8.0

Vulnerability patching with CVSS, EPSS, and CISA's Known Exploited Vulnerabilities

https://github.com/TURROKS/CVE_Prioritizer
---
 pkgs/by-name/cv/cve-prioritizer/package.nix | 58 +++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/cv/cve-prioritizer/package.nix

diff --git a/pkgs/by-name/cv/cve-prioritizer/package.nix b/pkgs/by-name/cv/cve-prioritizer/package.nix
new file mode 100644
index 000000000000..705951a13d3c
--- /dev/null
+++ b/pkgs/by-name/cv/cve-prioritizer/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "cve-prioritizer";
+  version = "1.8.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "TURROKS";
+    repo = "CVE_Prioritizer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ade/gcRrdvVsp5F61ZndsNL3s3gq8TDk/dZvPc55S/8=";
+  };
+
+  patches = [
+    # Add script, https://github.com/TURROKS/CVE_Prioritizer/pull/33
+    (fetchpatch {
+      name = "add-script.patch";
+      url = "https://github.com/TURROKS/CVE_Prioritizer/commit/c29f2332cde7d79e0c9f34c0a1811611a8fb73c9.patch";
+      hash = "sha256-/hnS+YKO4zNGVGTG+KsugJH7Bt2OE8Q2F+7ZX+uhFlU=";
+    })
+  ];
+
+  postPatch = ''
+    # https://github.com/TURROKS/CVE_Prioritizer/pull/32
+    substituteInPlace pyproject.toml \
+      --replace-fail "CVE Prioritizer" "cve-prioritizer"
+  '';
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    click
+    pandas
+    python-dotenv
+    requests
+    termcolor
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "cve_prioritizer" ];
+
+  meta = {
+    description = "Vulnerability patching with CVSS, EPSS, and CISA's Known Exploited Vulnerabilities";
+    homepage = "https://github.com/TURROKS/CVE_Prioritizer";
+    changelog = "https://github.com/TURROKS/CVE_Prioritizer/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "cve-prioritizer";
+  };
+}

From f11148a34ccbdf909e07bd25d738d103dabf0fcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 20:51:41 +0000
Subject: [PATCH 1056/1504] albert: 0.26.10 -> 0.26.11

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

diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index 977e730991bf..c1fe2144e67d 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.26.10";
+  version = "0.26.11";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GVYRcrSXz4EXb3isoUN3x/68CAfr0wMgnvv+CzW/yZY=";
+    hash = "sha256-rPQ6nxUT7qiuOgmmQKCrYHl4kKJODe+nw4VNGjF+n/g=";
     fetchSubmodules = true;
   };
 

From 5b816767fd23694290a622d42d38b2a4fcd7fde6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 1 Jan 2025 21:30:05 +0100
Subject: [PATCH 1057/1504] tinymist: generate shell completion

---
 pkgs/by-name/ti/tinymist/package.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 214bd58662ff..1bcb45a8c615 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -1,11 +1,14 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
+  installShellFiles,
   pkg-config,
   libgit2,
   openssl,
   zlib,
+  buildPackages,
   versionCheckHook,
   nix-update-script,
   vscode-extensions,
@@ -27,7 +30,10 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+Ce9qIETGFZXG4RX5GP8tpmH4fkpbPkDS1FX64NQ6/4=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
 
   buildInputs = [
     libgit2
@@ -59,6 +65,17 @@ rustPlatform.buildRustPackage rec {
     "--skip=semantic_tokens_full::tests::test"
   ];
 
+  postInstall =
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      installShellCompletion --cmd tinymist \
+        --bash <(${emulator} $out/bin/tinymist completion bash) \
+        --fish <(${emulator} $out/bin/tinymist completion fish) \
+        --zsh <(${emulator} $out/bin/tinymist completion zsh)
+    '';
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];

From 7faac508af7d39701a856bf8013e33f5674a600d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 1 Jan 2025 21:51:32 +0100
Subject: [PATCH 1058/1504] home-assistant-custom-components.calendar_export:
 init at 0.1.0

---
 .../calendar_export/package.nix               | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/calendar_export/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix b/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix
new file mode 100644
index 000000000000..b63dee9ad998
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/calendar_export/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  icalendar,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "JosephAbbey";
+  domain = "calendar_export";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "JosephAbbey";
+    repo = "ha_calendar_export";
+    tag = "v${version}";
+    hash = "sha256-ULnkjnBc0oR1CwA+Mz1RnVamEXOKpgd60xryZMkCQwg=";
+  };
+
+  dependencies = [ icalendar ];
+
+  ignoreVersionRequirement = [ "icalendar" ];
+
+  meta = {
+    description = "Export calendar events in the iCalendar format";
+    homepage = "https://github.com/JosephAbbey/ha_calendar_export";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}

From 94ae419b96b80b486180920899df9cfa65714c9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 22:08:50 +0100
Subject: [PATCH 1059/1504] python312Packages.diagrams: 0.23.4 -> 0.24.2

---
 .../diagrams/build_poetry.patch               | 12 -----
 .../python-modules/diagrams/default.nix       | 51 ++++++++++---------
 2 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/diagrams/build_poetry.patch

diff --git a/pkgs/development/python-modules/diagrams/build_poetry.patch b/pkgs/development/python-modules/diagrams/build_poetry.patch
deleted file mode 100644
index b2e3d39dae11..000000000000
--- a/pkgs/development/python-modules/diagrams/build_poetry.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 2c93a39..6c800e2 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -24,3 +24,7 @@ isort = "^4.3"
- 
- [tool.black]
- line-length = 120
-+
-+[build-system]
-+requires = ["poetry_core>=1.0.0"]
-+build-backend = "poetry.core.masonry.api"
diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index 85eafa12893b..551430eebaa6 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -1,47 +1,52 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+  fetchpatch,
+  graphviz,
+  imagemagick,
+  inkscape,
   jinja2,
   poetry-core,
-  round,
-  graphviz,
-  inkscape,
-  imagemagick,
   pytestCheckHook,
-  typed-ast,
+  pythonOlder,
+  round,
 }:
 
 buildPythonPackage rec {
   pname = "diagrams";
-  version = "0.23.4";
-  format = "pyproject";
+  version = "0.24.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "mingrammer";
-    repo = pname;
+    repo = "diagrams";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2jRWN2glGEr51fzny8nkqa5c2EdJG5aZPG2eTD7AISY=";
+    hash = "sha256-xdc8qHvLKy5QV/1c87o7H/VhitUhpH/+VgqBHn2a8lg=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'graphviz = ">=0.13.2,<0.20.0"' 'graphviz = "*"'
-  '';
+  patches = [
+    # Add build-system, https://github.com/mingrammer/diagrams/pull/1089
+    (fetchpatch {
+      name = "add-build-system.patch";
+      url = "https://github.com/mingrammer/diagrams/commit/59b84698b142f5a0998ee9e395df717a1b77e9b2.patch";
+      hash = "sha256-/zV5X4qgHJs+KO9gHyu6LqQ3hB8Zx+BzOFo7K1vQK78=";
+    })
+    ./remove-black-requirement.patch
+  ];
+
+  pythonRemoveDeps = [ "pre-commit" ];
+
+  pythonRelaxDeps = [ "graphviz" ];
 
   preConfigure = ''
     patchShebangs autogen.sh
     ./autogen.sh
   '';
 
-  patches = [
-    # The build-system section is missing
-    ./build_poetry.patch
-    ./remove-black-requirement.patch
-  ];
+  build-system = [ poetry-core ];
 
   # Despite living in 'tool.poetry.dependencies',
   # these are only used at build time to process the image resource files
@@ -49,14 +54,10 @@ buildPythonPackage rec {
     inkscape
     imagemagick
     jinja2
-    poetry-core
     round
   ];
 
-  propagatedBuildInputs = [
-    graphviz
-    typed-ast
-  ];
+  dependencies = [ graphviz ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 5ab7ac6886342f59496a221bb17d370c1432580c Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:20:25 +0100
Subject: [PATCH 1060/1504] antora-ui-default: conventionally sort fetch
 attributes

---
 pkgs/by-name/an/antora-ui-default/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix
index 33c7346ebf9f..7da104702a55 100644
--- a/pkgs/by-name/an/antora-ui-default/package.nix
+++ b/pkgs/by-name/an/antora-ui-default/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   srcFetchFromGitLab = {
-    hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
     owner = "trueNAHO";
     repo = "antora-ui-default";
     rev = "11f563294248e9b64124b9289d639e349f2e9f5f";
+    hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
   };
 in
 stdenvNoCC.mkDerivation {

From 031e8ea9ef4c3135588e1272f4f2b3456cacb337 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:20:47 +0100
Subject: [PATCH 1061/1504] antora-lunr-extension: conventionally sort fetch
 attributes

---
 pkgs/by-name/an/antora-lunr-extension/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/antora-lunr-extension/package.nix b/pkgs/by-name/an/antora-lunr-extension/package.nix
index c4eb14a9996f..35948b865d8f 100644
--- a/pkgs/by-name/an/antora-lunr-extension/package.nix
+++ b/pkgs/by-name/an/antora-lunr-extension/package.nix
@@ -10,10 +10,10 @@ buildNpmPackage rec {
   version = "1.0.0-alpha.8";
 
   src = fetchFromGitLab {
-    hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
     owner = "antora";
     repo = pname;
     rev = "v${version}";
+    hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
   };
 
   npmDepsHash = "sha256-EtjZL6U/uSGSYSqtuatCkdWP0NHxRuht13D9OaM4x00=";

From 2390809980a276226c53e3e07d169fdc45de7c13 Mon Sep 17 00:00:00 2001
From: Jacob Moody <moody@posixcafe.org>
Date: Wed, 1 Jan 2025 15:24:47 -0600
Subject: [PATCH 1062/1504] tlsclient: 1.6.5 -> 1.6.6

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

diff --git a/pkgs/by-name/tl/tlsclient/package.nix b/pkgs/by-name/tl/tlsclient/package.nix
index 20bbacd0c27a..2d829c518a68 100644
--- a/pkgs/by-name/tl/tlsclient/package.nix
+++ b/pkgs/by-name/tl/tlsclient/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tlsclient";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromSourcehut {
     owner = "~moody";
     repo = "tlsclient";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ff41LZ5jbrqni2ptsUlI3L17SCHnGo4utg8etFubRNI=";
+    hash = "sha256-nUvOmEwdMKuPM9KaMGxmW0Lvo3968wjDc95pLB17YnM=";
   };
 
   strictDeps = true;

From 293f832365699e6e028737ac1ad35b7428c97da5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 21:28:24 +0000
Subject: [PATCH 1063/1504] opensnitch-ui: 1.6.6 -> 1.6.7

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

diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix
index fc4dd9ef9300..74440f506d7b 100644
--- a/pkgs/by-name/op/opensnitch-ui/package.nix
+++ b/pkgs/by-name/op/opensnitch-ui/package.nix
@@ -8,13 +8,13 @@
 
 python311Packages.buildPythonApplication rec {
   pname = "opensnitch-ui";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI=";
+    hash = "sha256-2BwFCRbVvs7pAM5SnhynWws2+QthB/F9V6DYPViDICU=";
   };
 
   postPatch = ''

From 0b22020d8841d3b2e342567bdabfb6c5575edfa1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 1 Jan 2025 22:37:44 +0100
Subject: [PATCH 1064/1504] vscode-extensions.visualjj.visualjj: switch to
 VSCode marketplace

---
 .../extensions/visualjj.visualjj/default.nix  | 38 +------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 9d2dd8d9ba28..2950e7ab0006 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -1,48 +1,14 @@
 {
   lib,
-  stdenv,
   vscode-utils,
-  fetchurl,
 }:
 
-let
-  version = "0.13.4";
-
-  sources = {
-    "x86_64-linux" = {
-      arch = "linux-x64";
-      url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
-      hash = "sha256-q9ubYkhrV28sB9CV1dyBEIFEkTrkGHRXdz5+4xjeVzI=";
-    };
-    "x86_64-darwin" = {
-      arch = "darwin-x64";
-      url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
-      hash = "sha256-vV5u1QBICz3GIYRgH9UWM38a8YXtvW0u8r7c1SaKwxM=";
-    };
-    "aarch64-linux" = {
-      arch = "linux-arm64";
-      url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
-      hash = "sha256-fgT4brIhHI6gNCcsbHpz+v4/diyox2VoFlvCnhPIbPM=";
-    };
-    "aarch64-darwin" = {
-      arch = "darwin-arm64";
-      url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
-      hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM=";
-    };
-  };
-in
 vscode-utils.buildVscodeMarketplaceExtension {
-  vsix = fetchurl {
-    url = sources.${stdenv.hostPlatform.system}.url;
-    hash = sources.${stdenv.hostPlatform.system}.hash;
-    name = "visualjj-visualjj-${version}.zip";
-  };
-
   mktplcRef = {
-    inherit version;
     name = "visualjj";
     publisher = "visualjj";
-    arch = sources.${stdenv.hostPlatform.system}.arch;
+    version = "0.13.4";
+    hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM=";
   };
 
   meta = {

From dd2f21b54cbfde064fe70dbe7585194d8b00afc2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 22:44:41 +0100
Subject: [PATCH 1065/1504] python312Packages.slixmpp: update disabled

---
 pkgs/development/python-modules/slixmpp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index c86de6bd6157..02070116ebda 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   version = "1.8.6";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;

From 3fdfa094a1ac69185184dbdfb679c500dbed8e01 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 22:51:10 +0100
Subject: [PATCH 1066/1504] python312Packages.zabbix-utils: init at 2.0.2

Library for zabbix

https://github.com/zabbix/python-zabbix-utils
---
 .../python-modules/zabbix-utils/default.nix   | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/zabbix-utils/default.nix

diff --git a/pkgs/development/python-modules/zabbix-utils/default.nix b/pkgs/development/python-modules/zabbix-utils/default.nix
new file mode 100644
index 000000000000..6b8d71d2cf1d
--- /dev/null
+++ b/pkgs/development/python-modules/zabbix-utils/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "zabbix-utils";
+  version = "2.0.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "zabbix";
+    repo = "python-zabbix-utils";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rRPen/FzWT0cCnXWiSdoybtXeP1pxYqnjq5b0QPVs1I=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "zabbix_utils" ];
+
+  meta = {
+    description = "Library for zabbix";
+    homepage = "https://github.com/zabbix/python-zabbix-utils";
+    changelog = "https://github.com/zabbix/python-zabbix-utils/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 094d52701692..e675ef39a59a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18366,6 +18366,8 @@ self: super: with self; {
     pname = "z3-solver";
   }))).python;
 
+  zabbix-utils = callPackage ../development/python-modules/zabbix-utils { };
+
   zadnegoale = callPackage ../development/python-modules/zadnegoale { };
 
   zamg = callPackage ../development/python-modules/zamg { };

From 9695e75dde3197dd10e3a4d9883e2daaeb6ee2f7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 1 Jan 2025 12:26:06 +0800
Subject: [PATCH 1067/1504] nixos/kmonad: create determinate symlinks

---
 nixos/doc/manual/release-notes/rl-2505.section.md |  2 ++
 nixos/modules/services/hardware/kmonad.nix        | 11 +++++++++++
 nixos/tests/kmonad.nix                            |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 9b39fb1869ea..bd7937aa7f93 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -306,6 +306,8 @@
 
 - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
 
+- `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices.
+
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
 - Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added.
diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 687224fae2e9..363a8e702874 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -195,6 +195,17 @@ in
   config = lib.mkIf cfg.enable {
     hardware.uinput.enable = true;
 
+    services.udev.extraRules =
+      let
+        mkRule = name: ''
+          ACTION=="add", KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="${name}", ATTRS{id/product}=="5679", ATTRS{id/vendor}=="1235", SYMLINK+="input/by-id/${name}"
+        '';
+      in
+      lib.foldlAttrs (
+        rules: _: keyboard:
+        rules + "\n" + mkRule (mkName keyboard.name)
+      ) "" cfg.keyboards;
+
     systemd = {
       paths = lib.mapAttrs' (_: mkPath) cfg.keyboards;
       services = lib.mapAttrs' (_: mkService) cfg.keyboards;
diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix
index e0150cb99f18..9b0d47e578e4 100644
--- a/nixos/tests/kmonad.nix
+++ b/nixos/tests/kmonad.nix
@@ -43,5 +43,7 @@
 
     with subtest("kmonad is running"):
          machine.succeed(f"systemctl status {service_name}")
+    with subtest("kmonad symlink is created"):
+         machine.wait_for_file(f"/dev/input/by-id/{service_name}", timeout=5)
   '';
 }

From f6d3c5c227a39c920246484b6fa683f2d84d1161 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 22:08:05 +0000
Subject: [PATCH 1068/1504] chirp: 0.4.0-unstable-2024-12-17 ->
 0.4.0-unstable-2024-12-26

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

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 984d459ec3f0..092ce48b52dc 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2024-12-17";
+  version = "0.4.0-unstable-2024-12-26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "605037deb68994bbb3114c2a35db7a7a7e4755a6";
-    hash = "sha256-5AwoXX5Qa4ROjt5wSdcElLJ7ZVguKK3urn0ygVDJiGQ=";
+    rev = "43449629fb3c2ae0b71e8b7cb7d49e8e97a00c64";
+    hash = "sha256-zn9pInfJ/QbwgvBqkqzdW7txVGZVU1EPDo4I4ZQDdLY=";
   };
 
   nativeBuildInputs = [

From e089eb4cafdbd23331bbac20790c7ed991872e6a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 23:08:53 +0100
Subject: [PATCH 1069/1504] python312Packages.tencentcloud-sdk-python: 3.0.1293
 -> 3.0.1294

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1293...3.0.1294

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1294/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index ff12a6001792..7b2d029eab50 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1293";
+  version = "3.0.1294";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-ho1RneF7xRO6Lc7i4BxAVjHA9UZiEZA2+olnasv4RSw=";
+    hash = "sha256-6Xuih0E+i5dxTlkYzYa0J3T0aNpCoGnnBo1tpfuzWQM=";
   };
 
   build-system = [ setuptools ];

From 05176adfbd5983430b4790c071e7aa3dc3480d32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 22:10:23 +0000
Subject: [PATCH 1070/1504] roddhjav-apparmor-rules: 0-unstable-2024-12-13 ->
 0-unstable-2024-12-25

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 8f182baa67eb..efe2cdb64926 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-12-13";
+  version = "0-unstable-2024-12-25";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "edaa45067abd5f18fa702ca3f08897d93425bbc5";
-    hash = "sha256-um00IUuYmDh9lilaUxklrgbFgJVBojSDMov3q5y4FkY=";
+    rev = "2560e9645ff11d4fd24c69ef8145adf9bc8f817c";
+    hash = "sha256-pPA9/QF3ftCjW7TZKWBHOvEE49XtcBSl7X5IugumCEg=";
   };
 
   dontConfigure = true;

From 29f2c03f1610d0f35ce8901db3ef6798d7982118 Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sun, 22 Dec 2024 21:24:07 +0200
Subject: [PATCH 1071/1504] maintainers: add myypo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b1246893c90b..6c292846f902 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15563,6 +15563,12 @@
     githubId = 9636071;
     name = "Myrl Hex";
   };
+  myypo = {
+    email = "nikirsmcgl@gmail.com";
+    github = "myypo";
+    githubId = 110892040;
+    name = "Mykyta Polchanov";
+  };
   mzacho = {
     email = "nixpkgs@martinzacho.net";
     github = "mzacho";

From fd8921d8c80e60bbfcfba91a40495f2c3bee5c46 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 18:10:08 +0900
Subject: [PATCH 1072/1504] python312Packages.jax: reenable cuda support and
 clean up

---
 .../jax-cuda12-pjrt/default.nix               | 43 +++++++------------
 .../jax-cuda12-plugin/default.nix             |  9 ++--
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index 16c0236cc218..67f5774a2f49 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchurl,
-  autoAddDriverRunpath,
+  addDriverRunpath,
   autoPatchelfHook,
   pypaInstallHook,
   wheelUnpackHook,
@@ -19,16 +19,14 @@ let
     with cudaPackages;
     [
       (lib.getLib cuda_cudart) # libcudart.so
-      (lib.getLib cuda_cupti) # libcupti.so
       (lib.getLib cudnn) # libcudnn.so
-      (lib.getLib libcufft) # libcufft.so
-      (lib.getLib libcusolver) # libcusolver.so
-      (lib.getLib libcusparse) # libcusparse.so
+      (lib.getLib libcublas) # libcublas.so
+      addDriverRunpath.driverLink # libcuda.so
     ]
   );
 
   # Find new releases at https://storage.googleapis.com/jax-releases
-  # When upgrading, you can get these hashes from prefetch.sh. See
+  # When upgrading, you can get these hashes from jaxlib/prefetch.sh. See
   # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index.
 
   # upstream does not distribute jax-cuda12-pjrt 0.4.38 binaries for aarch64-linux
@@ -53,46 +51,37 @@ buildPythonPackage {
       or (throw "jax-cuda12-pjrt: No src for ${stdenv.hostPlatform.system}");
 
   nativeBuildInputs = [
-    autoAddDriverRunpath
     autoPatchelfHook
     pypaInstallHook
     wheelUnpackHook
   ];
 
-  # The following attributes (buildInputs, postInstall and preInstallCheck) are copied from jaxlib-0.4.28
-  # but it does not recognize GPUs as of 2024-12-29
-  # Dynamic link dependencies
-  buildInputs = [ (lib.getLib stdenv.cc.cc) ];
-
-  # jaxlib looks for ptxas at runtime, eg when running `jax.random.PRNGKey(0)`.
+  # jax-cuda12-pjrt looks for ptxas, nvlink and nvvm at runtime, eg when running `jax.random.PRNGKey(0)`.
   # Linking into $out is the least bad solution. See
   # * https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621
   # * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211
   # for more info.
   postInstall = ''
-    mkdir -p $out/${python.sitePackages}/jaxlib/cuda/bin
-    ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jaxlib/cuda/bin/ptxas
+    mkdir -p $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/bin
+    ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/bin/ptxas
+    ln -s ${lib.getExe' cudaPackages.cuda_nvcc "nvlink"} $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/bin/nvlink
+    ln -s ${cudaPackages.cuda_nvcc}/nvvm $out/${python.sitePackages}/jax_plugins/nvidia/cuda_nvcc/nvvm
   '';
 
-  # jaxlib contains shared libraries that open other shared libraries via dlopen
+  # jax-cuda12-pjrt contains shared libraries that open other shared libraries via dlopen
   # and these implicit dependencies are not recognized by ldd or
   # autoPatchelfHook. That means we need to sneak them into rpath. This step
   # must be done after autoPatchelfHook and the automatic stripping of
   # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the
   # patchPhase.
   preInstallCheck = ''
-    shopt -s globstar
-
-    for file in $out/**/*.so; do
-      echo $file
-      patchelf --add-rpath "${cudaLibPath}" "$file"
-    done
+    patchelf --add-rpath "${cudaLibPath}" $out/${python.sitePackages}/jax_plugins/xla_cuda12/xla_cuda_plugin.so
   '';
 
-  # no tests
-  doCheck = false;
+  # FIXME: there are no tests, but we need to run preInstallCheck above
+  doCheck = true;
 
-  pythonImportsCheck = [ "jax_plugins.xla_cuda12" ];
+  pythonImportsCheck = [ "jax_plugins" ];
 
   meta = {
     description = "JAX XLA PJRT Plugin for NVIDIA GPUs";
@@ -104,8 +93,6 @@ buildPythonPackage {
     # see CUDA compatibility matrix
     # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
     broken =
-      !(lib.versionAtLeast cudaVersion "12.1")
-      || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1")
-      || true;
+      !(lib.versionAtLeast cudaVersion "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
   };
 }
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index d672a1c82e1a..0b63fac213a1 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
-  autoAddDriverRunpath,
   autoPatchelfHook,
   pypaInstallHook,
   wheelUnpackHook,
@@ -90,7 +89,6 @@ buildPythonPackage {
   );
 
   nativeBuildInputs = [
-    autoAddDriverRunpath
     autoPatchelfHook
     pypaInstallHook
     wheelUnpackHook
@@ -100,6 +98,9 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "jax_cuda12_plugin" ];
 
+  # no tests
+  doCheck = false;
+
   meta = {
     description = "JAX Plugin for CUDA12";
     homepage = "https://github.com/jax-ml/jax/tree/main/jax_plugins/cuda";
@@ -110,8 +111,6 @@ buildPythonPackage {
     # see CUDA compatibility matrix
     # https://jax.readthedocs.io/en/latest/installation.html#pip-installation-nvidia-gpu-cuda-installed-locally-harder
     broken =
-      !(lib.versionAtLeast cudaVersion "12.1")
-      || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1")
-      || true;
+      !(lib.versionAtLeast cudaVersion "12.1") || !(lib.versionAtLeast cudaPackages.cudnn.version "9.1");
   };
 }

From cbd736c3e130d696af740b48765e08c3db51b561 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:04:15 +0100
Subject: [PATCH 1073/1504] spotube: unify linux and darwin builder

---
 pkgs/by-name/sp/spotube/package.nix | 172 ++++++++++++----------------
 1 file changed, 73 insertions(+), 99 deletions(-)

diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix
index d181f0f06a0f..1337e51c7da3 100644
--- a/pkgs/by-name/sp/spotube/package.nix
+++ b/pkgs/by-name/sp/spotube/package.nix
@@ -20,37 +20,73 @@
   webkitgtk_4_1,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "spotube";
   version = "3.9.0";
 
-  meta = {
-    description = "Open source, cross-platform Spotify client compatible across multiple platforms";
-    longDescription = ''
-      Spotube is an open source, cross-platform Spotify client compatible across
-      multiple platforms utilizing Spotify's data API and YouTube (or Piped.video or JioSaavn)
-      as an audio source, eliminating the need for Spotify Premium
-    '';
-    downloadPage = "https://github.com/KRTirtho/spotube/releases";
-    homepage = "https://spotube.krtirtho.dev/";
-    license = lib.licenses.bsdOriginal;
-    mainProgram = "spotube";
-    maintainers = with lib.maintainers; [ tomasajt ];
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
-      "aarch64-linux"
-    ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
+  src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
-  sources =
+  sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin ".";
+
+  nativeBuildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      autoPatchelfHook
+      dpkg
+      makeWrapper
+      wrapGAppsHook3
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      undmg
+      makeBinaryWrapper
+    ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    glib-networking
+    gtk3
+    libappindicator
+    libnotify
+    libsoup_3
+    mpv-unwrapped
+    webkitgtk_4_1
+  ];
+
+  dontWrapGApps = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    ${lib.optionalString stdenv.hostPlatform.isLinux ''
+      mkdir -p $out
+      cp -r usr/* $out
+    ''}
+
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      cp -r Spotube.app $out/Applications
+      makeBinaryWrapper $out/Applications/Spotube.app/Contents/MacOS/Spotube $out/bin/spotube
+    ''}
+
+    runHook postInstall
+  '';
+
+  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
+        --replace-needed libmpv.so.1 libmpv.so
+  '';
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    makeWrapper $out/share/spotube/spotube $out/bin/spotube \
+        "''${gappsWrapperArgs[@]}" \
+        --prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [ mpv-unwrapped ]} \
+        --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
+  '';
+
+  passthru.sources =
     let
       fetchArtifact =
         { filename, hash }:
         fetchurl {
-          url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}";
+          url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/${filename}";
           inherit hash;
         };
     in
@@ -73,81 +109,19 @@ let
       };
     };
 
-  src = sources.${stdenv.hostPlatform.system};
-
-  darwin = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      meta
-      src
-      ;
-
-    passthru = { inherit sources; };
-
-    sourceRoot = ".";
-
-    nativeBuildInputs = [
-      undmg
-      makeBinaryWrapper
-    ];
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/Applications $out/bin
-      cp -r spotube.app $out/Applications
-      makeBinaryWrapper $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
-      runHook postInstall
+  meta = {
+    description = "Open source, cross-platform Spotify client compatible across multiple platforms";
+    longDescription = ''
+      Spotube is an open source, cross-platform Spotify client compatible across
+      multiple platforms utilizing Spotify's data API and YouTube (or Piped.video or JioSaavn)
+      as an audio source, eliminating the need for Spotify Premium
     '';
+    downloadPage = "https://github.com/KRTirtho/spotube/releases";
+    homepage = "https://spotube.krtirtho.dev/";
+    license = lib.licenses.bsdOriginal;
+    mainProgram = "spotube";
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.attrNames finalAttrs.passthru.sources;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
-
-  linux = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      meta
-      src
-      ;
-
-    passthru = { inherit sources; };
-
-    nativeBuildInputs = [
-      autoPatchelfHook
-      dpkg
-      makeWrapper
-      wrapGAppsHook3
-    ];
-
-    buildInputs = [
-      glib-networking
-      gtk3
-      libappindicator
-      libnotify
-      libsoup_3
-      mpv-unwrapped
-      webkitgtk_4_1
-    ];
-
-    dontWrapGApps = true;
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out
-      cp -r usr/* $out
-      runHook postInstall
-    '';
-
-    preFixup = ''
-      patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
-          --replace-needed libmpv.so.1 libmpv.so
-    '';
-
-    postFixup = ''
-      makeWrapper $out/share/spotube/spotube $out/bin/spotube \
-          "''${gappsWrapperArgs[@]}" \
-          --prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [ mpv-unwrapped ]} \
-          --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
-    '';
-  };
-in
-if stdenv.hostPlatform.isDarwin then darwin else linux
+})

From fac4c997a615d68e6606f7ab9ce2206b46e31cbc Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 1 Jan 2025 23:38:20 +0100
Subject: [PATCH 1074/1504] python312Packages.strawberry-graphql: fix build

---
 pkgs/development/python-modules/strawberry-graphql/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 986b87ef7273..370d5ab068c3 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -147,6 +147,7 @@ buildPythonPackage rec {
     "tests/cli/"
     "tests/django/test_dataloaders.py"
     "tests/exceptions/"
+    "tests/experimental/pydantic/test_fields.py"
     "tests/http/"
     "tests/schema/extensions/"
     "tests/schema/test_dataloaders.py"

From b74d40912714f72e87b65a556f0ade8c9f2c3cf7 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 14:41:54 -0800
Subject: [PATCH 1075/1504] nixos/tor: fix eval take three

This time I looked through all the symbols in `lib` and verified that each instance had a `lib.` before it.

The `nixosTests.tor` continues to pass. It doesn't cover all the cases, sadly.
---
 nixos/modules/services/security/tor.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 6c1554e60caf..7002aa9dabb6 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -126,7 +126,7 @@ let
             );
           config = {
             flags =
-              filter (name: config.${name} == true) isolateFlags
+              lib.filter (name: config.${name} == true) isolateFlags
               ++ lib.optional (config.SessionGroup != null) "SessionGroup=${toString config.SessionGroup}";
           };
         }
@@ -244,7 +244,7 @@ let
                     }
                   );
                 config = {
-                  flags = filter (name: config.${name} == true) flags;
+                  flags = lib.filter (name: config.${name} == true) flags;
                 };
               }
             ))
@@ -928,7 +928,7 @@ in
                           }
                         );
                       config = {
-                        flags = filter (name: config.${name} == true) flags;
+                        flags = lib.filter (name: config.${name} == true) flags;
                       };
                     }
                   ))

From 0c160da06c202aa7a1a4614c52f6582f30dd50ff Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 15:09:27 -0800
Subject: [PATCH 1076/1504] nixosTest.lvm2: remove 4.19 kernel, test on 6.6

All tests continue to pass except for `nixosTests.lvm2.lvm-raid-sd-stage-1-linux-5_15` which continues to fail due to not having a kernel with the appropriate options configured.
---
 nixos/tests/lvm2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix
index 0e4ec8d27fda..4d6fc3bac5c3 100644
--- a/nixos/tests/lvm2/default.nix
+++ b/nixos/tests/lvm2/default.nix
@@ -4,11 +4,11 @@
   pkgs ? import ../../.. { inherit system config; },
   lib ? pkgs.lib,
   kernelVersionsToTest ? [
-    "4.19"
     "5.4"
     "5.10"
     "5.15"
     "6.1"
+    "6.6"
     "latest"
   ],
 }:

From 161f45d4be41a7b93c41d874f5fc8fd858dfeffb Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 1 Jan 2025 15:35:51 -0800
Subject: [PATCH 1077/1504] nixosTest.lvm2: don't run one test on old 5.15
 kernel without support

---
 nixos/tests/lvm2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix
index 4d6fc3bac5c3..58eef6e0ccef 100644
--- a/nixos/tests/lvm2/default.nix
+++ b/nixos/tests/lvm2/default.nix
@@ -33,7 +33,7 @@ let
       # systemd in stage 1
       raid-sd-stage-1 = {
         test = callTest ./systemd-stage-1.nix;
-        kernelFilter = lib.id;
+        kernelFilter = lib.filter (v: v != "5.15");
         flavour = "raid";
       };
       thinpool-sd-stage-1 = {

From 93ccd7bb6f387df8b53b34cc53a4c57b3ba20940 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 00:42:15 +0100
Subject: [PATCH 1078/1504] sound-of-sorting: fix darwin build

---
 pkgs/by-name/so/sound-of-sorting/package.nix | 32 ++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix
index a95365171787..735416282a9d 100644
--- a/pkgs/by-name/so/sound-of-sorting/package.nix
+++ b/pkgs/by-name/so/sound-of-sorting/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   SDL2,
   wxGTK32,
-  darwin,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,18 +19,32 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/freebsd/freebsd-ports/raw/31ec0266e31910c16b0f69e16a2a693aae20abdf/math/sound-of-sorting/files/patch-src_SortAlgo.cpp";
+      extraPrefix = "";
+      hash = "sha256-mOo3GsEZ8r8p9ROoel2TO9Z4yF5SmCN0/fUn/2qUKAo=";
+    })
+    (fetchpatch {
+      url = "https://github.com/freebsd/freebsd-ports/raw/31ec0266e31910c16b0f69e16a2a693aae20abdf/math/sound-of-sorting/files/patch-src_SortAlgo.h";
+      extraPrefix = "";
+      hash = "sha256-NNSPs0gT6ndeMQWHLHAwLR5nMQGP880Qd6kulDYJYF0=";
+    })
+    (fetchpatch {
+      url = "https://github.com/freebsd/freebsd-ports/raw/31ec0266e31910c16b0f69e16a2a693aae20abdf/math/sound-of-sorting/files/patch-src_SortArray.cpp";
+      extraPrefix = "";
+      hash = "sha256-WxqwcZ2L9HPG4QNf1Xi624aKTM3cRBWN+W00htcIJ5k=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
   ];
 
-  buildInputs =
-    [
-      wxGTK32
-      SDL2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Cocoa
-    ];
+  buildInputs = [
+    wxGTK32
+    SDL2
+  ];
 
   meta = {
     description = "Audibilization and Visualization of Sorting Algorithms";

From 9e9fe337e29512eab45ee9e8e8325d423f1527c1 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 2 Jan 2025 03:06:19 +0800
Subject: [PATCH 1079/1504] release-haskell.nix: add kmonad nixos test

---
 pkgs/top-level/release-haskell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 0751f936d355..811af101d371 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -263,6 +263,7 @@ let
       nixosTests = {
         inherit (packagePlatforms pkgs.nixosTests)
           agda
+          kmonad
           xmonad
           xmonad-xdg-autostart
           ;

From 709930aaf6d5b55c8635b2bac7eb92191e6f214f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 00:32:33 +0000
Subject: [PATCH 1080/1504] beam27Packages.elixir-ls: 0.25.0 -> 0.26.1

---
 pkgs/development/beam-modules/elixir-ls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 0accce293d29..7ca9fda3490a 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "elixir-ls";
-  version = "0.25.0";
+  version = "0.26.1";
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-7Lrv62R0otFPAfUAip1H4VcnBaV4QyDZkcBZTW7yq8I=";
+    hash = "sha256-fGjHDzQUBROFlv+AIzArRv+Q7RWPTizMFyYXQJGQzjA=";
   };
 in
 mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-yR2ttnrtYcWFotBMIfOLmJzEO9NKy3SqiKJZ4mmlkdA=";
+    hash = "sha256-EUWySBI082cNXbHZKQKEisXffe0/UpupNcHj1GT7Mek=";
   };
 
   # elixir-ls is an umbrella app

From 7417184aa10d4d5072c94fd54513eee3a315c3d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:33:43 +0000
Subject: [PATCH 1081/1504] fna3d: 24.12 -> 25.01

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

diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index 2655ca4eaeee..7b415cd053e0 100644
--- a/pkgs/by-name/fn/fna3d/package.nix
+++ b/pkgs/by-name/fn/fna3d/package.nix
@@ -7,14 +7,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "fna3d";
-  version = "24.12";
+  version = "25.01";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FNA3D";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-ieodMkzBDPq8WCTEyPMENFxoGwrknWV6qsVCZmi0TwQ=";
+    hash = "sha256-0BD3aFIg3miBhGr6YuWJyrRxWsNnPNIFNiZSzPalJ/c=";
   };
 
   buildInputs = [ SDL2 ];

From aea6bca54e74b31103195e00a203d1ee6c62be8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:34:08 +0000
Subject: [PATCH 1082/1504] golangci-lint: 1.62.2 -> 1.63.1

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

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 4ae2f37d757a..66738bfc88b2 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.62.2";
+  version = "1.63.1";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    hash = "sha256-8Itq4tWqJa9agGcPoQaJoQOgy/qhhegzPORDztS9T30=";
+    hash = "sha256-Q7SwLm+rnwyjlXf8iArUQWYC0DyjFZI9HIWJsgNplyw=";
   };
 
-  vendorHash = "sha256-SEoF+k7MYYq81v9m3eaDbIv1k9Hek5iAZ0TTJEgAsI4=";
+  vendorHash = "sha256-Rsg/bVbMsA2dUz0GjAdzifBTpDDVrFYY+ptyB5m3AgM=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 93e7e39c71b13a406ea70b3da1808f56be207b24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:53:18 +0000
Subject: [PATCH 1083/1504] mieru: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index ce770989c8e6..a8babccde6d6 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-59TWABRIH3FEOyLvZ+jn7b3jhI0comjU4Mrl4Ggx2eA=";
+    hash = "sha256-4uJi8+kpVBjigTkLmV9fL0igmcOt5Gb40qkQHYR8kCU=";
   };
 
   vendorHash = "sha256-hSTKhn39xKZx1N9x66EH/ql4oP4qn0eysGTbUk9mRAk=";

From 67aa530f56ecfdc33d6b369f86dadbdaa064d483 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:59:37 +0000
Subject: [PATCH 1084/1504] sarasa-gothic: 1.0.26 -> 1.0.27

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

diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index 2113f014e93d..66b69ce36ae0 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.26";
+  version = "1.0.27";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-Z2J8yW9yLnkGh+nNb57+xyz8uZFwePpuSlBdRxfPABA=";
+    hash = "sha256-/pN3NIwkJZ4a5g87Z3kr71Xvef0TIbN2UzsfvXJryNk=";
   };
 
   sourceRoot = ".";

From 137419b48bbcaa12d7876d81caa9842927733662 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 03:20:03 +0100
Subject: [PATCH 1085/1504] python313Packages.google-auth: fix build

---
 pkgs/development/python-modules/google-auth/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index b7b77f32137f..4813fd2f091e 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -70,7 +70,11 @@ buildPythonPackage rec {
       freezegun
       grpcio
       mock
+    ]
+    ++ lib.optionals (pythonOlder "3.13") [
       oauth2client
+    ]
+    ++ [
       pytest-asyncio
       pytest-localserver
       pytestCheckHook

From aa6e01dbf7105956b15f96cad60d922529a3be03 Mon Sep 17 00:00:00 2001
From: "\"wrvsrx\"" <"wrvsrx@outlook.com">
Date: Thu, 2 Jan 2025 10:22:39 +0800
Subject: [PATCH 1086/1504] vimPlugins.nvim-numbertoggle: init at 2024-03-29

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 8848db05fb55..0bb30fcad439 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -9389,6 +9389,18 @@ final: prev:
     meta.homepage = "https://github.com/LhKipp/nvim-nu/";
   };
 
+  nvim-numbertoggle = buildVimPlugin {
+    pname = "nvim-numbertoggle";
+    version = "2024-03-29";
+    src = fetchFromGitHub {
+      owner = "sitiom";
+      repo = "nvim-numbertoggle";
+      rev = "c5827153f8a955886f1b38eaea6998c067d2992f";
+      sha256 = "18nxqi3a3xamrjzpsabww411ix6vr44smprqi9prd47238lpshi2";
+    };
+    meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/";
+  };
+
   nvim-osc52 = buildVimPlugin {
     pname = "nvim-osc52";
     version = "2024-05-24";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 599d52852a3e..bb4f07a44edf 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -779,6 +779,7 @@ https://github.com/nvim-neotest/nvim-nio/,HEAD,
 https://github.com/ya2s/nvim-nonicons/,,
 https://github.com/rcarriga/nvim-notify/,,
 https://github.com/LhKipp/nvim-nu/,HEAD,
+https://github.com/sitiom/nvim-numbertoggle/,HEAD,
 https://github.com/ojroques/nvim-osc52/,,
 https://github.com/julienvincent/nvim-paredit/,,
 https://github.com/gpanders/nvim-parinfer/,HEAD,

From 755e20ecdba7a27ad80e9f9ce17b97c2c86157c4 Mon Sep 17 00:00:00 2001
From: "\"wrvsrx\"" <"wrvsrx@outlook.com">
Date: Thu, 2 Jan 2025 10:22:56 +0800
Subject: [PATCH 1087/1504] vimPlugins.linediff-vim: init at 2024-04-22

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0bb30fcad439..5a9bd0328c25 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6062,6 +6062,18 @@ final: prev:
     meta.homepage = "https://github.com/junegunn/limelight.vim/";
   };
 
+  linediff-vim = buildVimPlugin {
+    pname = "linediff.vim";
+    version = "2024-04-22";
+    src = fetchFromGitHub {
+      owner = "AndrewRadev";
+      repo = "linediff.vim";
+      rev = "ddae71ef5f94775d101c1c70032ebe8799f32745";
+      sha256 = "01dshpxm1svfhw9l447mz224qbvlbvywd7ai4wxwyjzgkhp36937";
+    };
+    meta.homepage = "https://github.com/AndrewRadev/linediff.vim/";
+  };
+
   lingua-franca-vim = buildVimPlugin {
     pname = "lingua-franca.vim";
     version = "2021-09-05";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index bb4f07a44edf..46f11e2e3b4c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -502,6 +502,7 @@ https://github.com/spywhere/lightline-lsp/,,
 https://github.com/itchyny/lightline.vim/,,
 https://github.com/ggandor/lightspeed.nvim/,,
 https://github.com/junegunn/limelight.vim/,,
+https://github.com/AndrewRadev/linediff.vim/,HEAD,
 https://github.com/lf-lang/lingua-franca.vim/,,
 https://github.com/tamago324/lir.nvim/,,
 https://github.com/kkharji/lispdocs.nvim/,,

From 0d1111fb417de5be3347dd51f16058759b1c75ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 03:09:58 +0000
Subject: [PATCH 1088/1504] rip2: 0.9.0 -> 0.9.2

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

diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index fcce093a2b23..3fe207615420 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rip2";
-  version = "0.9.0";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "MilesCranmer";
     repo = "rip2";
     rev = "v${version}";
-    hash = "sha256-9leLWfPilDQHzQRzTUjAFt9olTPEL4GcQgYFWZu3dug=";
+    hash = "sha256-OZsiAh0sQygLdVdA1QxCf7FTvP5CrlDNeOQLv2G2X3U=";
   };
 
-  cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8=";
+  cargoHash = "sha256-9wbHXgjOWyQS8JOMQQTVetMacdjWD9C4NBWxUpcjbdg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ae0678af25049f75e8f956d601c6b7049651b6ee Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 2 Jan 2025 11:53:41 +0800
Subject: [PATCH 1089/1504] resources: show Nvidia GPU info

Previously, resources failed to show Nvidia GPU info because it failed
to load libnvidia-ml.so.

```console
$ RUST_LOG=resources=debug resources
...
WARN  resources::utils::gpu::nvidia > Connection to NVML failed, reason: a libloading error occurred: libnvidia-ml.so: cannot open shared object file: No such file or directory
...
```
---
 pkgs/by-name/re/resources/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix
index d196fbc6bfb5..9f70e2c1325a 100644
--- a/pkgs/by-name/re/resources/package.nix
+++ b/pkgs/by-name/re/resources/package.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , appstream-glib
+, autoAddDriverRunpath
 , cargo
 , desktop-file-utils
 , meson
@@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     appstream-glib
+    autoAddDriverRunpath
     desktop-file-utils
     meson
     ninja

From e48d27cb8f382d5e7c190095a5f2cc22e9a18f7d Mon Sep 17 00:00:00 2001
From: Daniel Baker <daniel.n.baker@gmail.com>
Date: Wed, 1 Jan 2025 21:02:01 -0800
Subject: [PATCH 1090/1504] formatjson5: fix missing_docs error

Rust 1.83 introduced changes to how `missing_docs` works.
https://releases.rs/docs/1.83.0/

This commit introduces a patch from a PR made against the upstream
source repository to fix the issue.
---
 pkgs/by-name/fo/formatjson5/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix
index 112f94aa8358..c82393ab490e 100644
--- a/pkgs/by-name/fo/formatjson5/package.nix
+++ b/pkgs/by-name/fo/formatjson5/package.nix
@@ -5,6 +5,7 @@
   stdenv,
   darwin,
   nix-update-script,
+  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,6 +20,13 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Lredw/Fez+2U2++ShZcKTFCv8Qpai9YUvqvpGjG5W0o=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/google/json5format/commit/32914546e7088b3d9173ae9a2f307effa87917bf.patch";
+      hash = "sha256-kAbRUL/FuhnxkC9Xo4J2bXt9nkMOLeJvgMmOoKnSxKc=";
+    })
+  ];
+
   cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

From 156776e5be2034f335f5e7ac9ab9831ce1a91227 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Thu, 2 Jan 2025 02:14:20 -0300
Subject: [PATCH 1091/1504] openmw: fix build on GCC 14

Reported-by: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 ...1-function-inclusion-fixes-for-gcc14.patch | 41 +++++++++++++++++++
 pkgs/games/openmw/default.nix                 |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch

diff --git a/pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch b/pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch
new file mode 100644
index 000000000000..c0b6fb92a783
--- /dev/null
+++ b/pkgs/games/openmw/0001-function-inclusion-fixes-for-gcc14.patch
@@ -0,0 +1,41 @@
+From 59f8403616e8db6dcf8f3489c44b61524044fe64 Mon Sep 17 00:00:00 2001
+From: Fernando Rodrigues <alpha@sigmasquadron.net>
+Date: Thu, 2 Jan 2025 04:28:42 +0000
+Subject: [PATCH] Function inclusion fixes for GCC 14
+
+This patch includes <algorithm> in bsa_file.cpp and <list> in
+charactermanager.hpp to prevent a build failure with GCC 14.
+
+Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
+---
+ apps/openmw/mwstate/charactermanager.hpp | 1 +
+ components/bsa/bsa_file.cpp              | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
+index 8b3f2b8f8f..fac73b3d44 100644
+--- a/apps/openmw/mwstate/charactermanager.hpp
++++ b/apps/openmw/mwstate/charactermanager.hpp
+@@ -4,6 +4,7 @@
+ #include <boost/filesystem/path.hpp>
+
+ #include "character.hpp"
++#include <list>
+
+ namespace MWState
+ {
+diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
+index 4f795ec0d4..38e97b267b 100644
+--- a/components/bsa/bsa_file.cpp
++++ b/components/bsa/bsa_file.cpp
+@@ -25,6 +25,7 @@
+
+ #include <components/files/constrainedfilestream.hpp>
+
++#include <algorithm>
+ #include <cassert>
+
+ #include <boost/filesystem/path.hpp>
+--
+2.47.0
+
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 91497b50bd19..c83c5648eb62 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -78,6 +78,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-zkjVt3GfQZsFXl2Ht3lCuQtDMYQWxhdFO4aGSb3rsyo=";
   };
 
+  patches = [ ./0001-function-inclusion-fixes-for-gcc14.patch ];
+
   postPatch =
     ''
       sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12

From 6aa6cf0486ccde7890facf3b2b25092b7be475a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 05:21:50 +0000
Subject: [PATCH 1092/1504] tuifimanager: 5.0.5 -> 5.0.9

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

diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix
index 52f2f1efdfd1..3f48912d6056 100644
--- a/pkgs/by-name/tu/tuifimanager/package.nix
+++ b/pkgs/by-name/tu/tuifimanager/package.nix
@@ -21,15 +21,15 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
   python3.pkgs.buildPythonApplication
   rec {
     pname = "tuifimanager";
-    version = "5.0.5";
+    version = "5.0.9";
 
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "GiorgosXou";
       repo = "TUIFIManager";
-      rev = "v.${version}";
-      hash = "sha256-KwyRGNT3o/Ww+szBI+MmMMw5ZaSPT+G3xJIw5g9iBKo=";
+      tag = "v.${version}";
+      hash = "sha256-15PXua3kLf3Mpgft2msFBn+fS2bzfTAIC9bmOkNKqlU=";
     };
 
     build-system = with python3.pkgs; [

From b1e525c4c434665217862bad560c50ae2e8147b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 05:29:13 +0000
Subject: [PATCH 1093/1504] tigerbeetle: 0.16.19 -> 0.16.20

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

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 397e745eaf90..b6b00d786f1c 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-S5XeCgJaJxD6zaoWi2aIPl1chZPfQPvmeSLBvimMp9s=";
-    "x86_64-linux" = "sha256-BLPrhDzbEy/EjNexJ6jXKH7sIGDVzzL01Fbs60jyoCQ=";
-    "aarch64-linux" = "sha256-aG1fxb2BObP8ftcxyO2MyL7JsinyzoXtJ2Ha0FqDG6Y=";
+    "universal-macos" = "sha256-xuj14E2JVcyAJ8TrLdZ42X19x3E94SSDC4VqrvQD6Lo=";
+    "x86_64-linux" = "sha256-M6OCtktN6GnHpIMYNeEvB4K6uHR/+KDq2ByMBPcstQw=";
+    "aarch64-linux" = "sha256-WxO1A2bVMEv5k7yFkeUy06BZy8vVnykSXs+6GN6VIGA=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.19";
+  version = "0.16.20";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From 8b9f8cac1c1108d0d5340bbe0845c3049c1d2c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <ces@fem.gg>
Date: Thu, 2 Jan 2025 06:39:09 +0100
Subject: [PATCH 1094/1504] eza: 0.20.14 -> 0.20.15

changelog: https://github.com/eza-community/eza/releases/tag/v0.20.15
---
 pkgs/by-name/ez/eza/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index db32be221bc0..3313fe74ebd4 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eza";
-  version = "0.20.14";
+  version = "0.20.15";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-5sZlpJ7xzQsjvECN4pjPndM39qonbgNy4zew6AE06D0=";
+    hash = "sha256-r68zuMCFIccA0cRLC2RNYCWoFh7tYiGu97Kid4hh0Uw=";
   };
 
-  cargoHash = "sha256-A8vE2Q/HEMgX6HC+nwR63Kr84gy2iZ5BzYDzaZz/h9Q=";
+  cargoHash = "sha256-hBsb62fcIrSR2w9O5+UaMUadyUUtu2PLODRg70wG/Xc=";
 
   nativeBuildInputs = [
     cmake

From 7c1fe22d78955f0cd0a97c9808d72dd960cfddc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 05:42:45 +0000
Subject: [PATCH 1095/1504] sbt-with-scala-native: 1.10.6 -> 1.10.7

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index be62398d179c..550075230be3 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.10.6";
+  version = "1.10.7";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-fhsJjv/sgGFOg4qmG3U6i0YjeyS3BuybN2CQMIAMERo=";
+    hash = "sha256-MsFSM8Y2wjPuJaLDGHkEnbcCHP73CAfBh1FcOblrD+Y=";
   };
 
   postPatch = ''

From 3a63b6f18dcf0c43634667a81c89721626f47af8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 05:42:48 +0000
Subject: [PATCH 1096/1504] sbt: 1.10.6 -> 1.10.7

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index be62398d179c..550075230be3 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.10.6";
+  version = "1.10.7";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-fhsJjv/sgGFOg4qmG3U6i0YjeyS3BuybN2CQMIAMERo=";
+    hash = "sha256-MsFSM8Y2wjPuJaLDGHkEnbcCHP73CAfBh1FcOblrD+Y=";
   };
 
   postPatch = ''

From c783fed7cb0ce18890b389fa875318d8a3132664 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 27 Dec 2024 21:18:57 +0530
Subject: [PATCH 1097/1504] swapspace: refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>

Update pkgs/by-name/sw/swapspace/package.nix

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/by-name/sw/swapspace/package.nix | 31 +++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sw/swapspace/package.nix b/pkgs/by-name/sw/swapspace/package.nix
index c9250663c8e0..997d8bdbd177 100644
--- a/pkgs/by-name/sw/swapspace/package.nix
+++ b/pkgs/by-name/sw/swapspace/package.nix
@@ -10,14 +10,14 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "swapspace";
   version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "Tookmund";
     repo = "Swapspace";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-KrPdmF1H7WFI78ZJlLqDyfxbs7fymSUQpXL+7XjN9bI=";
   };
 
@@ -45,21 +45,24 @@ stdenv.mkDerivation rec {
     install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"
   '';
 
-  # Nothing in swapspace --help or swapspace’s man page mentions
-  # anything about swapspace executing its arguments.
-  passthru.binlore.out = binlore.synthesize swapspace ''
-    execer cannot bin/swapspace
-  '';
-  passthru.tests = {
-    inherit (nixosTests) swapspace;
+  passthru = {
+    # Nothing in swapspace --help or swapspace’s man page mentions
+    # anything about swapspace executing its arguments.
+    binlore.out = binlore.synthesize swapspace ''
+      execer cannot bin/swapspace
+    '';
+    tests = {
+      inherit (nixosTests) swapspace;
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic swap manager for Linux";
     homepage = "https://github.com/Tookmund/Swapspace";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ Luflosi ];
+    changelog = "https://github.com/Tookmund/Swapspace/releases/tag/v${finalAttrs.version}";
     mainProgram = "swapspace";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
-}
+})

From 5d239ccac976f2862b2498d87989336a233fe38c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 05:45:30 +0000
Subject: [PATCH 1098/1504] fwup: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 1c68448b9729..1b434c71aea8 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fwup";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "sha256-XdWEvIM+gNQVmNPwtcka+lZwmNIWpxAIMGBjY0b9QNM=";
+    sha256 = "sha256-WYolvHAK7l1HJZuBXsPJ+X6uzWFHBlHELx4zvD/S934=";
   };
 
   nativeBuildInputs = [

From 8a5e208a0f15f555f37e0b471a90feba5d33ed1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 06:28:52 +0000
Subject: [PATCH 1099/1504] spacevim: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix
index 82268cc69616..104e30e50d1c 100644
--- a/pkgs/by-name/sp/spacevim/package.nix
+++ b/pkgs/by-name/sp/spacevim/package.nix
@@ -23,12 +23,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "spacevim";
-  version = "2.3.0";
+  version = "2.4.0";
   src = fetchFromGitHub {
     owner = "SpaceVim";
     repo = "SpaceVim";
     rev = "v${version}";
-    hash = "sha256-MHsAA0x/rfwRupe8aW1JVKGiYkySAX0AhOkBuScpn7I=";
+    hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ba58e46cc70cdaf6b046df1f2d20fc47f6698b49 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Wed, 1 Jan 2025 21:30:24 -0800
Subject: [PATCH 1100/1504] ckan: Install desktop file and icons

---
 pkgs/by-name/ck/ckan/package.nix | 41 +++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix
index ba33a6737582..d7e846f579a6 100644
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@@ -6,6 +6,9 @@
   mono,
   gtk2,
   curl,
+  imagemagick,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,9 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-SK2eKdH/bm+W+qU8XUHRD9uffmfp5bR4dBvBEUKCm8E=";
   };
 
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/KSP-CKAN/CKAN/450e2f960e1a3fee4ab7cf74ad56bddc5296fc7e/assets/ckan-256.png";
+    hash = "sha256-BJvuOz8NWmzpYzzhveeq6rcuqXIxQqxtBIcRvobx+TY=";
+  };
+
   dontUnpack = true;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    imagemagick
+    makeWrapper
+  ];
+
   buildInputs = [ mono ];
 
   libraries = lib.makeLibraryPath [
@@ -30,12 +43,38 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
+    runHook preInstall
+    for size in 16 24 48 64 96 128 256; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      magick -background none ${icon} -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
+    done
     install -m 644 -D $src $out/bin/ckan.exe
     makeWrapper ${mono}/bin/mono $out/bin/ckan \
       --add-flags $out/bin/ckan.exe \
       --set LD_LIBRARY_PATH $libraries
+    runHook postInstall
   '';
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ckan";
+      comment = "The Comprehensive Kerbal Archive Network Client";
+      desktopName = "CKAN";
+      categories = [
+        "Game"
+        "PackageManager"
+      ];
+      exec = "ckan";
+      icon = "ckan";
+      keywords = [
+        "Kerbal Space Program"
+        "KSP"
+        "Mod"
+      ];
+      extraConfig.X-GNOME-SingleWindow = "true";
+    })
+  ];
+
   meta = with lib; {
     description = "Mod manager for Kerbal Space Program";
     mainProgram = "ckan";

From 559ebf51a9ba65aa751e7ec58c8405b7671f0ab7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 01:38:42 +0000
Subject: [PATCH 1101/1504] dosbox-x: 2024.12.04 -> 2025.01.01

---
 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 a7cc9b5ea6a3..4b6ffafb9363 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.12.04";
+  version = "2025.01.01";
 
   src = fetchFromGitHub {
     owner = "joncampbell123";
     repo = "dosbox-x";
     rev = "dosbox-x-v${finalAttrs.version}";
-    hash = "sha256-wZCLwEInUfzuOCcUsz8W+Gi00lp4Nwc0QZjLF8/e9iM=";
+    hash = "sha256-3zE/VDCFNQRgqpIL5hRAafDoc7agX2LIsiL4xwDBLJY=";
   };
 
   # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants

From 737defd4cd97ada9a268bde05603eee367425f1c Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 1 Jan 2025 13:20:05 -0800
Subject: [PATCH 1102/1504] ncps: init at 0.1.1

---
 pkgs/by-name/nc/ncps/package.nix | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/nc/ncps/package.nix

diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
new file mode 100644
index 000000000000..b66c1d3ae1f2
--- /dev/null
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -0,0 +1,47 @@
+{
+  buildGoModule,
+  dbmate,
+  fetchFromGitHub,
+  lib,
+}:
+
+let
+  finalAttrs = {
+    pname = "ncps";
+    version = "v0.1.1";
+
+    src = fetchFromGitHub {
+      owner = "kalbasit";
+      repo = "ncps";
+      rev = finalAttrs.version;
+      hash = "sha256-Vr/thppCABdZDl1LEc7l7c7Ih55U/EFwJInWSUWoLJA";
+    };
+
+    ldflags = [
+      "-X github.com/kalbasit/ncps/cmd.Version=${finalAttrs.version}"
+    ];
+
+    subPackages = [ "." ];
+
+    vendorHash = "sha256-xPrWofNyDFrUPQ42AYDs2x2gGoQ2w3tRrMIsu3SVyHA=";
+    doCheck = true;
+
+    nativeBuildInputs = [
+      dbmate # used for testing
+    ];
+
+    postInstall = ''
+      mkdir -p $out/share/ncps
+      cp -r db $out/share/ncps/db
+    '';
+
+    meta = {
+      description = "Nix binary cache proxy service";
+      homepage = "https://github.com/kalbasit/ncps";
+      license = lib.licenses.mit;
+      mainProgram = "ncps";
+      maintainers = [ lib.maintainers.kalbasit ];
+    };
+  };
+in
+buildGoModule finalAttrs

From 3b7f0c3b4d322ed3832efa78e4d6b82613ccea6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 07:47:01 +0000
Subject: [PATCH 1103/1504] git-delete-merged-branches: 7.4.1 -> 7.4.2

---
 pkgs/by-name/gi/git-delete-merged-branches/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-delete-merged-branches/package.nix b/pkgs/by-name/gi/git-delete-merged-branches/package.nix
index 0287e5ed5903..945cdb11f85c 100644
--- a/pkgs/by-name/gi/git-delete-merged-branches/package.nix
+++ b/pkgs/by-name/gi/git-delete-merged-branches/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-delete-merged-branches";
-  version = "7.4.1";
+  version = "7.4.2";
 
   src = fetchFromGitHub {
     owner = "hartwork";
     repo = pname;
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-1CUwac2TPU5s1uLS1zPvtXZEGCWYwm1y935jqbI173Q=";
+    tag = version;
+    sha256 = "sha256-l+R4gINZJ8bJdhcK+U9jOuIoAm2/bd5P+w9AbwPZMrk=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 83af87a20653e11be4cc0d39c9c3fce38c36c039 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 08:48:22 +0100
Subject: [PATCH 1104/1504] nixos/zfs-replication: use expanded arguments for
 clarity

---
 nixos/modules/services/backup/zfs-replication.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index ed635a35617b..063ddf6a79d7 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -80,9 +80,9 @@ in
         let
           args = lib.map lib.escapeShellArg (
             [
-              "-l"
+              "--user"
               cfg.username
-              "-i"
+              "--identity-file"
               cfg.identityFilePath
               cfg.host
               cfg.remoteFilesystem

From 28f43d4628fc7f1d039efde754fce409a7788994 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 08:48:37 +0100
Subject: [PATCH 1105/1504] nixos/zfs-replication: add --verbose to command
 line arguments

---
 nixos/modules/services/backup/zfs-replication.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index 063ddf6a79d7..3828db386f66 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -80,6 +80,7 @@ in
         let
           args = lib.map lib.escapeShellArg (
             [
+              "--verbose"
               "--user"
               cfg.username
               "--identity-file"

From f837172930e0132e9cf8266bb63ba4e3ebaab8bb Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sun, 22 Dec 2024 21:23:29 +0200
Subject: [PATCH 1106/1504] restate: init at 1.1.6

---
 pkgs/by-name/re/restate/package.nix | 121 ++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 pkgs/by-name/re/restate/package.nix

diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
new file mode 100644
index 000000000000..efb80b0cf913
--- /dev/null
+++ b/pkgs/by-name/re/restate/package.nix
@@ -0,0 +1,121 @@
+{
+  lib,
+  stdenv,
+  testers,
+  versionCheckHook,
+  nix-update-script,
+  rustPlatform,
+  fetchFromGitHub,
+  protobuf,
+  restate,
+  pkg-config,
+  openssl,
+  perl,
+  cmake,
+  cacert,
+  rdkafka,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "restate";
+  version = "1.1.6";
+
+  src = fetchFromGitHub {
+    owner = "restatedev";
+    repo = "restate";
+    tag = "v${version}";
+    hash = "sha256-uDNPIL9Ox5rwWVzqWe74elHPGy6lSvWR1S7HsY6ATjc=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-z7VAKU4bi6pX2z4jCKWDfQt8FFLN7ugnW2LOy6IHz/w=";
+
+  env = {
+    PROTOC = lib.getExe protobuf;
+    PROTOC_INCLUDE = "${protobuf}/include";
+
+    VERGEN_GIT_COMMIT_DATE = "2024-12-23";
+    VERGEN_GIT_SHA = "v${version}";
+
+    # rustflags as defined in the upstream's .cargo/config.toml
+    RUSTFLAGS =
+      let
+        target = stdenv.hostPlatform.config;
+        targetFlags = rec {
+          build = [
+            "-C force-unwind-tables"
+            "-C debug-assertions"
+            "--cfg uuid_unstable"
+            "--cfg tokio_unstable"
+          ];
+
+          "aarch64-unknown-linux-gnu" = build ++ [
+            # Enable frame pointers to support Parca (https://github.com/parca-dev/parca-agent/pull/1805)
+            "-C force-frame-pointers=yes"
+          ];
+
+          "x86_64-unknown-linux-musl" = build ++ [
+            "-C link-self-contained=yes"
+          ];
+
+          "aarch64-unknown-linux-musl" = build ++ [
+            # Enable frame pointers to support Parca (https://github.com/parca-dev/parca-agent/pull/1805)
+            "-C force-frame-pointers=yes"
+            "-C link-self-contained=yes"
+          ];
+        };
+      in
+      lib.concatStringsSep " " (lib.attrsets.attrByPath [ target ] targetFlags.build targetFlags);
+
+    # Have to be set to dynamically link librdkafka
+    CARGO_FEATURE_DYNAMIC_LINKING = 1;
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    openssl
+    perl
+    rustPlatform.bindgenHook
+    cmake
+  ];
+  buildInputs = [ rdkafka ];
+  nativeCheckInputs = [
+    cacert
+  ];
+
+  useNextest = true;
+  # Feature resolution seems to be failing due to this https://github.com/rust-lang/cargo/issues/7754
+  auditable = false;
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    tests.restateCliVersion = testers.testVersion {
+      package = restate;
+      command = "restate --version";
+    };
+    tests.restateServerVersion = testers.testVersion {
+      package = restate;
+      command = "restate-server --version";
+    };
+    tests.restateCtlVersion = testers.testVersion {
+      package = restate;
+      command = "restatectl --version";
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Restate is a platform for developing distributed fault-tolerant applications.";
+    homepage = "https://restate.dev";
+    changelog = "https://github.com/restatedev/restate/releases/tag/v${version}";
+    mainProgram = "restate";
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [ myypo ];
+  };
+}

From 57cb0844450ac2fd8ebc72899e987a53b55ae806 Mon Sep 17 00:00:00 2001
From: Misael Aguayo <aguayo.misael@gmail.com>
Date: Thu, 2 Jan 2025 02:54:02 -0600
Subject: [PATCH 1107/1504] jj: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 750ce685575b..c096701c143e 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "0.24.0";
+  version = "0.25.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${version}";
-    hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758";
+    hash = "sha256-5J1ZfPNyniUK5D3Pt1aKuJ+/8vad3JPxCztBRY591N8=";
   };
 
-  cargoHash = "sha256-9JwRdeHo8JkwRQwPA+UsIEWar4gYQS4SIM/uj1TU2yg";
+  cargoHash = "sha256-kuZ1zvb6H5QWjJSUYMq5tEywsQMC6187YJPUT1r4S5o=";
 
   nativeBuildInputs = [
     installShellFiles

From a5ca2074895abb48e0745412df495df9cdb345c1 Mon Sep 17 00:00:00 2001
From: Phani Rithvij <phanirithvij2000@gmail.com>
Date: Thu, 2 Jan 2025 14:51:03 +0530
Subject: [PATCH 1108/1504] dprint-plugins: init (#369415)

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
Co-authored-by: Jonas Chevalier <zimbatm@zimbatm.com>
---
 pkgs/by-name/dp/dprint/plugins/default.nix    |  44 +++++
 .../dp/dprint/plugins/dprint-plugin-biome.nix |  21 +++
 .../plugins/dprint-plugin-dockerfile.nix      |  14 ++
 .../dp/dprint/plugins/dprint-plugin-json.nix  |  14 ++
 .../dprint/plugins/dprint-plugin-jupyter.nix  |  14 ++
 .../dprint/plugins/dprint-plugin-markdown.nix |  14 ++
 .../dp/dprint/plugins/dprint-plugin-ruff.nix  |  17 ++
 .../dp/dprint/plugins/dprint-plugin-toml.nix  |  14 ++
 .../plugins/dprint-plugin-typescript.nix      |  21 +++
 .../dp/dprint/plugins/g-plane-malva.nix       |  19 +++
 .../dp/dprint/plugins/g-plane-markup_fmt.nix  |  24 +++
 .../dprint/plugins/g-plane-pretty_graphql.nix |  17 ++
 .../dp/dprint/plugins/g-plane-pretty_yaml.nix |  17 ++
 .../dp/dprint/plugins/update-plugins.py       | 156 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 15 files changed, 408 insertions(+)
 create mode 100644 pkgs/by-name/dp/dprint/plugins/default.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
 create mode 100644 pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
 create mode 100755 pkgs/by-name/dp/dprint/plugins/update-plugins.py

diff --git a/pkgs/by-name/dp/dprint/plugins/default.nix b/pkgs/by-name/dp/dprint/plugins/default.nix
new file mode 100644
index 000000000000..cefe95973b8d
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/default.nix
@@ -0,0 +1,44 @@
+{ lib, fetchurl }:
+let
+  mkDprintPlugin =
+    {
+      url,
+      hash,
+      pname,
+      version,
+      description,
+      initConfig,
+      updateUrl,
+      license ? lib.licenses.mit,
+      maintainers ? [ lib.maintainers.phanirithvij ],
+    }:
+    fetchurl {
+      inherit hash url;
+      name = "${pname}-${version}.wasm";
+      meta = {
+        inherit
+          description
+          license
+          maintainers
+          ;
+      };
+      passthru = {
+        updateScript = ./update-plugins.py;
+        inherit initConfig updateUrl;
+      };
+    };
+  inherit (lib)
+    filterAttrs
+    mapAttrs'
+    nameValuePair
+    removeSuffix
+    ;
+  files = filterAttrs (
+    name: type: type == "regular" && name != "default.nix" && lib.hasSuffix ".nix" name
+  ) (builtins.readDir ./.);
+  plugins = mapAttrs' (
+    name: _:
+    nameValuePair (removeSuffix ".nix" name) (import (./. + "/${name}") { inherit mkDprintPlugin; })
+  ) files;
+in
+plugins // { inherit mkDprintPlugin; }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
new file mode 100644
index 000000000000..4f1087505d52
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -0,0 +1,21 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Biome (JS/TS) wrapper plugin.";
+  hash = "sha256-+zY+myazFAUxeNuWFigkvF4zpKBs+jzVYQT09jRWFKI=";
+  initConfig = {
+    configExcludes = [ "**/node_modules" ];
+    configKey = "biome";
+    fileExtensions = [
+      "ts"
+      "tsx"
+      "js"
+      "jsx"
+      "cjs"
+      "mjs"
+    ];
+  };
+  pname = "dprint-plugin-biome";
+  updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
+  url = "https://plugins.dprint.dev/biome-0.7.1.wasm";
+  version = "0.7.1";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
new file mode 100644
index 000000000000..76e62aceecd7
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Dockerfile code formatter.";
+  hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "dockerfile";
+    fileExtensions = [ "dockerfile" ];
+  };
+  pname = "dprint-plugin-dockerfile";
+  updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json";
+  url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm";
+  version = "0.3.2";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
new file mode 100644
index 000000000000..2d8702539a0a
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "JSON/JSONC code formatter.";
+  hash = "sha256-Sw+HkUb4K2wrLuQRZibr8gOCR3Rz36IeId4Vd4LijmY=";
+  initConfig = {
+    configExcludes = [ "**/*-lock.json" ];
+    configKey = "json";
+    fileExtensions = [ "json" ];
+  };
+  pname = "dprint-plugin-json";
+  updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json";
+  url = "https://plugins.dprint.dev/json-0.19.4.wasm";
+  version = "0.19.4";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
new file mode 100644
index 000000000000..f1ac0eae9708
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-jupyter.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Jupyter notebook code block formatter.";
+  hash = "sha256-877CEZbMlj9cHkFtl16XCnan37SeEGUL3BHaUKUv8S4=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "jupyter";
+    fileExtensions = [ "ipynb" ];
+  };
+  pname = "dprint-plugin-jupyter";
+  updateUrl = "https://plugins.dprint.dev/dprint/jupyter/latest.json";
+  url = "https://plugins.dprint.dev/jupyter-0.1.5.wasm";
+  version = "0.1.5";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
new file mode 100644
index 000000000000..0d17600f6827
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Markdown code formatter.";
+  hash = "sha256-PIEN9UnYC8doJpdzS7M6QEHQNQtj7WwXAgvewPsTjqs=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "markdown";
+    fileExtensions = [ "md" ];
+  };
+  pname = "dprint-plugin-markdown";
+  updateUrl = "https://plugins.dprint.dev/dprint/markdown/latest.json";
+  url = "https://plugins.dprint.dev/markdown-0.17.8.wasm";
+  version = "0.17.8";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
new file mode 100644
index 000000000000..deee9292f48f
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
@@ -0,0 +1,17 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "Ruff (Python) wrapper plugin.";
+  hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "ruff";
+    fileExtensions = [
+      "py"
+      "pyi"
+    ];
+  };
+  pname = "dprint-plugin-ruff";
+  updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json";
+  url = "https://plugins.dprint.dev/ruff-0.3.9.wasm";
+  version = "0.3.9";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
new file mode 100644
index 000000000000..3eef32b0e3bd
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix
@@ -0,0 +1,14 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "TOML code formatter.";
+  hash = "sha256-aDfo/sKfOeNpyfd/4N1LgL1bObTTnviYrA8T7M/1KNs=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "toml";
+    fileExtensions = [ "toml" ];
+  };
+  pname = "dprint-plugin-toml";
+  updateUrl = "https://plugins.dprint.dev/dprint/toml/latest.json";
+  url = "https://plugins.dprint.dev/toml-0.6.3.wasm";
+  version = "0.6.3";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
new file mode 100644
index 000000000000..a3a805827ec0
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -0,0 +1,21 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "TypeScript/JavaScript code formatter.";
+  hash = "sha256-urgKQOjgkoDJCH/K7DWLJCkD0iH0Ok+rvrNDI0i4uS0=";
+  initConfig = {
+    configExcludes = [ "**/node_modules" ];
+    configKey = "typescript";
+    fileExtensions = [
+      "ts"
+      "tsx"
+      "js"
+      "jsx"
+      "cjs"
+      "mjs"
+    ];
+  };
+  pname = "dprint-plugin-typescript";
+  updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
+  url = "https://plugins.dprint.dev/typescript-0.93.3.wasm";
+  version = "0.93.3";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
new file mode 100644
index 000000000000..c01cad63c064
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
@@ -0,0 +1,19 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "CSS, SCSS, Sass and Less formatter.";
+  hash = "sha256-zt7F1tgPhPAn+gtps6+JB5RtvjIZw2n/G85Bv6kazgU=";
+  initConfig = {
+    configExcludes = [ "**/node_modules" ];
+    configKey = "malva";
+    fileExtensions = [
+      "css"
+      "scss"
+      "sass"
+      "less"
+    ];
+  };
+  pname = "g-plane-malva";
+  updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/malva-v0.11.1.wasm";
+  version = "0.11.1";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
new file mode 100644
index 000000000000..b948d3569013
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
@@ -0,0 +1,24 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter.";
+  hash = "sha256-G8UnJbc+oZ60V3oi8W2SS6H06zEYfY3wpmSUp+1GF8k=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "markup";
+    fileExtensions = [
+      "html"
+      "vue"
+      "svelte"
+      "astro"
+      "jinja"
+      "jinja2"
+      "twig"
+      "njk"
+      "vto"
+    ];
+  };
+  pname = "g-plane-markup_fmt";
+  updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.18.0.wasm";
+  version = "0.18.0";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
new file mode 100644
index 000000000000..38d7326ab416
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
@@ -0,0 +1,17 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "GraphQL formatter.";
+  hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "graphql";
+    fileExtensions = [
+      "graphql"
+      "gql"
+    ];
+  };
+  pname = "g-plane-pretty_graphql";
+  updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm";
+  version = "0.2.1";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
new file mode 100644
index 000000000000..a303b945d5e7
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
@@ -0,0 +1,17 @@
+{ mkDprintPlugin }:
+mkDprintPlugin {
+  description = "YAML formatter.";
+  hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo=";
+  initConfig = {
+    configExcludes = [ ];
+    configKey = "yaml";
+    fileExtensions = [
+      "yaml"
+      "yml"
+    ];
+  };
+  pname = "g-plane-pretty_yaml";
+  updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json";
+  url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm";
+  version = "0.5.0";
+}
diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
new file mode 100755
index 000000000000..9a3bd7e38cae
--- /dev/null
+++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python -p nix nixfmt-rfc-style 'python3.withPackages (pp: [ pp.requests ])'
+
+import json
+import os
+from pathlib import Path
+import sys
+import subprocess
+import requests
+
+USAGE = """Usage: {0} [ | plugin-name | plugin-file-path]
+
+eg.
+  {0}
+  {0} dprint-plugin-json
+  {0} /path/to/dprint-plugin-json.nix"""
+
+FILE_PATH = Path(os.path.realpath(__file__))
+SCRIPT_DIR = FILE_PATH.parent
+
+pname = ""
+if len(sys.argv) > 1:
+    if "-help" in "".join(sys.argv):
+        print(USAGE.format(FILE_PATH.name))
+        exit(0)
+    pname = sys.argv[1]
+else:
+    pname = os.environ.get("UPDATE_NIX_PNAME", "")
+
+
+# get sri hash for a url, no unpack
+def nix_prefetch_url(url, name, algo="sha256"):
+    hash = (
+        subprocess.check_output(
+            ["nix-prefetch-url", "--type", algo, "--name", name, url]
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+    sri = (
+        subprocess.check_output(
+            # split by space is enough for this command
+            "nix --extra-experimental-features nix-command "
+            f"hash convert --hash-algo {algo} --to sri {hash}".split(" ")
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+    return sri
+
+
+# json object to nix string
+def json_to_nix(jsondata):
+    # to quote strings, dumps twice does it
+    json_str = json.dumps(json.dumps(jsondata))
+    return (
+        subprocess.check_output(
+            "nix --extra-experimental-features nix-command eval "
+            f"--expr 'builtins.fromJSON ''{json_str}''' --impure | nixfmt",
+            shell=True,
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+
+
+# nix string to json object
+def nix_to_json(nixstr):
+    return json.loads(
+        subprocess.check_output(
+            f"nix --extra-experimental-features nix-command eval --json --expr '{nixstr}'",
+            shell=True,
+        )
+        .decode("utf-8")
+        .rstrip()
+    )
+
+
+# nixfmt a file
+def nixfmt(nixfile):
+    subprocess.run(["nixfmt", nixfile])
+
+
+def get_update_url(plugin_url):
+    """Get a single plugin's update url given the plugin's url"""
+
+    # remove -version.wasm at the end
+    url = "-".join(plugin_url.split("-")[:-1])
+    names = url.split("/")[3:]
+    # if single name then -> dprint/<name>
+    if len(names) == 1:
+        names.insert(0, "dprint")
+    return "https://plugins.dprint.dev/" + "/".join(names) + "/latest.json"
+
+
+def write_plugin_derivation(drv_attrs):
+    drv = f"{{ mkDprintPlugin }}: mkDprintPlugin {json_to_nix(drv_attrs)}"
+    filepath = SCRIPT_DIR / f"{drv_attrs["pname"]}.nix"
+    with open(filepath, "w+", encoding="utf8") as f:
+        f.write(drv)
+    nixfmt(filepath)
+
+
+def update_plugin_by_name(name):
+    """Update a single plugin by name"""
+
+    # allow passing in filename as well as pname
+    if name.endswith(".nix"):
+        name = Path(name[:-4]).name
+    try:
+        p = (SCRIPT_DIR / f"{name}.nix").read_text().replace("\n", "")
+    except OSError as e:
+        print(f"failed to update plugin {name}: error: {e}")
+        exit(1)
+
+    start_idx = p.find("mkDprintPlugin {") + len("mkDprintPlugin {")
+    p = nix_to_json("{" + p[start_idx:].strip())
+
+    data = requests.get(p["updateUrl"]).json()
+    p["url"] = data["url"]
+    p["version"] = data["version"]
+    p["hash"] = nix_prefetch_url(data["url"], f"{name}-{data["version"]}.wasm")
+
+    write_plugin_derivation(p)
+
+
+def update_plugins():
+    """Update all the plugins"""
+
+    data = requests.get("https://plugins.dprint.dev/info.json").json()["latest"]
+
+    for e in data:
+        update_url = get_update_url(e["url"])
+        pname = e["name"]
+        if "/" in e["name"]:
+            pname = pname.replace("/", "-")
+        drv_attrs = {
+            "url": e["url"],
+            "hash": nix_prefetch_url(e["url"], f"{pname}-{e["version"]}.wasm"),
+            "updateUrl": update_url,
+            "pname": pname,
+            "version": e["version"],
+            "description": e["description"],
+            "initConfig": {
+                "configKey": e["configKey"],
+                "configExcludes": e["configExcludes"],
+                "fileExtensions": e["fileExtensions"],
+            },
+        }
+        write_plugin_derivation(drv_attrs)
+
+
+if pname != "":
+    update_plugin_by_name(pname)
+else:
+    update_plugins()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed3cf54d85b..d4e45f4de4f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5907,6 +5907,8 @@ with pkgs;
 
   devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
 
+  dprint-plugins = recurseIntoAttrs (callPackage ../by-name/dp/dprint/plugins { });
+
   elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;
 
   elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });

From 041cda876a039c2e254c740b431224584c1c8f48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 09:30:57 +0000
Subject: [PATCH 1109/1504] iosevka: 32.2.1 -> 32.3.1

---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 9ffade535fc4..4b4ce4f1e47e 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "32.2.1";
+  version = "32.3.1";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-z0S38X2A0rfGFNTr/Ym0VHfOhzdz/q42QL3tVf+m5FQ=";
+    hash = "sha256-WoRBDLCqLglTXeXtC8ZVELgDOv18dsCDvToUq3iPoDU=";
   };
 
-  npmDepsHash = "sha256-dFVhoBf4v0K1mqbiysZNk4yCt4Ars0Pgnr63xIsavDo=";
+  npmDepsHash = "sha256-gmaFzcTbocx3RYW4G4Lw/08f3c71draxRwzV0BA2/KY=";
 
   nativeBuildInputs =
     [

From a0919c7eeda731b1f8e2948d9feebb4ad9b89aab Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 25 Dec 2024 11:21:20 +0100
Subject: [PATCH 1110/1504] postgresql_14: fix build

Building postgresql_14 currently fails with this on master:

  error: derivation contains an illegal reference specifier 'man'

The reason seems to be a bug in nix, where outputChecks are run
improperly when one of the outputs can already be substituted. Why the
man output can be substituted from hydra is unknown, but adding more
outputChecks for the the man and doc outputs should work around the
problem until nix is fixed.
---
 pkgs/servers/sql/postgresql/generic.nix | 68 ++++++++++++++++---------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 10cf487ad4a3..2effd687e8e4 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -146,29 +146,51 @@ let
         "lib"
         "man"
       ];
-      outputChecks.out = {
-        disallowedReferences = [
-          "dev"
-          "doc"
-          "man"
-        ];
-        disallowedRequisites = [
-          stdenv'.cc
-          llvmPackages.llvm.out
-        ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-      };
-      outputChecks.lib = {
-        disallowedReferences = [
-          "out"
-          "dev"
-          "doc"
-          "man"
-        ];
-        disallowedRequisites = [
-          stdenv'.cc
-          llvmPackages.llvm.out
-        ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-      };
+      outputChecks =
+        {
+          out = {
+            disallowedReferences = [
+              "dev"
+              "doc"
+              "man"
+            ];
+            disallowedRequisites = [
+              stdenv'.cc
+              llvmPackages.llvm.out
+            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+          };
+
+          lib = {
+            disallowedReferences = [
+              "out"
+              "dev"
+              "doc"
+              "man"
+            ];
+            disallowedRequisites = [
+              stdenv'.cc
+              llvmPackages.llvm.out
+            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+          };
+        }
+        // lib.optionalAttrs (atLeast "14" && olderThan "15") {
+          # TODO: Make this unconditional via staging because of number of rebuilds.
+          doc = {
+            disallowedReferences = [
+              "out"
+              "dev"
+              "man"
+            ];
+          };
+
+          man = {
+            disallowedReferences = [
+              "out"
+              "dev"
+              "doc"
+            ];
+          };
+        };
 
       strictDeps = true;
 

From 8f96c5ad727ad969de2a86f6cf599983286ddd41 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Fri, 27 Dec 2024 14:59:39 +0800
Subject: [PATCH 1111/1504] cutemarked-ng: remove

---
 ...emove-dependency-on-vendored-library.patch | 95 -------------------
 .../0002-use-pkgcofig-to-find-libraries.patch | 25 -----
 .../office/cutemarked-ng/default.nix          | 58 -----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 5 files changed, 1 insertion(+), 180 deletions(-)
 delete mode 100644 pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch
 delete mode 100644 pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch
 delete mode 100644 pkgs/applications/office/cutemarked-ng/default.nix

diff --git a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch b/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch
deleted file mode 100644
index b42b7c3295c3..000000000000
--- a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b9bf46966dd7931f9f33c30ed608a21d0e71e923 Mon Sep 17 00:00:00 2001
-From: rewine <lhongxu@outlook.com>
-Date: Tue, 19 Jul 2022 13:19:10 +0800
-Subject: [PATCH 1/2] remove dependency on vendored library
-
----
- CuteMarkEd.pro                |  4 +---
- app-static/app-static.pro     | 11 ++---------
- app/app.pro                   |  2 --
- app/cutemarkdownhighlighter.h |  2 +-
- 4 files changed, 4 insertions(+), 15 deletions(-)
-
-diff --git a/CuteMarkEd.pro b/CuteMarkEd.pro
-index 4ee92e3..0d247a4 100644
---- a/CuteMarkEd.pro
-+++ b/CuteMarkEd.pro
-@@ -9,12 +9,10 @@ TEMPLATE = subdirs
- CONFIG += c++14
- 
- SUBDIRS = \
--    3rdparty \
-     libs \
-     app-static \
-     app \
--    fontawesomeicon \
--    test
-+    fontawesomeicon
- 
- # build order: 3rdparty -> libs -> app-static -> app & test
- #libs.depends = 3rdparty
-diff --git a/app-static/app-static.pro b/app-static/app-static.pro
-index cd3c292..560b4fc 100644
---- a/app-static/app-static.pro
-+++ b/app-static/app-static.pro
-@@ -13,7 +13,6 @@ CONFIG += c++11
- 
- INCLUDEPATH += $$PWD
- # MD4C library
--INCLUDEPATH += $$PWD/../3rdparty/md4c/src
- 
- SOURCES += \
-     snippets/jsonsnippettranslator.cpp \
-@@ -34,10 +33,7 @@ SOURCES += \
-     revealviewsynchronizer.cpp \
-     htmlpreviewcontroller.cpp \
-     htmlviewsynchronizer.cpp \
--    yamlheaderchecker.cpp \
--    $$PWD/../3rdparty/md4c/src/md4c.c \
--    $$PWD/../3rdparty/md4c/src/entity.c \
--    $$PWD/../3rdparty/md4c/src/md4c-html.c
-+    yamlheaderchecker.cpp
- 
- HEADERS += \
-     snippets/snippet.h \
-@@ -64,10 +60,7 @@ HEADERS += \
-     revealviewsynchronizer.h \
-     htmlpreviewcontroller.h \
-     htmlviewsynchronizer.h \
--    yamlheaderchecker.h \
--    $$PWD/../3rdparty/md4c/src/md4c.h \
--    $$PWD/../3rdparty/md4c/src/entity.h \
--    $$PWD/../3rdparty/md4c/src/md4c-html.h
-+    yamlheaderchecker.h
- 
- 
- #unix:!symbian {
-diff --git a/app/app.pro b/app/app.pro
-index 4827673..ab961cf 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -40,8 +40,6 @@ macx {
- }
- 
- #qmarkdowntextedit
--include(../3rdparty/qmarkdowntextedit/qmarkdowntextedit.pri)
--include(../3rdparty/hunspell/hunspell.pri)
- INCLUDEPATH += $$PWD
- 
- SOURCES += \
-diff --git a/app/cutemarkdownhighlighter.h b/app/cutemarkdownhighlighter.h
-index c99ab56..78f2be6 100644
---- a/app/cutemarkdownhighlighter.h
-+++ b/app/cutemarkdownhighlighter.h
-@@ -19,7 +19,7 @@
- 
- #include <QSyntaxHighlighter>
- 
--#include "../3rdparty/qmarkdowntextedit/markdownhighlighter.h"
-+#include <QMarkdownTextedit/markdownhighlighter.h>
- 
- namespace hunspell {
- class SpellChecker;
--- 
-2.36.1
-
diff --git a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch b/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch
deleted file mode 100644
index 89b5441738c5..000000000000
--- a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bdc66eace846edc8a7b435f7ca9f324427243ce4 Mon Sep 17 00:00:00 2001
-From: rewine <lhongxu@outlook.com>
-Date: Thu, 21 Jul 2022 17:30:22 +0800
-Subject: [PATCH 2/2] use pkgcofig to find libraries
-
----
- app/app.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/app/app.pro b/app/app.pro
-index ab961cf..475487d 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -13,6 +13,8 @@ win32: QT += winextras
- TARGET = cutemarked
- TEMPLATE = app
- CONFIG += c++11
-+CONFIG += link_pkgconfig
-+PKGCONFIG += QMarkdownTextedit hunspell md4c-html
- 
- unix:!macx {
-   CONFIG += link_pkgconfig
--- 
-2.36.1
-
diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix
deleted file mode 100644
index 021259dd4004..000000000000
--- a/pkgs/applications/office/cutemarked-ng/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  pkg-config,
-  qttools,
-  qtwebengine,
-  wrapQtAppsHook,
-  qmarkdowntextedit,
-  md4c,
-  hunspell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "CuteMarkEd-NG";
-  version = "unstable-2021-07-29";
-
-  src = fetchFromGitHub {
-    owner = "Waqar144";
-    repo = pname;
-    rev = "9431ac603cef23d6f29e51e18f1eeee156f5bfb3";
-    sha256 = "sha256-w/D4C2ZYgI/7ZCDamTQlhrJ9vtvAMThgM/fopkdKWYc";
-  };
-
-  patches = [
-    ./0001-remove-dependency-on-vendored-library.patch
-    ./0002-use-pkgcofig-to-find-libraries.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace app/app.pro \
-      --replace '$$[QT_INSTALL_BINS]/lrelease' "lrelease"
-  '';
-
-  nativeBuildInputs = [
-    qmake
-    qttools
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    md4c
-    qtwebengine
-    qmarkdowntextedit
-    hunspell.dev
-  ];
-
-  meta = with lib; {
-    description = "Qt-based, free and open source markdown editor";
-    mainProgram = "cutemarked";
-    homepage = "https://github.com/Waqar144/CuteMarkEd-NG";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ rewine ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 51c1de71827b..9b3579627358 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -254,6 +254,7 @@ mapAliases {
   cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
+  cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
 
   # these are for convenience, not for backward compat and shouldn't expire
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1cf6857c57a..d26082f6c397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2207,8 +2207,6 @@ with pkgs;
 
   csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { };
 
-  cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { };
-
   dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard;
 
   datasette = with python3Packages; toPythonApplication datasette;

From 783d48a7233c1f411bedbb8403daf2273697cd24 Mon Sep 17 00:00:00 2001
From: Iain Majer <iainvm@outlook.com>
Date: Thu, 2 Jan 2025 09:46:55 +0000
Subject: [PATCH 1112/1504] go-task: update shell completions

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

diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index 3f605df660ee..46f1442502a9 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -37,14 +37,10 @@ buildGoModule rec {
   postInstall = ''
     ln -s $out/bin/task $out/bin/go-task
 
-    installShellCompletion completion/{bash,fish,zsh}/*
-
-    substituteInPlace $out/share/bash-completion/completions/task.bash \
-      --replace-fail 'complete -F _task task' 'complete -F _task task go-task'
-    substituteInPlace $out/share/fish/vendor_completions.d/task.fish \
-      --replace-fail 'complete -c $GO_TASK_PROGNAME' 'complete -c $GO_TASK_PROGNAME -c go-task'
-    substituteInPlace $out/share/zsh/site-functions/_task \
-      --replace-fail '#compdef task' '#compdef task go-task'
+    installShellCompletion --cmd task \
+      --bash <($out/bin/task --completion bash) \
+      --fish <($out/bin/task --completion fish) \
+      --zsh <($out/bin/task --completion zsh)
   '';
 
   passthru = {

From 297e71258a7bc903f28ef5be37d14fc9e8175a50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 09:58:55 +0000
Subject: [PATCH 1113/1504] python312Packages.marimo: 0.10.5 -> 0.10.9

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

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 7958d63eb9ee..a2d391e263e7 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -30,13 +30,13 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.10.5";
+  version = "0.10.9";
   pyproject = true;
 
   # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KJKnGVOM0ahZOWDXHyS5meRS1xXypKzgo3X9RvD1tJs=";
+    hash = "sha256-WoMfybvKlD8Gy2sc3/EhQZVN9WPh8eEVPlG5ksyjjGc=";
   };
 
   build-system = [ hatchling ];

From 7f338aad226d63423d512a3e79035f0837c7a07f Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 1 Jan 2025 23:45:48 +0100
Subject: [PATCH 1114/1504] vectorscan: fix cross-compile

---
 pkgs/by-name/ve/vectorscan/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 860ea03f7a2d..7ac93806d006 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-wz2oIhau/vjnri3LOyPZSCFAWg694FTLVt7+SZYEsL4=";
   };
 
+  postPatch = ''
+    substituteInPlace cmake/build_wrapper.sh \
+      --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \
+      --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 0f3c1d31bfb512edfca8a28ce19a8a5bc69f8eb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 10:05:48 +0000
Subject: [PATCH 1115/1504] renode-dts2repl: 0-unstable-2024-12-20 ->
 0-unstable-2024-12-28

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index f749546b3271..94d33583ba40 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2024-12-20";
+  version = "0-unstable-2024-12-28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "323cc41b6864e53cb1b99bf909c779b739a8fccb";
-    hash = "sha256-CYgQ5CMVkHqOEPPaG74GVNhm8pa6ZpAtt54JrrDn+2M=";
+    rev = "f655a1380364fdab9fa0f72909c19ab8ff16dbb6";
+    hash = "sha256-mErr95/Ew9HwKDJhQy7V86H1MJb5Y7IFzg7Id8Llqy8=";
   };
 
   nativeBuildInputs = [

From 4d3b1bcad8797b28a4cf744fdad043b4f438ba32 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 02:12:46 -0800
Subject: [PATCH 1116/1504] singular: fix clang-19 build

remove dead code with invalid member reference
https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9

enable local networking in darwin sandbox

note: the darwin build is still broken due a link error which occurs due
to combining -flat_namespace and libgfortran.dylib -- gfortran/libs
are usings `@rpaths/libname.dylib` rather than full path names. However,
once this is fix the build succeeds.
---
 pkgs/by-name/si/singular/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix
index 47e6c2445191..40fa34b87761 100644
--- a/pkgs/by-name/si/singular/package.nix
+++ b/pkgs/by-name/si/singular/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   gmp,
   bison,
   perl,
@@ -48,6 +49,15 @@ stdenv.mkDerivation rec {
     forceFetchGit = true;
   };
 
+  patches = [
+    (fetchpatch {
+      # removes dead code with invalid member reference in gfanlib
+      name = "clang-19.patch";
+      url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch";
+      hash = "sha256-1KOk+yrTvHWY4aSK9QcByHIwKwe71QIYTMx8zo7XNos=";
+    })
+  ];
+
   configureFlags =
     [
       "--enable-gfanlib"
@@ -173,6 +183,7 @@ stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
+  __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
     description = "CAS for polynomial computations";

From b287c667e03207351291e8c84bd5a5384470ecd9 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 02:16:18 -0800
Subject: [PATCH 1117/1504] gfan: fix clang-19 build

remove dead code with invalid member reference
https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9
---
 pkgs/by-name/gf/gfan/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/gf/gfan/package.nix b/pkgs/by-name/gf/gfan/package.nix
index 9410d7d2e491..a4b202e829da 100644
--- a/pkgs/by-name/gf/gfan/package.nix
+++ b/pkgs/by-name/gf/gfan/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
   patches =
     [
       ./gfan-0.6.2-cddlib-prefix.patch
+      (fetchpatch {
+        # removes dead code with invalid member reference in gfanlib
+        name = "clang-19.patch";
+        url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch";
+        stripLen = 2;
+        extraPrefix = "src/";
+        hash = "sha256-jPGMYx/GOFV7Tk3CqaRWeX/UHkzjeL57eZj4r40s8/g=";
+      })
     ]
     ++ lib.optionals (stdenv.cc.isClang) [
       (fetchpatch {

From 41f7b3d67bf62aaf4b7494c06c35b66d1d473358 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 10:23:29 +0000
Subject: [PATCH 1118/1504] factoriolab: 3.8.9 -> 3.8.10

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

diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index c096519a0538..92c4dc66836f 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.8.9";
+  version = "3.8.10";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     rev = "refs/tags/v${version}";
-    hash = "sha256-H+l/eDdTc/IMqE85Xh4IAo2ZWZRYKKUnH3rXkON2L1s=";
+    hash = "sha256-vwcqUsqlggmqqlQ3fyn+s3NKQ0oNcVztfjTpJPW1mFs=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

From 2eecf15ad7776f924f8fc01e329d9bd17fbd6bf5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 11:36:22 +0100
Subject: [PATCH 1119/1504] python312Packages.deepdish: fix build

---
 .../python-modules/deepdish/default.nix       | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix
index 04062db872a7..119defd7ea17 100644
--- a/pkgs/development/python-modules/deepdish/default.nix
+++ b/pkgs/development/python-modules/deepdish/default.nix
@@ -1,7 +1,12 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   numpy,
   scipy,
   tables,
@@ -10,14 +15,23 @@
 buildPythonPackage rec {
   pname = "deepdish";
   version = "0.3.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wqzwh3y0mjdyba5kfbvlamn561d3afz50zi712c7klkysz3mzva";
+    hash = "sha256-av86vvaTzsNEOPGD8p0aLZhiq6J7uVnU8k1W4AfkH/M=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace deepdish/core.py \
+      --replace-fail "np.ComplexWarning" "np.exceptions.ComplexWarning"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     numpy
     scipy
     tables
@@ -32,11 +46,11 @@ buildPythonPackage rec {
   # The tests are broken: `ModuleNotFoundError: No module named 'deepdish.six.conf'`
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Flexible HDF5 saving/loading and other data science tools from the University of Chicago";
     mainProgram = "ddls";
     homepage = "https://github.com/uchicago-cs/deepdish";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ndl ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ndl ];
   };
 }

From fb6bdb41292630157cc8786ee118af734497b6c6 Mon Sep 17 00:00:00 2001
From: musjj <72612857+musjj@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:40:06 +0700
Subject: [PATCH 1120/1504] evcxr: add mainProgram

---
 pkgs/development/interpreters/evcxr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 8625eab28aca..d4520719a7e8 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -73,5 +73,6 @@ rustPlatform.buildRustPackage rec {
       protoben
       ma27
     ];
+    mainProgram = "evcxr";
   };
 }

From 3aee503522c4e9ddb4c0ee4943484af7d92139e4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:07:45 +0100
Subject: [PATCH 1121/1504] voicevox-core: 0.15.4 -> 0.15.7, make sources
 easier to fetch

---
 pkgs/by-name/vo/voicevox-core/package.nix | 75 +++++++++++++----------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix
index 0283b9cbfb4c..556eb756424d 100644
--- a/pkgs/by-name/vo/voicevox-core/package.nix
+++ b/pkgs/by-name/vo/voicevox-core/package.nix
@@ -1,45 +1,18 @@
 {
   lib,
   stdenv,
-  fetchzip,
+  fetchurl,
+  unzip,
   autoPatchelfHook,
 }:
 
-let
-  platformInfoTable = {
-    "x86_64-linux" = {
-      id = "linux-x64";
-      hash = "sha256-/PD5e0bWgnIsIrvyOypoJw30VkgbOFWV1NJpPS2G0WM=";
-    };
-    "aarch64-linux" = {
-      id = "linux-arm64";
-      hash = "sha256-zfiorXZyIISZPXPwmcdYeHceDmQXkUhsvTkNZScg648=";
-    };
-    "x86_64-darwin" = {
-      id = "osx-x64";
-      hash = "sha256-cdNdV1fVPkz6B7vtKZiPsLQGqnIiDtYa9KTcwSkjdJg=";
-    };
-    "aarch64-darwin" = {
-      id = "osx-arm64";
-      hash = "sha256-Z1dq2t/HBQulbPF23ZCihOrcZHMpTXEQ6yXKORZaFPk=";
-    };
-  };
-
-  platformInfo =
-    platformInfoTable.${stdenv.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "voicevox-core";
-  version = "0.15.4";
+  version = "0.15.7";
 
-  # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models
-  src = fetchzip {
-    url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${platformInfo.id}-cpu-${finalAttrs.version}.zip";
-    inherit (platformInfo) hash;
-  };
+  src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
   buildInputs = [ stdenv.cc.cc.lib ];
 
@@ -54,6 +27,37 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # When updating, run the following command to fetch all FODs:
+  # nix-build -A voicevox-core.sources --keep-going
+  passthru.sources =
+    let
+      # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models
+      fetchCoreArtifact =
+        { id, hash }:
+        fetchurl {
+          url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${id}-cpu-${finalAttrs.version}.zip";
+          inherit hash;
+        };
+    in
+    {
+      "x86_64-linux" = fetchCoreArtifact {
+        id = "linux-x64";
+        hash = "sha256-7FgrJ1HlB8l5MHd2KM4lYRx2bYdxrD2+su1G33/ugUA=";
+      };
+      "aarch64-linux" = fetchCoreArtifact {
+        id = "linux-arm64";
+        hash = "sha256-fD7YMTo9jeB4vJibnVwX8VrukCUeAwS6VXGOr3VXG+c=";
+      };
+      "x86_64-darwin" = fetchCoreArtifact {
+        id = "osx-x64";
+        hash = "sha256-5h9qEKbdcvip50TLs3vf6lXkSv24VEjOrx6CTUo7Q4Q=";
+      };
+      "aarch64-darwin" = fetchCoreArtifact {
+        id = "osx-arm64";
+        hash = "sha256-0bFLhvP7LqDzuk3pyM9QZfc8eLMW0IgqVkaXsuS3qlY=";
+      };
+    };
+
   meta = {
     changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}";
     description = "Core library for the VOICEVOX speech synthesis software";
@@ -67,8 +71,11 @@ stdenv.mkDerivation (finalAttrs: {
         redistributable = true;
       })
     ];
-    maintainers = with lib.maintainers; [ tomasajt ];
-    platforms = lib.attrNames platformInfoTable;
+    maintainers = with lib.maintainers; [
+      tomasajt
+      eljamm
+    ];
+    platforms = lib.attrNames finalAttrs.passthru.sources;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From 6be536c0d86750d4daecfaa10fecb0fa0c906978 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:08:17 +0100
Subject: [PATCH 1122/1504] voicevox-engine: 0.20.0 -> 0.22.2

---
 pkgs/by-name/vo/voicevox-engine/package.nix | 22 ++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix
index bc9a67617e9f..e9f3e56a73f7 100644
--- a/pkgs/by-name/vo/voicevox-engine/package.nix
+++ b/pkgs/by-name/vo/voicevox-engine/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "voicevox-engine";
-  version = "0.20.0";
+  version = "0.22.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox_engine";
-    rev = "refs/tags/${version}";
-    hash = "sha256-Gib5R7oleg+XXyu2V65EqrflQ1oiAR7a09a0MFhSITc=";
+    tag = version;
+    hash = "sha256-TZycd3xX5d4dNk4ze2JozyO7zDpGAuO+O7xHAx7QXUI=";
   };
 
   patches = [
@@ -95,6 +95,10 @@ python3Packages.buildPythonApplication rec {
     # this test checks the behaviour of openapi
     # one of the functions returns a slightly different output due to openapi version differences
     "test_OpenAPIの形が変わっていないことを確認"
+
+    # these tests fail due to some tiny floating point discrepancies
+    "test_upspeak_voiced_last_mora"
+    "test_upspeak_voiced_N_last_mora"
   ];
 
   nativeCheckInputs = with python3Packages; [
@@ -105,22 +109,26 @@ python3Packages.buildPythonApplication rec {
 
   passthru = {
     resources = fetchFromGitHub {
+      name = "voicevox-resource-${version}"; # this contains ${version} to invalidate the hash upon updating the package
       owner = "VOICEVOX";
       repo = "voicevox_resource";
-      rev = "refs/tags/${version}";
-      hash = "sha256-m888DF9qgGbK30RSwNnAoT9D0tRJk6cD5QY72FRkatM=";
+      tag = version;
+      hash = "sha256-oeWJESm1v0wicAXXFAyZT8z4QRVv9c+3vsWksmuY5wY=";
     };
 
     pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };
   };
 
   meta = {
-    changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${version}";
+    changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${src.tag}";
     description = "Engine for the VOICEVOX speech synthesis software";
     homepage = "https://github.com/VOICEVOX/voicevox_engine";
     license = lib.licenses.lgpl3Only;
     mainProgram = "voicevox-engine";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      eljamm
+    ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 1c90438fd833f11d06431acdd3453c46305b5455 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:08:22 +0100
Subject: [PATCH 1123/1504] voicevox: 0.20.0 -> 0.22.3

---
 pkgs/by-name/vo/voicevox/hardcode-paths.patch | 21 ++++++++---------
 pkgs/by-name/vo/voicevox/package.nix          | 23 ++++++++++++++-----
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/vo/voicevox/hardcode-paths.patch b/pkgs/by-name/vo/voicevox/hardcode-paths.patch
index 844a3e5884c4..91d862602bff 100644
--- a/pkgs/by-name/vo/voicevox/hardcode-paths.patch
+++ b/pkgs/by-name/vo/voicevox/hardcode-paths.patch
@@ -12,30 +12,29 @@ index 5b0dcb0..5848ccd 100644
          "host": "http://127.0.0.1:50021"
      }
 diff --git a/electron-builder.config.js b/electron-builder.config.js
-index 462e6f2..10a9bff 100644
+index 196a0d7..7e313c2 100644
 --- a/electron-builder.config.js
 +++ b/electron-builder.config.js
-@@ -35,19 +35,6 @@ const isMac = process.platform === "darwin";
+@@ -37,18 +37,7 @@ const isArm64 = process.arch === "arm64";
  // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A
  const extraFilePrefix = isMac ? "MacOS/" : "";
  
 -const sevenZipFile = fs
--  .readdirSync(path.resolve(__dirname, "build", "vendored", "7z"))
+-  .readdirSync(path.resolve(__dirname, "vendored", "7z"))
 -  .find(
 -    // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
 -    (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
 -  );
--
+ 
 -if (!sevenZipFile) {
 -  throw new Error(
--    "7z binary file not found. Run `node ./build/download7z.js` first.",
+-    "7z binary file not found. Run `node ./tools/download7z.js` first.",
 -  );
 -}
--
+ 
  /** @type {import("electron-builder").Configuration} */
  const builderOptions = {
-   beforeBuild: async () => {
-@@ -88,14 +75,6 @@ const builderOptions = {
+@@ -90,14 +79,6 @@ const builderOptions = {
        from: "build/README.txt",
        to: extraFilePrefix + "README.txt",
      },
@@ -44,17 +43,17 @@ index 462e6f2..10a9bff 100644
 -      to: path.join(extraFilePrefix, "vv-engine"),
 -    },
 -    {
--      from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile),
+-      from: path.resolve(__dirname, "vendored", "7z", sevenZipFile),
 -      to: extraFilePrefix + sevenZipFile,
 -    },
    ],
    // electron-builder installer
    productName: "VOICEVOX",
 diff --git a/src/backend/electron/manager/vvppManager.ts b/src/backend/electron/manager/vvppManager.ts
-index 6aa17b6..b8b52b7 100644
+index edd3177..22d0114 100644
 --- a/src/backend/electron/manager/vvppManager.ts
 +++ b/src/backend/electron/manager/vvppManager.ts
-@@ -196,16 +196,8 @@ export class VvppManager {
+@@ -184,16 +184,8 @@ export class VvppManager {
  
          const args = ["x", "-o" + outputDir, archiveFile, "-t" + format];
  
diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix
index e4935091c87b..a12fcef8e1c0 100644
--- a/pkgs/by-name/vo/voicevox/package.nix
+++ b/pkgs/by-name/vo/voicevox/package.nix
@@ -10,17 +10,18 @@
   electron,
   _7zz,
   voicevox-engine,
+  dart-sass,
 }:
 
 buildNpmPackage rec {
   pname = "voicevox";
-  version = "0.20.0";
+  version = "0.22.3";
 
   src = fetchFromGitHub {
     owner = "VOICEVOX";
     repo = "voicevox";
-    rev = "refs/tags/${version}";
-    hash = "sha256-05WTecNc1xxe7SGDPZbLtRELNghFkMTqI4pkX4PsVWI=";
+    tag = version;
+    hash = "sha256-6z+A4bJIDfN/K8IjEdt2TqEa/EDt4uQpGh+zSWfP74I=";
   };
 
   patches = [
@@ -36,7 +37,10 @@ buildNpmPackage rec {
         --replace-fail "postinstall" "_postinstall"
   '';
 
-  npmDepsHash = "sha256-g3avCj3S96qYPAyGXn4yvrZ4gteJld+g4eV4aRtv/3g=";
+  npmDepsHash = "sha256-NuKFhDb/J6G3pFYHZedKnY2hDC5GCp70DpqrST4bJMA=";
+
+  # unlock very specific node version bounds specified by upstream
+  npmInstallFlags = [ "--engine-strict=false" ];
 
   nativeBuildInputs =
     [
@@ -54,6 +58,10 @@ buildNpmPackage rec {
   buildPhase = ''
     runHook preBuild
 
+    # force sass-embedded to use our own sass instead of the bundled one
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+        --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
+
     # build command taken from the definition of the `electron:build` npm script
     VITE_TARGET=electron npm exec vite build
 
@@ -105,12 +113,15 @@ buildNpmPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${version}";
+    changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${src.tag}";
     description = "Editor for the VOICEVOX speech synthesis software";
     homepage = "https://github.com/VOICEVOX/voicevox";
     license = lib.licenses.lgpl3Only;
     mainProgram = "voicevox";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      eljamm
+    ];
     platforms = electron.meta.platforms;
   };
 }

From 2776ee4823534217858c68cb28058fa8844ae75b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 10:52:51 +0000
Subject: [PATCH 1124/1504] heptabase: 1.49.0 -> 1.50.0

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

diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index 2f3f0e480caf..6174f2e9818e 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "heptabase";
-  version = "1.49.0";
+  version = "1.50.0";
   src = fetchurl {
     url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-4YjhJEuDMKNvIHir6Je4MKbgZzTfPxdMeuvF/F+kYvw=";
+    hash = "sha256-HFnHzftnLO4nfHxXhvHH4+lVdcPp2N3ihgMhnxSv2bA=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 8474f557efabe0741d87ace6571ee1614d8d53e8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Jan 2025 10:50:20 +0100
Subject: [PATCH 1125/1504] rspamd: build with vectorscan

---
 pkgs/by-name/rs/rspamd/package.nix | 41 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 853b9cae4c77..1288743c3c1f 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -14,7 +14,7 @@
   sqlite,
   ragel,
   icu,
-  hyperscan,
+  vectorscan,
   jemalloc,
   blas,
   lapack,
@@ -24,13 +24,10 @@
   zstd,
   libarchive,
   withBlas ? true,
-  withHyperscan ? stdenv.hostPlatform.isx86_64,
   withLuaJIT ? stdenv.hostPlatform.isx86_64,
   nixosTests,
 }:
 
-assert withHyperscan -> stdenv.hostPlatform.isx86_64;
-
 stdenv.mkDerivation rec {
   pname = "rspamd";
   version = "3.11.0";
@@ -48,7 +45,9 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     perl
+    ragel
   ];
+
   buildInputs =
     [
       doctest
@@ -64,8 +63,8 @@ stdenv.mkDerivation rec {
       xxHash
       zstd
       libarchive
+      vectorscan
     ]
-    ++ lib.optional withHyperscan hyperscan
     ++ lib.optionals withBlas [
       blas
       lapack
@@ -73,23 +72,21 @@ stdenv.mkDerivation rec {
     ++ lib.optional withLuaJIT luajit
     ++ lib.optional (!withLuaJIT) lua;
 
-  cmakeFlags =
-    [
-      # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
-      "-DENABLE_PCRE2=OFF"
-      "-DDEBIAN_BUILD=ON"
-      "-DRUNDIR=/run/rspamd"
-      "-DDBDIR=/var/lib/rspamd"
-      "-DLOGDIR=/var/log/rspamd"
-      "-DLOCAL_CONFDIR=/etc/rspamd"
-      "-DENABLE_JEMALLOC=ON"
-      "-DSYSTEM_DOCTEST=ON"
-      "-DSYSTEM_FMT=ON"
-      "-DSYSTEM_XXHASH=ON"
-      "-DSYSTEM_ZSTD=ON"
-    ]
-    ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
-    ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
+  cmakeFlags = [
+    # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
+    "-DENABLE_PCRE2=OFF"
+    "-DDEBIAN_BUILD=ON"
+    "-DRUNDIR=/run/rspamd"
+    "-DDBDIR=/var/lib/rspamd"
+    "-DLOGDIR=/var/log/rspamd"
+    "-DLOCAL_CONFDIR=/etc/rspamd"
+    "-DENABLE_JEMALLOC=ON"
+    "-DSYSTEM_DOCTEST=ON"
+    "-DSYSTEM_FMT=ON"
+    "-DSYSTEM_XXHASH=ON"
+    "-DSYSTEM_ZSTD=ON"
+    "-DENABLE_HYPERSCAN=ON"
+  ] ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
 
   passthru.tests.rspamd = nixosTests.rspamd;
 

From fac85fd1fccae52b528c0ed8cc04b6c404ae6e38 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Jan 2025 10:48:35 +0100
Subject: [PATCH 1126/1504] vectorscan: fix pkg-config

---
 pkgs/by-name/hy/hyperscan/package.nix  | 4 ++--
 pkgs/by-name/ve/vectorscan/package.nix | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index b9ba8e7b8dda..bce1ead253fd 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     sed -i '/examples/d' CMakeLists.txt
     substituteInPlace libhs.pc.in \
-      --replace "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
-      --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
+      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
+      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
   doCheck = true;
diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index 7ac93806d006..e2554d526f25 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
+    sed -i '/examples/d' CMakeLists.txt
+    substituteInPlace libhs.pc.in \
+      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
+      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
     substituteInPlace cmake/build_wrapper.sh \
       --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \
       --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy'

From 3b11e0c595be016251ebc641ca523bc95aa01e17 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Jan 2025 10:50:03 +0100
Subject: [PATCH 1127/1504] vectorscan: reformat

---
 pkgs/by-name/ve/vectorscan/package.nix | 75 +++++++++++++++++---------
 1 file changed, 50 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix
index e2554d526f25..206fb21b02eb 100644
--- a/pkgs/by-name/ve/vectorscan/package.nix
+++ b/pkgs/by-name/ve/vectorscan/package.nix
@@ -1,15 +1,16 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, ragel
-, util-linux
-, python3
-, boost
-, sqlite
-, pcre
-, enableShared ? !stdenv.hostPlatform.isStatic
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  ragel,
+  util-linux,
+  python3,
+  boost,
+  sqlite,
+  pcre,
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,18 +56,35 @@ stdenv.mkDerivation rec {
   #
   # For generic builds (e.g. x86_64) this can mean using an implementation not optimized for the
   # potentially available more modern hardware extensions (e.g. x86_64 with AVX512).
-  cmakeFlags = [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ]
-    ++
-    (if lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" ] then
-      [ "-DBUILD_AVX2=ON" "-DBUILD_AVX512=ON" "-DBUILD_AVX512VBMI=ON" "-DFAT_RUNTIME=ON" ]
-    else
-      (if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
-        [ "-DBUILD_SVE=ON" "-DBUILD_SVE2=ON" "-DBUILD_SVE2_BITPERM=ON" "-DFAT_RUNTIME=ON" ]
+  cmakeFlags =
+    [ (if enableShared then "-DBUILD_SHARED_LIBS=ON" else "BUILD_STATIC_LIBS=ON") ]
+    ++ (
+      if
+        lib.elem stdenv.hostPlatform.system [
+          "x86_64-linux"
+          "i686-linux"
+        ]
+      then
+        [
+          "-DBUILD_AVX2=ON"
+          "-DBUILD_AVX512=ON"
+          "-DBUILD_AVX512VBMI=ON"
+          "-DFAT_RUNTIME=ON"
+        ]
       else
-        [ "-DFAT_RUNTIME=OFF" ]
-          ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
-          ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
-      )
+        (
+          if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
+            [
+              "-DBUILD_SVE=ON"
+              "-DBUILD_SVE2=ON"
+              "-DBUILD_SVE2_BITPERM=ON"
+              "-DFAT_RUNTIME=ON"
+            ]
+          else
+            [ "-DFAT_RUNTIME=OFF" ]
+            ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
+            ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
+        )
     );
 
   doCheck = true;
@@ -95,7 +113,14 @@ stdenv.mkDerivation rec {
     homepage = "https://www.vectorcamp.gr/vectorscan/";
     changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG-vectorscan.md";
     platforms = platforms.unix;
-    license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ];
-    maintainers = with maintainers; [ tnias vlaci ];
+    license = with licenses; [
+      bsd3 # and
+      bsd2 # and
+      licenses.boost
+    ];
+    maintainers = with maintainers; [
+      tnias
+      vlaci
+    ];
   };
 }

From 22274d9c68c66e798a97191f4fea322d223fccbb Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:59:22 +0200
Subject: [PATCH 1128/1504] yarn-berry: move to `pkgs/by-name`

---
 .../default.nix => by-name/ya/yarn-berry/package.nix}           | 0
 pkgs/{development/tools => by-name/ya}/yarn-berry/update.sh     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/tools/yarn-berry/default.nix => by-name/ya/yarn-berry/package.nix} (100%)
 rename pkgs/{development/tools => by-name/ya}/yarn-berry/update.sh (100%)

diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/by-name/ya/yarn-berry/package.nix
similarity index 100%
rename from pkgs/development/tools/yarn-berry/default.nix
rename to pkgs/by-name/ya/yarn-berry/package.nix
diff --git a/pkgs/development/tools/yarn-berry/update.sh b/pkgs/by-name/ya/yarn-berry/update.sh
similarity index 100%
rename from pkgs/development/tools/yarn-berry/update.sh
rename to pkgs/by-name/ya/yarn-berry/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faf644bc957b..a357a180f826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5665,8 +5665,6 @@ with pkgs;
 
   yapf = with python3Packages; toPythonApplication yapf;
 
-  yarn-berry = callPackage ../development/tools/yarn-berry { };
-
   yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { pkgs = pkgs.__splicedPackages; };
 
   inherit (yarn2nix-moretea)

From d2fb42f5e06d63ed15c45debb82eae707ad377d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:16:15 +0000
Subject: [PATCH 1129/1504] mise: 2024.12.17 -> 2025.1.0

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

diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 976d1b9357bb..c8ee85eff0c9 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2024.12.17";
+  version = "2025.1.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-kdI7GEtUlVUJYN7ch8RjG1aWBMDkvLkdUGfyqWv4yAQ=";
+    hash = "sha256-q6kzDs2YBeO3H/4LuKszkelT1SKfe5yK8j5yG41WHQQ=";
   };
 
-  cargoHash = "sha256-7ORbX2rWZ4tuf7qQo5lwTpHGFNCpo8R5ywJDdBjZcMU=";
+  cargoHash = "sha256-c/PgxIdLrKfDdeHL3HNuhvmgtSsFr/lhMPR6r2NVWBg=";
 
   nativeBuildInputs = [
     installShellFiles

From 1833a29ada0ef0a34af80de337a22bbeab570af0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:16:47 +0000
Subject: [PATCH 1130/1504] bacon: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 9de29879ee74..39cdac8e7beb 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bacon";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "bacon";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L+LVD7ceKUQ+nVyepusrv9Zz4BSGjXucnimsf+abM2k=";
+    hash = "sha256-pw+EfmpDvMCKSHOeHiv06x13/tRuf053Zcj8z0eWnPs=";
   };
 
-  cargoHash = "sha256-NUCy3DZ1uV1iPanHGbK/TSY6oS3zSQxVpmnw7Aon+pw=";
+  cargoHash = "sha256-W1bDZSUBjPmb/7bOnE+E5byA0clJZ+qGJ4XYASAjfeU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = [ "--version" ];

From 2fd3c5e63d91c0019693b67e8467df225dba9109 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:16:49 +0000
Subject: [PATCH 1131/1504] gotrue-supabase: 2.166.0 -> 2.167.0

---
 pkgs/tools/security/gotrue/supabase.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index cf37dbabfb41..0bccd3c1165a 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.166.0";
+  version = "2.167.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-e4PLop+enPt0IkPYRNH0UyZwiBhQKsk0mTFXokGcLug=";
+    hash = "sha256-L5yhrlbZk5R1f21rLpaskg/CW1ITt51sfgXu0DdSD3M=";
   };
 
   vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M=";

From 5f7fc7beb0ea15bf33927735576a175b1edc253f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 12:20:21 +0100
Subject: [PATCH 1132/1504] python312Packages.plotnine: 0.14.4 -> 0.14.5

Diff: https://github.com/has2k1/plotnine/compare/refs/tags/v0.14.4...v0.14.5

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

diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index 6fd63a35390c..53a0d1e6d940 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.14.4";
+  version = "0.14.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     tag = "v${version}";
-    hash = "sha256-pNbnbzmY3WMCfmuvaVa0JRuyadlvnVCIx5jtni/VcVI=";
+    hash = "sha256-3ImNLmZ8RhhqRGv/FtdjbHmdOtgQC7hjUsViEQYE8Ao=";
   };
 
   postPatch = ''

From 501e5ba9ceb02d3209c2dc12df3df26ff00884a2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Sep 2024 09:11:36 +0200
Subject: [PATCH 1133/1504] python312Packages.mmcv: clean derivation

---
 .../python-modules/mmcv/default.nix           | 147 ++++++++++--------
 1 file changed, 78 insertions(+), 69 deletions(-)

diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix
index ba3a72976f58..c86ea25b50c0 100644
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@@ -2,82 +2,56 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  torch,
-  torchvision,
-  opencv4,
-  yapf,
-  packaging,
-  pillow,
-  addict,
+
+  # nativeBuildInputs
   ninja,
   which,
+
+  # buildInputs
   pybind11,
+  torch,
+
+  # dependencies
+  addict,
+  mmengine,
+  numpy,
+  packaging,
+  pillow,
+  pyyaml,
+  yapf,
+
+  # tests
+  lmdb,
   onnx,
   onnxruntime,
-  scipy,
+  pytestCheckHook,
   pyturbojpeg,
+  scipy,
   tifffile,
-  lmdb,
-  mmengine,
+  torchvision,
 }:
 
 let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
   inherit (cudaPackages) backendStdenv;
-
 in
 buildPythonPackage rec {
   pname = "mmcv";
   version = "2.2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "open-mmlab";
     repo = "mmcv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc=";
   };
 
-  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
-
-  preConfigure =
-    ''
-      export MMCV_WITH_OPS=1
-    ''
-    + lib.optionalString cudaSupport ''
-      export CC=${backendStdenv.cc}/bin/cc
-      export CXX=${backendStdenv.cc}/bin/c++
-      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-      export FORCE_CUDA=1
-    '';
-
   postPatch = ''
-    substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
+    substituteInPlace setup.py \
+      --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
   '';
 
-  preCheck = ''
-    # remove the conflicting source directory
-    rm -rf mmcv
-  '';
-
-  # test_cnn test_ops really requires gpus to be useful.
-  # some of the tests take exceedingly long time.
-  # the rest of the tests are disabled due to sandbox env.
-  disabledTests = [
-    "test_cnn"
-    "test_ops"
-    "test_fileclient"
-    "test_load_model_zoo"
-    "test_processing"
-    "test_checkpoint"
-    "test_hub"
-    "test_reader"
-  ];
-
   nativeBuildInputs = [
     ninja
     which
@@ -99,34 +73,69 @@ buildPythonPackage rec {
       ]
     );
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    torchvision
-    lmdb
-    onnx
-    onnxruntime
-    scipy
-    pyturbojpeg
-    tifffile
-  ];
-
-  propagatedBuildInputs = [
+  dependencies = [
+    addict
     mmengine
-    torch
-    opencv4
-    yapf
+    numpy
     packaging
     pillow
-    addict
+    pyyaml
+    yapf
+
+    # opencv4
+    # torch
   ];
 
+  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
+
+  preConfigure =
+    ''
+      export MMCV_WITH_OPS=1
+    ''
+    + lib.optionalString cudaSupport ''
+      export CC=${lib.getExe' backendStdenv.cc "cc"}
+      export CXX=${lib.getExe' backendStdenv.cc "c++"}
+      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
+      export FORCE_CUDA=1
+    '';
+
   pythonImportsCheck = [ "mmcv" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    lmdb
+    onnx
+    onnxruntime
+    pytestCheckHook
+    pyturbojpeg
+    scipy
+    tifffile
+    torchvision
+  ];
+
+  # remove the conflicting source directory
+  preCheck = ''
+    rm -rf mmcv
+  '';
+
+  # test_cnn test_ops really requires gpus to be useful.
+  # some of the tests take exceedingly long time.
+  # the rest of the tests are disabled due to sandbox env.
+  disabledTests = [
+    "test_cnn"
+    "test_ops"
+    "test_fileclient"
+    "test_load_model_zoo"
+    "test_processing"
+    "test_checkpoint"
+    "test_hub"
+    "test_reader"
+  ];
+
+  meta = {
     description = "Foundational Library for Computer Vision Research";
     homepage = "https://github.com/open-mmlab/mmcv";
     changelog = "https://github.com/open-mmlab/mmcv/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ rxiao ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ rxiao ];
   };
 }

From 7480f0a44708856d54dac11685adbb14e5a947d9 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 11:55:38 +0100
Subject: [PATCH 1134/1504] ftjam: drop

---
 pkgs/by-name/ft/ftjam/package.nix | 117 ------------------------------
 pkgs/top-level/aliases.nix        |   1 +
 2 files changed, 1 insertion(+), 117 deletions(-)
 delete mode 100644 pkgs/by-name/ft/ftjam/package.nix

diff --git a/pkgs/by-name/ft/ftjam/package.nix b/pkgs/by-name/ft/ftjam/package.nix
deleted file mode 100644
index b78215472a7c..000000000000
--- a/pkgs/by-name/ft/ftjam/package.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  lib,
-  bison,
-  buildPackages,
-  fetchurl,
-  installShellFiles,
-  pkgsBuildTarget,
-  stdenv,
-  testers,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "ftjam";
-  version = "2.5.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/freetype/ftjam/${finalAttrs.version}/ftjam-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-6JdzUAqSkS3pGOn+v/q+S2vOedaa8ZRDX04DK4ptZqM=";
-  };
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
-  nativeBuildInputs = [
-    bison
-    installShellFiles
-  ];
-
-  # Doesn't understand how to cross compile once bootstrapped, so we'll just use
-  # the Makefile for the bootstrapping portion
-  configurePlatforms = [
-    "build"
-    "target"
-  ];
-
-  configureFlags = [
-    "CC=${buildPackages.stdenv.cc.targetPrefix}cc"
-    "--host=${stdenv.buildPlatform.config}"
-  ];
-
-  makeFlags = [
-    "CC=${buildPackages.stdenv.cc.targetPrefix}cc"
-  ];
-
-  env = {
-    LOCATE_TARGET = "bin.unix";
-    # Jam uses c89 conventions
-    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89";
-  };
-
-  enableParallelBuilding = true;
-
-  strictDeps = true;
-
-  # Jambase expects ar to have flags.
-  preConfigure = ''
-    export AR="$AR rc"
-  '';
-
-  # When cross-compiling, we need to set the preprocessor macros
-  # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the host
-  # platform. This looks a little ridiculous because the vast majority of build
-  # tools don't embed target-specific information into their binary, but in this
-  # case we behave more like a compiler than a make(1)-alike.
-  postPatch =
-    ''
-      substituteInPlace Jamfile \
-        --replace "strip" "${stdenv.cc.targetPrefix}strip"
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
-      cat >>jam.h <<EOF
-      #undef OSMAJOR
-      #undef OSMINOR
-      #undef OSPLAT
-      $(
-         ${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc -E -dM jam.h | grep -E '^#define (OSMAJOR|OSMINOR|OSPLAT) '
-      )
-      EOF
-    '';
-
-  buildPhase = ''
-    runHook preBuild
-    make $makeFlags jam0
-    ./jam0 -j$NIX_BUILD_CORES -sCC=${buildPackages.stdenv.cc.targetPrefix}cc jambase.c
-    ./jam0 -j$NIX_BUILD_CORES
-    runHook postBuild
-  '';
-
-  # The configure script does not recognize --docdir; because of it, the outputs
-  # can't be split
-  installPhase = ''
-    runHook preInstall
-
-    installBin bin.unix/jam
-    install -Dm644 -t ''${!outputDoc}/share/doc/jam-${finalAttrs.version}/ *.html
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      command = "jam -v";
-    };
-  };
-
-  meta = {
-    homepage = "https://freetype.org/jam/";
-    description = "FreeType's enhanced, backwards-compatible Jam clone";
-    license = lib.licenses.free;
-    mainProgram = "jam";
-    maintainers = with lib.maintainers; [
-      impl
-      AndersonTorres
-    ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9ae158a5ae5a..6aac8c31ec29 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -409,6 +409,7 @@ mapAliases {
   framework-system-tools = framework-tool; # added 2023-12-09
   francis = kdePackages.francis; # added 2024-07-13
   frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
+  ftjam = throw "ftjam was removed, as it hasn't been updated since 2007 and fails to build"; # added 2025-01-02
   fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
   fuse-common = throw "fuse-common was removed, because the udev rule was early included by systemd-udevd and the config is done by NixOS module `programs.fuse`"; # added 2024-09-29
   futuresql = libsForQt5.futuresql; # added 2023-11-11

From 5651648b38a4b112049e0cbf8d2deaddc0140982 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:56:20 +0000
Subject: [PATCH 1135/1504] sgt-puzzles: 20241223.5eea14c -> 20241230.79be403

---
 pkgs/games/sgt-puzzles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index ae07af273f13..257bad506f5d 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sgt-puzzles";
-  version = "20241223.5eea14c";
+  version = "20241230.79be403";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-c9cPPxjU7O+uAp6jzCkfv8ZJeVrcLmEfD+lUK0l+X9w=";
+    hash = "sha256-gWt328Ic0+ctcptnhnTprAEmMpcpfAAyTEqRuKF0gVY=";
   };
 
   sgt-puzzles-menu = fetchurl {

From 8c30dd41a7f580b2eac5fecfc872daed3c233dd3 Mon Sep 17 00:00:00 2001
From: Jonas Fierlings <fnoegip@gmail.com>
Date: Wed, 1 Jan 2025 23:00:38 +0100
Subject: [PATCH 1136/1504] python312Packages.blockdiag: fix missing runtime
 dependency

The `blockdiag.imagedraw` module has a runtime dependency on
[`pkg_resources`], which is part of the `setuptools` package.

[`pkg_resources`]: https://github.com/blockdiag/blockdiag/blob/3.0.0/src/blockdiag/imagedraw/__init__.py#L16
---
 pkgs/development/python-modules/blockdiag/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index 5859e00c6cd8..149d30c1dda6 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -58,6 +58,7 @@ buildPythonPackage rec {
     funcparserlib
     pillow
     reportlab
+    setuptools
     webcolors
   ];
 

From bef37907d7722a7d1eba18f03ec589ca49964a63 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 2 Jan 2025 20:08:39 +0800
Subject: [PATCH 1137/1504] deepin.deepin-picker: 6.0.1 -> 6.0.3

---
 pkgs/desktops/deepin/apps/deepin-picker/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
index ba567a9ad47e..d70c24b38883 100644
--- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-picker";
-  version = "6.0.1";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-vChSlP+lGufurvLkYbljAhc8qqqbc1bxQ2UIROreK2o=";
+    hash = "sha256-FCFRBhInmqKap1pms8TJrUJmbF8RgiXSTCUy8G1IlAg=";
   };
 
   nativeBuildInputs = [
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
     "DOCDIR=${placeholder "out"}/share/dman/deepin-picker"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Color picker application";
     mainProgram = "deepin-picker";
     homepage = "https://github.com/linuxdeepin/deepin-picker";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

From 6e95ad3b2b49d5da92feb3c310286a650c349dd6 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 02:26:58 -0800
Subject: [PATCH 1138/1504] lcalc: workaround for vendored <complex>

https://gitlab.com/sagemath/lcalc/-/issues/16

add -D_GLIBCXX_COMPLEX -D_LIBCPP_COMPLEX -D_LIBCPP___FWD_COMPLEX_H to
prevent including system <complex> and use the vendored copy.
---
 pkgs/by-name/lc/lcalc/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix
index f81ea501270f..22f326219a47 100644
--- a/pkgs/by-name/lc/lcalc/package.nix
+++ b/pkgs/by-name/lc/lcalc/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc=";
   };
 
+  # workaround for vendored GCC 3.5 <complex>
+  # https://gitlab.com/sagemath/lcalc/-/issues/16
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-D_GLIBCXX_COMPLEX"
+    "-D_LIBCPP_COMPLEX"
+    "-D_LIBCPP___FWD_COMPLEX_H"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     gengetopt

From d1c6a9c6af4ae4aa299846a7070a5d25f044434a Mon Sep 17 00:00:00 2001
From: pcboy <david.hagege@gmail.com>
Date: Thu, 2 Jan 2025 21:22:40 +0900
Subject: [PATCH 1139/1504] ruby-packages.prism: 0.24.0 -> 1.3.0 (#369508)

---
 pkgs/top-level/ruby-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 8e8904bd9a20..13ad49b50b2e 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -2753,10 +2753,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji";
+      sha256 = "sRYggpgxsct+bJtGyB/4puNsyz+IjxZEhetzUfOGJzo=";
       type = "gem";
     };
-    version = "0.24.0";
+    version = "1.3.0";
   };
   pry = {
     dependencies = ["coderay" "method_source"];

From e6d5e6ab5620226bbe1084bd15e4bd0c8d96672a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 12:26:07 +0000
Subject: [PATCH 1140/1504] vgmstream: 1951 -> 1980

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

diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index 3efe8c3eaec8..c810d8e416e3 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vgmstream";
-  version = "1951";
+  version = "1980";
 
   src = fetchFromGitHub {
     owner = "vgmstream";
     repo = "vgmstream";
     rev = "refs/tags/r${version}";
-    hash = "sha256-Wa0FAUHdJtG+u9y3ZOt8dxRIo78lekFPghiu67KJZ9s=";
+    hash = "sha256-TmaWC04XbtFfBYhmTO4ouh3NoByio1BCpDJGJy3r0NY=";
   };
 
   passthru.updateScript = nix-update-script {

From ee99d1de6df33a1661673ff4e1b91b1f8bd33f0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 12:28:27 +0000
Subject: [PATCH 1141/1504] satty: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index fb3b1295d6be..73aad9079f75 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -17,16 +17,16 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-SfZgvCtociQ0JbUTDVlXZPLHbyG0oxSSUqNXBHMDYNU=";
+    hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE=";
   };
 
-  cargoHash = "sha256-OP19bIwRCqZdQUAvc6pTf0oTL7Jy+OUuVdnddrbxrys=";
+  cargoHash = "sha256-ZMtOo7AgEza1OptBXAUZ590xf6znN6ZNrC9bhk4nR94=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 01ff4040a971787e1c2395418cc8e00137f7e717 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 13:28:42 +0100
Subject: [PATCH 1142/1504] ruff: 0.8.4 -> 0.8.5

Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.8.4...0.8.5

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.8.5
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 662b7409ec8e..fd0f0aab7057 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = version;
-    hash = "sha256-c5d2XaoEjCHWMdjTLD6CnwP8rpSXTUrmKSs0QWQ6UG0=";
+    hash = "sha256-Y6J7hW+VYePhKH+5YXfuGuVB0WjYjUg8mM3kQBUnv/U=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
+  cargoHash = "sha256-nEpVAdo/awRxwBvYd8EpTzXdWho3+yuItCp8km+s2uM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 41ea9f469098acee3c247bf3860610ee74adefa7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 11:40:37 +0100
Subject: [PATCH 1143/1504] python312Packages.pyedflib: init at 0.1.38

---
 .../python-modules/pyedflib/default.nix       | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyedflib/default.nix

diff --git a/pkgs/development/python-modules/pyedflib/default.nix b/pkgs/development/python-modules/pyedflib/default.nix
new file mode 100644
index 000000000000..a83fe89795b0
--- /dev/null
+++ b/pkgs/development/python-modules/pyedflib/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyedflib";
+  version = "0.1.38";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "holgern";
+    repo = "pyedflib";
+    tag = "v${version}";
+    hash = "sha256-sj2O5ISAy12u4GdtucLaRfOeSA6o6FJpZWTyiLq5B3U=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "pyedflib"
+  ];
+
+  # Otherwise, the module is imported from source and lacks the compiled artifacts
+  # By moving to the pyedflib directory, python imports the installed package instead of the module
+  # from the local files
+  preCheck = ''
+    cd pyedflib
+  '';
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python library to read/write EDF+/BDF+ files based on EDFlib";
+    homepage = "https://github.com/holgern/pyedflib";
+    changelog = "https://github.com/holgern/pyedflib/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7db18e65452..b5a48837f234 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11619,6 +11619,8 @@ self: super: with self; {
 
   pyecowitt = callPackage ../development/python-modules/pyecowitt { };
 
+  pyedflib = callPackage ../development/python-modules/pyedflib { };
+
   pyedimax = callPackage ../development/python-modules/pyedimax { };
 
   pyee = callPackage ../development/python-modules/pyee { };

From 6a22aaca7219ede672ab5361b30a3b472223d5fd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 14 Sep 2024 21:06:55 +0200
Subject: [PATCH 1144/1504] python312Packages.pyseries: init at 1.0.26

---
 .../python-modules/pyseries/default.nix       | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyseries/default.nix

diff --git a/pkgs/development/python-modules/pyseries/default.nix b/pkgs/development/python-modules/pyseries/default.nix
new file mode 100644
index 000000000000..76003eb105af
--- /dev/null
+++ b/pkgs/development/python-modules/pyseries/default.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  deepdish,
+  matplotlib,
+  numpy,
+  obspy,
+  pandas,
+  pyedflib,
+  scikit-learn,
+  scipy,
+  seaborn,
+  tabulate,
+}:
+
+buildPythonPackage rec {
+  pname = "pyseries";
+  version = "1.0.26";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Cq+DXt0/6Ncae8OO+kaPuTCxouh0cFPHP+T8tGVXxXo=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [
+    # sklearn is the old name of the scikit-learn package
+    "sklearn"
+  ];
+
+  dependencies = [
+    deepdish
+    matplotlib
+    numpy
+    obspy
+    pandas
+    pyedflib
+    scikit-learn
+    scipy
+    seaborn
+    tabulate
+  ];
+
+  pythonImportsCheck = [ "pyseries" ];
+
+  # no tests in the pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "Package for statistical analysis of time-series data";
+    homepage = "https://pypi.org/project/pyseries/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5a48837f234..151fcf870f82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10649,6 +10649,8 @@ self: super: with self; {
 
   pysequoia = callPackage ../development/python-modules/pysequoia { };
 
+  pyseries = callPackage ../development/python-modules/pyseries { };
+
   pyschemes = callPackage ../development/python-modules/pyschemes { };
 
   pyschlage = callPackage ../development/python-modules/pyschlage { };

From 822c3cb37f96083877a582f688bb2ae78383ad9b Mon Sep 17 00:00:00 2001
From: "Samuel Hierholzer (Adfinis AG)" <samuel.hierholzer@adfinis.com>
Date: Thu, 2 Jan 2025 13:46:11 +0100
Subject: [PATCH 1145/1504] deja-dup: Fix missing dep for gdrive

---
 pkgs/by-name/de/deja-dup/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index b45c605a9d92..0c7d6883db31 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -11,6 +11,7 @@
   itstool,
   desktop-file-utils,
   glib,
+  glib-networking,
   gtk4,
   coreutils,
   libsoup_3,
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libsoup_3
     glib
+    glib-networking
     gtk4
     libsecret
     libadwaita

From dcbd560920fad8463ccadfdb656dc28f69ba12d3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 13:47:54 +0100
Subject: [PATCH 1146/1504] prism: minor refactoring

---
 pkgs/by-name/pr/prism/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/prism/package.nix b/pkgs/by-name/pr/prism/package.nix
index 86227fdb840e..2d4b513466b9 100644
--- a/pkgs/by-name/pr/prism/package.nix
+++ b/pkgs/by-name/pr/prism/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildGoModule rec {
@@ -10,18 +11,21 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "muesli";
-    repo = pname;
-    rev = "v${version}";
+    repo = "prism";
+    tag = "v${version}";
     hash = "sha256-IRR7Gu+wGUUYyFfhc003QVlEaWCJPmi6XYVUN6Q6+GA=";
   };
 
   vendorHash = "sha256-uKtVifw4dxJdVvHxytL+9qjXHEdTyiz8U8n/95MObdY=";
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "RTMP stream recaster/splitter";
     homepage = "https://github.com/muesli/prism";
-    license = licenses.mit;
-    maintainers = with maintainers; [ paperdigits ];
+    changelog = "https://github.com/muesli/prism/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ paperdigits ];
     mainProgram = "prism";
   };
 }

From 8b2c5064d77fb5e64212ef14863c0b77abe0d9b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 12:52:40 +0000
Subject: [PATCH 1147/1504] ghostunnel: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index 2edd0471f85c..e5946c5c682f 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "ghostunnel";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "ghostunnel";
     repo = "ghostunnel";
     rev = "v${version}";
-    hash = "sha256-OWjYa8LOWClAWhZERJ24e6tIaOJZUuOzaYXN04rvv8s=";
+    hash = "sha256-WO7dyz+S8dBSFfNCTHHg1lGDlUGSBqa5pcR5GCiWsl8=";
   };
 
   vendorHash = null;

From e18aa0b180a55d09032382d4e76ba3b582cd7e59 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 2 Jan 2025 20:47:44 +0800
Subject: [PATCH 1148/1504] nerd-fonts: change pname, version and license
 schema

Fix issue #370117.
---
 pkgs/data/fonts/nerd-fonts/default.nix        | 22 +++++++++++--------
 .../fonts/nerd-fonts/manifests/release.json   |  3 +--
 pkgs/data/fonts/nerd-fonts/update.py          |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
index e7b2d449a554..6d10cb071946 100644
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -17,11 +17,7 @@ let
     if builtins.match "[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
 
   convertVersion =
-    version: date:
-    if builtins.match "[[:digit:]].*" version != null then
-      version
-    else
-      "0-unstable-" + builtins.head (lib.strings.splitString "T" date);
+    version: if builtins.match "[[:digit:]].*" version != null then "+" + version else "";
 
   convertLicense = import ./convert-license.nix lib;
 
@@ -36,8 +32,8 @@ let
       ...
     }:
     stdenvNoCC.mkDerivation {
-      pname = lib.strings.toLower caskName;
-      version = convertVersion version releaseInfo.published_at;
+      pname = "nerd-fonts-" + lib.strings.toLower caskName;
+      version = (lib.removePrefix "v" releaseInfo.tag_name) + convertVersion version;
 
       src =
         let
@@ -74,7 +70,15 @@ let
 
       meta = {
         description = "Nerd Fonts: " + description;
-        license = convertLicense licenseId;
+        license = lib.unique (
+          (with lib.licenses; [
+            # > Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files
+            ofl
+            # > Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others)
+            mit
+          ])
+          ++ lib.toList (convertLicense licenseId)
+        );
         homepage = "https://nerdfonts.com/";
         changelog = "https://github.com/ryanoasis/nerd-fonts/blob/${releaseInfo.tag_name}/changelog.md";
         platforms = lib.platforms.all;
@@ -86,7 +90,7 @@ let
     };
 
   nerdFonts = lib.trivial.pipe fontsInfo [
-    (map (font: lib.attrsets.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
+    (map (font: lib.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
     builtins.listToAttrs
   ];
 in
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/release.json b/pkgs/data/fonts/nerd-fonts/manifests/release.json
index 428f1edccec2..0073a9ea0d40 100644
--- a/pkgs/data/fonts/nerd-fonts/manifests/release.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/release.json
@@ -1,4 +1,3 @@
 {
-  "tag_name": "v3.3.0",
-  "published_at": "2024-11-18T12:43:12Z"
+  "tag_name": "v3.3.0"
 }
diff --git a/pkgs/data/fonts/nerd-fonts/update.py b/pkgs/data/fonts/nerd-fonts/update.py
index 026e293c0569..e070d1ceebe0 100755
--- a/pkgs/data/fonts/nerd-fonts/update.py
+++ b/pkgs/data/fonts/nerd-fonts/update.py
@@ -40,7 +40,7 @@ os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), "manifests"))
 
 release_info = slicedict(
     fetchjson(RELEASE_INFO_URL),
-    ["tag_name", "published_at"]
+    ["tag_name"]
 )
 
 tag_name = release_info["tag_name"]

From 06d52b09a2e425de9be8dae109d66524b559d34d Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 2 Jan 2025 20:49:53 +0800
Subject: [PATCH 1149/1504] nerd-fonts: fix attr name and version handling

---
 pkgs/data/fonts/nerd-fonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
index 6d10cb071946..6fa4633a0b45 100644
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -14,10 +14,10 @@ let
     let
       lowerName = lib.strings.toLower name;
     in
-    if builtins.match "[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
+    if builtins.match "^[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
 
   convertVersion =
-    version: if builtins.match "[[:digit:]].*" version != null then "+" + version else "";
+    version: if builtins.match "^[[:digit:]].*" version != null then "+" + version else "";
 
   convertLicense = import ./convert-license.nix lib;
 

From d37ad3d28fae19036467ae3ded7792478f8b2c1f Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 2 Jan 2025 21:11:06 +0800
Subject: [PATCH 1150/1504] nerd-fonts: add releaseVersion to passthru

---
 pkgs/data/fonts/nerd-fonts/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
index 6fa4633a0b45..27595a1fb4f6 100644
--- a/pkgs/data/fonts/nerd-fonts/default.nix
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -9,6 +9,8 @@ let
   fontsInfo = lib.trivial.importJSON ./manifests/fonts.json;
   checksums = lib.trivial.importJSON ./manifests/checksums.json;
 
+  releaseVersion = lib.removePrefix "v" releaseInfo.tag_name;
+
   convertAttrName =
     name:
     let
@@ -33,7 +35,7 @@ let
     }:
     stdenvNoCC.mkDerivation {
       pname = "nerd-fonts-" + lib.strings.toLower caskName;
-      version = (lib.removePrefix "v" releaseInfo.tag_name) + convertVersion version;
+      version = releaseVersion + convertVersion version;
 
       src =
         let
@@ -63,9 +65,12 @@ let
           runHook postInstall
         '';
 
-      passthru.updateScript = {
-        command = ./update.py;
-        supportedFeatures = [ "commit" ];
+      passthru = {
+        inherit releaseVersion;
+        updateScript = {
+          command = ./update.py;
+          supportedFeatures = [ "commit" ];
+        };
       };
 
       meta = {

From 403f488b80fd97cf60e8e5924fdcedb82f09a082 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:11:32 +0300
Subject: [PATCH 1151/1504] numbat: 1.14.0 -> 1.15.0

---
 pkgs/by-name/nu/numbat/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index bb0424d357e3..cd9248f39493 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,30 +1,24 @@
 {
   lib,
-  stdenv,
   testers,
   fetchFromGitHub,
   rustPlatform,
-  darwin,
   numbat,
   tzdata,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "numbat";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "numbat";
-    rev = "v${version}";
-    hash = "sha256-TmzM541S2W5Cy8zHEWKRE2Zj2bSgrM4vbsWw3zbi3LQ=";
+    tag = "v${version}";
+    hash = "sha256-5XsrOAvBrmCG6k7YRwGZZtBP/o1jVVtBBTrwIT5CDX8=";
   };
 
-  cargoHash = "sha256-exvJJsGIj6KhmMcwhPjXMELvisuUtl17BAO6XEJSJmI=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  cargoHash = "sha256-RMON7JThY6Ad1QHQFiNbTb2PUsfviR2t+55k1ZtlOd8=";
 
   env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
 

From d19c3249afd168fdc5d5787c615447b0bed590f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:13:06 +0000
Subject: [PATCH 1152/1504] go-callvis: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/go/go-callvis/package.nix b/pkgs/by-name/go/go-callvis/package.nix
index 47834b5e8d68..4a06f4d363a8 100644
--- a/pkgs/by-name/go/go-callvis/package.nix
+++ b/pkgs/by-name/go/go-callvis/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-callvis";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "ofabry";
     repo = "go-callvis";
     rev = "v${version}";
-    hash = "sha256-PIzmnqlK+uFtzZW4H0xpP5c+X30hFvOjQydvreJn4xM=";
+    hash = "sha256-gCQjxJH03QAg6MZx5NJUJR6tKP02ThIa5BGN6A/0ejM=";
   };
 
-  vendorHash = "sha256-AfbUxA5C5dH70+vqC+1RGaTt7S0FL9CBcxel0ifmHKs=";
+  vendorHash = "sha256-IS8lkDBy7Y/qAaDxmWRfrVQEF9OFo7VofqSNgNTEQQw=";
 
   ldflags = [
     "-s"

From 6d17306e6761abb7175f7a090559a0453787a53e Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:12:55 +0300
Subject: [PATCH 1153/1504] numbat: use version check hook, nix update script

---
 pkgs/by-name/nu/numbat/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index cd9248f39493..2b3c0ddea189 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  testers,
   fetchFromGitHub,
   rustPlatform,
-  numbat,
   tzdata,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,11 +34,12 @@ rustPlatform.buildRustPackage rec {
     export TZDIR=${tzdata}/share/zoneinfo
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = numbat;
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
 
   meta = with lib; {
+  passthru.updateScript = nix-update-script { };
     description = "High precision scientific calculator with full support for physical units";
     longDescription = ''
       A statically typed programming language for scientific computations

From 1514589aa6f001b1214afee2df9283fc06cdcd91 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Thu, 2 Jan 2025 16:14:39 +0300
Subject: [PATCH 1154/1504] numbat: refactor meta

---
 pkgs/by-name/nu/numbat/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index 2b3c0ddea189..da0e75d1a3a6 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -38,8 +38,9 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
   versionCheckProgramArg = [ "--version" ];
 
-  meta = with lib; {
   passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "High precision scientific calculator with full support for physical units";
     longDescription = ''
       A statically typed programming language for scientific computations
@@ -47,14 +48,14 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://numbat.dev";
     changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    mainProgram = "numbat";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       giomf
       atemu
     ];
+    mainProgram = "numbat";
   };
 }

From d224c09c3d0a7591a6c389c49b9bbef2c9e2893c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:15:02 +0000
Subject: [PATCH 1155/1504] cloudflare-dynamic-dns: 4.3.12 -> 4.3.13

---
 pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 80a819cc3009..21238f3f1c51 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "cloudflare-dynamic-dns";
-  version = "4.3.12";
+  version = "4.3.13";
 
   src = fetchFromGitHub {
     owner = "zebradil";
     repo = "cloudflare-dynamic-dns";
     rev = "refs/tags/${version}";
-    hash = "sha256-28fIxwQmM9Lmu5Ak31+5/zw/syYwBDnQDZ0CYfmMR+U=";
+    hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA=";
   };
 
-  vendorHash = "sha256-ie5/9qChgEWXKPqhbJzOalKPxTBr4UN9exxvfB8/HrQ=";
+  vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc=";
 
   subPackages = ".";
 

From acf374ec33bd6ca656323a52a1b66950d6e2886e Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 2 Jan 2025 13:24:26 +0000
Subject: [PATCH 1156/1504] atuin: unpin apple-sdk

---
 pkgs/by-name/at/atuin/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index d5835283ee76..266ae4b0d5b0 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   installShellFiles,
   rustPlatform,
-  apple-sdk_11,
   nixosTests,
 }:
 
@@ -39,10 +38,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd atuin \
       --bash <($out/bin/atuin gen-completions -s bash) \
@@ -67,11 +62,11 @@ rustPlatform.buildRustPackage rec {
     "--skip=build_aliases"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
     homepage = "https://github.com/atuinsh/atuin";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       sciencentistguy
       _0x4A6F

From eadbe6c73c7e18e4f52ad3f50b0939371045bd22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:26:02 +0000
Subject: [PATCH 1157/1504] iay: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix
index 22b184685830..01f1205f9dc2 100644
--- a/pkgs/tools/misc/iay/default.nix
+++ b/pkgs/tools/misc/iay/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "iay";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "aaqaishtyaq";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vk+1RbAmzRf2bbvbSpO+upVW4VrtYWM+5iiH73N+dsc=";
+    sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50=";
   };
 
-  cargoHash = "sha256-+PpmxVPyRx/xF7jQGy/07xqALmdNp2uL3HZVOeRicqY=";
+  cargoHash = "sha256-bcMi8967dsJ3fL28XiUXfHz6CPB/RKSKsRvwMJtxEUA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 87ba234f1bcb9fb80e87754dac9828196103aeba Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack@wilsdon.me>
Date: Thu, 2 Jan 2025 13:26:24 +0000
Subject: [PATCH 1158/1504] beets: fix building in 2025

---
 pkgs/tools/audio/beets/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 9bd644c3d115..74abd34e13b7 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -3,6 +3,7 @@
   callPackage,
   fetchFromGitHub,
   python3Packages,
+  fetchpatch,
 }:
 /*
   ** To customize the enabled beets plugins, use the pluginOverrides input to the
@@ -17,11 +18,22 @@
   **   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
   ** }; }
 */
+let
+  extraPatches = [
+    # Bash completion fix for Nix
+    ./patches/bash-completion-always-print.patch
+    # Remove after next release.
+    (fetchpatch {
+      url = "https://github.com/beetbox/beets/commit/bcc79a5b09225050ce7c88f63dfa56f49f8782a8.patch?full_index=1";
+      hash = "sha256-Y2Q5Co3UlDGKuzfxUvdUY3rSMNpsBoDW03ZWZOfzp3Y=";
+    })
+  ];
+in
 lib.makeExtensible (self: {
   beets = self.beets-stable;
 
   beets-stable = callPackage ./common.nix rec {
-    inherit python3Packages;
+    inherit python3Packages extraPatches;
     version = "2.2.0";
     src = fetchFromGitHub {
       owner = "beetbox";
@@ -29,16 +41,12 @@ lib.makeExtensible (self: {
       rev = "v${version}";
       hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
     };
-    extraPatches = [
-      # Bash completion fix for Nix
-      ./patches/bash-completion-always-print.patch
-    ];
   };
 
   beets-minimal = self.beets.override { disableAllPlugins = true; };
 
   beets-unstable = callPackage ./common.nix {
-    inherit python3Packages;
+    inherit python3Packages extraPatches;
     version = "2.2.0-unstable-2024-12-02";
     src = fetchFromGitHub {
       owner = "beetbox";
@@ -46,10 +54,6 @@ lib.makeExtensible (self: {
       rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
       hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
     };
-    extraPatches = [
-      # Bash completion fix for Nix
-      ./patches/bash-completion-always-print.patch
-    ];
   };
 
   alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };

From 35d4823c41ad0590a17defdafd250734a48f3c35 Mon Sep 17 00:00:00 2001
From: Dlurak <84224239+Dlurak@users.noreply.github.com>
Date: Fri, 27 Dec 2024 18:40:08 +0100
Subject: [PATCH 1159/1504] moxide: init at 0.1.0

---
 pkgs/by-name/mo/moxide/package.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pkgs/by-name/mo/moxide/package.nix

diff --git a/pkgs/by-name/mo/moxide/package.nix b/pkgs/by-name/mo/moxide/package.nix
new file mode 100644
index 000000000000..2d2ac506f0fa
--- /dev/null
+++ b/pkgs/by-name/mo/moxide/package.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "moxide";
+  version = "0.1.0";
+
+  cargoHash = "sha256-MqJ3lxnzvvmNXEMgx0su8vRDXAZbNtPuuphNzjeMN+w=";
+  src = fetchFromGitHub {
+    owner = "dlurak";
+    repo = "moxide";
+    tag = "v${version}";
+    hash = "sha256-XYEcMaHqu84aKIcV0pQZXl4sIeH9BkRGA2gcwZveXCU=";
+  };
+
+  meta = {
+    description = "Tmux session manager with a modular configuration";
+    mainProgram = "moxide";
+    homepage = "https://github.com/dlurak/moxide";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dlurak ];
+  };
+}

From ef8fab1b2c8cc6220c368e47bb28ca373efcc59f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 14:32:23 +0100
Subject: [PATCH 1160/1504] zfs-replicate: move to by-name

---
 .../zf/zfs-replicate/package.nix}                | 16 +++++-----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 5 insertions(+), 13 deletions(-)
 rename pkgs/{tools/backup/zfs-replicate/default.nix => by-name/zf/zfs-replicate/package.nix} (72%)

diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/by-name/zf/zfs-replicate/package.nix
similarity index 72%
rename from pkgs/tools/backup/zfs-replicate/default.nix
rename to pkgs/by-name/zf/zfs-replicate/package.nix
index 37781400c15b..9accd9234462 100644
--- a/pkgs/tools/backup/zfs-replicate/default.nix
+++ b/pkgs/by-name/zf/zfs-replicate/package.nix
@@ -1,16 +1,10 @@
 {
-  buildPythonApplication,
-  click,
+  python3Packages,
   fetchPypi,
-  hypothesis,
   lib,
-  poetry-core,
-  pytest-cov-stub,
-  pytestCheckHook,
-  stringcase,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "zfs_replicate";
   version = "4.0.0";
   pyproject = true;
@@ -20,17 +14,17 @@ buildPythonApplication rec {
     hash = "sha256-9WD2IW7GRxMF7hOa8HTI/+cuOjVaYMT4OnrYU/xFgME=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3Packages; [
     poetry-core
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     hypothesis
     pytest-cov-stub
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     click
     stringcase
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faf644bc957b..fef19d6a26ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18571,8 +18571,6 @@ with pkgs;
 
   wfuzz = with python3Packages; toPythonApplication wfuzz;
 
-  zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
-
   kodelife = callPackage ../applications/graphics/kodelife {
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };

From d70411a127cfd95aeb64f595de690384b229d05e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 14:37:16 +0100
Subject: [PATCH 1161/1504] zfs-replicate: clean derivation

---
 pkgs/by-name/zf/zfs-replicate/package.nix | 33 ++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/zf/zfs-replicate/package.nix b/pkgs/by-name/zf/zfs-replicate/package.nix
index 9accd9234462..b787a02aaf65 100644
--- a/pkgs/by-name/zf/zfs-replicate/package.nix
+++ b/pkgs/by-name/zf/zfs-replicate/package.nix
@@ -1,7 +1,7 @@
 {
-  python3Packages,
-  fetchPypi,
   lib,
+  python3Packages,
+  fetchFromGitHub,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -9,33 +9,36 @@ python3Packages.buildPythonApplication rec {
   version = "4.0.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9WD2IW7GRxMF7hOa8HTI/+cuOjVaYMT4OnrYU/xFgME=";
+  src = fetchFromGitHub {
+    owner = "alunduil";
+    repo = "zfs-replicate";
+    tag = "v${version}";
+    hash = "sha256-VajMSoFZ4SQXpuF1Lo6S9IhxvspCfUwpNw5zg16uA3M=";
   };
 
-  nativeBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
     poetry-core
   ];
 
+  dependencies = with python3Packages; [
+    click
+    stringcase
+  ];
+
   nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     hypothesis
     pytest-cov-stub
   ];
 
-  propagatedBuildInputs = with python3Packages; [
-    click
-    stringcase
-  ];
-
   doCheck = true;
 
-  meta = with lib; {
-    homepage = "https://github.com/alunduil/zfs-replicate";
+  meta = {
     description = "ZFS Snapshot Replication";
+    homepage = "https://github.com/alunduil/zfs-replicate";
+    changelog = "https://github.com/alunduil/zfs-replicate/blob/v${version}/CHANGELOG.md";
     mainProgram = "zfs-replicate";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ alunduil ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ alunduil ];
   };
 }

From 4fd0ac47d1905f930fda61f194e7b362d6429d6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 13:42:16 +0000
Subject: [PATCH 1162/1504] mill: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index 241f3b4169f1..7db92e52beeb 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "0.12.4";
+  version = "0.12.5";
 
   src = fetchurl {
     url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly";
-    hash = "sha256-WlykyNyXUitR6FHbhZXOeJKtMCrvoJK1gruh+G/hkb8=";
+    hash = "sha256-DHslQS/uzwbZVdATQY3pqQgM51W+26x2AckQnDPVoFc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b895f9201940f6b1ddd1dd23eb59d4e7521a9c4c Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Thu, 2 Jan 2025 06:41:50 -0700
Subject: [PATCH 1163/1504] outils: fix build

---
 pkgs/by-name/ou/outils/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ou/outils/package.nix b/pkgs/by-name/ou/outils/package.nix
index a133d68e30c8..416bfc9abac9 100644
--- a/pkgs/by-name/ou/outils/package.nix
+++ b/pkgs/by-name/ou/outils/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   lib,
 }:
 
@@ -15,6 +16,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/leahneukirchen/outils/commit/50877e1bf7c905044e0b50b227ecff48cfec394b.patch?full_index=1";
+      name = "outils-add-recallocarray-prototype.patch";
+      hash = "sha256-jOnCMPcHKMRR3J0Yh+ZTHAn7P85FO80yXVX0K2vtlVk=";
+    })
+  ];
+
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {

From b754b036e3f77973bbc2a482c7085692194c2962 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:17 +0200
Subject: [PATCH 1164/1504] titaniumenv: remove

---
 doc/languages-frameworks/index.md             |   1 -
 doc/languages-frameworks/titanium.section.md  | 110 -----------
 doc/redirects.json                            |   9 -
 .../mobile/titaniumenv/build-app.nix          | 186 ------------------
 .../mobile/titaniumenv/default.nix            |  20 --
 .../mobile/titaniumenv/titaniumsdk-8.2.nix    | 113 -----------
 .../mobile/titaniumenv/titaniumsdk-8.3.nix    | 102 ----------
 pkgs/top-level/all-packages.nix               |   2 -
 8 files changed, 543 deletions(-)
 delete mode 100644 doc/languages-frameworks/titanium.section.md
 delete mode 100644 pkgs/development/mobile/titaniumenv/build-app.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/default.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix

diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md
index a8a13ce5b9e2..fe5f0e65a52e 100644
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@@ -95,6 +95,5 @@ scheme.section.md
 swift.section.md
 tcl.section.md
 texlive.section.md
-titanium.section.md
 vim.section.md
 ```
diff --git a/doc/languages-frameworks/titanium.section.md b/doc/languages-frameworks/titanium.section.md
deleted file mode 100644
index 306ad8662767..000000000000
--- a/doc/languages-frameworks/titanium.section.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# Titanium {#titanium}
-
-The Nixpkgs repository contains facilities to deploy a variety of versions of
-the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
-mobile app development framework using JavaScript as an implementation language,
-and includes a function abstraction making it possible to build Titanium
-applications for Android and iOS devices from source code.
-
-Not all Titanium features supported -- currently, it can only be used to build
-Android and iOS apps.
-
-## Building a Titanium app {#building-a-titanium-app}
-
-We can build a Titanium app from source for Android or iOS and for debugging or
-release purposes by invoking the `titaniumenv.buildApp {}` function:
-
-```nix
-titaniumenv.buildApp {
-  name = "myapp";
-  src = ./myappsource;
-
-  preBuild = "";
-  target = "android"; # or 'iphone'
-  tiVersion = "7.1.0.GA";
-  release = true;
-
-  androidsdkArgs = {
-    platformVersions = [ "25" "26" ];
-  };
-  androidKeyStore = ./keystore;
-  androidKeyAlias = "myfirstapp";
-  androidKeyStorePassword = "secret";
-
-  xcodeBaseDir = "/Applications/Xcode.app";
-  xcodewrapperArgs = {
-    version = "9.3";
-  };
-  iosMobileProvisioningProfile = ./myprovisioning.profile;
-  iosCertificateName = "My Company";
-  iosCertificate = ./mycertificate.p12;
-  iosCertificatePassword = "secret";
-  iosVersion = "11.3";
-  iosBuildStore = false;
-
-  enableWirelessDistribution = true;
-  installURL = "/installipa.php";
-}
-```
-
-The `titaniumenv.buildApp {}` function takes the following parameters:
-
-* The `name` parameter refers to the name in the Nix store.
-* The `src` parameter refers to the source code location of the app that needs
-  to be built.
-* `preRebuild` contains optional build instructions that are carried out before
-  the build starts.
-* `target` indicates for which device the app must be built. Currently only
-  'android' and 'iphone' (for iOS) are supported.
-* `tiVersion` can be used to optionally override the requested Titanium version
-  in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`.
-* `release` should be set to true when building an app for submission to the
-  Google Playstore or Apple Appstore. Otherwise, it should be false.
-
-When the `target` has been set to `android`, we can configure the following
-parameters:
-
-* The `androidSdkArgs` parameter refers to an attribute set that propagates all
-  parameters to the `androidenv.composeAndroidPackages {}` function. This can
-  be used to install all relevant Android plugins that may be needed to perform
-  the Android build. If no parameters are given, it will deploy the platform
-  SDKs for API-levels 25 and 26 by default.
-
-When the `release` parameter has been set to true, you need to provide
-parameters to sign the app:
-
-* `androidKeyStore` is the path to the keystore file
-* `androidKeyAlias` is the key alias
-* `androidKeyStorePassword` refers to the password to open the keystore file.
-
-When the `target` has been set to `iphone`, we can configure the following
-parameters:
-
-* The `xcodeBaseDir` parameter refers to the location where Xcode has been
-  installed. When none value is given, the above value is the default.
-* The `xcodewrapperArgs` parameter passes arbitrary parameters to the
-  `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used
-  to adjust the default version of Xcode.
-
-When `release` has been set to true, you also need to provide the following
-parameters:
-
-* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed
-  for signing.
-* `iosCertificateName` refers to the company name in the P12 certificate.
-* `iosCertificate` refers to the path to the P12 file.
-* `iosCertificatePassword` contains the password to open the P12 file.
-* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest
-  version.
-* `iosBuildStore` should be set to `true` when building for the Apple Appstore
-  submission. For enterprise or ad-hoc builds it should be set to `false`.
-
-When `enableWirelessDistribution` has been enabled, you must also provide the
-path of the PHP script (`installURL`) (that is included with the iOS build
-environment) to enable wireless ad-hoc installations.
-
-## Emulating or simulating the app {#emulating-or-simulating-the-app}
-
-It is also possible to simulate the correspond iOS simulator build by using
-`xcodeenv.simulateApp {}` and emulate an Android APK by using
-`androidenv.emulateApp {}`.
diff --git a/doc/redirects.json b/doc/redirects.json
index e86ad9f7e9d7..4b05cb27d1c6 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3736,15 +3736,6 @@
   "sec-language-texlive-lualatex-font-cache": [
     "index.html#sec-language-texlive-lualatex-font-cache"
   ],
-  "titanium": [
-    "index.html#titanium"
-  ],
-  "building-a-titanium-app": [
-    "index.html#building-a-titanium-app"
-  ],
-  "emulating-or-simulating-the-app": [
-    "index.html#emulating-or-simulating-the-app"
-  ],
   "vim": [
     "index.html#vim"
   ],
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
deleted file mode 100644
index ef36dced9a31..000000000000
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ /dev/null
@@ -1,186 +0,0 @@
-{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
-{ name, src, preBuild ? "", target, tiVersion ? null
-, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
-, enableWirelessDistribution ? false, installURL ? null
-, xcodeBaseDir ? "/Applications/Xcode.app"
-, androidsdkArgs ? {}
-, xcodewrapperArgs ? {}
-, ...
-}@args:
-
-assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
-assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
-assert enableWirelessDistribution -> installURL != null;
-
-let
-  realAndroidsdkArgs = {
-    platformVersions = [ "28" ];
-  } // androidsdkArgs;
-
-  androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk;
-
-  xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
-
-  deleteKeychain = ''
-    if [ -f $HOME/lock-keychain ]
-    then
-        security default-keychain -s login.keychain
-        security delete-keychain $keychainName
-        rm -f $HOME/lock-keychain
-    fi
-  '';
-
-  extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
-in
-stdenv.mkDerivation ({
-  name = lib.replaceStrings [" "] [""] name;
-
-  buildInputs = [ nodejs titanium alloy python which file jdk ];
-
-  buildPhase = ''
-    ${preBuild}
-
-    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
-      alloy=$(dirname $(type -p alloy))/..
-      cp -rv $alloy/* alloy
-      chmod -R u+w alloy
-      export PATH=$(pwd)/alloy/bin:$PATH
-    ''}
-
-    export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
-
-    ${lib.optionalString (tiVersion != null) ''
-      # Replace titanium version by the provided one
-      sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
-    ''}
-
-    # Simulate a login
-    mkdir -p $HOME/.titanium
-    cat > $HOME/.titanium/auth_session.json <<EOF
-    { "loggedIn": true }
-    EOF
-
-    # Configure the paths to the Titanium SDK and modules
-    echo "{}" > $TMPDIR/config.json
-    titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-    titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
-
-    mkdir -p $out
-
-    ${if target == "android" then ''
-      titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdk}/libexec/android-sdk
-
-      export PATH=${androidsdk}/libexec/android-sdk/tools:$(echo ${androidsdk}/libexec/android-sdk/build-tools/android-*):$PATH
-      export GRADLE_USER_HOME=$TMPDIR/gradle
-
-      ${if release then ''
-        ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-          # Signing the app does not work with OpenJDK on macOS, use host SDK instead
-          export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-        ''}
-        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias "${androidKeyAlias}" --store-password "${androidKeyStorePassword}" --output-dir $out
-      '' else ''
-        titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out
-      ''}
-    ''
-    else if target == "iphone" then ''
-      # Be sure that the Xcode wrapper has priority over everything else.
-      # When using buildInputs this does not seem to be the case.
-      export PATH=${xcodewrapper}/bin:$PATH
-
-      # Configure the path to Xcode
-      titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
-
-      # Link the modules folder
-      if [ ! -e modules ]
-      then
-          ln -s ${titaniumsdk}/modules modules
-          createdModulesSymlink=1
-      fi
-
-      ${if release then ''
-        # Create a keychain with the component hash name (should always be unique)
-        export keychainName=$(basename $out)
-
-        security create-keychain -p "" $keychainName
-        security default-keychain -s $keychainName
-        security unlock-keychain -p "" $keychainName
-        security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-        security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName
-        provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
-
-        # Ensure that the requested provisioning profile can be found
-
-        if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-        then
-            mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-            cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-        fi
-
-        # Take precautions to prevent concurrent builds blocking the keychain
-        while [ -f $HOME/lock-keychain ]
-        do
-            echo "Keychain locked, waiting for a couple of seconds, or remove $HOME/lock-keychain to unblock..."
-            sleep 3
-        done
-
-        touch $HOME/lock-keychain
-
-        security default-keychain -s $keychainName
-
-        # Do the actual build
-        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
-
-        # Remove our generated keychain
-        ${deleteKeychain}
-      '' else ''
-        # Copy all sources to the output store directory.
-        # Why? Debug application include *.js files, which are symlinked into their
-        # sources. If they are not copied, we have dangling references to the
-        # temp folder.
-
-        cp -av * $out
-        cd $out
-
-        # Execute the build
-        titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out
-
-        # Remove the modules symlink
-        if [ "$createdModulesSymlink" = "1" ]
-        then
-            rm $out/modules
-        fi
-      ''}
-    '' else throw "Target: ${target} is not supported!"}
-  '';
-
-  installPhase = ''
-    ${if target == "android" then ''
-      ${lib.optionalString (!release) ''
-        cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out
-      ''}
-
-      mkdir -p $out/nix-support
-      echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
-    ''
-    else if target == "iphone" then
-      lib.optionalString release ''
-        mkdir -p $out/nix-support
-        echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
-
-        ${lib.optionalString enableWirelessDistribution ''
-          appname="$(basename $out/*.ipa .ipa)"
-          bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
-          version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
-
-          sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
-          echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
-        ''}
-      ''
-    else throw "Target: ${target} is not supported!"}
-  '';
-
-  failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
-} // extraArgs)
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
deleted file mode 100644
index 74865edab54c..000000000000
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, androidenv, xcodeenv, tiVersion ? "8.3.2.GA"}:
-
-rec {
-  titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix
-      else if tiVersion == "8.3.2.GA" then ./titaniumsdk-8.3.nix
-      else throw "Titanium version not supported: "+tiVersion;
-    in
-    import titaniumSdkFile {
-      inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
-    };
-
-  buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv lib python which file jdk nodejs titanium;
-    alloy = pkgs.titanium-alloy;
-    inherit (androidenv) composeAndroidPackages;
-    inherit (xcodeenv) composeXcodeWrapper;
-    inherit titaniumsdk;
-  };
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
deleted file mode 100644
index a0907881d168..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper }:
-
-let
-  # Gradle is a build system that bootstraps itself. This is what it actually
-  # downloads in the bootstrap phase.
-  gradleAllZip = fetchurl {
-    url = "http://services.gradle.org/distributions/gradle-4.1-all.zip";
-    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
-  };
-
-  # A Titanium-Android build requires proguard plugins. We create a fake
-  # repository so that Gradle does not attempt to download them in the builder.
-  # Since there are only 3 plugins required, this is still (sort of) manageable
-  # without a generator.
-  proguardVersion = "5.3.3";
-
-  proguardGradlePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
-    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
-  };
-  proguardGradleJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
-    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
-  };
-  proguardParentPOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
-    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
-  };
-  proguardBasePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
-    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
-  };
-  proguardBaseJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
-    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
-  };
-
-  # Put the downloaded plugins in a fake Maven repository
-  fakeMavenRepo = stdenv.mkDerivation {
-    name = "fake-maven-repo";
-    buildCommand = ''
-      mkdir -p $out
-      cd $out
-      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
-      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
-      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
-      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
-      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
-      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
-      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
-      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
-    '';
-  };
-in
-stdenv.mkDerivation {
-  pname = "mobilesdk";
-  version = "8.2.1.GA";
-
-  src =
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip";
-        sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip";
-        sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    (yes y | unzip $src) || true
-
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 8.2.1.GA
-    cd *
-
-    # Patch bundled gradle build infrastructure to make shebangs work
-    patchShebangs android/templates/gradle
-
-    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
-    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
-    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-
-    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
-    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
-
-    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
-      # Patch the strip frameworks script in the iPhone build template to not let
-      # it skip the strip phase. This is caused by an assumption on the file
-      # permissions in which Nix deviates from the standard.
-      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
-    ''}
-
-    # Patch some executables
-
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
-      ''
-      else lib.optionalString (stdenv.system == "x86_64-linux") ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
-      ''
-    }
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
deleted file mode 100644
index eadbad7e0f5f..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, makeWrapper }:
-
-let
-  # Gradle is a build system that bootstraps itself. This is what it actually
-  # downloads in the bootstrap phase.
-  gradleAllZip = fetchurl {
-    url = "http://services.gradle.org/distributions/gradle-4.1-all.zip";
-    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
-  };
-
-  # A Titanium-Android build requires proguard plugins. We create a fake
-  # repository so that Gradle does not attempt to download them in the builder.
-  # Since there are only 3 plugins required, this is still (sort of) manageable
-  # without a generator.
-  proguardVersion = "5.3.3";
-
-  proguardGradlePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
-    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
-  };
-  proguardGradleJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
-    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
-  };
-  proguardParentPOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
-    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
-  };
-  proguardBasePOM = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
-    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
-  };
-  proguardBaseJAR = fetchurl {
-    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
-    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
-  };
-
-  # Put the downloaded plugins in a fake Maven repository
-  fakeMavenRepo = stdenv.mkDerivation {
-    name = "fake-maven-repo";
-    buildCommand = ''
-      mkdir -p $out
-      cd $out
-      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
-      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
-      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
-      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
-      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
-      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
-      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
-      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
-    '';
-  };
-in
-stdenv.mkDerivation {
-  pname = "mobilesdk";
-  version = "8.3.2.GA";
-
-  src =
-    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip";
-        sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9";
-      }
-    else if stdenv.system == "x86_64-darwin" then
-      fetchurl {
-        url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip";
-        sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw";
-      }
-    else throw "Platform: ${stdenv.system} not supported!";
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv * 8.3.2.GA
-    cd *
-
-    # Patch bundled gradle build infrastructure to make shebangs work
-    patchShebangs android/templates/gradle
-
-    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
-    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
-    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
-
-    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
-    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
-
-    ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
-      # Patch the strip frameworks script in the iPhone build template to not let
-      # it skip the strip phase. This is caused by an assumption on the file
-      # permissions in which Nix deviates from the standard.
-      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
-    ''}
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faf644bc957b..490abbd856f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1911,8 +1911,6 @@ with pkgs;
 
   gomobile = callPackage ../development/mobile/gomobile { };
 
-  titaniumenv = callPackage ../development/mobile/titaniumenv { };
-
   adb-sync = callPackage ../development/mobile/adb-sync {
     inherit (androidenv.androidPkgs) platform-tools;
   };

From d2f4842daa9556df09d908423058817a8154254e Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 1165/1504] titanium-alloy: remove

---
 pkgs/by-name/ti/titanium-alloy/package.nix | 29 ----------------------
 pkgs/development/node-packages/aliases.nix |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/by-name/ti/titanium-alloy/package.nix

diff --git a/pkgs/by-name/ti/titanium-alloy/package.nix b/pkgs/by-name/ti/titanium-alloy/package.nix
deleted file mode 100644
index e0e534db5d53..000000000000
--- a/pkgs/by-name/ti/titanium-alloy/package.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  pname = "alloy";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "tidev";
-    repo = "alloy";
-    rev = version;
-    hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A=";
-  };
-
-  npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md";
-    description = "MVC framework for the Appcelerator Titanium SDK";
-    homepage = "https://github.com/tidev/alloy";
-    license = lib.licenses.asl20;
-    mainProgram = "alloy";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 6a1059896ef7..270385e8c405 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -53,7 +53,6 @@ mapAliases {
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
   "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
-  alloy = pkgs.titanium-alloy; # added 2023-08-17
   antennas = pkgs.antennas; # added 2023-07-30
   inherit (pkgs) autoprefixer; # added 2024-06-25
   inherit (pkgs) asar; # added 2023-08-26

From 91a004b943e9b88a8f24adb4b8917d05734827e7 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 1166/1504] titanium: remove

---
 pkgs/by-name/ti/titanium/package.nix       | 29 ----------------------
 pkgs/development/node-packages/aliases.nix |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/by-name/ti/titanium/package.nix

diff --git a/pkgs/by-name/ti/titanium/package.nix b/pkgs/by-name/ti/titanium/package.nix
deleted file mode 100644
index 28a92af107d1..000000000000
--- a/pkgs/by-name/ti/titanium/package.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-}:
-
-buildNpmPackage rec {
-  pname = "titanium";
-  version = "6.1.1";
-
-  src = fetchFromGitHub {
-    owner = "tidev";
-    repo = "titanium-cli";
-    rev = "v${version}";
-    hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI=";
-  };
-
-  npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM=";
-
-  dontNpmBuild = true;
-
-  meta = {
-    changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md";
-    description = "Command Line Tool for creating and building Titanium Mobile applications and modules";
-    homepage = "https://github.com/tidev/titanium-cli";
-    license = lib.licenses.asl20;
-    mainProgram = "titanium";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 270385e8c405..d187b9ee4378 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -201,7 +201,6 @@ mapAliases {
   inherit (pkgs) textlint-rule-write-good; # Added 2024-05-16
   thelounge = pkgs.thelounge; # Added 2023-05-22
   three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
-  inherit (pkgs) titanium; # added 2023-08-17
   triton = pkgs.triton; # Added 2023-05-06
   typescript = pkgs.typescript; # Added 2023-06-21
   inherit (pkgs) typescript-language-server; # added 2024-02-27

From 9516e693c6bb03a922992d037ef9dd35aaa03567 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 1167/1504] doc/rl-2505: mention removal of titaniumenv,
 titanium, and titanium-alloy

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

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 9b39fb1869ea..473b3ecc365c 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -221,6 +221,8 @@
 
 - `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
 
+- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
+
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
   details.

From 10a75ab5b2c237e3c30556d65de3ee49ff4b6830 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:19:18 +0200
Subject: [PATCH 1168/1504] doc: titanium tombstone

---
 doc/manual.md.in                              |  4 ++++
 doc/redirects.json                            | 21 +++++++++++++++++++
 doc/release-notes/release-notes.md            |  7 +++++++
 doc/release-notes/rl-2505.section.md          | 19 +++++++++++++++++
 nixos/doc/manual/default.nix                  |  2 ++
 nixos/doc/manual/redirects.json               | 20 ++++++++++++++----
 .../manual/release-notes/rl-2505.section.md   | 12 +++--------
 7 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 doc/release-notes/release-notes.md
 create mode 100644 doc/release-notes/rl-2505.section.md

diff --git a/doc/manual.md.in b/doc/manual.md.in
index e5f58a23a399..07e587190d84 100644
--- a/doc/manual.md.in
+++ b/doc/manual.md.in
@@ -14,3 +14,7 @@ development.md
 contributing.md
 interoperability.md
 ```
+
+```{=include=} appendix html:into-file=//release-notes.html
+release-notes/release-notes.md
+```
diff --git a/doc/redirects.json b/doc/redirects.json
index 4b05cb27d1c6..330c25effc14 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -1,4 +1,7 @@
 {
+  "chap-release-notes": [
+    "release-notes.html#chap-release-notes"
+  ],
   "nixpkgs-manual": [
     "index.html#nixpkgs-manual"
   ],
@@ -50,6 +53,24 @@
   "chap-overlays": [
     "index.html#chap-overlays"
   ],
+  "sec-nixpkgs-release-25.05": [
+    "release-notes.html#sec-nixpkgs-release-25.05"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
+    "index.html#titanium",
+    "index.html#building-a-titanium-app",
+    "index.html#emulating-or-simulating-the-app"
+  ],
+  "sec-nixpkgs-release-25.05-lib": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib"
+  ],
+  "sec-nixpkgs-release-25.05-lib-breaking": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking"
+  ],
   "sec-overlays-install": [
     "index.html#sec-overlays-install"
   ],
diff --git a/doc/release-notes/release-notes.md b/doc/release-notes/release-notes.md
new file mode 100644
index 000000000000..454ea7c50a9e
--- /dev/null
+++ b/doc/release-notes/release-notes.md
@@ -0,0 +1,7 @@
+# Release Notes {#chap-release-notes}
+
+This section lists the release notes for each stable version of Nixpkgs and current unstable revision.
+
+```{=include=} sections
+rl-2505.section.md
+```
diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
new file mode 100644
index 000000000000..9fa72cc1f484
--- /dev/null
+++ b/doc/release-notes/rl-2505.section.md
@@ -0,0 +1,19 @@
+# Nixpkgs 25.05 (2025.05/??) {#sec-nixpkgs-release-25.05}
+
+## Backward Incompatibilities {#sec-nixpkgs-release-25.05-incompatibilities}
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
+### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed}
+
+- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
+
+## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
+
+### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking}
+
+- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
+  - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
+  - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 177a05b37532..5b171420b24d 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -79,6 +79,8 @@ let
   prepareManualFromMD = ''
     cp -r --no-preserve=all $inputs/* .
 
+    cp -r ${../../../doc/release-notes} ./release-notes-nixpkgs
+
     substituteInPlace ./manual.md \
       --replace-fail '@NIXOS_VERSION@' "${version}"
     substituteInPlace ./configuration/configuration.md \
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 428dbdcc54c2..106148d1dd04 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1886,11 +1886,23 @@
   "sec-release-25.05-notable-changes": [
     "release-notes.html#sec-release-25.05-notable-changes"
   ],
-  "sec-release-25.05-lib": [
-    "release-notes.html#sec-release-25.05-lib"
+  "sec-nixpkgs-release-25.05": [
+    "release-notes.html#sec-nixpkgs-release-25.05"
   ],
-  "sec-release-25.05-lib-breaking": [
-    "release-notes.html#sec-release-25.05-lib-breaking"
+  "sec-nixpkgs-release-25.05-incompatibilities": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities"
+  ],
+  "sec-nixpkgs-release-25.05-incompatibilities-titanium-removed": [
+    "release-notes.html#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed",
+    "index.html#titanium",
+    "index.html#building-a-titanium-app",
+    "index.html#emulating-or-simulating-the-app"
+  ],
+  "sec-nixpkgs-release-25.05-lib": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib"
+  ],
+  "sec-nixpkgs-release-25.05-lib-breaking": [
+    "release-notes.html#sec-nixpkgs-release-25.05-lib-breaking"
   ],
   "sec-release-24.11": [
     "release-notes.html#sec-release-24.11"
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 473b3ecc365c..2d108ac7ce00 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -221,8 +221,6 @@
 
 - `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
 
-- `titaniumenv`, `titanium`, and `titanium-alloy` have been removed due to lack of maintenance in Nixpkgs.
-
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
   details.
@@ -342,10 +340,6 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-## Nixpkgs Library {#sec-release-25.05-lib}
-
-### Breaking changes {#sec-release-25.05-lib-breaking}
-
-- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
-  - [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
-  - [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
+```{=include=} sections
+../release-notes-nixpkgs/rl-2505.section.md
+```

From 6ff39470d983d4861165dc3734c13f6aa9243fbe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:20 +0300
Subject: [PATCH 1169/1504] linux_testing: 6.13-rc4 -> 6.13-rc5

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 3b5c5feea1b5..5dd1a3fba12b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.13-rc4",
-        "hash": "sha256:0ca986ycx3k69j1km1j4fyjh0d1wvxnyx1fzlb52g930r1jymp39"
+        "version": "6.13-rc5",
+        "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr"
     },
     "6.1": {
         "version": "6.1.122",

From 1ba73a81a6c20bf998ae685561e4534f03b85743 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:25 +0300
Subject: [PATCH 1170/1504] linux_6_12: 6.12.7 -> 6.12.8

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 5dd1a3fba12b..e8ed63ee0dd5 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -28,7 +28,7 @@
         "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
     },
     "6.12": {
-        "version": "6.12.7",
-        "hash": "sha256:1kx0kmc8xlx5kpvfplawk05wjqpdnsj2hcmv8flnc2qfi9jgp1gp"
+        "version": "6.12.8",
+        "hash": "sha256:0y992b484rkkaqdkz5mw2is1l0izxhm3cl7fi5f72jx0bh3dm492"
     }
 }

From 71435ccf3eeeeb2e1a4dd0f8149df574d28d18c5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:31 +0300
Subject: [PATCH 1171/1504] linux_6_6: 6.6.68 -> 6.6.69

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index e8ed63ee0dd5..d0f555c52973 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7"
     },
     "6.6": {
-        "version": "6.6.68",
-        "hash": "sha256:1qj0b2n4ck9qrgpqcgmhkl2jc4rh4000rqqs2vnwwlpkwc8g8gr8"
+        "version": "6.6.69",
+        "hash": "sha256:0d2gilgh8myavzfdjnx7az4dbwvkk7irvsz6rla9bnbmgdb0aqww"
     },
     "6.11": {
         "version": "6.11.11",

From d798810f57742f2dfafaa3966cc7abfb9d6036b9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 2 Jan 2025 17:08:38 +0300
Subject: [PATCH 1172/1504] linux_6_1: 6.1.122 -> 6.1.123

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index d0f555c52973..11bec459af64 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr"
     },
     "6.1": {
-        "version": "6.1.122",
-        "hash": "sha256:0l3frvlzpl23f9j1vjm2y29d1ppv0ynq40h695i7w2qhh2rw14p8"
+        "version": "6.1.123",
+        "hash": "sha256:1g5k9q113nyid3a347abb36v2xfv5vf74ic88af7kf04kzbsr9rk"
     },
     "5.15": {
         "version": "5.15.175",

From 04c5813ba200257d968d719982d899de22f531af Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 15:10:22 +0100
Subject: [PATCH 1173/1504] tinymist: 0.12.14 -> 0.12.16

Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.12.14...v0.12.16

Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.12.16/CHANGELOG.md
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 79001403f3fa..a8aa75ababa3 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-nMuK51ktoJQTgJEfFivOjDmnMUx/lWNsIPZ7ZmreqYo=";
+    hash = "sha256-8QwUZfR0eTjXE6IgjpYx9TcWf8WrrVWA0VfTUX+WVCc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 1bcb45a8c615..88d407b868b1 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.12.14";
+  version = "0.12.16";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${version}";
-    hash = "sha256-F6nJH3JU8NxyxFevYMaQnPDTIcjcqM779CP4M1zp1rU=";
+    hash = "sha256-DwekAk1LkpK/48yzKc6Ry5GZ3oR/uH7+xpvT0LlSF00=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+Ce9qIETGFZXG4RX5GP8tpmH4fkpbPkDS1FX64NQ6/4=";
+  cargoHash = "sha256-LlZD/amKO/4dOo6xB5kz51igTDrkHbVQDquRpkMujVU=";
 
   nativeBuildInputs = [
     installShellFiles

From c86bb0aba1bbc9e7bb1e4d4baa3316b5fbc7738c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 14:40:13 +0100
Subject: [PATCH 1174/1504] zfs-replicate: patch path to lz4 binary

---
 pkgs/by-name/zf/zfs-replicate/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/zf/zfs-replicate/package.nix b/pkgs/by-name/zf/zfs-replicate/package.nix
index b787a02aaf65..afa628d8486d 100644
--- a/pkgs/by-name/zf/zfs-replicate/package.nix
+++ b/pkgs/by-name/zf/zfs-replicate/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  lz4,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -16,6 +17,15 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-VajMSoFZ4SQXpuF1Lo6S9IhxvspCfUwpNw5zg16uA3M=";
   };
 
+  # For compression to work, both local and remote systems must have lz4 installed.
+  # This hard codes the path to the lz4 when running it on the local system.
+  postPatch = ''
+    substituteInPlace zfs/replicate/compress/command.py \
+      --replace-fail \
+        '("/usr/bin/env - lz4 | ", "/usr/bin/env - lz4 -d | ")' \
+        '("${lib.getExe lz4}  | ", "/usr/bin/env - lz4 -d | ")'
+  '';
+
   build-system = with python3Packages; [
     poetry-core
   ];

From 2726c8872e6a9b71d2c2c1ca6e54d160c7439414 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 15:07:32 +0100
Subject: [PATCH 1175/1504] zfs-replicate: disable failing tests on darwin

---
 pkgs/by-name/zf/zfs-replicate/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/zf/zfs-replicate/package.nix b/pkgs/by-name/zf/zfs-replicate/package.nix
index afa628d8486d..ab110b740786 100644
--- a/pkgs/by-name/zf/zfs-replicate/package.nix
+++ b/pkgs/by-name/zf/zfs-replicate/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   python3Packages,
   fetchFromGitHub,
   lz4,
@@ -43,6 +44,11 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = true;
 
+  disabledTestPaths = lib.optionals stdenv.isDarwin [
+    # AssertionError: Expected SystemExit or FileNotFoundError
+    "zfs_test/replicate_test/cli_test/main_test.py"
+  ];
+
   meta = {
     description = "ZFS Snapshot Replication";
     homepage = "https://github.com/alunduil/zfs-replicate";

From f59c7b1923ebbcdecd734e83601648c9e078c29f Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Thu, 2 Jan 2025 14:49:42 +0000
Subject: [PATCH 1176/1504] vscode-extensions.egirlcatnip.adwaita-github-theme:
 init at 1.0.5

---
 .../editors/vscode/extensions/default.nix        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b49e0786f8e7..09df2534f2c8 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1672,6 +1672,22 @@ let
         };
       };
 
+      egirlcatnip.adwaita-github-theme = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "adwaita-github-theme";
+          publisher = "egirlcatnip";
+          version = "1.0.5";
+          hash = "sha256-OvonS6137ICRUV5Tx4gD3we8nrza6ZgnRSs2SxFiCjU=";
+        };
+        meta = {
+          description = "Adwaita VS Code theme with Github syntax highlighting";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=egirlcatnip.adwaita-github-theme";
+          homepage = "https://github.com/egirlcatnip/adwaita-github-theme";
+          license = lib.licenses.gpl3;
+          maintainers = with lib.maintainers; [ thtrf ];
+        };
+      };
+
       elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "elixir-ls";

From fb8b7c30c9317ba2354449dbead6c246812bba47 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 15:32:12 +0100
Subject: [PATCH 1177/1504] irssi: fix cross build

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

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 1495b2daca70..4c4a1ccb04df 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
+    perl
     pkg-config
   ];
 
@@ -38,7 +39,6 @@ stdenv.mkDerivation rec {
     libotr
     ncurses
     openssl
-    perl
   ];
 
   configureFlags = [

From da7c2933c6e5849f38e0c9c06640eea273447dd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 14:52:30 +0000
Subject: [PATCH 1178/1504] movim: 0.28 -> 0.29

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

diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index bc4b138ecc4e..b20a79b6fa65 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -44,13 +44,13 @@ let
 in
 php.buildComposerProject (finalAttrs: {
   pname = "movim";
-  version = "0.28";
+  version = "0.29";
 
   src = fetchFromGitHub {
     owner = "movim";
     repo = "movim";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-mjBeBu1seH5XMls+e4ON13ayVeugKogbNTzbjp1pUjE=";
+    hash = "sha256-hAOT3n0i9t3uWMjqWJlOs4Vakq3y4+GhiFZ4n3jVqtw=";
   };
 
   php = php.buildEnv (
@@ -98,7 +98,7 @@ php.buildComposerProject (finalAttrs: {
   # pinned commonmark
   composerStrictValidation = false;
 
-  vendorHash = "sha256-ZfMUpkIRCAsiQf6PEVPrMpljZWjP9JXf+nEFA/LunsQ=";
+  vendorHash = "sha256-uma3evj/81qz/+1+poIl0FJqWe1e2Ay0Jm446CKOGP0=";
 
   postPatch = ''
     # Our modules are already wrapped, removes missing *.so warnings;

From 0ce76d75325dacc66080e6904c01557032ef4ea1 Mon Sep 17 00:00:00 2001
From: Barry Moore <chiroptical@gmail.com>
Date: Thu, 2 Jan 2025 09:53:05 -0500
Subject: [PATCH 1179/1504] ex_doc: disable nix-update-script

---
 pkgs/development/beam-modules/ex_doc/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index b46d7fee6ef4..fbc1f8a0da92 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -1,4 +1,4 @@
-{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }:
+{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }:
 # Based on ../elixir-ls/default.nix
 
 let
@@ -51,5 +51,4 @@ mixRelease {
     mainProgram = "ex_doc";
     maintainers = with maintainers; [chiroptical];
   };
-  passthru.updateScript = nix-update-script { };
 }

From a6503eae6e473c931c6b6f1d72b73da0ea621816 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 16:07:37 +0100
Subject: [PATCH 1180/1504] python312Packages.archinfo: 9.2.134 -> 9.2.135

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 9eb5be283c87..b6bd3fbd9592 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.134";
+  version = "9.2.135";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3NfiK75RyEFz2Pe+NPLMrbyvwgZxD7fKCGg4o8SpO40=";
+    hash = "sha256-eMRDuDsjUSWzlhHOG96MB1UxhAsdMpO4k1A1eFsiNEc=";
   };
 
   build-system = [ setuptools ];

From ee18541bc3f0e38bf9f0f720755c1b2174accb2c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 16:07:47 +0100
Subject: [PATCH 1181/1504] python312Packages.ailment: 9.2.134 -> 9.2.135

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index c6a3381ca2fb..3f4be1f73200 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.134";
+  version = "9.2.135";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ev3/5TNj7bK0T9ouWVdA6PXqEiC+KFwtM35QD9BIyJs=";
+    hash = "sha256-uc8iNWrAESDXVpM0TuXYbvQm95CXWLOooUFQ49O3YTg=";
   };
 
   build-system = [ setuptools ];

From 417db03082c796d2330d0ca164688d1e4d9b512d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 16:09:12 +0100
Subject: [PATCH 1182/1504] python312Packages.pyvex: 9.2.134 -> 9.2.135

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 1a1fc99ac3d4..33dbca061d3d 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.134";
+  version = "9.2.135";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uskSojAEE+9pQD4531+L5OkgRIAtxwvE4/7AZnlkiBI=";
+    hash = "sha256-VZoi+0Hwm0QSwy86MMdlR16kLIPa1ZpoRcYn61IpeWc=";
   };
 
   build-system = [ setuptools ];

From 579af0bb31d34de72a31a0ae3e3647e196b2aae4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 16:09:37 +0100
Subject: [PATCH 1183/1504] python312Packages.claripy: 9.2.134 -> 9.2.135

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

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 6b4c1ea360b9..01a5f6af92d5 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.134";
+  version = "9.2.135";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jz7eF01dYOsa/f6ssAwBK66LGxBXozG075yEllq8j9Y=";
+    hash = "sha256-k3jlHGkgtT/+Eo9rwUSgRCfs9PPHX+vS4LR0jH6cVdE=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From 43a7804c195504dba67a4c026c2eccee05329a17 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 16:13:02 +0100
Subject: [PATCH 1184/1504] python312Packages.cle: 9.2.134 -> 9.2.135

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 77ad1bd24587..c3a42ba67925 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,14 +16,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.134";
+  version = "9.2.135";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2C4vA8lRLLcfwqGoQ3dqV1kGGtlKx2sgSOKy1QqsEVY=";
+    hash = "sha256-HgTy5yxZ+z7NTog5NGM+cLl0stVdKMkh5KOr5laDtAg=";
   };
 in
 buildPythonPackage rec {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0txid9qiNMEBemSphwok5Gkk3NJvzWSIlvrqFnre5TA=";
+    hash = "sha256-v6FjxdyELtoMIDqiRco1s9bebfikW5YK/+J6BNNrGGA=";
   };
 
   build-system = [ setuptools ];

From 25e041f5e5fa7bcf78a58b3ad66234b642aa3429 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 15:13:10 +0000
Subject: [PATCH 1185/1504] rustmission: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix
index 6a883d129281..8790b4f8a499 100644
--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustmission";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "intuis";
     repo = "rustmission";
     rev = "v${version}";
-    hash = "sha256-V9sy3rkoI3mKpeZjXT4D3Bs4NVETJ8h43iwOoDx1MKU=";
+    hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk=";
   };
 
-  cargoHash = "sha256-KYg+SVAvlQn77kI1gyzXlzhKgPECYPZKICnmkcEnuh8=";
+  cargoHash = "sha256-yelDzx/5SxZ+DT9Rvx3tuSp/yDLfVOYmexa9ZqeUT88=";
 
   nativeBuildInputs = [ pkg-config ];
 

From a2f3aabf57430baa980a4e02466ab8f0374a1159 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 16:15:59 +0100
Subject: [PATCH 1186/1504] python311Packages.angr: 9.2.134 -> 9.2.135

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

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index d24131f42230..01165f93e3ea 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.134";
+  version = "9.2.135";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wBneJJ+kR99hNHf0Ki1U6CS9pru60wiwIGV26JC8lWU=";
+    hash = "sha256-jxCcftc9sVuEp7VoUTNiGGhLR9HBYmjQqHBn/UXIlNY=";
   };
 
   postPatch = ''

From 81485e446839a9687526f5bc7a4d489715b29b4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 15:18:30 +0000
Subject: [PATCH 1187/1504] templ: 0.2.793 -> 0.3.819

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

diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index eb5265268b1a..c537e95b3988 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "templ";
-  version = "0.2.793";
+  version = "0.3.819";
 
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
     rev = "v${version}";
-    hash = "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw=";
+    hash = "sha256-kTP/DLnou3KETZRtvHdeiMmRW6xldgZBAn9O9p9s/MA=";
   };
 
-  vendorHash = "sha256-ZWY19f11+UI18jeHYIEZjdb9Ii74mD6w+dYRLPkdfBU=";
+  vendorHash = "sha256-ipLn52MsgX7KQOJixYcwMR9TCeHz55kQQ7fgkIgnu7w=";
 
   subPackages = [ "cmd/templ" ];
 

From 0725951bfc4bbc2efff3a537837ca13159b4aec9 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Thu, 2 Jan 2025 19:21:44 +0400
Subject: [PATCH 1188/1504] nixos/libvirtd: link Microsoft-templated OVMF files
 to shared folder (#346904)

Link MS OVMF files to shared folder as well
---
 nixos/modules/virtualisation/libvirtd.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 35f5c4070b5a..165876910749 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -13,7 +13,12 @@ let
   '';
   qemuConfigFile = pkgs.writeText "qemu.conf" ''
     ${optionalString cfg.qemu.ovmf.enable ''
-      nvram = [ "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" ]
+      nvram = [
+        "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd",
+        "/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd",
+        "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd",
+        "/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd"
+      ]
     ''}
     ${optionalString (!cfg.qemu.runAsRoot) ''
       user = "qemu-libvirtd"
@@ -451,10 +456,10 @@ in
           };
         in
           ''
-          ln -s --force ${ovmfpackage}/FV/AAVMF_CODE.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/OVMF_CODE.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/AAVMF_VARS.fd /run/${dirName}/nix-ovmf/
-          ln -s --force ${ovmfpackage}/FV/OVMF_VARS.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
+          ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
         '')}
 
         # Symlink hooks to /var/lib/libvirt

From 2c43f705d0e60dbd6cc807b928f48d4c5072cd9a Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 2 Jan 2025 16:08:30 +0100
Subject: [PATCH 1189/1504] mobilizon: fix internal version

---
 pkgs/servers/mobilizon/0001-fix-version.patch | 13 +++++++++++++
 pkgs/servers/mobilizon/default.nix            |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/servers/mobilizon/0001-fix-version.patch

diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch
new file mode 100644
index 000000000000..da4d8f436a52
--- /dev/null
+++ b/pkgs/servers/mobilizon/0001-fix-version.patch
@@ -0,0 +1,13 @@
+diff --git a/mix.exs b/mix.exs
+index 8338abf8..883e6987 100644
+--- a/mix.exs
++++ b/mix.exs
+@@ -1,7 +1,7 @@
+ defmodule Mobilizon.Mixfile do
+   use Mix.Project
+ 
+-  @version "5.1.0"
++  @version "5.1.1"
+ 
+   def project do
+     [
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index a007a30f6f26..efd40acbfeef 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -19,6 +19,11 @@ in
 mixRelease rec {
   inherit (common) pname version src;
 
+  # Version 5.1.1 failed to bump their internal package version,
+  # which causes issues with static file serving in the NixOS module.
+  # See https://github.com/NixOS/nixpkgs/pull/370277
+  patches = [ ./0001-fix-version.patch ];
+
   nativeBuildInputs = [
     git
     cmake

From 732c2f23f156b7a5fc36529f381734481b120ce6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 15:29:24 +0000
Subject: [PATCH 1190/1504] vacuum-go: 0.14.3 -> 0.15.0

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 87861b665d6d..5eaf9e47a396 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "vacuum-go";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     rev = "refs/tags/v${version}";
-    hash = "sha256-EVAfaZ/cbhBKSoAlrNP2QOM/2zKFxhe2uBoVfB4DL4c=";
+    hash = "sha256-OsujmYu0QNyfyj6W8+aPcV4xsjpwZDWSJC7WjIw+rOc=";
   };
 
-  vendorHash = "sha256-M9+AKgZwqnOtejIHdBF8MAWg2sJLX2cJtNdMZylp1UE=";
+  vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From 8fd76e7819d116847cae2c8157c19e667577292f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 2 Jan 2025 16:40:44 +0100
Subject: [PATCH 1191/1504] vscode-extensions.saoudrizwan.claude-dev: init at
 3.0.12

---
 .../editors/vscode/extensions/default.nix     |  2 ++
 .../saoudrizwan.claude-dev/default.nix        | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b49e0786f8e7..e3cdfd4b1cd6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4271,6 +4271,8 @@ let
         };
       };
 
+      saoudrizwan.claude-dev = callPackage ./saoudrizwan.claude-dev { };
+
       sainnhe.gruvbox-material = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "gruvbox-material";
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
new file mode 100644
index 000000000000..90a62814d973
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "claude-dev";
+    publisher = "saoudrizwan";
+    version = "3.0.12";
+    hash = "sha256-GlBo4MIoIazKEYHv4yXpRGLVElOnjYgD9gB6rMQxeGg=";
+  };
+
+  meta = {
+    description = "A VSCode extension providing an autonomous coding agent right in your IDE, capable of creating/editing files, executing commands, using the browser, and more with your permission every step of the way";
+    downloadPage = "https://github.com/cline/cline";
+    homepage = "https://github.com/cline/cline";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.drupol ];
+  };
+}

From 1227084c58918525780997af4e814395885d7cd6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 2 Jan 2025 16:52:41 +0100
Subject: [PATCH 1192/1504] maintainers: update jopejoe1

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 10f6a88385b8..d3f96a51a540 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11135,11 +11135,11 @@
     githubId = 13179;
   };
   jopejoe1 = {
-    email = "johannes@joens.email";
+    email = "nixpkgs@missing.ninja";
     matrix = "@jopejoe1:matrix.org";
     github = "jopejoe1";
     githubId = 34899572;
-    name = "Johannes Jöns";
+    name = "jopejoe1";
   };
   jordanisaacs = {
     name = "Jordan Isaacs";

From a35271af53ba19f95e82335db1ac8a5dc5aa1aed Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 2 Jan 2025 16:54:52 +0100
Subject: [PATCH 1193/1504] mailmap: add jopejoe1

---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 5dab7144bb1a..9004483d7055 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,6 +10,9 @@ Fiona Behrens <me@kloenk.dev>
 Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
 goatastronaut0212 <goatastronaut0212@outlook.com> <goatastronaut0212@proton.me>
 Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
+jopejoe1 <nixpkgs@missing.ninja>
+jopejoe1 <nixpkgs@missing.ninja> <johannes@joens.email>
+jopejoe1 <nixpkgs@missing.ninja> <34899572+jopejoe1@users.noreply.github.com>
 Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>
 Lin Jian <me@linj.tech> <linj.dev@outlook.com>
 Lin Jian <me@linj.tech> <75130626+jian-lin@users.noreply.github.com>

From c4f5b7c0e7b51c77db71c0d48b5723130d73e8b8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 2 Jan 2025 17:40:18 +0100
Subject: [PATCH 1194/1504] python312Packages.safetensors: 0.4.5 -> 0.5.0

Diff: https://github.com/huggingface/safetensors/compare/refs/tags/v0.4.5...v0.5.0

Changelog: https://github.com/huggingface/safetensors/releases/tag/v0.5.0
---
 .../python-modules/safetensors/default.nix          | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix
index 584cc1e7d6af..ceb01938be6c 100644
--- a/pkgs/development/python-modules/safetensors/default.nix
+++ b/pkgs/development/python-modules/safetensors/default.nix
@@ -10,9 +10,6 @@
   rustc,
   setuptools-rust,
 
-  # buildInputs
-  libiconv,
-
   # tests
   h5py,
   numpy,
@@ -22,20 +19,20 @@
 
 buildPythonPackage rec {
   pname = "safetensors";
-  version = "0.4.5";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "safetensors";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-gr4hBbecaGHaoNhRQQXWfLfNB0/wQPKftSiTnGgngog=";
+    tag = "v${version}";
+    hash = "sha256-rs9mYl/2KNdV9e+L/kZr59kLw7ckW9UQPZwkaGyl1Iw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${src.name}/bindings/python";
-    hash = "sha256-zDXzEVvmJF1dEVUFGBc3losr9U1q/qJCjNFkdJ/pCd4=";
+    hash = "sha256-bQkLBiuhVm2dzrf6hq+S04+zoXUszA7be8iS0WJSoOU=";
   };
 
   sourceRoot = "${src.name}/bindings/python";
@@ -48,8 +45,6 @@ buildPythonPackage rec {
     setuptools-rust
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
   nativeCheckInputs = [
     h5py
     numpy

From 97a24017577fc4a260057736bcc14d484627a505 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 16:42:26 +0000
Subject: [PATCH 1195/1504] siyuan: 3.1.16 -> 3.1.18

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

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 1b7ace038950..e86b092545bd 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.1.16";
+  version = "3.1.18";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8+Gz9AuxmK2hOApRZ2b1+rROOG94EBJR3pyp8YwtgiA=";
+    hash = "sha256-hUPHWVULyHQgGNTpLZKDk6hUlBIK1ouYAYecr0oUe/M=";
   };
 
   kernel = buildGo123Module {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-B2pGXs0IN5WhNHoFgTufd46q60RNvWzNdwoCxpayYC8=";
+    vendorHash = "sha256-1JwUQ/WhR1O3LTevI2kWk+FNpH4FBVgF46d+W6M7UBg=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-LlQdfRGsBn3IZWKSUqH5tAljXnWanuFXO2x+Wi3on7E=";
+    hash = "sha256-357iBgxevtXus0Dpa8+LHKsO42HoHibkhRSy+tpD8jo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";

From 7b55ce8367e077969fc7ed3ca4caee8b8a5d060e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 15:32:12 +0100
Subject: [PATCH 1196/1504] fsg: fix cross build

---
 pkgs/by-name/fs/fsg/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix
index 5f7340f9f039..0a8048d5e6f8 100644
--- a/pkgs/by-name/fs/fsg/package.nix
+++ b/pkgs/by-name/fs/fsg/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./wxgtk-3.2.patch ];
 
+  # use correct wx-config for cross-compiling
+  postPatch = ''
+    substituteInPlace makefile \
+      --replace-fail 'wx-config' "${lib.getExe' wxGTK32 "wx-config"}"
+  '';
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkg-config ];
@@ -45,6 +51,10 @@ stdenv.mkDerivation rec {
     sed -re '/ctrans_prob/s/energy\[center][+]energy\[other]/(int)(fmin(energy[center]+energy[other],99))/g' -i Canvas.cpp
   '';
 
+  makeFlags = [
+    "CPP=${stdenv.cc.targetPrefix}c++"
+  ];
+
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp sand $out/libexec

From fdd1a8c1e02a2e9784ff73979c9e881e784578d9 Mon Sep 17 00:00:00 2001
From: Korrat <korrat@protonmail.com>
Date: Thu, 2 Jan 2025 16:29:51 +0100
Subject: [PATCH 1197/1504] libfishsound: fix build with gcc14

In gcc 14, the default compiler in stdenv, -Wincompatible-pointer-types
is enabled by default. This causes a build failure for libfishsound.

This patch adds a patch to libfishsound to fix the declaration of two
callbacks.
---
 .../li/libfishsound/fix-callbacks.patch       | 20 +++++++++++++++++++
 pkgs/by-name/li/libfishsound/package.nix      |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/by-name/li/libfishsound/fix-callbacks.patch

diff --git a/pkgs/by-name/li/libfishsound/fix-callbacks.patch b/pkgs/by-name/li/libfishsound/fix-callbacks.patch
new file mode 100644
index 000000000000..992efcf23ec8
--- /dev/null
+++ b/pkgs/by-name/li/libfishsound/fix-callbacks.patch
@@ -0,0 +1,20 @@
+--- a/src/libfishsound/flac.c
++++ b/src/libfishsound/flac.c
+@@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void * data, int datasize)
+ #if FS_DECODE
+ static FLAC__StreamDecoderReadStatus
+ fs_flac_read_callback(const FLAC__StreamDecoder *decoder,
+-                      FLAC__byte buffer[], unsigned int *bytes,
++                      FLAC__byte buffer[], size_t *bytes,
+                       void *client_data)
+ {
+   FishSound* fsound = (FishSound*)client_data;
+@@ -346,7 +346,7 @@ dec_err:
+ #if FS_ENCODE
+ static FLAC__StreamEncoderWriteStatus
+ fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,
+-                           const FLAC__byte buffer[], unsigned bytes,
++                           const FLAC__byte buffer[], size_t bytes,
+                            unsigned samples, unsigned current_frame,
+                            void *client_data)
+ {
diff --git a/pkgs/by-name/li/libfishsound/package.nix b/pkgs/by-name/li/libfishsound/package.nix
index 0c5ea9c4c023..63b0838b4b01 100644
--- a/pkgs/by-name/li/libfishsound/package.nix
+++ b/pkgs/by-name/li/libfishsound/package.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
   };
 
+  patches = [
+    ./fix-callbacks.patch
+  ];
+
   propagatedBuildInputs = [
     libvorbis
     speex

From 88751ab1f8af667c46ddd0d53532ae385318e9a4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:49:55 +0100
Subject: [PATCH 1198/1504] xmrig: move to pkgs/by-name

---
 .../moneroocean.nix => by-name/xm/xmrig-mo/package.nix}     | 0
 .../xmrig/proxy.nix => by-name/xm/xmrig-proxy/package.nix}  | 0
 .../misc => by-name/xm}/xmrig/donate-level.patch            | 0
 .../misc/xmrig/default.nix => by-name/xm/xmrig/package.nix} | 0
 pkgs/top-level/all-packages.nix                             | 6 ------
 5 files changed, 6 deletions(-)
 rename pkgs/{applications/misc/xmrig/moneroocean.nix => by-name/xm/xmrig-mo/package.nix} (100%)
 rename pkgs/{applications/misc/xmrig/proxy.nix => by-name/xm/xmrig-proxy/package.nix} (100%)
 rename pkgs/{applications/misc => by-name/xm}/xmrig/donate-level.patch (100%)
 rename pkgs/{applications/misc/xmrig/default.nix => by-name/xm/xmrig/package.nix} (100%)

diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/by-name/xm/xmrig-mo/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmrig/moneroocean.nix
rename to pkgs/by-name/xm/xmrig-mo/package.nix
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmrig/proxy.nix
rename to pkgs/by-name/xm/xmrig-proxy/package.nix
diff --git a/pkgs/applications/misc/xmrig/donate-level.patch b/pkgs/by-name/xm/xmrig/donate-level.patch
similarity index 100%
rename from pkgs/applications/misc/xmrig/donate-level.patch
rename to pkgs/by-name/xm/xmrig/donate-level.patch
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/by-name/xm/xmrig/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmrig/default.nix
rename to pkgs/by-name/xm/xmrig/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ed3cf54d85b..6a041b1e8d01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14600,12 +14600,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
-
-  xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
-
-  xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
-
   monotone = callPackage ../applications/version-management/monotone {
     lua = lua5;
   };

From 532220669af5b69c2ae742dd7171c9e5e6e8b29b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:51:23 +0100
Subject: [PATCH 1199/1504] xmrig: use new apple sdk pattern

---
 pkgs/by-name/xm/xmrig/package.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix
index 9099e8e3dbfe..589b7ff35d35 100644
--- a/pkgs/by-name/xm/xmrig/package.nix
+++ b/pkgs/by-name/xm/xmrig/package.nix
@@ -7,12 +7,8 @@
 , openssl
 , hwloc
 , donateLevel ? 0
-, darwin
 }:
 
-let
-  inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;
-in
 stdenv.mkDerivation rec {
   pname = "xmrig";
   version = "6.22.2";
@@ -43,10 +39,6 @@ stdenv.mkDerivation rec {
     libmicrohttpd
     openssl
     hwloc
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Carbon
-    CoreServices
-    OpenCL
   ];
 
   inherit donateLevel;

From 6f2ff58e43b8c530b2e8b12ec73a0faef7a194aa Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:51:35 +0100
Subject: [PATCH 1200/1504] xmrig-proxy: use new apple sdk pattern

---
 pkgs/by-name/xm/xmrig-proxy/package.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/xm/xmrig-proxy/package.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix
index 7090f85483b4..3bbc7ee70883 100644
--- a/pkgs/by-name/xm/xmrig-proxy/package.nix
+++ b/pkgs/by-name/xm/xmrig-proxy/package.nix
@@ -6,12 +6,8 @@
   libuv,
   libmicrohttpd,
   openssl,
-  darwin,
 }:
 
-let
-  inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit;
-in
 stdenv.mkDerivation rec {
   pname = "xmrig-proxy";
   version = "6.22.0";
@@ -35,16 +31,11 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  buildInputs =
-    [
-      libuv
-      libmicrohttpd
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      CoreServices
-      IOKit
-    ];
+  buildInputs = [
+    libuv
+    libmicrohttpd
+    openssl
+  ];
 
   installPhase = ''
     runHook preInstall

From 7f2713dcb9518cd93b2892aee9aa84e7552e6029 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 15:32:12 +0100
Subject: [PATCH 1201/1504] fairymax: fix build with GCC 14

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

diff --git a/pkgs/by-name/fa/fairymax/package.nix b/pkgs/by-name/fa/fairymax/package.nix
index 5950e0b3591f..572d5505c20d 100644
--- a/pkgs/by-name/fa/fairymax/package.nix
+++ b/pkgs/by-name/fa/fairymax/package.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
       -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"'
   '';
 
+  # errors by default in GCC 14
+  NIX_CFLAGS_COMPILE = "-Wno-error=return-mismatch -Wno-error=implicit-int";
+
   installPhase = ''
     mkdir -p "$out"/{bin,share/fairymax}
     cp fairymax "$out/bin"

From df553a0b34b5e9851565d1d76a6bb47d0328c0ae Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 2 Jan 2025 18:07:59 +0100
Subject: [PATCH 1202/1504] koreader: fix hash (#370115)

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

diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index 169b083878ad..bb1969b3ac19 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
     {
       aarch64-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb";
-        hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk=";
+        hash = "sha256-uy+4+pNyz10xrGM0QF9q0y6UpQK1B9PGNqrcK6nENQY=";
       };
       armv7l-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb";
-        hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw=";
+        hash = "sha256-lTc12qmoe0kGUhrStlGfDRw+cNJnX7F09/jKKc/1U9g=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "koreader";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc=";
+    sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0=";
   };
 
   nativeBuildInputs = [

From 3ab766775d37c0b6f39506db6319d87260e81906 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:09:29 +1000
Subject: [PATCH 1203/1504] _7zz: 24.08 -> 24.09 (#360699)

_7zz: 24.08 -> 24.09
---
 pkgs/tools/archivers/7zz/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
index d23ec4af02ee..db6c8883c000 100644
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "7zz";
-  version = "24.08";
+  version = "24.09";
 
   src = fetchzip {
     url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
     hash = {
-      free = "sha256-2lv2Z4rrjmawD6aI8TmrACgo62StD720WQWOa0/u7KE=";
-      unfree = "sha256-f6hibHeTlF6RRnFiC7tOZ/A+IQdjhIrxYq6JrDVhnYI=";
+      free = "sha256-iQJ2m2OZrdkzf2sDIbKuyu0wIUktfvySTpsGFSLDZOM=";
+      unfree = "sha256-HVSu5GvdCY3lVXLUkHxaXco22WO52J2ldkGgfsyMVVg=";
     }.${if enableUnfree then "unfree" else "free"};
     stripRoot = false;
     # remove the unRAR related code from the src drv

From 5fbbc60571844845dd1e5abf9e9829e9c47e55e8 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 30 Dec 2024 14:44:15 +0100
Subject: [PATCH 1204/1504] tcl-8_5: fix build

---
 pkgs/development/interpreters/tcl/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 86bc54b9ceb3..11a12c6eac04 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -62,6 +62,10 @@ let
         # Don't install tzdata because NixOS already has a more up-to-date copy.
         "--with-tzdata=no"
       ]
+      ++ lib.optionals (lib.versionOlder version "8.6") [
+        # configure check broke due to GCC 14
+        "ac_cv_header_stdc=yes"
+      ]
       ++ lib.optionals (lib.versionAtLeast version "9.0") [
         # By default, tcl libraries get zipped and embedded into libtcl*.so,
         # which gets `zipfs mount`ed at runtime. This is fragile (for example

From e162494ac40ce637fd5cdcb87a83038255ed6abc Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:28:55 +0800
Subject: [PATCH 1205/1504] pykms: unstable-2021-01-25 -> 0-unstable-2024-07-06

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

diff --git a/pkgs/by-name/py/pykms/package.nix b/pkgs/by-name/py/pykms/package.nix
index ba8710caeba3..a00cdbe4b45c 100644
--- a/pkgs/by-name/py/pykms/package.nix
+++ b/pkgs/by-name/py/pykms/package.nix
@@ -36,13 +36,13 @@ let
 in
 pypkgs.buildPythonApplication rec {
   pname = "pykms";
-  version = "unstable-2021-01-25";
+  version = "0-unstable-2024-07-06";
 
   src = fetchFromGitHub {
     owner = "Py-KMS-Organization";
     repo = "py-kms";
-    rev = "1435c86fe4f11aa7fd42d77fa61715ca3015eeab";
-    hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ=";
+    rev = "465f4d14c728819d4eb00e3419bd1cb98af7f81c";
+    hash = "sha256-/XbMbcBcZPO7joHyaprJ29Cq4gNpuuzTzj2x1XDIyj8=";
   };
 
   sourceRoot = "${src.name}/py-kms";

From 0826de34a5452a77edb56aadbed7f0574af55009 Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:35:10 +0800
Subject: [PATCH 1206/1504] nixos/pykms: allow overriding default package

---
 nixos/modules/services/misc/pykms.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index c9613f684e84..059fb9e66092 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -24,6 +24,8 @@ in
         description = "Whether to enable the PyKMS service.";
       };
 
+      package = lib.mkPackageOption pkgs "pykms" { };
+
       listenAddress = lib.mkOption {
         type = lib.types.str;
         default = "0.0.0.0";
@@ -78,13 +80,13 @@ in
       wantedBy = [ "multi-user.target" ];
       # python programs with DynamicUser = true require HOME to be set
       environment.HOME = libDir;
-      serviceConfig = with pkgs; {
+      serviceConfig = {
         DynamicUser = true;
         StateDirectory = baseNameOf libDir;
-        ExecStartPre = "${lib.getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db";
+        ExecStartPre = "${lib.getBin cfg.package}/libexec/create_pykms_db.sh ${libDir}/clients.db";
         ExecStart = lib.concatStringsSep " " (
           [
-            "${lib.getBin pykms}/bin/server"
+            "${lib.getBin cfg.package}/bin/server"
             "--logfile=STDOUT"
             "--loglevel=${cfg.logLevel}"
             "--sqlite=${libDir}/clients.db"

From 92242097202b12f1224481f5d71ec6348eb34843 Mon Sep 17 00:00:00 2001
From: MakiseKurisu <MakiseKurisu@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:59:56 +0800
Subject: [PATCH 1207/1504] nixos/pykms: suggest dual stack binding

---
 nixos/modules/services/misc/pykms.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index 059fb9e66092..a8f08e5ab186 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -29,6 +29,7 @@ in
       listenAddress = lib.mkOption {
         type = lib.types.str;
         default = "0.0.0.0";
+        example = "::";
         description = "The IP address on which to listen.";
       };
 

From dac39cc53a2fdff63f6c61771805cd3dd2414d8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:16:14 +1000
Subject: [PATCH 1208/1504] python312Packages.pyspark: 3.5.3 -> 3.5.4 (#368497)

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

diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index e06ab2932483..58afd33217fb 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "3.5.3";
+  version = "3.5.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aLfMDAxXCn2GRPSfQNLahwmwHTDJEmzIz5O0+E89l0c=";
+    hash = "sha256-HCkm1jAgkCFj9YIiRmrfb4AW9sQ8HzGbjnpx26oF/FE=";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.

From a00976b3883b7e8627a10d45e3c1f8969ec3b148 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 12:22:19 +0000
Subject: [PATCH 1209/1504] bloat: 0-unstable-2024-10-28 ->
 0-unstable-2024-12-27

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

diff --git a/pkgs/by-name/bl/bloat/package.nix b/pkgs/by-name/bl/bloat/package.nix
index bfb5b1f13395..e2efe3f83307 100644
--- a/pkgs/by-name/bl/bloat/package.nix
+++ b/pkgs/by-name/bl/bloat/package.nix
@@ -7,12 +7,12 @@
 
 buildGoModule {
   pname = "bloat";
-  version = "0-unstable-2024-10-28";
+  version = "0-unstable-2024-12-27";
 
   src = fetchgit {
     url = "git://git.freesoftwareextremist.com/bloat";
-    rev = "68d7acc2f7266c47001445229ff235546c8c71b4";
-    hash = "sha256-VLyL1tnb3/qsDFp8s84XTj1Ohl/ajD+tn7V8iBp3ppY=";
+    rev = "d171b6c2d50500cdfd2f3308bf82a5f79e22cd8b";
+    hash = "sha256-a9nL6NvZLQZLOuoqdDbZTH9dVtQ6guKopkAHughINcg=";
   };
 
   vendorHash = null;

From ab065822e58d98cec1c0e919ecd5aa79fafa6dd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 14:47:26 +0000
Subject: [PATCH 1210/1504] ft2-clone: 1.89 -> 1.93

---
 pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index b444aa92a968..431fe22a8694 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ft2-clone";
-  version = "1.89";
+  version = "1.93";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${version}";
-    hash = "sha256-s2HMzHJB85kLe3TuKH3oFloWUirmbSYDwh298dZlP6M=";
+    hash = "sha256-B91kLShg3nvOyOlBkLSpTydhUs5yHa+C/OWe8N+MB9c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 7b40f54d169aab9b92926baad02ffb2ebbf489e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 06:15:50 +0000
Subject: [PATCH 1211/1504] python312Packages.ntc-templates: 6.0.0 -> 7.5.0

---
 .../python-modules/ntc-templates/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index 4b0936f22948..668e0af41753 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "ntc-templates";
-  version = "6.0.0";
-  format = "pyproject";
+  version = "7.5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "networktocode";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-E8n4ZcCH8xxU5XXVxQUl8844RnRpnbHy/LnjHlz7Eeg=";
+    repo = "ntc-templates";
+    tag = "v${version}";
+    hash = "sha256-VRkWjhl/7qDwXTWQ5ZhIS7JMuxJWlWkqwjoSo1DXOQE=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   propagatedBuildInputs = [ textfsm ];
 

From 640038c84b075fc03f16fbf9ea57d620f3fa56ca Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Thu, 2 Jan 2025 19:07:05 +0100
Subject: [PATCH 1212/1504] timg: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/ti/timg/package.nix b/pkgs/by-name/ti/timg/package.nix
index 7eba3a507079..70d9c4557a54 100644
--- a/pkgs/by-name/ti/timg/package.nix
+++ b/pkgs/by-name/ti/timg/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "timg";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "timg";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rTqToWgCPQeRYnMUmhPd/lJPX6L9PstFs1NczyecaB0=";
+    hash = "sha256-D5pQozxy5eSKVaV5qhoneG/b2yKcPQWD8OHs8MsGL1w=";
   };
 
   buildInputs = [

From 6e0d5066693daf94584b84d65d90f1d18073fb8f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:08:24 +0100
Subject: [PATCH 1213/1504] python312Packages.gotenberg-client: drop support
 for python 3.8

---
 pkgs/development/python-modules/gotenberg-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 196385c2413a..7d5785eb90bd 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   version = "0.8.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "stumpylog";

From 040ef3ec0856211d627bbfc57aaaf64b7f727755 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:09:55 +0100
Subject: [PATCH 1214/1504] python312Packages.tika-client: drop support for
 python 3.8

---
 pkgs/development/python-modules/tika-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix
index 56f98fcf93fc..4b01da1d5551 100644
--- a/pkgs/development/python-modules/tika-client/default.nix
+++ b/pkgs/development/python-modules/tika-client/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   version = "0.8.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "stumpylog";

From 37afe4396d336e967b066d861a10415d12e39892 Mon Sep 17 00:00:00 2001
From: Nicky Mouha <nmouha@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:10:51 -0500
Subject: [PATCH 1215/1504] curl-cffi: 0.7.2 (broken) -> 0.7.4

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

diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 38a11e353d74..31dad93e5e89 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.7.2";
+  version = "0.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     rev = "refs/tags/v${version}";
-    hash = "sha256-s8P/7erdAeGZuykUrgpCcm0a4ym3Y8F6kKFXoDXsOdQ=";
+    hash = "sha256-Q1VppzQ1Go+ia1D1BemTf40o9wV0miWyoGy/tY+95qE==";
   };
 
   patches = [ ./use-system-libs.patch ];

From 60c7e52f9f996c4382db7d850e7c154ac8132f02 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 2 Jan 2025 10:13:42 -0800
Subject: [PATCH 1216/1504] zoom-us: 6.3.0.* -> 6.3.1.*

---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 183c139d12a5..0b2581aaf458 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -50,23 +50,23 @@ let
   # and often with different versions.  We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.3.0.44805";
-  versions.x86_64-darwin = "6.3.0.44805";
-  versions.x86_64-linux = "6.3.0.5527";
+  versions.aarch64-darwin = "6.3.1.45300";
+  versions.x86_64-darwin = "6.3.1.45300";
+  versions.x86_64-linux = "6.3.1.5673";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-S4uBJw0FPcPv1O2zcTbEaEONrNLkRCkWYazpR5chYbE=";
+      hash = "sha256-WPhqYof/XR6TDkuA4NK2a30ksdhN7NBfs4KCQwqKJ0g=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-PKIxhy+bnBpMn0oUL1cAfhOT+osXPDBIRoY1HLgO26s=";
+      hash = "sha256-BywBvJCcNXARHTkO/UJbOFRjuiXRkmFWmSuZsW9t1pk=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-5Tk8lU6D0cgyr5pe1oVZFCURQ1YznBpWPPM9nogOT6Q=";
+      hash = "sha256-0gREcRnGkiFj6kIra0laR5PUqrb0Jvoj6gDfpAVLRtg=";
     };
   };
 

From 0299c518a464172d783bb7382096a345fc4bb089 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:28:31 +0000
Subject: [PATCH 1217/1504] python312Packages.ytmusicapi: 1.8.2 -> 1.9.1

---
 pkgs/development/python-modules/ytmusicapi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index 78218a379fef..45df43e2e4d0 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.8.2";
+  version = "1.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sigma67";
     repo = "ytmusicapi";
-    rev = "refs/tags/${version}";
-    hash = "sha256-SZ5YsQNrE91ycSXy/NjtjXp0E6msVKlV0f+Td0AwYpQ=";
+    tag = version;
+    hash = "sha256-yg8wjJTbx6LaVrln+Qdfn7XKnnI2n4W56YQZRYXrtLI=";
   };
 
   build-system = [ setuptools-scm ];

From c32729c079419a776abfc5808c978e9a3f0e9fb1 Mon Sep 17 00:00:00 2001
From: Nicky Mouha <nmouha@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:17:38 -0500
Subject: [PATCH 1218/1504] Patch for yt-dlp to support fixed curl-cffi 0.7.4

---
 pkgs/by-name/yt/yt-dlp/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 8317d9da71bb..971c68aa0c76 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -75,6 +75,14 @@ python3Packages.buildPythonApplication rec {
   # Requires network
   doCheck = false;
 
+  # curl-cffi 0.7.2 and 0.7.3 are broken, but 0.7.4 is fixed
+  # https://github.com/lexiforest/curl_cffi/issues/394
+  postPatch = ''
+    substituteInPlace yt_dlp/networking/_curlcffi.py \
+      --replace-fail "(0, 7, 0) <= curl_cffi_version < (0, 7, 2)" \
+        "((0, 7, 0) <= curl_cffi_version < (0, 7, 2)) or curl_cffi_version >= (0, 7, 4)"
+  '';
+
   postInstall = lib.optionalString withAlias ''
     ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
   '';

From ed3f112a0e6bafe629f602fd7b1e313ed1a57ad6 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 2 Jan 2025 06:11:49 +0800
Subject: [PATCH 1219/1504] nixos/kmonad: remove unnecessary cli flag --input

input has already been set in the config file.
---
 nixos/modules/services/hardware/kmonad.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 687224fae2e9..86e9e32012cf 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -122,8 +122,6 @@ let
       cmd =
         [
           (lib.getExe cfg.package)
-          "--input"
-          ''device-file "${keyboard.device}"''
         ]
         ++ cfg.extraArgs
         ++ [ "${mkCfg keyboard}" ];

From c3588cf2c5fb41bb1759fd0b46820384625c8120 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 2 Jan 2025 06:42:32 +0800
Subject: [PATCH 1220/1504] nixos/kmonad: avoid running an unnecessary bash

---
 nixos/modules/services/hardware/kmonad.nix | 14 +++++---------
 nixos/tests/kmonad.nix                     |  3 +++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 86e9e32012cf..df60f07d3890 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  utils,
   ...
 }:
 
@@ -118,17 +119,8 @@ let
   # Build a systemd service that starts KMonad:
   mkService =
     keyboard:
-    let
-      cmd =
-        [
-          (lib.getExe cfg.package)
-        ]
-        ++ cfg.extraArgs
-        ++ [ "${mkCfg keyboard}" ];
-    in
     lib.nameValuePair (mkName keyboard.name) {
       description = "KMonad for ${keyboard.device}";
-      script = lib.escapeShellArgs cmd;
       unitConfig = {
         # Control rate limiting.
         # Stop the restart logic if we restart more than
@@ -137,6 +129,10 @@ let
         StartLimitBurst = 5;
       };
       serviceConfig = {
+        ExecStart = ''
+          ${lib.getExe cfg.package} ${mkCfg keyboard} \
+            ${utils.escapeSystemdExecArgs cfg.extraArgs}
+        '';
         Restart = "always";
         # Restart at increasing intervals from 2s to 1m
         RestartSec = 2;
diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix
index e0150cb99f18..57bb9249397c 100644
--- a/nixos/tests/kmonad.nix
+++ b/nixos/tests/kmonad.nix
@@ -11,6 +11,9 @@
     machine = {
       services.kmonad = {
         enable = true;
+        extraArgs = [
+          "--log-level=debug"
+        ];
         keyboards = {
           defaultKbd = {
             device = "/dev/input/by-id/vm-default-kbd";

From 9e8ed1f41185f962919e3db121266ea30bf27bde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 18:25:18 +0000
Subject: [PATCH 1221/1504] legcord: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix
index df4b73bacb21..ae70d077a298 100644
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "legcord";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "Legcord";
     repo = "Legcord";
     rev = "v${version}";
-    hash = "sha256-9CicqDZDetxElD36OLizyVNxkqz3rQOjAtUNTGWVwss=";
+    hash = "sha256-0dVuSqViMqhWBMEY36ZcXM1FYnMcDH5brp5gsMWg3Rc=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-5GE/I2xLmu2Wu9mjzZMk1YZvtS5PgpwgXnxuY+4nimQ=";
+    hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E=";
   };
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

From 3ed899a4ebccfd4bce39643093555c28ff63963c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 18:40:27 +0000
Subject: [PATCH 1222/1504] nb: 7.15.0 -> 7.15.1

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

diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index aabac99ab728..cde39aad99bc 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nb";
-  version = "7.15.0";
+  version = "7.15.1";
 
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
     rev = version;
-    hash = "sha256-dZl/WYmm+UTPYuvVf+7zvU7ms5x/cwnC56y+PIRx3Hc=";
+    hash = "sha256-ep3EHqYz4xkTQSTSr0gnPqu8f04j2xAVbSpa1VUZJB4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 66ddf84c33620c69bbb6be6b86252c7b4ce0460d Mon Sep 17 00:00:00 2001
From: Alexandru Scvortov <code@scvalex.net>
Date: Thu, 19 Dec 2024 16:48:06 +0000
Subject: [PATCH 1223/1504] kubernetes: kubelet.extraConfig should be `attrsOf
 json.type`

---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 98f601d8886e..aa759e20f49f 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -205,9 +205,14 @@ in
     };
 
     extraConfig = mkOption {
-      description = "Kubernetes kubelet extra configuration file entries.";
+      description = ''
+        Kubernetes kubelet extra configuration file entries.
+
+        See also [Set Kubelet Parameters Via A Configuration File](https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/)
+        and [Kubelet Configuration](https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/).
+      '';
       default = { };
-      type = attrsOf attrs;
+      type = attrsOf ((pkgs.formats.json { }).type);
     };
 
     featureGates = mkOption {

From ccfdbc34fd402c227559dcede15ba28f1a65be50 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Tue, 31 Dec 2024 20:58:37 +0100
Subject: [PATCH 1224/1504] docs: add references to module system section

---
 doc/module-system/module-system.chapter.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index 927f66073748..d24faa255259 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -7,9 +7,12 @@ The module system is a language for handling configuration, implemented as a Nix
 Compared to plain Nix, it adds documentation, type checking and composition or extensibility.
 
 ::: {.note}
-This chapter is new and not complete yet. For a gentle introduction to the module system, in the context of NixOS, see [Writing NixOS Modules](https://nixos.org/manual/nixos/unstable/index.html#sec-writing-modules) in the NixOS manual.
-:::
+This chapter is new and not complete yet.
 
+See also:
+- Introduction to the module system, in the context of NixOS, see [Writing NixOS Modules](https://nixos.org/manual/nixos/unstable/index.html#sec-writing-modules) in the NixOS manual.
+- Generic guide to the module system on [nix.dev](https://nix.dev/tutorials/module-system/index.html).
+:::
 
 ## `lib.evalModules` {#module-system-lib-evalModules}
 

From 1ac626c6821b6f9b0bbcfee902e070b3e4d45a7d Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 2 Jan 2025 14:37:08 -0300
Subject: [PATCH 1225/1504] pmbootstrap: 3.0.0 -> 3.1.0, fix build, tweaking

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 91 +++++--------------------
 1 file changed, 18 insertions(+), 73 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 8cff6df159f2..35f1299c39ba 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -9,18 +9,20 @@
   sudo,
   python3Packages,
   gitUpdater,
+  util-linux,
+  versionCheckHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = pname;
-    rev = version;
-    hash = "sha256-hUrWMU4V7tf/qVR4geR5FsCQ+BZA+zCPTdCZGN1PMKk=";
+    tag = version;
+    hash = "sha256-ijXyX+VJqiS0z5IOXGjeL2SGZ/4ledhnq/Zr1ZLW/Io=";
     domain = "gitlab.postmarketos.org";
   };
 
@@ -34,103 +36,46 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [
-    python3Packages.pytestCheckHook
     git
+    multipath-tools
     openssl
     ps
+    python3Packages.pytestCheckHook
     sudo
+    util-linux
+    versionCheckHook
   ];
 
   # Add test dependency in PATH
-  preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
+  preCheck = ''
+    export PYTHONPATH=$PYTHONPATH:${pmb_test}
+  '';
 
   # skip impure tests
   disabledTests = [
-    "test_apk_static"
-    "test_aportgen"
-    "test_aportgen_device_wizard"
-    "test_bootimg"
-    "test_build_abuild_leftovers"
-    "test_build_depends_binary_outdated"
-    "test_build_depends_high_level"
-    "test_build_depends_no_binary_error"
-    "test_build_is_necessary"
-    "test_build_local_source_high_level"
-    "test_build_src_invalid_path"
-    "test_check"
-    "test_can_fast_forward"
-    "test_check_build_for_arch"
-    "test_check_config"
-    "test_chroot_arguments"
-    "test_chroot_interactive_shell"
-    "test_chroot_interactive_shell_user"
-    "test_chroot_mount"
-    "test_clean_worktree"
-    "test_config_user"
-    "test_cross_compile_distcc"
-    "test_crossdirect"
-    "test_extract_arch"
-    "test_extract_version"
-    "test_file"
-    "test_filter_aport_packages"
-    "test_filter_missing_packages_binary_exists"
-    "test_filter_missing_packages_invalid"
-    "test_filter_missing_packages_pmaports"
-    "test_finish"
-    "test_folder_size"
-    "test_get_all_component_names"
-    "test_get_apkbuild"
-    "test_get_depends"
-    "test_get_upstream_remote"
-    "test_helpers_lint"
-    "test_helpers_package_get_apkindex"
-    "test_helpers_repo"
-    "test_helpers_ui"
-    "test_init_buildenv"
-    "test_kconfig_check"
-    "test_keys"
-    "test_newapkbuild"
-    "test_package"
-    "test_package_from_aports"
     "test_pkgrepo_pmaports"
-    "test_pkgrel_bump"
-    "test_pmbootstrap_status"
-    "test_print_checks_git_repo"
-    "test_proxy"
-    "test_pull"
-    "test_qemu_running_processes"
-    "test_questions_additional_options"
-    "test_questions_bootimg"
-    "test_questions_channel"
-    "test_questions_keymaps"
-    "test_questions_work_path"
-    "test_read_config_channel"
-    "test_recurse_invalid"
-    "test_run_abuild"
-    "test_run_core"
-    "test_shell_escape"
-    "test_skip_already_built"
-    "test_switch_to_channel_branch"
-    "test_version"
   ];
 
+  versionCheckProgramArg = "--version";
+
   makeWrapperArgs = [
     "--prefix PATH : ${
       lib.makeBinPath [
         git
         openssl
         multipath-tools
+        util-linux
       ]
     }"
   ];
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Sophisticated chroot/build/flash tool to develop and install postmarketOS";
     homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       onny
       lucasew
     ];

From d7e545210a327ff4247112f53babf3cdf473e55d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 19:12:19 +0000
Subject: [PATCH 1226/1504] tdlib: 1.8.41 -> 1.8.42

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

diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index 7c308bec9098..e096cab47e7f 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -35,7 +35,7 @@ in
 
 stdenv.mkDerivation {
   pname = "tdlib";
-  version = "1.8.41";
+  version = "1.8.42";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "5b974c298d4ed551d3ad2c061ad7b8280d137c7e";
-    hash = "sha256-1TyGv2yMjX75+ccZSox/2m6SMmwEZAkShIhLfCeNmZg=";
+    rev = "ef580cd3dd0e5223c2be503342dc29e128be866e";
+    hash = "sha256-k1YQpQXYmEdoiyWeAcj2KRU+BcWuWbHpd4etxLspEoo=";
   };
 
   buildInputs = [

From 6c12a584251429cda2c991f27c98259502722d22 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 2 Jan 2025 11:35:02 +0100
Subject: [PATCH 1227/1504] emacsPackages.copilot: 0-unstable-2024-05-01 ->
 0-unstable-2024-12-28

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

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 2225dff0872d..438f1a8ae101 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -10,13 +10,13 @@
 }:
 melpaBuild {
   pname = "copilot";
-  version = "0-unstable-2024-05-01";
+  version = "0-unstable-2024-12-28";
 
   src = fetchFromGitHub {
     owner = "copilot-emacs";
     repo = "copilot.el";
-    rev = "733bff26450255e092c10873580e9abfed8a81b8";
-    sha256 = "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=";
+    rev = "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4";
+    sha256 = "sha256-FzI08AW7a7AleEM7kSQ8LsWsDYID8SW1SmSN6/mIB/A=";
   };
 
   files = ''(:defaults "dist")'';

From 46646c3003838f77555619b3d505188b3cc43401 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 2 Jan 2025 14:09:33 +0100
Subject: [PATCH 1228/1504] emacsPackages.copilot: Configure nix-installed
 copilot-node-server

By default, the copilot Emacs package searches for "copilot-node-server"
in PATH. If copilot-node-server isn't found, the package downloads and
installs it automatically. All of that isn't compatible with the Nix
way of doing things.

This commit configures the package so the package gets the
copilot-node-server from Nix.

Co-authored-by: Lin Jian <me@linj.tech>
---
 .../manual-packages/copilot/package.nix            |  7 +++++++
 .../copilot/specify-copilot-install-dir.patch      | 14 ++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 438f1a8ae101..2c6bbd7fb465 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -4,9 +4,11 @@
   editorconfig,
   f,
   fetchFromGitHub,
+  replaceVars,
   nodejs,
   s,
   melpaBuild,
+  copilot-node-server,
 }:
 melpaBuild {
   pname = "copilot";
@@ -21,6 +23,11 @@ melpaBuild {
 
   files = ''(:defaults "dist")'';
 
+  patches = [
+    (replaceVars ./specify-copilot-install-dir.patch {
+      copilot-node-server = copilot-node-server;
+    })
+  ];
   packageRequires = [
     dash
     editorconfig
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch
new file mode 100644
index 000000000000..c10f19133cac
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/specify-copilot-install-dir.patch
@@ -0,0 +1,14 @@
+diff --git a/copilot.el b/copilot.el
+index f1f5e51..ddf2b5b 100644
+--- a/copilot.el
++++ b/copilot.el
+@@ -132,8 +132,7 @@ (defcustom copilot-indentation-alist
+ (defconst copilot-server-package-name "copilot-node-server"
+   "The name of the package to install copilot server.")
+ 
+-(defcustom copilot-install-dir (expand-file-name
+-                                (locate-user-emacs-file (f-join ".cache" "copilot")))
++(defcustom copilot-install-dir "@copilot-node-server@"
+   "Directory in which the servers will be installed."
+   :risky t
+   :type 'directory

From 9dd2f25c2b1ef93daec35953d962f00a840a0a93 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 2 Jan 2025 14:13:58 +0100
Subject: [PATCH 1229/1504] emacsPackages.copilot: Make the package use a
 compatible version of the server

---
 .../manual-packages/copilot/package.nix          | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 2c6bbd7fb465..86109b57a2ac 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -10,6 +10,20 @@
   melpaBuild,
   copilot-node-server,
 }:
+let
+  # The Emacs package isn't compatible with the latest
+  # copilot-node-server so we have to set a specific revision
+  # https://github.com/copilot-emacs/copilot.el/issues/344
+  pinned-copilot-node-server = copilot-node-server.overrideAttrs (old: rec {
+    version = "1.27.0";
+    src = fetchFromGitHub {
+      owner = "jfcherng";
+      repo = "copilot-node-server";
+      rev = version;
+      hash = "sha256-Ds2agoO7LBXI2M1dwvifQyYJ3F9fm9eV2Kmm7WITgyo=";
+    };
+  });
+in
 melpaBuild {
   pname = "copilot";
   version = "0-unstable-2024-12-28";
@@ -25,7 +39,7 @@ melpaBuild {
 
   patches = [
     (replaceVars ./specify-copilot-install-dir.patch {
-      copilot-node-server = copilot-node-server;
+      copilot-node-server = pinned-copilot-node-server;
     })
   ];
   packageRequires = [

From 4f6fc2e343a2c7ef29de8be4e552b96354b8a924 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:32:36 +0100
Subject: [PATCH 1230/1504] gnunet-gtk: 0.21.0 -> 0.22.0

---
 pkgs/applications/networking/p2p/gnunet/gtk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 95c1780256d7..56dc9ae6b701 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnunet-gtk";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";
-    hash = "sha256-vQFtKFI57YG64WpKVngx1kq687hI+f1kpP9ooK53/aw=";
+    hash = "sha256-bpSEdymFT7q5OQKshD8lGwwMF26yXp0RyUAvNVzua6U=";
   };
 
   nativeBuildInputs = [

From a460583a48b45caea548dd5a08206554702c1ea1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:49:20 +0100
Subject: [PATCH 1231/1504] python312Packages.kivy: fix build

---
 pkgs/development/python-modules/kivy/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index 273de9cca3da..2f42ef165d6a 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -82,7 +82,14 @@ buildPythonPackage rec {
   # prefer pkg-config over hardcoded framework paths
   USE_OSX_FRAMEWORKS = 0;
   # work around python distutils compiling C++ with $CC (see issue #26709)
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isGNU [
+      "-Wno-error=incompatible-pointer-types"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "-I${lib.getDev libcxx}/include/c++/v1"
+    ]
+  );
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace kivy/lib/mtdev.py \

From b9895413188b5b4f83f1ff1872e0f01dc683876a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 20:51:27 +0100
Subject: [PATCH 1232/1504] python312Packages.aioacaia: 0.1.11 -> 0.1.12

Diff: https://github.com/zweckj/aioacaia/compare/refs/tags/v0.1.11...v0.1.12

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

diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix
index a92d44a6bb30..cb16f0513039 100644
--- a/pkgs/development/python-modules/aioacaia/default.nix
+++ b/pkgs/development/python-modules/aioacaia/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioacaia";
-  version = "0.1.11";
+  version = "0.1.12";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "aioacaia";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9lRF3NrJ/Zl7ZOihiUiflxCjUi9WHjovgbpFebJJl9M=";
+    hash = "sha256-XtHze2EYLSGm3u8aG6vbogqki83k1mBKy/bC8gCCoWQ=";
   };
 
   build-system = [ setuptools ];

From 4efb59aa6e420ff6d2ad574f8141c93dfe9c9294 Mon Sep 17 00:00:00 2001
From: Otto Sabart <seberm@seberm.com>
Date: Sat, 28 Dec 2024 21:00:00 +0100
Subject: [PATCH 1233/1504] python3Packages.yoto-api: init at 1.24.2

---
 .../python-modules/yoto-api/default.nix       | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/yoto-api/default.nix

diff --git a/pkgs/development/python-modules/yoto-api/default.nix b/pkgs/development/python-modules/yoto-api/default.nix
new file mode 100644
index 000000000000..85bc4e936ba1
--- /dev/null
+++ b/pkgs/development/python-modules/yoto-api/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytz,
+  requests,
+  paho-mqtt,
+}:
+
+buildPythonPackage rec {
+  pname = "yoto-api";
+  version = "1.24.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cdnninja";
+    repo = "yoto_api";
+    tag = "v${version}";
+    hash = "sha256-wbqeRTYHDpxKqOwTRkkYGtgYOmnyNQY50dnvI0WprwA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pytz
+    requests
+    paho-mqtt
+  ];
+
+  # All tests require access to and authentication with the Yoto API (api.yotoplay.com).
+  doCheck = false;
+
+  pythonImportsCheck = [ "yoto_api" ];
+
+  meta = with lib; {
+    changelog = "https://github.com/cdnninja/yoto_api/releases/tag/${src.tag}";
+    homepage = "https://github.com/cdnninja/yoto_api";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ seberm ];
+    license = licenses.mit;
+    description = "A python package that makes it a bit easier to work with the yoto play API.";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b75afca63448..f115ab7e682b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18313,6 +18313,8 @@ self: super: with self; {
     python3 = python;
   });
 
+  yoto-api = callPackage ../development/python-modules/yoto-api { };
+
   youless-api = callPackage ../development/python-modules/youless-api { };
 
   youseedee = callPackage ../development/python-modules/youseedee { };

From eb75913a1a6ce877effe6a4c70eb43e5c898ea94 Mon Sep 17 00:00:00 2001
From: Otto Sabart <seberm@seberm.com>
Date: Sat, 28 Dec 2024 21:00:00 +0100
Subject: [PATCH 1234/1504] home-assistant-custom-components.yoto_ha: init at
 1.22.0

---
 .../custom-components/yoto_ha/package.nix     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
new file mode 100644
index 000000000000..f005c0ecc365
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  yoto-api,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "cdnninja";
+  domain = "yoto";
+  version = "1.22.0";
+
+  src = fetchFromGitHub {
+    owner = "cdnninja";
+    repo = "yoto_ha";
+    tag = "v${version}";
+    hash = "sha256-uaakUxuPxYqLnE2UK6ept91Lycvvhr0r9vZw44y1W4g=";
+  };
+
+  dependencies = [
+    yoto-api
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/cdnninja/yoto_ha/releases/tag/${src.tag}";
+    description = "Home Assistant Integration for Yoto.";
+    homepage = "https://github.com/cdnninja/yoto_ha";
+    maintainers = with maintainers; [ seberm ];
+    license = licenses.mit;
+  };
+}

From 27a515f9dd89103d14f2b5182b2cb7460d80c2d2 Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Wed, 1 Jan 2025 22:44:30 +0100
Subject: [PATCH 1235/1504] mosml: pass -fpermissive to C compiler

The MosML build system relies on some terrible C that GCC 14 now
refuses to compile. This has supposedly been fixed in MosML upstream,
but the fix is not yet in any released version. It is not so easy to
simply cherry-pick the changes necessary to make GCC 14 work, since
they seem spread over various different commits. This change serves to
make this rather obscure derivation work for a little while longer.
---
 pkgs/by-name/mo/mosml/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/mo/mosml/package.nix b/pkgs/by-name/mo/mosml/package.nix
index 755a002ebff5..2bd5a6b1c0a0 100644
--- a/pkgs/by-name/mo/mosml/package.nix
+++ b/pkgs/by-name/mo/mosml/package.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-fpermissive";
+
   src = fetchFromGitHub {
     owner = "kfl";
     repo = "mosml";

From a4c6e4d715f9da7cc66c75ff224c681f841dcd8f Mon Sep 17 00:00:00 2001
From: Nigel Banks <nigelgbanks@users.noreply.github.com>
Date: Thu, 2 Jan 2025 21:03:01 +0100
Subject: [PATCH 1236/1504] vscode-extensions.vadimcn.vscode-lldb: remove
 nigelgbanks as maintainer (#370342)

---
 .../editors/vscode/extensions/vadimcn.vscode-lldb/default.nix   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
index 20b81c3c70cd..a4dec529aba6 100644
--- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
@@ -199,7 +199,7 @@ stdenv.mkDerivation {
     description = "Native debugger extension for VSCode based on LLDB";
     homepage = "https://github.com/vadimcn/vscode-lldb";
     license = [ lib.licenses.mit ];
-    maintainers = [ lib.maintainers.nigelgbanks ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }

From 6118a3d758d113db7a72dc425afbd6237d0a6803 Mon Sep 17 00:00:00 2001
From: Dopplerian <dopplerian+git@proton.me>
Date: Mon, 16 Dec 2024 13:13:21 +0100
Subject: [PATCH 1237/1504] bashrun2: init at 0.2.6

---
 pkgs/by-name/ba/bashrun2/package.nix          | 90 +++++++++++++++++++
 .../ba/bashrun2/remote-permissions.patch      | 12 +++
 2 files changed, 102 insertions(+)
 create mode 100644 pkgs/by-name/ba/bashrun2/package.nix
 create mode 100644 pkgs/by-name/ba/bashrun2/remote-permissions.patch

diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix
new file mode 100644
index 000000000000..057d1e3894a4
--- /dev/null
+++ b/pkgs/by-name/ba/bashrun2/package.nix
@@ -0,0 +1,90 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  makeWrapper,
+  xorg,
+  ncurses,
+  coreutils,
+  bashInteractive,
+  gnused,
+  gnugrep,
+  glibc,
+  xterm,
+  util-linux,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bashrun2";
+  version = "0.2.6";
+
+  src = fetchFromGitHub {
+    owner = "hbekel";
+    repo = "bashrun2";
+    tag = "v${version}";
+    hash = "sha256-U2ntplhyv8KAkaMd2D6wRsUIYkhJzxdgHo2xsbNRfqM=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    xorg.libX11
+  ];
+
+  patches = [
+    ./remote-permissions.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace \
+      man/bashrun2.1 \
+      --replace-fail '/usr/bin/brwctl' "$out/bin/brwctl"
+
+    substituteInPlace \
+      src/bindings \
+      src/registry \
+      src/utils \
+      src/bashrun2 \
+      src/frontend \
+      src/remote \
+      src/plugin \
+      src/engine \
+      src/bookmarks \
+      --replace-fail '/bin/rm' '${coreutils}/bin/rm'
+
+    substituteInPlace \
+      src/bashrun2 \
+      --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bashInteractive}'
+
+    substituteInPlace \
+      src/remote \
+      --replace-fail '/bin/cp' '${coreutils}/bin/cp'
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/bashrun2 \
+      --prefix PATH : "$out/bin:${
+        lib.makeBinPath [
+          ncurses
+          coreutils
+          gnused
+          gnugrep
+          glibc
+          bashInteractive
+          xterm
+          util-linux
+        ]
+      }" \
+      --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
+  '';
+
+  meta = {
+    maintainers = with lib.maintainers; [ dopplerian ];
+    mainProgram = "bashrun2";
+    homepage = "http://henning-liebenau.de/bashrun2/";
+    license = lib.licenses.gpl2Plus;
+    description = "Application launcher based on a modified bash session in a small terminal window";
+  };
+}
diff --git a/pkgs/by-name/ba/bashrun2/remote-permissions.patch b/pkgs/by-name/ba/bashrun2/remote-permissions.patch
new file mode 100644
index 000000000000..888280feaa2d
--- /dev/null
+++ b/pkgs/by-name/ba/bashrun2/remote-permissions.patch
@@ -0,0 +1,12 @@
+diff --git a/src/remote b/src/remote
+index 07674ca..07a6b25 100644
+--- a/src/remote
++++ b/src/remote
+@@ -97,6 +97,7 @@ function §remote.interface.create {
+     local bookmarks="$bashrun_cache_home/remote-bookmarks.bash"
+ 
+     /bin/cp "$bashrun_site/interface" "$interface"
++    chmod +w "$interface"
+     printf '%s\n' "$bashrun_remote_interface" >> "$interface"
+ 
+     printf '%s\n' "source $bindings" >> "$interface"

From b5b9581eeaaf17f62cc598a5ba820f4da3e50b70 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 5 Dec 2024 18:40:28 -0500
Subject: [PATCH 1238/1504] python312Packages.pylibjpeg: add
 optional-dependencies

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

diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix
index 155b3f1fe8c0..2e253d8d63b3 100644
--- a/pkgs/development/python-modules/pylibjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg/default.nix
@@ -9,6 +9,7 @@
   pydicom,
   pylibjpeg-data,
   pylibjpeg-libjpeg,
+  pylibjpeg-openjpeg,
 }:
 
 buildPythonPackage rec {
@@ -29,6 +30,12 @@ buildPythonPackage rec {
 
   dependencies = [ numpy ];
 
+  optional-dependencies = {
+    libjpeg = [ pylibjpeg-libjpeg ];
+    openjpeg = [ pylibjpeg-openjpeg ];
+    #rle = [ pylibjpeg-rle ]; # not in Nixpkgs
+  };
+
   nativeCheckInputs = [
     pytestCheckHook
     pydicom

From 080f7e9b06ff531439ff78385f97f5e0d8fa2bfa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 2 Jan 2025 20:02:29 +0000
Subject: [PATCH 1239/1504] openroad: unpin Boost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Doesn’t fully build for me due to the tests mentioned in
<https://github.com/NixOS/nixpkgs/pull/369735#issuecomment-2568320644>,
but gets past all the C++ compilation and fails on the same tests
as without this change, so this seeems safe to get rid of the sole
remaining user of Boost 1.80. Upstream pins no specific version in
their build system (though their Dockerfile installs the version from
CentOS 7, which is the truly ancient Boost 1.53).
---
 pkgs/applications/science/electronics/openroad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix
index 4558a9f69b4b..e6278d57f160 100644
--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/applications/science/electronics/openroad/default.nix
@@ -9,7 +9,7 @@
   git,
   python3,
   swig,
-  boost180,
+  boost,
   cbc, # for clp
   cimg,
   clp, # for or-tools
@@ -70,7 +70,7 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    boost180
+    boost
     cbc
     cimg
     clp

From bf9cdfc24c3d5b8088bb8ed3e0958d3f586c7d60 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 2 Jan 2025 14:46:23 -0400
Subject: [PATCH 1240/1504] dotnetCorePackages.dotnet_8.vmr: fix build on llvm
 19

This is a backport of [1], which fixes:

> comreflectioncache.hpp:40:15: error: no member named 'EnterRead' in 'ReflectionCache<Element, CacheType, CacheSize>'; did you mean 'TryEnterRead'?

[1] https://github.com/dotnet/runtime/commit/043ae8c50dbe1c7377cf5ad436c5ac1c226aef79
---
 .../compilers/dotnet/fix-clang19-build.patch  | 48 +++++++++++++++++++
 pkgs/development/compilers/dotnet/vmr.nix     |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/compilers/dotnet/fix-clang19-build.patch

diff --git a/pkgs/development/compilers/dotnet/fix-clang19-build.patch b/pkgs/development/compilers/dotnet/fix-clang19-build.patch
new file mode 100644
index 000000000000..40964acb24dd
--- /dev/null
+++ b/pkgs/development/compilers/dotnet/fix-clang19-build.patch
@@ -0,0 +1,48 @@
+From 36354a7aca58753893148d62a889ca9e27381ac0 Mon Sep 17 00:00:00 2001
+From: David McFarland <corngood@gmail.com>
+Date: Thu, 2 Jan 2025 15:30:16 -0400
+Subject: [PATCH] fix clang19 build
+
+---
+ src/runtime/src/coreclr/vm/comreflectioncache.hpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/runtime/src/coreclr/vm/comreflectioncache.hpp b/src/runtime/src/coreclr/vm/comreflectioncache.hpp
+index 08d173e616..12db55251d 100644
+--- a/src/runtime/src/coreclr/vm/comreflectioncache.hpp
++++ b/src/runtime/src/coreclr/vm/comreflectioncache.hpp
+@@ -26,6 +26,7 @@ public:
+ 
+     void Init();
+ 
++#ifndef DACCESS_COMPILE
+     BOOL GetFromCache(Element *pElement, CacheType& rv)
+     {
+         CONTRACTL
+@@ -102,6 +103,7 @@ public:
+         AdjustStamp(TRUE);
+         this->LeaveWrite();
+     }
++#endif // !DACCESS_COMPILE
+ 
+ private:
+     // Lock must have been taken before calling this.
+@@ -141,6 +143,7 @@ private:
+         return CacheSize;
+     }
+ 
++#ifndef DACCESS_COMPILE
+     void AdjustStamp(BOOL hasWriterLock)
+     {
+         CONTRACTL
+@@ -170,6 +173,7 @@ private:
+         if (!hasWriterLock)
+             this->LeaveWrite();
+     }
++#endif // !DACCESS_COMPILE
+ 
+     void UpdateHashTable(SIZE_T hash, int slot)
+     {
+-- 
+2.47.0
+
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 45c10ebd3b39..1e71d0bd6509 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -148,6 +148,7 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (lib.versionOlder version "9") [
       ./fix-aspnetcore-portable-build.patch
+      ./fix-clang19-build.patch
     ];
 
   postPatch =

From 0ca182415a762b5fcea9163c70c04478e4741308 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 21:36:42 +0100
Subject: [PATCH 1241/1504] python312Packages.iottycloud: 0.2.1 -> 0.3.0

Changelog: https://github.com/pburgio/iottyCloud/releases/tag/0.3.0
---
 pkgs/development/python-modules/iottycloud/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix
index 0f9b72bd9186..449784de27ed 100644
--- a/pkgs/development/python-modules/iottycloud/default.nix
+++ b/pkgs/development/python-modules/iottycloud/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "iottycloud";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pburgio";
     repo = "iottyCloud";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/${version}";
     hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo=";
   };
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/pburgio/iottyCloud/releases/tag/v${version}";
+    changelog = "https://github.com/pburgio/iottyCloud/releases/tag/${version}";
     description = "Python library to interact with iotty CloudApi";
     homepage = "https://github.com/pburgio/iottyCloud";
     license = lib.licenses.agpl3Only;

From 0557e6648211d0976e6f7b478196acf75f89a890 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 3 Nov 2024 14:20:11 -0500
Subject: [PATCH 1242/1504] python312Packages.pydicom: 2.4.4 -> 3.0.1

---
 .../python-modules/pydicom/default.nix        | 67 +++++++++++--------
 .../pydicom/pillow-10.1.0-compat.patch        | 29 --------
 2 files changed, 40 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch

diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index 94822a24d444..13fbb8e4d0d5 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -3,54 +3,59 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonOlder,
   flit-core,
   numpy,
-  pillow,
   pytestCheckHook,
-  pythonOlder,
-  setuptools,
+
+  # optional/test dependencies
+  gdcm,
+  pillow,
+  pylibjpeg,
+  pylibjpeg-libjpeg,
 }:
-
 let
-  pname = "pydicom";
-  version = "2.4.4";
-
-  src = fetchFromGitHub {
-    owner = "pydicom";
-    repo = "pydicom";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-iJE1horEmdL7bKPn+NlZLgmtCbLZCZWQ8NjDBQPzXk8=";
-  };
-
   # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded
   # before the package creation, it'll try to download during the checkPhase.
   test_data = fetchFromGitHub {
     owner = "pydicom";
     repo = "pydicom-data";
-    rev = "cbb9b2148bccf0f550e3758c07aca3d0e328e768";
-    hash = "sha256-nF/j7pfcEpWHjjsqqTtIkW8hCEbuQ3J4IxpRk0qc1CQ=";
+    rev = "8da482f208401d63cd63f3f4efc41b6856ef36c7";
+    hash = "sha256-ji7SppKdiszaXs8yCSIPkJj4Ld++XWNw9FuxLoFLfFo=";
   };
 in
-buildPythonPackage {
-  inherit pname version src;
+buildPythonPackage rec {
+  pname = "pydicom";
+  version = "3.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
-  patches = [
-    # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c
-    ./pillow-10.1.0-compat.patch
-  ];
+  src = fetchFromGitHub {
+    owner = "pydicom";
+    repo = "pydicom";
+    tag = "v${version}";
+    hash = "sha256-SvRevQehRaSp+vCtJRQVEJiC5noIJS+bGG1/q4p7/XU=";
+  };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
-    pillow
-    setuptools
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  optional-dependencies = {
+    pixeldata = [
+      pillow
+      #pyjpegls # not in nixpkgs
+      #pylibjpeg.optional-dependencies.openjpeg # infinite recursion
+      #pylibjpeg.optional-dependencies.rle # not in nixpkgs
+      pylibjpeg-libjpeg
+      gdcm
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pixeldata;
 
   # Setting $HOME to prevent pytest to try to create a folder inside
   # /homeless-shelter which is read-only.
@@ -65,6 +70,14 @@ buildPythonPackage {
     [
       # tries to remove a dicom inside $HOME/.pydicom/data/ and download it again
       "test_fetch_data_files"
+
+      # test_reference_expl{,_binary}[parametric_map_float.dcm] tries to download that file for some reason even though it's present in test-data
+      "test_reference_expl"
+      "test_reference_expl_binary"
+
+      # slight error in regex matching
+      "test_no_decoders_raises"
+      "test_deepcopy_bufferedreader_raises"
     ]
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       # https://github.com/pydicom/pydicom/issues/1386
diff --git a/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch
deleted file mode 100644
index 2599f955f7dd..000000000000
--- a/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/pydicom/pixel_data_handlers/pillow_handler.py b/pydicom/pixel_data_handlers/pillow_handler.py
-index ff781025d..a44eb9a41 100644
---- a/pydicom/pixel_data_handlers/pillow_handler.py
-+++ b/pydicom/pixel_data_handlers/pillow_handler.py
-@@ -119,18 +119,12 @@ def _decompress_single_frame(
-     # space prior to compression, setting the value of "mode" to YCbCr
-     # signals Pillow to not apply any color transformation upon
-     # decompression.
--    if (transfer_syntax in PillowJPEGTransferSyntaxes and
--            photometric_interpretation == 'RGB'):
--        if 'adobe_transform' not in image.info:
--            color_mode = 'YCbCr'
--            image.tile = [(
--                'jpeg',
--                image.tile[0][1],
--                image.tile[0][2],
--                (color_mode, ''),
--            )]
--            image.mode = color_mode
--            image.rawmode = color_mode
-+    if (
-+        transfer_syntax in PillowJPEGTransferSyntaxes
-+        and photometric_interpretation == 'RGB'
-+        and "adobe_transform" not in image.info
-+    ):
-+        image.draft("YCbCr", image.size)
-     return image
- 
- 

From 14729df8ea2b46235d85a3692fa8cf4752712279 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 27 Dec 2024 11:21:50 -0500
Subject: [PATCH 1243/1504] python312Packages.nibabel: 5.2.1 -> 5.3.2

---
 .../python-modules/nibabel/default.nix            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index c0a51cd1dd39..f3a7147491e7 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -22,22 +22,22 @@
 
 buildPythonPackage rec {
   pname = "nibabel";
-  version = "5.2.1";
+  version = "5.3.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tsgLLnKOS8K2XxFC2bjSKHqRAqi/hHfhFe8NgzRVmXU=";
+    hash = "sha256-C9ymUDsceEtEbHRaRUI2fed1bPug1yFDuR+f+3i+Vps=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     packaging
   ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
@@ -65,11 +65,6 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
-  disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [
-    # uses distutils
-    "nisext/tests/test_sexts.py"
-  ];
-
   meta = with lib; {
     homepage = "https://nipy.org/nibabel";
     changelog = "https://github.com/nipy/nibabel/blob/${version}/Changelog";

From 6fa672169e01779d9468c440abca943b6362b69e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 21:41:48 +0100
Subject: [PATCH 1244/1504] python312Packages.twitchapi: 4.3.1 -> 4.4.0

Diff: https://github.com/Teekeks/pyTwitchAPI/compare/refs/tags/v4.3.1...v4.4.0

Changelog: https://github.com/Teekeks/pyTwitchAPI/blob/refs/tags/v4.4.0/docs/changelog.rst
---
 pkgs/development/python-modules/twitchapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix
index 7fa9b9d0f22c..6b0d6db6ceed 100644
--- a/pkgs/development/python-modules/twitchapi/default.nix
+++ b/pkgs/development/python-modules/twitchapi/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "twitchapi";
-  version = "4.3.1";
+  version = "4.4.0";
 
   disabled = pythonOlder "3.7";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Teekeks";
     repo = "pyTwitchAPI";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pXbrI4WbId6nYbDSpF9cYnQBOkbNGvzW6/opCztZ1ck=";
+    hash = "sha256-yN7KsiPnhGSm8wj44zn1TzGhRDIMflkKiRnBlVT5i2o=";
   };
 
   postPatch = ''

From c29e08f7e4db6a9efaabb66d06a29941d88351b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Dec 2024 15:07:13 +0000
Subject: [PATCH 1245/1504] stanc: 2.35.0 -> 2.36.0

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

diff --git a/pkgs/by-name/st/stanc/package.nix b/pkgs/by-name/st/stanc/package.nix
index 9fd2e5af9b31..8ac7add6d2ae 100644
--- a/pkgs/by-name/st/stanc/package.nix
+++ b/pkgs/by-name/st/stanc/package.nix
@@ -6,7 +6,7 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "stanc";
-  version = "2.35.0";
+  version = "2.36.0";
 
   minimalOCamlVersion = "4.12";
   duneVersion = "3";
@@ -15,7 +15,7 @@ ocamlPackages.buildDunePackage rec {
     owner = "stan-dev";
     repo = "stanc3";
     rev = "v${version}";
-    hash = "sha256-QN/yY4tn0U5yOE0FKkOvvEFXDaj5GDBdeqI2UqjVN2c=";
+    hash = "sha256-IrpHV00Fn3Nxail4Xgv/8ezclKpyVuQa1F34kF07wwA=";
   };
 
   nativeBuildInputs = with ocamlPackages; [ menhir ];

From 2d34f69f77fccd9924ef82fc15f6f1ac96c26a60 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 18 Dec 2024 05:42:14 +0100
Subject: [PATCH 1246/1504] cmdstan: 2.35.0 -> 2.36.0

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

diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 6ddbcaedff10..1a4780cece1b 100644
--- a/pkgs/by-name/cm/cmdstan/package.nix
+++ b/pkgs/by-name/cm/cmdstan/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "cmdstan";
-  version = "2.35.0";
+  version = "2.36.0";
 
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-bmzkXbR4KSnpfXjs2MAx8mbNSbNrIWDP/O8S+JGWrcg=";
+    hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo=";
   };
 
   postPatch = ''

From 595b69c36596a3814bf09193ee735e904907db96 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 2 Jan 2025 16:15:51 -0300
Subject: [PATCH 1247/1504] livebook: 0.14.4 -> 0.14.5, tweak, fix update
 script

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/li/livebook/package.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/li/livebook/package.nix b/pkgs/by-name/li/livebook/package.nix
index c346aa664be0..8dfe7a9cf5cc 100644
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@@ -7,10 +7,11 @@
   erlang,
   fetchFromGitHub,
   nixosTests,
+  nix-update-script,
 }:
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.14.4";
+  version = "0.14.5";
 
   inherit elixir;
 
@@ -21,14 +22,14 @@ beamPackages.mixRelease rec {
   src = fetchFromGitHub {
     owner = "livebook-dev";
     repo = "livebook";
-    rev = "v${version}";
-    hash = "sha256-XpBJlPLr7E3OqTnLxnSmKCgDyiU1hT8WfOhWeRGYROA=";
+    tag = "v${version}";
+    hash = "sha256-VSxW+X5zt6npV4tVVgTEvQhjA+jTramSX5h92BWWaQM=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-jB6IOBX3LwdrEtaWY3gglo1HO2OhdiK8j3BgzfZ1nAU=";
+    hash = "sha256-FrkM82LO7GIFpKQfhlEUrAuKu33BzPBs6OrWW4C6pI0=";
   };
 
   postInstall = ''
@@ -42,18 +43,21 @@ beamPackages.mixRelease rec {
       --set MIX_REBAR3 ${rebar3}/bin/rebar3
   '';
 
-  passthru.tests = {
-    livebook-service = nixosTests.livebook-service;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      livebook-service = nixosTests.livebook-service;
+    };
   };
 
-  meta = with lib; {
-    license = licenses.asl20;
+  meta = {
+    license = lib.licenses.asl20;
     homepage = "https://livebook.dev/";
     description = "Automate code & data workflows with interactive Elixir notebooks";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       munksgaard
       scvalex
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

From 2abfb5b366c73d1c98a6e04ca9ca42117885793a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 21:58:07 +0100
Subject: [PATCH 1248/1504] python312Packages.xsdata: 24.11 -> 24.12

Diff: https://github.com/tefra/xsdata/compare/refs/tags/v24.11...v24.12

Changelog: https://github.com/tefra/xsdata/blob/refs/tags/v24.12/CHANGES.md
---
 pkgs/development/python-modules/xsdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix
index 9524fc6b2200..b42851b6daf1 100644
--- a/pkgs/development/python-modules/xsdata/default.nix
+++ b/pkgs/development/python-modules/xsdata/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "xsdata";
-  version = "24.11";
+  version = "24.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "tefra";
     repo = "xsdata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hyNC9VcWkGnOYm6BpXgH3RzmHTqBVmQoADvcEvgF6yg=";
+    hash = "sha256-ARq7QNwEtnXo0Q04CNWf3bAwyjl92YnFUp/Y51sgsLU=";
   };
 
   patches = [

From df9822a7b119c51227a6dab5a091f6a14947ff9c Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:49:40 -0500
Subject: [PATCH 1249/1504] maintainers: add tebriel

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8e176d01b908..463589fd1dcf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22306,6 +22306,12 @@
     github = "teatwig";
     githubId = 18734648;
   };
+  tebriel = {
+    email = "tebriel@frodux.in";
+    name = "tebriel";
+    github = "tebriel";
+    githubId = 821688;
+  };
   techknowlogick = {
     email = "techknowlogick@gitea.com";
     github = "techknowlogick";

From 4909d74216e14f21f706d9ebf5a638327766a2d2 Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:26:34 -0800
Subject: [PATCH 1250/1504] kotlin: refactor to use finalAttrs

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 32d75157dd7c..329e1a731e5a 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, makeWrapper, jre, unzip }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
   version = "2.1.0";
 
   src = fetchurl {
-    url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
+    url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
     sha256 = "sha256-tmmNVyitj57c3QFhfWOAcxkdigMTnMU4o5G043Wa0pc=";
   };
 
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ SubhrajyotiSen ];
     platforms = lib.platforms.all;
   };
-}
+})

From cee5e731ccd21bbcc54604260860241ffdce315d Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:42:55 -0500
Subject: [PATCH 1251/1504] komga: 1.15.0 -> 1.15.1

---
 pkgs/by-name/ko/komga/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 467af02ffc6e..8afc916c7a66 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -3,17 +3,17 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  jdk17_headless,
+  jdk23_headless,
   nixosTests,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-mgPGhBdZ7FyxkVNPJkfFjQ6mJDbQ049PKzacTN6cajk=";
+    sha256 = "sha256-Gv0AaW3aTjLjNAzC5FJMVfvZyIN23ezPpRk15OYyKKs=";
   };
 
   nativeBuildInputs = [
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   buildCommand = ''
-    makeWrapper ${jdk17_headless}/bin/java $out/bin/komga --add-flags "-jar $src"
+    makeWrapper ${jdk23_headless}/bin/java $out/bin/komga --add-flags "-jar $src"
   '';
 
   passthru.tests = {
@@ -32,9 +32,9 @@ stdenvNoCC.mkDerivation rec {
     description = "Free and open source comics/mangas server";
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
-    platforms = jdk17_headless.meta.platforms;
+    platforms = jdk23_headless.meta.platforms;
     maintainers = with lib.maintainers; [ govanify ];
     mainProgram = "komga";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
-
 }

From e4d3f51bbd74c6d74fbd17e09319fe41685ec381 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 22:01:23 +0100
Subject: [PATCH 1252/1504] python312Packages.cmdstanpy: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix
index 6fcf618bafef..a38a717fc252 100644
--- a/pkgs/development/python-modules/cmdstanpy/default.nix
+++ b/pkgs/development/python-modules/cmdstanpy/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "cmdstanpy";
-  version = "1.2.4";
+  version = "1.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstanpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SKDqLvWbzaBcL13E87kcphBJNIZfdkPp2g4SIDEKA0U=";
+    hash = "sha256-/MiWawB1Y4/eMBHXQLjd+P+Pe8EtsLbGFrzQa1RNf6g=";
   };
 
   patches = [

From 98891a2ea0407d3f9abdef13092f2c1a59e0f647 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:43:59 -0500
Subject: [PATCH 1253/1504] komga: add tebriel to maintainers

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

diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 8afc916c7a66..38764f7e8612 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -33,7 +33,10 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
     platforms = jdk23_headless.meta.platforms;
-    maintainers = with lib.maintainers; [ govanify ];
+    maintainers = with lib.maintainers; [
+      tebriel
+      govanify
+    ];
     mainProgram = "komga";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };

From dab6fb969070751a3b9efabf3d87a5f208774f50 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 22:02:30 +0100
Subject: [PATCH 1254/1504] python312Packages.keba-kecontact: 4.0.2 -> 4.2.1

Diff: https://github.com/dannerph/keba-kecontact/compare/refs/tags/4.0.2...4.2.1

Changelog: https://github.com/dannerph/keba-kecontact/releases/tag/4.2.1
---
 pkgs/development/python-modules/keba-kecontact/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keba-kecontact/default.nix b/pkgs/development/python-modules/keba-kecontact/default.nix
index 7768da48715d..8f95da8d2bb2 100644
--- a/pkgs/development/python-modules/keba-kecontact/default.nix
+++ b/pkgs/development/python-modules/keba-kecontact/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "keba-kecontact";
-  version = "4.0.2";
+  version = "4.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "dannerph";
     repo = "keba-kecontact";
     rev = "refs/tags/${version}";
-    hash = "sha256-HzfoWijsrtDNElqyxWB7f07OTMIoS/fEjmdX59G+Hw0=";
+    hash = "sha256-2XWZt9H+1m4TX0C3cjEIlkrXp6BSArUsbLi+VKGDqhE=";
   };
 
   build-system = [ hatchling ];

From 8c98f9da9ef797694c6dc1cc800c9a34c7e048dc Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Sat, 28 Dec 2024 20:35:09 +0100
Subject: [PATCH 1255/1504] python3Packages.nifty8: 8.5.2 -> 8.5.4

---
 pkgs/development/python-modules/nifty8/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nifty8/default.nix b/pkgs/development/python-modules/nifty8/default.nix
index 70e9140123db..9e816b01b7fb 100644
--- a/pkgs/development/python-modules/nifty8/default.nix
+++ b/pkgs/development/python-modules/nifty8/default.nix
@@ -27,15 +27,15 @@
 
 buildPythonPackage rec {
   pname = "nifty8";
-  version = "8.5.2";
+  version = "8.5.4";
   pyproject = true;
 
   src = fetchFromGitLab {
     domain = "gitlab.mpcdf.mpg.de";
     owner = "ift";
     repo = "nifty";
-    rev = "v${version}";
-    hash = "sha256-EWsJX+iqKOhQXEWlQfYUiPYqyfOfrwLtbI+DVn7vCQI=";
+    tag = "v${version}";
+    hash = "sha256-Q42ZhQ/T8JmkG75BexevbvVKQqfDmMG6+oTYR0Ze718=";
   };
 
   build-system = [ setuptools ];
@@ -76,7 +76,15 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://gitlab.mpcdf.mpg.de/ift/nifty";
+    changelog = "https://gitlab.mpcdf.mpg.de/ift/nifty/-/blob/${src.tag}/ChangeLog.md";
     description = "Bayesian Imaging library for high-dimensional posteriors";
+    longDescription = ''
+      NIFTy, "Numerical Information Field Theory", is a Bayesian imaging library.
+      It is designed to infer the million to billion dimensional posterior
+      distribution in the image space from noisy input data.  At the core of
+      NIFTy lies a set of powerful Gaussian Process (GP) models and accurate
+      Variational Inference (VI) algorithms.
+    '';
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ parras ];
   };

From 84866ae3b1a10ec40eb9c9cebeb167b4d0c66ef1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 22:17:50 +0100
Subject: [PATCH 1256/1504] python312Packages.json-api-doc: init at 0.15.0

JSON API parser returning a simple Python dictionary

https://github.com/julien-duponchelle/json-api-doc
---
 .../python-modules/json-api-doc/default.nix   | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/json-api-doc/default.nix

diff --git a/pkgs/development/python-modules/json-api-doc/default.nix b/pkgs/development/python-modules/json-api-doc/default.nix
new file mode 100644
index 000000000000..ba8b757ed7bd
--- /dev/null
+++ b/pkgs/development/python-modules/json-api-doc/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "json-api-doc";
+  version = "0.15.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "julien-duponchelle";
+    repo = "json-api-doc";
+    tag = "v${version}";
+    hash = "sha256-r6XduJ2GIr2hGen6hoNIdE3yqPzHJ9xAFOSbMgErsNA=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "'pytest-runner'," ""
+  '';
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "json_api_doc" ];
+
+  meta = {
+    description = "JSON API parser returning a simple Python dictionary";
+    homepage = "https://github.com/julien-duponchelle/json-api-doc";
+    changelog = "https://github.com/julien-duponchelle/json-api-doc/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b60d3574d51a..1617cb1db180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6691,6 +6691,8 @@ self: super: with self; {
 
   jsonlines = callPackage ../development/python-modules/jsonlines { };
 
+  json-api-doc = callPackage ../development/python-modules/json-api-doc { };
+
   json-logging = callPackage ../development/python-modules/json-logging { };
 
   jsonmerge = callPackage ../development/python-modules/jsonmerge { };

From b73aee9fde619e974b4d6a3a1789ab680813ef56 Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:30:35 -0800
Subject: [PATCH 1257/1504] jetbrains.idea-community: fix build (#367486)

---
 .../editors/jetbrains/source/build.nix            | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix
index 41550a6303a9..ad44e4ab435f 100644
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -32,6 +32,13 @@
 }:
 
 let
+  kotlin_2_0_21 = kotlin.overrideAttrs (oldAttrs: {
+    version = "2.0.21";
+    src = fetchurl {
+      url = oldAttrs.src.url;
+      sha256 = "sha256-A1LApFvSL4D2sm5IXNBNqAR7ql3lSGUoH7n4mkp7zyo=";
+    };
+  });
 
   jbr = jetbrains.jdk-no-jcef-17;
 
@@ -147,7 +154,7 @@ let
     sourceRoot = "${src.name}/platform/jps-bootstrap";
     nativeBuildInputs = [ ant makeWrapper jbr ];
     patches = [ ../patches/kotlinc-path.patch ];
-    postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
+    postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin_2_0_21}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
     buildPhase = ''
       runHook preInstall
 
@@ -234,7 +241,7 @@ stdenvNoCC.mkDerivation rec {
     substituteInPlace \
       platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt \
       --replace-fail 'JPS_PLUGIN_CLASSPATH_HERE' '${kotlin-jps-plugin-classpath}' \
-      --replace-fail 'KOTLIN_PATH_HERE' '${kotlin}'
+      --replace-fail 'KOTLIN_PATH_HERE' '${kotlin_2_0_21}'
     substituteInPlace \
       platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt \
       --replace-fail 'JDK_PATH_HERE' '${jbr}/lib/openjdk'
@@ -259,7 +266,7 @@ stdenvNoCC.mkDerivation rec {
     export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source
     jps-bootstrap \
       -Dbuild.number=${buildNumber} \
-      -Djps.kotlin.home=${kotlin} \
+      -Djps.kotlin.home=${kotlin_2_0_21} \
       -Dintellij.build.target.os=linux \
       -Dintellij.build.target.arch=x64 \
       -Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step,sources_archive \
@@ -275,7 +282,7 @@ stdenvNoCC.mkDerivation rec {
     runHook preBuild
 
     java \
-      -Djps.kotlin.home=${kotlin} \
+      -Djps.kotlin.home=${kotlin_2_0_21} \
       "@java_argfile"
 
     runHook postBuild

From 33510a9252e717586abb2abec73ee3888fed32b6 Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Thu, 2 Jan 2025 22:18:42 +0100
Subject: [PATCH 1258/1504] python3Packages.wat: 0.3.0 -> 0.4.3

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

diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix
index 4231336c31ce..243f4aab3044 100644
--- a/pkgs/development/python-modules/wat/default.nix
+++ b/pkgs/development/python-modules/wat/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "wat";
-  version = "0.3.0";
+  version = "0.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "igrek51";
     repo = "wat";
     rev = version;
-    hash = "sha256-WCMMj4KtfWOp6LsS4XHD/M/iepstVasHknEvEUTMMM8=";
+    hash = "sha256-AiCu62Kemlziv7whFmXwsumJSAFxLWPkwm4gFh1IGko=";
   };
 
   build-system = [ setuptools ];

From f4992924b349403fb365338aa101cebe5322bf2a Mon Sep 17 00:00:00 2001
From: Johan Larsson <jolars@posteo.com>
Date: Thu, 2 Jan 2025 22:07:20 +0100
Subject: [PATCH 1259/1504] vimPlugins.nvim-trevJ-lua: init at 2024-12-23

vimPlugins.nvim-trevJ-lua: init at 2024-12-23

chore: put dependency on single line
---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix  |  5 +++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5a9bd0328c25..5ffbeb90305a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -9785,6 +9785,18 @@ final: prev:
     meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/";
   };
 
+  nvim-trevJ-lua = buildVimPlugin {
+    pname = "nvim-trevJ.lua";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AckslD";
+      repo = "nvim-trevJ.lua";
+      rev = "86445d0143d47aede944b6daa5c0a463e9d3e730";
+      sha256 = "0wrmzk7wyr4mk8y0c7hq0qqk19ngdwvvd80690vqs3vby89a5zkj";
+    };
+    meta.homepage = "https://github.com/AckslD/nvim-trevJ.lua/";
+  };
+
   nvim-ts-autotag = buildVimPlugin {
     pname = "nvim-ts-autotag";
     version = "2024-12-02";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index f9f3f0dff68a..0fd5010f7d51 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2308,6 +2308,11 @@ in
     dependencies = [ self.nvim-treesitter ];
   };
 
+  nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs {
+    dependencies = [ self.nvim-treesitter ];
+    nvimRequireCheck = "trevj";
+  };
+
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = [ self.promise-async ];
     nvimRequireCheck = "ufo";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 46f11e2e3b4c..26579292c051 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -812,6 +812,7 @@ https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
 https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD,
 https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
 https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
+https://github.com/AckslD/nvim-trevJ.lua/,HEAD,
 https://github.com/windwp/nvim-ts-autotag/,,
 https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
 https://github.com/kevinhwang91/nvim-ufo/,HEAD,

From 0675fe18c7fa266f32b71ccc36e17bf08d9f07a7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 22:43:21 +0100
Subject: [PATCH 1260/1504] python312Packages.pyflick: 0.0.2 -> 1.1.2

Changelog: https://github.com/ZephireNZ/PyFlick/releases/tag/v1.1.2
---
 .../python-modules/pyflick/default.nix        | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix
index f9f7f084e0be..4b11027d55f0 100644
--- a/pkgs/development/python-modules/pyflick/default.nix
+++ b/pkgs/development/python-modules/pyflick/default.nix
@@ -1,27 +1,36 @@
 {
   lib,
-  buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
   aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  json-api-doc,
   python-dateutil,
+  setuptools-scm,
+  setuptools,
 }:
 
 buildPythonPackage rec {
-  pname = "pyflick";
-  version = "0.0.2";
-  format = "setuptools";
+  pname = "py-flick";
+  version = "1.1.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    pname = "PyFlick";
-    inherit version;
-    sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f";
+  src = fetchFromGitHub {
+    owner = "ZephireNZ";
+    repo = "PyFlick";
+    tag = "v${version}";
+    hash = "sha256-Csm5gXMIGEhHgzN/7sO/1iM/wZklI2Jc0C69tgYWxnQ=";
   };
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "aiohttp" ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     aiohttp
+    json-api-doc
     python-dateutil
   ];
 
@@ -33,10 +42,11 @@ buildPythonPackage rec {
     "pyflick.authentication"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python API For Flick Electric in New Zealand";
     homepage = "https://github.com/ZephireNZ/PyFlick";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/ZephireNZ/PyFlick/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 2ce46489b3ebc4903355f05ab33f1458ed860b80 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 2 Jan 2025 23:37:42 +0100
Subject: [PATCH 1261/1504] iterm2: 3.5.10 -> 3.5.11

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

diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix
index fefa6abd446a..12243e25da32 100644
--- a/pkgs/by-name/it/iterm2/package.nix
+++ b/pkgs/by-name/it/iterm2/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "iterm2";
-  version = "3.5.10";
+  version = "3.5.11";
 
   src = fetchzip {
     url = "https://iterm2.com/downloads/stable/iTerm2-${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
-    hash = "sha256-tvHAuHitB5Du8hqaBXmWzplrmaLF6QxV8SNsRyfCUfM=";
+    hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI=";
   };
 
   dontFixup = true;

From 61c974229bbd484c9e256078dcfe6754da1a7054 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 22:51:28 +0000
Subject: [PATCH 1262/1504] dnsproxy: 0.73.5 -> 0.74.1

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

diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix
index 51a95bb88187..a0d31cb054b1 100644
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "dnsproxy";
-  version = "0.73.5";
+  version = "0.74.1";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "dnsproxy";
     rev = "v${version}";
-    hash = "sha256-U3OqRfJUtH0rMdVypaoFF3Mi6oBvgt08ufnERPFVjC4=";
+    hash = "sha256-s6VJXlWzrbHu/kOeng3gnySd5YMJFaUelZy/GoL611c=";
   };
 
   vendorHash = "sha256-d1WrUfE31Gvgz8tw7cVdPhWf4OHsuuyEHDSn9bETCjI=";

From 085d37112f50fdc584b289ae0bdaf3ef49c0197b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:00:04 +0100
Subject: [PATCH 1263/1504] python312Packages.boto3-stubs: 1.35.90 -> 1.35.91

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index d993a647f170..a77a5e07cfbf 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.35.90";
+  version = "1.35.91";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-I6ODTVHGA7gIhH313Va2x12cOeiXhI5lVw2GtBXV9Gk=";
+    hash = "sha256-eA9xQGFHt4+YYNeJB7XAFYdFN9ghNkWI7IN8TNHuz5E=";
   };
 
   build-system = [ setuptools ];

From 64642dba63b732e5a81c8c2d3dbbbcab433bd212 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:00:10 +0100
Subject: [PATCH 1264/1504] python312Packages.botocore-stubs: 1.35.90 ->
 1.35.91

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index f8618c4f3559..171a03bc1357 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.35.90";
+  version = "1.35.91";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-xrKUyuQ26q+H3LcX5DSMJQ6h/BcDNledoRS2k2Y9jkI=";
+    hash = "sha256-3hUCkyBdsQlvcNEMAwYHBXm4Jfopg+Axx/3+Z+grxVo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 0141bbaa789b9f816e0f9787fded0f34ed0d3a96 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:01:12 +0100
Subject: [PATCH 1265/1504] python312Packages.mypy-boto3-appsync: 1.35.77 ->
 1.35.91

---
 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 82520dd560de..1451c9853ac0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -134,8 +134,8 @@ rec {
       "sha256-5rsHt8WPBvbXMsqvw2ccOCaSzEE7dlzTre+qhXjQV3g=";
 
   mypy-boto3-appsync =
-    buildMypyBoto3Package "appsync" "1.35.77"
-      "sha256-DmwHwbpBnxzyJnxAVqptfH9ZBD1HweVZJaDhNefTaGg=";
+    buildMypyBoto3Package "appsync" "1.35.91"
+      "sha256-LMYIrTdXgawatXvXQdcay4ltNhBnnRnJopma86QrdlQ=";
 
   mypy-boto3-arc-zonal-shift =
     buildMypyBoto3Package "arc-zonal-shift" "1.35.0"

From af9f4a16758a2976e51a91c0d6d8a35b86b58c2b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:03:31 +0100
Subject: [PATCH 1266/1504] python312Packages.mypy-boto3-gamelift: 1.35.59 ->
 1.35.91

---
 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 1451c9853ac0..cee7296a5fdf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -562,8 +562,8 @@ rec {
       "sha256-J2Vkx1tNMM+0GBKAQD1HWFN6jmJwY+XkghmKgP21NP0=";
 
   mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.35.59"
-      "sha256-OyORzgahpj8UmmKkbdl0FrYaRWtrS07/LSYIkYgcwOY=";
+    buildMypyBoto3Package "gamelift" "1.35.91"
+      "sha256-+4h0LyHrEb9qiaU9UgD9beUP9Xb0BI52GQ8knmdTGXo=";
 
   mypy-boto3-glacier =
     buildMypyBoto3Package "glacier" "1.35.0"

From 8dfe0e61d8be0094bc8cd53d5d26603911d8cfcc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:05:11 +0100
Subject: [PATCH 1267/1504] python312Packages.mypy-boto3-mediaconnect: 1.35.81
 -> 1.35.91

---
 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 cee7296a5fdf..5cf1a8499679 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -858,8 +858,8 @@ rec {
       "sha256-POYl0YUu3WsZ9lfseKTNuT6PaOVDfvKbqtKM064Ksak=";
 
   mypy-boto3-mediaconnect =
-    buildMypyBoto3Package "mediaconnect" "1.35.81"
-      "sha256-q4e5KzE6y5L4F1N0hTtEUgDbFKoVCFmojJy/q9Z+u08=";
+    buildMypyBoto3Package "mediaconnect" "1.35.91"
+      "sha256-uMaBmD14rqFMZ7KJw5cn6JkcY/4a39oPyWJBatQPIiY=";
 
   mypy-boto3-mediaconvert =
     buildMypyBoto3Package "mediaconvert" "1.35.85"

From da711a2fa1a1b3107cdb13209959c5ced0cfb16e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:05:13 +0100
Subject: [PATCH 1268/1504] python312Packages.mypy-boto3-mediaconvert: 1.35.85
 -> 1.35.91

---
 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 5cf1a8499679..ccdb53a0bf67 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -862,8 +862,8 @@ rec {
       "sha256-uMaBmD14rqFMZ7KJw5cn6JkcY/4a39oPyWJBatQPIiY=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.35.85"
-      "sha256-MRyDNl0i0TyP2sG+5trUCYNIPWsjgsENoqq+0DwOzIo=";
+    buildMypyBoto3Package "mediaconvert" "1.35.91"
+      "sha256-G1l3yWroXYQRgWgMQ6MZ/AXrarn1KXnVVMbTg4t62sw=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.35.85"

From 8308258f5419d186079124878926401d7e6bb135 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:05:47 +0100
Subject: [PATCH 1269/1504] python312Packages.mypy-boto3-organizations: 1.35.72
 -> 1.35.91

---
 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 ccdb53a0bf67..159571381f19 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -986,8 +986,8 @@ rec {
       "sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.35.72"
-      "sha256-sIQ3HrziVY2CE/+sIk0IRAhhI3PaCwFwxwK75K0oH/s=";
+    buildMypyBoto3Package "organizations" "1.35.91"
+      "sha256-qSL4m1GfSbdh7EKObfWOh6YP/zzkTxtH7Qk7+R+NhBc=";
 
   mypy-boto3-osis =
     buildMypyBoto3Package "osis" "1.35.0"

From 709a40777b10b820a9c4deaa492b1e8ce5917335 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:06:38 +0100
Subject: [PATCH 1270/1504] python312Packages.mypy-boto3-sagemaker: 1.35.86 ->
 1.35.91

---
 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 159571381f19..97c8bcf547b4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.35.86"
-      "sha256-V8zUpPjD5eyXcnARG7SXzjSNstZw8ffqMBBGddvFcSA=";
+    buildMypyBoto3Package "sagemaker" "1.35.91"
+      "sha256-lsSJGfbgQ0CQNbg1pq0JZYwZFkkHGrOQBekl2mXuSTM=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0"

From bf341a3aec2baeb0f73f479aca94fa5217c27964 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 3 Jan 2025 00:07:04 +0100
Subject: [PATCH 1271/1504] python312Packages.mypy-boto3-sqs: 1.35.0 -> 1.35.91

---
 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 97c8bcf547b4..f6a56d0717e8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1290,8 +1290,8 @@ rec {
       "sha256-Wn3vcHrCmMMS4LcTQhzctYPg2ZPSF7SBgQSz44bJyGo=";
 
   mypy-boto3-sqs =
-    buildMypyBoto3Package "sqs" "1.35.0"
-      "sha256-YXUvHCvy76OBX2TUPCW0o529vZ5HKuSKoY18bSp6brg=";
+    buildMypyBoto3Package "sqs" "1.35.91"
+      "sha256-AS3ntE4BNwg+L1y0m2PAUJHRQcMrVptGnf6qXqI9HM0=";
 
   mypy-boto3-ssm =
     buildMypyBoto3Package "ssm" "1.35.67"

From 87b42d403e5856b99476e869f27c78df3e14fa97 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 1 Jan 2025 13:29:37 -0800
Subject: [PATCH 1272/1504] nixos/ncps: init service

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/ncps.nix    | 326 ++++++++++++++++++
 3 files changed, 329 insertions(+)
 create mode 100644 nixos/modules/services/networking/ncps.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 9b39fb1869ea..47606fab3d74 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -51,6 +51,8 @@
 
 - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
 
+- [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable).
+
 - [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable).
 
 - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 06979a4df508..7dc6e6f0489a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1160,6 +1160,7 @@
   ./services/networking/nats.nix
   ./services/networking/nbd.nix
   ./services/networking/ncdns.nix
+  ./services/networking/ncps.nix
   ./services/networking/ndppd.nix
   ./services/networking/nebula.nix
   ./services/networking/netbird.nix
diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
new file mode 100644
index 000000000000..12b51bf05217
--- /dev/null
+++ b/nixos/modules/services/networking/ncps.nix
@@ -0,0 +1,326 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.ncps;
+
+  logLevels = [
+    "trace"
+    "debug"
+    "info"
+    "warn"
+    "error"
+    "fatal"
+    "panic"
+  ];
+
+  globalFlags = lib.concatStringsSep " " (
+    [ "--log-level='${cfg.logLevel}'" ]
+    ++ (lib.optionals cfg.openTelemetry.enable (
+      [
+        "--otel-enabled"
+      ]
+      ++ (lib.optional (
+        cfg.openTelemetry.grpcURL != null
+      ) "--otel-grpc-url='${cfg.openTelemetry.grpcURL}'")
+    ))
+  );
+
+  serveFlags = lib.concatStringsSep " " (
+    [
+      "--cache-hostname='${cfg.cache.hostName}'"
+      "--cache-data-path='${cfg.cache.dataPath}'"
+      "--cache-database-url='${cfg.cache.databaseURL}'"
+      "--server-addr='${cfg.server.addr}'"
+    ]
+    ++ (lib.optional cfg.cache.allowDeleteVerb "--cache-allow-delete-verb")
+    ++ (lib.optional cfg.cache.allowPutVerb "--cache-allow-put-verb")
+    ++ (lib.optional (cfg.cache.maxSize != null) "--cache-max-size='${cfg.cache.maxSize}'")
+    ++ (lib.optionals (cfg.cache.lru.schedule != null) [
+      "--cache-lru-schedule='${cfg.cache.lru.schedule}'"
+      "--cache-lru-schedule-timezone='${cfg.cache.lru.scheduleTimeZone}'"
+    ])
+    ++ (lib.optional (cfg.cache.secretKeyPath != null) "--cache-secret-key-path='%d/secretKey'")
+    ++ (lib.forEach cfg.upstream.caches (url: "--upstream-cache='${url}'"))
+    ++ (lib.forEach cfg.upstream.publicKeys (pk: "--upstream-public-key='${pk}'"))
+  );
+
+  isSqlite = lib.strings.hasPrefix "sqlite:" cfg.cache.databaseURL;
+
+  dbPath = lib.removePrefix "sqlite:" cfg.cache.databaseURL;
+  dbDir = dirOf dbPath;
+in
+{
+  options = {
+    services.ncps = {
+      enable = lib.mkEnableOption "ncps: Nix binary cache proxy service implemented in Go";
+
+      package = lib.mkPackageOption pkgs "ncps" { };
+
+      dbmatePackage = lib.mkPackageOption pkgs "dbmate" { };
+
+      openTelemetry = {
+        enable = lib.mkEnableOption "Enable OpenTelemetry logs, metrics, and tracing";
+
+        grpcURL = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          description = ''
+            Configure OpenTelemetry gRPC URL. Missing or "https" scheme enables
+            secure gRPC, "insecure" otherwise. Omit to emit telemetry to
+            stdout.
+          '';
+        };
+      };
+
+      logLevel = lib.mkOption {
+        type = lib.types.enum logLevels;
+        default = "info";
+        description = ''
+          Set the level for logging. Refer to
+          <https://pkg.go.dev/github.com/rs/zerolog#readme-leveled-logging> for
+          more information.
+        '';
+      };
+
+      cache = {
+        allowDeleteVerb = lib.mkEnableOption ''
+          Whether to allow the DELETE verb to delete narinfo and nar files from
+          the cache.
+        '';
+
+        allowPutVerb = lib.mkEnableOption ''
+          Whether to allow the PUT verb to push narinfo and nar files directly
+          to the cache.
+        '';
+
+        hostName = lib.mkOption {
+          type = lib.types.str;
+          description = ''
+            The hostname of the cache server. **This is used to generate the
+            private key used for signing store paths (.narinfo)**
+          '';
+        };
+
+        dataPath = lib.mkOption {
+          type = lib.types.str;
+          default = "/var/lib/ncps";
+          description = ''
+            The local directory for storing configuration and cached store paths
+          '';
+        };
+
+        databaseURL = lib.mkOption {
+          type = lib.types.str;
+          default = "sqlite:${cfg.cache.dataPath}/db/db.sqlite";
+          defaultText = "sqlite:/var/lib/ncps/db/db.sqlite";
+          description = ''
+            The URL of the database (currently only SQLite is supported)
+          '';
+        };
+
+        lru = {
+          schedule = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "0 2 * * *";
+            description = ''
+              The cron spec for cleaning the store to keep it under
+              config.ncps.cache.maxSize. Refer to
+              https://pkg.go.dev/github.com/robfig/cron/v3#hdr-Usage for
+              documentation.
+            '';
+          };
+
+          scheduleTimeZone = lib.mkOption {
+            type = lib.types.str;
+            default = "Local";
+            example = "America/Los_Angeles";
+            description = ''
+              The name of the timezone to use for the cron schedule. See
+              <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>
+              for a comprehensive list of possible values for this setting.
+            '';
+          };
+        };
+
+        maxSize = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          example = "100G";
+          description = ''
+            The maximum size of the store. It can be given with units such as
+            5K, 10G etc. Supported units: B, K, M, G, T.
+          '';
+        };
+
+        secretKeyPath = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          description = ''
+            The path to load the secretKey for signing narinfos. Leave this
+            empty to automatically generate a private/public key.
+          '';
+        };
+      };
+
+      server = {
+        addr = lib.mkOption {
+          type = lib.types.str;
+          default = ":8501";
+          description = ''
+            The address and port the server listens on.
+          '';
+        };
+      };
+
+      upstream = {
+        caches = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          example = [ "https://cache.nixos.org" ];
+          description = ''
+            A list of URLs of upstream binary caches.
+          '';
+        };
+
+        publicKeys = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          default = [ ];
+          example = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+          description = ''
+            A list of public keys of upstream caches in the format
+            `host[-[0-9]*]:public-key`. This flag is used to verify the
+            signatures of store paths downloaded from upstream caches.
+          '';
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null;
+        message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set";
+      }
+
+      {
+        assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath);
+        message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not";
+      }
+    ];
+
+    users.users.ncps = {
+      isSystemUser = true;
+      group = "ncps";
+    };
+    users.groups.ncps = { };
+
+    systemd.services.ncps-create-datadirs = {
+      description = "Created required directories by ncps";
+      serviceConfig = {
+        Type = "oneshot";
+        UMask = "0066";
+      };
+      script =
+        (lib.optionalString (cfg.cache.dataPath != "/var/lib/ncps") ''
+          if ! test -d ${cfg.cache.dataPath}; then
+            mkdir -p ${cfg.cache.dataPath}
+            chown ncps:ncps ${cfg.cache.dataPath}
+          fi
+        '')
+        + (lib.optionalString isSqlite ''
+          if ! test -d ${dbDir}; then
+            mkdir -p ${dbDir}
+            chown ncps:ncps ${dbDir}
+          fi
+        '');
+      wantedBy = [ "ncps.service" ];
+      before = [ "ncps.service" ];
+    };
+
+    systemd.services.ncps = {
+      description = "ncps binary cache proxy service";
+
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        ${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up
+      '';
+
+      serviceConfig = lib.mkMerge [
+        {
+          ExecStart = "${lib.getExe cfg.package} ${globalFlags} serve ${serveFlags}";
+          User = "ncps";
+          Group = "ncps";
+          Restart = "on-failure";
+          RuntimeDirectory = "ncps";
+        }
+
+        # credentials
+        (lib.mkIf (cfg.cache.secretKeyPath != null) {
+          LoadCredential = "secretKey:${cfg.cache.secretKeyPath}";
+        })
+
+        # ensure permissions on required directories
+        (lib.mkIf (cfg.cache.dataPath != "/var/lib/ncps") {
+          ReadWritePaths = [ cfg.cache.dataPath ];
+        })
+        (lib.mkIf (cfg.cache.dataPath == "/var/lib/ncps") {
+          StateDirectory = "ncps";
+          StateDirectoryMode = "0700";
+        })
+        (lib.mkIf (isSqlite && !lib.strings.hasPrefix "/var/lib/ncps" dbDir) {
+          ReadWritePaths = [ dbDir ];
+        })
+
+        # Hardening
+        {
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+            "~@resources"
+          ];
+          CapabilityBoundingSet = "";
+          PrivateUsers = true;
+          DevicePolicy = "closed";
+          DeviceAllow = [ "" ];
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectControlGroups = true;
+          ProtectKernelLogs = true;
+          ProtectHostname = true;
+          ProtectClock = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          RestrictSUIDSGID = true;
+          RestrictRealtime = true;
+          MemoryDenyWriteExecute = true;
+          ProcSubset = "pid";
+          RestrictNamespaces = true;
+          SystemCallArchitectures = "native";
+          PrivateNetwork = false;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          NoNewPrivileges = true;
+          LockPersonality = true;
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
+          LimitNOFILE = 65536;
+          UMask = "0066";
+        }
+      ];
+
+      unitConfig.RequiresMountsFor = lib.concatStringsSep " " (
+        [ "${cfg.cache.dataPath}" ] ++ lib.optional (isSqlite) dbDir
+      );
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ kalbasit ];
+}

From 07144733765a9fdfc4fb0e81c5242a0fa095f17e Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 1 Jan 2025 17:15:26 -0800
Subject: [PATCH 1273/1504] nixos/tests/ncps: init service test

---
 nixos/tests/all-tests.nix |  5 +++
 nixos/tests/ncps.nix      | 89 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 nixos/tests/ncps.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 147e9c11612e..5aed7937ebf4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -659,6 +659,11 @@ in {
   navidrome = handleTest ./navidrome.nix {};
   nbd = handleTest ./nbd.nix {};
   ncdns = handleTest ./ncdns.nix {};
+  ncps = runTest ./ncps.nix;
+  ncps-custom-cache-datapath = runTest {
+    imports = [ ./ncps.nix ];
+    defaults.services.ncps.cache.dataPath =  "/path/to/ncps";
+  };
   ndppd = handleTest ./ndppd.nix {};
   nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nebula = handleTest ./nebula.nix {};
diff --git a/nixos/tests/ncps.nix b/nixos/tests/ncps.nix
new file mode 100644
index 000000000000..ce637246ff44
--- /dev/null
+++ b/nixos/tests/ncps.nix
@@ -0,0 +1,89 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  name = "ncps";
+
+  nodes = {
+    harmonia = {
+      services.harmonia = {
+        enable = true;
+        signKeyPaths = [
+          (pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg==")
+        ];
+        settings.priority = 35;
+      };
+
+      networking.firewall.allowedTCPPorts = [ 5000 ];
+      system.extraDependencies = [ pkgs.emptyFile ];
+    };
+
+    ncps = {
+      services.ncps = {
+        enable = true;
+
+        cache = {
+          hostName = "ncps";
+          secretKeyPath = builtins.toString (
+            pkgs.writeText "ncps-cache-key" "ncps:dcrGsrku0KvltFhrR5lVIMqyloAdo0y8vYZOeIFUSLJS2IToL7dPHSSCk/fi+PJf8EorpBn8PU7MNhfvZoI8mA=="
+          );
+        };
+
+        upstream = {
+          caches = [ "http://harmonia:5000" ];
+          publicKeys = [
+            "cache.example.com-1:eIGQXcGQpc00x6/XFcyacLEUmC07u4RAEHt5Y8vdglo="
+          ];
+        };
+      };
+
+      networking.firewall.allowedTCPPorts = [ 8501 ];
+    };
+
+    client01 = {
+      nix.settings = {
+        substituters = lib.mkForce [ "http://ncps:8501" ];
+        trusted-public-keys = lib.mkForce [
+          "ncps:UtiE6C+3Tx0kgpP34vjyX/BKK6QZ/D1OzDYX72aCPJg="
+        ];
+      };
+    };
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      narinfoName =
+        (lib.strings.removePrefix "/nix/store/" (
+          lib.strings.removeSuffix "-empty-file" pkgs.emptyFile.outPath
+        ))
+        + ".narinfo";
+
+      narinfoNameChars = lib.strings.stringToCharacters narinfoName;
+
+      narinfoPath = lib.concatStringsSep "/" [
+        nodes.ncps.services.ncps.cache.dataPath
+        "store/narinfo"
+        (lib.lists.elemAt narinfoNameChars 0)
+        ((lib.lists.elemAt narinfoNameChars 0) + (lib.lists.elemAt narinfoNameChars 1))
+        narinfoName
+      ];
+    in
+    ''
+      start_all()
+
+      harmonia.wait_for_unit("harmonia.service")
+
+      ncps.wait_for_unit("ncps.service")
+
+      client01.wait_until_succeeds("curl -f http://ncps:8501/ | grep '\"hostname\":\"${toString nodes.ncps.services.ncps.cache.hostName}\"' >&2")
+
+      client01.succeed("cat /etc/nix/nix.conf >&2")
+      client01.succeed("nix-store --realise ${pkgs.emptyFile}")
+
+      ncps.succeed("cat ${narinfoPath} >&2")
+    '';
+}

From 8aefa4378546240d88e9047f0b2bdfe54583437e Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara.grouwstra@gmail.com>
Date: Fri, 3 Jan 2025 00:10:39 +0100
Subject: [PATCH 1274/1504] chore: set `meta.mainProgram` for a few packages

---
 pkgs/applications/misc/visidata/default.nix | 1 +
 pkgs/by-name/le/lesspipe/package.nix        | 1 +
 pkgs/by-name/lo/local-ai/package.nix        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 51530cec1a28..d3b8dcc2bdff 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -165,6 +165,7 @@ buildPythonApplication rec {
 
   meta = {
     description = "Interactive terminal multitool for tabular data";
+    mainProgram = "visidata";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
       raskin
diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix
index 3124d58d20fc..a9c135010efe 100644
--- a/pkgs/by-name/le/lesspipe/package.nix
+++ b/pkgs/by-name/le/lesspipe/package.nix
@@ -237,6 +237,7 @@ stdenv.mkDerivation rec {
       plist and archive formats, perl storable data and gpg encrypted files.
       This does require additional helper programs being installed.
     '';
+    mainProgram = "lesspipe.sh";
     homepage = "https://github.com/wofr06/lesspipe";
     platforms = platforms.all;
     license = licenses.gpl2Only;
diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index a4cf8d1cbbf4..e5125f67369b 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -638,6 +638,7 @@ let
 
     meta = with lib; {
       description = "OpenAI alternative to run local LLMs, image and audio generation";
+      mainProgram = "local-ai";
       homepage = "https://localai.io";
       license = licenses.mit;
       maintainers = with maintainers; [

From f57cad70d0fd8b43ee9efd3c03d37ad6757ae18f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 23:35:51 +0000
Subject: [PATCH 1275/1504] bosh-cli: 7.8.5 -> 7.8.6

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

diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix
index 5e6d47469772..b5ec1b059286 100644
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@@ -9,13 +9,13 @@
 buildGoModule rec {
   pname = "bosh-cli";
 
-  version = "7.8.5";
+  version = "7.8.6";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8uxl8h7EAhLo4BMLPbtQdxK5kNe9fv1PbViBELJZXKY=";
+    sha256 = "sha256-rrYB8W1Zq9rCRgVyAPFZ5i37uEKXvV83hpkLaB7N9zQ=";
   };
   vendorHash = null;
 

From 1c088c121438421f0c329558de818af1794bea7a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 00:42:36 +0100
Subject: [PATCH 1276/1504] python312Packages.nibabel: propagate
 typing-extensions

---
 pkgs/development/python-modules/nibabel/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index f3a7147491e7..b905f1c4a75d 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -2,13 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonAtLeast,
   pythonOlder,
   hatchling,
   hatch-vcs,
   numpy,
   packaging,
   importlib-resources,
+  typing-extensions,
   pydicom,
   pillow,
   h5py,
@@ -37,10 +37,13 @@ buildPythonPackage rec {
     hatch-vcs
   ];
 
-  dependencies = [
-    numpy
-    packaging
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  dependencies =
+    [
+      numpy
+      packaging
+    ]
+    ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]
+    ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ];
 
   optional-dependencies = rec {
     all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd;

From bdf9a15c55a3de477027dd23433836babf7b9f27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 23:59:34 +0000
Subject: [PATCH 1277/1504] tenv: 4.0.3 -> 4.1.0

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

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index 9f347521abe6..08436afc25f0 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "4.0.3";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-DqKgoobzaAGoT7ODA9d5Zgs1dnlAishNJ0E23Nqbp8Y=";
+    hash = "sha256-6Em/cauhHuK0RN8Jp1JkPFBHFBwu65QxVHTAu0rh+Vo=";
   };
 
   vendorHash = "sha256-JrAzjnXqZSlsukLRXqHReiKPuOyWQS85/F2EnXf043U=";

From 4adeba749da1a52ce121d4839b0883de8a838d24 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 01:25:53 +0100
Subject: [PATCH 1278/1504] aegisub: 3.4.0 -> 3.4.1

---
 pkgs/by-name/ae/aegisub/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix
index ea5a703e4f18..bef7a2097963 100644
--- a/pkgs/by-name/ae/aegisub/package.nix
+++ b/pkgs/by-name/ae/aegisub/package.nix
@@ -2,7 +2,6 @@
   lib,
   alsa-lib,
   boost,
-  curl,
   meson,
   config,
   expat,
@@ -42,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aegisub";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "TypesettingTools";
     repo = "aegisub";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HvBbHUWKUFpne7Dj8CB2V9agBSBbB24BXnnYWUjHSDI=";
+    hash = "sha256-3yWtBuCwr1OPOg/nh2s8SFg62vt8zuBMMp0gfOZrjqk=";
   };
 
   nativeBuildInputs = [
@@ -63,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost
-    curl
     expat
     ffmpeg
     ffms
@@ -115,10 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
     # system version?
     substituteInPlace meson.build \
       --replace-fail "subdir('tests')" "# subdir('tests')"
-
-    # https://github.com/TypesettingTools/Aegisub/issues/191
-    substituteInPlace src/dialog_colorpicker.cpp \
-      --replace-fail "NSUInteger" "size_t"
   '';
 
   # Inject the version, per the AUR package:

From d45e7d764c646049014d3414a0ea35f330bacf6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 00:35:04 +0000
Subject: [PATCH 1279/1504] civo: 1.1.92 -> 1.1.93

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

diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index f26722131bcd..d5b5896ccad0 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.1.92";
+  version = "1.1.93";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-nsH/6OVvCOU4f9UZNFOm9AtyN9L4tXB285580g3SsxE=";
+    hash = "sha256-FX2hnqYqvPoD6Fn1363XrK4n0tMd9xkWlIcyIhDJDW4=";
   };
 
   vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8=";

From 0dd7250c735247a9c6365e6624b37da2a826dbf9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 3 Jan 2025 08:27:13 +1000
Subject: [PATCH 1280/1504] buildbot: add patch for compatibility with twisted
 24.11.0

---
 .../tools/continuous-integration/buildbot/master.nix        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index e5bfb0f9c4cc..06d1e09975c5 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -43,6 +43,7 @@
   unidiff,
   glibcLocales,
   nixosTests,
+  fetchpatch,
 }:
 
 let
@@ -140,6 +141,11 @@ buildPythonApplication rec {
   ];
 
   patches = [
+    (fetchpatch {
+      name = "remove-uses-of-twisted-python-constants.patch";
+      url = "https://github.com/buildbot/buildbot/commit/ac46c0aa77be46eaa64e09bef03da6f8dbaacfa7.patch";
+      hash = "sha256-XoODSKY0GzFh2H5gWxiXm/QxngGN2MM0yId5D1RQflQ=";
+    })
     # This patch disables the test that tries to read /etc/os-release which
     # is not accessible in sandboxed builds.
     ./skip_test_linux_distro.patch

From 56323119c98c98d2a6a1a38975d73d0593f742da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 01:38:51 +0000
Subject: [PATCH 1281/1504] ghidra-extensions.ghidra-delinker-extension: 0.5.0
 -> 0.5.1

---
 .../ghidra/extensions/ghidra-delinker-extension/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
index 0a8cc8352354..22b53b61ab53 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "0.5.0";
+  version = "0.5.1";
   self = ghidra.buildGhidraExtension {
     pname = "ghidra-delinker-extension";
     inherit version;
@@ -14,7 +14,7 @@ let
       owner = "boricj";
       repo = "ghidra-delinker-extension";
       rev = "v${version}";
-      hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0=";
+      hash = "sha256-h6F50Z7S6tPOl9mIhChLKoFxHuAkq/n36ysUEFwWGxI=";
     };
 
     postPatch = ''

From 8ab64aad563f68b7f9c2a53831d884176b207d82 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 02:56:50 +0100
Subject: [PATCH 1282/1504] python312Packages.dicom-numpy: fix build

---
 .../development/python-modules/dicom-numpy/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix
index aeb867e0a019..c532a7dfea5b 100644
--- a/pkgs/development/python-modules/dicom-numpy/default.nix
+++ b/pkgs/development/python-modules/dicom-numpy/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pythonOlder,
   pytestCheckHook,
+  setuptools,
   numpy,
   pydicom,
 }:
@@ -22,6 +23,15 @@ buildPythonPackage rec {
     hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE=";
   };
 
+  postPatch = ''
+    substituteInPlace dicom_numpy/zip_archive.py \
+      --replace-fail "pydicom.read_file" "pydicom.dcmread"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     numpy
     pydicom

From 2703dd4b65e762254d98ea253d501d67bfac9e1e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 03:00:19 +0100
Subject: [PATCH 1283/1504] python312Packages.dcmstack: 0.9 ->
 0.9-unstable-2024-12-05

---
 .../python-modules/dcmstack/default.nix          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix
index fd84640e8d78..f4982057e9e9 100644
--- a/pkgs/development/python-modules/dcmstack/default.nix
+++ b/pkgs/development/python-modules/dcmstack/default.nix
@@ -4,24 +4,25 @@
   fetchFromGitHub,
   nibabel,
   pydicom,
-  pylibjpeg-libjpeg,
+  pylibjpeg,
+  pint,
   pytestCheckHook,
   pythonOlder,
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "dcmstack";
-  version = "0.9";
+  version = "0.9-unstable-2024-12-05";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "moloney";
     repo = "dcmstack";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs=";
+    rev = "68575996c8956152865e3598b15f621d7c803a96";
+    hash = "sha256-QXnBtlXkxYDJFdjiqCoEuBMcHnq+87YmHX8j5EPW7HU=";
   };
 
   build-system = [ setuptools ];
@@ -29,7 +30,8 @@ buildPythonPackage rec {
   dependencies = [
     nibabel
     pydicom
-    pylibjpeg-libjpeg
+    pylibjpeg
+    pint
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 582399a5d92819c94129f576cc7c1d85e6c6279a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 03:00:29 +0100
Subject: [PATCH 1284/1504] python312Packages.heudiconv: fix build

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

diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix
index 6d19a460fde1..b44c00fb041a 100644
--- a/pkgs/development/python-modules/heudiconv/default.nix
+++ b/pkgs/development/python-modules/heudiconv/default.nix
@@ -8,6 +8,7 @@
   fetchPypi,
   filelock,
   git,
+  git-annex,
   nibabel,
   nipype,
   pydicom,
@@ -53,6 +54,7 @@ buildPythonPackage rec {
     dcm2niix
     pytestCheckHook
     git
+    git-annex
   ];
 
   preCheck = ''

From 7b7685d5fbe458d518b610aa153207e007117d33 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 03:08:08 +0100
Subject: [PATCH 1285/1504] python312Packages.nipy: 0.6.0 -> 0.6.1

---
 pkgs/development/python-modules/nipy/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix
index e245aafa0791..107f754dca31 100644
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 
   # build-system
   cython,
@@ -24,13 +24,15 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.6.1";
   pname = "nipy";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-BTn2nV4VMeT8bxTOJTHjRU8I2bxFZCzIZCZVn/QcUrk=";
+  src = fetchFromGitHub {
+    owner = "nipy";
+    repo = "nipy";
+    tag = version;
+    hash = "sha256-KGMGu0/0n1CzN++ri3Ig1AJjeZfkl4KzNgm6jdwXB7o=";
   };
 
   postPatch = ''

From 33aa4301cbdcb05cd125a0ea54fc9e381df0ca32 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 03:24:28 +0100
Subject: [PATCH 1286/1504] python312Packages.pynetdicom: 2.1.1 ->
 2.1.1-unstable-2024-12-22

---
 .../python-modules/pynetdicom/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix
index efcad7461e99..10c76d524a2b 100644
--- a/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/pkgs/development/python-modules/pynetdicom/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  flit-core,
   pydicom,
   pyfakefs,
   pytestCheckHook,
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "pynetdicom";
-  version = "2.1.1";
+  version = "2.1.1-unstable-2024-12-22";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = "pynetdicom";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-cEe0/mzmMnPoLQMx5AsJocGxCUVE512k9KlEmjzjzn4=";
+    rev = "c22be4b79a20eea0f176340629b37c6e30dd10b2";
+    hash = "sha256-ydNFlSR/h9xJcJxHyRLpLfkaQwJABPt9PJMkPEWzf3s=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ flit-core ];
 
   dependencies = [ pydicom ];
 

From 155ee7ec3442150cc4947612dc58b74715aeb36d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 02:30:06 +0000
Subject: [PATCH 1287/1504] pql: 0.1.0 -> 0.2.0

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

diff --git a/pkgs/by-name/pq/pql/package.nix b/pkgs/by-name/pq/pql/package.nix
index 590364b3a9cf..df0424707dc9 100644
--- a/pkgs/by-name/pq/pql/package.nix
+++ b/pkgs/by-name/pq/pql/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pql";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "runreveal";
     repo = "pql";
     rev = "v${version}";
-    hash = "sha256-xNWwjDdnF4+IvS814iJlqCFYNOGNF2nHEnnbRqxJsjM=";
+    hash = "sha256-/112LQfIkya/9hzq3nxtpdSarHIshPw4mezNcKm4xyI=";
   };
 
-  vendorHash = "sha256-j/R+1PWfX+lmm99cHWSuo+v8RxKg089Bvb4rFHpmpfE=";
+  vendorHash = "sha256-hYCbwDChI7pnc9aZ/i2PffTwSBjUjc0Qc71D4EfUOI8=";
 
   ldflags = [
     "-s"

From f03fef05643a7775f43d43d36bd925d2253305ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 02:30:19 +0000
Subject: [PATCH 1288/1504] datafusion-cli: 43.0.0 -> 44.0.0

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

diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index e347b5be35a1..50e114fbd983 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -8,19 +8,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "datafusion-cli";
-  version = "43.0.0";
+  version = "44.0.0";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     rev = version;
-    sha256 = "sha256-/7qiVjvWwcRrCyXbQfcyzT6TcsLf/NyDVpIEJjzJHEc=";
+    sha256 = "sha256-235z+dyEt36sPY2UMVMMdakrDe2WWqPCk2/flEX6s4Y=";
   };
 
   sourceRoot = "${src.name}/datafusion-cli";
 
-  cargoHash = "sha256-oKrfaaBnbCuIkz2p94rnIN71b/GrvYxAji7Eo3bcS14=";
+  cargoHash = "sha256-jqL/o4vSTJfQEFurtmNoi8pNzCLslhqlNKISm8dp6hs=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security

From aaa70920ea216a1539fd018a92d13deed85d07d0 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Thu, 26 Dec 2024 23:43:16 +0000
Subject: [PATCH 1289/1504] venera: 1.1.2 -> 1.1.3

---
 pkgs/by-name/ve/venera/package.nix            |  6 ++--
 pkgs/by-name/ve/venera/pubspec.lock.json      | 32 +++++++++----------
 pkgs/by-name/ve/venera/update.sh              |  2 +-
 .../package-source-builders/rhttp/default.nix |  1 +
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index e82ac37b8e9b..4bed65e02238 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -9,13 +9,13 @@
 }:
 flutter327.buildFlutterApplication rec {
   pname = "venera";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "venera-app";
     repo = "venera";
     tag = "v${version}";
-    hash = "sha256-zf3KeSoMLmXdD0aEYRPN5IYy0LdMYpqOkCFDmLi2ix0=";
+    hash = "sha256-zjlu+rdS+ctp8R1laeT9OF+HCLvTyQsAJIBA1fEiNMg=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -58,7 +58,7 @@ flutter327.buildFlutterApplication rec {
   ];
 
   extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : "$out/app/venera/lib"
+    --prefix LD_LIBRARY_PATH : $out/app/venera/lib
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json
index ee6895dc7537..c13e95a43078 100644
--- a/pkgs/by-name/ve/venera/pubspec.lock.json
+++ b/pkgs/by-name/ve/venera/pubspec.lock.json
@@ -4,11 +4,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99",
+        "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -84,11 +84,11 @@
       "dependency": "direct main",
       "description": {
         "name": "battery_plus",
-        "sha256": "220c8f1961efb01d6870493b5ac5a80afaeaffc8757f7a11ed3025a8570d29e7",
+        "sha256": "a0409fe7d21905987eb1348ad57c634f913166f14f0c8936b73d3f5940fac551",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.0"
+      "version": "6.2.1"
     },
     "battery_plus_platform_interface": {
       "dependency": "transitive",
@@ -528,11 +528,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_rust_bridge",
-        "sha256": "fb9d3c9395eae3c71d4fe3ec343b9f30636c9988150c8bb33b60047549b34e3d",
+        "sha256": "35c257fc7f98e34c1314d6c145e5ed54e7c94e8a9f469947e31c9298177d546f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "flutter_saf": {
       "dependency": "direct main",
@@ -555,11 +555,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_to_arch",
-        "sha256": "656cffc182b05af38aa96a1115931620b8865c4b0cfe00813b26fcff0875f2ab",
+        "sha256": "b68b2757a89a517ae2141cbc672acdd1f69721dd686cacad03876b6f436ff040",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.1"
     },
     "flutter_to_debian": {
       "dependency": "direct dev",
@@ -993,11 +993,11 @@
       "dependency": "direct main",
       "description": {
         "name": "rhttp",
-        "sha256": "581d57b5b6056d31489af94db8653a1c11d7b59050cbbc41ece4279e50414de5",
+        "sha256": "8212cbc816cc3e761eecb8d4dbbaa1eca95de715428320a198a4e7a89acdcd2e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.6"
+      "version": "0.9.8"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1064,21 +1064,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8",
+        "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.2"
+      "version": "10.1.3"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48",
+        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.1"
+      "version": "5.0.2"
     },
     "shimmer": {
       "dependency": "direct main",
@@ -1140,11 +1140,11 @@
       "dependency": "direct main",
       "description": {
         "name": "sqlite3_flutter_libs",
-        "sha256": "636b0fe8a2de894e5455572f6cbbc458f4ffecfe9f860b79439e27041ea4f0b9",
+        "sha256": "73016db8419f019e807b7a5e5fbf2a7bd45c165fed403b8e7681230f3a102785",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.27"
+      "version": "0.5.28"
     },
     "stack_trace": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/ve/venera/update.sh b/pkgs/by-name/ve/venera/update.sh
index b44451a186e1..7d9761ca3a5d 100755
--- a/pkgs/by-name/ve/venera/update.sh
+++ b/pkgs/by-name/ve/venera/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nixVersions.latest bash coreutils nix-update
+#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
 
 set -eou pipefail
 
diff --git a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
index b87acb6bdb2f..e6e1644f0228 100644
--- a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
@@ -18,6 +18,7 @@ let
       {
         _0_9_1 = "sha256-Gl3ArdSuw3/yi/JX6oloKJqerSJjTfK8HXRNei/LO+4=";
         _0_9_6 = "sha256-a11UxG8nbIng+6uOWq/BZxdtRmRINl/7UOc6ap2mgrk=";
+        _0_9_8 = "sha256-/1qj0N83wgkPSQnGb3CHTS/ox6OpJCKF5mVpuKTqUBQ=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'rhttp': '${version}'

From 7c6c1125ec3f0418cab1c07d51478aa70de36d23 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Wed, 20 Nov 2024 23:40:13 +0100
Subject: [PATCH 1290/1504] raylib: 5.0 -> 5.5, cleanup

- Update from 5.0 to 5.5
- Avoid `with lib;`
- Remove redundant inputs
- Sync dependencies with Raylib wiki
- Reorder some parts to make sense
- Add platform argument
- Only enable one audio backend by default, and don't add them to
buildInputs
- Format with nixfmt-rfc-style
---
 pkgs/by-name/ra/raylib/package.nix | 143 ++++++++++++++---------------
 1 file changed, 69 insertions(+), 74 deletions(-)

diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 3a8757e5ce2a..2b7bb3ee68f4 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -1,85 +1,80 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, fetchpatch
-, libgbm
-, libGLU
-, glfw
-, libX11
-, libXi
-, libXcursor
-, libXrandr
-, libXinerama
-, alsaSupport ? stdenv.hostPlatform.isLinux
-, alsa-lib
-, pulseSupport ? stdenv.hostPlatform.isLinux
-, libpulseaudio
-, sharedLib ? true
-, includeEverything ? true
-, raylib-games
-, darwin
-, autoPatchelfHook
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  autoPatchelfHook,
+  glfw,
+  SDL2,
+  alsa-lib,
+  libpulseaudio,
+  raylib-games,
+  platform ? "Desktop", # Note that "Web", "Android" and "Raspberry Pi" do not currently work
+  pulseSupport ? stdenv.hostPlatform.isLinux,
+  alsaSupport ? false,
+  sharedLib ? true,
+  includeEverything ? true,
 }:
 let
-  inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL;
-in
-stdenv.mkDerivation (finalAttrs: {
+  inherit (lib) optional;
+
   pname = "raylib";
-  version = "5.0";
+in
 
-  src = fetchFromGitHub {
-    owner = "raysan5";
-    repo = "raylib";
-    rev = finalAttrs.version;
-    hash = "sha256-gEstNs3huQ1uikVXOW4uoYnIDr5l8O9jgZRTX1mkRww=";
-  };
+lib.checkListOfEnum "${pname}: platform"
+  [
+    "Desktop"
+    "Web"
+    "Android"
+    "Raspberry Pi"
+    "SDL"
+  ]
+  [ platform ]
+  (
+    stdenv.mkDerivation (finalAttrs: {
+      __structuredAttrs = true;
 
-  nativeBuildInputs = [
-    cmake
-  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+      inherit pname;
+      version = "5.5";
 
-  buildInputs = [ glfw ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libgbm libXi libXcursor libXrandr libXinerama ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]
-    ++ lib.optional alsaSupport alsa-lib
-    ++ lib.optional pulseSupport libpulseaudio;
+      src = fetchFromGitHub {
+        owner = "raysan5";
+        repo = "raylib";
+        rev = finalAttrs.version;
+        hash = "sha256-J99i4z4JF7d6mJNuJIB0rHNDhXJ5AEkG0eBvvuBLHrY=";
+      };
 
-  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenGL ];
+      # autoPatchelfHook is needed for appendRunpaths
+      nativeBuildInputs = [
+        cmake
+      ] ++ optional (builtins.length finalAttrs.appendRunpaths > 0) autoPatchelfHook;
+      buildInputs = optional (platform == "Desktop") glfw ++ optional (platform == "SDL") SDL2;
 
-  # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
-  cmakeFlags = [
-    "-DUSE_EXTERNAL_GLFW=ON"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DCUSTOMIZE_BUILD=1"
-  ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
-  ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
+      # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
+      cmakeFlags =
+        [
+          "-DCUSTOMIZE_BUILD=ON"
+          "-DPLATFORM=${platform}"
+        ]
+        ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON"
+        ++ optional includeEverything "-DINCLUDE_EVERYTHING=ON"
+        ++ optional sharedLib "-DBUILD_SHARED_LIBS=ON";
 
-  passthru.tests = { inherit raylib-games; };
+      appendRunpaths = optional stdenv.hostPlatform.isLinux (
+        lib.makeLibraryPath (optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio)
+      );
 
-  patches = [
-    # Patch version in CMakeLists.txt to 5.0.0
-    # The library author doesn't use cmake, so when updating this package please
-    # check that the resulting library extension matches the package version
-    # and remove/update this patch
-    (fetchpatch {
-      url = "https://github.com/raysan5/raylib/commit/032cc497ca5aaca862dc926a93c2a45ed8017737.patch";
-      hash = "sha256-qsX5AwyQaGoRsbdszOO7tUF9dR+AkEFi4ebNkBVHNEY=";
+      passthru.tests = {
+        inherit raylib-games;
+      };
+
+      meta = {
+        description = "Simple and easy-to-use library to enjoy videogames programming";
+        homepage = "https://www.raylib.com/";
+        license = lib.licenses.zlib;
+        maintainers = [ ];
+        platforms = lib.platforms.all;
+        changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
+      };
     })
-  ];
-
-  # fix libasound.so/libpulse.so not being found
-  appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [
-    (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio))
-  ];
-
-  meta = with lib; {
-    description = "Simple and easy-to-use library to enjoy videogames programming";
-    homepage = "https://www.raylib.com/";
-    license = licenses.zlib;
-    maintainers = [ ];
-    platforms = platforms.all;
-    changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
-  };
-})
+  )

From 47b52e6bd2487f52d18e150d933b6eff2d086e58 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Thu, 21 Nov 2024 02:33:34 +0100
Subject: [PATCH 1291/1504] raylib: add diniamo as a maintainer

---
 pkgs/by-name/ra/raylib/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 2b7bb3ee68f4..51c40b5101df 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -9,6 +9,8 @@
   alsa-lib,
   libpulseaudio,
   raylib-games,
+  libGLU,
+  libX11,
   platform ? "Desktop", # Note that "Web", "Android" and "Raspberry Pi" do not currently work
   pulseSupport ? stdenv.hostPlatform.isLinux,
   alsaSupport ? false,
@@ -48,8 +50,11 @@ lib.checkListOfEnum "${pname}: platform"
       nativeBuildInputs = [
         cmake
       ] ++ optional (builtins.length finalAttrs.appendRunpaths > 0) autoPatchelfHook;
+
       buildInputs = optional (platform == "Desktop") glfw ++ optional (platform == "SDL") SDL2;
 
+      propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libX11 ];
+
       # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
       cmakeFlags =
         [
@@ -72,7 +77,7 @@ lib.checkListOfEnum "${pname}: platform"
         description = "Simple and easy-to-use library to enjoy videogames programming";
         homepage = "https://www.raylib.com/";
         license = lib.licenses.zlib;
-        maintainers = [ ];
+        maintainers = [ lib.maintainers.diniamo ];
         platforms = lib.platforms.all;
         changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
       };

From 51773b1a1f55ce4a206cce925cffb92226a94068 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 02:55:38 +0000
Subject: [PATCH 1292/1504] goread: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/by-name/go/goread/package.nix b/pkgs/by-name/go/goread/package.nix
index 51849cb0cc65..98a5b066d565 100644
--- a/pkgs/by-name/go/goread/package.nix
+++ b/pkgs/by-name/go/goread/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "goread";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "TypicalAM";
     repo = "goread";
     rev = "v${version}";
-    hash = "sha256-tWQVqHtuTCHrsZu3CfTWUQzvUYbQrrdJoWHp43dfPEE=";
+    hash = "sha256-8QjroS0aKALcrDJkpihD70iJJBdiVP4Q2j2n3BsY71w=";
   };
 
   vendorHash = "sha256-S/0uuy/G7ZT239OgKaOT1dmY+u5/lnZKL4GtbEi2zCI=";

From 0371b7fb4b8d3f69f6cf7f1a7192a3c55b362006 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 3 Jan 2025 02:52:13 +0100
Subject: [PATCH 1293/1504] ci/request-reviews: split off a more reusable
 reviewer processing script

We can reuse the new process-reviewers.json part for requesting
reviews from maintainers.
---
 ci/request-reviews/default.nix          |  1 +
 ci/request-reviews/get-reviewers.sh     | 42 +++----------------
 ci/request-reviews/process-reviewers.sh | 55 +++++++++++++++++++++++++
 ci/request-reviews/request-reviews.sh   |  3 +-
 4 files changed, 64 insertions(+), 37 deletions(-)
 create mode 100755 ci/request-reviews/process-reviewers.sh

diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
index b51d896539d8..f5f8dc1deb00 100644
--- a/ci/request-reviews/default.nix
+++ b/ci/request-reviews/default.nix
@@ -15,6 +15,7 @@ stdenvNoCC.mkDerivation {
     root = ./.;
     fileset = lib.fileset.unions [
       ./get-reviewers.sh
+      ./process-reviewers.sh
       ./request-reviews.sh
       ./verify-base-branch.sh
       ./dev-branches.txt
diff --git a/ci/request-reviews/get-reviewers.sh b/ci/request-reviews/get-reviewers.sh
index 1107edd9e6f1..f447e2a7e597 100755
--- a/ci/request-reviews/get-reviewers.sh
+++ b/ci/request-reviews/get-reviewers.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-# Get the code owners of the files changed by a PR,
-# suitable to be consumed by the API endpoint to request reviews:
-# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
+# Get the code owners of the files changed by a PR, returning one username per line
 
 set -euo pipefail
 
@@ -10,18 +8,15 @@ log() {
     echo "$@" >&2
 }
 
-if (( "$#" < 7 )); then
-    log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REPO BASE_REF HEAD_REF PR_NUMBER PR_AUTHOR"
+if (( "$#" < 4 )); then
+    log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REF HEAD_REF"
     exit 1
 fi
 
 gitRepo=$1
 ownersFile=$2
-baseRepo=$3
-baseRef=$4
-headRef=$5
-prNumber=$6
-prAuthor=$7
+baseRef=$3
+headRef=$4
 
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' exit
@@ -98,29 +93,4 @@ for file in "${touchedFiles[@]}"; do
 
 done
 
-# Cannot request a review from the author
-if [[ -v users[${prAuthor,,}] ]]; then
-    log "One or more files are owned by the PR author, ignoring"
-    unset 'users[${prAuthor,,}]'
-fi
-
-gh api \
-    -H "Accept: application/vnd.github+json" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    "/repos/$baseRepo/pulls/$prNumber/reviews" \
-    --jq '.[].user.login' > "$tmp/already-reviewed-by"
-
-# And we don't want to rerequest reviews from people who already reviewed
-while read -r user; do
-    if [[ -v users[${user,,}] ]]; then
-        log "User $user is a code owner but has already left a review, ignoring"
-        unset 'users[${user,,}]'
-    fi
-done < "$tmp/already-reviewed-by"
-
-# Turn it into a JSON for the GitHub API call to request PR reviewers
-jq -n \
-    --arg users "${!users[*]}" \
-    '{
-      reviewers: $users | split(" "),
-    }'
+printf "%s\n" "${!users[@]}"
diff --git a/ci/request-reviews/process-reviewers.sh b/ci/request-reviews/process-reviewers.sh
new file mode 100755
index 000000000000..ec929e25b900
--- /dev/null
+++ b/ci/request-reviews/process-reviewers.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Process reviewers for a PR, reading line-separated usernames on stdin,
+# returning a JSON suitable to be consumed by the API endpoint to request reviews:
+# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
+
+set -euo pipefail
+
+log() {
+    echo "$@" >&2
+}
+
+if (( "$#" < 3 )); then
+    log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR"
+    exit 1
+fi
+
+baseRepo=$1
+prNumber=$2
+prAuthor=$3
+
+tmp=$(mktemp -d)
+trap 'rm -rf "$tmp"' exit
+
+declare -A users=()
+while read -r handle && [[ -n "$handle" ]]; do
+    users[$handle]=
+done
+
+# Cannot request a review from the author
+if [[ -v users[${prAuthor,,}] ]]; then
+    log "One or more files are owned by the PR author, ignoring"
+    unset 'users[${prAuthor,,}]'
+fi
+
+gh api \
+    -H "Accept: application/vnd.github+json" \
+    -H "X-GitHub-Api-Version: 2022-11-28" \
+    "/repos/$baseRepo/pulls/$prNumber/reviews" \
+    --jq '.[].user.login' > "$tmp/already-reviewed-by"
+
+# And we don't want to rerequest reviews from people who already reviewed
+while read -r user; do
+    if [[ -v users[${user,,}] ]]; then
+        log "User $user is a code owner but has already left a review, ignoring"
+        unset 'users[${user,,}]'
+    fi
+done < "$tmp/already-reviewed-by"
+
+# Turn it into a JSON for the GitHub API call to request PR reviewers
+jq -n \
+    --arg users "${!users[*]}" \
+    '{
+      reviewers: $users | split(" "),
+    }'
diff --git a/ci/request-reviews/request-reviews.sh b/ci/request-reviews/request-reviews.sh
index b21354560242..986f3684b42a 100755
--- a/ci/request-reviews/request-reviews.sh
+++ b/ci/request-reviews/request-reviews.sh
@@ -78,7 +78,8 @@ if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRep
 fi
 
 log "Getting code owners to request reviews from"
-"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseRepo" "$baseBranch" "$headRef" "$prNumber" "$prAuthor" > "$tmp/reviewers.json"
+"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \
+    "$SCRIPT_DIR"/process-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor" > "$tmp/reviewers.json"
 
 log "Requesting reviews from: $(<"$tmp/reviewers.json")"
 

From 0ebab0bccadbd38d9bc0aae3e53e9493afa9ec0b Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 3 Jan 2025 03:07:38 +0100
Subject: [PATCH 1294/1504] workflows/eval: Reuse process-reviewers.sh

Filters out the PR author and avoids rerequesting reviews from people
that already left a review. In a future commit, this can be expanded to
also avoid requesting reviews from people not in the org
---
 .github/workflows/eval.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index ab62551ce468..a813c7297288 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -219,7 +219,7 @@ jobs:
   tag:
     name: Tag
     runs-on: ubuntu-latest
-    needs: process
+    needs: [ attrs, process ]
     if: needs.process.outputs.baseRunId
     permissions:
       pull-requests: write
@@ -239,6 +239,21 @@ jobs:
           name: comparison
           path: comparison
 
+      - name: Install Nix
+        uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
+
+      # Important: This workflow job runs with extra permissions,
+      # so we need to make sure to not run untrusted code from PRs
+      - name: Check out Nixpkgs at the base commit
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ needs.attrs.outputs.baseSha }}
+          path: base
+          sparse-checkout: ci
+
+      - name: Build the requestReviews derivation
+        run: nix-build base/ci -A requestReviews
+
       - name: Tagging pull request
         run: |
           # Get all currently set rebuild labels
@@ -271,8 +286,8 @@ jobs:
           # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
           # There appears to be no API to request reviews based on GitHub IDs
           jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id"; done \
-            | jq -s '{ reviewers: map(.login) }' \
+            | while read -r id; do gh api /user/"$id" --jq .login; done \
+            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/process-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" \
             > reviewers.json
 
           # Request reviewers from maintainers of changed output paths
@@ -285,6 +300,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
+          AUTHOR: ${{ github.event.pull_request.user.login }}
 
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}

From ab248be504bc38a3ea0f7409d31109b45e619224 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 3 Jan 2025 03:09:19 +0100
Subject: [PATCH 1295/1504] workflows/eval: Minor cleanup

The ${{ }} syntax is best avoided in scripts. While it wouldn't be a
problem here, let's do this for consistency
---
 .github/workflows/eval.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index a813c7297288..2e99bb17b8bb 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -293,7 +293,7 @@ jobs:
           # Request reviewers from maintainers of changed output paths
           GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
             --method POST \
-            /repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers \
+            /repos/"$REPOSITORY"/pulls/"$NUMBER"/requested_reviewers \
             --input reviewers.json
 
         env:

From b7daf641be0ecaf01b417977403a62a71e046864 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:16:35 +0100
Subject: [PATCH 1296/1504] gnunet: 0.22.1 -> 0.23.1

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

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 048ba5a35496..0a6fa325cf4b 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnunet";
-  version = "0.22.1";
+  version = "0.23.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";
-    hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o=";
+    hash = "sha256-b9BbaQdrOxqOfiCyVOBE/dTG2lMTGWMX894Ij30CXPI=";
   };
 
   enableParallelBuilding = true;

From 697af55da3d69b2fd76241cc74283aa9758b3c05 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:18:16 +0100
Subject: [PATCH 1297/1504] gnunet-gtk: 0.22.0 -> 0.23.1

---
 pkgs/applications/networking/p2p/gnunet/gtk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 56dc9ae6b701..2f1e31f48d91 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnunet-gtk";
-  version = "0.22.0";
+  version = "0.23.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";
-    hash = "sha256-bpSEdymFT7q5OQKshD8lGwwMF26yXp0RyUAvNVzua6U=";
+    hash = "sha256-bmU3799pZVUyrsJ92MKgn5NIqCW76ml4N42Ewi+VWvI=";
   };
 
   nativeBuildInputs = [

From e0df174c69e5b91ee57473884e191d9bce53fc14 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:24:07 +0100
Subject: [PATCH 1298/1504] taler-exchange: 0.13.0 -> 0.14.1

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

diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix
index 10dea51455a1..99d917a7ed57 100644
--- a/pkgs/by-name/ta/taler-exchange/package.nix
+++ b/pkgs/by-name/ta/taler-exchange/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-exchange";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/exchange.git";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-elVZUuiIMLOG058n+Egpy9oD9T2sLDC4TUCYZTCi0bw=";
+    hash = "sha256-DD6fX54K1q4f2d/IqC+urVpMkypDRaL3lrBoQieGviI=";
   };
 
   patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ];

From 5b01aaa08952afc98abe24ccd3b6784fd4909bcf Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:31:32 +0100
Subject: [PATCH 1299/1504] taler-wallet-core: 0.13.3 -> 0.14.1

---
 pkgs/by-name/ta/taler-wallet-core/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index cdd30749f2c2..0d2330553fb2 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -37,12 +37,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-wallet-core";
-  version = "0.13.3";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/wallet-core.git";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9pRhaQNnIzbhahMaTVVZqLTlAxh7GZxoz4Gf3TDldAA=";
+    hash = "sha256-Sae83qGPqVwuxKf30zHCmdOoo5rDPBHKSOE1hxNn7Xo=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-+RxTTm5t0/0hLKxhWILzb0qf6aZzbOZJYJenRpX8UdA=";
+    hash = "sha256-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874=";
   };
 
   buildInputs = [ nodejs ];

From 95077128f7623875d98d2259459bfe710fdcc62b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:56:37 +0100
Subject: [PATCH 1300/1504] taler-merchant: 0.13.0 -> 0.14.1

---
 pkgs/by-name/ta/taler-merchant/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index 75f0356f6a0e..2cf1f7de6cf5 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-merchant";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/merchant.git";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-N3atOOE21OEks3G1LPOM5qo/kq0D5D9gmTfURCBZx6M=";
+    hash = "sha256-ac7ajHBLW6BJrL0iaa+b7XNZHMEEmbAo17URIdPSXd8=";
   };
 
   postUnpack = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   # path to the `taler-exchange` package is used.
   postPatch = ''
     substituteInPlace src/backend/taler-merchant-httpd.c \
-      --replace-fail 'TALER_TEMPLATING_init ("merchant");' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\");"
+      --replace-fail 'TALER_TEMPLATING_init (TALER_MERCHANT_project_data ())' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\")"
 
     substituteInPlace src/backend/taler-merchant-httpd_spa.c \
       --replace-fail 'GNUNET_DISK_directory_scan (dn,' "GNUNET_DISK_directory_scan (\"$out/share/taler/merchant/spa/\","
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   # NOTE: The executables that need database access fail to detect the
   # postgresql library in `$out/lib/taler`, so we need to wrap them.
   postInstall = ''
-    for exec in dbinit httpd webhook wirewatch depositcheck exchange; do
+    for exec in dbinit httpd webhook wirewatch depositcheck exchangekeyupdate; do
       wrapProgram $out/bin/taler-merchant-$exec \
         --prefix LD_LIBRARY_PATH : "$out/lib/taler"
     done

From 2b9d0e926b06add54e116310b2811292ae941fe8 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:59:13 +0100
Subject: [PATCH 1301/1504] taler-challenger: 0.13.0 -> 0.14.1

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

diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix
index 0a3404e94f58..ad4accab593a 100644
--- a/pkgs/by-name/ta/taler-challenger/package.nix
+++ b/pkgs/by-name/ta/taler-challenger/package.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-challenger";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/challenger.git";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OlUgE40Qo7on9VaMGKJ/MRWActDBqPe7Ja95dv1OFhA=";
+    hash = "sha256-W7oImw5ptrLVIK8KPtmb7PJKSpmh8KsazxV6reUoRO8=";
   };
 
   # https://git.taler.net/challenger.git/tree/bootstrap

From 2730726cf616fec97b468f770133547b745f4cac Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:59:35 +0100
Subject: [PATCH 1302/1504] taler-sync: 0.13.1 -> 0.14.1

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

diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix
index 08f872abe803..931bf33c836b 100644
--- a/pkgs/by-name/ta/taler-sync/package.nix
+++ b/pkgs/by-name/ta/taler-sync/package.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-sync";
-  version = "0.13.1";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.taler.net/sync.git";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v5OQVpyTDWYGJrEbnOIDYu0nZlJcMN5AGunfn6G7s20=";
+    hash = "sha256-v+BBn9GZ+4Zc8iUebGmLtxAQN+7+cTdG8jNOpi+jN2c=";
   };
 
   strictDeps = true;

From 077007a65827b7c8127458adf2c3661b91fc5545 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 3 Jan 2025 03:24:37 +0100
Subject: [PATCH 1303/1504] ci/request-reviews: Don't request reviews from
 non-repo-collaborators

Fixes this problem for maintainer-based reviews when the maintainer
didn't yet accept or missed the automated invite:

    gh: Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the NixOS/nixpkgs repository. (HTTP 422)
---
 ci/request-reviews/process-reviewers.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ci/request-reviews/process-reviewers.sh b/ci/request-reviews/process-reviewers.sh
index ec929e25b900..52c0dca0b559 100755
--- a/ci/request-reviews/process-reviewers.sh
+++ b/ci/request-reviews/process-reviewers.sh
@@ -47,6 +47,16 @@ while read -r user; do
     fi
 done < "$tmp/already-reviewed-by"
 
+for user in "${!users[@]}"; do
+    if ! gh api \
+        -H "Accept: application/vnd.github+json" \
+        -H "X-GitHub-Api-Version: 2022-11-28" \
+        "/repos/$baseRepo/collaborators/$user" >&2; then
+        log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
+        unset 'users[$user]'
+    fi
+done
+
 # Turn it into a JSON for the GitHub API call to request PR reviewers
 jq -n \
     --arg users "${!users[*]}" \

From 26d247b462d671a06d20945dea99a061bc460574 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:31:56 -0600
Subject: [PATCH 1304/1504] treewide: unpin apple-sdk_11 t-z

---
 pkgs/by-name/ta/taterclient-ddnet/package.nix |  1 -
 pkgs/by-name/td/tdb/package.nix               |  3 --
 pkgs/by-name/te/tealdeer/package.nix          |  4 ---
 pkgs/by-name/to/ton/package.nix               | 28 +++++++------------
 pkgs/by-name/tu/turbo-unwrapped/package.nix   |  3 +-
 pkgs/by-name/vc/vcpkg-tool/package.nix        |  3 +-
 pkgs/by-name/vi/vimv-rs/package.nix           |  4 ---
 pkgs/by-name/ws/wstunnel/package.nix          |  6 ----
 pkgs/by-name/zl/zls/package.nix               |  3 --
 pkgs/by-name/zo/zon2nix/package.nix           |  3 --
 pkgs/by-name/zt/ztags/package.nix             |  3 --
 11 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 6fb16457c466..abe38207bf90 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -28,7 +28,6 @@
   spirv-tools,
   gtest,
   glew,
-  apple-sdk_11,
 }:
 let
   clientExecutable = "TaterClient-DDNet";
diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix
index 81e663908d1d..3cf8aabc948e 100644
--- a/pkgs/by-name/td/tdb/package.nix
+++ b/pkgs/by-name/td/tdb/package.nix
@@ -7,7 +7,6 @@
 , readline
 , libxslt
 , libxcrypt
-, apple-sdk_11
 , docbook-xsl-nons
 , docbook_xml_dtd_45
 }:
@@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
     python3
     readline # required to build python
     libxcrypt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
   ];
 
   # otherwise the configure script fails with
diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix
index b6e634fd005f..3d029f8e8ece 100644
--- a/pkgs/by-name/te/tealdeer/package.nix
+++ b/pkgs/by-name/te/tealdeer/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix
index 22a34bdcc200..4423a274ddff 100644
--- a/pkgs/by-name/to/ton/package.nix
+++ b/pkgs/by-name/to/ton/package.nix
@@ -14,8 +14,6 @@
   secp256k1,
   zlib,
   nix-update-script,
-  darwinMinVersionHook,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,22 +39,16 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      gperf
-      libmicrohttpd
-      libsodium
-      lz4
-      openssl
-      readline
-      secp256k1
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-      (darwinMinVersionHook "10.13")
-      apple-sdk_11
-    ];
+  buildInputs = [
+    gperf
+    libmicrohttpd
+    libsodium
+    lz4
+    openssl
+    readline
+    secp256k1
+    zlib
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index e91fb9a2603e..2d2d42bf3087 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   capnproto,
   extra-cmake-modules,
   fetchFromGitHub,
@@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     rust-jemalloc-sys
     zlib
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   cargoBuildFlags = [
     "--package"
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 2f776cb3c3af..d67d50871d11 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   runtimeShell,
-  apple-sdk_11,
   cacert,
   cmake,
   cmakerc,
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cmakerc
     fmt
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   patches = [
     ./change-lock-location.patch
diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix
index ec0a0c3d4c3b..bff4c550b940 100644
--- a/pkgs/by-name/vi/vimv-rs/package.nix
+++ b/pkgs/by-name/vi/vimv-rs/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchCrate,
-  stdenv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   meta = with lib; {
     description = "Command line utility for batch-renaming files";
     homepage = "https://www.dmulholl.com/dev/vimv.html";
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index bfc3c7135e89..316e88117602 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -2,11 +2,9 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  stdenv,
   nixosTests,
   nix-update-script,
   versionCheckHook,
-  apple-sdk_11,
 }:
 
 let
@@ -29,10 +27,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ versionCheckHook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   doInstallCheck = true;
 
   checkFlags = [
diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix
index 8c6c3a90310f..55d0c5a7a57d 100644
--- a/pkgs/by-name/zl/zls/package.nix
+++ b/pkgs/by-name/zl/zls/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   zig_0_13,
   callPackage,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ zig_0_13.hook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postPatch = ''
     ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
   '';
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index 953ee8eece32..82135e9ddd2b 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   zig_0_11,
   nix,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,8 +21,6 @@ stdenv.mkDerivation rec {
     zig_0_11.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   zigBuildFlags = [
     "-Dnix=${lib.getExe nix}"
   ];
diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix
index c2529025ff8d..5640918d8c55 100644
--- a/pkgs/by-name/zt/ztags/package.nix
+++ b/pkgs/by-name/zt/ztags/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   scdoc,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 let
@@ -26,8 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     zig build docs --prefix $out
   '';

From 88adec4b3ab6f7fa70c71f8c5f3ede26ddd13c48 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:31:24 -0600
Subject: [PATCH 1305/1504] treewide: unpin apple-sdk_11 n-q

---
 pkgs/by-name/nc/ncspot/package.nix            |  2 --
 pkgs/by-name/ne/neovide/package.nix           |  3 +--
 pkgs/by-name/nt/ntpd-rs/package.nix           |  3 ---
 pkgs/by-name/nu/nufmt/package.nix             |  6 -----
 pkgs/by-name/nv/nvc/package.nix               |  4 ---
 pkgs/by-name/op/openvi/package.nix            |  3 +--
 pkgs/by-name/pa/packetry/package.nix          | 14 +++--------
 pkgs/by-name/pi/pizauth/package.nix           |  5 ----
 .../pr/prismlauncher-unwrapped/package.nix    | 22 +++++++---------
 pkgs/by-name/pu/pugl/package.nix              | 25 ++++++++-----------
 pkgs/by-name/qb/qbittorrent/package.nix       |  2 --
 11 files changed, 25 insertions(+), 64 deletions(-)

diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 9a3383f28775..46d346176116 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   alsa-lib,
-  apple-sdk_11,
   config,
   dbus,
   fetchFromGitHub,
@@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [ ncurses ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
     ++ lib.optional stdenv.hostPlatform.isLinux openssl
     ++ lib.optional (withALSA || withRodio) alsa-lib
     ++ lib.optional withClipboard libxcb
diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index f8a33a9a4597..7fead8ea25a0 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -13,7 +13,6 @@
   pkg-config,
   python3,
   removeReferencesTo,
-  apple-sdk_11,
   cctools,
   SDL2,
   fontconfig,
@@ -81,7 +80,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     SDL2
     fontconfig
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   postFixup =
     let
diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 87aea07c6e98..90f2385dccc7 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
   ntpd-rs,
   installShellFiles,
   pandoc,
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [
     pandoc
     installShellFiles
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index 8c956cb82080..adba5f328ec3 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
-  apple-sdk_11,
   nix-update-script,
 }:
 
@@ -22,10 +20,6 @@ rustPlatform.buildRustPackage {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 1afeaf9673d9..64927c674a90 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -12,7 +12,6 @@
   llvm,
   zlib,
   zstd,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -43,9 +42,6 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
       elfutils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix
index 6b88bdd29667..9ac54feb90b7 100644
--- a/pkgs/by-name/op/openvi/package.nix
+++ b/pkgs/by-name/op/openvi/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   ncurses,
   perl,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     perl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
index 42e5f062faeb..78bfd1b43b0c 100644
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -1,13 +1,11 @@
 {
   fetchFromGitHub,
   lib,
-  stdenv,
   rustPlatform,
   gtk4,
   pkg-config,
   pango,
   wrapGAppsHook4,
-  apple-sdk_11,
   versionCheckHook,
 }:
 
@@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec {
     wrapGAppsHook4
   ];
 
-  buildInputs =
-    [
-      gtk4
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    gtk4
+    pango
+  ];
 
   # Disable test_replay tests as they need a gui
   preCheck = ''
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 517a38571bed..17333ca11943 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -3,8 +3,6 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  apple-sdk_11,
-  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,9 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM=";
 
-  # pizauth cannot be built with default apple-sdk_10 on x86_64-darwin, pin to 11
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index dffc73ff16d6..a43ff52601c9 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   cmark,
-  apple-sdk_11,
   extra-cmake-modules,
   gamemode,
   ghc_filesystem,
@@ -57,18 +56,15 @@ stdenv.mkDerivation (finalAttrs: {
     stripJavaArchivesHook
   ];
 
-  buildInputs =
-    [
-      cmark
-      ghc_filesystem
-      kdePackages.qtbase
-      kdePackages.qtnetworkauth
-      kdePackages.quazip
-      tomlplusplus
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
-    ++ lib.optional gamemodeSupport gamemode;
+  buildInputs = [
+    cmark
+    ghc_filesystem
+    kdePackages.qtbase
+    kdePackages.qtnetworkauth
+    kdePackages.quazip
+    tomlplusplus
+    zlib
+  ] ++ lib.optional gamemodeSupport gamemode;
 
   hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
 
diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix
index 4887bcad63eb..2af38bb31d1b 100644
--- a/pkgs/by-name/pu/pugl/package.nix
+++ b/pkgs/by-name/pu/pugl/package.nix
@@ -15,7 +15,6 @@
   sphinx,
   sphinxygen,
   ninja,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -45,20 +44,16 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.sphinx-lv2-theme
   ];
 
-  buildInputs =
-    [
-      xorg.libX11
-      xorg.libXcursor
-      xorg.libXrandr
-      libGL
-      vulkan-loader
-      vulkan-headers
-      xorg.libXext
-      cairo
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXrandr
+    libGL
+    vulkan-loader
+    vulkan-headers
+    xorg.libXext
+    cairo
+  ];
 
   meta = {
     homepage = "https://github.com/lv2/pugl";
diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index d468554240c5..b14db25ef91d 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_11,
   boost,
   cmake,
   dbus,
@@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
       qt6.qttools
       zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
     ++ lib.optionals guiSupport [ dbus ]
     ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ]
     ++ lib.optionals trackerSearch [ python3 ];

From 7b2e42fffd91815fa180b716f72f98021752e486 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:31:11 -0600
Subject: [PATCH 1306/1504] treewide: unpin apple-sdk_11 j-m

---
 pkgs/by-name/ja/jankyborders/package.nix      |  5 -----
 pkgs/by-name/je/jellyfin-web/package.nix      |  8 +-------
 pkgs/by-name/ju/julius/package.nix            |  3 +--
 pkgs/by-name/ka/kando/package.nix             | 19 +++++++------------
 pkgs/by-name/li/linuxwave/package.nix         |  3 ---
 pkgs/by-name/ln/lnav/package.nix              |  4 ----
 pkgs/by-name/ls/lsd/package.nix               |  4 ----
 pkgs/by-name/ma/materialize/package.nix       | 16 ++++------------
 pkgs/by-name/mi/minizign/package.nix          |  3 ---
 .../mo/modrinth-app-unwrapped/package.nix     |  6 +-----
 pkgs/by-name/mo/moonlight-qt/package.nix      |  4 ----
 11 files changed, 14 insertions(+), 61 deletions(-)

diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix
index f1ed9b0d2292..b0d8a1a731e0 100644
--- a/pkgs/by-name/ja/jankyborders/package.nix
+++ b/pkgs/by-name/ja/jankyborders/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   fetchFromGitHub,
   pkg-config,
   testers,
@@ -22,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [
-    apple-sdk_11
-  ];
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index a8fc62c33780..6d57a0be8634 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -9,8 +9,6 @@
   xcbuild,
   pango,
   giflib,
-  apple-sdk_11,
-  darwinMinVersionHook,
   jellyfin,
 }:
 buildNpmPackage rec {
@@ -26,7 +24,7 @@ buildNpmPackage rec {
       hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY=";
     };
 
-  nodejs = nodejs_20;  # does not build with 22
+  nodejs = nodejs_20; # does not build with 22
 
   postPatch = ''
     substituteInPlace webpack.common.js \
@@ -48,10 +46,6 @@ buildNpmPackage rec {
     [ pango ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       giflib
-      apple-sdk_11
-      # node-canvas builds code that requires aligned_alloc,
-      # which on Darwin requires at least the 10.15 SDK
-      (darwinMinVersionHook "10.15")
     ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix
index 429d34420baa..2d9cec42ba95 100644
--- a/pkgs/by-name/ju/julius/package.nix
+++ b/pkgs/by-name/ju/julius/package.nix
@@ -7,7 +7,6 @@
   cmake,
   libpng,
   darwin,
-  apple-sdk_11,
   libicns,
   imagemagick,
 }:
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
     SDL2
     SDL2_mixer
     libpng
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 8c14284c2bef..33244e11a37b 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -19,7 +19,6 @@
   libXtst,
   libXi,
   wayland,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -50,17 +49,13 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libxkbcommon
-      libX11
-      libXtst
-      libXi
-      wayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libxkbcommon
+    libX11
+    libXtst
+    libXi
+    wayland
+  ];
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix
index e9ec5ad93687..41a5819ac1a7 100644
--- a/pkgs/by-name/li/linuxwave/package.nix
+++ b/pkgs/by-name/li/linuxwave/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   installShellFiles,
   zig_0_13,
-  apple-sdk_11,
   callPackage,
 }:
 
@@ -32,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     installManPage man/linuxwave.1
   '';
diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 1cbe887b1f07..2d2378e9df5b 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -19,7 +19,6 @@
   cargo,
   rustPlatform,
   rustc,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -58,9 +57,6 @@ stdenv.mkDerivation rec {
       curl
       libarchive
     ]
-    ++ lib.optionals stdenv.isDarwin [
-      apple-sdk_11
-    ]
     ++ lib.optionals (!stdenv.isDarwin) [
       gpm
     ];
diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix
index 98c2e8dfc8b1..e2b4bb682e63 100644
--- a/pkgs/by-name/ls/lsd/package.nix
+++ b/pkgs/by-name/ls/lsd/package.nix
@@ -1,10 +1,8 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
-  apple-sdk_11,
   pandoc,
   testers,
   lsd,
@@ -28,8 +26,6 @@ rustPlatform.buildRustPackage rec {
     pandoc
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   postInstall = ''
     pandoc --standalone --to man doc/lsd.md -o lsd.1
     installManPage lsd.1
diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index c3745ba58f47..5e575efb2afd 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -15,8 +15,6 @@
   # buildInputs
   openssl,
   rdkafka,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   versionCheckHook,
   nix-update-script,
@@ -138,16 +136,10 @@ rustPlatform.buildRustPackage rec {
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;
 
-  buildInputs =
-    [
-      openssl
-      rdkafka
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ];
+  buildInputs = [
+    openssl
+    rdkafka
+  ];
 
   # the check phase requires linking with rocksdb which can be a problem since
   # the rust rocksdb crate is not updated very often.
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index a5dfa15ba17f..ea85e75a5329 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 let
@@ -24,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   meta = {
     description = "Minisign reimplemented in Zig";
     homepage = "https://github.com/jedisct1/zig-minisign";
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 695d42ca6ea0..1323ac457f59 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   cacert,
   cargo-tauri,
   desktop-file-utils,
@@ -48,10 +47,7 @@ rustPlatform.buildRustPackage rec {
     pnpm.configHook
   ] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper;
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11
-    ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
+  buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
   # Tests fail on other, unrelated packages in the monorepo
   cargoTestFlags = [
diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix
index 323f79d0160c..dc57ce4678f5 100644
--- a/pkgs/by-name/mo/moonlight-qt/package.nix
+++ b/pkgs/by-name/mo/moonlight-qt/package.nix
@@ -19,7 +19,6 @@
   libxkbcommon,
   wayland,
   libdrm,
-  apple-sdk_11,
   nix-update-script,
 }:
 
@@ -70,9 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
       qt6.qtwayland
       wayland
       libdrm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   qmakeFlags = [ "CONFIG+=disable-prebuilts" ];

From caade838e8d337a73e36b851529b736883ee191e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:31:00 -0600
Subject: [PATCH 1307/1504] treewide: unpin apple-sdk_11

---
 pkgs/by-name/da/darkradiant/package.nix    | 40 +++++++++-------------
 pkgs/by-name/de/debase/package.nix         |  3 +-
 pkgs/by-name/de/dexed/package.nix          | 23 ++++++-------
 pkgs/by-name/en/en-croissant/package.nix   | 21 +++++-------
 pkgs/by-name/es/espanso/package.nix        |  6 ----
 pkgs/by-name/fe/febio-studio/package.nix   |  8 +----
 pkgs/by-name/fe/febio/package.nix          | 10 +-----
 pkgs/by-name/fi/findup/package.nix         |  3 --
 pkgs/by-name/fi/fire/package.nix           | 21 +++++-------
 pkgs/by-name/gc/gcs/package.nix            |  4 ---
 pkgs/by-name/gg/gg-jj/package.nix          |  4 +--
 pkgs/by-name/gh/ghc_filesystem/package.nix |  3 --
 pkgs/by-name/gl/glsl_analyzer/package.nix  |  7 ----
 13 files changed, 49 insertions(+), 104 deletions(-)

diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index 87e1e2d0ad6d..7c309d86655e 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -21,7 +21,6 @@
   python3,
   asciidoctor,
   libgit2,
-  apple-sdk_11,
   wrapGAppsHook3,
   installShellFiles,
   buildPlugins ? true,
@@ -46,28 +45,23 @@ stdenv.mkDerivation (finalAttrs: {
     installShellFiles
   ];
 
-  buildInputs =
-    [
-      zlib
-      libjpeg
-      wxGTK32
-      libxml2
-      libsigcxx
-      libpng
-      openal
-      libvorbis
-      eigen
-      ftgl
-      freetype
-      glew
-      glib
-      libgit2
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    zlib
+    libjpeg
+    wxGTK32
+    libxml2
+    libsigcxx
+    libpng
+    openal
+    libvorbis
+    eigen
+    ftgl
+    freetype
+    glew
+    glib
+    libgit2
+    python3
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index 70be9b81eed6..c32b5423f1ed 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_11,
   fetchFromGitHub,
   fetchpatch, # Delete at next version bump.
   lib,
@@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libgit2
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
index 0e2479517cfe..95eb94b1af1a 100644
--- a/pkgs/by-name/de/dexed/package.nix
+++ b/pkgs/by-name/de/dexed/package.nix
@@ -13,7 +13,6 @@
   freetype,
   alsa-lib,
   libjack2,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,18 +48,16 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXext
-      libXcursor
-      libXinerama
-      libXrandr
-      freetype
-      alsa-lib
-      libjack2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXext
+    libXcursor
+    libXinerama
+    libXrandr
+    freetype
+    alsa-lib
+    libjack2
+  ];
 
   # JUCE insists on only dlopen'ing these
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 6b8ea3e50f11..972a9a797e04 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -15,7 +15,6 @@
   libsoup_2_4,
   webkitgtk_4_0,
   gst_all_1,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -51,17 +50,15 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      openssl
-      libsoup_2_4
-      webkitgtk_4_0
-      gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-good
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+    libsoup_2_4
+    webkitgtk_4_0
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+  ];
 
   doCheck = false; # many scoring tests fail
 
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 636bec07ee1e..10d2f31bce25 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -19,8 +19,6 @@
   wxGTK32,
   makeWrapper,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
   waylandSupport ? false,
   x11Support ? stdenv.hostPlatform.isLinux,
   testers,
@@ -81,10 +79,6 @@ rustPlatform.buildRustPackage rec {
       libnotify
       libxkbcommon
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ]
     ++ lib.optionals waylandSupport [
       wl-clipboard
     ]
diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index 13271dc23e43..aecec37c9523 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -9,8 +9,6 @@
   qt6Packages,
   febio,
   glew,
-  apple-sdk_11,
-  darwinMinVersionHook,
   fetchpatch,
   sshSupport ? true,
   openssl,
@@ -74,11 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional tetgenSupport tetgen
     ++ lib.optional ffmpegSupport ffmpeg
-    ++ lib.optional dicomSupport dcmtk
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
-    ];
+    ++ lib.optional dicomSupport dcmtk;
 
   meta = {
     description = "FEBio Suite Solver";
diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
index 698b0d81ea80..2ee2ca525185 100644
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   fetchpatch2,
   replaceVars,
-  apple-sdk_11,
   cmake,
-  darwinMinVersionHook,
   ninja,
   zlib,
   mklSupport ? true,
@@ -48,13 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [ zlib ]
-    ++ lib.optionals mklSupport [ mkl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
-    ];
+  buildInputs = [ zlib ] ++ lib.optionals mklSupport [ mkl ];
 
   meta = {
     description = "FEBio Suite Solver";
diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
index 645e7731b498..baa0248200ed 100644
--- a/pkgs/by-name/fi/findup/package.nix
+++ b/pkgs/by-name/fi/findup/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   testers,
   zig_0_11,
-  apple-sdk_11,
 }:
 let
   zig = zig_0_11;
@@ -22,8 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ zig.hook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index f8f32d05708f..a5c3c0be3681 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -13,7 +13,6 @@
   libXcursor,
   freetype,
   alsa-lib,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,17 +52,15 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-      freetype
-      alsa-lib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXrandr
+    libXinerama
+    libXext
+    libXcursor
+    freetype
+    alsa-lib
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index e6c5ee6c5486..3a1d96ed47b6 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -17,7 +17,6 @@
   mupdf,
   fontconfig,
   freetype,
-  apple-sdk_11,
 }:
 
 buildGoModule rec {
@@ -88,9 +87,6 @@ buildGoModule rec {
       libXxf86vm
       fontconfig
       freetype
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh
diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
index a2d89037f435..37f3b7b8ab4b 100644
--- a/pkgs/by-name/gg/gg-jj/package.nix
+++ b/pkgs/by-name/gg/gg-jj/package.nix
@@ -17,7 +17,6 @@
 
   openssl,
   webkitgtk_4_1,
-  apple-sdk_11,
 
   versionCheckHook,
   nix-update-script,
@@ -71,8 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       webkitgtk_4_1
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   env.OPENSSL_NO_VENDOR = true;
 
diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix
index ff9d9c351d8f..dcc66bfeb3dc 100644
--- a/pkgs/by-name/gh/ghc_filesystem/package.nix
+++ b/pkgs/by-name/gh/ghc_filesystem/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   cmake,
   fetchFromGitHub,
   nix-update-script,
@@ -20,8 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
index f7a71c4398a4..96e83519325e 100644
--- a/pkgs/by-name/gl/glsl_analyzer/package.nix
+++ b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   zig_0_13,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
     zig_0_13.hook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    # The package failed to build on x86_64-darwin because the default was the 10.12 SDK
-    # Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed.
-    apple-sdk_11
-  ];
-
   postPatch = ''
     substituteInPlace build.zig \
       --replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"'

From 096ab963dcda8b8e274789186a33b43c07b0edf9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:46:07 +0000
Subject: [PATCH 1308/1504] erofs-utils: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index aabbe20cde6c..05968132a811 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "erofs-utils";
-  version = "1.8.3";
+  version = "1.8.4";
   outputs = [
     "out"
     "man"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PFzANgPqCLqa5eBCDurqX/F+0p4igGhTEDVsvyUwToU=";
+    hash = "sha256-eRWHqgdLufn6IYx2LMH2CwFeL1G8ss6R9oLwQ4VqtJQ=";
   };
 
   nativeBuildInputs = [

From 1b884f28bf4e8872dda48e3d5965f8b1e43a1c38 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 19:20:02 -0600
Subject: [PATCH 1309/1504] treewide: unpin apple-sdk_11

---
 pkgs/applications/audio/musescore/default.nix            | 4 ----
 pkgs/applications/editors/lapce/default.nix              | 2 --
 pkgs/applications/emulators/86box/default.nix            | 4 +---
 pkgs/applications/networking/sync/lsyncd/default.nix     | 6 +++---
 pkgs/applications/version-management/fnc/default.nix     | 4 ----
 .../applications/version-management/gitoxide/default.nix | 3 +--
 .../build-support/build-graalvm-native-image/default.nix | 9 ---------
 pkgs/by-name/gi/git-interactive-rebase-tool/package.nix  | 2 --
 pkgs/games/ddnet/default.nix                             | 4 ----
 pkgs/servers/search/meilisearch/default.nix              | 4 ----
 pkgs/tools/system/btop/default.nix                       | 2 --
 11 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 4a06c49e49ef..04253607aadb 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -32,7 +32,6 @@
   qtnetworkauth,
   qttools,
   nixosTests,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -127,9 +126,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
       qtwayland
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   postInstall =
diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix
index ea649595d645..83a76824e405 100644
--- a/pkgs/applications/editors/lapce/default.nix
+++ b/pkgs/applications/editors/lapce/default.nix
@@ -19,7 +19,6 @@
   wayland,
   gobject-introspection,
   xorg,
-  apple-sdk_11,
 }:
 let
   rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [
@@ -94,7 +93,6 @@ rustPlatform.buildRustPackage rec {
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libobjc
-      apple-sdk_11
     ];
 
   postInstall =
diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix
index f9c25f94a4ba..51961cc76e5a 100644
--- a/pkgs/applications/emulators/86box/default.nix
+++ b/pkgs/applications/emulators/86box/default.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  apple-sdk_11,
   lib,
   fetchFromGitHub,
   cmake,
@@ -90,8 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
     ++ lib.optional enableWayland wayland
-    ++ lib.optional enableVncRenderer libvncserver
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ++ lib.optional enableVncRenderer libvncserver;
 
   cmakeFlags =
     lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index 7a985b7ad940..c11e062e33e0 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -11,11 +11,11 @@
   docbook_xml_dtd_45,
   docbook_xsl,
   libxslt,
-  apple-sdk_11,
+  apple-sdk,
 }:
 
 let
-  xnu = apple-sdk_11.sourceRelease "xnu";
+  xnu = apple-sdk.sourceRelease "xnu";
 in
 stdenv.mkDerivation rec {
   pname = "lsyncd";
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     docbook_xml_dtd_45
     docbook_xsl
     libxslt
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/axkibe/lsyncd";
diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix
index af9088d8a068..515f8a193311 100644
--- a/pkgs/applications/version-management/fnc/default.nix
+++ b/pkgs/applications/version-management/fnc/default.nix
@@ -5,8 +5,6 @@
   zlib,
   ncurses,
   libiconv,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,8 +20,6 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
     ncurses
     zlib
-    apple-sdk_11
-    (darwinMinVersionHook "11.0")
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index 61b8cfdf68c5..35680d240ae6 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -5,7 +5,6 @@
   cmake,
   pkg-config,
   stdenv,
-  apple-sdk_11,
   curl,
   openssl,
   buildPackages,
@@ -36,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ apple-sdk_11 ] else [ openssl ]);
+  buildInputs = [ curl ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
   preFixup = lib.optionalString canRunCmd ''
     installShellCompletion --cmd gix \
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index 45680a42e9ed..e1e4df52f02a 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -1,8 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
   glibcLocales,
   # The GraalVM derivation to use
   graalvmDrv,
@@ -35,8 +33,6 @@ let
   extraArgs = builtins.removeAttrs args [
     "lib"
     "stdenv"
-    "apple-sdk_11"
-    "darwinMinVersionHook"
     "glibcLocales"
     "jar"
     "dontUnpack"
@@ -60,11 +56,6 @@ stdenv.mkDerivation (
       removeReferencesTo
     ];
 
-    buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
-
     nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
 
     buildPhase =
diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index 534db5bfb1b5..06224cfc0812 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   rustPlatform,
   libiconv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -22,7 +21,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
-    apple-sdk_11
   ];
 
   # Compilation during tests fails if this env var is not set.
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 7ab1ef89e2e7..f69c15ecfa3f 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -8,7 +8,6 @@
   pkg-config,
   rustPlatform,
   rustc,
-  apple-sdk_11,
   curl,
   freetype,
   libGLU,
@@ -87,9 +86,6 @@ stdenv.mkDerivation rec {
       ++ lib.optionals stdenv.hostPlatform.isLinux [
         libX11
       ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        apple-sdk_11
-      ]
     );
 
   postPatch = ''
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index 8249fdccc2ab..109d3f24c63a 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -1,9 +1,7 @@
 {
-  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
   nixosTests,
   nix-update-script,
 }:
@@ -38,8 +36,6 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   passthru = {
     updateScript = nix-update-script { };
     tests = {
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix
index 2a50e5933d3a..2623821e16dc 100644
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@@ -7,7 +7,6 @@
   removeReferencesTo,
   autoAddDriverRunpath,
   apple-sdk_15,
-  darwinMinVersionHook,
   versionCheckHook,
   rocmPackages,
   cudaSupport ? config.cudaSupport,
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
-    (darwinMinVersionHook "10.15")
   ];
 
   installFlags = [ "PREFIX=$(out)" ];

From 9d13130e47d52a6c0f6a25ab08061055e085bb53 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 20:29:14 -0600
Subject: [PATCH 1310/1504] git-interactive-rebase-tool: remove explicit
 libiconv

---
 pkgs/by-name/gi/git-interactive-rebase-tool/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index 06224cfc0812..6a8db4bcd889 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
-  libiconv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,10 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-  ];
-
   # Compilation during tests fails if this env var is not set.
   preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
   postCheck = "unset GIRT_BUILD_GIT_HASH";

From f9ce72b1489076056f97078ac97bfa615b8b3955 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 2 Jan 2025 17:37:29 -0800
Subject: [PATCH 1311/1504] maintainers: add nullcube

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 463589fd1dcf..e8ffaee8fea3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16578,6 +16578,13 @@
     githubId = 22592293;
     name = "Kartik Gokte";
   };
+  nullcube = {
+    email = "nullcub3@gmail.com";
+    name = "NullCube";
+    github = "nullcub3";
+    githubId = 51034487;
+    matrix = "@nullcube:matrix.org";
+  };
   nullishamy = {
     email = "spam@amyerskine.me";
     name = "nullishamy";

From 283118767b8767a6f70240fe94c057f107ac8642 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:59:08 +0000
Subject: [PATCH 1312/1504] goreleaser: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index e2c2ec088a7e..19f350b0205e 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGoModule rec {
   pname = "goreleaser";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-DWxYcviI/J9SlHe81UU8yw19pz671C+BsUnrId4JbDE=";
+    hash = "sha256-W3f/1nn2gZhNloZNEg4ucTKt7B0K6NIYcBsPJyEhaKc=";
   };
 
-  vendorHash = "sha256-Dbd7zKmzaMixD7AsWjsdiSXUebyjFvPfmwMjozMnaUQ=";
+  vendorHash = "sha256-lEtuEtz0FMTiUYHiOhPlH78IXHjXCj0Y9Uf2lLgJw/o=";
 
   ldflags = [
     "-s"

From 7d832b60c0cc38b0eda3a670fe1f798e762175b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 03:59:20 +0000
Subject: [PATCH 1313/1504] nom: 2.6.2 -> 2.7.1

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

diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 97c43e597fda..23369e12e628 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "2.6.2";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     rev = "v${version}";
-    hash = "sha256-oaManxhksEBwbe1jmkRmOJMhYFiulGTVCuto4RMznvg=";
+    hash = "sha256-8zUIqOKbiD8tOWfTU9ixyxWMIRsmskmJVcXyM6X9JNs=";
   };
 
-  vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M=";
+  vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
 
   meta = with lib; {
     homepage = "https://github.com/guyfedwards/nom";

From 51deb46482e312afb92504791fa1092bfa0645ee Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 11:12:40 +0900
Subject: [PATCH 1314/1504] hmmer: enable aarch64 support

hmmer supports aarch64 since v3.4
---
 pkgs/by-name/hm/hmmer/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix
index 81d0cdb1ec81..9a3d0a364082 100644
--- a/pkgs/by-name/hm/hmmer/package.nix
+++ b/pkgs/by-name/hm/hmmer/package.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md";
     license = licenses.gpl3;
     maintainers = [ maintainers.iimog ];
-    # at least SSE is *required*
-    platforms = platforms.x86_64;
+    platforms = lib.platforms.unix;
   };
 }

From 9e00c8a8519bf11c7f58e765daf0279d68c5723b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 11:18:55 +0900
Subject: [PATCH 1315/1504] hmmer: change license from gpl3 to bsd3

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

diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix
index 9a3d0a364082..c05ccd065d04 100644
--- a/pkgs/by-name/hm/hmmer/package.nix
+++ b/pkgs/by-name/hm/hmmer/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://hmmer.org/";
     changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md";
-    license = licenses.gpl3;
+    license = licenses.bsd3;
     maintainers = [ maintainers.iimog ];
     platforms = lib.platforms.unix;
   };

From 0890b8133312e2aeef7e3d5529ad7e8e692cae20 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 12:22:09 +0900
Subject: [PATCH 1316/1504] easel: init at 0.49

---
 pkgs/by-name/ea/easel/package.nix | 49 +++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/ea/easel/package.nix

diff --git a/pkgs/by-name/ea/easel/package.nix b/pkgs/by-name/ea/easel/package.nix
new file mode 100644
index 000000000000..d172f891eb69
--- /dev/null
+++ b/pkgs/by-name/ea/easel/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  perl,
+  python3,
+  versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "easel";
+  version = "0.49";
+
+  src = fetchFromGitHub {
+    owner = "EddyRivasLab";
+    repo = "easel";
+    tag = "easel-${finalAttrs.version}";
+    hash = "sha256-NSKy7ptNYR0K/VFJNv+5TGWdC1ZM4Y5i/3L+3Coj/sg=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  nativeCheckInputs = [
+    perl
+    python3
+  ];
+
+  preCheck = ''
+    patchShebangs devkit/sqc
+  '';
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Sequence analysis library used by Eddy/Rivas lab code";
+    homepage = "https://github.com/EddyRivasLab/easel";
+    license = lib.licenses.bsd2;
+    mainProgram = "easel";
+    maintainers = with lib.maintainers; [ natsukium ];
+    platforms = lib.platforms.unix;
+  };
+})

From e3f9d35315ccb2cff631a8f3c0cbf536e8ef9135 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 13:43:07 +0900
Subject: [PATCH 1317/1504] hmmer: enable tests

---
 pkgs/by-name/hm/hmmer/package.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix
index c05ccd065d04..941a59068b32 100644
--- a/pkgs/by-name/hm/hmmer/package.nix
+++ b/pkgs/by-name/hm/hmmer/package.nix
@@ -2,6 +2,10 @@
   lib,
   stdenv,
   fetchurl,
+  easel,
+  perl,
+  python3,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,6 +17,28 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M=";
   };
 
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  nativeCheckInputs = [
+    perl
+    python3
+  ];
+
+  preCheck = ''
+    install -Dm755 ${easel.src}/devkit/sqc easel/devkit/sqc
+    patchShebangs easel/devkit/sqc testsuite/* src/hmmpress.itest.pl
+  '';
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgram = "${placeholder "out"}/bin/hmmalign";
+
+  versionCheckProgramArg = [ "-h" ];
+
   meta = with lib; {
     description = "Biosequence analysis using profile hidden Markov models";
     longDescription = ''

From 2e4f197e17d4651a1b293f36f92148b05b8422e2 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 13:46:25 +0900
Subject: [PATCH 1318/1504] hmmer: refactor

---
 pkgs/by-name/hm/hmmer/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix
index 941a59068b32..ef70f6d37ca9 100644
--- a/pkgs/by-name/hm/hmmer/package.nix
+++ b/pkgs/by-name/hm/hmmer/package.nix
@@ -8,13 +8,13 @@
   versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "3.4";
   pname = "hmmer";
 
   src = fetchurl {
-    url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
-    sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M=";
+    url = "http://eddylab.org/software/hmmer/hmmer-${finalAttrs.version}.tar.gz";
+    hash = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M=";
   };
 
   enableParallelBuilding = true;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   versionCheckProgramArg = [ "-h" ];
 
-  meta = with lib; {
+  meta = {
     description = "Biosequence analysis using profile hidden Markov models";
     longDescription = ''
       HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs).
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
       HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute.
     '';
     homepage = "http://hmmer.org/";
-    changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.iimog ];
+    changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${finalAttrs.version}/release-notes/RELEASE-${finalAttrs.version}.md";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.iimog ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 3d76bff0ac6487b474e31051312efd68eea23a06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 04:51:21 +0000
Subject: [PATCH 1319/1504] python312Packages.orange-canvas-core: 0.2.4 ->
 0.2.5

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

diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix
index c79a8e1e9511..354e8e5d4f48 100644
--- a/pkgs/development/python-modules/orange-canvas-core/default.nix
+++ b/pkgs/development/python-modules/orange-canvas-core/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "orange-canvas-core";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "biolab";
     repo = "orange-canvas-core";
     tag = version;
-    hash = "sha256-tLFWOXsAhqxFV0wdlAKestO/F/rDtdFnKDd0FXPeNpg=";
+    hash = "sha256-uh9wNqgLYRcnCSOdpeLx6ZTRC0cpq6lG/sqmrYLR+3g=";
   };
 
   build-system = [ setuptools ];

From cc9ec42710d2a0f62034759d6c910317a43a267d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 05:32:59 +0000
Subject: [PATCH 1320/1504] simdutf: 5.7.1 -> 5.7.2

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 06f75f403f8e..23bf0aa51313 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.7.1";
+  version = "5.7.2";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CrWFs8fjgkvElbsvfS3jOyk1G+fBQB1lt63EvU6p11c=";
+    hash = "sha256-rSEl5g9FZiOrYRoHkBAUbMWE1kZvl3pbhkskzoMbIb0=";
   };
 
   # Fix build on darwin

From 59bb5daf312bbb48a3432d6866b7f0b7cbec0966 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 3 Jan 2025 05:13:12 +0000
Subject: [PATCH 1321/1504] komikku: 1.66.0 -> 1.67.0

Diff: https://codeberg.org/valos/Komikku/compare/v1.66.0...v1.67.0
Changelog: https://codeberg.org/valos/Komikku/releases/tag/v1.67.0
---
 pkgs/by-name/ko/komikku/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index 70f1f85009aa..cf61592b4f7b 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,16 +23,15 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.66.0";
-
-  format = "other";
+  version = "1.67.0";
+  pyproject = false;
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-hrQZZ0pZhn+Ph7it6LPFtRMN9mvgFkG//zEi+pVb8n4=";
+    hash = "sha256-vWAYsImJseEQvgq7vreqS76M963zfuL56R87P3od9m4=";
   };
 
   nativeBuildInputs = [

From cf879faabb4526eb78c1a93770e80fd49eacdfc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 06:06:50 +0000
Subject: [PATCH 1322/1504] fluidd: 1.31.2 -> 1.31.4

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

diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix
index 05894dc685f7..275be923db0e 100644
--- a/pkgs/by-name/fl/fluidd/package.nix
+++ b/pkgs/by-name/fl/fluidd/package.nix
@@ -2,12 +2,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "fluidd";
-  version = "1.31.2";
+  version = "1.31.4";
 
   src = fetchurl {
     name = "fluidd-v${version}.zip";
     url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip";
-    sha256 = "sha256-It/etwQGBok805FVTneOR+LU7QkHUHWXpUWtKLq6xe0=";
+    sha256 = "sha256-gqwVZg37pZA+XjT3FpTMYkrOIT1KKUN6upg7e1vh1t0=";
   };
 
   nativeBuildInputs = [ unzip ];

From ea99748e2fb0233dc2a5b896d079eed8728102e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 06:23:56 +0000
Subject: [PATCH 1323/1504] warp-terminal: 0.2024.12.18.08.02.stable_03 ->
 0.2024.12.18.08.02.stable_05

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index bc2650a06601..857823715da7 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-CrRt7fLoZ9LR3fD7xXBzlRFf4CAjQjokU5UaHNJnVNA=",
-    "version": "0.2024.12.18.08.02.stable_03"
+    "hash": "sha256-Un5dqYt3kGh3ODZnP2nskfzhma7KkpZXJTqPfwcZ4Dw=",
+    "version": "0.2024.12.18.08.02.stable_05"
   },
   "linux_x86_64": {
-    "hash": "sha256-0A9EPkDp77tpfrRuXV2rVPaXMYbY7erbKBd6IT9CTFQ=",
-    "version": "0.2024.12.18.08.02.stable_03"
+    "hash": "sha256-U14TFQg72vfizYu8qXjH+JafL5aWndz1sbMSF3TD/+E=",
+    "version": "0.2024.12.18.08.02.stable_05"
   },
   "linux_aarch64": {
-    "hash": "sha256-IlqpK8IbtSMKGNspKj2Rq2Jzlyc7RYcfRaoYY9Akhdk=",
-    "version": "0.2024.12.18.08.02.stable_03"
+    "hash": "sha256-lbZawoh9VUhNlbs+pxUu5pdWsizq9B1UPBsaNxUSs20=",
+    "version": "0.2024.12.18.08.02.stable_05"
   }
 }

From 71399ae0c848d50492d607ff43654deba7a16d27 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 22:40:29 +0100
Subject: [PATCH 1324/1504] fbvnc: fix build with GCC 14

---
 pkgs/by-name/fb/fbvnc/gcc14-fix.patch | 25 +++++++++++++++++++++++++
 pkgs/by-name/fb/fbvnc/package.nix     |  6 ++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/fb/fbvnc/gcc14-fix.patch

diff --git a/pkgs/by-name/fb/fbvnc/gcc14-fix.patch b/pkgs/by-name/fb/fbvnc/gcc14-fix.patch
new file mode 100644
index 000000000000..c53156e830c1
--- /dev/null
+++ b/pkgs/by-name/fb/fbvnc/gcc14-fix.patch
@@ -0,0 +1,25 @@
+diff --git a/vncauth.c b/vncauth.c
+index 79c4448..6348007 100644
+--- a/vncauth.c
++++ b/vncauth.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "vncauth.h"
+diff --git a/vncauth.h b/vncauth.h
+index 86dc455..7fdb8d4 100644
+--- a/vncauth.h
++++ b/vncauth.h
+@@ -25,6 +25,8 @@
+ #define CHALLENGESIZE 16
+ 
+ extern int vncEncryptAndStorePasswd(char *passwd, char *fname);
++extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname);
+ extern char *vncDecryptPasswdFromFile(char *fname);
++extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly);
+ extern void vncRandomBytes(unsigned char *bytes);
+ extern void vncEncryptBytes(unsigned char *bytes, char *passwd);
diff --git a/pkgs/by-name/fb/fbvnc/package.nix b/pkgs/by-name/fb/fbvnc/package.nix
index 74934166b9d9..edcf7eb92dc5 100644
--- a/pkgs/by-name/fb/fbvnc/package.nix
+++ b/pkgs/by-name/fb/fbvnc/package.nix
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-oT7+6kIeFDgU6GbcHYQ6k0jCU84p8fTEVgUozYMkeVI=";
   };
 
+  patches = [
+    # GCC 14 errors on missing function definitions
+    # https://github.com/zohead/fbvnc/pull/3
+    ./gcc14-fix.patch
+  ];
+
   makeFlags = [
     "CC:=$(CC)"
   ];

From f23381a2ee322543203e928da6053a7c3eda44e1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jan 2025 08:36:47 +0100
Subject: [PATCH 1325/1504] zfs-replicate: fix typo in comment

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

diff --git a/pkgs/by-name/zf/zfs-replicate/package.nix b/pkgs/by-name/zf/zfs-replicate/package.nix
index ab110b740786..130d6e813c04 100644
--- a/pkgs/by-name/zf/zfs-replicate/package.nix
+++ b/pkgs/by-name/zf/zfs-replicate/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   };
 
   # For compression to work, both local and remote systems must have lz4 installed.
-  # This hard codes the path to the lz4 when running it on the local system.
+  # This hard codes the path to the lz4 binary when running it on the local system.
   postPatch = ''
     substituteInPlace zfs/replicate/compress/command.py \
       --replace-fail \
@@ -37,9 +37,9 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
     hypothesis
     pytest-cov-stub
+    pytestCheckHook
   ];
 
   doCheck = true;

From 131c19f890c5698797536f7a76e844621700b153 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 07:56:39 +0000
Subject: [PATCH 1326/1504] omnictl: 0.45.0 -> 0.45.1

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

diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix
index 7f9dce85e10a..2f96914b0702 100644
--- a/pkgs/by-name/om/omnictl/package.nix
+++ b/pkgs/by-name/om/omnictl/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "omnictl";
-  version = "0.45.0";
+  version = "0.45.1";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "omni";
     rev = "v${version}";
-    hash = "sha256-FA2lGSeTbJXc/BEWOu43sV2xS9tTwQ+iKrDW2tFAsJ4=";
+    hash = "sha256-a9lp/XDet4CcMadMHj1ia4tdsK/Y8Sfd2f6/A2j1liQ=";
   };
 
   vendorHash = "sha256-U/cserG37gM1XDN9HcPqnq4hPJSaOaLBoIs5OcsocYw=";

From 64b7779cf25c7b5960311f4508f9c2df798d7df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= <greyrol@kiosc.com>
Date: Fri, 3 Jan 2025 09:08:10 +0100
Subject: [PATCH 1327/1504] symfony-cli: 5.10.5 -> 5.10.6

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

diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index 50842e433ca2..3364aebb692e 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -11,14 +11,14 @@
 
 buildGoModule rec {
   pname = "symfony-cli";
-  version = "5.10.5";
+  version = "5.10.6";
   vendorHash = "sha256-UqaRZPCgjiexeeylfP8p0rye6oc+rWac87p8KbVKrdc=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     rev = "v${version}";
-    hash = "sha256-0QYv7C3n1VtmR3OOVqIXI13MtPTJD4wBTX1NDoKP6f8=";
+    hash = "sha256-II8dPbvi8Ys+7JzzLDPipKHMJDxZOFib3Lv/9qLTjg0=";
     leaveDotGit = true;
     postFetch = ''
       git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE

From ba76eccef048c65f8ab7b51144b137f519991e56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 08:14:51 +0000
Subject: [PATCH 1328/1504] home-manager: 0-unstable-2024-12-23 ->
 0-unstable-2025-01-02

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

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 6b24aca0cc08..58fc93c32659 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2024-12-23";
+  version = "0-unstable-2025-01-02";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "f1b1786ea77739dcd181b920d430e30fb1608b8a";
-    hash = "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=";
+    rev = "5f6aa268e419d053c3d5025da740e390b12ac936";
+    hash = "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=";
   };
 
   nativeBuildInputs = [

From 1b564f773f7dcd4e455f47fe0b2b4598f2224fbf Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 3 Jan 2025 17:26:56 +0900
Subject: [PATCH 1329/1504] uv: 0.5.13 -> 0.5.14

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index ad6684023ca2..ba2a45cb9bdb 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uv";
-  version = "0.5.13";
+  version = "0.5.14";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-W24bw+fQk7DoHPGFtUiIPybxuCa03o1ngAXqVwU/Z7E=";
+    hash = "sha256-/IUVdOcQwBKfuNlQozdaVe3TzdXptpADXGk27XLF+xc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-CN4ZqYeZktcQT0Pro8rfnzri6i0xranmYdroKzwkK6A=";
+  cargoHash = "sha256-dkVyLfihJIfhGrETY0BAHrB4h6JiwL+kfsyP2nwqLN4=";
 
   nativeBuildInputs = [
     cmake

From b640889b6247d1a1b31d7337bd6688cb070273ef Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:07:33 +0100
Subject: [PATCH 1330/1504] cargo-asm: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-asm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 476eb57c4341..f8cd24e153d3 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Display the assembly or LLVM-IR generated for Rust source code";
     homepage = "https://github.com/gnzlbg/cargo-asm";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }

From 278286c93e33e2b8ae232d42ecc49d32e430c4c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 09:30:57 +0000
Subject: [PATCH 1331/1504] usql: 0.19.14 -> 0.19.15

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

diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix
index 4f99c2d6a3e3..4fcc79347bf6 100644
--- a/pkgs/by-name/us/usql/package.nix
+++ b/pkgs/by-name/us/usql/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.19.14";
+  version = "0.19.15";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    hash = "sha256-RKeUh+a2fyvvwm1dcRY2ydAloD9kD9mgLcrjmKSl1Xw=";
+    hash = "sha256-sZre2hMJvUyAmsTeXXzwQZhLzZUTx3eFmi7mGHHTAkk=";
   };
 
   buildInputs = [
@@ -25,7 +25,7 @@ buildGoModule rec {
     icu
   ];
 
-  vendorHash = "sha256-AA4w9ROVozDXx2F/3PoOe0BSDC/GFkmsVmt/daK9MQU=";
+  vendorHash = "sha256-DpqQK6PQaqNYaLL0SsWLyKy8xFZdsYk9RjRx3178g7U=";
   proxyVendor = true;
 
   # Exclude drivers from the bad group

From b4e1c1f013a24039b6a9e9e80655e3bab96c90a5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 3 Jan 2025 04:47:57 -0500
Subject: [PATCH 1332/1504] lhapdf: update/fix meta, update pdf_sets (#369896)

* lhapdf: update meta

* lhapdf.pdf_sets: update
---
 .../libraries/physics/lhapdf/default.nix      |   4 +-
 .../libraries/physics/lhapdf/maintainer.sh    |   4 +-
 .../libraries/physics/lhapdf/pdf_sets.nix     | 580 ++++++++++++------
 3 files changed, 390 insertions(+), 198 deletions(-)

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 5fcba8724184..b1d42a3560db 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "General purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
-    license = licenses.gpl2;
-    homepage = "http://lhapdf.hepforge.org";
+    license = licenses.gpl3;
+    homepage = "https://www.lhapdf.org";
     platforms = platforms.unix;
     maintainers = with maintainers; [ veprbl ];
   };
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
index dc182ec99ea6..2adf757f4c02 100755
--- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh
+++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
@@ -6,8 +6,8 @@ set -xe
 
 BASE_URL="https://lhapdfsets.web.cern.ch/current/"
 
-for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -n -e 's/.*<a href=".*\/\([^"/]*\.tar\.gz\)".*/\1/p' | sort -u`; do
-    echo -n "    \"${pdf_set%.tar.gz}\" = \""
+for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -n -e 's/.*<a href="#" data-url="\([^"/]*\.tar\.gz\)".*/\1/p' | sort -u`; do
+    echo -n "  \"${pdf_set%.tar.gz}\" = \""
     nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n'
     echo "\";"
 done
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 01bf10868959..20b2fef93425 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -35,6 +35,7 @@ lib.mapAttrs mkPdfSet {
   "ABMP16_4_nnlo" = "1cw52ijyrhgvyqc28pp278bavy9acvs6qywysgc7qjifygb14mca";
   "ABMP16_5_nlo" = "0s7yz85fjfkmmxj3xdkhz5658n3nx8rr4yjz4hrqbcy00zdcscr2";
   "ABMP16_5_nnlo" = "0iyypvj4645g7nh8w6v88pz37p81bxilgc4p7wlkaa90hiq0wrk0";
+  "ABMP16_5_nnlo_high_x" = "06nldc7x3z7z27d6pz8hyy04p9nh2y9djnj3hbnpnx52qkmiw4vk";
   "ABMP16als112_5_nnlo" = "17kg6gvl09p5gm99yb9d8hkl1q51904qflsziv3r5ybxs18ym5g8";
   "ABMP16als113_5_nnlo" = "1gaiyq70zxx7c7c0gkkad3ygbhdwc563al2a6ksy78q8is3bhdy9";
   "ABMP16als114_5_nlo" = "0vnwbz6v2d02d5r34ysd7b4d22h948f3zri2n3yj93k6za9y42gw";
@@ -67,6 +68,11 @@ lib.mapAttrs mkPdfSet {
   "ATLASepWZVjet20-EIG" = "0lvd3zkmisx95rbjx7r9wkk0s0mxvaybp3pk66sxrxf1bj1l9r52";
   "ATLASepWZVjet20-MOD" = "1iyb50isdsy3a5wnlm0185z9bfs6nxwlcl1aqlh4h3j1dbmz4ba9";
   "ATLASepWZVjet20-PAR" = "1kfqii7sbcs8zdsyd9kiy3r233nawc9yfc23fb6ql0xcwfzpyb1d";
+  "ATLASpdf21_T1" = "06p9lzchprnfnx79djz6hdgv4hpvghmylxx2a41a8kp10bshc0gd";
+  "ATLASpdf21_T3" = "0apfbydnakn898m7ny5vcp2jgnlfh79zxkcsdpzm7va2zvh686wm";
+  "CGMP_B-hadron_NNLO_as_0118" = "00j7rm20kyf6k2j45inb478bjikml6jf1h34ynfda9fhh5vv20ks";
+  "CGMP_B-hadron_to_Jpsi_NNLO_as_0118" = "087gszpxj43db1am005d4aavwr858y2vr2yf71aw1581j7ln7grv";
+  "CGMP_B-hadron_to_muon_NNLO_as_0118" = "026j6y0jglh0sdivrq3cmmrlydq3d6fw4780wll3m8i5mz3aal61";
   "CJ12max" = "1vk2zkaiqbl6fixaxy7mrggmmxv7lvnw736lxm5sh25dapg6s8ag";
   "CJ12mid" = "0s2558ihypn0l9qqx25qwnawbc7fkbi2wwwhbyb108rjk2klaf8v";
   "CJ12min" = "1kdla638m3axr65ndid9irmqhby4gl084r297xw3jxxlrb0b7hj9";
@@ -229,7 +235,12 @@ lib.mapAttrs mkPdfSet {
   "CT18ANNLO_as_0122" = "1nbkgb0wmjh2bfx944sqb810sn4bb0ppxgv2aw2y93jbfyx7x4ry";
   "CT18ANNLO_as_0123" = "1rlxn70mc299v596y0dwp9a1pdy1yz0r8367cjw5l97y46yxhjrh";
   "CT18ANNLO_as_0124" = "0sfkvhyxp9sqf75wj91h9h59vcs2y2n4qchsg0marjy849xxh6qb";
+  "CT18FC" = "1ashbdgym3z27c217hhy6xmrmgg2899nlj881b4v0kbv3fhkwnbh";
+  "CT18LO" = "0gqyr8bd3v8xw9smwnsprg0yzkf6wsi4jsyi2gjcix6hxf8pbhz3";
   "CT18NLO" = "04y2p6vz484l3yv6381pfavqs3xh78h3jn6bg7ncp5vywwqp44n9";
+  "CT18NLO_NF3" = "07dbi10qrkc0jqjcfir6j38zj56jvimarry6a9xxk3zp3idqb15g";
+  "CT18NLO_NF4" = "1psg0vw0waff06pcghiliaa8afrjlgwmmc9xsf6gd1c47kk86qgw";
+  "CT18NLO_NF6" = "04dmgjjlv15zzanwsjgm4wpsjzhiqaldz225iq6vs1szw5x1zdp8";
   "CT18NLO_as_0110" = "0nrydk44sp7hgabn6xk6r2hnkir7mgddcsbbnqmpwmq3x0xz27pn";
   "CT18NLO_as_0111" = "17xwzcj4n1bmfwz02n2g8afzxc4lp5diij00f2w50pqh2w7vj6g9";
   "CT18NLO_as_0112" = "0a6lsmpz3c1z7dm593nb3r9q7dgpskkls2i6wpdlrrg6s6cr8rmq";
@@ -246,6 +257,9 @@ lib.mapAttrs mkPdfSet {
   "CT18NLO_as_0123" = "1bl6rf69gjnblvfdh5p8flax9qb65vk25hcfjw2r7qwdz3dxs6sr";
   "CT18NLO_as_0124" = "18mhpn4l3qqg9v79z2vz4jc8w3za726fndfl6sbc9mf94jy72chm";
   "CT18NNLO" = "1shkah5ma0hp101aklkz2p8n9y4i4sv6zwa5ifzyj3bgz1020l5f";
+  "CT18NNLO_NF3" = "1lrmdiccsiqq1awhszd4vyrm1xbvknnya88c2qh10q63z7r01xin";
+  "CT18NNLO_NF4" = "1dkr3w0m8gxk302p1bvv06wx9vplb15zjdwfgayavr3sj2axm4xs";
+  "CT18NNLO_NF6" = "1ivddp2sv8w25sl62gl3fmswp9ii8jjxg246m7igh0hpz35p9b65";
   "CT18NNLO_as_0110" = "0v7nsjcm1q7hgj726zlvfydl3arqkwyddd20z3g0nwdqcimv3qs9";
   "CT18NNLO_as_0111" = "118444ygv03ryhbb28njbsayvv0rdlcb9djja6p62kk6rnbwi1wz";
   "CT18NNLO_as_0112" = "0djxkvwk628sxgf62bff40m2m6vgzs08jss61f90rscvj6gxid5b";
@@ -294,6 +308,9 @@ lib.mapAttrs mkPdfSet {
   "CT18XNNLO_as_0123" = "02kak35pj6c4hml75na7452ryashfclglhahclzkpq8gs72l5w91";
   "CT18XNNLO_as_0124" = "03wym12nvwdcr13dz6d2gr4bz3csffnn21zfdld42fsyq4glx431";
   "CT18ZNLO" = "0iv8laks2ymn5fygk6k9lxm3s7fld5g292n9bfkhn3nmcfxczi03";
+  "CT18ZNLO_NF3" = "0nplvmpd0crhb7526z373mb5z00057p3adsx2kgiqd6q644si1x7";
+  "CT18ZNLO_NF4" = "0253bs83sjzp099sxymzqzs3p7f3czcn1x3bwj4wlv4jvf7wd057";
+  "CT18ZNLO_NF6" = "02gyxj2mg3jk87yaw3j6szl7n3grgphw89wyp4fc6g87rgsh9lnj";
   "CT18ZNLO_as_0110" = "1d0j9nmn9mk90698pxqlpgz7c7cyxswc88n89cr2h8mgcg2w8g2v";
   "CT18ZNLO_as_0111" = "17l7j1j2x529mhk0andkdh83k9z6kg9v3ccfna08i7d4iilsdfrs";
   "CT18ZNLO_as_0112" = "1b8mi0jwln2wvysrkbm1fvay053d17dzvlj9fkz36xmr03bv5mvj";
@@ -310,6 +327,9 @@ lib.mapAttrs mkPdfSet {
   "CT18ZNLO_as_0123" = "14cl8fmkl6jav7byqwcfa1z2ml6lnn6pzp0w4nqy75gc7wxsba0m";
   "CT18ZNLO_as_0124" = "18riha0fflfbsgh7nnc3ghm8cpzpcss0z6l48d28bbq0i7caqad7";
   "CT18ZNNLO" = "0zsqrpab6vgcinsxjq3rqdadig5flxzk61wc1aa9rwnkbpm1paa5";
+  "CT18ZNNLO_NF3" = "0kgac920jn9c2klhzbv6ydlmg4qn673kw0jbixa6ar4ka7ap0rpy";
+  "CT18ZNNLO_NF4" = "0b5bx8lv2816l5lpzkrx3l592ynk2v8pmm9mhygmpcympyanxwjr";
+  "CT18ZNNLO_NF6" = "1w5s8sg1lg2mgaxya0xk5pqbzg3xaqwryxs1sl3rzqlvjkqg4ca6";
   "CT18ZNNLO_as_0110" = "06qzlfshx8gwrhnmjfvz6sxq7h2is1dqvx5sz8jxrr1gl7gl92h9";
   "CT18ZNNLO_as_0111" = "08k101cn9x9y44zcpn6iql85qqx89rv7xjhvak4y6s309p9rlnzi";
   "CT18ZNNLO_as_0112" = "1c72mz93kha8mdfdcwj8fs8dqqylxmmc4vs7fjf9h7xbrqzmss7m";
@@ -325,6 +345,12 @@ lib.mapAttrs mkPdfSet {
   "CT18ZNNLO_as_0122" = "1bd4193ggv4nb48d0mw2n93ia30h4myfy197k9b0m3qc90xjq77z";
   "CT18ZNNLO_as_0123" = "0r2vri1brq0xcrpj0cg9hf9kwhkh2czmimrsg5bfvx35adiiis19";
   "CT18ZNNLO_as_0124" = "1wq0nz9jfb5fmzwnnh0xyra2j62kb5xpmh2nyy8ih4lvxhgi16mg";
+  "CT18qed_neutron" = "0fvf13n1srxpzm2y0dd4ay2izb8q7hldf9fcppcp1002nf5wg0h3";
+  "CT18qed_neutron_elastic" = "1pjap6sxh5mp6xf6ha0hrl5kkj1qyckkls100axxsd64d6df2q0z";
+  "CT18qed_neutron_inelastic" = "177i6zxyw8r173gpzkn8vclkw06dgj5lg83yspj0n6j1kfszr38h";
+  "CT18qed_proton" = "01z8kil3xflzjp4gf30577dcqmby534sx1czrkvm51g1dx1h3alq";
+  "CT18qed_proton_elastic" = "1cdxhjmhdpgb8hs0ibz8hbb9p1i5c8kykw5qg9qz3zjsgxhn24vk";
+  "CT18qed_proton_inelastic" = "03i5gjj673pxc0qy48p0qwjlhrwsjvgf4702x0hg5nyqpqw4inm2";
   "EPPS16_B_90CL_Au_hess" = "0ab3pnv8fq45mdp29m6lfmrhhnr88k6qvkq6lwxmn17k39v8j9w4";
   "EPPS16_B_90CL_Pb_hess" = "1cjc79sygpxnir3qw9n6cdwvd3flfn11ajqs5y64svrpsqcx5ng0";
   "EPPS16_B_c_90CL_Au_hess" = "1ijvnglq4wrjhhvksyd60s7c6nv50vwyk5vd8c3gs0qr8yz1fk69";
@@ -363,6 +389,23 @@ lib.mapAttrs mkPdfSet {
   "EPPS16nlo_CT14nlo_Pt195" = "14v1gicvm8i8z9d98rlv5rbhaglkbi9fhs3z465p4d764al6znnc";
   "EPPS16nlo_CT14nlo_Sn119" = "10nxn6rdp7svsrkdcdwxryjmirn1s871yj1w493adpfcy3chqw9k";
   "EPPS16nlo_CT14nlo_W184" = "1x8ndmkzmnl79vz1bgi9972190x03asvgnls6qiz746xl37q4ky7";
+  "EPPS21nlo_CT18Anlo_Ag108" = "1fb4m3x7c5bipv50cj1i3izpda0lxah7wihsh11i5b8daxdny8wg";
+  "EPPS21nlo_CT18Anlo_Al27" = "03v7rr4sf6i987yx1xy6qmhfrgz0k9b3ddza443q4agc0qx4w945";
+  "EPPS21nlo_CT18Anlo_Ar40" = "1wmm7naw1cb7j5jwd6k2li0jsqjcssag4andx5grd665vl9izsyz";
+  "EPPS21nlo_CT18Anlo_Au197" = "0a7szqg7rb9pjmcd36z5w8qzpp9cxzhh98hd71qn178ijhmw2adm";
+  "EPPS21nlo_CT18Anlo_Be9" = "1jpx260m7zzafcwddbk3b590sh7c5a7fbz4sjqgy0jgyhvvcrm4m";
+  "EPPS21nlo_CT18Anlo_C12" = "0xds8wp4ncwbkahkf4wy2myf1ccwm6zcf6n2xy89zhddz7f3bzsk";
+  "EPPS21nlo_CT18Anlo_Ca40" = "1fj4ggsab6m52r3zfw8yyc3gr5vlyzdd8m8w7j46mkvg1hb712w1";
+  "EPPS21nlo_CT18Anlo_Cu64" = "1125d3alfikxs26sk9zm89damb1qxp62azsmbrsm6glpxy55jvzm";
+  "EPPS21nlo_CT18Anlo_Fe56" = "0xg0rgdffbnar4gaq7xdnh6rayvma7znf6njn6hwd9zmi6ha04m7";
+  "EPPS21nlo_CT18Anlo_He3" = "1v2r1lxqlp8bb80b2dqjs00jd6k102zhfjsy4sy1ra97fv6s2ism";
+  "EPPS21nlo_CT18Anlo_He4" = "07in45vd0wmpv03447vmidbxi76pvlm85k74kc4vgwkijp6y9dyc";
+  "EPPS21nlo_CT18Anlo_Li6" = "0s6qbik9rigbgvjnk5qxxlg4r3sji2kikd45hhaxn7pnimpmzzhs";
+  "EPPS21nlo_CT18Anlo_O16" = "1mxi57b35hw2hdf2cqdzl4gbvbbg03y3v0dhfc1x6fdxny53900y";
+  "EPPS21nlo_CT18Anlo_Pb208" = "11vjm08ql8c6zc2samvnxfqa8368ibj3jvrmc2p6msa18f8yyrhi";
+  "EPPS21nlo_CT18Anlo_Pt195" = "06kwyjszvm1y53q0iankjagypxyp9gwncsyqb1m2lpv72lar371g";
+  "EPPS21nlo_CT18Anlo_Sn119" = "0d6jid5zf0b0j1b0ch00n1qlnrgknn8z9i14nx9yg58y9l5mzr2w";
+  "EPPS21nlo_CT18Anlo_W184" = "15ss4j6cicp9z7mlpwc9r51r53ksrrzk53l8yyxjq2xwrba0l66q";
   "GKG18_DPDF_FitA_LO" = "0ql03hp30wfaw9gfyska0v5vf4p3n2dsxvkapjqnyfl01ad6vjw2";
   "GKG18_DPDF_FitA_NLO" = "0n9khzvhyxfwbl758vzy8jgyqkgcgl328m657vlami3w22hmpbrz";
   "GKG18_DPDF_FitB_LO" = "0s15ia8mcn00xl28rhdxjigpq0ai80a831366sx0w7qx44bb5n0p";
@@ -472,9 +515,19 @@ lib.mapAttrs mkPdfSet {
   "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c";
   "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n";
   "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib";
-  "MAPFF10NLOPIm" = "0w875dh5klqgggcr84g0g7qmh4q2xim8nrf0xdnfc665xww7v4my";
-  "MAPFF10NLOPIp" = "1493k3p7b03sw0n7va60vqxcry2b3xgpww6fnk2gx8b4w1632yn2";
-  "MAPFF10NLOPIsum" = "0x6sashkhg1hs7wy6fyln12s1f4yavvc90zv4k7rclbah4hr75wm";
+  "MAP23Pion_PRVnlo" = "0hjlswv2dj9pa3xr5w4pka3kpjjydgz390k84rz91mb5rl25bf92";
+  "MAPFF10NLOKAm" = "0sp5gyk2ja4ckbqph2373awicbcs7pi8g925d5yia7hhvy2hp3z3";
+  "MAPFF10NLOKAp" = "15y9ix1jiq03k5y8sv5a5j1kszc6ha0ahyk7p41qbrdv6w75xn35";
+  "MAPFF10NLOKAsum" = "0yyz6qhh8pg0xirds90w0had2ij8b9d90d78df4r8ax96arhp12h";
+  "MAPFF10NLOPIm" = "1nz2fiy186kxcl64cqrii9chrxm2bqs4c4b4xjy18mk7f5z1i3c1";
+  "MAPFF10NLOPIp" = "1w6kk5sppn9mmjqaa419rknpvc68vqza8i4bdc83cn262wqqgf30";
+  "MAPFF10NLOPIsum" = "0v0brfw8gc2qsf8qnfp5h6mcfbr54zjva8mrp9xd8m3askf7qpzv";
+  "MAPFF10NNLOKAm" = "1p0rik42376c3as6zka47vckym5v0m88r8snmj5sdaa6kggp9par";
+  "MAPFF10NNLOKAp" = "0fx5abjyjz0abhlfcaiik5f4n2brwwknmkiak3qancf9qpg6f4f3";
+  "MAPFF10NNLOKAsum" = "1rppj4phmz74d40qdzfgdhh349s1cghvjqmkawr8y5gilgilgw36";
+  "MAPFF10NNLOPIm" = "029qj9asj4pzx1zymijxhyiz9c6rmcyywqyzl2h14433f25a28c9";
+  "MAPFF10NNLOPIp" = "05zibjyyyp2vcy22jn0yw3hpq7sc1ljim0qz8mlm37y2jfgkgsm7";
+  "MAPFF10NNLOPIsum" = "0p3sgznfx4kgmpl4s9qqcrkwdv8l7slaa5600ax422d67ikhsfln";
   "METAv10LHC" = "1vn4wnx1blz6wylbzirswdqqf0knmyh1pcfh62wvj695mh7i0w16";
   "METAv10LHCH" = "1p4wy7m1ksz0r1fylwz3cbq7jl8s58v817n3d898l83ic2ghp4vj";
   "METAv10LHCHfull" = "1w623939fjdyx1316rxyaavf6kmxff19himr00br57jrw3v49nfg";
@@ -530,48 +583,57 @@ lib.mapAttrs mkPdfSet {
   "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc";
   "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6";
   "MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq";
-  "MSHT20lo_as130" = "0ivjvqabk9jnrlrczjlqywmijx5ql8wy579j77qkl1vhv7sqccm1";
+  "MSHT20an3lo_as118" = "0k4qwayl1v51i7j4pymz2zc7q7f3r1l49gv4yjbcdkfahpv7137k";
+  "MSHT20an3lo_as118_Kcorr" = "1wfjv53kmkbfbp0q3qp8rznfsxcqjd769b16y688f87y49nb8q8x";
+  "MSHT20an3lo_as_smallrange" = "01y648a0c6y9lizffv2ynbww7is6fa401nslfn8zj2gnnpw683h9";
+  "MSHT20lo_as130" = "0gcrsmqi70n9maznigdqbhwrgm1pk191wf6p8zsssy03rfxkfzff";
   "MSHT20nlo_as118" = "1qwbwcq8p4hrprz4ib18mp5142b0lbyyzc1bf5a4iq5jjvi5qm93";
   "MSHT20nlo_as120" = "10y1a6iryahrafzdqskypjrnad6xxq08gm72pa9yc61xdy6andc6";
-  "MSHT20nlo_as120_mbrange_nf3" = "0548pw6lkwwqhlrg7c4cyqh76bcyz78yh06fs7crdbx7hfl47cj7";
-  "MSHT20nlo_as120_mbrange_nf4" = "0pg49mad4845llj49a1piaggd8wpwb2s4ar7jydlhrv7im886by4";
-  "MSHT20nlo_as120_mbrange_nf5" = "0148agm89p7pwzdfjk8gjdaicll30xhz6sawca632kp5qwyd4g3d";
-  "MSHT20nlo_as120_mcrange_nf3" = "187hgg8klk5jhcadiy8viyrfi0jfb3i18jckv6d7nsapixz1wgkz";
-  "MSHT20nlo_as120_mcrange_nf4" = "12pjy0igjcsih100g238v143kq5cjjm5a13cghcipgcz2w4ldglf";
-  "MSHT20nlo_as120_mcrange_nf5" = "00mipn9ndnw1k4nx6pmxb95wddmh98hg9k0317vlirxrf2n2jy7g";
-  "MSHT20nlo_as120_nf3" = "1zy0j9qc28xpav3gx24r6r02zfz49r11ic66hkyq83d3q3fj751b";
-  "MSHT20nlo_as120_nf4" = "0fpyf9s9ppb6w49chsmb2xfp9gwkx3ky9v8gwwqxli9fpzsc2ywn";
+  "MSHT20nlo_as120_mbrange_nf3" = "0p72rbgqwrsp408lmrbkkp108kfkvfglgysky56fyh096zlfsr7x";
+  "MSHT20nlo_as120_mbrange_nf4" = "0grmrxpmn7mrib64b8ammi8md9zqksic1zdph3k7qpf2x5jx3rfj";
+  "MSHT20nlo_as120_mbrange_nf5" = "1f55lqy79fbmcah1k8sgncb366ys3yhw52zir1iwd59pxrpk75hz";
+  "MSHT20nlo_as120_mcrange_nf3" = "1i7mvq055pqv3ppdj5wbsglbp33gd7fj7i48qbqv5l1kljx0jp79";
+  "MSHT20nlo_as120_mcrange_nf4" = "03wp26lcvksmdp4c2021wnkrs0z0f0vfrrqq6d77mj3b2r9rxqf6";
+  "MSHT20nlo_as120_mcrange_nf5" = "12pswr87izbrs1sc44vj0lf6dd2zq7zj5lbga671w6dgmaqs9biy";
+  "MSHT20nlo_as120_nf3" = "1y23arhnambkag5pvmwyprnzws19x3jcxv7fh6n9basizl38fpgl";
+  "MSHT20nlo_as120_nf4" = "1a3vm1vx9m48wryjfgafj2jixzizlas3qb4iighln20ya8ga2xf3";
   "MSHT20nlo_as_largerange" = "1f57dvxas2c6qnv38ysnsyf0y8imafnrxkcqh3b0an19mkln5mmg";
   "MSHT20nlo_as_smallrange" = "1rygvj33g84whl24kgpqa47g11c48l93jlnpzqq8f5zr1ijqcq7i";
-  "MSHT20nlo_as_smallrange_nf3" = "1d6cr1akc25mwfyghvn1986i60l76fxb8fd02h7f4pl4lmnn6i8n";
-  "MSHT20nlo_as_smallrange_nf4" = "08js1l5g6knjx3813i0rf34xfjkbn3mdsrbawzkn00vf49xzcxdj";
-  "MSHT20nlo_mbrange_nf3" = "1bwl4inshg5h3sslss4lgvcqahb5q0n794ag73hyacxd1kmx7d2z";
-  "MSHT20nlo_mbrange_nf4" = "1sm995pzzr601wcs4rjgjs6alm74vc23szgmkqa5dvxghw7x8w55";
-  "MSHT20nlo_mbrange_nf5" = "1sal7iqma7770593ifxypl9zapvba693asc8m2fjsbgpbfjjid60";
-  "MSHT20nlo_mcrange_nf3" = "0lmv6m8m7zv0s8kjfm8parr9xlfy39dhwxn71z33f5x6cyp08zlg";
-  "MSHT20nlo_mcrange_nf4" = "0875zfv0dws8n44fqawa1jp5p8b9vky8yyq48wijhrcph8qbxbrx";
-  "MSHT20nlo_mcrange_nf5" = "0qjvam29zwibx54fgijry58vdwqkiwyavdwn736bmckjycncnv8p";
+  "MSHT20nlo_as_smallrange_nf3" = "199is3r6is4g0jfjgw2v95pwsnvp9h6smg75jldgnnpj6giiwaxm";
+  "MSHT20nlo_as_smallrange_nf4" = "1d0l15f3vzc6vcv2gklm1nrs18315v3fch90q5gx9vqsxqv0img6";
+  "MSHT20nlo_mbrange_nf3" = "1ymndpasxp5zr5yvwrmgp9q23fzcx434nnhqlb1sms1fpzngrs0w";
+  "MSHT20nlo_mbrange_nf4" = "04fv7paincahgvnqdbg2pf3adrs0plccb92qcj7w16vyppw7963h";
+  "MSHT20nlo_mbrange_nf5" = "0jlzc62vlv92ibgxfn6mwfnxdf91ak6ns97lsni3v75x6a71gcx1";
+  "MSHT20nlo_mcrange_nf3" = "0k3bxs4sfba851m27xz7zq9njncxw0yq9fk2ivqrqnqk7mq5hkv8";
+  "MSHT20nlo_mcrange_nf4" = "11ndwp5vis2j786isp5sjrm1cc40hd4jbrd9bj1d95p4f4dk6hm8";
+  "MSHT20nlo_mcrange_nf5" = "1nvr4iaa4l15v4y7778yad44qnanxgfln9cqd70d69zzldd1hgc3";
   "MSHT20nlo_nf3" = "1v0mzsa2sxp0g3m3d8yqcs7dgi74am6cpx79f341ahpwybz5x829";
-  "MSHT20nlo_nf4" = "1lyii55adqaah6sm8b778q8scaq5yjycq3s8jdi3k48z8m23zqng";
-  "MSHT20nnlo_as118" = "1yz0003ixjg97974648qba5d37vb4fhzzmq4k9xh4c37pnc3kgyn";
+  "MSHT20nlo_nf4" = "0p1zpjnyd3l20i9ws5m20p78i9bd0d4ag6z1mw07isffpid3a3lm";
+  "MSHT20nnlo_as118" = "0ksk54cg05prqpnc49kjd5drfw1gvm7741gf3ib29zgp39f78avp";
   "MSHT20nnlo_as_largerange" = "014a9x6zsw3w7b6w3v6lg8qxdjicxslr79bnagi6ci0skqs2v7z9";
   "MSHT20nnlo_as_smallrange" = "1bv7cbdynp6dm5c9v7r32gqy1lch4428apw426pr0d7xpm0abnxv";
-  "MSHT20nnlo_as_smallrange_nf3" = "0n1j9dd069qdmgmd85m7wp29g96cnbgsdxrvlh6y51q063lkqbwb";
-  "MSHT20nnlo_as_smallrange_nf4" = "1jkdl3rd933czz753qbi7yvszg376r6bvwq2inqbslnzfkfav5bh";
-  "MSHT20nnlo_mbrange_nf3" = "095zcxhpfhlsb67ki4j6a8z4d1r5hzx92xlzprwkwd4v5ya4f732";
-  "MSHT20nnlo_mbrange_nf4" = "1114z5a0pk9svps918zifff23difxf37rbmr3jnzxnyp1vfgzws7";
-  "MSHT20nnlo_mbrange_nf5" = "12i6m01bmnzqadi6jg5gmah1jliq4wr4p0vpjgmpgyagsk4drx4b";
-  "MSHT20nnlo_mcrange_nf3" = "01wq537083dr9ibiahwdwdaxj0j2ys211m478w9wgvihdjjvjvvv";
-  "MSHT20nnlo_mcrange_nf4" = "04abrnlnbr94lksn29w9ws9a3b6sqkqvi9awmbk4715dxk2amnpk";
-  "MSHT20nnlo_mcrange_nf5" = "0za255xi66a1mfch2b91qqmsr305m0kvs4rzvqlzf7k0v141j90y";
-  "MSHT20nnlo_nf3" = "10yx59r32q4rl0yn4gpc29z8xskbvizkdr7k219qf16lnv892jpa";
-  "MSHT20nnlo_nf4" = "17d10rba8b0aqi1npnx93j1995has5sw2l4izd6lly3yhjynbgp6";
-  "MSHT20qed_nnlo" = "05c2hjgysyvkcyqg1lq3y00hqixgc8w984zivxkr76nj5csyf6m3";
-  "MSHT20qed_nnlo_elastic" = "0in0y27gn4k9h6ya77krhizv8rg3i6s3d6h4bk0fhz91hbi4l3gh";
-  "MSHT20qed_nnlo_inelastic" = "0vna0gbadf92w3xngb8gnsxd3lil8m029as8260wlki2axm4gqlw";
-  "MSHT20qed_nnlo_neutron" = "1hiq7m8j7736477vfs18mqwhkxyvjmcrs7jiqysa8v6rmhb4bali";
-  "MSHT20qed_nnlo_neutron_elastic" = "06dbvsysszpbvabgafb569vq88q1sm9mvz1iwv1m2b9vzin2ixiy";
-  "MSHT20qed_nnlo_neutron_inelastic" = "0gfh6nhl4vq4qz1jhnv5vhhz4h4wlkwgj4ffjqll6jqa5anfhbqr";
+  "MSHT20nnlo_as_smallrange_nf3" = "0w73vw53s15c0kxrhbkaig7jiy08fy29cbv8i52mlz0l85c289d6";
+  "MSHT20nnlo_as_smallrange_nf4" = "127jil9rz03vi1qmj68ysx9aa892sar5g9s6j8s35wdh9sk0b6nx";
+  "MSHT20nnlo_mbrange_nf3" = "00cfyfwkwbql5bfvwdaznffwfgyk22d0wyrwnjbvdj83iwnzgixb";
+  "MSHT20nnlo_mbrange_nf4" = "0l39l7hvc2lv252zdx2kgwsgb544li47bdcfdzngpwmysc3q5p8a";
+  "MSHT20nnlo_mbrange_nf5" = "1r27nqv9j3552ykfaw5pjky3v95ayki2wlwp7x3mhh36wrw7ld18";
+  "MSHT20nnlo_mcrange_nf3" = "19cd3srs47wjphwlk69g3dfz7jpj9v67zck9zh8cm9pg3lzqsmpr";
+  "MSHT20nnlo_mcrange_nf4" = "1c54191mfjaxb8l95xmw2nbfvxiif7p3xzzzv1sd2gxfp80rbak0";
+  "MSHT20nnlo_mcrange_nf5" = "10s8ghzvmdlg3vzwmfgfv04yaq7y0lysj7ks1d5nd2c165ws8d0x";
+  "MSHT20nnlo_nf3" = "1mhqa5h308na71bcmvgyjy5r1r00sfx6ghrpvrxi5bpd6q5jzm4p";
+  "MSHT20nnlo_nf4" = "02s55yavzrw2dhh2v7zaww5laj3mg7ccdc6mpsjxaqv75a1501rp";
+  "MSHT20qed_an3lo" = "1c3fhkjlvvvi999dmwv1z8dkxihi2c0nxjy7bhblpi88iib83prn";
+  "MSHT20qed_an3lo_elastic" = "0g2gaw8i006bvay3qy0nnnlsk1a6390x5hc0gyzivnmbhr8796n5";
+  "MSHT20qed_an3lo_inelastic" = "0zij1m285qc4wm03m5fwq98lna6gz11d0pk2qrs6ndp9cdidpqwp";
+  "MSHT20qed_lo" = "1xh8smg5p2kr99i3h2sbn9ragsmjy7a384fmv0c56yy6ii69vib4";
+  "MSHT20qed_lo_elastic" = "0086y9qmgmyfy2fl0ymva3fd5s6lq9yllshfa55jpmq0mhd976bz";
+  "MSHT20qed_lo_inelastic" = "1s3b0v5l8pf8n55065rh2a569k5rqh3cw1rl5p9c3kk0g2ng68q1";
+  "MSHT20qed_nnlo" = "0g22mii5mmikawskiblcw8lclkgm3f009c0kp3mvwdjmj745mkvr";
+  "MSHT20qed_nnlo_elastic" = "06j3vyr5nw768iw7fy3xl1k3qs7h2frn5680dj8xawy8chgdyszn";
+  "MSHT20qed_nnlo_inelastic" = "0aznly86vdb9cyshzq3lbki66dffddhbbv2acs31bfx25cn1220j";
+  "MSHT20qed_nnlo_neutron" = "1r8v2wdhpl1ny7dzwhsj94j333sgyaczk7jrw5rhghlkahvy506y";
+  "MSHT20qed_nnlo_neutron_elastic" = "0fvrq3jfv0650322m3ymlb42xb107xgb8n9n89kv5biz4adhifvv";
+  "MSHT20qed_nnlo_neutron_inelastic" = "1scgfpzlx9mldk52di2q52174bmlbp9pb2i2q8zn6q5dm4xh4y2l";
   "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51";
   "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3";
   "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l";
@@ -929,12 +991,31 @@ lib.mapAttrs mkPdfSet {
   "NNPDF31_nnlo_pch_hessian_pdfas" = "08baysni2lhbpr1scx7h0zf64gyncj2ahcv4y86142gl4zqrafvp";
   "NNPDF31_nnlo_pch_pdfas" = "09mw3gr7dz0vwdnralaplvlz2c464lmdizf673xsb0wlm12pqf6g";
   "NNPDF31_nnlo_pdfas" = "0l92q3xhdk5nrnhkmrirxnvplj531rdpnblnacd759cl4hgxcs2q";
+  "NNPDF40MC_lo_as_01180" = "0xzaki3jwzjapfrfbj4qz9ihr64ylcxcijdxw8g034wc5j30mw98";
+  "NNPDF40MC_lo_as_01180_qed" = "11ybdvqsfxhlf6kr6hckciykjnski6kr88f4fz4vi5bc2ncidy87";
+  "NNPDF40MC_nlo_as_01180" = "1cwpyndmzpgz04ghmh1lcsh5h2hg43z5zj2hgrb1q1n0cyvnyb4d";
+  "NNPDF40MC_nlo_as_01180_qed" = "06zk4l876xb01lpmw6g7m205avzzsccnalcigs09hrk9a0507aab";
+  "NNPDF40MC_nnlo_as_01180" = "1m86xnl6xfpxkysgx8hp4a9k3q7vc910dbfyz5iamlmzisb97p8h";
+  "NNPDF40MC_nnlo_as_01180_qed" = "1fhva206sfibjn7imyapj1p5zppffvkqyqqndb28p3gb97lhi4an";
+  "NNPDF40_an3lo_as_01180" = "1an8243d5dr24p7sd7g86a5k8cwbd56wwih74zgymb3z73cslkwg";
+  "NNPDF40_an3lo_as_01180_hessian" = "0pr6arrjcdvwf335ibzvkfgav2abcf1iyzvz9wpp9g47z31bxzd7";
+  "NNPDF40_an3lo_as_01180_mhou" = "01pd4h2rk3a8cwq1lfgqn5hxz3rylwdr2x0knw33bpw8r4bvhgpp";
+  "NNPDF40_an3lo_as_01180_mhou_hessian" = "00asvfpkz7asg1h0gyv0sr9y2llafnbm7drjc75n3rx7109bbrxg";
+  "NNPDF40_an3lo_as_01180_mhou_pdfas" = "1qkpk1vz1pk2n7hal9l5fnvk05sfxwagn9g0yl2yyxyaa6nps088";
+  "NNPDF40_an3lo_as_01180_mhou_pdfas_hessian" =
+    "0q3sqpr31b8r54087yg2j9ikpc3jrnibb58yf37sk3f1rfk06fwq";
+  "NNPDF40_an3lo_as_01180_pdfas" = "0gm7cw33lyj0gcnvawm95pxq5h3kx76m3dh0c9j7msk8lsh5a9zi";
+  "NNPDF40_an3lo_as_01180_pdfas_hessian" = "167ifn4g0g9v7q2br7f6m49m51qbhkxz1hzh7gllznn0f7xii58c";
+  "NNPDF40_an3lo_as_01180_qed" = "0sxz4vdyjfp0lz012rhl50flhjsgfpm95xzypdcxf45lmwsca6z8";
+  "NNPDF40_an3lo_as_01180_qed_mhou" = "1ynp4lc0z90a98sjv957ga01l1hids0633n94v5khws99jd2v70d";
   "NNPDF40_lo_as_01180" = "0m630n5i7s0qnlxzk6ka43qfp6ipz2jgzr7ys42hdb66kg3z5lkc";
   "NNPDF40_lo_pch_as_01180" = "0wrvmcgdaipi7vy7j85yszaa3c57hs3xll9lfn9cdbjscvmsx6x5";
   "NNPDF40_nlo_as_01170" = "14j21qryc25k1jk4ypdcr3cgfkhyy4hsb57hy8x5pggfwc2w3f36";
   "NNPDF40_nlo_as_01180" = "0399bnxvgl2h2ini198jmzjjb179f6dpxfv5x8imlfl515llivx2";
+  "NNPDF40_nlo_as_01180_mhou" = "0vdjsvly9bhm5zchbwn86yi0s9cyq0lwfrlg8rlim4pxp0lj303d";
   "NNPDF40_nlo_as_01180_nf_4" = "01kwziiyg8vbl26znv7khqdckm501d7ccxlkq1y0cd9s1f5ff8xi";
   "NNPDF40_nlo_as_01180_nf_6" = "1gv8anb3vqpzdymp9g69702x64pbh6l2rn9257hdpz4i4m98rsjy";
+  "NNPDF40_nlo_as_01180_qed" = "1059ng62jgm629js80a4mf7036bs9n0nsjq4k5saj8bzfx4alrms";
   "NNPDF40_nlo_as_01190" = "0wf8p2i4mxs3hkqvxg1clj082yinbdgccr6qx5kbwkzsck4yybar";
   "NNPDF40_nlo_nf_4_pdfas" = "1ia9glingyds6bj6yxy867ahriqdhfkxczzc4nki933h6jbj74bf";
   "NNPDF40_nlo_pch_as_01180" = "0gad0hjq9kwiymc9pljj4z52jsg794m3knb38zj9icgjk0p9lwxm";
@@ -945,8 +1026,11 @@ lib.mapAttrs mkPdfSet {
   "NNPDF40_nnlo_as_01180" = "1bhysjkji0k7xy9njarkfvxff05kjl1byhkknxv0875p2znzkpva";
   "NNPDF40_nnlo_as_01180_1000" = "04yai94qwd7187wg26icwf2wbwi20747l6zikd66ygsz9n34xn9y";
   "NNPDF40_nnlo_as_01180_hessian" = "0cmpqgaz341hif0gdkzq8mnfh9apxn1zxjwa12fk5svbig9i1a81";
+  "NNPDF40_nnlo_as_01180_mhou" = "1s5p6z34ijd0dv1jml8n0rfh5gs2f6axvjqd7h5qwbwm7fl9zz2r";
   "NNPDF40_nnlo_as_01180_nf_4" = "1aj5y3fyvna2jwxbsrgr2cbc452aprxnwv78vh3ph20jlnww20pd";
   "NNPDF40_nnlo_as_01180_nf_6" = "0bf6s6s0w7l592bm87mazwff05d8s4qlblzl9yj91am3xlv0cvn1";
+  "NNPDF40_nnlo_as_01180_qed" = "17ihm4hr2p4qilm2j8sk5icczs90ga44ls5c9sqhdlrgq6nc18ql";
+  "NNPDF40_nnlo_as_01180_qed_mhou" = "16rniv3xkfcsxsjjsrw9ly54ls4jx1mi7zrbn798zcacmxwpsppw";
   "NNPDF40_nnlo_as_01185" = "0y1xn9qcv2l81sbz9rayzrpd1bjsdyixr42lzfgmqbq45sw2m04n";
   "NNPDF40_nnlo_as_01190" = "1ibz4yfrw1n8plq4gi03yxi9afaca2yprxfk2y9lvbkycn608d0q";
   "NNPDF40_nnlo_as_01200" = "1cfcn819aali7ylv9y6yb2ggqy0yghyj0dys9lf9gv5wiqjwh5q2";
@@ -957,6 +1041,44 @@ lib.mapAttrs mkPdfSet {
   "NNPDF40_nnlo_pdfas" = "16d81h0pzxzgwwrfjghmradx4bijf08xbrdn79y9bxf6czacm8n6";
   "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8";
   "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8";
+  "NNSFnu_Ag_highQ" = "02hapqyaab60bbbz2011cyhsiyffcs4h0qvj8rcrfjizbwgdvzkf";
+  "NNSFnu_Ag_lowQ" = "0wnikk26l17rm1g1clxnpfk31xxq0l1d8abbi54xhi8bhkmkf94l";
+  "NNSFnu_Al_highQ" = "0r1w871c49ismmawy9akvn8gg5lj0xf5d9rmy36bhh1s88wxgfwc";
+  "NNSFnu_Al_lowQ" = "0wqmdiwfvdr4xp8mpsg72y17s0649d5w0fj4jhbm08algdwh7i5b";
+  "NNSFnu_Ar_highQ" = "0ffx07zpm6gfnw7qpai9h0hs8igm3mpfkc89za233v4fm5j1wq53";
+  "NNSFnu_Ar_lowQ" = "169a44bwpm5hp2mkwxvmklzwahql48fv0qn9si79pblga0qjhapk";
+  "NNSFnu_Au_highQ" = "0424ccwqmzhi54311cbv9bbdsi2yrbkg92rz868ri7yzzny9fd9v";
+  "NNSFnu_Au_lowQ" = "1gycdn116ca8wwfwxh6gjb9r516snmssz1ahsac0r0gaa0f2h9r5";
+  "NNSFnu_Be_highQ" = "139jq8klzlnqlj5dgkba6l93kslncbr8whq9kl3ylpd7ypkwlydh";
+  "NNSFnu_Be_lowQ" = "1b6k3ghmwbdqr6wsn0r42hymr7shyhxdymkvb6cp2vfilwh02w9s";
+  "NNSFnu_C_highQ" = "07hpmcahk75n1d6f5q9rg2pqjz631zpw1sjn3sx1cqfsqnd88bjv";
+  "NNSFnu_C_lowQ" = "1048azj11ji9q0ab0gk59krmdsbl803j5k31a60227jv32pmq4q8";
+  "NNSFnu_Ca_highQ" = "08d3w72l7ax4xf7552m1zfkn82kbn2ndkdcyjyvjnlv0vzq0yw5y";
+  "NNSFnu_Ca_lowQ" = "12xj8kl4naxf4hpskgjdx0gwj9i0xjbpq6dvbhgff32rmii6ycs4";
+  "NNSFnu_Cu_highQ" = "1awxqzkrfpi9mcqxzrdw1spg9xxaslp4wahqb96fvzjfvkq1gbs5";
+  "NNSFnu_Cu_lowQ" = "1d0k6gfcp5sy5v71hwqav6x7i9jb6y6dn3slivk5ap4ps7szngrr";
+  "NNSFnu_D_highQ" = "1qs77jl5ipjbc946ifrg01csfcfd321dlgd5zc7gmm4yjk5ipriz";
+  "NNSFnu_D_lowQ" = "1rgd1q5f0n9l6ka38fg6ldx2x7rm66s4izfgrkbjk0nd858vbasw";
+  "NNSFnu_Ea_highQ" = "0jv4aijsvrx304y34akpwqs21g56113ich4r3pvs6jhwzb7drh92";
+  "NNSFnu_Ea_lowQ" = "0a2vi1y5yh17y1lvwihg4map0qcsic4m832c3i3h50f1a7mfdqcf";
+  "NNSFnu_Fe_highQ" = "01ly2p9yjv8cnj1dknngsmfn950fwqj8adb4idpf93myj80s4431";
+  "NNSFnu_Fe_lowQ" = "085zx3c9l9iipznph9j9jdgkg4bl86qz6iv93n55x67p6md8jrwv";
+  "NNSFnu_He_highQ" = "16i60mjkfv2w2bw0ps5mfkd5w9y5nvl9x71grkqlqh4a7mc7k8d9";
+  "NNSFnu_He_lowQ" = "1xd6w1s2kwc0kxars535c5dgvhvj3sanvd13znyyvwxfnq1ia493";
+  "NNSFnu_Li_highQ" = "0sx9wy7s5h797zcjc4k1bbspsrsbz9l8yj5c3w0vk7mrmj0mwn4d";
+  "NNSFnu_Li_lowQ" = "0di710fg1mwkcpy6hj92hkd8prsw8i0nbg9l3d7cmz4a05l2ivlv";
+  "NNSFnu_N_highQ" = "01x48ksx64ks1dcsfr6di0qfa752az4rls1rwdbb1hq9fx5lpckn";
+  "NNSFnu_N_lowQ" = "0glsrc8y4g47sdyk1bhn5nggibp8ma8ng3d6b0igq6bmmdv3qh4i";
+  "NNSFnu_O_highQ" = "0l6m3d86kc8h0br1j39pkjjfh0j55bypl5ys4s9m0vxpm9ixy9h4";
+  "NNSFnu_O_lowQ" = "13ahpn0gi8zrw9r2pz7qr5hypbjd1ydjzv27wdyq47h8v971jkka";
+  "NNSFnu_Pb_highQ" = "0gq3jg8b0k2jvkayc9hjs27c1adr8ii93m97cjmkgxp964hihhxi";
+  "NNSFnu_Pb_lowQ" = "1yy864yjlr8bzvqprrrnh2ja330s2bpasz9kzb5lrj3i754cjb5p";
+  "NNSFnu_Sn_highQ" = "0n30hc505ajmlnfbscpyhngcigfl1jkgcgy76jf0lxvs9xfrfdfc";
+  "NNSFnu_Sn_lowQ" = "0mp3fi6808x7hyf27n1kcr8vxyj304j6h0dy7d9z65v5acivn5ii";
+  "NNSFnu_W_highQ" = "0yw1ifmzjqzfaqws8krvzgp977jsy930sf80fns4r4n04nwi7kmd";
+  "NNSFnu_W_lowQ" = "0hxh5yklq9kxkgf53qkvyv6xsx1ml9hd03pss5cahz8f6a5qj188";
+  "NNSFnu_Xe_highQ" = "0rgdjxvp1wg8q2yki8gi70ba87q4pr2nw191ywdcq3cqar6dznkq";
+  "NNSFnu_Xe_lowQ" = "08rnyhvv3ibzfj1srkyjygni831cz0j43g6mkka3605fvl2iqwpw";
   "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7";
   "PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp";
   "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72";
@@ -1008,6 +1130,28 @@ lib.mapAttrs mkPdfSet {
   "TUJU19_nnlo_56_26" = "1kqc6v6qq6wl3nls31gn5nrzwfl9kshm2bbak771c3xvjsgvjpdy";
   "TUJU19_nnlo_64_29" = "166k8swsysr7x5rgivi6k04q4p8njb2ny7xj7xjqhkgxrznc8jzq";
   "TUJU19_nnlo_7_3" = "0q9vswr0s3k15abghx3cccf1ays0601n1438pwqgd5xz8981ngm5";
+  "TUJU21_nlo_12_6" = "071lk1am7w6kkaygc48ddhmpdizb0x2g3z1wcp71cd4gpzzsvgia";
+  "TUJU21_nlo_131_54" = "0y5lrdg3m3qwimhhsvvvycb18w6msy5ghvm7y3algfq66jsi9xsh";
+  "TUJU21_nlo_14_7" = "0l9gc0rgx1cva23fnsmacdcw4xymvdbrdb76rml8qfbz359d8rh8";
+  "TUJU21_nlo_16_8" = "1fhdxf8lkml370rwjms7yvysspbnwzf51hnrwv24l3b0l21akck9";
+  "TUJU21_nlo_197_79" = "1f6z6gmvvpcd8g2gv7847qd1i60y2cb8r4wrzh7yrvcvf0p438pn";
+  "TUJU21_nlo_1_1" = "0ff1bpmm1l1wy2l80i9wk8d49kmjirf1fsqclvhbih8nbnaxrmvw";
+  "TUJU21_nlo_208_82" = "1lwsr5jx54596mzff8xnh697s7xh6kvw2q8lm77paxb2r4072pvc";
+  "TUJU21_nlo_27_13" = "03xq2cpp0jbfncw3j2c4xfwhj69vrrah9ps2wqh19xghml16cfgp";
+  "TUJU21_nlo_2_1" = "1hwhfif6ga1jwqw4lm1hznl9m3b9ipd2w08s88v10d5yr4nl1ajh";
+  "TUJU21_nlo_4_2" = "1gi1gr4avj9dhh3gv62nqakr2gby9030b49nbrygs8ilkmck59j9";
+  "TUJU21_nlo_56_26" = "1p4dys06zdac54nql9vn3cflk53ri5w477ar631pl6mr1alv0pry";
+  "TUJU21_nnlo_12_6" = "04fdbjd70biss7i1qn7dbcmfing81rsmq1r51hvwfcj67ni8sgzk";
+  "TUJU21_nnlo_131_54" = "027y4lx69iiy2y3yljn08jj0paf080c8ki0gh0qlg1681icsax36";
+  "TUJU21_nnlo_14_7" = "1b81ay90b8h238k0zpgwqczybrqqz3sfa4qxg9d4znqxdz1rl7s5";
+  "TUJU21_nnlo_16_8" = "1m1ghq91d32xglkdafswi2b7plvirwy6hnlqyaqvvj1jk1hzi3fj";
+  "TUJU21_nnlo_197_79" = "10gblrpf623r9pjv17cxdyrfkjis5yv325s183i6nwyvj3dsnq8p";
+  "TUJU21_nnlo_1_1" = "1xkp100bjazwkl7k951n5cdi1mmjw15s10i675cl2q249nn7ld6b";
+  "TUJU21_nnlo_208_82" = "0jdsvl9h09wy7q83cw56xg5g57x8vrfbp8ar95q3fq1389cy3gnx";
+  "TUJU21_nnlo_27_13" = "1ql5b6i4fbw0hbb6k1m9hcq4w0k5xldh9ggkj5z9nwckr5cvcbx5";
+  "TUJU21_nnlo_2_1" = "125s2kxksiynqcqsvk2i0piib9wh37nr6hnshwskw4aspm3p7zhc";
+  "TUJU21_nnlo_4_2" = "181hjn00190h851yskgcd27b2cb1zmyy91rva2z743i6mz1hka7a";
+  "TUJU21_nnlo_56_26" = "1dzgdlkadpwajd9z7pfwq55zqi1fg3qi9z41zayhppgz5p63c9zm";
   "abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs";
   "abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i";
   "abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4";
@@ -1051,162 +1195,210 @@ lib.mapAttrs mkPdfSet {
   "nCTEQ15FullNuc_7_3" = "1ncarbncfkqk6l3rx3zg34a3sj7mpm2diqsafyldpn92cw66bcs2";
   "nCTEQ15FullNuc_84_42" = "1z719mcx5lnx2ciwlnxxhgc4s00jrr9sfrxcimh69sj14hmzgx0d";
   "nCTEQ15FullNuc_9_4" = "180ipb4m2zy54h7n4s0jwqk9k6562bygvnv7mg9dp2f7vf5317a1";
-  "nCTEQ15HIX_108_47" = "0iqv6rsvvr5mqiaddn2cs6psrslw6ncqxca993v0z0hng9ahnnwd";
-  "nCTEQ15HIX_119_50" = "0gxdr596gk69sb76r90p5ksvx9bk4axj21qrsyxjf1bmgdg2rv72";
-  "nCTEQ15HIX_12_6" = "0vkkz3hq0irvfb08cpdijfvv17bcvzaba5c1bf8kwx1i2zl5s6xz";
-  "nCTEQ15HIX_131_54" = "0pbm6390cdglxqzrpl2slv65m943m32i10c49pf70fg68x3l2dff";
-  "nCTEQ15HIX_14_7" = "1yshwpa3zzzmf7s5v3c3130ysm1wciicz202hrraz4px102h8a06";
-  "nCTEQ15HIX_184_74" = "1wy1691pc776kv456cbjl5x5rg2z7cycyfny24caq1qvjifvbr94";
-  "nCTEQ15HIX_197_79" = "0ckbp8cw49ch78q4nsm1fccn6nizpipdp8q85nnipql53xsnr4zm";
-  "nCTEQ15HIX_1_1" = "13sfws9cmrsnp26mx4m2n03gary2m10l67bd8xic8pykgpr8c695";
-  "nCTEQ15HIX_208_82" = "0fqvzpqszkyqb4f2y44hrdj7rvadbqj6y8fzkl9xzk432lalm8w5";
-  "nCTEQ15HIX_27_13" = "0z356q82x6cm52f3qym7vkajlkf2amkz87as0jvfiygvi4gnilcn";
-  "nCTEQ15HIX_2_1" = "117dgz8nx1j64xgqlp40zmgpg0z8b0p1j75d1llvshmksba43avb";
-  "nCTEQ15HIX_3_2" = "1k1hxpcg39hrh629ml2kwnhir6pq41rpic48njq2lagmrcdpbn52";
-  "nCTEQ15HIX_40_20" = "0q1ggww4a5cdf802737kh7igb0br3q50xw205v4b5p7v237wsiym";
-  "nCTEQ15HIX_4_2" = "0n9zf4yxvp3b3ryxbkdw0yilsb21nrjh40ms883d6j42slzhf37f";
-  "nCTEQ15HIX_56_26" = "1z39vjgp6jryvqaxv6jq05jj0lfxsj212g17amch65pgxm4l7cwg";
-  "nCTEQ15HIX_64_29" = "1iy1g1226irrjxz9wwabwd6x0712dm1aap7ka6fy9wwwbn87f6d8";
-  "nCTEQ15HIX_6_3" = "0ljq0h0cdwbfvlpd40v2nypklimw4hh6k999mnyxqfvq47m13ffl";
-  "nCTEQ15HIX_7_3" = "1y9k2snzymzgs26ayfn2c8n6isqzqq14pzf05xvlxmc3k1fbsfyx";
-  "nCTEQ15HIX_84_36" = "130g553b22s7plgy51n56az05v1pnfgrg5knpg1knx8xr8a9xhh5";
-  "nCTEQ15HIX_9_4" = "05igk9g2i1gm7d7npdwd7y3k7xf39scx1mwiw4m39b52kbq7kszp";
-  "nCTEQ15HIX_FullNuc_108_47" = "1h2x2h2n02nwinf8ba3yyqa61384p4g29ib8vnrzwzc7q34940i0";
-  "nCTEQ15HIX_FullNuc_119_50" = "0m5z036py2m1863k62pzysjdr92dhyiwmb8lxgky5skd7514rrsd";
-  "nCTEQ15HIX_FullNuc_12_6" = "13rsl7lczf5qzjgy8m3dp4f1gyib2ffvf86iwci91sq51sma5kk9";
-  "nCTEQ15HIX_FullNuc_131_54" = "1bsi3y6b7sxykwablgghqc89s3vxrvjr9y4bvhwcm21c2i4y6vbp";
-  "nCTEQ15HIX_FullNuc_14_7" = "0w93qfiqdnzvrry9ddpbqcy6y16sszxfmvvgdy6r8i8py8dzfkyr";
-  "nCTEQ15HIX_FullNuc_184_74" = "1q93f9rvlc4z3hzfhdmmxlyqfschrf99a0xyrc78rq1z2pfgmm9b";
-  "nCTEQ15HIX_FullNuc_197_79" = "0kb2lnvh8mq25i5pkfis86ggs0s6hmpmyqqgimhcsamk8xnf2pcv";
-  "nCTEQ15HIX_FullNuc_1_1" = "1nk792chip0iamc6dlqgqqlc2qlxlbgvgnhsvbmzkmmzvp2ji961";
-  "nCTEQ15HIX_FullNuc_208_82" = "1l038nhnwc0pd7sq4yki3sjrrn66bsvqkvba2j3kf4f852gsyswr";
-  "nCTEQ15HIX_FullNuc_27_13" = "1gdb09429xn5n07qqjch9x1cnq4xinf05wla8fsq69qr7bcdq9mp";
-  "nCTEQ15HIX_FullNuc_2_1" = "0fnbpwv8qzgchc2r2gcjgw9yh4r94vm1rzbwj1f6ahbwrsl4rfp3";
-  "nCTEQ15HIX_FullNuc_3_2" = "1r1s7ljwa169nbgc1439cj0gkaqza6ilx3x4gyq2jg9byz30khzx";
-  "nCTEQ15HIX_FullNuc_40_20" = "13p7mnh2h8abih8y24rfapnrsd036pc8xy8qm82j8g4bk0j5jacx";
-  "nCTEQ15HIX_FullNuc_4_2" = "0j1w7d11ybmpfci79lz99i94szxf5xn6z4kxvh8hly3qlcgn636j";
-  "nCTEQ15HIX_FullNuc_56_26" = "08wds8afv0fzlaxck5i2d3pzvi5nqnc1jmq58fpnc7i0g238wl8k";
-  "nCTEQ15HIX_FullNuc_64_29" = "0w4hn5iwqa65lnf6mhihx5qrq4wpcqw04ii3jphy79l58j3i1iam";
-  "nCTEQ15HIX_FullNuc_6_3" = "1ki2cfsg0wmvfkzv2j9akiyl4d4b8v3d6f65iryxakjkhqj6vvgx";
-  "nCTEQ15HIX_FullNuc_7_3" = "14mx5lh278p3zdc572bhxw9sc6n7ga0ak0ch85h3lx9zwg2a1m5i";
-  "nCTEQ15HIX_FullNuc_84_36" = "0hyxyhb2mn64fwmijigw8m3v5zlj52hf2hicvx4gcq0lw063jxj4";
-  "nCTEQ15HIX_FullNuc_9_4" = "17pydzll5lgs974gz4bchl2wxc9ixfpnqjrsidzksl4jf03gn77z";
-  "nCTEQ15WZSIH_108_54" = "02z08pzvl8fa0bi6ddrlbknj0iryimw02r40z0nn7p8xf99qabhz";
-  "nCTEQ15WZSIH_119_59" = "0r03k6j6nd2mvdkidw4gx1xm1s9hil9z5kanxsn2hzp30ab971db";
-  "nCTEQ15WZSIH_12_6" = "00d4lis1qas1k8yzfb3dbqgvy9ynv7h9lx67ys3mj1ws5fqyn5al";
-  "nCTEQ15WZSIH_131_54" = "10frai6qmzvp8xpkanl1qlpnc6chf6k5j70f4pw4abw8ycbjymij";
-  "nCTEQ15WZSIH_14_7" = "02qd5x041p6n8rzv5l446481jb9vkc5nrc018vcg41735azr0d0p";
-  "nCTEQ15WZSIH_16_8" = "164ciyxkrxp33r5nrkl86gq0jvdzm90hf602raamn1b5l5yrnadl";
-  "nCTEQ15WZSIH_184_74" = "00nrwb8q6sa3zwbdc9mx4jz5ndibml84lfz8gad9vhy20zayyh3q";
-  "nCTEQ15WZSIH_197_79" = "03hzr05vhb0l58iv9c2743c688ygagy1bi5a7zqn8nilsmykbvag";
-  "nCTEQ15WZSIH_197_98" = "1mdlhp643z0gkjpj2jdi5zdd4qxxjqsy93rkv69cn1x5abawdl8l";
-  "nCTEQ15WZSIH_1_1" = "13wskph284niaxqx92yaa4jg749ry6y98ds1ifvwc9970iccdnk2";
-  "nCTEQ15WZSIH_207_103" = "0mpc6msqqjbcs756zd426xgzxmmmcmk8cp8wh2mpagib1drrg1x8";
-  "nCTEQ15WZSIH_208_82" = "130bs9y9337pmgwi1ix0ar2xvhfhl4rs0626kbin5yrxhdy7rpha";
-  "nCTEQ15WZSIH_27_13" = "1r01sbzixlrqxkjp9kx3s4zgsd48myivyc70p7ha83i1qrq50g7w";
-  "nCTEQ15WZSIH_2_1" = "1qlh3zxbg13sq187k1fmssan00ifmqr0q2l7i45vc8jz3mk70098";
-  "nCTEQ15WZSIH_3_1" = "057zyvlxz3hwlwgydccl2y124bvc6iwqqgav2jqw0r53a39rc25g";
-  "nCTEQ15WZSIH_40_20" = "11psi56yk2yd75v396j68hfdacsnxvng2bw4v9g4afbjv9697jgr";
-  "nCTEQ15WZSIH_4_2" = "0g4rvlgksw5gf6a7zh7yzsi2sq5jqkwbrx6d7jgz7zpg8jkg4qrz";
-  "nCTEQ15WZSIH_56_26" = "12d0bj92b615kzadxwivp1q0j906m2rlcxfflwgwg21sv9axhi4l";
-  "nCTEQ15WZSIH_56_28" = "12yx9v87y59qf14005fmj55n38xnhlvc7qgcrgfsicmdbx3ncm5x";
-  "nCTEQ15WZSIH_64_32" = "02w3a4sbygc72acxnfc6lhird4nxcgq5dprfldg10h7f9lr7441y";
-  "nCTEQ15WZSIH_6_3" = "05x3cknlnc1kbqnmi3hk6fjgx07dhl7b36rg3abaqn4yg65i79sj";
-  "nCTEQ15WZSIH_7_3" = "0d6cmpv6csysr96knip033mw7sg56ls1gcq8gvz2qy7isj167gx7";
-  "nCTEQ15WZSIH_84_42" = "15zva7n91p6s98kkhcfsvws20s26fl1bvjql8m1n1c2d5pr29wj5";
-  "nCTEQ15WZSIH_9_4" = "04cs89s2m99p31jkc2k4f5i5rr0l4fpa6a41d59zvknhgfy74yvw";
-  "nCTEQ15WZSIH_FullNuc_108_54" = "1wk8vhhlzj3wrb994s66q5zmwxhcy9vxpyks36s3jr5729jxk1j1";
-  "nCTEQ15WZSIH_FullNuc_119_59" = "1rrkj7inah6bg03mmxgza39z40ghdr8km9hy5v5b69bvqcyr42a3";
-  "nCTEQ15WZSIH_FullNuc_12_6" = "14wgacbimifnaji6byq1cds9zz266a63bvv616b0n06391plvzff";
-  "nCTEQ15WZSIH_FullNuc_131_54" = "0k6gncwq4l5avlnr4qpvakklysi6g855yqksylc42ndlgjm4jxfy";
-  "nCTEQ15WZSIH_FullNuc_14_7" = "1mlffwsn3f942flxvvi0rp63xlcrq88ir9vffmkzh3br3qpm4q41";
-  "nCTEQ15WZSIH_FullNuc_16_8" = "1ga0kijnlzjz98j32bakcan89bfhbhq8y08d84d90xpgaqkpb9z2";
-  "nCTEQ15WZSIH_FullNuc_184_74" = "1nhly8065kabzjjkapr75vafx46f1zl21xc6fdcv15a2qwx54n0p";
-  "nCTEQ15WZSIH_FullNuc_197_79" = "0l9c684f427b8hhwm68swh78n6104nbpdxq6v50zipwc6df0j6w9";
-  "nCTEQ15WZSIH_FullNuc_197_98" = "0vc285bd21arpmaykb6baspzr8ak42yx9h4j0sx2vj07l648g5hi";
-  "nCTEQ15WZSIH_FullNuc_1_1" = "13gbjq46f5cdpdr902nxv261hqw041f7ryxbwgvxr3k2zm7h8fw0";
-  "nCTEQ15WZSIH_FullNuc_207_103" = "08m08pcz0f72nd7zcrvi8cl5va49djlvdff1w4is4gmsb44khyv2";
-  "nCTEQ15WZSIH_FullNuc_208_82" = "04x5icmidi1p3j8bdarl3sj0ak6g2ygyc5wmkkn9g80qqn4mxwva";
-  "nCTEQ15WZSIH_FullNuc_27_13" = "0x4iv1kxb5lp514qm1nr3k32m68aw7sgy12nhdjhy2dv018snd8n";
-  "nCTEQ15WZSIH_FullNuc_2_1" = "177qv17wv15sr1zcm2p6av20h32cjkspf4jj3jvvvgvks947n7dl";
-  "nCTEQ15WZSIH_FullNuc_3_1" = "0aawk1ppg3nhl5n6gpdi6l1rw53l2x2sv3fwjz5821b6d7cmb9f6";
-  "nCTEQ15WZSIH_FullNuc_40_20" = "1271dlp580a5gm29sv6b8plpc8d06j57x2xrfjyp7kafxa1158ii";
-  "nCTEQ15WZSIH_FullNuc_4_2" = "0sv20zpzbinrz5biia1g3jzgyq0wbqaqrmrhhcyg2yxg9z48vgca";
-  "nCTEQ15WZSIH_FullNuc_56_26" = "1wz1vwy2q85qz85kdy9gzzhnvv0jy4iazzavf9janz2xzw7833gg";
-  "nCTEQ15WZSIH_FullNuc_56_28" = "01y0f2bz5yxmfd719fq8s1i3q5wb0dd81l0qkllpa961db83zmz2";
-  "nCTEQ15WZSIH_FullNuc_64_32" = "1a93nqx26pj9kyvy66dmm4ib2pl5qwf03420q84zdl1hlcgaszzc";
-  "nCTEQ15WZSIH_FullNuc_6_3" = "157j927a4x53gcam5kmpcpkyk76qgdlszxa4bcj9wlqrygwxsk3k";
-  "nCTEQ15WZSIH_FullNuc_7_3" = "0l369wpd3gcb6i452w2hsjvidz80xl623xf1g1p8d2485nrvh6jm";
-  "nCTEQ15WZSIH_FullNuc_84_42" = "1nikb7yk35s27g43k1wlgcfxqfyjf40csn8a6aiabliqdfjacaqv";
-  "nCTEQ15WZSIH_FullNuc_9_4" = "0nnxf32kllwvm3fyjlswnyjx8cpsanx15qwsn03z6d67wx2f87sw";
-  "nCTEQ15WZ_108_47" = "0v1s95f0wxyz73pfv5z6hc4mslxb7ml6imjmkhn2p9yx5mvk94qf";
-  "nCTEQ15WZ_108_54" = "0zqw1p1sls58v7aacmwamlic0vsjyjijfam6bas5lh92rrmcf9h6";
-  "nCTEQ15WZ_119_50" = "1wwx1rsjhd8rqrvyq68r70issnsby8zrlr8d76br3622mxqr83a7";
-  "nCTEQ15WZ_119_59" = "11hckxdqyfrbsv3lc12q8zjysr2nw9mhx438ff13azp93ha7h1v6";
-  "nCTEQ15WZ_12_6" = "0naqqy223p6gyw2r1qy5fs185dhmxzmb3zmkx3bbccqnspk7qcnz";
-  "nCTEQ15WZ_131_54" = "0fi4sjv7rs90yac1zmnlf38dv5ry9zwzxrjwakpzh00irxw0cz8r";
-  "nCTEQ15WZ_14_7" = "1k4sc588n3rd8fvcvwhxzc405iqj28xzv7y1md45kz1c7m6qy4cj";
-  "nCTEQ15WZ_16_8" = "0ndjlgbggbk3zk5bm9nm726ci1v8b3qfy3gag14jmp7q780zyhmy";
-  "nCTEQ15WZ_184_74" = "08cdkqbjihls2sg4waj9rxg7nvs0mjzxfv3dx1jppiw6f7ljjzrr";
-  "nCTEQ15WZ_197_79" = "0ss7wgvx8rv03x1g10c516i0yd65njc7qjh19maij49aizf1fd4l";
-  "nCTEQ15WZ_197_98" = "0vlyjqlj9plniim0z7mdhia307i296iha94l8b3iqgzyp9553gly";
-  "nCTEQ15WZ_1_0" = "13wnm5sz1sf3hng70j8d3ml53knrx9b7wrg2h6x947jl51flrkh4";
-  "nCTEQ15WZ_1_1" = "0pllq4zdgjaklad9j87vilx8gapzfhjh478gcw479ahgjcbbbxxp";
-  "nCTEQ15WZ_207_103" = "088d8sr9mq9q4bi0ipxznbm3k2b2k347bj9k5fxsb27f4dl5d0jp";
-  "nCTEQ15WZ_207_82" = "0cxagqav2q6kwq83syiad67nmzzkmrg9q0hlshbz6bjlcqmdi4jr";
-  "nCTEQ15WZ_208_82" = "1c7vacsr2m6r7dy1b439c46xgxjqvq1gj9y68p2vargm5az444sz";
-  "nCTEQ15WZ_20_10" = "1y38sqjgsjrfhmyhf688jir2hgkk871sjz8dm89lm5g7m5c1mgmq";
-  "nCTEQ15WZ_27_13" = "0gb2zg5j3jcqjisa3nzsbif4rfi8vshl5vq2vq93d2132qgpzq3l";
-  "nCTEQ15WZ_2_1" = "04nhmrvy2m4a2i8b5qadsg8h51k171df1kb7mdqn3hjzga7lg0j7";
-  "nCTEQ15WZ_3_1" = "00aansn8jjh8yqyhr2fx8h453nahrdf8j1j0qgny1n1mhad4mc56";
-  "nCTEQ15WZ_3_2" = "1pk6gp5a1g15zn5w00l89liz4w7w4xsmpcdk4x50vc7k5phy6vj7";
-  "nCTEQ15WZ_40_18" = "0m58lby911lxqy6rvvs959qg5gjbppnfxl34hn81glc0lr90qiz6";
-  "nCTEQ15WZ_40_20" = "0dnk9yikivxd557bpi9j7dbpwkf4sk49bg8lf0lxf86bdmi2l330";
-  "nCTEQ15WZ_4_2" = "00rr4qwwp7i419sy5wr6f2lz82121ilrvvj0js45bvcqknx26c7i";
-  "nCTEQ15WZ_56_26" = "09qjjavqjwrh9adkz6yhcjjiy55dg6c7imnbsi8qxi8xspz8nqq3";
-  "nCTEQ15WZ_56_28" = "0pdqsrj4dphjb50r3v95wp1drc8rkdgsbisgg430dj9xaa703ijr";
-  "nCTEQ15WZ_64_29" = "1qjvvfzv5nfjp1k1kdv2kz5pjssr2avrnjlxznqvlxwgs7rv8p7v";
-  "nCTEQ15WZ_64_32" = "172whqdyyvqxyr3lijw2v45y8nvc0vk7z47i9xfmcydi2qfz8g3s";
-  "nCTEQ15WZ_6_3" = "0kr0cf8aqwsn4x8kjwihsynvb99i8bdp4g91digbgcfpp02jyvgd";
-  "nCTEQ15WZ_7_3" = "1c76h9xfflfihqyxi9a6dlmg1gwwr2wh93mfac3a3jnx73981gq3";
-  "nCTEQ15WZ_84_36" = "1cvykpl9r41dwahjv3kik98y6sx53wiyyzywqc87mhnlx1x5876f";
-  "nCTEQ15WZ_84_42" = "1jslkk9wc0fzbm6s5czpmaf004pndwc2ggwnxgkga2idn45204xz";
-  "nCTEQ15WZ_9_4" = "0farphic6jyzc5x3ja715wdmvv5rfcgil1c49i8fxqlap5mlgv89";
-  "nCTEQ15WZ_9_4_iso" = "01zxmn50r14n1a5gq75pia8mz4ibyqhyjl5d31kv3h69xgdrlizc";
-  "nCTEQ15WZ_FullNuc_108_47" = "0yl5ll4j3mr6nhiz9ynn9w3hybgwdypg0b8zwsxz1rjcr3c8bmz5";
-  "nCTEQ15WZ_FullNuc_108_54" = "1c8cdilw9n91apqj9lrv9j6hf6mcg3ndndchc96d5svrqlqk4fg6";
-  "nCTEQ15WZ_FullNuc_119_50" = "19lb71cmmi4fvpb0bxmz0ipjlzg6b5hrlwiml4bj5r65km46whyk";
-  "nCTEQ15WZ_FullNuc_119_59" = "0r9cwy2znpl59ynv2av6whjl3igm4b19rzh6sjqsm6a85d5jjdpc";
-  "nCTEQ15WZ_FullNuc_12_6" = "1972j8lziq1ckwq2s7qpcf9g7mg3762kfrnbdjf4ilfw5b2b9i9n";
-  "nCTEQ15WZ_FullNuc_131_54" = "06w9yl6a11ir8qjyxaakyzs8b51hf3jhm8nj5nvrh4f6cicp1g66";
-  "nCTEQ15WZ_FullNuc_14_7" = "095x9pphc9lx71hlhpwcb71p8wx3b1pnv6qd3s6992visismyb02";
-  "nCTEQ15WZ_FullNuc_16_8" = "005h4mbf9c7d9w61pmgghpxb5yh63i6cbyxyylngznbbbaxggjcc";
-  "nCTEQ15WZ_FullNuc_184_74" = "0niyiq85bmbr596gfrsmf79rksql7n2gqdxw72yrki5ywc3iy4sr";
-  "nCTEQ15WZ_FullNuc_197_79" = "0vbgg6m0b1wlrsx2c5xxga0crz0nwvcq9a88f032yjzihh6rscjd";
-  "nCTEQ15WZ_FullNuc_197_98" = "0sf4q5bb4b44zkbxq51pf0xhpldr5dj5d0gqpqs40qkdlmkb9z7k";
-  "nCTEQ15WZ_FullNuc_1_0" = "1il9j3ggn9kc8k8jpql46lw5c9lq45ngaip45vqppgvl3zcrc4fv";
-  "nCTEQ15WZ_FullNuc_1_1" = "0nxvm11qlapnpdkkymqhy86axcvcx84r9hk0dswa2ji5gmk18jww";
-  "nCTEQ15WZ_FullNuc_207_103" = "05qqg6ckkhv30nfbs5rdpiwz7dkgywjrd8a9gr3skvlayj2bisni";
-  "nCTEQ15WZ_FullNuc_207_82" = "0s27py7i2h0va79q9ivmgrpwk5pxrjx9csyad76fc7pmvi4xsgjl";
-  "nCTEQ15WZ_FullNuc_208_82" = "1xygz9px4jwz3vkbx86384775vhiqqv5l2rp2qi42zy8y8ijwaqd";
-  "nCTEQ15WZ_FullNuc_20_10" = "06bgr8r6pz8cpvqbncjaazxw7j2qzhh183brs7r5mi6yckg318gz";
-  "nCTEQ15WZ_FullNuc_27_13" = "1qrs82jscmxyhqkd4fa2kjglzgig23kqwc7r2n8p23352ggcsn9x";
-  "nCTEQ15WZ_FullNuc_2_1" = "0jxam0p1ypd3x8l83d2f14h2av9wk1r69prfhl6pgd6pdh3nx2gh";
-  "nCTEQ15WZ_FullNuc_3_1" = "0kjgsiidi33p442bpp1g6sss62qn4pj90ag4hcmdqsdf5m9vpc5s";
-  "nCTEQ15WZ_FullNuc_3_2" = "0srxdvk5jh4ga4r8hniikzanfa8fh65xc4g51arxwd9sda4n0mqb";
-  "nCTEQ15WZ_FullNuc_40_18" = "1x7d1cpglijq4rag57m8sp6qyzn3c7r3zs5z9jqarsaqc9wv2ypw";
-  "nCTEQ15WZ_FullNuc_40_20" = "1l58bvdhqs9i4mgc39dw9c13rsh5vq5vh6zq8xk35150cbysiwza";
-  "nCTEQ15WZ_FullNuc_4_2" = "0s1zdn5r9hk7bjk2ggn7bhrzq2iaxspdhmwi9rq1xbsk7n8k3wif";
-  "nCTEQ15WZ_FullNuc_56_26" = "15ilca90cvw7p3w1xr15jynqnvnyw8zhpydhyq11x1kc647bgirm";
-  "nCTEQ15WZ_FullNuc_56_28" = "16bs4yq4jr4y3431csabgps6330gcw1ymgm2161z4nmmyp988w1g";
-  "nCTEQ15WZ_FullNuc_64_29" = "17wqyn8g5zbrm6ywvqn2y5kphy9xwbgijwlzxsni5k821nzmjyxn";
-  "nCTEQ15WZ_FullNuc_64_32" = "0ivyka1g2cj6ign8wm28pzim3saas3bvnxqhixxkr91m1gl40b86";
-  "nCTEQ15WZ_FullNuc_6_3" = "00v5wydvrvw1fgbzc436cap7amk8yr7dj5wf3ykyd6415vxmlzl3";
-  "nCTEQ15WZ_FullNuc_7_3" = "06z2p0gx988q5w4d3c0qx6pj7lp6mqlz1qrnwy5lf4i4i4vcqkkx";
-  "nCTEQ15WZ_FullNuc_84_36" = "0rfn82f8f9f6bgngrs67maip2kfhy42i4ppa904d7dspyqkgfa31";
-  "nCTEQ15WZ_FullNuc_84_42" = "14lyhhc5jwccqnz85msaqzdx7cn2vxkvm2l9mf1p2kmgy7p5jis3";
-  "nCTEQ15WZ_FullNuc_9_4" = "1895lr4yydzk4cry5wnjhpl6gs2kcspjlm2mv2y00sb7gzinjs94";
-  "nCTEQ15WZ_FullNuc_9_4_iso" = "0kvjk4wvw98w7y02ishjacn9frncspl6rsxlzcd4y2pdk1ckr29i";
+  "nCTEQ15HIX_108_47" = "1w4vglhfsy4rnlsihf71fpgzdbn1rlx8qfxwg9lai63xf74wf8zg";
+  "nCTEQ15HIX_119_50" = "10nv6zpjx63anxsny926w3cd1wl7xcrdqsq4d120z8hdxlcc6x5x";
+  "nCTEQ15HIX_12_6" = "1m0app8zanpfap0i3ynj3ymspa9ma4zjvjpq2vsnbb1mmkaqkvsf";
+  "nCTEQ15HIX_131_54" = "0clfkn1mw2cg4nj1pwmpi4cqrpnsagq06yh8cbp5bw7m3pvll3rk";
+  "nCTEQ15HIX_14_7" = "1i57rckkv08jh7qyi22lzliy5vmlrh8vwx5x7f9zjlbslghcmx26";
+  "nCTEQ15HIX_184_74" = "0ffs7p6cdw1405246ajriy3sb7nkb6vxjl2rcgspvdhsvpq4wiki";
+  "nCTEQ15HIX_197_79" = "0aa1qq4mrq6zzp4glrnamkdgppcmjd6fq9v6kyg2xmafzbk7crn6";
+  "nCTEQ15HIX_1_1" = "0zzsz4ryh5wrbd96fsj63gmzib1m78r478i11kxfy13h3v6n796j";
+  "nCTEQ15HIX_208_82" = "0sxafxjpmrmlgwiygnsavzgggc7sl3svwj4fsq2cjgkq9g1ny7xf";
+  "nCTEQ15HIX_27_13" = "1lg693mznr4dcs7wsh5qqrjz0mn2abjg9iry235gxl68lfb36hr1";
+  "nCTEQ15HIX_2_1" = "0dklyy54hqjnix59m896xrd28m1mcc9d1gr39idwxwp7vah8h2xh";
+  "nCTEQ15HIX_3_2" = "1cm32w3lqssbm2r4k57v68kjrr9w545wfk3k9bld55qffcc2di0z";
+  "nCTEQ15HIX_40_20" = "1d2jrfvfdm064wnxy7jrwz300hwwc8r1gyclmdp3rjwyvymbml5b";
+  "nCTEQ15HIX_4_2" = "00xp5rch1gn2cj37xqf1iai3zx0l2ix8w1fxqnzf63vpkmfiylws";
+  "nCTEQ15HIX_56_26" = "1f6bi5jmhxbfs5zg2g14j883cpk49jgplhq4fdnjpf9fzhkgvrnw";
+  "nCTEQ15HIX_64_29" = "1f8afd14y2hqngk7wfrf453vvqa15mcbsaijx9cb4hs89jl21jpm";
+  "nCTEQ15HIX_6_3" = "0hkckivc90ixzyyw9m5r59vv05n5cyqfqmnvnchrliv8v81i1v7s";
+  "nCTEQ15HIX_7_3" = "1hjw9akqqnjnj5wzans6yg3w3v5r0q58c21gaan0qgcy4rdqnb5z";
+  "nCTEQ15HIX_84_36" = "1rp65mh33vf2l19ybzbkyahbwxc2anj3hwx1akzwcb34g91wbxzm";
+  "nCTEQ15HIX_9_4" = "1jka1pxq9i7gv5rcisrj4lblii3rh4ngfgkna0cjjzl820dccb7l";
+  "nCTEQ15HIX_FullNuc_108_47" = "12gxzi7dsn8lzrsxfdmscdmnxqsalcj100ndzfdr31bgi4rriylf";
+  "nCTEQ15HIX_FullNuc_119_50" = "1qa11k6irwlbqagxcfgiamp04rw4l5mw7w01znjyf9q14ir4bw72";
+  "nCTEQ15HIX_FullNuc_12_6" = "1szmby3m8lch9jlvdgmwcbbrdi81k9cam63xmrhpfz7m81ns1p1k";
+  "nCTEQ15HIX_FullNuc_131_54" = "0xz57hwzxkqfbgs6ki9ypfiqd2l0yfs86znmknkpzi88wm1lpj5x";
+  "nCTEQ15HIX_FullNuc_14_7" = "1j80ihnxkqiyrk8rch1svs5g8cyw9hnzn562nxi6jsxhd8pmb5v6";
+  "nCTEQ15HIX_FullNuc_184_74" = "005jcyl3h6jv944swq035hfb9mkn7jlg7v1k424507wi4j0f1vj9";
+  "nCTEQ15HIX_FullNuc_197_79" = "0h5dbrcx44f14ybs6hi46px6d323sz0gpss60s4fb5r0p10l40ds";
+  "nCTEQ15HIX_FullNuc_1_1" = "169a4g1qdi462lb9p1abk29fis6jzdp5vxx4liqs82qf90p2r8sp";
+  "nCTEQ15HIX_FullNuc_208_82" = "1rpyrfcl5391kzlplxfrs6m8rhd8icfq6ki6brmy9awhb35hyhn4";
+  "nCTEQ15HIX_FullNuc_27_13" = "1n0inp61zkdhjha5gplks59p1wbqzw67l3mkl1md2bhwhbfjij46";
+  "nCTEQ15HIX_FullNuc_2_1" = "0lx3df0s3ad9crc4ff5qf46w8paknyj248hfbighn3mz89kvwx85";
+  "nCTEQ15HIX_FullNuc_3_2" = "1jv5f093rpp1z32nzddhknw7zdqz54xrf2vpgihvqcc10ca57xkz";
+  "nCTEQ15HIX_FullNuc_40_20" = "0iypyij62ms5znhi6dbzv8n8grq3ky0gm0v3grvlp7jw7vf94p0a";
+  "nCTEQ15HIX_FullNuc_4_2" = "1h62kdixqq4kjnm4m5p3cv2awnc4i1gl6b0cv1567hy6bjw86w9b";
+  "nCTEQ15HIX_FullNuc_56_26" = "0rfjyf8ka2205r4980g50nns78xky8s7jyisdbaif3s4f7aan9wn";
+  "nCTEQ15HIX_FullNuc_64_29" = "0dasf251w5f4ch8w2cva2xxa3y64gbh7aq288fga0s2fysgdfmqk";
+  "nCTEQ15HIX_FullNuc_6_3" = "0bbl3lsg43lxsga8ghzmgckn5qnhha46rh5wp4v1bvw0sip3s0xl";
+  "nCTEQ15HIX_FullNuc_7_3" = "1g50bvfj7xlw9h6p7i6fwwrlr47ixnw68zj9awaxicqihfvdxis5";
+  "nCTEQ15HIX_FullNuc_84_36" = "12cw4rsjj4c152xp502aavgq8akx0h8ynanw5h88vcwyl8xr479h";
+  "nCTEQ15HIX_FullNuc_9_4" = "0pli0np6mzc04jkzsfa4kjxqdng94qfms3xpbcycrffdq3hanvl6";
+  "nCTEQ15HQ_108_54" = "1slpvz1lniqvgs9ikh266i6vl20mk05diz1ps5wlb89c4kw45i95";
+  "nCTEQ15HQ_119_59" = "1p66rfb67dww66qv3wiajkw7hi636f92dwbg5iy10vwsffj0cxhp";
+  "nCTEQ15HQ_12_6" = "114dy87r9f7zwfx91yzz00diayvkgj1bq4v803yx43j64j1rphnj";
+  "nCTEQ15HQ_131_54" = "1s6zp2r5z3zvmmjc1z1l9d0x3n2xxr4d009r6raw211n07325jl7";
+  "nCTEQ15HQ_14_7" = "1nm4yz8jki1h15biqcd1r1s6w3f7ravd45qlbki1i2iv40mnxzbg";
+  "nCTEQ15HQ_16_8" = "0vkprb6y5y1pp4z6q9apwfvy2ind4r733hzxv3bwiap8hpfbvqdm";
+  "nCTEQ15HQ_184_74" = "107fpfrfdfvcymfm67jcvf1h052f7ymilinng226kdghwz09bg1v";
+  "nCTEQ15HQ_197_79" = "1xhzbp0pmi5yrqp0z4c33xh8qiii3mj17sjgrm1lg5jka78hjsrb";
+  "nCTEQ15HQ_197_98" = "0zma6rmaxb6vlsx4fkqya7raa9ci02wr28r4blrws3mlkja421xb";
+  "nCTEQ15HQ_1_1" = "16jnh5jycrrmvj5j0ay6mx1vf62kgdakrpg88dn41ii7cp60kvp6";
+  "nCTEQ15HQ_207_103" = "0dzddmd95yhy61gwd2zl36266lzy4lrqad2chidg7kb4crb5wgly";
+  "nCTEQ15HQ_208_82" = "0ns9y7kz1dglqrw3v78mvrpdc324r92vr6cydcin3wxhfj2nfyxz";
+  "nCTEQ15HQ_27_13" = "005fynv4xqqksn95r8fkyd3sb6pk8avkpv05bnn5zqfa589rj2x2";
+  "nCTEQ15HQ_2_1" = "19hq3myj2w3d73rxygi797d2rgnqwxqzfg4h2xlz642204d69v25";
+  "nCTEQ15HQ_3_1" = "1m5q822p7vcf00c1lfi8wc77x2qzq9pd9wxcwb2dk51qjikhqqyr";
+  "nCTEQ15HQ_40_20" = "07p39x25kjy84xxrcvmc74b27phdky42ccijb8chbdd8vxs064cx";
+  "nCTEQ15HQ_4_2" = "02lzf5515xlyaq79hpv6hqf32xd95z4b71d98c6zs27lac0g35xn";
+  "nCTEQ15HQ_56_26" = "15dgvlid95j87klkrhiwp123ls11zzhnyfsgfjm48d72ahvxnm5p";
+  "nCTEQ15HQ_56_28" = "1jgsf2bj8fd9kn0y21d9fk690niwmjcdcv8g2a9awwac633yr9ln";
+  "nCTEQ15HQ_64_32" = "0q0cvyf8rixbyj9b1mfi68wv9q1d1l2bdzzyjzcn7fzdadwipga2";
+  "nCTEQ15HQ_6_3" = "02lr1df7lsl809lqxqvb8jxyr0rnxr6zd42yj7hc3n0jjsqm1h65";
+  "nCTEQ15HQ_7_3" = "07bqkk6mwky58bvxg18mmrayzlalhq7cx7mxcv8bnrp71j265ncm";
+  "nCTEQ15HQ_84_42" = "0ydkxa242b7mda97scv77n5il033dznzcy77g0wmn9k5dsw31npj";
+  "nCTEQ15HQ_9_4" = "08pdfjsjdixdmxw4xfijzkpbwn094b2nfcihxngzpm7csc5kdx9k";
+  "nCTEQ15HQ_FullNuc_108_54" = "07ly5fm04dkppwm28d3q08s5r0gqwqj6yz7lc2bj4bhiysnw08r2";
+  "nCTEQ15HQ_FullNuc_119_59" = "0mjccw866cbzsipr4wzsk07hcqfxxr5972ifmcrwfgj1g3ak2cn0";
+  "nCTEQ15HQ_FullNuc_12_6" = "1cph82nnfn58ywb5jlw2rdwn7mj5ig6hip1p6rdfb6kah4c945c0";
+  "nCTEQ15HQ_FullNuc_131_54" = "097ljk9nx5n9mf94vzk59ybdbyyijp5mdwg6w4zrrrq4ax5mmzkw";
+  "nCTEQ15HQ_FullNuc_14_7" = "0zj3jjap7vyv0hw5xrgq18jsqmamvcb8x0j3kmvxv9ld5w6snfah";
+  "nCTEQ15HQ_FullNuc_16_8" = "1n202nhh9yhdh0hwrp1xai5hrdil5spgjbbh6qz2m4i85pv7404z";
+  "nCTEQ15HQ_FullNuc_184_74" = "1jdh1hqq5dxvnhhinv5ixj9icqdb3dxynfl9773s6mx3080flnnm";
+  "nCTEQ15HQ_FullNuc_197_79" = "1k5qbgx7i1is72g3zw29b80wknsyvjq23vnmfrsb2wm8fzgxyslc";
+  "nCTEQ15HQ_FullNuc_197_98" = "01ddw29g3yakvxq6jg210kb5br7ga96740hb5la358p4dpl8n1pd";
+  "nCTEQ15HQ_FullNuc_1_1" = "1pnwh3fdmylgvy3wy24w3aqds2ridcnyyc5w6xsrri3p7r7y5w0p";
+  "nCTEQ15HQ_FullNuc_207_103" = "1fpz7nfvgrsk3lrlymvs10d8dlzv809f4hmjh6jqcq8rn1p80vr3";
+  "nCTEQ15HQ_FullNuc_208_82" = "0d5gxzrxya0c4049rkd2mfgp319rvj8v63h3jsdhqml985cqfzqp";
+  "nCTEQ15HQ_FullNuc_27_13" = "0shc0nl6k10646xas54spqr1i8x31jqfwgw8hv2wq65ncqadqiwy";
+  "nCTEQ15HQ_FullNuc_2_1" = "0wi0n54sjj7v6k6ilz6b511savr6xj77rakndy8vc79jy9b0wkvw";
+  "nCTEQ15HQ_FullNuc_3_1" = "0hf5r3gzmkscdv0sxw14nsjiz98wjn9dp3gfhb8biqnzdivf4chm";
+  "nCTEQ15HQ_FullNuc_40_20" = "1slyfiywayfd9wdrssa494vpgcdb743k7kan7kzwj86ck9k6pdxq";
+  "nCTEQ15HQ_FullNuc_4_2" = "01vh0hr40hhfl13dbhmng1xgcd7lgqd7lzhrqj7zhfl6f5xqhjii";
+  "nCTEQ15HQ_FullNuc_56_26" = "1g5wkwpcb6ja8b1akx41bcc4f1lqa48sj47rmnw0x43c49l3xk2b";
+  "nCTEQ15HQ_FullNuc_56_28" = "06fknkzc94cnzgvpy73m8rglx9ablkmf8sda2ilchr3scr7pb1pr";
+  "nCTEQ15HQ_FullNuc_64_32" = "0jq6zjgx0hbhahrs45kjqsiqbbc2bcy41ppzl2y2j2v2li3gjkwj";
+  "nCTEQ15HQ_FullNuc_6_3" = "1js55wwpqvkxwpl3h3qbslbk4ppi7vs1mbbpb7kxlcydx3fi0ax7";
+  "nCTEQ15HQ_FullNuc_7_3" = "1hsvqa0vlkld70ddxsmz0j1bs64fyzmciz2vjy82ms5gs9qnv7g7";
+  "nCTEQ15HQ_FullNuc_84_42" = "0xcbqvxyvksll83rwbs2jmnya2sgm179xbbf865cl3wjh4r4n5pc";
+  "nCTEQ15HQ_FullNuc_9_4" = "0np4217wrxh140q1zyi2ikylrrdhbjfbrbfgha9fgmdyg92czmw4";
+  "nCTEQ15WZSIH_108_54" = "0jmbwdjy59h8hfyys8gv7fr0v1v8nqzl4bncrj50wmkbsqry28cr";
+  "nCTEQ15WZSIH_119_59" = "17ywm2f9151k8148980ikiylfdwx4ghvh3d84q4z2yd7vab47k1d";
+  "nCTEQ15WZSIH_12_6" = "1w4yxfyf7nbb7iqndp5ifqh0d2acjh9dj93si2k1dnqlgz07hvnx";
+  "nCTEQ15WZSIH_131_54" = "05qi63kzkk4r8v7zadysnf9p1qn461kksmrqc06jb47r7mpy399h";
+  "nCTEQ15WZSIH_14_7" = "0238c74asr45nv5s9phyv99k9jgn64lbzrm2ygp3482v7aqrm7gr";
+  "nCTEQ15WZSIH_16_8" = "14ljjxnwx0n3wk37z7rgpdikzmbfri5l1n27626c3mxfvpm3p0sf";
+  "nCTEQ15WZSIH_184_74" = "04k0qrlly9y98ib21p0w19dlybg71jyh2331fwr8pfc1j7vyz4wb";
+  "nCTEQ15WZSIH_197_79" = "01lqdl1v8lhwa3p2d61qf4rnllrypkzp2pjmvdcsc2hll1c533vw";
+  "nCTEQ15WZSIH_197_98" = "1124ivl1apfvv7x02mdf1xl9y98f5mx8gq0rf3n2vh8rkj7if4ha";
+  "nCTEQ15WZSIH_1_1" = "0iyzh37dxlmkzlx4azln0x4gd53rlwcm9p4x6hil41idh12i39j4";
+  "nCTEQ15WZSIH_207_103" = "100im91fz8y88bk7pnxha19wv61nqgdy2xlckcr1sbb1qp0ai0ny";
+  "nCTEQ15WZSIH_208_82" = "0bgdar8hzg21glkp8nv5w5jnw13yq5ifcrravhd3f7h9582lg3za";
+  "nCTEQ15WZSIH_27_13" = "0px0rg95pa4kn6c9825ghgqki5lpgwni5pqrfyzp5yr1dnwxwdq5";
+  "nCTEQ15WZSIH_2_1" = "0m9frrw5dxi15gr5lfg8pkvw974y7vhfq688bj8k479pndi996sa";
+  "nCTEQ15WZSIH_3_1" = "0ra52fcv6gbrcriw8c6h10ylwiyb72ajx1as110p04x3y8kp3698";
+  "nCTEQ15WZSIH_40_20" = "0lysvv2an0xcich3r9qdz15pbzg65d5r151nqvgpvzrb13ifg0bk";
+  "nCTEQ15WZSIH_4_2" = "0fb3id9mdjcjp809pp6g2lafp6qkjwrrgdy73d64ph1a7x08kmjd";
+  "nCTEQ15WZSIH_56_26" = "1dv41iz0arb76c0dh0cbh8263dp097g6c2y1kklnv1ds5zx6bv1r";
+  "nCTEQ15WZSIH_56_28" = "1d07j76a5kphv76vibw3ca8s3z4x6xi3l28jqbypsa0sw7dnrsfq";
+  "nCTEQ15WZSIH_64_32" = "12dk5hvfqanbp4rlgnah6jrdnw3hdl2797dgd6ll7kij92bk0zv5";
+  "nCTEQ15WZSIH_6_3" = "1d4cil1gypzhbn8apgaxc87fq8czakxwq01v0c75x2qiwasah5qp";
+  "nCTEQ15WZSIH_7_3" = "1jgpxd7gp62zam2jgbnrxh9m7xzvpvn32q8pvhgm9v16sxs2v5sr";
+  "nCTEQ15WZSIH_84_42" = "1wr3dd3wlxm89ngaqmkb0nszx1yxs028q2d3y6i8k6fab4ab3m4x";
+  "nCTEQ15WZSIH_9_4" = "1lbmi26knka3h5r1r3mzzq46svbcxh099dx03spv5hq3cxx1796p";
+  "nCTEQ15WZSIH_FullNuc_108_54" = "041p3l4a1npijyv0pdnk4hyhhwla27waxd64jygydil6hz1z838j";
+  "nCTEQ15WZSIH_FullNuc_119_59" = "0hwjc4l8pd4x0wknm4xhig83rpwk467464kfcdncrh4ayzcjjf2s";
+  "nCTEQ15WZSIH_FullNuc_12_6" = "0h6wcl8vl7f9k0rky41agzlmydm45f2aiylgwf4hlln9jq35hr8p";
+  "nCTEQ15WZSIH_FullNuc_131_54" = "1pighs821zf3y8nbsynd80wq2ihxhi15mzyqd933s9kivmpv0sp7";
+  "nCTEQ15WZSIH_FullNuc_14_7" = "0pv569rm2jfjj49nqg0ms2kjlcnfqjiq938y25jnhbsr38wifvyv";
+  "nCTEQ15WZSIH_FullNuc_16_8" = "1abzwa9c25vhc465y1bz45bl9jbhqqvwh340s9rs2pl9xwddnivx";
+  "nCTEQ15WZSIH_FullNuc_184_74" = "14k9xwxkg7am9qcwrlgl5dnbr5c8dw40mhmvqs9nwaxkahkvz8ch";
+  "nCTEQ15WZSIH_FullNuc_197_79" = "0683ym1jf9y25jd81lv71pz7n71an954a6vb8z6xfmzdr2yms51j";
+  "nCTEQ15WZSIH_FullNuc_197_98" = "1fwsxpf03ymcnz2nl9zk1844hjjcj3gc7vaknnbfq6cg670kngpf";
+  "nCTEQ15WZSIH_FullNuc_1_1" = "0cbylcph0im5dklkpkwi01814nr94rg3yd8akzm1wgl1fjqqziyk";
+  "nCTEQ15WZSIH_FullNuc_207_103" = "06i8z595gwcwb8i204dy3md6v8l336nmycmngr0b0v67xwly81g6";
+  "nCTEQ15WZSIH_FullNuc_208_82" = "11y5bsav1zp4r6fj104knxfnxjhaw0zlgs0b53xl5v148w885rmz";
+  "nCTEQ15WZSIH_FullNuc_27_13" = "1qbw0igryhmdmcr6mr2krb9jm5s2v2lhz5xb3bfkw72kr9b7lsq7";
+  "nCTEQ15WZSIH_FullNuc_2_1" = "1zsfdzy4bapcvmd9r1bgkhr26zdr7bnp3ya57mp2s407k0vmr57f";
+  "nCTEQ15WZSIH_FullNuc_3_1" = "1rws71qy4viv9hvadd95rq7zi9x6fp9asnrfvfdchb9pcnpzh3ba";
+  "nCTEQ15WZSIH_FullNuc_40_20" = "06mq1ckmrc9flg9406ydrqlkivcwiw75y05qahyvsd25rixgvwil";
+  "nCTEQ15WZSIH_FullNuc_4_2" = "0fgkx7r0q1l1a7kaxw9h3yil3292qk5g3dcsv4ccs4295xf0szww";
+  "nCTEQ15WZSIH_FullNuc_56_26" = "15lgfhwyqarr1p27b953gr56wlv2hgy66090nsn9swb1hs85pc59";
+  "nCTEQ15WZSIH_FullNuc_56_28" = "1pw9x942pk9zaarw7ld6ksbbl1n5nbmdm5wad6ac5ap8y94bxcrv";
+  "nCTEQ15WZSIH_FullNuc_64_32" = "1p55raikbiwl8jr898g0yrc1baa9r43n2zf1j2jkphbk4agl3rwl";
+  "nCTEQ15WZSIH_FullNuc_6_3" = "021h89y3q8ym731xmzj96q1diqkrx74dfbp6jgx6dsgdbxi5lnmf";
+  "nCTEQ15WZSIH_FullNuc_7_3" = "134n7gg07sls33sc5a68b4cjhd02k32i69cpkh3dk7dsqkqa09m4";
+  "nCTEQ15WZSIH_FullNuc_84_42" = "1b3f564hs573zzfqw1f0v924y824rmnf52zkgin26aar14il14yx";
+  "nCTEQ15WZSIH_FullNuc_9_4" = "0by1gfkb9nkav3mc5lk9xhsnbizl10va36ydbhqhmzln2ddz1psj";
+  "nCTEQ15WZ_108_47" = "1lc5i1n6mnfkqd789hbhmc6c4lm2l4dhinghh5sg50rv31gvck60";
+  "nCTEQ15WZ_108_54" = "0j0kc7cbxmz7k75sf0bngx8lkfyi2w5qdclrbjml2lml3czb34hb";
+  "nCTEQ15WZ_119_50" = "0srpj3h7fw4p1hbrmlkpscrcaa5x368xw41xp6scpkvdbckjc0v3";
+  "nCTEQ15WZ_119_59" = "16d7rmdxlnamampxpg9bhikzzd49bg58kzxwvjvj1b2vn3lprqv2";
+  "nCTEQ15WZ_12_6" = "1qg4b3h97a4jc93w87i3hvm4fl40n26q1ivbj0fnhvbpwn02wi95";
+  "nCTEQ15WZ_131_54" = "12gsp3l3q7gvrvd5klx9sk0cf0q62mhhfdsy3rq7r6nbwrxly8ng";
+  "nCTEQ15WZ_14_7" = "034x24xd1l8klyymim2bz0yfki6i0hvc50cin20hlxiqspl4g8pf";
+  "nCTEQ15WZ_16_8" = "1kidv4nbhnlmb70n9bpmmyrqw0lnsqhg97fxbflp1dkp7nspvclc";
+  "nCTEQ15WZ_184_74" = "0xwy21myml30y0k8510z956fr76z15ccsz3pvnki10x0rjf66r0l";
+  "nCTEQ15WZ_197_79" = "0kqwddmdskjfshb4z11qv0c4ymg0jz108yawba511g0r9919j5bg";
+  "nCTEQ15WZ_197_98" = "1c882kpjj18z5j3fcrljjkp0sja9v6bmrjrn6il1lhwfjflb3q6h";
+  "nCTEQ15WZ_1_0" = "0p7b306y8zj87pqiva390790darzjrfhs6i8dqii3cw4aj2s38za";
+  "nCTEQ15WZ_1_1" = "1b079n979aphfh1jv0p2sxx81518i0gkhfwzf6x0a765iglwj278";
+  "nCTEQ15WZ_207_103" = "00i96r9fdnvw2di73qs1h883sbnpkhw3fl5fvfvpy3s9vjb644sl";
+  "nCTEQ15WZ_207_82" = "13ivx1ia9gkw0gsk8v1c2m2v7bv22fmky7m7y2ccq5mkxmnvnh75";
+  "nCTEQ15WZ_208_82" = "179xm981fxr1sc0jn0kgihd1n8f3l3grab4q6k0haz894qg5kdy4";
+  "nCTEQ15WZ_20_10" = "0qxsqb215xky8c4wmrppmnkdcxs9vp7s8g9gn61h4kyfshcj2mn8";
+  "nCTEQ15WZ_27_13" = "19akxcsyyyfwhkr3x71agyfbj2ayyj407b6ppnkrdksri5yknxyi";
+  "nCTEQ15WZ_2_1" = "10w4zvfh1iqpg0ydf6i9zr4vpj0nkrnljr7vcck3qzl6spd27frm";
+  "nCTEQ15WZ_3_1" = "1gq30k62akjh0cx6rz16j2bppxigqbmdyhbzrwcyna9krhz15kjg";
+  "nCTEQ15WZ_3_2" = "0lpa3wgr40zixf6sjzf8kzznjbxlgnpa1kbjar3msjmr8dy6x3bl";
+  "nCTEQ15WZ_40_18" = "0xbnsabpy7bjihhx92ws4b2209b0ipx4h9w5y78qkga68zrmqf42";
+  "nCTEQ15WZ_40_20" = "1qfdjs4jsz4ns0cz1lbknhwjv8i8j2lfnffvzly9qgsxaci45lmi";
+  "nCTEQ15WZ_4_2" = "1rmxc59qy9f4xk8p4l7vaf0nvvapwbzyijjkjv146958kkvxh8h9";
+  "nCTEQ15WZ_56_26" = "120xd77qp0ffaa5wwm813bvzjaf6rxlnfy28fp7czc7k2d8b5mkp";
+  "nCTEQ15WZ_56_28" = "0plbk3pb0269b5frcgc8rjr3pmkiq05dv4qzpbp74nx5j5s4jp6b";
+  "nCTEQ15WZ_64_29" = "0k59zml9k27b97nljywa3rpkf4p5cy7g39n7fwljd1gvnv5d63x7";
+  "nCTEQ15WZ_64_32" = "1gb52sd4p87hwpld0jzi1hcv4gqhgif6mjgwjqw4b8ch8rhbbd1z";
+  "nCTEQ15WZ_6_3" = "15hikabxgl2pqayls3n4anq08jj26g6w65xv4mz33gxpgk3pqf2c";
+  "nCTEQ15WZ_7_3" = "0i26ns1icgqwlv3mpakr4v47k39zvbj36ap750p64f7wg34448i0";
+  "nCTEQ15WZ_84_36" = "1s1i9kbr3zxcdm221yl6jr38jjwvkb87ll1klz2m83jck07nlwqb";
+  "nCTEQ15WZ_84_42" = "0b5fq2gq82m8szz2krp7llkbpdrgw7cz7wfsy0h5pqd3l854rh0h";
+  "nCTEQ15WZ_9_4" = "1sq0j6cf80wgw77mgbp5h0zv4iyywc32206sgpq2gdp2dcwcf37f";
+  "nCTEQ15WZ_9_4_iso" = "1r4glsf7ypkdcx7wqrj8jkymwnkwb0rb7dvnsldq5gs2fkrsnmmp";
+  "nCTEQ15WZ_FullNuc_108_47" = "1568r6wf22yq8cy004c6h6xaxl6bpnrfhmrr1x35bmj8g4x4g4fv";
+  "nCTEQ15WZ_FullNuc_108_54" = "08v3ajasbyz7skmzf6lqj4cs8jzfrxwm1pdmz2qhmxy2s3kwffmz";
+  "nCTEQ15WZ_FullNuc_119_50" = "1lmckp5v7wi63n4w3j2qbrsd2zy21ibxmbacj8722vr9pp7n7bjs";
+  "nCTEQ15WZ_FullNuc_119_59" = "0yz8z0f316dmhgvy93nspd9pmniwq9hdyyg5zlic3g0fd9a1p2ak";
+  "nCTEQ15WZ_FullNuc_12_6" = "0csl32rqrrchrbcqf9z0vaccf4xs13zchbi54a3yrn6m03msbfvd";
+  "nCTEQ15WZ_FullNuc_131_54" = "0myma0mavapcb2lrwcwy0n9cjy1bzgs6r0bgx7pahcaifcp4va6c";
+  "nCTEQ15WZ_FullNuc_14_7" = "1hy47z8qnk4i291ihjpnn5a6zhb6pb5gyhga0vmfak3m9q188n1n";
+  "nCTEQ15WZ_FullNuc_16_8" = "0jgqjva419p4h4wcqs9fh2qzjywrhyxykm26n7h9kw1phc67rrr2";
+  "nCTEQ15WZ_FullNuc_184_74" = "0x8ydzfg40bgdsvi24b12rilm19fdv49402mfsf9dh7ysws69sv2";
+  "nCTEQ15WZ_FullNuc_197_79" = "11c8r6h1f4m53m1bf0lchl56q49d52qznm6qqkbar3gi71nrnj48";
+  "nCTEQ15WZ_FullNuc_197_98" = "15asy566k71i2qak9blynyxi62z9zj9x316sidnbdikikqsh02xd";
+  "nCTEQ15WZ_FullNuc_1_0" = "0s1wqlrz0s7gbfbc8hyyfv18h5ddbh80haayhni1990zfl176zws";
+  "nCTEQ15WZ_FullNuc_1_1" = "103h6a9jmp9px5jwhpjr3sbxn9rwbqa6c78bl4rq8c3qpna62fjy";
+  "nCTEQ15WZ_FullNuc_207_103" = "09376xai5jlf0gqa0svgdlf06xnbs174v5k3icvs18f2fvzwq6kd";
+  "nCTEQ15WZ_FullNuc_207_82" = "18fisiqm2a26rs1mrl3ax6kl7q3bd4f9r0mszmq6q8yi5wmn05ds";
+  "nCTEQ15WZ_FullNuc_208_82" = "1jrxm30h938jhz2474hl3arikrlvijm5shqslrgl8b9c67zjxcsj";
+  "nCTEQ15WZ_FullNuc_20_10" = "1vvyiw6q106smkklnpy10v3fww67p41glyjfqykbp4bmbnjr7c2m";
+  "nCTEQ15WZ_FullNuc_27_13" = "120p67g45jwnxzim1fsfvxi6q4b3lwsm51kfivpbb0fiy3n8hbp9";
+  "nCTEQ15WZ_FullNuc_2_1" = "04q8fk70qhsa08zyhynqrxbilyps6p8ivpp77w07ipq0qpfvddpq";
+  "nCTEQ15WZ_FullNuc_3_1" = "1pryhhayi49w8css7mssha2ix012nnkyz5b590rj9y4qasmj5a7i";
+  "nCTEQ15WZ_FullNuc_3_2" = "0gfixlsf8jvp6v9jkn6whgblvswyqf9c9c0mjlyj5p038jig8k7k";
+  "nCTEQ15WZ_FullNuc_40_18" = "12iz53hq4cw8wgj6wl9gnix5zrcdc8k9pn9binc5s8x4w5v14f2b";
+  "nCTEQ15WZ_FullNuc_40_20" = "0qjrp1xwzcba12kdka1klzvgv1a0qig85j98xiq12y0c2ax88sy7";
+  "nCTEQ15WZ_FullNuc_4_2" = "0ipasfw139y78v6md0k6hakh6n8fh79frszj9fsa5c9hng8s70jz";
+  "nCTEQ15WZ_FullNuc_56_26" = "1njjzdp0an3pp3kgg6g9a1fskqpvfn9lg9f6hba2jr1jylkmshkx";
+  "nCTEQ15WZ_FullNuc_56_28" = "04zk6vcg79hzg1cvc2j59nkc5hik28q0miivzng2ngb11b6gaq6f";
+  "nCTEQ15WZ_FullNuc_64_29" = "12yxc1vyxlxvfi75brrgpgvllhspl4bky5i7l3wcsv6c9dq7p20j";
+  "nCTEQ15WZ_FullNuc_64_32" = "1svj0m331ajchxpwg9l27civkz95ik7q0yclxk6pv16iv02zkv1f";
+  "nCTEQ15WZ_FullNuc_6_3" = "1rs5srl7ljprznj2b03syrh78fsj7fliq4w89pzm2v04h01kwpix";
+  "nCTEQ15WZ_FullNuc_7_3" = "00ap7a1kb9dhqs9hcfggk9lpdynxjdywlbjnpkmqcribpaadirny";
+  "nCTEQ15WZ_FullNuc_84_36" = "1z9shhccqavnbds06xh0nvygk5m64cbpnjl91azdyxsl4s396dj0";
+  "nCTEQ15WZ_FullNuc_84_42" = "0j28izpb48b2klxfh0v661x3bwirf1i8mz3a555g2nnjp544cpz9";
+  "nCTEQ15WZ_FullNuc_9_4" = "0j7c4nw31xayzrsm3fyw3ak99aarwfpbygnavmv75jjzcq24ki9l";
+  "nCTEQ15WZ_FullNuc_9_4_iso" = "1a9lz5vbrhsirz4ldwasw662706q3zndp0606xyyg2wmnq64z4h1";
   "nCTEQ15_108_54" = "1bjx2d61qjhabfx28pfi64hf8br4gl67nzir3ygdpwdcah4k6lz8";
   "nCTEQ15_119_59" = "0g7wffsyjh84r2wv8w67skx8gwdb3clv9c1dlpijwqmpkcm3b8q5";
   "nCTEQ15_12_6" = "1xnnqp38zz3b61jb38hz54wv09w06fwwnb66sf93r1agcajvv1vi";

From 8316e7e6417b8c41adc010c4c54acbd992535bc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 09:55:47 +0000
Subject: [PATCH 1333/1504] iosevka-bin: 32.3.0 -> 32.3.1

---
 pkgs/data/fonts/iosevka/bin.nix      |   2 +-
 pkgs/data/fonts/iosevka/variants.nix | 180 +++++++++++++--------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 057e40799bcc..753b347b895a 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "32.3.0";
+  version = "32.3.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 1f2f4aec7ae1..dcc9a09f2568 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0x9h41jhhxgafad7zc39jb4la30sxkqcz1m4l2har9zfakc3jhnm";
-  IosevkaAile = "1rf70nsqkza1zwzpl2i015rhxs2wqq9msvkjhghg6scfir2bmpky";
-  IosevkaCurly = "0hqn94k9vh9ds077m4gmdhdhcg1x8libb6cp1c2iqgy7nyc9qywd";
-  IosevkaCurlySlab = "18ya3c8fw0hwifxdkyyfrnqybpwhf21ir3lhajs0x772ifs7xs22";
-  IosevkaEtoile = "1ycwyfyg1dk47mxgnc729liqnffyk2f5f0vzavdamydfdqnd9wrq";
-  IosevkaSlab = "1dfgbx0clsz7dxy32n7gzza8bx63gfq2j77vyfqwi9201qbmsyqr";
-  IosevkaSS01 = "1x4fayq749lcn857v5kls4kizdn2nm7sv3n5r9ac3x1vhnjp03c9";
-  IosevkaSS02 = "0ghwab6cx958kk5znc8d59bkjw1pfif3cz583j99n2jyd524y6bf";
-  IosevkaSS03 = "04g41ds76nkva8ai23xbq62szfdvrn659hrn0bjn1f754aq921h8";
-  IosevkaSS04 = "1c34cbmnmfnss9sncrkh92n054q8lhdpn7qvvi0p3kq1xbg17iny";
-  IosevkaSS05 = "03ii0w908k9xvgal7ja6sw3bmc3gnvhkgd6j023whrcjis77ryi9";
-  IosevkaSS06 = "1hv41jn17zacmfck1r6kc905i0aikz51xwx4zdnmmqq0xyyxdkrn";
-  IosevkaSS07 = "0vfys80wc4rznynvv8zck8h41nfz5ig01by03f6m8qd5fnjdbhw1";
-  IosevkaSS08 = "0ramm4jd6wfkfnwymfqpcgapbrqcsq1irfh33mkzamj35racnkgm";
-  IosevkaSS09 = "0f0y536nfmbkz5b57wm978ywrn5qc3f1wzfmwpdc7h3jqygakbdc";
-  IosevkaSS10 = "030blnwf75psiiqi5haypwvp9f9jnh5h24fz9x6swxx23x6pl6gn";
-  IosevkaSS11 = "06c9ka1ca57srnn81ahbmnvimcyb090izw22yrkkyd6nnf59ma34";
-  IosevkaSS12 = "11jv4xy9xva97v1lhz7w8c1qj9yb69a7l17aycdq1ma3mx73dpk0";
-  IosevkaSS13 = "07l3adjiz9i7hqfs8174db1283m2ly6nn0c91njx84fm541sizfn";
-  IosevkaSS14 = "1862fcq9zxdm5dh2032bvs2l2wg3ryrcsyjz0addgih7arp4gzfd";
-  IosevkaSS15 = "111pj1l1vmfcpj1jcb1cpdl1xbm2pjvmlvpmxbn8qh3ms2cvdgra";
-  IosevkaSS16 = "14dk6j8dw8scd0kn7hazld41731fgf5ym6ylljdq4jcgi6kygsiz";
-  IosevkaSS17 = "0ci8l5i2iwb8yjdxdzs41204x3zypsbcdn7a4sgjwc0fcg6ln89m";
-  IosevkaSS18 = "1wkwfdlz0kxymiii4i1wg1kiwbksnqkdpd5xjlg5abixj9dg2kcf";
-  SGr-Iosevka = "1q3x9b9h7daxfhz56mnlgsbcl3a4sr3h87f04dl3cxqxwmf1c65q";
-  SGr-IosevkaCurly = "0xplpj2na2427znwphrifyh5firc2z1pdq6sf7rc5apfizydspxc";
-  SGr-IosevkaCurlySlab = "1jbsq475fg0bmjjbrl0ylxzpi59cn9wm00693y3f2n900lrbbd6x";
-  SGr-IosevkaFixed = "1kw90cqj9fkjhhgjpi2pmjjxljhirfk68jz2k07b213qvg1ca1ab";
-  SGr-IosevkaFixedCurly = "1kpvimfga2harfb13i1gp4h5nl8qffa6a4dg9fcjwi56j9p1r0hq";
-  SGr-IosevkaFixedCurlySlab = "03r9h4gh7g7b80pwddm9vvldps9b32wfzd4bysmgn918wqiqkcwh";
-  SGr-IosevkaFixedSlab = "0q9l1djgsg15qhwl11kxdckrds05pkr6w34048r2hdxgvzr7f6gm";
-  SGr-IosevkaFixedSS01 = "1acc8cv14vv21p60iv0ldpmkd7a0hzpi6s1mw5z1zilnrm8swbfk";
-  SGr-IosevkaFixedSS02 = "1kp2b891wna0k4y8k40hdmm34a0p7788ja2ip9h7xvc2n1g64yl8";
-  SGr-IosevkaFixedSS03 = "1vgb6vdwc2kmh0219rpzqhg27zamka801zv7gm9ic24hfizy713x";
-  SGr-IosevkaFixedSS04 = "1g49bqkzsjdb5bli3pxh1rbmr8n6c0dxn2vdxjachxcz5mf4ja9z";
-  SGr-IosevkaFixedSS05 = "1sni2mxlwsbpvgh0rpjmr3ifjq4awgsc44s3yjiqw0y8wmd90qmg";
-  SGr-IosevkaFixedSS06 = "0nsv3bxjbm2r6dnva74d67f9r3k42jdvcjfrdgxkpwgydrcrkar7";
-  SGr-IosevkaFixedSS07 = "0qxx9mmg5i7rgqwl7zy3m11bhrqr6akv4jqlns4119clfq1bh1ip";
-  SGr-IosevkaFixedSS08 = "0w9v8slpp9q2ywn5absc97zqmg3f55vfd52rrv6rcc7jkd7zsz72";
-  SGr-IosevkaFixedSS09 = "19js1wah54mbkpf3vjqrxwk6lf2y7nq86dc5xxrj015yimkzsbsw";
-  SGr-IosevkaFixedSS10 = "03vvjfm69mvm0873b1ws93vkjbqjzd7f3kg65h7zwxg6r9l20ikc";
-  SGr-IosevkaFixedSS11 = "0jcwgblwx0bhvfibnlizsgwqryjqhyj80cz4dqhhrjlviirm17v3";
-  SGr-IosevkaFixedSS12 = "1pm1kmlmpaz5nnkbk4s0n12am134kb5mh2b6rhs104dkngf1zfkf";
-  SGr-IosevkaFixedSS13 = "1h3v8c7qsf7iyypvbhn7qsmm0a7mfyyh7i0p4f3pvkfdpb1sd509";
-  SGr-IosevkaFixedSS14 = "1fpwrck8dhha5rkrbz7dykyqrlg46fgih3sn1c36s7j737j69vch";
-  SGr-IosevkaFixedSS15 = "16iwab1gpc3xzgxld8km43n9dm6jxv0z39zgyxknw7xdxkwy247z";
-  SGr-IosevkaFixedSS16 = "0di6sr995gjadky3nd6k68i88cl745i2awq69cnv6akvcyy53fhd";
-  SGr-IosevkaFixedSS17 = "1p7qm49ww201yaddc0m18vjgp5xjn69cpmg3lsxav4bapf3yq01q";
-  SGr-IosevkaFixedSS18 = "08858lgilwqhrvpzciagh95a2cqc4bfipdyidl9bj718z67vwmgq";
-  SGr-IosevkaSlab = "10y6ykq3aaki5m4j4kmsv5y79li3l9bqisrwbvzw6vcs4895z6qw";
-  SGr-IosevkaSS01 = "0mdkm5fb6srxd9bmw41a1rglnap0fmfv78anzff6w0g4azvxlwxj";
-  SGr-IosevkaSS02 = "1z6bf14qcx5qkhfd99g0p26flin8wqmvlkqmxl32r0697a1yhaqm";
-  SGr-IosevkaSS03 = "1jvf58qnx89f90h1gwlm8nzfb4ab1wv6z39p9fzawcrsk70fj29q";
-  SGr-IosevkaSS04 = "11akqjhjc1nnmc1b0x05v78b3pr2mq4x1w9ldq07mq088cp9n1v8";
-  SGr-IosevkaSS05 = "0dn1d4gkgfqars6nj84lbic3ybld3h0h321kkrbl4s5wplli264k";
-  SGr-IosevkaSS06 = "1lxjvgipr4w7865xvcrx5vl5w40c9bz91rb7wm6lnxs9fljg9nim";
-  SGr-IosevkaSS07 = "0kyb0qyvq7z0m1z8561w6bkz73hfhnxp4hshx68pcbvyh3ah25hs";
-  SGr-IosevkaSS08 = "07f1qy450v6k9dn2l15b8xfdhkx2ri773lnld2jv482wm8nqn54z";
-  SGr-IosevkaSS09 = "1gkxlaip18fnxkcdf6iqh7in0qgjk4kvjqky3qjwhww3nbkww5cl";
-  SGr-IosevkaSS10 = "0g25n440ad8n2xxc4m9mrjfi5lf77jhjg9hld26w9ir5fhbg5gd9";
-  SGr-IosevkaSS11 = "06xgh13qsmfjzk925s30qwrvdhaxk3f04qrsyb12fyns7r8q39k2";
-  SGr-IosevkaSS12 = "05s9x6h609mrmq9dn1ca25crbb2nkf4v3av0mb7phc9narp2nl9d";
-  SGr-IosevkaSS13 = "1yz26cgb1mcbqhn2x85yh3hhivkdmrxpnkkqh28kqhp6yajb7cma";
-  SGr-IosevkaSS14 = "0ql72ic7m28p1k5c2zbrgpdllsciggcm26iylxxqvirsvrxpa4gg";
-  SGr-IosevkaSS15 = "1j3xib3szygxjx658jj1kzn8sn5qyyw14w7ayz9zi5dr2l86cnzy";
-  SGr-IosevkaSS16 = "0m48y236m5incc8p45mq7rryqyisjfrpihym7fsv10hylvfmjfp4";
-  SGr-IosevkaSS17 = "1c7hwxjzjcdil0vl44pndsa89rlp4i9p254zsr7qb23frjrd1jn5";
-  SGr-IosevkaSS18 = "0m09ilj16p2fl6mcf6hx2v3v2zshr1fwm49jvhcc1l72niafm2wm";
-  SGr-IosevkaTerm = "0n91a4icwxxbg3nhr4jc0ssjxf70wh7r5k7rhacha80kbb3n5yai";
-  SGr-IosevkaTermCurly = "0fbkad52yi2svh309klhr36pf79avp62nnh0sgh3pi5ss0fs1msr";
-  SGr-IosevkaTermCurlySlab = "0pzffbjjb8rm1cbc8v6qpl0xavgq0hdfipi3fafw5grl79hiz266";
-  SGr-IosevkaTermSlab = "01sif6fvszbsjq35gpydiy450n3l9s6zcgv16yg0yl7qpkcdjnyj";
-  SGr-IosevkaTermSS01 = "06x65513mr1xjqhvq72l28ki341v9zy51006pjm7q47gryvj9z9g";
-  SGr-IosevkaTermSS02 = "1wxryjk65idhkjbzamxr82zbqhh5vzc6kfi8f4zjsqi5mvd3x1fc";
-  SGr-IosevkaTermSS03 = "08vdzxy4rvpsdn2q1014ma4v9sk7f75i4633x2d3cysj08yq62qg";
-  SGr-IosevkaTermSS04 = "143wf50dfwn734zmq69d9nm98ynhicv0685d8s86kdn9lwrviz6a";
-  SGr-IosevkaTermSS05 = "1myql01syc1d9i61jrfdkk6j515dj6v01dkn8fcn1rcqkavz0r6j";
-  SGr-IosevkaTermSS06 = "1sha89llc72n4jf76yqh87pa2dx0rqwz1pq2v2gcljlmimmvknki";
-  SGr-IosevkaTermSS07 = "1ksd28c7i047ms01jih3xfkq39l1dvfmrr8zb994363qrxa8ycp8";
-  SGr-IosevkaTermSS08 = "02f35fkr31zm5z7zd081v2slv65f584lymbf5a6hjdpvf5bl42br";
-  SGr-IosevkaTermSS09 = "130xq18wwkbfr8myvga9zrpwf3y57ca5943ff1j88prmsq4m2gpx";
-  SGr-IosevkaTermSS10 = "0wj8k7a0ddgysrdfwqvcr615ch4d55rd22cr96jwmindx0k86az3";
-  SGr-IosevkaTermSS11 = "0bv4jxpq43gp8y6wbml06zbdzwb7zzk3l593c1zq41vs28lk6qb0";
-  SGr-IosevkaTermSS12 = "0nijgws4mlv6sp34l9fqlrk78krrbc2zxzkbbn7a0yalpnzddilz";
-  SGr-IosevkaTermSS13 = "04i434zafahf1wkdj87zd8fdvpi7nc83h00d844afcx8rdamm3fq";
-  SGr-IosevkaTermSS14 = "0qsb5jdq4b0p749fksqvj6givkn8ba5lqpm93rjrf2xxqv1bacy4";
-  SGr-IosevkaTermSS15 = "1j9jcr1823vw8bfvvvlw1v1sar14csmmwwcam4m69p9f3yxp8l2c";
-  SGr-IosevkaTermSS16 = "02v6qb7j0rnzm87mx4mvhkfj2888752a850sflsfv97fk5g4dnxs";
-  SGr-IosevkaTermSS17 = "1d1b5h8z21yqqzppnfwx22q3938a9r5gdkr5183608jrqhwnjlzr";
-  SGr-IosevkaTermSS18 = "1jzihaabkj33bxp2wxi6mndkxwfiv153i3941hmh5p6gmbm386a7";
+  Iosevka = "1lpjvk31is2wm7705ilb826cpsgwfsx5182ic6lavpjigjnwi4qr";
+  IosevkaAile = "0bagp60c44ksl1irh02hdjn4dw963l1z0k77nkmipqrgxl8g00vc";
+  IosevkaCurly = "1sp72p2vxmjqjlxfkiyzg5gibymss8vxrvp7c32fybi5dfyixy28";
+  IosevkaCurlySlab = "0wbrca2qjwd5g1jic10lfzgg3rpd70plx0q73fjlj7gpx4af7j25";
+  IosevkaEtoile = "0jnbn5w04brx87ir708vi9nh0zx41znvk8anbxhi8smn7p8krd52";
+  IosevkaSlab = "1l70z14xrh4aiib3yx32ypnxaj96gimiq72ar1w06mi445s3bka1";
+  IosevkaSS01 = "0wfcjlkl2l6nyxy8gpsrmmvp5dsjz5qbz94ixviian2067lmy9n6";
+  IosevkaSS02 = "0lj1vjvk3977kszc21p2pjmmfj68gj43dj69qn01wzfh6sy8qjwm";
+  IosevkaSS03 = "0qd8nrd1j62khj865w52p9sanliyw19i8i3c49haw5pcwpylsgw5";
+  IosevkaSS04 = "0dpm6jkszr75w6v023wd4yk1zrvfw1p3q7a9n4svr8vxmimn0b7m";
+  IosevkaSS05 = "1naqv4nfl1bkl1gkmccls7104ixah9bkjyw6hn1434dgfgb7fhh3";
+  IosevkaSS06 = "1cknkhcj8pqaz65s62rvpw1c6mr59hkn623lr8jzfz5wy018xy73";
+  IosevkaSS07 = "0skn5i6wd40kzrlh6b483j0861imwa0zfalv6d022lxadznzld9f";
+  IosevkaSS08 = "0lj48zk5il5jd7p3wyhcgqszkcyjzdmskbldjp31avjhjpmv0l78";
+  IosevkaSS09 = "0w7w7jvs3jk6iimkb2g3c6w1a6rmmwnvh7gzh7zs5dirzyx2wcsd";
+  IosevkaSS10 = "0f61cpjlw05r21i8pjx005yjy3wiw1rkrxmp12fd5v5hmj88m7wh";
+  IosevkaSS11 = "138svbwr42hhhxbi330adhbyjqp1zfxvbv1nnc74pj94zijj6vzp";
+  IosevkaSS12 = "1dil93hrghpg38wz3988zfd25hm7bx69zm6qw369x5216hcknz2v";
+  IosevkaSS13 = "1ah6s1akc1m4hl21j64xnvd2jy2pmdafkkkvi1jhdvcq36k6nsm9";
+  IosevkaSS14 = "1v2780dzyaazp0r2z1nclms2f26v4g2s7k1wqxw34fjzlzpkfcfa";
+  IosevkaSS15 = "0m2fkvrnbz4h6ncsim9ixvp15g6rl1lsb62cvhfpq9bnydpzzxby";
+  IosevkaSS16 = "0b3d6zkd5rn5dg6zq9airj96cjmbc30ds8qi3c610jvca865gh1m";
+  IosevkaSS17 = "16x4n7cvhp017dg3a94chg5pg2svimlblmhbxnyic5nzy27hq26f";
+  IosevkaSS18 = "18iab2dafsj1y18rvhvr53dyfawk6gxxsss4h4r9vajvp08y3qra";
+  SGr-Iosevka = "0523fpvvypb0a1zj881n352vkbgybwz8859i8rqayxn1l766w8kx";
+  SGr-IosevkaCurly = "0gfpw0ilk5j4r7kz53w99jsc309j8c4a9cxcahpssb6cnygpm6cp";
+  SGr-IosevkaCurlySlab = "1gig9h22x9nw3zds3z9bqry9kvvgl197lkjf5x9pbbc8ah9m25iz";
+  SGr-IosevkaFixed = "1bqn0v3z2vqi7lgxhwmbm7s62llyammpbs524na59m99g8rxa8dr";
+  SGr-IosevkaFixedCurly = "1pwv91cpf672wdrvmv6adjkbnnrrdqqla2iyd9baxni44qmk9dji";
+  SGr-IosevkaFixedCurlySlab = "0wsgx32d45a1iwz67hl40kwbz6j7g6c83f3nhq156pqa5v0afk2d";
+  SGr-IosevkaFixedSlab = "04ms0gnz55fp6y01f6qskwmxfj8hy3kwxigpmqlghlzygbyfx7mf";
+  SGr-IosevkaFixedSS01 = "0ffrhysjr5qggx5ccglsa44j5l25jz7a7kypcanpglpfzja011q2";
+  SGr-IosevkaFixedSS02 = "1a0khkqs6fw9vzrd23a1nnjzz5vimgx1d5m1bzk761fsbrgv9jn0";
+  SGr-IosevkaFixedSS03 = "0h25vb2d3qs778pv01l6slx3d4q5mz9vmqr5lb6ch1zczilz5i9q";
+  SGr-IosevkaFixedSS04 = "0za23nay4909cyy3vjh2k28975cbabrqqxifw5wlyqwsi8ajr8hs";
+  SGr-IosevkaFixedSS05 = "1kgfryzqddywdv8wyc38fwhx6nbh9fij2g4xfs25xiwfsprl36lm";
+  SGr-IosevkaFixedSS06 = "0z9y16sipzqdgi36315zsa3hr4cy394g0f6j99lz8p027r14mbd1";
+  SGr-IosevkaFixedSS07 = "1rfpri0fl7iihi6850zr96jlvcsarvv1jfsyhkmj8rclpd1zqgwk";
+  SGr-IosevkaFixedSS08 = "046pwn81w7ijda9v7hwwgxja76n15l70c2zaa3wx5cqpkkadm4f3";
+  SGr-IosevkaFixedSS09 = "1dqb4d8dr1mj34625pzvp8sngky98900vv9m1n8fid9lg1kix0jp";
+  SGr-IosevkaFixedSS10 = "0d29vzvw1mhb6i1i8fmwgiycx30lpjgv38jmx8gnb837q5295r62";
+  SGr-IosevkaFixedSS11 = "0khvm0bxm207va69a932v45dsafqlgzyx4fi146msx67h9nz9i57";
+  SGr-IosevkaFixedSS12 = "1l1imghykch93n11y0a6hs1512xlcsxq3c4mk040zzy8dflbl9w4";
+  SGr-IosevkaFixedSS13 = "1xb6janlz1cpns2pacsj2pbchghgzbz6mqgnq14z2x646ag90290";
+  SGr-IosevkaFixedSS14 = "085q55s1rn52swlizcxw6wrdy73ilv6h0ypysh6zjqcrlgpda3x6";
+  SGr-IosevkaFixedSS15 = "1m2adjy4rh7w2hjfb86kdagwasvai5fk83lincbh84avxlwz28sf";
+  SGr-IosevkaFixedSS16 = "1w2f2glipy3h9sdw8l3ng7abl0421v176fi7phxjci90mxdj1i2l";
+  SGr-IosevkaFixedSS17 = "1dvnxfyp89x7qrmjrkgzc14c0xxdfq1qb71bbks69zcnsmcm4zr1";
+  SGr-IosevkaFixedSS18 = "1hms6c5g0p0j2dxyp1jdkc0kar1jwqzmjafafm6vjpnm8gaz5pz1";
+  SGr-IosevkaSlab = "04539yj4yq854af0lm9p68njjigarigpk16h3qv8x8n1l2rkrq0z";
+  SGr-IosevkaSS01 = "1gfcnj0wbm1x6zb1w9acp0q7775wdahdwd397fmpg662l0ss25mq";
+  SGr-IosevkaSS02 = "0pm76nkpgjsnz44ngk93slsy5jv32821l4vrzn5d785bbdzzzf8d";
+  SGr-IosevkaSS03 = "0cvmam87jzk83zfzjb2pcqvzh2zvr4ljjbg55ij1q7xhd64rqpaj";
+  SGr-IosevkaSS04 = "1jq16mz0p8xy4ikyn7bjbvnrhlpvkz6y0ih84xbfkgig66hq43g1";
+  SGr-IosevkaSS05 = "1phvc0ssssh7l5rdn1xby0bp4q3asr333xrf3dfiavx7ldysyipq";
+  SGr-IosevkaSS06 = "0ybb7slxwsg87avhyyyvyrx469lf00bb8aw4371ypp34bbs10zr8";
+  SGr-IosevkaSS07 = "0c2ym41kzxq3jnj131qc4q451blmaks5rd5ai1fb8xkzzwzfjin3";
+  SGr-IosevkaSS08 = "0305v7pzxwp34kvwp6ysiirw0vl0z81hh629nsg3dm8a4da86b7h";
+  SGr-IosevkaSS09 = "14zl7lab38xwp2k1fmqgnmm3bxf6ribk23bk531l6bgwdzxd84ds";
+  SGr-IosevkaSS10 = "19a24pfcwiidpvfncf955q856kz2imqwmcvf93afwmpd7aya5gi2";
+  SGr-IosevkaSS11 = "1b9ayk0ykxdcxlafqh49g5gyck1s9kpyd66nfg6jd1d3ql3ryajh";
+  SGr-IosevkaSS12 = "01rby2jx0gc6n5ch79qjdfq8sp2bm4ji28dcixycv03sjq96agdz";
+  SGr-IosevkaSS13 = "0rmkx6bzwvbcqaa950lng8aizkm9m3zrrwxzrfydgf6xx1s37ac5";
+  SGr-IosevkaSS14 = "0xf41gjq55xk1fkys1j324zrh1ds545s8bdlliq1kzik0i6gbjli";
+  SGr-IosevkaSS15 = "0izk1snd2rsh1gaa6rikr1grn3lwfkg3hnsikfqj16fixpxm752j";
+  SGr-IosevkaSS16 = "1zr5706wq1jbfhngwnd6i9dy4izhv43p8pz0l0ly6f4zgcx3533a";
+  SGr-IosevkaSS17 = "1lwj5mdhmnq9qkjkql2vawihbjf0dp50s8s8i2gq5cciy861i0qx";
+  SGr-IosevkaSS18 = "155kwdny6fcaavd8mg8j1j6s9sfj35ig2cx75h7dkqsblbmcz2z2";
+  SGr-IosevkaTerm = "0snj7i9ipa1ilancqcdwcw12s427nj9z3vgmmf71hbba9f82az1c";
+  SGr-IosevkaTermCurly = "119ay1rxci8bg59687ckd2n61a6g09h4a6lk7319caw3s1w3mj6d";
+  SGr-IosevkaTermCurlySlab = "0j1pis6aj1sblm4png0y1mihz3b1f4l8g768grnrfzl338nfg90v";
+  SGr-IosevkaTermSlab = "05vqfdhrxrbsb81j2yrsfjqzmrhin9qf9jncx220dp7qvkjpjsza";
+  SGr-IosevkaTermSS01 = "1j2sgpgnavll25ah6dr408bbq1i0mp0jvd5cgdfa4lq9nk9aa6c2";
+  SGr-IosevkaTermSS02 = "0rx3kdin2rf8nr1jf7kw1ch6zgilgirflgkq9lyx83qq79dhakma";
+  SGr-IosevkaTermSS03 = "1984r56grgrcm6lmm8mkik6n79pvwhzpfygd204rcqm267mw3hml";
+  SGr-IosevkaTermSS04 = "168dxikfxqc66j3k8amf9bqcdzw053g4rl1cbxw3mxa72ay822j9";
+  SGr-IosevkaTermSS05 = "0fy5mxw3yb82mr7jqm5fr2990xav794x3w419n7zs5bx8gj3l28c";
+  SGr-IosevkaTermSS06 = "1fiw3qmkfhfzhns0b9gkb6bzfn17qkwyx3a8i3y2q2567hr6j1v4";
+  SGr-IosevkaTermSS07 = "14fmhhrv1f39b6shp4y8aqmmvf245l12ga00af75mdan13mqsj1s";
+  SGr-IosevkaTermSS08 = "1mcjlhvg1sci7y3whj4zc3lf8k880pvl8w2lf2fkyyz01x4x3ixw";
+  SGr-IosevkaTermSS09 = "17wlci26hzjxawgars1dfdj0nn4a64r24fh1m8xvay8c6n0id50d";
+  SGr-IosevkaTermSS10 = "113mjv8hxzjcimzwg1fy1z3ii44ncaxd1kcq1n2f5czdcsawx1lj";
+  SGr-IosevkaTermSS11 = "0hp6b8c4ggzl6j4bjbw6dwphh4klwg6qrfmksqng0p8hvsf5lkp6";
+  SGr-IosevkaTermSS12 = "1v7l7x8c7dmaim5rjdlvn66parfpzslc8y5c77r0c1rxafxgkycd";
+  SGr-IosevkaTermSS13 = "1z855ikw3d8gnsz8xsdnfzl4pzxyp6p6yx6mjkw8rigjgk95kq8s";
+  SGr-IosevkaTermSS14 = "1m7csblfpc0i6ly6jlizma5h6j73y9c2dhgqgqqw0r3cgrg249wi";
+  SGr-IosevkaTermSS15 = "10l5b9p0b5m1884wmq0jk5i31hbizy6rn19i3qj6ifnf0mni3zxs";
+  SGr-IosevkaTermSS16 = "07rb6vpa9rq7czdc68jw68n9k742hbd1hcwa9zgd0njnwf78fjjr";
+  SGr-IosevkaTermSS17 = "0sm63f8r27lfvk7is9ldaa9shcfwbkydd16zd78g0n13nniiw0h7";
+  SGr-IosevkaTermSS18 = "1rx38sqclkxiql402fc33d9v4y65y3cz9wyx1p97c5wa3j686ngh";
 }

From 573e4da1c43c7d8f687da05012af0c84d76b997c Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Fri, 3 Jan 2025 11:42:42 +0100
Subject: [PATCH 1334/1504] stellarium: mark as broken on darwin

---
 pkgs/applications/science/astronomy/stellarium/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 54728665daea..1c41f924b898 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -123,5 +123,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ kilianar ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From 2f194ced0f4d6374cf0d4c6106dcd043bb97ff54 Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Thu, 2 Jan 2025 22:38:54 +0200
Subject: [PATCH 1335/1504] libsigrokdecode: 0.5.3-unstable-2023-10-23 ->
 0.5.3-unstable-2024-10-01

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

diff --git a/pkgs/by-name/li/libsigrokdecode/package.nix b/pkgs/by-name/li/libsigrokdecode/package.nix
index 36eed358095b..a6f0c2645677 100644
--- a/pkgs/by-name/li/libsigrokdecode/package.nix
+++ b/pkgs/by-name/li/libsigrokdecode/package.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libsigrokdecode";
-  version = "0.5.3-unstable-2023-10-23";
+  version = "0.5.3-unstable-2024-10-01";
 
   src = fetchgit {
     url = "git://sigrok.org/libsigrokdecode";
-    rev = "0c35c5c5845d05e5f624c99d58af992d2f004446";
-    hash = "sha256-1kQB7uk2c+6Uriw+1o6brThDcBLoCdPV0MVWAha7ohk=";
+    rev = "71f451443029322d57376214c330b518efd84f88";
+    hash = "sha256-aW0llB/rziJxLW3OZU1VhxeM3MDWsaMVVgvDKZzdiIY=";
   };
 
   nativeBuildInputs = [

From dbbc4b1b28a9d2d2043fbf23aefbb86a6b06a25a Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Fri, 3 Jan 2025 00:00:41 +0200
Subject: [PATCH 1336/1504] libsigrok: 0.5.2-unstable-2024-01-03 ->
 0.5.2-unstable-2024-10-20

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

diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index caf8199c93e1..84366aab70be 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libsigrok";
-  version = "0.5.2-unstable-2024-01-03";
+  version = "0.5.2-unstable-2024-10-20";
 
   src = fetchgit {
     url = "git://sigrok.org/libsigrok";
-    rev = "b503d24cdf56abf8c0d66d438ccac28969f01670";
-    hash = "sha256-9EW0UCzU6MqBX6rkT5CrBsDkAi6/CLyS9MZHsDV+1IQ=";
+    rev = "f06f788118191d19fdbbb37046d3bd5cec91adb1";
+    hash = "sha256-8aco5tymkCJ6ya1hyp2ODrz+dlXvZmcYoo4o9YC6D6o=";
   };
 
   enableParallelBuilding = true;

From 3c321b3f03f306e01316d7e2ba03a583cd61ecf8 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 30 Dec 2024 19:20:41 +0800
Subject: [PATCH 1337/1504] openlinkhub: init at 0.4.3

---
 pkgs/by-name/op/openlinkhub/package.nix | 40 +++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/op/openlinkhub/package.nix

diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
new file mode 100644
index 000000000000..e900eacf869a
--- /dev/null
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -0,0 +1,40 @@
+{
+  buildGoModule,
+  lib,
+  fetchFromGitHub,
+  udev,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "openlinkhub";
+  version = "0.4.4";
+
+  src = fetchFromGitHub {
+    owner = "jurkovic-nikola";
+    repo = "OpenLinkHub";
+    tag = version;
+    hash = "sha256-MpG2RJdzDGaoXfN8YdxqXttpsjAEslN5xGdkWyDWX/c=";
+  };
+
+  proxyVendor = true;
+
+  vendorHash = "sha256-nDE3GUZl5OBSlhRpJBixUbWhhFMeieidNrSIzOOB/9g=";
+
+  buildInputs = [
+    udev
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/jurkovic-nikola/OpenLinkHub";
+    platforms = lib.platforms.linux;
+    description = "Open source interface for iCUE LINK Hub and other Corsair AIOs, Hubs for Linux";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    license = lib.licenses.gpl3Only;
+    mainProgram = "OpenLinkHub";
+    changelog = "https://github.com/jurkovic-nikola/OpenLinkHub/releases/tag/${version}";
+  };
+}

From ef133efd7148ff97d21e1c5e61e7af204d83da47 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 3 Jan 2025 14:03:45 +0300
Subject: [PATCH 1338/1504] nixos/galene: fix type error

---
 nixos/modules/services/web-apps/galene.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix
index aec180702abc..013b8b3da8a0 100644
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@@ -152,7 +152,7 @@ in
           WorkingDirectory = cfg.stateDir;
           ExecStart = ''${cfg.package}/bin/galene \
           ${optionalString (cfg.insecure) "-insecure"} \
-          -http ${cfg.httpAddress}:${cfg.httpPort} \
+          -http ${cfg.httpAddress}:${toString cfg.httpPort} \
           -turn ${cfg.turnAddress} \
           -data ${cfg.dataDir} \
           -groups ${cfg.groupsDir} \

From 6865042ec34b46de27a1e5649f622cde49c67af7 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Fri, 3 Jan 2025 12:22:38 +0100
Subject: [PATCH 1339/1504] openroad: Use recommended swig
 SWIG_Python_AppendOutput() workaround

Update patch to use recommended swit update workaround
according to https://www.swig.org/Release/CHANGES.current (2024-06-15)
---
 .../science/electronics/openroad/swig43-compat.patch      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
index 97456f84d4d5..9bc49991e8e6 100644
--- a/pkgs/applications/science/electronics/openroad/swig43-compat.patch
+++ b/pkgs/applications/science/electronics/openroad/swig43-compat.patch
@@ -1,5 +1,3 @@
-diff --git a/src/odb/src/swig/python/dbtypes.i b/src/odb/src/swig/python/dbtypes.i
-index 37305d55e..d85f2915e 100644
 --- a/src/odb/src/swig/python/dbtypes.i
 +++ b/src/odb/src/swig/python/dbtypes.i
 @@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
@@ -7,7 +5,7 @@ index 37305d55e..d85f2915e 100644
    for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {
      PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);
 -    $result = SWIG_Python_AppendOutput($result, o);
-+    $result = SWIG_Python_AppendOutput($result, o, 0);
++    $result = SWIG_AppendOutput($result, o);
    }
  }
  
@@ -16,7 +14,7 @@ index 37305d55e..d85f2915e 100644
      PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);
      PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);
 -    $result = SWIG_Python_AppendOutput($result, tuple);
-+    $result = SWIG_Python_AppendOutput($result, tuple, 0);
++    $result = SWIG_AppendOutput($result, tuple);
    }
  }
  
@@ -24,7 +22,7 @@ index 37305d55e..d85f2915e 100644
    for(auto it = $1->begin(); it != $1->end(); it++) {
      PyObject *obj = PyInt_FromLong((long)*it);
 -    $result = SWIG_Python_AppendOutput($result, obj);
-+    $result = SWIG_Python_AppendOutput($result, obj, 0);
++    $result = SWIG_AppendOutput($result, obj);
    }
  }
  

From 2cb7521505cbf53fb2e8bca853c0e5371748423a Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 30 Dec 2024 18:48:33 +0800
Subject: [PATCH 1340/1504] bsdgames: fix build

---
 pkgs/by-name/bs/bsdgames/package.nix | 41 +++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bs/bsdgames/package.nix b/pkgs/by-name/bs/bsdgames/package.nix
index a134b4c8c291..9fca2faa5ffd 100644
--- a/pkgs/by-name/bs/bsdgames/package.nix
+++ b/pkgs/by-name/bs/bsdgames/package.nix
@@ -8,14 +8,15 @@
   bison,
   less,
   miscfiles,
+  fetchpatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bsd-games";
   version = "2.17";
 
   src = fetchurl {
-    url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz";
+    url = "mirror://ibiblioPubLinux/games/bsd-games-${finalAttrs.version}.tar.gz";
     hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A=";
   };
 
@@ -27,10 +28,31 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Remove UTMPX support on Makefrag file
-    (fetchurl {
+    # Follow All patches from http://t2sde.org/packages/bsd-games.html
+    # May be removed in the next version
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/delay_output-sym.patch";
+      hash = "sha256-qbtp2cJVmEuxbTgpXM2gRHSNLE25OCmNxK+aeBBPRBw=";
+    })
+    (fetchpatch {
       url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch";
-      sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2";
+      hash = "sha256-oioJ5M7DAUVzX8k998p2h/APn8azw9Z8txmBuly2ouw=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix-gcc43.patch";
+      hash = "sha256-9pkJmEOmM5vd/5nm3AlsbJNX0oX1kCtFrmciGpStvlA=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix-glibc.patch";
+      hash = "sha256-yNL88XORTXl2qSYTlYCYDN2G++TzBxywBpYdK+ufwrA=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/hotfix.patch";
+      hash = "sha256-UFXvtfVzJLRWvzbv0gaoVdt0vZOUj4UWWqoCZL/BDqE=";
+    })
+    (fetchpatch {
+      url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/postfix-bsd.patch";
+      hash = "sha256-Noqq+FpSJb3heejGGHyLYYkHB3fC4qCv/p1XMfEGdx8=";
     })
   ];
 
@@ -59,7 +81,7 @@ stdenv.mkDerivation rec {
     bsd_games_cfg_pager=${less}
     EOF
 
-    sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .)
+    sed -e '/sigpause/d' -i hunt/hunt/otto.c
   '';
 
   postConfigure = ''
@@ -67,6 +89,7 @@ stdenv.mkDerivation rec {
        -e "s,-o root -g root, ," \
        -e "s,-o root -g games, ," \
        -e "s,.*chown.*,true," \
+       -e 's/install -c -m 2755/install -Dm755/' \
        -e 's/INSTALL_VARDATA.*/INSTALL_VARDATA := true/' \
        -e 's/INSTALL_HACKDIR.*/INSTALL_HACKDIR := true/' \
        -e 's/INSTALL_DM.*/INSTALL_DM := true/' \
@@ -74,6 +97,10 @@ stdenv.mkDerivation rec {
        Makeconfig install-man
   '';
 
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
   meta = {
     homepage = "http://www.t2-project.org/packages/bsd-games.html";
     description = "Ports of all the games from NetBSD-current that are free";
@@ -81,4 +108,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ viric ];
     platforms = with lib.platforms; linux;
   };
-}
+})

From fc8e9288f199f08d0dc03cf2d351614a0dab9ca5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 11:50:09 +0000
Subject: [PATCH 1341/1504] mame: 0.272 -> 0.273

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

diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index d4fe0df36791..86948a575ca9 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -39,14 +39,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mame";
-  version = "0.272";
+  version = "0.273";
   srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
   src = fetchFromGitHub {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${srcVersion}";
-    hash = "sha256-qD9xWP4KtPJWqje9QVb5wozgLTc+hE84kkEFM6Re+Sk=";
+    hash = "sha256-aOBYnkdcFKDkw/KFiv0IRgpOChn8NRKD2xmbfExYGKY=";
   };
 
   outputs = [

From 7b4626721c1f2e8ea52180bdd6ff4bbd895db7d9 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 3 Jan 2025 11:24:34 +0100
Subject: [PATCH 1342/1504] foo2zjs: fix cross build

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

diff --git a/pkgs/by-name/fo/foo2zjs/package.nix b/pkgs/by-name/fo/foo2zjs/package.nix
index f1c186529c0d..be8ed41f5217 100644
--- a/pkgs/by-name/fo/foo2zjs/package.nix
+++ b/pkgs/by-name/fo/foo2zjs/package.nix
@@ -19,14 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x";
   };
 
-  buildInputs = [
-    foomatic-filters
+  nativeBuildInputs = [
     bc
+    foomatic-filters
     ghostscript
-    systemd
     vim
   ];
 
+  buildInputs = [
+    systemd
+  ];
+
   patches = [
     ./no-hardcode-fw.diff
     # Support HBPL1 printers. Updated patch based on

From b4a6216f6eb5968e52c1de2f2cd2af25711780c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 12:33:35 +0000
Subject: [PATCH 1343/1504] cargo-llvm-lines: 0.4.41 -> 0.4.42

---
 pkgs/by-name/ca/cargo-llvm-lines/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index 612775f92d1d..abecfad449aa 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-llvm-lines";
-  version = "0.4.41";
+  version = "0.4.42";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    hash = "sha256-ewxdjvo9WFVX4484uuEkerzcJ4fOy2Sm90tiPGNbrV0=";
+    hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0=";
   };
 
-  cargoHash = "sha256-9jG5VgIlHYv1IFSjPy34dNk8RHjhgXi6daI+R0jgxMc=";
+  cargoHash = "sha256-IDFCzTAlC/ZYGwUSmmxyRmZy5belxvyfeWpTCPzJQ6o=";
 
   meta = with lib; {
     description = "Count the number of lines of LLVM IR across all instantiations of a generic function";

From ff49134fb8daad0ad6a1ea1e786a88d28b574c8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 12:36:30 +0000
Subject: [PATCH 1344/1504] cargo-tally: 1.0.56 -> 1.0.57

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

diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index c26c414ea0bc..57a9cc9ff5ad 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tally";
-  version = "1.0.56";
+  version = "1.0.57";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-IB1OoS9pdFHFewLfeu1cVCffLGtPvCJlVkIBZxtBkm4=";
+    hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150=";
   };
 
-  cargoHash = "sha256-uPlilomHib10/v2HKBjU/ln0B4QkKpFJPpKf37RO7Oo=";
+  cargoHash = "sha256-o4S13uvKYLUUmx6tHQpCm7U9AOtmg8P60NxdNsXy9Fc=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk_11_0.frameworks;

From c9f2db61cee65889e4f8c4c23820efbbeaeaf14a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:07:33 +0100
Subject: [PATCH 1345/1504] cargo-c: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-c/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index e100e2a09998..0f3f244fcb9e 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -64,6 +64,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/lu-zero/cargo-c";
     changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ cpu ];
+    maintainers = with maintainers; [
+      cpu
+      matthiasbeyer
+    ];
   };
 }

From 62f275380c15d15cc290b390bab0b94365c824db Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:07:33 +0100
Subject: [PATCH 1346/1504] cargo-edit: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-edit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix
index f97543a88bc5..7b52294da6e7 100644
--- a/pkgs/development/tools/rust/cargo-edit/default.nix
+++ b/pkgs/development/tools/rust/cargo-edit/default.nix
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
       gerschtli
       jb55
       killercup
+      matthiasbeyer
     ];
   };
 }

From cb088012609a21077c465ed168aed95ef58c6a75 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:07:33 +0100
Subject: [PATCH 1347/1504] cargo-lambda: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-lambda/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index a3f1d083d9bc..564cc3cf3ae6 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -66,6 +66,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [
       taylor1791
       calavera
+      matthiasbeyer
     ];
   };
 }

From 108a4ac0062e43cb0537fc2b68da16fa4c11d668 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:07:34 +0100
Subject: [PATCH 1348/1504] cargo-pgrx: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 48b36e9cb91f..5da7f839e9b2 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -48,7 +48,10 @@ let
         homepage = "https://github.com/pgcentralfoundation/pgrx";
         changelog = "https://github.com/pgcentralfoundation/pgrx/releases/tag/v${version}";
         license = licenses.mit;
-        maintainers = with maintainers; [ happysalada ];
+        maintainers = with maintainers; [
+          happysalada
+          matthiasbeyer
+        ];
         mainProgram = "cargo-pgrx";
       };
     };

From 379ce3cd0a6f2b98d81395db7e3ec774d8d04218 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:07:34 +0100
Subject: [PATCH 1349/1504] cargo-vet: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-vet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix
index 7f88be5ddfbf..af5364e9a206 100644
--- a/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/pkgs/development/tools/rust/cargo-vet/default.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [
       figsoda
       jk
+      matthiasbeyer
     ];
   };
 }

From 0e5a5e5aa7733f3deb47d2cc41a0aaae476c6b3e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:08:29 +0100
Subject: [PATCH 1350/1504] nom: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/no/nom/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 97c43e597fda..487d14f5aed7 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -21,7 +21,10 @@ buildGoModule rec {
     description = "RSS reader for the terminal";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ nadir-ishiguro ];
+    maintainers = with maintainers; [
+      nadir-ishiguro
+      matthiasbeyer
+    ];
     mainProgram = "nom";
   };
 }

From d47abc02ccca4632fb2505c3586364df8ada1fb4 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:08:57 +0100
Subject: [PATCH 1351/1504] qownnotes: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/qo/qownnotes/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 78608b0b53e0..ac84c552e7ca 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -88,6 +88,7 @@ qt6Packages.stdenv.mkDerivation {
     maintainers = with maintainers; [
       pbek
       totoroot
+      matthiasbeyer
     ];
     platforms = platforms.unix;
   };

From 39d7152ace460ecd99f7084f107c65e2654e4eda Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:09:34 +0100
Subject: [PATCH 1352/1504] rip2: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ri/rip2/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index 3fe207615420..ab354bbc64c5 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec {
     description = "Safe and ergonomic alternative to rm";
     homepage = "https://github.com/MilesCranmer/rip2";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ milescranmer ];
+    maintainers = with lib.maintainers; [
+      milescranmer
+      matthiasbeyer
+    ];
     mainProgram = "rip";
   };
 }

From 1e043445082efab8f3ae6ca7d9317246b327ff48 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:10:21 +0100
Subject: [PATCH 1353/1504] git-absorb: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/version-management/git-absorb/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index a8cbf03ac3f2..b4c077fb2038 100644
--- a/pkgs/applications/version-management/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
@@ -36,7 +36,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/tummychow/git-absorb";
     description = "git commit --fixup, but automatic";
     license = [ licenses.bsd3 ];
-    maintainers = with maintainers; [ tomfitzhenry ];
+    maintainers = with maintainers; [
+      tomfitzhenry
+      matthiasbeyer
+    ];
     mainProgram = "git-absorb";
   };
 }

From 947554cb46e1bbe1e2b80f8c5eabcc9fc602b862 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:20:39 +0100
Subject: [PATCH 1354/1504] git-annex-metadata-gui: Add matthiasbeyer as
 maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../version-management/git-annex-metadata-gui/default.nix    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
index 3622bf842a3c..08f8e17eae1f 100644
--- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
@@ -37,7 +37,10 @@ buildPythonApplication rec {
     homepage = "https://github.com/alpernebbi/git-annex-metadata-gui";
     description = "Graphical interface for git-annex metadata commands";
     mainProgram = "git-annex-metadata-gui";
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [
+      dotlambda
+      matthiasbeyer
+    ];
     license = licenses.gpl3Plus;
     platforms = with platforms; linux;
   };

From 66cf8859b7fd89c6061150b32428b54ac022afd8 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:20:39 +0100
Subject: [PATCH 1355/1504] git-annex-remote-dbx: Add matthiasbeyer as
 maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../version-management/git-annex-remote-dbx/default.nix          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
index bee106e434e0..c969087e39be 100644
--- a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
+++ b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
@@ -27,5 +27,6 @@ buildPythonApplication rec {
     homepage = "https://pypi.org/project/git-annex-remote-dbx/";
     license = licenses.mit;
     mainProgram = "git-annex-remote-dbx";
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }

From 82f63e2294169ab6ff36af46e59f276e400da0ea Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:20:40 +0100
Subject: [PATCH 1356/1504] git-cliff: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/version-management/git-cliff/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix
index f818cd5399de..889a67312200 100644
--- a/pkgs/applications/version-management/git-cliff/default.nix
+++ b/pkgs/applications/version-management/git-cliff/default.nix
@@ -43,7 +43,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orhun/git-cliff";
     changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ siraben ];
+    maintainers = with maintainers; [
+      siraben
+      matthiasbeyer
+    ];
     mainProgram = "git-cliff";
   };
 }

From 933d3d83ac1a11dd40b2d275c7928f3b7dda6bb4 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:20:40 +0100
Subject: [PATCH 1357/1504] git-fame: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/version-management/git-fame/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix
index 08009920b61a..92ce90465b83 100644
--- a/pkgs/applications/version-management/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-fame/default.nix
@@ -20,7 +20,10 @@ bundlerEnv {
     '';
     homepage = "http://oleander.io/git-fame-rb";
     license = licenses.mit;
-    maintainers = with maintainers; [ nicknovitski ];
+    maintainers = with maintainers; [
+      nicknovitski
+      matthiasbeyer
+    ];
     platforms = platforms.unix;
     mainProgram = "git-fame";
   };

From 16686e5ac4928afe18d2ad827103e0fc31471c42 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:20:40 +0100
Subject: [PATCH 1358/1504] git-gone: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/version-management/git-gone/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix
index fe29587a05df..6211b3f080f2 100644
--- a/pkgs/applications/version-management/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-gone/default.nix
@@ -33,7 +33,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/swsnr/git-gone";
     changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ cafkafk ];
+    maintainers = with maintainers; [
+      cafkafk
+      matthiasbeyer
+    ];
     mainProgram = "git-gone";
   };
 }

From 97d3e396030b522a3f84ad32d00d8ef19533fea0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:20:40 +0100
Subject: [PATCH 1359/1504] git-quickfix: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../applications/version-management/git-quickfix/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix
index c1b65a3d7318..f30c06c7bf6c 100644
--- a/pkgs/applications/version-management/git-quickfix/default.nix
+++ b/pkgs/applications/version-management/git-quickfix/default.nix
@@ -39,7 +39,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/siedentop/git-quickfix";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ cafkafk ];
+    maintainers = with maintainers; [
+      cafkafk
+      matthiasbeyer
+    ];
     mainProgram = "git-quickfix";
   };
 }

From bdeb0475faf6b136b5b07ddf6c75a9e37b3838ab Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:24:13 +0100
Subject: [PATCH 1360/1504] blesh: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/bl/blesh/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix
index 2ae1f5914b66..79fb35dd0701 100644
--- a/pkgs/by-name/bl/blesh/package.nix
+++ b/pkgs/by-name/bl/blesh/package.nix
@@ -60,7 +60,10 @@ stdenvNoCC.mkDerivation rec {
     description = "Bash Line Editor -- a full-featured line editor written in pure Bash";
     mainProgram = "blesh-share";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ aiotter ];
+    maintainers = with maintainers; [
+      aiotter
+      matthiasbeyer
+    ];
     platforms = platforms.unix;
   };
 }

From ec7571253026a5f2a62d98e8545aa4d54cda2769 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:24:14 +0100
Subject: [PATCH 1361/1504] fd: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/fd/fd/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 9984e3274392..dd055f18f70d 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -69,6 +69,7 @@ rustPlatform.buildRustPackage rec {
       globin
       ma27
       zowoq
+      matthiasbeyer
     ];
     mainProgram = "fd";
   };

From af87fffd79480c7f2474f855bcb7670d5c21de60 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:24:14 +0100
Subject: [PATCH 1362/1504] zellij: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ze/zellij/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index d1fe6127597d..5a749f3b7eab 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -89,6 +89,7 @@ rustPlatform.buildRustPackage rec {
       _0x4A6F
       abbe
       pyrox0
+      matthiasbeyer
     ];
     mainProgram = "zellij";
   };

From f8a929ca36c6e3ea3130f80a20e08df57b06ed8c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 09:24:58 +0100
Subject: [PATCH 1363/1504] gitlint: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/version-management/gitlint/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix
index 7bfe3658af53..2cfc9613e864 100644
--- a/pkgs/applications/version-management/gitlint/default.nix
+++ b/pkgs/applications/version-management/gitlint/default.nix
@@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [
       ethancedwards8
       fab
+      matthiasbeyer
     ];
     mainProgram = "gitlint";
   };

From d99385401e1cce1c90b4fe0211dff85657982f41 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 3 Jan 2025 12:17:14 +0100
Subject: [PATCH 1364/1504] bacon: Add matthiasbeyer as maintainer

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ba/bacon/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 39cdac8e7beb..0f3e322bef8d 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -34,6 +34,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/bacon";
     changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ FlorianFranzen ];
+    maintainers = with lib.maintainers; [
+      FlorianFranzen
+      matthiasbeyer
+    ];
   };
 }

From 1439e821f38bdbcff5f902a00e55eedaf5ee1447 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 3 Jan 2025 13:34:23 +0100
Subject: [PATCH 1365/1504] refactor: Sort arguments

---
 pkgs/development/web/netlify-cli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix
index 97ac938ef17f..6a7897307246 100644
--- a/pkgs/development/web/netlify-cli/default.nix
+++ b/pkgs/development/web/netlify-cli/default.nix
@@ -1,11 +1,11 @@
 {
-  callPackage,
-  vips,
-  pkg-config,
-  lib,
   buildNpmPackage,
+  callPackage,
   fetchFromGitHub,
+  lib,
   nix-update-script,
+  pkg-config,
+  vips,
 }:
 
 buildNpmPackage rec {

From 097be59b2a8fd1b358b4b129ee0cf4d0b7b38e2a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 3 Jan 2025 13:40:06 +0100
Subject: [PATCH 1366/1504] netlify-cli: Pin to nodejs_20

Fixes a node gyp compilation failure
---
 pkgs/development/web/netlify-cli/default.nix | 3 +++
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix
index 6a7897307246..653c4c0f0649 100644
--- a/pkgs/development/web/netlify-cli/default.nix
+++ b/pkgs/development/web/netlify-cli/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   lib,
   nix-update-script,
+  nodejs,
   pkg-config,
   vips,
 }:
@@ -21,6 +22,8 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-pJaNdR9jyFSdfE+yLnQn9/Gbq2CbH6y3aEVbpg3Ft/o=";
 
+  inherit nodejs;
+
   buildInputs = [ vips ];
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dbd8ab633b6..a0936fa097f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4405,7 +4405,9 @@ with pkgs;
     };
   });
 
-  netlify-cli = callPackage ../development/web/netlify-cli { };
+  netlify-cli = callPackage ../development/web/netlify-cli {
+    nodejs = nodejs_20;
+  };
 
   netpbm = callPackage ../tools/graphics/netpbm { };
 

From 1d12e6144db0a34c452c6ebc68a13adfc6f09fbd Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 15:43:40 -0300
Subject: [PATCH 1367/1504] cargo-msrv: move to pkgs/by-name

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../default.nix => by-name/ca/cargo-msrv/package.nix} | 11 +----------
 pkgs/top-level/all-packages.nix                       |  3 ---
 2 files changed, 1 insertion(+), 13 deletions(-)
 rename pkgs/{development/tools/rust/cargo-msrv/default.nix => by-name/ca/cargo-msrv/package.nix} (88%)

diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
similarity index 88%
rename from pkgs/development/tools/rust/cargo-msrv/default.nix
rename to pkgs/by-name/ca/cargo-msrv/package.nix
index 4a1ff0908d59..4ce70db69e9c 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -6,8 +6,6 @@
   rustup,
   openssl,
   stdenv,
-  libiconv,
-  Security,
   makeWrapper,
   gitUpdater,
 }:
@@ -35,14 +33,7 @@ rustPlatform.buildRustPackage rec {
   # Integration tests fail
   doCheck = false;
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then
-      [
-        libiconv
-        Security
-      ]
-    else
-      [ openssl ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 679e0a50c3a8..c8f55bed9b85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6820,9 +6820,6 @@ with pkgs;
     zig = buildPackages.zig_0_12;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
-  cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
   cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
     inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
   };

From 7fb7b560d665dd4b8d19829163fc36a3fb8dc0cb Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 18:24:07 +0000
Subject: [PATCH 1368/1504] cargo-msrv: 0.16.2 -> 0.17.1

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/by-name/ca/cargo-msrv/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix
index 4ce70db69e9c..4cd3c6b098fd 100644
--- a/pkgs/by-name/ca/cargo-msrv/package.nix
+++ b/pkgs/by-name/ca/cargo-msrv/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-msrv";
-  version = "0.16.2";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "foresterre";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc=";
+    tag = "v${version}";
+    sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU=";
   };
 
-  cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY=";
+  cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q=";
 
   passthru = {
     updateScript = gitUpdater {

From 8b9f68815be79bda3725ad2f14923d3bbffd282f Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Fri, 3 Jan 2025 11:03:36 +0800
Subject: [PATCH 1369/1504] haskellPackages.iCalendar: unbreak it

---
 .../haskell-modules/configuration-hackage2nix/broken.yaml       | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index a34c5110db85..d6efd52d2e1e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3055,7 +3055,6 @@ broken-packages:
   - iap-verifier # failure in job https://hydra.nixos.org/build/233202491 at 2023-09-02
   - iban # failure in job https://hydra.nixos.org/build/233236424 at 2023-09-02
   - ib-api # failure in job https://hydra.nixos.org/build/233223054 at 2023-09-02
-  - iCalendar # failure in job https://hydra.nixos.org/build/252886686 at 2024-03-16
   - ical # failure in job https://hydra.nixos.org/build/233200229 at 2023-09-02
   - icepeak # failure in job https://hydra.nixos.org/build/233242326 at 2023-09-02
   - icfpc2020-galaxy # failure in job https://hydra.nixos.org/build/233208746 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b3437248fc93..5ad83946195e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -172001,8 +172001,6 @@ self: {
        ];
        description = "iCalendar data types, parser, and printer";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "iException" = callPackage

From f9f5325ad936789caf621ab2faba8863fc4fb278 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 23 Dec 2024 17:11:50 +0100
Subject: [PATCH 1370/1504] workflows/periodic-merge: merge merge-base into
 haskell-updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since haskell-updates is based on master, but merges into staging, we
need to base it on a merge-base of staging and master. See #361143.

I'm a bit worried that the information GitHub uses for displaying
Pull-Requests becomes stale and this will “add” commits to the PR
compared to the base anyways. We'll find out, I suppose.
---
 .github/workflows/periodic-merge-24h.yml      |  2 -
 .../periodic-merge-haskell-updates.yml        | 59 +++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/periodic-merge-haskell-updates.yml

diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 08570d60e1d4..cee07aa7d669 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -33,8 +33,6 @@ jobs:
       max-parallel: 1
       matrix:
         pairs:
-          - from: master
-            into: haskell-updates
           - from: release-24.11
             into: staging-next-24.11
           - from: staging-next-24.11
diff --git a/.github/workflows/periodic-merge-haskell-updates.yml b/.github/workflows/periodic-merge-haskell-updates.yml
new file mode 100644
index 000000000000..46011d66061c
--- /dev/null
+++ b/.github/workflows/periodic-merge-haskell-updates.yml
@@ -0,0 +1,59 @@
+# This action periodically merges a merge base of master and staging into haskell-updates.
+#
+# haskell-updates is based on master (so there are little unrelated failures and the cache
+# is already prepopulated), but needs to target staging due to the high amount of rebuilds
+# it typically causes. To prevent unrelated commits clattering the GitHub UI, we need to
+# take care to only merge the merge-base of master and staging into haskell-updates.
+#
+# See also https://github.com/NixOS/nixpkgs/issues/361143.
+
+name: "Periodic Merges (haskell-updates)"
+
+
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # Merge every 24 hours
+    - cron:  '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  periodic-merge:
+    permissions:
+      contents: write  # for devmasx/merge-branch to merge branches
+      pull-requests: write  # for peter-evans/create-or-update-comment to create or update comment
+    if: github.repository_owner == 'NixOS'
+    runs-on: ubuntu-latest
+    name: git merge-base master staging → haskell-updates
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      # Note: If we want to do something similar for more branches, we can move this into a
+      # separate job, so we can use the matrix strategy again.
+      - name: Find merge base of master and staging
+        id: find_merge_base_step
+        run: |
+          merge_base="$(git merge-base refs/remotes/origin/master refs/remotes/origin/staging)"
+          echo "Found merge base: $merge_base" >&2
+          echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT"
+
+      - name: git merge-base master staging → haskell-updates
+        uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
+        with:
+          type: now
+          head_to_merge: ${{ steps.find_merge_base_step.outputs.merge_base }}
+          target_branch: haskell-updates
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Comment on failure
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        if: ${{ failure() }}
+        with:
+          issue-number: 367709
+          body: |
+            Periodic merge from `${{ steps.find_merge_base_step.outputs.merge_base }}` into `haskell-updates` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).

From eac96201700540904779898ae96b0583b8892bef Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 14 Dec 2024 13:35:25 +0100
Subject: [PATCH 1371/1504] dtbloader: init at 1.2.2

---
 pkgs/by-name/dt/dtbloader/package.nix | 62 +++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/dt/dtbloader/package.nix

diff --git a/pkgs/by-name/dt/dtbloader/package.nix b/pkgs/by-name/dt/dtbloader/package.nix
new file mode 100644
index 000000000000..e2d559a40637
--- /dev/null
+++ b/pkgs/by-name/dt/dtbloader/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  llvmPackages,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dtbloader";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "TravMurav";
+    repo = "dtbloader";
+    tag = finalAttrs.version;
+    hash = "sha256-5Efxi0cojhq9mqB5VMShXx/Sp4CE6Cvr1pcwnUm5zlo=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = with llvmPackages; [
+    clang
+    lld
+    llvm
+  ];
+
+  # Disable hardening which adds incompatible flags like -fPIC
+  hardeningDisable = [ "all" ];
+
+  buildPhase = ''
+    make -j$NIX_BUILD_CORES
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/dtbloader/efi
+    cp build-aarch64/dtbloader.efi $out/share/dtbloader/efi/
+
+    mkdir -p $out/share/doc/dtbloader
+    cp README.md $out/share/doc/dtbloader/
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "EFI driver that finds and installs DeviceTree into the UEFI configuration table";
+    homepage = "https://github.com/TravMurav/dtbloader";
+    changelog = "https://github.com/TravMurav/dtbloader/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.bsd3;
+    platforms = [
+      # EFI file only works on aarch64 platforms
+      "aarch64-linux"
+    ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    mainProgram = "dtbloader.efi";
+  };
+})

From 9fb3d2e4e4ad87c9329e0d28d22d4bf6a41f8e95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 13:34:37 +0000
Subject: [PATCH 1372/1504] mediamtx: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index ebd2c9f4b3d7..a407c075741a 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,16 +15,16 @@ in
 buildGoModule rec {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-nz+8soxZ6lyc0saB4U3tDsTtqA0kV886M95cA3Gn3R0=";
+    hash = "sha256-WpMFP88MLpftfPn6DP2QM7oSRNwDAIC35/imrznLVA8=";
   };
 
-  vendorHash = "sha256-Csa8G+ji/OoTItu3XbGOySqmNMVdr7QqE8SNCba8cbI=";
+  vendorHash = "sha256-yOeenOYV2MztEfhwxIkmbxn40XhYNZMMTm+kcR7TAtc=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js

From 9863b117532a91a26044d3d0eeec58473aa9f01a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 7 Nov 2024 06:21:47 +0000
Subject: [PATCH 1373/1504] wesnoth: 1.18.2 -> 1.18.3

Changes: https://github.com/wesnoth/wesnoth/blob/1.18.3/changelog.md
(cherry picked from commit 68e7b65bf3e0b348ab711e833d8712c6b4ad29f1)
---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 5017216aecc4..92ac3e6b4c08 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.18.2";
+  version = "1.18.3";
 
   src = fetchFromGitHub {
     rev = version;
     owner = "wesnoth";
     repo = "wesnoth";
-    hash = "sha256-nr+WUFzHeaPxCzwc+8JZRL86X8XEsnsGM1HXnNqOIF0=";
+    hash = "sha256-Uk8omtXYZaneyBr4TASRtIKEyJLGwfKWu9vRQNVpdVA=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 9c163546ee0f9fdbc52b88d34aed74d88de5be83 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 3 Jan 2025 14:00:13 +0000
Subject: [PATCH 1374/1504] Revert "wesnoth: pin to boost183 to restore the
 build"

No longer required with 1.18.3.

This reverts commit e780bc8e5e3c25ee131dc99c92c119203c2886f7.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dbd8ab633b6..cc85069f3b69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16918,8 +16918,6 @@ with pkgs;
 
   wesnoth = callPackage ../games/wesnoth {
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
-    # fails to build against latest boost
-    boost = boost183;
     # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
     lua = lua5_4.override {
       postConfigure = ''

From b050a66ed1da838ad0ed2e4d32d090c4fc119893 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 3 Jan 2025 15:04:26 +0100
Subject: [PATCH 1375/1504] hyprutils: 0.3.0 -> 0.3.2

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

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index fec3042b5a4d..99a172a5371e 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-5Wvsn+0/Hu6eUUToK9hBWwRlbg1i++lc9or4yPYBUuk=";
+    hash = "sha256-7D5j2sh3Miw2CRdmx8ftepb342pl36kDFJy+3aVfDVc=";
   };
 
   nativeBuildInputs = [

From d8a6e2bf74a9416e61857b654a8c43eccc0436c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 06:10:44 -0800
Subject: [PATCH 1376/1504] python312Packages.hahomematic: 2024.12.13 ->
 2025.1.0

Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2024.12.13...2025.1.0

Changelog: https://github.com/SukramJ/hahomematic/blob/2025.1.0/changelog.md
---
 pkgs/development/python-modules/hahomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 999001916eb2..e79e885c3c68 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2024.12.13";
+  version = "2025.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "hahomematic";
     tag = version;
-    hash = "sha256-qHB47S5bU+353deoq4B8XwPYfUoU940Y3hl8u3gGrNs=";
+    hash = "sha256-xsMSTZDqfAQFhxJZNPs45Niv700dJDGdT0feTZyIn08=";
   };
 
   __darwinAllowLocalNetworking = true;

From 1766e85bdee0696cfdbed4ae3509a23e9c57635d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 20 Nov 2024 12:04:13 +0100
Subject: [PATCH 1377/1504] rundeck: init at 5.8.0

---
 pkgs/by-name/ru/rundeck/package.nix | 78 +++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/ru/rundeck/package.nix

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
new file mode 100644
index 000000000000..d1dc4e16a62e
--- /dev/null
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  jdk17,
+  which,
+  coreutils,
+  openssh,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rundeck";
+  version = "5.8.0-20241205";
+
+  src = fetchurl {
+    url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
+    hash = "sha256-fqmRYzmBteiZjCmBj30J6RLBzgZgwLcFzUKNFIsH2MQ=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ jdk17 ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/rundeck
+    cp $src $out/share/rundeck/rundeck.war
+
+    mkdir -p $out/bin
+    # Main rundeck executable
+    makeWrapper ${lib.getExe jdk17} $out/bin/rundeck \
+      --set RDECK_BASE "/var/lib/rundeck" \
+      --add-flags "-Xmx4g" \
+      --add-flags "-Drdeck.base=/var/lib/rundeck" \
+      --add-flags "-Drundeck.config.location=/etc/rundeck" \
+      --add-flags "-jar $out/share/rundeck/rundeck.war" \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          which
+          coreutils
+          openssh
+        ]
+      }
+
+    # Installation helper script
+    makeWrapper ${lib.getExe jdk17} $out/bin/rundeck-install \
+      --set RDECK_BASE "/var/lib/rundeck" \
+      --add-flags "-jar $out/share/rundeck/rundeck.war" \
+      --add-flags "--installonly" \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          which
+          coreutils
+          openssh
+        ]
+      }
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Job scheduler and runbook automation";
+    longDescription = ''
+      Rundeck is an open source automation service with a web console,
+      command line tools and a WebAPI. It lets you easily run automation tasks
+      across a set of nodes.
+    '';
+    homepage = "https://www.rundeck.com/";
+    changelog = "https://docs.rundeck.com/docs/history/";
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.liberodark ];
+  };
+})

From 4c16291562ced0ac1d587c7f1406098e67376fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 06:10:58 -0800
Subject: [PATCH 1378/1504] home-assistant-custom-components.homematicip_local:
 1.76.1 -> 1.77.0

Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.76.1...1.77.0

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.77.0/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 643b58e3ae7d..06e9d56f2b87 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.76.1";
+  version = "1.77.0";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-dBNZFYoi6tA9waV/yPCkgLu+ADxq09UKsOBHWOOBRJY=";
+    hash = "sha256-l5SK3qB+fst7DQuAykVNXcVpZAaRU5NfWUqRFG/1DMg=";
   };
 
   postPatch = ''

From 9de54116901b452d91b57ba8e9d25d137041928a Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 2 Jan 2025 17:25:54 -0800
Subject: [PATCH 1379/1504] home-assistant-custom-components.frigidaire: init
 at 0.1.1

---
 .../custom-components/frigidaire/package.nix  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/frigidaire/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
new file mode 100644
index 000000000000..8e74450717f8
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  frigidaire,
+}:
+buildHomeAssistantComponent rec {
+  owner = "bm1549";
+  domain = "frigidaire";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = "home-assistant-frigidaire";
+    tag = version;
+    hash = "sha256-Jynm0e5y/mSgyd5Pyus+nIVV3XSjsm5z+oNuGIhCu9s=";
+  };
+
+  dependencies = [ frigidaire ];
+
+  # NOTE: The manifest.json specifies an exact version requirement for the
+  # frigidaire dependency
+  ignoreVersionRequirement = [ "frigidaire" ];
+
+  meta = {
+    description = "Custom component for the Frigidaire integration";
+    homepage = "https://github.com/bm1549/home-assistant-frigidaire";
+    maintainers = with lib.maintainers; [ nullcube ];
+    license = lib.licenses.mit;
+  };
+}

From 5945ce7d74c0a09f5c7bc0a5c616335f73f2acbf Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 3 Jan 2025 11:24:34 +0100
Subject: [PATCH 1380/1504] python312Packages.libvirt: fix cross build

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

diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index fa0b83e607e5..527cc81b75cb 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitLab,
@@ -21,6 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-zOjTGXwxjd6QT01AaIln0FdP/8UZS0W3yPltUhlocpk=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config"
+  '';
+
   build-system = [ setuptools ];
 
   nativeBuildInputs = [ pkg-config ];

From cf23ef7647790e6211771866e7efb40867d85ddf Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:30:19 -0600
Subject: [PATCH 1381/1504] treewide: unpin apple-sdk_11 a-c

---
 .../by-name/ag/age-plugin-yubikey/package.nix | 10 ++-----
 pkgs/by-name/al/alacritty/package.nix         |  7 +----
 pkgs/by-name/an/anvil-editor/package.nix      | 29 ++++++-------------
 pkgs/by-name/ar/ares/package.nix              |  4 ---
 pkgs/by-name/au/audacity/package.nix          |  2 --
 pkgs/by-name/au/augustus/package.nix          |  3 +-
 pkgs/by-name/bo/bottom/package.nix            |  6 ----
 pkgs/by-name/br/bruno-cli/package.nix         | 13 ++-------
 pkgs/by-name/br/bruno/package.nix             | 16 ++++------
 pkgs/by-name/bs/bsnes-hd/package.nix          |  5 +---
 pkgs/by-name/ca/cargo-deadlinks/package.nix   |  3 --
 pkgs/by-name/ca/cargo-spellcheck/package.nix  |  4 ---
 pkgs/by-name/ch/chrony/package.nix            |  6 ----
 pkgs/by-name/co/contour/package.nix           |  2 --
 pkgs/by-name/co/corsix-th/package.nix         |  6 +---
 15 files changed, 24 insertions(+), 92 deletions(-)

diff --git a/pkgs/by-name/ag/age-plugin-yubikey/package.nix b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
index 4c0446e586fd..986e7b0a31e1 100644
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   openssl,
   pcsclite,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,12 +30,9 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ];
 
   meta = with lib; {
     description = "YubiKey plugin for age";
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 5376c79a4072..508d26bace0b 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -22,7 +22,6 @@
   wayland,
   xdg-utils,
 
-  apple-sdk_11,
 }:
 let
   rpathLibs =
@@ -65,11 +64,7 @@ rustPlatform.buildRustPackage rec {
     scdoc
   ];
 
-  buildInputs =
-    rpathLibs
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = rpathLibs;
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix
index 97a547f25bb0..2466eb283aa0 100644
--- a/pkgs/by-name/an/anvil-editor/package.nix
+++ b/pkgs/by-name/an/anvil-editor/package.nix
@@ -4,12 +4,9 @@
   buildGoModule,
   fetchzip,
   pkg-config,
-  libicns,
   copyDesktopItems,
   makeDesktopItem,
   desktopToDarwinBundle,
-  apple-sdk_11,
-  darwinMinVersionHook,
   wayland,
   libxkbcommon,
   vulkan-headers,
@@ -44,23 +41,15 @@ buildGoModule rec {
       desktopToDarwinBundle
     ];
 
-  buildInputs =
-    if stdenv.hostPlatform.isDarwin then
-      [
-        apple-sdk_11
-        # metal dependencies require 10.13 or newer
-        (darwinMinVersionHook "10.13")
-      ]
-    else
-      [
-        wayland
-        libxkbcommon
-        vulkan-headers
-        libGL
-        xorg.libX11
-        xorg.libXcursor
-        xorg.libXfixes
-      ];
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    wayland
+    libxkbcommon
+    vulkan-headers
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXfixes
+  ];
 
   # Got different result in utf8 char length?
   checkFlags = [ "-skip=^TestClearAfter$" ];
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index 6af1cb6d4e50..5e24c6d8f8fd 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -2,7 +2,6 @@
   lib,
   SDL2,
   alsa-lib,
-  apple-sdk_11,
   autoPatchelfHook,
   fetchFromGitHub,
   gtk3,
@@ -67,9 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
       libpulseaudio
       openal
       udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
     ];
 
   appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ];
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index e68a8bcf111b..061aea770cda 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -52,7 +52,6 @@
   wavpack,
   wxGTK32,
   gtk3,
-  apple-sdk_11,
   libpng,
   libjpeg,
 }:
@@ -144,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
       util-linux
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
       libpng
       libjpeg
     ];
diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix
index c2b116f269f2..e2aa70b1694f 100644
--- a/pkgs/by-name/au/augustus/package.nix
+++ b/pkgs/by-name/au/augustus/package.nix
@@ -7,7 +7,6 @@
   SDL2_mixer,
   libpng,
   darwin,
-  apple-sdk_11,
   libicns,
   imagemagick,
 }:
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
     SDL2
     SDL2_mixer
     libpng
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+  ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index 33b91c6db5d2..9a19a12e500f 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -4,8 +4,6 @@
   fetchFromGitHub,
   autoAddDriverRunpath,
   installShellFiles,
-  stdenv,
-  apple-sdk_11,
   versionCheckHook,
   nix-update-script,
 }:
@@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   postInstall = ''
     installManPage target/tmp/bottom/manpage/btm.1
     installShellCompletion \
diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
index 51d771e9a3eb..c5203edbfe3a 100644
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -1,11 +1,9 @@
 {
   lib,
-  stdenv,
   buildNpmPackage,
   bruno,
   pkg-config,
   pango,
-  apple-sdk_11,
   testers,
   bruno-cli,
 }:
@@ -28,14 +26,9 @@ buildNpmPackage {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
-      apple-sdk_11
-    ];
+  buildInputs = [
+    pango
+  ];
 
   ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index e6ffdea18a35..7de25e8cd9c5 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -13,7 +13,6 @@
   cairo,
   pango,
   npm-lockfile-fix,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -43,16 +42,11 @@ buildNpmPackage rec {
       copyDesktopItems
     ];
 
-  buildInputs =
-    [
-      pixman
-      cairo
-      pango
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fix for: https://github.com/NixOS/nixpkgs/issues/272156
-      apple-sdk_11
-    ];
+  buildInputs = [
+    pixman
+    cairo
+    pango
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix
index bc03d6bbce03..c98b96e2affb 100644
--- a/pkgs/by-name/bs/bsnes-hd/package.nix
+++ b/pkgs/by-name/bs/bsnes-hd/package.nix
@@ -2,9 +2,7 @@
   lib,
   SDL2,
   alsa-lib,
-  apple-sdk_11,
   fetchFromGitHub,
-  fetchpatch,
   gtk3,
   gtksourceview3,
   libX11,
@@ -69,8 +67,7 @@ stdenv.mkDerivation {
       alsa-lib
       openal
       libpulseaudio
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+    ];
 
   makeFlags =
     [
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index e461c80cd04b..67dda48c1ad5 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec {
       # assumes the target is x86_64-unknown-linux-gnu
       "--skip simple_project::it_checks_okay_project_correctly";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   meta = with lib; {
     description = "Cargo subcommand to check rust documentation for broken links";
     homepage = "https://github.com/deadlinks/cargo-deadlinks";
diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index f33a0f385b67..c79eefb5086a 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -2,8 +2,6 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  stdenv,
-  apple-sdk_11,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   preCheck = "HOME=$(mktemp -d)";
 
   checkFlags = [
diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index 22eaf9a13bc5..cfa7806285f3 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -10,8 +10,6 @@
   libseccomp,
   pps-tools,
   nixosTests,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,10 +38,6 @@ stdenv.mkDerivation rec {
       libcap
       libseccomp
       pps-tools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
     ];
 
   configureFlags = [
diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix
index 03f09fab4025..779144322f25 100644
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@@ -20,7 +20,6 @@
   yaml-cpp,
   ncurses,
   file,
-  apple-sdk_11,
   libutil,
   sigtool,
   nixosTests,
@@ -73,7 +72,6 @@ stdenv.mkDerivation (final: {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
       libutil
     ];
 
diff --git a/pkgs/by-name/co/corsix-th/package.nix b/pkgs/by-name/co/corsix-th/package.nix
index 9d6a78b361a4..6ae3ea109013 100644
--- a/pkgs/by-name/co/corsix-th/package.nix
+++ b/pkgs/by-name/co/corsix-th/package.nix
@@ -12,9 +12,6 @@
   SDL2,
   SDL2_mixer,
   timidity,
-  # Darwin dependencies
-  libiconv,
-  apple-sdk_11,
   # Update
   nix-update-script,
 }:
@@ -60,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       SDL2
       SDL2_mixer
       timidity
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   cmakeFlags = [ "-Wno-dev" ];
 

From a5f897d4640c6475ecff444a81d9114ff41ed689 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 3 Jan 2025 14:48:55 +0000
Subject: [PATCH 1382/1504] Revert "libfishsound: fix build with gcc14"

This reverts commit fdd1a8c1e02a2e9784ff73979c9e881e784578d9.

reverting in to apply a more comprehensive fix
---
 .../li/libfishsound/fix-callbacks.patch       | 20 -------------------
 pkgs/by-name/li/libfishsound/package.nix      |  4 ----
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/by-name/li/libfishsound/fix-callbacks.patch

diff --git a/pkgs/by-name/li/libfishsound/fix-callbacks.patch b/pkgs/by-name/li/libfishsound/fix-callbacks.patch
deleted file mode 100644
index 992efcf23ec8..000000000000
--- a/pkgs/by-name/li/libfishsound/fix-callbacks.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libfishsound/flac.c
-+++ b/src/libfishsound/flac.c
-@@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void * data, int datasize)
- #if FS_DECODE
- static FLAC__StreamDecoderReadStatus
- fs_flac_read_callback(const FLAC__StreamDecoder *decoder,
--                      FLAC__byte buffer[], unsigned int *bytes,
-+                      FLAC__byte buffer[], size_t *bytes,
-                       void *client_data)
- {
-   FishSound* fsound = (FishSound*)client_data;
-@@ -346,7 +346,7 @@ dec_err:
- #if FS_ENCODE
- static FLAC__StreamEncoderWriteStatus
- fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,
--                           const FLAC__byte buffer[], unsigned bytes,
-+                           const FLAC__byte buffer[], size_t bytes,
-                            unsigned samples, unsigned current_frame,
-                            void *client_data)
- {
diff --git a/pkgs/by-name/li/libfishsound/package.nix b/pkgs/by-name/li/libfishsound/package.nix
index 63b0838b4b01..0c5ea9c4c023 100644
--- a/pkgs/by-name/li/libfishsound/package.nix
+++ b/pkgs/by-name/li/libfishsound/package.nix
@@ -17,10 +17,6 @@ stdenv.mkDerivation rec {
     sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
   };
 
-  patches = [
-    ./fix-callbacks.patch
-  ];
-
   propagatedBuildInputs = [
     libvorbis
     speex

From 765cd09de5a910235e1c16a0e480f5f28832f0bf Mon Sep 17 00:00:00 2001
From: Ross Nomann <rossnomann@protonmail.com>
Date: Mon, 30 Dec 2024 00:19:40 +0100
Subject: [PATCH 1383/1504] libfishsound: add debian patches

---
 pkgs/by-name/li/libfishsound/package.nix | 31 +++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libfishsound/package.nix b/pkgs/by-name/li/libfishsound/package.nix
index 0c5ea9c4c023..59ceeccfd2f3 100644
--- a/pkgs/by-name/li/libfishsound/package.nix
+++ b/pkgs/by-name/li/libfishsound/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
+  autoreconfHook,
   libvorbis,
   speex,
   flac,
@@ -17,13 +19,40 @@ stdenv.mkDerivation rec {
     sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
   };
 
+  patches =
+    let
+      fetchDebPatch =
+        { name, hash }:
+        fetchpatch {
+          inherit name hash;
+          url = "https://salsa.debian.org/multimedia-team/libfishsound/-/raw/f25f31a13dd2ce008614427889b08e6f2222898f/debian/patches/${name}";
+        };
+    in
+    map fetchDebPatch [
+      {
+        name = "0001-Patch-configure.ac-to-specify-config-macro-dir.patch";
+        hash = "sha256-3cijMhgxqwFisc5nt8826QUwOqPI7H425QkDcjnD4iM=";
+      }
+      {
+        name = "0002-flac-set-vendor_string.length-0.patch";
+        hash = "sha256-8195rU9IAhFL3MgB4jLwtJv6BWgz22A38+RmIymIQoo=";
+      }
+      {
+        name = "0003-Fix-incompatible-flac-callback-types.patch";
+        hash = "sha256-BxG1hlThzhJ6VeGcsNpDEtVyKSJTLGFKeHFpFoXW54A=";
+      }
+    ];
+
   propagatedBuildInputs = [
     libvorbis
     speex
     flac
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
 
   meta = with lib; {
     homepage = "https://xiph.org/fishsound/";

From 9890298bfc32d9d4a775885dc0d1d6798c69d3df Mon Sep 17 00:00:00 2001
From: Trim21 <trim21.me@gmail.com>
Date: Fri, 3 Jan 2025 22:52:53 +0800
Subject: [PATCH 1384/1504] libtorrent: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 3faae47e02ce..1b5ff8e0c9d3 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -7,7 +7,6 @@
   autoconf-archive,
   autoreconfHook,
   cppunit,
-  libsigcxx,
   openssl,
   pkg-config,
   zlib,
@@ -16,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rakshasa-libtorrent";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "libtorrent";
     rev = "v${version}";
-    hash = "sha256-FtuVDXH9vIdz+Wz7PLY2lRZkR+j9NYmgaHPDDx2SA98=";
+    hash = "sha256-ejDne7vaV+GYP6M0n3VAEva4UHuxRGwfc2rgxf7U/EM=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +32,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cppunit
-    libsigcxx
     openssl
     zlib
   ];

From c30b953d03cf0ab2f24a6f847d9b457dd813d5f4 Mon Sep 17 00:00:00 2001
From: Trim21 <trim21.me@gmail.com>
Date: Fri, 3 Jan 2025 22:53:03 +0800
Subject: [PATCH 1385/1504] rtorrent: 0.10.0-unstable-2024-12-15 -> 0.15.1

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

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index ed5866a666b9..60fc441ae999 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -15,18 +15,18 @@
   pkg-config,
   zlib,
   nixosTests,
-  unstableGitUpdater,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
   pname = "rakshasa-rtorrent";
-  version = "0.10.0-unstable-2024-12-15";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
-    rev = "b8cb828d963719565528573123bb08b72cd50928";
-    hash = "sha256-nvyRRmZRdyRAazGAFqHDK+zME9bSkp+LwW9Na4M8+L0=";
+    rev = "68fdb86c723a0ae67ebaffec416af99fec41dcbc";
+    hash = "sha256-/GWC28LsY7GcUH+SBzi01sOWVfA1lyM0r9OdUDTYbT8=";
   };
 
   outputs = [
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = unstableGitUpdater { tagPrefix = "v"; };
+    updateScript = gitUpdater { rev-prefix = "v"; };
     tests = {
       inherit (nixosTests) rtorrent;
     };

From 5f7d1bedc17d30c85a0fd9d0e4d48e28dd3eab6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 14:58:14 +0000
Subject: [PATCH 1386/1504] renovate: 39.82.6 -> 39.90.2

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

diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index 066ba315c44e..81540d092045 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "39.82.6";
+  version = "39.90.2";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-RV3rOzs0dPQK0rYGU6URqTcvqGMXCrke5wSSVo/Wd5s=";
+    hash = "sha256-D0VoBkP+zMsJK5ZgoU4USF0qhrmLi2V1BU6k6czSr+o=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-c8bnNBkWyJspRvwoQTlExChM1PXi6Hw466xqT11s7Ys=";
+    hash = "sha256-JkdfI7P4zWf0hYgurDrETAGic5nz38zQsAuBoFi9C8w=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;

From ae433b68447eb4326e9475fb2ef73b8af28e34b2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 21:31:39 -0600
Subject: [PATCH 1387/1504] treewide: unpin apple-sdk_11 r-s

---
 pkgs/by-name/rb/rbw/package.nix               | 10 +-------
 pkgs/by-name/re/rehex/package.nix             |  4 +---
 pkgs/by-name/re/rerun/package.nix             | 24 +++++++------------
 pkgs/by-name/re/rewatch/package.nix           |  6 -----
 pkgs/by-name/ri/ride/package.nix              |  3 ---
 pkgs/by-name/ri/rio/package.nix               |  2 --
 pkgs/by-name/ri/ripgrep/package.nix           |  5 +---
 pkgs/by-name/ru/rucola/package.nix            | 13 +++-------
 pkgs/by-name/sc/scopehal-apps/package.nix     |  4 ----
 pkgs/by-name/sh/shipwright/package.nix        |  4 +---
 .../by-name/si/signalbackup-tools/package.nix |  6 -----
 pkgs/by-name/sk/skhd/package.nix              |  7 ------
 pkgs/by-name/sk/skia/package.nix              |  5 +---
 .../sp/spicy-parser-generator/package.nix     | 13 ++++------
 pkgs/by-name/sp/spotify-player/package.nix    |  4 ----
 pkgs/by-name/st/stockfish/package.nix         |  9 -------
 16 files changed, 20 insertions(+), 99 deletions(-)

diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index 7e3776be7575..31c35734f3ed 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -6,9 +6,7 @@
   openssl,
   pkg-config,
   installShellFiles,
-  darwin,
   bash,
-  apple-sdk_11,
   # rbw-fzf
   withFzf ? false,
   fzf,
@@ -39,13 +37,7 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
-  buildInputs =
-    [ bash ] # for git-credential-rbw
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
-      darwin.apple_sdk_11_0.frameworks.Security
-      darwin.apple_sdk_11_0.frameworks.AppKit
-    ];
+  buildInputs = [ bash ]; # for git-credential-rbw
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isLinux ''
     export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index d0355c64e8ee..8f6d56e3a3fa 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -14,7 +14,6 @@
   lua53Packages,
   perlPackages,
   gtk3,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -50,8 +49,7 @@ stdenv.mkDerivation rec {
       perl
       TemplateToolkit
     ])
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ];
 
   makeFlags = [
     "prefix=${placeholder "out"}"
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 6104fa868e8a..fccc14ce3ce3 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -19,7 +19,6 @@
   openssl,
   vulkan-loader,
   wayland,
-  apple-sdk_11,
 
   versionCheckHook,
 
@@ -63,21 +62,14 @@ rustPlatform.buildRustPackage rec {
     rustfmt
   ];
 
-  buildInputs =
-    [
-      freetype
-      glib
-      gtk3
-      (lib.getDev openssl)
-      libxkbcommon
-      vulkan-loader
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole"
-      # ld: symbol(s) not found for architecture x86_64
-      apple-sdk_11
-    ];
+  buildInputs = [
+    freetype
+    glib
+    gtk3
+    (lib.getDev openssl)
+    libxkbcommon
+    vulkan-loader
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
 
   addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
     lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix
index b4f030c3746c..e0ee1ebfc76b 100644
--- a/pkgs/by-name/re/rewatch/package.nix
+++ b/pkgs/by-name/re/rewatch/package.nix
@@ -3,8 +3,6 @@
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
-  apple-sdk_11,
-  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ];
-
   doCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix
index f8e6746c925c..93009c71cfb4 100644
--- a/pkgs/by-name/ri/ride/package.nix
+++ b/pkgs/by-name/ri/ride/package.nix
@@ -12,7 +12,6 @@
   copyDesktopItems,
   makeDesktopItem,
   electron,
-  apple-sdk_11,
 }:
 
 buildNpmPackage rec {
@@ -70,8 +69,6 @@ buildNpmPackage rec {
     makeWrapper
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
   # our patch adds the platform detecting build option
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 7c6a6094b12b..af28b721a612 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -17,7 +17,6 @@
   libGL,
   vulkan-loader,
   libxkbcommon,
-  apple-sdk_11,
 
   withX11 ? !stdenv.hostPlatform.isDarwin,
   libX11,
@@ -81,7 +80,6 @@ rustPlatform.buildRustPackage rec {
     rlinkLibs
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.libutil
-      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
     ];
 
   outputs = [
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index d90ad5d81bdd..43d4bbc66e85 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -6,7 +6,6 @@
   rustPlatform,
   installShellFiles,
   pkg-config,
-  apple-sdk_11,
   withPCRE2 ? true,
   pcre2,
 }:
@@ -29,9 +28,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config;
-  buildInputs =
-    lib.optional withPCRE2 pcre2
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+  buildInputs = lib.optional withPCRE2 pcre2;
 
   buildFeatures = lib.optional withPCRE2 "pcre2";
 
diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix
index f39186d6118c..a2cabcfa7170 100644
--- a/pkgs/by-name/ru/rucola/package.nix
+++ b/pkgs/by-name/ru/rucola/package.nix
@@ -5,8 +5,6 @@
   pkg-config,
   oniguruma,
   stdenv,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      oniguruma
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.13")
-    ];
+  buildInputs = [
+    oniguruma
+  ];
 
   env = {
     RUSTONIG_SYSTEM_LIBONIG = true;
diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index 7b6342150518..aa7d247526b2 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -22,8 +22,6 @@
   spirv-tools,
   ffts,
   moltenvk,
-  apple-sdk_11,
-  darwinMinVersionHook,
   llvmPackages,
 }:
 
@@ -73,8 +71,6 @@ stdenv.mkDerivation {
     ]
     ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "10.15")
       moltenvk
     ];
 
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 3b47b20b8929..bdbab146d4f2 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -27,7 +27,6 @@
   zenity,
   makeWrapper,
   darwin,
-  apple-sdk_11,
   libicns,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -94,8 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
       libXext
       libpulseaudio
       zenity
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
+    ];
 
   cmakeFlags = [
     (lib.cmakeBool "NON_PORTABLE" true)
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 0b6de93b497f..759e24e5226f 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -6,8 +6,6 @@
   cmake,
   pkg-config,
 
-  apple-sdk_11,
-  darwinMinVersionHook,
   dbus,
   openssl,
   sqlite,
@@ -35,10 +33,6 @@ stdenv.mkDerivation rec {
     sqlite
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     dbus
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Needed for `utimensat` on `x86_64-darwin`
-    apple-sdk_11
-    (darwinMinVersionHook "11.3")
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/sk/skhd/package.nix b/pkgs/by-name/sk/skhd/package.nix
index 60321fae3557..ba6762548460 100644
--- a/pkgs/by-name/sk/skhd/package.nix
+++ b/pkgs/by-name/sk/skhd/package.nix
@@ -2,8 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  apple-sdk_11,
-  darwinMinVersionHook,
   nix-update-script,
   versionCheckHook,
 }:
@@ -18,11 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI=";
   };
 
-  buildInputs = [
-    apple-sdk_11
-    (darwinMinVersionHook "10.13")
-  ];
-
   makeFlags = [ "BUILD_PATH=$(out)/bin" ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index cd7c5707520c..46e6e78d4356 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -19,7 +19,6 @@
 , xcbuild
 , cctools
 , zlib
-, apple-sdk_11
 , fixDarwinDylibNames
 
 , enableVulkan ? !stdenv.hostPlatform.isDarwin
@@ -70,9 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals enableVulkan [
     vulkan-headers
     vulkan-memory-allocator
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
-  ];
+  ] ;
 
   gnFlags = let
     cpu = {
diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
index d578353f064b..bd42478db9a7 100644
--- a/pkgs/by-name/sp/spicy-parser-generator/package.nix
+++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix
@@ -8,7 +8,6 @@
   bison,
   flex,
   zlib,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -33,14 +32,10 @@ stdenv.mkDerivation rec {
     python3
   ];
 
-  buildInputs =
-    [
-      flex
-      zlib
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = [
+    flex
+    zlib
+  ];
 
   postPatch = ''
     patchShebangs scripts tests/scripts
diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index f4c9babb9dda..4e4ce8228465 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -15,7 +15,6 @@
   dbus,
   fontconfig,
   libsixel,
-  apple-sdk_11,
 
   # build options
   withStreaming ? true,
@@ -75,9 +74,6 @@ rustPlatform.buildRustPackage rec {
       dbus
       fontconfig
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
-    ]
     ++ lib.optionals withSixel [ libsixel ]
     ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
     ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
index 502f9f9b478f..50216db2b95e 100644
--- a/pkgs/by-name/st/stockfish/package.nix
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -4,8 +4,6 @@
   fetchurl,
   fetchFromGitHub,
   apple-sdk,
-  apple-sdk_11,
-  darwinMinVersionHook,
 }:
 
 let
@@ -64,13 +62,6 @@ stdenv.mkDerivation rec {
   ];
   buildFlags = [ "build" ];
 
-  buildInputs =
-    lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "11")
-      [
-        apple-sdk_11
-        (darwinMinVersionHook "10.15")
-      ];
-
   enableParallelBuilding = true;
 
   meta = with lib; {

From 628bdcde37c9205b77b54a1e435fb665615d8082 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 3 Jan 2025 10:24:10 -0500
Subject: [PATCH 1388/1504] maintainers: add stepbrobd to Coq team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 66c2440b0bdc..4778365d5c9a 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -197,6 +197,7 @@ with lib.maintainers;
       siraben
       vbgl
       alizter
+      stepbrobd
     ];
     scope = "Maintain the Coq theorem prover and related packages.";
     shortName = "Coq";

From 10f23055687876f14de252001c0e7874b90cadee Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 3 Jan 2025 16:52:19 +0100
Subject: [PATCH 1389/1504] dtbloader : improve

---
 pkgs/by-name/dt/dtbloader/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/dt/dtbloader/package.nix b/pkgs/by-name/dt/dtbloader/package.nix
index e2d559a40637..3ce3551137ac 100644
--- a/pkgs/by-name/dt/dtbloader/package.nix
+++ b/pkgs/by-name/dt/dtbloader/package.nix
@@ -27,9 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Disable hardening which adds incompatible flags like -fPIC
   hardeningDisable = [ "all" ];
 
-  buildPhase = ''
-    make -j$NIX_BUILD_CORES
-  '';
+  enableParallelBuilding = true;
 
   installPhase = ''
     runHook preInstall
@@ -57,6 +55,5 @@ stdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
     ];
     maintainers = with lib.maintainers; [ liberodark ];
-    mainProgram = "dtbloader.efi";
   };
 })

From 70d4b4323cae9e44a302e00240d420a7e3f3c7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 6 Aug 2024 03:20:02 -0700
Subject: [PATCH 1390/1504] python312Packages.goslide-api: init at 0.7.3

---
 .../python-modules/goslide-api/default.nix    | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/goslide-api/default.nix

diff --git a/pkgs/development/python-modules/goslide-api/default.nix b/pkgs/development/python-modules/goslide-api/default.nix
new file mode 100644
index 000000000000..20972a657562
--- /dev/null
+++ b/pkgs/development/python-modules/goslide-api/default.nix
@@ -0,0 +1,36 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "goslide-api";
+  version = "0.7.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ualex73";
+    repo = "goslide-api";
+    tag = version;
+    hash = "sha256-s8MtOBNieg0o8U6pkf0e/EF8GtVkb7BgQBP6n/xmKJk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "goslideapi" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python API to utilise the Slide Open Cloud and Local API";
+    homepage = "https://github.com/ualex73/goslide-api";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 959365d03a30..4d91468e28db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5483,6 +5483,8 @@ self: super: with self; {
 
   gorilla = callPackage ../development/python-modules/gorilla { };
 
+  goslide-api = callPackage ../development/python-modules/goslide-api { };
+
   govee-ble = callPackage ../development/python-modules/govee-ble { };
 
   govee-led-wez = callPackage ../development/python-modules/govee-led-wez { };

From 061ce3e91a6cdc6274f08505b4ebd229da4deea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 07:55:13 -0800
Subject: [PATCH 1391/1504] home-assistant: support slide component

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 11305c417806..b4d5afe27378 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5037,7 +5037,8 @@
       ];
     "slide" =
       ps: with ps; [
-      ]; # missing inputs: goslide-api
+        goslide-api
+      ];
     "slimproto" =
       ps: with ps; [
         aioslimproto

From aa540982c1a06adeaeb0e33d3e8127611406cc21 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 3 Jan 2025 15:59:59 +0000
Subject: [PATCH 1392/1504] elixir-ls: 0.26.1 -> 0.26.2

---
 pkgs/development/beam-modules/elixir-ls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 7ca9fda3490a..d07614b9ac16 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "elixir-ls";
-  version = "0.26.1";
+  version = "0.26.2";
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-fGjHDzQUBROFlv+AIzArRv+Q7RWPTizMFyYXQJGQzjA=";
+    hash = "sha256-ELjZFGzUQ14iUj2/WD55a6Yf8EMOEjb7MnCx0Nyg/vQ=";
   };
 in
 mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version elixir;
-    hash = "sha256-EUWySBI082cNXbHZKQKEisXffe0/UpupNcHj1GT7Mek=";
+    hash = "sha256-I0u3eovTYNm0ncBCTEztg5fhLiLk+WNqcKfj3Za12zc=";
   };
 
   # elixir-ls is an umbrella app

From c16c500c81903346715dba2a3d1a8f0c9090c2af Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 3 Jan 2025 16:05:52 +0000
Subject: [PATCH 1393/1504] audiobookshelf: 2.17.5 -> 2.17.7

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

diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 71053763cc20..ac2ed8e3a0b8 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "190a1000d9b5909b5bcd953f32f39fa8f261ecb9",
-  "hash": "sha256-92Or9AHqSqp0nWB37B18EkTKhAfYeIfZ4Z5ctaFElXU=",
-  "version": "2.17.5",
-  "depsHash": "sha256-18c8reQjCo914MDfZqoQCeMsGvd38lPKrdLu9NHl0Y8=",
-  "clientDepsHash": "sha256-XslWtmvX8FExkdSgDHs10wzJFC4dFuAf034Jf53Twk0="
+  "rev": "de8b0abc3af740148bddde462fe809f03159d678",
+  "hash": "sha256-lLCG6xw1qWbIOxHbD8ONH7iYzayJ8OhMy+WgaXExcFQ=",
+  "version": "2.17.7",
+  "depsHash": "sha256-1uDCbgZNmx8e+LrsOHTfM29SZhS1TLDHmTg48XMbwkg=",
+  "clientDepsHash": "sha256-cDT45OtLbFDF0TXO4zVVj9+UOJhkb9TjCajtSWq4H8U="
 }

From ce1f9eb417f5c8392ea0ed576db19f14254ab4ee Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 2 Jan 2025 19:20:02 -0600
Subject: [PATCH 1394/1504] treewide: unpin apple-sdk_11

---
 pkgs/by-name/ed/edencommon/package.nix        | 25 +++++--------
 pkgs/by-name/fb/fb303/package.nix             | 23 ++++--------
 pkgs/by-name/fb/fbthrift/package.nix          | 29 ++++++---------
 pkgs/by-name/fi/fizz/package.nix              | 23 ++++--------
 pkgs/by-name/fo/folly/package.nix             | 37 ++++++++-----------
 pkgs/by-name/mv/mvfst/package.nix             | 17 +++------
 pkgs/by-name/rc/rcodesign/package.nix         |  3 --
 pkgs/by-name/wa/wangle/package.nix            | 25 +++++--------
 pkgs/by-name/wa/watchman/package.nix          | 35 +++++++-----------
 pkgs/development/compilers/go/1.22.nix        |  2 -
 pkgs/development/compilers/go/1.24.nix        |  2 -
 .../community-edition/buildGraalvm.nix        | 28 +++++---------
 pkgs/development/libraries/ngtcp2/default.nix |  3 --
 .../llama-cpp-python/default.nix              | 23 ++++--------
 .../python-modules/nanobind/default.nix       |  9 -----
 .../python-modules/soxr/default.nix           | 10 +----
 .../python-modules/wandb/default.nix          |  3 --
 17 files changed, 98 insertions(+), 199 deletions(-)

diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 060ea7cc2da2..871e79301580 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -15,8 +15,6 @@
   wangle,
   fbthrift,
   gtest,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   nix-update-script,
 }:
@@ -48,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      glog
-      gflags
-      folly
-      fb303
-      wangle
-      fbthrift
-      gtest
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    glog
+    gflags
+    folly
+    fb303
+    wangle
+    fbthrift
+    gtest
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix
index b03e66eb861c..97e7dbe5f8a4 100644
--- a/pkgs/by-name/fb/fb303/package.nix
+++ b/pkgs/by-name/fb/fb303/package.nix
@@ -13,8 +13,6 @@
   fbthrift,
   fizz,
   wangle,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   nix-update-script,
 }:
@@ -40,19 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs =
-    [
-      gflags
-      glog
-      folly
-      fbthrift
-      fizz
-      wangle
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    gflags
+    glog
+    folly
+    fbthrift
+    fizz
+    wangle
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index a189e7a66a93..92fcb3636b36 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -17,8 +17,6 @@
   zlib,
   zstd,
   xxHash,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   mvfst,
 
@@ -56,22 +54,17 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      openssl
-      gflags
-      glog
-      folly
-      fizz
-      wangle
-      zlib
-      zstd
-      xxHash
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    openssl
+    gflags
+    glog
+    folly
+    fizz
+    wangle
+    zlib
+    zstd
+    xxHash
+  ];
 
   propagatedBuildInputs = [
     mvfst
diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index 4c5c1efe08c6..e02f683e21e6 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -14,8 +14,6 @@
   zstd,
   gflags,
   libevent,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   folly,
   libsodium,
@@ -49,19 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      openssl
-      glog
-      double-conversion
-      zstd
-      gflags
-      libevent
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    openssl
+    glog
+    double-conversion
+    zstd
+    gflags
+    libevent
+  ];
 
   propagatedBuildInputs = [
     folly
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index ca393d884a13..12f8170324b1 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -21,8 +21,6 @@
   zstd,
   libiberty,
   libunwind,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   boost,
   fmt_11,
@@ -64,26 +62,21 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # See CMake/folly-deps.cmake in the Folly source tree.
-  buildInputs =
-    [
-      boost
-      double-conversion
-      fast-float
-      gflags
-      glog
-      libevent
-      zlib
-      openssl
-      xz
-      lz4
-      zstd
-      libiberty
-      libunwind
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    boost
+    double-conversion
+    fast-float
+    gflags
+    glog
+    libevent
+    zlib
+    openssl
+    xz
+    lz4
+    zstd
+    libiberty
+    libunwind
+  ];
 
   propagatedBuildInputs =
     [
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index de686a269b51..f14b252cf745 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -11,8 +11,6 @@
   folly,
   gflags,
   glog,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   fizz,
 
@@ -44,16 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      folly
-      gflags
-      glog
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    folly
+    gflags
+    glog
+  ];
 
   propagatedBuildInputs = [
     fizz
diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix
index 3b6efcc0ce78..a0118bc3423b 100644
--- a/pkgs/by-name/rc/rcodesign/package.nix
+++ b/pkgs/by-name/rc/rcodesign/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  apple-sdk_11,
   uutils-coreutils,
 }:
 
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
-
   cargoBuildFlags = [
     # Only build the binary we want
     "--bin"
diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix
index 1a0da53573ff..46b5c3b04015 100644
--- a/pkgs/by-name/wa/wangle/package.nix
+++ b/pkgs/by-name/wa/wangle/package.nix
@@ -15,8 +15,6 @@
   gflags,
   libevent,
   double-conversion,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   gtest,
 
@@ -45,20 +43,15 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      folly
-      fizz
-      openssl
-      glog
-      gflags
-      libevent
-      double-conversion
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    folly
+    fizz
+    openssl
+    glog
+    gflags
+    libevent
+    double-conversion
+  ];
 
   checkInputs = [
     gtest
diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix
index 8ee1aaf2c3b4..c020c76e83bb 100644
--- a/pkgs/by-name/wa/watchman/package.nix
+++ b/pkgs/by-name/wa/watchman/package.nix
@@ -26,8 +26,6 @@
   fbthrift,
   fb303,
   cpptoml,
-  apple-sdk_11,
-  darwinMinVersionHook,
 
   gtest,
 
@@ -58,25 +56,20 @@ stdenv.mkDerivation (finalAttrs: {
     removeReferencesTo
   ];
 
-  buildInputs =
-    [
-      pcre2
-      openssl
-      gflags
-      glog
-      libevent
-      edencommon
-      folly
-      fizz
-      wangle
-      fbthrift
-      fb303
-      cpptoml
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-      (darwinMinVersionHook "11.0")
-    ];
+  buildInputs = [
+    pcre2
+    openssl
+    gflags
+    glog
+    libevent
+    edencommon
+    folly
+    fizz
+    wangle
+    fbthrift
+    fb303
+    cpptoml
+  ];
 
   checkInputs = [
     gtest
diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix
index 319ed5081d0c..49625a945c21 100644
--- a/pkgs/development/compilers/go/1.22.nix
+++ b/pkgs/development/compilers/go/1.22.nix
@@ -5,7 +5,6 @@
   tzdata,
   substituteAll,
   iana-etc,
-  apple-sdk_11,
   xcbuild,
   mailcap,
   buildPackages,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
   depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
-    apple-sdk_11
     xcbuild
   ];
 
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 92653cfeebde..7f95a41f14ed 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -5,7 +5,6 @@
   tzdata,
   substituteAll,
   iana-etc,
-  apple-sdk_11,
   xcbuild,
   mailcap,
   buildPackages,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
   depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
-    apple-sdk_11
     xcbuild
   ];
 
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
index ea4c6d1b282d..3d7b4096690b 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   alsa-lib,
-  apple-sdk_11,
   autoPatchelfHook,
   cairo,
   cups,
-  darwinMinVersionHook,
   fontconfig,
   glib,
   glibc,
@@ -31,7 +29,6 @@ let
     "lib"
     "stdenv"
     "alsa-lib"
-    "apple-sdk_11"
     "autoPatchelfHook"
     "cairo"
     "cups"
@@ -127,21 +124,16 @@ let
         zlib
       ];
 
-      buildInputs =
-        lib.optionals stdenv.hostPlatform.isLinux [
-          alsa-lib # libasound.so wanted by lib/libjsound.so
-          fontconfig
-          (lib.getLib stdenv.cc.cc) # libstdc++.so.6
-          xorg.libX11
-          xorg.libXext
-          xorg.libXi
-          xorg.libXrender
-          xorg.libXtst
-        ]
-        ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-          apple-sdk_11
-          (darwinMinVersionHook "11.0")
-        ]);
+      buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+        alsa-lib # libasound.so wanted by lib/libjsound.so
+        fontconfig
+        (lib.getLib stdenv.cc.cc) # libstdc++.so.6
+        xorg.libX11
+        xorg.libXext
+        xorg.libXi
+        xorg.libXrender
+        xorg.libXtst
+      ];
 
       postInstall =
         let
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index fd1829bb0bed..7ddfc135fa18 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , cmake
 , brotli, libev, nghttp3, quictls
-, apple-sdk_11
 , withJemalloc ? false, jemalloc
 , curlHTTP3
 }:
@@ -26,8 +25,6 @@ stdenv.mkDerivation rec {
     libev
     nghttp3
     quictls
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
   ] ++ lib.optional withJemalloc jemalloc;
 
   cmakeFlags = [
diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 56907ada323b..f534b895a69b 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -13,9 +13,6 @@
   pyproject-metadata,
   scikit-build-core,
 
-  # buildInputs
-  apple-sdk_11,
-
   # dependencies
   diskcache,
   jinja2,
@@ -70,18 +67,14 @@ buildPythonPackage rec {
     scikit-build-core
   ];
 
-  buildInputs =
-    lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cudart # cuda_runtime.h
-        cuda_cccl # <thrust/*>
-        libcublas # cublas_v2.h
-      ]
-    )
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_11
-    ];
+  buildInputs = lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cudart # cuda_runtime.h
+      cuda_cccl # <thrust/*>
+      libcublas # cublas_v2.h
+    ]
+  );
 
   dependencies = [
     diskcache
diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix
index a01f9a175006..8255cd578439 100644
--- a/pkgs/development/python-modules/nanobind/default.nix
+++ b/pkgs/development/python-modules/nanobind/default.nix
@@ -1,9 +1,7 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   buildPythonPackage,
-  darwinMinVersionHook,
   fetchFromGitHub,
   pythonOlder,
 
@@ -49,13 +47,6 @@ buildPythonPackage rec {
 
   dependencies = [ eigen ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
-    (darwinMinVersionHook "10.13")
-
-    apple-sdk_11
-  ];
-
   dontUseCmakeBuildDir = true;
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index 14b8ff40533a..99c0d234a3e1 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -1,8 +1,6 @@
 {
   lib,
-  apple-sdk_11,
   buildPythonPackage,
-  darwinMinVersionHook,
   fetchFromGitHub,
   pythonOlder,
   stdenv,
@@ -63,13 +61,7 @@ buildPythonPackage rec {
       typing-extensions
     ];
 
-  buildInputs =
-    [ libsoxr ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
-      (darwinMinVersionHook "10.13")
-      apple-sdk_11
-    ];
+  buildInputs = [ libsoxr ];
 
   dependencies = [ numpy ];
 
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 338809a6f97a..eb0d02f8af11 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  apple-sdk_11,
   fetchFromGitHub,
 
   ## wandb-core
@@ -179,8 +178,6 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
-
   dependencies =
     [
       click

From f937f7a3e4c41a9adca2d6d6cadc2c4e9a4b3f81 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:25:03 +0100
Subject: [PATCH 1395/1504] jogl: use new apple sdk pattern

---
 pkgs/by-name/jo/jogl/package.nix | 28 +++++++++++-----------------
 pkgs/top-level/all-packages.nix  |  4 ----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix
index ed4968e78353..5614e73ba0cd 100644
--- a/pkgs/by-name/jo/jogl/package.nix
+++ b/pkgs/by-name/jo/jogl/package.nix
@@ -11,7 +11,6 @@
   udev,
   xorg,
   libgbm,
-  darwin,
   coreutils,
 }:
 
@@ -78,22 +77,17 @@ stdenv.mkDerivation {
       xcbuild
     ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-      xorg.libX11
-      xorg.libXrandr
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXt
-      xorg.libXxf86vm
-      xorg.libXrender
-      libgbm
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk_11_0.frameworks.AppKit
-      darwin.apple_sdk_11_0.frameworks.Cocoa
-    ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXt
+    xorg.libXxf86vm
+    xorg.libXrender
+    libgbm
+  ];
 
   env = {
     SOURCE_LEVEL = "1.8";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..0d4ffc506e45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3854,10 +3854,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  jogl = callPackage ../by-name/jo/jogl/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
-  };
-
   joplin = nodePackages.joplin;
 
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;

From b3df77d150d9cf26549c695bd1f4f1b8b2323d26 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Fri, 3 Jan 2025 12:18:37 -0300
Subject: [PATCH 1396/1504] catboost: tweak, fix build

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/ca/catboost/package.nix | 42 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix
index 1d0ef404a667..93c229d29f1e 100644
--- a/pkgs/by-name/ca/catboost/package.nix
+++ b/pkgs/by-name/ca/catboost/package.nix
@@ -12,13 +12,14 @@
   ragel,
   yasm,
   zlib,
+  gitUpdater,
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
   llvmPackages_12,
   pythonSupport ? false,
 }:
 let
-  inherit (llvmPackages) stdenv;
+  stdenv = if cudaSupport then cudaPackages.backendStdenv else llvmPackages.stdenv;
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "catboost";
     repo = "catboost";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4=";
   };
 
@@ -68,12 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       cctools
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_nvcc
-      ]
-    );
+    ++ lib.optionals cudaSupport [
+      cudaPackages.cuda_nvcc
+    ];
 
   buildInputs =
     [
@@ -83,14 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libiconv
     ]
-    ++ lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cudart
-        cuda_cccl
-        libcublas
-      ]
-    );
+    ++ lib.optionals cudaSupport [
+      cudaPackages.cuda_cudart
+      cudaPackages.cuda_cccl
+      cudaPackages.libcublas
+    ];
 
   env = {
     PROGRAM_VERSION = finalAttrs.version;
@@ -101,6 +96,11 @@ stdenv.mkDerivation (finalAttrs: {
     CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc";
     NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isLinux "-fuse-ld=lld";
     NIX_LDFLAGS = "-lc -lm";
+    NIX_CFLAGS_COMPILE = toString (
+      lib.optionals stdenv.cc.isClang [
+        "-Wno-error=missing-template-arg-list-after-template-kw"
+      ]
+    );
   };
 
   cmakeFlags = [
@@ -123,7 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
     description = "High-performance library for gradient boosting on decision trees";
     longDescription = ''
       A fast, scalable, high performance Gradient Boosting on Decision Trees
@@ -131,10 +133,10 @@ stdenv.mkDerivation (finalAttrs: {
       learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU.
     '';
     changelog = "https://github.com/catboost/catboost/releases/tag/v${finalAttrs.version}";
-    license = licenses.asl20;
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
     homepage = "https://catboost.ai";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       PlushBeaver
       natsukium
     ];

From 67dfca0395112999ca6eec8c6c31045f5d66631b Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:57:07 +0100
Subject: [PATCH 1397/1504] mongodb{,-6_0}: use new apple sdk pattern

---
 pkgs/servers/nosql/mongodb/6.0.nix     |  4 ----
 pkgs/servers/nosql/mongodb/7.0.nix     |  4 ----
 pkgs/servers/nosql/mongodb/mongodb.nix |  4 ----
 pkgs/top-level/all-packages.nix        | 20 ++------------------
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix
index 20adcf8b024c..b23fa286c50a 100644
--- a/pkgs/servers/nosql/mongodb/6.0.nix
+++ b/pkgs/servers/nosql/mongodb/6.0.nix
@@ -4,8 +4,6 @@
   fetchpatch,
   sasl,
   boost,
-  Security,
-  CoreFoundation,
   cctools,
   avxSupport ? stdenv.hostPlatform.avxSupport,
 }:
@@ -15,8 +13,6 @@ let
     inherit
       sasl
       boost
-      Security
-      CoreFoundation
       cctools
       stdenv
       ;
diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix
index 1c6389c8b4d1..6e612b008ce8 100644
--- a/pkgs/servers/nosql/mongodb/7.0.nix
+++ b/pkgs/servers/nosql/mongodb/7.0.nix
@@ -3,8 +3,6 @@
   callPackage,
   sasl,
   boost,
-  Security,
-  CoreFoundation,
   cctools,
   avxSupport ? stdenv.hostPlatform.avxSupport,
   nixosTests,
@@ -16,8 +14,6 @@ let
     inherit
       sasl
       boost
-      Security
-      CoreFoundation
       cctools
       stdenv
       ;
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 88da6993a6d4..9839b4ca949f 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -16,8 +16,6 @@
   openssl,
   libpcap,
   curl,
-  Security,
-  CoreFoundation,
   cctools,
   xz,
 }:
@@ -102,8 +100,6 @@ stdenv.mkDerivation rec {
       zlib
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Security
-      CoreFoundation
       cctools
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux net-snmp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..d388c96931cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11735,30 +11735,14 @@ with pkgs;
 
   mongodb = hiPrio mongodb-7_0;
 
-  mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
+  mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix {
     sasl = cyrus_sasl;
     boost = boost178.override { enableShared = false; };
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-    stdenv = if stdenv.hostPlatform.isDarwin then
-      darwin.apple_sdk_11_0.stdenv.override (old: {
-        hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
-        buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
-        targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
-      }) else
-      if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
   };
 
-  mongodb-7_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/7.0.nix {
+  mongodb-7_0 = callPackage ../servers/nosql/mongodb/7.0.nix {
     sasl = cyrus_sasl;
     boost = boost179.override { enableShared = false; };
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-    stdenv = if stdenv.hostPlatform.isDarwin then
-      darwin.apple_sdk_11_0.stdenv.override (old: {
-        hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
-        buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
-        targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
-      }) else
-      if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
   };
 
   influxdb = callPackage ../servers/nosql/influxdb { };

From c2525c85faca142c7cc49b4a163334aa92daac11 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:09:13 +0100
Subject: [PATCH 1398/1504] grpc: move to pkgs/by-name

---
 .../libraries => by-name/gr}/grpc/dynamic-lookup-darwin.patch | 0
 .../grpc/default.nix => by-name/gr/grpc/package.nix}          | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{development/libraries => by-name/gr}/grpc/dynamic-lookup-darwin.patch (100%)
 rename pkgs/{development/libraries/grpc/default.nix => by-name/gr/grpc/package.nix} (100%)

diff --git a/pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch b/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/grpc/dynamic-lookup-darwin.patch
rename to pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/by-name/gr/grpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/grpc/default.nix
rename to pkgs/by-name/gr/grpc/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..dcf75172c412 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9210,9 +9210,9 @@ with pkgs;
   goocanvas = callPackage ../development/libraries/goocanvas { };
   goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
   goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { };
-  grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc {
+  grpc = callPackage ../by-name/gr/grpc/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
-      then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; }
+      then overrideSDK stdenv { darwinMinVersion = "10.13"; }
       else stdenv;
   };
 

From a748f4ce0750f1c908c2f09069a20f14429d7b4c Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 3 Jan 2025 18:17:21 +0100
Subject: [PATCH 1399/1504] .github/workflows/ofborg-pending.yml: delete
 (#370427)

Ofborg is dead for a few days, so this workflow is useless.

https://discourse.nixos.org/t/infrastructure-announcement-the-future-of-ofborg-your-help-needed/56025
---
 .github/workflows/ofborg-pending.yml | 34 ----------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 .github/workflows/ofborg-pending.yml

diff --git a/.github/workflows/ofborg-pending.yml b/.github/workflows/ofborg-pending.yml
deleted file mode 100644
index 2eba88598d7f..000000000000
--- a/.github/workflows/ofborg-pending.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: "Set pending OfBorg status"
-on:
-  pull_request_target:
-
-# Sets the ofborg-eval status to "pending" to signal that we are waiting for
-# OfBorg even if it is running late. The status will be overwritten by OfBorg
-# once it starts evaluation.
-
-# WARNING:
-# When extending this action, be aware that $GITHUB_TOKEN allows (restricted) write access to
-# the GitHub repository. This means that it should not evaluate user input in a
-# way that allows code injection.
-
-permissions:
-  contents: read
-
-jobs:
-  action:
-    name: set-ofborg-pending
-    if: github.repository_owner == 'NixOS'
-    permissions:
-      statuses: write
-    runs-on: ubuntu-latest
-    steps:
-    - name: "Set pending OfBorg status"
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        curl \
-          -X POST \
-          -H "Accept: application/vnd.github.v3+json" \
-          -H "Authorization: Bearer $GITHUB_TOKEN" \
-          -d '{"context": "ofborg-eval", "state": "pending", "description": "Waiting for OfBorg..."}' \
-          "https://api.github.com/repos/NixOS/nixpkgs/commits/${{ github.event.pull_request.head.sha }}/statuses"

From 6fb35933b5fe0f921a1ae728c036c18b9bd9dc52 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 31 Dec 2024 10:45:15 +0100
Subject: [PATCH 1400/1504] pdfposter: unbreak

---
 pkgs/by-name/pd/pdfposter/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pd/pdfposter/package.nix b/pkgs/by-name/pd/pdfposter/package.nix
index f4f36d3291f7..e241327cf2de 100644
--- a/pkgs/by-name/pd/pdfposter/package.nix
+++ b/pkgs/by-name/pd/pdfposter/package.nix
@@ -12,6 +12,7 @@ let
       pypdf2 = super.pypdf2.overridePythonAttrs (oldAttrs: rec {
         version = "2.11.1";
         format = "setuptools";
+        pyproject = null;
         src = fetchPypi {
           pname = "PyPDF2";
           inherit version;

From c5eecdd3b781a40d5b55875678e95d270ba55726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 09:33:38 -0800
Subject: [PATCH 1401/1504] python312Packages.imgw-pib: 1.0.7 -> 1.0.8

Diff: https://github.com/bieniu/imgw-pib/compare/refs/tags/1.0.7...1.0.8

Changelog: https://github.com/bieniu/imgw-pib/releases/tag/1.0.8
---
 pkgs/development/python-modules/imgw-pib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix
index a43678b4ff8d..62f5f215c9c7 100644
--- a/pkgs/development/python-modules/imgw-pib/default.nix
+++ b/pkgs/development/python-modules/imgw-pib/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "imgw-pib";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "imgw-pib";
     tag = version;
-    hash = "sha256-vhLBnUjCq9OUQViVWJT6jgcEeRYsjz307x1o28ZUv0g=";
+    hash = "sha256-whHqW43RiG2fYAI3+S2S5cvcqIHnF7/qon6ymeBCrPk=";
   };
 
   build-system = [ setuptools ];

From 1fac09ca92a55fbd16d4163ed7ebef2b0e2fea40 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:27:36 +0100
Subject: [PATCH 1402/1504] bazel_5: use new apple sdk pattern

---
 .../tools/build-managers/bazel/bazel_5/default.nix     | 10 ----------
 pkgs/top-level/all-packages.nix                        |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
index f33c716b1e82..5fd35f3cb914 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
@@ -30,9 +30,6 @@
   cctools,
   libcxx,
   sigtool,
-  CoreFoundation,
-  CoreServices,
-  Foundation,
   # Allow to independently override the jdks used to build and run respectively
   buildJdk,
   runJdk,
@@ -455,10 +452,6 @@ stdenv.mkDerivation rec {
         # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
         export GCOV=${coreutils}/bin/false
 
-        # Framework search paths aren't added by bintools hook
-        # https://github.com/NixOS/nixpkgs/pull/41914
-        export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
-
         # libcxx includes aren't added by libcxx hook
         # https://github.com/NixOS/nixpkgs/pull/41589
         export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
@@ -633,9 +626,6 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       cctools
       libcxx
-      CoreFoundation
-      CoreServices
-      Foundation
     ];
 
   # Bazel makes extensive use of symlinks in the WORKSPACE.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..04f8516c21a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7724,10 +7724,9 @@ with pkgs;
 
   bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
     inherit (darwin) sigtool;
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk11_headless;
     runJdk = jdk11_headless;
-    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv
+    stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
       else if stdenv.cc.isGNU then gcc12Stdenv
       else stdenv;
     bazel_self = bazel_5;

From 2e4aa2b7ab0589191a250c2ce8127dc9070226fd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:27:54 +0100
Subject: [PATCH 1403/1504] bazel_6: use new apple sdk pattern

---
 .../tools/build-managers/bazel/bazel_6/default.nix        | 8 ++------
 pkgs/top-level/all-packages.nix                           | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
index b1069673f14a..7d339dec2c96 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
@@ -8,7 +8,7 @@
 # updater
 , python3, writeScript
 # Apple dependencies
-, cctools, libcxx, CoreFoundation, CoreServices, Foundation, sigtool
+, cctools, libcxx, sigtool
 # Allow to independently override the jdks used to build and run respectively
 , buildJdk, runJdk
 , runtimeShell
@@ -415,10 +415,6 @@ stdenv.mkDerivation rec {
       # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
       export GCOV=${coreutils}/bin/false
 
-      # Framework search paths aren't added by bintools hook
-      # https://github.com/NixOS/nixpkgs/pull/41914
-      export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
-
       # libcxx includes aren't added by libcxx hook
       # https://github.com/NixOS/nixpkgs/pull/41589
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
@@ -583,7 +579,7 @@ stdenv.mkDerivation rec {
     which
     zip
     python3.pkgs.absl-py   # Needed to build fish completion
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ];
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool ];
 
   # Bazel makes extensive use of symlinks in the WORKSPACE.
   # This causes problems with infinite symlinks if the build output is in the same location as the
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04f8516c21a5..52fa36ad692d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7732,13 +7732,11 @@ with pkgs;
     bazel_self = bazel_5;
   };
 
-  bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
+  bazel_6 = callPackage ../development/tools/build-managers/bazel/bazel_6 {
     inherit (darwin) sigtool;
-    inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk11_headless;
     runJdk = jdk11_headless;
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv
-      else if stdenv.cc.isClang then llvmPackages.stdenv
+    stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
       else if stdenv.cc.isGNU then gcc12Stdenv
       else stdenv;
     bazel_self = bazel_6;

From 79660b4ef4ea65837a01af0ea6f14a3f622a7c15 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:28:01 +0100
Subject: [PATCH 1404/1504] bazel_7: use new apple sdk pattern

---
 .../tools/build-managers/bazel/bazel_7/default.nix    | 11 -----------
 pkgs/top-level/all-packages.nix                       |  6 ++----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
index a37b28c88c17..cd9acfcfc723 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
@@ -37,10 +37,6 @@
   libcxx,
   libtool,
   sigtool,
-  CoreFoundation,
-  CoreServices,
-  Foundation,
-  IOKit,
   # Allow to independently override the jdks used to build and run respectively
   buildJdk,
   runJdk,
@@ -410,10 +406,6 @@ stdenv.mkDerivation rec {
         # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
         export GCOV=${coreutils}/bin/false
 
-        # Framework search paths aren't added by bintools hook
-        # https://github.com/NixOS/nixpkgs/pull/41914
-        export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks -F${IOKit}/Library/Frameworks"
-
         # libcxx includes aren't added by libcxx hook
         # https://github.com/NixOS/nixpkgs/pull/41589
         export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
@@ -564,9 +556,6 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       cctools
       libcxx
-      Foundation
-      CoreFoundation
-      CoreServices
     ];
 
   # Bazel makes extensive use of symlinks in the WORKSPACE.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52fa36ad692d..ebca858d5514 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7742,13 +7742,11 @@ with pkgs;
     bazel_self = bazel_6;
   };
 
-  bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
+  bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {
     inherit (darwin) sigtool;
-    inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
     buildJdk = jdk21_headless;
     runJdk = jdk21_headless;
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv
-      else if stdenv.cc.isClang then llvmPackages.stdenv
+    stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
       else stdenv;
     bazel_self = bazel_7;
   };

From 7f40a2c2febde0ccc2b22a824d6960170b58df87 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Mon, 30 Dec 2024 15:11:48 +0100
Subject: [PATCH 1405/1504] portfolio: 0.72.2 -> 0.73.0

---
 pkgs/by-name/po/portfolio/package.nix | 40 +++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix
index 9d1b41fa6624..4e0b80d0635c 100644
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "PortfolioPerformance";
-  version = "0.72.2";
+  version = "0.73.0";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-IYidpwN82j/XKUV+Z3V2pNkxTh9BTTCYD+322ILxZgU=";
+    hash = "sha256-GCP1lvdXzvdUMKBZnSyoLBJ3sxI2/4JKAuDrtGZQJxo=";
   };
 
   nativeBuildInputs = [
@@ -49,9 +49,43 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontBuild = true;
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/portfolio
     cp -av ./* $out/portfolio
 
+    # Remove all jna plugins that does not match the system
+    rm -fR $out/portfolio/plugins/com.sun.jna*/com/sun/jna/{\
+    aix-ppc,\
+    aix-ppc64,\
+    darwin-aarch64,\
+    darwin-x86-64,\
+    dragonflybsd-x86-64,\
+    freebsd-aarch64,\
+    freebsd-x86,\
+    freebsd-x86-64,\
+    linux-aarch64,\
+    linux-arm,\
+    linux-armel,\
+    linux-loongarch64,\
+    linux-mips64el,\
+    linux-ppc,\
+    linux-ppc64le,\
+    linux-riscv64,\
+    linux-s390x,\
+    linux-x86,\
+    openbsd-x86,\
+    openbsd-x86-64,\
+    sunos-sparc,\
+    sunos-sparcv9,\
+    sunos-x86,\
+    sunos-x86-64,\
+    win32,\
+    win32-aarch64,\
+    win32-x86,\
+    win32-x86-64\
+    }
+
     makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \
       --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
       --prefix PATH : ${openjdk21}/bin
@@ -61,6 +95,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     cp ${desktopItem}/share/applications/* $out/share/applications
     mkdir -p $out/share/pixmaps
     ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm
+
+    runHook postInstall
   '';
 
   passthru.updateScript = gitUpdater { url = "https://github.com/buchen/portfolio.git"; };

From 9f0b60a08db9932dcb287282d51917dc1196405b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 09:45:16 -0800
Subject: [PATCH 1406/1504] python312Packages.ahocorapy: init at 1.6.2

---
 .../python-modules/ahocorapy/default.nix      | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/ahocorapy/default.nix

diff --git a/pkgs/development/python-modules/ahocorapy/default.nix b/pkgs/development/python-modules/ahocorapy/default.nix
new file mode 100644
index 000000000000..cd4f90e8ae5c
--- /dev/null
+++ b/pkgs/development/python-modules/ahocorapy/default.nix
@@ -0,0 +1,45 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  future,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ahocorapy";
+  version = "1.6.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "abusix";
+    repo = "ahocorapy";
+    tag = version;
+    hash = "sha256-ynVkDnrZ12dpNPoKfUdw0/X06aORFkmXFMVH9u0Payo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    future
+  ];
+
+  pythonImportsCheck = [ "ahocorapy" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests/ahocorapy_test.py"
+  ];
+
+  meta = {
+    changelog = "https://github.com/abusix/ahocorapy/blob/${src.tag}/CHANGELOG";
+    description = "Pure python Aho-Corasick library";
+    homepage = "https://github.com/abusix/ahocorapy";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 959365d03a30..cc05102e2f8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -131,6 +131,8 @@ self: super: with self; {
 
   aggdraw = callPackage ../development/python-modules/aggdraw { };
 
+  ahocorapy = callPackage ../development/python-modules/ahocorapy { };
+
   ahocorasick-rs = callPackage ../development/python-modules/ahocorasick-rs { };
 
   aigpy = callPackage ../development/python-modules/aigpy { };

From cf837ebe92085575ad57fbd8642fb38e197ac697 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 17:49:57 +0000
Subject: [PATCH 1407/1504] memtester: 4.7.0 -> 4.7.1

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

diff --git a/pkgs/by-name/me/memtester/package.nix b/pkgs/by-name/me/memtester/package.nix
index 557ff9d6c94f..7ced9be0a7bb 100644
--- a/pkgs/by-name/me/memtester/package.nix
+++ b/pkgs/by-name/me/memtester/package.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "memtester";
-  version = "4.7.0";
+  version = "4.7.1";
 
   preConfigure = ''
     echo "$CC" > conf-cc
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
-    sha256 = "sha256-MycYBfiqMMEZ+79exOeimOn0wrydLZMCAio+0wHrcCg=";
+    sha256 = "sha256-5CfeZj970i0evuivElBqhSwBC9T8vKHg5rApctKYtbs=";
   };
 
   installFlags = [ "INSTALLPATH=$(out)" ];

From 14a209797201a28c3bca21dcb12229d6168df9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 09:41:40 -0800
Subject: [PATCH 1408/1504] python312Packages.beacontools: init at 2.1.0

---
 .../python-modules/beacontools/default.nix    | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/beacontools/default.nix

diff --git a/pkgs/development/python-modules/beacontools/default.nix b/pkgs/development/python-modules/beacontools/default.nix
new file mode 100644
index 000000000000..8e6315db900f
--- /dev/null
+++ b/pkgs/development/python-modules/beacontools/default.nix
@@ -0,0 +1,53 @@
+{
+  ahocorapy,
+  buildPythonPackage,
+  construct,
+  fetchFromGitHub,
+  lib,
+  pybluez,
+  pytestCheckHook,
+  setuptools,
+  stdenv,
+}:
+
+buildPythonPackage rec {
+  pname = "beacontools";
+  version = "2.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "citruz";
+    repo = "beacontools";
+    tag = "v${version}";
+    hash = "sha256-3a/HDssOqIfReSijRvmiXwuZjvWLJfDaDyUdA2vv/jA=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRelaxDeps = [
+    "ahocorapy"
+  ];
+
+  dependencies = [
+    ahocorapy
+    construct
+  ];
+
+  optional-dependencies = {
+    scan = lib.optionals stdenv.hostPlatform.isLinux [ pybluez ];
+  };
+
+  pythonImportsCheck = [ "beacontools" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/citruz/beacontools/releases/tag/${src.tag}";
+    description = "Python library for working with various types of Bluetooth LE Beacons";
+    homepage = "https://github.com/citruz/beacontools";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cc05102e2f8d..8b08a9a7abfa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1567,6 +1567,8 @@ self: super: with self; {
 
   bdffont = callPackage ../development/python-modules/bdffont { };
 
+  beacontools = callPackage ../development/python-modules/beacontools { };
+
   beaker = callPackage ../development/python-modules/beaker { };
 
   before-after = callPackage ../development/python-modules/before-after { };

From 2c596c1cb249ccf41c48bb3988b4fafd7a5bdc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 09:50:34 -0800
Subject: [PATCH 1409/1504] home-assistant: support eddystone_temperature
 component

---
 pkgs/servers/home-assistant/component-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 11305c417806..464c96cd15e5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1323,8 +1323,12 @@
         aioecowitt
       ];
     "eddystone_temperature" =
-      ps: with ps; [
-      ]; # missing inputs: beacontools
+      ps:
+      with ps;
+      [
+        beacontools
+      ]
+      ++ beacontools.optional-dependencies.scan;
     "edimax" =
       ps: with ps; [
         pyedimax

From db7b7fa9852ab3d8b9759425c10c5a7f8e4b6de4 Mon Sep 17 00:00:00 2001
From: Nicola Squartini <tensor5@gmail.com>
Date: Fri, 3 Jan 2025 18:57:32 +0100
Subject: [PATCH 1410/1504] bitbox: add more meta-attributes

---
 pkgs/by-name/bi/bitbox/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index b59bad835f55..cb040646f516 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -81,9 +81,14 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Companion app for the BitBox02 hardware wallet";
     homepage = "https://bitbox.swiss/app/";
+    downloadPage = "https://github.com/BitBoxSwiss/bitbox-wallet-app";
+    changelog = "https://github.com/BitBoxSwiss/bitbox-wallet-app/blob/master/CHANGELOG.md#${
+      builtins.replaceStrings [ "." ] [ "" ] version
+    }";
     license = lib.licenses.asl20;
-    mainProgram = "bitbox";
     maintainers = [ lib.maintainers.tensor5 ];
+    mainProgram = "bitbox";
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
     platforms = [ "x86_64-linux" ];
   };
 }

From a44a3bc54a62523a4064a7a5a4e4ed4e510bafe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 10:03:11 -0800
Subject: [PATCH 1411/1504] python312Packages.pyjvcprojector: init at 1.1.2

---
 .../python-modules/pyjvcprojector/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyjvcprojector/default.nix

diff --git a/pkgs/development/python-modules/pyjvcprojector/default.nix b/pkgs/development/python-modules/pyjvcprojector/default.nix
new file mode 100644
index 000000000000..470b56b669cb
--- /dev/null
+++ b/pkgs/development/python-modules/pyjvcprojector/default.nix
@@ -0,0 +1,43 @@
+{
+  aiodns,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pyjvcprojector";
+  version = "1.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SteveEasley";
+    repo = "pyjvcprojector";
+    tag = "v${version}";
+    hash = "sha256-ow9pCigbQpxLibIq1hsRifXuzJfbWnqpWmnkM5lC3I4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiodns
+  ];
+
+  pythonImportsCheck = [ "jvcprojector" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/SteveEasley/pyjvcprojector/releases/tag/${src.tag}";
+    description = "Python library for controlling a JVC Projector over a network connection";
+    homepage = "https://github.com/SteveEasley/pyjvcprojector";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 959365d03a30..0a09e942c9d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11882,6 +11882,8 @@ self: super: with self; {
 
   pyjsparser = callPackage ../development/python-modules/pyjsparser { };
 
+  pyjvcprojector = callPackage ../development/python-modules/pyjvcprojector { };
+
   pyjwkest = callPackage ../development/python-modules/pyjwkest { };
 
   pyjwt = callPackage ../development/python-modules/pyjwt { };

From c9589e4a754adba70906779f1685ccce613ac2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 10:04:10 -0800
Subject: [PATCH 1412/1504] home-assistant: support jvc_projector component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 11305c417806..74b572451d7a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2740,7 +2740,8 @@
       ];
     "jvc_projector" =
       ps: with ps; [
-      ]; # missing inputs: pyjvcprojector
+        pyjvcprojector
+      ];
     "kaiterra" =
       ps: with ps; [
       ]; # missing inputs: kaiterra-async-client
@@ -6802,6 +6803,7 @@
     "jewish_calendar"
     "juicenet"
     "justnimbus"
+    "jvc_projector"
     "kaleidescape"
     "keenetic_ndms2"
     "kegtron"

From 3aed333cdeb7d7684f00eb78e175aa0a9ea10049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 18 Nov 2024 14:06:38 -0800
Subject: [PATCH 1413/1504] imagemagick: 7.1.1-40 -> 7.1.1-43

Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-40...7.1.1-43

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
---
 pkgs/applications/graphics/ImageMagick/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 294666f19201..1d83dde7f3db 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch2
 , pkg-config
 , libtool
 , bzip2Support ? true, bzip2
@@ -51,22 +50,15 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-40";
+  version = "7.1.1-43";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-NrTIx1OvwPIeVlA39hGkXZ2Atk4FCsU3/55SZeSc40E=";
+    hash = "sha256-4JzCBKtXiKGLsZ29+7z5U+3aN3ppusQ7mz+sOZYpXGY=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/ImageMagick/ImageMagick/commit/bf5650f0dd41b500102a129d6867cb568f4edee4.patch";
-      hash = "sha256-nxvSTyNZ35DqjR41nM5uidWwRFWzd1e/LFE0n3fpbb8=";
-    })
-  ];
-
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
   outputMan = "out"; # it's tiny
 

From d584a8bb0d54fa041654481bd264ac934b4b5e49 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:56:52 +0100
Subject: [PATCH 1414/1504] virtualbox: fix X11 shared clipboard

Since the update to version 7.1.4,
clipboard sharing is broken if the host runs in X11.
The exact preconditions to trigger the bug are still unclear to me:
It can reliably be reproduced if the host
runs within a plasma5 desktop environemnt,
while the bug does not occur in an Xfce environment.
The guest OS doesn't seem to matter
(tested with Windows 11 and NixOS).

Corresponding log messages (virtualbox machine log) are:

> Shared Clipboard: Initializing X11 clipboard (regular mode)
> Shared Clipboard: libxFixes.so.* not found!
> Shared Clipboard: Failed to load the XFIXES extension
> Shared Clipboard: Initialisation failed: VERR_NOT_SUPPORTED
> Shared Clipboard: X11 event thread reported an error while starting

The underlying problem here is that virtualbox
dlopens `libXfixes.so.*` which is not in the RPATH:
https://github.com/mirror/vbox/blob/74117a1cb257c00e2a92cf522e8e930bd1c4d64b/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp#L961

To fix the issue, the commit at hand does what has already been
done for other libraries (like `libpulse` or `libasound`):
The full path to the library is patched into the dlopen call.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index e734319a7a19..be348027945a 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -14,6 +14,7 @@
   xorgproto,
   libXext,
   libXcursor,
+  libXfixes,
   libXmu,
   libIDL,
   SDL2,
@@ -204,6 +205,9 @@ stdenv.mkDerivation (finalAttrs: {
     grep 'libdbus-1\.so\.3'     src include -rI --files-with-match | xargs sed -i -e '
       s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
 
+    grep 'libXfixes\.so\.3'     src include -rI --files-with-match | xargs sed -i -e '
+      s@"libXfixes\.so\.3"@"${libXfixes.out}/lib/libXfixes.so.3"@g'
+
     grep 'libasound\.so\.2'     src include -rI --files-with-match | xargs sed -i -e '
       s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
 

From fff8abc77b4b73dbeed8c2fbc909c00a3f86ee70 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 26 Oct 2024 23:29:53 -0400
Subject: [PATCH 1415/1504] factorio: use actual args instead of sample in
 download help

Makes it easier for the user since they should no longer have to
manually replace things. Remove the note about the name as it may no
longer be true, and the user now has to care less since the values are
more easily copy-pastable.
---
 pkgs/by-name/fa/factorio/package.nix | 67 ++++++++++++++--------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index 82952186d86e..665c9b729c38 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -40,46 +40,44 @@ let
 
   mods = args.mods or [ ];
 
-  helpMsg = ''
+  helpMsg =
+    { dlName, storeName }:
+    ''
 
-    ===FETCH FAILED===
-    Please ensure you have set the username and token with config.nix, or
-    /etc/nix/nixpkgs-config.nix if on NixOS.
+      ===FETCH FAILED===
+      Please ensure you have set the username and token with config.nix, or
+      /etc/nix/nixpkgs-config.nix if on NixOS.
 
-    Your token can be seen at https://factorio.com/profile (after logging in). It is
-    not as sensitive as your password, but should still be safeguarded. There is a
-    link on that page to revoke/invalidate the token, if you believe it has been
-    leaked or wish to take precautions.
+      Your token can be seen at https://factorio.com/profile (after logging in). It is
+      not as sensitive as your password, but should still be safeguarded. There is a
+      link on that page to revoke/invalidate the token, if you believe it has been
+      leaked or wish to take precautions.
 
-    Example:
-    {
-      packageOverrides = pkgs: {
-        factorio = pkgs.factorio.override {
-          username = "FactorioPlayer1654";
-          token = "d5ad5a8971267c895c0da598688761";
+      Example:
+      {
+        packageOverrides = pkgs: {
+          factorio = pkgs.factorio.override {
+            username = "FactorioPlayer1654";
+            token = "d5ad5a8971267c895c0da598688761";
+          };
         };
-      };
-    }
+      }
 
-    Alternatively, instead of providing the username+token, you may manually
-    download the release through https://factorio.com/download , then add it to
-    the store using e.g.:
+      Alternatively, instead of providing the username+token, you may manually
+      download the release through https://factorio.com/download , then add it to
+      the store using e.g.:
 
-      releaseType=alpha
-      version=0.17.74
-      nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz
+        nix-prefetch-url file://\''$HOME/Downloads/${dlName} --name ${storeName}
 
-    Note the ultimate "_" is replaced with "-" in the --name arg!
+      If you go this route you might want to tell Nix to explicitly hold on to the
+      source tarball. Otherwise it could get GC'd from the Nix store and you'd
+      have to redownload it next time the package wants to rebuild to use a newer
+      dependency. E.g. if you're using NixOS:
 
-    If you go this route you might want to tell Nix to explicitly hold on to the
-    source tarball. Otherwise it could get GC'd from the Nix store and you'd
-    have to redownload it next time the package wants to rebuild to use a newer
-    dependency. E.g. if you're using NixOS:
-
-      system.extraDependencies = [
-        factorio.src
-      ];
-  '';
+        system.extraDependencies = [
+          factorio.src
+        ];
+    '';
 
   desktopItem = makeDesktopItem {
     name = "factorio";
@@ -155,7 +153,10 @@ let
                   '';
               failureHook = ''
                 cat <<EOF
-                ${helpMsg}
+                ${helpMsg {
+                  dlName = if candidateHashFilenames != [ ] then builtins.head candidateHashFilenames else name;
+                  storeName = name;
+                }}
                 EOF
               '';
             })

From 5c358db5d7c6c4db806543becce9026b7df9c5a6 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 26 Oct 2024 23:35:02 -0400
Subject: [PATCH 1416/1504] factorio: note that credentials will be
 world-readable in help msg

---
 pkgs/by-name/fa/factorio/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index 665c9b729c38..917c7a2bfb3a 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -48,10 +48,12 @@ let
       Please ensure you have set the username and token with config.nix, or
       /etc/nix/nixpkgs-config.nix if on NixOS.
 
-      Your token can be seen at https://factorio.com/profile (after logging in). It is
-      not as sensitive as your password, but should still be safeguarded. There is a
-      link on that page to revoke/invalidate the token, if you believe it has been
-      leaked or wish to take precautions.
+      Your token can be seen at https://factorio.com/profile (after logging in).
+      Beware this will add the credentials to the Nix store, which is
+      world-readable on the local machine. It is not as sensitive as your
+      password, but should still be safeguarded. There is a link on that page to
+      revoke/invalidate the token, if you believe it has been leaked or wish to
+      take precautions.
 
       Example:
       {

From 22ed6be32516c5c9b4edd1ad52025564d29bbdd1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 3 Jan 2025 21:37:42 +0300
Subject: [PATCH 1417/1504] mesa: 24.3.2 -> 24.3.3

---
 pkgs/development/libraries/mesa/common.nix |  4 ++--
 pkgs/development/libraries/mesa/gbm.nix    | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 1cf2792341ba..7ba7c70bb6d7 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "24.3.2";
+  version = "24.3.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-6EcSOE73wEz+aS4C+GUVfcbJtGB0MvIL4a6zA1ohVGA=";
+    hash = "sha256-OThJ/txyJ6p879jG5qOXX6mL27t7Uz/tbr620iRMeIc=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix
index 61a502adffda..7b4021b37201 100644
--- a/pkgs/development/libraries/mesa/gbm.nix
+++ b/pkgs/development/libraries/mesa/gbm.nix
@@ -15,9 +15,19 @@
 let
   common = import ./common.nix { inherit lib fetchFromGitLab; };
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "mesa-libgbm";
-  inherit (common) version src meta;
+  inherit (common) meta;
+
+  version = "24.3.2";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "mesa";
+    repo = "mesa";
+    rev = "mesa-${version}";
+    hash = "sha256-6EcSOE73wEz+aS4C+GUVfcbJtGB0MvIL4a6zA1ohVGA=";
+  };
 
   mesonAutoFeatures = "disabled";
 

From f5cfa33be109821765638c9e38c37ed542c1993f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 3 Jan 2025 10:33:00 -0800
Subject: [PATCH 1418/1504] python312Packages.img2pdf: skip failing tests

---
 .../python-modules/img2pdf/default.nix        | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index 62efb51697af..4e49d01ad8b6 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -88,6 +88,28 @@ buildPythonPackage rec {
   disabledTests = [
     # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
     "test_miff_cmyk16"
+    # https://gitlab.mister-muffin.de/josch/img2pdf/issues/205
+    "test_miff_cmyk8"
+    "test_miff_rgb8"
+    "test_tiff_ccitt_lsb_m2l_white"
+    "test_tiff_ccitt_msb_l2m_white"
+    "test_tiff_ccitt_msb_m2l_white"
+    "test_tiff_ccitt_nometa1"
+    "test_tiff_ccitt_nometa2"
+    "test_tiff_cmyk8"
+    "test_tiff_cmyk16"
+    "test_tiff_float"
+    "test_tiff_gray1"
+    "test_tiff_gray2"
+    "test_tiff_gray4"
+    "test_tiff_gray8"
+    "test_tiff_gray16"
+    "test_tiff_multipage"
+    "test_tiff_palette8"
+    "test_tiff_rgb8"
+    "test_tiff_rgb12"
+    "test_tiff_rgb14"
+    "test_tiff_rgb16"
   ];
 
   pythonImportsCheck = [ "img2pdf" ];

From 9e93bb5054e38e1028de935262fb55730aabe853 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:17:49 +0530
Subject: [PATCH 1419/1504] jack1: 0.125.0 -> 0.126.0

celt should be pinned to celt_0_7 for compatibility reasons.
Specifically definition of celt_encoder_create, celt_decoder_create functions changed in laters of celt.
This wasn't required in GCC_13 or older because the compiler would ignore it and print just an incompatible pointer to int conversion warning.

Additionally version bumping of jack1 fixes another bug with port_rename_callback definition.
This currently fixes build failure in master.

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/misc/jackaudio/jack1.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 8d30e863fb9a..fa31d8ae5fbb 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -9,7 +9,7 @@
   db ? null,
   libuuid ? null,
   libffado ? null,
-  celt ? null,
+  celt_0_7 ? null,
 
   testers,
 }:
@@ -22,15 +22,15 @@ let
   optDb = shouldUsePkg db;
   optLibuuid = shouldUsePkg libuuid;
   optLibffado = shouldUsePkg libffado;
-  optCelt = shouldUsePkg celt;
+  optCelt = shouldUsePkg celt_0_7;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jack1";
-  version = "0.125.0";
+  version = "0.126.0";
 
   src = fetchurl {
-    url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${finalAttrs.version}.tar.gz";
-    sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm";
+    url = "https://github.com/jackaudio/jack1/releases/download/${finalAttrs.version}/jack1-${finalAttrs.version}.tar.gz";
+    hash = "sha256-eykOnce5JirDKNQe74DBBTyXAT76y++jBHfLmypUReo=";
   };
 
   configureFlags = [

From a5af1da13031048da9c54fdd9c6aef0889585fc1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jan 2025 04:49:32 +1000
Subject: [PATCH 1420/1504] melonDS: 1.0rc-unstable-2024-12-05 ->
 1.0rc-unstable-2024-12-26 (#370301)

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

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index 35ac06ebe2b1..925dd9ae63e8 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0rc-unstable-2024-12-05";
+  version = "1.0rc-unstable-2024-12-26";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "7d718ada390bc54749fa35389437147e1bbefae1";
-    hash = "sha256-Oh69L4yOSeEAAUjUupMN7cQbPEUjZ0M/5FmiBvsBGxw=";
+    rev = "0c5dd28b1c5c1d17a2ce87efbd858059a8f9376f";
+    hash = "sha256-hIpIt+krUpSW1T05Vq02IU5Lfaj4Sgg18qMoMH45NaE=";
   };
 
   nativeBuildInputs = [

From 7d27fd2b04ede95f27fdce6b8902745777ad4844 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Fri, 3 Jan 2025 18:35:56 +0100
Subject: [PATCH 1421/1504] rocmPackages.llvm.clang: remove -nostdlibinc flag

---
 pkgs/build-support/cc-wrapper/default.nix              | 2 +-
 pkgs/development/rocm-modules/5/llvm/base.nix          | 1 +
 pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix | 3 +++
 pkgs/development/rocm-modules/6/llvm/base.nix          | 1 +
 pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix | 3 +++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d9174df31a2a..8558a9f3d8d2 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -639,7 +639,7 @@ stdenvNoCC.mkDerivation {
     # no `/usr/include`, there’s essentially no risk to dropping
     # the flag there. See discussion in NixOS/nixpkgs#191152.
     #
-    + optionalString ((cc.isClang or false) && !targetPlatform.isDarwin) ''
+    + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin) ''
       echo " -nostdlibinc" >> $out/nix-support/cc-cflags
     ''
 
diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix
index 1330d9d84b37..86a865613487 100644
--- a/pkgs/development/rocm-modules/5/llvm/base.nix
+++ b/pkgs/development/rocm-modules/5/llvm/base.nix
@@ -180,6 +180,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     isLLVM = targetDir == "llvm";
     isClang = targetDir == "clang" || builtins.elem "clang" targetProjects;
+    isROCm = true;
 
     updateScript = rocmUpdateScript {
       name = finalAttrs.pname;
diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix
index a0e4e79e4337..c702334140d7 100644
--- a/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix
+++ b/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix
@@ -40,8 +40,11 @@ wrapCCWith rec {
     '';
 
     passthru.isClang = true;
+    passthru.isROCm = true;
   });
 
+  gccForLibs = stdenv.cc.cc;
+
   extraPackages = [
     llvm
     lld
diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix
index bbe964547a9c..8b85ae53bcaa 100644
--- a/pkgs/development/rocm-modules/6/llvm/base.nix
+++ b/pkgs/development/rocm-modules/6/llvm/base.nix
@@ -188,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     isLLVM = targetDir == "llvm";
     isClang = targetDir == "clang" || builtins.elem "clang" targetProjects;
+    isROCm = true;
 
     updateScript = rocmUpdateScript {
       name = finalAttrs.pname;
diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix
index 894ffed8b8b6..4afaa726ad78 100644
--- a/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix
+++ b/pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix
@@ -40,8 +40,11 @@ wrapCCWith rec {
     '';
 
     passthru.isClang = true;
+    passthru.isROCm = true;
   });
 
+  gccForLibs = stdenv.cc.cc;
+
   extraPackages = [
     llvm
     lld

From 962d4a81a4cdb6bc3ae409d11a1fd6183d55d605 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 3 Jan 2025 20:14:27 +0100
Subject: [PATCH 1422/1504] vscode-extensions.visualjj.visualjj: add sources
 for the different architectures

---
 .../extensions/visualjj.visualjj/default.nix  | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 2950e7ab0006..ceece0447b0f 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -1,15 +1,37 @@
 {
+  stdenvNoCC,
   lib,
   vscode-utils,
 }:
 
 vscode-utils.buildVscodeMarketplaceExtension {
-  mktplcRef = {
-    name = "visualjj";
-    publisher = "visualjj";
-    version = "0.13.4";
-    hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM=";
-  };
+  mktplcRef =
+    let
+      sources = {
+        "x86_64-linux" = {
+          arch = "linux-x64";
+          hash = "sha256-q9ubYkhrV28sB9CV1dyBEIFEkTrkGHRXdz5+4xjeVzI=";
+        };
+        "x86_64-darwin" = {
+          arch = "darwin-x64";
+          hash = "sha256-vV5u1QBICz3GIYRgH9UWM38a8YXtvW0u8r7c1SaKwxM=";
+        };
+        "aarch64-linux" = {
+          arch = "linux-arm64";
+          hash = "sha256-fgT4brIhHI6gNCcsbHpz+v4/diyox2VoFlvCnhPIbPM=";
+        };
+        "aarch64-darwin" = {
+          arch = "darwin-arm64";
+          hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM=";
+        };
+      };
+    in
+    {
+      name = "visualjj";
+      publisher = "visualjj";
+      version = "0.13.4";
+    }
+    // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}");
 
   meta = {
     description = "Jujutsu version control integration, for simpler Git workflow";

From 5967f89f74e84c3a8c150098591b47711ccac0a2 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 3 Jan 2025 15:12:26 -0400
Subject: [PATCH 1423/1504] dependency-track: pin nodejs_20 for frontend

Using node 22 results in this error when building:

> npm error node-pre-gyp http GET https://github.com/marudor/libxmljs2/releases/download/v0.33.0/node-v127-linux-x64-glibc.tar.gz
> npm error node-pre-gyp ERR! install request to https://github.com/marudor/libxmljs2/releases/download/v0.33.0/node-v127-linux-x64-glibc.tar.gz failed, reason: getaddrinfo EAI_AGAIN github.com
---
 pkgs/by-name/de/dependency-track/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index 5bbc036f77c5..579fb99badf0 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  nodejs_20,
   jre_headless,
   protobuf,
   cyclonedx-cli,
@@ -17,6 +18,9 @@ let
     pname = "dependency-track-frontend";
     inherit version;
 
+    # TODO: pinned due to build error on node 22
+    nodejs = nodejs_20;
+
     src = fetchFromGitHub {
       owner = "DependencyTrack";
       repo = "frontend";

From f5ef950cfe12ef5f85b10c5cb4ca2f2c3a7c2660 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:45:53 +0530
Subject: [PATCH 1424/1504] pocl: 0.6.0 -> 6.0-unstable-2025-01-02

This fixes build with LLVM 19. The needed commit in question is https://github.com/pocl/pocl/commit/2ec5e820a9b5d58fb770cf9a3dc1795ca1a418d4 but it couldn't be applied automatically due to merge conflict. So let's move to unstable (latest commit as of now).

Additionally add johnrtitor as maintainer

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/po/pocl/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix
index 795a3893d873..4f1d93a72eb8 100644
--- a/pkgs/by-name/po/pocl/package.nix
+++ b/pkgs/by-name/po/pocl/package.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pocl";
-  version = "6.0";
+  version = "6.0-unstable-2025-01-02";
 
   src = fetchFromGitHub {
     owner = "pocl";
     repo = "pocl";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-NHR9yrI6Odb/s/OBnEVifdcLEXvwqzAMZWpGViv2cJg=";
+    rev = "acf4ea163b7346d20b3023d41c1141f094acc755";
+    hash = "sha256-d/BD8YkdMYtu6yFlGNXrsz7PVIrzBvvYLU1JRv7ZJmc=";
   };
 
   cmakeFlags = [
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       jansol
+      johnrtitor
       xddxdd
     ];
     platforms = lib.platforms.unix;

From db3c2922ab7e048b9983535e1acbe7200af07e81 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 3 Jan 2025 16:07:03 +0100
Subject: [PATCH 1425/1504] hyprlandPlugins.hyprfocus: fix build

---
 .../hyprwm/hyprland-plugins/hyprfocus.nix              | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
index a3f80eb83607..befba9e11a3d 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
@@ -3,12 +3,13 @@
   mkHyprlandPlugin,
   hyprland,
   fetchFromGitHub,
+  fetchpatch2,
   nix-update-script,
 }:
 
 mkHyprlandPlugin hyprland {
   pluginName = "hyprfocus";
-  version = "0-unstable-2024-10-09";
+  version = "0-unstable-2024-11-09";
 
   src = fetchFromGitHub {
     owner = "pyt0xic";
@@ -17,6 +18,13 @@ mkHyprlandPlugin hyprland {
     hash = "sha256-qIl7opF7fA1ZmC91TGQ7D12tB7kHc6Sn9DrfUN6sbBY=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/pyt0xic/hyprfocus/commit/e7d9ee3c470b194fe16179ff2f16fc4233e928ef.patch";
+      hash = "sha256-iETrtvoIZfcaD3TcKIIwFL8Rua0dFEqboml9AgQ/RZ0=";
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
 

From 2b969610d645c8a38865aade14daedbdb824f1cd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 19:55:15 +0100
Subject: [PATCH 1426/1504] treewide: replace darwin.apple_sdk_11_0.stdenv with
 stdenv on darwin

---
 pkgs/by-name/ne/nextcloud-client/package.nix  |  3 +-
 pkgs/by-name/op/openimagedenoise/package.nix  |  5 +-
 pkgs/by-name/qo/qownnotes/package.nix         |  2 +-
 .../libraries/mongocxx/default.nix            |  4 +-
 .../libraries/qscintilla/default.nix          |  5 +-
 .../python-modules/openusd/default.nix        |  3 +-
 .../python-modules/python-mapnik/default.nix  |  3 +-
 pkgs/top-level/all-packages.nix               | 47 +++----------------
 pkgs/top-level/qt6-packages.nix               |  2 +-
 9 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 58b8c585037c..2ac1a04ecddb 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -2,6 +2,7 @@
 , gitUpdater
 , fetchFromGitHub
 , qt6Packages
+, stdenv
 , cmake
 , extra-cmake-modules
 , inotify-tools
@@ -18,7 +19,7 @@
 , libsysprof-capture
 }:
 
-qt6Packages.stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "nextcloud-client";
   version = "3.15.2";
 
diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix
index 5f4c4336bba6..f9594f76c48d 100644
--- a/pkgs/by-name/op/openimagedenoise/package.nix
+++ b/pkgs/by-name/op/openimagedenoise/package.nix
@@ -13,10 +13,7 @@
   xcodebuild,
 }:
 
-let
-  stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openimagedenoise";
   version = "2.2.2";
 
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index ac84c552e7ca..c630fd65ddfc 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -17,7 +17,7 @@ let
   appname = "QOwnNotes";
   version = "24.12.7";
 in
-qt6Packages.stdenv.mkDerivation {
+stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix
index 52ad4692ce70..5c27f3275cfb 100644
--- a/pkgs/development/libraries/mongocxx/default.nix
+++ b/pkgs/development/libraries/mongocxx/default.nix
@@ -1,5 +1,5 @@
 { lib
-, pkgs
+, stdenv
 , fetchFromGitHub
 , mongoc
 , openssl
@@ -10,8 +10,6 @@
 , darwin
 }:
 
-let stdenv = if pkgs.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "mongocxx";
   version = "4.0.0";
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index abeecc0782f3..91d349d3eb31 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -10,10 +10,7 @@
   darwin,
 }:
 
-let
-  stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-in
-stdenv'.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qscintilla-qt5";
   version = "2.13.2";
 
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 959014e2513b..10a166ba5877 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -62,8 +62,7 @@ buildPythonPackage rec {
     hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE=";
   };
 
-  stdenv =
-    if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
+  stdenv = python.stdenv;
 
   outputs = [ "out" ] ++ lib.optional withDocs "doc";
 
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index 4f467a84484e..33770c3d8291 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -53,8 +53,7 @@ buildPythonPackage rec {
     ./python-mapnik_std_optional.patch
   ];
 
-  stdenv =
-    if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
+  stdenv = python.stdenv;
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..9c519d7ba428 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3668,9 +3668,7 @@ with pkgs;
 
   haste-client = callPackage ../tools/misc/haste-client { };
 
-  hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
+  hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
 
   halide = callPackage ../development/compilers/halide {
     llvmPackages = llvmPackages_18;
@@ -4672,9 +4670,7 @@ with pkgs;
 
   padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
 
-  pageedit = libsForQt5.callPackage ../applications/office/PageEdit {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
+  pageedit = libsForQt5.callPackage ../applications/office/PageEdit { };
 
   pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
 
@@ -4858,7 +4854,6 @@ with pkgs;
 
   proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
   pws = callPackage ../tools/misc/pws { };
@@ -5259,7 +5254,6 @@ with pkgs;
   };
 
   texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     extraFonts = true;
   };
 
@@ -9052,10 +9046,6 @@ with pkgs;
 
   ghcid = haskellPackages.ghcid.bin;
 
-  gr-framework = callPackage ../by-name/gr/gr-framework/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
-
   graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
 
   libgit2 = callPackage ../development/libraries/libgit2 {
@@ -10364,7 +10354,6 @@ with pkgs;
   };
 
   pcl = libsForQt5.callPackage ../development/libraries/pcl {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
   };
 
@@ -10511,7 +10500,7 @@ with pkgs;
 
   qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
     inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+    inherit stdenv;
   });
 
   quill = callPackage ../tools/security/quill {
@@ -13135,22 +13124,8 @@ with pkgs;
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };
 
-  bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
-    stdenv = if stdenv.hostPlatform.isDarwin then
-      darwin.apple_sdk_11_0.stdenv
-    else
-      stdenv;
-  };
-  bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker {
-    stdenv = if stdenv.hostPlatform.isDarwin then
-      darwin.apple_sdk_11_0.stdenv
-    else
-      stdenv;
-  };
-
-  ptcollab = callPackage ../by-name/pt/ptcollab/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
+  bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
+  bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { };
 
   schismtracker = callPackage ../applications/audio/schismtracker {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -13525,7 +13500,6 @@ with pkgs;
 
   keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc {
     inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication;
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
   evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; };
@@ -15143,9 +15117,7 @@ with pkgs;
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
 
-  quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
+  quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
 
   quasselClient = quassel.override {
     monolithic = false;
@@ -15490,7 +15462,6 @@ with pkgs;
   };
 
   synergy = libsForQt5.callPackage ../applications/misc/synergy {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications;
   };
 
@@ -16030,9 +16001,7 @@ with pkgs;
     lua = lua5_3;
   };
 
-  xpdf = libsForQt5.callPackage ../applications/misc/xpdf {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
+  xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
 
   xmobar = haskellPackages.xmobar.bin;
 
@@ -16151,7 +16120,6 @@ with pkgs;
   };
 
   bitcoin  = libsForQt5.callPackage ../applications/blockchains/bitcoin {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     withGui = true;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
@@ -16663,7 +16631,6 @@ with pkgs;
 
   mudlet = libsForQt5.callPackage ../games/mudlet {
     lua = lua5_1;
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
   };
 
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index d2d084b60b4b..9181e9b53edb 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -27,7 +27,7 @@ makeScopeWithSplicing' {
     inherit (self) callPackage;
     noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ];
   in (noExtraAttrs qt6) // {
-  inherit stdenv;
+  stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv;
 
   # LIBRARIES
   accounts-qt = callPackage ../development/libraries/accounts-qt { };

From 325c094e12a59172fecf499d530e92df09614f08 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 20:57:54 +0100
Subject: [PATCH 1427/1504] python312Packages.keras: disable float64 test on
 darwin

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

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index f35ff2252362..87f241d3b2ab 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -92,6 +92,8 @@ buildPythonPackage rec {
       "test_min_max_norm"
     ]
     ++ lib.optionals stdenv.isDarwin [
+      # TypeError: Cannot convert a MPS Tensor to float64 dtype as the MPS framework doesn't support float64. Please use float32 instead.
+      "test_dynamic_backend_torch"
       # AttributeError: module 'numpy' has no attribute 'float128'. Did you mean: 'float16'?
       "test_spectrogram_error"
     ];

From ff65ee04a617bda9c062abdfc0176aa5b9330d5a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 21:27:54 +0100
Subject: [PATCH 1428/1504] python312Packages.jaxopt: disable more flaky test
 on darwin

---
 pkgs/development/python-modules/jaxopt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix
index b617e21c1c27..ca4eb06034a0 100644
--- a/pkgs/development/python-modules/jaxopt/default.nix
+++ b/pkgs/development/python-modules/jaxopt/default.nix
@@ -94,6 +94,7 @@ buildPythonPackage rec {
       # AssertionError (flaky numerical tests)
       "test_logreg_with_intercept_manual_loop3"
       "test_binary_logit_log_likelihood"
+      "test_inv_hessian_product_pytree3"
     ];
 
   meta = {

From 04456da1d77a4a2253b6c51d8a5ecc497b99ae9f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 22:07:56 +0100
Subject: [PATCH 1429/1504] termusic: move to pkgs/by-name

---
 .../termusic/default.nix => by-name/te/termusic/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{applications/audio/termusic/default.nix => by-name/te/termusic/package.nix} (100%)

diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/by-name/te/termusic/package.nix
similarity index 100%
rename from pkgs/applications/audio/termusic/default.nix
rename to pkgs/by-name/te/termusic/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..9b4b711cb15d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1089,7 +1089,7 @@ with pkgs;
 
   tailwindcss = callPackage ../development/tools/tailwindcss { };
 
-  termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic {
+  termusic = darwin.apple_sdk_11_0.callPackage ../by-name/te/termusic/package.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
   };
 

From 3aefa6206f31e34eff5daba2e3caa074f46e7c55 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 22:15:06 +0100
Subject: [PATCH 1430/1504] termusic: use new apple sdk pattern

---
 pkgs/by-name/te/termusic/package.nix | 16 ----------------
 pkgs/top-level/all-packages.nix      |  4 ----
 2 files changed, 20 deletions(-)

diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index afc767749a3d..a1f7c3beddcd 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -1,23 +1,16 @@
 {
   alsa-lib,
-  AppKit,
-  CoreAudio,
-  CoreGraphics,
   dbus,
-  Foundation,
   fetchFromGitHub,
   fetchpatch,
   glib,
   gst_all_1,
-  IOKit,
   lib,
-  MediaPlayer,
   mpv-unwrapped,
   openssl,
   pkg-config,
   protobuf,
   rustPlatform,
-  Security,
   sqlite,
   stdenv,
 }:
@@ -76,15 +69,6 @@ rustPlatform.buildRustPackage rec {
       openssl
       sqlite
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      AppKit
-      CoreAudio
-      CoreGraphics
-      Foundation
-      IOKit
-      MediaPlayer
-      Security
-    ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
     ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b4b711cb15d..56847ec77853 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1089,10 +1089,6 @@ with pkgs;
 
   tailwindcss = callPackage ../development/tools/tailwindcss { };
 
-  termusic = darwin.apple_sdk_11_0.callPackage ../by-name/te/termusic/package.nix {
-    inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
-  };
-
   ufolint = with python3Packages; toPythonApplication ufolint;
 
   valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };

From e9f23698d0562cd4dce6abd9d28fa70ad3550db6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jan 2025 21:35:47 +0100
Subject: [PATCH 1431/1504] helix: 24.07 -> 25.01

Diff: https://github.com/helix-editor/helix/compare/None...25.01
---
 pkgs/by-name/he/helix/package.nix | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index 1a918acf6e31..549e1ca1b2ba 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -4,21 +4,23 @@
   rustPlatform,
   git,
   installShellFiles,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "helix";
-  version = "24.07";
+  version = "25.01";
 
   # This release tarball includes source code for the tree-sitter grammars,
   # which is not ordinarily part of the repository.
   src = fetchzip {
     url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
-    hash = "sha256-R8foMx7YJ01ZS75275xPQ52Ns2EB3OPop10F4nicmoA=";
+    hash = "sha256-HyDsHimDug+8vX0wfon4pK0DEYH5402CDinp3EZpaWs=";
     stripRoot = false;
   };
 
-  cargoHash = "sha256-Y8zqdS8vl2koXmgFY0hZWWP1ZAO8JgwkoPTYPVpkWsA=";
+  cargoHash = "sha256-G3gJRI12JFk+A4DP65TOcD9jBJvNrb4aPr9V9uv4JP0=";
 
   nativeBuildInputs = [
     git
@@ -39,12 +41,28 @@ rustPlatform.buildRustPackage rec {
     cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
   '';
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  # `hx --version` outputs 25.1 instead of 25.01
+  preVersionCheck = ''
+    export version=${lib.replaceStrings [ ".0" ] [ "." ] version}
+  '';
+  versionCheckProgram = "${placeholder "out"}/bin/hx";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Post-modern modal text editor";
     homepage = "https://helix-editor.com";
-    license = licenses.mpl20;
+    changelog = "https://github.com/helix-editor/helix/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mpl20;
     mainProgram = "hx";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       danth
       yusdacra
       zowoq

From 052f232f4513cab58107ab0c9d9e9bd3f49b8d66 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 22:24:29 +0100
Subject: [PATCH 1432/1504] python312Packages.prophet: 1.1.5 -> 1.1.6

---
 pkgs/development/python-modules/prophet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index 4ccfdb7fc726..710b3e893d72 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "prophet";
-  version = "1.1.5";
+  version = "1.1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "prophet";
-    rev = version;
-    hash = "sha256-liTg5Hm+FPpRQajBnnJKBh3JPGyu0Hflntf0isj1FiQ=";
+    rev = "v${version}";
+    hash = "sha256-vvSn2sVs6KZsTAKPuq9irlHgM1BmpkG8LJbvcu8ohd0=";
   };
 
   sourceRoot = "${src.name}/python";

From 2586c3adf7562aaf5b54f3c2dc84994306fa7a19 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 30 Dec 2024 21:18:46 +0000
Subject: [PATCH 1433/1504] python3Packages.triton: fix pytorch.compile

---
 pkgs/development/python-modules/triton/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 214bc9de1e6a..69ddb4ad716c 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage {
         }
         // lib.optionalAttrs rocmSupport { libhipDir = "${lib.getLib rocmPackages.clr}/lib"; }
         // lib.optionalAttrs cudaSupport {
-          libcudaStubsDir = "${lib.getLib cudaPackages.cuda_cudart}/lib/stubs";
+          libcudaStubsDir = "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs";
           ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib";
         }
       ))
@@ -82,6 +82,15 @@ buildPythonPackage {
     substituteInPlace unittest/CMakeLists.txt \
       --replace-fail "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\
       --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)"
+
+    # Patch the source code to make sure it doesn't specify a non-existent PTXAS version.
+    # CUDA 12.6 (the current default/max) tops out at PTXAS version 8.5.
+    # NOTE: This is fixed in `master`:
+    # https://github.com/triton-lang/triton/commit/f48dbc1b106c93144c198fbf3c4f30b2aab9d242
+    substituteInPlace "$NIX_BUILD_TOP/$sourceRoot/third_party/nvidia/backend/compiler.py" \
+      --replace-fail \
+        'return 80 + minor' \
+        'return 80 + min(minor, 5)'
   '';
 
   build-system = [ setuptools ];

From d3ce52991d3b3632baa7c140304b95b05cbeb71d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 3 Jan 2025 16:05:26 -0600
Subject: [PATCH 1434/1504] buck2: migrate to `pkgs/by-name`

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/build-managers => by-name/bu}/buck2/hashes.json   | 0
 .../buck2/default.nix => by-name/bu/buck2/package.nix}      | 0
 .../tools/build-managers => by-name/bu}/buck2/update.sh     | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{development/tools/build-managers => by-name/bu}/buck2/hashes.json (100%)
 rename pkgs/{development/tools/build-managers/buck2/default.nix => by-name/bu/buck2/package.nix} (100%)
 rename pkgs/{development/tools/build-managers => by-name/bu}/buck2/update.sh (88%)

diff --git a/pkgs/development/tools/build-managers/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json
similarity index 100%
rename from pkgs/development/tools/build-managers/buck2/hashes.json
rename to pkgs/by-name/bu/buck2/hashes.json
diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/by-name/bu/buck2/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/buck2/default.nix
rename to pkgs/by-name/bu/buck2/package.nix
diff --git a/pkgs/development/tools/build-managers/buck2/update.sh b/pkgs/by-name/bu/buck2/update.sh
similarity index 88%
rename from pkgs/development/tools/build-managers/buck2/update.sh
rename to pkgs/by-name/bu/buck2/update.sh
index 179ab6f3601d..309c4a610b91 100755
--- a/pkgs/development/tools/build-managers/buck2/update.sh
+++ b/pkgs/by-name/bu/buck2/update.sh
@@ -22,14 +22,14 @@ ARCHS=(
     "aarch64-darwin:aarch64-apple-darwin"
 )
 
-NFILE=pkgs/development/tools/build-managers/buck2/default.nix
-HFILE=pkgs/development/tools/build-managers/buck2/hashes.json
+NFILE=pkgs/by-name/bu/buck2/package.nix
+HFILE=pkgs/by-name/bu/buck2/hashes.json
 rm -f "$HFILE" && touch "$HFILE"
 
 PRELUDE_SHA256HASH="$(nix-prefetch-url --type sha256 "$PRELUDE_DL_URL")"
 PRELUDE_SRIHASH="$(nix hash to-sri --type sha256 "$PRELUDE_SHA256HASH")"
 
-printf "{ \"_comment\": \"@generated by pkgs/development/tools/build-managers/buck2/update.sh\"\n" >> "$HFILE"
+printf "{ \"_comment\": \"@generated by pkgs/by-name/bu/buck2/update.sh\"\n" >> "$HFILE"
 printf ", \"_prelude\": \"$PRELUDE_SRIHASH\"\n" >> "$HFILE"
 
 for arch in "${ARCHS[@]}"; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d4c053520bf..1a8d19909f4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7851,8 +7851,6 @@ with pkgs;
     python3 = python311;
   };
 
-  buck2 = callPackage ../development/tools/build-managers/buck2 { stdenv = stdenvNoCC; };
-
   build2 = callPackage ../development/tools/build-managers/build2 {
     # Break cycle by using self-contained toolchain for bootstrapping
     build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { };

From 4bc2a5fa129544887d6826a0e26b7e1ee7d49126 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 3 Jan 2025 16:08:32 -0600
Subject: [PATCH 1435/1504] buck2: 2024-10-15 -> 2025-01-02

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/by-name/bu/buck2/hashes.json | 12 ++++++------
 pkgs/by-name/bu/buck2/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json
index a48ac27b94ee..0daa44cb729b 100644
--- a/pkgs/by-name/bu/buck2/hashes.json
+++ b/pkgs/by-name/bu/buck2/hashes.json
@@ -1,7 +1,7 @@
-{ "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh"
-, "_prelude": "sha256-R2aC8tcg21UBEHdQzL4xOnOQc6p48ObvGswGqfmY2WM="
-, "x86_64-linux": "sha256-vyBsK0dj/SYsB36ks8v+ysLC7Pq+Bg1bY3V9Vk+onnE="
-, "x86_64-darwin": "sha256-7QKrAtAiCC8uimA7ttWlTK+JaaHt0p+lYfxGKahQ+Bs="
-, "aarch64-linux": "sha256-Jh+S0eeCZ8DKIZGQWVetQiMshyKgTMPZm9W7U2cpkMk="
-, "aarch64-darwin": "sha256-xEc0DUSjOOthSLCFTq2qZVt4TQL3EpMdl3iaPY6WFgU="
+{ "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh"
+, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs="
+, "x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="
+, "x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="
+, "aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="
+, "aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="
 }
diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix
index 1d603c53938f..c0571aa758be 100644
--- a/pkgs/by-name/bu/buck2/package.nix
+++ b/pkgs/by-name/bu/buck2/package.nix
@@ -44,7 +44,7 @@ let
   buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
 
   # our version of buck2; this should be a git tag
-  version = "2024-10-15";
+  version = "2025-01-02";
 
   # the platform-specific, statically linked binary — which is also
   # zstd-compressed
@@ -72,7 +72,7 @@ let
   # tooling
   prelude-src =
     let
-      prelude-hash = "615f852ad43a901d8a09b2cbbb3aefff61626c52";
+      prelude-hash = "d11a72de049a37b9b218a3ab8db33d3f97b9413c";
       name = "buck2-prelude-${version}.tar.gz";
       hash = buildHashes."_prelude";
       url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz";

From f72531b3e9572d9df5783b161d1f7c55159a90fc Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 3 Jan 2025 23:18:50 +0100
Subject: [PATCH 1436/1504] treewide: move fonts to pkgs/by-name

---
 .../an/ankacoder-condensed/package.nix}       |  0
 .../an/ankacoder/package.nix}                 |  0
 pkgs/by-name/ar/arphic-ukai/package.nix       | 42 ++++++++++
 pkgs/by-name/ar/arphic-uming/package.nix      | 42 ++++++++++
 .../fi/fira-code-symbols/package.nix}         |  0
 .../fi/fira-code/package.nix}                 |  0
 .../ha/hackgen-font/package.nix}              |  0
 .../ha/hackgen-nf-font/package.nix}           |  0
 .../in/inconsolata-lgc/package.nix}           |  0
 .../in/inconsolata/package.nix}               |  0
 .../in/input-fonts/package.nix}               |  0
 .../jo/joypixels/package.nix}                 |  0
 .../na/navilu-font/package.nix}               |  4 +-
 .../pa/paratype-pt-mono/package.nix}          |  0
 .../pa/paratype-pt-sans/package.nix}          |  0
 .../pa/paratype-pt-serif/package.nix}         |  0
 .../pr/profont/package.nix}                   |  4 +-
 pkgs/by-name/ta/tai-ahom/package.nix          | 33 ++++++++
 pkgs/data/fonts/arphic/default.nix            | 82 -------------------
 pkgs/data/fonts/tai-languages/default.nix     | 38 ---------
 pkgs/top-level/all-packages.nix               | 31 -------
 21 files changed, 121 insertions(+), 155 deletions(-)
 rename pkgs/{data/fonts/ankacoder/condensed.nix => by-name/an/ankacoder-condensed/package.nix} (100%)
 rename pkgs/{data/fonts/ankacoder/default.nix => by-name/an/ankacoder/package.nix} (100%)
 create mode 100644 pkgs/by-name/ar/arphic-ukai/package.nix
 create mode 100644 pkgs/by-name/ar/arphic-uming/package.nix
 rename pkgs/{data/fonts/fira-code/symbols.nix => by-name/fi/fira-code-symbols/package.nix} (100%)
 rename pkgs/{data/fonts/fira-code/default.nix => by-name/fi/fira-code/package.nix} (100%)
 rename pkgs/{data/fonts/hackgen/default.nix => by-name/ha/hackgen-font/package.nix} (100%)
 rename pkgs/{data/fonts/hackgen/nerdfont.nix => by-name/ha/hackgen-nf-font/package.nix} (100%)
 rename pkgs/{data/fonts/inconsolata/lgc.nix => by-name/in/inconsolata-lgc/package.nix} (100%)
 rename pkgs/{data/fonts/inconsolata/default.nix => by-name/in/inconsolata/package.nix} (100%)
 rename pkgs/{data/fonts/input-fonts/default.nix => by-name/in/input-fonts/package.nix} (100%)
 rename pkgs/{data/fonts/joypixels/default.nix => by-name/jo/joypixels/package.nix} (100%)
 rename pkgs/{data/fonts/navilu/default.nix => by-name/na/navilu-font/package.nix} (93%)
 rename pkgs/{data/fonts/paratype-pt/mono.nix => by-name/pa/paratype-pt-mono/package.nix} (100%)
 rename pkgs/{data/fonts/paratype-pt/sans.nix => by-name/pa/paratype-pt-sans/package.nix} (100%)
 rename pkgs/{data/fonts/paratype-pt/serif.nix => by-name/pa/paratype-pt-serif/package.nix} (100%)
 rename pkgs/{data/fonts/profont/default.nix => by-name/pr/profont/package.nix} (96%)
 create mode 100644 pkgs/by-name/ta/tai-ahom/package.nix
 delete mode 100644 pkgs/data/fonts/arphic/default.nix
 delete mode 100644 pkgs/data/fonts/tai-languages/default.nix

diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/by-name/an/ankacoder-condensed/package.nix
similarity index 100%
rename from pkgs/data/fonts/ankacoder/condensed.nix
rename to pkgs/by-name/an/ankacoder-condensed/package.nix
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/by-name/an/ankacoder/package.nix
similarity index 100%
rename from pkgs/data/fonts/ankacoder/default.nix
rename to pkgs/by-name/an/ankacoder/package.nix
diff --git a/pkgs/by-name/ar/arphic-ukai/package.nix b/pkgs/by-name/ar/arphic-ukai/package.nix
new file mode 100644
index 000000000000..6df92965f5ef
--- /dev/null
+++ b/pkgs/by-name/ar/arphic-ukai/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  mkfontdir,
+  mkfontscale,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "arphic-ukai";
+  version = "0.2.20080216.2";
+
+  src = fetchurl {
+    url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
+    hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I=";
+  };
+
+  nativeBuildInputs = [
+    mkfontscale
+    mkfontdir
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
+    cd $out/share/fonts
+    mkfontdir
+    mkfontscale
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "CJK Unicode font Kai style";
+    homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
+
+    license = licenses.arphicpl;
+    maintainers = [ maintainers.changlinli ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/by-name/ar/arphic-uming/package.nix b/pkgs/by-name/ar/arphic-uming/package.nix
new file mode 100644
index 000000000000..3d23d2e3c1ce
--- /dev/null
+++ b/pkgs/by-name/ar/arphic-uming/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  mkfontdir,
+  mkfontscale,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "arphic-uming";
+  version = "0.2.20080216.2";
+
+  src = fetchurl {
+    url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
+    hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds=";
+  };
+
+  nativeBuildInputs = [
+    mkfontscale
+    mkfontdir
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
+    cd $out/share/fonts
+    mkfontdir
+    mkfontscale
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "CJK Unicode font Ming style";
+    homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
+
+    license = licenses.arphicpl;
+    maintainers = [ maintainers.changlinli ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/by-name/fi/fira-code-symbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/fira-code/symbols.nix
rename to pkgs/by-name/fi/fira-code-symbols/package.nix
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/by-name/fi/fira-code/package.nix
similarity index 100%
rename from pkgs/data/fonts/fira-code/default.nix
rename to pkgs/by-name/fi/fira-code/package.nix
diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/by-name/ha/hackgen-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/hackgen/default.nix
rename to pkgs/by-name/ha/hackgen-font/package.nix
diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/by-name/ha/hackgen-nf-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/hackgen/nerdfont.nix
rename to pkgs/by-name/ha/hackgen-nf-font/package.nix
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/by-name/in/inconsolata-lgc/package.nix
similarity index 100%
rename from pkgs/data/fonts/inconsolata/lgc.nix
rename to pkgs/by-name/in/inconsolata-lgc/package.nix
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/by-name/in/inconsolata/package.nix
similarity index 100%
rename from pkgs/data/fonts/inconsolata/default.nix
rename to pkgs/by-name/in/inconsolata/package.nix
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/by-name/in/input-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/input-fonts/default.nix
rename to pkgs/by-name/in/input-fonts/package.nix
diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/by-name/jo/joypixels/package.nix
similarity index 100%
rename from pkgs/data/fonts/joypixels/default.nix
rename to pkgs/by-name/jo/joypixels/package.nix
diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/by-name/na/navilu-font/package.nix
similarity index 93%
rename from pkgs/data/fonts/navilu/default.nix
rename to pkgs/by-name/na/navilu-font/package.nix
index e796bebd3bf1..4d9ba79067e9 100644
--- a/pkgs/data/fonts/navilu/default.nix
+++ b/pkgs/by-name/na/navilu-font/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchFromGitHub,
   fontforge,
 }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "navilu-font";
   version = "1.2";
 
diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/paratype-pt/mono.nix
rename to pkgs/by-name/pa/paratype-pt-mono/package.nix
diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/paratype-pt/sans.nix
rename to pkgs/by-name/pa/paratype-pt-sans/package.nix
diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix
similarity index 100%
rename from pkgs/data/fonts/paratype-pt/serif.nix
rename to pkgs/by-name/pa/paratype-pt-serif/package.nix
diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/by-name/pr/profont/package.nix
similarity index 96%
rename from pkgs/data/fonts/profont/default.nix
rename to pkgs/by-name/pr/profont/package.nix
index ed264c41f247..146baa6231d4 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/by-name/pr/profont/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
       sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb";
       stripRoot = false;
     }
-    + /profont-x11;
+    + "/profont-x11";
 
   srcOtb =
     fetchzip {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
       sha256 = "18rfhfqrsj3510by0w1a7ak5as6r2cxh8xv02xc1y30mfa6g24x6";
       stripRoot = false;
     }
-    + /profont-otb;
+    + "/profont-otb";
 
   dontBuild = true;
 
diff --git a/pkgs/by-name/ta/tai-ahom/package.nix b/pkgs/by-name/ta/tai-ahom/package.nix
new file mode 100644
index 000000000000..b588cadc1292
--- /dev/null
+++ b/pkgs/by-name/ta/tai-ahom/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "tai-ahom";
+  version = "unstable-2015-07-06";
+
+  src = fetchurl {
+    url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf";
+    hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4=";
+  };
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/enabling-languages/tai-languages";
+    description = "Unicode-compliant Tai Ahom font";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.ofl; # See font metadata
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
deleted file mode 100644
index e658dcb713ff..000000000000
--- a/pkgs/data/fonts/arphic/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  mkfontdir,
-  mkfontscale,
-}:
-
-let
-  version = "0.2.20080216.2";
-in
-{
-  arphic-ukai = stdenvNoCC.mkDerivation rec {
-    pname = "arphic-ukai";
-    inherit version;
-
-    src = fetchurl {
-      url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
-      hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I=";
-    };
-
-    nativeBuildInputs = [
-      mkfontscale
-      mkfontdir
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
-      cd $out/share/fonts
-      mkfontdir
-      mkfontscale
-
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "CJK Unicode font Kai style";
-      homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
-
-      license = licenses.arphicpl;
-      maintainers = [ maintainers.changlinli ];
-      platforms = platforms.all;
-    };
-  };
-
-  arphic-uming = stdenvNoCC.mkDerivation rec {
-    pname = "arphic-uming";
-    inherit version;
-
-    src = fetchurl {
-      url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
-      hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds=";
-    };
-
-    nativeBuildInputs = [
-      mkfontscale
-      mkfontdir
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
-      cd $out/share/fonts
-      mkfontdir
-      mkfontscale
-
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "CJK Unicode font Ming style";
-      homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/";
-
-      license = licenses.arphicpl;
-      maintainers = [ maintainers.changlinli ];
-      platforms = platforms.all;
-    };
-  };
-}
diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix
deleted file mode 100644
index 97acb4920610..000000000000
--- a/pkgs/data/fonts/tai-languages/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-}:
-
-{
-  tai-ahom = stdenvNoCC.mkDerivation rec {
-    pname = "tai-ahom";
-    version = "unstable-2015-07-06";
-
-    src = fetchurl {
-      url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf";
-      hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4=";
-    };
-
-    dontUnpack = true;
-
-    installPhase = ''
-      runHook preInstall
-
-      install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf
-
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      homepage = "https://github.com/enabling-languages/tai-languages";
-      description = "Unicode-compliant Tai Ahom font";
-      maintainers = with maintainers; [ mathnerd314 ];
-      license = licenses.ofl; # See font metadata
-      platforms = platforms.all;
-    };
-  };
-
-  # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai)
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58f4ab07d90a..8cae33627c19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1645,9 +1645,6 @@ with pkgs;
 
   arpack-mpi = arpack.override { useMpi = true; };
 
-  inherit (callPackages ../data/fonts/arphic {})
-    arphic-ukai arphic-uming;
-
   asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
 
   atomicparsley = callPackage ../tools/video/atomicparsley {
@@ -4380,8 +4377,6 @@ with pkgs;
 
   mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
 
-  navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
-
   nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { });
 
   netcdf-mpi = netcdf.override {
@@ -12711,9 +12706,6 @@ with pkgs;
 
   andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { };
 
-  ankacoder = callPackage ../data/fonts/ankacoder { };
-  ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { };
-
   ant-theme = callPackage ../data/themes/ant-theme/ant.nix { };
 
   ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
@@ -12772,9 +12764,6 @@ with pkgs;
     inherit (nodePackages) svgo;
   };
 
-  fira-code = callPackage ../data/fonts/fira-code { };
-  fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
-
   flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
     inherit (plasma5Packages) breeze-icons;
   };
@@ -12816,22 +12805,10 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  hackgen-font = callPackage ../data/fonts/hackgen { };
-
-  hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { };
-
-  inconsolata = callPackage ../data/fonts/inconsolata { };
-
-  inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { };
-
-  input-fonts = callPackage ../data/fonts/input-fonts { };
-
   iosevka = callPackage ../data/fonts/iosevka { };
   iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { };
   iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {});
 
-  joypixels = callPackage ../data/fonts/joypixels { };
-
   kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { };
 
   kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
@@ -12917,10 +12894,6 @@ with pkgs;
 
   papis = with python3Packages; toPythonApplication papis;
 
-  paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { };
-  paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { };
-  paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { };
-
   plata-theme = callPackage ../data/themes/plata {
     inherit (mate) marco;
   };
@@ -12931,8 +12904,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  profont = callPackage ../data/fonts/profont { };
-
   qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { };
 
   ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
@@ -12973,8 +12944,6 @@ with pkgs;
   source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
   source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
 
-  inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
-
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
     gtk = res.gtk2;
   };

From 652dc876abc6893556984974ccf43aea13401b93 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 3 Jan 2025 23:03:14 +0000
Subject: [PATCH 1437/1504] mimir: 2.14.2 -> 2.15.0

https://github.com/grafana/mimir/blob/mimir-2.15.0/CHANGELOG.md
---
 pkgs/by-name/mi/mimir/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 5e1e4deb449c..fbaad66f3da0 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "mimir";
-  version = "2.14.2";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     rev = "${pname}-${version}";
     owner = "grafana";
     repo = pname;
-    hash = "sha256-y+87cMG9Ilyb99EeLp/UjIEl+5e1zyfoaFLW5i12gGY=";
+    hash = "sha256-mFCeetwMaqdxFt001QUEtoiPupRAtFBkTvIABszPQbc=";
   };
 
   vendorHash = null;

From f3fe7bb95790e29fc5234d105e2470c880884a04 Mon Sep 17 00:00:00 2001
From: weriomat <engel@weriomat.com>
Date: Sat, 4 Jan 2025 00:15:50 +0100
Subject: [PATCH 1438/1504] pingvin-share: 1.7.1 -> 1.8.0

---
 pkgs/servers/pingvin-share/backend.nix  | 2 +-
 pkgs/servers/pingvin-share/default.nix  | 4 ++--
 pkgs/servers/pingvin-share/frontend.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix
index 258ed2da3ef5..4a8330992cdd 100644
--- a/pkgs/servers/pingvin-share/backend.nix
+++ b/pkgs/servers/pingvin-share/backend.nix
@@ -31,7 +31,7 @@ buildNpmPackage {
     prisma
   ];
 
-  npmDepsHash = "sha256-SBVkrrNKD3hCf1dT4ZWXYcQCat+wVQ9+ti1d0hfpWIw=";
+  npmDepsHash = "sha256-zzN4r2hednmm5DFnK/RRTKPq0vWiGhG+WyNTPNNP1vc=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 
diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix
index f6169075f43e..dd46f4e0d383 100644
--- a/pkgs/servers/pingvin-share/default.nix
+++ b/pkgs/servers/pingvin-share/default.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.7.1";
+  version = "1.8.0";
   src = fetchFromGitHub {
     owner = "stonith404";
     repo = "pingvin-share";
     rev = "v${version}";
-    hash = "sha256-XchwPP573z4tzwAlSdWwi0aZwNlLcL1wGGgGyYgJAWg=";
+    hash = "sha256-cgB2cnpWdQFqdz9Lxyl87MOvhELge0YwwY0AoKqL8BU=";
   };
 in
 
diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix
index 810448aca363..b9248737fb7f 100644
--- a/pkgs/servers/pingvin-share/frontend.nix
+++ b/pkgs/servers/pingvin-share/frontend.nix
@@ -23,7 +23,7 @@ buildNpmPackage {
   buildInputs = [ vips ];
   nativeBuildInputs = [ pkg-config ];
 
-  npmDepsHash = "sha256-TC5yMvAXO3oKRhyVgGAiXT213vvv+cOxY4z6vQU1gX4=";
+  npmDepsHash = "sha256-wQIQHRVj8weUh/VOBdYVr8Q4ZE9u4rGJbQr0+NE6XG0=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 

From 896be7ba148917d93fb4aa6c9c0e883faaf3f498 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:15:06 +0100
Subject: [PATCH 1439/1504] treewide: replace darwin.apple_sdk_11_0.stdenv with
 stdenv on darwin

---
 .../default.nix => by-name/ch/chatterino2/package.nix} |  0
 .../default.nix => by-name/li/libjodycode/package.nix} |  0
 pkgs/top-level/all-packages.nix                        | 10 ----------
 3 files changed, 10 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/chatterino2/default.nix => by-name/ch/chatterino2/package.nix} (100%)
 rename pkgs/{development/libraries/libjodycode/default.nix => by-name/li/libjodycode/package.nix} (100%)

diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/by-name/ch/chatterino2/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/chatterino2/default.nix
rename to pkgs/by-name/ch/chatterino2/package.nix
diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/by-name/li/libjodycode/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjodycode/default.nix
rename to pkgs/by-name/li/libjodycode/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73be6f12fcbb..c9171776d3d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9482,11 +9482,6 @@ with pkgs;
 
   json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
 
-  libjodycode = callPackage ../development/libraries/libjodycode {
-    # missing aligned_alloc()
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
-
   kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
 
   keybinder = callPackage ../development/libraries/keybinder {
@@ -15890,10 +15885,6 @@ with pkgs;
     xwaylandSupport = false;
   };
 
-  chatterino2 = callPackage ../applications/networking/instant-messengers/chatterino2 {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
-
   wgnord = callPackage ../applications/networking/wgnord/default.nix { };
 
   whalebird = callPackage ../applications/misc/whalebird {
@@ -16159,7 +16150,6 @@ with pkgs;
   };
 
   groestlcoin  = libsForQt5.callPackage ../applications/blockchains/groestlcoin {
-    stdenv = darwin.apple_sdk_11_0.stdenv;
     withGui = true;
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From 0cd04d30366f52fe9dd7664fb7decf4b93b1d789 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 3 Jan 2025 21:24:13 +0100
Subject: [PATCH 1440/1504] treewide: migrate fetchgit `rev = "refs/tags/..."`
 to `tag`

---
 pkgs/applications/audio/greg/default.nix                      | 2 +-
 pkgs/applications/audio/littlegptracker/default.nix           | 2 +-
 pkgs/applications/audio/pithos/default.nix                    | 2 +-
 pkgs/applications/audio/puddletag/default.nix                 | 2 +-
 pkgs/applications/audio/zynaddsubfx/default.nix               | 2 +-
 pkgs/applications/editors/lapce/default.nix                   | 2 +-
 pkgs/applications/editors/manuskript/default.nix              | 2 +-
 pkgs/applications/editors/retext/default.nix                  | 2 +-
 pkgs/applications/emulators/dolphin-emu/default.nix           | 2 +-
 pkgs/applications/graphics/eddy/default.nix                   | 2 +-
 pkgs/applications/graphics/f3d/default.nix                    | 2 +-
 pkgs/applications/graphics/hydrus/default.nix                 | 2 +-
 .../graphics/inkscape/extensions/silhouette/default.nix       | 2 +-
 .../graphics/inkscape/extensions/textext/default.nix          | 2 +-
 pkgs/applications/graphics/ipe/default.nix                    | 2 +-
 pkgs/applications/misc/cask-server/default.nix                | 2 +-
 pkgs/applications/misc/databricks-sql-cli/default.nix         | 2 +-
 pkgs/applications/misc/electron-cash/default.nix              | 2 +-
 pkgs/applications/misc/golden-cheetah/default.nix             | 2 +-
 pkgs/applications/misc/gramps/default.nix                     | 2 +-
 pkgs/applications/misc/html5validator/default.nix             | 2 +-
 pkgs/applications/misc/inkcut/default.nix                     | 2 +-
 pkgs/applications/misc/maliit-framework/default.nix           | 2 +-
 pkgs/applications/misc/mbutil/default.nix                     | 2 +-
 pkgs/applications/misc/meerk40t/default.nix                   | 2 +-
 pkgs/applications/misc/ola/default.nix                        | 2 +-
 pkgs/applications/misc/pagefind/default.nix                   | 2 +-
 pkgs/applications/misc/remarkable/rmview/default.nix          | 2 +-
 pkgs/applications/misc/rofi-rbw/default.nix                   | 2 +-
 pkgs/applications/networking/cloudflared/default.nix          | 2 +-
 pkgs/applications/networking/cluster/tftui/default.nix        | 2 +-
 pkgs/applications/networking/cluster/tubekit/default.nix      | 2 +-
 pkgs/applications/networking/feedreaders/rssguard/default.nix | 2 +-
 pkgs/applications/networking/gopher/phetch/default.nix        | 2 +-
 .../networking/instant-messengers/twitch-tui/default.nix      | 2 +-
 pkgs/applications/networking/maestral-qt/default.nix          | 2 +-
 pkgs/applications/networking/pjsip/default.nix                | 2 +-
 pkgs/applications/networking/protonvpn-cli/default.nix        | 2 +-
 pkgs/applications/networking/protonvpn-gui/default.nix        | 2 +-
 pkgs/applications/networking/syncplay/default.nix             | 2 +-
 pkgs/applications/networking/syncthing/default.nix            | 2 +-
 pkgs/applications/networking/twtxt/default.nix                | 2 +-
 pkgs/applications/office/qnotero/default.nix                  | 2 +-
 pkgs/applications/radio/btlejack/default.nix                  | 2 +-
 pkgs/applications/science/astronomy/calcmysky/default.nix     | 2 +-
 pkgs/applications/science/biology/ants/default.nix            | 2 +-
 pkgs/applications/science/biology/mrtrix/default.nix          | 2 +-
 pkgs/applications/science/chemistry/autodock-vina/default.nix | 2 +-
 .../science/computer-architecture/qtrvsim/default.nix         | 2 +-
 pkgs/applications/science/electronics/degate/default.nix      | 2 +-
 pkgs/applications/science/electronics/gerbv/default.nix       | 2 +-
 pkgs/applications/science/misc/nextinspace/default.nix        | 2 +-
 pkgs/applications/science/robotics/mavproxy/default.nix       | 2 +-
 pkgs/applications/system/glances/default.nix                  | 2 +-
 .../terminal-emulators/cool-retro-term/default.nix            | 2 +-
 pkgs/applications/terminal-emulators/kitty/default.nix        | 2 +-
 pkgs/applications/version-management/git-absorb/default.nix   | 2 +-
 pkgs/applications/version-management/gitlint/default.nix      | 2 +-
 .../version-management/pass-git-helper/default.nix            | 2 +-
 pkgs/applications/video/go2tv/default.nix                     | 2 +-
 pkgs/applications/video/openshot-qt/default.nix               | 2 +-
 pkgs/applications/video/plex-mpv-shim/default.nix             | 2 +-
 pkgs/applications/video/rtabmap/default.nix                   | 2 +-
 pkgs/applications/window-managers/cage/default.nix            | 2 +-
 .../applications/window-managers/hyprwm/hyprshade/default.nix | 2 +-
 .../hyprwm/xdg-desktop-portal-hyprland/default.nix            | 2 +-
 pkgs/applications/window-managers/i3/default.nix              | 2 +-
 pkgs/by-name/_1/_1oom/package.nix                             | 2 +-
 pkgs/by-name/_2/_2ship2harkinian/package.nix                  | 2 +-
 pkgs/by-name/aa/aactivator/package.nix                        | 2 +-
 pkgs/by-name/ab/abcmidi/package.nix                           | 2 +-
 pkgs/by-name/ab/abctl/package.nix                             | 2 +-
 pkgs/by-name/ab/above/package.nix                             | 2 +-
 pkgs/by-name/ab/abpoa/package.nix                             | 4 ++--
 pkgs/by-name/ac/ac-library/package.nix                        | 2 +-
 pkgs/by-name/ac/acme-sh/package.nix                           | 2 +-
 pkgs/by-name/ac/acpica-tools/package.nix                      | 2 +-
 pkgs/by-name/ac/acr-cli/package.nix                           | 2 +-
 pkgs/by-name/ac/act/package.nix                               | 2 +-
 pkgs/by-name/ad/ad/package.nix                                | 2 +-
 pkgs/by-name/ad/adafruit-nrfutil/package.nix                  | 2 +-
 pkgs/by-name/ad/adalanche/package.nix                         | 2 +-
 pkgs/by-name/ad/addwater/package.nix                          | 2 +-
 pkgs/by-name/ad/adminer-pematon/package.nix                   | 2 +-
 pkgs/by-name/ad/adolc/package.nix                             | 2 +-
 pkgs/by-name/ad/adw-gtk3/package.nix                          | 2 +-
 pkgs/by-name/ad/adwsteamgtk/package.nix                       | 2 +-
 pkgs/by-name/ae/aeacus/package.nix                            | 2 +-
 pkgs/by-name/ai/aider-chat/package.nix                        | 2 +-
 pkgs/by-name/ai/aiodnsbrute/package.nix                       | 2 +-
 pkgs/by-name/ai/airgeddon/package.nix                         | 2 +-
 pkgs/by-name/ai/airgorah/package.nix                          | 2 +-
 pkgs/by-name/ai/airscan/package.nix                           | 2 +-
 pkgs/by-name/al/alacritty/package.nix                         | 2 +-
 pkgs/by-name/al/albedo/package.nix                            | 2 +-
 pkgs/by-name/al/alcom/package.nix                             | 2 +-
 pkgs/by-name/al/alexandria/package.nix                        | 2 +-
 pkgs/by-name/al/ali/package.nix                               | 2 +-
 pkgs/by-name/al/aliae/package.nix                             | 2 +-
 pkgs/by-name/al/alioth/package.nix                            | 2 +-
 pkgs/by-name/al/alist/package.nix                             | 2 +-
 pkgs/by-name/al/almo/package.nix                              | 2 +-
 pkgs/by-name/al/alock/package.nix                             | 2 +-
 pkgs/by-name/al/alot/package.nix                              | 2 +-
 pkgs/by-name/al/alsaequal/package.nix                         | 2 +-
 pkgs/by-name/al/alterx/package.nix                            | 2 +-
 pkgs/by-name/al/alttpr-opentracker/package.nix                | 2 +-
 pkgs/by-name/al/alvr/package.nix                              | 2 +-
 pkgs/by-name/am/amass/package.nix                             | 2 +-
 pkgs/by-name/am/amazon-ec2-utils/package.nix                  | 2 +-
 pkgs/by-name/am/amazon-ssm-agent/package.nix                  | 2 +-
 pkgs/by-name/am/ameba/package.nix                             | 2 +-
 pkgs/by-name/am/amiberry/package.nix                          | 2 +-
 pkgs/by-name/am/amneziawg-tools/package.nix                   | 2 +-
 pkgs/by-name/an/andi/package.nix                              | 2 +-
 pkgs/by-name/an/ani-skip/package.nix                          | 2 +-
 pkgs/by-name/an/ansible-language-server/package.nix           | 2 +-
 pkgs/by-name/an/antares/package.nix                           | 2 +-
 pkgs/by-name/an/antiprism/package.nix                         | 2 +-
 pkgs/by-name/ap/apache-answer/package.nix                     | 2 +-
 pkgs/by-name/ap/apachetomcatscanner/package.nix               | 2 +-
 pkgs/by-name/ap/apfsprogs/package.nix                         | 2 +-
 pkgs/by-name/ap/apgdiff/package.nix                           | 2 +-
 pkgs/by-name/ap/aphorme/package.nix                           | 2 +-
 pkgs/by-name/ap/apkid/package.nix                             | 2 +-
 pkgs/by-name/ap/apkleaks/package.nix                          | 2 +-
 pkgs/by-name/ap/apksigcopier/package.nix                      | 2 +-
 pkgs/by-name/ap/application-title-bar/package.nix             | 2 +-
 pkgs/by-name/ap/apvlv/package.nix                             | 2 +-
 pkgs/by-name/ar/archimede/package.nix                         | 2 +-
 pkgs/by-name/ar/arduino-language-server/package.nix           | 2 +-
 pkgs/by-name/ar/ares-rs/package.nix                           | 2 +-
 pkgs/by-name/ar/argo/package.nix                              | 2 +-
 pkgs/by-name/ar/argon/package.nix                             | 2 +-
 pkgs/by-name/ar/arjun/package.nix                             | 2 +-
 pkgs/by-name/ar/ark-pixel-font/package.nix                    | 2 +-
 pkgs/by-name/ar/arxiv-latex-cleaner/package.nix               | 2 +-
 pkgs/by-name/as/ascii-draw/package.nix                        | 2 +-
 pkgs/by-name/as/asn/package.nix                               | 2 +-
 pkgs/by-name/as/asnmap/package.nix                            | 2 +-
 pkgs/by-name/au/audible-cli/package.nix                       | 2 +-
 pkgs/by-name/au/audiness/package.nix                          | 2 +-
 pkgs/by-name/au/audiobookshelf/package.nix                    | 2 +-
 pkgs/by-name/au/audion/package.nix                            | 2 +-
 pkgs/by-name/au/auth0-cli/package.nix                         | 2 +-
 pkgs/by-name/au/auto-cpufreq/package.nix                      | 2 +-
 pkgs/by-name/au/auto-editor/package.nix                       | 2 +-
 pkgs/by-name/au/auto-epp/package.nix                          | 2 +-
 pkgs/by-name/au/autobloody/package.nix                        | 2 +-
 pkgs/by-name/au/autorandr/package.nix                         | 2 +-
 pkgs/by-name/au/autosuspend/package.nix                       | 2 +-
 pkgs/by-name/au/autotools-language-server/package.nix         | 2 +-
 pkgs/by-name/au/autotrash/package.nix                         | 2 +-
 pkgs/by-name/av/av1an-unwrapped/package.nix                   | 2 +-
 pkgs/by-name/av/avalanchego/package.nix                       | 2 +-
 pkgs/by-name/av/avbroot/package.nix                           | 2 +-
 pkgs/by-name/av/avml/package.nix                              | 2 +-
 pkgs/by-name/aw/aws-assume-role/package.nix                   | 2 +-
 pkgs/by-name/aw/aws-iam-authenticator/package.nix             | 2 +-
 pkgs/by-name/aw/aws-sam-cli/package.nix                       | 2 +-
 pkgs/by-name/aw/awscli2/package.nix                           | 2 +-
 pkgs/by-name/aw/awsebcli/package.nix                          | 2 +-
 pkgs/by-name/aw/awslimitchecker/package.nix                   | 2 +-
 pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix       | 2 +-
 pkgs/by-name/ay/ayatana-indicator-datetime/package.nix        | 2 +-
 pkgs/by-name/ay/ayatana-indicator-display/package.nix         | 2 +-
 pkgs/by-name/ay/ayatana-indicator-messages/package.nix        | 2 +-
 pkgs/by-name/ay/ayatana-indicator-power/package.nix           | 2 +-
 pkgs/by-name/ay/ayatana-indicator-session/package.nix         | 2 +-
 pkgs/by-name/ay/ayatana-indicator-sound/package.nix           | 2 +-
 pkgs/by-name/ay/ayatana-webmail/package.nix                   | 2 +-
 pkgs/by-name/az/azure-storage-azcopy/package.nix              | 2 +-
 pkgs/by-name/az/azurehound/package.nix                        | 2 +-
 pkgs/by-name/ba/baboossh/package.nix                          | 2 +-
 pkgs/by-name/ba/backblaze-b2/package.nix                      | 2 +-
 pkgs/by-name/ba/backrest/package.nix                          | 2 +-
 pkgs/by-name/ba/bacon/package.nix                             | 2 +-
 pkgs/by-name/ba/bada-bib/package.nix                          | 2 +-
 pkgs/by-name/ba/baddns/package.nix                            | 2 +-
 pkgs/by-name/ba/badkeys/package.nix                           | 4 ++--
 pkgs/by-name/ba/bamtools/package.nix                          | 4 ++--
 pkgs/by-name/ba/banana-vera/package.nix                       | 2 +-
 pkgs/by-name/ba/bark-server/package.nix                       | 2 +-
 pkgs/by-name/ba/barman/package.nix                            | 2 +-
 pkgs/by-name/ba/batmon/package.nix                            | 2 +-
 pkgs/by-name/bc/bcachefs-tools/package.nix                    | 2 +-
 pkgs/by-name/bc/bcc/package.nix                               | 2 +-
 pkgs/by-name/be/bearer/package.nix                            | 2 +-
 pkgs/by-name/be/beeper-bridge-manager/package.nix             | 2 +-
 pkgs/by-name/be/beluga/package.nix                            | 2 +-
 pkgs/by-name/be/bemoji/package.nix                            | 2 +-
 pkgs/by-name/be/bend/package.nix                              | 2 +-
 pkgs/by-name/be/benthos/package.nix                           | 2 +-
 pkgs/by-name/be/beszel/package.nix                            | 2 +-
 pkgs/by-name/bi/biblioteca/package.nix                        | 2 +-
 pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix         | 2 +-
 pkgs/by-name/bi/bigquery-emulator/package.nix                 | 2 +-
 pkgs/by-name/bi/binary/package.nix                            | 2 +-
 pkgs/by-name/bl/blobdrop/package.nix                          | 2 +-
 pkgs/by-name/bl/blockbench/package.nix                        | 2 +-
 pkgs/by-name/bo/boilr/package.nix                             | 2 +-
 pkgs/by-name/bo/bomber-go/package.nix                         | 2 +-
 pkgs/by-name/bo/boofuzz/package.nix                           | 2 +-
 pkgs/by-name/bo/borgbackup/package.nix                        | 2 +-
 pkgs/by-name/bo/bowtie2/package.nix                           | 4 ++--
 pkgs/by-name/bp/bpf-linker/package.nix                        | 2 +-
 pkgs/by-name/bp/bpfmon/package.nix                            | 2 +-
 pkgs/by-name/bp/bpftop/package.nix                            | 2 +-
 pkgs/by-name/br/brainflow/package.nix                         | 2 +-
 pkgs/by-name/br/broadlink-cli/package.nix                     | 2 +-
 pkgs/by-name/br/browsers/package.nix                          | 2 +-
 pkgs/by-name/br/browsr/package.nix                            | 4 ++--
 pkgs/by-name/bs/bsc/package.nix                               | 2 +-
 pkgs/by-name/bu/budgie-media-player-applet/package.nix        | 2 +-
 pkgs/by-name/bu/bunbun/package.nix                            | 2 +-
 pkgs/by-name/bu/butterfly/package.nix                         | 2 +-
 pkgs/by-name/by/byedpi/package.nix                            | 2 +-
 pkgs/by-name/c3/c3c/package.nix                               | 2 +-
 pkgs/by-name/ca/calcure/package.nix                           | 2 +-
 pkgs/by-name/ca/cansina/package.nix                           | 2 +-
 pkgs/by-name/ca/cargo-cross/package.nix                       | 2 +-
 pkgs/by-name/ca/cargo-release/package.nix                     | 2 +-
 pkgs/by-name/ca/cargo-tauri/package.nix                       | 2 +-
 pkgs/by-name/ca/cargonode/package.nix                         | 2 +-
 pkgs/by-name/ca/cariddi/package.nix                           | 2 +-
 pkgs/by-name/ca/cartero/package.nix                           | 2 +-
 pkgs/by-name/ca/catppuccin-catwalk/package.nix                | 2 +-
 pkgs/by-name/ca/catppuccin-whiskers/package.nix               | 2 +-
 pkgs/by-name/ca/cavalcade/package.nix                         | 2 +-
 pkgs/by-name/ca/cavalier/package.nix                          | 2 +-
 pkgs/by-name/cb/cbmc/package.nix                              | 2 +-
 pkgs/by-name/cc/ccache/package.nix                            | 2 +-
 pkgs/by-name/cd/cdecl/package.nix                             | 2 +-
 pkgs/by-name/cd/cdecrypt/package.nix                          | 2 +-
 pkgs/by-name/cd/cdk-go/package.nix                            | 2 +-
 pkgs/by-name/cd/cdncheck/package.nix                          | 2 +-
 pkgs/by-name/ce/cedar/package.nix                             | 2 +-
 pkgs/by-name/ce/cent/package.nix                              | 2 +-
 pkgs/by-name/ce/cert-viewer/package.nix                       | 2 +-
 pkgs/by-name/ce/certinfo-go/package.nix                       | 2 +-
 pkgs/by-name/cf/cfripper/package.nix                          | 2 +-
 pkgs/by-name/cf/cfspeedtest/package.nix                       | 2 +-
 pkgs/by-name/ch/chainsaw/package.nix                          | 2 +-
 pkgs/by-name/ch/chaos/package.nix                             | 2 +-
 pkgs/by-name/ch/charge-lnd/package.nix                        | 2 +-
 pkgs/by-name/ch/charls/package.nix                            | 2 +-
 pkgs/by-name/ch/charmcraft/package.nix                        | 2 +-
 pkgs/by-name/ch/checkip/package.nix                           | 2 +-
 pkgs/by-name/ch/cherrytree/package.nix                        | 2 +-
 pkgs/by-name/ch/chisel/package.nix                            | 2 +-
 pkgs/by-name/ch/chocolate-doom/package.nix                    | 2 +-
 pkgs/by-name/ci/ciel/package.nix                              | 2 +-
 pkgs/by-name/ci/cilium-cli/package.nix                        | 2 +-
 pkgs/by-name/ci/cimg/package.nix                              | 2 +-
 pkgs/by-name/ci/cinny-desktop/package.nix                     | 2 +-
 pkgs/by-name/ci/circup/package.nix                            | 2 +-
 pkgs/by-name/cl/clairvoyance/package.nix                      | 2 +-
 pkgs/by-name/cl/clanlib/package.nix                           | 2 +-
 pkgs/by-name/cl/clapgrep/package.nix                          | 2 +-
 pkgs/by-name/cl/clash-rs/package.nix                          | 2 +-
 pkgs/by-name/cl/clash-verge-rev/package.nix                   | 2 +-
 pkgs/by-name/cl/clevis/package.nix                            | 2 +-
 pkgs/by-name/cl/clipcat/package.nix                           | 2 +-
 pkgs/by-name/cl/cliphist/package.nix                          | 2 +-
 pkgs/by-name/cl/cliqr/package.nix                             | 2 +-
 pkgs/by-name/cl/cloud-custodian/package.nix                   | 2 +-
 pkgs/by-name/cl/cloud-nuke/package.nix                        | 2 +-
 pkgs/by-name/cl/cloud-utils/package.nix                       | 2 +-
 pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix            | 2 +-
 pkgs/by-name/cl/cloudfox/package.nix                          | 2 +-
 pkgs/by-name/cl/cloudhunter/package.nix                       | 2 +-
 pkgs/by-name/cl/cloudlist/package.nix                         | 2 +-
 pkgs/by-name/cl/cloudrecon/package.nix                        | 2 +-
 pkgs/by-name/cl/cloudsmith-cli/package.nix                    | 2 +-
 pkgs/by-name/cl/clusternet/package.nix                        | 2 +-
 pkgs/by-name/cm/cmake-lint/package.nix                        | 2 +-
 pkgs/by-name/cn/cnquery/package.nix                           | 2 +-
 pkgs/by-name/co/cobang/package.nix                            | 2 +-
 pkgs/by-name/co/coercer/package.nix                           | 2 +-
 pkgs/by-name/co/coinlive/package.nix                          | 2 +-
 pkgs/by-name/co/collabora-online/package.nix                  | 2 +-
 pkgs/by-name/co/collada2gltf/package.nix                      | 2 +-
 pkgs/by-name/co/comet-gog/package.nix                         | 2 +-
 pkgs/by-name/co/commit/package.nix                            | 2 +-
 pkgs/by-name/co/committed/package.nix                         | 2 +-
 pkgs/by-name/co/compiledb/package.nix                         | 2 +-
 pkgs/by-name/co/composer-require-checker/package.nix          | 2 +-
 pkgs/by-name/co/conan/package.nix                             | 2 +-
 pkgs/by-name/co/concord/package.nix                           | 2 +-
 pkgs/by-name/co/concurrently/package.nix                      | 2 +-
 pkgs/by-name/co/conftest/package.nix                          | 2 +-
 pkgs/by-name/co/connectome-workbench/package.nix              | 2 +-
 pkgs/by-name/co/conpass/package.nix                           | 2 +-
 pkgs/by-name/co/consul/package.nix                            | 2 +-
 pkgs/by-name/co/container2wasm/package.nix                    | 2 +-
 pkgs/by-name/co/containerd/package.nix                        | 2 +-
 pkgs/by-name/co/convbin/package.nix                           | 2 +-
 pkgs/by-name/co/converseen/package.nix                        | 2 +-
 pkgs/by-name/co/copacetic/package.nix                         | 2 +-
 pkgs/by-name/co/copier/package.nix                            | 2 +-
 pkgs/by-name/co/copycat/package.nix                           | 2 +-
 pkgs/by-name/co/corrscope/package.nix                         | 2 +-
 pkgs/by-name/co/coturn/package.nix                            | 2 +-
 pkgs/by-name/co/coursera-dl/package.nix                       | 2 +-
 pkgs/by-name/co/cowsql/package.nix                            | 2 +-
 pkgs/by-name/cp/cp210x-program/package.nix                    | 2 +-
 pkgs/by-name/cp/cppitertools/package.nix                      | 2 +-
 pkgs/by-name/cp/cpplint/package.nix                           | 2 +-
 pkgs/by-name/cp/cpu-x/package.nix                             | 2 +-
 pkgs/by-name/cp/cpustat/package.nix                           | 2 +-
 pkgs/by-name/cr/crab-hole/package.nix                         | 2 +-
 pkgs/by-name/cr/crates-tui/package.nix                        | 2 +-
 pkgs/by-name/cr/creds/package.nix                             | 2 +-
 pkgs/by-name/cr/credslayer/package.nix                        | 2 +-
 pkgs/by-name/cr/crlfsuite/package.nix                         | 2 +-
 pkgs/by-name/cr/crowdsec/package.nix                          | 2 +-
 pkgs/by-name/cs/csvlens/package.nix                           | 2 +-
 pkgs/by-name/cs/csvtk/package.nix                             | 2 +-
 pkgs/by-name/ct/ctune/package.nix                             | 2 +-
 pkgs/by-name/cu/cups-printers/package.nix                     | 2 +-
 pkgs/by-name/cu/curtail/package.nix                           | 2 +-
 pkgs/by-name/cu/curv/package.nix                              | 2 +-
 pkgs/by-name/cv/cvehound/package.nix                          | 2 +-
 pkgs/by-name/cv/cvemap/package.nix                            | 2 +-
 pkgs/by-name/cw/cwltool/package.nix                           | 2 +-
 pkgs/by-name/cy/cyclonedx-cli/package.nix                     | 2 +-
 pkgs/by-name/cy/cyclonedx-python/package.nix                  | 2 +-
 pkgs/by-name/cy/cyrus-imapd/package.nix                       | 2 +-
 pkgs/by-name/cz/cz-cli/package.nix                            | 2 +-
 pkgs/by-name/cz/czkawka/package.nix                           | 2 +-
 pkgs/by-name/d2/d2/package.nix                                | 2 +-
 pkgs/by-name/da/daed/package.nix                              | 2 +-
 pkgs/by-name/da/dalfox/package.nix                            | 2 +-
 pkgs/by-name/da/darkradiant/package.nix                       | 2 +-
 pkgs/by-name/da/darkstat/package.nix                          | 2 +-
 pkgs/by-name/da/das/package.nix                               | 2 +-
 pkgs/by-name/da/datatrove/package.nix                         | 2 +-
 pkgs/by-name/da/datree/package.nix                            | 2 +-
 pkgs/by-name/db/dbmate/package.nix                            | 2 +-
 pkgs/by-name/db/dbx/package.nix                               | 2 +-
 pkgs/by-name/dc/dcgm/package.nix                              | 2 +-
 pkgs/by-name/dc/dcrd/package.nix                              | 2 +-
 pkgs/by-name/dd/ddate/package.nix                             | 2 +-
 pkgs/by-name/dd/ddosify/package.nix                           | 2 +-
 pkgs/by-name/de/debase/package.nix                            | 2 +-
 pkgs/by-name/de/deck/package.nix                              | 2 +-
 pkgs/by-name/de/deckmaster/package.nix                        | 2 +-
 pkgs/by-name/de/deeptools/package.nix                         | 2 +-
 pkgs/by-name/de/deface/package.nix                            | 2 +-
 pkgs/by-name/de/delta/package.nix                             | 2 +-
 pkgs/by-name/de/deno/package.nix                              | 2 +-
 pkgs/by-name/de/densify/package.nix                           | 2 +-
 pkgs/by-name/de/dependency-track-exporter/package.nix         | 2 +-
 pkgs/by-name/de/desed/package.nix                             | 2 +-
 pkgs/by-name/de/desk-exec/package.nix                         | 2 +-
 pkgs/by-name/de/desync/package.nix                            | 2 +-
 pkgs/by-name/de/dethrace/package.nix                          | 2 +-
 pkgs/by-name/de/devdash/package.nix                           | 2 +-
 pkgs/by-name/de/devtoolbox/package.nix                        | 2 +-
 pkgs/by-name/de/dexed/package.nix                             | 2 +-
 pkgs/by-name/de/dezoomify-rs/package.nix                      | 2 +-
 pkgs/by-name/dh/dhcpdump/package.nix                          | 2 +-
 pkgs/by-name/dh/dhcpig/package.nix                            | 2 +-
 pkgs/by-name/di/diagrams-as-code/package.nix                  | 2 +-
 pkgs/by-name/di/dialect/package.nix                           | 2 +-
 pkgs/by-name/di/discover-overlay/package.nix                  | 2 +-
 pkgs/by-name/di/dismember/package.nix                         | 2 +-
 pkgs/by-name/dl/dlib/package.nix                              | 2 +-
 pkgs/by-name/dm/dmarc-metrics-exporter/package.nix            | 2 +-
 pkgs/by-name/dm/dmenu-rs/package.nix                          | 2 +-
 pkgs/by-name/dm/dms/package.nix                               | 2 +-
 pkgs/by-name/dn/dnsdiag/package.nix                           | 2 +-
 pkgs/by-name/dn/dnslink-std-go/package.nix                    | 2 +-
 pkgs/by-name/dn/dnslookup/package.nix                         | 2 +-
 pkgs/by-name/dn/dnsmonster/package.nix                        | 2 +-
 pkgs/by-name/dn/dnsrecon/package.nix                          | 2 +-
 pkgs/by-name/dn/dnstwist/package.nix                          | 2 +-
 pkgs/by-name/dn/dnsx/package.nix                              | 2 +-
 pkgs/by-name/do/docify/package.nix                            | 2 +-
 pkgs/by-name/do/docker-credential-gcr/package.nix             | 2 +-
 pkgs/by-name/do/docopts/package.nix                           | 2 +-
 pkgs/by-name/do/donpapi/package.nix                           | 2 +-
 pkgs/by-name/do/dontgo403/package.nix                         | 2 +-
 pkgs/by-name/do/dooit/package.nix                             | 2 +-
 pkgs/by-name/do/doq/package.nix                               | 4 ++--
 pkgs/by-name/do/dotenvx/package.nix                           | 2 +-
 pkgs/by-name/do/downonspot/package.nix                        | 2 +-
 pkgs/by-name/dp/dprint/package.nix                            | 2 +-
 pkgs/by-name/dq/dq/package.nix                                | 2 +-
 pkgs/by-name/dq/dqlite/package.nix                            | 2 +-
 pkgs/by-name/dr/drat-trim/package.nix                         | 2 +-
 pkgs/by-name/dr/drawing/package.nix                           | 2 +-
 pkgs/by-name/dr/driftnet/package.nix                          | 2 +-
 pkgs/by-name/dr/drone-runner-docker/package.nix               | 2 +-
 pkgs/by-name/ds/dssat/package.nix                             | 2 +-
 pkgs/by-name/ds/dssp/package.nix                              | 4 ++--
 pkgs/by-name/du/dua/package.nix                               | 2 +-
 pkgs/by-name/dy/dynamips/package.nix                          | 2 +-
 pkgs/by-name/dy/dynisland/package.nix                         | 2 +-
 pkgs/by-name/e1/e1s/package.nix                               | 2 +-
 pkgs/by-name/ea/easyeasm/package.nix                          | 2 +-
 pkgs/by-name/ea/easyeffects/package.nix                       | 2 +-
 pkgs/by-name/ec/ecsk/package.nix                              | 2 +-
 pkgs/by-name/ed/edencommon/package.nix                        | 2 +-
 pkgs/by-name/ed/edgedb/package.nix                            | 2 +-
 pkgs/by-name/ee/eepers/package.nix                            | 2 +-
 pkgs/by-name/eg/eggnog-mapper/package.nix                     | 2 +-
 pkgs/by-name/ej/ejabberd/package.nix                          | 2 +-
 pkgs/by-name/el/elasticsearch-curator/package.nix             | 2 +-
 pkgs/by-name/em/ember-cli/package.nix                         | 2 +-
 pkgs/by-name/em/emplace/package.nix                           | 2 +-
 pkgs/by-name/en/en-croissant/package.nix                      | 2 +-
 pkgs/by-name/en/ente-cli/package.nix                          | 2 +-
 pkgs/by-name/en/ente-web/package.nix                          | 2 +-
 pkgs/by-name/en/enum4linux-ng/package.nix                     | 2 +-
 pkgs/by-name/en/enumer/package.nix                            | 2 +-
 pkgs/by-name/en/enumerepo/package.nix                         | 2 +-
 pkgs/by-name/eo/eolie/package.nix                             | 2 +-
 pkgs/by-name/ep/epub2txt2/package.nix                         | 2 +-
 pkgs/by-name/eq/equibop/package.nix                           | 2 +-
 pkgs/by-name/er/era/package.nix                               | 2 +-
 pkgs/by-name/er/erosmb/package.nix                            | 2 +-
 pkgs/by-name/er/errands/package.nix                           | 2 +-
 pkgs/by-name/es/eslint/package.nix                            | 2 +-
 pkgs/by-name/es/espflash/package.nix                          | 2 +-
 pkgs/by-name/es/esptool/package.nix                           | 2 +-
 pkgs/by-name/et/etebase-server/package.nix                    | 2 +-
 pkgs/by-name/et/eternal-terminal/package.nix                  | 2 +-
 pkgs/by-name/et/ethq/package.nix                              | 2 +-
 pkgs/by-name/et/etlegacy-unwrapped/package.nix                | 2 +-
 pkgs/by-name/ev/evemu/package.nix                             | 2 +-
 pkgs/by-name/ev/evil-winrm/package.nix                        | 2 +-
 pkgs/by-name/ev/evillimiter/package.nix                       | 2 +-
 pkgs/by-name/ev/evtx/package.nix                              | 2 +-
 pkgs/by-name/ex/exabgp/package.nix                            | 2 +-
 pkgs/by-name/ex/exercism/package.nix                          | 2 +-
 pkgs/by-name/ex/extism-cli/package.nix                        | 2 +-
 pkgs/by-name/fa/factoriolab/package.nix                       | 2 +-
 pkgs/by-name/fa/fahrplan/package.nix                          | 2 +-
 pkgs/by-name/fa/famistudio/package.nix                        | 2 +-
 pkgs/by-name/fa/fangfrisch/package.nix                        | 2 +-
 pkgs/by-name/fa/faraday-agent-dispatcher/package.nix          | 2 +-
 pkgs/by-name/fa/faraday-cli/package.nix                       | 2 +-
 pkgs/by-name/fa/fastJson/package.nix                          | 2 +-
 pkgs/by-name/fa/fastahack/package.nix                         | 2 +-
 pkgs/by-name/fa/fastcompmgr/package.nix                       | 2 +-
 pkgs/by-name/fb/fb303/package.nix                             | 2 +-
 pkgs/by-name/fb/fbthrift/package.nix                          | 2 +-
 pkgs/by-name/fc/fcp/package.nix                               | 2 +-
 pkgs/by-name/fe/fedifetcher/package.nix                       | 2 +-
 pkgs/by-name/fe/felix-fm/package.nix                          | 2 +-
 pkgs/by-name/ff/ffsubsync/package.nix                         | 2 +-
 pkgs/by-name/ff/ffuf/package.nix                              | 2 +-
 pkgs/by-name/fi/fierce/package.nix                            | 2 +-
 pkgs/by-name/fi/figma-agent/package.nix                       | 2 +-
 pkgs/by-name/fi/fim-rs/package.nix                            | 2 +-
 pkgs/by-name/fi/findomain/package.nix                         | 2 +-
 pkgs/by-name/fi/fingerprintx/package.nix                      | 2 +-
 pkgs/by-name/fi/firebase-tools/package.nix                    | 2 +-
 pkgs/by-name/fi/firefly/package.nix                           | 2 +-
 pkgs/by-name/fi/fish-lsp/package.nix                          | 2 +-
 pkgs/by-name/fi/fizz/package.nix                              | 2 +-
 pkgs/by-name/fl/flare-floss/package.nix                       | 2 +-
 pkgs/by-name/fl/flashgbx/package.nix                          | 2 +-
 pkgs/by-name/fl/fluffychat/package.nix                        | 2 +-
 pkgs/by-name/fl/flye/package.nix                              | 2 +-
 pkgs/by-name/fo/foliate/package.nix                           | 2 +-
 pkgs/by-name/fo/folio/package.nix                             | 2 +-
 pkgs/by-name/fo/folly/package.nix                             | 2 +-
 pkgs/by-name/fo/forbidden/package.nix                         | 2 +-
 pkgs/by-name/fr/freenet/package.nix                           | 2 +-
 pkgs/by-name/fr/freeradius/package.nix                        | 2 +-
 pkgs/by-name/fr/freesasa/package.nix                          | 2 +-
 pkgs/by-name/fr/frescobaldi/package.nix                       | 2 +-
 pkgs/by-name/fr/frigate/package.nix                           | 2 +-
 pkgs/by-name/fr/fritz-exporter/package.nix                    | 2 +-
 pkgs/by-name/fs/fsmon/package.nix                             | 2 +-
 pkgs/by-name/fu/fuse-archive/package.nix                      | 2 +-
 pkgs/by-name/fy/fyne/package.nix                              | 2 +-
 pkgs/by-name/g8/g810-led/package.nix                          | 2 +-
 pkgs/by-name/ga/gale/package.nix                              | 2 +-
 pkgs/by-name/ga/galer/package.nix                             | 2 +-
 pkgs/by-name/ga/gallia/package.nix                            | 2 +-
 pkgs/by-name/ga/gam/package.nix                               | 2 +-
 pkgs/by-name/ga/gapcast/package.nix                           | 2 +-
 pkgs/by-name/ga/garble/package.nix                            | 2 +-
 pkgs/by-name/ga/garnet/package.nix                            | 2 +-
 pkgs/by-name/ga/gat/package.nix                               | 2 +-
 pkgs/by-name/ga/gate/package.nix                              | 2 +-
 pkgs/by-name/ga/gato/package.nix                              | 2 +-
 pkgs/by-name/ga/gau/package.nix                               | 2 +-
 pkgs/by-name/gc/gcalcli/package.nix                           | 2 +-
 pkgs/by-name/gc/gcfflasher/package.nix                        | 2 +-
 pkgs/by-name/gc/gcp-scanner/package.nix                       | 2 +-
 pkgs/by-name/gc/gcs/package.nix                               | 2 +-
 pkgs/by-name/gd/gdbuspp/package.nix                           | 2 +-
 pkgs/by-name/gd/gdm-settings/package.nix                      | 2 +-
 pkgs/by-name/gd/gdu/package.nix                               | 2 +-
 pkgs/by-name/ge/gemmi/package.nix                             | 2 +-
 pkgs/by-name/ge/genzai/package.nix                            | 2 +-
 pkgs/by-name/ge/getmail6/package.nix                          | 2 +-
 pkgs/by-name/gf/gfn-electron/package.nix                      | 2 +-
 pkgs/by-name/gg/gg-jj/package.nix                             | 2 +-
 pkgs/by-name/gh/gh-eco/package.nix                            | 2 +-
 pkgs/by-name/gh/gh/package.nix                                | 2 +-
 pkgs/by-name/gh/ghauri/package.nix                            | 2 +-
 pkgs/by-name/gh/ghc_filesystem/package.nix                    | 2 +-
 pkgs/by-name/gh/ghunt/package.nix                             | 2 +-
 pkgs/by-name/gi/gickup/package.nix                            | 2 +-
 pkgs/by-name/gi/girsh/package.nix                             | 2 +-
 pkgs/by-name/gi/git-crecord/package.nix                       | 2 +-
 pkgs/by-name/gi/git-gr/package.nix                            | 2 +-
 pkgs/by-name/gi/git-graph/package.nix                         | 2 +-
 pkgs/by-name/gi/git-identity/package.nix                      | 2 +-
 pkgs/by-name/gi/git-lfs/package.nix                           | 2 +-
 pkgs/by-name/gi/git-prole/package.nix                         | 2 +-
 pkgs/by-name/gi/git-pw/package.nix                            | 2 +-
 pkgs/by-name/gi/git-releaser/package.nix                      | 2 +-
 pkgs/by-name/gi/git-smash/package.nix                         | 2 +-
 pkgs/by-name/gi/git-spice/package.nix                         | 2 +-
 pkgs/by-name/gi/git-upstream/package.nix                      | 2 +-
 pkgs/by-name/gi/git-worktree-switcher/package.nix             | 2 +-
 pkgs/by-name/gi/gitify/package.nix                            | 2 +-
 pkgs/by-name/gi/gitleaks/package.nix                          | 2 +-
 pkgs/by-name/gi/gitxray/package.nix                           | 2 +-
 pkgs/by-name/gl/glasskube/package.nix                         | 2 +-
 pkgs/by-name/gm/gmrun/package.nix                             | 2 +-
 pkgs/by-name/gm/gmt/package.nix                               | 2 +-
 pkgs/by-name/gn/gnome-frog/package.nix                        | 2 +-
 pkgs/by-name/go/go-chromecast/package.nix                     | 2 +-
 pkgs/by-name/go/go-cve-search/package.nix                     | 2 +-
 pkgs/by-name/go/go-dork/package.nix                           | 2 +-
 pkgs/by-name/go/go-exploitdb/package.nix                      | 2 +-
 pkgs/by-name/go/go-licenses/package.nix                       | 2 +-
 pkgs/by-name/go/go-secdump/package.nix                        | 2 +-
 pkgs/by-name/go/go-swagger/package.nix                        | 2 +-
 pkgs/by-name/go/go-task/package.nix                           | 2 +-
 pkgs/by-name/go/go2rtc/package.nix                            | 2 +-
 pkgs/by-name/go/go365/package.nix                             | 2 +-
 pkgs/by-name/go/go9p/package.nix                              | 2 +-
 pkgs/by-name/go/goaccess/package.nix                          | 2 +-
 pkgs/by-name/go/gobgpd/package.nix                            | 2 +-
 pkgs/by-name/go/goblob/package.nix                            | 2 +-
 pkgs/by-name/go/gobuster/package.nix                          | 2 +-
 pkgs/by-name/go/godns/package.nix                             | 2 +-
 pkgs/by-name/go/godspeed/package.nix                          | 2 +-
 pkgs/by-name/go/gokey/package.nix                             | 2 +-
 pkgs/by-name/go/gollama/package.nix                           | 2 +-
 pkgs/by-name/go/gomanagedocker/package.nix                    | 2 +-
 pkgs/by-name/go/gomplate/package.nix                          | 2 +-
 pkgs/by-name/go/google-alloydb-auth-proxy/package.nix         | 2 +-
 pkgs/by-name/go/google-chat-linux/package.nix                 | 2 +-
 pkgs/by-name/go/google-clasp/package.nix                      | 2 +-
 pkgs/by-name/go/google-guest-agent/package.nix                | 2 +-
 pkgs/by-name/go/gose/package.nix                              | 2 +-
 pkgs/by-name/go/gosh/package.nix                              | 2 +-
 pkgs/by-name/go/goss/package.nix                              | 2 +-
 pkgs/by-name/go/gossip/package.nix                            | 2 +-
 pkgs/by-name/go/gotemplate/package.nix                        | 2 +-
 pkgs/by-name/go/gotenberg/package.nix                         | 2 +-
 pkgs/by-name/go/gotestwaf/package.nix                         | 2 +-
 pkgs/by-name/go/gotosocial/package.nix                        | 2 +-
 pkgs/by-name/go/goverview/package.nix                         | 2 +-
 pkgs/by-name/go/govulncheck/package.nix                       | 2 +-
 pkgs/by-name/gp/gptscript/package.nix                         | 2 +-
 pkgs/by-name/gp/gpu-viewer/package.nix                        | 2 +-
 pkgs/by-name/gq/gqmqtt/package.nix                            | 2 +-
 pkgs/by-name/gr/gramma/package.nix                            | 2 +-
 pkgs/by-name/gr/grap/package.nix                              | 2 +-
 pkgs/by-name/gr/graphinder/package.nix                        | 2 +-
 pkgs/by-name/gr/grcov/package.nix                             | 2 +-
 pkgs/by-name/gr/greenmask/package.nix                         | 2 +-
 pkgs/by-name/gr/grimoire/package.nix                          | 2 +-
 pkgs/by-name/gr/grip-grab/package.nix                         | 2 +-
 pkgs/by-name/gr/grype/package.nix                             | 2 +-
 pkgs/by-name/gs/gsan/package.nix                              | 2 +-
 pkgs/by-name/gs/gswatcher/package.nix                         | 2 +-
 pkgs/by-name/gt/gtfocli/package.nix                           | 2 +-
 pkgs/by-name/gt/gtimelog/package.nix                          | 2 +-
 pkgs/by-name/gu/guake/package.nix                             | 2 +-
 pkgs/by-name/gu/gucci/package.nix                             | 2 +-
 pkgs/by-name/gu/gusb/package.nix                              | 2 +-
 pkgs/by-name/gv/gvm-libs/package.nix                          | 2 +-
 pkgs/by-name/gw/gweled/package.nix                            | 2 +-
 pkgs/by-name/gy/gyb/package.nix                               | 2 +-
 pkgs/by-name/h2/h2/package.nix                                | 2 +-
 pkgs/by-name/h2/h2o/package.nix                               | 2 +-
 pkgs/by-name/h8/h8mail/package.nix                            | 2 +-
 pkgs/by-name/ha/haguichi/package.nix                          | 2 +-
 pkgs/by-name/ha/halftone/package.nix                          | 2 +-
 pkgs/by-name/ha/halloy/package.nix                            | 2 +-
 pkgs/by-name/ha/hamster/package.nix                           | 2 +-
 pkgs/by-name/ha/hardinfo2/package.nix                         | 2 +-
 pkgs/by-name/ha/harlequin/package.nix                         | 2 +-
 pkgs/by-name/ha/harmonia/package.nix                          | 2 +-
 pkgs/by-name/ha/hashes/package.nix                            | 2 +-
 pkgs/by-name/ha/hatch/package.nix                             | 2 +-
 pkgs/by-name/ha/hatsu/package.nix                             | 2 +-
 pkgs/by-name/ha/havn/package.nix                              | 2 +-
 pkgs/by-name/hc/hcloud/package.nix                            | 2 +-
 pkgs/by-name/hd/hdf4/package.nix                              | 2 +-
 pkgs/by-name/hd/hdfview/package.nix                           | 2 +-
 pkgs/by-name/hd/hdr10plus_tool/package.nix                    | 2 +-
 pkgs/by-name/he/hednsextractor/package.nix                    | 2 +-
 pkgs/by-name/he/helm/package.nix                              | 2 +-
 pkgs/by-name/hf/hfinger/package.nix                           | 2 +-
 pkgs/by-name/hf/hfst-ospell/package.nix                       | 2 +-
 pkgs/by-name/hf/hfst/package.nix                              | 2 +-
 pkgs/by-name/hi/hickory-dns/package.nix                       | 2 +-
 pkgs/by-name/hi/hieroglyphic/package.nix                      | 2 +-
 pkgs/by-name/hi/highlight-pointer/package.nix                 | 2 +-
 pkgs/by-name/hi/hilbish/package.nix                           | 2 +-
 pkgs/by-name/hm/hmat-oss/package.nix                          | 2 +-
 pkgs/by-name/hn/hnswlib/package.nix                           | 4 ++--
 pkgs/by-name/hs/hstsparser/package.nix                        | 2 +-
 pkgs/by-name/ht/htgettoken/package.nix                        | 2 +-
 pkgs/by-name/ht/httpdirfs/package.nix                         | 2 +-
 pkgs/by-name/ht/httping/package.nix                           | 2 +-
 pkgs/by-name/ht/httptoolkit/package.nix                       | 2 +-
 pkgs/by-name/ht/httpx/package.nix                             | 2 +-
 pkgs/by-name/hu/hurl/package.nix                              | 2 +-
 pkgs/by-name/hw/hwatch/package.nix                            | 2 +-
 pkgs/by-name/hy/hyfetch/package.nix                           | 2 +-
 pkgs/by-name/hy/hyperhdr/package.nix                          | 2 +-
 pkgs/by-name/hy/hyprcursor/package.nix                        | 2 +-
 pkgs/by-name/hy/hypre/package.nix                             | 2 +-
 pkgs/by-name/hy/hyprland/package.nix                          | 2 +-
 pkgs/by-name/hy/hyprpolkitagent/package.nix                   | 2 +-
 pkgs/by-name/hy/hyprspace/package.nix                         | 2 +-
 pkgs/by-name/hy/hyprsunset/package.nix                        | 2 +-
 pkgs/by-name/hy/hyprutils/package.nix                         | 2 +-
 pkgs/by-name/i3/i3-back/package.nix                           | 2 +-
 pkgs/by-name/im/ima-evm-utils/package.nix                     | 2 +-
 pkgs/by-name/im/imapdedup/package.nix                         | 2 +-
 pkgs/by-name/im/imdshift/package.nix                          | 2 +-
 pkgs/by-name/im/imgbrd-grabber/package.nix                    | 2 +-
 pkgs/by-name/im/imhex/package.nix                             | 2 +-
 pkgs/by-name/im/imsprog/package.nix                           | 2 +-
 pkgs/by-name/in/indicator-sound-switcher/package.nix          | 2 +-
 pkgs/by-name/in/ineffassign/package.nix                       | 2 +-
 pkgs/by-name/in/inotify-info/package.nix                      | 2 +-
 pkgs/by-name/in/inputplumber/package.nix                      | 2 +-
 pkgs/by-name/in/inql/package.nix                              | 2 +-
 pkgs/by-name/in/inshellisense/package.nix                     | 2 +-
 pkgs/by-name/in/intel-undervolt/package.nix                   | 2 +-
 pkgs/by-name/in/intentrace/package.nix                        | 2 +-
 pkgs/by-name/in/interactsh/package.nix                        | 2 +-
 pkgs/by-name/in/invidtui/package.nix                          | 2 +-
 pkgs/by-name/in/invoiceplane/package.nix                      | 2 +-
 pkgs/by-name/io/ioc-scan/package.nix                          | 2 +-
 pkgs/by-name/ip/iptsd/package.nix                             | 4 ++--
 pkgs/by-name/ir/ircdog/package.nix                            | 2 +-
 pkgs/by-name/is/isolyzer/package.nix                          | 2 +-
 pkgs/by-name/iz/izrss/package.nix                             | 2 +-
 pkgs/by-name/ja/jalv/package.nix                              | 2 +-
 pkgs/by-name/je/jellyfin-rpc/package.nix                      | 2 +-
 pkgs/by-name/jf/jfrog-cli/package.nix                         | 2 +-
 pkgs/by-name/jf/jfsw/package.nix                              | 2 +-
 pkgs/by-name/jh/jhentai/package.nix                           | 2 +-
 pkgs/by-name/ji/jira-cli-go/package.nix                       | 2 +-
 pkgs/by-name/ji/jitsi/package.nix                             | 2 +-
 pkgs/by-name/jo/joincap/package.nix                           | 2 +-
 pkgs/by-name/jo/journalist/package.nix                        | 2 +-
 pkgs/by-name/jo/journalwatch/package.nix                      | 2 +-
 pkgs/by-name/jo/joystickwake/package.nix                      | 2 +-
 pkgs/by-name/jp/jpcre2/package.nix                            | 2 +-
 pkgs/by-name/jq/jq-lsp/package.nix                            | 2 +-
 pkgs/by-name/jq/jq-zsh-plugin/package.nix                     | 2 +-
 pkgs/by-name/jr/jrnl/package.nix                              | 2 +-
 pkgs/by-name/js/jsonnet-language-server/package.nix           | 2 +-
 pkgs/by-name/js/jsonschema/package.nix                        | 2 +-
 pkgs/by-name/ju/junest/package.nix                            | 2 +-
 pkgs/by-name/ju/just/package.nix                              | 2 +-
 pkgs/by-name/jw/jwt-hack/package.nix                          | 2 +-
 pkgs/by-name/k0/k0sctl/package.nix                            | 2 +-
 pkgs/by-name/k3/k3d/package.nix                               | 2 +-
 pkgs/by-name/ka/kafkactl/package.nix                          | 2 +-
 pkgs/by-name/ka/kalign/package.nix                            | 4 ++--
 pkgs/by-name/ka/kanboard/package.nix                          | 2 +-
 pkgs/by-name/ka/kando/package.nix                             | 2 +-
 pkgs/by-name/ka/kangaru/package.nix                           | 2 +-
 pkgs/by-name/ka/kaput-cli/package.nix                         | 2 +-
 pkgs/by-name/ka/kara/package.nix                              | 2 +-
 pkgs/by-name/ka/kas/package.nix                               | 2 +-
 pkgs/by-name/ka/katana/package.nix                            | 2 +-
 pkgs/by-name/kd/kdsingleapplication/package.nix               | 2 +-
 pkgs/by-name/ke/keedump/package.nix                           | 2 +-
 pkgs/by-name/ke/key/package.nix                               | 2 +-
 pkgs/by-name/kh/khoj/package.nix                              | 2 +-
 pkgs/by-name/ki/kics/package.nix                              | 2 +-
 pkgs/by-name/ki/kikit/default.nix                             | 2 +-
 pkgs/by-name/ki/killerbee/package.nix                         | 2 +-
 pkgs/by-name/ki/kin-openapi/package.nix                       | 2 +-
 pkgs/by-name/ki/kittycad-kcl-lsp/package.nix                  | 2 +-
 pkgs/by-name/kn/knockpy/package.nix                           | 2 +-
 pkgs/by-name/kn/knowsmore/package.nix                         | 2 +-
 pkgs/by-name/ko/ko/package.nix                                | 2 +-
 pkgs/by-name/ko/koboldcpp/package.nix                         | 2 +-
 pkgs/by-name/ko/komac/package.nix                             | 2 +-
 pkgs/by-name/kr/krbjack/package.nix                           | 2 +-
 pkgs/by-name/kr/krr/package.nix                               | 2 +-
 pkgs/by-name/ks/ksh/package.nix                               | 2 +-
 pkgs/by-name/kt/ktfmt/package.nix                             | 2 +-
 pkgs/by-name/kt/ktor-cli/package.nix                          | 2 +-
 pkgs/by-name/kt/kty/package.nix                               | 2 +-
 pkgs/by-name/ku/kube-bench/package.nix                        | 2 +-
 pkgs/by-name/ku/kube-hunter/package.nix                       | 2 +-
 pkgs/by-name/ku/kubeaudit/package.nix                         | 2 +-
 pkgs/by-name/ku/kubeclarity/package.nix                       | 2 +-
 pkgs/by-name/ku/kubefirst/package.nix                         | 2 +-
 pkgs/by-name/ku/kubernetes-kcp/package.nix                    | 2 +-
 pkgs/by-name/ku/kubescape/package.nix                         | 2 +-
 pkgs/by-name/ku/kubesec/package.nix                           | 2 +-
 pkgs/by-name/ku/kubestroyer/package.nix                       | 2 +-
 pkgs/by-name/ku/kubetrim/package.nix                          | 2 +-
 pkgs/by-name/ku/kubetui/package.nix                           | 2 +-
 pkgs/by-name/kw/kwok/package.nix                              | 2 +-
 pkgs/by-name/la/labelle/package.nix                           | 4 ++--
 pkgs/by-name/la/labwc/package.nix                             | 2 +-
 pkgs/by-name/la/lacus/package.nix                             | 2 +-
 pkgs/by-name/la/lazygit/package.nix                           | 2 +-
 pkgs/by-name/lc/lc0/package.nix                               | 2 +-
 pkgs/by-name/lc/lcevcdec/package.nix                          | 2 +-
 pkgs/by-name/ld/ldapmonitor/package.nix                       | 2 +-
 pkgs/by-name/ld/ldapnomnom/package.nix                        | 2 +-
 pkgs/by-name/ld/ldm/package.nix                               | 2 +-
 pkgs/by-name/le/leftwm/package.nix                            | 2 +-
 pkgs/by-name/le/legitify/package.nix                          | 2 +-
 pkgs/by-name/le/lektor/package.nix                            | 2 +-
 pkgs/by-name/le/level-zero/package.nix                        | 2 +-
 pkgs/by-name/lg/lgogdownloader/package.nix                    | 2 +-
 pkgs/by-name/li/libb2/package.nix                             | 2 +-
 pkgs/by-name/li/libblake3/package.nix                         | 2 +-
 pkgs/by-name/li/libcifpp/package.nix                          | 4 ++--
 pkgs/by-name/li/libcutl/package.nix                           | 2 +-
 pkgs/by-name/li/libde265/package.nix                          | 2 +-
 pkgs/by-name/li/libdnet/package.nix                           | 2 +-
 pkgs/by-name/li/libeatmydata/package.nix                      | 2 +-
 pkgs/by-name/li/liberasurecode/package.nix                    | 2 +-
 pkgs/by-name/li/libfakekey/package.nix                        | 2 +-
 pkgs/by-name/li/libideviceactivation/package.nix              | 2 +-
 pkgs/by-name/li/libinjection/package.nix                      | 2 +-
 pkgs/by-name/li/libinput-gestures/package.nix                 | 2 +-
 pkgs/by-name/li/libkrun/package.nix                           | 2 +-
 pkgs/by-name/li/libkrunfw/package.nix                         | 2 +-
 pkgs/by-name/li/libleidenalg/package.nix                      | 2 +-
 pkgs/by-name/li/libloragw-2g4/package.nix                     | 2 +-
 pkgs/by-name/li/libloragw-sx1301/package.nix                  | 2 +-
 pkgs/by-name/li/libloragw-sx1302/package.nix                  | 2 +-
 pkgs/by-name/li/libmcfp/package.nix                           | 2 +-
 pkgs/by-name/li/libminc/package.nix                           | 2 +-
 pkgs/by-name/li/libmkv/package.nix                            | 2 +-
 pkgs/by-name/li/libmrss/package.nix                           | 2 +-
 pkgs/by-name/li/libnxml/package.nix                           | 2 +-
 pkgs/by-name/li/libpoly/package.nix                           | 2 +-
 pkgs/by-name/li/libpostal/package.nix                         | 2 +-
 pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix     | 2 +-
 pkgs/by-name/li/libsignon-glib/package.nix                    | 2 +-
 pkgs/by-name/li/libspnav/package.nix                          | 2 +-
 pkgs/by-name/li/libtar/package.nix                            | 2 +-
 pkgs/by-name/li/libuecc/package.nix                           | 2 +-
 pkgs/by-name/li/liburing/package.nix                          | 2 +-
 pkgs/by-name/li/libvoikko/package.nix                         | 2 +-
 pkgs/by-name/li/libwebm/package.nix                           | 2 +-
 pkgs/by-name/li/libxdg_basedir/package.nix                    | 2 +-
 pkgs/by-name/li/libxlsxwriter/package.nix                     | 2 +-
 pkgs/by-name/li/libzim/package.nix                            | 2 +-
 pkgs/by-name/li/license-scanner/package.nix                   | 2 +-
 pkgs/by-name/li/lieer/package.nix                             | 2 +-
 pkgs/by-name/li/lightningcss/package.nix                      | 2 +-
 pkgs/by-name/li/ligolo-ng/package.nix                         | 2 +-
 pkgs/by-name/li/lil-pwny/package.nix                          | 2 +-
 pkgs/by-name/li/linkchecker/package.nix                       | 2 +-
 pkgs/by-name/li/linux-router/package.nix                      | 2 +-
 pkgs/by-name/li/livepeer/package.nix                          | 2 +-
 pkgs/by-name/ll/lla/package.nix                               | 2 +-
 pkgs/by-name/ll/llama-cpp/package.nix                         | 2 +-
 pkgs/by-name/ln/lndmanage/package.nix                         | 2 +-
 pkgs/by-name/lo/lock/package.nix                              | 2 +-
 pkgs/by-name/lo/lockbook/package.nix                          | 2 +-
 pkgs/by-name/lo/lokinet/package.nix                           | 2 +-
 pkgs/by-name/lo/loramon/package.nix                           | 2 +-
 pkgs/by-name/lp/lprobe/package.nix                            | 2 +-
 pkgs/by-name/ls/lse/package.nix                               | 2 +-
 pkgs/by-name/ls/lsp-ai/package.nix                            | 2 +-
 pkgs/by-name/lt/lttoolbox/package.nix                         | 2 +-
 pkgs/by-name/lu/lug-helper/package.nix                        | 2 +-
 pkgs/by-name/lu/lumafly/package.nix                           | 2 +-
 pkgs/by-name/lu/luminance/package.nix                         | 2 +-
 pkgs/by-name/lu/lunarml/package.nix                           | 2 +-
 pkgs/by-name/lu/lunarvim/package.nix                          | 2 +-
 pkgs/by-name/lx/lxc/package.nix                               | 2 +-
 pkgs/by-name/lx/lxd-ui/package.nix                            | 2 +-
 pkgs/by-name/lx/lxd-unwrapped-lts/package.nix                 | 2 +-
 pkgs/by-name/ly/lyrebird/package.nix                          | 2 +-
 pkgs/by-name/ma/magic-enum/package.nix                        | 2 +-
 pkgs/by-name/ma/makefile2graph/package.nix                    | 2 +-
 pkgs/by-name/ma/mako/package.nix                              | 2 +-
 pkgs/by-name/ma/mangojuice/package.nix                        | 2 +-
 pkgs/by-name/ma/manticoresearch/package.nix                   | 2 +-
 pkgs/by-name/ma/mantra/package.nix                            | 2 +-
 pkgs/by-name/ma/mapcidr/package.nix                           | 2 +-
 pkgs/by-name/ma/mariadb-connector-java/package.nix            | 2 +-
 pkgs/by-name/ma/markdown2html-converter/package.nix           | 2 +-
 pkgs/by-name/ma/mathmod/package.nix                           | 2 +-
 pkgs/by-name/ma/matrix-appservice-irc/package.nix             | 2 +-
 pkgs/by-name/ma/matrix-authentication-service/package.nix     | 2 +-
 pkgs/by-name/ma/matugen/package.nix                           | 2 +-
 pkgs/by-name/ma/mautrix-googlechat/package.nix                | 2 +-
 pkgs/by-name/mc/mcdreforged/package.nix                       | 2 +-
 pkgs/by-name/mc/mchprs/package.nix                            | 2 +-
 pkgs/by-name/md/md-tui/package.nix                            | 2 +-
 pkgs/by-name/md/mdbook-i18n-helpers/package.nix               | 2 +-
 pkgs/by-name/md/mdbook/package.nix                            | 2 +-
 pkgs/by-name/me/mediawriter/package.nix                       | 2 +-
 pkgs/by-name/me/melodeon/package.nix                          | 2 +-
 pkgs/by-name/me/memorado/package.nix                          | 2 +-
 pkgs/by-name/me/memray/package.nix                            | 2 +-
 pkgs/by-name/me/memtier-benchmark/package.nix                 | 2 +-
 pkgs/by-name/me/mermerd/package.nix                           | 2 +-
 pkgs/by-name/me/meson/package.nix                             | 2 +-
 pkgs/by-name/me/metabigor/package.nix                         | 2 +-
 pkgs/by-name/me/meteo-qt/package.nix                          | 2 +-
 pkgs/by-name/me/methane/package.nix                           | 2 +-
 pkgs/by-name/mi/mingtest/package.nix                          | 2 +-
 pkgs/by-name/mi/miniflux/package.nix                          | 2 +-
 pkgs/by-name/mi/minimal-grub-theme/package.nix                | 2 +-
 pkgs/by-name/mi/ministat/package.nix                          | 2 +-
 pkgs/by-name/mi/minutor/package.nix                           | 2 +-
 pkgs/by-name/mi/miriway/package.nix                           | 2 +-
 pkgs/by-name/mi/misconfig-mapper/package.nix                  | 2 +-
 pkgs/by-name/mi/mistral-rs/package.nix                        | 2 +-
 pkgs/by-name/mi/mitmproxy2swagger/package.nix                 | 2 +-
 pkgs/by-name/mj/mjolnir/package.nix                           | 2 +-
 pkgs/by-name/mk/mktxp/package.nix                             | 2 +-
 pkgs/by-name/ml/mlx42/package.nix                             | 2 +-
 pkgs/by-name/mm/mmdbctl/package.nix                           | 2 +-
 pkgs/by-name/mm/mmdbinspect/package.nix                       | 2 +-
 pkgs/by-name/mm/mmseqs2/package.nix                           | 2 +-
 pkgs/by-name/mo/modelscan/package.nix                         | 2 +-
 pkgs/by-name/mo/monitorets/package.nix                        | 2 +-
 pkgs/by-name/mo/monsoon/package.nix                           | 2 +-
 pkgs/by-name/mo/moodle-dl/package.nix                         | 2 +-
 pkgs/by-name/mo/moonfire-nvr/package.nix                      | 2 +-
 pkgs/by-name/mo/morewaita-icon-theme/package.nix              | 2 +-
 pkgs/by-name/mo/morf/package.nix                              | 2 +-
 pkgs/by-name/mo/mosdns/package.nix                            | 2 +-
 pkgs/by-name/mo/motoc/package.nix                             | 2 +-
 pkgs/by-name/mo/mouse-actions-gui/package.nix                 | 2 +-
 pkgs/by-name/mo/mov-cli/package.nix                           | 2 +-
 pkgs/by-name/mo/movim/package.nix                             | 2 +-
 pkgs/by-name/mo/mozphab/package.nix                           | 2 +-
 pkgs/by-name/mp/mpb/package.nix                               | 2 +-
 pkgs/by-name/mp/mpris-timer/package.nix                       | 2 +-
 pkgs/by-name/mp/mprocs/package.nix                            | 2 +-
 pkgs/by-name/mp/mps/package.nix                               | 2 +-
 pkgs/by-name/mq/mqtt-benchmark/package.nix                    | 2 +-
 pkgs/by-name/mq/mqtt-exporter/package.nix                     | 2 +-
 pkgs/by-name/mq/mqtt-randompub/package.nix                    | 2 +-
 pkgs/by-name/mq/mqttui/package.nix                            | 2 +-
 pkgs/by-name/mq/mqttx-cli/package.nix                         | 2 +-
 pkgs/by-name/ms/msgpack-c/package.nix                         | 2 +-
 pkgs/by-name/ms/msgpack-cxx/package.nix                       | 2 +-
 pkgs/by-name/mu/mubeng/package.nix                            | 2 +-
 pkgs/by-name/mu/mujoco/package.nix                            | 2 +-
 pkgs/by-name/mu/multipath-tools/package.nix                   | 2 +-
 pkgs/by-name/mu/music-assistant/package.nix                   | 2 +-
 pkgs/by-name/mu/musicpod/package.nix                          | 2 +-
 pkgs/by-name/mu/mutmut/package.nix                            | 2 +-
 pkgs/by-name/mv/mvfst/package.nix                             | 2 +-
 pkgs/by-name/mv/mvt/package.nix                               | 2 +-
 pkgs/by-name/mx/mx-takeover/package.nix                       | 2 +-
 pkgs/by-name/my/mya/package.nix                               | 2 +-
 pkgs/by-name/my/myanon/package.nix                            | 2 +-
 pkgs/by-name/my/mybbscan/package.nix                          | 2 +-
 pkgs/by-name/my/mydumper/package.nix                          | 2 +-
 pkgs/by-name/my/myks/package.nix                              | 2 +-
 pkgs/by-name/na/naabu/package.nix                             | 2 +-
 pkgs/by-name/na/nagios/package.nix                            | 2 +-
 pkgs/by-name/na/nagstamon/package.nix                         | 2 +-
 pkgs/by-name/na/nats-top/package.nix                          | 2 +-
 pkgs/by-name/na/natscli/package.nix                           | 2 +-
 pkgs/by-name/na/nautilus-open-any-terminal/package.nix        | 2 +-
 pkgs/by-name/na/nautilus-open-in-blackbox/package.nix         | 2 +-
 pkgs/by-name/nb/nbmerge/package.nix                           | 2 +-
 pkgs/by-name/nb/nbqa/package.nix                              | 2 +-
 pkgs/by-name/nb/nbtscanner/package.nix                        | 2 +-
 pkgs/by-name/nc/ncbi-vdb/package.nix                          | 2 +-
 pkgs/by-name/nc/nchat/package.nix                             | 2 +-
 pkgs/by-name/nc/ncmpcpp/package.nix                           | 2 +-
 pkgs/by-name/nc/ncspot/package.nix                            | 2 +-
 pkgs/by-name/nd/ndpi/package.nix                              | 2 +-
 pkgs/by-name/ne/nearcore/package.nix                          | 2 +-
 pkgs/by-name/ne/nebula/package.nix                            | 2 +-
 pkgs/by-name/ne/nengo-gui/package.nix                         | 2 +-
 pkgs/by-name/ne/neovim-node-client/package.nix                | 2 +-
 pkgs/by-name/ne/netbox_4_0/package.nix                        | 2 +-
 pkgs/by-name/ne/netbox_4_1/package.nix                        | 2 +-
 pkgs/by-name/ne/netease-cloud-music-gtk/package.nix           | 2 +-
 pkgs/by-name/ne/netfetch/package.nix                          | 2 +-
 pkgs/by-name/ne/netlistsvg/package.nix                        | 2 +-
 pkgs/by-name/ne/netscanner/package.nix                        | 2 +-
 pkgs/by-name/ne/newman/package.nix                            | 2 +-
 pkgs/by-name/ne/next-ls/package.nix                           | 2 +-
 pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix       | 2 +-
 pkgs/by-name/ne/nezha-agent/package.nix                       | 2 +-
 pkgs/by-name/ne/nezha/package.nix                             | 2 +-
 pkgs/by-name/nf/nfdump/package.nix                            | 2 +-
 pkgs/by-name/ng/nginx-language-server/package.nix             | 2 +-
 pkgs/by-name/nh/nh/package.nix                                | 2 +-
 pkgs/by-name/ni/nickel/package.nix                            | 2 +-
 pkgs/by-name/ni/nicotine-plus/package.nix                     | 2 +-
 pkgs/by-name/ni/niimath/package.nix                           | 2 +-
 pkgs/by-name/ni/niri/package.nix                              | 2 +-
 pkgs/by-name/ni/nix-forecast/package.nix                      | 2 +-
 pkgs/by-name/ni/nix-janitor/package.nix                       | 2 +-
 pkgs/by-name/ni/nix-update/package.nix                        | 2 +-
 pkgs/by-name/ni/nix-zsh-completions/package.nix               | 2 +-
 pkgs/by-name/nk/nkeys/package.nix                             | 2 +-
 pkgs/by-name/no/node-gyp/package.nix                          | 2 +-
 pkgs/by-name/no/node-pre-gyp/package.nix                      | 2 +-
 pkgs/by-name/no/node-red/package.nix                          | 2 +-
 pkgs/by-name/no/noice/package.nix                             | 2 +-
 pkgs/by-name/no/nomore403/package.nix                         | 2 +-
 pkgs/by-name/no/normcap/package.nix                           | 2 +-
 pkgs/by-name/no/norminette/package.nix                        | 2 +-
 pkgs/by-name/no/notonoto/package.nix                          | 2 +-
 pkgs/by-name/no/nova-password/package.nix                     | 2 +-
 pkgs/by-name/np/np/package.nix                                | 2 +-
 pkgs/by-name/nq/nqptp/package.nix                             | 2 +-
 pkgs/by-name/nr/nray/package.nix                              | 2 +-
 pkgs/by-name/ns/nstool/package.nix                            | 2 +-
 pkgs/by-name/nt/ntfs2btrfs/package.nix                        | 2 +-
 pkgs/by-name/nt/ntlmrecon/package.nix                         | 2 +-
 pkgs/by-name/nt/ntopng/package.nix                            | 2 +-
 pkgs/by-name/nt/ntpd-rs/package.nix                           | 2 +-
 pkgs/by-name/nu/nuclei-templates/package.nix                  | 2 +-
 pkgs/by-name/nu/nuclei/package.nix                            | 2 +-
 pkgs/by-name/nu/nucleiparser/package.nix                      | 2 +-
 pkgs/by-name/nv/nvdtools/package.nix                          | 2 +-
 pkgs/by-name/nv/nvpy/package.nix                              | 2 +-
 pkgs/by-name/nv/nvrh/package.nix                              | 2 +-
 pkgs/by-name/nw/nwg-clipman/package.nix                       | 2 +-
 pkgs/by-name/nw/nwg-displays/package.nix                      | 2 +-
 pkgs/by-name/nw/nwg-dock-hyprland/package.nix                 | 2 +-
 pkgs/by-name/nw/nwg-wrapper/package.nix                       | 2 +-
 pkgs/by-name/oa/oam-tools/package.nix                         | 2 +-
 pkgs/by-name/oa/oapi-codegen/package.nix                      | 2 +-
 pkgs/by-name/ob/obs-cli/package.nix                           | 2 +-
 pkgs/by-name/oc/ocis/package.nix                              | 2 +-
 pkgs/by-name/oc/ocsinventory-agent/package.nix                | 2 +-
 pkgs/by-name/oc/octoscan/package.nix                          | 2 +-
 pkgs/by-name/oc/octosuite/package.nix                         | 2 +-
 pkgs/by-name/oe/oelint-adv/package.nix                        | 2 +-
 pkgs/by-name/of/offat/package.nix                             | 2 +-
 pkgs/by-name/og/ogen/package.nix                              | 2 +-
 pkgs/by-name/oh/oha/package.nix                               | 2 +-
 pkgs/by-name/ok/okms-cli/package.nix                          | 2 +-
 pkgs/by-name/om/omorfi/package.nix                            | 2 +-
 pkgs/by-name/on/onionshare/package.nix                        | 2 +-
 pkgs/by-name/on/onthespot/package.nix                         | 2 +-
 pkgs/by-name/op/opae/package.nix                              | 2 +-
 pkgs/by-name/op/open5gs/package.nix                           | 2 +-
 pkgs/by-name/op/opengfw/package.nix                           | 2 +-
 pkgs/by-name/op/openpomodoro-cli/package.nix                  | 2 +-
 pkgs/by-name/op/openrisk/package.nix                          | 2 +-
 pkgs/by-name/op/openslide/package.nix                         | 2 +-
 pkgs/by-name/op/opensnitch-ui/package.nix                     | 2 +-
 pkgs/by-name/op/opensnitch/package.nix                        | 2 +-
 pkgs/by-name/op/opensplat/package.nix                         | 2 +-
 pkgs/by-name/op/opentabletdriver/package.nix                  | 2 +-
 pkgs/by-name/op/opentsdb/package.nix                          | 2 +-
 pkgs/by-name/op/openttd-ttf/package.nix                       | 2 +-
 pkgs/by-name/op/openvas-scanner/package.nix                   | 2 +-
 pkgs/by-name/op/openvas-smb/package.nix                       | 2 +-
 pkgs/by-name/op/openvino/package.nix                          | 2 +-
 pkgs/by-name/op/openvpn3/package.nix                          | 2 +-
 pkgs/by-name/op/openvswitch/package.nix                       | 2 +-
 pkgs/by-name/op/operator-sdk/package.nix                      | 2 +-
 pkgs/by-name/op/opsdroid/package.nix                          | 2 +-
 pkgs/by-name/op/opshin/package.nix                            | 2 +-
 pkgs/by-name/or/orion/package.nix                             | 2 +-
 pkgs/by-name/or/ory/package.nix                               | 2 +-
 pkgs/by-name/os/oscavmgr/package.nix                          | 2 +-
 pkgs/by-name/os/ospd-openvas/package.nix                      | 2 +-
 pkgs/by-name/os/ossutil/package.nix                           | 2 +-
 pkgs/by-name/os/osv-scanner/package.nix                       | 2 +-
 pkgs/by-name/ot/otpclient/package.nix                         | 2 +-
 pkgs/by-name/ou/out-of-tree/package.nix                       | 2 +-
 pkgs/by-name/ou/outguess/package.nix                          | 2 +-
 pkgs/by-name/ov/ov/package.nix                                | 2 +-
 pkgs/by-name/ov/overlayed/package.nix                         | 2 +-
 pkgs/by-name/ov/ovn/package.nix                               | 2 +-
 pkgs/by-name/ow/owncloud-client/package.nix                   | 2 +-
 pkgs/by-name/pa/pace/package.nix                              | 2 +-
 pkgs/by-name/pa/packetry/package.nix                          | 2 +-
 pkgs/by-name/pa/packj/package.nix                             | 2 +-
 pkgs/by-name/pa/pacu/package.nix                              | 2 +-
 pkgs/by-name/pa/pacup/package.nix                             | 2 +-
 pkgs/by-name/pa/padre/package.nix                             | 2 +-
 pkgs/by-name/pa/paml/package.nix                              | 4 ++--
 pkgs/by-name/pa/panvimdoc/package.nix                         | 2 +-
 pkgs/by-name/pa/pappl/package.nix                             | 2 +-
 pkgs/by-name/pa/parallel-hashmap/package.nix                  | 4 ++--
 pkgs/by-name/pa/parca-agent/package.nix                       | 2 +-
 pkgs/by-name/pa/parca-debuginfo/package.nix                   | 2 +-
 pkgs/by-name/pa/parca/package.nix                             | 2 +-
 pkgs/by-name/pa/parpd/package.nix                             | 2 +-
 pkgs/by-name/pa/parquet-tools/package.nix                     | 2 +-
 pkgs/by-name/pa/partio/package.nix                            | 2 +-
 pkgs/by-name/pa/passepartui/package.nix                       | 2 +-
 pkgs/by-name/pa/passky-desktop/package.nix                    | 2 +-
 pkgs/by-name/pa/past-time/package.nix                         | 2 +-
 pkgs/by-name/pa/patroni/package.nix                           | 2 +-
 pkgs/by-name/pa/payload-dumper-go/package.nix                 | 2 +-
 pkgs/by-name/pd/pdfannots2json/package.nix                    | 2 +-
 pkgs/by-name/pd/pdfarranger/package.nix                       | 2 +-
 pkgs/by-name/pd/pdfrip/package.nix                            | 2 +-
 pkgs/by-name/pd/pdm/package.nix                               | 2 +-
 pkgs/by-name/pe/peering-manager/package.nix                   | 2 +-
 pkgs/by-name/pe/performous/package.nix                        | 2 +-
 pkgs/by-name/pe/persepolis/package.nix                        | 2 +-
 pkgs/by-name/pf/pferd/package.nix                             | 2 +-
 pkgs/by-name/pg/pg_activity/package.nix                       | 2 +-
 pkgs/by-name/pg/pgf-pie/package.nix                           | 2 +-
 pkgs/by-name/pg/pgf-umlcd/package.nix                         | 2 +-
 pkgs/by-name/pg/pgf1/package.nix                              | 2 +-
 pkgs/by-name/pg/pgf2/package.nix                              | 2 +-
 pkgs/by-name/pg/pgf3/package.nix                              | 2 +-
 pkgs/by-name/pg/pgfplots/package.nix                          | 2 +-
 pkgs/by-name/pg/pgraphs/package.nix                           | 2 +-
 pkgs/by-name/ph/phel/package.nix                              | 2 +-
 pkgs/by-name/ph/photini/package.nix                           | 2 +-
 pkgs/by-name/ph/photofield/package.nix                        | 2 +-
 pkgs/by-name/pi/picard/package.nix                            | 2 +-
 pkgs/by-name/pi/picocrypt/package.nix                         | 2 +-
 pkgs/by-name/pi/pie-cli/package.nix                           | 2 +-
 pkgs/by-name/pi/pigz/package.nix                              | 2 +-
 pkgs/by-name/pi/pingtcp/package.nix                           | 2 +-
 pkgs/by-name/pi/pip-audit/package.nix                         | 2 +-
 pkgs/by-name/pi/pipenv/package.nix                            | 2 +-
 pkgs/by-name/pi/piper-phonemize/package.nix                   | 2 +-
 pkgs/by-name/pi/pizauth/package.nix                           | 2 +-
 pkgs/by-name/pl/plasma-applet-commandoutput/package.nix       | 2 +-
 pkgs/by-name/pl/plasma-panel-colorizer/package.nix            | 2 +-
 pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix      | 2 +-
 pkgs/by-name/pl/plasmusic-toolbar/package.nix                 | 2 +-
 pkgs/by-name/pl/plattenalbum/package.nix                      | 2 +-
 pkgs/by-name/pl/plow/package.nix                              | 2 +-
 pkgs/by-name/po/pocketsphinx/package.nix                      | 2 +-
 pkgs/by-name/po/podlet/package.nix                            | 2 +-
 pkgs/by-name/po/poethepoet/package.nix                        | 4 ++--
 pkgs/by-name/po/pokete/package.nix                            | 2 +-
 pkgs/by-name/po/pololu-tic/package.nix                        | 2 +-
 pkgs/by-name/po/portablemc/package.nix                        | 4 ++--
 pkgs/by-name/po/postmoogle/package.nix                        | 2 +-
 pkgs/by-name/po/posy-cursors/package.nix                      | 2 +-
 pkgs/by-name/po/poutine/package.nix                           | 2 +-
 pkgs/by-name/po/powerhub/package.nix                          | 2 +-
 pkgs/by-name/po/powerpipe/package.nix                         | 2 +-
 pkgs/by-name/po/powertop/package.nix                          | 2 +-
 pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix       | 2 +-
 pkgs/by-name/pr/pre-commit/package.nix                        | 2 +-
 pkgs/by-name/pr/pre2k/package.nix                             | 2 +-
 pkgs/by-name/pr/presenterm/package.nix                        | 2 +-
 pkgs/by-name/pr/pretender/package.nix                         | 2 +-
 pkgs/by-name/pr/prettierd/package.nix                         | 2 +-
 pkgs/by-name/pr/printrun/package.nix                          | 2 +-
 pkgs/by-name/pr/prismlauncher-unwrapped/package.nix           | 2 +-
 pkgs/by-name/pr/privatebin/package.nix                        | 2 +-
 pkgs/by-name/pr/project-lemonlime/package.nix                 | 2 +-
 pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix     | 2 +-
 pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix          | 2 +-
 pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix       | 2 +-
 pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix      | 2 +-
 pkgs/by-name/pr/protobufc/package.nix                         | 2 +-
 pkgs/by-name/pr/protoc-gen-connect-es/package.nix             | 2 +-
 pkgs/by-name/pr/protoc-gen-connect-go/package.nix             | 2 +-
 pkgs/by-name/pr/protoc-gen-elixir/package.nix                 | 2 +-
 pkgs/by-name/pr/protoc-gen-es/package.nix                     | 2 +-
 pkgs/by-name/pr/protols/package.nix                           | 2 +-
 pkgs/by-name/pr/proxify/package.nix                           | 2 +-
 pkgs/by-name/ps/ps3-disc-dumper/package.nix                   | 2 +-
 pkgs/by-name/ps/psudohash/package.nix                         | 2 +-
 pkgs/by-name/pu/pubs/package.nix                              | 2 +-
 pkgs/by-name/pw/pwdsafety/package.nix                         | 2 +-
 pkgs/by-name/pw/pwvucontrol/package.nix                       | 2 +-
 pkgs/by-name/py/pyamlboot/package.nix                         | 2 +-
 pkgs/by-name/py/pyenv/package.nix                             | 2 +-
 pkgs/by-name/py/pyfa/package.nix                              | 2 +-
 pkgs/by-name/py/pylode/package.nix                            | 2 +-
 pkgs/by-name/py/pyp/package.nix                               | 2 +-
 pkgs/by-name/py/pypi-mirror/package.nix                       | 2 +-
 pkgs/by-name/py/pyprland/package.nix                          | 2 +-
 pkgs/by-name/py/pyrosimple/package.nix                        | 2 +-
 pkgs/by-name/py/pysqlrecon/package.nix                        | 2 +-
 pkgs/by-name/py/pytr/package.nix                              | 4 ++--
 pkgs/by-name/q2/q2pro/package.nix                             | 2 +-
 pkgs/by-name/qd/qdiskinfo/package.nix                         | 2 +-
 pkgs/by-name/qd/qdrant-web-ui/package.nix                     | 2 +-
 pkgs/by-name/qh/qhexedit2/package.nix                         | 2 +-
 pkgs/by-name/qo/qovery-cli/package.nix                        | 2 +-
 pkgs/by-name/qq/qqwing/package.nix                            | 2 +-
 pkgs/by-name/qs/qspeakers/package.nix                         | 2 +-
 pkgs/by-name/qt/qtalarm/package.nix                           | 2 +-
 pkgs/by-name/qu/quake-injector/package.nix                    | 2 +-
 pkgs/by-name/qu/qualisys-cpp-sdk/package.nix                  | 2 +-
 pkgs/by-name/qu/quick-lookup/package.nix                      | 2 +-
 pkgs/by-name/qw/qwerty-fr/package.nix                         | 2 +-
 pkgs/by-name/ra/rabbit/package.nix                            | 2 +-
 pkgs/by-name/ra/radcli/package.nix                            | 2 +-
 pkgs/by-name/ra/radiance/package.nix                          | 2 +-
 pkgs/by-name/ra/radicale/package.nix                          | 2 +-
 pkgs/by-name/ra/radvd/package.nix                             | 2 +-
 pkgs/by-name/ra/raft-canonical/package.nix                    | 2 +-
 pkgs/by-name/ra/raft-cowsql/package.nix                       | 2 +-
 pkgs/by-name/ra/rain-bittorrent/package.nix                   | 2 +-
 pkgs/by-name/ra/rainfrog/package.nix                          | 2 +-
 pkgs/by-name/ra/rana/package.nix                              | 2 +-
 pkgs/by-name/ra/raspberrypi-eeprom/package.nix                | 2 +-
 pkgs/by-name/ra/rates/package.nix                             | 2 +-
 pkgs/by-name/ra/raygui/package.nix                            | 2 +-
 pkgs/by-name/ra/raze/package.nix                              | 2 +-
 pkgs/by-name/rd/rdkafka/package.nix                           | 2 +-
 pkgs/by-name/re/readability-extractor/package.nix             | 2 +-
 pkgs/by-name/re/readsb/package.nix                            | 2 +-
 pkgs/by-name/re/ready-check/package.nix                       | 2 +-
 pkgs/by-name/re/refurb/package.nix                            | 2 +-
 pkgs/by-name/re/reindeer/package.nix                          | 2 +-
 pkgs/by-name/re/remarshal_0_17/package.nix                    | 2 +-
 pkgs/by-name/re/remod/package.nix                             | 2 +-
 pkgs/by-name/re/repak/package.nix                             | 2 +-
 pkgs/by-name/re/repocheck/package.nix                         | 2 +-
 pkgs/by-name/re/resolve-march-native/package.nix              | 2 +-
 pkgs/by-name/re/resources/package.nix                         | 2 +-
 pkgs/by-name/re/responder/package.nix                         | 2 +-
 pkgs/by-name/re/resticprofile/package.nix                     | 2 +-
 pkgs/by-name/re/restish/package.nix                           | 2 +-
 pkgs/by-name/re/retdec/package.nix                            | 2 +-
 pkgs/by-name/re/retool/package.nix                            | 2 +-
 pkgs/by-name/rf/rfc-bibtex/package.nix                        | 2 +-
 pkgs/by-name/ri/rich-cli/package.nix                          | 2 +-
 pkgs/by-name/ri/ride/package.nix                              | 2 +-
 pkgs/by-name/ri/riffdiff/package.nix                          | 2 +-
 pkgs/by-name/ri/ripasso-cursive/package.nix                   | 2 +-
 pkgs/by-name/ri/ripe-atlas-tools/package.nix                  | 2 +-
 pkgs/by-name/ri/rippkgs/package.nix                           | 2 +-
 pkgs/by-name/ri/rita/package.nix                              | 2 +-
 pkgs/by-name/ri/rivalcfg/package.nix                          | 2 +-
 pkgs/by-name/rm/rmate-sh/package.nix                          | 2 +-
 pkgs/by-name/rn/rnm/package.nix                               | 2 +-
 pkgs/by-name/ro/roadrunner/package.nix                        | 2 +-
 pkgs/by-name/ro/robin-map/package.nix                         | 2 +-
 pkgs/by-name/ro/rofi-games/package.nix                        | 2 +-
 pkgs/by-name/ro/rofimoji/package.nix                          | 2 +-
 pkgs/by-name/ro/rogcat/package.nix                            | 2 +-
 pkgs/by-name/ro/rot8/package.nix                              | 2 +-
 pkgs/by-name/ro/route-detect/package.nix                      | 2 +-
 pkgs/by-name/ro/route-graph/package.nix                       | 2 +-
 pkgs/by-name/rp/rpi-imager/package.nix                        | 2 +-
 pkgs/by-name/rs/rstfmt/package.nix                            | 2 +-
 pkgs/by-name/rt/rtaudio_6/package.nix                         | 2 +-
 pkgs/by-name/ru/ruff-lsp/package.nix                          | 2 +-
 pkgs/by-name/ru/ruler/package.nix                             | 2 +-
 pkgs/by-name/ru/rustcat/package.nix                           | 2 +-
 pkgs/by-name/ru/rustic/package.nix                            | 2 +-
 pkgs/by-name/ru/rusty-bash/package.nix                        | 2 +-
 pkgs/by-name/s2/s2geometry/package.nix                        | 4 ++--
 pkgs/by-name/s3/s3ql/package.nix                              | 2 +-
 pkgs/by-name/sa/sad/package.nix                               | 2 +-
 pkgs/by-name/sa/salt-lint/package.nix                         | 2 +-
 pkgs/by-name/sa/sasutils/package.nix                          | 2 +-
 pkgs/by-name/sa/saucectl/package.nix                          | 2 +-
 pkgs/by-name/sb/sbctl/package.nix                             | 2 +-
 pkgs/by-name/sb/sbom-utility/package.nix                      | 2 +-
 pkgs/by-name/sc/scarab/package.nix                            | 2 +-
 pkgs/by-name/sc/scenefx/package.nix                           | 2 +-
 pkgs/by-name/sc/schemaspy/package.nix                         | 2 +-
 pkgs/by-name/sc/scilla/package.nix                            | 2 +-
 pkgs/by-name/sc/scli/package.nix                              | 2 +-
 pkgs/by-name/sc/scrcpy/package.nix                            | 2 +-
 pkgs/by-name/sc/screenly-cli/package.nix                      | 2 +-
 pkgs/by-name/sc/screentest/package.nix                        | 2 +-
 pkgs/by-name/sc/scrutiny-collector/package.nix                | 2 +-
 pkgs/by-name/sc/scrutiny/package.nix                          | 2 +-
 pkgs/by-name/sc/scs/package.nix                               | 2 +-
 pkgs/by-name/se/secp256k1/package.nix                         | 2 +-
 pkgs/by-name/se/secrets-extractor/package.nix                 | 2 +-
 pkgs/by-name/se/secretscanner/package.nix                     | 2 +-
 pkgs/by-name/se/send/package.nix                              | 2 +-
 pkgs/by-name/se/sentencepiece/package.nix                     | 2 +-
 pkgs/by-name/se/sequin/package.nix                            | 2 +-
 pkgs/by-name/se/setools/package.nix                           | 2 +-
 pkgs/by-name/se/setzer/package.nix                            | 2 +-
 pkgs/by-name/sf/sftpgo/package.nix                            | 2 +-
 pkgs/by-name/sh/shadowsocks-libev/package.nix                 | 2 +-
 pkgs/by-name/sh/shairport-sync/package.nix                    | 2 +-
 pkgs/by-name/sh/shaka-packager/package.nix                    | 2 +-
 pkgs/by-name/sh/shell-gpt/package.nix                         | 2 +-
 pkgs/by-name/sh/shellclear/package.nix                        | 2 +-
 pkgs/by-name/sh/shelldap/package.nix                          | 2 +-
 pkgs/by-name/sh/sherlock/package.nix                          | 2 +-
 pkgs/by-name/sh/shipwright/package.nix                        | 2 +-
 pkgs/by-name/sh/shotcut/package.nix                           | 2 +-
 pkgs/by-name/sh/shoutrrr/package.nix                          | 2 +-
 pkgs/by-name/sh/showmethekey/package.nix                      | 2 +-
 pkgs/by-name/si/sigma-cli/package.nix                         | 2 +-
 pkgs/by-name/si/simple64-netplay-server/package.nix           | 2 +-
 pkgs/by-name/si/simple64/package.nix                          | 2 +-
 pkgs/by-name/si/simpleini/package.nix                         | 2 +-
 pkgs/by-name/si/sipvicious/package.nix                        | 2 +-
 pkgs/by-name/si/sish/package.nix                              | 2 +-
 pkgs/by-name/sk/skim/package.nix                              | 2 +-
 pkgs/by-name/sk/skjold/package.nix                            | 2 +-
 pkgs/by-name/sk/skrive/package.nix                            | 2 +-
 pkgs/by-name/sk/skytemple/package.nix                         | 2 +-
 pkgs/by-name/sl/slackdump/package.nix                         | 2 +-
 pkgs/by-name/sl/slowlorust/package.nix                        | 2 +-
 pkgs/by-name/sl/slskd/package.nix                             | 2 +-
 pkgs/by-name/sl/slumber/package.nix                           | 2 +-
 pkgs/by-name/sm/smartcat/package.nix                          | 2 +-
 pkgs/by-name/sm/smbmap/package.nix                            | 2 +-
 pkgs/by-name/sm/smtp4dev/package.nix                          | 2 +-
 pkgs/by-name/sm/smtprelay/package.nix                         | 2 +-
 pkgs/by-name/sn/sn0int/package.nix                            | 2 +-
 pkgs/by-name/sn/snallygaster/package.nix                      | 2 +-
 pkgs/by-name/sn/snapcraft/package.nix                         | 2 +-
 pkgs/by-name/sn/sniffnet/package.nix                          | 2 +-
 pkgs/by-name/sn/snowflake-cli/package.nix                     | 2 +-
 pkgs/by-name/sn/snpguest/package.nix                          | 2 +-
 pkgs/by-name/sn/snphost/package.nix                           | 2 +-
 pkgs/by-name/sn/snyk/package.nix                              | 2 +-
 pkgs/by-name/so/softether/package.nix                         | 2 +-
 pkgs/by-name/so/solaar/package.nix                            | 2 +-
 pkgs/by-name/so/sonar-scanner-cli/package.nix                 | 2 +-
 pkgs/by-name/so/sonic-server/package.nix                      | 2 +-
 pkgs/by-name/so/sops/package.nix                              | 2 +-
 pkgs/by-name/so/sopwith/package.nix                           | 2 +-
 pkgs/by-name/so/soteria/package.nix                           | 2 +-
 pkgs/by-name/so/soundconverter/package.nix                    | 2 +-
 pkgs/by-name/sp/speedtest-go/package.nix                      | 2 +-
 pkgs/by-name/sp/speedtest-rs/package.nix                      | 2 +-
 pkgs/by-name/sp/speedtest/package.nix                         | 2 +-
 pkgs/by-name/sp/sploitscan/package.nix                        | 2 +-
 pkgs/by-name/sp/spnavcfg/package.nix                          | 2 +-
 pkgs/by-name/sp/spotdl/package.nix                            | 2 +-
 pkgs/by-name/sp/spotify-player/package.nix                    | 2 +-
 pkgs/by-name/sq/sqlboiler/package.nix                         | 2 +-
 pkgs/by-name/sq/sqlfluff/package.nix                          | 2 +-
 pkgs/by-name/sq/sqlite3-to-mysql/package.nix                  | 2 +-
 pkgs/by-name/sq/sqlmc/package.nix                             | 2 +-
 pkgs/by-name/sq/sqlpkg-cli/package.nix                        | 2 +-
 pkgs/by-name/sq/sqruff/package.nix                            | 2 +-
 pkgs/by-name/sr/sratoolkit/package.nix                        | 2 +-
 pkgs/by-name/ss/ssh-audit/package.nix                         | 2 +-
 pkgs/by-name/ss/ssh-import-id/package.nix                     | 2 +-
 pkgs/by-name/ss/ssh-mitm/package.nix                          | 2 +-
 pkgs/by-name/ss/sshified/package.nix                          | 2 +-
 pkgs/by-name/ss/sshocker/package.nix                          | 2 +-
 pkgs/by-name/ss/sslstrip/package.nix                          | 2 +-
 pkgs/by-name/st/stac-validator/package.nix                    | 2 +-
 pkgs/by-name/st/stalwart-mail/package.nix                     | 2 +-
 pkgs/by-name/st/stardust-xr-server/package.nix                | 2 +-
 pkgs/by-name/st/steampipe/package.nix                         | 2 +-
 pkgs/by-name/st/step-ca/package.nix                           | 2 +-
 pkgs/by-name/st/step-cli/package.nix                          | 2 +-
 pkgs/by-name/st/stevenblack-blocklist/package.nix             | 2 +-
 pkgs/by-name/st/stratis-cli/package.nix                       | 2 +-
 pkgs/by-name/st/stratisd/package.nix                          | 2 +-
 pkgs/by-name/st/stressapptest/package.nix                     | 2 +-
 pkgs/by-name/st/strictdoc/package.nix                         | 2 +-
 pkgs/by-name/su/subfinder/package.nix                         | 2 +-
 pkgs/by-name/su/subprober/package.nix                         | 2 +-
 pkgs/by-name/su/sudachi-rs/package.nix                        | 2 +-
 pkgs/by-name/su/superhtml/package.nix                         | 2 +-
 pkgs/by-name/su/superlu/package.nix                           | 2 +-
 pkgs/by-name/sv/svt-av1-psy/package.nix                       | 2 +-
 pkgs/by-name/sw/sway-assign-cgroups/package.nix               | 2 +-
 pkgs/by-name/sw/swayfx-unwrapped/package.nix                  | 2 +-
 pkgs/by-name/sw/swayimg/package.nix                           | 2 +-
 pkgs/by-name/sw/swego/package.nix                             | 2 +-
 pkgs/by-name/sw/switchres/package.nix                         | 2 +-
 pkgs/by-name/sw/swww/package.nix                              | 2 +-
 pkgs/by-name/sy/syft/package.nix                              | 2 +-
 pkgs/by-name/sy/syncstorage-rs/package.nix                    | 2 +-
 pkgs/by-name/sy/syncyomi/package.nix                          | 2 +-
 pkgs/by-name/sy/sysstat/package.nix                           | 2 +-
 pkgs/by-name/sy/systemd-netlogd/package.nix                   | 2 +-
 pkgs/by-name/ta/tabby-agent/package.nix                       | 2 +-
 pkgs/by-name/ta/tabby/package.nix                             | 2 +-
 pkgs/by-name/ta/tartufo/package.nix                           | 2 +-
 pkgs/by-name/ta/task-keeper/package.nix                       | 2 +-
 pkgs/by-name/ta/tasks/package.nix                             | 2 +-
 pkgs/by-name/ta/taterclient-ddnet/package.nix                 | 2 +-
 pkgs/by-name/ta/tatl/package.nix                              | 2 +-
 pkgs/by-name/te/teams-for-linux/package.nix                   | 2 +-
 pkgs/by-name/te/technitium-dns-server-library/package.nix     | 2 +-
 pkgs/by-name/te/technitium-dns-server/package.nix             | 2 +-
 pkgs/by-name/te/teler/package.nix                             | 2 +-
 pkgs/by-name/te/tell-me-your-secrets/package.nix              | 2 +-
 pkgs/by-name/te/tennix/package.nix                            | 2 +-
 pkgs/by-name/te/terminator/package.nix                        | 2 +-
 pkgs/by-name/te/termineter/package.nix                        | 2 +-
 pkgs/by-name/te/termscp/package.nix                           | 2 +-
 pkgs/by-name/te/terraform-compliance/package.nix              | 2 +-
 pkgs/by-name/te/terraform-plugin-docs/package.nix             | 2 +-
 pkgs/by-name/te/terragrunt/package.nix                        | 2 +-
 pkgs/by-name/te/terrapin-scanner/package.nix                  | 2 +-
 pkgs/by-name/te/terrascan/package.nix                         | 2 +-
 pkgs/by-name/te/testlib/package.nix                           | 2 +-
 pkgs/by-name/te/tetragon/package.nix                          | 2 +-
 pkgs/by-name/te/tex-fmt/package.nix                           | 2 +-
 pkgs/by-name/te/textlint-plugin-org/package.nix               | 2 +-
 .../te/textlint-rule-abbr-within-parentheses/package.nix      | 4 ++--
 pkgs/by-name/te/textlint-rule-alex/package.nix                | 4 ++--
 pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix   | 4 ++--
 pkgs/by-name/te/textlint-rule-max-comma/package.nix           | 4 ++--
 .../textlint-rule-no-start-duplicated-conjunction/package.nix | 4 ++--
 pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix | 4 ++--
 .../te/textlint-rule-preset-ja-technical-writing/package.nix  | 2 +-
 pkgs/by-name/te/textlint-rule-prh/package.nix                 | 2 +-
 pkgs/by-name/te/textlint-rule-stop-words/package.nix          | 4 ++--
 pkgs/by-name/te/textlint-rule-terminology/package.nix         | 4 ++--
 pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix  | 4 ++--
 pkgs/by-name/te/textlint/package.nix                          | 2 +-
 pkgs/by-name/tf/tflint/package.nix                            | 2 +-
 pkgs/by-name/tf/tfsec/package.nix                             | 2 +-
 pkgs/by-name/tg/tg-archive/package.nix                        | 2 +-
 pkgs/by-name/tg/tgpt/package.nix                              | 2 +-
 pkgs/by-name/th/thanos/package.nix                            | 2 +-
 pkgs/by-name/th/the-powder-toy/package.nix                    | 2 +-
 pkgs/by-name/th/theattyr/package.nix                          | 2 +-
 pkgs/by-name/th/thefuck/package.nix                           | 2 +-
 pkgs/by-name/th/theharvester/package.nix                      | 2 +-
 pkgs/by-name/th/threatest/package.nix                         | 2 +-
 pkgs/by-name/ti/ticker/package.nix                            | 2 +-
 pkgs/by-name/ti/tickrs/package.nix                            | 2 +-
 pkgs/by-name/ti/tiddit/package.nix                            | 2 +-
 pkgs/by-name/ti/time-decode/package.nix                       | 2 +-
 pkgs/by-name/ti/timetagger_cli/package.nix                    | 2 +-
 pkgs/by-name/ti/tinyfetch/package.nix                         | 2 +-
 pkgs/by-name/ti/tinyssh/package.nix                           | 2 +-
 pkgs/by-name/tl/tlsinfo/package.nix                           | 2 +-
 pkgs/by-name/tl/tlsx/package.nix                              | 2 +-
 pkgs/by-name/to/todoman/package.nix                           | 2 +-
 pkgs/by-name/to/tomb/package.nix                              | 2 +-
 pkgs/by-name/to/toml-sort/package.nix                         | 2 +-
 pkgs/by-name/to/tomlplusplus/package.nix                      | 2 +-
 pkgs/by-name/to/tomlq/package.nix                             | 2 +-
 pkgs/by-name/to/tone/package.nix                              | 2 +-
 pkgs/by-name/to/toolong/package.nix                           | 2 +-
 pkgs/by-name/to/totp-cli/package.nix                          | 2 +-
 pkgs/by-name/tp/tproxy/package.nix                            | 2 +-
 pkgs/by-name/tr/tracexec/package.nix                          | 2 +-
 pkgs/by-name/tr/transmission-remote-gtk/package.nix           | 2 +-
 pkgs/by-name/tr/trickest-cli/package.nix                      | 2 +-
 pkgs/by-name/tr/trivy/package.nix                             | 2 +-
 pkgs/by-name/tr/trustymail/package.nix                        | 2 +-
 pkgs/by-name/tt/tts/package.nix                               | 2 +-
 pkgs/by-name/tt/ttyd/package.nix                              | 2 +-
 pkgs/by-name/tt/ttysvr/package.nix                            | 2 +-
 pkgs/by-name/tu/tuisky/package.nix                            | 2 +-
 pkgs/by-name/tu/tun2proxy/package.nix                         | 2 +-
 pkgs/by-name/tu/tunnelgraf/package.nix                        | 2 +-
 pkgs/by-name/tu/turbo-unwrapped/package.nix                   | 2 +-
 pkgs/by-name/tu/turn-rs/package.nix                           | 2 +-
 pkgs/by-name/tw/twig-language-server/package.nix              | 2 +-
 pkgs/by-name/tw/twitch-dl/package.nix                         | 2 +-
 pkgs/by-name/tw/twm/package.nix                               | 4 ++--
 pkgs/by-name/tx/txt2tags/package.nix                          | 2 +-
 pkgs/by-name/ty/typos-lsp/package.nix                         | 2 +-
 pkgs/by-name/ty/typst-lsp/package.nix                         | 4 ++--
 pkgs/by-name/ty/typst/package.nix                             | 2 +-
 pkgs/by-name/tz/tzupdate/package.nix                          | 2 +-
 pkgs/by-name/u-/u-config/package.nix                          | 2 +-
 pkgs/by-name/ub/ubridge/package.nix                           | 2 +-
 pkgs/by-name/uc/uchecker/package.nix                          | 2 +-
 pkgs/by-name/ud/udev-block-notify/package.nix                 | 2 +-
 pkgs/by-name/ud/udocker/package.nix                           | 2 +-
 pkgs/by-name/ud/udpx/package.nix                              | 2 +-
 pkgs/by-name/ug/ugit/package.nix                              | 2 +-
 pkgs/by-name/uk/ukmm/package.nix                              | 2 +-
 pkgs/by-name/un/unbound/package.nix                           | 2 +-
 pkgs/by-name/un/uncover/package.nix                           | 2 +-
 pkgs/by-name/un/uni/package.nix                               | 2 +-
 pkgs/by-name/un/unifi-protect-backup/package.nix              | 2 +-
 pkgs/by-name/un/unnamed-sdvx-clone/package.nix                | 2 +-
 pkgs/by-name/up/upiano/package.nix                            | 2 +-
 pkgs/by-name/up/upscayl-ncnn/package.nix                      | 2 +-
 pkgs/by-name/ur/urh/package.nix                               | 2 +-
 pkgs/by-name/ur/url-parser/package.nix                        | 2 +-
 pkgs/by-name/ur/urlscan/package.nix                           | 2 +-
 pkgs/by-name/uw/uwc/package.nix                               | 2 +-
 pkgs/by-name/uw/uwsm/package.nix                              | 2 +-
 pkgs/by-name/v4/v4l2-relayd/package.nix                       | 2 +-
 pkgs/by-name/va/vacuum-go/package.nix                         | 2 +-
 pkgs/by-name/va/vale-ls/package.nix                           | 2 +-
 pkgs/by-name/va/vapoursynth-bestsource/package.nix            | 2 +-
 pkgs/by-name/va/vapoursynth-nnedi3/package.nix                | 2 +-
 pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix              | 2 +-
 pkgs/by-name/va/varia/package.nix                             | 2 +-
 pkgs/by-name/va/variety/package.nix                           | 2 +-
 pkgs/by-name/va/vatprism/package.nix                          | 2 +-
 pkgs/by-name/ve/verdict/package.nix                           | 2 +-
 pkgs/by-name/ve/versatiles/package.nix                        | 2 +-
 pkgs/by-name/ve/versitygw/package.nix                         | 2 +-
 pkgs/by-name/vg/vgmstream/package.nix                         | 2 +-
 pkgs/by-name/vg/vgmtrans/package.nix                          | 2 +-
 pkgs/by-name/vi/vidcutter/package.nix                         | 2 +-
 pkgs/by-name/vi/villain/package.nix                           | 2 +-
 pkgs/by-name/vi/vips/package.nix                              | 2 +-
 pkgs/by-name/vi/visp/package.nix                              | 2 +-
 pkgs/by-name/vo/vokoscreen-ng/package.nix                     | 2 +-
 pkgs/by-name/vo/volatility3/package.nix                       | 2 +-
 pkgs/by-name/vo/vouch-proxy/package.nix                       | 2 +-
 pkgs/by-name/vp/vpcs/package.nix                              | 2 +-
 pkgs/by-name/vr/vrcadvert/package.nix                         | 2 +-
 pkgs/by-name/vt/vt-cli/package.nix                            | 2 +-
 pkgs/by-name/vu/vuls/package.nix                              | 2 +-
 pkgs/by-name/vu/vunnel/package.nix                            | 2 +-
 pkgs/by-name/vw/vwsfriend/package.nix                         | 2 +-
 pkgs/by-name/vx/vxl/package.nix                               | 2 +-
 pkgs/by-name/vy/vyxal/package.nix                             | 2 +-
 pkgs/by-name/wa/waagent/package.nix                           | 2 +-
 pkgs/by-name/wa/waf-tester/package.nix                        | 2 +-
 pkgs/by-name/wa/wafw00f/package.nix                           | 2 +-
 pkgs/by-name/wa/wangle/package.nix                            | 2 +-
 pkgs/by-name/wa/wapiti/package.nix                            | 2 +-
 pkgs/by-name/wa/wasabibackend/package.nix                     | 2 +-
 pkgs/by-name/wa/wasm-pack/package.nix                         | 2 +-
 pkgs/by-name/wa/watchman/package.nix                          | 2 +-
 pkgs/by-name/wa/waybar/package.nix                            | 2 +-
 pkgs/by-name/wa/waycorner/package.nix                         | 2 +-
 pkgs/by-name/wa/waydroid/package.nix                          | 2 +-
 pkgs/by-name/wa/waypaper/package.nix                          | 2 +-
 pkgs/by-name/wc/wcurl/package.nix                             | 2 +-
 pkgs/by-name/we/webanalyze/package.nix                        | 2 +-
 pkgs/by-name/we/webcord/package.nix                           | 2 +-
 pkgs/by-name/we/weblate/package.nix                           | 2 +-
 pkgs/by-name/we/webpack-cli/package.nix                       | 2 +-
 pkgs/by-name/we/websocat/package.nix                          | 2 +-
 pkgs/by-name/we/websploit/package.nix                         | 2 +-
 pkgs/by-name/we/websurfx/package.nix                          | 2 +-
 pkgs/by-name/wg/wgcf/package.nix                              | 2 +-
 pkgs/by-name/wg/wgpu-native/package.nix                       | 2 +-
 pkgs/by-name/wg/wgsl-analyzer/package.nix                     | 2 +-
 pkgs/by-name/wh/whatsapp-chat-exporter/package.nix            | 2 +-
 pkgs/by-name/wh/whatsapp-emoji-font/package.nix               | 2 +-
 pkgs/by-name/wh/whatsie/package.nix                           | 2 +-
 pkgs/by-name/wh/where-is-my-sddm-theme/package.nix            | 2 +-
 pkgs/by-name/wi/wideriver/package.nix                         | 2 +-
 pkgs/by-name/wi/wikiman/package.nix                           | 2 +-
 pkgs/by-name/wi/wiper/package.nix                             | 2 +-
 pkgs/by-name/wi/wired/package.nix                             | 2 +-
 pkgs/by-name/wi/wireguard-ui/package.nix                      | 2 +-
 pkgs/by-name/wi/wizer/package.nix                             | 2 +-
 pkgs/by-name/wl/wl-kbptr/package.nix                          | 2 +-
 pkgs/by-name/wl/wl-restart/package.nix                        | 2 +-
 pkgs/by-name/wl/wlr-layout-ui/package.nix                     | 2 +-
 pkgs/by-name/wo/woodpecker-plugin-git/package.nix             | 2 +-
 pkgs/by-name/wo/woomer/package.nix                            | 2 +-
 pkgs/by-name/wo/wordbook/package.nix                          | 2 +-
 pkgs/by-name/wo/workout-tracker/package.nix                   | 2 +-
 pkgs/by-name/wo/world-serpant-search/package.nix              | 2 +-
 pkgs/by-name/ws/wsrepl/package.nix                            | 2 +-
 pkgs/by-name/wt/wtfis/package.nix                             | 2 +-
 pkgs/by-name/wy/wyoming-satellite/package.nix                 | 2 +-
 pkgs/by-name/xa/xandikos/package.nix                          | 2 +-
 pkgs/by-name/xa/xautocfg/package.nix                          | 2 +-
 pkgs/by-name/xc/xcrawl3r/package.nix                          | 2 +-
 pkgs/by-name/xe/xeol/package.nix                              | 2 +-
 pkgs/by-name/xm/xmoji/package.nix                             | 2 +-
 pkgs/by-name/xn/xnlinkfinder/package.nix                      | 2 +-
 pkgs/by-name/xo/xortool/package.nix                           | 2 +-
 pkgs/by-name/xp/xpaste/package.nix                            | 2 +-
 pkgs/by-name/xr/xrootd/package.nix                            | 2 +-
 pkgs/by-name/xs/xsct/package.nix                              | 2 +-
 pkgs/by-name/xs/xsubfind3r/package.nix                        | 2 +-
 pkgs/by-name/xw/xwayland-satellite/package.nix                | 2 +-
 pkgs/by-name/xw/xwinmosaic/package.nix                        | 2 +-
 pkgs/by-name/xx/xxh/package.nix                               | 2 +-
 pkgs/by-name/ya/yamlfmt/package.nix                           | 2 +-
 pkgs/by-name/ya/yamlpath/package.nix                          | 2 +-
 pkgs/by-name/ya/yara-x/package.nix                            | 2 +-
 pkgs/by-name/ya/yara/package.nix                              | 2 +-
 pkgs/by-name/ya/yatas/package.nix                             | 2 +-
 pkgs/by-name/ye/yewtube/package.nix                           | 2 +-
 pkgs/by-name/yo/yofi/package.nix                              | 2 +-
 pkgs/by-name/yo/your_spotify/package.nix                      | 2 +-
 pkgs/by-name/yt/ytdownloader/package.nix                      | 2 +-
 pkgs/by-name/yu/yubico-piv-tool/package.nix                   | 2 +-
 pkgs/by-name/yu/yutto/package.nix                             | 2 +-
 pkgs/by-name/za/zabbix-cli/package.nix                        | 2 +-
 pkgs/by-name/za/zapret/package.nix                            | 2 +-
 pkgs/by-name/ze/zellij/package.nix                            | 2 +-
 pkgs/by-name/ze/zenn-cli/package.nix                          | 2 +-
 pkgs/by-name/zf/zf/package.nix                                | 2 +-
 pkgs/by-name/zi/zigpy-cli/package.nix                         | 2 +-
 pkgs/by-name/zi/zircolite/package.nix                         | 2 +-
 pkgs/by-name/zi/zizmor/package.nix                            | 2 +-
 pkgs/by-name/zk/zkar/package.nix                              | 2 +-
 pkgs/by-name/zl/zlint/package.nix                             | 4 ++--
 pkgs/by-name/zn/znapzend/package.nix                          | 2 +-
 pkgs/by-name/zo/zoraxy/package.nix                            | 2 +-
 pkgs/by-name/zo/zoxide/package.nix                            | 2 +-
 pkgs/by-name/zs/zsh-forgit/package.nix                        | 2 +-
 pkgs/desktops/gnome/extensions/impatience/default.nix         | 2 +-
 pkgs/desktops/mate/libmatekbd/default.nix                     | 2 +-
 .../compilers/elm/packages/elm-test-rs/default.nix            | 2 +-
 pkgs/development/compilers/gleam/default.nix                  | 2 +-
 pkgs/development/compilers/teyjus/default.nix                 | 2 +-
 pkgs/development/compilers/yosys/default.nix                  | 2 +-
 pkgs/development/interpreters/wasmer/default.nix              | 2 +-
 pkgs/development/libraries/cassandra-cpp-driver/default.nix   | 2 +-
 pkgs/development/libraries/duckdb/default.nix                 | 2 +-
 pkgs/development/libraries/gdcm/default.nix                   | 2 +-
 pkgs/development/libraries/gstreamer/icamerasrc/default.nix   | 2 +-
 pkgs/development/libraries/imgui/default.nix                  | 2 +-
 pkgs/development/libraries/mapbox-gl-qml/default.nix          | 4 ++--
 pkgs/development/libraries/maplibre-native-qt/default.nix     | 2 +-
 pkgs/development/libraries/maui-core/default.nix              | 2 +-
 pkgs/development/libraries/mongoc/default.nix                 | 2 +-
 pkgs/development/libraries/mongocxx/default.nix               | 2 +-
 .../development/libraries/science/biology/elastix/default.nix | 2 +-
 pkgs/development/libraries/science/math/faiss/default.nix     | 2 +-
 pkgs/development/libraries/simpleitk/default.nix              | 2 +-
 pkgs/development/libraries/unicorn/default.nix                | 2 +-
 pkgs/development/libraries/wolfssl/default.nix                | 2 +-
 pkgs/development/ocaml-modules/ocolor/default.nix             | 2 +-
 pkgs/development/ocaml-modules/ocsigen-server/default.nix     | 2 +-
 pkgs/development/ocaml-modules/shine/default.nix              | 2 +-
 pkgs/development/ocaml-modules/xxhash/default.nix             | 2 +-
 pkgs/development/octave-modules/control/default.nix           | 2 +-
 .../octave-modules/fuzzy-logic-toolkit/default.nix            | 2 +-
 pkgs/development/octave-modules/statistics/default.nix        | 2 +-
 pkgs/development/octave-modules/symbolic/default.nix          | 2 +-
 pkgs/development/perl-modules/Tirex/default.nix               | 2 +-
 pkgs/development/php-packages/phing/default.nix               | 2 +-
 pkgs/development/php-packages/phpstan/default.nix             | 2 +-
 pkgs/development/php-packages/psalm/default.nix               | 2 +-
 pkgs/development/php-packages/uuid/default.nix                | 2 +-
 pkgs/development/python-modules/aardwolf/default.nix          | 2 +-
 pkgs/development/python-modules/accuweather/default.nix       | 2 +-
 pkgs/development/python-modules/acquire/default.nix           | 2 +-
 pkgs/development/python-modules/actdiag/default.nix           | 2 +-
 pkgs/development/python-modules/adafruit-io/default.nix       | 2 +-
 pkgs/development/python-modules/adax-local/default.nix        | 2 +-
 pkgs/development/python-modules/adax/default.nix              | 2 +-
 pkgs/development/python-modules/adb-enhanced/default.nix      | 2 +-
 pkgs/development/python-modules/adblock/default.nix           | 2 +-
 pkgs/development/python-modules/adext/default.nix             | 2 +-
 pkgs/development/python-modules/adguardhome/default.nix       | 2 +-
 pkgs/development/python-modules/adjusttext/default.nix        | 2 +-
 pkgs/development/python-modules/adlfs/default.nix             | 2 +-
 pkgs/development/python-modules/aeidon/default.nix            | 2 +-
 pkgs/development/python-modules/aesedb/default.nix            | 2 +-
 pkgs/development/python-modules/aetcd/default.nix             | 2 +-
 pkgs/development/python-modules/afdko/default.nix             | 2 +-
 pkgs/development/python-modules/afsapi/default.nix            | 2 +-
 pkgs/development/python-modules/agate/default.nix             | 2 +-
 pkgs/development/python-modules/agent-py/default.nix          | 2 +-
 pkgs/development/python-modules/ailment/default.nix           | 2 +-
 .../development/python-modules/aio-geojson-client/default.nix | 2 +-
 .../python-modules/aio-geojson-generic-client/default.nix     | 2 +-
 .../python-modules/aio-geojson-geonetnz-quakes/default.nix    | 2 +-
 .../python-modules/aio-geojson-geonetnz-volcano/default.nix   | 2 +-
 .../python-modules/aio-geojson-nsw-rfs-incidents/default.nix  | 2 +-
 .../python-modules/aio-geojson-usgs-earthquakes/default.nix   | 2 +-
 pkgs/development/python-modules/aio-georss-client/default.nix | 2 +-
 pkgs/development/python-modules/aio-georss-gdacs/default.nix  | 2 +-
 pkgs/development/python-modules/aio-pika/default.nix          | 2 +-
 pkgs/development/python-modules/aioacaia/default.nix          | 2 +-
 pkgs/development/python-modules/aioairq/default.nix           | 2 +-
 pkgs/development/python-modules/aioairzone-cloud/default.nix  | 2 +-
 pkgs/development/python-modules/aioairzone/default.nix        | 2 +-
 pkgs/development/python-modules/aioambient/default.nix        | 2 +-
 pkgs/development/python-modules/aioapcaccess/default.nix      | 2 +-
 pkgs/development/python-modules/aioaseko/default.nix          | 2 +-
 pkgs/development/python-modules/aioasuswrt/default.nix        | 2 +-
 pkgs/development/python-modules/aioautomower/default.nix      | 2 +-
 pkgs/development/python-modules/aioazuredevops/default.nix    | 2 +-
 pkgs/development/python-modules/aiobafi6/default.nix          | 2 +-
 pkgs/development/python-modules/aiobiketrax/default.nix       | 2 +-
 pkgs/development/python-modules/aioblescan/default.nix        | 2 +-
 pkgs/development/python-modules/aioboto3/default.nix          | 2 +-
 pkgs/development/python-modules/aiobotocore/default.nix       | 2 +-
 pkgs/development/python-modules/aiocache/default.nix          | 2 +-
 pkgs/development/python-modules/aiocoap/default.nix           | 2 +-
 pkgs/development/python-modules/aiocomelit/default.nix        | 2 +-
 pkgs/development/python-modules/aioconsole/default.nix        | 2 +-
 pkgs/development/python-modules/aiocsv/default.nix            | 2 +-
 pkgs/development/python-modules/aiocurrencylayer/default.nix  | 2 +-
 pkgs/development/python-modules/aiodiscover/default.nix       | 2 +-
 pkgs/development/python-modules/aiodns/default.nix            | 2 +-
 pkgs/development/python-modules/aiodukeenergy/default.nix     | 2 +-
 pkgs/development/python-modules/aioeafm/default.nix           | 2 +-
 pkgs/development/python-modules/aioeagle/default.nix          | 2 +-
 pkgs/development/python-modules/aioecowitt/default.nix        | 2 +-
 .../development/python-modules/aioelectricitymaps/default.nix | 2 +-
 pkgs/development/python-modules/aioesphomeapi/default.nix     | 2 +-
 pkgs/development/python-modules/aiofile/default.nix           | 2 +-
 pkgs/development/python-modules/aiofiles/default.nix          | 2 +-
 pkgs/development/python-modules/aioflo/default.nix            | 2 +-
 pkgs/development/python-modules/aiogithubapi/default.nix      | 2 +-
 pkgs/development/python-modules/aioguardian/default.nix       | 2 +-
 pkgs/development/python-modules/aiohappyeyeballs/default.nix  | 2 +-
 pkgs/development/python-modules/aiohomeconnect/default.nix    | 2 +-
 pkgs/development/python-modules/aiohomekit/default.nix        | 2 +-
 pkgs/development/python-modules/aiohttp-basicauth/default.nix | 2 +-
 pkgs/development/python-modules/aiohttp-fast-zlib/default.nix | 2 +-
 .../python-modules/aiohttp-middlewares/default.nix            | 2 +-
 pkgs/development/python-modules/aiohttp-remotes/default.nix   | 2 +-
 pkgs/development/python-modules/aiohttp-retry/default.nix     | 2 +-
 pkgs/development/python-modules/aiohttp-session/default.nix   | 2 +-
 .../python-modules/aiohttp-sse-client2/default.nix            | 2 +-
 pkgs/development/python-modules/aiohttp/default.nix           | 2 +-
 pkgs/development/python-modules/aiohue/default.nix            | 2 +-
 pkgs/development/python-modules/aioimaplib/default.nix        | 2 +-
 pkgs/development/python-modules/aiojellyfin/default.nix       | 2 +-
 pkgs/development/python-modules/aiojobs/default.nix           | 2 +-
 pkgs/development/python-modules/aiokafka/default.nix          | 2 +-
 pkgs/development/python-modules/aiolifx-themes/default.nix    | 2 +-
 pkgs/development/python-modules/aiolookin/default.nix         | 2 +-
 pkgs/development/python-modules/aiolyric/default.nix          | 2 +-
 pkgs/development/python-modules/aiomealie/default.nix         | 2 +-
 pkgs/development/python-modules/aiomqtt/default.nix           | 2 +-
 pkgs/development/python-modules/aiomultiprocess/default.nix   | 2 +-
 pkgs/development/python-modules/aiomusiccast/default.nix      | 2 +-
 pkgs/development/python-modules/aiomysql/default.nix          | 2 +-
 pkgs/development/python-modules/aionanoleaf/default.nix       | 2 +-
 pkgs/development/python-modules/aionotion/default.nix         | 2 +-
 pkgs/development/python-modules/aionut/default.nix            | 2 +-
 pkgs/development/python-modules/aiooncue/default.nix          | 2 +-
 .../python-modules/aioopenexchangerates/default.nix           | 2 +-
 pkgs/development/python-modules/aioopenssl/default.nix        | 2 +-
 pkgs/development/python-modules/aiooss2/default.nix           | 2 +-
 pkgs/development/python-modules/aiooui/default.nix            | 2 +-
 pkgs/development/python-modules/aiopegelonline/default.nix    | 2 +-
 pkgs/development/python-modules/aiopinboard/default.nix       | 2 +-
 pkgs/development/python-modules/aiopurpleair/default.nix      | 2 +-
 pkgs/development/python-modules/aiopvapi/default.nix          | 2 +-
 pkgs/development/python-modules/aiopvpc/default.nix           | 2 +-
 pkgs/development/python-modules/aiopyarr/default.nix          | 2 +-
 pkgs/development/python-modules/aioqsw/default.nix            | 2 +-
 pkgs/development/python-modules/aioraven/default.nix          | 2 +-
 pkgs/development/python-modules/aiorecollect/default.nix      | 2 +-
 pkgs/development/python-modules/aioridwell/default.nix        | 2 +-
 pkgs/development/python-modules/aiormq/default.nix            | 2 +-
 pkgs/development/python-modules/aiortm/default.nix            | 2 +-
 pkgs/development/python-modules/aiortsp/default.nix           | 2 +-
 pkgs/development/python-modules/aioruckus/default.nix         | 2 +-
 pkgs/development/python-modules/aiorun/default.nix            | 2 +-
 pkgs/development/python-modules/aiorussound/default.nix       | 2 +-
 pkgs/development/python-modules/aioruuvigateway/default.nix   | 2 +-
 pkgs/development/python-modules/aiorwlock/default.nix         | 2 +-
 pkgs/development/python-modules/aiosasl/default.nix           | 2 +-
 pkgs/development/python-modules/aioshelly/default.nix         | 2 +-
 pkgs/development/python-modules/aioshutil/default.nix         | 2 +-
 pkgs/development/python-modules/aioskybell/default.nix        | 2 +-
 pkgs/development/python-modules/aioslimproto/default.nix      | 2 +-
 pkgs/development/python-modules/aiosmtpd/default.nix          | 2 +-
 pkgs/development/python-modules/aiosmtplib/default.nix        | 2 +-
 pkgs/development/python-modules/aiosolaredge/default.nix      | 2 +-
 pkgs/development/python-modules/aiosonic/default.nix          | 2 +-
 pkgs/development/python-modules/aiosql/default.nix            | 2 +-
 pkgs/development/python-modules/aiosqlite/default.nix         | 2 +-
 pkgs/development/python-modules/aiosteamist/default.nix       | 2 +-
 pkgs/development/python-modules/aiostream/default.nix         | 2 +-
 pkgs/development/python-modules/aiostreammagic/default.nix    | 2 +-
 pkgs/development/python-modules/aioswitcher/default.nix       | 2 +-
 pkgs/development/python-modules/aiotankerkoenig/default.nix   | 2 +-
 pkgs/development/python-modules/aiotarfile/default.nix        | 2 +-
 pkgs/development/python-modules/aiotractive/default.nix       | 2 +-
 pkgs/development/python-modules/aiounifi/default.nix          | 2 +-
 pkgs/development/python-modules/aiounittest/default.nix       | 2 +-
 pkgs/development/python-modules/aiowaqi/default.nix           | 2 +-
 pkgs/development/python-modules/aiowatttime/default.nix       | 2 +-
 pkgs/development/python-modules/aiowebostv/default.nix        | 2 +-
 pkgs/development/python-modules/aioweenect/default.nix        | 2 +-
 pkgs/development/python-modules/aiowinreg/default.nix         | 2 +-
 pkgs/development/python-modules/aiowithings/default.nix       | 2 +-
 pkgs/development/python-modules/aiowmi/default.nix            | 2 +-
 pkgs/development/python-modules/aioxmpp/default.nix           | 2 +-
 pkgs/development/python-modules/aiozoneinfo/default.nix       | 2 +-
 pkgs/development/python-modules/airgradient/default.nix       | 2 +-
 pkgs/development/python-modules/airthings-ble/default.nix     | 2 +-
 pkgs/development/python-modules/airthings-cloud/default.nix   | 2 +-
 pkgs/development/python-modules/airtouch4pyapi/default.nix    | 2 +-
 pkgs/development/python-modules/airtouch5py/default.nix       | 2 +-
 pkgs/development/python-modules/aladdin-connect/default.nix   | 2 +-
 pkgs/development/python-modules/albucore/default.nix          | 2 +-
 pkgs/development/python-modules/ale-py/default.nix            | 2 +-
 pkgs/development/python-modules/alive-progress/default.nix    | 2 +-
 pkgs/development/python-modules/allpairspy/default.nix        | 2 +-
 pkgs/development/python-modules/alpha-vantage/default.nix     | 2 +-
 pkgs/development/python-modules/altair/default.nix            | 2 +-
 pkgs/development/python-modules/amarna/default.nix            | 2 +-
 pkgs/development/python-modules/amazon-ion/default.nix        | 2 +-
 pkgs/development/python-modules/amazon-kclpy/default.nix      | 2 +-
 pkgs/development/python-modules/amcrest/default.nix           | 2 +-
 pkgs/development/python-modules/androidtv/default.nix         | 2 +-
 pkgs/development/python-modules/androidtvremote2/default.nix  | 2 +-
 pkgs/development/python-modules/angr/default.nix              | 2 +-
 pkgs/development/python-modules/angrcli/default.nix           | 2 +-
 pkgs/development/python-modules/angrop/default.nix            | 2 +-
 pkgs/development/python-modules/annexremote/default.nix       | 2 +-
 pkgs/development/python-modules/annotated-types/default.nix   | 4 ++--
 pkgs/development/python-modules/annoy/default.nix             | 2 +-
 pkgs/development/python-modules/anova-wifi/default.nix        | 2 +-
 pkgs/development/python-modules/ansi/default.nix              | 2 +-
 pkgs/development/python-modules/ansi2image/default.nix        | 2 +-
 pkgs/development/python-modules/ansicolor/default.nix         | 2 +-
 pkgs/development/python-modules/ansimarkup/default.nix        | 2 +-
 pkgs/development/python-modules/anthemav/default.nix          | 2 +-
 pkgs/development/python-modules/anthropic/default.nix         | 2 +-
 pkgs/development/python-modules/anybadge/default.nix          | 2 +-
 pkgs/development/python-modules/anyio/default.nix             | 2 +-
 pkgs/development/python-modules/anysqlite/default.nix         | 2 +-
 pkgs/development/python-modules/anytree/default.nix           | 2 +-
 pkgs/development/python-modules/aocd/default.nix              | 2 +-
 pkgs/development/python-modules/apache-beam/default.nix       | 2 +-
 pkgs/development/python-modules/apipkg/default.nix            | 2 +-
 pkgs/development/python-modules/apischema/default.nix         | 2 +-
 .../python-modules/apispec-webframeworks/default.nix          | 2 +-
 pkgs/development/python-modules/apkinspector/default.nix      | 2 +-
 pkgs/development/python-modules/apollo-fpga/default.nix       | 2 +-
 pkgs/development/python-modules/app-model/default.nix         | 2 +-
 pkgs/development/python-modules/appimage/default.nix          | 2 +-
 pkgs/development/python-modules/apple-weatherkit/default.nix  | 2 +-
 pkgs/development/python-modules/approvaltests/default.nix     | 2 +-
 pkgs/development/python-modules/apptools/default.nix          | 2 +-
 pkgs/development/python-modules/apricot-select/default.nix    | 2 +-
 pkgs/development/python-modules/apsw/default.nix              | 2 +-
 pkgs/development/python-modules/apsystems-ez1/default.nix     | 2 +-
 pkgs/development/python-modules/arabic-reshaper/default.nix   | 2 +-
 pkgs/development/python-modules/aranet4/default.nix           | 2 +-
 pkgs/development/python-modules/archinfo/default.nix          | 2 +-
 pkgs/development/python-modules/archspec/default.nix          | 2 +-
 pkgs/development/python-modules/arelle/default.nix            | 2 +-
 pkgs/development/python-modules/argcomplete/default.nix       | 2 +-
 pkgs/development/python-modules/argilla/default.nix           | 2 +-
 .../development/python-modules/argparse-dataclass/default.nix | 2 +-
 pkgs/development/python-modules/argparse-manpage/default.nix  | 2 +-
 pkgs/development/python-modules/aria2p/default.nix            | 2 +-
 pkgs/development/python-modules/ariadne/default.nix           | 2 +-
 pkgs/development/python-modules/array-api-compat/default.nix  | 2 +-
 pkgs/development/python-modules/array-api-strict/default.nix  | 2 +-
 pkgs/development/python-modules/arris-tg2492lg/default.nix    | 2 +-
 pkgs/development/python-modules/arsenic/default.nix           | 2 +-
 pkgs/development/python-modules/art/default.nix               | 2 +-
 pkgs/development/python-modules/arviz/default.nix             | 2 +-
 pkgs/development/python-modules/arxiv/default.nix             | 2 +-
 pkgs/development/python-modules/asana/default.nix             | 2 +-
 pkgs/development/python-modules/asdf-astropy/default.nix      | 2 +-
 .../python-modules/asdf-coordinates-schemas/default.nix       | 2 +-
 pkgs/development/python-modules/asdf-wcs-schemas/default.nix  | 2 +-
 pkgs/development/python-modules/asdf/default.nix              | 2 +-
 pkgs/development/python-modules/asf-search/default.nix        | 2 +-
 pkgs/development/python-modules/asgi-csrf/default.nix         | 2 +-
 pkgs/development/python-modules/asgi-lifespan/default.nix     | 2 +-
 pkgs/development/python-modules/asgineer/default.nix          | 2 +-
 pkgs/development/python-modules/asgiref/default.nix           | 2 +-
 pkgs/development/python-modules/asn1/default.nix              | 2 +-
 pkgs/development/python-modules/asn1tools/default.nix         | 2 +-
 .../python-modules/asteroid-filterbanks/default.nix           | 2 +-
 pkgs/development/python-modules/asteval/default.nix           | 2 +-
 pkgs/development/python-modules/astroid/default.nix           | 2 +-
 pkgs/development/python-modules/astropy-iers-data/default.nix | 2 +-
 pkgs/development/python-modules/async-interrupt/default.nix   | 2 +-
 pkgs/development/python-modules/async-lru/default.nix         | 2 +-
 pkgs/development/python-modules/async-modbus/default.nix      | 2 +-
 pkgs/development/python-modules/async-stagger/default.nix     | 2 +-
 pkgs/development/python-modules/async-upnp-client/default.nix | 2 +-
 pkgs/development/python-modules/asyncclick/default.nix        | 2 +-
 pkgs/development/python-modules/asynccmd/default.nix          | 2 +-
 pkgs/development/python-modules/asyncinotify/default.nix      | 2 +-
 pkgs/development/python-modules/asyncio-dgram/default.nix     | 2 +-
 pkgs/development/python-modules/asyncmy/default.nix           | 2 +-
 pkgs/development/python-modules/asyncstdlib/default.nix       | 2 +-
 pkgs/development/python-modules/asyncua/default.nix           | 2 +-
 pkgs/development/python-modules/asyncwhois/default.nix        | 2 +-
 pkgs/development/python-modules/atc-ble/default.nix           | 2 +-
 .../python-modules/atlassian-python-api/default.nix           | 2 +-
 pkgs/development/python-modules/atom/default.nix              | 2 +-
 pkgs/development/python-modules/atomman/default.nix           | 2 +-
 pkgs/development/python-modules/atsim-potentials/default.nix  | 2 +-
 pkgs/development/python-modules/attacut/default.nix           | 2 +-
 pkgs/development/python-modules/audible/default.nix           | 2 +-
 pkgs/development/python-modules/audio-metadata/default.nix    | 2 +-
 pkgs/development/python-modules/audioop-lts/default.nix       | 2 +-
 pkgs/development/python-modules/augmax/default.nix            | 2 +-
 pkgs/development/python-modules/auroranoaa/default.nix        | 2 +-
 pkgs/development/python-modules/autarco/default.nix           | 2 +-
 pkgs/development/python-modules/auth0-python/default.nix      | 2 +-
 pkgs/development/python-modules/authcaptureproxy/default.nix  | 2 +-
 pkgs/development/python-modules/authheaders/default.nix       | 2 +-
 pkgs/development/python-modules/authlib/default.nix           | 2 +-
 pkgs/development/python-modules/autobahn/default.nix          | 2 +-
 pkgs/development/python-modules/autocommand/default.nix       | 2 +-
 pkgs/development/python-modules/autofaiss/default.nix         | 2 +-
 pkgs/development/python-modules/automower-ble/default.nix     | 2 +-
 pkgs/development/python-modules/automx2/default.nix           | 2 +-
 pkgs/development/python-modules/autopep8/default.nix          | 2 +-
 pkgs/development/python-modules/autoslot/default.nix          | 2 +-
 pkgs/development/python-modules/av/default.nix                | 2 +-
 pkgs/development/python-modules/avwx-engine/default.nix       | 2 +-
 pkgs/development/python-modules/awesomeversion/default.nix    | 2 +-
 pkgs/development/python-modules/aws-adfs/default.nix          | 2 +-
 .../development/python-modules/aws-sam-translator/default.nix | 2 +-
 pkgs/development/python-modules/aws-xray-sdk/default.nix      | 2 +-
 pkgs/development/python-modules/awsiotpythonsdk/default.nix   | 2 +-
 pkgs/development/python-modules/awsiotsdk/default.nix         | 2 +-
 pkgs/development/python-modules/awsipranges/default.nix       | 2 +-
 pkgs/development/python-modules/awslambdaric/default.nix      | 2 +-
 pkgs/development/python-modules/ax-platform/default.nix       | 2 +-
 pkgs/development/python-modules/axis/default.nix              | 2 +-
 .../python-modules/ayla-iot-unofficial/default.nix            | 2 +-
 pkgs/development/python-modules/azure-kusto-data/default.nix  | 2 +-
 .../development/python-modules/azure-kusto-ingest/default.nix | 2 +-
 .../python-modules/azure-storage-file-datalake/default.nix    | 2 +-
 pkgs/development/python-modules/babelfont/default.nix         | 2 +-
 pkgs/development/python-modules/backoff/default.nix           | 2 +-
 .../backports-datetime-fromisoformat/default.nix              | 2 +-
 pkgs/development/python-modules/baize/default.nix             | 2 +-
 pkgs/development/python-modules/base2048/default.nix          | 2 +-
 pkgs/development/python-modules/basemap/default.nix           | 2 +-
 pkgs/development/python-modules/bases/default.nix             | 2 +-
 pkgs/development/python-modules/batchspawner/default.nix      | 2 +-
 pkgs/development/python-modules/batinfo/default.nix           | 2 +-
 pkgs/development/python-modules/bayespy/default.nix           | 2 +-
 pkgs/development/python-modules/bc-detect-secrets/default.nix | 2 +-
 pkgs/development/python-modules/bc-jsonpath-ng/default.nix    | 2 +-
 pkgs/development/python-modules/beaker/default.nix            | 2 +-
 pkgs/development/python-modules/beancount-black/default.nix   | 2 +-
 pkgs/development/python-modules/beancount-parser/default.nix  | 2 +-
 pkgs/development/python-modules/beanhub-cli/default.nix       | 2 +-
 pkgs/development/python-modules/beanhub-extract/default.nix   | 2 +-
 pkgs/development/python-modules/beanhub-forms/default.nix     | 2 +-
 pkgs/development/python-modules/beanhub-import/default.nix    | 2 +-
 pkgs/development/python-modules/beanquery/default.nix         | 2 +-
 pkgs/development/python-modules/beautiful-date/default.nix    | 2 +-
 pkgs/development/python-modules/bellows/default.nix           | 2 +-
 pkgs/development/python-modules/beniget/default.nix           | 2 +-
 pkgs/development/python-modules/bentoml/default.nix           | 2 +-
 pkgs/development/python-modules/betamax-matchers/default.nix  | 2 +-
 pkgs/development/python-modules/betterproto/default.nix       | 2 +-
 pkgs/development/python-modules/bidict/default.nix            | 2 +-
 pkgs/development/python-modules/biliass/default.nix           | 2 +-
 pkgs/development/python-modules/billiard/default.nix          | 2 +-
 pkgs/development/python-modules/binary2strings/default.nix    | 2 +-
 pkgs/development/python-modules/biom-format/default.nix       | 2 +-
 pkgs/development/python-modules/biopandas/default.nix         | 4 ++--
 pkgs/development/python-modules/bip-utils/default.nix         | 2 +-
 pkgs/development/python-modules/bite-parser/default.nix       | 2 +-
 pkgs/development/python-modules/bitstring/default.nix         | 2 +-
 pkgs/development/python-modules/blackjax/default.nix          | 2 +-
 pkgs/development/python-modules/blackrenderer/default.nix     | 2 +-
 pkgs/development/python-modules/blake3/default.nix            | 2 +-
 pkgs/development/python-modules/bleak-esphome/default.nix     | 2 +-
 .../python-modules/bleak-retry-connector/default.nix          | 2 +-
 pkgs/development/python-modules/bleak/default.nix             | 2 +-
 pkgs/development/python-modules/blebox-uniapi/default.nix     | 2 +-
 pkgs/development/python-modules/bless/default.nix             | 2 +-
 pkgs/development/python-modules/blinkpy/default.nix           | 2 +-
 pkgs/development/python-modules/blis/default.nix              | 2 +-
 pkgs/development/python-modules/blivet/default.nix            | 2 +-
 pkgs/development/python-modules/blobfile/default.nix          | 2 +-
 pkgs/development/python-modules/blockdiag/default.nix         | 2 +-
 pkgs/development/python-modules/blockfrost-python/default.nix | 2 +-
 pkgs/development/python-modules/blocksat-cli/default.nix      | 2 +-
 pkgs/development/python-modules/bloodyad/default.nix          | 2 +-
 pkgs/development/python-modules/blosc2/default.nix            | 2 +-
 pkgs/development/python-modules/bluemaestro-ble/default.nix   | 2 +-
 .../development/python-modules/bluetooth-adapters/default.nix | 2 +-
 .../python-modules/bluetooth-auto-recovery/default.nix        | 2 +-
 .../python-modules/bluetooth-data-tools/default.nix           | 2 +-
 .../python-modules/bluetooth-sensor-state-data/default.nix    | 2 +-
 pkgs/development/python-modules/bme680/default.nix            | 2 +-
 pkgs/development/python-modules/boa-api/default.nix           | 2 +-
 .../python-modules/boiboite-opener-framework/default.nix      | 2 +-
 pkgs/development/python-modules/boilerpy3/default.nix         | 2 +-
 pkgs/development/python-modules/boltons/default.nix           | 2 +-
 pkgs/development/python-modules/bond-async/default.nix        | 2 +-
 pkgs/development/python-modules/boost-histogram/default.nix   | 2 +-
 pkgs/development/python-modules/borb/default.nix              | 2 +-
 pkgs/development/python-modules/bork/default.nix              | 2 +-
 pkgs/development/python-modules/boschshcpy/default.nix        | 2 +-
 pkgs/development/python-modules/boto3/default.nix             | 2 +-
 pkgs/development/python-modules/botorch/default.nix           | 2 +-
 pkgs/development/python-modules/bottombar/default.nix         | 2 +-
 pkgs/development/python-modules/breathe/default.nix           | 2 +-
 pkgs/development/python-modules/bring-api/default.nix         | 2 +-
 pkgs/development/python-modules/brother/default.nix           | 2 +-
 pkgs/development/python-modules/brotli/default.nix            | 2 +-
 pkgs/development/python-modules/bson/default.nix              | 2 +-
 pkgs/development/python-modules/btest/default.nix             | 2 +-
 pkgs/development/python-modules/bthome-ble/default.nix        | 2 +-
 pkgs/development/python-modules/btsocket/default.nix          | 2 +-
 pkgs/development/python-modules/bucketstore/default.nix       | 2 +-
 pkgs/development/python-modules/bump2version/default.nix      | 2 +-
 pkgs/development/python-modules/bumpfontversion/default.nix   | 2 +-
 pkgs/development/python-modules/bundlewrap/default.nix        | 2 +-
 pkgs/development/python-modules/busypie/default.nix           | 2 +-
 pkgs/development/python-modules/bx-py-utils/default.nix       | 4 ++--
 pkgs/development/python-modules/bx-python/default.nix         | 2 +-
 pkgs/development/python-modules/bytecode/default.nix          | 2 +-
 pkgs/development/python-modules/bytewax/default.nix           | 2 +-
 pkgs/development/python-modules/cache/default.nix             | 2 +-
 pkgs/development/python-modules/cachecontrol/default.nix      | 2 +-
 pkgs/development/python-modules/cached-ipaddress/default.nix  | 2 +-
 pkgs/development/python-modules/cached-property/default.nix   | 2 +-
 pkgs/development/python-modules/cachelib/default.nix          | 2 +-
 pkgs/development/python-modules/cachetools/default.nix        | 2 +-
 pkgs/development/python-modules/cachier/default.nix           | 2 +-
 pkgs/development/python-modules/caio/default.nix              | 2 +-
 pkgs/development/python-modules/caldav/default.nix            | 2 +-
 pkgs/development/python-modules/callee/default.nix            | 2 +-
 pkgs/development/python-modules/calysto-scheme/default.nix    | 2 +-
 pkgs/development/python-modules/camel-converter/default.nix   | 2 +-
 pkgs/development/python-modules/can-isotp/default.nix         | 2 +-
 pkgs/development/python-modules/canals/default.nix            | 2 +-
 pkgs/development/python-modules/canmatrix/default.nix         | 2 +-
 pkgs/development/python-modules/captcha/default.nix           | 2 +-
 pkgs/development/python-modules/captum/default.nix            | 2 +-
 pkgs/development/python-modules/cart/default.nix              | 2 +-
 pkgs/development/python-modules/casbin/default.nix            | 2 +-
 pkgs/development/python-modules/cassandra-driver/default.nix  | 2 +-
 pkgs/development/python-modules/castepxbin/default.nix        | 2 +-
 pkgs/development/python-modules/catppuccin/default.nix        | 2 +-
 pkgs/development/python-modules/cattrs/default.nix            | 2 +-
 pkgs/development/python-modules/causal-conv1d/default.nix     | 2 +-
 pkgs/development/python-modules/cdcs/default.nix              | 2 +-
 pkgs/development/python-modules/celery-redbeat/default.nix    | 2 +-
 pkgs/development/python-modules/cement/default.nix            | 2 +-
 pkgs/development/python-modules/cemm/default.nix              | 2 +-
 pkgs/development/python-modules/censys/default.nix            | 2 +-
 pkgs/development/python-modules/cerberus/default.nix          | 2 +-
 .../python-modules/cert-chain-resolver/default.nix            | 2 +-
 pkgs/development/python-modules/certbot/default.nix           | 2 +-
 pkgs/development/python-modules/certipy-ad/default.nix        | 2 +-
 pkgs/development/python-modules/certomancer/default.nix       | 2 +-
 pkgs/development/python-modules/cf-xarray/default.nix         | 2 +-
 pkgs/development/python-modules/cfgv/default.nix              | 2 +-
 pkgs/development/python-modules/cfn-lint/default.nix          | 2 +-
 pkgs/development/python-modules/cgal/default.nix              | 2 +-
 .../python-modules/chacha20poly1305-reuseable/default.nix     | 2 +-
 pkgs/development/python-modules/chainer/default.nix           | 2 +-
 pkgs/development/python-modules/chalice/default.nix           | 2 +-
 pkgs/development/python-modules/chameleon/default.nix         | 2 +-
 pkgs/development/python-modules/channels-redis/default.nix    | 2 +-
 pkgs/development/python-modules/channels/default.nix          | 2 +-
 .../development/python-modules/charset-normalizer/default.nix | 2 +-
 pkgs/development/python-modules/check-manifest/default.nix    | 2 +-
 pkgs/development/python-modules/checkdmarc/default.nix        | 2 +-
 pkgs/development/python-modules/cheetah3/default.nix          | 2 +-
 pkgs/development/python-modules/chess/default.nix             | 2 +-
 pkgs/development/python-modules/chispa/default.nix            | 2 +-
 pkgs/development/python-modules/chroma-hnswlib/default.nix    | 2 +-
 pkgs/development/python-modules/chromadb/default.nix          | 2 +-
 pkgs/development/python-modules/circuitbreaker/default.nix    | 2 +-
 pkgs/development/python-modules/ciscoconfparse/default.nix    | 2 +-
 pkgs/development/python-modules/ciso8601/default.nix          | 2 +-
 pkgs/development/python-modules/claripy/default.nix           | 2 +-
 pkgs/development/python-modules/cleanlab/default.nix          | 2 +-
 pkgs/development/python-modules/cleanvision/default.nix       | 2 +-
 pkgs/development/python-modules/cleo/default.nix              | 2 +-
 pkgs/development/python-modules/clevercsv/default.nix         | 2 +-
 .../development/python-modules/click-command-tree/default.nix | 2 +-
 .../python-modules/click-default-group/default.nix            | 2 +-
 pkgs/development/python-modules/click-didyoumean/default.nix  | 2 +-
 .../development/python-modules/click-option-group/default.nix | 2 +-
 pkgs/development/python-modules/click-repl/default.nix        | 2 +-
 pkgs/development/python-modules/click-shell/default.nix       | 2 +-
 pkgs/development/python-modules/click/default.nix             | 2 +-
 pkgs/development/python-modules/clickgen/default.nix          | 2 +-
 .../development/python-modules/clickhouse-connect/default.nix | 2 +-
 pkgs/development/python-modules/clikit/default.nix            | 2 +-
 pkgs/development/python-modules/clintermission/default.nix    | 2 +-
 pkgs/development/python-modules/clip-anytorch/default.nix     | 2 +-
 pkgs/development/python-modules/cloudevents/default.nix       | 2 +-
 pkgs/development/python-modules/cloudpathlib/default.nix      | 2 +-
 pkgs/development/python-modules/cloudpickle/default.nix       | 2 +-
 pkgs/development/python-modules/cloudsplaining/default.nix    | 2 +-
 pkgs/development/python-modules/cma/default.nix               | 2 +-
 pkgs/development/python-modules/cmaes/default.nix             | 2 +-
 pkgs/development/python-modules/cmdstanpy/default.nix         | 2 +-
 .../development/python-modules/cmsis-pack-manager/default.nix | 2 +-
 pkgs/development/python-modules/cnvkit/default.nix            | 2 +-
 pkgs/development/python-modules/coconut/default.nix           | 2 +-
 pkgs/development/python-modules/cocotb/default.nix            | 2 +-
 pkgs/development/python-modules/coffea/default.nix            | 2 +-
 pkgs/development/python-modules/coincurve/default.nix         | 2 +-
 pkgs/development/python-modules/color-operations/default.nix  | 2 +-
 pkgs/development/python-modules/colorful/default.nix          | 2 +-
 pkgs/development/python-modules/colorzero/default.nix         | 2 +-
 pkgs/development/python-modules/colout/default.nix            | 2 +-
 pkgs/development/python-modules/cometblue-lite/default.nix    | 2 +-
 pkgs/development/python-modules/comicon/default.nix           | 2 +-
 pkgs/development/python-modules/comm/default.nix              | 2 +-
 pkgs/development/python-modules/command-runner/default.nix    | 2 +-
 pkgs/development/python-modules/commitizen/default.nix        | 2 +-
 pkgs/development/python-modules/commonmark/default.nix        | 2 +-
 pkgs/development/python-modules/compressai/default.nix        | 2 +-
 pkgs/development/python-modules/conda-inject/default.nix      | 2 +-
 .../python-modules/conda-libmamba-solver/default.nix          | 2 +-
 .../python-modules/conda-package-handling/default.nix         | 2 +-
 .../python-modules/conda-package-streaming/default.nix        | 2 +-
 pkgs/development/python-modules/conda/default.nix             | 2 +-
 pkgs/development/python-modules/confection/default.nix        | 2 +-
 pkgs/development/python-modules/configargparse/default.nix    | 2 +-
 pkgs/development/python-modules/configobj/default.nix         | 2 +-
 pkgs/development/python-modules/configparser/default.nix      | 2 +-
 pkgs/development/python-modules/connect-box/default.nix       | 2 +-
 pkgs/development/python-modules/connexion/default.nix         | 2 +-
 pkgs/development/python-modules/connio/default.nix            | 2 +-
 pkgs/development/python-modules/cons/default.nix              | 2 +-
 pkgs/development/python-modules/consonance/default.nix        | 2 +-
 pkgs/development/python-modules/constantly/default.nix        | 2 +-
 pkgs/development/python-modules/construct-typing/default.nix  | 2 +-
 pkgs/development/python-modules/construct/default.nix         | 2 +-
 .../python-modules/container-inspector/default.nix            | 2 +-
 pkgs/development/python-modules/contourpy/default.nix         | 2 +-
 pkgs/development/python-modules/coordinates/default.nix       | 2 +-
 pkgs/development/python-modules/coqpit/default.nix            | 2 +-
 pkgs/development/python-modules/coredis/default.nix           | 2 +-
 pkgs/development/python-modules/corner/default.nix            | 2 +-
 pkgs/development/python-modules/correctionlib/default.nix     | 2 +-
 pkgs/development/python-modules/corsair-scan/default.nix      | 2 +-
 pkgs/development/python-modules/coveralls/default.nix         | 2 +-
 pkgs/development/python-modules/cpe/default.nix               | 2 +-
 pkgs/development/python-modules/cpufeature/default.nix        | 2 +-
 pkgs/development/python-modules/craft-application/default.nix | 2 +-
 pkgs/development/python-modules/craft-archives/default.nix    | 2 +-
 pkgs/development/python-modules/craft-cli/default.nix         | 2 +-
 pkgs/development/python-modules/craft-grammar/default.nix     | 2 +-
 pkgs/development/python-modules/craft-parts/default.nix       | 2 +-
 pkgs/development/python-modules/craft-platforms/default.nix   | 2 +-
 pkgs/development/python-modules/craft-providers/default.nix   | 2 +-
 pkgs/development/python-modules/cramjam/default.nix           | 2 +-
 pkgs/development/python-modules/crc/default.nix               | 2 +-
 pkgs/development/python-modules/crc32c/default.nix            | 2 +-
 pkgs/development/python-modules/crccheck/default.nix          | 2 +-
 pkgs/development/python-modules/crcelk/default.nix            | 2 +-
 pkgs/development/python-modules/credstash/default.nix         | 2 +-
 pkgs/development/python-modules/cron-descriptor/default.nix   | 2 +-
 pkgs/development/python-modules/cronsim/default.nix           | 2 +-
 pkgs/development/python-modules/crossandra/default.nix        | 2 +-
 pkgs/development/python-modules/crossplane/default.nix        | 2 +-
 pkgs/development/python-modules/cryptography/default.nix      | 2 +-
 pkgs/development/python-modules/crytic-compile/default.nix    | 2 +-
 pkgs/development/python-modules/cssutils/default.nix          | 2 +-
 pkgs/development/python-modules/cstruct/default.nix           | 2 +-
 pkgs/development/python-modules/ctypesgen/default.nix         | 2 +-
 .../python-modules/cucumber-tag-expressions/default.nix       | 2 +-
 pkgs/development/python-modules/cupy/default.nix              | 2 +-
 pkgs/development/python-modules/curio-compat/default.nix      | 2 +-
 pkgs/development/python-modules/curl-cffi/default.nix         | 2 +-
 pkgs/development/python-modules/customtkinter/default.nix     | 2 +-
 pkgs/development/python-modules/cvss/default.nix              | 2 +-
 pkgs/development/python-modules/cvxpy/default.nix             | 2 +-
 pkgs/development/python-modules/cwl-upgrader/default.nix      | 2 +-
 pkgs/development/python-modules/cwl-utils/default.nix         | 2 +-
 pkgs/development/python-modules/cwlformat/default.nix         | 2 +-
 pkgs/development/python-modules/cybox/default.nix             | 2 +-
 pkgs/development/python-modules/cycler/default.nix            | 2 +-
 pkgs/development/python-modules/cyclonedds-python/default.nix | 2 +-
 .../python-modules/cyclonedx-python-lib/default.nix           | 2 +-
 pkgs/development/python-modules/cyclopts/default.nix          | 2 +-
 pkgs/development/python-modules/cyipopt/default.nix           | 2 +-
 pkgs/development/python-modules/cymruwhois/default.nix        | 2 +-
 pkgs/development/python-modules/cypherpunkpay/default.nix     | 2 +-
 pkgs/development/python-modules/cyrtranslit/default.nix       | 2 +-
 pkgs/development/python-modules/cython/default.nix            | 2 +-
 pkgs/development/python-modules/dacite/default.nix            | 2 +-
 pkgs/development/python-modules/dahlia/default.nix            | 2 +-
 pkgs/development/python-modules/daphne/default.nix            | 2 +-
 pkgs/development/python-modules/daqp/default.nix              | 2 +-
 pkgs/development/python-modules/dash/default.nix              | 2 +-
 pkgs/development/python-modules/dask-gateway/default.nix      | 2 +-
 pkgs/development/python-modules/dask-image/default.nix        | 2 +-
 pkgs/development/python-modules/dask-jobqueue/default.nix     | 2 +-
 pkgs/development/python-modules/dask-ml/default.nix           | 2 +-
 pkgs/development/python-modules/dask-yarn/default.nix         | 2 +-
 pkgs/development/python-modules/databases/default.nix         | 2 +-
 pkgs/development/python-modules/databricks-cli/default.nix    | 2 +-
 pkgs/development/python-modules/databricks-sdk/default.nix    | 2 +-
 pkgs/development/python-modules/dataclasses-json/default.nix  | 2 +-
 pkgs/development/python-modules/datafusion/default.nix        | 2 +-
 pkgs/development/python-modules/datalad-next/default.nix      | 2 +-
 pkgs/development/python-modules/datapoint/default.nix         | 2 +-
 pkgs/development/python-modules/dataproperty/default.nix      | 2 +-
 pkgs/development/python-modules/datasalad/default.nix         | 2 +-
 pkgs/development/python-modules/datasets/default.nix          | 2 +-
 .../python-modules/datasette-publish-fly/default.nix          | 2 +-
 pkgs/development/python-modules/datasette/default.nix         | 2 +-
 pkgs/development/python-modules/datauri/default.nix           | 2 +-
 pkgs/development/python-modules/datefinder/default.nix        | 2 +-
 pkgs/development/python-modules/dateparser/default.nix        | 2 +-
 pkgs/development/python-modules/datetime/default.nix          | 2 +-
 pkgs/development/python-modules/db-dtypes/default.nix         | 2 +-
 pkgs/development/python-modules/dbt-adapters/default.nix      | 2 +-
 pkgs/development/python-modules/dbt-core/default.nix          | 2 +-
 .../python-modules/dbt-semantic-interfaces/default.nix        | 2 +-
 pkgs/development/python-modules/dbt-snowflake/default.nix     | 2 +-
 pkgs/development/python-modules/dbus-fast/default.nix         | 2 +-
 pkgs/development/python-modules/dbus-next/default.nix         | 2 +-
 .../python-modules/dbus-python-client-gen/default.nix         | 2 +-
 pkgs/development/python-modules/deal-solver/default.nix       | 2 +-
 pkgs/development/python-modules/deal/default.nix              | 2 +-
 pkgs/development/python-modules/debuglater/default.nix        | 2 +-
 pkgs/development/python-modules/decli/default.nix             | 2 +-
 pkgs/development/python-modules/deebot-client/default.nix     | 2 +-
 pkgs/development/python-modules/deepface/default.nix          | 2 +-
 .../development/python-modules/deepsearch-toolkit/default.nix | 2 +-
 pkgs/development/python-modules/deezer-python/default.nix     | 2 +-
 pkgs/development/python-modules/defusedcsv/default.nix        | 2 +-
 pkgs/development/python-modules/defusedxml/default.nix        | 2 +-
 pkgs/development/python-modules/deltachat2/default.nix        | 2 +-
 pkgs/development/python-modules/demetriek/default.nix         | 2 +-
 pkgs/development/python-modules/demoji/default.nix            | 2 +-
 pkgs/development/python-modules/dendropy/default.nix          | 2 +-
 pkgs/development/python-modules/denonavr/default.nix          | 2 +-
 pkgs/development/python-modules/dep-logic/default.nix         | 4 ++--
 .../python-modules/dependency-injector/default.nix            | 2 +-
 pkgs/development/python-modules/deprecat/default.nix          | 2 +-
 pkgs/development/python-modules/deprecated/default.nix        | 2 +-
 pkgs/development/python-modules/desktop-notifier/default.nix  | 2 +-
 pkgs/development/python-modules/detect-secrets/default.nix    | 2 +-
 pkgs/development/python-modules/detectron2/default.nix        | 2 +-
 pkgs/development/python-modules/devialet/default.nix          | 2 +-
 pkgs/development/python-modules/devito/default.nix            | 2 +-
 pkgs/development/python-modules/devolo-plc-api/default.nix    | 2 +-
 pkgs/development/python-modules/devtools/default.nix          | 2 +-
 pkgs/development/python-modules/diagrams/default.nix          | 2 +-
 pkgs/development/python-modules/dicom-numpy/default.nix       | 2 +-
 pkgs/development/python-modules/dicom2nifti/default.nix       | 2 +-
 pkgs/development/python-modules/dicomweb-client/default.nix   | 2 +-
 pkgs/development/python-modules/dict2xml/default.nix          | 2 +-
 pkgs/development/python-modules/diffenator2/default.nix       | 2 +-
 pkgs/development/python-modules/diffsync/default.nix          | 2 +-
 pkgs/development/python-modules/diffusers/default.nix         | 4 ++--
 pkgs/development/python-modules/dill/default.nix              | 2 +-
 pkgs/development/python-modules/dinghy/default.nix            | 2 +-
 .../python-modules/dio-chacon-wifi-api/default.nix            | 2 +-
 pkgs/development/python-modules/dipy/default.nix              | 2 +-
 pkgs/development/python-modules/dirigera/default.nix          | 2 +-
 pkgs/development/python-modules/dirty-equals/default.nix      | 2 +-
 pkgs/development/python-modules/discogs-client/default.nix    | 2 +-
 pkgs/development/python-modules/discordpy/default.nix         | 2 +-
 pkgs/development/python-modules/discovery30303/default.nix    | 2 +-
 pkgs/development/python-modules/dissect-archive/default.nix   | 2 +-
 pkgs/development/python-modules/dissect-btrfs/default.nix     | 2 +-
 pkgs/development/python-modules/dissect-cim/default.nix       | 2 +-
 pkgs/development/python-modules/dissect-clfs/default.nix      | 2 +-
 .../python-modules/dissect-cobaltstrike/default.nix           | 2 +-
 pkgs/development/python-modules/dissect-cstruct/default.nix   | 2 +-
 pkgs/development/python-modules/dissect-esedb/default.nix     | 2 +-
 pkgs/development/python-modules/dissect-etl/default.nix       | 2 +-
 pkgs/development/python-modules/dissect-eventlog/default.nix  | 2 +-
 pkgs/development/python-modules/dissect-evidence/default.nix  | 2 +-
 .../development/python-modules/dissect-executable/default.nix | 2 +-
 pkgs/development/python-modules/dissect-extfs/default.nix     | 2 +-
 pkgs/development/python-modules/dissect-fat/default.nix       | 2 +-
 pkgs/development/python-modules/dissect-ffs/default.nix       | 2 +-
 .../development/python-modules/dissect-hypervisor/default.nix | 2 +-
 pkgs/development/python-modules/dissect-jffs/default.nix      | 2 +-
 pkgs/development/python-modules/dissect-ntfs/default.nix      | 2 +-
 pkgs/development/python-modules/dissect-ole/default.nix       | 2 +-
 pkgs/development/python-modules/dissect-regf/default.nix      | 2 +-
 pkgs/development/python-modules/dissect-shellitem/default.nix | 2 +-
 pkgs/development/python-modules/dissect-sql/default.nix       | 2 +-
 pkgs/development/python-modules/dissect-squashfs/default.nix  | 2 +-
 pkgs/development/python-modules/dissect-target/default.nix    | 2 +-
 .../development/python-modules/dissect-thumbcache/default.nix | 2 +-
 pkgs/development/python-modules/dissect-util/default.nix      | 2 +-
 pkgs/development/python-modules/dissect-vmfs/default.nix      | 2 +-
 pkgs/development/python-modules/dissect-volume/default.nix    | 2 +-
 pkgs/development/python-modules/dissect-xfs/default.nix       | 2 +-
 pkgs/development/python-modules/dissect/default.nix           | 2 +-
 pkgs/development/python-modules/distorm3/default.nix          | 2 +-
 pkgs/development/python-modules/distrax/default.nix           | 2 +-
 pkgs/development/python-modules/dj-database-url/default.nix   | 2 +-
 pkgs/development/python-modules/dj-rest-auth/default.nix      | 2 +-
 .../python-modules/django-admin-sortable2/default.nix         | 2 +-
 .../development/python-modules/django-allauth-2fa/default.nix | 2 +-
 pkgs/development/python-modules/django-allauth/default.nix    | 2 +-
 pkgs/development/python-modules/django-anymail/default.nix    | 2 +-
 pkgs/development/python-modules/django-app-helper/default.nix | 2 +-
 pkgs/development/python-modules/django-appconf/default.nix    | 2 +-
 pkgs/development/python-modules/django-axes/default.nix       | 2 +-
 pkgs/development/python-modules/django-bootstrap3/default.nix | 2 +-
 pkgs/development/python-modules/django-bootstrap4/default.nix | 2 +-
 pkgs/development/python-modules/django-cachalot/default.nix   | 2 +-
 .../development/python-modules/django-celery-beat/default.nix | 2 +-
 pkgs/development/python-modules/django-ckeditor/default.nix   | 2 +-
 pkgs/development/python-modules/django-cms/default.nix        | 2 +-
 pkgs/development/python-modules/django-countries/default.nix  | 2 +-
 .../python-modules/django-crispy-bootstrap3/default.nix       | 2 +-
 .../python-modules/django-crispy-bootstrap4/default.nix       | 2 +-
 .../python-modules/django-crispy-bootstrap5/default.nix       | 2 +-
 .../python-modules/django-crispy-forms/default.nix            | 2 +-
 .../python-modules/django-cryptography/default.nix            | 2 +-
 pkgs/development/python-modules/django-cte/default.nix        | 2 +-
 .../python-modules/django-debug-toolbar/default.nix           | 2 +-
 .../python-modules/django-dynamic-preferences/default.nix     | 2 +-
 .../python-modules/django-elasticsearch-dsl/default.nix       | 2 +-
 pkgs/development/python-modules/django-extensions/default.nix | 2 +-
 pkgs/development/python-modules/django-filter/default.nix     | 2 +-
 .../python-modules/django-formset-js-improved/default.nix     | 2 +-
 pkgs/development/python-modules/django-fsm/default.nix        | 2 +-
 .../python-modules/django-google-analytics-app/default.nix    | 2 +-
 .../python-modules/django-health-check/default.nix            | 2 +-
 pkgs/development/python-modules/django-hierarkey/default.nix  | 2 +-
 pkgs/development/python-modules/django-hijack/default.nix     | 2 +-
 .../python-modules/django-import-export/default.nix           | 2 +-
 pkgs/development/python-modules/django-jinja2/default.nix     | 2 +-
 pkgs/development/python-modules/django-js-asset/default.nix   | 2 +-
 .../development/python-modules/django-json-widget/default.nix | 2 +-
 pkgs/development/python-modules/django-libsass/default.nix    | 2 +-
 .../development/python-modules/django-localflavor/default.nix | 2 +-
 .../django-login-required-middleware/default.nix              | 2 +-
 .../python-modules/django-maintenance-mode/default.nix        | 2 +-
 pkgs/development/python-modules/django-markdownx/default.nix  | 2 +-
 pkgs/development/python-modules/django-markup/default.nix     | 2 +-
 pkgs/development/python-modules/django-mfa3/default.nix       | 2 +-
 .../development/python-modules/django-model-utils/default.nix | 2 +-
 .../python-modules/django-modeltranslation/default.nix        | 2 +-
 .../python-modules/django-oauth-toolkit/default.nix           | 2 +-
 pkgs/development/python-modules/django-parler/default.nix     | 2 +-
 pkgs/development/python-modules/django-payments/default.nix   | 2 +-
 .../python-modules/django-phonenumber-field/default.nix       | 2 +-
 pkgs/development/python-modules/django-pwa/default.nix        | 2 +-
 pkgs/development/python-modules/django-ratelimit/default.nix  | 2 +-
 pkgs/development/python-modules/django-redis/default.nix      | 2 +-
 .../python-modules/django-rest-registration/default.nix       | 2 +-
 pkgs/development/python-modules/django-rosetta/default.nix    | 2 +-
 pkgs/development/python-modules/django-rq/default.nix         | 2 +-
 pkgs/development/python-modules/django-scheduler/default.nix  | 2 +-
 pkgs/development/python-modules/django-scim2/default.nix      | 2 +-
 pkgs/development/python-modules/django-scopes/default.nix     | 2 +-
 pkgs/development/python-modules/django-sesame/default.nix     | 2 +-
 .../python-modules/django-simple-history/default.nix          | 2 +-
 pkgs/development/python-modules/django-statici18n/default.nix | 2 +-
 pkgs/development/python-modules/django-storages/default.nix   | 2 +-
 pkgs/development/python-modules/django-tastypie/default.nix   | 2 +-
 pkgs/development/python-modules/django-tenants/default.nix    | 2 +-
 .../python-modules/django-two-factor-auth/default.nix         | 2 +-
 pkgs/development/python-modules/django-vite/default.nix       | 2 +-
 pkgs/development/python-modules/django-webpush/default.nix    | 4 ++--
 .../python-modules/django-widget-tweaks/default.nix           | 2 +-
 .../python-modules/djangocms-admin-style/default.nix          | 2 +-
 pkgs/development/python-modules/djangocms-alias/default.nix   | 2 +-
 .../python-modules/djangorestframework-csv/default.nix        | 2 +-
 .../djangorestframework-dataclasses/default.nix               | 2 +-
 .../python-modules/djangorestframework-guardian2/default.nix  | 2 +-
 .../python-modules/djangorestframework-jsonp/default.nix      | 2 +-
 pkgs/development/python-modules/djangosaml2/default.nix       | 2 +-
 pkgs/development/python-modules/dllogger/default.nix          | 2 +-
 pkgs/development/python-modules/dlms-cosem/default.nix        | 2 +-
 pkgs/development/python-modules/dm-haiku/default.nix          | 2 +-
 pkgs/development/python-modules/dm-tree/default.nix           | 2 +-
 pkgs/development/python-modules/dnachisel/default.nix         | 2 +-
 pkgs/development/python-modules/dncil/default.nix             | 2 +-
 pkgs/development/python-modules/dnf-plugins-core/default.nix  | 2 +-
 pkgs/development/python-modules/dnfile/default.nix            | 2 +-
 pkgs/development/python-modules/dns-lexicon/default.nix       | 2 +-
 pkgs/development/python-modules/docformatter/default.nix      | 2 +-
 pkgs/development/python-modules/docker-pycreds/default.nix    | 2 +-
 pkgs/development/python-modules/docker/default.nix            | 2 +-
 pkgs/development/python-modules/docling-core/default.nix      | 2 +-
 .../development/python-modules/docling-ibm-models/default.nix | 2 +-
 pkgs/development/python-modules/docling-parse/default.nix     | 2 +-
 pkgs/development/python-modules/docstr-coverage/default.nix   | 2 +-
 pkgs/development/python-modules/docstring-parser/default.nix  | 2 +-
 .../python-modules/docstring-to-markdown/default.nix          | 2 +-
 pkgs/development/python-modules/docx2python/default.nix       | 2 +-
 pkgs/development/python-modules/dotwiz/default.nix            | 2 +-
 pkgs/development/python-modules/downloader-cli/default.nix    | 2 +-
 pkgs/development/python-modules/dparse2/default.nix           | 2 +-
 pkgs/development/python-modules/draftjs-exporter/default.nix  | 2 +-
 pkgs/development/python-modules/dragonfly/default.nix         | 2 +-
 pkgs/development/python-modules/dramatiq/default.nix          | 2 +-
 pkgs/development/python-modules/drawsvg/default.nix           | 2 +-
 .../development/python-modules/drf-nested-routers/default.nix | 2 +-
 pkgs/development/python-modules/drf-spectacular/default.nix   | 2 +-
 pkgs/development/python-modules/drf-ujson2/default.nix        | 2 +-
 .../python-modules/drf-writable-nested/default.nix            | 2 +-
 pkgs/development/python-modules/dropbox/default.nix           | 2 +-
 pkgs/development/python-modules/dropmqttapi/default.nix       | 2 +-
 pkgs/development/python-modules/ds-store/default.nix          | 2 +-
 pkgs/development/python-modules/dsmr-parser/default.nix       | 2 +-
 pkgs/development/python-modules/dsnap/default.nix             | 2 +-
 pkgs/development/python-modules/dtschema/default.nix          | 2 +-
 pkgs/development/python-modules/dtw-python/default.nix        | 2 +-
 pkgs/development/python-modules/duckduckgo-search/default.nix | 2 +-
 pkgs/development/python-modules/duet/default.nix              | 2 +-
 pkgs/development/python-modules/dukpy/default.nix             | 2 +-
 pkgs/development/python-modules/dunamai/default.nix           | 2 +-
 pkgs/development/python-modules/duo-client/default.nix        | 2 +-
 pkgs/development/python-modules/dvc-data/default.nix          | 2 +-
 pkgs/development/python-modules/dvc-gdrive/default.nix        | 2 +-
 pkgs/development/python-modules/dvc-hdfs/default.nix          | 2 +-
 pkgs/development/python-modules/dvc-http/default.nix          | 2 +-
 pkgs/development/python-modules/dvc-objects/default.nix       | 2 +-
 pkgs/development/python-modules/dvc-render/default.nix        | 2 +-
 pkgs/development/python-modules/dvc-studio-client/default.nix | 2 +-
 pkgs/development/python-modules/dvc-task/default.nix          | 2 +-
 pkgs/development/python-modules/dvc/default.nix               | 2 +-
 pkgs/development/python-modules/dvclive/default.nix           | 2 +-
 pkgs/development/python-modules/dynalite-devices/default.nix  | 2 +-
 pkgs/development/python-modules/e3-core/default.nix           | 4 ++--
 pkgs/development/python-modules/e3-testsuite/default.nix      | 4 ++--
 pkgs/development/python-modules/easy-thumbnails/default.nix   | 2 +-
 pkgs/development/python-modules/easyenergy/default.nix        | 2 +-
 pkgs/development/python-modules/easyocr/default.nix           | 2 +-
 pkgs/development/python-modules/ebcdic/default.nix            | 2 +-
 pkgs/development/python-modules/echo/default.nix              | 2 +-
 pkgs/development/python-modules/ecos/default.nix              | 2 +-
 pkgs/development/python-modules/ecs-logging/default.nix       | 2 +-
 pkgs/development/python-modules/ed25519/default.nix           | 2 +-
 pkgs/development/python-modules/edalize/default.nix           | 2 +-
 pkgs/development/python-modules/editdistance/default.nix      | 2 +-
 pkgs/development/python-modules/editdistpy/default.nix        | 2 +-
 .../python-modules/edk2-pytool-library/default.nix            | 2 +-
 pkgs/development/python-modules/eigenpy/default.nix           | 2 +-
 pkgs/development/python-modules/einops/default.nix            | 2 +-
 pkgs/development/python-modules/eiswarnung/default.nix        | 2 +-
 pkgs/development/python-modules/elastic-apm/default.nix       | 2 +-
 pkgs/development/python-modules/elastic-transport/default.nix | 2 +-
 pkgs/development/python-modules/elegy/default.nix             | 2 +-
 pkgs/development/python-modules/elementpath/default.nix       | 2 +-
 pkgs/development/python-modules/elgato/default.nix            | 2 +-
 pkgs/development/python-modules/eliot/default.nix             | 2 +-
 pkgs/development/python-modules/elkm1-lib/default.nix         | 2 +-
 pkgs/development/python-modules/elmax-api/default.nix         | 2 +-
 pkgs/development/python-modules/embedding-reader/default.nix  | 2 +-
 pkgs/development/python-modules/emborg/default.nix            | 2 +-
 pkgs/development/python-modules/emcee/default.nix             | 2 +-
 pkgs/development/python-modules/emoji/default.nix             | 2 +-
 pkgs/development/python-modules/empty-files/default.nix       | 2 +-
 pkgs/development/python-modules/emv/default.nix               | 2 +-
 pkgs/development/python-modules/enaml/default.nix             | 2 +-
 pkgs/development/python-modules/enamlx/default.nix            | 2 +-
 pkgs/development/python-modules/energyflip-client/default.nix | 2 +-
 pkgs/development/python-modules/energyflow/default.nix        | 2 +-
 pkgs/development/python-modules/energyzero/default.nix        | 2 +-
 pkgs/development/python-modules/enocean/default.nix           | 2 +-
 pkgs/development/python-modules/enterpriseattack/default.nix  | 2 +-
 pkgs/development/python-modules/env-canada/default.nix        | 2 +-
 pkgs/development/python-modules/environs/default.nix          | 2 +-
 pkgs/development/python-modules/epicstore-api/default.nix     | 2 +-
 pkgs/development/python-modules/epion/default.nix             | 2 +-
 pkgs/development/python-modules/epitran/default.nix           | 2 +-
 pkgs/development/python-modules/eq3btsmart/default.nix        | 2 +-
 pkgs/development/python-modules/eradicate/default.nix         | 2 +-
 pkgs/development/python-modules/es-client/default.nix         | 2 +-
 pkgs/development/python-modules/espeak-phonemizer/default.nix | 2 +-
 pkgs/development/python-modules/esper/default.nix             | 2 +-
 .../python-modules/esphome-dashboard-api/default.nix          | 2 +-
 .../development/python-modules/essentials-openapi/default.nix | 2 +-
 pkgs/development/python-modules/etcd3/default.nix             | 2 +-
 pkgs/development/python-modules/etelemetry/default.nix        | 2 +-
 pkgs/development/python-modules/eternalegypt/default.nix      | 2 +-
 pkgs/development/python-modules/eth-typing/default.nix        | 2 +-
 pkgs/development/python-modules/ethtool/default.nix           | 2 +-
 pkgs/development/python-modules/etuples/default.nix           | 2 +-
 pkgs/development/python-modules/evaluate/default.nix          | 2 +-
 pkgs/development/python-modules/eve/default.nix               | 2 +-
 pkgs/development/python-modules/eventlet/default.nix          | 2 +-
 pkgs/development/python-modules/events/default.nix            | 2 +-
 pkgs/development/python-modules/evohome-async/default.nix     | 2 +-
 pkgs/development/python-modules/evosax/default.nix            | 2 +-
 pkgs/development/python-modules/evtx/default.nix              | 2 +-
 pkgs/development/python-modules/exceptiongroup/default.nix    | 2 +-
 pkgs/development/python-modules/exchangelib/default.nix       | 2 +-
 pkgs/development/python-modules/exitcode/default.nix          | 2 +-
 pkgs/development/python-modules/exiv2/default.nix             | 2 +-
 .../python-modules/experiment-utilities/default.nix           | 2 +-
 pkgs/development/python-modules/expiringdict/default.nix      | 2 +-
 pkgs/development/python-modules/explorerscript/default.nix    | 2 +-
 pkgs/development/python-modules/extension-helpers/default.nix | 2 +-
 pkgs/development/python-modules/extract-msg/default.nix       | 2 +-
 pkgs/development/python-modules/extruct/default.nix           | 2 +-
 pkgs/development/python-modules/ezdxf/default.nix             | 2 +-
 pkgs/development/python-modules/ezyrb/default.nix             | 2 +-
 pkgs/development/python-modules/f5-icontrol-rest/default.nix  | 2 +-
 pkgs/development/python-modules/fairscale/default.nix         | 2 +-
 pkgs/development/python-modules/falcon/default.nix            | 2 +-
 pkgs/development/python-modules/faraday-plugins/default.nix   | 2 +-
 pkgs/development/python-modules/fast-histogram/default.nix    | 2 +-
 pkgs/development/python-modules/fastapi-cli/default.nix       | 2 +-
 pkgs/development/python-modules/fastapi-mail/default.nix      | 2 +-
 pkgs/development/python-modules/fastapi-sso/default.nix       | 2 +-
 pkgs/development/python-modules/fastapi/default.nix           | 2 +-
 pkgs/development/python-modules/fastavro/default.nix          | 2 +-
 pkgs/development/python-modules/fastcrc/default.nix           | 2 +-
 pkgs/development/python-modules/fastembed/default.nix         | 2 +-
 pkgs/development/python-modules/fasteners/default.nix         | 2 +-
 pkgs/development/python-modules/fastnumbers/default.nix       | 2 +-
 pkgs/development/python-modules/fastparquet/default.nix       | 2 +-
 pkgs/development/python-modules/faust-cchardet/default.nix    | 2 +-
 pkgs/development/python-modules/ffmpy/default.nix             | 2 +-
 pkgs/development/python-modules/fhir-py/default.nix           | 2 +-
 pkgs/development/python-modules/fickling/default.nix          | 2 +-
 pkgs/development/python-modules/filecheck/default.nix         | 2 +-
 pkgs/development/python-modules/filedepot/default.nix         | 2 +-
 pkgs/development/python-modules/find-libpython/default.nix    | 2 +-
 pkgs/development/python-modules/findimports/default.nix       | 2 +-
 pkgs/development/python-modules/finvizfinance/default.nix     | 2 +-
 pkgs/development/python-modules/fiona/default.nix             | 2 +-
 pkgs/development/python-modules/fire/default.nix              | 2 +-
 .../development/python-modules/firebase-messaging/default.nix | 2 +-
 pkgs/development/python-modules/fireflyalgorithm/default.nix  | 2 +-
 pkgs/development/python-modules/flake8-docstrings/default.nix | 2 +-
 .../python-modules/flake8-future-import/default.nix           | 2 +-
 pkgs/development/python-modules/flametree/default.nix         | 2 +-
 pkgs/development/python-modules/flask-admin/default.nix       | 2 +-
 pkgs/development/python-modules/flask-api/default.nix         | 2 +-
 pkgs/development/python-modules/flask-assets/default.nix      | 2 +-
 pkgs/development/python-modules/flask-babel/default.nix       | 2 +-
 pkgs/development/python-modules/flask-compress/default.nix    | 2 +-
 pkgs/development/python-modules/flask-cors/default.nix        | 2 +-
 pkgs/development/python-modules/flask-mail/default.nix        | 2 +-
 pkgs/development/python-modules/flask-mailman/default.nix     | 2 +-
 pkgs/development/python-modules/flask-marshmallow/default.nix | 2 +-
 pkgs/development/python-modules/flask-migrate/default.nix     | 2 +-
 pkgs/development/python-modules/flask-paginate/default.nix    | 2 +-
 pkgs/development/python-modules/flask-principal/default.nix   | 2 +-
 pkgs/development/python-modules/flask-restx/default.nix       | 2 +-
 pkgs/development/python-modules/flask-security/default.nix    | 2 +-
 .../python-modules/flask-session-captcha/default.nix          | 2 +-
 pkgs/development/python-modules/flask-session/default.nix     | 2 +-
 pkgs/development/python-modules/flask-simpleldap/default.nix  | 2 +-
 pkgs/development/python-modules/flask-socketio/default.nix    | 2 +-
 .../python-modules/flask-sqlalchemy-lite/default.nix          | 2 +-
 pkgs/development/python-modules/flask-themer/default.nix      | 2 +-
 pkgs/development/python-modules/flask-webtest/default.nix     | 2 +-
 pkgs/development/python-modules/flax/default.nix              | 2 +-
 pkgs/development/python-modules/flexit-bacnet/default.nix     | 2 +-
 pkgs/development/python-modules/flipr-api/default.nix         | 2 +-
 pkgs/development/python-modules/floret/default.nix            | 2 +-
 pkgs/development/python-modules/flow-record/default.nix       | 2 +-
 pkgs/development/python-modules/flowlogs-reader/default.nix   | 2 +-
 pkgs/development/python-modules/flowmc/default.nix            | 2 +-
 pkgs/development/python-modules/fluent-logger/default.nix     | 2 +-
 pkgs/development/python-modules/flux-led/default.nix          | 2 +-
 pkgs/development/python-modules/flynt/default.nix             | 2 +-
 pkgs/development/python-modules/fnv-hash-fast/default.nix     | 2 +-
 pkgs/development/python-modules/fonttools/default.nix         | 2 +-
 pkgs/development/python-modules/forecast-solar/default.nix    | 2 +-
 pkgs/development/python-modules/formulae/default.nix          | 2 +-
 pkgs/development/python-modules/formulaic/default.nix         | 2 +-
 pkgs/development/python-modules/fortiosapi/default.nix        | 2 +-
 pkgs/development/python-modules/fpylll/default.nix            | 2 +-
 pkgs/development/python-modules/fpyutils/default.nix          | 2 +-
 pkgs/development/python-modules/free-proxy/default.nix        | 2 +-
 pkgs/development/python-modules/freenub/default.nix           | 2 +-
 pkgs/development/python-modules/freesasa/default.nix          | 2 +-
 pkgs/development/python-modules/frelatage/default.nix         | 2 +-
 pkgs/development/python-modules/freud/default.nix             | 2 +-
 pkgs/development/python-modules/frigidaire/default.nix        | 2 +-
 pkgs/development/python-modules/fritzconnection/default.nix   | 2 +-
 pkgs/development/python-modules/frozendict/default.nix        | 2 +-
 pkgs/development/python-modules/frozenlist/default.nix        | 2 +-
 pkgs/development/python-modules/fschat/default.nix            | 2 +-
 pkgs/development/python-modules/fsspec-xrootd/default.nix     | 2 +-
 pkgs/development/python-modules/fsspec/default.nix            | 2 +-
 pkgs/development/python-modules/ftfy/default.nix              | 2 +-
 pkgs/development/python-modules/fugashi/default.nix           | 2 +-
 pkgs/development/python-modules/funsor/default.nix            | 2 +-
 pkgs/development/python-modules/fuzzyfinder/default.nix       | 2 +-
 pkgs/development/python-modules/fyta-cli/default.nix          | 2 +-
 pkgs/development/python-modules/gamble/default.nix            | 2 +-
 pkgs/development/python-modules/garminconnect/default.nix     | 2 +-
 pkgs/development/python-modules/gassist-text/default.nix      | 2 +-
 pkgs/development/python-modules/gast/default.nix              | 2 +-
 pkgs/development/python-modules/gcal-sync/default.nix         | 2 +-
 pkgs/development/python-modules/gcsfs/default.nix             | 2 +-
 pkgs/development/python-modules/geniushub-client/default.nix  | 2 +-
 pkgs/development/python-modules/gentools/default.nix          | 2 +-
 pkgs/development/python-modules/geoalchemy2/default.nix       | 2 +-
 pkgs/development/python-modules/geoarrow-c/default.nix        | 2 +-
 pkgs/development/python-modules/geoarrow-pandas/default.nix   | 2 +-
 pkgs/development/python-modules/geoarrow-pyarrow/default.nix  | 2 +-
 pkgs/development/python-modules/geoarrow-types/default.nix    | 2 +-
 pkgs/development/python-modules/geocachingapi/default.nix     | 2 +-
 pkgs/development/python-modules/geodatasets/default.nix       | 2 +-
 pkgs/development/python-modules/geojson-client/default.nix    | 2 +-
 pkgs/development/python-modules/geojson/default.nix           | 2 +-
 pkgs/development/python-modules/geomet/default.nix            | 2 +-
 pkgs/development/python-modules/geometric/default.nix         | 2 +-
 pkgs/development/python-modules/geopandas/default.nix         | 2 +-
 pkgs/development/python-modules/geopy/default.nix             | 2 +-
 pkgs/development/python-modules/georss-client/default.nix     | 2 +-
 .../python-modules/georss-ign-sismologia-client/default.nix   | 2 +-
 .../georss-ingv-centro-nazionale-terremoti-client/default.nix | 2 +-
 .../georss-qld-bushfire-alert-client/default.nix              | 2 +-
 pkgs/development/python-modules/getmac/default.nix            | 2 +-
 pkgs/development/python-modules/geventhttpclient/default.nix  | 2 +-
 pkgs/development/python-modules/ghapi/default.nix             | 2 +-
 pkgs/development/python-modules/ghrepo-stats/default.nix      | 2 +-
 pkgs/development/python-modules/gios/default.nix              | 2 +-
 pkgs/development/python-modules/gipc/default.nix              | 2 +-
 pkgs/development/python-modules/git-annex-adapter/default.nix | 2 +-
 pkgs/development/python-modules/gitignore-parser/default.nix  | 2 +-
 pkgs/development/python-modules/gitlike-commands/default.nix  | 2 +-
 pkgs/development/python-modules/gitpython/default.nix         | 2 +-
 pkgs/development/python-modules/glances-api/default.nix       | 2 +-
 pkgs/development/python-modules/glcontext/default.nix         | 2 +-
 pkgs/development/python-modules/glfw/default.nix              | 2 +-
 pkgs/development/python-modules/globus-sdk/default.nix        | 2 +-
 pkgs/development/python-modules/glueviz/default.nix           | 2 +-
 pkgs/development/python-modules/glymur/default.nix            | 2 +-
 pkgs/development/python-modules/glyphslib/default.nix         | 2 +-
 pkgs/development/python-modules/gmpy2/default.nix             | 2 +-
 pkgs/development/python-modules/go2rtc-client/default.nix     | 2 +-
 pkgs/development/python-modules/gocardless-pro/default.nix    | 2 +-
 pkgs/development/python-modules/goodwe/default.nix            | 2 +-
 pkgs/development/python-modules/google-crc32c/default.nix     | 2 +-
 .../python-modules/google-generativeai/default.nix            | 2 +-
 .../python-modules/google-i18n-address/default.nix            | 2 +-
 pkgs/development/python-modules/google-nest-sdm/default.nix   | 2 +-
 .../python-modules/google-photos-library-api/default.nix      | 2 +-
 pkgs/development/python-modules/googlemaps/default.nix        | 2 +-
 pkgs/development/python-modules/gophish/default.nix           | 2 +-
 pkgs/development/python-modules/gotailwind/default.nix        | 2 +-
 pkgs/development/python-modules/govee-ble/default.nix         | 2 +-
 pkgs/development/python-modules/govee-local-api/default.nix   | 2 +-
 pkgs/development/python-modules/gpiozero/default.nix          | 2 +-
 pkgs/development/python-modules/gplaycli/default.nix          | 2 +-
 pkgs/development/python-modules/gprof2dot/default.nix         | 2 +-
 pkgs/development/python-modules/gptcache/default.nix          | 4 ++--
 pkgs/development/python-modules/gpuctypes/default.nix         | 2 +-
 pkgs/development/python-modules/gpy/default.nix               | 2 +-
 pkgs/development/python-modules/gpytorch/default.nix          | 2 +-
 pkgs/development/python-modules/gql/default.nix               | 2 +-
 pkgs/development/python-modules/gradient-utils/default.nix    | 2 +-
 pkgs/development/python-modules/grafanalib/default.nix        | 2 +-
 pkgs/development/python-modules/graphene-django/default.nix   | 2 +-
 pkgs/development/python-modules/graphene/default.nix          | 2 +-
 pkgs/development/python-modules/graphql-core/default.nix      | 4 ++--
 .../python-modules/graphql-subscription-manager/default.nix   | 2 +-
 pkgs/development/python-modules/graphtage/default.nix         | 2 +-
 pkgs/development/python-modules/graphviz/default.nix          | 2 +-
 .../development/python-modules/graspologic-native/default.nix | 2 +-
 .../development/python-modules/great-expectations/default.nix | 2 +-
 pkgs/development/python-modules/great-tables/default.nix      | 2 +-
 pkgs/development/python-modules/greeclimate/default.nix       | 2 +-
 pkgs/development/python-modules/greeneye-monitor/default.nix  | 2 +-
 pkgs/development/python-modules/gremlinpython/default.nix     | 2 +-
 pkgs/development/python-modules/greynoise/default.nix         | 2 +-
 pkgs/development/python-modules/gridnet/default.nix           | 2 +-
 pkgs/development/python-modules/groq/default.nix              | 2 +-
 pkgs/development/python-modules/growattserver/default.nix     | 2 +-
 .../development/python-modules/grpc-google-iam-v1/default.nix | 2 +-
 pkgs/development/python-modules/grpc-interceptor/default.nix  | 2 +-
 pkgs/development/python-modules/grpclib/default.nix           | 2 +-
 pkgs/development/python-modules/gruut/default.nix             | 2 +-
 pkgs/development/python-modules/gsd/default.nix               | 2 +-
 pkgs/development/python-modules/gspread/default.nix           | 2 +-
 pkgs/development/python-modules/gssapi/default.nix            | 2 +-
 pkgs/development/python-modules/gstools/default.nix           | 2 +-
 pkgs/development/python-modules/gto/default.nix               | 2 +-
 pkgs/development/python-modules/gtts/default.nix              | 2 +-
 pkgs/development/python-modules/guidance/default.nix          | 4 ++--
 pkgs/development/python-modules/guidata/default.nix           | 2 +-
 pkgs/development/python-modules/gunicorn/default.nix          | 2 +-
 pkgs/development/python-modules/guppy3/default.nix            | 2 +-
 pkgs/development/python-modules/gvm-tools/default.nix         | 2 +-
 pkgs/development/python-modules/gym/default.nix               | 2 +-
 pkgs/development/python-modules/gymnasium/default.nix         | 2 +-
 pkgs/development/python-modules/h3/default.nix                | 2 +-
 pkgs/development/python-modules/h5io/default.nix              | 4 ++--
 pkgs/development/python-modules/ha-ffmpeg/default.nix         | 2 +-
 pkgs/development/python-modules/ha-philipsjs/default.nix      | 2 +-
 pkgs/development/python-modules/habanero/default.nix          | 2 +-
 pkgs/development/python-modules/habitipy/default.nix          | 2 +-
 pkgs/development/python-modules/habluetooth/default.nix       | 2 +-
 pkgs/development/python-modules/hachoir/default.nix           | 2 +-
 pkgs/development/python-modules/hakuin/default.nix            | 2 +-
 pkgs/development/python-modules/halohome/default.nix          | 2 +-
 pkgs/development/python-modules/hankel/default.nix            | 2 +-
 pkgs/development/python-modules/hap-python/default.nix        | 2 +-
 pkgs/development/python-modules/hass-client/default.nix       | 2 +-
 pkgs/development/python-modules/hass-nabucasa/default.nix     | 2 +-
 pkgs/development/python-modules/hass-splunk/default.nix       | 2 +-
 pkgs/development/python-modules/hatasmota/default.nix         | 2 +-
 .../python-modules/hatch-nodejs-version/default.nix           | 2 +-
 pkgs/development/python-modules/hatch-odoo/default.nix        | 2 +-
 .../development/python-modules/hatch-regex-commit/default.nix | 2 +-
 .../python-modules/hatch-requirements-txt/default.nix         | 2 +-
 pkgs/development/python-modules/haversine/default.nix         | 2 +-
 pkgs/development/python-modules/hawkauthlib/default.nix       | 2 +-
 pkgs/development/python-modules/haystack-ai/default.nix       | 4 ++--
 pkgs/development/python-modules/hdate/default.nix             | 2 +-
 pkgs/development/python-modules/hdf5plugin/default.nix        | 2 +-
 pkgs/development/python-modules/hdfs/default.nix              | 2 +-
 pkgs/development/python-modules/headerparser/default.nix      | 2 +-
 pkgs/development/python-modules/heatmiserv3/default.nix       | 2 +-
 pkgs/development/python-modules/heatshrink2/default.nix       | 2 +-
 pkgs/development/python-modules/heatzypy/default.nix          | 2 +-
 pkgs/development/python-modules/herepy/default.nix            | 2 +-
 pkgs/development/python-modules/hexbytes/default.nix          | 2 +-
 pkgs/development/python-modules/hf-transfer/default.nix       | 2 +-
 pkgs/development/python-modules/highdicom/default.nix         | 2 +-
 pkgs/development/python-modules/hikari-crescent/default.nix   | 2 +-
 pkgs/development/python-modules/hikari-lightbulb/default.nix  | 2 +-
 pkgs/development/python-modules/hikari/default.nix            | 2 +-
 pkgs/development/python-modules/hikvision/default.nix         | 2 +-
 pkgs/development/python-modules/hiredis/default.nix           | 2 +-
 pkgs/development/python-modules/hishel/default.nix            | 2 +-
 pkgs/development/python-modules/hiyapyco/default.nix          | 2 +-
 pkgs/development/python-modules/hjson/default.nix             | 2 +-
 pkgs/development/python-modules/holidays/default.nix          | 2 +-
 pkgs/development/python-modules/hologram/default.nix          | 2 +-
 .../python-modules/home-assistant-bluetooth/default.nix       | 2 +-
 pkgs/development/python-modules/homf/default.nix              | 2 +-
 pkgs/development/python-modules/howdoi/default.nix            | 2 +-
 pkgs/development/python-modules/hpccm/default.nix             | 2 +-
 pkgs/development/python-modules/hstspreload/default.nix       | 2 +-
 pkgs/development/python-modules/html-sanitizer/default.nix    | 2 +-
 pkgs/development/python-modules/html-text/default.nix         | 2 +-
 pkgs/development/python-modules/html2image/default.nix        | 2 +-
 pkgs/development/python-modules/html2text/default.nix         | 2 +-
 pkgs/development/python-modules/html5-parser/default.nix      | 2 +-
 pkgs/development/python-modules/htmldate/default.nix          | 2 +-
 pkgs/development/python-modules/htmltools/default.nix         | 2 +-
 pkgs/development/python-modules/http-parser/default.nix       | 2 +-
 pkgs/development/python-modules/http-sf/default.nix           | 2 +-
 pkgs/development/python-modules/httpcore/default.nix          | 2 +-
 pkgs/development/python-modules/httpie/default.nix            | 2 +-
 pkgs/development/python-modules/httpx-auth/default.nix        | 2 +-
 pkgs/development/python-modules/httpx-socks/default.nix       | 2 +-
 pkgs/development/python-modules/httpx-sse/default.nix         | 2 +-
 pkgs/development/python-modules/httpx/default.nix             | 2 +-
 pkgs/development/python-modules/huawei-lte-api/default.nix    | 2 +-
 pkgs/development/python-modules/huey/default.nix              | 2 +-
 pkgs/development/python-modules/humanize/default.nix          | 2 +-
 pkgs/development/python-modules/huum/default.nix              | 2 +-
 pkgs/development/python-modules/hwi/default.nix               | 2 +-
 pkgs/development/python-modules/hy/default.nix                | 2 +-
 pkgs/development/python-modules/hydra-core/default.nix        | 2 +-
 pkgs/development/python-modules/hydrogram/default.nix         | 2 +-
 pkgs/development/python-modules/hyperpyyaml/default.nix       | 2 +-
 pkgs/development/python-modules/hyperscan/default.nix         | 2 +-
 pkgs/development/python-modules/hyppo/default.nix             | 2 +-
 pkgs/development/python-modules/hyrule/default.nix            | 2 +-
 pkgs/development/python-modules/i-pi/default.nix              | 2 +-
 pkgs/development/python-modules/ibeacon-ble/default.nix       | 2 +-
 pkgs/development/python-modules/ibis-framework/default.nix    | 2 +-
 .../development/python-modules/ibm-cloud-sdk-core/default.nix | 2 +-
 pkgs/development/python-modules/ibm-watson/default.nix        | 2 +-
 pkgs/development/python-modules/ical/default.nix              | 2 +-
 pkgs/development/python-modules/icalendar/default.nix         | 2 +-
 pkgs/development/python-modules/icalevents/default.nix        | 2 +-
 pkgs/development/python-modules/iceportal/default.nix         | 2 +-
 pkgs/development/python-modules/icnsutil/default.nix          | 2 +-
 pkgs/development/python-modules/icontract/default.nix         | 2 +-
 pkgs/development/python-modules/ics/default.nix               | 2 +-
 pkgs/development/python-modules/id/default.nix                | 2 +-
 pkgs/development/python-modules/idasen-ha/default.nix         | 2 +-
 pkgs/development/python-modules/idasen/default.nix            | 2 +-
 pkgs/development/python-modules/identify/default.nix          | 2 +-
 pkgs/development/python-modules/ifcopenshell/default.nix      | 2 +-
 pkgs/development/python-modules/ignite/default.nix            | 2 +-
 pkgs/development/python-modules/igraph/default.nix            | 2 +-
 pkgs/development/python-modules/ihcsdk/default.nix            | 2 +-
 pkgs/development/python-modules/ihm/default.nix               | 2 +-
 pkgs/development/python-modules/image-go-nord/default.nix     | 2 +-
 pkgs/development/python-modules/imagededup/default.nix        | 4 ++--
 pkgs/development/python-modules/imagehash/default.nix         | 2 +-
 pkgs/development/python-modules/imageio-ffmpeg/default.nix    | 2 +-
 pkgs/development/python-modules/imap-tools/default.nix        | 2 +-
 pkgs/development/python-modules/imapclient/default.nix        | 2 +-
 pkgs/development/python-modules/imgcat/default.nix            | 2 +-
 pkgs/development/python-modules/immutabledict/default.nix     | 2 +-
 pkgs/development/python-modules/immutables/default.nix        | 2 +-
 pkgs/development/python-modules/in-place/default.nix          | 2 +-
 pkgs/development/python-modules/incremental/default.nix       | 2 +-
 pkgs/development/python-modules/inflect/default.nix           | 2 +-
 pkgs/development/python-modules/influxdb-client/default.nix   | 2 +-
 pkgs/development/python-modules/influxdb3-python/default.nix  | 2 +-
 pkgs/development/python-modules/inject/default.nix            | 2 +-
 pkgs/development/python-modules/injector/default.nix          | 2 +-
 pkgs/development/python-modules/inkbird-ble/default.nix       | 2 +-
 pkgs/development/python-modules/inline-snapshot/default.nix   | 2 +-
 pkgs/development/python-modules/inlinestyler/default.nix      | 2 +-
 pkgs/development/python-modules/inquirer/default.nix          | 2 +-
 pkgs/development/python-modules/inquirerpy/default.nix        | 2 +-
 pkgs/development/python-modules/inscriptis/default.nix        | 2 +-
 pkgs/development/python-modules/instructor/default.nix        | 4 ++--
 pkgs/development/python-modules/intake-parquet/default.nix    | 2 +-
 pkgs/development/python-modules/intake/default.nix            | 2 +-
 pkgs/development/python-modules/intellifire4py/default.nix    | 2 +-
 pkgs/development/python-modules/internetarchive/default.nix   | 2 +-
 pkgs/development/python-modules/invocations/default.nix       | 2 +-
 pkgs/development/python-modules/iocextract/default.nix        | 2 +-
 pkgs/development/python-modules/iodata/default.nix            | 2 +-
 pkgs/development/python-modules/iopath/default.nix            | 2 +-
 pkgs/development/python-modules/iottycloud/default.nix        | 2 +-
 pkgs/development/python-modules/ipadic/default.nix            | 2 +-
 pkgs/development/python-modules/iptools/default.nix           | 2 +-
 pkgs/development/python-modules/ipwhois/default.nix           | 2 +-
 pkgs/development/python-modules/islpy/default.nix             | 2 +-
 pkgs/development/python-modules/ismartgate/default.nix        | 2 +-
 pkgs/development/python-modules/iso3166/default.nix           | 2 +-
 pkgs/development/python-modules/iso4217/default.nix           | 2 +-
 pkgs/development/python-modules/isort/default.nix             | 2 +-
 pkgs/development/python-modules/israel-rail-api/default.nix   | 2 +-
 pkgs/development/python-modules/itanium-demangler/default.nix | 2 +-
 pkgs/development/python-modules/itemdb/default.nix            | 2 +-
 pkgs/development/python-modules/itemloaders/default.nix       | 2 +-
 pkgs/development/python-modules/iterable-io/default.nix       | 2 +-
 .../python-modules/iteration-utilities/default.nix            | 2 +-
 .../python-modules/iterative-telemetry/default.nix            | 2 +-
 pkgs/development/python-modules/iterfzf/default.nix           | 2 +-
 pkgs/development/python-modules/itunespy/default.nix          | 2 +-
 pkgs/development/python-modules/ixia/default.nix              | 2 +-
 pkgs/development/python-modules/jaconv/default.nix            | 2 +-
 pkgs/development/python-modules/jamo/default.nix              | 2 +-
 pkgs/development/python-modules/jaraco-abode/default.nix      | 2 +-
 pkgs/development/python-modules/jaraco-classes/default.nix    | 2 +-
 pkgs/development/python-modules/jaraco-context/default.nix    | 2 +-
 pkgs/development/python-modules/jaraco-email/default.nix      | 2 +-
 pkgs/development/python-modules/jaraco-envs/default.nix       | 2 +-
 pkgs/development/python-modules/jaraco-net/default.nix        | 2 +-
 pkgs/development/python-modules/jaraco-path/default.nix       | 2 +-
 pkgs/development/python-modules/jaraco-test/default.nix       | 2 +-
 pkgs/development/python-modules/jarowinkler/default.nix       | 2 +-
 pkgs/development/python-modules/jaxopt/default.nix            | 2 +-
 pkgs/development/python-modules/jaxtyping/default.nix         | 2 +-
 pkgs/development/python-modules/jc/default.nix                | 2 +-
 .../python-modules/jedi-language-server/default.nix           | 2 +-
 .../python-modules/jellyfin-apiclient-python/default.nix      | 2 +-
 pkgs/development/python-modules/jh2/default.nix               | 2 +-
 pkgs/development/python-modules/jinja2-git/default.nix        | 2 +-
 pkgs/development/python-modules/jira/default.nix              | 2 +-
 pkgs/development/python-modules/jishaku/default.nix           | 2 +-
 pkgs/development/python-modules/jiter/default.nix             | 2 +-
 pkgs/development/python-modules/jiwer/default.nix             | 2 +-
 pkgs/development/python-modules/jmp/default.nix               | 2 +-
 pkgs/development/python-modules/johnnycanencrypt/default.nix  | 2 +-
 pkgs/development/python-modules/joserfc/default.nix           | 2 +-
 pkgs/development/python-modules/jq/default.nix                | 2 +-
 pkgs/development/python-modules/json-logging/default.nix      | 2 +-
 .../python-modules/json-schema-for-humans/default.nix         | 2 +-
 .../python-modules/json-stream-rs-tokenizer/default.nix       | 2 +-
 pkgs/development/python-modules/json-tricks/default.nix       | 2 +-
 pkgs/development/python-modules/json5/default.nix             | 2 +-
 pkgs/development/python-modules/jsonable/default.nix          | 2 +-
 pkgs/development/python-modules/jsonargparse/default.nix      | 2 +-
 pkgs/development/python-modules/jsonconversion/default.nix    | 2 +-
 pkgs/development/python-modules/jsondate/default.nix          | 2 +-
 pkgs/development/python-modules/jsondiff/default.nix          | 2 +-
 pkgs/development/python-modules/jsonformatter/default.nix     | 2 +-
 pkgs/development/python-modules/jsonpatch/default.nix         | 2 +-
 pkgs/development/python-modules/jsonpath-ng/default.nix       | 2 +-
 pkgs/development/python-modules/jsonref/default.nix           | 2 +-
 pkgs/development/python-modules/jsonrpc-base/default.nix      | 2 +-
 pkgs/development/python-modules/jsonrpc-websocket/default.nix | 2 +-
 pkgs/development/python-modules/jsons/default.nix             | 2 +-
 pkgs/development/python-modules/jsonschema-path/default.nix   | 2 +-
 pkgs/development/python-modules/jsonschema-spec/default.nix   | 2 +-
 pkgs/development/python-modules/jsonslicer/default.nix        | 2 +-
 pkgs/development/python-modules/junos-eznc/default.nix        | 2 +-
 pkgs/development/python-modules/jupyter-book/default.nix      | 2 +-
 pkgs/development/python-modules/jupyter-console/default.nix   | 2 +-
 .../python-modules/jupyter-contrib-core/default.nix           | 2 +-
 pkgs/development/python-modules/jupyter-core/default.nix      | 2 +-
 pkgs/development/python-modules/jupyter-events/default.nix    | 2 +-
 .../jupyter-highlight-selected-word/default.nix               | 2 +-
 .../jupyter-nbextensions-configurator/default.nix             | 2 +-
 .../python-modules/jupyter-repo2docker/default.nix            | 2 +-
 .../python-modules/jupyter-server-fileid/default.nix          | 2 +-
 .../python-modules/jupyter-server-terminals/default.nix       | 2 +-
 pkgs/development/python-modules/jupyter-sphinx/default.nix    | 4 ++--
 pkgs/development/python-modules/jupyter-ui-poll/default.nix   | 2 +-
 .../python-modules/jupyterhub-ldapauthenticator/default.nix   | 2 +-
 .../python-modules/jupyterhub-systemdspawner/default.nix      | 2 +-
 pkgs/development/python-modules/justbases/default.nix         | 2 +-
 pkgs/development/python-modules/justbytes/default.nix         | 2 +-
 pkgs/development/python-modules/justext/default.nix           | 2 +-
 pkgs/development/python-modules/justnimbus/default.nix        | 2 +-
 pkgs/development/python-modules/k-diffusion/default.nix       | 2 +-
 pkgs/development/python-modules/kafka-python-ng/default.nix   | 2 +-
 pkgs/development/python-modules/kajiki/default.nix            | 2 +-
 pkgs/development/python-modules/karton-asciimagic/default.nix | 2 +-
 .../python-modules/karton-autoit-ripper/default.nix           | 2 +-
 pkgs/development/python-modules/karton-classifier/default.nix | 2 +-
 .../python-modules/karton-config-extractor/default.nix        | 2 +-
 pkgs/development/python-modules/karton-core/default.nix       | 2 +-
 pkgs/development/python-modules/karton-dashboard/default.nix  | 2 +-
 .../python-modules/karton-mwdb-reporter/default.nix           | 2 +-
 .../development/python-modules/karton-yaramatcher/default.nix | 2 +-
 pkgs/development/python-modules/kasa-crypt/default.nix        | 2 +-
 pkgs/development/python-modules/kbcstorage/default.nix        | 2 +-
 .../python-modules/kde-material-you-colors/default.nix        | 2 +-
 pkgs/development/python-modules/keba-kecontact/default.nix    | 2 +-
 pkgs/development/python-modules/kegtron-ble/default.nix       | 2 +-
 pkgs/development/python-modules/keyring-pass/default.nix      | 2 +-
 pkgs/development/python-modules/keyring/default.nix           | 2 +-
 pkgs/development/python-modules/keyrings-alt/default.nix      | 2 +-
 .../development/python-modules/keyrings-cryptfile/default.nix | 2 +-
 pkgs/development/python-modules/khanaa/default.nix            | 2 +-
 pkgs/development/python-modules/kiss-headers/default.nix      | 2 +-
 pkgs/development/python-modules/kiwiki-client/default.nix     | 2 +-
 pkgs/development/python-modules/klein/default.nix             | 2 +-
 pkgs/development/python-modules/kmapper/default.nix           | 2 +-
 pkgs/development/python-modules/kneaddata/default.nix         | 2 +-
 pkgs/development/python-modules/kneed/default.nix             | 2 +-
 pkgs/development/python-modules/kornia-rs/default.nix         | 2 +-
 pkgs/development/python-modules/kornia/default.nix            | 2 +-
 .../development/python-modules/kubernetes-asyncio/default.nix | 2 +-
 pkgs/development/python-modules/kubernetes/default.nix        | 2 +-
 pkgs/development/python-modules/labelbox/default.nix          | 2 +-
 pkgs/development/python-modules/labgrid/default.nix           | 2 +-
 pkgs/development/python-modules/lacuscore/default.nix         | 2 +-
 pkgs/development/python-modules/lakeside/default.nix          | 2 +-
 pkgs/development/python-modules/lancedb/default.nix           | 2 +-
 pkgs/development/python-modules/langchain-aws/default.nix     | 2 +-
 .../langchain-azure-dynamic-sessions/default.nix              | 2 +-
 pkgs/development/python-modules/langchain-chroma/default.nix  | 2 +-
 .../python-modules/langchain-community/default.nix            | 2 +-
 pkgs/development/python-modules/langchain-core/default.nix    | 2 +-
 .../python-modules/langchain-huggingface/default.nix          | 2 +-
 pkgs/development/python-modules/langchain-mongodb/default.nix | 2 +-
 pkgs/development/python-modules/langchain-ollama/default.nix  | 2 +-
 pkgs/development/python-modules/langchain-openai/default.nix  | 2 +-
 .../python-modules/langchain-text-splitters/default.nix       | 2 +-
 pkgs/development/python-modules/langchain/default.nix         | 2 +-
 pkgs/development/python-modules/langfuse/default.nix          | 4 ++--
 pkgs/development/python-modules/langsmith/default.nix         | 2 +-
 pkgs/development/python-modules/language-data/default.nix     | 2 +-
 pkgs/development/python-modules/language-tags/default.nix     | 2 +-
 pkgs/development/python-modules/lark/default.nix              | 2 +-
 pkgs/development/python-modules/laundrify-aio/default.nix     | 2 +-
 pkgs/development/python-modules/layoutparser/default.nix      | 2 +-
 pkgs/development/python-modules/lazy-imports/default.nix      | 2 +-
 pkgs/development/python-modules/lazy-loader/default.nix       | 2 +-
 pkgs/development/python-modules/lcgit/default.nix             | 2 +-
 pkgs/development/python-modules/ld2410-ble/default.nix        | 2 +-
 pkgs/development/python-modules/ldfparser/default.nix         | 2 +-
 pkgs/development/python-modules/leaone-ble/default.nix        | 2 +-
 pkgs/development/python-modules/leb128/default.nix            | 2 +-
 pkgs/development/python-modules/led-ble/default.nix           | 2 +-
 pkgs/development/python-modules/legacy-cgi/default.nix        | 2 +-
 pkgs/development/python-modules/leidenalg/default.nix         | 2 +-
 pkgs/development/python-modules/lektricowifi/default.nix      | 2 +-
 pkgs/development/python-modules/levenshtein/default.nix       | 2 +-
 pkgs/development/python-modules/lexilang/default.nix          | 2 +-
 pkgs/development/python-modules/libagent/default.nix          | 2 +-
 pkgs/development/python-modules/libarchive-c/default.nix      | 2 +-
 pkgs/development/python-modules/libcst/default.nix            | 2 +-
 pkgs/development/python-modules/libgravatar/default.nix       | 2 +-
 pkgs/development/python-modules/libpysal/default.nix          | 2 +-
 pkgs/development/python-modules/librespot/default.nix         | 2 +-
 pkgs/development/python-modules/libretranslate/default.nix    | 2 +-
 pkgs/development/python-modules/librouteros/default.nix       | 2 +-
 pkgs/development/python-modules/libsass/default.nix           | 2 +-
 pkgs/development/python-modules/libsoundtouch/default.nix     | 2 +-
 pkgs/development/python-modules/liccheck/default.nix          | 2 +-
 .../development/python-modules/license-expression/default.nix | 2 +-
 pkgs/development/python-modules/life360/default.nix           | 2 +-
 pkgs/development/python-modules/lifelines/default.nix         | 2 +-
 .../python-modules/lightning-utilities/default.nix            | 2 +-
 pkgs/development/python-modules/limits/default.nix            | 2 +-
 .../development/python-modules/linear-garage-door/default.nix | 2 +-
 pkgs/development/python-modules/linear-operator/default.nix   | 2 +-
 pkgs/development/python-modules/linetable/default.nix         | 2 +-
 pkgs/development/python-modules/lingva/default.nix            | 2 +-
 pkgs/development/python-modules/linien-common/default.nix     | 2 +-
 pkgs/development/python-modules/linkify-it-py/default.nix     | 2 +-
 pkgs/development/python-modules/linknlink/default.nix         | 2 +-
 pkgs/development/python-modules/liquidctl/default.nix         | 2 +-
 pkgs/development/python-modules/litellm/default.nix           | 2 +-
 pkgs/development/python-modules/llfuse/default.nix            | 2 +-
 pkgs/development/python-modules/llvmlite/default.nix          | 2 +-
 .../development/python-modules/lm-format-enforcer/default.nix | 2 +-
 pkgs/development/python-modules/lnkparse3/default.nix         | 2 +-
 pkgs/development/python-modules/localstack/default.nix        | 2 +-
 pkgs/development/python-modules/localzone/default.nix         | 2 +-
 pkgs/development/python-modules/locust/default.nix            | 2 +-
 pkgs/development/python-modules/logging-journald/default.nix  | 2 +-
 .../python-modules/logical-unification/default.nix            | 2 +-
 pkgs/development/python-modules/logmatic-python/default.nix   | 2 +-
 pkgs/development/python-modules/loopy/default.nix             | 2 +-
 pkgs/development/python-modules/loqedapi/default.nix          | 2 +-
 pkgs/development/python-modules/losant-rest/default.nix       | 2 +-
 pkgs/development/python-modules/lox/default.nix               | 2 +-
 pkgs/development/python-modules/lsassy/default.nix            | 2 +-
 pkgs/development/python-modules/lsp-tree-sitter/default.nix   | 2 +-
 pkgs/development/python-modules/lsprotocol/default.nix        | 2 +-
 pkgs/development/python-modules/luddite/default.nix           | 2 +-
 pkgs/development/python-modules/luna-soc/default.nix          | 2 +-
 pkgs/development/python-modules/luna-usb/default.nix          | 2 +-
 pkgs/development/python-modules/luqum/default.nix             | 2 +-
 pkgs/development/python-modules/lxmf/default.nix              | 2 +-
 pkgs/development/python-modules/lxml-html-clean/default.nix   | 2 +-
 pkgs/development/python-modules/lxml-stubs/default.nix        | 2 +-
 pkgs/development/python-modules/lxml/default.nix              | 2 +-
 pkgs/development/python-modules/lyricwikia/default.nix        | 2 +-
 pkgs/development/python-modules/lz4/default.nix               | 2 +-
 pkgs/development/python-modules/m3u8/default.nix              | 2 +-
 pkgs/development/python-modules/maec/default.nix              | 2 +-
 pkgs/development/python-modules/maestral/default.nix          | 2 +-
 pkgs/development/python-modules/magic-filter/default.nix      | 2 +-
 pkgs/development/python-modules/magic-wormhole/default.nix    | 2 +-
 pkgs/development/python-modules/mahotas/default.nix           | 2 +-
 pkgs/development/python-modules/mail-parser/default.nix       | 2 +-
 pkgs/development/python-modules/maison/default.nix            | 2 +-
 pkgs/development/python-modules/malduck/default.nix           | 2 +-
 pkgs/development/python-modules/mamba-ssm/default.nix         | 2 +-
 pkgs/development/python-modules/mandown/default.nix           | 2 +-
 pkgs/development/python-modules/manga-ocr/default.nix         | 2 +-
 pkgs/development/python-modules/manifest-ml/default.nix       | 2 +-
 pkgs/development/python-modules/manifold3d/default.nix        | 2 +-
 pkgs/development/python-modules/manim-slides/default.nix      | 2 +-
 pkgs/development/python-modules/manim/default.nix             | 2 +-
 pkgs/development/python-modules/manimpango/default.nix        | 2 +-
 pkgs/development/python-modules/mapbox-earcut/default.nix     | 2 +-
 pkgs/development/python-modules/mapclassify/default.nix       | 2 +-
 pkgs/development/python-modules/mariadb/default.nix           | 2 +-
 pkgs/development/python-modules/markdown-include/default.nix  | 2 +-
 pkgs/development/python-modules/markdown-it-py/default.nix    | 2 +-
 pkgs/development/python-modules/markdown/default.nix          | 2 +-
 pkgs/development/python-modules/markdownify/default.nix       | 2 +-
 pkgs/development/python-modules/marko/default.nix             | 2 +-
 pkgs/development/python-modules/markupsafe/default.nix        | 2 +-
 .../python-modules/marshmallow-dataclass/default.nix          | 2 +-
 .../python-modules/marshmallow-oneofschema/default.nix        | 2 +-
 .../python-modules/marshmallow-polyfield/default.nix          | 2 +-
 pkgs/development/python-modules/marshmallow/default.nix       | 2 +-
 pkgs/development/python-modules/mashumaro/default.nix         | 2 +-
 pkgs/development/python-modules/masky/default.nix             | 2 +-
 pkgs/development/python-modules/mastodon-py/default.nix       | 2 +-
 pkgs/development/python-modules/matplotlib-inline/default.nix | 2 +-
 pkgs/development/python-modules/matrix-nio/default.nix        | 2 +-
 pkgs/development/python-modules/mautrix/default.nix           | 2 +-
 pkgs/development/python-modules/maya/default.nix              | 2 +-
 pkgs/development/python-modules/mayim/default.nix             | 2 +-
 pkgs/development/python-modules/mbstrdecoder/default.nix      | 2 +-
 pkgs/development/python-modules/mcstatus/default.nix          | 2 +-
 pkgs/development/python-modules/mcuuid/default.nix            | 2 +-
 pkgs/development/python-modules/md-toc/default.nix            | 2 +-
 pkgs/development/python-modules/md2pdf/default.nix            | 2 +-
 pkgs/development/python-modules/mdformat-admon/default.nix    | 2 +-
 pkgs/development/python-modules/mdformat-beautysh/default.nix | 2 +-
 pkgs/development/python-modules/mdformat-footnote/default.nix | 2 +-
 .../python-modules/mdformat-frontmatter/default.nix           | 2 +-
 .../python-modules/mdformat-gfm-alerts/default.nix            | 2 +-
 pkgs/development/python-modules/mdformat-gfm/default.nix      | 2 +-
 .../python-modules/mdformat-nix-alejandra/default.nix         | 2 +-
 .../python-modules/mdformat-simple-breaks/default.nix         | 2 +-
 pkgs/development/python-modules/mdformat-toc/default.nix      | 2 +-
 pkgs/development/python-modules/mdformat/default.nix          | 2 +-
 pkgs/development/python-modules/mdit-py-plugins/default.nix   | 2 +-
 pkgs/development/python-modules/mdtraj/default.nix            | 4 ++--
 pkgs/development/python-modules/mdutils/default.nix           | 4 ++--
 .../python-modules/mdx-truly-sane-lists/default.nix           | 2 +-
 .../python-modules/mean-average-precision/default.nix         | 2 +-
 pkgs/development/python-modules/measurement/default.nix       | 2 +-
 pkgs/development/python-modules/mechanicalsoup/default.nix    | 2 +-
 pkgs/development/python-modules/medallion/default.nix         | 2 +-
 pkgs/development/python-modules/medpy/default.nix             | 2 +-
 pkgs/development/python-modules/meeko/default.nix             | 4 ++--
 pkgs/development/python-modules/meep/default.nix              | 2 +-
 pkgs/development/python-modules/meilisearch/default.nix       | 2 +-
 pkgs/development/python-modules/melnor-bluetooth/default.nix  | 2 +-
 pkgs/development/python-modules/mercadopago/default.nix       | 2 +-
 pkgs/development/python-modules/merkletools/default.nix       | 2 +-
 pkgs/development/python-modules/meross-iot/default.nix        | 2 +-
 pkgs/development/python-modules/metar/default.nix             | 2 +-
 pkgs/development/python-modules/meteoalertapi/default.nix     | 2 +-
 pkgs/development/python-modules/meteofrance-api/default.nix   | 2 +-
 pkgs/development/python-modules/meteoswiss-async/default.nix  | 2 +-
 pkgs/development/python-modules/mf2py/default.nix             | 2 +-
 pkgs/development/python-modules/mhcflurry/default.nix         | 2 +-
 .../python-modules/microsoft-kiota-abstractions/default.nix   | 2 +-
 .../microsoft-kiota-authentication-azure/default.nix          | 2 +-
 .../python-modules/microsoft-kiota-http/default.nix           | 2 +-
 .../microsoft-kiota-serialization-form/default.nix            | 2 +-
 .../microsoft-kiota-serialization-json/default.nix            | 2 +-
 .../microsoft-kiota-serialization-multipart/default.nix       | 2 +-
 .../microsoft-kiota-serialization-text/default.nix            | 2 +-
 .../python-modules/midea-beautiful-air/default.nix            | 2 +-
 pkgs/development/python-modules/mill-local/default.nix        | 2 +-
 pkgs/development/python-modules/minidb/default.nix            | 2 +-
 pkgs/development/python-modules/mirakuru/default.nix          | 2 +-
 pkgs/development/python-modules/mistletoe/default.nix         | 2 +-
 pkgs/development/python-modules/mistune/default.nix           | 2 +-
 pkgs/development/python-modules/mitogen/default.nix           | 2 +-
 pkgs/development/python-modules/mixbox/default.nix            | 2 +-
 pkgs/development/python-modules/mixpanel/default.nix          | 2 +-
 .../python-modules/mkdocs-autolinks-plugin/default.nix        | 2 +-
 pkgs/development/python-modules/mkdocs-autorefs/default.nix   | 2 +-
 .../mkdocs-git-revision-date-localized-plugin/default.nix     | 2 +-
 pkgs/development/python-modules/mkdocs-material/default.nix   | 2 +-
 .../python-modules/mkdocs-mermaid2-plugin/default.nix         | 2 +-
 .../python-modules/mkdocs-minify-plugin/default.nix           | 2 +-
 pkgs/development/python-modules/mkdocs-redirects/default.nix  | 2 +-
 pkgs/development/python-modules/mkdocs-redoc-tag/default.nix  | 2 +-
 pkgs/development/python-modules/mkdocs-rss-plugin/default.nix | 2 +-
 .../python-modules/mkdocs-swagger-ui-tag/default.nix          | 2 +-
 pkgs/development/python-modules/mkdocs/default.nix            | 2 +-
 .../python-modules/mkdocstrings-python/default.nix            | 2 +-
 pkgs/development/python-modules/mkdocstrings/default.nix      | 2 +-
 pkgs/development/python-modules/mkl-service/default.nix       | 2 +-
 pkgs/development/python-modules/mktestdocs/default.nix        | 2 +-
 pkgs/development/python-modules/ml-collections/default.nix    | 2 +-
 pkgs/development/python-modules/ml-dtypes/default.nix         | 2 +-
 pkgs/development/python-modules/mmcif-pdbx/default.nix        | 2 +-
 pkgs/development/python-modules/mmengine/default.nix          | 2 +-
 pkgs/development/python-modules/mne-python/default.nix        | 2 +-
 pkgs/development/python-modules/moat-ble/default.nix          | 2 +-
 pkgs/development/python-modules/mobi/default.nix              | 2 +-
 pkgs/development/python-modules/mobly/default.nix             | 2 +-
 pkgs/development/python-modules/mock-ssh-server/default.nix   | 2 +-
 pkgs/development/python-modules/model-bakery/default.nix      | 2 +-
 pkgs/development/python-modules/modelcif/default.nix          | 2 +-
 pkgs/development/python-modules/moderngl-window/default.nix   | 2 +-
 pkgs/development/python-modules/monai-deploy/default.nix      | 2 +-
 pkgs/development/python-modules/monai/default.nix             | 2 +-
 pkgs/development/python-modules/mongoengine/default.nix       | 2 +-
 pkgs/development/python-modules/monitorcontrol/default.nix    | 2 +-
 pkgs/development/python-modules/monkeytype/default.nix        | 2 +-
 .../python-modules/monotonic-alignment-search/default.nix     | 2 +-
 pkgs/development/python-modules/monty/default.nix             | 2 +-
 pkgs/development/python-modules/monzopy/default.nix           | 2 +-
 pkgs/development/python-modules/moonraker-api/default.nix     | 2 +-
 pkgs/development/python-modules/mopeka-iot-ble/default.nix    | 2 +-
 pkgs/development/python-modules/moreorless/default.nix        | 2 +-
 pkgs/development/python-modules/mortgage/default.nix          | 2 +-
 pkgs/development/python-modules/motionblinds/default.nix      | 2 +-
 pkgs/development/python-modules/motionblindsble/default.nix   | 2 +-
 pkgs/development/python-modules/motor/default.nix             | 2 +-
 pkgs/development/python-modules/moviepy/default.nix           | 2 +-
 .../python-modules/mpl-scatter-density/default.nix            | 2 +-
 pkgs/development/python-modules/mplhep/default.nix            | 2 +-
 pkgs/development/python-modules/mpmath/default.nix            | 2 +-
 pkgs/development/python-modules/mqtt2influxdb/default.nix     | 2 +-
 pkgs/development/python-modules/mrjob/default.nix             | 2 +-
 .../python-modules/ms-active-directory/default.nix            | 2 +-
 pkgs/development/python-modules/msal-extensions/default.nix   | 2 +-
 pkgs/development/python-modules/mscerts/default.nix           | 2 +-
 pkgs/development/python-modules/msgpack/default.nix           | 2 +-
 pkgs/development/python-modules/msgraph-core/default.nix      | 2 +-
 pkgs/development/python-modules/msgspec/default.nix           | 2 +-
 pkgs/development/python-modules/msoffcrypto-tool/default.nix  | 2 +-
 pkgs/development/python-modules/msrestazure/default.nix       | 2 +-
 pkgs/development/python-modules/msticpy/default.nix           | 2 +-
 pkgs/development/python-modules/mt-940/default.nix            | 2 +-
 pkgs/development/python-modules/mtcnn/default.nix             | 2 +-
 pkgs/development/python-modules/multidict/default.nix         | 2 +-
 pkgs/development/python-modules/multimethod/default.nix       | 2 +-
 pkgs/development/python-modules/multipart/default.nix         | 2 +-
 pkgs/development/python-modules/multiprocess/default.nix      | 2 +-
 pkgs/development/python-modules/munch/default.nix             | 2 +-
 pkgs/development/python-modules/mung/default.nix              | 2 +-
 .../python-modules/music-assistant-models/default.nix         | 2 +-
 pkgs/development/python-modules/mwclient/default.nix          | 2 +-
 pkgs/development/python-modules/mwdblib/default.nix           | 2 +-
 pkgs/development/python-modules/myjwt/default.nix             | 2 +-
 pkgs/development/python-modules/mypermobil/default.nix        | 2 +-
 pkgs/development/python-modules/mypy/default.nix              | 2 +-
 pkgs/development/python-modules/myst-docutils/default.nix     | 2 +-
 pkgs/development/python-modules/myst-parser/default.nix       | 2 +-
 pkgs/development/python-modules/myuplink/default.nix          | 2 +-
 pkgs/development/python-modules/nampa/default.nix             | 2 +-
 pkgs/development/python-modules/nanoemoji/default.nix         | 2 +-
 pkgs/development/python-modules/napalm/default.nix            | 2 +-
 pkgs/development/python-modules/napari-console/default.nix    | 2 +-
 pkgs/development/python-modules/napari-nifti/default.nix      | 2 +-
 pkgs/development/python-modules/napari-npe2/default.nix       | 2 +-
 .../python-modules/napari-plugin-engine/default.nix           | 2 +-
 pkgs/development/python-modules/napari-svg/default.nix        | 2 +-
 pkgs/development/python-modules/napari/default.nix            | 2 +-
 pkgs/development/python-modules/nasdaq-data-link/default.nix  | 2 +-
 pkgs/development/python-modules/nats-py/default.nix           | 2 +-
 pkgs/development/python-modules/nats-python/default.nix       | 2 +-
 pkgs/development/python-modules/natural/default.nix           | 2 +-
 pkgs/development/python-modules/naturalsort/default.nix       | 2 +-
 pkgs/development/python-modules/nbclient/default.nix          | 2 +-
 pkgs/development/python-modules/nbconflux/default.nix         | 2 +-
 pkgs/development/python-modules/nbexec/default.nix            | 2 +-
 pkgs/development/python-modules/nbmake/default.nix            | 2 +-
 pkgs/development/python-modules/ncclient/default.nix          | 2 +-
 pkgs/development/python-modules/ndeflib/default.nix           | 2 +-
 pkgs/development/python-modules/ndindex/default.nix           | 2 +-
 pkgs/development/python-modules/ndspy/default.nix             | 2 +-
 pkgs/development/python-modules/nebula3-python/default.nix    | 2 +-
 pkgs/development/python-modules/nemosis/default.nix           | 2 +-
 pkgs/development/python-modules/nengo/default.nix             | 2 +-
 pkgs/development/python-modules/neo/default.nix               | 2 +-
 pkgs/development/python-modules/neo4j/default.nix             | 2 +-
 pkgs/development/python-modules/neoteroi-mkdocs/default.nix   | 2 +-
 pkgs/development/python-modules/nessclient/default.nix        | 2 +-
 pkgs/development/python-modules/nest-asyncio/default.nix      | 2 +-
 pkgs/development/python-modules/nestedtext/default.nix        | 2 +-
 .../python-modules/netbox-reorder-rack/default.nix            | 2 +-
 pkgs/development/python-modules/netdata/default.nix           | 2 +-
 pkgs/development/python-modules/netifaces2/default.nix        | 2 +-
 pkgs/development/python-modules/netio/default.nix             | 2 +-
 .../python-modules/nettigo-air-monitor/default.nix            | 2 +-
 pkgs/development/python-modules/netutils/default.nix          | 2 +-
 pkgs/development/python-modules/newversion/default.nix        | 2 +-
 pkgs/development/python-modules/nexia/default.nix             | 2 +-
 pkgs/development/python-modules/nextcloudmonitor/default.nix  | 2 +-
 pkgs/development/python-modules/nextcord/default.nix          | 2 +-
 pkgs/development/python-modules/nextdns/default.nix           | 2 +-
 pkgs/development/python-modules/nfcpy/default.nix             | 2 +-
 pkgs/development/python-modules/niaaml/default.nix            | 2 +-
 pkgs/development/python-modules/niaarm/default.nix            | 2 +-
 pkgs/development/python-modules/nianet/default.nix            | 2 +-
 pkgs/development/python-modules/niapy/default.nix             | 2 +-
 pkgs/development/python-modules/nibe/default.nix              | 2 +-
 .../development/python-modules/nicegui-highcharts/default.nix | 2 +-
 pkgs/development/python-modules/nicegui/default.nix           | 2 +-
 pkgs/development/python-modules/ninebot-ble/default.nix       | 2 +-
 pkgs/development/python-modules/nipreps-versions/default.nix  | 2 +-
 pkgs/development/python-modules/niworkflows/default.nix       | 2 +-
 pkgs/development/python-modules/node-semver/default.nix       | 2 +-
 pkgs/development/python-modules/nodeenv/default.nix           | 2 +-
 pkgs/development/python-modules/noiseprotocol/default.nix     | 2 +-
 pkgs/development/python-modules/nomadnet/default.nix          | 2 +-
 pkgs/development/python-modules/notebook-shim/default.nix     | 2 +-
 .../python-modules/notifications-android-tv/default.nix       | 2 +-
 .../python-modules/notifications-python-client/default.nix    | 2 +-
 pkgs/development/python-modules/notify-py/default.nix         | 2 +-
 pkgs/development/python-modules/nototools/default.nix         | 2 +-
 pkgs/development/python-modules/notus-scanner/default.nix     | 2 +-
 pkgs/development/python-modules/nox/default.nix               | 2 +-
 pkgs/development/python-modules/nptyping/default.nix          | 2 +-
 pkgs/development/python-modules/nsapi/default.nix             | 2 +-
 pkgs/development/python-modules/nsz/default.nix               | 2 +-
 pkgs/development/python-modules/nuheat/default.nix            | 2 +-
 pkgs/development/python-modules/numba/default.nix             | 2 +-
 pkgs/development/python-modules/numpy-groupies/default.nix    | 2 +-
 pkgs/development/python-modules/nutils-poly/default.nix       | 2 +-
 pkgs/development/python-modules/nutils/default.nix            | 2 +-
 pkgs/development/python-modules/nutpie/default.nix            | 2 +-
 pkgs/development/python-modules/nvdlib/default.nix            | 2 +-
 pkgs/development/python-modules/nwdiag/default.nix            | 2 +-
 pkgs/development/python-modules/nxt-python/default.nix        | 2 +-
 pkgs/development/python-modules/objax/default.nix             | 2 +-
 pkgs/development/python-modules/objprint/default.nix          | 2 +-
 pkgs/development/python-modules/objsize/default.nix           | 2 +-
 pkgs/development/python-modules/obspy/default.nix             | 2 +-
 pkgs/development/python-modules/ocifs/default.nix             | 2 +-
 pkgs/development/python-modules/oddsprout/default.nix         | 2 +-
 pkgs/development/python-modules/odp-amsterdam/default.nix     | 2 +-
 pkgs/development/python-modules/oelint-parser/default.nix     | 2 +-
 pkgs/development/python-modules/oemthermostat/default.nix     | 2 +-
 pkgs/development/python-modules/ohmepy/default.nix            | 2 +-
 pkgs/development/python-modules/okonomiyaki/default.nix       | 2 +-
 pkgs/development/python-modules/ollama/default.nix            | 2 +-
 pkgs/development/python-modules/omegaconf/default.nix         | 2 +-
 pkgs/development/python-modules/omnikinverter/default.nix     | 2 +-
 pkgs/development/python-modules/omnilogic/default.nix         | 2 +-
 pkgs/development/python-modules/oncalendar/default.nix        | 2 +-
 pkgs/development/python-modules/ondilo/default.nix            | 2 +-
 pkgs/development/python-modules/onecache/default.nix          | 2 +-
 pkgs/development/python-modules/onetimepass/default.nix       | 2 +-
 .../python-modules/online-judge-api-client/default.nix        | 2 +-
 .../development/python-modules/online-judge-tools/default.nix | 2 +-
 pkgs/development/python-modules/onnx/default.nix              | 4 ++--
 .../python-modules/onnxconverter-common/default.nix           | 2 +-
 pkgs/development/python-modules/onvif-zeep-async/default.nix  | 2 +-
 pkgs/development/python-modules/open-clip-torch/default.nix   | 2 +-
 pkgs/development/python-modules/openai-whisper/default.nix    | 2 +-
 pkgs/development/python-modules/openai/default.nix            | 2 +-
 pkgs/development/python-modules/openant/default.nix           | 2 +-
 pkgs/development/python-modules/openapi-core/default.nix      | 2 +-
 .../python-modules/openapi-schema-validator/default.nix       | 2 +-
 .../python-modules/openapi-spec-validator/default.nix         | 2 +-
 pkgs/development/python-modules/openerz-api/default.nix       | 2 +-
 pkgs/development/python-modules/openhomedevice/default.nix    | 2 +-
 pkgs/development/python-modules/opensearch-py/default.nix     | 2 +-
 pkgs/development/python-modules/opensensemap-api/default.nix  | 2 +-
 pkgs/development/python-modules/openshift/default.nix         | 2 +-
 pkgs/development/python-modules/openslide/default.nix         | 2 +-
 pkgs/development/python-modules/openstep-parser/default.nix   | 2 +-
 pkgs/development/python-modules/opentelemetry-api/default.nix | 4 ++--
 .../python-modules/opentelemetry-instrumentation/default.nix  | 4 ++--
 pkgs/development/python-modules/opentsne/default.nix          | 2 +-
 pkgs/development/python-modules/openusd/default.nix           | 2 +-
 pkgs/development/python-modules/openwrt-ubus-rpc/default.nix  | 2 +-
 pkgs/development/python-modules/opower/default.nix            | 2 +-
 pkgs/development/python-modules/optax/default.nix             | 2 +-
 pkgs/development/python-modules/optimum/default.nix           | 4 ++--
 pkgs/development/python-modules/optree/default.nix            | 2 +-
 pkgs/development/python-modules/optuna/default.nix            | 2 +-
 pkgs/development/python-modules/oralb-ble/default.nix         | 2 +-
 pkgs/development/python-modules/oras/default.nix              | 2 +-
 pkgs/development/python-modules/orderly-set/default.nix       | 2 +-
 pkgs/development/python-modules/orjson/default.nix            | 2 +-
 pkgs/development/python-modules/ormar/default.nix             | 2 +-
 pkgs/development/python-modules/oryx/default.nix              | 2 +-
 pkgs/development/python-modules/osc-placement/default.nix     | 2 +-
 pkgs/development/python-modules/osc-sdk-python/default.nix    | 2 +-
 pkgs/development/python-modules/oslo-log/default.nix          | 2 +-
 pkgs/development/python-modules/osmnx/default.nix             | 2 +-
 pkgs/development/python-modules/ospd/default.nix              | 2 +-
 pkgs/development/python-modules/oss2/default.nix              | 2 +-
 pkgs/development/python-modules/ossfs/default.nix             | 2 +-
 pkgs/development/python-modules/osxphotos/default.nix         | 2 +-
 pkgs/development/python-modules/outdated/default.nix          | 2 +-
 pkgs/development/python-modules/outlines/default.nix          | 2 +-
 pkgs/development/python-modules/outspin/default.nix           | 2 +-
 pkgs/development/python-modules/overrides/default.nix         | 2 +-
 pkgs/development/python-modules/ovoenergy/default.nix         | 2 +-
 pkgs/development/python-modules/owslib/default.nix            | 2 +-
 pkgs/development/python-modules/p1monitor/default.nix         | 2 +-
 pkgs/development/python-modules/packaging-legacy/default.nix  | 2 +-
 pkgs/development/python-modules/packvers/default.nix          | 2 +-
 pkgs/development/python-modules/pandantic/default.nix         | 2 +-
 pkgs/development/python-modules/pandas-stubs/default.nix      | 2 +-
 pkgs/development/python-modules/pandas/default.nix            | 2 +-
 .../python-modules/pandoc-latex-environment/default.nix       | 2 +-
 pkgs/development/python-modules/paperbush/default.nix         | 2 +-
 pkgs/development/python-modules/papermill/default.nix         | 2 +-
 pkgs/development/python-modules/papis/default.nix             | 2 +-
 pkgs/development/python-modules/paragraphs/default.nix        | 2 +-
 pkgs/development/python-modules/param/default.nix             | 2 +-
 pkgs/development/python-modules/paramz/default.nix            | 2 +-
 pkgs/development/python-modules/parquet/default.nix           | 2 +-
 pkgs/development/python-modules/parse-type/default.nix        | 2 +-
 pkgs/development/python-modules/parse/default.nix             | 2 +-
 pkgs/development/python-modules/parsy/default.nix             | 2 +-
 pkgs/development/python-modules/partd/default.nix             | 2 +-
 pkgs/development/python-modules/paste/default.nix             | 2 +-
 pkgs/development/python-modules/pastedeploy/default.nix       | 2 +-
 pkgs/development/python-modules/pathable/default.nix          | 2 +-
 pkgs/development/python-modules/pathos/default.nix            | 2 +-
 pkgs/development/python-modules/patiencediff/default.nix      | 2 +-
 pkgs/development/python-modules/patool/default.nix            | 2 +-
 pkgs/development/python-modules/patsy/default.nix             | 4 ++--
 .../python-modules/paypal-checkout-serversdk/default.nix      | 2 +-
 pkgs/development/python-modules/paypalhttp/default.nix        | 2 +-
 pkgs/development/python-modules/pbar/default.nix              | 2 +-
 pkgs/development/python-modules/pbs-installer/default.nix     | 2 +-
 pkgs/development/python-modules/pbxproj/default.nix           | 2 +-
 pkgs/development/python-modules/pcpp/default.nix              | 2 +-
 pkgs/development/python-modules/pdf2docx/default.nix          | 2 +-
 pkgs/development/python-modules/pdfminer-six/default.nix      | 2 +-
 pkgs/development/python-modules/pdfplumber/default.nix        | 2 +-
 pkgs/development/python-modules/pdm-backend/default.nix       | 2 +-
 pkgs/development/python-modules/pdoc3/default.nix             | 2 +-
 pkgs/development/python-modules/pdunehd/default.nix           | 2 +-
 pkgs/development/python-modules/peewee-migrate/default.nix    | 2 +-
 pkgs/development/python-modules/peewee/default.nix            | 2 +-
 pkgs/development/python-modules/pegen/default.nix             | 2 +-
 pkgs/development/python-modules/pelican/default.nix           | 2 +-
 pkgs/development/python-modules/pem/default.nix               | 2 +-
 pkgs/development/python-modules/pendulum/default.nix          | 2 +-
 pkgs/development/python-modules/pep8-naming/default.nix       | 2 +-
 pkgs/development/python-modules/perfplot/default.nix          | 2 +-
 pkgs/development/python-modules/pesq/default.nix              | 2 +-
 pkgs/development/python-modules/pettingzoo/default.nix        | 2 +-
 pkgs/development/python-modules/pfzy/default.nix              | 2 +-
 pkgs/development/python-modules/pgmpy/default.nix             | 2 +-
 pkgs/development/python-modules/pgvector/default.nix          | 2 +-
 pkgs/development/python-modules/phe/default.nix               | 2 +-
 pkgs/development/python-modules/phik/default.nix              | 2 +-
 pkgs/development/python-modules/philipstv/default.nix         | 2 +-
 pkgs/development/python-modules/photutils/default.nix         | 2 +-
 pkgs/development/python-modules/phunspell/default.nix         | 2 +-
 .../development/python-modules/phx-class-registry/default.nix | 2 +-
 pkgs/development/python-modules/pi1wire/default.nix           | 2 +-
 pkgs/development/python-modules/piccata/default.nix           | 2 +-
 pkgs/development/python-modules/pick/default.nix              | 2 +-
 pkgs/development/python-modules/picobox/default.nix           | 2 +-
 pkgs/development/python-modules/picologging/default.nix       | 2 +-
 pkgs/development/python-modules/picosvg/default.nix           | 2 +-
 pkgs/development/python-modules/pika/default.nix              | 2 +-
 pkgs/development/python-modules/pikepdf/default.nix           | 2 +-
 pkgs/development/python-modules/pilkit/default.nix            | 2 +-
 pkgs/development/python-modules/pillow-heif/default.nix       | 2 +-
 pkgs/development/python-modules/pillow-jpls/default.nix       | 2 +-
 pkgs/development/python-modules/pillow/default.nix            | 2 +-
 pkgs/development/python-modules/pims/default.nix              | 2 +-
 pkgs/development/python-modules/pins/default.nix              | 2 +-
 pkgs/development/python-modules/pint-pandas/default.nix       | 2 +-
 pkgs/development/python-modules/pint/default.nix              | 2 +-
 pkgs/development/python-modules/pip-api/default.nix           | 2 +-
 pkgs/development/python-modules/pip-chill/default.nix         | 2 +-
 .../python-modules/pip-requirements-parser/default.nix        | 2 +-
 pkgs/development/python-modules/pip/default.nix               | 2 +-
 pkgs/development/python-modules/pipdeptree/default.nix        | 2 +-
 pkgs/development/python-modules/pipe/default.nix              | 2 +-
 .../python-modules/pipenv-poetry-migrate/default.nix          | 2 +-
 pkgs/development/python-modules/pipx/default.nix              | 2 +-
 pkgs/development/python-modules/piqp/default.nix              | 2 +-
 pkgs/development/python-modules/pivy/default.nix              | 2 +-
 pkgs/development/python-modules/plac/default.nix              | 2 +-
 pkgs/development/python-modules/plantuml-markdown/default.nix | 2 +-
 pkgs/development/python-modules/platformdirs/default.nix      | 2 +-
 pkgs/development/python-modules/playwright/default.nix        | 2 +-
 pkgs/development/python-modules/playwrightcapture/default.nix | 2 +-
 pkgs/development/python-modules/plexapi/default.nix           | 2 +-
 pkgs/development/python-modules/plexwebsocket/default.nix     | 2 +-
 pkgs/development/python-modules/ploomber-core/default.nix     | 2 +-
 pkgs/development/python-modules/plotext/default.nix           | 2 +-
 pkgs/development/python-modules/plotly/default.nix            | 2 +-
 pkgs/development/python-modules/plotpy/default.nix            | 2 +-
 pkgs/development/python-modules/pluggy/default.nix            | 2 +-
 pkgs/development/python-modules/plugwise/default.nix          | 2 +-
 pkgs/development/python-modules/plumbum/default.nix           | 2 +-
 pkgs/development/python-modules/plux/default.nix              | 2 +-
 pkgs/development/python-modules/plyer/default.nix             | 2 +-
 pkgs/development/python-modules/plyfile/default.nix           | 2 +-
 pkgs/development/python-modules/podcastparser/default.nix     | 2 +-
 pkgs/development/python-modules/podman/default.nix            | 2 +-
 pkgs/development/python-modules/poetry-core/default.nix       | 2 +-
 .../python-modules/poetry-dynamic-versioning/default.nix      | 2 +-
 pkgs/development/python-modules/policy-sentry/default.nix     | 2 +-
 pkgs/development/python-modules/polyline/default.nix          | 2 +-
 pkgs/development/python-modules/polyswarm-api/default.nix     | 2 +-
 pkgs/development/python-modules/pomegranate/default.nix       | 2 +-
 pkgs/development/python-modules/pony/default.nix              | 2 +-
 pkgs/development/python-modules/pook/default.nix              | 2 +-
 pkgs/development/python-modules/port-for/default.nix          | 2 +-
 pkgs/development/python-modules/portion/default.nix           | 2 +-
 pkgs/development/python-modules/posthog/default.nix           | 2 +-
 pkgs/development/python-modules/pot/default.nix               | 2 +-
 pkgs/development/python-modules/powerapi/default.nix          | 2 +-
 pkgs/development/python-modules/powerline/default.nix         | 2 +-
 pkgs/development/python-modules/ppk2-api/default.nix          | 2 +-
 pkgs/development/python-modules/ppscore/default.nix           | 2 +-
 pkgs/development/python-modules/prance/default.nix            | 2 +-
 pkgs/development/python-modules/praw/default.nix              | 2 +-
 pkgs/development/python-modules/prawcore/default.nix          | 2 +-
 .../prayer-times-calculator-offline/default.nix               | 2 +-
 pkgs/development/python-modules/pre-commit-hooks/default.nix  | 2 +-
 pkgs/development/python-modules/precis-i18n/default.nix       | 2 +-
 .../python-modules/preprocess-cancellation/default.nix        | 2 +-
 pkgs/development/python-modules/primer3/default.nix           | 2 +-
 pkgs/development/python-modules/primp/default.nix             | 2 +-
 pkgs/development/python-modules/print-color/default.nix       | 2 +-
 pkgs/development/python-modules/prisma/default.nix            | 2 +-
 pkgs/development/python-modules/private-gpt/default.nix       | 2 +-
 pkgs/development/python-modules/procmon-parser/default.nix    | 2 +-
 .../python-modules/prometheus-api-client/default.nix          | 2 +-
 pkgs/development/python-modules/prometheus-client/default.nix | 2 +-
 .../prometheus-fastapi-instrumentator/default.nix             | 2 +-
 pkgs/development/python-modules/promise/default.nix           | 2 +-
 pkgs/development/python-modules/propcache/default.nix         | 2 +-
 pkgs/development/python-modules/propka/default.nix            | 2 +-
 pkgs/development/python-modules/proton-core/default.nix       | 2 +-
 .../python-modules/proton-keyring-linux/default.nix           | 2 +-
 .../python-modules/proton-vpn-network-manager/default.nix     | 2 +-
 pkgs/development/python-modules/protonvpn-nm-lib/default.nix  | 2 +-
 pkgs/development/python-modules/proxy-db/default.nix          | 2 +-
 pkgs/development/python-modules/proxy-py/default.nix          | 2 +-
 pkgs/development/python-modules/pscript/default.nix           | 2 +-
 pkgs/development/python-modules/psrpcore/default.nix          | 2 +-
 .../python-modules/psutil-home-assistant/default.nix          | 2 +-
 pkgs/development/python-modules/psychrolib/default.nix        | 2 +-
 pkgs/development/python-modules/psycopg/default.nix           | 2 +-
 pkgs/development/python-modules/psycopg2cffi/default.nix      | 2 +-
 pkgs/development/python-modules/psygnal/default.nix           | 2 +-
 pkgs/development/python-modules/pubnub/default.nix            | 2 +-
 pkgs/development/python-modules/pulp/default.nix              | 2 +-
 pkgs/development/python-modules/pulsar/default.nix            | 2 +-
 pkgs/development/python-modules/pulsectl-asyncio/default.nix  | 2 +-
 pkgs/development/python-modules/pulumi-aws/default.nix        | 2 +-
 pkgs/development/python-modules/pulumi-hcloud/default.nix     | 2 +-
 pkgs/development/python-modules/pure-cdb/default.nix          | 2 +-
 pkgs/development/python-modules/pure-protobuf/default.nix     | 2 +-
 pkgs/development/python-modules/puremagic/default.nix         | 2 +-
 pkgs/development/python-modules/pvextractor/default.nix       | 2 +-
 pkgs/development/python-modules/pvo/default.nix               | 2 +-
 pkgs/development/python-modules/pwkit/default.nix             | 2 +-
 pkgs/development/python-modules/pwlf/default.nix              | 2 +-
 pkgs/development/python-modules/py-aosmith/default.nix        | 2 +-
 pkgs/development/python-modules/py-bip39-bindings/default.nix | 2 +-
 pkgs/development/python-modules/py-canary/default.nix         | 2 +-
 pkgs/development/python-modules/py-desmume/default.nix        | 2 +-
 pkgs/development/python-modules/py-dormakaba-dkey/default.nix | 2 +-
 .../python-modules/py-improv-ble-client/default.nix           | 2 +-
 pkgs/development/python-modules/py-madvr2/default.nix         | 4 ++--
 pkgs/development/python-modules/py-multicodec/default.nix     | 2 +-
 pkgs/development/python-modules/py-multihash/default.nix      | 2 +-
 pkgs/development/python-modules/py-nextbusnext/default.nix    | 2 +-
 pkgs/development/python-modules/py-ocsf-models/default.nix    | 2 +-
 pkgs/development/python-modules/py-opensonic/default.nix      | 2 +-
 pkgs/development/python-modules/py-partiql-parser/default.nix | 2 +-
 pkgs/development/python-modules/py-radix-sr/default.nix       | 2 +-
 pkgs/development/python-modules/py-serializable/default.nix   | 2 +-
 pkgs/development/python-modules/py-sucks/default.nix          | 2 +-
 .../development/python-modules/py-synologydsm-api/default.nix | 2 +-
 pkgs/development/python-modules/py-tes/default.nix            | 2 +-
 pkgs/development/python-modules/py-zabbix/default.nix         | 2 +-
 pkgs/development/python-modules/py65/default.nix              | 2 +-
 pkgs/development/python-modules/pyads/default.nix             | 2 +-
 pkgs/development/python-modules/pyaftership/default.nix       | 2 +-
 pkgs/development/python-modules/pyahocorasick/default.nix     | 2 +-
 pkgs/development/python-modules/pyairnow/default.nix          | 2 +-
 pkgs/development/python-modules/pyairvisual/default.nix       | 2 +-
 pkgs/development/python-modules/pyais/default.nix             | 2 +-
 pkgs/development/python-modules/pyaml-env/default.nix         | 2 +-
 pkgs/development/python-modules/pyannote-audio/default.nix    | 2 +-
 pkgs/development/python-modules/pyannote-core/default.nix     | 2 +-
 pkgs/development/python-modules/pyannote-database/default.nix | 2 +-
 pkgs/development/python-modules/pyannote-metrics/default.nix  | 2 +-
 pkgs/development/python-modules/pyannote-pipeline/default.nix | 2 +-
 pkgs/development/python-modules/pyarr/default.nix             | 2 +-
 pkgs/development/python-modules/pyarrow-hotfix/default.nix    | 2 +-
 pkgs/development/python-modules/pyasn1-modules/default.nix    | 2 +-
 pkgs/development/python-modules/pyasuswrt/default.nix         | 2 +-
 pkgs/development/python-modules/pyasyncore/default.nix        | 2 +-
 pkgs/development/python-modules/pyatag/default.nix            | 2 +-
 pkgs/development/python-modules/pyatmo/default.nix            | 2 +-
 pkgs/development/python-modules/pyatv/default.nix             | 2 +-
 pkgs/development/python-modules/pyaussiebb/default.nix        | 2 +-
 pkgs/development/python-modules/pybalboa/default.nix          | 2 +-
 pkgs/development/python-modules/pybase64/default.nix          | 4 ++--
 pkgs/development/python-modules/pybigwig/default.nix          | 2 +-
 pkgs/development/python-modules/pybind11-stubgen/default.nix  | 2 +-
 pkgs/development/python-modules/pybind11/default.nix          | 2 +-
 pkgs/development/python-modules/pyblackbird/default.nix       | 2 +-
 pkgs/development/python-modules/pyblu/default.nix             | 2 +-
 pkgs/development/python-modules/pybox2d/default.nix           | 2 +-
 pkgs/development/python-modules/pybravia/default.nix          | 2 +-
 pkgs/development/python-modules/pybrowsers/default.nix        | 2 +-
 pkgs/development/python-modules/pycairo/default.nix           | 2 +-
 pkgs/development/python-modules/pycaption/default.nix         | 2 +-
 pkgs/development/python-modules/pycec/default.nix             | 2 +-
 pkgs/development/python-modules/pycfdns/default.nix           | 2 +-
 pkgs/development/python-modules/pycfmodel/default.nix         | 2 +-
 pkgs/development/python-modules/pyclip/default.nix            | 2 +-
 pkgs/development/python-modules/pyclipper/default.nix         | 2 +-
 pkgs/development/python-modules/pycm/default.nix              | 2 +-
 pkgs/development/python-modules/pycognito/default.nix         | 2 +-
 pkgs/development/python-modules/pycomfoconnect/default.nix    | 2 +-
 pkgs/development/python-modules/pycomm3/default.nix           | 2 +-
 pkgs/development/python-modules/pycontrol4/default.nix        | 2 +-
 pkgs/development/python-modules/pycookiecheat/default.nix     | 2 +-
 .../python-modules/pycoolmasternet-async/default.nix          | 2 +-
 pkgs/development/python-modules/pycountry/default.nix         | 2 +-
 pkgs/development/python-modules/pycrdt-websocket/default.nix  | 2 +-
 pkgs/development/python-modules/pycron/default.nix            | 2 +-
 pkgs/development/python-modules/pycryptodome/default.nix      | 2 +-
 pkgs/development/python-modules/pycyphal/default.nix          | 2 +-
 pkgs/development/python-modules/pydaikin/default.nix          | 2 +-
 pkgs/development/python-modules/pydanfossair/default.nix      | 2 +-
 pkgs/development/python-modules/pydantic-compat/default.nix   | 2 +-
 pkgs/development/python-modules/pydantic-core/default.nix     | 2 +-
 .../python-modules/pydantic-extra-types/default.nix           | 2 +-
 pkgs/development/python-modules/pydantic-scim/default.nix     | 2 +-
 pkgs/development/python-modules/pydantic-settings/default.nix | 2 +-
 pkgs/development/python-modules/pydantic-yaml/default.nix     | 2 +-
 pkgs/development/python-modules/pydantic/default.nix          | 2 +-
 pkgs/development/python-modules/pydash/default.nix            | 2 +-
 .../development/python-modules/pydata-google-auth/default.nix | 2 +-
 pkgs/development/python-modules/pydbus/default.nix            | 2 +-
 pkgs/development/python-modules/pydeako/default.nix           | 2 +-
 pkgs/development/python-modules/pydeconz/default.nix          | 2 +-
 pkgs/development/python-modules/pydeps/default.nix            | 2 +-
 pkgs/development/python-modules/pydexcom/default.nix          | 2 +-
 pkgs/development/python-modules/pydicom-seg/default.nix       | 2 +-
 pkgs/development/python-modules/pydiscourse/default.nix       | 2 +-
 pkgs/development/python-modules/pydiscovergy/default.nix      | 2 +-
 pkgs/development/python-modules/pydmd/default.nix             | 2 +-
 pkgs/development/python-modules/pydocstyle/default.nix        | 2 +-
 pkgs/development/python-modules/pydrawise/default.nix         | 2 +-
 pkgs/development/python-modules/pydroid-ipcam/default.nix     | 2 +-
 pkgs/development/python-modules/pydruid/default.nix           | 2 +-
 pkgs/development/python-modules/pydsdl/default.nix            | 2 +-
 pkgs/development/python-modules/pydub/default.nix             | 2 +-
 pkgs/development/python-modules/pyduke-energy/default.nix     | 2 +-
 pkgs/development/python-modules/pyduotecno/default.nix        | 2 +-
 pkgs/development/python-modules/pyeapi/default.nix            | 2 +-
 pkgs/development/python-modules/pyeclib/default.nix           | 2 +-
 pkgs/development/python-modules/pyecoforest/default.nix       | 2 +-
 pkgs/development/python-modules/pyeconet/default.nix          | 2 +-
 pkgs/development/python-modules/pyecotrend-ista/default.nix   | 2 +-
 pkgs/development/python-modules/pyecowitt/default.nix         | 2 +-
 pkgs/development/python-modules/pyefergy/default.nix          | 2 +-
 pkgs/development/python-modules/pyegps/default.nix            | 2 +-
 pkgs/development/python-modules/pyelectra/default.nix         | 2 +-
 pkgs/development/python-modules/pyelftools/default.nix        | 2 +-
 pkgs/development/python-modules/pyemby/default.nix            | 2 +-
 pkgs/development/python-modules/pyemoncms/default.nix         | 2 +-
 pkgs/development/python-modules/pyenphase/default.nix         | 2 +-
 pkgs/development/python-modules/pyexiftool/default.nix        | 2 +-
 pkgs/development/python-modules/pyezviz/default.nix           | 2 +-
 pkgs/development/python-modules/pyfaidx/default.nix           | 2 +-
 pkgs/development/python-modules/pyfcm/default.nix             | 2 +-
 pkgs/development/python-modules/pyfibaro/default.nix          | 2 +-
 pkgs/development/python-modules/pyflume/default.nix           | 2 +-
 pkgs/development/python-modules/pyfritzhome/default.nix       | 2 +-
 pkgs/development/python-modules/pyfronius/default.nix         | 2 +-
 pkgs/development/python-modules/pyftdi/default.nix            | 2 +-
 pkgs/development/python-modules/pyftgl/default.nix            | 2 +-
 pkgs/development/python-modules/pyfunctional/default.nix      | 2 +-
 pkgs/development/python-modules/pyfuse3/default.nix           | 2 +-
 pkgs/development/python-modules/pyfwup/default.nix            | 2 +-
 pkgs/development/python-modules/pygame-ce/default.nix         | 2 +-
 pkgs/development/python-modules/pygame-gui/default.nix        | 2 +-
 pkgs/development/python-modules/pygatt/default.nix            | 2 +-
 pkgs/development/python-modules/pygdbmi/default.nix           | 2 +-
 pkgs/development/python-modules/pygitguardian/default.nix     | 2 +-
 pkgs/development/python-modules/pygithub/default.nix          | 2 +-
 pkgs/development/python-modules/pyglm/default.nix             | 4 ++--
 pkgs/development/python-modules/pygls/default.nix             | 2 +-
 pkgs/development/python-modules/pygltflib/default.nix         | 2 +-
 pkgs/development/python-modules/pygmars/default.nix           | 2 +-
 pkgs/development/python-modules/pygmo/default.nix             | 2 +-
 pkgs/development/python-modules/pygmt/default.nix             | 2 +-
 pkgs/development/python-modules/pygnmi/default.nix            | 2 +-
 pkgs/development/python-modules/pygobject-stubs/default.nix   | 2 +-
 pkgs/development/python-modules/pygount/default.nix           | 2 +-
 pkgs/development/python-modules/pygraphviz/default.nix        | 2 +-
 pkgs/development/python-modules/pygti/default.nix             | 2 +-
 pkgs/development/python-modules/pyhamcrest/default.nix        | 2 +-
 .../python-modules/pyhanko-certvalidator/default.nix          | 2 +-
 pkgs/development/python-modules/pyhaversion/default.nix       | 2 +-
 pkgs/development/python-modules/pyheck/default.nix            | 2 +-
 pkgs/development/python-modules/pyheif/default.nix            | 2 +-
 pkgs/development/python-modules/pyheos/default.nix            | 2 +-
 pkgs/development/python-modules/pyhepmc/default.nix           | 2 +-
 pkgs/development/python-modules/pyhiveapi/default.nix         | 2 +-
 pkgs/development/python-modules/pyhocon/default.nix           | 2 +-
 pkgs/development/python-modules/pyindego/default.nix          | 2 +-
 pkgs/development/python-modules/pyinfra/default.nix           | 2 +-
 pkgs/development/python-modules/pyinsteon/default.nix         | 2 +-
 pkgs/development/python-modules/pyinstrument/default.nix      | 2 +-
 pkgs/development/python-modules/pyintesishome/default.nix     | 2 +-
 pkgs/development/python-modules/pyipma/default.nix            | 2 +-
 pkgs/development/python-modules/pyipp/default.nix             | 2 +-
 pkgs/development/python-modules/pyiqvia/default.nix           | 2 +-
 pkgs/development/python-modules/pyisemail/default.nix         | 2 +-
 pkgs/development/python-modules/pyiskra/default.nix           | 2 +-
 pkgs/development/python-modules/pyisy/default.nix             | 2 +-
 pkgs/development/python-modules/pyituran/default.nix          | 2 +-
 pkgs/development/python-modules/pyixapi/default.nix           | 2 +-
 pkgs/development/python-modules/pyjson5/default.nix           | 2 +-
 pkgs/development/python-modules/pyjwt/default.nix             | 2 +-
 pkgs/development/python-modules/pykaleidescape/default.nix    | 2 +-
 pkgs/development/python-modules/pykeepass/default.nix         | 2 +-
 pkgs/development/python-modules/pykeyatome/default.nix        | 2 +-
 pkgs/development/python-modules/pykka/default.nix             | 2 +-
 pkgs/development/python-modules/pykoplenti/default.nix        | 2 +-
 pkgs/development/python-modules/pylacrosse/default.nix        | 2 +-
 pkgs/development/python-modules/pylacus/default.nix           | 2 +-
 pkgs/development/python-modules/pylamarzocco/default.nix      | 2 +-
 pkgs/development/python-modules/pylance/default.nix           | 2 +-
 pkgs/development/python-modules/pylast/default.nix            | 2 +-
 pkgs/development/python-modules/pylaunches/default.nix        | 2 +-
 pkgs/development/python-modules/pyleri/default.nix            | 2 +-
 pkgs/development/python-modules/pylgnetcast/default.nix       | 2 +-
 pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix | 2 +-
 .../development/python-modules/pylibjpeg-openjpeg/default.nix | 2 +-
 pkgs/development/python-modules/pylibjpeg/default.nix         | 2 +-
 pkgs/development/python-modules/pylink-square/default.nix     | 2 +-
 pkgs/development/python-modules/pylint-django/default.nix     | 2 +-
 .../python-modules/pylint-plugin-utils/default.nix            | 2 +-
 pkgs/development/python-modules/pylint-venv/default.nix       | 2 +-
 pkgs/development/python-modules/pylint/default.nix            | 2 +-
 pkgs/development/python-modules/pylitejet/default.nix         | 2 +-
 pkgs/development/python-modules/pylitterbot/default.nix       | 2 +-
 pkgs/development/python-modules/pyloadapi/default.nix         | 2 +-
 pkgs/development/python-modules/pyls-isort/default.nix        | 2 +-
 pkgs/development/python-modules/pyls-memestra/default.nix     | 2 +-
 pkgs/development/python-modules/pylsp-mypy/default.nix        | 2 +-
 pkgs/development/python-modules/pylsp-rope/default.nix        | 2 +-
 pkgs/development/python-modules/pylutron-caseta/default.nix   | 2 +-
 pkgs/development/python-modules/pylxd/default.nix             | 2 +-
 pkgs/development/python-modules/pymatgen/default.nix          | 2 +-
 pkgs/development/python-modules/pymatting/default.nix         | 2 +-
 pkgs/development/python-modules/pymedio/default.nix           | 2 +-
 pkgs/development/python-modules/pymee/default.nix             | 2 +-
 pkgs/development/python-modules/pymeteireann/default.nix      | 2 +-
 pkgs/development/python-modules/pymeteoclimatic/default.nix   | 2 +-
 pkgs/development/python-modules/pymetno/default.nix           | 2 +-
 pkgs/development/python-modules/pymfy/default.nix             | 2 +-
 pkgs/development/python-modules/pymicro-vad/default.nix       | 2 +-
 pkgs/development/python-modules/pymilter/default.nix          | 2 +-
 pkgs/development/python-modules/pymilvus/default.nix          | 2 +-
 pkgs/development/python-modules/pymodbus/default.nix          | 2 +-
 pkgs/development/python-modules/pymodes/default.nix           | 2 +-
 pkgs/development/python-modules/pymongo-inmemory/default.nix  | 2 +-
 pkgs/development/python-modules/pymoo/default.nix             | 2 +-
 pkgs/development/python-modules/pymorphy3/default.nix         | 2 +-
 pkgs/development/python-modules/pymsteams/default.nix         | 2 +-
 pkgs/development/python-modules/pymupdf/default.nix           | 2 +-
 pkgs/development/python-modules/pynamodb/default.nix          | 2 +-
 pkgs/development/python-modules/pynecil/default.nix           | 2 +-
 pkgs/development/python-modules/pynetbox/default.nix          | 2 +-
 pkgs/development/python-modules/pynetgear/default.nix         | 2 +-
 pkgs/development/python-modules/pyngo/default.nix             | 2 +-
 pkgs/development/python-modules/pynmeagps/default.nix         | 2 +-
 pkgs/development/python-modules/pynobo/default.nix            | 2 +-
 pkgs/development/python-modules/pynordpool/default.nix        | 2 +-
 pkgs/development/python-modules/pynput/default.nix            | 2 +-
 pkgs/development/python-modules/pynrrd/default.nix            | 2 +-
 pkgs/development/python-modules/pynslookup/default.nix        | 2 +-
 pkgs/development/python-modules/pynuki/default.nix            | 2 +-
 pkgs/development/python-modules/pynvim/default.nix            | 2 +-
 pkgs/development/python-modules/pynvml/default.nix            | 2 +-
 pkgs/development/python-modules/pynws/default.nix             | 2 +-
 pkgs/development/python-modules/pynx584/default.nix           | 2 +-
 pkgs/development/python-modules/pyobihai/default.nix          | 2 +-
 pkgs/development/python-modules/pyocd-pemicro/default.nix     | 2 +-
 pkgs/development/python-modules/pyoctoprintapi/default.nix    | 2 +-
 pkgs/development/python-modules/pyogrio/default.nix           | 2 +-
 pkgs/development/python-modules/pyopencl/default.nix          | 2 +-
 pkgs/development/python-modules/pyopenssl/default.nix         | 2 +-
 pkgs/development/python-modules/pyopenuv/default.nix          | 2 +-
 pkgs/development/python-modules/pyopenweathermap/default.nix  | 2 +-
 pkgs/development/python-modules/pyorthanc/default.nix         | 2 +-
 pkgs/development/python-modules/pyosf/default.nix             | 2 +-
 pkgs/development/python-modules/pyosmium/default.nix          | 2 +-
 pkgs/development/python-modules/pyosohotwaterapi/default.nix  | 2 +-
 pkgs/development/python-modules/pyotgw/default.nix            | 2 +-
 pkgs/development/python-modules/pyoutbreaksnearme/default.nix | 2 +-
 pkgs/development/python-modules/pyowm/default.nix             | 2 +-
 pkgs/development/python-modules/pypalazzetti/default.nix      | 2 +-
 pkgs/development/python-modules/pypandoc/default.nix          | 2 +-
 pkgs/development/python-modules/pyparsing/default.nix         | 2 +-
 pkgs/development/python-modules/pyparted/default.nix          | 2 +-
 pkgs/development/python-modules/pypdf/default.nix             | 2 +-
 pkgs/development/python-modules/pypinyin/default.nix          | 2 +-
 pkgs/development/python-modules/pypitoken/default.nix         | 2 +-
 pkgs/development/python-modules/pypoint/default.nix           | 2 +-
 pkgs/development/python-modules/pyppeteer/default.nix         | 2 +-
 pkgs/development/python-modules/pyprecice/default.nix         | 2 +-
 pkgs/development/python-modules/pyprobables/default.nix       | 2 +-
 pkgs/development/python-modules/pyprof2calltree/default.nix   | 2 +-
 pkgs/development/python-modules/pyproj/default.nix            | 2 +-
 pkgs/development/python-modules/pyproject-api/default.nix     | 2 +-
 pkgs/development/python-modules/pyprosegur/default.nix        | 2 +-
 pkgs/development/python-modules/pyprusalink/default.nix       | 2 +-
 pkgs/development/python-modules/pypsrp/default.nix            | 2 +-
 pkgs/development/python-modules/pypugjs/default.nix           | 2 +-
 pkgs/development/python-modules/pyqldb/default.nix            | 2 +-
 pkgs/development/python-modules/pyqtgraph/default.nix         | 2 +-
 pkgs/development/python-modules/pyradiomics/default.nix       | 2 +-
 pkgs/development/python-modules/pyrainbird/default.nix        | 2 +-
 pkgs/development/python-modules/pyramid-multiauth/default.nix | 2 +-
 .../development/python-modules/pyreaderwriterlock/default.nix | 2 +-
 pkgs/development/python-modules/pyreadstat/default.nix        | 2 +-
 pkgs/development/python-modules/pyrender/default.nix          | 2 +-
 pkgs/development/python-modules/pyrfxtrx/default.nix          | 2 +-
 pkgs/development/python-modules/pyrisco/default.nix           | 2 +-
 pkgs/development/python-modules/pyro-ppl/default.nix          | 2 +-
 pkgs/development/python-modules/pyroute2/default.nix          | 2 +-
 pkgs/development/python-modules/pyrympro/default.nix          | 2 +-
 pkgs/development/python-modules/pysam/default.nix             | 2 +-
 pkgs/development/python-modules/pysaml2/default.nix           | 2 +-
 pkgs/development/python-modules/pyscard/default.nix           | 2 +-
 pkgs/development/python-modules/pyscf/default.nix             | 2 +-
 pkgs/development/python-modules/pyschlage/default.nix         | 2 +-
 pkgs/development/python-modules/pyscss/default.nix            | 2 +-
 pkgs/development/python-modules/pyseventeentrack/default.nix  | 2 +-
 pkgs/development/python-modules/pyshark/default.nix           | 2 +-
 .../python-modules/pysigma-backend-elasticsearch/default.nix  | 2 +-
 .../python-modules/pysigma-backend-insightidr/default.nix     | 2 +-
 .../python-modules/pysigma-backend-opensearch/default.nix     | 2 +-
 .../python-modules/pysigma-backend-qradar/default.nix         | 2 +-
 .../python-modules/pysigma-backend-sqlite/default.nix         | 2 +-
 .../python-modules/pysigma-pipeline-crowdstrike/default.nix   | 2 +-
 .../python-modules/pysigma-pipeline-sysmon/default.nix        | 2 +-
 .../python-modules/pysigma-pipeline-windows/default.nix       | 2 +-
 pkgs/development/python-modules/pysigma/default.nix           | 2 +-
 .../development/python-modules/pysignalclirestapi/default.nix | 2 +-
 pkgs/development/python-modules/pysilero-vad/default.nix      | 2 +-
 pkgs/development/python-modules/pyskyqremote/default.nix      | 2 +-
 pkgs/development/python-modules/pyslurm/default.nix           | 2 +-
 pkgs/development/python-modules/pysmartdl/default.nix         | 2 +-
 pkgs/development/python-modules/pysmb/default.nix             | 2 +-
 pkgs/development/python-modules/pysmi/default.nix             | 2 +-
 pkgs/development/python-modules/pysml/default.nix             | 2 +-
 pkgs/development/python-modules/pysmlight/default.nix         | 2 +-
 pkgs/development/python-modules/pysnmp-pyasn1/default.nix     | 2 +-
 pkgs/development/python-modules/pysnmp-pysmi/default.nix      | 2 +-
 pkgs/development/python-modules/pysnmp/default.nix            | 2 +-
 pkgs/development/python-modules/pysnmplib/default.nix         | 2 +-
 pkgs/development/python-modules/pysnooz/default.nix           | 2 +-
 pkgs/development/python-modules/pysolcast/default.nix         | 2 +-
 pkgs/development/python-modules/pyspcwebgw/default.nix        | 2 +-
 pkgs/development/python-modules/pyspeex-noise/default.nix     | 2 +-
 pkgs/development/python-modules/pyspnego/default.nix          | 2 +-
 pkgs/development/python-modules/pyspx/default.nix             | 2 +-
 pkgs/development/python-modules/pysqueezebox/default.nix      | 2 +-
 pkgs/development/python-modules/pystac-client/default.nix     | 2 +-
 pkgs/development/python-modules/pystac/default.nix            | 2 +-
 pkgs/development/python-modules/pystemmer/default.nix         | 2 +-
 pkgs/development/python-modules/pysuezv2/default.nix          | 2 +-
 pkgs/development/python-modules/pyswitchbee/default.nix       | 2 +-
 pkgs/development/python-modules/pyswitchbot/default.nix       | 2 +-
 pkgs/development/python-modules/pysyncobj/default.nix         | 2 +-
 pkgs/development/python-modules/pysyncthru/default.nix        | 2 +-
 pkgs/development/python-modules/pytablewriter/default.nix     | 2 +-
 pkgs/development/python-modules/pytaglib/default.nix          | 2 +-
 pkgs/development/python-modules/pytautulli/default.nix        | 2 +-
 pkgs/development/python-modules/pytedee-async/default.nix     | 2 +-
 pkgs/development/python-modules/pytenable/default.nix         | 2 +-
 pkgs/development/python-modules/pytesseract/default.nix       | 2 +-
 pkgs/development/python-modules/pytest-aio/default.nix        | 2 +-
 pkgs/development/python-modules/pytest-aiohttp/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-asyncio/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-base-url/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-bdd/default.nix        | 2 +-
 pkgs/development/python-modules/pytest-benchmark/default.nix  | 2 +-
 pkgs/development/python-modules/pytest-celery/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-cid/default.nix        | 2 +-
 pkgs/development/python-modules/pytest-codspeed/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-datadir/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-datafiles/default.nix  | 2 +-
 .../python-modules/pytest-docker-tools/default.nix            | 2 +-
 pkgs/development/python-modules/pytest-emoji/default.nix      | 2 +-
 pkgs/development/python-modules/pytest-flake8/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-forked/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-freezer/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-golden/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-harvest/default.nix    | 4 ++--
 pkgs/development/python-modules/pytest-httpbin/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-httpserver/default.nix | 2 +-
 pkgs/development/python-modules/pytest-httpx/default.nix      | 2 +-
 pkgs/development/python-modules/pytest-isort/default.nix      | 2 +-
 .../development/python-modules/pytest-json-report/default.nix | 2 +-
 pkgs/development/python-modules/pytest-jupyter/default.nix    | 2 +-
 .../python-modules/pytest-lazy-fixtures/default.nix           | 2 +-
 .../python-modules/pytest-markdown-docs/default.nix           | 2 +-
 pkgs/development/python-modules/pytest-notebook/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-order/default.nix      | 2 +-
 pkgs/development/python-modules/pytest-parallel/default.nix   | 2 +-
 .../development/python-modules/pytest-param-files/default.nix | 2 +-
 pkgs/development/python-modules/pytest-playwright/default.nix | 2 +-
 pkgs/development/python-modules/pytest-postgresql/default.nix | 2 +-
 pkgs/development/python-modules/pytest-raises/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-recording/default.nix  | 2 +-
 pkgs/development/python-modules/pytest-responses/default.nix  | 2 +-
 pkgs/development/python-modules/pytest-ruff/default.nix       | 2 +-
 pkgs/development/python-modules/pytest-selenium/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-services/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-smtpd/default.nix      | 2 +-
 pkgs/development/python-modules/pytest-snapshot/default.nix   | 2 +-
 pkgs/development/python-modules/pytest-socket/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-spec/default.nix       | 2 +-
 pkgs/development/python-modules/pytest-subprocess/default.nix | 2 +-
 pkgs/development/python-modules/pytest-test-utils/default.nix | 2 +-
 .../python-modules/pytest-textual-snapshot/default.nix        | 2 +-
 pkgs/development/python-modules/pytest-twisted/default.nix    | 2 +-
 pkgs/development/python-modules/pytest-unordered/default.nix  | 2 +-
 pkgs/development/python-modules/pytest-variables/default.nix  | 2 +-
 pkgs/development/python-modules/pytest-voluptuous/default.nix | 2 +-
 pkgs/development/python-modules/python-aodhclient/default.nix | 2 +-
 pkgs/development/python-modules/python-benedict/default.nix   | 2 +-
 pkgs/development/python-modules/python-bidi/default.nix       | 2 +-
 pkgs/development/python-modules/python-binance/default.nix    | 2 +-
 pkgs/development/python-modules/python-bitcoinlib/default.nix | 2 +-
 pkgs/development/python-modules/python-bsblan/default.nix     | 2 +-
 pkgs/development/python-modules/python-calamine/default.nix   | 2 +-
 pkgs/development/python-modules/python-can/default.nix        | 2 +-
 pkgs/development/python-modules/python-creole/default.nix     | 2 +-
 pkgs/development/python-modules/python-datemath/default.nix   | 2 +-
 pkgs/development/python-modules/python-dbusmock/default.nix   | 2 +-
 pkgs/development/python-modules/python-decouple/default.nix   | 2 +-
 pkgs/development/python-modules/python-didl-lite/default.nix  | 2 +-
 .../python-modules/python-digitalocean/default.nix            | 2 +-
 pkgs/development/python-modules/python-docx/default.nix       | 2 +-
 pkgs/development/python-modules/python-ecobee-api/default.nix | 2 +-
 pkgs/development/python-modules/python-engineio/default.nix   | 2 +-
 pkgs/development/python-modules/python-escpos/default.nix     | 2 +-
 .../development/python-modules/python-frontmatter/default.nix | 2 +-
 pkgs/development/python-modules/python-fsutil/default.nix     | 2 +-
 pkgs/development/python-modules/python-fullykiosk/default.nix | 2 +-
 pkgs/development/python-modules/python-fx/default.nix         | 2 +-
 pkgs/development/python-modules/python-hcl2/default.nix       | 2 +-
 pkgs/development/python-modules/python-hl7/default.nix        | 2 +-
 .../python-modules/python-homeassistant-analytics/default.nix | 2 +-
 pkgs/development/python-modules/python-idzip/default.nix      | 2 +-
 pkgs/development/python-modules/python-ipmi/default.nix       | 2 +-
 pkgs/development/python-modules/python-ipware/default.nix     | 2 +-
 pkgs/development/python-modules/python-izone/default.nix      | 2 +-
 .../python-modules/python-jsonrpc-server/default.nix          | 2 +-
 pkgs/development/python-modules/python-keycloak/default.nix   | 2 +-
 pkgs/development/python-modules/python-ldap/default.nix       | 2 +-
 pkgs/development/python-modules/python-libnmap/default.nix    | 2 +-
 .../python-modules/python-logging-loki/default.nix            | 2 +-
 pkgs/development/python-modules/python-lsp-black/default.nix  | 2 +-
 .../development/python-modules/python-lsp-jsonrpc/default.nix | 2 +-
 pkgs/development/python-modules/python-lsp-ruff/default.nix   | 2 +-
 pkgs/development/python-modules/python-lsp-server/default.nix | 2 +-
 pkgs/development/python-modules/python-lzf/default.nix        | 2 +-
 pkgs/development/python-modules/python-lzo/default.nix        | 2 +-
 .../python-modules/python-magnumclient/default.nix            | 2 +-
 .../development/python-modules/python-motionmount/default.nix | 2 +-
 pkgs/development/python-modules/python-multipart/default.nix  | 2 +-
 pkgs/development/python-modules/python-ndn/default.nix        | 2 +-
 pkgs/development/python-modules/python-on-whales/default.nix  | 2 +-
 pkgs/development/python-modules/python-opensky/default.nix    | 2 +-
 pkgs/development/python-modules/python-otbr-api/default.nix   | 2 +-
 pkgs/development/python-modules/python-pam/default.nix        | 2 +-
 pkgs/development/python-modules/python-rapidjson/default.nix  | 2 +-
 pkgs/development/python-modules/python-registry/default.nix   | 2 +-
 pkgs/development/python-modules/python-slugify/default.nix    | 2 +-
 pkgs/development/python-modules/python-smarttub/default.nix   | 2 +-
 pkgs/development/python-modules/python-snap7/default.nix      | 2 +-
 pkgs/development/python-modules/python-socketio/default.nix   | 2 +-
 pkgs/development/python-modules/python-socks/default.nix      | 2 +-
 pkgs/development/python-modules/python-songpal/default.nix    | 2 +-
 pkgs/development/python-modules/python-tado/default.nix       | 2 +-
 pkgs/development/python-modules/python-technove/default.nix   | 2 +-
 .../python-modules/python-telegram-bot/default.nix            | 2 +-
 pkgs/development/python-modules/python-telegram/default.nix   | 2 +-
 pkgs/development/python-modules/python-toolbox/default.nix    | 2 +-
 .../development/python-modules/python-troveclient/default.nix | 2 +-
 .../python-modules/python-twitch-client/default.nix           | 2 +-
 pkgs/development/python-modules/python-ulid/default.nix       | 2 +-
 pkgs/development/python-modules/python-vagrant/default.nix    | 2 +-
 .../python-modules/python-watcherclient/default.nix           | 2 +-
 pkgs/development/python-modules/python-yate/default.nix       | 2 +-
 .../development/python-modules/python-zaqarclient/default.nix | 2 +-
 pkgs/development/python-modules/python-zbar/default.nix       | 2 +-
 pkgs/development/python-modules/python-zunclient/default.nix  | 2 +-
 pkgs/development/python-modules/python3-gnutls/default.nix    | 2 +-
 pkgs/development/python-modules/python3-saml/default.nix      | 2 +-
 pkgs/development/python-modules/pythonegardia/default.nix     | 2 +-
 pkgs/development/python-modules/pythonfinder/default.nix      | 2 +-
 pkgs/development/python-modules/pythonocc-core/default.nix    | 2 +-
 pkgs/development/python-modules/pythonqwt/default.nix         | 2 +-
 pkgs/development/python-modules/pythran/default.nix           | 2 +-
 pkgs/development/python-modules/pytibber/default.nix          | 2 +-
 pkgs/development/python-modules/pytile/default.nix            | 2 +-
 pkgs/development/python-modules/pytimeparse2/default.nix      | 2 +-
 pkgs/development/python-modules/pytm/default.nix              | 2 +-
 pkgs/development/python-modules/pytoolconfig/default.nix      | 2 +-
 pkgs/development/python-modules/pytorch-msssim/default.nix    | 2 +-
 .../development/python-modules/pytorch-pfn-extras/default.nix | 2 +-
 pkgs/development/python-modules/pytouchlinesl/default.nix     | 4 ++--
 pkgs/development/python-modules/pytraccar/default.nix         | 2 +-
 pkgs/development/python-modules/pytradfri/default.nix         | 2 +-
 pkgs/development/python-modules/pytrydan/default.nix          | 2 +-
 pkgs/development/python-modules/pytubefix/default.nix         | 2 +-
 pkgs/development/python-modules/pyturbojpeg/default.nix       | 2 +-
 pkgs/development/python-modules/pyu2f/default.nix             | 2 +-
 pkgs/development/python-modules/pyunpack/default.nix          | 2 +-
 pkgs/development/python-modules/pyuptimerobot/default.nix     | 2 +-
 pkgs/development/python-modules/pyvips/default.nix            | 2 +-
 pkgs/development/python-modules/pyvis/default.nix             | 2 +-
 pkgs/development/python-modules/pyvisa-py/default.nix         | 2 +-
 pkgs/development/python-modules/pyvisa/default.nix            | 2 +-
 pkgs/development/python-modules/pyvista/default.nix           | 2 +-
 pkgs/development/python-modules/pyvlx/default.nix             | 2 +-
 pkgs/development/python-modules/pyvmomi/default.nix           | 2 +-
 pkgs/development/python-modules/pywaterkotte/default.nix      | 2 +-
 pkgs/development/python-modules/pywavelets/default.nix        | 2 +-
 pkgs/development/python-modules/pywaze/default.nix            | 2 +-
 pkgs/development/python-modules/pyweatherflowrest/default.nix | 2 +-
 pkgs/development/python-modules/pyweatherflowudp/default.nix  | 2 +-
 pkgs/development/python-modules/pywemo/default.nix            | 2 +-
 pkgs/development/python-modules/pywfa/default.nix             | 4 ++--
 pkgs/development/python-modules/pyxbe/default.nix             | 2 +-
 pkgs/development/python-modules/pyxnat/default.nix            | 2 +-
 pkgs/development/python-modules/pyyaml-include/default.nix    | 2 +-
 pkgs/development/python-modules/pyyaml/default.nix            | 2 +-
 pkgs/development/python-modules/pyyardian/default.nix         | 2 +-
 pkgs/development/python-modules/pyzabbix/default.nix          | 2 +-
 pkgs/development/python-modules/pyzerproc/default.nix         | 2 +-
 pkgs/development/python-modules/pyzipper/default.nix          | 2 +-
 pkgs/development/python-modules/pyzx/default.nix              | 2 +-
 pkgs/development/python-modules/qasync/default.nix            | 2 +-
 .../python-modules/qcodes-contrib-drivers/default.nix         | 2 +-
 pkgs/development/python-modules/qcodes/default.nix            | 2 +-
 .../python-modules/qcs-api-client-common/default.nix          | 2 +-
 pkgs/development/python-modules/qcs-api-client/default.nix    | 2 +-
 pkgs/development/python-modules/qdrant-client/default.nix     | 2 +-
 pkgs/development/python-modules/qingping-ble/default.nix      | 2 +-
 pkgs/development/python-modules/qmk-dotty-dict/default.nix    | 2 +-
 pkgs/development/python-modules/qnapstats/default.nix         | 2 +-
 pkgs/development/python-modules/qpsolvers/default.nix         | 2 +-
 pkgs/development/python-modules/qstylizer/default.nix         | 2 +-
 pkgs/development/python-modules/qtawesome/default.nix         | 2 +-
 pkgs/development/python-modules/qtconsole/default.nix         | 2 +-
 pkgs/development/python-modules/qtile-extras/default.nix      | 2 +-
 pkgs/development/python-modules/qtile/default.nix             | 2 +-
 pkgs/development/python-modules/qualysclient/default.nix      | 2 +-
 pkgs/development/python-modules/quantile-forest/default.nix   | 2 +-
 pkgs/development/python-modules/quantiphy/default.nix         | 2 +-
 pkgs/development/python-modules/quantities/default.nix        | 2 +-
 pkgs/development/python-modules/quart-cors/default.nix        | 2 +-
 pkgs/development/python-modules/quart/default.nix             | 2 +-
 pkgs/development/python-modules/quaternion/default.nix        | 2 +-
 pkgs/development/python-modules/questionary/default.nix       | 2 +-
 pkgs/development/python-modules/qutip/default.nix             | 2 +-
 pkgs/development/python-modules/rachiopy/default.nix          | 2 +-
 pkgs/development/python-modules/radian/default.nix            | 2 +-
 pkgs/development/python-modules/radios/default.nix            | 2 +-
 pkgs/development/python-modules/radish-bdd/default.nix        | 2 +-
 pkgs/development/python-modules/rangehttpserver/default.nix   | 2 +-
 pkgs/development/python-modules/rapidfuzz/default.nix         | 2 +-
 pkgs/development/python-modules/rapt-ble/default.nix          | 2 +-
 pkgs/development/python-modules/rarfile/default.nix           | 2 +-
 pkgs/development/python-modules/ratarmountcore/default.nix    | 2 +-
 .../development/python-modules/raylib-python-cffi/default.nix | 2 +-
 pkgs/development/python-modules/rchitect/default.nix          | 2 +-
 pkgs/development/python-modules/rdflib/default.nix            | 2 +-
 pkgs/development/python-modules/reactivex/default.nix         | 2 +-
 pkgs/development/python-modules/readabilipy/default.nix       | 2 +-
 pkgs/development/python-modules/readchar/default.nix          | 2 +-
 pkgs/development/python-modules/recline/default.nix           | 2 +-
 pkgs/development/python-modules/reconplogger/default.nix      | 2 +-
 .../python-modules/recurring-ical-events/default.nix          | 2 +-
 pkgs/development/python-modules/redis-om/default.nix          | 4 ++--
 pkgs/development/python-modules/reedsolo/default.nix          | 2 +-
 pkgs/development/python-modules/referencing/default.nix       | 2 +-
 pkgs/development/python-modules/reflex-chakra/default.nix     | 2 +-
 pkgs/development/python-modules/reflex/default.nix            | 4 ++--
 pkgs/development/python-modules/refoss-ha/default.nix         | 2 +-
 pkgs/development/python-modules/regenmaschine/default.nix     | 2 +-
 pkgs/development/python-modules/remarshal/default.nix         | 2 +-
 pkgs/development/python-modules/remotezip/default.nix         | 2 +-
 pkgs/development/python-modules/renault-api/default.nix       | 2 +-
 pkgs/development/python-modules/reno/default.nix              | 2 +-
 .../python-modules/renson-endura-delta/default.nix            | 2 +-
 pkgs/development/python-modules/reolink-aio/default.nix       | 2 +-
 pkgs/development/python-modules/reolink/default.nix           | 2 +-
 .../python-modules/reorder-python-imports/default.nix         | 2 +-
 pkgs/development/python-modules/replicate/default.nix         | 2 +-
 pkgs/development/python-modules/reqif/default.nix             | 2 +-
 pkgs/development/python-modules/requests-aws4auth/default.nix | 2 +-
 pkgs/development/python-modules/requests-cache/default.nix    | 2 +-
 pkgs/development/python-modules/requests-file/default.nix     | 2 +-
 .../python-modules/requests-ratelimiter/default.nix           | 2 +-
 .../python-modules/requirements-detector/default.nix          | 2 +-
 .../python-modules/requirements-parser/default.nix            | 2 +-
 pkgs/development/python-modules/resampy/default.nix           | 2 +-
 pkgs/development/python-modules/responses/default.nix         | 2 +-
 pkgs/development/python-modules/restfly/default.nix           | 2 +-
 pkgs/development/python-modules/retinaface/default.nix        | 2 +-
 pkgs/development/python-modules/retry-decorator/default.nix   | 2 +-
 pkgs/development/python-modules/retry2/default.nix            | 2 +-
 pkgs/development/python-modules/reuse/default.nix             | 2 +-
 pkgs/development/python-modules/rfc8785/default.nix           | 2 +-
 pkgs/development/python-modules/rfcat/default.nix             | 2 +-
 pkgs/development/python-modules/rflink/default.nix            | 2 +-
 pkgs/development/python-modules/rich-argparse/default.nix     | 2 +-
 pkgs/development/python-modules/rich-pixels/default.nix       | 4 ++--
 pkgs/development/python-modules/rich-rst/default.nix          | 2 +-
 .../development/python-modules/rich-theme-manager/default.nix | 2 +-
 pkgs/development/python-modules/rich/default.nix              | 2 +-
 pkgs/development/python-modules/riden/default.nix             | 2 +-
 pkgs/development/python-modules/rio-tiler/default.nix         | 2 +-
 pkgs/development/python-modules/rioxarray/default.nix         | 2 +-
 .../python-modules/ripe-atlas-cousteau/default.nix            | 2 +-
 pkgs/development/python-modules/riscof/default.nix            | 2 +-
 pkgs/development/python-modules/riscv-config/default.nix      | 2 +-
 pkgs/development/python-modules/riscv-isac/default.nix        | 2 +-
 pkgs/development/python-modules/rising/default.nix            | 2 +-
 pkgs/development/python-modules/rki-covid-parser/default.nix  | 2 +-
 pkgs/development/python-modules/rkm-codes/default.nix         | 2 +-
 pkgs/development/python-modules/rlax/default.nix              | 2 +-
 pkgs/development/python-modules/rlcard/default.nix            | 2 +-
 pkgs/development/python-modules/rmscene/default.nix           | 2 +-
 pkgs/development/python-modules/rns/default.nix               | 2 +-
 .../python-modules/robotframework-databaselibrary/default.nix | 2 +-
 .../python-modules/robotframework-pythonlibcore/default.nix   | 2 +-
 .../python-modules/robotframework-requests/default.nix        | 2 +-
 .../python-modules/robotframework-seleniumlibrary/default.nix | 2 +-
 pkgs/development/python-modules/robotframework/default.nix    | 2 +-
 .../development/python-modules/robotstatuschecker/default.nix | 2 +-
 pkgs/development/python-modules/rokuecp/default.nix           | 2 +-
 pkgs/development/python-modules/roma/default.nix              | 2 +-
 pkgs/development/python-modules/romy/default.nix              | 2 +-
 pkgs/development/python-modules/roombapy/default.nix          | 2 +-
 pkgs/development/python-modules/rope/default.nix              | 2 +-
 pkgs/development/python-modules/ropgadget/default.nix         | 2 +-
 pkgs/development/python-modules/routeros-api/default.nix      | 2 +-
 pkgs/development/python-modules/rova/default.nix              | 2 +-
 pkgs/development/python-modules/rpcq/default.nix              | 2 +-
 pkgs/development/python-modules/rpyc/default.nix              | 2 +-
 pkgs/development/python-modules/rq/default.nix                | 2 +-
 pkgs/development/python-modules/rstcheck-core/default.nix     | 2 +-
 pkgs/development/python-modules/rstcheck/default.nix          | 2 +-
 pkgs/development/python-modules/rtfde/default.nix             | 2 +-
 pkgs/development/python-modules/rtfunicode/default.nix        | 2 +-
 pkgs/development/python-modules/rtmixer/default.nix           | 2 +-
 pkgs/development/python-modules/rtree/default.nix             | 2 +-
 pkgs/development/python-modules/rtslib/default.nix            | 2 +-
 pkgs/development/python-modules/rtsp-to-webrtc/default.nix    | 2 +-
 pkgs/development/python-modules/ruff-api/default.nix          | 2 +-
 pkgs/development/python-modules/rules/default.nix             | 2 +-
 pkgs/development/python-modules/ruuvitag-ble/default.nix      | 2 +-
 pkgs/development/python-modules/ruyaml/default.nix            | 2 +-
 pkgs/development/python-modules/s3-credentials/default.nix    | 2 +-
 pkgs/development/python-modules/s3transfer/default.nix        | 2 +-
 pkgs/development/python-modules/sacrebleu/default.nix         | 2 +-
 pkgs/development/python-modules/safety/default.nix            | 2 +-
 pkgs/development/python-modules/sagemaker-core/default.nix    | 2 +-
 pkgs/development/python-modules/sagemaker-mlflow/default.nix  | 2 +-
 pkgs/development/python-modules/sagemaker/default.nix         | 2 +-
 pkgs/development/python-modules/salmon-mail/default.nix       | 2 +-
 pkgs/development/python-modules/samarium/default.nix          | 2 +-
 pkgs/development/python-modules/samplerate/default.nix        | 2 +-
 pkgs/development/python-modules/samsungtvws/default.nix       | 2 +-
 pkgs/development/python-modules/sanic-routing/default.nix     | 2 +-
 pkgs/development/python-modules/sanic-testing/default.nix     | 2 +-
 pkgs/development/python-modules/sanic/default.nix             | 2 +-
 pkgs/development/python-modules/sanix/default.nix             | 2 +-
 pkgs/development/python-modules/sasmodels/default.nix         | 2 +-
 pkgs/development/python-modules/scapy/default.nix             | 2 +-
 pkgs/development/python-modules/schema-salad/default.nix      | 2 +-
 pkgs/development/python-modules/scikit-bio/default.nix        | 2 +-
 .../python-modules/scikit-hep-testdata/default.nix            | 2 +-
 pkgs/development/python-modules/scikit-image/default.nix      | 4 ++--
 .../development/python-modules/scikit-learn-extra/default.nix | 2 +-
 pkgs/development/python-modules/scikit-misc/default.nix       | 2 +-
 pkgs/development/python-modules/scikit-survival/default.nix   | 2 +-
 pkgs/development/python-modules/scikit-tda/default.nix        | 2 +-
 .../python-modules/scim2-filter-parser/default.nix            | 2 +-
 pkgs/development/python-modules/scipy/default.nix             | 2 +-
 pkgs/development/python-modules/scmrepo/default.nix           | 2 +-
 pkgs/development/python-modules/scooby/default.nix            | 2 +-
 pkgs/development/python-modules/scrapy/default.nix            | 2 +-
 pkgs/development/python-modules/screeninfo/default.nix        | 2 +-
 pkgs/development/python-modules/screenlogicpy/default.nix     | 2 +-
 pkgs/development/python-modules/scs/default.nix               | 2 +-
 pkgs/development/python-modules/sdds/default.nix              | 2 +-
 pkgs/development/python-modules/seaborn/default.nix           | 2 +-
 pkgs/development/python-modules/seabreeze/default.nix         | 2 +-
 pkgs/development/python-modules/seatconnect/default.nix       | 2 +-
 pkgs/development/python-modules/sectools/default.nix          | 2 +-
 pkgs/development/python-modules/securesystemslib/default.nix  | 2 +-
 pkgs/development/python-modules/securetar/default.nix         | 2 +-
 pkgs/development/python-modules/securityreporter/default.nix  | 2 +-
 pkgs/development/python-modules/seedir/default.nix            | 2 +-
 pkgs/development/python-modules/segno/default.nix             | 2 +-
 pkgs/development/python-modules/segyio/default.nix            | 2 +-
 pkgs/development/python-modules/selenium-wire/default.nix     | 2 +-
 pkgs/development/python-modules/selenium/default.nix          | 2 +-
 pkgs/development/python-modules/semver/default.nix            | 2 +-
 pkgs/development/python-modules/send2trash/default.nix        | 2 +-
 pkgs/development/python-modules/sendgrid/default.nix          | 2 +-
 pkgs/development/python-modules/sense-energy/default.nix      | 2 +-
 pkgs/development/python-modules/sensirion-ble/default.nix     | 2 +-
 pkgs/development/python-modules/sensor-state-data/default.nix | 2 +-
 pkgs/development/python-modules/sensorpro-ble/default.nix     | 2 +-
 pkgs/development/python-modules/sensorpush-ble/default.nix    | 2 +-
 .../python-modules/sentence-transformers/default.nix          | 2 +-
 pkgs/development/python-modules/sentry-sdk/default.nix        | 2 +-
 pkgs/development/python-modules/seqdiag/default.nix           | 2 +-
 pkgs/development/python-modules/serialio/default.nix          | 2 +-
 pkgs/development/python-modules/servefile/default.nix         | 2 +-
 pkgs/development/python-modules/service-identity/default.nix  | 2 +-
 pkgs/development/python-modules/setupmeta/default.nix         | 2 +-
 .../python-modules/setuptools-changelog-shortener/default.nix | 2 +-
 .../python-modules/setuptools-generate/default.nix            | 2 +-
 .../development/python-modules/setuptools-gettext/default.nix | 2 +-
 .../python-modules/setuptools-git-versioning/default.nix      | 2 +-
 pkgs/development/python-modules/setuptools-odoo/default.nix   | 2 +-
 pkgs/development/python-modules/setuptools/default.nix        | 2 +-
 pkgs/development/python-modules/sev-snp-measure/default.nix   | 2 +-
 pkgs/development/python-modules/sfrbox-api/default.nix        | 2 +-
 pkgs/development/python-modules/sh/default.nix                | 2 +-
 pkgs/development/python-modules/shap/default.nix              | 2 +-
 pkgs/development/python-modules/shaperglot/default.nix        | 2 +-
 pkgs/development/python-modules/sharkiq/default.nix           | 2 +-
 pkgs/development/python-modules/sharp-aquos-rc/default.nix    | 2 +-
 pkgs/development/python-modules/shazamio/default.nix          | 4 ++--
 pkgs/development/python-modules/shellingham/default.nix       | 2 +-
 pkgs/development/python-modules/shimmy/default.nix            | 2 +-
 pkgs/development/python-modules/shiny/default.nix             | 2 +-
 pkgs/development/python-modules/shlib/default.nix             | 2 +-
 pkgs/development/python-modules/shtab/default.nix             | 2 +-
 pkgs/development/python-modules/signxml/default.nix           | 2 +-
 pkgs/development/python-modules/sigparse/default.nix          | 2 +-
 .../python-modules/sigstore-rekor-types/default.nix           | 2 +-
 pkgs/development/python-modules/sigstore/default.nix          | 2 +-
 pkgs/development/python-modules/simber/default.nix            | 2 +-
 pkgs/development/python-modules/simpful/default.nix           | 2 +-
 pkgs/development/python-modules/simple-parsing/default.nix    | 2 +-
 pkgs/development/python-modules/simple-salesforce/default.nix | 2 +-
 pkgs/development/python-modules/simple-websocket/default.nix  | 2 +-
 pkgs/development/python-modules/simpleeval/default.nix        | 2 +-
 pkgs/development/python-modules/simplefin4py/default.nix      | 2 +-
 pkgs/development/python-modules/simplefix/default.nix         | 2 +-
 pkgs/development/python-modules/simplejson/default.nix        | 2 +-
 pkgs/development/python-modules/simplekv/default.nix          | 2 +-
 pkgs/development/python-modules/simplemma/default.nix         | 2 +-
 pkgs/development/python-modules/simplepush/default.nix        | 2 +-
 pkgs/development/python-modules/simplesat/default.nix         | 2 +-
 pkgs/development/python-modules/simplisafe-python/default.nix | 2 +-
 pkgs/development/python-modules/single-source/default.nix     | 2 +-
 pkgs/development/python-modules/single-version/default.nix    | 2 +-
 .../python-modules/siobrultech-protocols/default.nix          | 2 +-
 pkgs/development/python-modules/sipyco/default.nix            | 2 +-
 pkgs/development/python-modules/sismic/default.nix            | 2 +-
 pkgs/development/python-modules/sisyphus-control/default.nix  | 2 +-
 pkgs/development/python-modules/siuba/default.nix             | 2 +-
 pkgs/development/python-modules/six/default.nix               | 2 +-
 pkgs/development/python-modules/skodaconnect/default.nix      | 2 +-
 pkgs/development/python-modules/skops/default.nix             | 2 +-
 pkgs/development/python-modules/skrl/default.nix              | 2 +-
 pkgs/development/python-modules/slack-bolt/default.nix        | 2 +-
 pkgs/development/python-modules/slack-sdk/default.nix         | 2 +-
 pkgs/development/python-modules/slapd/default.nix             | 2 +-
 pkgs/development/python-modules/sleekxmppfs/default.nix       | 2 +-
 pkgs/development/python-modules/slither-analyzer/default.nix  | 2 +-
 pkgs/development/python-modules/slowapi/default.nix           | 2 +-
 pkgs/development/python-modules/smart-meter-texas/default.nix | 2 +-
 pkgs/development/python-modules/smart-open/default.nix        | 2 +-
 pkgs/development/python-modules/smartypants/default.nix       | 2 +-
 pkgs/development/python-modules/smbprotocol/default.nix       | 2 +-
 pkgs/development/python-modules/smbus2/default.nix            | 2 +-
 pkgs/development/python-modules/smhi-pkg/default.nix          | 2 +-
 pkgs/development/python-modules/smoke-zephyr/default.nix      | 2 +-
 .../snakemake-executor-plugin-cluster-generic/default.nix     | 2 +-
 .../python-modules/snakemake-interface-common/default.nix     | 2 +-
 .../snakemake-interface-executor-plugins/default.nix          | 2 +-
 .../snakemake-interface-report-plugins/default.nix            | 2 +-
 .../snakemake-interface-storage-plugins/default.nix           | 2 +-
 .../python-modules/snakemake-storage-plugin-fs/default.nix    | 2 +-
 .../python-modules/snakemake-storage-plugin-s3/default.nix    | 2 +-
 .../snakemake-storage-plugin-xrootd/default.nix               | 2 +-
 pkgs/development/python-modules/snakeviz/default.nix          | 2 +-
 pkgs/development/python-modules/snap-helpers/default.nix      | 2 +-
 pkgs/development/python-modules/snapcast/default.nix          | 2 +-
 pkgs/development/python-modules/snitun/default.nix            | 2 +-
 pkgs/development/python-modules/snorkel/default.nix           | 2 +-
 .../python-modules/snowflake-connector-python/default.nix     | 2 +-
 pkgs/development/python-modules/snscrape/default.nix          | 2 +-
 .../python-modules/social-auth-app-django/default.nix         | 2 +-
 pkgs/development/python-modules/social-auth-core/default.nix  | 2 +-
 pkgs/development/python-modules/socialscan/default.nix        | 2 +-
 pkgs/development/python-modules/sockio/default.nix            | 2 +-
 pkgs/development/python-modules/soco/default.nix              | 2 +-
 pkgs/development/python-modules/solarlog-cli/default.nix      | 2 +-
 pkgs/development/python-modules/somajo/default.nix            | 2 +-
 pkgs/development/python-modules/sonos-websocket/default.nix   | 2 +-
 pkgs/development/python-modules/soxr/default.nix              | 2 +-
 .../development/python-modules/spacy-transformers/default.nix | 2 +-
 pkgs/development/python-modules/spake2/default.nix            | 2 +-
 pkgs/development/python-modules/sparklines/default.nix        | 2 +-
 pkgs/development/python-modules/sparsezoo/default.nix         | 2 +-
 pkgs/development/python-modules/spatial-image/default.nix     | 2 +-
 pkgs/development/python-modules/spdx-lookup/default.nix       | 2 +-
 pkgs/development/python-modules/spdx-tools/default.nix        | 2 +-
 pkgs/development/python-modules/spdx/default.nix              | 2 +-
 pkgs/development/python-modules/speechbrain/default.nix       | 2 +-
 pkgs/development/python-modules/speechrecognition/default.nix | 2 +-
 pkgs/development/python-modules/sphinx-autodoc2/default.nix   | 2 +-
 pkgs/development/python-modules/sphinx-automodapi/default.nix | 2 +-
 .../python-modules/sphinx-codeautolink/default.nix            | 2 +-
 .../python-modules/sphinx-jupyterbook-latex/default.nix       | 2 +-
 .../python-modules/sphinx-notfound-page/default.nix           | 2 +-
 pkgs/development/python-modules/sphinx-prompt/default.nix     | 2 +-
 pkgs/development/python-modules/sphinx-pytest/default.nix     | 2 +-
 .../python-modules/sphinx-rtd-dark-mode/default.nix           | 2 +-
 pkgs/development/python-modules/sphinx-sitemap/default.nix    | 2 +-
 pkgs/development/python-modules/sphinx-tabs/default.nix       | 2 +-
 pkgs/development/python-modules/sphinx/default.nix            | 2 +-
 .../python-modules/sphinxcontrib-bibtex/default.nix           | 2 +-
 .../python-modules/sphinxcontrib-jquery/default.nix           | 2 +-
 .../python-modules/sphinxcontrib-log-cabinet/default.nix      | 2 +-
 .../python-modules/sphinxcontrib-youtube/default.nix          | 2 +-
 pkgs/development/python-modules/sphinxemoji/default.nix       | 2 +-
 .../python-modules/sphinxext-opengraph/default.nix            | 2 +-
 pkgs/development/python-modules/splinter/default.nix          | 2 +-
 pkgs/development/python-modules/spotifyaio/default.nix        | 2 +-
 pkgs/development/python-modules/spsdk/default.nix             | 2 +-
 pkgs/development/python-modules/spur/default.nix              | 2 +-
 pkgs/development/python-modules/spyse-python/default.nix      | 2 +-
 pkgs/development/python-modules/spython/default.nix           | 2 +-
 pkgs/development/python-modules/sqlalchemy-json/default.nix   | 2 +-
 .../python-modules/sqlalchemy-jsonfield/default.nix           | 2 +-
 pkgs/development/python-modules/sqlalchemy-mixins/default.nix | 2 +-
 pkgs/development/python-modules/sqlalchemy-utils/default.nix  | 2 +-
 pkgs/development/python-modules/sqlalchemy-views/default.nix  | 2 +-
 pkgs/development/python-modules/sqlalchemy/default.nix        | 2 +-
 pkgs/development/python-modules/sqlfmt/default.nix            | 2 +-
 pkgs/development/python-modules/sqlglot/default.nix           | 2 +-
 pkgs/development/python-modules/sqlite-anyio/default.nix      | 2 +-
 pkgs/development/python-modules/sqlite-fts4/default.nix       | 2 +-
 pkgs/development/python-modules/sqlitedict/default.nix        | 2 +-
 pkgs/development/python-modules/sqlmodel/default.nix          | 2 +-
 pkgs/development/python-modules/sqltrie/default.nix           | 2 +-
 pkgs/development/python-modules/squarify/default.nix          | 2 +-
 pkgs/development/python-modules/srpenergy/default.nix         | 2 +-
 pkgs/development/python-modules/srvlookup/default.nix         | 2 +-
 pkgs/development/python-modules/ssdeep/default.nix            | 2 +-
 pkgs/development/python-modules/ssdp/default.nix              | 2 +-
 pkgs/development/python-modules/sse-starlette/default.nix     | 2 +-
 pkgs/development/python-modules/sshfs/default.nix             | 2 +-
 pkgs/development/python-modules/ssort/default.nix             | 2 +-
 pkgs/development/python-modules/stable-baselines3/default.nix | 2 +-
 pkgs/development/python-modules/stack-data/default.nix        | 2 +-
 pkgs/development/python-modules/stamina/default.nix           | 2 +-
 pkgs/development/python-modules/stanza/default.nix            | 2 +-
 pkgs/development/python-modules/starkbank-ecdsa/default.nix   | 2 +-
 pkgs/development/python-modules/starlette-context/default.nix | 2 +-
 pkgs/development/python-modules/starlette-wtf/default.nix     | 2 +-
 pkgs/development/python-modules/starlette/default.nix         | 2 +-
 pkgs/development/python-modules/statmake/default.nix          | 2 +-
 pkgs/development/python-modules/statsd/default.nix            | 2 +-
 pkgs/development/python-modules/stdlibs/default.nix           | 2 +-
 pkgs/development/python-modules/steamodd/default.nix          | 2 +-
 pkgs/development/python-modules/stickytape/default.nix        | 2 +-
 pkgs/development/python-modules/stim/default.nix              | 2 +-
 pkgs/development/python-modules/stix2-patterns/default.nix    | 2 +-
 pkgs/development/python-modules/stix2-validator/default.nix   | 2 +-
 pkgs/development/python-modules/stix2/default.nix             | 2 +-
 pkgs/development/python-modules/stone/default.nix             | 2 +-
 pkgs/development/python-modules/stookwijzer/default.nix       | 2 +-
 pkgs/development/python-modules/stravalib/default.nix         | 2 +-
 pkgs/development/python-modules/stravaweblib/default.nix      | 2 +-
 pkgs/development/python-modules/strenum/default.nix           | 2 +-
 pkgs/development/python-modules/stringparser/default.nix      | 2 +-
 pkgs/development/python-modules/stringzilla/default.nix       | 4 ++--
 pkgs/development/python-modules/structlog/default.nix         | 2 +-
 pkgs/development/python-modules/stumpy/default.nix            | 2 +-
 pkgs/development/python-modules/stupidartnet/default.nix      | 2 +-
 pkgs/development/python-modules/subarulink/default.nix        | 2 +-
 pkgs/development/python-modules/subliminal/default.nix        | 2 +-
 pkgs/development/python-modules/submitit/default.nix          | 2 +-
 pkgs/development/python-modules/subprocess-tee/default.nix    | 4 ++--
 pkgs/development/python-modules/succulent/default.nix         | 2 +-
 pkgs/development/python-modules/suds/default.nix              | 2 +-
 pkgs/development/python-modules/sunweg/default.nix            | 2 +-
 pkgs/development/python-modules/surepy/default.nix            | 2 +-
 pkgs/development/python-modules/svg-path/default.nix          | 2 +-
 pkgs/development/python-modules/svg-py/default.nix            | 2 +-
 pkgs/development/python-modules/svg2tikz/default.nix          | 2 +-
 pkgs/development/python-modules/svgelements/default.nix       | 2 +-
 pkgs/development/python-modules/svgutils/default.nix          | 2 +-
 pkgs/development/python-modules/swifter/default.nix           | 2 +-
 pkgs/development/python-modules/swisshydrodata/default.nix    | 2 +-
 pkgs/development/python-modules/switchbot-api/default.nix     | 2 +-
 pkgs/development/python-modules/sybil/default.nix             | 2 +-
 pkgs/development/python-modules/symengine/default.nix         | 2 +-
 pkgs/development/python-modules/symspellpy/default.nix        | 2 +-
 pkgs/development/python-modules/syncedlyrics/default.nix      | 2 +-
 pkgs/development/python-modules/syrupy/default.nix            | 2 +-
 .../python-modules/syslog-rfc5424-formatter/default.nix       | 2 +-
 pkgs/development/python-modules/sysrsync/default.nix          | 2 +-
 .../python-modules/systembridgeconnector/default.nix          | 2 +-
 .../development/python-modules/systembridgemodels/default.nix | 2 +-
 pkgs/development/python-modules/tabledata/default.nix         | 2 +-
 pkgs/development/python-modules/tabula-py/default.nix         | 2 +-
 pkgs/development/python-modules/tago/default.nix              | 2 +-
 pkgs/development/python-modules/tagoio-sdk/default.nix        | 2 +-
 pkgs/development/python-modules/tailscale/default.nix         | 2 +-
 pkgs/development/python-modules/tank-utility/default.nix      | 2 +-
 pkgs/development/python-modules/taskw-ng/default.nix          | 2 +-
 pkgs/development/python-modules/tatsu/default.nix             | 2 +-
 pkgs/development/python-modules/taxii2-client/default.nix     | 2 +-
 pkgs/development/python-modules/tbm-utils/default.nix         | 2 +-
 pkgs/development/python-modules/tcolorpy/default.nix          | 2 +-
 pkgs/development/python-modules/tcxreader/default.nix         | 2 +-
 pkgs/development/python-modules/telegram-text/default.nix     | 2 +-
 pkgs/development/python-modules/telegraph/default.nix         | 2 +-
 pkgs/development/python-modules/telethon/default.nix          | 2 +-
 pkgs/development/python-modules/tellduslive/default.nix       | 2 +-
 pkgs/development/python-modules/templateflow/default.nix      | 2 +-
 pkgs/development/python-modules/tempora/default.nix           | 2 +-
 .../python-modules/tenant-schemas-celery/default.nix          | 2 +-
 .../python-modules/tencentcloud-sdk-python/default.nix        | 2 +-
 pkgs/development/python-modules/tendo/default.nix             | 2 +-
 pkgs/development/python-modules/tensorboardx/default.nix      | 2 +-
 pkgs/development/python-modules/tensordict/default.nix        | 2 +-
 .../python-modules/tensorflow-metadata/default.nix            | 2 +-
 pkgs/development/python-modules/tensorflow/default.nix        | 2 +-
 pkgs/development/python-modules/tensorly/default.nix          | 2 +-
 pkgs/development/python-modules/term-image/default.nix        | 2 +-
 pkgs/development/python-modules/termgraph/default.nix         | 2 +-
 pkgs/development/python-modules/tesla-powerwall/default.nix   | 2 +-
 pkgs/development/python-modules/teslajsonpy/default.nix       | 2 +-
 pkgs/development/python-modules/testrail-api/default.nix      | 2 +-
 pkgs/development/python-modules/texsoup/default.nix           | 2 +-
 pkgs/development/python-modules/textile/default.nix           | 2 +-
 pkgs/development/python-modules/textual-dev/default.nix       | 2 +-
 .../python-modules/textual-fastdatatable/default.nix          | 2 +-
 pkgs/development/python-modules/textual-textarea/default.nix  | 2 +-
 .../textual-universal-directorytree/default.nix               | 4 ++--
 pkgs/development/python-modules/textual/default.nix           | 2 +-
 pkgs/development/python-modules/tf2onnx/default.nix           | 2 +-
 pkgs/development/python-modules/tgcrypto/default.nix          | 2 +-
 pkgs/development/python-modules/thelogrus/default.nix         | 2 +-
 pkgs/development/python-modules/thermobeacon-ble/default.nix  | 2 +-
 pkgs/development/python-modules/thermopro-ble/default.nix     | 2 +-
 pkgs/development/python-modules/thinqconnect/default.nix      | 2 +-
 pkgs/development/python-modules/threadpoolctl/default.nix     | 2 +-
 pkgs/development/python-modules/thriftpy2/default.nix         | 2 +-
 pkgs/development/python-modules/throttler/default.nix         | 2 +-
 pkgs/development/python-modules/thttp/default.nix             | 2 +-
 pkgs/development/python-modules/tiledb/default.nix            | 2 +-
 pkgs/development/python-modules/tilt-ble/default.nix          | 2 +-
 pkgs/development/python-modules/time-machine/default.nix      | 2 +-
 pkgs/development/python-modules/timezonefinder/default.nix    | 2 +-
 pkgs/development/python-modules/timing-asgi/default.nix       | 2 +-
 pkgs/development/python-modules/timm/default.nix              | 2 +-
 pkgs/development/python-modules/tiny-proxy/default.nix        | 2 +-
 pkgs/development/python-modules/tinycss2/default.nix          | 2 +-
 pkgs/development/python-modules/tinydb/default.nix            | 2 +-
 pkgs/development/python-modules/tinygrad/default.nix          | 2 +-
 pkgs/development/python-modules/tinyrecord/default.nix        | 2 +-
 pkgs/development/python-modules/tinytag/default.nix           | 2 +-
 pkgs/development/python-modules/tinytuya/default.nix          | 2 +-
 pkgs/development/python-modules/titlecase/default.nix         | 2 +-
 pkgs/development/python-modules/tldextract/default.nix        | 2 +-
 pkgs/development/python-modules/tlds/default.nix              | 2 +-
 pkgs/development/python-modules/tls-client/default.nix        | 2 +-
 pkgs/development/python-modules/tlsh/default.nix              | 2 +-
 .../development/python-modules/todoist-api-python/default.nix | 2 +-
 pkgs/development/python-modules/toggl-cli/default.nix         | 2 +-
 pkgs/development/python-modules/token-bucket/default.nix      | 2 +-
 pkgs/development/python-modules/tokentrim/default.nix         | 2 +-
 pkgs/development/python-modules/toml-adapt/default.nix        | 2 +-
 pkgs/development/python-modules/toonapi/default.nix           | 2 +-
 .../python-modules/torch-audiomentations/default.nix          | 2 +-
 pkgs/development/python-modules/torch-geometric/default.nix   | 2 +-
 pkgs/development/python-modules/torch-pitch-shift/default.nix | 2 +-
 pkgs/development/python-modules/torchaudio/default.nix        | 2 +-
 pkgs/development/python-modules/torchinfo/default.nix         | 2 +-
 pkgs/development/python-modules/torchio/default.nix           | 2 +-
 pkgs/development/python-modules/torchprofile/default.nix      | 2 +-
 pkgs/development/python-modules/torchrl/default.nix           | 2 +-
 pkgs/development/python-modules/torchsde/default.nix          | 2 +-
 pkgs/development/python-modules/torchsnapshot/default.nix     | 2 +-
 pkgs/development/python-modules/torchvision/default.nix       | 2 +-
 pkgs/development/python-modules/tornado/default.nix           | 2 +-
 pkgs/development/python-modules/tox/default.nix               | 2 +-
 pkgs/development/python-modules/tracerite/default.nix         | 2 +-
 pkgs/development/python-modules/trackpy/default.nix           | 2 +-
 pkgs/development/python-modules/trailrunner/default.nix       | 2 +-
 pkgs/development/python-modules/trainer/default.nix           | 2 +-
 pkgs/development/python-modules/transaction/default.nix       | 2 +-
 pkgs/development/python-modules/translatepy/default.nix       | 2 +-
 pkgs/development/python-modules/transmission-rpc/default.nix  | 2 +-
 pkgs/development/python-modules/tree-sitter/default.nix       | 2 +-
 pkgs/development/python-modules/treeo/default.nix             | 2 +-
 pkgs/development/python-modules/treex/default.nix             | 2 +-
 .../python-modules/trino-python-client/default.nix            | 2 +-
 pkgs/development/python-modules/trio-asyncio/default.nix      | 2 +-
 pkgs/development/python-modules/trio/default.nix              | 2 +-
 pkgs/development/python-modules/troposphere/default.nix       | 2 +-
 pkgs/development/python-modules/truncnorm/default.nix         | 2 +-
 pkgs/development/python-modules/truststore/default.nix        | 2 +-
 pkgs/development/python-modules/trx-python/default.nix        | 2 +-
 pkgs/development/python-modules/ttach/default.nix             | 2 +-
 pkgs/development/python-modules/ttfautohint-py/default.nix    | 2 +-
 pkgs/development/python-modules/ttls/default.nix              | 2 +-
 pkgs/development/python-modules/ttn-client/default.nix        | 2 +-
 pkgs/development/python-modules/ttp-templates/default.nix     | 2 +-
 pkgs/development/python-modules/ttp/default.nix               | 2 +-
 pkgs/development/python-modules/tuf/default.nix               | 2 +-
 pkgs/development/python-modules/turrishw/default.nix          | 2 +-
 pkgs/development/python-modules/tweepy/default.nix            | 2 +-
 pkgs/development/python-modules/twentemilieu/default.nix      | 2 +-
 pkgs/development/python-modules/twilio/default.nix            | 2 +-
 pkgs/development/python-modules/twitchapi/default.nix         | 2 +-
 pkgs/development/python-modules/twitterapi/default.nix        | 2 +-
 pkgs/development/python-modules/txi2p-tahoe/default.nix       | 2 +-
 pkgs/development/python-modules/txredisapi/default.nix        | 2 +-
 pkgs/development/python-modules/typepy/default.nix            | 2 +-
 pkgs/development/python-modules/typer-shell/default.nix       | 2 +-
 pkgs/development/python-modules/types-lxml/default.nix        | 2 +-
 pkgs/development/python-modules/typeshed-client/default.nix   | 2 +-
 pkgs/development/python-modules/typical/default.nix           | 2 +-
 pkgs/development/python-modules/typing-validation/default.nix | 2 +-
 pkgs/development/python-modules/typish/default.nix            | 2 +-
 pkgs/development/python-modules/ua-parser-rs/default.nix      | 2 +-
 pkgs/development/python-modules/ua-parser/default.nix         | 4 ++--
 pkgs/development/python-modules/uamqp/default.nix             | 2 +-
 pkgs/development/python-modules/uarray/default.nix            | 2 +-
 pkgs/development/python-modules/uart-devices/default.nix      | 2 +-
 pkgs/development/python-modules/ubelt/default.nix             | 2 +-
 pkgs/development/python-modules/uc-micro-py/default.nix       | 2 +-
 pkgs/development/python-modules/ucsmsdk/default.nix           | 2 +-
 pkgs/development/python-modules/ufmt/default.nix              | 2 +-
 pkgs/development/python-modules/ufomerge/default.nix          | 2 +-
 pkgs/development/python-modules/uharfbuzz/default.nix         | 2 +-
 pkgs/development/python-modules/uiprotect/default.nix         | 2 +-
 pkgs/development/python-modules/ulid-transform/default.nix    | 2 +-
 pkgs/development/python-modules/umap-learn/default.nix        | 2 +-
 pkgs/development/python-modules/umodbus/default.nix           | 2 +-
 pkgs/development/python-modules/uncertainties/default.nix     | 2 +-
 pkgs/development/python-modules/unicode-rbnf/default.nix      | 2 +-
 pkgs/development/python-modules/unicodeit/default.nix         | 2 +-
 pkgs/development/python-modules/unicrypto/default.nix         | 2 +-
 pkgs/development/python-modules/unidic/default.nix            | 2 +-
 pkgs/development/python-modules/unifi-ap/default.nix          | 2 +-
 pkgs/development/python-modules/unifi-discovery/default.nix   | 2 +-
 pkgs/development/python-modules/unify/default.nix             | 2 +-
 pkgs/development/python-modules/unique-log-filter/default.nix | 2 +-
 .../python-modules/unittest-xml-reporting/default.nix         | 2 +-
 .../python-modules/universal-silabs-flasher/default.nix       | 2 +-
 pkgs/development/python-modules/unpaddedbase64/default.nix    | 2 +-
 .../python-modules/unstructured-api-tools/default.nix         | 2 +-
 .../python-modules/unstructured-inference/default.nix         | 2 +-
 pkgs/development/python-modules/unstructured/default.nix      | 2 +-
 pkgs/development/python-modules/untangle/default.nix          | 2 +-
 pkgs/development/python-modules/upb-lib/default.nix           | 2 +-
 pkgs/development/python-modules/upcloud-api/default.nix       | 2 +-
 pkgs/development/python-modules/uplc/default.nix              | 2 +-
 pkgs/development/python-modules/uproot/default.nix            | 2 +-
 pkgs/development/python-modules/uri-template/default.nix      | 2 +-
 pkgs/development/python-modules/urwid-readline/default.nix    | 2 +-
 pkgs/development/python-modules/urwid/default.nix             | 2 +-
 pkgs/development/python-modules/urwidgets/default.nix         | 2 +-
 pkgs/development/python-modules/urwidtrees/default.nix        | 2 +-
 pkgs/development/python-modules/usb-devices/default.nix       | 2 +-
 pkgs/development/python-modules/usb-protocol/default.nix      | 2 +-
 pkgs/development/python-modules/usort/default.nix             | 2 +-
 pkgs/development/python-modules/uvcclient/default.nix         | 2 +-
 pkgs/development/python-modules/uvicorn/default.nix           | 2 +-
 pkgs/development/python-modules/uxsim/default.nix             | 2 +-
 pkgs/development/python-modules/vaa/default.nix               | 2 +-
 .../python-modules/vacuum-map-parser-base/default.nix         | 2 +-
 .../python-modules/vacuum-map-parser-roborock/default.nix     | 2 +-
 .../python-modules/validator-collection/default.nix           | 2 +-
 pkgs/development/python-modules/validators/default.nix        | 2 +-
 .../python-modules/vallox-websocket-api/default.nix           | 2 +-
 pkgs/development/python-modules/vdf/default.nix               | 2 +-
 pkgs/development/python-modules/vector/default.nix            | 2 +-
 pkgs/development/python-modules/vehicle/default.nix           | 2 +-
 pkgs/development/python-modules/velbus-aio/default.nix        | 2 +-
 pkgs/development/python-modules/versioneer/default.nix        | 2 +-
 pkgs/development/python-modules/vg/default.nix                | 2 +-
 pkgs/development/python-modules/viewstate/default.nix         | 2 +-
 pkgs/development/python-modules/vilfo-api-client/default.nix  | 2 +-
 pkgs/development/python-modules/viv-utils/default.nix         | 2 +-
 pkgs/development/python-modules/vncdo/default.nix             | 2 +-
 pkgs/development/python-modules/voip-utils/default.nix        | 2 +-
 pkgs/development/python-modules/volatile/default.nix          | 2 +-
 pkgs/development/python-modules/volkswagencarnet/default.nix  | 2 +-
 pkgs/development/python-modules/volkszaehler/default.nix      | 2 +-
 .../python-modules/voluptuous-serialize/default.nix           | 2 +-
 pkgs/development/python-modules/voluptuous/default.nix        | 2 +-
 pkgs/development/python-modules/volvooncall/default.nix       | 2 +-
 pkgs/development/python-modules/vt-py/default.nix             | 2 +-
 pkgs/development/python-modules/vtjp/default.nix              | 2 +-
 pkgs/development/python-modules/vulcan-api/default.nix        | 2 +-
 pkgs/development/python-modules/vulkan/default.nix            | 2 +-
 pkgs/development/python-modules/wagtail-factories/default.nix | 2 +-
 .../development/python-modules/wagtail-modeladmin/default.nix | 2 +-
 pkgs/development/python-modules/wakeonlan/default.nix         | 2 +-
 pkgs/development/python-modules/walrus/default.nix            | 2 +-
 pkgs/development/python-modules/wandb/default.nix             | 2 +-
 pkgs/development/python-modules/ward/default.nix              | 2 +-
 pkgs/development/python-modules/warlock/default.nix           | 2 +-
 pkgs/development/python-modules/watchdog-gevent/default.nix   | 2 +-
 pkgs/development/python-modules/watchfiles/default.nix        | 2 +-
 pkgs/development/python-modules/waterfurnace/default.nix      | 2 +-
 pkgs/development/python-modules/watermark/default.nix         | 2 +-
 pkgs/development/python-modules/wavefile/default.nix          | 2 +-
 pkgs/development/python-modules/weasel/default.nix            | 2 +-
 pkgs/development/python-modules/weatherflow4py/default.nix    | 2 +-
 pkgs/development/python-modules/webauthn/default.nix          | 2 +-
 pkgs/development/python-modules/webdataset/default.nix        | 2 +-
 pkgs/development/python-modules/webdav4/default.nix           | 2 +-
 pkgs/development/python-modules/webdriver-manager/default.nix | 2 +-
 pkgs/development/python-modules/webexteamssdk/default.nix     | 2 +-
 pkgs/development/python-modules/webmin-xmlrpc/default.nix     | 2 +-
 pkgs/development/python-modules/webob/default.nix             | 2 +-
 pkgs/development/python-modules/webrtc-models/default.nix     | 2 +-
 pkgs/development/python-modules/webrtc-noise-gain/default.nix | 2 +-
 pkgs/development/python-modules/websockets/default.nix        | 2 +-
 pkgs/development/python-modules/websockify/default.nix        | 2 +-
 pkgs/development/python-modules/webthing-ws/default.nix       | 2 +-
 pkgs/development/python-modules/weconnect-mqtt/default.nix    | 2 +-
 pkgs/development/python-modules/weheat/default.nix            | 2 +-
 pkgs/development/python-modules/wfuzz/default.nix             | 2 +-
 pkgs/development/python-modules/whatthepatch/default.nix      | 2 +-
 pkgs/development/python-modules/wheel-inspect/default.nix     | 2 +-
 pkgs/development/python-modules/wheel/default.nix             | 2 +-
 pkgs/development/python-modules/whenever/default.nix          | 2 +-
 .../python-modules/whirlpool-sixth-sense/default.nix          | 2 +-
 pkgs/development/python-modules/whisper/default.nix           | 2 +-
 pkgs/development/python-modules/whispers/default.nix          | 2 +-
 pkgs/development/python-modules/whitenoise/default.nix        | 2 +-
 pkgs/development/python-modules/whodap/default.nix            | 2 +-
 pkgs/development/python-modules/whois/default.nix             | 2 +-
 pkgs/development/python-modules/whoisdomain/default.nix       | 2 +-
 pkgs/development/python-modules/whool/default.nix             | 2 +-
 pkgs/development/python-modules/wiffi/default.nix             | 2 +-
 pkgs/development/python-modules/wikipedia-api/default.nix     | 2 +-
 pkgs/development/python-modules/wikipedia2vec/default.nix     | 2 +-
 pkgs/development/python-modules/willow/default.nix            | 2 +-
 pkgs/development/python-modules/withings-api/default.nix      | 2 +-
 pkgs/development/python-modules/withings-sync/default.nix     | 2 +-
 pkgs/development/python-modules/wktutils/default.nix          | 2 +-
 pkgs/development/python-modules/wled/default.nix              | 2 +-
 pkgs/development/python-modules/wordfreq/default.nix          | 2 +-
 pkgs/development/python-modules/wrapt/default.nix             | 2 +-
 pkgs/development/python-modules/wrf-python/default.nix        | 2 +-
 pkgs/development/python-modules/wsgi-intercept/default.nix    | 2 +-
 pkgs/development/python-modules/wsgidav/default.nix           | 2 +-
 pkgs/development/python-modules/wtforms/default.nix           | 2 +-
 pkgs/development/python-modules/wunsen/default.nix            | 2 +-
 pkgs/development/python-modules/wyoming/default.nix           | 2 +-
 pkgs/development/python-modules/x-wr-timezone/default.nix     | 2 +-
 pkgs/development/python-modules/xarray-einstats/default.nix   | 2 +-
 pkgs/development/python-modules/xarray/default.nix            | 2 +-
 pkgs/development/python-modules/xboxapi/default.nix           | 2 +-
 pkgs/development/python-modules/xdg-base-dirs/default.nix     | 2 +-
 pkgs/development/python-modules/xdis/default.nix              | 2 +-
 pkgs/development/python-modules/xdoctest/default.nix          | 2 +-
 pkgs/development/python-modules/xformers/default.nix          | 2 +-
 pkgs/development/python-modules/xhtml2pdf/default.nix         | 2 +-
 pkgs/development/python-modules/xiaomi-ble/default.nix        | 2 +-
 pkgs/development/python-modules/xknx/default.nix              | 2 +-
 pkgs/development/python-modules/xknxproject/default.nix       | 2 +-
 pkgs/development/python-modules/xlib/default.nix              | 2 +-
 pkgs/development/python-modules/xmlschema/default.nix         | 2 +-
 pkgs/development/python-modules/xmodem/default.nix            | 2 +-
 pkgs/development/python-modules/xmpppy/default.nix            | 2 +-
 pkgs/development/python-modules/xsdata/default.nix            | 2 +-
 pkgs/development/python-modules/yabadaba/default.nix          | 2 +-
 .../python-modules/yalesmartalarmclient/default.nix           | 2 +-
 pkgs/development/python-modules/yalexs/default.nix            | 2 +-
 pkgs/development/python-modules/yamale/default.nix            | 2 +-
 pkgs/development/python-modules/yamlfix/default.nix           | 2 +-
 pkgs/development/python-modules/yamllint/default.nix          | 2 +-
 pkgs/development/python-modules/yangson/default.nix           | 2 +-
 pkgs/development/python-modules/yara-python/default.nix       | 2 +-
 pkgs/development/python-modules/yaramod/default.nix           | 2 +-
 pkgs/development/python-modules/yarl/default.nix              | 2 +-
 pkgs/development/python-modules/yaspin/default.nix            | 2 +-
 pkgs/development/python-modules/yolink-api/default.nix        | 2 +-
 pkgs/development/python-modules/youless-api/default.nix       | 2 +-
 pkgs/development/python-modules/youtokentome/default.nix      | 2 +-
 .../python-modules/youtube-transcript-api/default.nix         | 2 +-
 pkgs/development/python-modules/youtubeaio/default.nix        | 2 +-
 pkgs/development/python-modules/yowsup/default.nix            | 2 +-
 pkgs/development/python-modules/ypy-websocket/default.nix     | 2 +-
 pkgs/development/python-modules/yte/default.nix               | 2 +-
 pkgs/development/python-modules/zadnegoale/default.nix        | 2 +-
 pkgs/development/python-modules/zamg/default.nix              | 2 +-
 pkgs/development/python-modules/zeep/default.nix              | 2 +-
 pkgs/development/python-modules/zeroconf/default.nix          | 2 +-
 pkgs/development/python-modules/zeversolar/default.nix        | 2 +-
 pkgs/development/python-modules/zha-quirks/default.nix        | 2 +-
 pkgs/development/python-modules/zha/default.nix               | 2 +-
 pkgs/development/python-modules/ziafont/default.nix           | 2 +-
 pkgs/development/python-modules/ziamath/default.nix           | 2 +-
 pkgs/development/python-modules/zigpy-deconz/default.nix      | 2 +-
 pkgs/development/python-modules/zigpy-xbee/default.nix        | 2 +-
 pkgs/development/python-modules/zigpy-zboss/default.nix       | 2 +-
 pkgs/development/python-modules/zigpy-zigate/default.nix      | 2 +-
 pkgs/development/python-modules/zigpy-znp/default.nix         | 2 +-
 pkgs/development/python-modules/zigpy/default.nix             | 2 +-
 pkgs/development/python-modules/zipstream-ng/default.nix      | 2 +-
 pkgs/development/python-modules/zm-py/default.nix             | 2 +-
 pkgs/development/python-modules/zope-exceptions/default.nix   | 2 +-
 pkgs/development/python-modules/zope-testbrowser/default.nix  | 2 +-
 pkgs/development/python-modules/zpp/default.nix               | 2 +-
 .../python-modules/zwave-js-server-python/default.nix         | 2 +-
 pkgs/development/python-modules/zwave-me-ws/default.nix       | 2 +-
 pkgs/development/python-modules/zxcvbn/default.nix            | 2 +-
 pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix   | 2 +-
 pkgs/development/tools/analysis/checkov/default.nix           | 2 +-
 pkgs/development/tools/analysis/hotspot/default.nix           | 2 +-
 pkgs/development/tools/analysis/radare2/default.nix           | 2 +-
 pkgs/development/tools/djhtml/default.nix                     | 2 +-
 pkgs/development/tools/geckodriver/default.nix                | 2 +-
 pkgs/development/tools/language-servers/fortls/default.nix    | 2 +-
 pkgs/development/tools/misc/cmake-language-server/default.nix | 2 +-
 pkgs/development/tools/misc/cvise/default.nix                 | 2 +-
 pkgs/development/tools/misc/texlab/default.nix                | 2 +-
 pkgs/development/tools/parsing/tree-sitter/default.nix        | 2 +-
 pkgs/development/tools/rbspy/default.nix                      | 2 +-
 pkgs/development/web/netlify-cli/default.nix                  | 2 +-
 pkgs/games/rare/default.nix                                   | 2 +-
 pkgs/games/the-butterfly-effect/default.nix                   | 2 +-
 pkgs/kde/third-party/krohnkite/default.nix                    | 2 +-
 pkgs/misc/autotiling/default.nix                              | 2 +-
 pkgs/misc/drivers/sc-controller/default.nix                   | 2 +-
 pkgs/misc/drivers/spacenavd/default.nix                       | 2 +-
 pkgs/misc/fastly/default.nix                                  | 2 +-
 pkgs/os-specific/linux/amneziawg/default.nix                  | 2 +-
 pkgs/os-specific/linux/dddvb/default.nix                      | 2 +-
 pkgs/os-specific/linux/evdi/default.nix                       | 2 +-
 pkgs/os-specific/linux/sinit/default.nix                      | 2 +-
 pkgs/os-specific/linux/sssd/default.nix                       | 2 +-
 pkgs/os-specific/linux/universal-pidff/default.nix            | 2 +-
 .../custom-components/adaptive_lighting/package.nix           | 2 +-
 .../home-assistant/custom-components/alarmo/package.nix       | 2 +-
 .../custom-components/better_thermostat/package.nix           | 2 +-
 .../custom-components/climate_group/package.nix               | 2 +-
 .../custom-components/elevenlabs_tts/package.nix              | 2 +-
 .../home-assistant/custom-components/epex_spot/package.nix    | 2 +-
 .../home-assistant/custom-components/indego/package.nix       | 2 +-
 .../home-assistant/custom-components/miele/package.nix        | 2 +-
 .../home-assistant/custom-components/moonraker/package.nix    | 2 +-
 .../home-assistant/custom-components/nest_protect/package.nix | 2 +-
 .../custom-components/omnik_inverter/package.nix              | 2 +-
 .../custom-components/prometheus_sensor/package.nix           | 2 +-
 .../custom-components/samsungtv-smart/package.nix             | 2 +-
 .../home-assistant/custom-components/sensi/package.nix        | 2 +-
 .../home-assistant/custom-components/solax_modbus/package.nix | 2 +-
 .../home-assistant/custom-components/somweb/package.nix       | 2 +-
 .../home-assistant/custom-components/spook/package.nix        | 2 +-
 .../home-assistant/custom-components/systemair/package.nix    | 2 +-
 .../home-assistant/custom-components/tuya_local/package.nix   | 2 +-
 .../custom-components/volkswagen_we_connect_id/package.nix    | 2 +-
 .../custom-components/volkswagencarnet/package.nix            | 2 +-
 .../custom-components/waste_collection_schedule/package.nix   | 2 +-
 .../custom-lovelace-modules/light-entity-card/package.nix     | 2 +-
 .../custom-lovelace-modules/mini-graph-card/package.nix       | 2 +-
 .../custom-lovelace-modules/weather-card/package.nix          | 2 +-
 pkgs/servers/http/apache-modules/mod_jk/default.nix           | 2 +-
 pkgs/servers/http/apache-modules/mod_python/default.nix       | 2 +-
 pkgs/servers/http/apache-modules/mod_tile/default.nix         | 2 +-
 pkgs/servers/isso/default.nix                                 | 2 +-
 pkgs/servers/mautrix-telegram/default.nix                     | 2 +-
 pkgs/servers/monitoring/laurel/default.nix                    | 2 +-
 .../monitoring/nagios-plugins/check_smartmon/default.nix      | 2 +-
 .../monitoring/nagios-plugins/check_ssl_cert/default.nix      | 2 +-
 .../monitoring/nagios-plugins/check_systemd/default.nix       | 2 +-
 .../monitoring/nagios-plugins/check_wmi_plus/default.nix      | 2 +-
 pkgs/servers/monitoring/nagios-plugins/check_zfs/default.nix  | 2 +-
 pkgs/servers/peertube/default.nix                             | 2 +-
 pkgs/servers/pinnwand/default.nix                             | 2 +-
 pkgs/servers/search/meilisearch/default.nix                   | 2 +-
 pkgs/servers/search/qdrant/default.nix                        | 2 +-
 pkgs/servers/tang/default.nix                                 | 2 +-
 pkgs/servers/tautulli/default.nix                             | 2 +-
 pkgs/shells/nushell/default.nix                               | 2 +-
 pkgs/tools/audio/piper/default.nix                            | 2 +-
 pkgs/tools/audio/video2midi/default.nix                       | 2 +-
 pkgs/tools/filesystems/catcli/default.nix                     | 2 +-
 pkgs/tools/games/gamemode/default.nix                         | 2 +-
 pkgs/tools/graphics/vkbasalt/default.nix                      | 2 +-
 pkgs/tools/misc/esphome/default.nix                           | 2 +-
 pkgs/tools/misc/jsonwatch/default.nix                         | 2 +-
 pkgs/tools/misc/moreutils/default.nix                         | 2 +-
 pkgs/tools/misc/mpremote/default.nix                          | 2 +-
 pkgs/tools/misc/opentimestamps-client/default.nix             | 2 +-
 pkgs/tools/misc/pandoc-include/default.nix                    | 2 +-
 pkgs/tools/misc/pdd/default.nix                               | 2 +-
 pkgs/tools/misc/pgbadger/default.nix                          | 2 +-
 pkgs/tools/misc/remote-exec/default.nix                       | 2 +-
 pkgs/tools/misc/sshx/default.nix                              | 2 +-
 .../misc/steampipe-packages/steampipe-plugin-aws/default.nix  | 2 +-
 .../steampipe-packages/steampipe-plugin-azure/default.nix     | 2 +-
 .../steampipe-packages/steampipe-plugin-github/default.nix    | 2 +-
 pkgs/tools/misc/uutils-coreutils/default.nix                  | 2 +-
 pkgs/tools/misc/valeronoi/default.nix                         | 2 +-
 pkgs/tools/networking/fast-ssh/default.nix                    | 2 +-
 pkgs/tools/networking/innernet/default.nix                    | 2 +-
 pkgs/tools/networking/ivpn/default.nix                        | 2 +-
 pkgs/tools/networking/octodns/default.nix                     | 2 +-
 pkgs/tools/networking/octodns/providers/gandi/default.nix     | 2 +-
 pkgs/tools/networking/octodns/providers/powerdns/default.nix  | 2 +-
 pkgs/tools/networking/s3cmd/default.nix                       | 2 +-
 pkgs/tools/package-management/libdnf/default.nix              | 2 +-
 pkgs/tools/package-management/protontricks/default.nix        | 2 +-
 pkgs/tools/security/aflplusplus/default.nix                   | 2 +-
 pkgs/tools/security/cnspec/default.nix                        | 2 +-
 pkgs/tools/security/cve-bin-tool/default.nix                  | 2 +-
 pkgs/tools/security/cyclonedx-gomod/default.nix               | 2 +-
 pkgs/tools/security/deepsecrets/default.nix                   | 2 +-
 pkgs/tools/security/feroxbuster/default.nix                   | 2 +-
 pkgs/tools/security/ggshield/default.nix                      | 2 +-
 pkgs/tools/security/gowitness/default.nix                     | 2 +-
 pkgs/tools/security/maigret/default.nix                       | 2 +-
 pkgs/tools/security/metasploit/default.nix                    | 2 +-
 pkgs/tools/security/nitrokey-app/default.nix                  | 2 +-
 pkgs/tools/security/pcsc-tools/default.nix                    | 2 +-
 pkgs/tools/security/rustscan/default.nix                      | 2 +-
 pkgs/tools/security/sbomnix/default.nix                       | 2 +-
 pkgs/tools/security/sslscan/default.nix                       | 2 +-
 pkgs/tools/security/tracee/default.nix                        | 2 +-
 pkgs/tools/security/trufflehog/default.nix                    | 2 +-
 pkgs/tools/text/mdbook-mermaid/default.nix                    | 2 +-
 pkgs/tools/virtualization/cloud-init/default.nix              | 2 +-
 4669 files changed, 4740 insertions(+), 4740 deletions(-)

diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
index cb1e046fbe48..dc9fb72f4425 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/applications/audio/greg/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "manolomartinez";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
   };
 
diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix
index 6340678de13c..ef6d8402ce49 100644
--- a/pkgs/applications/audio/littlegptracker/default.nix
+++ b/pkgs/applications/audio/littlegptracker/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "djdiskmachine";
     repo = "littlegptracker";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE=";
   };
 
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index dd3473c069b4..c0d130b421ca 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ=";
   };
 
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 415e1ce8425e..4daeee6d4cb3 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "puddletag";
     repo = "puddletag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8=";
   };
 
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 77045ea36dfb..fdcfc0a8005e 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg=";
   };
diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix
index 83a76824e405..aca54f83db43 100644
--- a/pkgs/applications/editors/lapce/default.nix
+++ b/pkgs/applications/editors/lapce/default.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lapce";
     repo = "lapce";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y=";
   };
 
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index 56802dde7cd5..85b7ae070a43 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "olivierkes";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/Ryvv5mHdZ3iwMpZjOa62h8D2B00pzknJ70DfjDTPPA=";
   };
 
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index 095447a17a40..480be18986c8 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "retext-project";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68=";
   };
 
diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix
index 290f2f2a0f6c..b7aae1d4c7c0 100644
--- a/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-5Eir8EQPGVSg2QXzzuHH9lf7CrV76KwmRsHiDqs6tD4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix
index f8ee5bf288d0..71157b656031 100644
--- a/pkgs/applications/graphics/eddy/default.nix
+++ b/pkgs/applications/graphics/eddy/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "obdasystems";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vRmLUIqU0qfcnKzymBGb9gfM/uQiAcUHUnyz8iH/GrM=";
   };
 
diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index b476a11d4993..924ff6866d92 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "f3d-app";
     repo = "f3d";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S3eigdW6rkDRSm4uCCTFHx5fhJGNVWpAAAKboougr08=";
   };
 
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 33d595fd2ea0..cb23ed7f17d7 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i9XeZJgB0oDimoc0D5UTYSBs9C55QXC6HIxv2gP8vWY=";
   };
 
diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
index d511395889b0..084edb23f2db 100644
--- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
@@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fablabnbg";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0=";
   };
 
diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix
index 312d018c13b4..09221bd35996 100644
--- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "textext";
     repo = "textext";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-JbI/ScCFCvHbK9JZzHuT67uSAL3546et+gtTkwRnCSE=";
   };
 
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index ff49948bdb14..8e42bb6d43ad 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "otfried";
     repo = "ipe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
   };
 
diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix
index f2d6b680be34..ece410684697 100644
--- a/pkgs/applications/misc/cask-server/default.nix
+++ b/pkgs/applications/misc/cask-server/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nitrux";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-XUgLtZMcvzGewtUcgu7FbBCn/1zqOjWvw2AI9gUwWkc=";
   };
 
diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix
index 385910f68010..8393de6e9999 100644
--- a/pkgs/applications/misc/databricks-sql-cli/default.nix
+++ b/pkgs/applications/misc/databricks-sql-cli/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sql-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wmwXw1o+pRsRjA7ai9x5o1el7mNBqM6xlGrvw0IqfMo=";
   };
 
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 89579d62a4f9..2cdcfef62bac 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Electron-Cash";
     repo = "Electron-Cash";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo=";
   };
 
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index e6fde4b0a7a9..7888db1a27d6 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -40,7 +40,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GoldenCheetah";
     repo = "GoldenCheetah";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
   };
 
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index c26b63f5ec30..91e1e5853cf8 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -33,7 +33,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gramps-project";
     repo = "gramps";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8=";
   };
 
diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix
index 154c36cd7718..8692e4ad735b 100644
--- a/pkgs/applications/misc/html5validator/default.nix
+++ b/pkgs/applications/misc/html5validator/default.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "svenkreiss";
     repo = "html5validator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yvclqE4+2R9q/UJU9W95U1/xVJeNj+5eKvT6VQel9k8=";
   };
 
diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix
index b23d544071ac..cf0a61e62fbc 100644
--- a/pkgs/applications/misc/inkcut/default.nix
+++ b/pkgs/applications/misc/inkcut/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
   };
 
diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix
index e295ba09bf4d..87d388e02d29 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/applications/misc/maliit-framework/default.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maliit";
     repo = "framework";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY=";
   };
 
diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix
index 962df1d4dfb9..bbfadd2bb105 100644
--- a/pkgs/applications/misc/mbutil/default.nix
+++ b/pkgs/applications/misc/mbutil/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "mbutil";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vxAF49NluEI/cZMUv1dlQBpUh1jfZ6KUVkYAmFAWphk=";
   };
 
diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix
index 6406abad27bb..d694ecdfd874 100644
--- a/pkgs/applications/misc/meerk40t/default.nix
+++ b/pkgs/applications/misc/meerk40t/default.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "meerk40t";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dybmbmEvvTka0wMBIUDYemqDaCvG9odgCbIWYhROJLI=";
   };
 
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index 3a8f03259f21..e8642f86ded2 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenLightingProject";
     repo = "ola";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU=";
   };
 
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
index 611c9b002ed7..84164c0b04f0 100644
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/applications/misc/pagefind/default.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloudcannon";
     repo = "pagefind";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk=";
   };
 
diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix
index 5831773cfd8c..780ac1b91bcf 100644
--- a/pkgs/applications/misc/remarkable/rmview/default.nix
+++ b/pkgs/applications/misc/remarkable/rmview/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bordaigorl";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-V26zmu8cQkLs0IMR7eFO8x34McnT3xYyzlZfntApYkk=";
   };
 
diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix
index e1cb6a1e61bf..4e69d743cd05 100644
--- a/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/pkgs/applications/misc/rofi-rbw/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fdw";
     repo = "rofi-rbw";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wUb89GkNB2lEfb42hMvcxpbjc1O+wx8AkFjq7aJwAko=";
   };
 
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 1826209e2ced..9c0addbf085d 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gk18N8iJve4lznkUb93Qzdgl93fTCOZCAXqm1BjsDak=";
   };
 
diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix
index 41a8fc4cbe74..dcdc0128c1be 100644
--- a/pkgs/applications/networking/cluster/tftui/default.nix
+++ b/pkgs/applications/networking/cluster/tftui/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "idoavrah";
     repo = "terraform-tui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4=";
   };
 
diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/applications/networking/cluster/tubekit/default.nix
index 7dcbf5c6c975..7a20bfe64543 100644
--- a/pkgs/applications/networking/cluster/tubekit/default.nix
+++ b/pkgs/applications/networking/cluster/tubekit/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "reconquest";
     repo = "tubekit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fUe5bMFF569A9Xdx3bfQH2DzbQDRfZ+ewlDL+gK2gWw=";
   };
 
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 795a252ef043..ea7272336557 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martinrotter";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-eF0jPT0gQnnBWu9IKfY0DwMwotL3IEjovqnQqx9v2NA=";
   };
 
diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix
index 90ad50006bae..2b3e9cf7d2aa 100644
--- a/pkgs/applications/networking/gopher/phetch/default.nix
+++ b/pkgs/applications/networking/gopher/phetch/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xvxx";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ=";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
index 807d8f9fbbb6..0e0572d1830f 100644
--- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Xithrius";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QwFCabksDG+G7nfQPtxshd4n71Dj/uKOGRRutnZxECM=";
   };
 
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 0027fe8804de..26ec805cb557 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral-qt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc=";
   };
 
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 047e86036d08..240979abe9d2 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pjsip";
     repo = "pjproject";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
   };
 
diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix
index 3c896200c98d..a06d76503eb0 100644
--- a/pkgs/applications/networking/protonvpn-cli/default.nix
+++ b/pkgs/applications/networking/protonvpn-cli/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "protonvpn";
     repo = "linux-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";
   };
 
diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix
index d81a48a9cf33..b9df3bd1faeb 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/applications/networking/protonvpn-gui/default.nix
@@ -27,7 +27,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+UnMsjIJ0M1YiF+BcY7RObUoCeDZGtE0ul6KBaODzeY=";
   };
 
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 1d21cc6c2528..a86bd5899076 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Syncplay";
     repo = "syncplay";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ipo027XyN4BpMkxzXznbnaufsaG/YkHxFJYo+XWzbyE=";
   };
 
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 10c5fda3c15c..8c0e1ef2ca79 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -18,7 +18,7 @@ let
       src = fetchFromGitHub {
         owner = "syncthing";
         repo = "syncthing";
-        rev = "refs/tags/v${version}";
+        tag = "v${version}";
         hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI=";
       };
 
diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix
index bee27ef2a743..0725ae0b53db 100644
--- a/pkgs/applications/networking/twtxt/default.nix
+++ b/pkgs/applications/networking/twtxt/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "buckket";
     repo = "twtxt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw=";
   };
 
diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
index 028c5bad8aea..e8ad77bca307 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ealbiter";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Rym7neluRbYCpuezRQyLc6gSl3xbVR9fvhOxxW5+Nzo=";
   };
 
diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix
index 86a9c52dbb29..b4e6e30961bb 100644
--- a/pkgs/applications/radio/btlejack/default.nix
+++ b/pkgs/applications/radio/btlejack/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "virtualabs";
     repo = "btlejack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Q6y9murV1o2i1sluqTVB5+X3B7ywFsI0ZvlJjHrHSpo=";
   };
 
diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix
index b3bd3ed4ae9f..659462ffebf8 100644
--- a/pkgs/applications/science/astronomy/calcmysky/default.nix
+++ b/pkgs/applications/science/astronomy/calcmysky/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "10110111";
     repo = "CalcMySky";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-18ZNnLK2zMT7P0MDXS6Z38LffE8EqXKBH89TPPxVWlo=";
   };
 
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index 6316458e1c28..fabcfbd708dd 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ANTsX";
     repo = "ANTs";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY=";
   };
 
diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix
index 7b107029dd20..ba268b46faad 100644
--- a/pkgs/applications/science/biology/mrtrix/default.nix
+++ b/pkgs/applications/science/biology/mrtrix/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MRtrix3";
     repo = "mrtrix3";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix
index 1a0549ea68a3..f29069bed2fa 100644
--- a/pkgs/applications/science/chemistry/autodock-vina/default.nix
+++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ccsb-scripps";
     repo = "autodock-vina";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yguUMEX0tn75wKrPKyqlCYbBFaEwC5b1s3k9xept1Fw=";
   };
 
diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix
index cfe7606cbbb0..19e76f532765 100644
--- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix
+++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cvut";
     repo = "qtrvsim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+EpPDA2+mBTdQjq6i9TN11yeXqvJA28JtmdNihM1a/U=";
   };
 
diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/applications/science/electronics/degate/default.nix
index 478e1b78ab25..5e328890d48d 100644
--- a/pkgs/applications/science/electronics/degate/default.nix
+++ b/pkgs/applications/science/electronics/degate/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DegateCommunity";
     repo = "Degate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-INoA3Z6ya03ZMn6E+nOCkXZLoxoo2WgPDw9v5miI09A=";
   };
 
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index cf0dfe7e43f9..66e7a5cdbeee 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "gerbv";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sr48RGLYcMKuyH9p+5BhnR6QpKBvNOqqtRryw3+pbBk=";
   };
 
diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix
index 4298c889c74f..b6e27482ee59 100644
--- a/pkgs/applications/science/misc/nextinspace/default.nix
+++ b/pkgs/applications/science/misc/nextinspace/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "not-stirred";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CrhzCvIA3YAFsWvdemvK1RLMacsM5RtgMjLeiqz5MwY=";
   };
 
diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index bca0c81a7b70..ff3cee1e5f59 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ArduPilot";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI=";
   };
 
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index b06a83dab70b..3085d9920bf9 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -31,7 +31,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8Jm6DE3B7OQkaNwX/KwXMNZHUyvPtln8mJYaD6yzJRM=";
   };
 
diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
index 5386ae950e34..ee47e968d8b0 100644
--- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
+++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Swordfish90";
     repo = "cool-retro-term";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c=";
   };
 
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index dee1115cb404..8e788f270867 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -41,7 +41,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0M4Bvhh3j9vPedE/d+8zaiZdET4mXcrSNUgLllhaPJw=";
   };
 
diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index b4c077fb2038..7f598867b602 100644
--- a/pkgs/applications/version-management/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tummychow";
     repo = "git-absorb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU=";
   };
 
diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix
index 2cfc9613e864..ec27bc6ecf34 100644
--- a/pkgs/applications/version-management/gitlint/default.nix
+++ b/pkgs/applications/version-management/gitlint/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jorisroovers";
     repo = "gitlint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4SGkkC4LjZXTDXwK6jMOIKXR1qX76CasOwSqv8XUrjs=";
   };
 
diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix
index 8f96bc2b58b8..9d4ab973c19d 100644
--- a/pkgs/applications/version-management/pass-git-helper/default.nix
+++ b/pkgs/applications/version-management/pass-git-helper/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "languitar";
     repo = "pass-git-helper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-DLH3l4wYfBlrc49swLgyHeZXebJ5JSzU7cHjD7Hmw0g=";
   };
 
diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix
index f62d1cfef798..d203d8b62400 100644
--- a/pkgs/applications/video/go2tv/default.nix
+++ b/pkgs/applications/video/go2tv/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexballas";
     repo = "go2tv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NCfr6FXxHFFTe9l7K68MkKU71Hu/vWQFZcJXFAB94q8=";
   };
 
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index fe1b77937e00..cb2a57bfb609 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -21,7 +21,7 @@ let
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zZZ7C/1+Qh7KS1WJ8YWkhFgw0+UHJhjk+145u9/TBcI=";
   };
 in
diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix
index 3b82e4621add..2dae6a3d221e 100644
--- a/pkgs/applications/video/plex-mpv-shim/default.nix
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo=";
   };
 
diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix
index 45818f48166e..fc22d8988eae 100644
--- a/pkgs/applications/video/rtabmap/default.nix
+++ b/pkgs/applications/video/rtabmap/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "introlab";
     repo = "rtabmap";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk=";
   };
 
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index 7459a96393f9..adfa29198ed4 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cage-kiosk";
     repo = "cage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g=";
   };
 
diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
index 02f72471e876..8eaaadb3a86e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "loqusion";
     repo = "hyprshade";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MlbNE9n//Qb6OJc3DMkOpnPtoodfV8JlG/I5rOfWMtQ=";
   };
 
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index 09ff2fdc42a5..9da0df03294b 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -32,7 +32,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "xdg-desktop-portal-hyprland";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sAObJHBZjJHzYR62g+BLNBNq19cqb5LTw73H8m57K0w=";
   };
 
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index e9d44fae06a0..fdb0eb33f94a 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "i3";
     repo = "i3";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-2tuhfB/SMN+osCBfZtw/yDPhNNEhBH4Qo6dexpqVWYk=";
   };
 
diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 97b1ccc6595e..6d82fe749013 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "1oom-fork";
     repo = "1oom";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xEHFuCOyuWmee6kgOc0WUk1iWWFqfFb42F7shGZmutQ=";
   };
 
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 90899330ea3d..dc3fc2e45384 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "HarbourMasters";
     repo = "2ship2harkinian";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1iSFzroKxwFpsIGNMetSlQKTKRWCy7QtgCTepFdSeY8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/aa/aactivator/package.nix b/pkgs/by-name/aa/aactivator/package.nix
index 776b9e2d6dd6..7755f43e2fd1 100644
--- a/pkgs/by-name/aa/aactivator/package.nix
+++ b/pkgs/by-name/aa/aactivator/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "aactivator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vnBDtLEvU1jHbb5/MXAulXaBaugdCZdLQSP2b8P6SiQ=";
   };
 
diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix
index 3aa646dced06..4577c477e8d6 100644
--- a/pkgs/by-name/ab/abcmidi/package.nix
+++ b/pkgs/by-name/ab/abcmidi/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sshlien";
     repo = "abcmidi";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-8kzgojLwVVFjpWiQ1/0S3GCVU8oEpoFItjtRDByauDg=";
   };
 
diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix
index 4b11e5c8bd12..f078176f0529 100644
--- a/pkgs/by-name/ab/abctl/package.nix
+++ b/pkgs/by-name/ab/abctl/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "airbytehq";
     repo = "abctl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw=";
   };
 
diff --git a/pkgs/by-name/ab/above/package.nix b/pkgs/by-name/ab/above/package.nix
index 3fe3dbe49237..d48a50417090 100644
--- a/pkgs/by-name/ab/above/package.nix
+++ b/pkgs/by-name/ab/above/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "casterbyte";
     repo = "Above";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tOSAci9aIALNCL3nLui96EdvqjNxnnuj2/dMdWLY9yI=";
   };
 
diff --git a/pkgs/by-name/ab/abpoa/package.nix b/pkgs/by-name/ab/abpoa/package.nix
index cecdcbc923a0..8cef3f0efb35 100644
--- a/pkgs/by-name/ab/abpoa/package.nix
+++ b/pkgs/by-name/ab/abpoa/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "yangao07";
     repo = "abPOA";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-90mkXp4cC0Omnx0C7ab7NNs/M2oedIcICTUJl3qhcyo=";
   };
 
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "SIMD-based C library for fast partial order alignment using adaptive band";
     homepage = "https://github.com/yangao07/abPOA";
-    changelog = "https://github.com/yangao07/abPOA/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/yangao07/abPOA/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
     mainProgram = "abpoa";
diff --git a/pkgs/by-name/ac/ac-library/package.nix b/pkgs/by-name/ac/ac-library/package.nix
index 6e3cebd0becd..45e8b2e771fd 100644
--- a/pkgs/by-name/ac/ac-library/package.nix
+++ b/pkgs/by-name/ac/ac-library/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "atcoder";
     repo = "ac-library";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-AIqG98c1tcxxhYcX+NSf6Rw3onw61T5NTZtqQzT9jls=";
   };
 
diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix
index 35224cd62bff..7281467bdbd5 100644
--- a/pkgs/by-name/ac/acme-sh/package.nix
+++ b/pkgs/by-name/ac/acme-sh/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "acmesh-official";
     repo = "acme.sh";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BPZ+5xvKqEaz+tkccVL0hEDAxLkICW5O+qPf73bOqRU=";
   };
 
diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix
index dccf6f5122b9..7211b45c70ee 100644
--- a/pkgs/by-name/ac/acpica-tools/package.nix
+++ b/pkgs/by-name/ac/acpica-tools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "acpica";
     repo = "acpica";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-vxiWYUAEk54F1M0WrrMTHZ4DNJxxT/GaXetd5LjE808=";
   };
 
diff --git a/pkgs/by-name/ac/acr-cli/package.nix b/pkgs/by-name/ac/acr-cli/package.nix
index 51df14afc5a9..cd5e5121e5a4 100644
--- a/pkgs/by-name/ac/acr-cli/package.nix
+++ b/pkgs/by-name/ac/acr-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "acr-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h4vRtxAu/ggEu5HuzaiEoLslOyAXP1rMI1/ua9YARug=";
   };
 
diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix
index 7b85786b43c7..c5485fdc2e66 100644
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@@ -17,7 +17,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "nektos";
     repo = "act";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7e2ehUM3d5hcFtaahW/hrhVkpy74ufMdYwdnbsUA+WM=";
   };
 
diff --git a/pkgs/by-name/ad/ad/package.nix b/pkgs/by-name/ad/ad/package.nix
index f3a7b23f313e..a1af89096e34 100644
--- a/pkgs/by-name/ad/ad/package.nix
+++ b/pkgs/by-name/ad/ad/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sminez";
     repo = "ad";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c2oSQ81qCZbwUl4TqovDWm8TUqI6RdrQPvoP/FaTI/A=";
   };
 
diff --git a/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix
index 00d0d8052ab0..ef5abcf85152 100644
--- a/pkgs/by-name/ad/adafruit-nrfutil/package.nix
+++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "Adafruit_nRF52_nrfutil";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4=";
   };
 
diff --git a/pkgs/by-name/ad/adalanche/package.nix b/pkgs/by-name/ad/adalanche/package.nix
index 7b81c370f22c..b3d87bf15945 100644
--- a/pkgs/by-name/ad/adalanche/package.nix
+++ b/pkgs/by-name/ad/adalanche/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lkarlslund";
     repo = "adalanche";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SJa2PQCXTYdv5jMucpJOD2gC7Qk2dNdINHW4ZvLXSLw=";
   };
 
diff --git a/pkgs/by-name/ad/addwater/package.nix b/pkgs/by-name/ad/addwater/package.nix
index 90e6173d5e58..98c4c687fd24 100644
--- a/pkgs/by-name/ad/addwater/package.nix
+++ b/pkgs/by-name/ad/addwater/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "largestgithubuseronearth";
     repo = "addwater";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5iuSRA18TWj6naw5MraGZ1Y9OUWEVg2oKqQtkC8rMWw=";
   };
 
diff --git a/pkgs/by-name/ad/adminer-pematon/package.nix b/pkgs/by-name/ad/adminer-pematon/package.nix
index cc9936831ce2..2529fc4cf338 100644
--- a/pkgs/by-name/ad/adminer-pematon/package.nix
+++ b/pkgs/by-name/ad/adminer-pematon/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pematon";
     repo = "adminer";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ExCHEsZ+VFmrom3632/1OOjb3zbZgiaZJDapBkBGUnQ=";
   };
 
diff --git a/pkgs/by-name/ad/adolc/package.nix b/pkgs/by-name/ad/adolc/package.nix
index 96ac820471a2..d74245b104e7 100644
--- a/pkgs/by-name/ad/adolc/package.nix
+++ b/pkgs/by-name/ad/adolc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "coin-or";
     repo = "ADOL-C";
-    rev = "refs/tags/releases/${finalAttrs.version}";
+    tag = "releases/${finalAttrs.version}";
     hash = "sha256-oU229SuOl/gHoRT8kiWfd5XFiByjeypgdVWFLMYFHfA=";
   };
 
diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
index c8676942c34e..ef748bc77dae 100644
--- a/pkgs/by-name/ad/adw-gtk3/package.nix
+++ b/pkgs/by-name/ad/adw-gtk3/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "adw-gtk3";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-S/H6JGXwEgiqmcH1W+ZyHYOkk0gQtKG9Q3BiI2IjnEM=";
   };
 
diff --git a/pkgs/by-name/ad/adwsteamgtk/package.nix b/pkgs/by-name/ad/adwsteamgtk/package.nix
index 2baa58d3c93b..2818f3843078 100644
--- a/pkgs/by-name/ad/adwsteamgtk/package.nix
+++ b/pkgs/by-name/ad/adwsteamgtk/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Foldex";
     repo = "AdwSteamGtk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DI5WK8CtoyH8hSogQx5/oDCrGoLxE06cy63ubU+e3bQ=";
   };
 
diff --git a/pkgs/by-name/ae/aeacus/package.nix b/pkgs/by-name/ae/aeacus/package.nix
index 07a75a2d3a3c..b1264a51eb4b 100644
--- a/pkgs/by-name/ae/aeacus/package.nix
+++ b/pkgs/by-name/ae/aeacus/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "elysium-suite";
     repo = "aeacus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LMsfogcz3CoShQDqyshMshb+iz2r0k5I7NDLXevMakI=";
   };
 
diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index e073d569ea2f..1a9deb7e2120 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "Aider-AI";
       repo = "aider";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-wGm6JV9ISRi/p1lA3JyzOdHQKFHFxEhfr+NdShUxm0M=";
     };
 
diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix
index ce66080a27b1..bee53975d4ab 100644
--- a/pkgs/by-name/ai/aiodnsbrute/package.nix
+++ b/pkgs/by-name/ai/aiodnsbrute/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "blark";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cEpk71VoQJZfKeAZummkk7yjtXKSMndgo0VleYiMlWE=";
   };
 
diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix
index cea1d37fd493..d64fb45373fa 100644
--- a/pkgs/by-name/ai/airgeddon/package.nix
+++ b/pkgs/by-name/ai/airgeddon/package.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "v1s1t0r1sh3r3";
     repo = "airgeddon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3Rx1tMRIpSk+IEJGOs+t+kDlvGHYOx1IOSi+663uzrw=";
   };
 
diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix
index f063495c72a9..87beccf94e9d 100644
--- a/pkgs/by-name/ai/airgorah/package.nix
+++ b/pkgs/by-name/ai/airgorah/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "martin-olivier";
     repo = "airgorah";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA=";
   };
 
diff --git a/pkgs/by-name/ai/airscan/package.nix b/pkgs/by-name/ai/airscan/package.nix
index bdc11a126770..fe1027fb7c55 100644
--- a/pkgs/by-name/ai/airscan/package.nix
+++ b/pkgs/by-name/ai/airscan/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "stapelberg";
     repo = "airscan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gk0soDzrsFBh+SrWcfO/quW6JweX6MthOigTHcaq1oE=";
   };
 
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 508d26bace0b..67f349bf7ef3 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE=";
   };
 
diff --git a/pkgs/by-name/al/albedo/package.nix b/pkgs/by-name/al/albedo/package.nix
index 7b63f9e7040f..da0c2ffb7648 100644
--- a/pkgs/by-name/al/albedo/package.nix
+++ b/pkgs/by-name/al/albedo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coreruleset";
     repo = "albedo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HMW0SIcPDCy2QNfxpMke+/d1XCNpyx6RL6RCZAmU+WE=";
   };
 
diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix
index 11120d87ade3..35336e223729 100644
--- a/pkgs/by-name/al/alcom/package.nix
+++ b/pkgs/by-name/al/alcom/package.nix
@@ -24,7 +24,7 @@ let
   src = fetchFromGitHub {
     owner = "vrc-get";
     repo = "vrc-get";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-jkhjJTb/U2dXj/vyaip+gWoqIOdfFKSExeDl0T11DE4=";
   };
diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix
index 7acc0ca83b85..05f6a01aea7a 100644
--- a/pkgs/by-name/al/alexandria/package.nix
+++ b/pkgs/by-name/al/alexandria/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "btpf";
     repo = "Alexandria";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-18i3/HLTfhBSa9/c55dCOfFal+V40wcHcLoYt1dU+d0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/al/ali/package.nix b/pkgs/by-name/al/ali/package.nix
index effa23aaafca..b95e1382960b 100644
--- a/pkgs/by-name/al/ali/package.nix
+++ b/pkgs/by-name/al/ali/package.nix
@@ -11,7 +11,7 @@ buildGo122Module rec {
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = "ali";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/pdHlI20IzSTX2pnsbxPiJiWmOCbp13eJWLi0Tcsueg=";
   };
 
diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index c6f762de988e..386958b88836 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HccUA4+es9M7PZUTqWvIb3xNxmOeyI2iw5bG316RgLE=";
   };
 
diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index 30fd5d09df9d..fa0fcad30e8e 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "alioth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU=";
   };
 
diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 13028533d773..e2ba073fa636 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AlistGo";
     repo = "alist";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DzqSkcyDRyiHM0yh7A+dZj7TnjhDVQoHHgV5piVcu1g=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix
index 706492caa853..6c7e2c516ff1 100644
--- a/pkgs/by-name/al/almo/package.nix
+++ b/pkgs/by-name/al/almo/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "abap34";
     repo = "almo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc=";
   };
 
diff --git a/pkgs/by-name/al/alock/package.nix b/pkgs/by-name/al/alock/package.nix
index cf331fe6f3a1..e00ef5e9c2ad 100644
--- a/pkgs/by-name/al/alock/package.nix
+++ b/pkgs/by-name/al/alock/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Arkq";
     repo = "alock";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xfPhsXZrTlEqea75SvacDfjM9o21MTudrqfNN9xtdcg=";
   };
 
diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix
index 90ceff591aba..c720e0b8374e 100644
--- a/pkgs/by-name/al/alot/package.nix
+++ b/pkgs/by-name/al/alot/package.nix
@@ -29,7 +29,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "alot";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc=";
   };
 
diff --git a/pkgs/by-name/al/alsaequal/package.nix b/pkgs/by-name/al/alsaequal/package.nix
index d90c73845f6e..924e9ca0b47d 100644
--- a/pkgs/by-name/al/alsaequal/package.nix
+++ b/pkgs/by-name/al/alsaequal/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bassdr";
     repo = "alsaequal";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g=";
   };
 
diff --git a/pkgs/by-name/al/alterx/package.nix b/pkgs/by-name/al/alterx/package.nix
index 08acb62ad0b3..035db050cbf3 100644
--- a/pkgs/by-name/al/alterx/package.nix
+++ b/pkgs/by-name/al/alterx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "alterx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A01XROFB2NkArfFtRMv/r9Nu5QoKMTOVzVIUnFoVe78=";
   };
 
diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix
index 485f286e173e..ed54af5d83bb 100644
--- a/pkgs/by-name/al/alttpr-opentracker/package.nix
+++ b/pkgs/by-name/al/alttpr-opentracker/package.nix
@@ -22,7 +22,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "trippsc2";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg==";
   };
 
diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix
index 8110d66e4d06..61186040a144 100644
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "alvr-org";
     repo = "ALVR";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true; #TODO devendor openvr
     hash = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8=";
   };
diff --git a/pkgs/by-name/am/amass/package.nix b/pkgs/by-name/am/amass/package.nix
index bd2809791596..e7aa091c3bff 100644
--- a/pkgs/by-name/am/amass/package.nix
+++ b/pkgs/by-name/am/amass/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lhvU2fUnjQ+D+EZDRircNg/np4Ynk+HzOBgxT1L8BaQ=";
   };
 
diff --git a/pkgs/by-name/am/amazon-ec2-utils/package.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix
index 27fdef05c1a8..889a7f8280ba 100644
--- a/pkgs/by-name/am/amazon-ec2-utils/package.nix
+++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amazonlinux";
     repo = "amazon-ec2-utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg=";
   };
 
diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
index e8327b415654..0f9544044be8 100644
--- a/pkgs/by-name/am/amazon-ssm-agent/package.nix
+++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -47,7 +47,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ssm-agent";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0=";
   };
 
diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix
index 07aa2de99711..fc6e5a6f3570 100644
--- a/pkgs/by-name/am/ameba/package.nix
+++ b/pkgs/by-name/am/ameba/package.nix
@@ -11,7 +11,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "crystal-ameba";
     repo = "ameba";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NwmsNz9YfHDk0hVwVb5zczuzvErrwPhd3rs75t/Fj+I=";
   };
 
diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix
index 82c9c2a8aac6..bfbf88632bcf 100644
--- a/pkgs/by-name/am/amiberry/package.nix
+++ b/pkgs/by-name/am/amiberry/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BlitterStudio";
     repo = "amiberry";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64=";
   };
 
diff --git a/pkgs/by-name/am/amneziawg-tools/package.nix b/pkgs/by-name/am/amneziawg-tools/package.nix
index a21bb621b123..c9551fbc92bb 100644
--- a/pkgs/by-name/am/amneziawg-tools/package.nix
+++ b/pkgs/by-name/am/amneziawg-tools/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-tools";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-y6xkOLT9KVD6ACCH60Myk2iA1S8/+tGXEQbOYnu+dPI=";
   };
 
diff --git a/pkgs/by-name/an/andi/package.nix b/pkgs/by-name/an/andi/package.nix
index 85b9cbdf5a13..06efb791d54e 100644
--- a/pkgs/by-name/an/andi/package.nix
+++ b/pkgs/by-name/an/andi/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "evolbioinf";
     repo = "andi";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tjQ9exFyqu/xnbUGpF6k0kE5C1D93kISjRErwHfjW9E=";
   };
 
diff --git a/pkgs/by-name/an/ani-skip/package.nix b/pkgs/by-name/an/ani-skip/package.nix
index 6302ec58ec2e..a42bac4297a8 100644
--- a/pkgs/by-name/an/ani-skip/package.nix
+++ b/pkgs/by-name/an/ani-skip/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "synacktraa";
     repo = "ani-skip";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-VEEG3d6rwTAS7/+gBKHFKIg9zFfBu5eBOu6Z23621gM=";
   };
 
diff --git a/pkgs/by-name/an/ansible-language-server/package.nix b/pkgs/by-name/an/ansible-language-server/package.nix
index 246ba733302f..d5cb48dce265 100644
--- a/pkgs/by-name/an/ansible-language-server/package.nix
+++ b/pkgs/by-name/an/ansible-language-server/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "ansible";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e6cOWoryOxWnl8q62rlGmSgwLVnoxLMwNFoGlUZw2bQ=";
   };
 
diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix
index 5c23c18588a8..a83b1f09bede 100644
--- a/pkgs/by-name/an/antares/package.nix
+++ b/pkgs/by-name/an/antares/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "antares-sql";
     repo = "antares";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g=";
   };
 
diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix
index 63a0993084e2..b9e16e48b40f 100644
--- a/pkgs/by-name/an/antiprism/package.nix
+++ b/pkgs/by-name/an/antiprism/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "antiprism";
     repo = "antiprism";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-0FkaIsZixYHP45H0gytnzlpRvNd8mMYjW22w15z3RH8=";
   };
 
diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index 20c446c38ba4..2a39d54a2494 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "incubator-answer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nS3ZDwY221axzo1HAz369f5jWZ/mpCn4r3OPPqjiohI=";
   };
 
diff --git a/pkgs/by-name/ap/apachetomcatscanner/package.nix b/pkgs/by-name/ap/apachetomcatscanner/package.nix
index 31e5546fd02b..9abec5a1ea22 100644
--- a/pkgs/by-name/ap/apachetomcatscanner/package.nix
+++ b/pkgs/by-name/ap/apachetomcatscanner/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = "ApacheTomcatScanner";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8=";
   };
 
diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix
index 53b374f77975..a8f5c2c89f47 100644
--- a/pkgs/by-name/ap/apfsprogs/package.nix
+++ b/pkgs/by-name/ap/apfsprogs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "linux-apfs";
     repo = "apfsprogs";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rolbBLdE98jqlKC06fTo6eJU3abKzgB3QIlaw4bza9U=";
   };
 
diff --git a/pkgs/by-name/ap/apgdiff/package.nix b/pkgs/by-name/ap/apgdiff/package.nix
index 0e09c9bb92bd..23f2213939e3 100644
--- a/pkgs/by-name/ap/apgdiff/package.nix
+++ b/pkgs/by-name/ap/apgdiff/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
     sparseCheckout = [ "src" ];
     owner = "fordfrog";
     repo = "apgdiff";
-    rev = "refs/tags/release_${version}";
+    tag = "release_${version}";
     hash = "sha256-2m+9QNwQV2tJwOabTXE2xjRB5gDrSwyL6zL2op+wmkM=";
   };
 
diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix
index 2a379da52aaf..865f714265c3 100644
--- a/pkgs/by-name/ap/aphorme/package.nix
+++ b/pkgs/by-name/ap/aphorme/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Iaphetes";
     repo = "aphorme_launcher";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI=";
   };
 
diff --git a/pkgs/by-name/ap/apkid/package.nix b/pkgs/by-name/ap/apkid/package.nix
index b77a81bc56ea..eb496bf43ad3 100644
--- a/pkgs/by-name/ap/apkid/package.nix
+++ b/pkgs/by-name/ap/apkid/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rednaga";
     repo = "APKiD";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yO3k2kT043/KkiCjDnNUlqxX86kQqMZ+CghD+yon3r4=";
   };
 
diff --git a/pkgs/by-name/ap/apkleaks/package.nix b/pkgs/by-name/ap/apkleaks/package.nix
index 17677755409d..b83d71c0c380 100644
--- a/pkgs/by-name/ap/apkleaks/package.nix
+++ b/pkgs/by-name/ap/apkleaks/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dwisiswant0";
     repo = "apkleaks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8P4LZsyq0mSVdE6QhnW3QaaA3UAg4UDBS3jSg7Kg/oY=";
   };
 
diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix
index a63b6b7145ab..693205e6e2a7 100644
--- a/pkgs/by-name/ap/apksigcopier/package.nix
+++ b/pkgs/by-name/ap/apksigcopier/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "obfusk";
     repo = "apksigcopier";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VuwSaoTv5qq1jKwgBTKd1y9RKUzz89n86Z4UBv7Q51o=";
   };
 
diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix
index d9690aa9bdc5..20397508cc5b 100644
--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "antroids";
     repo = "application-title-bar";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-K4wbEWmeXDxVkVSHCPU8u49A211ZXR1As1k47/ibj/c=";
   };
 
diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix
index 1f45f4fb1094..fe9836b41717 100644
--- a/pkgs/by-name/ap/apvlv/package.nix
+++ b/pkgs/by-name/ap/apvlv/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "naihe2010";
     repo = "apvlv";
-    rev = "refs/tags/v0.5.0-final";
+    tag = "v0.5.0-final";
     hash = "sha256-5Wbv3dXieymhhPmEKQu8X/38WsDA1T/IBPoMXdpzcaA=";
   };
 
diff --git a/pkgs/by-name/ar/archimede/package.nix b/pkgs/by-name/ar/archimede/package.nix
index 4db745f62caa..07116fc4be5a 100644
--- a/pkgs/by-name/ar/archimede/package.nix
+++ b/pkgs/by-name/ar/archimede/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "archimede";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7P7PtzYlcNYG2+KW9zvcaRlTW+vHw8jeLD2dEQXmrzc=";
   };
 
diff --git a/pkgs/by-name/ar/arduino-language-server/package.nix b/pkgs/by-name/ar/arduino-language-server/package.nix
index 1ff285ebbe7e..b291aa28eb1f 100644
--- a/pkgs/by-name/ar/arduino-language-server/package.nix
+++ b/pkgs/by-name/ar/arduino-language-server/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "arduino-language-server";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PmPGhbB1HqxZRK+f28SdZNh4HhE0oseYsdJuEAAk90I=";
   };
 
diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix
index b23f13de05ef..a40dfacb5abc 100644
--- a/pkgs/by-name/ar/ares-rs/package.nix
+++ b/pkgs/by-name/ar/ares-rs/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bee-san";
     repo = "ares";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug=";
   };
 
diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo/package.nix
index f3888770286a..6947234dc673 100644
--- a/pkgs/by-name/ar/argo/package.nix
+++ b/pkgs/by-name/ar/argo/package.nix
@@ -39,7 +39,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GRs6xF9/vZi5LdkDA4RkBR6ElvWi0uji/05h0Y7P2eU=";
   };
 
diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix
index 46c6364dc70f..1219fc4fc2d3 100644
--- a/pkgs/by-name/ar/argon/package.nix
+++ b/pkgs/by-name/ar/argon/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "argon-rbx";
     repo = "argon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw=";
   };
 
diff --git a/pkgs/by-name/ar/arjun/package.nix b/pkgs/by-name/ar/arjun/package.nix
index 4c9ffe2fd9cc..b24de04dfaa8 100644
--- a/pkgs/by-name/ar/arjun/package.nix
+++ b/pkgs/by-name/ar/arjun/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "s0md3v";
     repo = "Arjun";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-odVUFs517RSp66MymniSeTKTntQtXomjC68Hhdsglf0=";
   };
 
diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix
index 7da2639a8e21..7d0313f9f23e 100644
--- a/pkgs/by-name/ar/ark-pixel-font/package.nix
+++ b/pkgs/by-name/ar/ark-pixel-font/package.nix
@@ -23,7 +23,7 @@ python312Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TakWolf";
     repo = "ark-pixel-font";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss=";
   };
 
diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
index b9dbbb9f9a1f..88619edad297 100644
--- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
+++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "google-research";
     repo = "arxiv-latex-cleaner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CQb1u1j+/px+vNqA3iXZ2oe6/0ZWeMjWrUQL9elRDEI=";
   };
 
diff --git a/pkgs/by-name/as/ascii-draw/package.nix b/pkgs/by-name/as/ascii-draw/package.nix
index b33e4fa1df7c..ad17218131a4 100644
--- a/pkgs/by-name/as/ascii-draw/package.nix
+++ b/pkgs/by-name/as/ascii-draw/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "ascii-draw";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+K9th1LbESVzAiJqIplWpj2QHt7zDidENs7jHOuJ2S0=";
   };
 
diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix
index 5d917507f9cd..88f05bb5d41a 100644
--- a/pkgs/by-name/as/asn/package.nix
+++ b/pkgs/by-name/as/asn/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nitefood";
     repo = "asn";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI=";
   };
 
diff --git a/pkgs/by-name/as/asnmap/package.nix b/pkgs/by-name/as/asnmap/package.nix
index e4b474100593..7246edd85187 100644
--- a/pkgs/by-name/as/asnmap/package.nix
+++ b/pkgs/by-name/as/asnmap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "asnmap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dGSWUuM4Zcz9QYjYaHur3RYryxe1wJycx/wUL5yqCpM=";
   };
 
diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix
index 926a9ac27d45..88a8bfd55c0d 100644
--- a/pkgs/by-name/au/audible-cli/package.nix
+++ b/pkgs/by-name/au/audible-cli/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mkb79";
     repo = "audible-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AYL7lcYYY7gK12Id94aHRWRlCiznnF4r+lpI5VFpAWY=";
   };
 
diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix
index 61380450349a..dd4235aac3a0 100644
--- a/pkgs/by-name/au/audiness/package.nix
+++ b/pkgs/by-name/au/audiness/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "audiusGmbH";
     repo = "audiness";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+5NDea4p/JWEk305EhAtab3to36a74KR50eosw6c5qI=";
   };
 
diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix
index e5b2e8b5b17e..f7ec693a8fb4 100644
--- a/pkgs/by-name/au/audiobookshelf/package.nix
+++ b/pkgs/by-name/au/audiobookshelf/package.nix
@@ -22,7 +22,7 @@ let
   src = fetchFromGitHub {
     owner = "advplyr";
     repo = "audiobookshelf";
-    rev = "refs/tags/v${source.version}";
+    tag = "v${source.version}";
     inherit (source) hash;
   };
 
diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix
index 304016a12830..abb8be20f472 100644
--- a/pkgs/by-name/au/audion/package.nix
+++ b/pkgs/by-name/au/audion/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "audiusGmbH";
     repo = "audion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA=";
   };
 
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index fb7e20b6e92b..e0226277b571 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IuL/x7gcZj7RVRI3RhnsYgFo1XJ0CRF7sNvgMlLsPd0=";
   };
 
diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index c185b8a27dd2..354b5ebfd4c5 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AdnanHodzic";
     repo = "auto-cpufreq";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Xsh3d7rQY7RKzZ7J0swrgxZEyITb7B3oX5F/tcBGjfk=";
   };
 
diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index 4bfc9ccaabe0..a517327148c8 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2/6IqwMlaWobOlDr/h2WV2OqkxqVmUI65XsyBphTbpA=";
   };
 
diff --git a/pkgs/by-name/au/auto-epp/package.nix b/pkgs/by-name/au/auto-epp/package.nix
index edddaba68e31..48655147f8e1 100644
--- a/pkgs/by-name/au/auto-epp/package.nix
+++ b/pkgs/by-name/au/auto-epp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jothi-prasath";
     repo = "auto-epp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7sI8K+7ZAdzBN/XOzYQQZ1f9t+fFo6fcXYzX6abNyQ8=";
   };
 
diff --git a/pkgs/by-name/au/autobloody/package.nix b/pkgs/by-name/au/autobloody/package.nix
index c583324a88da..a07870e2c239 100644
--- a/pkgs/by-name/au/autobloody/package.nix
+++ b/pkgs/by-name/au/autobloody/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "autobloody";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0MwhdT9GYLcrdZSqszx1DC9lyz8K61lJZZCzeFfWB0E=";
   };
 
diff --git a/pkgs/by-name/au/autorandr/package.nix b/pkgs/by-name/au/autorandr/package.nix
index cd6d1db71f7e..26e0b1c69618 100644
--- a/pkgs/by-name/au/autorandr/package.nix
+++ b/pkgs/by-name/au/autorandr/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "autorandr";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8FMfy3GCN4z/TnfefU2DbKqV3W35I29/SuGGqeOrjNg";
   };
 
diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix
index 85d691a96637..706c01319773 100644
--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "languitar";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ePQiP7NeRBPVHkd8rvbxno/NBX95e9d97F8TIazCUH4=";
   };
 
diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix
index 5378476905e6..6eed1550b31e 100644
--- a/pkgs/by-name/au/autotools-language-server/package.nix
+++ b/pkgs/by-name/au/autotools-language-server/package.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = "autotools-language-server";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V0EOV1ZmeC+4svc2fqV6AIiL37dkrxUJAnjywMZcENw=";
   };
   patches = [
diff --git a/pkgs/by-name/au/autotrash/package.nix b/pkgs/by-name/au/autotrash/package.nix
index c963703a9514..ff5a97a4cd64 100644
--- a/pkgs/by-name/au/autotrash/package.nix
+++ b/pkgs/by-name/au/autotrash/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bneijt";
     repo = "autotrash";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo=";
   };
 
diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix
index e89f7116e118..e7ed15a35725 100644
--- a/pkgs/by-name/av/av1an-unwrapped/package.nix
+++ b/pkgs/by-name/av/av1an-unwrapped/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "master-of-zen";
     repo = "av1an";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Mb5I+9IBwpfmK1w4LstNHI/qsJKlCuRxgSUiqpwUqF0=";
   };
 
diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix
index cba41dac089c..9d3d345e81be 100644
--- a/pkgs/by-name/av/avalanchego/package.nix
+++ b/pkgs/by-name/av/avalanchego/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = "avalanchego";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iedhLVNtwU8wSQIaq0r0fAYGH8fNnCRJW69D7wPdyx0=";
   };
 
diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix
index 9b245baf8418..9708d95c17e7 100644
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "chenxiaolong";
     repo = "avbroot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gG8pR/D5oaPPqq0e815J6z+dDVxh4VSoHIm1Yl3x2p4=";
   };
 
diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix
index f556430666dc..61f1b9790302 100644
--- a/pkgs/by-name/av/avml/package.nix
+++ b/pkgs/by-name/av/avml/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "avml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MIqQ5NRWAfXm7AblsKCrUiaYN5IGUo2jWJMJZL+w3V4=";
   };
 
diff --git a/pkgs/by-name/aw/aws-assume-role/package.nix b/pkgs/by-name/aw/aws-assume-role/package.nix
index f7785c457a32..334b6c1ccbe8 100644
--- a/pkgs/by-name/aw/aws-assume-role/package.nix
+++ b/pkgs/by-name/aw/aws-assume-role/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "remind101";
     repo = "assume-role";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-7+9qi9lYzv1YCFhUyla+5Gqs5nBUiiazhFwiqHzMFd4=";
   };
 
diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
index 07e7d93a326c..d4ea9e617e65 100644
--- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix
+++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xjHwnzh22cGv1Q2civdgLz9sFoV5p3exyG8P26u4hi0=";
   };
 
diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index 4a1fb5ab08d3..7f1e622b7ef9 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5h+uACzc4bAIgHoaZw2U/FCPA1ls8JTLqJd608J2uTU=";
   };
 
diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 6a4df356ef15..24064b1668e1 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -68,7 +68,7 @@ py.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yrkGfD2EBPsNRLcafdJE4UnYsK7EAfIA7TLa6smmWjY=";
   };
 
diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index c03f97d07d00..2d0a1e3cb865 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -31,7 +31,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE=";
   };
 
diff --git a/pkgs/by-name/aw/awslimitchecker/package.nix b/pkgs/by-name/aw/awslimitchecker/package.nix
index bb122774090d..9a603a5e6024 100644
--- a/pkgs/by-name/aw/awslimitchecker/package.nix
+++ b/pkgs/by-name/aw/awslimitchecker/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jantman";
     repo = "awslimitchecker";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+8F7qOfAFoFNZ6GG5ezTA/LWENpJvbcPdtpQH/8k1tw=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix
index 7f4eb6cef35a..451aade5bc9d 100644
--- a/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-bluetooth/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-bluetooth";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-EreOhrlWbSZtwazsvwWsPji2iLfQxr2LbjCI13Hrb28=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
index f280e00b1cb5..90c5fb5a2581 100644
--- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-datetime";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-lY49v2uZ7BawQoN/hmN6pbetHlSGjMHbS6S8Wl1bDmQ=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
index a3054c9c25d9..2bc786818554 100644
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-display";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-ZEmJJtVK1dHIrY0C6pqVu1N5PmQtYqX0K5v5LvzNfFA=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
index 6018719f2cab..054390390166 100644
--- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-messages";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-D1181eD2mAVXEa7RLXXC4b2tVGrxbh0WWgtbC1anHH0=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
index 7226c90daa37..1b9b16d5bc3b 100644
--- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-power";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-M7BzyQRPKyXMEY0FTMBXsCemC3+w8upjTHApWkRf71I=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
index 0ee7f5228624..e6a2c4737bd4 100644
--- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-session";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-p4nu7ZgnEjnnxNqyZIg//YcssnQcCY7GFDbpGIu1dz0=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
index 8b911c40de09..039d88bb2b35 100644
--- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-sound";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-icHX/uZQIkS08RByjvlcX7whXtUYc+osBMbqngKqmGU=";
   };
 
diff --git a/pkgs/by-name/ay/ayatana-webmail/package.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix
index 1c99ef0427e3..14665fb0e4e4 100644
--- a/pkgs/by-name/ay/ayatana-webmail/package.nix
+++ b/pkgs/by-name/ay/ayatana-webmail/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-webmail";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais=";
   };
   postConfigure = ''
diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
index 3eda1619b870..aa6b36ffabcd 100644
--- a/pkgs/by-name/az/azure-storage-azcopy/package.nix
+++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h/EiJZMX2vHn/t1FPM1ZkXf9I8LYiqK1GqkSDAlXBYY=";
   };
 
diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index f6b07107b6da..0222f32a3dae 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DqoEtL0uyLsP/2PJdOpAmXryEZQDlyGWPQHThF+3gJA=";
   };
 
diff --git a/pkgs/by-name/ba/baboossh/package.nix b/pkgs/by-name/ba/baboossh/package.nix
index 1cec997ff3af..26c1182a01a3 100644
--- a/pkgs/by-name/ba/baboossh/package.nix
+++ b/pkgs/by-name/ba/baboossh/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cybiere";
     repo = "baboossh";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-E/a6dL6BpQ6D8v010d8/qav/fkxpCYNvSvoPAZsm0Hk=";
   };
 
diff --git a/pkgs/by-name/ba/backblaze-b2/package.nix b/pkgs/by-name/ba/backblaze-b2/package.nix
index 46b970698418..54c2e9f1ef3d 100644
--- a/pkgs/by-name/ba/backblaze-b2/package.nix
+++ b/pkgs/by-name/ba/backblaze-b2/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Backblaze";
     repo = "B2_Command_Line_Tool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a0XJq8M1yw4GmD5ndIAJtmHFKqS0rYdvYIxK7t7oyZw=";
   };
 
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 25cc308ed240..80689fb85e83 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "garethgeorge";
     repo = "backrest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qxEZkRKkwKZ+EZ3y3aGcX2ioKOz19SRdi3+9mjF1LpE=";
   };
 
diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index 0f3e322bef8d..f71293605050 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "bacon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pw+EfmpDvMCKSHOeHiv06x13/tRuf053Zcj8z0eWnPs=";
   };
 
diff --git a/pkgs/by-name/ba/bada-bib/package.nix b/pkgs/by-name/ba/bada-bib/package.nix
index 22bf2189d98d..fcc082f28c07 100644
--- a/pkgs/by-name/ba/bada-bib/package.nix
+++ b/pkgs/by-name/ba/bada-bib/package.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RogerCrocker";
     repo = "BadaBib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8lpkmQCVh94+qhFJijAIVyYeJRFz2u/OYR1C5E+gtOE=";
   };
 
diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix
index a2a03370fe81..cedbaec9ee1c 100644
--- a/pkgs/by-name/ba/baddns/package.nix
+++ b/pkgs/by-name/ba/baddns/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "blacklanternsecurity";
     repo = "baddns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pF7HYl1l+TSahJHuyVBZtYeET6wPCiSi+Yi7Rg46T44=";
   };
 
diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix
index 8dd4c5a0453c..584d5e57b1f3 100644
--- a/pkgs/by-name/ba/badkeys/package.nix
+++ b/pkgs/by-name/ba/badkeys/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "badkeys";
     repo = "badkeys";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8=";
   };
 
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Tool to find common vulnerabilities in cryptographic public keys";
     homepage = "https://badkeys.info/";
-    changelog = "https://github.com/badkeys/badkeys/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/badkeys/badkeys/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "badkeys";
diff --git a/pkgs/by-name/ba/bamtools/package.nix b/pkgs/by-name/ba/bamtools/package.nix
index b85f703bd9de..2c6792c47c88 100644
--- a/pkgs/by-name/ba/bamtools/package.nix
+++ b/pkgs/by-name/ba/bamtools/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pezmaster31";
     repo = "bamtools";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-l2DmA4P1kPneTCL9YVACE6LcQHT0F+mufPyM69VkksE=";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C++ API & command-line toolkit for working with BAM data";
     mainProgram = "bamtools";
     homepage = "https://github.com/pezmaster31/bamtools";
-    changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/pezmaster31/bamtools/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/ba/banana-vera/package.nix b/pkgs/by-name/ba/banana-vera/package.nix
index f847f77bc570..cfaa1713635e 100644
--- a/pkgs/by-name/ba/banana-vera/package.nix
+++ b/pkgs/by-name/ba/banana-vera/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Epitech";
     repo = "banana-vera";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c=";
   };
 
diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index bb1b66535014..167a709fac5a 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Finb";
     repo = "bark-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bZWX47krx9V0qXg6Yl8yQbX1zd5DtsWkIBLi0bDxrpA=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix
index da9cda162fd1..20f31c7eaca4 100644
--- a/pkgs/by-name/ba/barman/package.nix
+++ b/pkgs/by-name/ba/barman/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EnterpriseDB";
     repo = "barman";
-    rev = "refs/tags/release/${version}";
+    tag = "release/${version}";
     hash = "sha256-X39XOv8HJdSjMjMMnmB7Gxjseg5k/LuKICTxapcHVsU=";
   };
 
diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix
index 0d51bc0ec83b..131fdd0af162 100644
--- a/pkgs/by-name/ba/batmon/package.nix
+++ b/pkgs/by-name/ba/batmon/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "6543";
     repo = "batmon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o=";
   };
 
diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index 532f8be2aae0..680933ef9ec4 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng=";
   };
 
diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix
index ce6b5919291f..b0f511c96b6c 100644
--- a/pkgs/by-name/bc/bcc/package.nix
+++ b/pkgs/by-name/bc/bcc/package.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "iovisor";
     repo = "bcc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-urEHDDBBIdopQiT/QI5WtTbIO45pBk6bTNpfs8q/2hA=";
   };
   format = "other";
diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix
index 2c2e8bff30ed..5311f8bb5616 100644
--- a/pkgs/by-name/be/bearer/package.nix
+++ b/pkgs/by-name/be/bearer/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "bearer";
     repo = "bearer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yr5ik+DxOcW3UFK6KiPvheGlDdwSz2s7DKm2vAsSwG0=";
   };
 
diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix
index f1bbec78e3c8..b8d391ff3a51 100644
--- a/pkgs/by-name/be/beeper-bridge-manager/package.nix
+++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "beeper";
     repo = "bridge-manager";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bNnansZNshWp70LQQsa6+bS+LJxpCzdTkL2pX+ksrP0=";
   };
 
diff --git a/pkgs/by-name/be/beluga/package.nix b/pkgs/by-name/be/beluga/package.nix
index 6c97064a52cb..09d31d35607a 100644
--- a/pkgs/by-name/be/beluga/package.nix
+++ b/pkgs/by-name/be/beluga/package.nix
@@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "Beluga-lang";
     repo = "Beluga";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QUZ3mmd0gBQ+hnAeo/TbvFsETnThAdAoQyfpz2F//4g=";
   };
 
diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix
index 976ee9bd3344..a7b4215aceeb 100644
--- a/pkgs/by-name/be/bemoji/package.nix
+++ b/pkgs/by-name/be/bemoji/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "marty-oehme";
     repo = "bemoji";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww=";
   };
 
diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix
index b337ef53fda0..c1e6470dfdcc 100644
--- a/pkgs/by-name/be/bend/package.nix
+++ b/pkgs/by-name/be/bend/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "HigherOrderCO";
     repo = "Bend";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-j4YMdeSxIbhp7xT42L42/y0ZncFPKBkxTh0LgO/RjkY=";
   };
 
diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index dd7bfef69e47..cbc35e7669b6 100644
--- a/pkgs/by-name/be/benthos/package.nix
+++ b/pkgs/by-name/be/benthos/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JLBH3eFhqPaLK5kCqsnUF54Izu+fEFQbP+cehvrHL9Q=";
   };
 
diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 8746cda0e594..cd7b74290ad9 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VB3ICoJrBIwP27jZJASQin4xzQ04089VqwFp7hfqZaQ=";
   };
 
diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix
index f857d8f7a723..8e04e854367b 100644
--- a/pkgs/by-name/bi/biblioteca/package.nix
+++ b/pkgs/by-name/bi/biblioteca/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "workbenchdev";
     repo = "Biblioteca";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-zrrI3u4ukGN6eb/eK/aZG4gi/xtXciyRS+JX9Js9KEw=";
   };
diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
index 94291f9993e8..4e01e22af5e0 100644
--- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
+++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MateusRodCosta";
     repo = "bign-handheld-thumbnailer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rRKMIkeTBb16GF8DgQ36Vdx/1I6zuzpuL/jusFJ0OZw=";
   };
 
diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix
index ef5089102a13..8b569e27bcb9 100644
--- a/pkgs/by-name/bi/bigquery-emulator/package.nix
+++ b/pkgs/by-name/bi/bigquery-emulator/package.nix
@@ -18,7 +18,7 @@ buildGoModule.override
     src = fetchFromGitHub {
       owner = "goccy";
       repo = "bigquery-emulator";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-iAVbxbm1G7FIWTB5g6Ff8h2dZjZssONA2MOCGuvK180=";
     };
 
diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 615408de74fe..ef5e300418e8 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
     repo = "binary";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0pVQMPwy/XXJl2fHQ/gIi+e/cJY87CA9G+GPkdYFQBc=";
   };
 
diff --git a/pkgs/by-name/bl/blobdrop/package.nix b/pkgs/by-name/bl/blobdrop/package.nix
index 4725edc5f327..12c866b1d963 100644
--- a/pkgs/by-name/bl/blobdrop/package.nix
+++ b/pkgs/by-name/bl/blobdrop/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vimpostor";
     repo = "blobdrop";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-o2+qtkyu2qcwXpum3KiogyO8D6aY7bRJ6y4FWQKQY/o=";
   };
 
diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix
index 8895019cf59c..a5efc0611b98 100644
--- a/pkgs/by-name/bl/blockbench/package.nix
+++ b/pkgs/by-name/bl/blockbench/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rUMzn+3j+RL8DY8euS6a4MmdoIAVLXxXu9wvKNmK/TU=";
   };
 
diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix
index 83a83011c1c9..22d7c5930dd9 100644
--- a/pkgs/by-name/bo/boilr/package.nix
+++ b/pkgs/by-name/bo/boilr/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   src = fetchFromGitHub {
     owner = "PhilipK";
     repo = "BoilR";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80=";
   };
 
diff --git a/pkgs/by-name/bo/bomber-go/package.nix b/pkgs/by-name/bo/bomber-go/package.nix
index 97e8d4ce1531..579f0c7d276f 100644
--- a/pkgs/by-name/bo/bomber-go/package.nix
+++ b/pkgs/by-name/bo/bomber-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devops-kung-fu";
     repo = "bomber";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-q3x3duXc2++BvVul2a5fBTcPHWrOHpPOGHBUXL08syg=";
   };
 
diff --git a/pkgs/by-name/bo/boofuzz/package.nix b/pkgs/by-name/bo/boofuzz/package.nix
index 05e5dc722633..22a8a0d26859 100644
--- a/pkgs/by-name/bo/boofuzz/package.nix
+++ b/pkgs/by-name/bo/boofuzz/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jtpereyda";
     repo = "boofuzz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ffZVFmfDAJ+Qn3hbeHY/CvYgpDLxB+jaYOiYyZqZ7mo=";
   };
 
diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index cdff7c1cd067..e2be04cc98f9 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -26,7 +26,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "borgbackup";
     repo = "borg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140=";
   };
 
diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix
index 519913e6ef1b..adc49a98e353 100644
--- a/pkgs/by-name/bo/bowtie2/package.nix
+++ b/pkgs/by-name/bo/bowtie2/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BenLangmead";
     repo = "bowtie2";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-ZbmVOItfAgKdsMrvQIXgKiPtoQJZYfGblCGDoNPjvTU=";
   };
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences";
     license = licenses.gpl3Plus;
     homepage = "http://bowtie-bio.sf.net/bowtie2";
-    changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/v${finalAttrs.version}";
     maintainers = with maintainers; [ rybern ];
     platforms = platforms.all;
     mainProgram = "bowtie2";
diff --git a/pkgs/by-name/bp/bpf-linker/package.nix b/pkgs/by-name/bp/bpf-linker/package.nix
index 721c910d7833..63c07fe0347d 100644
--- a/pkgs/by-name/bp/bpf-linker/package.nix
+++ b/pkgs/by-name/bp/bpf-linker/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aya-rs";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CRYp1ktmmY4OS23+LNKOBQJUMkd+GXptBp5LPfbyZAc=";
   };
 
diff --git a/pkgs/by-name/bp/bpfmon/package.nix b/pkgs/by-name/bp/bpfmon/package.nix
index b1858b012c1b..3671c9bf705b 100644
--- a/pkgs/by-name/bp/bpfmon/package.nix
+++ b/pkgs/by-name/bp/bpfmon/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbonev";
     repo = "bpfmon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+W+3RLvgXXtUImzLkJr9mSWExvAUgjMp+lR9sg14VaY=";
   };
 
diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix
index 4f912c09e659..a72478079904 100644
--- a/pkgs/by-name/bp/bpftop/package.nix
+++ b/pkgs/by-name/bp/bpftop/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "bpftop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WH/oCnkBcvoouBbkAcyawfAuNR3VsTl5+ZATLpi9d4w=";
   };
 
diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix
index f8e4454e0f67..445283cc05a9 100644
--- a/pkgs/by-name/br/brainflow/package.nix
+++ b/pkgs/by-name/br/brainflow/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "brainflow-dev";
     repo = "brainflow";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-NBdSVYW2xWY5jgXeaeW0yBzIzvSWt5Qp2A9zIn7+0Yw=";
   };
 
diff --git a/pkgs/by-name/br/broadlink-cli/package.nix b/pkgs/by-name/br/broadlink-cli/package.nix
index 6056c5ea3375..ecd5e45c535e 100644
--- a/pkgs/by-name/br/broadlink-cli/package.nix
+++ b/pkgs/by-name/br/broadlink-cli/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mjg59";
     repo = "python-broadlink";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-fqhi4K8Ceh8Rs0ExteCfAuVfEamFjMCjCFm6DRAJDmI=";
   };
 
diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix
index 74a3f85694ef..8f15a55686a2 100644
--- a/pkgs/by-name/br/browsers/package.nix
+++ b/pkgs/by-name/br/browsers/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Browsers-software";
     repo = "browsers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qLqyv5XXG7cpW+/eNCWguqemT3G2BhnolntHi2zZJ0o=";
   };
 
diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix
index 2e564787e443..611d7146bae7 100644
--- a/pkgs/by-name/br/browsr/package.nix
+++ b/pkgs/by-name/br/browsr/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "juftin";
     repo = "browsr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-76OzJOunZRVSGalQiyX+TSukD8rRIFHxA713NqOn3PY=";
   };
 
@@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "File explorer in your terminal";
     mainProgram = "browsr";
     homepage = "https://juftin.com/browsr";
-    changelog = "https://github.com/juftin/browsr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/juftin/browsr/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
   };
diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix
index 4b0cea6f5472..9c122cb6b926 100644
--- a/pkgs/by-name/bs/bsc/package.nix
+++ b/pkgs/by-name/bs/bsc/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "IlyaGrebnov";
     repo = "libbsc";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q=";
   };
 
diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
index 7d7065dcef81..cf44c39eae72 100644
--- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zalesyc";
     repo = "budgie-media-player-applet";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wmtO4Djs1xXBjimAEV6pvPo7zxDM+XQIOi/WOPRieQ8=";
   };
 
diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix
index 4bb2f8b0df0b..e6e468db36ea 100644
--- a/pkgs/by-name/bu/bunbun/package.nix
+++ b/pkgs/by-name/bu/bunbun/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "devraza";
     repo = "bunbun";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4=";
   };
 
diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix
index 4d68d43ce0d0..a4932bc764d8 100644
--- a/pkgs/by-name/bu/butterfly/package.nix
+++ b/pkgs/by-name/bu/butterfly/package.nix
@@ -8,7 +8,7 @@ let
   src = fetchFromGitHub {
     owner = "LinwoodDev";
     repo = "Butterfly";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tq2pBvGHDdZoi2EMgBIgNgsg3Ovh2PLCvET98oB+7Sw=";
   };
 in
diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix
index 9be662becdd7..674119df83f2 100644
--- a/pkgs/by-name/by/byedpi/package.nix
+++ b/pkgs/by-name/by/byedpi/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hufrea";
     repo = "byedpi";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jsQFfIvWvpJRBewUSS5bhDGocfPTvtG6LiejUxdqk28=";
   };
 
diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 49cf69018931..e12ca87d951f 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -18,7 +18,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2OxUHnmFtT/TunfO+fOBOrkaHKlnqpO1wJWs79wkvAY=";
   };
 
diff --git a/pkgs/by-name/ca/calcure/package.nix b/pkgs/by-name/ca/calcure/package.nix
index 50e5346a70db..e9b4f4745906 100644
--- a/pkgs/by-name/ca/calcure/package.nix
+++ b/pkgs/by-name/ca/calcure/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "anufrievroman";
     repo = "calcure";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ufrJbc3WMY88VEsUHlWxQ1m0iupts4zNusvQL8YAqJc=";
   };
 
diff --git a/pkgs/by-name/ca/cansina/package.nix b/pkgs/by-name/ca/cansina/package.nix
index d0cc43ce38f7..4e6064a1f925 100644
--- a/pkgs/by-name/ca/cansina/package.nix
+++ b/pkgs/by-name/ca/cansina/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "deibit";
     repo = "cansina";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vDlYJSRBVFtEdE/1bN8PniFYkpggIKMcEakphHmaTos=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix
index 6e0d246f6146..d62b6aa9c799 100644
--- a/pkgs/by-name/ca/cargo-cross/package.nix
+++ b/pkgs/by-name/ca/cargo-cross/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cross-rs";
     repo = "cross";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index ad9a9d648ee4..b38492c0a6a3 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "cargo-release";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eMPwbcMIjYxM5gJm3HSdwzxN7WYOOtzj/Wf7rwuJfWs=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index aa4fbe069ad1..07832381f70d 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
-    rev = "refs/tags/tauri-v${version}";
+    tag = "tauri-v${version}";
     hash = "sha256-HPmViOowP1xAjDJ89YS0BTjNnKI1P0L777ywkqAhhc4=";
   };
 
diff --git a/pkgs/by-name/ca/cargonode/package.nix b/pkgs/by-name/ca/cargonode/package.nix
index 2b6b95471fd3..51fda0140d5c 100644
--- a/pkgs/by-name/ca/cargonode/package.nix
+++ b/pkgs/by-name/ca/cargonode/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xosnrdev";
     repo = "cargonode";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xzBLuQRyKmd9k0sbBFV5amtFWwKqXR0CEsRv8SHiJcQ=";
   };
 
diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix
index 681ffadd1c27..443623316b53 100644
--- a/pkgs/by-name/ca/cariddi/package.nix
+++ b/pkgs/by-name/ca/cariddi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = "cariddi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U=";
   };
 
diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix
index 6d2bcb7700ee..e73bf605cb88 100644
--- a/pkgs/by-name/ca/cartero/package.nix
+++ b/pkgs/by-name/ca/cartero/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "danirod";
     repo = "cartero";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-catwalk/package.nix b/pkgs/by-name/ca/catppuccin-catwalk/package.nix
index 981bc6da239a..676345b0b528 100644
--- a/pkgs/by-name/ca/catppuccin-catwalk/package.nix
+++ b/pkgs/by-name/ca/catppuccin-catwalk/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "catwalk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Yj9xTQJ0eu3Ymi2R9fgYwBJO0V+4bN4MOxXCJGQ8NjU=";
   };
 
diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix
index 2f69b8cd504e..7838d626885a 100644
--- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix
+++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "whiskers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4=";
   };
 
diff --git a/pkgs/by-name/ca/cavalcade/package.nix b/pkgs/by-name/ca/cavalcade/package.nix
index f5cf8e667152..368c0256b850 100644
--- a/pkgs/by-name/ca/cavalcade/package.nix
+++ b/pkgs/by-name/ca/cavalcade/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "worron";
     repo = "cavalcade";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VyWOPNidN0+pfuxsgPWq6lI5gXQsiRpmYjQYjZW6i9w=";
   };
 
diff --git a/pkgs/by-name/ca/cavalier/package.nix b/pkgs/by-name/ca/cavalier/package.nix
index 8fc49f34fa6e..eef902233f00 100644
--- a/pkgs/by-name/ca/cavalier/package.nix
+++ b/pkgs/by-name/ca/cavalier/package.nix
@@ -21,7 +21,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "NickvisionApps";
     repo = "Cavalier";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SFhEKtYrlnkbLMnxU4Uf4jnFsw0MJHstgZgLLnGC2d8=";
   };
 
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index 0b7200647536..730449c04de2 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "diffblue";
     repo = "cbmc";
-    rev = "refs/tags/cbmc-${finalAttrs.version}";
+    tag = "cbmc-${finalAttrs.version}";
     hash = "sha256-PZZnseOE3nodE0zwyG+82gm55BO4rsCcP4T+fZq7L6I=";
   };
 
diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index 25753bd55557..1bee50d60c43 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ccache";
     repo = "ccache";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     # `git archive` replaces `$Format:%H %D$` in cmake/CcacheVersion.cmake
     # we need to replace it with something reproducible
     # see https://github.com/NixOS/nixpkgs/pull/316524
diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix
index 8819963e50b7..590b928c11f7 100644
--- a/pkgs/by-name/cd/cdecl/package.nix
+++ b/pkgs/by-name/cd/cdecl/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "paul-j-lucas";
     repo = "cdecl";
-    rev = "refs/tags/cdecl-${finalAttrs.version}";
+    tag = "cdecl-${finalAttrs.version}";
     hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM=";
   };
 
diff --git a/pkgs/by-name/cd/cdecrypt/package.nix b/pkgs/by-name/cd/cdecrypt/package.nix
index 2c2e8dcf4970..e74a63e04b4c 100644
--- a/pkgs/by-name/cd/cdecrypt/package.nix
+++ b/pkgs/by-name/cd/cdecrypt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "VitaSmith";
     repo = "cdecrypt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PyT60RDyp1/Co/7WHC0+KrsnrDeTJ605x1pt4OmlGYg=";
   };
 
diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix
index 02bd3a044538..164f9f857e8f 100644
--- a/pkgs/by-name/cd/cdk-go/package.nix
+++ b/pkgs/by-name/cd/cdk-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cdk-team";
     repo = "CDK";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Lpn+VuCzODOzxcgfD1l36eHmssAUz7+HgtN8vZwDNwE=";
   };
 
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index b18d0625a291..146df1742574 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1TYUSWbcWnRsOM8ctY1g9CmFSAXiK9NmN5ZDaKeJIgw=";
   };
 
diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix
index 16963c41058d..2b3e0708ca1b 100644
--- a/pkgs/by-name/ce/cedar/package.nix
+++ b/pkgs/by-name/ce/cedar/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cedar-policy";
     repo = "cedar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p8idQx3HGO/ikL0pDTPXx5+rD2sRpXANqs/g51BL554=";
   };
 
diff --git a/pkgs/by-name/ce/cent/package.nix b/pkgs/by-name/ce/cent/package.nix
index 065c666e0a1c..b11bb02e4cf2 100644
--- a/pkgs/by-name/ce/cent/package.nix
+++ b/pkgs/by-name/ce/cent/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xm1k3";
     repo = "cent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xwGmBZgdpyYJ1AKoNUUPEMbU5/racalE4SLrx/E51wM=";
   };
 
diff --git a/pkgs/by-name/ce/cert-viewer/package.nix b/pkgs/by-name/ce/cert-viewer/package.nix
index 85f16a1a419c..ee0f876a77ab 100644
--- a/pkgs/by-name/ce/cert-viewer/package.nix
+++ b/pkgs/by-name/ce/cert-viewer/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mgit-at";
     repo = "cert-viewer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6IPr2BG3y/7cmc2WkeeFDpQ59GNU1eOhhm49HE2w0cA=";
   };
 
diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix
index d95f0f6838b8..1a820b587177 100644
--- a/pkgs/by-name/ce/certinfo-go/package.nix
+++ b/pkgs/by-name/ce/certinfo-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "certinfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ySXp5dPdGhBEbo9uvCsINCufhm9j/dIX0Jn+Ou73NjM=";
   };
 
diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix
index f2d0f138aa8d..f06f13e966e4 100644
--- a/pkgs/by-name/cf/cfripper/package.nix
+++ b/pkgs/by-name/cf/cfripper/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = "cfripper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2yOATSCXqv28OE+GdF9F9Dhi3AIkxSe/YJ9ILLnd/nw=";
   };
 
diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix
index b9010abb2567..5ab305fa5072 100644
--- a/pkgs/by-name/cf/cfspeedtest/package.nix
+++ b/pkgs/by-name/cf/cfspeedtest/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "code-inflation";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7FKUP6ZCIGmP/WX6lUwrUT7QEVo/LGJz46ZmqPeRTW8=";
   };
 
diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix
index f345d897c2f5..345d0801242b 100644
--- a/pkgs/by-name/ch/chainsaw/package.nix
+++ b/pkgs/by-name/ch/chainsaw/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "WithSecureLabs";
     repo = "chainsaw";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4=";
   };
 
diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix
index dfbfbb62b73a..534ca61872ef 100644
--- a/pkgs/by-name/ch/chaos/package.nix
+++ b/pkgs/by-name/ch/chaos/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "chaos-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YjwxInBEPgovSk5EZzpeNhp4/FRWf6prZnNqcyyFFJg=";
   };
 
diff --git a/pkgs/by-name/ch/charge-lnd/package.nix b/pkgs/by-name/ch/charge-lnd/package.nix
index 88817c6e4b02..2defe92c7aa0 100644
--- a/pkgs/by-name/ch/charge-lnd/package.nix
+++ b/pkgs/by-name/ch/charge-lnd/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "accumulator";
     repo = "charge-lnd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
   };
 
diff --git a/pkgs/by-name/ch/charls/package.nix b/pkgs/by-name/ch/charls/package.nix
index 0595b4629aea..4822f0d7644b 100644
--- a/pkgs/by-name/ch/charls/package.nix
+++ b/pkgs/by-name/ch/charls/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "team-charls";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c1wrk6JLcAH7TFPwjARlggaKXrAsLWyUQF/3WHlqoqg=";
   };
 
diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index dca969004eb1..83efaa904005 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "charmcraft";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg=";
   };
 
diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix
index a7beb3d5d076..10617fb3d6c7 100644
--- a/pkgs/by-name/ch/checkip/package.nix
+++ b/pkgs/by-name/ch/checkip/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bjKRHIY9OIEft//g8VHKHTUrwWn8UU38SPP4IdPbIQE=";
   };
 
diff --git a/pkgs/by-name/ch/cherrytree/package.nix b/pkgs/by-name/ch/cherrytree/package.nix
index 98f219022afe..08aa96f13bae 100644
--- a/pkgs/by-name/ch/cherrytree/package.nix
+++ b/pkgs/by-name/ch/cherrytree/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "giuspen";
     repo = "cherrytree";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE=";
   };
 
diff --git a/pkgs/by-name/ch/chisel/package.nix b/pkgs/by-name/ch/chisel/package.nix
index 8bcd2ccb54cc..081ef937a79d 100644
--- a/pkgs/by-name/ch/chisel/package.nix
+++ b/pkgs/by-name/ch/chisel/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jpillora";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b3r4D/P7D3kfIyMd1s/ntciY04qMrvSTru9+HjAOrnA=";
   };
 
diff --git a/pkgs/by-name/ch/chocolate-doom/package.nix b/pkgs/by-name/ch/chocolate-doom/package.nix
index 677fed32aea1..030f9bc55600 100644
--- a/pkgs/by-name/ch/chocolate-doom/package.nix
+++ b/pkgs/by-name/ch/chocolate-doom/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "chocolate-doom";
     repo = "chocolate-doom";
-    rev = "refs/tags/chocolate-doom-${finalAttrs.version}";
+    tag = "chocolate-doom-${finalAttrs.version}";
     hash = "sha256-yDPfqCuzRbDhOQisIDAGo2bmmMjT+0lds5xc9C2pqoU=";
   };
 
diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix
index fa603f3d9f26..d214b6266520 100644
--- a/pkgs/by-name/ci/ciel/package.nix
+++ b/pkgs/by-name/ci/ciel/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AOSC-Dev";
     repo = "ciel-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vV1qZLVVVc6KFZrpF4blKmbfQjf/Ltn+IhmM5Zqb2zU=";
   };
 
diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index f7e09b0fae4d..cd0054e9d4f5 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "cilium-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P4S+4N9f/m28lNwx7xzYcq99nvXelSvzX01QXDhfGM4=";
   };
 
diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix
index 3c0b917a81a0..47eaabc6ec0a 100644
--- a/pkgs/by-name/ci/cimg/package.nix
+++ b/pkgs/by-name/ci/cimg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GreycLab";
     repo = "CImg";
-    rev = "refs/tags/v.${finalAttrs.version}";
+    tag = "v.${finalAttrs.version}";
     hash = "sha256-Abe7mSbdj06MossUQXCKZPzzfyvJyRVeLfzINYNPv4g=";
   };
 
diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index f1595df7042d..5109a12a6eba 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yNGzgkZXz/VroGGnZFqo5n2v3cE6/tvpQv5U4p27row=";
   };
 
diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix
index cbb952c1035b..0d5e8ff1a47b 100644
--- a/pkgs/by-name/ci/circup/package.nix
+++ b/pkgs/by-name/ci/circup/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "circup";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw=";
   };
 
diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix
index b89f785c642a..f8bbe77a1402 100644
--- a/pkgs/by-name/cl/clairvoyance/package.nix
+++ b/pkgs/by-name/cl/clairvoyance/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nikitastupin";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA=";
   };
 
diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix
index d3053408815a..00a684eb1398 100644
--- a/pkgs/by-name/cl/clanlib/package.nix
+++ b/pkgs/by-name/cl/clanlib/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     repo = "ClanLib";
     owner = "sphair";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sRHRkT8NiKVfa9YgP6DYV9WzCZoH7f0phHpoYMnCk98=";
   };
 
diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix
index 06b6ea3f6986..71fbae07627d 100644
--- a/pkgs/by-name/cl/clapgrep/package.nix
+++ b/pkgs/by-name/cl/clapgrep/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "luleyleo";
     repo = "clapgrep";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MYV8MrCIpa8eqp2iCLTNLZrVQOyGsMEGqlnEF43fyls=";
   };
 
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index ec2edfa543b9..3ca00cf9e710 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Watfaq";
     repo = "clash-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SJ3NhLiDA0iRgq9pKB/CeltPE2ewbY+z1NBQriebNi0=";
   };
 
diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index c90218f2f36c..5fccdc27b4af 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -19,7 +19,7 @@ let
   src = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-rev";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QLvJO1JFHPFOsVxNi6SCu2QuJQ9hCsO1+WKOjZL944w=";
   };
 
diff --git a/pkgs/by-name/cl/clevis/package.nix b/pkgs/by-name/cl/clevis/package.nix
index ba093e923b3d..4dc89fa2acd5 100644
--- a/pkgs/by-name/cl/clevis/package.nix
+++ b/pkgs/by-name/cl/clevis/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "clevis";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2vDQP+yvH4v46fLEWG/37r5cYP3OeDfJz71cDHEGiUg=";
   };
 
diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix
index 22f828a3f9b0..a9960dfc02b1 100644
--- a/pkgs/by-name/cl/clipcat/package.nix
+++ b/pkgs/by-name/cl/clipcat/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "xrelkd";
     repo = "clipcat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-94xw/E1Jp+bctVNzRZDdVaxxSMF/R87DNlRAzRT3Uvg=";
   };
 
diff --git a/pkgs/by-name/cl/cliphist/package.nix b/pkgs/by-name/cl/cliphist/package.nix
index 7c8e6c73a140..9a2f1ceb3ede 100644
--- a/pkgs/by-name/cl/cliphist/package.nix
+++ b/pkgs/by-name/cl/cliphist/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sentriz";
     repo = "cliphist";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tImRbWjYCdIY8wVMibc5g5/qYZGwgT9pl4pWvY7BDlI=";
   };
 
diff --git a/pkgs/by-name/cl/cliqr/package.nix b/pkgs/by-name/cl/cliqr/package.nix
index 5f2ad0596f3f..865b6bf5b3f3 100644
--- a/pkgs/by-name/cl/cliqr/package.nix
+++ b/pkgs/by-name/cl/cliqr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "cliqr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iPNI92kCNFXRiV5NV7Yj0gznwNeFoW02yh6QLrkBYO0=";
   };
 
diff --git a/pkgs/by-name/cl/cloud-custodian/package.nix b/pkgs/by-name/cl/cloud-custodian/package.nix
index 932df60ce487..32c2ce5cba80 100644
--- a/pkgs/by-name/cl/cloud-custodian/package.nix
+++ b/pkgs/by-name/cl/cloud-custodian/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cloud-custodian";
     repo = "cloud-custodian";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jGWPwHiETS4+hk9euLLxs0PBb7mxz2PHCbYYlFfLQUw=";
   };
 
diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index 585cf3608c76..560b04ae9a81 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bQPfKIpOh3eq+7cGU7pB+y2a9wsOXNBdmqYbZ0kC6k8=";
   };
 
diff --git a/pkgs/by-name/cl/cloud-utils/package.nix b/pkgs/by-name/cl/cloud-utils/package.nix
index 9074fc4b319a..c649cdc2396a 100644
--- a/pkgs/by-name/cl/cloud-utils/package.nix
+++ b/pkgs/by-name/cl/cloud-utils/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "cloud-utils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 21238f3f1c51..11407ac4735e 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zebradil";
     repo = "cloudflare-dynamic-dns";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA=";
   };
 
diff --git a/pkgs/by-name/cl/cloudfox/package.nix b/pkgs/by-name/cl/cloudfox/package.nix
index 495d85cf0f32..01e00de947a4 100644
--- a/pkgs/by-name/cl/cloudfox/package.nix
+++ b/pkgs/by-name/cl/cloudfox/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "BishopFox";
     repo = "cloudfox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YLZSrBAEf0SXECAdnF2CQAlEd15DJ1Iv+x+RebM5tw4=";
   };
 
diff --git a/pkgs/by-name/cl/cloudhunter/package.nix b/pkgs/by-name/cl/cloudhunter/package.nix
index 890527a1b6fe..b6a4c79e17bd 100644
--- a/pkgs/by-name/cl/cloudhunter/package.nix
+++ b/pkgs/by-name/cl/cloudhunter/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "belane";
     repo = "CloudHunter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7iT4vr0kcNXEyJJdBbJsllIcbZRGY3T5t/FjEONkuq0=";
   };
 
diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index 273189376cf4..18fb694db7e0 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cloudlist";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HV4qhQgeLKwkyrRFzRQibqjWRyjLBtoWVdliJ+iyyBc=";
   };
 
diff --git a/pkgs/by-name/cl/cloudrecon/package.nix b/pkgs/by-name/cl/cloudrecon/package.nix
index fda6f1e81c74..5e30337695fe 100644
--- a/pkgs/by-name/cl/cloudrecon/package.nix
+++ b/pkgs/by-name/cl/cloudrecon/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "g0ldencybersec";
     repo = "CloudRecon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SslHkwoMelvszrQZvNX28EokBgwnPDBbTUBA9jdJPro=";
   };
 
diff --git a/pkgs/by-name/cl/cloudsmith-cli/package.nix b/pkgs/by-name/cl/cloudsmith-cli/package.nix
index 427c85fea926..7eef1ae64902 100644
--- a/pkgs/by-name/cl/cloudsmith-cli/package.nix
+++ b/pkgs/by-name/cl/cloudsmith-cli/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cloudsmith-io";
     repo = "cloudsmith-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UzyfOmjJzYEJYA6c4kn5XCvRVIMuiIpiq0kH9UhBwmo=";
   };
 
diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix
index 8c2dd22c241d..02e0648ee688 100644
--- a/pkgs/by-name/cl/clusternet/package.nix
+++ b/pkgs/by-name/cl/clusternet/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "clusternet";
     repo = "clusternet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uhRnJyUR7lbJvVxd3YNVxmTSTDksQsVcM5G8ZKO7Xbk=";
   };
 
diff --git a/pkgs/by-name/cm/cmake-lint/package.nix b/pkgs/by-name/cm/cmake-lint/package.nix
index e58eff674d90..da7c65a8db14 100644
--- a/pkgs/by-name/cm/cmake-lint/package.nix
+++ b/pkgs/by-name/cm/cmake-lint/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cmake-lint";
     repo = "cmake-lint";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/OuWwerBlJynEibaYo+jkLpHt4x9GZrqMRJNxgrDBlM=";
   };
 
diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index 7b3fa82f5235..c4e672e62b7b 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WBzl3DyjPr5vV9oobqZx1pprs4gkVN9BafOMIMqqb7E=";
   };
 
diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index 1909421547ef..6d1c76f17c49 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hongquan";
     repo = "CoBang";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU=";
   };
 
diff --git a/pkgs/by-name/co/coercer/package.nix b/pkgs/by-name/co/coercer/package.nix
index 2c7faee3a34b..c5f63e35efd4 100644
--- a/pkgs/by-name/co/coercer/package.nix
+++ b/pkgs/by-name/co/coercer/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = "Coercer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WeaKToKYIB+jjTNIQvAUQQNb25TsNWALYZwIZuBjkPE=";
   };
 
diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix
index 96c5fe8e4ef1..148c0ed2ebf5 100644
--- a/pkgs/by-name/co/coinlive/package.nix
+++ b/pkgs/by-name/co/coinlive/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mayeranalytics";
     repo = "coinlive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
   };
 
diff --git a/pkgs/by-name/co/collabora-online/package.nix b/pkgs/by-name/co/collabora-online/package.nix
index 489894bd1d84..62c33c455c32 100644
--- a/pkgs/by-name/co/collabora-online/package.nix
+++ b/pkgs/by-name/co/collabora-online/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "CollaboraOnline";
     repo = "online";
-    rev = "refs/tags/cp-${finalAttrs.version}";
+    tag = "cp-${finalAttrs.version}";
     hash = "sha256-0IvymvXAozsjm+GXJK9AGWo79QMaIACrAfkYfX67fBc=";
   };
 
diff --git a/pkgs/by-name/co/collada2gltf/package.nix b/pkgs/by-name/co/collada2gltf/package.nix
index 7b32f6781c5b..c3c143419101 100644
--- a/pkgs/by-name/co/collada2gltf/package.nix
+++ b/pkgs/by-name/co/collada2gltf/package.nix
@@ -11,7 +11,7 @@ gcc10Stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "COLLADA2GLTF";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3Eo1qS6S5vlc/d2WB4iDJTjUnwMUrx9+Ln6n8PYU5qA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix
index 6cb12d620a92..0de956c490f2 100644
--- a/pkgs/by-name/co/comet-gog/package.nix
+++ b/pkgs/by-name/co/comet-gog/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "imLinguin";
     repo = "comet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LAEt2i/SRABrz+y2CTMudrugifLgHNxkMSdC8PXYF0E=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index 0033bf69a3e0..639d9275357d 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "Commit";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix
index 1134d60d6f0f..76dffacaac42 100644
--- a/pkgs/by-name/co/committed/package.nix
+++ b/pkgs/by-name/co/committed/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "committed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM=";
   };
   cargoHash = "sha256-F+6pTxgr/I3DcDGZsfDjLe0+5wj9Mu7nqghyOzSWlvc=";
diff --git a/pkgs/by-name/co/compiledb/package.nix b/pkgs/by-name/co/compiledb/package.nix
index 87d07c05852f..47fa3a007ecd 100644
--- a/pkgs/by-name/co/compiledb/package.nix
+++ b/pkgs/by-name/co/compiledb/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nickdiego";
     repo = "compiledb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pN2F0bFT5r8w+8kZOP/tU7Cx1SDN81fzkMfnj19jMWM=";
   };
 
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index a8da571f0bef..52244d37598b 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: {
   # Upstream no longer provides the composer.lock in their release artifact
   src = fetchgit {
     url = "https://github.com/maglnet/ComposerRequireChecker";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-dBUDkgbuUBKA3MKB4fxwHhDoT9wYRl49m/2ZCvIcNMM=";
   };
 
diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix
index d9fad07293ae..50edea536250 100644
--- a/pkgs/by-name/co/conan/package.nix
+++ b/pkgs/by-name/co/conan/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "conan-io";
     repo = "conan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1KKXOvoSAemzafWvBoYFtxqgSObHcXe3GVPgG25VNm0=";
   };
 
diff --git a/pkgs/by-name/co/concord/package.nix b/pkgs/by-name/co/concord/package.nix
index 97c31704ba36..5f65b6a0258b 100644
--- a/pkgs/by-name/co/concord/package.nix
+++ b/pkgs/by-name/co/concord/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Cogmasters";
     repo = "concord";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yTFGRnhDzxU+dPeZbCWlm52gsmEgD2el+46c8XQBQng=";
   };
 
diff --git a/pkgs/by-name/co/concurrently/package.nix b/pkgs/by-name/co/concurrently/package.nix
index c53adc26c610..f6b3a6166be0 100644
--- a/pkgs/by-name/co/concurrently/package.nix
+++ b/pkgs/by-name/co/concurrently/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "open-cli-tools";
     repo = "concurrently";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-VoyVYBOBMguFKnG2VItk1L5BbF72nO7bYJpb7adqICs=";
   };
 
diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix
index c0e62aff582e..34b5a95e295d 100644
--- a/pkgs/by-name/co/conftest/package.nix
+++ b/pkgs/by-name/co/conftest/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk=";
   };
   vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc=";
diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix
index dd0a3467d1a9..6634f29839a2 100644
--- a/pkgs/by-name/co/connectome-workbench/package.nix
+++ b/pkgs/by-name/co/connectome-workbench/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Washington-University";
     repo = "workbench";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg=";
   };
 
diff --git a/pkgs/by-name/co/conpass/package.nix b/pkgs/by-name/co/conpass/package.nix
index d8870a907541..f690bc8c62e1 100644
--- a/pkgs/by-name/co/conpass/package.nix
+++ b/pkgs/by-name/co/conpass/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "login-securite";
     repo = "conpass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7o4aQ6qpaWimWqgFO35Wht7mQsdVezoPTm7hp54FWR8=";
   };
 
diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index b3e36fda0517..6ad143e4255a 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nYWrJB98S2zPSBu8ZIHejnLP5OQyPxpJGLdLenGHzHM=";
   };
 
diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix
index 49fd7a0eb42f..47b9d2b944a3 100644
--- a/pkgs/by-name/co/container2wasm/package.nix
+++ b/pkgs/by-name/co/container2wasm/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ktock";
     repo = "container2wasm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Awk7tC5eyapbra/GlwPPfYx+Jh5UHlK9zo9ZRCVz9S0=";
   };
 
diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix
index 55f44253622f..dc27557d108e 100644
--- a/pkgs/by-name/co/containerd/package.nix
+++ b/pkgs/by-name/co/containerd/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gD0XRZThU/T8qxLyyboyE6GsX911ylt7hH59S+rB7vQ=";
   };
 
diff --git a/pkgs/by-name/co/convbin/package.nix b/pkgs/by-name/co/convbin/package.nix
index 0708be15d396..512c0d6b889d 100644
--- a/pkgs/by-name/co/convbin/package.nix
+++ b/pkgs/by-name/co/convbin/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mateoconlechuga";
     repo = "convbin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-k0hwBdjOweFoAE6jzhlRFZsMOVDDpi4R4LHA7SwO3os=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix
index 94f6ffef5ac5..b1692a571e90 100644
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Faster3ck";
     repo = "Converseen";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+AYw0/hCAVMPeD9MigYO5ddfs6o6w901OJH03H8gYlw=";
   };
 
diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix
index c2820c37c532..04a415919bdc 100644
--- a/pkgs/by-name/co/copacetic/package.nix
+++ b/pkgs/by-name/co/copacetic/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "project-copacetic";
     repo = "copacetic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hvSbjkqrd//thUex2It31Z4Vrj1u07WEAQFAnWiPo6M=";
   };
 
diff --git a/pkgs/by-name/co/copier/package.nix b/pkgs/by-name/co/copier/package.nix
index f19d567b70ed..cceaf852271c 100644
--- a/pkgs/by-name/co/copier/package.nix
+++ b/pkgs/by-name/co/copier/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "copier-org";
     repo = "copier";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     # Conflict on APFS on darwin
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix
index 3771d9067f37..16eec28ab4fd 100644
--- a/pkgs/by-name/co/copycat/package.nix
+++ b/pkgs/by-name/co/copycat/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "DeeKahy";
     repo = "CopyCat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0pqC6fxuvqOPuO10Em63tFguc3VJNnniPCHM6TcFDN0=";
   };
 
diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix
index 34f72de0c145..a4a2ddd9523e 100644
--- a/pkgs/by-name/co/corrscope/package.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "corrscope";
     repo = "corrscope";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WSv65jEu/w6iNrL/f5PN147FBjmR0j30H1D39dd+KN8=";
   };
 
diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix
index e43adbf78f9e..351796f237c1 100644
--- a/pkgs/by-name/co/coturn/package.nix
+++ b/pkgs/by-name/co/coturn/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "coturn";
     repo = "coturn";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GG8aQJoCBV5wolPEzSuZhqNn//ytaTAptjY42YKga4E=";
   };
 
diff --git a/pkgs/by-name/co/coursera-dl/package.nix b/pkgs/by-name/co/coursera-dl/package.nix
index 63aaf33f7f42..f2fdc53f85fa 100644
--- a/pkgs/by-name/co/coursera-dl/package.nix
+++ b/pkgs/by-name/co/coursera-dl/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "coursera-dl";
     repo = "coursera-dl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c+ElGIrd4ZhMfWtsNHrHRO3HaRRtEQuGlCSBrvPnbyo=";
   };
 
diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix
index 0c790fd5057b..ed182bacb7b8 100644
--- a/pkgs/by-name/co/cowsql/package.nix
+++ b/pkgs/by-name/co/cowsql/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cowsql";
     repo = "cowsql";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-cr6AT/n2/6DuGK53JvGLwCkMi4+fS128qxj3X9SJYuw=";
   };
 
diff --git a/pkgs/by-name/cp/cp210x-program/package.nix b/pkgs/by-name/cp/cp210x-program/package.nix
index 908b92c7cb33..36bd9eb1d503 100644
--- a/pkgs/by-name/cp/cp210x-program/package.nix
+++ b/pkgs/by-name/cp/cp210x-program/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "VCTLabs";
     repo = "cp210x-program";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-IjKshP12WfFly9cPm6svD4qZW6cT8C7lOVrGenSqbfY=";
   };
 
diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix
index e9ddcdb1b339..e484d70c3294 100644
--- a/pkgs/by-name/cp/cppitertools/package.nix
+++ b/pkgs/by-name/cp/cppitertools/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ryanhaining";
     repo = "cppitertools";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mii4xjxF1YC3H/TuO/o4cEz8bx2ko6U0eufqNVw5LNA=";
   };
 
diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix
index e8f7c8ef8cf1..a46c032ec6df 100644
--- a/pkgs/by-name/cp/cpplint/package.nix
+++ b/pkgs/by-name/cp/cpplint/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cpplint";
     repo = "cpplint";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-076363ZwcriPb+Fn9S5jay8oL+LlBTNh+IqQRCAndRo=";
   };
 
diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix
index bbc48a13715a..0ffe7b6a8d4f 100644
--- a/pkgs/by-name/cp/cpu-x/package.nix
+++ b/pkgs/by-name/cp/cpu-x/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "X0rg";
     repo = "CPU-X";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4wW8elGsU3EhDDMPxa5di01NlB0dJ8MN8TiaIBo2qxo=";
   };
 
diff --git a/pkgs/by-name/cp/cpustat/package.nix b/pkgs/by-name/cp/cpustat/package.nix
index 62f5d9d328f0..515f121b3152 100644
--- a/pkgs/by-name/cp/cpustat/package.nix
+++ b/pkgs/by-name/cp/cpustat/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ColinIanKing";
     repo = "cpustat";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-Rxoj2pnQ/tEUzcsFT1F+rU960b4Th3hqZU2YR6YGwZQ=";
   };
 
diff --git a/pkgs/by-name/cr/crab-hole/package.nix b/pkgs/by-name/cr/crab-hole/package.nix
index 0ad403277bb4..4ac3d3e7c0a6 100644
--- a/pkgs/by-name/cr/crab-hole/package.nix
+++ b/pkgs/by-name/cr/crab-hole/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LuckyTurtleDev";
     repo = "crab-hole";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OyZ+GkWU+OMnS6X7yk7H1e1MzfQQQkhOkoxUmWn6k7I=";
   };
 
diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix
index a5552487394d..e3a1a9e2f83a 100644
--- a/pkgs/by-name/cr/crates-tui/package.nix
+++ b/pkgs/by-name/cr/crates-tui/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "ratatui";
     repo = "crates-tui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU=";
   };
 
diff --git a/pkgs/by-name/cr/creds/package.nix b/pkgs/by-name/cr/creds/package.nix
index 9758afeafbfa..5bb3bb793cfd 100644
--- a/pkgs/by-name/cr/creds/package.nix
+++ b/pkgs/by-name/cr/creds/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ihebski";
     repo = "DefaultCreds-cheat-sheet";
-    rev = "refs/tags/creds-v${version}";
+    tag = "creds-v${version}";
     hash = "sha256-CtwGSF3EGcPqL49paNRCsB2qxYjKpCLqyRsC67nAyVk=";
   };
 
diff --git a/pkgs/by-name/cr/credslayer/package.nix b/pkgs/by-name/cr/credslayer/package.nix
index 8f660ca17252..62c16cfdde7e 100644
--- a/pkgs/by-name/cr/credslayer/package.nix
+++ b/pkgs/by-name/cr/credslayer/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ShellCode33";
     repo = "CredSLayer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gryV9MHULY6ZHy6YDFQDIkZsfIX8La0tHT0vrrQJNDQ=";
   };
 
diff --git a/pkgs/by-name/cr/crlfsuite/package.nix b/pkgs/by-name/cr/crlfsuite/package.nix
index 0a0d68d0b117..dadb9067590f 100644
--- a/pkgs/by-name/cr/crlfsuite/package.nix
+++ b/pkgs/by-name/cr/crlfsuite/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nefcore";
     repo = "CRLFsuite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI=";
   };
 
diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index 4a982cf61810..4c3a030b9e34 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "crowdsecurity";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-U3YnLjsD+Kl/6HD+RPP0gWa4N96X5wkbdCmIrxas1I8=";
   };
 
diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix
index ea1873f05f0c..6e3c4ae66e2a 100644
--- a/pkgs/by-name/cs/csvlens/package.nix
+++ b/pkgs/by-name/cs/csvlens/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YS-L";
     repo = "csvlens";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JlyDw+VL/vpKTvvBlDIwVIovhKJX2pV4UTY47cLR1IE=";
   };
 
diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix
index 01b447b887eb..327f4bc3ea56 100644
--- a/pkgs/by-name/cs/csvtk/package.nix
+++ b/pkgs/by-name/cs/csvtk/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "shenwei356";
     repo = "csvtk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t1juidSPCOEFsApvMWW8F/gF2F6JwK0Ds7O/GSZRg30=";
   };
 
diff --git a/pkgs/by-name/ct/ctune/package.nix b/pkgs/by-name/ct/ctune/package.nix
index c9e38fba90ab..d68db580dd34 100644
--- a/pkgs/by-name/ct/ctune/package.nix
+++ b/pkgs/by-name/ct/ctune/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "An7ar35";
     repo = "ctune";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fy7Wb4R6HDa+cLxI5YWq67gxw1XS/iDDN4M3Rn7GYeI=";
   };
 
diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix
index be8f8a12cd29..754a8ee4b9c2 100644
--- a/pkgs/by-name/cu/cups-printers/package.nix
+++ b/pkgs/by-name/cu/cups-printers/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "audiusGmbH";
     repo = "cups-printers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HTR9t9ElQmCzJfdWyu+JQ8xBfDNpXl8XtNsJxGSfBXk=";
   };
 
diff --git a/pkgs/by-name/cu/curtail/package.nix b/pkgs/by-name/cu/curtail/package.nix
index dbe74dee24eb..de6765bb4fec 100644
--- a/pkgs/by-name/cu/curtail/package.nix
+++ b/pkgs/by-name/cu/curtail/package.nix
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Huluti";
     repo = "Curtail";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-IpN1NMIT13icYnflkcZW+aSzw0Nau8UIOP38Kzji3bg=";
   };
 
diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 88a270fd6295..71465cb2933a 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "curv3d";
     repo = "curv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m4p5uxRk6kEJUilmbQ1zJcQDRvRCV7pkxnqupZJxyjo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/cv/cvehound/package.nix b/pkgs/by-name/cv/cvehound/package.nix
index 5e86d13d1e23..09d06f93091f 100644
--- a/pkgs/by-name/cv/cvehound/package.nix
+++ b/pkgs/by-name/cv/cvehound/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "evdenis";
     repo = "cvehound";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ=";
   };
 
diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix
index 0146986657db..1e56aad3321c 100644
--- a/pkgs/by-name/cv/cvemap/package.nix
+++ b/pkgs/by-name/cv/cvemap/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cvemap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ste08J3KIJmugKZegU82wq6N+B5DaHc8Z0UtqKsUYE8=";
   };
 
diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix
index 70df85bbb630..15f387b7e131 100644
--- a/pkgs/by-name/cw/cwltool/package.nix
+++ b/pkgs/by-name/cw/cwltool/package.nix
@@ -31,7 +31,7 @@ py.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwltool";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-46x/7ewnt1eTu+1GdmPUExpiFfYE3mN8N8VFMM4r1Vk=";
   };
 
diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix
index e32b4f8a9544..25a7a451d24d 100644
--- a/pkgs/by-name/cy/cyclonedx-cli/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix
@@ -11,7 +11,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QU/MaT8iIf/9VpOb2mixOfOtG/J+sE7S0mT6BKYQnlI=";
   };
 
diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix
index 4e7c16d2e769..a6bbf4778cd7 100644
--- a/pkgs/by-name/cy/cyclonedx-python/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-python/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EcCxw3SppuGUgN7AIU9NhpRw7dLDhTHHT5emGOgkDFU=";
   };
 
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 1bba318c5531..c2e6ddd804fe 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cyrusimap";
     repo = "cyrus-imapd";
-    rev = "refs/tags/cyrus-imapd-${finalAttrs.version}";
+    tag = "cyrus-imapd-${finalAttrs.version}";
     hash = "sha256-dyybRqmrVX+ERGpToS5JjGC6S/B0t967dLCWfeUrLKA=";
   };
 
diff --git a/pkgs/by-name/cz/cz-cli/package.nix b/pkgs/by-name/cz/cz-cli/package.nix
index c3b5f7600ad0..5a40f248b350 100644
--- a/pkgs/by-name/cz/cz-cli/package.nix
+++ b/pkgs/by-name/cz/cz-cli/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "commitizen";
     repo = "cz-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4kyGxidE8dzkHL0oPv/XxDxQ3qlEE6TKSgj+1g9uvJM=";
   };
 
diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index 0ec3c8d6d00f..ca60c04af919 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -32,7 +32,7 @@ let
     src = fetchFromGitHub {
       owner = "qarmin";
       repo = "czkawka";
-      rev = "refs/tags/${self.version}";
+      tag = self.version;
       hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM=";
     };
 
diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix
index fc41c44b0ea4..9cfebc4669d4 100644
--- a/pkgs/by-name/d2/d2/package.nix
+++ b/pkgs/by-name/d2/d2/package.nix
@@ -15,7 +15,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "terrastruct";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Sd4AkXKQVRJIgQTb7BbDNb8DbULyoWX8TuFtiu+Km5Y=";
   };
 
diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix
index 8618a3212fb2..0a04f2eb2a0b 100644
--- a/pkgs/by-name/da/daed/package.nix
+++ b/pkgs/by-name/da/daed/package.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "daed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix
index 5c0a9d1d4bd0..fe2986db7569 100644
--- a/pkgs/by-name/da/dalfox/package.nix
+++ b/pkgs/by-name/da/dalfox/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = "dalfox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tg8TXPeGINGDBR3HOWYRXrg7ioBFhX1V7N1wRzHI0/c=";
   };
 
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index 7c309d86655e..b4b185178d5d 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "codereader";
     repo = "DarkRadiant";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-y0VzTnHobW36/25/nTV49OKnUMpnsjImioMdNKoTyYA=";
   };
 
diff --git a/pkgs/by-name/da/darkstat/package.nix b/pkgs/by-name/da/darkstat/package.nix
index 1266f308c531..618907b0739e 100644
--- a/pkgs/by-name/da/darkstat/package.nix
+++ b/pkgs/by-name/da/darkstat/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emikulic";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kKj4fCgphoe3lojJfARwpITxQh7E6ehUew9FVEW63uQ=";
   };
 
diff --git a/pkgs/by-name/da/das/package.nix b/pkgs/by-name/da/das/package.nix
index 8806e9181407..df799889b301 100644
--- a/pkgs/by-name/da/das/package.nix
+++ b/pkgs/by-name/da/das/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "snovvcrash";
     repo = "DivideAndScan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WZmWpcBqxsNH96nVWwoepFhsvdxZpYKmAjNd7ghIJMA=";
   };
 
diff --git a/pkgs/by-name/da/datatrove/package.nix b/pkgs/by-name/da/datatrove/package.nix
index 61ac911cc8e4..d9c12161ce2d 100644
--- a/pkgs/by-name/da/datatrove/package.nix
+++ b/pkgs/by-name/da/datatrove/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "datatrove";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2NJja2yWeHOgo1pCuwHN6SgYnsimuZdK0jE8ucTH4r8=";
   };
 
diff --git a/pkgs/by-name/da/datree/package.nix b/pkgs/by-name/da/datree/package.nix
index 9d671a0fb734..e1a33be5eca5 100644
--- a/pkgs/by-name/da/datree/package.nix
+++ b/pkgs/by-name/da/datree/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "datreeio";
     repo = "datree";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-W1eX7eUMdPGbHA/f08xkG2EUeZmaunEAQn7/LRBe2nk=";
   };
 
diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix
index fe13c4fe3501..5cec210701aa 100644
--- a/pkgs/by-name/db/dbmate/package.nix
+++ b/pkgs/by-name/db/dbmate/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xmQS0eBOgll8+AU/kQriClqtwrfIz606/o7jEJlQLV8=";
   };
 
diff --git a/pkgs/by-name/db/dbx/package.nix b/pkgs/by-name/db/dbx/package.nix
index b1fcd6f53916..2590c12dd31d 100644
--- a/pkgs/by-name/db/dbx/package.nix
+++ b/pkgs/by-name/db/dbx/package.nix
@@ -18,7 +18,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "databrickslabs";
     repo = "dbx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5qjEABNTSUD9I2uAn49HQ4n+gbAcmfnqS4Z2M9MvFXQ=";
   };
 
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 382ecad9142b..405fc0a2d5eb 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "DCGM";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PysxuN5WT7GB0oOvT5ezYeOau6AMVDDWE5HOAcmqw/Y=";
   };
 
diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix
index 077494f05a7a..ef496df3a7bb 100644
--- a/pkgs/by-name/dc/dcrd/package.nix
+++ b/pkgs/by-name/dc/dcrd/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "decred";
     repo = "dcrd";
-    rev = "refs/tags/release-v${version}";
+    tag = "release-v${version}";
     hash = "sha256-nSocqwXgJhvfbdElddbb1gGxoygmtVtK6DbiSuMxYew=";
   };
 
diff --git a/pkgs/by-name/dd/ddate/package.nix b/pkgs/by-name/dd/ddate/package.nix
index fd4b7ab868b7..7e8658b16c23 100644
--- a/pkgs/by-name/dd/ddate/package.nix
+++ b/pkgs/by-name/dd/ddate/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bo0ts";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f";
   };
 
diff --git a/pkgs/by-name/dd/ddosify/package.nix b/pkgs/by-name/dd/ddosify/package.nix
index 77b29c41d25e..e77ce0e5c8b2 100644
--- a/pkgs/by-name/dd/ddosify/package.nix
+++ b/pkgs/by-name/dd/ddosify/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ddosify";
     repo = "ddosify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5K/qXtdlDC09dEjRwYvoh9SapGLNmvywDMiNdwZDDTQ=";
   };
 
diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix
index c32b5423f1ed..2468dd302b24 100644
--- a/pkgs/by-name/de/debase/package.nix
+++ b/pkgs/by-name/de/debase/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     (fetchFromGitHub {
       owner = "toasterllc";
       repo = "debase";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-6AavH8Ag+879ntcxJDbVgsg8V6U4cxwPQYPKvq2PpoQ=";
       fetchSubmodules = true;
     }).overrideAttrs
diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index 29d1c94b8308..94aef5ecbcb4 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Kong";
     repo = "deck";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+HXTBTE8oEvyEwzwJbM0snVV0sKcKFHFnHB1iJ+4LJc=";
   };
 
diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix
index 70d1d5fb7c44..84e659b6f96e 100644
--- a/pkgs/by-name/de/deckmaster/package.nix
+++ b/pkgs/by-name/de/deckmaster/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "deckmaster";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ=";
   };
 
diff --git a/pkgs/by-name/de/deeptools/package.nix b/pkgs/by-name/de/deeptools/package.nix
index 162141847c44..97c76c7f0575 100644
--- a/pkgs/by-name/de/deeptools/package.nix
+++ b/pkgs/by-name/de/deeptools/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "deeptools";
     repo = "deepTools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2kSlL7Y5f/FjVtStnmz+GlTw2oymrtxOCaXlqgbQ7FU=";
   };
 
diff --git a/pkgs/by-name/de/deface/package.nix b/pkgs/by-name/de/deface/package.nix
index ff66a7f02cfe..dc40f47ecf93 100644
--- a/pkgs/by-name/de/deface/package.nix
+++ b/pkgs/by-name/de/deface/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ORB-HD";
     repo = "deface";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/mXWeL6OSgW4BMXtAZD/3UxQUGt7UE5ZvH8CXNCueJo=";
   };
 
diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index 76b4df5c3a23..1275c94df002 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dandavison";
     repo = "delta";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA=";
   };
 
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 100de753161a..5512d0188a88 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CUfUYiD1ZVrbH4RowJN0PUCafpIsEWu0sCPzxngz4Ak=";
   };
 
diff --git a/pkgs/by-name/de/densify/package.nix b/pkgs/by-name/de/densify/package.nix
index b4f2797ba94b..ecc05ae8e25b 100644
--- a/pkgs/by-name/de/densify/package.nix
+++ b/pkgs/by-name/de/densify/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hkdb";
     repo = "Densify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-giFFy8HiSmnOqFKLyrPD1kTry8hMQxotEgD/u2FEMRY=";
   };
 
diff --git a/pkgs/by-name/de/dependency-track-exporter/package.nix b/pkgs/by-name/de/dependency-track-exporter/package.nix
index 0cd1ab979def..85c4084984e6 100644
--- a/pkgs/by-name/de/dependency-track-exporter/package.nix
+++ b/pkgs/by-name/de/dependency-track-exporter/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jetstack";
     repo = "dependency-track-exporter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yvScGxgkyZzEdfeJCXk/tSk3cLW+jyw00XbJVrpU6MY=";
   };
 
diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix
index e7d07164628b..aa7e2b957763 100644
--- a/pkgs/by-name/de/desed/package.nix
+++ b/pkgs/by-name/de/desed/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SoptikHa2";
     repo = "desed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aKkOs8IhnHjoJkXq9ryGn9fN0AmZyVTHbD/Vano+Erw=";
   };
 
diff --git a/pkgs/by-name/de/desk-exec/package.nix b/pkgs/by-name/de/desk-exec/package.nix
index 61dfad8939b6..d5b0535f5045 100644
--- a/pkgs/by-name/de/desk-exec/package.nix
+++ b/pkgs/by-name/de/desk-exec/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AxerTheAxe";
     repo = "desk-exec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bJLdd07IAf+ba++vtS0iSmeQSGygwSVNry2bHTDAgjE=";
   };
 
diff --git a/pkgs/by-name/de/desync/package.nix b/pkgs/by-name/de/desync/package.nix
index eac341a9a794..954327c155c7 100644
--- a/pkgs/by-name/de/desync/package.nix
+++ b/pkgs/by-name/de/desync/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "desync";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TwzD9WYi4cdDPKKV2XoqkGWJ9CzIwoxeFll8LqNWf/E=";
   };
 
diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix
index 7aca04136563..b5d487d9f23f 100644
--- a/pkgs/by-name/de/dethrace/package.nix
+++ b/pkgs/by-name/de/dethrace/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dethrace-labs";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Bt2wwF5cquXZwFpFyJ0TDmbFdTHbboQ93W/DvP9bsMo=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/de/devdash/package.nix b/pkgs/by-name/de/devdash/package.nix
index 21a605db475f..62d8e4f83ae0 100644
--- a/pkgs/by-name/de/devdash/package.nix
+++ b/pkgs/by-name/de/devdash/package.nix
@@ -13,7 +13,7 @@ buildGo122Module rec {
   src = fetchFromGitHub {
     owner = "Phantas0s";
     repo = "devdash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RUPpgMVl9Cm8uhztdfKnuQ6KdMn9m9PewlT59NnTSiY=";
   };
 
diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix
index 68ac11eb34e4..703bd5187054 100644
--- a/pkgs/by-name/de/devtoolbox/package.nix
+++ b/pkgs/by-name/de/devtoolbox/package.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aleiepure";
     repo = "devtoolbox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yeOX2ASQWpo3TN9ou25voOVD3pSK4SE0CDXHkrwu+E4=";
   };
 
diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
index 95eb94b1af1a..93e607a1f927 100644
--- a/pkgs/by-name/de/dexed/package.nix
+++ b/pkgs/by-name/de/dexed/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "asb2m10";
     repo = "dexed";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-mXr1KGzA+DF2dEgAJE4lpnefPqO8pqfnKa43vyjSJgU=";
   };
diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix
index 35fa5f60b20a..f426eeaafc4a 100644
--- a/pkgs/by-name/de/dezoomify-rs/package.nix
+++ b/pkgs/by-name/de/dezoomify-rs/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "dezoomify-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug=";
   };
 
diff --git a/pkgs/by-name/dh/dhcpdump/package.nix b/pkgs/by-name/dh/dhcpdump/package.nix
index a33913220510..e1616f567f68 100644
--- a/pkgs/by-name/dh/dhcpdump/package.nix
+++ b/pkgs/by-name/dh/dhcpdump/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bbonev";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ck6DLsLQ00unNqPLBKkxaJLDCaPFjTFJcQjTbKSq0U8=";
   };
 
diff --git a/pkgs/by-name/dh/dhcpig/package.nix b/pkgs/by-name/dh/dhcpig/package.nix
index 6582556241ae..ac05557b1c5a 100644
--- a/pkgs/by-name/dh/dhcpig/package.nix
+++ b/pkgs/by-name/dh/dhcpig/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kamorin";
     repo = "DHCPig";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MquLChDuJe3DdkxxKV4W0o49IIt7Am+yuhdOqUqexS8=";
   };
 
diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix
index fd748332c230..14ba0abf5a9b 100644
--- a/pkgs/by-name/di/diagrams-as-code/package.nix
+++ b/pkgs/by-name/di/diagrams-as-code/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dmytrostriletskyi";
     repo = "diagrams-as-code";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cd602eQvNCUQuCdn/RpcfURcDHjXLZ0gAG+SObB++Q0=";
   };
 
diff --git a/pkgs/by-name/di/dialect/package.nix b/pkgs/by-name/di/dialect/package.nix
index 65c1a8b29225..a9c95c7f7e08 100644
--- a/pkgs/by-name/di/dialect/package.nix
+++ b/pkgs/by-name/di/dialect/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dialect-app";
     repo = "dialect";
-    rev = "refs/tags/${version}";
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-TWXJlzuSBy+Ij3s0KS02bh8vdXP10hQpgdz4QMTLf/Q=";
   };
diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix
index 4d400b97d4c2..433e6178adac 100644
--- a/pkgs/by-name/di/discover-overlay/package.nix
+++ b/pkgs/by-name/di/discover-overlay/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trigg";
     repo = "Discover";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0b0uZDa9Q3pQ6X65C+E31dMpdTPt4vvHDEqFEtRoedg=";
   };
 
diff --git a/pkgs/by-name/di/dismember/package.nix b/pkgs/by-name/di/dismember/package.nix
index e8f09eb8f89b..589d33adc2f3 100644
--- a/pkgs/by-name/di/dismember/package.nix
+++ b/pkgs/by-name/di/dismember/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "liamg";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-myoBXoi7VqHOLmu/XrvnlfBDlEnXm+0fp8WQec+3EJY=";
   };
 
diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix
index debaf686da04..8fca85081b32 100644
--- a/pkgs/by-name/dl/dlib/package.nix
+++ b/pkgs/by-name/dl/dlib/package.nix
@@ -25,7 +25,7 @@
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-BpE7ZrtiiaDqwy1G4IHOQBJMr6sAadFbRxsdObs1SIY=";
   };
 
diff --git a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
index 0a0cab6b0e9c..369dd3548d36 100644
--- a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
+++ b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jgosmann";
     repo = "dmarc-metrics-exporter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cIsI4TNYuLK0fpUg9lnbl5KSBtzQoT/pTByI9hiy/7o=";
   };
 
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
index d64f5a0cc8cc..20df1141d3df 100644
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Shizcow";
     repo = "dmenu-rs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g=";
   };
 
diff --git a/pkgs/by-name/dm/dms/package.nix b/pkgs/by-name/dm/dms/package.nix
index eed1e01eb846..2eb2ca2838d1 100644
--- a/pkgs/by-name/dm/dms/package.nix
+++ b/pkgs/by-name/dm/dms/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anacrolix";
     repo = "dms";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dObY2MNrrQqn5i/y2LDlKvd9S04EArmsalIsfXsrth0=";
   };
 
diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix
index a64f1a32dafb..8ae326177f87 100644
--- a/pkgs/by-name/dn/dnsdiag/package.nix
+++ b/pkgs/by-name/dn/dnsdiag/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "farrokhi";
     repo = "dnsdiag";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6TDs+ncbVa7LWtGLlqEXJb9zzXZ+nAhbi4QGyCSu3ho=";
   };
 
diff --git a/pkgs/by-name/dn/dnslink-std-go/package.nix b/pkgs/by-name/dn/dnslink-std-go/package.nix
index c061c74035a6..54a79a5a867f 100644
--- a/pkgs/by-name/dn/dnslink-std-go/package.nix
+++ b/pkgs/by-name/dn/dnslink-std-go/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dnslink-std";
     repo = "go";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aATnNDUogNS4jBoWxUAFYFMa2ZS0+th3XH+1KWqwfWQ=";
   };
   vendorHash = "sha256-RH55yfIO9jHLbjtEdUF5QpL5ILV5ctX2hBYBJWutmUA=";
diff --git a/pkgs/by-name/dn/dnslookup/package.nix b/pkgs/by-name/dn/dnslookup/package.nix
index 8491c0597a69..d18d164cffdc 100644
--- a/pkgs/by-name/dn/dnslookup/package.nix
+++ b/pkgs/by-name/dn/dnslookup/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ameshkov";
     repo = "dnslookup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zgEW4ANIlwF0f6YqTQicGhGgLc9RaL7Xy0wg/ICzOK4=";
   };
 
diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix
index 782bd8518596..566998865506 100644
--- a/pkgs/by-name/dn/dnsmonster/package.nix
+++ b/pkgs/by-name/dn/dnsmonster/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mosajjal";
     repo = "dnsmonster";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0WHTrqnc3vYQro+nSsQipAPVymR8L4uOwtd9GJHxhVM=";
   };
 
diff --git a/pkgs/by-name/dn/dnsrecon/package.nix b/pkgs/by-name/dn/dnsrecon/package.nix
index d1992581b2cb..5e51dc1b2fc6 100644
--- a/pkgs/by-name/dn/dnsrecon/package.nix
+++ b/pkgs/by-name/dn/dnsrecon/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "darkoperator";
     repo = "dnsrecon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CW5HM8hATfhyQDbSAV+zSp8Gc/C5uy40yKMJAGawn0k=";
   };
 
diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix
index ec35004d476e..ff7468be8699 100644
--- a/pkgs/by-name/dn/dnstwist/package.nix
+++ b/pkgs/by-name/dn/dnstwist/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "elceef";
     repo = "dnstwist";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-J6MfPKj7iACsiiSUU/2gxQdwtmqw9NKnjDoSdhxKoAw=";
   };
 
diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix
index 20c81aa260ab..e93957700849 100644
--- a/pkgs/by-name/dn/dnsx/package.nix
+++ b/pkgs/by-name/dn/dnsx/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "dnsx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-scp0CDIO8F2TqpSCgXXfb8I83stvO/GZqSA5/BkN8pE=";
   };
 
diff --git a/pkgs/by-name/do/docify/package.nix b/pkgs/by-name/do/docify/package.nix
index 5207dce0caa8..fd9602986b24 100644
--- a/pkgs/by-name/do/docify/package.nix
+++ b/pkgs/by-name/do/docify/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "AThePeanut4";
     repo = "docify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pENahqprTf6weP6qi9CyeQPdNOqr9c/q7j6GO9Lq3N4=";
   };
 
diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix
index e59c92b42294..deedd7c8a72f 100644
--- a/pkgs/by-name/do/docker-credential-gcr/package.nix
+++ b/pkgs/by-name/do/docker-credential-gcr/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "docker-credential-gcr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4sgUeEXBfP0qaR92ZulqAf1ObQBDbSjEHqhAqa0EV2Q=";
   };
 
diff --git a/pkgs/by-name/do/docopts/package.nix b/pkgs/by-name/do/docopts/package.nix
index 24098bca701d..f1f8f4ecffe7 100644
--- a/pkgs/by-name/do/docopts/package.nix
+++ b/pkgs/by-name/do/docopts/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "docopt";
     repo = "docopts";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GIBrJ5qexeJ6ul5ek9LJZC4J3cNExsTrnxdzRCfoqn8=";
   };
 
diff --git a/pkgs/by-name/do/donpapi/package.nix b/pkgs/by-name/do/donpapi/package.nix
index e8c62da2fcae..8a90402c0276 100644
--- a/pkgs/by-name/do/donpapi/package.nix
+++ b/pkgs/by-name/do/donpapi/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "login-securite";
     repo = "DonPAPI";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-60aGnsr36X3mf91nH9ud0xyLBqKgzZ4ALucrLGpAuzQ=";
   };
 
diff --git a/pkgs/by-name/do/dontgo403/package.nix b/pkgs/by-name/do/dontgo403/package.nix
index 12f81ebbb241..74a4a4859371 100644
--- a/pkgs/by-name/do/dontgo403/package.nix
+++ b/pkgs/by-name/do/dontgo403/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devploit";
     repo = "dontgo403";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qA1i8l2oBQQ5IF8ho3K2k+TAndUTFGwb2NfhyFqfKzU=";
   };
 
diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index 4dd74adb09b1..57bd173e17c4 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dooit-org";
     repo = "dooit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tqSWDW3nj+nMt7t5vgSqWvtx7YA3y2GV29gI1MYFMhc=";
   };
 
diff --git a/pkgs/by-name/do/doq/package.nix b/pkgs/by-name/do/doq/package.nix
index 4427fe310643..3a490905102b 100644
--- a/pkgs/by-name/do/doq/package.nix
+++ b/pkgs/by-name/do/doq/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "heavenshell";
     repo = "py-doq";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iVu+5o8pZ5OhIzNItWbzUzqC3VQ6HCD7nP5gW/PVAMM=";
   };
 
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Docstring generator for Python";
     homepage = "https://github.com/heavenshell/py-doq";
-    changelog = "https://github.com/heavenshell/py-doq/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/heavenshell/py-doq/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ natsukium ];
     mainProgram = "doq";
diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 01700acd9fde..bac58c9244d0 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GOofZ8nBsncxdmoodA86s0HUuLGw6UxDpTcG6yKiE6k=";
   };
 
diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix
index 3f6ea6bdc7d2..6d9e05f8efe8 100644
--- a/pkgs/by-name/do/downonspot/package.nix
+++ b/pkgs/by-name/do/downonspot/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "oSumAtrIX";
     repo = "DownOnSpot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h/BKVFzvPq9FhX4wZzlIzoegK8nPEt+mR7oKpRC5eV0=";
   };
 
diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 9df8d207aff2..c517147ff949 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dprint";
     repo = "dprint";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g=";
   };
 
diff --git a/pkgs/by-name/dq/dq/package.nix b/pkgs/by-name/dq/dq/package.nix
index 60e5b429896c..196d9ecc609e 100644
--- a/pkgs/by-name/dq/dq/package.nix
+++ b/pkgs/by-name/dq/dq/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "janmojzis";
     repo = "dq";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aXNj2JsSCxp3+zTF2/7SAffrzwQH+3NCppxpnPCLT4o=";
   };
 
diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix
index 846bc338b8da..14d1bea4103f 100644
--- a/pkgs/by-name/dq/dqlite/package.nix
+++ b/pkgs/by-name/dq/dqlite/package.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sWA04CoVMR8380/PXSkMo/Ml2Gk1RNQxPC12CMVqxwE=";
   };
 
diff --git a/pkgs/by-name/dr/drat-trim/package.nix b/pkgs/by-name/dr/drat-trim/package.nix
index c4070e3f45e7..cb0437860117 100644
--- a/pkgs/by-name/dr/drat-trim/package.nix
+++ b/pkgs/by-name/dr/drat-trim/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "marijnheule";
     repo = "drat-trim";
-    rev = "refs/tags/v05.22.2023";
+    tag = "v05.22.2023";
     hash = "sha256-sV3A0f1TLSaTIdAtT6y8rU3ZS2UqEePJYSf3UySOlSA=";
   };
 
diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix
index b41473f8867d..cf75fc8fbbe9 100644
--- a/pkgs/by-name/dr/drawing/package.nix
+++ b/pkgs/by-name/dr/drawing/package.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "maoschanz";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kNF9db8NoHWW1A0WEFQzxHqAQ4A7kxInMRZFJOXQX/k=";
   };
 
diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix
index 0a533f421131..b0bff18b2955 100644
--- a/pkgs/by-name/dr/driftnet/package.nix
+++ b/pkgs/by-name/dr/driftnet/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "deiv";
     repo = "driftnet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lMn60vtOMPs1Tr+SnAOUZDrNIO7gEXdHpizjXiEkkoM=";
   };
 
diff --git a/pkgs/by-name/dr/drone-runner-docker/package.nix b/pkgs/by-name/dr/drone-runner-docker/package.nix
index 278d17379d6f..290ca71e3bfd 100644
--- a/pkgs/by-name/dr/drone-runner-docker/package.nix
+++ b/pkgs/by-name/dr/drone-runner-docker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "drone-runners";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0=";
   };
 
diff --git a/pkgs/by-name/ds/dssat/package.nix b/pkgs/by-name/ds/dssat/package.nix
index 4b40302c415d..c04c35f6f012 100644
--- a/pkgs/by-name/ds/dssat/package.nix
+++ b/pkgs/by-name/ds/dssat/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (final: {
   src = fetchFromGitHub {
     owner = "DSSAT";
     repo = "dssat-csm-os";
-    rev = "refs/tags/v${final.version}";
+    tag = "v${final.version}";
     hash = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA=";
   };
 
diff --git a/pkgs/by-name/ds/dssp/package.nix b/pkgs/by-name/ds/dssp/package.nix
index ac5d5dce68f9..6f569feda455 100644
--- a/pkgs/by-name/ds/dssp/package.nix
+++ b/pkgs/by-name/ds/dssp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PDB-REDO";
     repo = "dssp";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-YNYpHjp9kEszXvLF3RrNg6gYd4GPvfRVtdkUwJ89qOc=";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein";
     mainProgram = "mkdssp";
     homepage = "https://github.com/PDB-REDO/dssp";
-    changelog = "https://github.com/PDB-REDO/dssp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/PDB-REDO/dssp/releases/tag/v${finalAttrs.version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ natsukium ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 01ef5d8f9203..1d3b37858e90 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/by-name/dy/dynamips/package.nix b/pkgs/by-name/dy/dynamips/package.nix
index 77f662acb6e1..9d36c5295b2d 100644
--- a/pkgs/by-name/dy/dynamips/package.nix
+++ b/pkgs/by-name/dy/dynamips/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "dynamips";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0=";
   };
 
diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix
index 9c78c061352a..e494d58b9aba 100644
--- a/pkgs/by-name/dy/dynisland/package.nix
+++ b/pkgs/by-name/dy/dynisland/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cr3eperall";
     repo = "dynisland";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HqwykR6BXxtYSxNUYdegmjCwSVTW29pqP7qLWbcqLeg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index 7797bce15426..05b435dc7de3 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "keidarcy";
     repo = "e1s";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cq2iv502Cr2r20/qba9+648yNmhNoEbaySNoijCbXcM=";
   };
 
diff --git a/pkgs/by-name/ea/easyeasm/package.nix b/pkgs/by-name/ea/easyeasm/package.nix
index 8dd436666d32..6a91e82846f6 100644
--- a/pkgs/by-name/ea/easyeasm/package.nix
+++ b/pkgs/by-name/ea/easyeasm/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "g0ldencybersec";
     repo = "EasyEASM";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/PhoH+5k63rJL1N3V3IL1TP1oacsBfGfVw/OueN9j8M=";
   };
 
diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 9ceefbbb98be..dabc47f19320 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-It+kldlhThWF9y/rTgKt9QlIouH1cQcCtSHQTsaGjfo=";
   };
 
diff --git a/pkgs/by-name/ec/ecsk/package.nix b/pkgs/by-name/ec/ecsk/package.nix
index 5a38c1d025ff..6fd712e94744 100644
--- a/pkgs/by-name/ec/ecsk/package.nix
+++ b/pkgs/by-name/ec/ecsk/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "yukiarrr";
     repo = "ecsk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1nrV7NslOIXQDHsc7c5YfaWhoJ8kfkEQseoVVeENrHM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 871e79301580..3623f1cbf71b 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebookexperimental";
     repo = "edencommon";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pVPkH80vowdpwWv/h6ovEk335OeI6/0k0cAFhhFqSDM=";
   };
 
diff --git a/pkgs/by-name/ed/edgedb/package.nix b/pkgs/by-name/ed/edgedb/package.nix
index 8d07257fdbcd..75806744be54 100644
--- a/pkgs/by-name/ed/edgedb/package.nix
+++ b/pkgs/by-name/ed/edgedb/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "edgedb";
     repo = "edgedb-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iB0ZWciEx/Xiq+pMg3nMJNHumoy5Z8dB6ev7UneHnVg=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ee/eepers/package.nix b/pkgs/by-name/ee/eepers/package.nix
index d642252774e9..d109a13515b2 100644
--- a/pkgs/by-name/ee/eepers/package.nix
+++ b/pkgs/by-name/ee/eepers/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsoding";
     repo = "eepers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KG7ci327qlTtlN4yV54P8Q34ExFLJfTGMTZxN3RtZbc=";
   };
 
diff --git a/pkgs/by-name/eg/eggnog-mapper/package.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix
index 8a8cfe376028..80d9be278eda 100644
--- a/pkgs/by-name/eg/eggnog-mapper/package.nix
+++ b/pkgs/by-name/eg/eggnog-mapper/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "eggnogdb";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+luxXQmtGufYrA/9Ak3yKzbotOj2HM3vhIoOxE+Ty1U=";
   };
 
diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 7f0dcb784206..2ca3efb02ebd 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "processone";
     repo = "ejabberd";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE=";
   };
 
diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix
index 033dceb3ee8a..b03562d869e8 100644
--- a/pkgs/by-name/el/elasticsearch-curator/package.nix
+++ b/pkgs/by-name/el/elasticsearch-curator/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "curator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Y2GXh+LUKU3VcQ51yZZdEIUjfKzRdbu6QKnXshI1Em0=";
   };
 
diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix
index a80a6e56ae78..c7954fb558b3 100644
--- a/pkgs/by-name/em/ember-cli/package.nix
+++ b/pkgs/by-name/em/ember-cli/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ember-cli";
     repo = "ember-cli";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ=";
   };
 
diff --git a/pkgs/by-name/em/emplace/package.nix b/pkgs/by-name/em/emplace/package.nix
index 711c4d154a39..947c9adc08af 100644
--- a/pkgs/by-name/em/emplace/package.nix
+++ b/pkgs/by-name/em/emplace/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tversteeg";
     repo = "emplace";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-FZ+lvf5HRSruUdmkm/Hqz0aRa95SjfIa43WQczRCGNg=";
   };
 
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 972a9a797e04..942c2f342a3c 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "franciscoBSalgueiro";
     repo = "en-croissant";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EiGML3oFCJR4TZkd+FekUrJwCYe/nGdWD9mAtKKtITQ=";
   };
 
diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix
index 49c0eb21adaa..42fde2888a6d 100644
--- a/pkgs/by-name/en/ente-cli/package.nix
+++ b/pkgs/by-name/en/ente-cli/package.nix
@@ -20,7 +20,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
-    rev = "refs/tags/cli-v${version}";
+    tag = "cli-v${version}";
     hash = "sha256-ynbljYl73XwCnt3RUNmOYdrN8FX3sJ+3qDhWa8m2YJs=";
     sparseCheckout = [ "cli" ];
   };
diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 53faf8188dcb..10d0c897f87e 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "web" ];
-    rev = "refs/tags/photos-v${finalAttrs.version}";
+    tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-DqfUUXY79CndEqPT8TR4PasLtaSCtqZaV2kp10Vu4PQ=";
   };
diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix
index 0f143671f4ec..120c580e1666 100644
--- a/pkgs/by-name/en/enum4linux-ng/package.nix
+++ b/pkgs/by-name/en/enum4linux-ng/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cddmp";
     repo = "enum4linux-ng";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MN3AUubro9CHkdPe/X1xcE11ye/D/A+Kf6zUOJTN4l0=";
   };
 
diff --git a/pkgs/by-name/en/enumer/package.nix b/pkgs/by-name/en/enumer/package.nix
index ed2fe3869a6b..d4eae263e383 100644
--- a/pkgs/by-name/en/enumer/package.nix
+++ b/pkgs/by-name/en/enumer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dmarkham";
     repo = "enumer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks=";
   };
 
diff --git a/pkgs/by-name/en/enumerepo/package.nix b/pkgs/by-name/en/enumerepo/package.nix
index a97320dc3501..8f888ff2b62d 100644
--- a/pkgs/by-name/en/enumerepo/package.nix
+++ b/pkgs/by-name/en/enumerepo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trickest";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PWWx6b+fttxKxMtuHAYPTeEsta0E6+IQ1DSKO6c7Jdc=";
   };
 
diff --git a/pkgs/by-name/eo/eolie/package.nix b/pkgs/by-name/eo/eolie/package.nix
index bf691b1a42c0..ef455d62358c 100644
--- a/pkgs/by-name/eo/eolie/package.nix
+++ b/pkgs/by-name/eo/eolie/package.nix
@@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
 
   src = fetchgit {
     url = "https://gitlab.gnome.org/World/eolie";
-    rev = "refs/tags/${version}";
+    tag = version;
     fetchSubmodules = true;
     sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w";
   };
diff --git a/pkgs/by-name/ep/epub2txt2/package.nix b/pkgs/by-name/ep/epub2txt2/package.nix
index ebf3f7af1543..539e4bbb7414 100644
--- a/pkgs/by-name/ep/epub2txt2/package.nix
+++ b/pkgs/by-name/ep/epub2txt2/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kevinboone";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-YFaXkcIdat2cn1ITYFyG1hxbbepqcxvyJ6ZzDo4dVYI=";
   };
 
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index f6105d9f7f6e..d3587cc7e78d 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equibop";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LGgmWaC7iYj0Mx5wPKmLkYV2ozyhkiwrE4v4uFB0erg=";
   };
 
diff --git a/pkgs/by-name/er/era/package.nix b/pkgs/by-name/er/era/package.nix
index cbe15bd7b47e..8cfd9aca5ac8 100644
--- a/pkgs/by-name/er/era/package.nix
+++ b/pkgs/by-name/er/era/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kyoheiu";
     repo = "era";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OOPVLY9kg4TmKSrpHgsOmAmeDPbX5df0bX51lA6DvcY=";
   };
 
diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix
index abb3f08474ba..cc5952fa60c3 100644
--- a/pkgs/by-name/er/erosmb/package.nix
+++ b/pkgs/by-name/er/erosmb/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "viktor02";
     repo = "EroSmb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9Zs5Z+3JiBiJkV9Ixl5pPmLv0dUT59CT0UkQDsmneWc=";
   };
 
diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix
index 7448804c3696..a45ed3c74a16 100644
--- a/pkgs/by-name/er/errands/package.nix
+++ b/pkgs/by-name/er/errands/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mrvladus";
     repo = "Errands";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kPF6BS7qDFstCGadSB8MSvBy+T4PkG/wRisYAaIU6rY=";
   };
 
diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix
index 6ad9acd2afc0..80e37e956e8f 100644
--- a/pkgs/by-name/es/eslint/package.nix
+++ b/pkgs/by-name/es/eslint/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage' rec {
   src = fetchFromGitHub {
     owner = "eslint";
     repo = "eslint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R5DO4xN3PkwGAIfyMkohs9SvFiLjWf1ddOwkY6wbsjA=";
   };
 
diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix
index cd636ba77210..cacf6c09070a 100644
--- a/pkgs/by-name/es/espflash/package.nix
+++ b/pkgs/by-name/es/espflash/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espflash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-X9VTwXk/6zAkQb5P9Wz8Pt4oIt2xXfff9dhGb8wauG4=";
   };
 
diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix
index 8f4b6482d9a6..a77cb5e750d7 100644
--- a/pkgs/by-name/es/esptool/package.nix
+++ b/pkgs/by-name/es/esptool/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cNEg2a3j7Vql06GwVaE9y86UtMkNsUdJYM00OEUra2w=";
   };
 
diff --git a/pkgs/by-name/et/etebase-server/package.nix b/pkgs/by-name/et/etebase-server/package.nix
index b5f350b850d3..407bf12fbdb8 100644
--- a/pkgs/by-name/et/etebase-server/package.nix
+++ b/pkgs/by-name/et/etebase-server/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W2u/d8X8luOzgy1CLNgujnwaoO1pR1QO1Ma7i4CGkdU=";
   };
 
diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index 7f4ce3143be5..634ecfbbf4d0 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
-    rev = "refs/tags/et-v${version}";
+    tag = "et-v${version}";
     hash = "sha256-vukh3a6SxHaVCT4hmoVt4hEGB8Sqylu53Nz8fgBWkTM";
   };
 
diff --git a/pkgs/by-name/et/ethq/package.nix b/pkgs/by-name/et/ethq/package.nix
index 9e817fe78fd3..b7eb49c86bb2 100644
--- a/pkgs/by-name/et/ethq/package.nix
+++ b/pkgs/by-name/et/ethq/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "isc-projects";
     repo = "ethq";
-    rev = "refs/tags/v${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
     hash = "sha256-ye5ep9EM9Sq/NqNZHENPmFZefVBx1BGrPm3YEG1NcSc=";
   };
 
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index f7e14dd8c3d3..78e24187eddf 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "etlegacy";
     repo = "etlegacy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k1H3irA9UVOICY3keKGVJMtBczW/b5ObyNvB7fGAcFA=";
   };
 
diff --git a/pkgs/by-name/ev/evemu/package.nix b/pkgs/by-name/ev/evemu/package.nix
index 06df7e1471a0..1676e1225a47 100644
--- a/pkgs/by-name/ev/evemu/package.nix
+++ b/pkgs/by-name/ev/evemu/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # each time it is downloaded :/
   src = fetchgit {
     url = "git://git.freedesktop.org/git/evemu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-SQDaARuqBMBVlUz+Nw6mjdxaZfVOukmzTlIqy8U2rus=";
   };
 
diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix
index b8e88e1db9eb..81acdce03071 100644
--- a/pkgs/by-name/ev/evil-winrm/package.nix
+++ b/pkgs/by-name/ev/evil-winrm/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Hackplayers";
     repo = "evil-winrm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA=";
   };
 
diff --git a/pkgs/by-name/ev/evillimiter/package.nix b/pkgs/by-name/ev/evillimiter/package.nix
index d96b54a9538c..b5d79f882ce7 100644
--- a/pkgs/by-name/ev/evillimiter/package.nix
+++ b/pkgs/by-name/ev/evillimiter/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bitbrute";
     repo = "evillimiter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h6BReZcDW2UYaYYVQVgV0T91/+CsGuZf+J+boUhjCtA=";
   };
 
diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix
index 25a9d5ff1cca..3eb8b9c23e81 100644
--- a/pkgs/by-name/ev/evtx/package.nix
+++ b/pkgs/by-name/ev/evtx/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "omerbenamram";
     repo = "evtx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ljEuFsLOwydLbx1DprJdBTL3cjFkhmuwr34da8LzG88=";
   };
 
diff --git a/pkgs/by-name/ex/exabgp/package.nix b/pkgs/by-name/ex/exabgp/package.nix
index 7d8f4917a711..28128bc5b102 100644
--- a/pkgs/by-name/ex/exabgp/package.nix
+++ b/pkgs/by-name/ex/exabgp/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Exa-Networks";
     repo = "exabgp";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PrdCAmefKCBmbBFp04KiQGSsZZ4KNFk/ZtMedh9oow4=";
   };
 
diff --git a/pkgs/by-name/ex/exercism/package.nix b/pkgs/by-name/ex/exercism/package.nix
index 117798021077..4676addc2c2b 100644
--- a/pkgs/by-name/ex/exercism/package.nix
+++ b/pkgs/by-name/ex/exercism/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "exercism";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7euitdo/rdeopnP7hHHxQ5lPh8wJVDaTneckeR5BEGo=";
   };
 
diff --git a/pkgs/by-name/ex/extism-cli/package.nix b/pkgs/by-name/ex/extism-cli/package.nix
index ef165ac07df5..0f3d738ec4f9 100644
--- a/pkgs/by-name/ex/extism-cli/package.nix
+++ b/pkgs/by-name/ex/extism-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "extism";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg=";
   };
 
diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index 92c4dc66836f..6ecfce2bb8ec 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -15,7 +15,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vwcqUsqlggmqqlQ3fyn+s3NKQ0oNcVztfjTpJPW1mFs=";
   };
   buildInputs = [ vips ];
diff --git a/pkgs/by-name/fa/fahrplan/package.nix b/pkgs/by-name/fa/fahrplan/package.nix
index dc0d74b441d0..784f04afbc11 100644
--- a/pkgs/by-name/fa/fahrplan/package.nix
+++ b/pkgs/by-name/fa/fahrplan/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "fahrplan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2QVaA2zqqFuxjkKbDXo+SNzkrDCxXiSYMUOftQ++wO4=";
   };
 
diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index cd115bbcc338..7b315588882f 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -33,7 +33,7 @@ buildDotnetModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Ldht7w1qgLTiqbRUJJvFQgl1VW6k+14w/jz58kAeMl0=";
   };
 
diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix
index 8b99fda48ae4..529b57f48f16 100644
--- a/pkgs/by-name/fa/fangfrisch/package.nix
+++ b/pkgs/by-name/fa/fangfrisch/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "rseichter";
     repo = "fangfrisch";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-B2fVXVYzrtWMh/WjgFBOqrq8Jt+jqudbtpY/w4rJG08=";
   };
 
diff --git a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
index 5b6a3420c2b6..9de101c70582 100644
--- a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
+++ b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "infobyte";
     repo = "faraday_agent_dispatcher";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Qr3ZGU4y7f6yHD78ecdv7a6IBFDpT+/4Yez0n/MenN0=";
   };
 
diff --git a/pkgs/by-name/fa/faraday-cli/package.nix b/pkgs/by-name/fa/faraday-cli/package.nix
index 814572c2b8e1..b54f6b1a555c 100644
--- a/pkgs/by-name/fa/faraday-cli/package.nix
+++ b/pkgs/by-name/fa/faraday-cli/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "infobyte";
     repo = "faraday-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bCiiX5dYodnWkKeNo2j3PGMz17F5y2X4ECZiStDdK5U=";
   };
 
diff --git a/pkgs/by-name/fa/fastJson/package.nix b/pkgs/by-name/fa/fastJson/package.nix
index 131baa6fe346..5090cfcb9fc4 100644
--- a/pkgs/by-name/fa/fastJson/package.nix
+++ b/pkgs/by-name/fa/fastJson/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rsyslog";
     repo = "libfastjson";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4=";
   };
 
diff --git a/pkgs/by-name/fa/fastahack/package.nix b/pkgs/by-name/fa/fastahack/package.nix
index ed8f342007ba..1ab307b61b4b 100644
--- a/pkgs/by-name/fa/fastahack/package.nix
+++ b/pkgs/by-name/fa/fastahack/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ekg";
     repo = "fastahack";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SWu2iRwNgdhsn4sH9/3jPNG3+l1xFAHXPq5/ODVd4WY=";
   };
 
diff --git a/pkgs/by-name/fa/fastcompmgr/package.nix b/pkgs/by-name/fa/fastcompmgr/package.nix
index 8d46db2f1f7b..240b40b44b8c 100644
--- a/pkgs/by-name/fa/fastcompmgr/package.nix
+++ b/pkgs/by-name/fa/fastcompmgr/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tycho-kirchner";
     repo = "fastcompmgr";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yH/+E2IBe9KZxKTiP8oNcb9fJcZ0ukuenqTSv97ed44=";
   };
 
diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix
index 97e7dbe5f8a4..9cb51f82e540 100644
--- a/pkgs/by-name/fb/fb303/package.nix
+++ b/pkgs/by-name/fb/fb303/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "fb303";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3zQLX42qeOE2bbFmu4Kuvu0Fvq2mBq8YgkVGpyfwaak=";
   };
 
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index 92fcb3636b36..b602e6270dd7 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "fbthrift";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dJf4vaIcat24WiKLFNEqeCnJYiO+c5YkuFu+hrS6cPE=";
   };
 
diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix
index e2ca5ee7af93..f65403bcb469 100644
--- a/pkgs/by-name/fc/fcp/package.nix
+++ b/pkgs/by-name/fc/fcp/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "svetlitski";
     repo = "fcp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
   };
 
diff --git a/pkgs/by-name/fe/fedifetcher/package.nix b/pkgs/by-name/fe/fedifetcher/package.nix
index 297e4ffa9a44..d9d5fd4be5fe 100644
--- a/pkgs/by-name/fe/fedifetcher/package.nix
+++ b/pkgs/by-name/fe/fedifetcher/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nanos";
     repo = "FediFetcher";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SfR4CYVs2kLLguKCau+x5vy6ha48Zd43OJ+tsA6M9yg=";
   };
 
diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix
index ff704f6d27cb..664464e8e836 100644
--- a/pkgs/by-name/fe/felix-fm/package.nix
+++ b/pkgs/by-name/fe/felix-fm/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kyoheiu";
     repo = "felix";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo=";
   };
 
diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix
index 35885e0f725b..fdf791d6b3aa 100644
--- a/pkgs/by-name/ff/ffsubsync/package.nix
+++ b/pkgs/by-name/ff/ffsubsync/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "smacke";
     repo = "ffsubsync";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc=";
   };
 
diff --git a/pkgs/by-name/ff/ffuf/package.nix b/pkgs/by-name/ff/ffuf/package.nix
index 3b576a117f36..dcd519cc9a71 100644
--- a/pkgs/by-name/ff/ffuf/package.nix
+++ b/pkgs/by-name/ff/ffuf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ffuf";
     repo = "ffuf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+wcNqQHtB8yCLiJXMBxolCWsYZbBAsBGS1hs7j1lzUU=";
   };
 
diff --git a/pkgs/by-name/fi/fierce/package.nix b/pkgs/by-name/fi/fierce/package.nix
index b4e3870c7e9f..684acc2d3f2e 100644
--- a/pkgs/by-name/fi/fierce/package.nix
+++ b/pkgs/by-name/fi/fierce/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mschwager";
     repo = "fierce";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-y5ZSDJCTqslU78kXGyk6DajBpX7xz1CVmbhYerHmyis=";
   };
 
diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix
index 3d01590f725b..3c2137433c71 100644
--- a/pkgs/by-name/fi/figma-agent/package.nix
+++ b/pkgs/by-name/fi/figma-agent/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "neetly";
     repo = "figma-agent-linux";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM=";
   };
 
diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix
index c10cc2b50a68..2ecb4b4142d1 100644
--- a/pkgs/by-name/fi/fim-rs/package.nix
+++ b/pkgs/by-name/fi/fim-rs/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Achiefs";
     repo = "fim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V9BzgVcDTnYSy7N5fCo38vQmXRDXLjY6wvnSkIpuDGg=";
   };
 
diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix
index 09e666128b6e..3c91b450c40d 100644
--- a/pkgs/by-name/fi/findomain/package.nix
+++ b/pkgs/by-name/fi/findomain/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "findomain";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-M6i62JI4HjaM0C2rSK8P5O19JeugFP5xIy1E6vE8KP4=";
   };
 
diff --git a/pkgs/by-name/fi/fingerprintx/package.nix b/pkgs/by-name/fi/fingerprintx/package.nix
index 087d587a0f5d..0b20a8ad6c2f 100644
--- a/pkgs/by-name/fi/fingerprintx/package.nix
+++ b/pkgs/by-name/fi/fingerprintx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "fingerprintx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o0u6UOrdzORnTgfOlc0kSQ5diDtNHjjbwfuyvPoHHKs=";
   };
 
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index c76310cec6d3..6b26b2beff78 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j6luT+L/vN9qaGjjeMW+8QGuzjJxzbn0sMGDjhqoeZA=";
   };
 in
diff --git a/pkgs/by-name/fi/firefly/package.nix b/pkgs/by-name/fi/firefly/package.nix
index 631627c3dd57..d01065e22d69 100644
--- a/pkgs/by-name/fi/firefly/package.nix
+++ b/pkgs/by-name/fi/firefly/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Brum3ns";
     repo = "firefly";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hhZw7u4NX+BvapUZv0k2Xu/UOdL7Pt8Idjat4aJzvIk=";
   };
 
diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix
index b891bda1447e..4d49b1f33685 100644
--- a/pkgs/by-name/fi/fish-lsp/package.nix
+++ b/pkgs/by-name/fi/fish-lsp/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ndonfris";
     repo = "fish-lsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u125EZXQEouVbmJuoW3KNDNqLB5cS/TzblXraClcw6Q=";
   };
 
diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index e02f683e21e6..157a900789a1 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "fizz";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mNe+CHEXhkwzek9qy2l6zvPXim9tJV44s+naSm6bQ4Q=";
   };
 
diff --git a/pkgs/by-name/fl/flare-floss/package.nix b/pkgs/by-name/fl/flare-floss/package.nix
index 020793273066..8e7936346d76 100644
--- a/pkgs/by-name/fl/flare-floss/package.nix
+++ b/pkgs/by-name/fl/flare-floss/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mandiant";
     repo = "flare-floss";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true; # for tests
     hash = "sha256-ciyF1Pt5KdUsmpTgvfgE81hhTHBM5zMBcZpom99R5GY=";
   };
diff --git a/pkgs/by-name/fl/flashgbx/package.nix b/pkgs/by-name/fl/flashgbx/package.nix
index c38f37464777..8e86ab8e11fc 100644
--- a/pkgs/by-name/fl/flashgbx/package.nix
+++ b/pkgs/by-name/fl/flashgbx/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = "FlashGBX";
     owner = "lesserkuma";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jPD+7bFU6k1+NRKRHwynEmZ0G6ZwnF8AZVuTqk5DjEY=";
   };
 
diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix
index 373adc09c42a..0de095f4c6e9 100644
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@@ -28,7 +28,7 @@ flutter324.buildFlutterApplication (
     src = fetchFromGitHub {
       owner = "krille-chan";
       repo = "fluffychat";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-T187GK0hBTRLGgUw23dNSzql6VZssreS84NbgCwf558=";
     };
 
diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix
index c81469ea2571..443c66488e23 100644
--- a/pkgs/by-name/fl/flye/package.nix
+++ b/pkgs/by-name/fl/flye/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fenderglass";
     repo = "flye";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-448PTdGueQVHFIDS5zMy+XKZCtEb0SqP8bspPLHMJn0=";
   };
 
diff --git a/pkgs/by-name/fo/foliate/package.nix b/pkgs/by-name/fo/foliate/package.nix
index 6dd3db577152..178a7b70f64f 100644
--- a/pkgs/by-name/fo/foliate/package.nix
+++ b/pkgs/by-name/fo/foliate/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "johnfactotum";
     repo = "foliate";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NU4lM+J5Tpd9Fl+eVbBy7WnCQ6LJ7oeWVkBxp6euTHU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix
index fce873482dd8..b1b727c012d2 100644
--- a/pkgs/by-name/fo/folio/package.nix
+++ b/pkgs/by-name/fo/folio/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "toolstack";
     repo = "Folio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-A0vUM6oIchpC/1NEjPmZkT2/f/CmEWmPsMHQrGkDKXQ=";
   };
 
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 12f8170324b1..e564965bf956 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-CX4YzNs64yeq/nDDaYfD5y8GKrxBueW4y275edPoS0c=";
   };
 
diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix
index 783f6a3737a0..b5fea8aad7ed 100644
--- a/pkgs/by-name/fo/forbidden/package.nix
+++ b/pkgs/by-name/fo/forbidden/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ivan-sincek";
     repo = "forbidden";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KE2FHn0ocAna5ReRi9re/u8gdNVkCygSbSRj8gEudgI=";
   };
 
diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix
index 2d69097c057f..4046a270c3e7 100644
--- a/pkgs/by-name/fr/freenet/package.nix
+++ b/pkgs/by-name/fr/freenet/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "freenet";
     repo = "fred";
-    rev = "refs/tags/build${version}";
+    tag = "build${version}";
     hash = "sha256-L9vae7wB6Ow2O4JA7CG/XV/zI8OS9/Rg7in/TSatXxY=";
   };
 
diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix
index d24c66fe1be9..dda4a5943a72 100644
--- a/pkgs/by-name/fr/freeradius/package.nix
+++ b/pkgs/by-name/fr/freeradius/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FreeRADIUS";
     repo = "freeradius-server";
-    rev = "refs/tags/release_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}";
     hash = "sha256-1n447BpTqmkg5tyXe9yPzjfDoh7wMLZhwouUEzkwxKM=";
   };
 
diff --git a/pkgs/by-name/fr/freesasa/package.nix b/pkgs/by-name/fr/freesasa/package.nix
index a20ace885373..141554495903 100644
--- a/pkgs/by-name/fr/freesasa/package.nix
+++ b/pkgs/by-name/fr/freesasa/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mittinatten";
     repo = "freesasa";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-OH1/GGFtMBnHuoOu3pdR+ohVO1m0I/jmCZbxPQ0C0jo=";
   };
diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix
index ae51e88588ab..d9a63a5fe2fc 100644
--- a/pkgs/by-name/fr/frescobaldi/package.nix
+++ b/pkgs/by-name/fr/frescobaldi/package.nix
@@ -13,7 +13,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "wbsoft";
     repo = "frescobaldi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A=";
   };
 
diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 924efe720d28..93256c130d21 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -15,7 +15,7 @@ let
     name = "frigate-${version}-source";
     owner = "blakeblackshear";
     repo = "frigate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PfUlo9ua4SVcQJTfmSVoEXHH1MUJ8A/w3kJHFpEzll8=";
   };
 
diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix
index e2230ff91977..cd0d327c8dc7 100644
--- a/pkgs/by-name/fr/fritz-exporter/package.nix
+++ b/pkgs/by-name/fr/fritz-exporter/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pdreker";
     repo = "fritz_exporter";
-    rev = "refs/tags/fritzexporter-v${version}";
+    tag = "fritzexporter-v${version}";
     hash = "sha256-qqvvoOQRFNl9IUjaBc/qzg9AevT5c2JDsfDVAZW6d6E=";
   };
 
diff --git a/pkgs/by-name/fs/fsmon/package.nix b/pkgs/by-name/fs/fsmon/package.nix
index bbdf9cad5e2f..7667bfdd0c63 100644
--- a/pkgs/by-name/fs/fsmon/package.nix
+++ b/pkgs/by-name/fs/fsmon/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nowsecure";
     repo = "fsmon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m0Bu1lT3KH4ytkpEakI7fvRHV1kmgaXS71+wmNGmEl8=";
   };
 
diff --git a/pkgs/by-name/fu/fuse-archive/package.nix b/pkgs/by-name/fu/fuse-archive/package.nix
index 3313de11477d..cdcf0b6926f5 100644
--- a/pkgs/by-name/fu/fuse-archive/package.nix
+++ b/pkgs/by-name/fu/fuse-archive/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "fuse-archive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l4tIK157Qo4m611etwMSk564+eC28x4RbmjX3J57/7Q=";
   };
 
diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix
index 8cf7ca58fa3d..bb78a5fd3ec3 100644
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fyne-io";
     repo = "fyne";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DSJZMsvAs1hB1nv5B36yjSSSdw/VaextWw8lchCQ38E=";
   };
 
diff --git a/pkgs/by-name/g8/g810-led/package.nix b/pkgs/by-name/g8/g810-led/package.nix
index 94bf6df4bd93..977007b86f5f 100644
--- a/pkgs/by-name/g8/g810-led/package.nix
+++ b/pkgs/by-name/g8/g810-led/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "MatMoul";
     repo = "g810-led";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GKHtQ7DinqfhclDdPO94KtTLQhhonAoWS4VOvs6CMhY=";
   };
 
diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix
index 01bd15ed5d7e..ad176149074e 100644
--- a/pkgs/by-name/ga/gale/package.nix
+++ b/pkgs/by-name/ga/gale/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Kesomannen";
     repo = "gale";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-yAfQuLfucz522ln0YNMy8nppp2jk6tGJnP/WhK7JdhI=";
   };
 
diff --git a/pkgs/by-name/ga/galer/package.nix b/pkgs/by-name/ga/galer/package.nix
index e433793a657d..af801aaf3bc1 100644
--- a/pkgs/by-name/ga/galer/package.nix
+++ b/pkgs/by-name/ga/galer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dwisiswant0";
     repo = "galer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-otyvEXBiPBhWvyoJEG6Ho5HA63Lg78odMR4mc0n+xXo=";
   };
 
diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix
index 1788e2784cc6..0878b750a958 100644
--- a/pkgs/by-name/ga/gallia/package.nix
+++ b/pkgs/by-name/ga/gallia/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Fraunhofer-AISEC";
     repo = "gallia";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-izMTTZrp4aizq5jS51BNtq3lv9Kr+xI7scZfYKXA/oY=";
   };
 
diff --git a/pkgs/by-name/ga/gam/package.nix b/pkgs/by-name/ga/gam/package.nix
index f34e21d313f7..3e2783dafa9a 100644
--- a/pkgs/by-name/ga/gam/package.nix
+++ b/pkgs/by-name/ga/gam/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "GAM-team";
     repo = "GAM";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-AIaPzYavbBlJyi9arZN8HTmUXM7Tef0SIfE07PmV9Oo=";
   };
 
diff --git a/pkgs/by-name/ga/gapcast/package.nix b/pkgs/by-name/ga/gapcast/package.nix
index 0a7329635791..57ed1665d766 100644
--- a/pkgs/by-name/ga/gapcast/package.nix
+++ b/pkgs/by-name/ga/gapcast/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ANDRVV";
     repo = "gapcast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ei5XfcnbUoegB8lNEEQ3PrCzNJGaVeVd2lfrMWYoODw=";
   };
 
diff --git a/pkgs/by-name/ga/garble/package.nix b/pkgs/by-name/ga/garble/package.nix
index a9f2c711cb66..4a1c2e93fced 100644
--- a/pkgs/by-name/ga/garble/package.nix
+++ b/pkgs/by-name/ga/garble/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "burrowers";
     repo = "garble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY=";
   };
 
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index 7a82210b4698..1b8889c18952 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L+yML0VgD+rTReRurfH78U4uXZJWOW4mE+dmBQRbb9U=";
   };
 
diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index 30493656cead..bef50038d1ef 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MBRKp1S/6dizZR0zDyaNGqKsHI+vK6oTNkPuxwbf7os=";
   };
 
diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 29b116c4a4bc..10379d08b15a 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "minekube";
     repo = "gate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a2rt+V6y8lyBMSG49eWLTPeLZKIjq+a5NBL+agIL1dg=";
   };
 
diff --git a/pkgs/by-name/ga/gato/package.nix b/pkgs/by-name/ga/gato/package.nix
index ec74ec1672ff..fb1737ac2306 100644
--- a/pkgs/by-name/ga/gato/package.nix
+++ b/pkgs/by-name/ga/gato/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "gato";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vXQFgP0KDWo1VWe7tMGCB2yEYlr/1KMXsiNupBVLBqc=";
   };
 
diff --git a/pkgs/by-name/ga/gau/package.nix b/pkgs/by-name/ga/gau/package.nix
index fca2c6963c69..575ba3833664 100644
--- a/pkgs/by-name/ga/gau/package.nix
+++ b/pkgs/by-name/ga/gau/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lc";
     repo = "gau";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B2l5joHeFDjYmdb3F1FFDKjIKENZu92O2sMlkf3Sf6Y=";
   };
 
diff --git a/pkgs/by-name/gc/gcalcli/package.nix b/pkgs/by-name/gc/gcalcli/package.nix
index e1f51abd82f7..a69fe904a72e 100644
--- a/pkgs/by-name/gc/gcalcli/package.nix
+++ b/pkgs/by-name/gc/gcalcli/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "insanum";
     repo = "gcalcli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FU1EHLQ+/2sOGeeGwONsrV786kHTFfMel7ocBcCe+rI=";
   };
 
diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix
index 2a82d2530b9f..28f2bf0bc843 100644
--- a/pkgs/by-name/gc/gcfflasher/package.nix
+++ b/pkgs/by-name/gc/gcfflasher/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dresden-elektronik";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jBKYKjsog0vfyrPoixqTifej5Kb+qYS11Tn+il3J0w0=";
   };
 
diff --git a/pkgs/by-name/gc/gcp-scanner/package.nix b/pkgs/by-name/gc/gcp-scanner/package.nix
index f16d3254028f..b0d33520cdf0 100644
--- a/pkgs/by-name/gc/gcp-scanner/package.nix
+++ b/pkgs/by-name/gc/gcp-scanner/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gcp_scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6bIrSaTqpXQjB64YWAI64DlgQBD2XD+zMvKymMtwpDk=";
   };
 
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index 3a1d96ed47b6..96bfbab97fc0 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "richardwilkes";
     repo = "gcs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
 
     nativeBuildInputs = [
       cacert
diff --git a/pkgs/by-name/gd/gdbuspp/package.nix b/pkgs/by-name/gd/gdbuspp/package.nix
index 8faf4b8990ee..1d371de5192f 100644
--- a/pkgs/by-name/gd/gdbuspp/package.nix
+++ b/pkgs/by-name/gd/gdbuspp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "gdbuspp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LwEUNBQ7BUyoTm8tBgE4hwL7AbimCY/grQus8lWSI/M=";
   };
 
diff --git a/pkgs/by-name/gd/gdm-settings/package.nix b/pkgs/by-name/gd/gdm-settings/package.nix
index 69527131ca14..2fab3fa7429f 100644
--- a/pkgs/by-name/gd/gdm-settings/package.nix
+++ b/pkgs/by-name/gd/gdm-settings/package.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gdm-settings";
     repo = "gdm-settings";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3Te8bhv2TkpJFz4llm1itRhzg9v64M7Drtrm4s9EyiQ=";
   };
 
diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix
index ce767725e979..ff1f3c878f3c 100644
--- a/pkgs/by-name/gd/gdu/package.nix
+++ b/pkgs/by-name/gd/gdu/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dundee";
     repo = "gdu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3SymmE3J+lphyRKTQ+sLsnXaBvLyjJRlwpy79U4+t5o=";
   };
 
diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix
index d48e9b6ea9ac..48d78ec8d75b 100644
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "project-gemmi";
     repo = "gemmi";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE=";
   };
 
diff --git a/pkgs/by-name/ge/genzai/package.nix b/pkgs/by-name/ge/genzai/package.nix
index d7477b783a1b..2779d13730ce 100644
--- a/pkgs/by-name/ge/genzai/package.nix
+++ b/pkgs/by-name/ge/genzai/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "umair9747";
     repo = "Genzai";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OTkHPzZcPOYZRzEKrJekrgKE/XfGUDL85RjznmrVZb8=";
   };
 
diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix
index 2513718cf40b..1ebcacfc5869 100644
--- a/pkgs/by-name/ge/getmail6/package.nix
+++ b/pkgs/by-name/ge/getmail6/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "getmail6";
     repo = "getmail6";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I=";
   };
 
diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix
index 1cb031cb354e..d00abe7861b3 100644
--- a/pkgs/by-name/gf/gfn-electron/package.nix
+++ b/pkgs/by-name/gf/gfn-electron/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "hmlendea";
     repo = "gfn-electron";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY=";
   };
 
diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix
index 37f3b7b8ab4b..7372c8236c3b 100644
--- a/pkgs/by-name/gg/gg-jj/package.nix
+++ b/pkgs/by-name/gg/gg-jj/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gulbanana";
     repo = "gg";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-iQxPJgMxBtyindkNdQkehwPf7ZgWCI09PToqs2y1Hfw=";
   };
 
diff --git a/pkgs/by-name/gh/gh-eco/package.nix b/pkgs/by-name/gh/gh-eco/package.nix
index 4918546f7961..cbe12671bf6a 100644
--- a/pkgs/by-name/gh/gh-eco/package.nix
+++ b/pkgs/by-name/gh/gh-eco/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "jrnxf";
     repo = "gh-eco";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Xtlz+u31hO81M53V0ZUtxmOgJ60zlspgVyCr181QrRE=";
   };
 
diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index e744dbb923f1..a78985cb5d2f 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5OdUA0rwBUjfoUZfXzFBmt/GFuvH3pm8JV2iLhaJQek=";
   };
 
diff --git a/pkgs/by-name/gh/ghauri/package.nix b/pkgs/by-name/gh/ghauri/package.nix
index 41f75ccbe233..4fb194efd5fb 100644
--- a/pkgs/by-name/gh/ghauri/package.nix
+++ b/pkgs/by-name/gh/ghauri/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "r0oth3x49";
     repo = "ghauri";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GEUuQMtp8XO32uOIILWiMfngPXx/3vCKk+YbA0E13rg=";
   };
 
diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix
index dcc66bfeb3dc..6543b4a7dcee 100644
--- a/pkgs/by-name/gh/ghc_filesystem/package.nix
+++ b/pkgs/by-name/gh/ghc_filesystem/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gulrak";
     repo = "filesystem";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-XZ0IxyNIAs2tegktOGQevkLPbWHam/AOFT+M6wAWPFg=";
   };
 
diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix
index 719da1f89760..0f4c42ff05dd 100644
--- a/pkgs/by-name/gh/ghunt/package.nix
+++ b/pkgs/by-name/gh/ghunt/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mxrch";
     repo = "ghunt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UeHVATTyAH3Xdm/NVSUhiicM+tZ4UnLeJsy1jSLK3v8=";
   };
 
diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix
index 7c97c654a762..f92f08c9e554 100644
--- a/pkgs/by-name/gi/gickup/package.nix
+++ b/pkgs/by-name/gi/gickup/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cooperspencer";
     repo = "gickup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Os26Il/FhH5cpgpaMZGfOljZ4p3XlCrRPEvzKD6kgpg=";
   };
 
diff --git a/pkgs/by-name/gi/girsh/package.nix b/pkgs/by-name/gi/girsh/package.nix
index 710abe7b0ab2..f819fa2ea7fe 100644
--- a/pkgs/by-name/gi/girsh/package.nix
+++ b/pkgs/by-name/gi/girsh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nodauf";
     repo = "Girsh";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MgzIBag0Exoh0TXW/AD0lbSOj7PVkMeVYQ8v5jdCgAs=";
   };
 
diff --git a/pkgs/by-name/gi/git-crecord/package.nix b/pkgs/by-name/gi/git-crecord/package.nix
index b5eec22bedc2..359d8b6675c1 100644
--- a/pkgs/by-name/gi/git-crecord/package.nix
+++ b/pkgs/by-name/gi/git-crecord/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "andrewshadura";
     repo = "git-crecord";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-zsrMAD9EU+TvkWfWl9x6WbMXuw7YEz50LxQzSFVkKdQ=";
   };
 
diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix
index 60f61e430cd4..46113ce2a757 100644
--- a/pkgs/by-name/gi/git-gr/package.nix
+++ b/pkgs/by-name/gi/git-gr/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "9999years";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t308Ep27iRvRHSdvVMOrRGVoajBtnTutHAkKbZkO7Wg=";
   };
 
diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix
index 9c5902319aa5..a20fdcc54166 100644
--- a/pkgs/by-name/gi/git-graph/package.nix
+++ b/pkgs/by-name/gi/git-graph/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mlange-42";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xYUpLujePO1MS0c25UJX5rRdmPzkaFgF5zJonzQOJqM=";
   };
 
diff --git a/pkgs/by-name/gi/git-identity/package.nix b/pkgs/by-name/gi/git-identity/package.nix
index 51addeebc16c..4d159ee4d920 100644
--- a/pkgs/by-name/gi/git-identity/package.nix
+++ b/pkgs/by-name/gi/git-identity/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "madx";
     repo = "git-identity";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u4lIW0bntaKrVUwodXZ8ZwWxSZtLuhVSUAbIj8jjcLw=";
   };
 
diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix
index da5fa88179cc..cecabf2a76e1 100644
--- a/pkgs/by-name/gi/git-lfs/package.nix
+++ b/pkgs/by-name/gi/git-lfs/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-lfs";
     repo = "git-lfs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PpNdbvtDAZDT43yyEkUvnhfUTAMM+mYImb3dVbAVPic=";
   };
 
diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix
index d303c2394776..72b4446e4251 100644
--- a/pkgs/by-name/gi/git-prole/package.nix
+++ b/pkgs/by-name/gi/git-prole/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "9999years";
     repo = "git-prole";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QwLkByC8gdAnt6geZS285ErdH8nfV3vsWjMF4hTzq9Y=";
   };
 
diff --git a/pkgs/by-name/gi/git-pw/package.nix b/pkgs/by-name/gi/git-pw/package.nix
index 24961845d1e9..a7f3f866e067 100644
--- a/pkgs/by-name/gi/git-pw/package.nix
+++ b/pkgs/by-name/gi/git-pw/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "getpatchwork";
     repo = "git-pw";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-y5qbvhuT+tjXvIFgCrM7RIPF6zhCkMu+/qByValrEXE=";
   };
 
diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix
index 0a46e3e98cd4..9d3d9d1d45ce 100644
--- a/pkgs/by-name/gi/git-releaser/package.nix
+++ b/pkgs/by-name/gi/git-releaser/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-releaser";
     repo = "git-releaser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bXW2/FpZnYV/zZ/DlaW2pUe2RUHLElPwqHm/J5gKJZI=";
   };
 
diff --git a/pkgs/by-name/gi/git-smash/package.nix b/pkgs/by-name/gi/git-smash/package.nix
index 3d0be16148a6..028b177eaed8 100644
--- a/pkgs/by-name/gi/git-smash/package.nix
+++ b/pkgs/by-name/gi/git-smash/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "anthraxx";
     repo = "git-smash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NyNYEF5g0O9xNhq+CoDPhQXZ+ISiY4DsShpjk5nP0N8=";
   };
 
diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index d1a23aaaf3fe..2e2fcc03974b 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -15,7 +15,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q5cNkX6ZtNXh+qDjpR0a2FfHmk5YA9izLCBRPFRpdvs=";
   };
 
diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix
index 3c5ef78d4585..0f80ba1665c5 100644
--- a/pkgs/by-name/gi/git-upstream/package.nix
+++ b/pkgs/by-name/gi/git-upstream/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "9999years";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA=";
   };
 
diff --git a/pkgs/by-name/gi/git-worktree-switcher/package.nix b/pkgs/by-name/gi/git-worktree-switcher/package.nix
index 27a7274e5c93..c3c2df5fa2f8 100644
--- a/pkgs/by-name/gi/git-worktree-switcher/package.nix
+++ b/pkgs/by-name/gi/git-worktree-switcher/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mateusauler";
     repo = "git-worktree-switcher";
-    rev = "refs/tags/${finalAttrs.version}-fork";
+    tag = "${finalAttrs.version}-fork";
     hash = "sha256-N+bDsLEUM6FWhyliUav2n5hwMa5EEuVPoIK+Cja0DxA=";
   };
 
diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index c4fce21fc13e..94277985556e 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gitify-app";
     repo = "gitify";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-l89CXfARLBNS6MMq54gM63y5FqeHdMXDBt52znir+/A=";
   };
 
diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix
index 397d78fc2dcc..3feed5163383 100644
--- a/pkgs/by-name/gi/gitleaks/package.nix
+++ b/pkgs/by-name/gi/gitleaks/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PJczVI2/TogRaw+Hs6HibHuwhKwL2scrCpsTQMsHv6Y=";
   };
 
diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix
index 6fab7a815bab..19976da2d5f1 100644
--- a/pkgs/by-name/gi/gitxray/package.nix
+++ b/pkgs/by-name/gi/gitxray/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kulkansecurity";
     repo = "gitxray";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rxG/FXIvPPCmV8//Bq3Upu4kNjwVhPVTK4ADp9X3OL0=";
   };
 
diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix
index c3ce67cbdf66..7b3433834157 100644
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@@ -12,7 +12,7 @@ let
   gitSrc = fetchFromGitHub {
     owner = "glasskube";
     repo = "glasskube";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-456kMO7KappYI2FuHA8g+uhkJNCGCxb/9zmleZqu6SQ=";
   };
   web-bundle = buildNpmPackage rec {
diff --git a/pkgs/by-name/gm/gmrun/package.nix b/pkgs/by-name/gm/gmrun/package.nix
index 1a87c20d12e6..2a6ecfbe8e07 100644
--- a/pkgs/by-name/gm/gmrun/package.nix
+++ b/pkgs/by-name/gm/gmrun/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wdlkmpx";
     repo = "gmrun";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-sp+Atod9ZKVF8sxNWIMrlewqZAGnoLo2mZUNkCtSkec=";
   };
 
diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix
index 4fe72aebc230..b4d4f268fe15 100644
--- a/pkgs/by-name/gm/gmt/package.nix
+++ b/pkgs/by-name/gm/gmt/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GenericMappingTools";
     repo = "gmt";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI=";
   };
 
diff --git a/pkgs/by-name/gn/gnome-frog/package.nix b/pkgs/by-name/gn/gnome-frog/package.nix
index b63c65f81795..7efaef29778a 100644
--- a/pkgs/by-name/gn/gnome-frog/package.nix
+++ b/pkgs/by-name/gn/gnome-frog/package.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "TenderOwl";
     repo = "Frog";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-Zu1xUGpjqpFiPQAAgaVYtnXI4jMtyywrJqn+38K5VHo=";
   };
 
diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix
index 74d9189fd1ab..24fffaf2da09 100644
--- a/pkgs/by-name/go/go-chromecast/package.nix
+++ b/pkgs/by-name/go/go-chromecast/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vishen";
     repo = "go-chromecast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg=";
   };
 
diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix
index 80e8a4e580c2..64d78a9cadd6 100644
--- a/pkgs/by-name/go/go-cve-search/package.nix
+++ b/pkgs/by-name/go/go-cve-search/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "s-index";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ofa6lfA3XKj70YM6AVNKRgGI53teK7OB09luAom8HpQ=";
   };
 
diff --git a/pkgs/by-name/go/go-dork/package.nix b/pkgs/by-name/go/go-dork/package.nix
index 5afffba56e3c..a1d6c959ad6a 100644
--- a/pkgs/by-name/go/go-dork/package.nix
+++ b/pkgs/by-name/go/go-dork/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "dwisiswant0";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q7ECwXH9q6qWba2URh3LjMx8g6vPF1DWfKnmXej7ht4=";
   };
 
diff --git a/pkgs/by-name/go/go-exploitdb/package.nix b/pkgs/by-name/go/go-exploitdb/package.nix
index d5e75b85cb35..5478e49bb8c7 100644
--- a/pkgs/by-name/go/go-exploitdb/package.nix
+++ b/pkgs/by-name/go/go-exploitdb/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vulsio";
     repo = "go-exploitdb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7S6DuPCsT3mP4/W5Lsyg4RS7Km8dmYkrUhvSjlRhahc=";
   };
 
diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix
index b63583d49298..c4c506e0621c 100644
--- a/pkgs/by-name/go/go-licenses/package.nix
+++ b/pkgs/by-name/go/go-licenses/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "go-licenses";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GAlwTVoVA+n9+EfhybmpKm16FoY9kFzrxy1ZQxS6A8E=";
   };
 
diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix
index c8d965c3c9ec..8390d93f2387 100644
--- a/pkgs/by-name/go/go-secdump/package.nix
+++ b/pkgs/by-name/go/go-secdump/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jfjallid";
     repo = "go-secdump";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HZAt/lSe13OjCjpJMNCvWoenhCMc2YGoys0S1eiLeKo=";
   };
 
diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix
index 0133af94d9c2..6d5e428bfead 100644
--- a/pkgs/by-name/go/go-swagger/package.nix
+++ b/pkgs/by-name/go/go-swagger/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PeH9bkRObsw4+ttuWhaPfPQQTOAw8pwlgTEtPoUBiIQ=";
   };
 
diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index 46f1442502a9..8639df064de2 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "go-task";
     repo = "task";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jQKPTKEzTfzqPlNlKFMduaAhvDsogRv3vCGtZ4KP/O4=";
   };
 
diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix
index fd7f5d685a10..4b299642dfe0 100644
--- a/pkgs/by-name/go/go2rtc/package.nix
+++ b/pkgs/by-name/go/go2rtc/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "go2rtc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pxKocvnFy1XMrjQ57VAmCnavcBgVPuNqWzT0v5+pWMI=";
   };
 
diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix
index 297e6f04f53b..fe041e6edf22 100644
--- a/pkgs/by-name/go/go365/package.nix
+++ b/pkgs/by-name/go/go365/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "optiv";
     repo = "Go365";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jmsbZrqc6XogUhuEWcU59v88id2uLqN/68URwylzWZI=";
   };
 
diff --git a/pkgs/by-name/go/go9p/package.nix b/pkgs/by-name/go/go9p/package.nix
index 9cb84797c96a..886fc50878cb 100644
--- a/pkgs/by-name/go/go9p/package.nix
+++ b/pkgs/by-name/go/go9p/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "knusbaum";
     repo = "go9p";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dqaj92LwHu5VRLLEvrUTFL9i61jG2qCARWBDMt9tGH8=";
   };
 
diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix
index b9433f23bb2c..82979ab9de38 100644
--- a/pkgs/by-name/go/goaccess/package.nix
+++ b/pkgs/by-name/go/goaccess/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "allinurl";
     repo = "goaccess";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZOngDAHA88YQvkx2pk5ZSpBzxqelvCIR4z5hiFmfGyc=";
   };
 
diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix
index bc5162675d38..236d983bf782 100644
--- a/pkgs/by-name/go/gobgpd/package.nix
+++ b/pkgs/by-name/go/gobgpd/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DIOii1jFVK3jwDLaLFWBbbQPC9eQnTwLYwI8uC8G8ig=";
   };
 
diff --git a/pkgs/by-name/go/goblob/package.nix b/pkgs/by-name/go/goblob/package.nix
index 1665cf1617ba..311f40e4b21c 100644
--- a/pkgs/by-name/go/goblob/package.nix
+++ b/pkgs/by-name/go/goblob/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Macmod";
     repo = "goblob";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FnSlfLi40VwDyQY77PvhV7EbhUDs1uGx0VsgP8HgKTw=";
   };
 
diff --git a/pkgs/by-name/go/gobuster/package.nix b/pkgs/by-name/go/gobuster/package.nix
index 832f69b3b6d8..58cd4d20c09c 100644
--- a/pkgs/by-name/go/gobuster/package.nix
+++ b/pkgs/by-name/go/gobuster/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "OJ";
     repo = "gobuster";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LZL9Zje2u0v6iAQinfjflvusV57ys5J5Il6Q7br3Suc=";
   };
 
diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix
index 503bd2bd9b07..f2583e8e26b3 100644
--- a/pkgs/by-name/go/godns/package.nix
+++ b/pkgs/by-name/go/godns/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "godns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qkyEQs96E5l1R5JTGefnTeiThr4P7PtUjpNmiylQj4c=";
   };
 
diff --git a/pkgs/by-name/go/godspeed/package.nix b/pkgs/by-name/go/godspeed/package.nix
index a86f1c9c3f21..32e7543cf7ad 100644
--- a/pkgs/by-name/go/godspeed/package.nix
+++ b/pkgs/by-name/go/godspeed/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redcode-labs";
     repo = "GodSpeed";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI=";
   };
 
diff --git a/pkgs/by-name/go/gokey/package.nix b/pkgs/by-name/go/gokey/package.nix
index 2b5a6f89ac06..f1775c771227 100644
--- a/pkgs/by-name/go/gokey/package.nix
+++ b/pkgs/by-name/go/gokey/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "gokey";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pvtRSWq/vXlyUShb61aiDlis9AiQnrA2PWycr1Zw0og=";
   };
 
diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix
index 38545a415603..003cca81df09 100644
--- a/pkgs/by-name/go/gollama/package.nix
+++ b/pkgs/by-name/go/gollama/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sammcj";
     repo = "gollama";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-n3GbEPh69mrr5qZ2TVzKv06lkR+zuhH9TtjmusXDHQg=";
   };
 
diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix
index ae172d32b876..c194f11d4afe 100644
--- a/pkgs/by-name/go/gomanagedocker/package.nix
+++ b/pkgs/by-name/go/gomanagedocker/package.nix
@@ -16,7 +16,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "ajayd-san";
     repo = "gomanagedocker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oM0DCOHdVPJFWgmHF8yeGGo6XvuTCXar7NebM1obahg=";
   };
 
diff --git a/pkgs/by-name/go/gomplate/package.nix b/pkgs/by-name/go/gomplate/package.nix
index 15127156114a..18c7577844a2 100644
--- a/pkgs/by-name/go/gomplate/package.nix
+++ b/pkgs/by-name/go/gomplate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hairyhenderson";
     repo = "gomplate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PupwL0VzZiWz+96Mv1o6QSmj7iLyvVIQMcdRlGqmpRs=";
   };
 
diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
index 510b0c0469d1..37fa2e16a675 100644
--- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
+++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "alloydb-auth-proxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z1sTArR6usEkoI/Dp5FUXhjsPeDHVG88GaSbrb9KaaA=";
   };
 
diff --git a/pkgs/by-name/go/google-chat-linux/package.nix b/pkgs/by-name/go/google-chat-linux/package.nix
index 3df1deb2dca3..b64012899c98 100644
--- a/pkgs/by-name/go/google-chat-linux/package.nix
+++ b/pkgs/by-name/go/google-chat-linux/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "squalou";
     repo = "google-chat-linux";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JBjxZUs0HUgAkJJBYhNv2SHjpBtAcP09Ah4ATPwpZsQ=";
   };
 
diff --git a/pkgs/by-name/go/google-clasp/package.nix b/pkgs/by-name/go/google-clasp/package.nix
index abf89139867d..b6c12c334236 100644
--- a/pkgs/by-name/go/google-clasp/package.nix
+++ b/pkgs/by-name/go/google-clasp/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "clasp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Cnnqbxjfx7hlRYIDtbjSbDO0QBHqLsleIGrAUQDLaCw=";
   };
 
diff --git a/pkgs/by-name/go/google-guest-agent/package.nix b/pkgs/by-name/go/google-guest-agent/package.nix
index 6f545c73764d..65168424ad66 100644
--- a/pkgs/by-name/go/google-guest-agent/package.nix
+++ b/pkgs/by-name/go/google-guest-agent/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DP15KDnD09edBxOQDwP0cjVIFxjMzE1hu1Sbu6Faj9Y=";
   };
 
diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix
index c52c12b0e352..fe03ebb95994 100644
--- a/pkgs/by-name/go/gose/package.nix
+++ b/pkgs/by-name/go/gose/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     repo = "gose";
     owner = "stv0g";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Vcp9gMJ296KS8OFOIcWvvYrS+LrOVlN3KN20yJxoo5U=";
   };
 
diff --git a/pkgs/by-name/go/gosh/package.nix b/pkgs/by-name/go/gosh/package.nix
index eb72987300d0..c802ab933495 100644
--- a/pkgs/by-name/go/gosh/package.nix
+++ b/pkgs/by-name/go/gosh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "redcode-labs";
     repo = "GoSH";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h4WqaN2okAeaU/+0fs8zLYDtyQLuLkCDdGrkGz8rdhg=";
   };
 
diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix
index a14fa86e14a9..40fbaea11de3 100644
--- a/pkgs/by-name/go/goss/package.nix
+++ b/pkgs/by-name/go/goss/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goss-org";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GdkLasokpWegjK4kZzAskp1NGwcuMjrjjau75cEo8kg=";
   };
 
diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 6cb81d28de5d..e97f13075ca9 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mikedilger";
     repo = "gossip";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mPM5HYPEUQ+cGrJ3G/0pmSN4ZQ9SvSNACJRTkgqTAeY=";
   };
 
diff --git a/pkgs/by-name/go/gotemplate/package.nix b/pkgs/by-name/go/gotemplate/package.nix
index 0ab99a16e379..10dc0354baee 100644
--- a/pkgs/by-name/go/gotemplate/package.nix
+++ b/pkgs/by-name/go/gotemplate/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "coveooss";
     repo = "gotemplate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XcSlQ0Gw+EW2sJK+M2Sp9pcSSy2wsdRZ3MeFewhx7nw=";
   };
 
diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix
index e783eb806944..b4f105360c38 100644
--- a/pkgs/by-name/go/gotenberg/package.nix
+++ b/pkgs/by-name/go/gotenberg/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gotenberg";
     repo = "gotenberg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y54DtOYIzFAk05TvXFcLdStfAXim3sVHBkW+R8CrtMM=";
   };
 
diff --git a/pkgs/by-name/go/gotestwaf/package.nix b/pkgs/by-name/go/gotestwaf/package.nix
index 747ee15bf070..343aaa66226f 100644
--- a/pkgs/by-name/go/gotestwaf/package.nix
+++ b/pkgs/by-name/go/gotestwaf/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wallarm";
     repo = "gotestwaf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bZ8cNREPUgIO7lJg0WBtc9qvkDUnfqtFNi612Ctcxo8=";
   };
 
diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix
index 4e3ced2cb0a3..da157305bb37 100644
--- a/pkgs/by-name/go/gotosocial/package.nix
+++ b/pkgs/by-name/go/gotosocial/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     inherit owner repo;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ql0tDaMc/1NgsLUpPHZB6GoXJj9DwUpadTX3AYufR/o=";
   };
 
diff --git a/pkgs/by-name/go/goverview/package.nix b/pkgs/by-name/go/goverview/package.nix
index a5093faa0f2a..01d008a2c09d 100644
--- a/pkgs/by-name/go/goverview/package.nix
+++ b/pkgs/by-name/go/goverview/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "j3ssie";
     repo = "goverview";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IgvpMuDwMK9IdPs1IRbPbpgr7xZuDX3boVT5d7Lb+3w=";
   };
 
diff --git a/pkgs/by-name/go/govulncheck/package.nix b/pkgs/by-name/go/govulncheck/package.nix
index b5cd36afea4b..e2da42b7439b 100644
--- a/pkgs/by-name/go/govulncheck/package.nix
+++ b/pkgs/by-name/go/govulncheck/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "golang";
     repo = "vuln";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ydJ8AeoCnLls6dXxjI05+THEqPPdJqtAsKTriTIK9Uc=";
   };
 
diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix
index 4394e97bec61..2f128bb06305 100644
--- a/pkgs/by-name/gp/gptscript/package.nix
+++ b/pkgs/by-name/gp/gptscript/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gptscript-ai";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9wyDcvY5JCjtvx6XtvHwOsZLCiN1fRn0wBGaIaw2iRQ=";
   };
 
diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix
index 79c26a10bf64..9e258b2e5de9 100644
--- a/pkgs/by-name/gp/gpu-viewer/package.nix
+++ b/pkgs/by-name/gp/gpu-viewer/package.nix
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "arunsivaramanneo";
     repo = "gpu-viewer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0rbg3T9OXnSZ5+2cjgfNitAv1LgdO0N90wWJifzHcsg=";
   };
 
diff --git a/pkgs/by-name/gq/gqmqtt/package.nix b/pkgs/by-name/gq/gqmqtt/package.nix
index 55fb2c8d420c..9a11f132c638 100644
--- a/pkgs/by-name/gq/gqmqtt/package.nix
+++ b/pkgs/by-name/gq/gqmqtt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "klumw";
     repo = "gqmqtt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4FV2Z3eow69v/Z6sfVfJew/N8ceiXX+JtvLidmiysPk=";
   };
 
diff --git a/pkgs/by-name/gr/gramma/package.nix b/pkgs/by-name/gr/gramma/package.nix
index 2161522c3fb3..794f49106a1e 100644
--- a/pkgs/by-name/gr/gramma/package.nix
+++ b/pkgs/by-name/gr/gramma/package.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "caderek";
     repo = "gramma";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-gfBwKpsttdhjD/Opn8251qskURpwLX2S5NSbpwP3hFg=";
   };
 
diff --git a/pkgs/by-name/gr/grap/package.nix b/pkgs/by-name/gr/grap/package.nix
index 556857150040..e4589322a0fe 100644
--- a/pkgs/by-name/gr/grap/package.nix
+++ b/pkgs/by-name/gr/grap/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "QuoSecGmbH";
     repo = "grap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zLIKoNOdrmTyZkQGRogeKfIRk4kpG0hmeN0519SJbbo=";
   };
 
diff --git a/pkgs/by-name/gr/graphinder/package.nix b/pkgs/by-name/gr/graphinder/package.nix
index 2aed25920bd4..432012cdec27 100644
--- a/pkgs/by-name/gr/graphinder/package.nix
+++ b/pkgs/by-name/gr/graphinder/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Escape-Technologies";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TDc6aIFkxShlfC6fLYMKULfrFUAYhQZrIHZNDuMh68g=";
   };
 
diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix
index 1c2276bf46c5..927f30b77d6a 100644
--- a/pkgs/by-name/gr/grcov/package.nix
+++ b/pkgs/by-name/gr/grcov/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "grcov";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI=";
   };
 
diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index 5aed93ea5def..8de09f551842 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gSwXwU0YF+0mqRvq+6D+qosLGUNb6/RIRavZpI1BSQM=";
   };
 
diff --git a/pkgs/by-name/gr/grimoire/package.nix b/pkgs/by-name/gr/grimoire/package.nix
index c17abb54ede2..07242d2325fd 100644
--- a/pkgs/by-name/gr/grimoire/package.nix
+++ b/pkgs/by-name/gr/grimoire/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "grimoire";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V6j6PBoZqTvGfYSbpxd0vOyTb/i2EV8pDVSuZeq1s5o=";
   };
 
diff --git a/pkgs/by-name/gr/grip-grab/package.nix b/pkgs/by-name/gr/grip-grab/package.nix
index 116dc3ba97b5..93564a6c03a5 100644
--- a/pkgs/by-name/gr/grip-grab/package.nix
+++ b/pkgs/by-name/gr/grip-grab/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "grip-grab";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e7duLL4tjW+11jXUqU6sqoKTAPGkH81iDCfjtNcnd4I=";
   };
 
diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index e581e128b713..0fabcd3d83c8 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k4Faw7DqN5H2bGxKEqeUA4+sMZOdbW1139GcqbU56Hk=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/gs/gsan/package.nix b/pkgs/by-name/gs/gsan/package.nix
index 8217d4b1c3c2..a0259a695185 100644
--- a/pkgs/by-name/gs/gsan/package.nix
+++ b/pkgs/by-name/gs/gsan/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "franccesco";
     repo = "getaltname";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Os/NappuvdadGqCouF5vhvPhRnu1SLpii+Esq0C1j48=";
   };
 
diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix
index cfdae25a27f8..b12a1bfc4a02 100644
--- a/pkgs/by-name/gs/gswatcher/package.nix
+++ b/pkgs/by-name/gs/gswatcher/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lxndr";
     repo = "gswatcher";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-U09vovOanYmDl5ymFC3bXU8pi8aUq2tPUE5AEoqmfpc=";
   };
 
diff --git a/pkgs/by-name/gt/gtfocli/package.nix b/pkgs/by-name/gt/gtfocli/package.nix
index e797e3975bf4..6579ba0ba645 100644
--- a/pkgs/by-name/gt/gtfocli/package.nix
+++ b/pkgs/by-name/gt/gtfocli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cmd-tools";
     repo = "gtfocli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yvL9H9yOiYTaWtm5cj9A8y+kKXLQgLqUMu9JMnm1llI=";
   };
 
diff --git a/pkgs/by-name/gt/gtimelog/package.nix b/pkgs/by-name/gt/gtimelog/package.nix
index bc63fab15193..7b6d00f9b5ee 100644
--- a/pkgs/by-name/gt/gtimelog/package.nix
+++ b/pkgs/by-name/gt/gtimelog/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gtimelog";
     repo = "gtimelog";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NlKAgAnZWodXF4eybcNOSxexjhegRgQEWoAPd+KWzsw=";
   };
 
diff --git a/pkgs/by-name/gu/guake/package.nix b/pkgs/by-name/gu/guake/package.nix
index f31b1a143441..4cfdd6e23aeb 100644
--- a/pkgs/by-name/gu/guake/package.nix
+++ b/pkgs/by-name/gu/guake/package.nix
@@ -26,7 +26,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Guake";
     repo = "guake";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e6Bf4HDftHBxFPcw9z02CqgZhSIvt6wlLF6dnIh9fEc=";
   };
 
diff --git a/pkgs/by-name/gu/gucci/package.nix b/pkgs/by-name/gu/gucci/package.nix
index 82cc016de143..4660c1a97ba5 100644
--- a/pkgs/by-name/gu/gucci/package.nix
+++ b/pkgs/by-name/gu/gucci/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noqcks";
     repo = "gucci";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-bwPQQtaPHby96C5ZHZhBTok+m8GPPS40U1CUPVYqCa4=";
   };
 
diff --git a/pkgs/by-name/gu/gusb/package.nix b/pkgs/by-name/gu/gusb/package.nix
index 75ba45988acb..c13c40baed3d 100644
--- a/pkgs/by-name/gu/gusb/package.nix
+++ b/pkgs/by-name/gu/gusb/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "libgusb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs=";
   };
 
diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix
index c3e5e278b590..5f38df5e096d 100644
--- a/pkgs/by-name/gv/gvm-libs/package.nix
+++ b/pkgs/by-name/gv/gvm-libs/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "gvm-libs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VYFAy6VVASNOBLs39qukePYr5pV0IR1qjztv+veNCVc=";
   };
 
diff --git a/pkgs/by-name/gw/gweled/package.nix b/pkgs/by-name/gw/gweled/package.nix
index 5263d9adab99..45d16fd45848 100644
--- a/pkgs/by-name/gw/gweled/package.nix
+++ b/pkgs/by-name/gw/gweled/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.launchpad.net/gweled";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-cm1z6l2tfYBFVFcvsnQ6cI3pQDnJMzn6SUC20gnBF5w=";
   };
 
diff --git a/pkgs/by-name/gy/gyb/package.nix b/pkgs/by-name/gy/gyb/package.nix
index 9cf2323ac833..ce093a3f302a 100644
--- a/pkgs/by-name/gy/gyb/package.nix
+++ b/pkgs/by-name/gy/gyb/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "GAM-team";
     repo = "got-your-back";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eKeT2tVBK2DcTOEC6Tvo+igPXPOD1wy66+kr0ltnMIU=";
   };
 
diff --git a/pkgs/by-name/h2/h2/package.nix b/pkgs/by-name/h2/h2/package.nix
index 004d48011133..d060e2465b79 100644
--- a/pkgs/by-name/h2/h2/package.nix
+++ b/pkgs/by-name/h2/h2/package.nix
@@ -19,7 +19,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "h2database";
     repo = "h2database";
-    rev = "refs/tags/version-${version}";
+    tag = "version-${version}";
     hash = "sha256-voqQ4JqYkHRxVdxMGsHmKirQXMP7s44rTXeasWWW2Jw=";
   };
 
diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 9f0100b8de9d..3fafadb333f8 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n";
   };
 
diff --git a/pkgs/by-name/h8/h8mail/package.nix b/pkgs/by-name/h8/h8mail/package.nix
index bff26f3d8c2f..ce9578865938 100644
--- a/pkgs/by-name/h8/h8mail/package.nix
+++ b/pkgs/by-name/h8/h8mail/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "khast3x";
     repo = "h8mail";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gKRght/12apPD1u3mRY/yCPT0XAyXwaYgaqyJHrDLgw=";
   };
 
diff --git a/pkgs/by-name/ha/haguichi/package.nix b/pkgs/by-name/ha/haguichi/package.nix
index a0d8c78ba100..122b85a98ba9 100644
--- a/pkgs/by-name/ha/haguichi/package.nix
+++ b/pkgs/by-name/ha/haguichi/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ztefn";
     repo = "haguichi";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-hSQsKG86QUzv/dfqz2amSXyAaA1ZAk9dTvel9KVgeFs=";
   };
 
diff --git a/pkgs/by-name/ha/halftone/package.nix b/pkgs/by-name/ha/halftone/package.nix
index aa7a4f7f4c29..c1d0a886554f 100644
--- a/pkgs/by-name/ha/halftone/package.nix
+++ b/pkgs/by-name/ha/halftone/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tfuxu";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-o55eimlDy86mbwveARxVXauMQEneAchVi2RNaj6FYxs=";
   };
 
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 7f5004bfec56..daf47b692559 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Tns0Jd5v+lizU7NMVqS/hoqjHhmqrc9VVawjoZvhk78=";
   };
 
diff --git a/pkgs/by-name/ha/hamster/package.nix b/pkgs/by-name/ha/hamster/package.nix
index a72f6ddbd7e5..7ad5fbaac6b5 100644
--- a/pkgs/by-name/ha/hamster/package.nix
+++ b/pkgs/by-name/ha/hamster/package.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "projecthamster";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cUmUvJP9Y3de5OaNgIxvigDsX2ww7NNRY5son/gg+WI=";
   };
 
diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix
index 57640b3a6a73..8303bb7cf09b 100644
--- a/pkgs/by-name/ha/hardinfo2/package.nix
+++ b/pkgs/by-name/ha/hardinfo2/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAtrs: {
   src = fetchFromGitHub {
     owner = "hardinfo2";
     repo = "hardinfo2";
-    rev = "refs/tags/release-${finalAtrs.version}";
+    tag = "release-${finalAtrs.version}";
     hash = "sha256-UgVryuUkD9o2SvwA9VbX/kCaAo3+Osf6FxlYyaRX1Ag=";
   };
 
diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 4f9afa90bd28..da6c0c4c5875 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "harlequin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ov9pMvFzJAMfOM7JeSgnp6dZ424GiRaH7W5OCKin9Jk=";
   };
 
diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix
index 0d737c0efdca..96204a03086c 100644
--- a/pkgs/by-name/ha/harmonia/package.nix
+++ b/pkgs/by-name/ha/harmonia/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "harmonia";
-    rev = "refs/tags/harmonia-v${version}";
+    tag = "harmonia-v${version}";
     hash = "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY=";
   };
 
diff --git a/pkgs/by-name/ha/hashes/package.nix b/pkgs/by-name/ha/hashes/package.nix
index a1937d82f5b7..3f2ab7034bb3 100644
--- a/pkgs/by-name/ha/hashes/package.nix
+++ b/pkgs/by-name/ha/hashes/package.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zefr0x";
     repo = "hashes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BmfSCHs+JcpsAG8AhaYf+SDFI+LdJKMKgBIodd66qmw=";
   };
 
diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix
index b4e5b6c42c5b..1bee6d3f4447 100644
--- a/pkgs/by-name/ha/hatch/package.nix
+++ b/pkgs/by-name/ha/hatch/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "hatch";
-    rev = "refs/tags/hatch-v${version}";
+    tag = "hatch-v${version}";
     hash = "sha256-jD8mr0PXlGK9YkBPZhNTimuxmq6dJG7cfQP/UEmHTZY=";
   };
 
diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix
index c395195a16a2..5d5f36d222fe 100644
--- a/pkgs/by-name/ha/hatsu/package.nix
+++ b/pkgs/by-name/ha/hatsu/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "importantimport";
     repo = "hatsu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-K+8X/bNPdjxBSJdlFIXUUOXlTq7Cgol3fFToj5KzbeE=";
   };
 
diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index 69fd890ab3e5..3b823bb0bf27 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-13ilzqFSBrOOPuSu0sqROqAPu6QWAI3dag5paSnq+2A=";
   };
 
diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix
index 483268680e06..9e46bf9a7089 100644
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Va6OWoBSEO+u1J1jYG6O0u7urnNkAPqXPBCFCHYO7VU=";
   };
 
diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index 0d7f0cac0385..c711432bea02 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "HDFGroup";
     repo = "hdf4";
-    rev = "refs/tags/hdf${finalAttrs.version}";
+    tag = "hdf${finalAttrs.version}";
     hash = "sha256-Q2VKwkp/iroStrOnwHI8d/dtMWkMoJesBVBVChwNa30=";
   };
 
diff --git a/pkgs/by-name/hd/hdfview/package.nix b/pkgs/by-name/hd/hdfview/package.nix
index 3274762d87c3..f3d9049485fe 100644
--- a/pkgs/by-name/hd/hdfview/package.nix
+++ b/pkgs/by-name/hd/hdfview/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "HDFGroup";
     repo = "hdfview";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-aJHeknkF38qDH9l+vuzdKFZZTcs/XMjtlHuu/LTF124=";
   };
 
diff --git a/pkgs/by-name/hd/hdr10plus_tool/package.nix b/pkgs/by-name/hd/hdr10plus_tool/package.nix
index d7177166f946..f8046e9120a2 100644
--- a/pkgs/by-name/hd/hdr10plus_tool/package.nix
+++ b/pkgs/by-name/hd/hdr10plus_tool/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "quietvoid";
     repo = "hdr10plus_tool";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eP77LHADP9oenMACctPKU6xPzg4atC0dPOqyrFse/1s=";
   };
 
diff --git a/pkgs/by-name/he/hednsextractor/package.nix b/pkgs/by-name/he/hednsextractor/package.nix
index 8f8fb9f4f605..8fbefeaa9ccf 100644
--- a/pkgs/by-name/he/hednsextractor/package.nix
+++ b/pkgs/by-name/he/hednsextractor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "HuntDownProject";
     repo = "HEDnsExtractor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Uj5TNQ+X0+ip1DcLanMmFzr5ROuXhuZJSPF9tile+ZQ=";
   };
 
diff --git a/pkgs/by-name/he/helm/package.nix b/pkgs/by-name/he/helm/package.nix
index c5b4dd4ce564..0919ddef6bf0 100644
--- a/pkgs/by-name/he/helm/package.nix
+++ b/pkgs/by-name/he/helm/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mtytel";
     repo = "helm";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pI1umrJGMRBB3ifiWrInG7/Rwn+8j9f8iKkzC/cW2p8=";
   };
 
diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix
index 85da3d54c445..0f5a2c124fed 100644
--- a/pkgs/by-name/hf/hfinger/package.nix
+++ b/pkgs/by-name/hf/hfinger/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "hfinger";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gxwirAqtY4R3KDHyNmDIknABO+SFuoDua9nm1UyXbxA=";
   };
 
diff --git a/pkgs/by-name/hf/hfst-ospell/package.nix b/pkgs/by-name/hf/hfst-ospell/package.nix
index a76e57a240ba..0248ff05ba2b 100644
--- a/pkgs/by-name/hf/hfst-ospell/package.nix
+++ b/pkgs/by-name/hf/hfst-ospell/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hfst";
     repo = "hfst-ospell";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BmM0acqPL8qPOJ0KEkcI264xj89v+VaItZ0yS8QLF3o=";
   };
 
diff --git a/pkgs/by-name/hf/hfst/package.nix b/pkgs/by-name/hf/hfst/package.nix
index afae2ce01bd8..47c17f0cf0be 100644
--- a/pkgs/by-name/hf/hfst/package.nix
+++ b/pkgs/by-name/hf/hfst/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hfst";
     repo = "hfst";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU=";
   };
 
diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix
index f38a834f10dd..b845aeaa85f6 100644
--- a/pkgs/by-name/hi/hickory-dns/package.nix
+++ b/pkgs/by-name/hi/hickory-dns/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hickory-dns";
     repo = "hickory-dns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yLhTQIu9C1ikm0TtoEPLSt7ZWqJXn4YE2Lrx38sSJtE=";
   };
 
diff --git a/pkgs/by-name/hi/hieroglyphic/package.nix b/pkgs/by-name/hi/hieroglyphic/package.nix
index 4e276e185d63..e0ccf4c8fcad 100644
--- a/pkgs/by-name/hi/hieroglyphic/package.nix
+++ b/pkgs/by-name/hi/hieroglyphic/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FineFindus";
     repo = "Hieroglyphic";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8UUFatJwtxqumhHd0aiPk6nKsaaF/jIIqMFxXye0X8U=";
   };
 
diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix
index 614ce434ef79..a13d4b23791d 100644
--- a/pkgs/by-name/hi/highlight-pointer/package.nix
+++ b/pkgs/by-name/hi/highlight-pointer/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "swillner";
     repo = "highlight-pointer";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mz9gXAtrtSV0Lapx8xBOPljuF+HRgDaF2DKCDrHXQa8=";
   };
 
diff --git a/pkgs/by-name/hi/hilbish/package.nix b/pkgs/by-name/hi/hilbish/package.nix
index 109b102966b0..6b2b77b49d24 100644
--- a/pkgs/by-name/hi/hilbish/package.nix
+++ b/pkgs/by-name/hi/hilbish/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Rosettea";
     repo = "Hilbish";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rDE9zxkCnnvc1OWd4Baei/Bw9KdFRV7DOorxLSD/KhM";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/hm/hmat-oss/package.nix b/pkgs/by-name/hm/hmat-oss/package.nix
index 41ac38f06901..f9b9e5e36a09 100644
--- a/pkgs/by-name/hm/hmat-oss/package.nix
+++ b/pkgs/by-name/hm/hmat-oss/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jeromerobert";
     repo = "hmat-oss";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-GnFlvZCEzSCcBVLjFWLe+AKXVA6UMs/gycrOJ2TBqrE=";
   };
 
diff --git a/pkgs/by-name/hn/hnswlib/package.nix b/pkgs/by-name/hn/hnswlib/package.nix
index 9d8c7c5cf225..3938c07ba1a6 100644
--- a/pkgs/by-name/hn/hnswlib/package.nix
+++ b/pkgs/by-name/hn/hnswlib/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nmslib";
     repo = "hnswlib";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1KkAX42j/I06KO4wCnDsDifN1JiENqYKR5NNHBjyuVA=";
   };
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Header-only C++/python library for fast approximate nearest neighbors";
     homepage = "https://github.com/nmslib/hnswlib";
-    changelog = "https://github.com/nmslib/hnswlib/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/nmslib/hnswlib/releases/tag/v${finalAttrs.version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ natsukium ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/hs/hstsparser/package.nix b/pkgs/by-name/hs/hstsparser/package.nix
index b956845048b5..47b9565c5e0b 100644
--- a/pkgs/by-name/hs/hstsparser/package.nix
+++ b/pkgs/by-name/hs/hstsparser/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "thebeanogamer";
     repo = "hstsparser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9ZNBzPa4mFXbao73QukEL56sM/3dg4ElOMXgNGTVh1g=";
   };
 
diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index 6fa7bc4baaac..4fd405b5fd52 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fermitools";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1rF72zo/Jj4ZeEG2Nk6Wla+AfaDo5iPZhZP1j9WAK5I=";
   };
 
diff --git a/pkgs/by-name/ht/httpdirfs/package.nix b/pkgs/by-name/ht/httpdirfs/package.nix
index fda57e5c3503..df8975a197da 100644
--- a/pkgs/by-name/ht/httpdirfs/package.nix
+++ b/pkgs/by-name/ht/httpdirfs/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fangfufu";
     repo = "httpdirfs";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-6TGptKWX0hSNL3Z3ioP7puzozWLiMhCybN7hATQdD/k=";
   };
 
diff --git a/pkgs/by-name/ht/httping/package.nix b/pkgs/by-name/ht/httping/package.nix
index ff034a6d62d8..ae1bbbcc0d59 100644
--- a/pkgs/by-name/ht/httping/package.nix
+++ b/pkgs/by-name/ht/httping/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "folkertvanheusden";
     repo = "HTTPing";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6PXus8lg+2L9RoRe4nPI1+2iYDKKEhVfJJZMoKWSCb0=";
   };
 
diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix
index e3c54203330c..ba35c59ac8f0 100644
--- a/pkgs/by-name/ht/httptoolkit/package.nix
+++ b/pkgs/by-name/ht/httptoolkit/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "httptoolkit";
     repo = "httptoolkit-desktop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e+ngBZMwMTvwzY1K7IaxlNoRkZUPDdJvKxvxuCsc9pw=";
   };
 
diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix
index e4801090d94f..c1f038cf6515 100644
--- a/pkgs/by-name/ht/httpx/package.nix
+++ b/pkgs/by-name/ht/httpx/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "httpx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk=";
   };
 
diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index e6907aae8d94..4a49b8b29e87 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "hurl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo=";
   };
 
diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix
index c28c727bedb6..513e0b726be9 100644
--- a/pkgs/by-name/hw/hwatch/package.nix
+++ b/pkgs/by-name/hw/hwatch/package.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "blacknon";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-E1IxeraZTHY+FDnOhyjygFyqOIwVEvnKuPuuNZvvL7o=";
   };
 
diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 49c8cf248af4..b35d874fea04 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk=";
   };
 
diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix
index 8eec9ef219ee..f6dafbde43d3 100644
--- a/pkgs/by-name/hy/hyperhdr/package.nix
+++ b/pkgs/by-name/hy/hyperhdr/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "awawa-dev";
     repo = "HyperHDR";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o=";
   };
 
diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix
index 3c13f0a3a2dc..a501314bcd91 100644
--- a/pkgs/by-name/hy/hyprcursor/package.nix
+++ b/pkgs/by-name/hy/hyprcursor/package.nix
@@ -19,7 +19,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprcursor";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LOTmvTIxmaWtXF8OP6b6oENSdG/quWxhsO3dJQACBUw=";
   };
 
diff --git a/pkgs/by-name/hy/hypre/package.nix b/pkgs/by-name/hy/hypre/package.nix
index 0fafb235b7b6..227cba66fac9 100644
--- a/pkgs/by-name/hy/hypre/package.nix
+++ b/pkgs/by-name/hy/hypre/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hypre-space";
     repo = "hypre";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-h16+nZ6+GfddfBJDF6sphuZ9Sff++PxW2R58XgJsnsI=";
   };
 
diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index f436b2985eca..ad06666d3237 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -91,7 +91,7 @@ customStdenv.mkDerivation (finalAttrs: {
     owner = "hyprwm";
     repo = "hyprland";
     fetchSubmodules = true;
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dj9dpVwpyTmUyVu4jtaIU39bHgVkoZjv6cgYfWyHc9E=";
   };
 
diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix
index 13baecb89f84..6bde2ab07b5e 100644
--- a/pkgs/by-name/hy/hyprpolkitagent/package.nix
+++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprpolkitagent";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fhG6YqByDW0DAixXXX6AwTJOH3MqDlQ2XrVvpusZ3Ek=";
   };
 
diff --git a/pkgs/by-name/hy/hyprspace/package.nix b/pkgs/by-name/hy/hyprspace/package.nix
index ffb30461fdb0..c0e514f83f4e 100644
--- a/pkgs/by-name/hy/hyprspace/package.nix
+++ b/pkgs/by-name/hy/hyprspace/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hyprspace";
     repo = "hyprspace";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zWajCfHFqPa3Z72DHcxBUq4bmcCu1lpEKUbZZewpYOE=";
   };
 
diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix
index 2202d52b8445..56755a513954 100644
--- a/pkgs/by-name/hy/hyprsunset/package.nix
+++ b/pkgs/by-name/hy/hyprsunset/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprsunset";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SVkcePzX9PAlWsPSGBaxiNFCouiQmGOezhMo0+zhDIQ=";
   };
 
diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index 99a172a5371e..bb6b9b0f7753 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7D5j2sh3Miw2CRdmx8ftepb342pl36kDFJy+3aVfDVc=";
   };
 
diff --git a/pkgs/by-name/i3/i3-back/package.nix b/pkgs/by-name/i3/i3-back/package.nix
index e21914435f7a..5a165dda6079 100644
--- a/pkgs/by-name/i3/i3-back/package.nix
+++ b/pkgs/by-name/i3/i3-back/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Cretezy";
     repo = "i3-back";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xGfX7ttWrcIVhy+MkR5RZr2DCAwIKwGu7zkafHcrjaE=";
   };
 
diff --git a/pkgs/by-name/im/ima-evm-utils/package.nix b/pkgs/by-name/im/ima-evm-utils/package.nix
index 21d580a7bb1b..62ac73d0adc0 100644
--- a/pkgs/by-name/im/ima-evm-utils/package.nix
+++ b/pkgs/by-name/im/ima-evm-utils/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-integrity";
     repo = "ima-evm-utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vIu12Flc2DiEqUSKAfoUi7Zg6D25pURvlYKEQKHER4I=";
   };
 
diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix
index 03dc0fdc78d4..84109cebd593 100644
--- a/pkgs/by-name/im/imapdedup/package.nix
+++ b/pkgs/by-name/im/imapdedup/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "quentinsf";
     repo = "IMAPdedup";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-s49nnMjX1beZKTrlcjzp0nESIVRb/LZDycpnzz8fG+o=";
   };
 
diff --git a/pkgs/by-name/im/imdshift/package.nix b/pkgs/by-name/im/imdshift/package.nix
index 0d0bff509cf8..d195f281f2f5 100644
--- a/pkgs/by-name/im/imdshift/package.nix
+++ b/pkgs/by-name/im/imdshift/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ayushpriya10";
     repo = "IMDShift";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Uoa0uNOhCkT622Yy8GEg8jz9k5zmtXwGmvdb3MVTLX8=";
   };
 
diff --git a/pkgs/by-name/im/imgbrd-grabber/package.nix b/pkgs/by-name/im/imgbrd-grabber/package.nix
index 5714ae5c109c..dc28c5e3132d 100644
--- a/pkgs/by-name/im/imgbrd-grabber/package.nix
+++ b/pkgs/by-name/im/imgbrd-grabber/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Bionus";
     repo = "imgbrd-grabber";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6XfIaASfbvdPovtdDEJtsk4pEL4Dhmyq8ml4X7KZ4DE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index c0b7eea35795..5f18c1ec4bf0 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -57,7 +57,7 @@ stdenv'.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
     owner = "WerWolv";
     repo = "ImHex";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-e7ppx2MdtTPki/Q+1kWswHkFLNRcO0Y8+q9VzpgUoVE=";
   };
 
diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix
index 6d65ea470935..d87cb99e7dc8 100644
--- a/pkgs/by-name/im/imsprog/package.nix
+++ b/pkgs/by-name/im/imsprog/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bigbigmdm";
     repo = "IMSProg";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dhBg0f7pIbBS8IiUXd1UlAxgGrv6HapzooXafkHIEK8=";
   };
 
diff --git a/pkgs/by-name/in/indicator-sound-switcher/package.nix b/pkgs/by-name/in/indicator-sound-switcher/package.nix
index c36260731107..8f46f42b439d 100644
--- a/pkgs/by-name/in/indicator-sound-switcher/package.nix
+++ b/pkgs/by-name/in/indicator-sound-switcher/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yktoo";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Benhlhz81EgL6+pmjzyruKBOS6O7ce5PPmIIzk2Zong=";
   };
 
diff --git a/pkgs/by-name/in/ineffassign/package.nix b/pkgs/by-name/in/ineffassign/package.nix
index f88b72527c27..55d48ecdf81a 100644
--- a/pkgs/by-name/in/ineffassign/package.nix
+++ b/pkgs/by-name/in/ineffassign/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gordonklaus";
     repo = "ineffassign";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JVrAIspRL6XvDd/AnPFt9IJPQ0hY1KPwXvldAfwYkzU=";
   };
 
diff --git a/pkgs/by-name/in/inotify-info/package.nix b/pkgs/by-name/in/inotify-info/package.nix
index feae12822170..99f7884185f5 100644
--- a/pkgs/by-name/in/inotify-info/package.nix
+++ b/pkgs/by-name/in/inotify-info/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mikesart";
     repo = "inotify-info";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mxZpJMmSCgm5uV5/wknVb1PdxRIF/b2k+6rdOh4b8zA=";
   };
 
diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 4738aa6a4d91..358c94e32886 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qo22x+eTqUUJ8Qnjv91QgBTy2SHFYv8JxPaGSnpIN9M=";
   };
 
diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix
index 4854dd1d72e0..0e492f7fc46e 100644
--- a/pkgs/by-name/in/inql/package.nix
+++ b/pkgs/by-name/in/inql/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "doyensec";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DFGJHqdrCmOZn8GdY5SZ1PrOhuIsMLoK+2Fry9WkRiY=";
   };
 
diff --git a/pkgs/by-name/in/inshellisense/package.nix b/pkgs/by-name/in/inshellisense/package.nix
index 9c013a592bca..0f73a0938621 100644
--- a/pkgs/by-name/in/inshellisense/package.nix
+++ b/pkgs/by-name/in/inshellisense/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9cSygGQar2rD3lorehlNmUzd0ZnABNJSJwmoNH3MTmk=";
   };
 
diff --git a/pkgs/by-name/in/intel-undervolt/package.nix b/pkgs/by-name/in/intel-undervolt/package.nix
index 317a1b45d209..9bee5bf14981 100644
--- a/pkgs/by-name/in/intel-undervolt/package.nix
+++ b/pkgs/by-name/in/intel-undervolt/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kitsunyan";
     repo = "intel-undervolt";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-BxTNqXC+vG24/y8yZ/h1Ep4F8MwVdjsr5uo/BjuWULo=";
   };
 
diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix
index 1a8b19a2dccc..e1e3139ee44e 100644
--- a/pkgs/by-name/in/intentrace/package.nix
+++ b/pkgs/by-name/in/intentrace/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "sectordistrict";
     repo = "intentrace";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ=";
   };
 
diff --git a/pkgs/by-name/in/interactsh/package.nix b/pkgs/by-name/in/interactsh/package.nix
index 824e1197d93c..0dd12136cae0 100644
--- a/pkgs/by-name/in/interactsh/package.nix
+++ b/pkgs/by-name/in/interactsh/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aPjeP9Js2lpJBiWYTpJjKo445wSkNcatszBZMutIIR0=";
   };
 
diff --git a/pkgs/by-name/in/invidtui/package.nix b/pkgs/by-name/in/invidtui/package.nix
index 81ce6d058a76..5feb30bc693d 100644
--- a/pkgs/by-name/in/invidtui/package.nix
+++ b/pkgs/by-name/in/invidtui/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = "invidtui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C465lzbZIh8LYDUHNa5u66nFteFsKAffilvy1Danfpg=";
   };
 
diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix
index a6e962622d24..a918be3193a8 100644
--- a/pkgs/by-name/in/invoiceplane/package.nix
+++ b/pkgs/by-name/in/invoiceplane/package.nix
@@ -22,7 +22,7 @@ php.buildComposerProject (finalAttrs: {
   src = fetchFromGitHub {
     owner = "InvoicePlane";
     repo = "InvoicePlane";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-E2TZ/FhlVKZpGuczXb/QLn27gGiO7YYlAkPSolTEoeQ=";
   };
 
diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix
index 4495906ba926..dd326868acf1 100644
--- a/pkgs/by-name/io/ioc-scan/package.nix
+++ b/pkgs/by-name/io/ioc-scan/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cisagov";
     repo = "ioc-scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SCyCANZfi7PqexM2Kc8WJwwEEiBQxPBg0ggWsK9WB4k=";
   };
 
diff --git a/pkgs/by-name/ip/iptsd/package.nix b/pkgs/by-name/ip/iptsd/package.nix
index 850fc4a03778..82fbed29652a 100644
--- a/pkgs/by-name/ip/iptsd/package.nix
+++ b/pkgs/by-name/ip/iptsd/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "linux-surface";
     repo = "iptsd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3z3A9qywmsSW1tlJ6LePC5wudM/FITTAFyuPkbHlid0=";
   };
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/linux-surface/iptsd/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/linux-surface/iptsd/releases/tag/v${version}";
     description = "Userspace daemon for Intel Precise Touch & Stylus";
     homepage = "https://github.com/linux-surface/iptsd";
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/ir/ircdog/package.nix b/pkgs/by-name/ir/ircdog/package.nix
index 6e01484a01e5..e3ef62028fb7 100644
--- a/pkgs/by-name/ir/ircdog/package.nix
+++ b/pkgs/by-name/ir/ircdog/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "goshuirc";
     repo = "ircdog";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-maF53Z0FHAhGmnOnMsX0dDnmckPNBY4Bcm4OBM/x4hQ=";
   };
 
diff --git a/pkgs/by-name/is/isolyzer/package.nix b/pkgs/by-name/is/isolyzer/package.nix
index 26b8ded3ca5f..0b9e85e88389 100644
--- a/pkgs/by-name/is/isolyzer/package.nix
+++ b/pkgs/by-name/is/isolyzer/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "KBNLresearch";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-NqkjnEwpaoyguG5GLscKS9UQGtF9N4jUL5JhrMtKCFE=";
   };
 
diff --git a/pkgs/by-name/iz/izrss/package.nix b/pkgs/by-name/iz/izrss/package.nix
index 35e507e9e06d..47c2924721fb 100644
--- a/pkgs/by-name/iz/izrss/package.nix
+++ b/pkgs/by-name/iz/izrss/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "isabelroses";
     repo = "izrss";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Op9aiCQrBH8TuhMTt+3Wthd8UY3lU2g9yJ110v7TtXA=";
   };
 
diff --git a/pkgs/by-name/ja/jalv/package.nix b/pkgs/by-name/ja/jalv/package.nix
index 9c518f777b47..9212178151c9 100644
--- a/pkgs/by-name/ja/jalv/package.nix
+++ b/pkgs/by-name/ja/jalv/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "drobilla";
     repo = "jalv";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38=";
   };
 
diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix
index e0120e9d6b98..c26315d4ad3c 100644
--- a/pkgs/by-name/je/jellyfin-rpc/package.nix
+++ b/pkgs/by-name/je/jellyfin-rpc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Radiicall";
     repo = "jellyfin-rpc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0=";
   };
 
diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix
index 830f21ebe078..632b3dadd07b 100644
--- a/pkgs/by-name/jf/jfrog-cli/package.nix
+++ b/pkgs/by-name/jf/jfrog-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-owE3mWzVogESko4SeysobC3VmmH37ikk7llJv65ZTfU=";
   };
 
diff --git a/pkgs/by-name/jf/jfsw/package.nix b/pkgs/by-name/jf/jfsw/package.nix
index 181b28e06c9d..68a46711f810 100644
--- a/pkgs/by-name/jf/jfsw/package.nix
+++ b/pkgs/by-name/jf/jfsw/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jonof";
     repo = "jfsw";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-bOUgRa9zWufTFEj5huXAKeRerV8PqfqQVDoVUvRrj2I=";
   };
diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix
index 29c47d6e619c..b52c2720baa5 100644
--- a/pkgs/by-name/jh/jhentai/package.nix
+++ b/pkgs/by-name/jh/jhentai/package.nix
@@ -13,7 +13,7 @@ flutter.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "jiangtian616";
     repo = "JHenTai";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LL1TyLF37NtwTRN9vhHBY+xHDg0E0ACt2ilacIKpduU=";
   };
 
diff --git a/pkgs/by-name/ji/jira-cli-go/package.nix b/pkgs/by-name/ji/jira-cli-go/package.nix
index 3d4382a9f99f..52a4376d9d78 100644
--- a/pkgs/by-name/ji/jira-cli-go/package.nix
+++ b/pkgs/by-name/ji/jira-cli-go/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ankitpokhrel";
     repo = "jira-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Wp6uDvnTiNixn8GyEn8SeKPdXanUNN3b7yr9dT1D6uo=";
   };
 
diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix
index 766ea45e5271..d963ae53044e 100644
--- a/pkgs/by-name/ji/jitsi/package.nix
+++ b/pkgs/by-name/ji/jitsi/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jitsi";
     repo = "jitsi";
-    rev = "refs/tags/${lib.versions.patch version}";
+    tag = lib.versions.patch version;
     hash = "sha256-CN4o0VfHdoUteI2wyJ2hFJ9UsQ2wWUzcvrLMbR/l36M=";
   };
 
diff --git a/pkgs/by-name/jo/joincap/package.nix b/pkgs/by-name/jo/joincap/package.nix
index 53bb4c0017d4..01a9a67bb985 100644
--- a/pkgs/by-name/jo/joincap/package.nix
+++ b/pkgs/by-name/jo/joincap/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "assafmo";
     repo = "joincap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HvqtAno26ZSggiXbQpkw5ghxCrmmLb5uDdeSQ2QVeq0=";
   };
 
diff --git a/pkgs/by-name/jo/journalist/package.nix b/pkgs/by-name/jo/journalist/package.nix
index 9c5e9a9fc42c..a4f6afc6321a 100644
--- a/pkgs/by-name/jo/journalist/package.nix
+++ b/pkgs/by-name/jo/journalist/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mrusme";
     repo = "journalist";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3MnkndG2c4P3oprIRbzj26oAutEmAgsUx8mjlaDLrkI=";
   };
 
diff --git a/pkgs/by-name/jo/journalwatch/package.nix b/pkgs/by-name/jo/journalwatch/package.nix
index 550b8917776b..b7c2a10c41b2 100644
--- a/pkgs/by-name/jo/journalwatch/package.nix
+++ b/pkgs/by-name/jo/journalwatch/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "The-Compiler";
     repo = "journalwatch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha512-60+ewzOIox2wsQFXMAgD7XN+zvPA1ScPz6V4MB5taVDhqCxUTMVOxodf+4AMhxtNQloXZ3ye7/0bjh1NPDjxQg==";
   };
 
diff --git a/pkgs/by-name/jo/joystickwake/package.nix b/pkgs/by-name/jo/joystickwake/package.nix
index dbc1d51d4830..a5dad0c49c61 100644
--- a/pkgs/by-name/jo/joystickwake/package.nix
+++ b/pkgs/by-name/jo/joystickwake/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "foresto";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vSvIpbcDIbRyitVjx3wNSxt5vTIZ9/NPWokOJt0p6oQ=";
   };
 
diff --git a/pkgs/by-name/jp/jpcre2/package.nix b/pkgs/by-name/jp/jpcre2/package.nix
index 3b8165a851b3..6286efa65164 100644
--- a/pkgs/by-name/jp/jpcre2/package.nix
+++ b/pkgs/by-name/jp/jpcre2/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jpcre2";
     repo = "jpcre2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CizjxAiajDLqajZKizMRAk5UEZA+jDeBSldPyIb6Ic8=";
   };
 
diff --git a/pkgs/by-name/jq/jq-lsp/package.nix b/pkgs/by-name/jq/jq-lsp/package.nix
index fd92650683e0..123fd7ff1844 100644
--- a/pkgs/by-name/jq/jq-lsp/package.nix
+++ b/pkgs/by-name/jq/jq-lsp/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "wader";
     repo = "jq-lsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jnHM3VSfi0KioNmXlkjVIlV7/7bKipEvpnV+z13+59Y=";
   };
 
diff --git a/pkgs/by-name/jq/jq-zsh-plugin/package.nix b/pkgs/by-name/jq/jq-zsh-plugin/package.nix
index 3e06f6d58872..b0566ed6403f 100644
--- a/pkgs/by-name/jq/jq-zsh-plugin/package.nix
+++ b/pkgs/by-name/jq/jq-zsh-plugin/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "reegnz";
     repo = "jq-zsh-plugin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-q/xQZ850kifmd8rCMW+aAEhuA43vB9ZAW22sss9e4SE=";
   };
 
diff --git a/pkgs/by-name/jr/jrnl/package.nix b/pkgs/by-name/jr/jrnl/package.nix
index 3686b1af0734..c60e20d95751 100644
--- a/pkgs/by-name/jr/jrnl/package.nix
+++ b/pkgs/by-name/jr/jrnl/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jrnl-org";
     repo = "jrnl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x0JoYJzD6RnuHbRsQMgrhHsNW6nVEVeoDjtPop2eg+w=";
   };
 
diff --git a/pkgs/by-name/js/jsonnet-language-server/package.nix b/pkgs/by-name/js/jsonnet-language-server/package.nix
index f04083484269..66c253303f0b 100644
--- a/pkgs/by-name/js/jsonnet-language-server/package.nix
+++ b/pkgs/by-name/js/jsonnet-language-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "jsonnet-language-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GR5EjVd1Tje9FLyP0pfNT6hMUGYkfPnsT8M72H713D4=";
   };
 
diff --git a/pkgs/by-name/js/jsonschema/package.nix b/pkgs/by-name/js/jsonschema/package.nix
index 3740cc4bccd6..477490f76584 100644
--- a/pkgs/by-name/js/jsonschema/package.nix
+++ b/pkgs/by-name/js/jsonschema/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "santhosh-tekuri";
     repo = "jsonschema";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ANo9OkdNVCjV5uEqr9lNNbStquNb/3oxuTfMqE2nUzo=";
   };
 
diff --git a/pkgs/by-name/ju/junest/package.nix b/pkgs/by-name/ju/junest/package.nix
index 60f25062bf71..d26020ece579 100644
--- a/pkgs/by-name/ju/junest/package.nix
+++ b/pkgs/by-name/ju/junest/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fsquillace";
     repo = "junest";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Dq4EqmeFI1TEbnc4kQwgqe71eJJpzWm2ywt1y6fD8z4=";
   };
 
diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index a7a504bc7c00..ea20cef8b3a1 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "casey";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jIc8+SFAcH2TsY12+txwlMoJmpDdDpC0H+UrjYH61Lk=";
   };
 
diff --git a/pkgs/by-name/jw/jwt-hack/package.nix b/pkgs/by-name/jw/jwt-hack/package.nix
index 2b73d69249aa..dee3dcaacd1e 100644
--- a/pkgs/by-name/jw/jwt-hack/package.nix
+++ b/pkgs/by-name/jw/jwt-hack/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hahwul";
     repo = "jwt-hack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IHR+ItI4ToINLpkVc7yrgpNTS17nD02G6x3pNMEfIW4=";
   };
 
diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix
index 5a78fccf95f5..c7e8179d773b 100644
--- a/pkgs/by-name/k0/k0sctl/package.nix
+++ b/pkgs/by-name/k0/k0sctl/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = "k0sctl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hArlgDBfqsnla55cctIMQjzY6GJJNLaFXC9EVyzrNms=";
   };
 
diff --git a/pkgs/by-name/k3/k3d/package.nix b/pkgs/by-name/k3/k3d/package.nix
index 37c256b714b0..e9034fb29268 100644
--- a/pkgs/by-name/k3/k3d/package.nix
+++ b/pkgs/by-name/k3/k3d/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "k3d-io";
     repo = "k3d";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z+7yeX0ea/6+4aWbA5NYW/HzvVcJiSkewOvo+oXp9bE=";
   };
 
diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index 673cbdd13739..d3d20d0903ee 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "deviceinsight";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ByvyRVyYXGvMFF9F/DU7lSka5PQJULyzo3nvqYAlQzI=";
   };
 
diff --git a/pkgs/by-name/ka/kalign/package.nix b/pkgs/by-name/ka/kalign/package.nix
index d33398fc668f..86a75dd384ed 100644
--- a/pkgs/by-name/ka/kalign/package.nix
+++ b/pkgs/by-name/ka/kalign/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "TimoLassmann";
     repo = "kalign";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QcFNaCTqj6CFiOzQ6ezfBL0mu8PDU11hyNdkcsLOPzA=";
   };
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fast multiple sequence alignment program";
     mainProgram = "kalign";
     homepage = "https://github.com/TimoLassmann/kalign";
-    changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/TimoLassmann/kalign/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix
index 63c917d4c559..d37847e8484e 100644
--- a/pkgs/by-name/ka/kanboard/package.nix
+++ b/pkgs/by-name/ka/kanboard/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kanboard";
     repo = "kanboard";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/PFE5h4elHFNbbIssoGMDkhGkEIec2uEMz+vU+DN5D0=";
   };
 
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 33244e11a37b..725f32b1b264 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -28,7 +28,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kando-menu";
     repo = "kando";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OTNxK2D7lM8IluZa6Rydd3WSP3hPNcT9nkQm1smq4ms=";
   };
 
diff --git a/pkgs/by-name/ka/kangaru/package.nix b/pkgs/by-name/ka/kangaru/package.nix
index 372b2da899ba..388e656a577e 100644
--- a/pkgs/by-name/ka/kangaru/package.nix
+++ b/pkgs/by-name/ka/kangaru/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gracicot";
     repo = "kangaru";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-30gmNo68cDGmGjS75KySyORC6s1NBI925QuZyOv3Kag=";
   };
 
diff --git a/pkgs/by-name/ka/kaput-cli/package.nix b/pkgs/by-name/ka/kaput-cli/package.nix
index a03f37ff97bf..8f36d2e56144 100644
--- a/pkgs/by-name/ka/kaput-cli/package.nix
+++ b/pkgs/by-name/ka/kaput-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "davidchalifoux";
     repo = "kaput-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sy8k9L9rmiRFzvhLc+hYl9OqmmP8INLxMNRjAx7/V8g=";
   };
 
diff --git a/pkgs/by-name/ka/kara/package.nix b/pkgs/by-name/ka/kara/package.nix
index 8aef49b4d294..c5b67a62c9e5 100644
--- a/pkgs/by-name/ka/kara/package.nix
+++ b/pkgs/by-name/ka/kara/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dhruv8sh";
     repo = "kara";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-an0tA1YQU/wpaY4y6lQfOFiUYm6aLmVTC1M5sukARVA=";
   };
 
diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix
index b9708c9e789a..8e9b74062240 100644
--- a/pkgs/by-name/ka/kas/package.nix
+++ b/pkgs/by-name/ka/kas/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "siemens";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-J64yy2G8+5uT31Vpwhge5R7ZqId+NzE5ykXBHjc0qgQ=";
   };
 
diff --git a/pkgs/by-name/ka/katana/package.nix b/pkgs/by-name/ka/katana/package.nix
index b15fb4f58849..a5d32857aca6 100644
--- a/pkgs/by-name/ka/katana/package.nix
+++ b/pkgs/by-name/ka/katana/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "katana";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cRzLJcX7U9jhKMYnpOyo8S8hN6cIeUYFElcmOqbv0GY=";
   };
 
diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix
index 5fa3dd19f72c..e4f236cb34dc 100644
--- a/pkgs/by-name/kd/kdsingleapplication/package.nix
+++ b/pkgs/by-name/kd/kdsingleapplication/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ymm+qOZMWULg7u5xEpGzcAfIrbWBQ3jsndnFSnh6/PA=";
   };
 
diff --git a/pkgs/by-name/ke/keedump/package.nix b/pkgs/by-name/ke/keedump/package.nix
index d5c0d2cc5c36..3389d2ec9c77 100644
--- a/pkgs/by-name/ke/keedump/package.nix
+++ b/pkgs/by-name/ke/keedump/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ynuwenhof";
     repo = "keedump";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V7wQZoUnISELuzjSUz+CJ77XJvlnGBK2n4U4pKlk+xI=";
   };
 
diff --git a/pkgs/by-name/ke/key/package.nix b/pkgs/by-name/ke/key/package.nix
index b4e8f8273a93..b0167cf8623e 100644
--- a/pkgs/by-name/ke/key/package.nix
+++ b/pkgs/by-name/ke/key/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KeYProject";
     repo = "key";
-    rev = "refs/tags/KeY-${version}";
+    tag = "KeY-${version}";
     hash = "sha256-veqaWyWEiTot2cAjvyPG+Ra8/pqS4i6w6iR+qhozIM4=";
   };
 
diff --git a/pkgs/by-name/kh/khoj/package.nix b/pkgs/by-name/kh/khoj/package.nix
index 5dad9fb101fd..ad87e38fad32 100644
--- a/pkgs/by-name/kh/khoj/package.nix
+++ b/pkgs/by-name/kh/khoj/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "debanjum";
     repo = "khoj";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec=";
   };
 
diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix
index fcf25f542eb0..d0724825c538 100644
--- a/pkgs/by-name/ki/kics/package.nix
+++ b/pkgs/by-name/ki/kics/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Checkmarx";
     repo = "kics";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/trhDDY2jyN0o92fjy/ScEbYpcuBPPIaHx+wNW3cWA0=";
   };
 
diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 249062ec9e96..69e7c4eef099 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -33,7 +33,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yaqwsx";
     repo = "KiKit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r8LQcy3I6hmcrU/6HfPAYJd+cEZdhad6DUldC9HvXZU=";
   };
 
diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix
index 28f9bf1e9ddd..703c1ad0e2c6 100644
--- a/pkgs/by-name/ki/killerbee/package.nix
+++ b/pkgs/by-name/ki/killerbee/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "riverloopsec";
     repo = "killerbee";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WM0Z6sd8S71F8FfhhoUq3MSD/2uvRTY/FsBP7VGGtb0=";
   };
 
diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix
index 6515189f95d2..4d16ab3a2b60 100644
--- a/pkgs/by-name/ki/kin-openapi/package.nix
+++ b/pkgs/by-name/ki/kin-openapi/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "getkin";
     repo = "kin-openapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4pYrg75dFFdFS2SC1BvFoHcLFNGgBumXd3Vd7jHvUJg=";
   };
 
diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
index f1a209767b71..e2e66c04d55f 100644
--- a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
+++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "KittyCAD";
     repo = "kcl-lsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3j7xiTrhDPBNTg53y2KyLpk8m4DrJbZWYkdIm5sxEfs=";
   };
 
diff --git a/pkgs/by-name/kn/knockpy/package.nix b/pkgs/by-name/kn/knockpy/package.nix
index e523795d93b3..3642043bbb43 100644
--- a/pkgs/by-name/kn/knockpy/package.nix
+++ b/pkgs/by-name/kn/knockpy/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "guelfoweb";
     repo = "knock";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tJNosM8zGzH0uMvVawoBl2d+8xkVzTIjycnHHjnMzSo=";
   };
 
diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix
index bd84ac19461c..cba831dbe077 100644
--- a/pkgs/by-name/kn/knowsmore/package.nix
+++ b/pkgs/by-name/kn/knowsmore/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "helviojunior";
     repo = "knowsmore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rLESaedhEHTMYVbITr3vjyE6urhwl/g1/iTMZ4ruE1c=";
   };
 
diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix
index 57892a050f4e..a59046b9dd20 100644
--- a/pkgs/by-name/ko/ko/package.nix
+++ b/pkgs/by-name/ko/ko/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ko-build";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MeFoy2WoPsJIgUhpzt/4sEP6J9lM4nsSAK2VZiTS7jo=";
   };
 
diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 9175c4aadb78..46a36948f254 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -45,7 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-uxqn4t2dDaVSkVilJOflNbG2Q3fH3Yid8qdEaDGfIcw=";
   };
 
diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix
index 2879b255eb97..55812610341a 100644
--- a/pkgs/by-name/ko/komac/package.nix
+++ b/pkgs/by-name/ko/komac/package.nix
@@ -20,7 +20,7 @@ let
   src = fetchFromGitHub {
     owner = "russellbanks";
     repo = "Komac";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yAf89GtKu500VPn+CKF6sGC+TPhJcGz2lR7C30/YBRI=";
   };
 in
diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix
index e9f6973c300d..762aae312096 100644
--- a/pkgs/by-name/kr/krbjack/package.nix
+++ b/pkgs/by-name/kr/krbjack/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "almandin";
     repo = "krbjack";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rvK0I8WlXqJtau9f+6ximfzYCjX21dPIyDN56IMI0gE=";
   };
 
diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix
index 509c91d696f1..824d0c2796b9 100644
--- a/pkgs/by-name/kr/krr/package.nix
+++ b/pkgs/by-name/kr/krr/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robusta-dev";
     repo = "krr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Bc1Ql3z/UmOXE2RJYC5/sE4a3MFdE06I3HwKY+SdSlk=";
   };
 
diff --git a/pkgs/by-name/ks/ksh/package.nix b/pkgs/by-name/ks/ksh/package.nix
index 0751ef64dbb0..86f06ae20266 100644
--- a/pkgs/by-name/ks/ksh/package.nix
+++ b/pkgs/by-name/ks/ksh/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "att";
     repo = "ast";
     sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
   };
 
   patches = [
diff --git a/pkgs/by-name/kt/ktfmt/package.nix b/pkgs/by-name/kt/ktfmt/package.nix
index 680d692de2fb..05863a02ff23 100644
--- a/pkgs/by-name/kt/ktfmt/package.nix
+++ b/pkgs/by-name/kt/ktfmt/package.nix
@@ -13,7 +13,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "ktfmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TIYV/V6vtGTTSLFf9dcKo8Ezx61e7Vvz3vQvbh0Kj/Y=";
   };
 
diff --git a/pkgs/by-name/kt/ktor-cli/package.nix b/pkgs/by-name/kt/ktor-cli/package.nix
index 6672fbb279a5..ace71efab245 100644
--- a/pkgs/by-name/kt/ktor-cli/package.nix
+++ b/pkgs/by-name/kt/ktor-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ktorio";
     repo = "ktor-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UOO6hoUZazlrP+OJ6WCdY358wnRnAiQHEXrOpN7ZIvU=";
   };
 
diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix
index 124cb3386510..72255bcc3f67 100644
--- a/pkgs/by-name/kt/kty/package.nix
+++ b/pkgs/by-name/kt/kty/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "grampelberg";
     repo = "kty";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-E9PqWDBKYJFYOUNyjiK+AM2WULMiwupFWTOQlBH+6d4=";
   };
 
diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix
index deb2e879f5c8..658feab034ff 100644
--- a/pkgs/by-name/ku/kube-bench/package.nix
+++ b/pkgs/by-name/ku/kube-bench/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SkXf8zZif1l+yOSUjYpW474gYOmxifaLtj/DNK+ZNfg=";
   };
 
diff --git a/pkgs/by-name/ku/kube-hunter/package.nix b/pkgs/by-name/ku/kube-hunter/package.nix
index 45a48d344578..47402ae08555 100644
--- a/pkgs/by-name/ku/kube-hunter/package.nix
+++ b/pkgs/by-name/ku/kube-hunter/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-+M8P/VSF9SKPvq+yNPjokyhggY7hzQ9qLLhkiTNbJls=";
   };
 
diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix
index df89c69f700b..57564d5ecd5a 100644
--- a/pkgs/by-name/ku/kubeaudit/package.nix
+++ b/pkgs/by-name/ku/kubeaudit/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "kubeaudit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zQAM/NtDBFJZmwJYGNuYIaxv058X0URzMByPut+18TA=";
   };
 
diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix
index ae27a2bc443d..66631a587d0a 100644
--- a/pkgs/by-name/ku/kubeclarity/package.nix
+++ b/pkgs/by-name/ku/kubeclarity/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "openclarity";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MC9GeJeVG7ROkpmOW2HD/fWMMnHo43q4Du9MzWTk2cg=";
   };
 
diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix
index 8be47ca2a7fb..b72db614dfa8 100644
--- a/pkgs/by-name/ku/kubefirst/package.nix
+++ b/pkgs/by-name/ku/kubefirst/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "konstructio";
     repo = "kubefirst";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nBYwvOgkkx3NXELK+h9SpapoMjAVauI9leCPhKNZfh0=";
   };
 
diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix
index f61d8b563221..4d294ff8e8d5 100644
--- a/pkgs/by-name/ku/kubernetes-kcp/package.nix
+++ b/pkgs/by-name/ku/kubernetes-kcp/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kcp-dev";
     repo = "kcp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vFwZerOW1H3qR428cSl5mnz8KthO20BWk8gUjOq1OfU=";
   };
   vendorHash = "sha256-p0dfkI1YPfQpIeFzRnI+ayge7kbjXT49XuCYP6FPXTQ=";
diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix
index d0ac97d23a9e..0d79437dedf2 100644
--- a/pkgs/by-name/ku/kubescape/package.nix
+++ b/pkgs/by-name/ku/kubescape/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubescape";
     repo = "kubescape";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m1tfYuRDPxm8Q1e4RIzqfkv9vOjGUPvI0FADvYXep/c=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix
index 78a274245e75..e134d1472fa1 100644
--- a/pkgs/by-name/ku/kubesec/package.nix
+++ b/pkgs/by-name/ku/kubesec/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "kubesec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4jVRd6XQekL4wMZ+Icoa2DEsTGzBISK2QPO+gu890kA=";
   };
 
diff --git a/pkgs/by-name/ku/kubestroyer/package.nix b/pkgs/by-name/ku/kubestroyer/package.nix
index c77703a3c233..b952d3ba3b28 100644
--- a/pkgs/by-name/ku/kubestroyer/package.nix
+++ b/pkgs/by-name/ku/kubestroyer/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Rolix44";
     repo = "Kubestroyer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A4kx0Xx3p9rP8OKRLPe9AfX+rqGggtvPb7Hsg+lLkSI=";
   };
 
diff --git a/pkgs/by-name/ku/kubetrim/package.nix b/pkgs/by-name/ku/kubetrim/package.nix
index 1e94339958bf..7c859b37b844 100644
--- a/pkgs/by-name/ku/kubetrim/package.nix
+++ b/pkgs/by-name/ku/kubetrim/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "kubetrim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fX8CbId2ArJlnGkevCSB7eE6Ovs8vJR9+l//k4DgvK4=";
   };
 
diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index 70fa2e13449b..1753635ee126 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sarub0b0";
     repo = "kubetui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Trgc3T+01u1izePfM0wPjer3IrA6PtIGsK+syEzs0V8=";
   };
 
diff --git a/pkgs/by-name/kw/kwok/package.nix b/pkgs/by-name/kw/kwok/package.nix
index 140dd1d60f12..8c119cbcb4be 100644
--- a/pkgs/by-name/kw/kwok/package.nix
+++ b/pkgs/by-name/kw/kwok/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "kwok";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RVyXGPT30Fz+K1VdMneYldXvzHyimuCX406DMKOtUq4=";
   };
 
diff --git a/pkgs/by-name/la/labelle/package.nix b/pkgs/by-name/la/labelle/package.nix
index 5b238aab0575..7a1a3a4f5039 100644
--- a/pkgs/by-name/la/labelle/package.nix
+++ b/pkgs/by-name/la/labelle/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "labelle-org";
     repo = "labelle";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+aRq+zwnoHy+kXerFCw1b46OHmWDDpyOiBRu4IvYAQg=";
   };
 
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   meta = {
-    changelog = "https://github.com/labelle-org/labelle/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/labelle-org/labelle/releases/tag/v${version}";
     description = "Print labels with LabelManager PnP from Dymo";
     homepage = "https://github.com/labelle-org/labelle";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index b70d8b1390b4..0662d6fb87af 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-dveV+3Rw9BMzevyIKzde98TsHsAJrQGAcvmc74nZTsg=";
   };
 
diff --git a/pkgs/by-name/la/lacus/package.nix b/pkgs/by-name/la/lacus/package.nix
index 4f1e42f0e70e..355d685e519b 100644
--- a/pkgs/by-name/la/lacus/package.nix
+++ b/pkgs/by-name/la/lacus/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "lacus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5KddApwaN4t+QRaQTqIXuYStuPxKq3v6pRknBusAcbM=";
   };
 
diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 6d167cae2239..cfa21b9bcb91 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -13,7 +13,7 @@ buildGo122Module rec {
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BP5PMgRq8LHLuUYDrWaX1PgfT9VEhj3xeLE2aDMAPF0=";
   };
 
diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix
index adc46d627a3c..a133323f18a3 100644
--- a/pkgs/by-name/lc/lc0/package.nix
+++ b/pkgs/by-name/lc/lc0/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LeelaChessZero";
     repo = "lc0";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8watDDxSyZ5khYqpXPyjQso2MkOzfI6o2nt0vkuiEUI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index 240649377a43..201d76afd5bc 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "v-novaltd";
     repo = "LCEVCdec";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Nf0YntB1A3AH0MTXlfUHhxYbzZqeB0EH9Fe9Xrqdsts=";
   };
 
diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix
index 0587418d3e8e..e44b6d0e02ac 100644
--- a/pkgs/by-name/ld/ldapmonitor/package.nix
+++ b/pkgs/by-name/ld/ldapmonitor/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BmTj/6dOUYfia6wO4nvkEW01MIC9TuBk4kYAsVHMsWY=";
   };
 
diff --git a/pkgs/by-name/ld/ldapnomnom/package.nix b/pkgs/by-name/ld/ldapnomnom/package.nix
index f761083458fe..2d9557ed0ceb 100644
--- a/pkgs/by-name/ld/ldapnomnom/package.nix
+++ b/pkgs/by-name/ld/ldapnomnom/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lkarlslund";
     repo = "ldapnomnom";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BKErfWJ6XKG4cKIjp5WU8SVZvyQlqtm/mvDwbUtDYIw=";
   };
 
diff --git a/pkgs/by-name/ld/ldm/package.nix b/pkgs/by-name/ld/ldm/package.nix
index c56ea0e82691..3edf44094f43 100644
--- a/pkgs/by-name/ld/ldm/package.nix
+++ b/pkgs/by-name/ld/ldm/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # contains important fixes for LVM setups.
   src = fetchgit {
     url = "https://github.com/LemonBoy/ldm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n";
   };
 
diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix
index ecc8506e8189..561aaa43e2d4 100644
--- a/pkgs/by-name/le/leftwm/package.nix
+++ b/pkgs/by-name/le/leftwm/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "leftwm";
     repo = "leftwm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3voGKM6MKisc+ZVdZ5sCrs3XVfeRayozIk4SXNjw820=";
   };
 
diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix
index 7e4509af4ed4..7e081b441238 100644
--- a/pkgs/by-name/le/legitify/package.nix
+++ b/pkgs/by-name/le/legitify/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Legit-Labs";
     repo = "legitify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc=";
   };
 
diff --git a/pkgs/by-name/le/lektor/package.nix b/pkgs/by-name/le/lektor/package.nix
index 86722f2dbb88..34c8c28e7cfa 100644
--- a/pkgs/by-name/le/lektor/package.nix
+++ b/pkgs/by-name/le/lektor/package.nix
@@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lektor";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     # fix for case-insensitive filesystems
     postFetch = ''
       rm -f $out/tests/demo-project/content/icc-profile-test/{LICENSE,license}.txt
diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index afc81c7e91cd..b334fa5d78fe 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MnTPu7jsjHR+PDHzj/zJiBKi9Ou/cjJvrf87yMdSnz0=";
   };
 
diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index f3b3360d0221..2dfee512b8a8 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-coPUPercfpB8LilBn5Uww9rEM+X9QAgzDECtQ1Ui/hg=";
   };
 
diff --git a/pkgs/by-name/li/libb2/package.nix b/pkgs/by-name/li/libb2/package.nix
index 5a44f2f2a72d..77679c010a36 100644
--- a/pkgs/by-name/li/libb2/package.nix
+++ b/pkgs/by-name/li/libb2/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BLAKE2";
     repo = "libb2";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya";
   };
 
diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index 6fcc0231d706..4351d246fdd5 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BLAKE3-team";
     repo = "BLAKE3";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-2M8OQNmtWwfDcbZYspaxpGz2clpfILru//4+P6dClNw=";
   };
 
diff --git a/pkgs/by-name/li/libcifpp/package.nix b/pkgs/by-name/li/libcifpp/package.nix
index e7ecc392a477..0e2b001eeaf7 100644
--- a/pkgs/by-name/li/libcifpp/package.nix
+++ b/pkgs/by-name/li/libcifpp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PDB-REDO";
     repo = "libcifpp";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-PD811D/n++PM45H/BatlLiMaIeUEiisLU/bGhiUhPU0=";
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Manipulate mmCIF and PDB files";
     homepage = "https://github.com/PDB-REDO/libcifpp";
-    changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/v${finalAttrs.version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ natsukium ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/li/libcutl/package.nix b/pkgs/by-name/li/libcutl/package.nix
index b6620c955537..0fce6200c4e6 100644
--- a/pkgs/by-name/li/libcutl/package.nix
+++ b/pkgs/by-name/li/libcutl/package.nix
@@ -12,7 +12,7 @@ gccStdenv.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.codesynthesis.com/libcutl/libcutl.git";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LY2ZyxduI6xftVjVqjNkhYPFTL5bvHC289Qcei1Kiw4=";
   };
 
diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix
index fc441254b9b3..1184f2770dfb 100644
--- a/pkgs/by-name/li/libde265/package.nix
+++ b/pkgs/by-name/li/libde265/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libde265";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-guiLM4RNe5O0qpeCoQUbs1Z7j0wp8iK9za2+6NIB8yY=";
   };
 
diff --git a/pkgs/by-name/li/libdnet/package.nix b/pkgs/by-name/li/libdnet/package.nix
index 58112ea2c2fd..4180cd34869e 100644
--- a/pkgs/by-name/li/libdnet/package.nix
+++ b/pkgs/by-name/li/libdnet/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ofalk";
     repo = "libdnet";
-    rev = "refs/tags/libdnet-${finalAttrs.version}";
+    tag = "libdnet-${finalAttrs.version}";
     hash = "sha256-oPlBQB9e8vGJ/rVydMqsZqdInhrpm2sNWkDl9JkkXCI=";
   };
 
diff --git a/pkgs/by-name/li/libeatmydata/package.nix b/pkgs/by-name/li/libeatmydata/package.nix
index d166a39299eb..af477fdc9285 100644
--- a/pkgs/by-name/li/libeatmydata/package.nix
+++ b/pkgs/by-name/li/libeatmydata/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stewartsmith";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc=";
   };
 
diff --git a/pkgs/by-name/li/liberasurecode/package.nix b/pkgs/by-name/li/liberasurecode/package.nix
index 494730b9c03a..058e3e155ab8 100644
--- a/pkgs/by-name/li/liberasurecode/package.nix
+++ b/pkgs/by-name/li/liberasurecode/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "liberasurecode";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-242p6lyLM+0UpuYvQqz87Z1S0oayxGXz7CZJW7fbgBk=";
   };
 
diff --git a/pkgs/by-name/li/libfakekey/package.nix b/pkgs/by-name/li/libfakekey/package.nix
index 008611594b46..9a90ea45bd87 100644
--- a/pkgs/by-name/li/libfakekey/package.nix
+++ b/pkgs/by-name/li/libfakekey/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.yoctoproject.org/libfakekey";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QNJlxZ9uNwNgFWm9qRJdPfusx7dXHZajjFH7wDhpgcs=";
   };
 
diff --git a/pkgs/by-name/li/libideviceactivation/package.nix b/pkgs/by-name/li/libideviceactivation/package.nix
index dffe780d28a8..fbd8a7e11134 100644
--- a/pkgs/by-name/li/libideviceactivation/package.nix
+++ b/pkgs/by-name/li/libideviceactivation/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "libideviceactivation";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-owcQpCN4+A785oy9pCboJIyfpgZ6X+8PRzqGtWpYl2w=";
   };
 
diff --git a/pkgs/by-name/li/libinjection/package.nix b/pkgs/by-name/li/libinjection/package.nix
index ebecb25ece7c..1e8e6959f09b 100644
--- a/pkgs/by-name/li/libinjection/package.nix
+++ b/pkgs/by-name/li/libinjection/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "client9";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";
   };
 
diff --git a/pkgs/by-name/li/libinput-gestures/package.nix b/pkgs/by-name/li/libinput-gestures/package.nix
index 354175a8cf32..af6a52b6f441 100644
--- a/pkgs/by-name/li/libinput-gestures/package.nix
+++ b/pkgs/by-name/li/libinput-gestures/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bulletmark";
     repo = "libinput-gestures";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-J9+KbaZYDPJzl/AE1gq6KNXIJns+XxoAL1oOSy7UTtY=";
   };
   patches = [
diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix
index dbe52975d7fa..692b989f11c9 100644
--- a/pkgs/by-name/li/libkrun/package.nix
+++ b/pkgs/by-name/li/libkrun/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "libkrun";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-a5ot5ad8boANK3achn6PJ52k/xmxawbTM0/hEEC/fss=";
   };
 
diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix
index 82f84b0b7a7d..5a70ea441b91 100644
--- a/pkgs/by-name/li/libkrunfw/package.nix
+++ b/pkgs/by-name/li/libkrunfw/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "libkrunfw";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GFfBiGMOyBwMKjpD1kj3vRpvjR0ydji3QNDyoOQoQsw=";
   };
 
diff --git a/pkgs/by-name/li/libleidenalg/package.nix b/pkgs/by-name/li/libleidenalg/package.nix
index 13dac32268ed..748cc5982264 100644
--- a/pkgs/by-name/li/libleidenalg/package.nix
+++ b/pkgs/by-name/li/libleidenalg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "libleidenalg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hEES/OHvgN0yRDp5ZBZTCQfWr1j7s8NqE+Sp9WMHEEY=";
   };
 
diff --git a/pkgs/by-name/li/libloragw-2g4/package.nix b/pkgs/by-name/li/libloragw-2g4/package.nix
index 820b6185ebb0..204e59e3810a 100644
--- a/pkgs/by-name/li/libloragw-2g4/package.nix
+++ b/pkgs/by-name/li/libloragw-2g4/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Lora-net";
     repo = "gateway_2g4_hal";
-    rev = "refs/tags/V${finalAttrs.version}";
+    tag = "V${finalAttrs.version}";
     hash = "sha256-EvsYCkZ55nEdZXhxp7AjCw954+uUIoi2Fc3xhaIjZys=";
   };
 
diff --git a/pkgs/by-name/li/libloragw-sx1301/package.nix b/pkgs/by-name/li/libloragw-sx1301/package.nix
index 71b40fe42fdb..aa9c8c3da07a 100644
--- a/pkgs/by-name/li/libloragw-sx1301/package.nix
+++ b/pkgs/by-name/li/libloragw-sx1301/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "brocaar";
     repo = "lora_gateway";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-YxnFWJhH5iUR+6zA0Pf7a+VxFwYkw84CeoQmd01efqU=";
   };
 
diff --git a/pkgs/by-name/li/libloragw-sx1302/package.nix b/pkgs/by-name/li/libloragw-sx1302/package.nix
index 44270575629e..a9466226ae1b 100644
--- a/pkgs/by-name/li/libloragw-sx1302/package.nix
+++ b/pkgs/by-name/li/libloragw-sx1302/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "brocaar";
     repo = "sx1302_hal";
-    rev = "refs/tags/V${finalAttrs.version}";
+    tag = "V${finalAttrs.version}";
     hash = "sha256-NYu54UpMn2OZfGihBH9Kbp2kUcEy0epH1Tt5I3r6jTs=";
   };
 
diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix
index 1c9937828009..e30193d7d17c 100644
--- a/pkgs/by-name/li/libmcfp/package.nix
+++ b/pkgs/by-name/li/libmcfp/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mhekkel";
     repo = "libmcfp";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY=";
   };
 
diff --git a/pkgs/by-name/li/libminc/package.nix b/pkgs/by-name/li/libminc/package.nix
index b747fea45483..c30eab86fe5b 100644
--- a/pkgs/by-name/li/libminc/package.nix
+++ b/pkgs/by-name/li/libminc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "libminc";
-    rev = "refs/tags/release-${finalAttrs.version}";
+    tag = "release-${finalAttrs.version}";
     hash = "sha256-HTt3y0AFM9pkEkWPb9cDmvUz4iBQWfpX7wLF9Vlg8hc=";
   };
 
diff --git a/pkgs/by-name/li/libmkv/package.nix b/pkgs/by-name/li/libmkv/package.nix
index 31c17b884ccb..1a16268daa7d 100644
--- a/pkgs/by-name/li/libmkv/package.nix
+++ b/pkgs/by-name/li/libmkv/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "saintdev";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl";
   };
 
diff --git a/pkgs/by-name/li/libmrss/package.nix b/pkgs/by-name/li/libmrss/package.nix
index 176d65549282..49daaef8d790 100644
--- a/pkgs/by-name/li/libmrss/package.nix
+++ b/pkgs/by-name/li/libmrss/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bakulf";
     repo = "libmrss";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-sllY0Q8Ct7XJn4A3N8xQCUqaHXubPoB49gBZS1vURBs=";
   };
 
diff --git a/pkgs/by-name/li/libnxml/package.nix b/pkgs/by-name/li/libnxml/package.nix
index 2e9ddfc91ef0..abfa3959d5cb 100644
--- a/pkgs/by-name/li/libnxml/package.nix
+++ b/pkgs/by-name/li/libnxml/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bakulf";
     repo = "libnxml";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-6KI1bsfDgGJ4x8Wv7fcwCKm5AILa3jLnV53JY1g9B+M=";
   };
 
diff --git a/pkgs/by-name/li/libpoly/package.nix b/pkgs/by-name/li/libpoly/package.nix
index 2ffc34ba5a55..815932ca481b 100644
--- a/pkgs/by-name/li/libpoly/package.nix
+++ b/pkgs/by-name/li/libpoly/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "SRI-CSL";
     repo = "libpoly";
     # they've pushed to the release branch, use explicit tag
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-7aFz+6XJOVEA/Fmi0ywd6rZdTW8sHq8MoHqXR0Hc2o4=";
   };
 
diff --git a/pkgs/by-name/li/libpostal/package.nix b/pkgs/by-name/li/libpostal/package.nix
index d30a2cdf7e18..74b0402e04f9 100644
--- a/pkgs/by-name/li/libpostal/package.nix
+++ b/pkgs/by-name/li/libpostal/package.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openvenues";
     repo = "libpostal";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7G/CjYdVzsrvUFXGODoXgXoRp8txkl5SddcPtgltrjY=";
   };
 
diff --git a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
index 6619689d46b0..5fbed39c692d 100644
--- a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
+++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owncloud";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wbdamPi2XSLWeprrYZtBUDH1A2gdp6/5geFZv+ZqSWk=";
   };
 
diff --git a/pkgs/by-name/li/libsignon-glib/package.nix b/pkgs/by-name/li/libsignon-glib/package.nix
index c668b6b1a070..a646c35e6144 100644
--- a/pkgs/by-name/li/libsignon-glib/package.nix
+++ b/pkgs/by-name/li/libsignon-glib/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://gitlab.com/accounts-sso/${pname}";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix
index 51a4805581ac..7937320acfda 100644
--- a/pkgs/by-name/li/libspnav/package.nix
+++ b/pkgs/by-name/li/libspnav/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "libspnav";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ=";
   };
 
diff --git a/pkgs/by-name/li/libtar/package.nix b/pkgs/by-name/li/libtar/package.nix
index 9c5d3dbedf0a..0aab9e7b0db7 100644
--- a/pkgs/by-name/li/libtar/package.nix
+++ b/pkgs/by-name/li/libtar/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   # Maintenance repo for libtar (Arch Linux uses this)
   src = fetchgit {
     url = "git://repo.or.cz/libtar.git";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9";
   };
 
diff --git a/pkgs/by-name/li/libuecc/package.nix b/pkgs/by-name/li/libuecc/package.nix
index da7cb93ab842..eebb0f2a01c4 100644
--- a/pkgs/by-name/li/libuecc/package.nix
+++ b/pkgs/by-name/li/libuecc/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.universe-factory.net/libuecc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs";
   };
 
diff --git a/pkgs/by-name/li/liburing/package.nix b/pkgs/by-name/li/liburing/package.nix
index ebe4d4562b23..744f05c3be22 100644
--- a/pkgs/by-name/li/liburing/package.nix
+++ b/pkgs/by-name/li/liburing/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "axboe";
     repo = "liburing";
-    rev = "refs/tags/liburing-${version}";
+    tag = "liburing-${version}";
     hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o=";
   };
 
diff --git a/pkgs/by-name/li/libvoikko/package.nix b/pkgs/by-name/li/libvoikko/package.nix
index 6cdfd61353eb..1c48c08fa53f 100644
--- a/pkgs/by-name/li/libvoikko/package.nix
+++ b/pkgs/by-name/li/libvoikko/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "voikko";
     repo = "corevoikko";
-    rev = "refs/tags/rel-libvoikko-${finalAttrs.version}";
+    tag = "rel-libvoikko-${finalAttrs.version}";
     hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M=";
   };
 
diff --git a/pkgs/by-name/li/libwebm/package.nix b/pkgs/by-name/li/libwebm/package.nix
index cfa2e5201ef2..ec93af05e410 100644
--- a/pkgs/by-name/li/libwebm/package.nix
+++ b/pkgs/by-name/li/libwebm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libwebm";
-    rev = "refs/tags/libwebm-${finalAttrs.version}";
+    tag = "libwebm-${finalAttrs.version}";
     hash = "sha256-+ayX33rcX/jkewsW8WrGalTe9X44qFBHOrIYTteOQzc=";
   };
 
diff --git a/pkgs/by-name/li/libxdg_basedir/package.nix b/pkgs/by-name/li/libxdg_basedir/package.nix
index ba1cb5fa6067..9d9b110d7b24 100644
--- a/pkgs/by-name/li/libxdg_basedir/package.nix
+++ b/pkgs/by-name/li/libxdg_basedir/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "devnev";
     repo = pname;
-    rev = "refs/tags/libxdg-basedir-${version}";
+    tag = "libxdg-basedir-${version}";
     hash = "sha256-ewtUKDdE6k9Q9hglWwhbTU3DTxvIN41t+zf2Gch9Dkk=";
   };
 
diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix
index 124e157c2c3e..1ab35b3b6739 100644
--- a/pkgs/by-name/li/libxlsxwriter/package.nix
+++ b/pkgs/by-name/li/libxlsxwriter/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jmcnamara";
     repo = "libxlsxwriter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZXVNW5cEWgMXKLnE0IpwWS0RIWBta5uhuGh4R9uFJ14=";
   };
 
diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix
index 83a225576e06..d9366ccffca9 100644
--- a/pkgs/by-name/li/libzim/package.nix
+++ b/pkgs/by-name/li/libzim/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openzim";
     repo = "libzim";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc=";
   };
 
diff --git a/pkgs/by-name/li/license-scanner/package.nix b/pkgs/by-name/li/license-scanner/package.nix
index 9700627303a9..758c5abf7823 100644
--- a/pkgs/by-name/li/license-scanner/package.nix
+++ b/pkgs/by-name/li/license-scanner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "license-scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2KUaVDAZxMwZ3AAMEUmRiuvenPSFliUp6rZCZrVTDps=";
   };
 
diff --git a/pkgs/by-name/li/lieer/package.nix b/pkgs/by-name/li/lieer/package.nix
index b0a564984e4b..9e114def8285 100644
--- a/pkgs/by-name/li/lieer/package.nix
+++ b/pkgs/by-name/li/lieer/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gauteh";
     repo = "lieer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-U3+Y634oGmvIrvcbSKrrJ8PzLRsMoN0Fd/+d9WE1Q7U=";
   };
 
diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix
index 544cb9e7fa31..51795125a4cd 100644
--- a/pkgs/by-name/li/lightningcss/package.nix
+++ b/pkgs/by-name/li/lightningcss/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "parcel-bundler";
     repo = "lightningcss";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IwuDJcKCG1CDyRsZbobPQnRzsaUfpJHKFemOWLJNM9c=";
   };
 
diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix
index 53c3d5383de8..155c38f38374 100644
--- a/pkgs/by-name/li/ligolo-ng/package.nix
+++ b/pkgs/by-name/li/ligolo-ng/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tnpitsecurity";
     repo = "ligolo-ng";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qsz7eRy+gkmw+ORNlrtstiKjH6Cj6v76GDH3cQ/HoiU=";
   };
 
diff --git a/pkgs/by-name/li/lil-pwny/package.nix b/pkgs/by-name/li/lil-pwny/package.nix
index 81b28b6c5533..052b52d906ab 100644
--- a/pkgs/by-name/li/lil-pwny/package.nix
+++ b/pkgs/by-name/li/lil-pwny/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "PaperMtn";
     repo = "lil-pwny";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-EE6+PQTmvAv5EvxI9QR/dQcPby13BBk66KSc7XDNAZA=";
   };
 
diff --git a/pkgs/by-name/li/linkchecker/package.nix b/pkgs/by-name/li/linkchecker/package.nix
index c5577a7bdccd..a00912637310 100644
--- a/pkgs/by-name/li/linkchecker/package.nix
+++ b/pkgs/by-name/li/linkchecker/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "linkchecker";
     repo = "linkchecker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo=";
   };
 
diff --git a/pkgs/by-name/li/linux-router/package.nix b/pkgs/by-name/li/linux-router/package.nix
index 4e84f419a190..6891749480f4 100644
--- a/pkgs/by-name/li/linux-router/package.nix
+++ b/pkgs/by-name/li/linux-router/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "garywill";
     repo = "linux-router";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iiIDWDPz8MBwsBcJAWVNeuGwaNJ7xh7gFfRqXTG4oGQ=";
   };
 
diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix
index 7412c218d9c8..ad26e4d346e1 100644
--- a/pkgs/by-name/li/livepeer/package.nix
+++ b/pkgs/by-name/li/livepeer/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "livepeer";
     repo = "go-livepeer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vJeYlMOJ0/C+IKVx5gqzb8LGwLP1ca9OreCUMryqWKs=";
   };
 
diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index dcbd06d5b0e1..5112d1aa4609 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "triyanox";
     repo = "lla";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8BnYLC5SGFvk9srRyLxflDgfVbbGMSHXBOjXQLMLIi8=";
   };
 
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 1f500426aa36..3a4e77c25622 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -86,7 +86,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
-    rev = "refs/tags/b${finalAttrs.version}";
+    tag = "b${finalAttrs.version}";
     hash = "sha256-zPWx8gdai8OfoBCr2X2oJYg45ipLselYZMrL+MbQ1AY=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ln/lndmanage/package.nix b/pkgs/by-name/ln/lndmanage/package.nix
index 5a2acdd1622a..c91b680fcbe0 100644
--- a/pkgs/by-name/ln/lndmanage/package.nix
+++ b/pkgs/by-name/ln/lndmanage/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bitromortac";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VUeGnk/DtNAyEYFESV6kXIRbKqUv4IcMnU3fo0NB4uQ=";
   };
 
diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 6cea78ab8252..37c8defe5ee7 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UZt8SlkwhtVRLUMf1uYNLchzkWnL+6e7xLYZ81+YQsw=";
   };
 
diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index 751a83f43136..ec215983f545 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hqBjA/6MWlhVjV4m+cIcnoRTApHuzbPzivMsaQHfRcc=";
   };
 
diff --git a/pkgs/by-name/lo/lokinet/package.nix b/pkgs/by-name/lo/lokinet/package.nix
index 0c2837df80f5..6d4b4b6bf58f 100644
--- a/pkgs/by-name/lo/lokinet/package.nix
+++ b/pkgs/by-name/lo/lokinet/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "oxen-io";
     repo = "lokinet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-aVFLDGTbRUOw2XWDpl+ojwHBG7c0miGeoKMLwMpqVtg=";
   };
diff --git a/pkgs/by-name/lo/loramon/package.nix b/pkgs/by-name/lo/loramon/package.nix
index 834234e4ecdd..fc8729442716 100644
--- a/pkgs/by-name/lo/loramon/package.nix
+++ b/pkgs/by-name/lo/loramon/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "LoRaMon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-94tXhuAoaS1y/zGz63PPqOayRylGK0Ei2a6H4/BCB30";
   };
 
diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix
index 18d2421ae37f..e7ecb2869ed0 100644
--- a/pkgs/by-name/lp/lprobe/package.nix
+++ b/pkgs/by-name/lp/lprobe/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fivexl";
     repo = "lprobe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WC0MDTyd5tRtSQ1LQsYJgV9CwJwtvnIO6tQnPrjpfcY=";
   };
 
diff --git a/pkgs/by-name/ls/lse/package.nix b/pkgs/by-name/ls/lse/package.nix
index 52d050e5ba7c..6d9c8caa9135 100644
--- a/pkgs/by-name/ls/lse/package.nix
+++ b/pkgs/by-name/ls/lse/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "diego-treitos";
     repo = "linux-smart-enumeration";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qGLmrbyeyhHG6ONs7TJLTm68xpvxB1iAnMUApfTSqEk=";
   };
 
diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix
index 3e5a1b1c390d..50edf4b963ca 100644
--- a/pkgs/by-name/ls/lsp-ai/package.nix
+++ b/pkgs/by-name/ls/lsp-ai/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "SilasMarvin";
     repo = "lsp-ai";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mBbaJn4u+Wlu/Y4G4a6YUBWnmN143INAGm0opiAjnIk=";
   };
 
diff --git a/pkgs/by-name/lt/lttoolbox/package.nix b/pkgs/by-name/lt/lttoolbox/package.nix
index 967c63308173..b4b8cba30a7a 100644
--- a/pkgs/by-name/lt/lttoolbox/package.nix
+++ b/pkgs/by-name/lt/lttoolbox/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "apertium";
     repo = "lttoolbox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3lHXKtwQSrMGQEGOGr27e3kB2qKkTFZcEzeAnIm89Rg=";
   };
 
diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix
index f3c6c9da0eb5..53d4411bb216 100644
--- a/pkgs/by-name/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "starcitizen-lug";
     repo = "lug-helper";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-k41aVNpgkrz06T33UOAzhj2EfJg+YoifYQoyxRQ9/hQ=";
   };
 
diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix
index 75a8df02ed6c..397b0e1b820a 100644
--- a/pkgs/by-name/lu/lumafly/package.nix
+++ b/pkgs/by-name/lu/lumafly/package.nix
@@ -18,7 +18,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "TheMulhima";
     repo = "lumafly";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GVPMAwxbq9XlKjMKd9G5yUol42f+6lSyHukN7NMCVDA=";
   };
 
diff --git a/pkgs/by-name/lu/luminance/package.nix b/pkgs/by-name/lu/luminance/package.nix
index cad11f55d30e..f885fbe7f653 100644
--- a/pkgs/by-name/lu/luminance/package.nix
+++ b/pkgs/by-name/lu/luminance/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sidevesh";
     repo = "Luminance";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1xDRs+OBzcrB75pILA3ZxIrZEleWVBROBNZz0MsCWnA=";
   };
 
diff --git a/pkgs/by-name/lu/lunarml/package.nix b/pkgs/by-name/lu/lunarml/package.nix
index 494fdf751ba0..355e8044c35e 100644
--- a/pkgs/by-name/lu/lunarml/package.nix
+++ b/pkgs/by-name/lu/lunarml/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "minoki";
     repo = "LunarML";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wNcsvtIR/MbvwAIhybc7zzbS+RgfwndQ1jdDVdte+44=";
   };
 
diff --git a/pkgs/by-name/lu/lunarvim/package.nix b/pkgs/by-name/lu/lunarvim/package.nix
index 6cd8f0b852d1..7f99c9b5bbea 100644
--- a/pkgs/by-name/lu/lunarvim/package.nix
+++ b/pkgs/by-name/lu/lunarvim/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LunarVim";
     repo = "LunarVim";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-uuXaDvZ9VaRJlZrdu28gawSOJFVSo5XX+JG53IB+Ijw=";
   };
 
diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix
index 26808a2a20f4..51fb25e446df 100644
--- a/pkgs/by-name/lx/lxc/package.nix
+++ b/pkgs/by-name/lx/lxc/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-h41lcHGjJmIH28XRpM0gdFsOQOCLSWevSLfvQ7gIf7Q=";
   };
 
diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix
index 9e4e07e761b5..6e8b2ac01511 100644
--- a/pkgs/by-name/lx/lxd-ui/package.nix
+++ b/pkgs/by-name/lx/lxd-ui/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lxd-ui";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HqdaG51W7eUCGUhA+9pYrAWaA6qyK7Fc95CKJvk9GaA=";
   };
 
diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
index 5b3f229d2fe0..f1cf3561ea2a 100644
--- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
+++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lxd";
-    rev = "refs/tags/lxd-${version}";
+    tag = "lxd-${version}";
     hash = "sha256-3C5pLvO7oABWFhFiWtBr5ohFFWm20Gg36WBfVVJgKdc=";
   };
 
diff --git a/pkgs/by-name/ly/lyrebird/package.nix b/pkgs/by-name/ly/lyrebird/package.nix
index a4b215a77432..fa70d065c157 100644
--- a/pkgs/by-name/ly/lyrebird/package.nix
+++ b/pkgs/by-name/ly/lyrebird/package.nix
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "chxrlt";
     repo = "lyrebird";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-VIYcOxvSpzRvJMzEv2i5b7t0WMF7aQxB4Y1jfvuZN/Y=";
   };
 
diff --git a/pkgs/by-name/ma/magic-enum/package.nix b/pkgs/by-name/ma/magic-enum/package.nix
index 93bcb8a624d8..eae9adc63775 100644
--- a/pkgs/by-name/ma/magic-enum/package.nix
+++ b/pkgs/by-name/ma/magic-enum/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec{
   src = fetchFromGitHub {
     owner = "Neargye";
     repo = "magic_enum";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1pO9FWd0InXqg8+lwRF3YNFTAeVLjqoI9v15LjWxnZY=";
   };
 
diff --git a/pkgs/by-name/ma/makefile2graph/package.nix b/pkgs/by-name/ma/makefile2graph/package.nix
index 4565e580289d..2e384a719440 100644
--- a/pkgs/by-name/ma/makefile2graph/package.nix
+++ b/pkgs/by-name/ma/makefile2graph/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "lindenb";
     repo = "makefile2graph";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4jyftC0eCJ13X/L4uEWhT5FA5/UXUmSHSoba89GSySQ=";
   };
 
diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix
index ccc6b61cfefc..49480a20afcd 100644
--- a/pkgs/by-name/ma/mako/package.nix
+++ b/pkgs/by-name/ma/mako/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "mako";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE=";
   };
 
diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index 071230c1feb1..f3821f83b68a 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "radiolamp";
     repo = "mangojuice";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-L+wxRmpCAfrvLE9IHAT9g+F/clXlQAkLpbnMJwC8RxY=";
   };
 
diff --git a/pkgs/by-name/ma/manticoresearch/package.nix b/pkgs/by-name/ma/manticoresearch/package.nix
index b6022a04303d..450a351c58a1 100644
--- a/pkgs/by-name/ma/manticoresearch/package.nix
+++ b/pkgs/by-name/ma/manticoresearch/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "manticoresoftware";
     repo = "manticoresearch";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-UD/r7rlJ5mR3wg4doKT/nTwTWzlulngUjOPNEjmykB8=";
   };
 
diff --git a/pkgs/by-name/ma/mantra/package.nix b/pkgs/by-name/ma/mantra/package.nix
index b48a36bd1b07..9f7c23b559ac 100644
--- a/pkgs/by-name/ma/mantra/package.nix
+++ b/pkgs/by-name/ma/mantra/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "MrEmpy";
     repo = "Mantra";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fBcoKoTBGCyJS8+mzKXLGxcxmRsCcZFZEyMTnA5Rkbw=";
   };
 
diff --git a/pkgs/by-name/ma/mapcidr/package.nix b/pkgs/by-name/ma/mapcidr/package.nix
index 18378cf233d3..aaad9a46dd70 100644
--- a/pkgs/by-name/ma/mapcidr/package.nix
+++ b/pkgs/by-name/ma/mapcidr/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/bZ6LimkdbR7nG7XcetNshk0KXw1FGbuaTXP+DH7hQg=";
   };
 
diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix
index 6c9ab7463094..d05d13d150e9 100644
--- a/pkgs/by-name/ma/mariadb-connector-java/package.nix
+++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix
@@ -12,7 +12,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-j";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-D9xm/qVD2nA7qkdadGoG3bUIZckVBDgY74J89AHSKyA=";
   };
 
diff --git a/pkgs/by-name/ma/markdown2html-converter/package.nix b/pkgs/by-name/ma/markdown2html-converter/package.nix
index bf5f3f0d68e9..051e6ab1f450 100644
--- a/pkgs/by-name/ma/markdown2html-converter/package.nix
+++ b/pkgs/by-name/ma/markdown2html-converter/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "magiclen";
     repo = "markdown2html-converter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C35TCmcskhK3sHbkUp3kEaTA4P7Ls5Rn6ahUbzy7KXY=";
   };
 
diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix
index df64cf723125..09f295b0c0dd 100644
--- a/pkgs/by-name/ma/mathmod/package.nix
+++ b/pkgs/by-name/ma/mathmod/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "parisolab";
     repo = "mathmod";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
index ab5b23f813b2..289b9a042c0f 100644
--- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
@@ -19,7 +19,7 @@ let
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Uq1sd1ZXv1JGjvCXHxBsNKvmdjMf4y4MVlOnCas4u/w=";
   };
 
diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 7e71432ef66f..d8eee746d796 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc=";
   };
 
diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix
index b7e943c30714..5b654005f96c 100644
--- a/pkgs/by-name/ma/matugen/package.nix
+++ b/pkgs/by-name/ma/matugen/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "InioX";
     repo = "matugen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk=";
   };
 
diff --git a/pkgs/by-name/ma/mautrix-googlechat/package.nix b/pkgs/by-name/ma/mautrix-googlechat/package.nix
index d3c8bdd7ee25..ba8517720acd 100644
--- a/pkgs/by-name/ma/mautrix-googlechat/package.nix
+++ b/pkgs/by-name/ma/mautrix-googlechat/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "googlechat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4H+zUH0GEQ5e/9Bv0BVdf1/pXulx2ihZrhJ+jl/db+U=";
   };
 
diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix
index d9c216271205..947f4a90b0fa 100644
--- a/pkgs/by-name/mc/mcdreforged/package.nix
+++ b/pkgs/by-name/mc/mcdreforged/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw=";
   };
 
diff --git a/pkgs/by-name/mc/mchprs/package.nix b/pkgs/by-name/mc/mchprs/package.nix
index df27432843f3..b256072b2375 100644
--- a/pkgs/by-name/mc/mchprs/package.nix
+++ b/pkgs/by-name/mc/mchprs/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MCHPR";
     repo = "MCHPRS";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Jm9ZsqCKOIxZsXQbCluYu7MgOD7hXYljcv/URaNVUW0=";
   };
 
diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix
index f6eb02f2e79f..50ad13dac0a5 100644
--- a/pkgs/by-name/md/md-tui/package.nix
+++ b/pkgs/by-name/md/md-tui/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "henriklovhaug";
     repo = "md-tui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O+EIhh83nIYE2GWaThkDLIVsYsg62g/6ksS+1fKm4AY=";
   };
 
diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
index 8efca623b2b7..937710be66f8 100644
--- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
+++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     owner = "google";
     repo = "mdbook-i18n-helpers";
     # TODO fix once upstream uses semver for tags again
-    rev = "refs/tags/mdbook-i18n-helpers-${version}";
+    tag = "mdbook-i18n-helpers-${version}";
     hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU=";
   };
 
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index d6cec841b3a3..52fa8ca72ca1 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "mdBook";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI=";
   };
 
diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index fdbe434bbff4..d712b8d0d318 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "MediaWriter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-L0rdZrCwgIULkcDacs3mwJ8Blccfxw/atFvJQt2z5r4=";
   };
 
diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix
index a1c0855676d1..0b6889b2b52d 100644
--- a/pkgs/by-name/me/melodeon/package.nix
+++ b/pkgs/by-name/me/melodeon/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "CDrummond";
     repo = "melodeon";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Og0o4Iy0mvGE7H5IY9h7uo7w64jZjXtdsGd4ApYO8oU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/me/memorado/package.nix b/pkgs/by-name/me/memorado/package.nix
index 1af6239281ae..a750bc7f5aae 100644
--- a/pkgs/by-name/me/memorado/package.nix
+++ b/pkgs/by-name/me/memorado/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wbernard";
     repo = "Memorado";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yWu2+VAa5FkpLs/KLI0lcNzFLGN/kiq6frtW8SHN+W4=";
   };
 
diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix
index cfe12b41d3aa..cfbf7609c0f9 100644
--- a/pkgs/by-name/me/memray/package.nix
+++ b/pkgs/by-name/me/memray/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bloomberg";
     repo = "memray";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E=";
   };
 
diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix
index 02f67e23c9c0..71dd966d290a 100644
--- a/pkgs/by-name/me/memtier-benchmark/package.nix
+++ b/pkgs/by-name/me/memtier-benchmark/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "redislabs";
     repo = "memtier_benchmark";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-a6v+M+r2f3AZImkHmUomViQNlgTdL7JaRayoVvmaMJU=";
   };
 
diff --git a/pkgs/by-name/me/mermerd/package.nix b/pkgs/by-name/me/mermerd/package.nix
index 7779d2b926f0..cd0fe6f6bde5 100644
--- a/pkgs/by-name/me/mermerd/package.nix
+++ b/pkgs/by-name/me/mermerd/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "KarnerTh";
     repo = "mermerd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-18GM/mb32MPI128ytM/Im+LO+N9cW1HoZ7M4tP2+i0o=";
   };
 
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 052ebf269630..c55dc369929a 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-st0dbb+GfF0KEyF+Qn/PIE2462ZrrXy8YcnrulHTI8M=";
   };
 
diff --git a/pkgs/by-name/me/metabigor/package.nix b/pkgs/by-name/me/metabigor/package.nix
index 5230006d1359..2034a9c91aaf 100644
--- a/pkgs/by-name/me/metabigor/package.nix
+++ b/pkgs/by-name/me/metabigor/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "j3ssie";
     repo = "metabigor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JFt9PC6VHWTYuaIWh2t2BiGFm1tGwZDdhhdp2xtmXSI=";
   };
 
diff --git a/pkgs/by-name/me/meteo-qt/package.nix b/pkgs/by-name/me/meteo-qt/package.nix
index 66b70d6638b7..26709f421b61 100644
--- a/pkgs/by-name/me/meteo-qt/package.nix
+++ b/pkgs/by-name/me/meteo-qt/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dglent";
     repo = "meteo-qt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J9R6UGfj3vaPfn0vmjeRMsHryc/1pxoKyIE9wteVYbY=";
   };
 
diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix
index 2840b9b048c1..c326b69df65c 100644
--- a/pkgs/by-name/me/methane/package.nix
+++ b/pkgs/by-name/me/methane/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     repo = "methane";
     owner = "rombust";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rByJqkhYsRuv0gTug+vP2qgkRY8TnX+Qx4/MbAmPTOU=";
   };
 
diff --git a/pkgs/by-name/mi/mingtest/package.nix b/pkgs/by-name/mi/mingtest/package.nix
index af847cd2f77b..d007fdaf9cb2 100644
--- a/pkgs/by-name/mi/mingtest/package.nix
+++ b/pkgs/by-name/mi/mingtest/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "craflin";
     repo = "mingtest";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-buFr5w+3YJ2gJeQ8YTsFrUMU9hWq/iAJ6cW6ykvETfM=";
   };
 
diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index 454ddf31be20..1eb421f1ad5f 100644
--- a/pkgs/by-name/mi/miniflux/package.nix
+++ b/pkgs/by-name/mi/miniflux/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-h5bOZPaYu5DlN4trwf+iMafzfcyXemNdssTYpM6NCZY=";
   };
 
diff --git a/pkgs/by-name/mi/minimal-grub-theme/package.nix b/pkgs/by-name/mi/minimal-grub-theme/package.nix
index 70e9c51d096c..127ada00f058 100644
--- a/pkgs/by-name/mi/minimal-grub-theme/package.nix
+++ b/pkgs/by-name/mi/minimal-grub-theme/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tomdewildt";
     repo = "minimal-grub-theme";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-CegLznlW+UJZbVe+WG/S8tREFdw0aq3flGvJeDrLWK0=";
   };
 
diff --git a/pkgs/by-name/mi/ministat/package.nix b/pkgs/by-name/mi/ministat/package.nix
index eadf3342aa7a..1933def73d62 100644
--- a/pkgs/by-name/mi/ministat/package.nix
+++ b/pkgs/by-name/mi/ministat/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.decadent.org.uk/git/ministat.git";
-    rev = "refs/tags/debian/${version}";
+    tag = "debian/${version}";
     sha256 = "1p4g0yqgsy4hiqhr8gqp8d38zxzrss5qz70s0bw3i2pg4w668k6f";
   };
 
diff --git a/pkgs/by-name/mi/minutor/package.nix b/pkgs/by-name/mi/minutor/package.nix
index 1bf92d38431f..e04e2504a22f 100644
--- a/pkgs/by-name/mi/minutor/package.nix
+++ b/pkgs/by-name/mi/minutor/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mrkite";
     repo = finalAttrs.pname;
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     sha256 = "0ldjnrk429ywf8cxdpjkam5k73s6fq7lvksandfn3xn7gl9np5rk";
   };
 
diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix
index 830b8c28d7e2..6967ff46b6ce 100644
--- a/pkgs/by-name/mi/miriway/package.nix
+++ b/pkgs/by-name/mi/miriway/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Miriway";
     repo = "Miriway";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DphzqU0jT2NE2dSDuQf6BQIjXTwJuPiOjfxk9N9YmaQ=";
   };
 
diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index deea099534f8..b5502f53973d 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v+Ls3P+s/pBMLgFMIHcfs+z9GsYNCcpOxoKlO+OjpzE=";
   };
 
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index 943a1c1e4e6d..f432f03702f5 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EricLBuehler";
     repo = "mistral.rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aflzpJZ48AFBqNTssZl2KxkspQb662nGkEU6COIluxk=";
   };
 
diff --git a/pkgs/by-name/mi/mitmproxy2swagger/package.nix b/pkgs/by-name/mi/mitmproxy2swagger/package.nix
index baf318573ee7..b127a9aa87dd 100644
--- a/pkgs/by-name/mi/mitmproxy2swagger/package.nix
+++ b/pkgs/by-name/mi/mitmproxy2swagger/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "alufers";
     repo = "mitmproxy2swagger";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VHxqxee5sQWRS13V4SfY4LWaN0oxxWsNVDOEqUyKHfg=";
   };
 
diff --git a/pkgs/by-name/mj/mjolnir/package.nix b/pkgs/by-name/mj/mjolnir/package.nix
index 215675d0f5cb..dae472d6c015 100644
--- a/pkgs/by-name/mj/mjolnir/package.nix
+++ b/pkgs/by-name/mj/mjolnir/package.nix
@@ -16,7 +16,7 @@ mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "mjolnir";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LK2CgMLDJHfr1+ejHYeJNw2ekCnUA8GHufZ6vbifzGQ=";
   };
 
diff --git a/pkgs/by-name/mk/mktxp/package.nix b/pkgs/by-name/mk/mktxp/package.nix
index 3c65e316e4b7..e483198c1a1d 100644
--- a/pkgs/by-name/mk/mktxp/package.nix
+++ b/pkgs/by-name/mk/mktxp/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "akpw";
     repo = "mktxp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LPCx5UJuL22aRbRYD+GkDAQ/0RCi+WJwvsF86ZQ01JY=";
   };
 
diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix
index 5bedd585948f..a439b5dcd484 100644
--- a/pkgs/by-name/ml/mlx42/package.nix
+++ b/pkgs/by-name/ml/mlx42/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "codam-coding-college";
     repo = "MLX42";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I=";
   };
 
diff --git a/pkgs/by-name/mm/mmdbctl/package.nix b/pkgs/by-name/mm/mmdbctl/package.nix
index c91b82c2644a..35dc947ec5b4 100644
--- a/pkgs/by-name/mm/mmdbctl/package.nix
+++ b/pkgs/by-name/mm/mmdbctl/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ipinfo";
     repo = "mmdbctl";
-    rev = "refs/tags/mmdbctl-${version}";
+    tag = "mmdbctl-${version}";
     hash = "sha256-6hJ9V8fHs84Lq48l3mB9nZka4rLneyxD4HMhWQYZ0cI=";
   };
 
diff --git a/pkgs/by-name/mm/mmdbinspect/package.nix b/pkgs/by-name/mm/mmdbinspect/package.nix
index ca0c32ad758d..06a4b8505086 100644
--- a/pkgs/by-name/mm/mmdbinspect/package.nix
+++ b/pkgs/by-name/mm/mmdbinspect/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "mmdbinspect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PYn+NgJDZBP+9nIU0kxg9KYT0EV35omagspcsCpa9DM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix
index 71be0aefcd91..f54142213e11 100644
--- a/pkgs/by-name/mm/mmseqs2/package.nix
+++ b/pkgs/by-name/mm/mmseqs2/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "soedinglab";
     repo = "mmseqs2";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-O7tx+gdVAmZLihPnWSo9RWNVzfPjI61LGY/XeaGHrI0=";
   };
 
diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix
index aff4446489aa..a71ca94e2592 100644
--- a/pkgs/by-name/mo/modelscan/package.nix
+++ b/pkgs/by-name/mo/modelscan/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "protectai";
     repo = "modelscan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ=";
   };
 
diff --git a/pkgs/by-name/mo/monitorets/package.nix b/pkgs/by-name/mo/monitorets/package.nix
index 4234bbf0904f..c13e642f4871 100644
--- a/pkgs/by-name/mo/monitorets/package.nix
+++ b/pkgs/by-name/mo/monitorets/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jorchube";
     repo = "monitorets";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y6cd9Wf2IzHwdxzLUP/U4rervlPUr8s2gKSW8y5I7bg=";
   };
 
diff --git a/pkgs/by-name/mo/monsoon/package.nix b/pkgs/by-name/mo/monsoon/package.nix
index 1c513fbe0f4f..d3d6d3bfa04f 100644
--- a/pkgs/by-name/mo/monsoon/package.nix
+++ b/pkgs/by-name/mo/monsoon/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "RedTeamPentesting";
     repo = "monsoon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-efVwOon499DUJ17g6aQveMd2g544Ck+/P7VttYnR+No=";
   };
 
diff --git a/pkgs/by-name/mo/moodle-dl/package.nix b/pkgs/by-name/mo/moodle-dl/package.nix
index cc09c84bfbe8..61180f9c4e8b 100644
--- a/pkgs/by-name/mo/moodle-dl/package.nix
+++ b/pkgs/by-name/mo/moodle-dl/package.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "C0D3D3V";
     repo = "Moodle-DL";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6arwc72gu7XyT6HokSEs2TkvE2FG7mIvy4F+/i/0eJg=";
   };
 
diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index c2ecaf695898..fb5951e96d71 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -19,7 +19,7 @@ let
   src = fetchFromGitHub {
     owner = "scottlamb";
     repo = "moonfire-nvr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kh+SPM08pnVFxKSZ6Gb2LP7Wa8j0VopknZK2urMIFNk=";
   };
   ui = stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
index 10f2cda2ece6..c556fe84d0de 100644
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "somepaulo";
     repo = "MoreWaita";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LvkYLY8PYajCb1x1p0HfpKoMq+t4XwH/w9Hvy9YXzk0=";
   };
 
diff --git a/pkgs/by-name/mo/morf/package.nix b/pkgs/by-name/mo/morf/package.nix
index c2a9f7ba2811..73243434e393 100644
--- a/pkgs/by-name/mo/morf/package.nix
+++ b/pkgs/by-name/mo/morf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "amrudesh1";
     repo = "morf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3PJ+YtKSH6HHAXBSHO8iMP2HFiuW1RQ0N8iUjQD7NBw=";
   };
 
diff --git a/pkgs/by-name/mo/mosdns/package.nix b/pkgs/by-name/mo/mosdns/package.nix
index 638240ad254b..826b7f6d7390 100644
--- a/pkgs/by-name/mo/mosdns/package.nix
+++ b/pkgs/by-name/mo/mosdns/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "IrineSistiana";
     repo = "mosdns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nSqSfbpi91W28DaLjCsWlPiLe1gLVHeZnstktc/CLag=";
   };
 
diff --git a/pkgs/by-name/mo/motoc/package.nix b/pkgs/by-name/mo/motoc/package.nix
index 009256fbfcca..54bf2174f86b 100644
--- a/pkgs/by-name/mo/motoc/package.nix
+++ b/pkgs/by-name/mo/motoc/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "galister";
     repo = "motoc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CAKgh9uddDhaFp2O62o1nNZ/ZWJbCR/7dMaI9V992Xk=";
   };
 
diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index f0ea612c309b..0c2468c0ff1e 100644
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jersou";
     repo = "mouse-actions";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
   };
 
diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix
index ae08bd5dd535..3637bd41eb92 100644
--- a/pkgs/by-name/mo/mov-cli/package.nix
+++ b/pkgs/by-name/mo/mov-cli/package.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage {
   src = fetchFromGitHub {
     owner = "mov-cli";
     repo = "mov-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mHtKQtLhHYwd2GEA0rCZQ4C/DEgsc6Rk7ZLpXFyW5d8=";
   };
 
diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index b20a79b6fa65..11315b9517a3 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -49,7 +49,7 @@ php.buildComposerProject (finalAttrs: {
   src = fetchFromGitHub {
     owner = "movim";
     repo = "movim";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hAOT3n0i9t3uWMjqWJlOs4Vakq3y4+GhiFZ4n3jVqtw=";
   };
 
diff --git a/pkgs/by-name/mo/mozphab/package.nix b/pkgs/by-name/mo/mozphab/package.nix
index a9618e9d5190..d9869dc02a6f 100644
--- a/pkgs/by-name/mo/mozphab/package.nix
+++ b/pkgs/by-name/mo/mozphab/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mozilla-conduit";
     repo = "review";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HxwQ+mGtjnruppPAD01QUg3aca+k5vpj814BWM+3VfQ=";
   };
 
diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix
index 4f57896e6ec9..fdd385b0c5ef 100644
--- a/pkgs/by-name/mp/mpb/package.nix
+++ b/pkgs/by-name/mp/mpb/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+2cMjZSGdfngtGoAeZRPRPBDvflTEIOWO8Se0W6jv9k=";
   };
 
diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix
index fecd71115088..bc9c61bf31b9 100644
--- a/pkgs/by-name/mp/mpris-timer/package.nix
+++ b/pkgs/by-name/mp/mpris-timer/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "efogdev";
     repo = "mpris-timer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QOnyu2FphqQW6aFa3rdJwLvQw+DXTS2JSzixshixLEg=";
   };
 
diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix
index 2dedffb92ff2..97e7d69ff372 100644
--- a/pkgs/by-name/mp/mprocs/package.nix
+++ b/pkgs/by-name/mp/mprocs/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pvolok";
     repo = "mprocs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-gK2kgc0Y0s1xys+pUadi8BhGeYxtyKRhNycCoqftmDI=";
   };
 
diff --git a/pkgs/by-name/mp/mps/package.nix b/pkgs/by-name/mp/mps/package.nix
index 48d8bede782e..644c185d6c71 100644
--- a/pkgs/by-name/mp/mps/package.nix
+++ b/pkgs/by-name/mp/mps/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ravenbrook";
     repo = "mps";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0=";
   };
 
diff --git a/pkgs/by-name/mq/mqtt-benchmark/package.nix b/pkgs/by-name/mq/mqtt-benchmark/package.nix
index 72ae68f33b56..6ed8032ee98d 100644
--- a/pkgs/by-name/mq/mqtt-benchmark/package.nix
+++ b/pkgs/by-name/mq/mqtt-benchmark/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "krylovsk";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gejLDtJ1geO4eDBapHjXgpc+M2TRGKcv5YzybmIyQSs=";
   };
 
diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix
index 0f0bc14ef29b..898e3f5ab894 100644
--- a/pkgs/by-name/mq/mqtt-exporter/package.nix
+++ b/pkgs/by-name/mq/mqtt-exporter/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kpetremann";
     repo = "mqtt-exporter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3gUAiujfBXJpVailx8cMmSJS7l69XpE4UGK/aebcQqY=";
   };
 
diff --git a/pkgs/by-name/mq/mqtt-randompub/package.nix b/pkgs/by-name/mq/mqtt-randompub/package.nix
index 37d43d291e06..08e0bb581860 100644
--- a/pkgs/by-name/mq/mqtt-randompub/package.nix
+++ b/pkgs/by-name/mq/mqtt-randompub/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fabaff";
     repo = "mqtt-randompub";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-X9gITmzyUNtYW8IMTcBiubPscBEO5OGjdxot9wRD/BY=";
   };
 
diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix
index d2617f51e1dd..fcadd12b7c5f 100644
--- a/pkgs/by-name/mq/mqttui/package.nix
+++ b/pkgs/by-name/mq/mqttui/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "EdJoPaTo";
     repo = "mqttui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JxaXiQj/dGSUhqyDtNij3JKT5NtEkyMta6rLGHmcLrU=";
   };
 
diff --git a/pkgs/by-name/mq/mqttx-cli/package.nix b/pkgs/by-name/mq/mqttx-cli/package.nix
index 984961024d28..025e63baaec6 100644
--- a/pkgs/by-name/mq/mqttx-cli/package.nix
+++ b/pkgs/by-name/mq/mqttx-cli/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "MQTTX";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-IPIiSav6MPJmzetBgVw9fLGPjJ+JKS3oWMEfCJmEY84=";
   };
 
diff --git a/pkgs/by-name/ms/msgpack-c/package.nix b/pkgs/by-name/ms/msgpack-c/package.nix
index f4b74a9abf99..afa7ea3581a3 100644
--- a/pkgs/by-name/ms/msgpack-c/package.nix
+++ b/pkgs/by-name/ms/msgpack-c/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-c";
-    rev = "refs/tags/c-${finalAttrs.version}";
+    tag = "c-${finalAttrs.version}";
     hash = "sha256-yL1+6w9l1Ccgrh8WXqvHv2yrb9QH+TrHIAFLXGoVuT0=";
   };
 
diff --git a/pkgs/by-name/ms/msgpack-cxx/package.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix
index 1238e616802d..1eefc89e9ecc 100644
--- a/pkgs/by-name/ms/msgpack-cxx/package.nix
+++ b/pkgs/by-name/ms/msgpack-cxx/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-c";
-    rev = "refs/tags/cpp-${finalAttrs.version}";
+    tag = "cpp-${finalAttrs.version}";
     hash = "sha256-kg4mpNiigfZ59ZeL8LXEHwtkLU8Po+vgRcUcgTJd+h4=";
   };
 
diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix
index 4b728284bf19..2cf8aee295fc 100644
--- a/pkgs/by-name/mu/mubeng/package.nix
+++ b/pkgs/by-name/mu/mubeng/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kitabisa";
     repo = "mubeng";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DZwtHLSsV6JYEqb6fdLtJs8DdaMBBb0uSx6AL1cjjBs=";
   };
 
diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix
index 75d56c5c026a..6396dd95a042 100644
--- a/pkgs/by-name/mu/mujoco/package.nix
+++ b/pkgs/by-name/mu/mujoco/package.nix
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "mujoco";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-n1H9e+GMqHYsimypF7AiVzHC2dXkL+4FWDEHB5B2ZIE=";
   };
 
diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix
index ecf7d72693be..d2855287fe30 100644
--- a/pkgs/by-name/mu/multipath-tools/package.nix
+++ b/pkgs/by-name/mu/multipath-tools/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opensvc";
     repo = "multipath-tools";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk=";
   };
 
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index ebbd057f138a..2b0af834bf2c 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-q71LczFsJAvZaWCQg4Lgzg2XX4XDFvA3x255Re00D9Q=";
   };
 
diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix
index d8d1b59746a1..c2a2c3867d99 100644
--- a/pkgs/by-name/mu/musicpod/package.nix
+++ b/pkgs/by-name/mu/musicpod/package.nix
@@ -14,7 +14,7 @@ flutter324.buildFlutterApplication rec {
   src = fetchFromGitHub {
     owner = "ubuntu-flutter-community";
     repo = "musicpod";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gsreA8ZTLcSvIAtODZ2gopZ78iyoN18gsSi9/IoY5/0=";
   };
 
diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix
index 70e131e53485..a7512adeaebd 100644
--- a/pkgs/by-name/mu/mutmut/package.nix
+++ b/pkgs/by-name/mu/mutmut/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "boxed";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+e2FmfpGtK401IW8LNqeHk0v8Hh5rF3LbZJkSOJ3yPY=";
   };
 
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index f14b252cf745..b6df17c6a5a7 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "mvfst";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2Iqk6QshM8fVO65uIqrTbex7aj8ELNSzNseYEeNdzCY=";
   };
 
diff --git a/pkgs/by-name/mv/mvt/package.nix b/pkgs/by-name/mv/mvt/package.nix
index 21659483fa3c..b81d8046b0e2 100644
--- a/pkgs/by-name/mv/mvt/package.nix
+++ b/pkgs/by-name/mv/mvt/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mvt-project";
     repo = "mvt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xDUjyvOsiweRqibTe7V8I/ABeaahCoR/d5w23qixp9A";
   };
 
diff --git a/pkgs/by-name/mx/mx-takeover/package.nix b/pkgs/by-name/mx/mx-takeover/package.nix
index d3799694f37c..a0df42942b33 100644
--- a/pkgs/by-name/mx/mx-takeover/package.nix
+++ b/pkgs/by-name/mx/mx-takeover/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "musana";
     repo = "mx-takeover";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yDQd2FEVFFsUu3wKxp26VDhGjnuXmAtxpWoKjV6ZrHA=";
   };
 
diff --git a/pkgs/by-name/my/mya/package.nix b/pkgs/by-name/my/mya/package.nix
index 073a003498d6..0a6100663841 100644
--- a/pkgs/by-name/my/mya/package.nix
+++ b/pkgs/by-name/my/mya/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jmakhack";
     repo = "myanimelist-cli";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-EmdkPpYEUIk9hr6rbnixjvznKSEnTCSMZz/17BfHGCk=";
   };
 
diff --git a/pkgs/by-name/my/myanon/package.nix b/pkgs/by-name/my/myanon/package.nix
index 0123698f6e2a..443ab1d6f5b8 100644
--- a/pkgs/by-name/my/myanon/package.nix
+++ b/pkgs/by-name/my/myanon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ppomes";
     repo = "myanon";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sB6ykRywaoG2gfHOEQ9UoVn62nMciBWgCM9DhovBoe0=";
   };
 
diff --git a/pkgs/by-name/my/mybbscan/package.nix b/pkgs/by-name/my/mybbscan/package.nix
index c85d0d20bc68..193b0ac3c9b4 100644
--- a/pkgs/by-name/my/mybbscan/package.nix
+++ b/pkgs/by-name/my/mybbscan/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "0xB9";
     repo = "MyBBscan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cX1483JK+bejQWua9d7V3GDw6cPPvlnLX5w2XQjqMOQ=";
   };
 
diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index cd881d005d8f..673b0fb56b4b 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZLLctIBbw95iQ1LpBEGZBNlBxQy2oyductmOQXckN2Q=";
     # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule
     fetchSubmodules = true;
diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 614ef27d70c1..54992fd8fa2d 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0kR1lluTRhDwpXhdUn4HJr5bYzJqnY1p77j/tiWyV68=";
   };
 
diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix
index fed5d02f7a9a..5120f7e1eebf 100644
--- a/pkgs/by-name/na/naabu/package.nix
+++ b/pkgs/by-name/na/naabu/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "naabu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ffE/PlLUH2qO4QJpSGHmEh7/ghputTCnTYplzP+Umw0=";
   };
 
diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix
index 1863ec630458..a6a5e52b0958 100644
--- a/pkgs/by-name/na/nagios/package.nix
+++ b/pkgs/by-name/na/nagios/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NagiosEnterprises";
     repo = "nagioscore";
-    rev = "refs/tags/nagios-${finalAttrs.version}";
+    tag = "nagios-${finalAttrs.version}";
     hash = "sha256-aOHdMZJCrGeJ3XA3+ed3JUb7X1FdfdGiT2ytzBDAT4c=";
   };
 
diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix
index f25d5e4d68a5..70da36703ebb 100644
--- a/pkgs/by-name/na/nagstamon/package.nix
+++ b/pkgs/by-name/na/nagstamon/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "HenriWahl";
     repo = "Nagstamon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9w8ux+AeSg0vDhnk28/2eCE2zYLvAjD7mB0pJBMFs2I=";
   };
 
diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix
index bd0bd9dc56cf..56e671ec6d95 100644
--- a/pkgs/by-name/na/nats-top/package.nix
+++ b/pkgs/by-name/na/nats-top/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NOU0U1hyP9FCSLK0ulf28cx1K0/KWKQd+t3KtaVqWWo=";
   };
 
diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix
index 8513a8d51ded..282287602a12 100644
--- a/pkgs/by-name/na/natscli/package.nix
+++ b/pkgs/by-name/na/natscli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "natscli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kdoBHTJq/Sj27BOD4NFDVpMlywG5H7vGRS6uUbPscOY=";
   };
 
diff --git a/pkgs/by-name/na/nautilus-open-any-terminal/package.nix b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix
index 058e3bec6e69..3af2ef1cc5ad 100644
--- a/pkgs/by-name/na/nautilus-open-any-terminal/package.nix
+++ b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Stunkymonkey";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jKPqgd0sSt/qKPqbYbvdeGuo78R5gp1R5tSTPAzz+IU=";
   };
 
diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix
index 6a68bbe72256..c43a9505de9f 100644
--- a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix
+++ b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ppvan";
     repo = "nautilus-open-in-blackbox";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5rvh3qNalpjamcBVQrnAW6GxhwPPlRxP5h045YDqvrM=";
   };
 
diff --git a/pkgs/by-name/nb/nbmerge/package.nix b/pkgs/by-name/nb/nbmerge/package.nix
index 3cd2efb857ca..8faffd48d66f 100644
--- a/pkgs/by-name/nb/nbmerge/package.nix
+++ b/pkgs/by-name/nb/nbmerge/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jbn";
     repo = "nbmerge";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM=";
   };
 
diff --git a/pkgs/by-name/nb/nbqa/package.nix b/pkgs/by-name/nb/nbqa/package.nix
index e171b4b57556..900e4f2d2e46 100644
--- a/pkgs/by-name/nb/nbqa/package.nix
+++ b/pkgs/by-name/nb/nbqa/package.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "nbQA-dev";
       repo = "nbQA";
-      rev = "refs/tags/${version}";
+      tag = version;
       hash = "sha256-qVNJ8f8vUlTCi5DbvG70orcSnulH60UcI5iABtXYUog=";
     };
 
diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix
index 17894259a546..30571eb14581 100644
--- a/pkgs/by-name/nb/nbtscanner/package.nix
+++ b/pkgs/by-name/nb/nbtscanner/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "jonkgrimes";
     repo = "nbtscanner";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q=";
   };
 
diff --git a/pkgs/by-name/nc/ncbi-vdb/package.nix b/pkgs/by-name/nc/ncbi-vdb/package.nix
index 64e981610cac..1424b3fb81a2 100644
--- a/pkgs/by-name/nc/ncbi-vdb/package.nix
+++ b/pkgs/by-name/nc/ncbi-vdb/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ncbi";
     repo = "ncbi-vdb";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-HBiheN8XfYYwmY5gw7j8qTczn6WZZNTzY2/fGtpgs/8=";
   };
 
diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index 68cb1525ca7b..444a4cc91cb0 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "d99kris";
     repo = "nchat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NrAU47GA7ZASJ7vCo1S8nyGBpfsZn4EBBqx2c4HKx7k=";
   };
 
diff --git a/pkgs/by-name/nc/ncmpcpp/package.nix b/pkgs/by-name/nc/ncmpcpp/package.nix
index 3d15f22943c9..b42875b9c04f 100644
--- a/pkgs/by-name/nc/ncmpcpp/package.nix
+++ b/pkgs/by-name/nc/ncmpcpp/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ncmpcpp";
     repo = "ncmpcpp";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-HRJQ+IOQ8xP1QkPlLI+VtDUWaI2m0Aw0fCDWHhgsOLY=";
   };
 
diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix
index 46d346176116..49fe958b8538 100644
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h3Mp67AKuzzeO6l7jN6yrQAHpYSsaOp1Y+qJoamK82U=";
   };
 
diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix
index 4d66df8dbffd..134487ef4e96 100644
--- a/pkgs/by-name/nd/ndpi/package.nix
+++ b/pkgs/by-name/nd/ndpi/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "nDPI";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso=";
   };
 
diff --git a/pkgs/by-name/ne/nearcore/package.nix b/pkgs/by-name/ne/nearcore/package.nix
index 3d3952a4d8c3..e23315a141a7 100644
--- a/pkgs/by-name/ne/nearcore/package.nix
+++ b/pkgs/by-name/ne/nearcore/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     owner = "near";
     repo = "nearcore";
     # there is also a branch for this version number, so we need to be explicit
-    rev = "refs/tags/${version}";
+    tag = version;
 
     sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY=";
   };
diff --git a/pkgs/by-name/ne/nebula/package.nix b/pkgs/by-name/ne/nebula/package.nix
index 4050345ea6ae..79bb79f6ed24 100644
--- a/pkgs/by-name/ne/nebula/package.nix
+++ b/pkgs/by-name/ne/nebula/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "slackhq";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IJMmVKdgYCXCaRndlcoozFBr+RsUhzC1Eqo427K1k+o=";
   };
 
diff --git a/pkgs/by-name/ne/nengo-gui/package.nix b/pkgs/by-name/ne/nengo-gui/package.nix
index 44e79a585520..b143a727816a 100644
--- a/pkgs/by-name/ne/nengo-gui/package.nix
+++ b/pkgs/by-name/ne/nengo-gui/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nengo";
     repo = "nengo-gui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-aBi4roe9pqPmpbW5zrbDoIvyH5mTKgIzL2O5j1+VBMY=";
   };
 
diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix
index 6f31a82328bd..0e717493a958 100644
--- a/pkgs/by-name/ne/neovim-node-client/package.nix
+++ b/pkgs/by-name/ne/neovim-node-client/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "node-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0vPw2hCGUDepSpF1gp/lI71EgwGsCSnw7ePP7ElHsTQ=";
   };
 
diff --git a/pkgs/by-name/ne/netbox_4_0/package.nix b/pkgs/by-name/ne/netbox_4_0/package.nix
index 91d9a58743b0..3a3221a3d99e 100644
--- a/pkgs/by-name/ne/netbox_4_0/package.nix
+++ b/pkgs/by-name/ne/netbox_4_0/package.nix
@@ -21,7 +21,7 @@ py.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0yEz7v5RL1+cqbGDyuyEsywFonJQfPdVIQdL0qLyc04=";
   };
 
diff --git a/pkgs/by-name/ne/netbox_4_1/package.nix b/pkgs/by-name/ne/netbox_4_1/package.nix
index aec258ff3899..384e6ddb99f5 100644
--- a/pkgs/by-name/ne/netbox_4_1/package.nix
+++ b/pkgs/by-name/ne/netbox_4_1/package.nix
@@ -22,7 +22,7 @@ py.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0AyIXSiNsAHELM8Ry/bcm7sd7K+ApeoEguiEm8ecAU0=";
   };
 
diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
index 5a95c5c39a3f..44325c79b8ac 100644
--- a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
+++ b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gmg137";
     repo = "netease-cloud-music-gtk";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-QRgGQDYrqOpZErz+OHZF1GPshxnZRPTIJSNkFWqQeHM=";
   };
 
diff --git a/pkgs/by-name/ne/netfetch/package.nix b/pkgs/by-name/ne/netfetch/package.nix
index b262e03cca9c..7d4e15037f51 100644
--- a/pkgs/by-name/ne/netfetch/package.nix
+++ b/pkgs/by-name/ne/netfetch/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "deggja";
     repo = "netfetch";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-N3wKpWdG92cXH0TwAkcsld9TRrfPRkbw0uZY/X4d+xk=";
   };
 
diff --git a/pkgs/by-name/ne/netlistsvg/package.nix b/pkgs/by-name/ne/netlistsvg/package.nix
index 6d9ee1f4a16e..3ce13ea48323 100644
--- a/pkgs/by-name/ne/netlistsvg/package.nix
+++ b/pkgs/by-name/ne/netlistsvg/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "nturley";
     repo = "netlistsvg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H37zhjfv7c/TV+pAk70eDiE6ZQ9JjZq1TFvac6OOKBk=";
   };
 
diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix
index 6acc8461dee2..433fda790091 100644
--- a/pkgs/by-name/ne/netscanner/package.nix
+++ b/pkgs/by-name/ne/netscanner/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "Chleba";
     repo = "netscanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/8UhnJ4ZPaJ+CQPCeKr1uH0Iw6A4/DARiSukK6+ZZeY=";
   };
 
diff --git a/pkgs/by-name/ne/newman/package.nix b/pkgs/by-name/ne/newman/package.nix
index 002dd0ad82f5..2ff02ca5660f 100644
--- a/pkgs/by-name/ne/newman/package.nix
+++ b/pkgs/by-name/ne/newman/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "postmanlabs";
     repo = "newman";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p0/uHrLiqw5VnboXzLKF+f56ZfW77m5aoopf2zqIpQE=";
   };
 
diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix
index 90dd466ffb59..6dd203a0857a 100644
--- a/pkgs/by-name/ne/next-ls/package.nix
+++ b/pkgs/by-name/ne/next-ls/package.nix
@@ -12,7 +12,7 @@ beamPackages.mixRelease rec {
   src = fetchFromGitHub {
     owner = "elixir-tools";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2KzBOzrfoQQIqjEtYufvhT9bBibfEjNDiC+d3l5eaUc=";
   };
 
diff --git a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
index f8cf00516c22..e778332cee35 100644
--- a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
+++ b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "whiteboard";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-27w8FZz9PbVdYV7yR5iRXi5edw7U/3bLVYfdRa8yPzo=";
   };
 
diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix
index 5641cff73012..b6ed4e9f3850 100644
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "agent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CVE1c0LLheGlH8oMWQWs6fox7mlHc5Y2O9XQ6kqXAwI=";
   };
 
diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index a38a518a33fd..bd3ccd452275 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "naiba";
     repo = "nezha";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fJvL2cESQoiW93aj2RHPyZXvP8246Mf8hIRiP/DSRRY=";
   };
 
diff --git a/pkgs/by-name/nf/nfdump/package.nix b/pkgs/by-name/nf/nfdump/package.nix
index 6e1afe8aae2a..c72bdb62a2e3 100644
--- a/pkgs/by-name/nf/nfdump/package.nix
+++ b/pkgs/by-name/nf/nfdump/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "phaag";
     repo = "nfdump";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1S55WVVHczYBDGwTxGZr+ND+e4a892jkTINlvIR2xgI=";
   };
 
diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix
index 03ebbd30807c..d9e19b79f7b6 100644
--- a/pkgs/by-name/ng/nginx-language-server/package.nix
+++ b/pkgs/by-name/ng/nginx-language-server/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pappasam";
     repo = "nginx-language-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AXWrNt4f3jkAbidE1goDgFicu4sSBv08f/Igyh2bRII=";
   };
 
diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index 0482c555e4bc..a4db4e5d6c82 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "viperML";
     repo = "nh";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k8rz5RF1qi7RXzQYWGbw5pJRNRFIdX85SIYN+IHiVL4=";
   };
 
diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 122d4a937567..5ff143157c87 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "nickel";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oOcVbAWNj0iVC3128QF4lKYfZbasqegwIfzv7qD8fDs=";
   };
 
diff --git a/pkgs/by-name/ni/nicotine-plus/package.nix b/pkgs/by-name/ni/nicotine-plus/package.nix
index bbb0ee5ff3d8..f5005b8a5d04 100644
--- a/pkgs/by-name/ni/nicotine-plus/package.nix
+++ b/pkgs/by-name/ni/nicotine-plus/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nicotine-plus";
     repo = "nicotine-plus";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Rj+dDkBXNV4l4A9LxjBApzBQ4c1edP5XjoPfpifkDoM=";
   };
 
diff --git a/pkgs/by-name/ni/niimath/package.nix b/pkgs/by-name/ni/niimath/package.nix
index b94fcb7b1fdf..d30a2680f2ca 100644
--- a/pkgs/by-name/ni/niimath/package.nix
+++ b/pkgs/by-name/ni/niimath/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rordenlab";
     repo = "niimath";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3XgB4q0HXLo9rEQBzC+2dxN81r9n8kkj2OC5d+WFmEs=";
   };
 
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 1658151fbe6b..044ec7e16625 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=";
   };
 
diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix
index 1d0899a5f3f8..06900abcab1e 100644
--- a/pkgs/by-name/ni/nix-forecast/package.nix
+++ b/pkgs/by-name/ni/nix-forecast/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "getchoo";
     repo = "nix-forecast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jfS7DXEIVHihC0/kH9W8ZJDOjoWuxdRvLMfzknElvrg=";
   };
 
diff --git a/pkgs/by-name/ni/nix-janitor/package.nix b/pkgs/by-name/ni/nix-janitor/package.nix
index 3b1f24d3b8a6..8fc36ac0c9ed 100644
--- a/pkgs/by-name/ni/nix-janitor/package.nix
+++ b/pkgs/by-name/ni/nix-janitor/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nobbz";
     repo = "nix-janitor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MRhTkxPl0tlObbXO7/0cD2pbd9/uQCeRKV3DStGvZMQ=";
   };
 
diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index bc48147792ac..fb17ef753981 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "Mic92";
       repo = "nix-update";
-      rev = "refs/tags/${self.version}";
+      tag = self.version;
       hash = "sha256-5KhS3RxeVDHKjsxT3hHtl0hHcwlSHl2fYFYLonobpLg=";
     };
 
diff --git a/pkgs/by-name/ni/nix-zsh-completions/package.nix b/pkgs/by-name/ni/nix-zsh-completions/package.nix
index e8a5f05538f8..ee621f70daf7 100644
--- a/pkgs/by-name/ni/nix-zsh-completions/package.nix
+++ b/pkgs/by-name/ni/nix-zsh-completions/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-zsh-completions";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bgbMc4HqigqgdkvUe/CWbUclwxpl17ESLzCIP8Sz+F8=";
   };
 
diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix
index 34fd1224fd15..80d791e60808 100644
--- a/pkgs/by-name/nk/nkeys/package.nix
+++ b/pkgs/by-name/nk/nkeys/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5HmtCzY2EmlnBqg36JcjaaM2ivrM5f719bkWqpxekVI=";
   };
 
diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix
index bf062bffc00f..48879b18fb4a 100644
--- a/pkgs/by-name/no/node-gyp/package.nix
+++ b/pkgs/by-name/no/node-gyp/package.nix
@@ -12,7 +12,7 @@
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-gyp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uC75nDZPSDLsRIXyFs1hwhRMcECQB8iycNe9wtZjJ/E=";
   };
 
diff --git a/pkgs/by-name/no/node-pre-gyp/package.nix b/pkgs/by-name/no/node-pre-gyp/package.nix
index 79ba4234ff16..dcfb5542fabd 100644
--- a/pkgs/by-name/no/node-pre-gyp/package.nix
+++ b/pkgs/by-name/no/node-pre-gyp/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "node-pre-gyp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O0PLEy2bEIrypaC+WyQJI5kfkqBBps029CujBKkzZ6o=";
   };
 
diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix
index 2f6c6c9b86b1..a27b1836a36d 100644
--- a/pkgs/by-name/no/node-red/package.nix
+++ b/pkgs/by-name/no/node-red/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "node-red";
     repo = "node-red";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-94U2233d81Rlu8kQF9KXLxSiGIF1Er4kRvH/XTwNm80=";
   };
 
diff --git a/pkgs/by-name/no/noice/package.nix b/pkgs/by-name/no/noice/package.nix
index 90ace4c43e47..6c7a28e9f8e7 100644
--- a/pkgs/by-name/no/noice/package.nix
+++ b/pkgs/by-name/no/noice/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.2f30.org/noice.git";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0975j4m93s9a21pazwdzn4gqhkngwq7q6ghp0q8a75r6c4fb7aar";
   };
 
diff --git a/pkgs/by-name/no/nomore403/package.nix b/pkgs/by-name/no/nomore403/package.nix
index 074db314f10a..413ead27a00c 100644
--- a/pkgs/by-name/no/nomore403/package.nix
+++ b/pkgs/by-name/no/nomore403/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "devploit";
     repo = "nomore403";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qA1i8l2oBQQ5IF8ho3K2k+TAndUTFGwb2NfhyFqfKzU=";
   };
 
diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix
index e4d8348acf6f..1a2f3e059bdf 100644
--- a/pkgs/by-name/no/normcap/package.nix
+++ b/pkgs/by-name/no/normcap/package.nix
@@ -35,7 +35,7 @@ ps.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dynobo";
     repo = "normcap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-K8BkPRHmcJSzYPxv49a1whKpe+StK7m0ea7t2YNUESw=";
   };
 
diff --git a/pkgs/by-name/no/norminette/package.nix b/pkgs/by-name/no/norminette/package.nix
index f1b7ecf41dc0..602297773727 100644
--- a/pkgs/by-name/no/norminette/package.nix
+++ b/pkgs/by-name/no/norminette/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "42School";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SaXOUpYEbc2QhZ8aKS+JeJ22MSXZ8HZuRmVQ9fWk7tM=";
   };
 
diff --git a/pkgs/by-name/no/notonoto/package.nix b/pkgs/by-name/no/notonoto/package.nix
index 37f953baf87a..ef4447f866b3 100644
--- a/pkgs/by-name/no/notonoto/package.nix
+++ b/pkgs/by-name/no/notonoto/package.nix
@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yuru7";
     repo = "NOTONOTO";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo=";
   };
 
diff --git a/pkgs/by-name/no/nova-password/package.nix b/pkgs/by-name/no/nova-password/package.nix
index ff9a35e29394..83fde0d4362a 100644
--- a/pkgs/by-name/no/nova-password/package.nix
+++ b/pkgs/by-name/no/nova-password/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sapcc";
     repo = "nova-password";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+qFbBjjbp1Nazpo21oOytvEPzn6Nmc4Cr8du045Ab/E=";
   };
 
diff --git a/pkgs/by-name/np/np/package.nix b/pkgs/by-name/np/np/package.nix
index dad49281b034..2cd7e5178eaf 100644
--- a/pkgs/by-name/np/np/package.nix
+++ b/pkgs/by-name/np/np/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "leesoh";
     repo = "np";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4krjQi/zEC4a+CjacgbnQIMKKFVr6H2FSwRVB6pkHf0=";
   };
 
diff --git a/pkgs/by-name/nq/nqptp/package.nix b/pkgs/by-name/nq/nqptp/package.nix
index 3fc3bea073a5..90912643b004 100644
--- a/pkgs/by-name/nq/nqptp/package.nix
+++ b/pkgs/by-name/nq/nqptp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mikebrady";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo=";
   };
 
diff --git a/pkgs/by-name/nr/nray/package.nix b/pkgs/by-name/nr/nray/package.nix
index bfbe6d969ba3..8e5716ef6c2f 100644
--- a/pkgs/by-name/nr/nray/package.nix
+++ b/pkgs/by-name/nr/nray/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nray-scanner";
     repo = "nray";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N78Bm/Le+pbA8hvDaUbjQpcdRlM0RKXnXyjOB8Nz3AE=";
   };
 
diff --git a/pkgs/by-name/ns/nstool/package.nix b/pkgs/by-name/ns/nstool/package.nix
index c8186bee9644..2cf44c6bec97 100644
--- a/pkgs/by-name/ns/nstool/package.nix
+++ b/pkgs/by-name/ns/nstool/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jakcron";
     repo = "nstool";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-az6AkBCO7Ew5jK/9qKQ65adwAKYf+H7QEvVI6LCXFS0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/nt/ntfs2btrfs/package.nix b/pkgs/by-name/nt/ntfs2btrfs/package.nix
index 2031938b40c6..96f7eae42081 100644
--- a/pkgs/by-name/nt/ntfs2btrfs/package.nix
+++ b/pkgs/by-name/nt/ntfs2btrfs/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "maharmstone";
     repo = "ntfs2btrfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sZ8AWREe2jasy3hqLTjaLcOMCNsrDjz2eIuknA2TsEs=";
   };
 
diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
index 68db2197c504..539d55e74fbf 100644
--- a/pkgs/by-name/nt/ntlmrecon/package.nix
+++ b/pkgs/by-name/nt/ntlmrecon/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pwnfoo";
     repo = "NTLMRecon";
-    rev = "refs/tags/v-${version}";
+    tag = "v-${version}";
     sha256 = "0rrx49li2l9xlcax84qxjf60nbzp3fgq77c36yqmsp0pc9i89ah6";
   };
 
diff --git a/pkgs/by-name/nt/ntopng/package.nix b/pkgs/by-name/nt/ntopng/package.nix
index 04f5648dd317..48ee6a6857b5 100644
--- a/pkgs/by-name/nt/ntopng/package.nix
+++ b/pkgs/by-name/nt/ntopng/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "ntopng";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-8PG18mOV/6EcBpKt9kLyI40OLDnpnc2b4IUu9JbK/Co=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 90f2385dccc7..f2207383f2b3 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-usLtf4qwKkn+lEYSQWCa1ap9h/52YYMVFDkpFJVD00k=";
   };
 
diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 3cec248688c2..a6dbec42c0ea 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WqGeNT3OLs5oY/b81fJh3R9b84vXYzn2u5hY9yI2kGM=";
   };
 
diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index 3b060db3b481..48fdc0e61649 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cvbxLEXPvJgAWHAMmHXPyHtBkYOOXj9xz1zfrm8oLG4=";
   };
 
diff --git a/pkgs/by-name/nu/nucleiparser/package.nix b/pkgs/by-name/nu/nucleiparser/package.nix
index d1af4451d9cf..3b02420f1997 100644
--- a/pkgs/by-name/nu/nucleiparser/package.nix
+++ b/pkgs/by-name/nu/nucleiparser/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sinkmanu";
     repo = "nucleiparser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/SLaRuO06rF7aLV7zY7tfIxkJRzsx+/Z+mc562RX2OQ=";
   };
 
diff --git a/pkgs/by-name/nv/nvdtools/package.nix b/pkgs/by-name/nv/nvdtools/package.nix
index 23a160c752cb..c703af25a703 100644
--- a/pkgs/by-name/nv/nvdtools/package.nix
+++ b/pkgs/by-name/nv/nvdtools/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "nvdtools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uB7dfqGaoP9Xx04BykscIFQ2rckaMaj93gh5mhgMqfw=";
   };
 
diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix
index c937fd46d6a0..96ecfeaa0ba0 100644
--- a/pkgs/by-name/nv/nvpy/package.nix
+++ b/pkgs/by-name/nv/nvpy/package.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cpbotha";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-guNdLu/bCk89o5M3gQU7J0W4h7eZdLHM0FG5IAPLE7c=";
   };
 
diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix
index 02d24c681d72..3fc4a45aaeca 100644
--- a/pkgs/by-name/nv/nvrh/package.nix
+++ b/pkgs/by-name/nv/nvrh/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mikew";
     repo = "nvrh";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FLlSS/ZgoGT4SyBG/sKdrN3eBSJdT0qFeGl01y4P/So=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix
index d8d2942906d8..92d77d8c3293 100644
--- a/pkgs/by-name/nw/nwg-clipman/package.nix
+++ b/pkgs/by-name/nw/nwg-clipman/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-clipman";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bAE9E6P+qfKrfRxb134k4r7DtIWGB+4JdiXKpI7gJ5M=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-displays/package.nix b/pkgs/by-name/nw/nwg-displays/package.nix
index e0cd1d5d57c4..a59d24afe44f 100644
--- a/pkgs/by-name/nw/nwg-displays/package.nix
+++ b/pkgs/by-name/nw/nwg-displays/package.nix
@@ -20,7 +20,7 @@ python310Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-displays";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lTFei4NR8eu5/5V9MEc/k6qQYRRZkQ5m6B7Bx9xIS6c=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
index 39813f6eee9d..ea7337d10d50 100644
--- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
+++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-dock-hyprland";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IKdXH2UK2CBZTHY8c9eN6JSbqsF4OpIHYH14XEKyrM0=";
   };
 
diff --git a/pkgs/by-name/nw/nwg-wrapper/package.nix b/pkgs/by-name/nw/nwg-wrapper/package.nix
index b086291928a1..e6718120726c 100644
--- a/pkgs/by-name/nw/nwg-wrapper/package.nix
+++ b/pkgs/by-name/nw/nwg-wrapper/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus=";
   };
 
diff --git a/pkgs/by-name/oa/oam-tools/package.nix b/pkgs/by-name/oa/oam-tools/package.nix
index 04116a4b23c0..d1fc3937f93e 100644
--- a/pkgs/by-name/oa/oam-tools/package.nix
+++ b/pkgs/by-name/oa/oam-tools/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "owasp-amass";
     repo = "oam-tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vt4V8em8Iaz3BVKIqlcAv+VIpJtD58xb3QrkIr4tYuU=";
   };
 
diff --git a/pkgs/by-name/oa/oapi-codegen/package.nix b/pkgs/by-name/oa/oapi-codegen/package.nix
index 42acac59aef8..add1f72532a6 100644
--- a/pkgs/by-name/oa/oapi-codegen/package.nix
+++ b/pkgs/by-name/oa/oapi-codegen/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "deepmap";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-21VhHSyfF+NHkXlr2svjwBNZmfS1O448POBP9XUQxak=";
   };
 
diff --git a/pkgs/by-name/ob/obs-cli/package.nix b/pkgs/by-name/ob/obs-cli/package.nix
index 60b5fe1df44a..cece45f3bf3f 100644
--- a/pkgs/by-name/ob/obs-cli/package.nix
+++ b/pkgs/by-name/ob/obs-cli/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "muesli";
     repo = "obs-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4tjS+PWyP/T0zs4IGE6VQ5c+3tuqxlBwfpPBVEcim6c=";
   };
 
diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix
index 2e403a249169..174c36d5771d 100644
--- a/pkgs/by-name/oc/ocis/package.nix
+++ b/pkgs/by-name/oc/ocis/package.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "owncloud";
     repo = "ocis";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TsMrQx+P1F2t66e0tGG0VvRi4W7+pCpDHd0aNsacOsI=";
   };
 
diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix
index cdb7d2d6f540..890792cd5c4a 100644
--- a/pkgs/by-name/oc/ocsinventory-agent/package.nix
+++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix
@@ -30,7 +30,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "OCSInventory-NG";
     repo = "UnixAgent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MKUYf3k47lHc9dTGo1wYd7r4GrX98dU+04mF0Jm5e9U=";
   };
 
diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix
index b6c5ffa15c5b..93f7f5ad0b09 100644
--- a/pkgs/by-name/oc/octoscan/package.nix
+++ b/pkgs/by-name/oc/octoscan/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "synacktiv";
     repo = "octoscan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7Y33HUqI3EKyWcVdJt+gj6VaMcXRp20fxuz9gNutOIo=";
   };
 
diff --git a/pkgs/by-name/oc/octosuite/package.nix b/pkgs/by-name/oc/octosuite/package.nix
index 95d7b46be826..f1e04885cd23 100644
--- a/pkgs/by-name/oc/octosuite/package.nix
+++ b/pkgs/by-name/oc/octosuite/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bellingcat";
     repo = "octosuite";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bgTAGIJbxOa8q8lMsWa8dHwNZ/jXiWGQOp921sd2Vdo=";
   };
 
diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index 4d23cd3a611c..8d9e37bcff9c 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-adv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bDttjeHcIK90W7zPrKNAS4B1L9mibaRjQdnUAU2N8as=";
   };
 
diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix
index 83bb81df0fc8..af338a75adb4 100644
--- a/pkgs/by-name/of/offat/package.nix
+++ b/pkgs/by-name/of/offat/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "OFFAT";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LZd9nMeI+TMd95r6CuNAB7eMqrE97ne0ioPjuIbtK7w=";
   };
 
diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix
index b65631cc89a8..e4b756748a55 100644
--- a/pkgs/by-name/og/ogen/package.nix
+++ b/pkgs/by-name/og/ogen/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ogen-go";
     repo = "ogen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SwJY9VQafclAxEQ/cbRJALvMLlnSIItIOz92XzuCoCk=";
   };
 
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index bb7d708cf186..cac1ed1b7e3b 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "hatoo";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-repm6Od9vuDZVZRoU8QTXTTVeqjlw9lFmFVWDNjToyU=";
   };
 
diff --git a/pkgs/by-name/ok/okms-cli/package.nix b/pkgs/by-name/ok/okms-cli/package.nix
index 1ee08adb8822..d490cd882096 100644
--- a/pkgs/by-name/ok/okms-cli/package.nix
+++ b/pkgs/by-name/ok/okms-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "okms-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y7Oy2vCxq5nXOUZxawz5737/io1+e/jNjuv7bH97yKA=";
   };
 
diff --git a/pkgs/by-name/om/omorfi/package.nix b/pkgs/by-name/om/omorfi/package.nix
index 824751a368d8..24c00b34e7af 100644
--- a/pkgs/by-name/om/omorfi/package.nix
+++ b/pkgs/by-name/om/omorfi/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "flammie";
     repo = "omorfi";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY=";
   };
 
diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix
index 463bc38e0224..d025d96e35a6 100644
--- a/pkgs/by-name/on/onionshare/package.nix
+++ b/pkgs/by-name/on/onionshare/package.nix
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "onionshare";
     repo = "onionshare";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko=";
   };
 
diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix
index ebda24f08696..86bd42383db6 100644
--- a/pkgs/by-name/on/onthespot/package.nix
+++ b/pkgs/by-name/on/onthespot/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "casualsnek";
     repo = "onthespot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg=";
   };
 
diff --git a/pkgs/by-name/op/opae/package.nix b/pkgs/by-name/op/opae/package.nix
index ccbd9bcb009c..1606a77b60d8 100644
--- a/pkgs/by-name/op/opae/package.nix
+++ b/pkgs/by-name/op/opae/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "opae";
     repo = "opae-sdk";
-    rev = "refs/tags/${tver}";
+    tag = tver;
     sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8";
   };
 
diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix
index 74a7f985f56e..a7ea2bf68f40 100644
--- a/pkgs/by-name/op/open5gs/package.nix
+++ b/pkgs/by-name/op/open5gs/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "open5gs";
     repo = "open5gs";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-XSDjVW+5l2trrilKMcSfX6QIfh/ijWxjoJg33Bn1DBU=";
   };
 
diff --git a/pkgs/by-name/op/opengfw/package.nix b/pkgs/by-name/op/opengfw/package.nix
index a78075f16a39..2281181c077f 100644
--- a/pkgs/by-name/op/opengfw/package.nix
+++ b/pkgs/by-name/op/opengfw/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "apernet";
     repo = "opengfw";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6PFfsPfLzzeaImcteX9u/k5pwe3cvSQwT90TCizA3gI=";
   };
 
diff --git a/pkgs/by-name/op/openpomodoro-cli/package.nix b/pkgs/by-name/op/openpomodoro-cli/package.nix
index 1ae51d6ecafb..1a0fe5f64d89 100644
--- a/pkgs/by-name/op/openpomodoro-cli/package.nix
+++ b/pkgs/by-name/op/openpomodoro-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "open-pomodoro";
     repo = "openpomodoro-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h/o4yxrZ8ViHhN2JS0ZJMfvcJBPCsyZ9ZQw9OmKnOfY=";
   };
 
diff --git a/pkgs/by-name/op/openrisk/package.nix b/pkgs/by-name/op/openrisk/package.nix
index f3600335803d..827870fab749 100644
--- a/pkgs/by-name/op/openrisk/package.nix
+++ b/pkgs/by-name/op/openrisk/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "openrisk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8DGwNoucLpdazf9r4PZrN4DEOMpTr5U7tal2Rab92pA=";
   };
 
diff --git a/pkgs/by-name/op/openslide/package.nix b/pkgs/by-name/op/openslide/package.nix
index 4410526f6980..ba0ae8eb69a7 100644
--- a/pkgs/by-name/op/openslide/package.nix
+++ b/pkgs/by-name/op/openslide/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "openslide";
     repo = "openslide";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-9LvQ7FG/0E0WpFyIUyrL4Fvn60iYWejjbgdKHMVOFdI=";
   };
 
diff --git a/pkgs/by-name/op/opensnitch-ui/package.nix b/pkgs/by-name/op/opensnitch-ui/package.nix
index fc4dd9ef9300..0edf4ede283b 100644
--- a/pkgs/by-name/op/opensnitch-ui/package.nix
+++ b/pkgs/by-name/op/opensnitch-ui/package.nix
@@ -13,7 +13,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI=";
   };
 
diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix
index 23f6590e37c4..39b4e6dfad79 100644
--- a/pkgs/by-name/op/opensnitch/package.nix
+++ b/pkgs/by-name/op/opensnitch/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2BwFCRbVvs7pAM5SnhynWws2+QthB/F9V6DYPViDICU=";
   };
 
diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix
index e54210130682..6dbe03103e21 100644
--- a/pkgs/by-name/op/opensplat/package.nix
+++ b/pkgs/by-name/op/opensplat/package.nix
@@ -31,7 +31,7 @@ stdenv'.mkDerivation {
   src = fetchFromGitHub {
     owner = "pierotofy";
     repo = "OpenSplat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u2UmD0O3sUWELYb4CjQE19i4HUjLMcaWqOinQH0PPTM=";
   };
 
diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index fcb0461de307..59b400192f01 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -26,7 +26,7 @@ buildDotnetModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "OpenTabletDriver";
     repo = "OpenTabletDriver";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ILnwHfcV/tW59TLDpAeDwJK708IQfMFBOYuqRtED0kw=";
   };
 
diff --git a/pkgs/by-name/op/opentsdb/package.nix b/pkgs/by-name/op/opentsdb/package.nix
index 0616cc5ea719..83c8681f1ff1 100644
--- a/pkgs/by-name/op/opentsdb/package.nix
+++ b/pkgs/by-name/op/opentsdb/package.nix
@@ -273,7 +273,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenTSDB";
     repo = "opentsdb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs=";
   };
 
diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix
index 4fe299858ffd..e3385e0d379a 100644
--- a/pkgs/by-name/op/openttd-ttf/package.nix
+++ b/pkgs/by-name/op/openttd-ttf/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zephyris";
     repo = "openttd-ttf";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Nr3oLiCEdpUhB/IczCEoLM8kb1hGDH/d6WYWRbjgOi8=";
   };
 
diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix
index d00a3575ef00..9769b3c7fa35 100644
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1IesoAK5Aq/JlM83WT0dodwmUvWv6RDqTyUg6LURle4=";
   };
 
diff --git a/pkgs/by-name/op/openvas-smb/package.nix b/pkgs/by-name/op/openvas-smb/package.nix
index 66d6de69b5d4..fd6e14ea407f 100644
--- a/pkgs/by-name/op/openvas-smb/package.nix
+++ b/pkgs/by-name/op/openvas-smb/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-smb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wnlBOHYOTWNbwzoHCpsXbuhp0uH3wBH6+Oo4Y+zSsfg=";
   };
 
diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 1b22d5d28267..2e81c9d1d8aa 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openvinotoolkit";
     repo = "openvino";
-    rev = "refs/tags/${version}";
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-GmbRuFM5L60vQNJLCkva1NzBWWKXK674xjMUpME4o4c=";
   };
diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix
index f5b959d15479..c690a37a1da8 100644
--- a/pkgs/by-name/op/openvpn3/package.nix
+++ b/pkgs/by-name/op/openvpn3/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "openvpn3-linux";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e3NRLrznTEolTzMO+kGEh48MCrcEr8p7JG3hG889aK4=";
     # `openvpn3-core` is a submodule.
     # TODO: make it into a separate package
diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 03bfc4f7a525..a128f77044c0 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openvswitch";
     repo = "ovs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EudcANZ0aUImQ/HWSX1PRklvhP2D5L3ugXaC0GKyF0Q=";
   };
 
diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix
index 0dd817ce733b..e9e1f977ecaa 100644
--- a/pkgs/by-name/op/operator-sdk/package.nix
+++ b/pkgs/by-name/op/operator-sdk/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YCYieXT+3LCpae3V/vub/TAKUG03HjB9FdHEhDVP4uM=";
   };
 
diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix
index 3ef92e059e05..09733948dadf 100644
--- a/pkgs/by-name/op/opsdroid/package.nix
+++ b/pkgs/by-name/op/opsdroid/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "opsdroid";
     repo = "opsdroid";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7H44wdhJD4Z6OP1sUmSGlepuvx+LlwKLq7iR8cwqR24=";
   };
 
diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix
index ce865e9d9218..dc2b6486dbc0 100644
--- a/pkgs/by-name/op/opshin/package.nix
+++ b/pkgs/by-name/op/opshin/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "OpShin";
     repo = "opshin";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-H6tuSJYV9bAwXu/5Y8g6aFbbQFCpq2aqcmRaDq2cAEg=";
   };
 
diff --git a/pkgs/by-name/or/orion/package.nix b/pkgs/by-name/or/orion/package.nix
index 851ea346b81c..3c5dcab90454 100644
--- a/pkgs/by-name/or/orion/package.nix
+++ b/pkgs/by-name/or/orion/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "Orion";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89";
   };
 
diff --git a/pkgs/by-name/or/ory/package.nix b/pkgs/by-name/or/ory/package.nix
index 96c775deb93f..e8abc6a696df 100644
--- a/pkgs/by-name/or/ory/package.nix
+++ b/pkgs/by-name/or/ory/package.nix
@@ -7,7 +7,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ory";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-q7+Fpttgx62GbKxCCiEDlX//e/pNO24e7KhhBeGRDH0=";
   };
 
diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix
index b71bf53b8549..cbc7238b58f9 100644
--- a/pkgs/by-name/os/oscavmgr/package.nix
+++ b/pkgs/by-name/os/oscavmgr/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "galister";
     repo = "oscavmgr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-05dNBzf1f92bVNLbRaUB6KUae+wY3V8mUxDgAb+g1T4=";
   };
 
diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix
index a889f0168924..7e6c8d8a3585 100644
--- a/pkgs/by-name/os/ospd-openvas/package.nix
+++ b/pkgs/by-name/os/ospd-openvas/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "ospd-openvas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bFZTwNITDG5OpoWD7F1Ad6BQFpY4Q5CGUGbYy7rTuc0=";
   };
 
diff --git a/pkgs/by-name/os/ossutil/package.nix b/pkgs/by-name/os/ossutil/package.nix
index cd32a65cfec0..80f5b13a7803 100644
--- a/pkgs/by-name/os/ossutil/package.nix
+++ b/pkgs/by-name/os/ossutil/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "ossutil";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M7Jh3rmWdUlsvj+P0UKazjQoe0zLDro882f/l8wFZGQ=";
   };
 
diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index bc2bf475698e..3e5e88634dd5 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Db5AgFvyrUOlW+1rcw8jPUzTBwQcFelLk5Rqk9HsbCo=";
   };
 
diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix
index 9569d7a5927b..85cc6f8d942c 100644
--- a/pkgs/by-name/ot/otpclient/package.nix
+++ b/pkgs/by-name/ot/otpclient/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "paolostivanin";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lSGXxwtys3V8dDTAW7l7+9VlF9tZQnWqNaV8neBvMRg=";
   };
 
diff --git a/pkgs/by-name/ou/out-of-tree/package.nix b/pkgs/by-name/ou/out-of-tree/package.nix
index 732a6bb5c6e0..0617756b90cd 100644
--- a/pkgs/by-name/ou/out-of-tree/package.nix
+++ b/pkgs/by-name/ou/out-of-tree/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchgit {
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     url = "https://code.dumpstack.io/tools/${pname}.git";
     hash = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo=";
   };
diff --git a/pkgs/by-name/ou/outguess/package.nix b/pkgs/by-name/ou/outguess/package.nix
index 5ead0d00fc4a..903c4754ffad 100644
--- a/pkgs/by-name/ou/outguess/package.nix
+++ b/pkgs/by-name/ou/outguess/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "resurrecting-open-source-projects";
     repo = "outguess";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-yv01jquPTnVk9fd1tqAt1Lxis+ZHZqdG3NiTFxfoXAE=";
   };
 
diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index b6cc370e4215..2782c508692e 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "ov";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PZYYr2763L/BOn05TSDr3tkjQQkg2Niic3rJrFSevu0=";
   };
 
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index be11066b305e..cdfc7a67f693 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "overlayeddev";
     repo = "overlayed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3GFg8czBf1csojXUNC51xFXJnGuXltP6D46fCt6q24I=";
   };
 
diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix
index 627a62f85d53..5ba29b443ff4 100644
--- a/pkgs/by-name/ov/ovn/package.nix
+++ b/pkgs/by-name/ov/ovn/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ovn-org";
     repo = "ovn";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Fz/YNEbMZ2mB4Fv1nKE3H3XrihehYP7j0N3clnTJ5x8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix
index e6f829425d28..b903a944b11a 100644
--- a/pkgs/by-name/ow/owncloud-client/package.nix
+++ b/pkgs/by-name/ow/owncloud-client/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "owncloud";
     repo = "client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ot+2hxipeZ5eI6nPJ8XGE8gFMNQoblUq+koAFZpZDv4=";
   };
 
diff --git a/pkgs/by-name/pa/pace/package.nix b/pkgs/by-name/pa/pace/package.nix
index 40d8706b3653..1a92a2b2eaf9 100644
--- a/pkgs/by-name/pa/pace/package.nix
+++ b/pkgs/by-name/pa/pace/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "pace-rs";
     repo = "pace";
-    rev = "refs/tags/pace-rs-v${version}";
+    tag = "pace-rs-v${version}";
     hash = "sha256-gyyf4GGHIEdiAWvzKbaOApFikoh3RLWBCZUfJ0MjbIE=";
   };
 
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
index 78bfd1b43b0c..f01731991eb2 100644
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "packetry";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM=";
   };
 
diff --git a/pkgs/by-name/pa/packj/package.nix b/pkgs/by-name/pa/packj/package.nix
index 82fe1d8b51ef..831955d9ef28 100644
--- a/pkgs/by-name/pa/packj/package.nix
+++ b/pkgs/by-name/pa/packj/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ossillate-inc";
     repo = "packj";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OWcJE2Gtjgoj9bCGZcHDfAFLWRP4wdENeJAnILMdUXY=";
   };
 
diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix
index c837b5fba948..14ee0c3ab078 100644
--- a/pkgs/by-name/pa/pacu/package.nix
+++ b/pkgs/by-name/pa/pacu/package.nix
@@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RhinoSecurityLabs";
     repo = "pacu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Td5H4O6/7Gh/rvP191xjCJmIbyc4ezZC5Fh4FZ39ZUM=";
   };
 
diff --git a/pkgs/by-name/pa/pacup/package.nix b/pkgs/by-name/pa/pacup/package.nix
index 992615982ea7..c06874e8a325 100644
--- a/pkgs/by-name/pa/pacup/package.nix
+++ b/pkgs/by-name/pa/pacup/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pacstall";
     repo = "pacup";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ItO38QyxNHftKPQZAPO7596ddBfX0a1nfVVqgx7BfwI=";
   };
 
diff --git a/pkgs/by-name/pa/padre/package.nix b/pkgs/by-name/pa/padre/package.nix
index 9b975e67cc64..c24ee299579c 100644
--- a/pkgs/by-name/pa/padre/package.nix
+++ b/pkgs/by-name/pa/padre/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "glebarez";
     repo = "padre";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UkL0EydwQfZl4HVtXiU8AyLJnzqBwECIgwm3bpQvyes=";
   };
 
diff --git a/pkgs/by-name/pa/paml/package.nix b/pkgs/by-name/pa/paml/package.nix
index 9fca986e5930..5de83b4b243a 100644
--- a/pkgs/by-name/pa/paml/package.nix
+++ b/pkgs/by-name/pa/paml/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "abacus-gene";
     repo = "paml";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s=";
   };
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.";
     license = lib.licenses.gpl3Only;
     homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html";
-    changelog = "https://github.com/abacus-gene/paml/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.version}";
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pa/panvimdoc/package.nix b/pkgs/by-name/pa/panvimdoc/package.nix
index d31260975a94..5ce0eabfc22b 100644
--- a/pkgs/by-name/pa/panvimdoc/package.nix
+++ b/pkgs/by-name/pa/panvimdoc/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "panvimdoc";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-HmEBPkNELHC7Xy0v730sQWZyPPwFdIBUcELzNtrWwzQ=";
   };
 
diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix
index 780f8f32c867..5cd3ebad48cc 100644
--- a/pkgs/by-name/pa/pappl/package.nix
+++ b/pkgs/by-name/pa/pappl/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "pappl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vp0DQvsQzuiXb5QAXVEcXNvyDJeRM99aO9/baZw9QwA=";
   };
 
diff --git a/pkgs/by-name/pa/parallel-hashmap/package.nix b/pkgs/by-name/pa/parallel-hashmap/package.nix
index ccb161e778ec..caaadf9e8a59 100644
--- a/pkgs/by-name/pa/parallel-hashmap/package.nix
+++ b/pkgs/by-name/pa/parallel-hashmap/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "greg7mdp";
     repo = "parallel-hashmap";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QDRy6YPoE34VpldN66V4mcF3PqK43RSlXThm+SzxRQ4=";
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Family of header-only, very fast and memory-friendly hashmap and btree containers";
     homepage = "https://github.com/greg7mdp/parallel-hashmap";
-    changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/v${finalAttrs.version}";
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ natsukium ];
diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index afa7ed722ce9..600f9d873355 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Sc2mqfOKXjiGtUVvo/pIRvSgDPaFeiK7UoWHhTtucFQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pa/parca-debuginfo/package.nix b/pkgs/by-name/pa/parca-debuginfo/package.nix
index 39acbf3d2633..1e54225374c1 100644
--- a/pkgs/by-name/pa/parca-debuginfo/package.nix
+++ b/pkgs/by-name/pa/parca-debuginfo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-debuginfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gL1BgDtEf2Q7yxzpoiTJY+nsRlsWv3zYzLVvaVijMDM=";
   };
 
diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix
index a906f7edf794..5ff206041ef4 100644
--- a/pkgs/by-name/pa/parca/package.nix
+++ b/pkgs/by-name/pa/parca/package.nix
@@ -13,7 +13,7 @@ let
   parca-src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iuTlKUmugRum0qZRhuw0FR13iE2qrQegTgwpAvgJSXk=";
   };
 
diff --git a/pkgs/by-name/pa/parpd/package.nix b/pkgs/by-name/pa/parpd/package.nix
index 777c5e72fe6d..ec1c32095f04 100644
--- a/pkgs/by-name/pa/parpd/package.nix
+++ b/pkgs/by-name/pa/parpd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "parpd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6qmoAW9jm7xMRHZUMQLpe0N+UeVnQP8dC4+Iq+d5Eaw=";
   };
 
diff --git a/pkgs/by-name/pa/parquet-tools/package.nix b/pkgs/by-name/pa/parquet-tools/package.nix
index ccc32744c43e..df25bfd14705 100644
--- a/pkgs/by-name/pa/parquet-tools/package.nix
+++ b/pkgs/by-name/pa/parquet-tools/package.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ktrueda";
     repo = "parquet-tools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mV66R5ejfzH1IasmoyAWAH5vzrnLVVhOqKBMfWKIVY0=";
   };
 
diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix
index ceaaf2dc5426..bee603d35080 100644
--- a/pkgs/by-name/pa/partio/package.nix
+++ b/pkgs/by-name/pa/partio/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wdas";
     repo = "partio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wV9byR85qwOkoTyLjG0gOLC3Gc19ykwiLpDy4T/MENQ=";
   };
 
diff --git a/pkgs/by-name/pa/passepartui/package.nix b/pkgs/by-name/pa/passepartui/package.nix
index 2586029487af..0beae15c4a6b 100644
--- a/pkgs/by-name/pa/passepartui/package.nix
+++ b/pkgs/by-name/pa/passepartui/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kardwen";
     repo = "passepartui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/rYdOurPlpGKCMAXTAhoWRn4NU3usPpJmef3f8V8EQA=";
   };
 
diff --git a/pkgs/by-name/pa/passky-desktop/package.nix b/pkgs/by-name/pa/passky-desktop/package.nix
index dfeffcb9f85e..ff13bd6d5c8e 100644
--- a/pkgs/by-name/pa/passky-desktop/package.nix
+++ b/pkgs/by-name/pa/passky-desktop/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Rabbit-Company";
     repo = "Passky-Desktop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QQ0+qIkDPNCHeWmcF6FkbDrrt/r3fIkNi0dv6XlV1rc=";
   };
 
diff --git a/pkgs/by-name/pa/past-time/package.nix b/pkgs/by-name/pa/past-time/package.nix
index 1d2b3a15f2df..249526583c13 100644
--- a/pkgs/by-name/pa/past-time/package.nix
+++ b/pkgs/by-name/pa/past-time/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fabaff";
     repo = "past-time";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NSuU33vuHbgJ+cG0FrGYLizIrG7jSz+veptt3D4UegY=";
   };
 
diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix
index b09368b60711..a44b4246d4d5 100644
--- a/pkgs/by-name/pa/patroni/package.nix
+++ b/pkgs/by-name/pa/patroni/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zalando";
     repo = "patroni";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-if3azfBb6/OegahZYAM2RMxmWRDsCX5DNkUATTcAUrw=";
   };
 
diff --git a/pkgs/by-name/pa/payload-dumper-go/package.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix
index 4aea8dc124d7..ede53a171dcb 100644
--- a/pkgs/by-name/pa/payload-dumper-go/package.nix
+++ b/pkgs/by-name/pa/payload-dumper-go/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ssut";
     repo = "payload-dumper-go";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TFnBWylOoyleuBx3yYfHl1kWO6jVBiqsi8AMYLMuuk0=";
   };
 
diff --git a/pkgs/by-name/pd/pdfannots2json/package.nix b/pkgs/by-name/pd/pdfannots2json/package.nix
index 74b2acdc308a..a75e19627a35 100644
--- a/pkgs/by-name/pd/pdfannots2json/package.nix
+++ b/pkgs/by-name/pd/pdfannots2json/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "mgmeyers";
     repo = "pdfannots2json";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qk4OSws/6SevN/Q0lsyxw+fZkm2uy1WwOYYL7CB7QUk=";
   };
 
diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index e1879ba6599d..2a8045abeaa4 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pdfarranger";
     repo = "pdfarranger";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA=";
   };
 
diff --git a/pkgs/by-name/pd/pdfrip/package.nix b/pkgs/by-name/pd/pdfrip/package.nix
index 2a94a5510339..7829a714331c 100644
--- a/pkgs/by-name/pd/pdfrip/package.nix
+++ b/pkgs/by-name/pd/pdfrip/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mufeedvh";
     repo = "pdfrip";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9KDWd71MJ2W9Xp3uqp0iZMmkBwIay+L4gnPUt7hylS0=";
   };
 
diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 800e8f457e31..f1c84e0f5f44 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-khAS/OpuvZTJGh9/lIGtKONajIonCwc/M9D9lSwzFvw=";
   };
 
diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix
index c5eb8bffc42a..d90554868467 100644
--- a/pkgs/by-name/pe/peering-manager/package.nix
+++ b/pkgs/by-name/pe/peering-manager/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UV1zSX9C9y5faOBUQ7bfj2DT6ffhMW28MIT7SaYjMgw=";
   };
 
diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix
index 9395982599c7..48732279f298 100644
--- a/pkgs/by-name/pe/performous/package.nix
+++ b/pkgs/by-name/pe/performous/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "performous";
     repo = "performous";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-f70IHA8LqIlkMRwJqSmszx3keStSx50nKcEWLGEjc3g=";
   };
 
diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix
index b16e08a3f564..f76b8848e311 100644
--- a/pkgs/by-name/pe/persepolis/package.nix
+++ b/pkgs/by-name/pe/persepolis/package.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "persepolisdm";
     repo = "persepolis";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ffEXPkpHGwvVzUxO6sjAEKYbxRod7o8f7DWR5AN+SkA=";
   };
 
diff --git a/pkgs/by-name/pf/pferd/package.nix b/pkgs/by-name/pf/pferd/package.nix
index 14be2ae7ecc0..1f563eaaced4 100644
--- a/pkgs/by-name/pf/pferd/package.nix
+++ b/pkgs/by-name/pf/pferd/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Garmelon";
     repo = "PFERD";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4+LlnGv/i9zDf+HeW86PJ6XsPMEkJ0JzhLr14MJ4WKM=";
   };
 
diff --git a/pkgs/by-name/pg/pg_activity/package.nix b/pkgs/by-name/pg/pg_activity/package.nix
index 39e94712f313..b58493998abc 100644
--- a/pkgs/by-name/pg/pg_activity/package.nix
+++ b/pkgs/by-name/pg/pg_activity/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dalibo";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fqRECReeXjdoCieCYIsIumIjcMGN7UUbWHxxAfzm9co=";
   };
 
diff --git a/pkgs/by-name/pg/pgf-pie/package.nix b/pkgs/by-name/pg/pgf-pie/package.nix
index 1b5e04b2ad08..259735f228dc 100644
--- a/pkgs/by-name/pg/pgf-pie/package.nix
+++ b/pkgs/by-name/pg/pgf-pie/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pgf-tikz";
     repo = "pgf-pie";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-tAUv35AMgJW5JI2KIXxxXFihqdB7qbMmNpAYhpDbAxs=";
   };
 
diff --git a/pkgs/by-name/pg/pgf-umlcd/package.nix b/pkgs/by-name/pg/pgf-umlcd/package.nix
index d255e9049712..702f956d743d 100644
--- a/pkgs/by-name/pg/pgf-umlcd/package.nix
+++ b/pkgs/by-name/pg/pgf-umlcd/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pgf-tikz";
     repo = "pgf-umlcd";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-92bfBcQfnalYoVxlVRjbRXhWt+CbS8PtiMmFIqbgo7A=";
   };
 
diff --git a/pkgs/by-name/pg/pgf1/package.nix b/pkgs/by-name/pg/pgf1/package.nix
index 3ba5c88b08c4..11720c4464c6 100644
--- a/pkgs/by-name/pg/pgf1/package.nix
+++ b/pkgs/by-name/pg/pgf1/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pgf-tikz";
     repo = "pgf";
-    rev = "refs/tags/version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
+    tag = "version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
     hash = "sha256-WZ/191iEDd5VK1bnV9JZx2BZfACUeAUhAqrlyx+ZvA4=";
   };
 
diff --git a/pkgs/by-name/pg/pgf2/package.nix b/pkgs/by-name/pg/pgf2/package.nix
index 7612081271ef..99c0bbd99b67 100644
--- a/pkgs/by-name/pg/pgf2/package.nix
+++ b/pkgs/by-name/pg/pgf2/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pgf-tikz";
     repo = "pgf";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-AA+XFhEkJifODJb6SppnxhR4lMlMNaH+k10UF6QisJ8=";
   };
 
diff --git a/pkgs/by-name/pg/pgf3/package.nix b/pkgs/by-name/pg/pgf3/package.nix
index 3accf107d24c..19769574271b 100644
--- a/pkgs/by-name/pg/pgf3/package.nix
+++ b/pkgs/by-name/pg/pgf3/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pgf-tikz";
     repo = "pgf";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-/zU2aTV39XpQhSpHVi8pBNsaAshcIhl6s+vOL1SO3Vw=";
   };
 
diff --git a/pkgs/by-name/pg/pgfplots/package.nix b/pkgs/by-name/pg/pgfplots/package.nix
index 47e1f257a4fb..5c6f8a81b99f 100644
--- a/pkgs/by-name/pg/pgfplots/package.nix
+++ b/pkgs/by-name/pg/pgfplots/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pgf-tikz";
     repo = "pgfplots";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-cTfOMasBptm0lydKeNHPnjdEyFjEb88awYPn8S2m73c=";
   };
 
diff --git a/pkgs/by-name/pg/pgraphs/package.nix b/pkgs/by-name/pg/pgraphs/package.nix
index d6a58ae683cc..dbe6cf34aba7 100644
--- a/pkgs/by-name/pg/pgraphs/package.nix
+++ b/pkgs/by-name/pg/pgraphs/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "pg-format";
     repo = "pgraphs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0Zo8Vg2KHhEGvO+vrbcP0ZTnfLtNTE2fqxq5LwPsJGs=";
   };
 
diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 8a1e9ba945aa..3ddc1ca77dfc 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-irN1Dnov6vDiU4xGsf2nxz7/kz1YOMq0yOLYt4HY1EM=";
   };
 
diff --git a/pkgs/by-name/ph/photini/package.nix b/pkgs/by-name/ph/photini/package.nix
index 4afc67386d57..c9d8bd031bc4 100644
--- a/pkgs/by-name/ph/photini/package.nix
+++ b/pkgs/by-name/ph/photini/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jim-easterbrook";
     repo = "Photini";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0jr1mNejCF0yW9LkrrsOTcE4ZPGZrMU9Pnt0eXD+3YQ=";
   };
 
diff --git a/pkgs/by-name/ph/photofield/package.nix b/pkgs/by-name/ph/photofield/package.nix
index 1674ec28013e..fbafa8a010ce 100644
--- a/pkgs/by-name/ph/photofield/package.nix
+++ b/pkgs/by-name/ph/photofield/package.nix
@@ -17,7 +17,7 @@ let
   src = fetchFromGitHub {
     owner = "SmilyOrg";
     repo = "photofield";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-leCXj8vETlrU1fwTqLcjcCGvhWWC1ESjpNDWSytAq4s=";
   };
 
diff --git a/pkgs/by-name/pi/picard/package.nix b/pkgs/by-name/pi/picard/package.nix
index e39f26d4a84e..ca86c672fcb6 100644
--- a/pkgs/by-name/pi/picard/package.nix
+++ b/pkgs/by-name/pi/picard/package.nix
@@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = "picard";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-ysHOiX8b9tlUaQDGl4qHUVLrLUF9MUDc4+vOQB76cj4=";
   };
 
diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index 5033bcaa53d5..7c4263059ac8 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "Picocrypt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VJCLbMthxb2eWN20pXA6GOzR1FDN97KCU6ligKbKQkY=";
   };
 
diff --git a/pkgs/by-name/pi/pie-cli/package.nix b/pkgs/by-name/pi/pie-cli/package.nix
index 98d70a2bf360..8a30aba35475 100644
--- a/pkgs/by-name/pi/pie-cli/package.nix
+++ b/pkgs/by-name/pi/pie-cli/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Falconerd";
     repo = "pie";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-qJaQyet6pjvPhBg6p0wxSIJtZE+P7A7XVqzAnvGn12E=";
   };
 
diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index 9e0b55b3a7a5..2636a6739478 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "madler";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-PzdxyO4mCg2jE/oBk1MH+NUdWM95wIIIbncBg71BkmQ=";
   };
 
diff --git a/pkgs/by-name/pi/pingtcp/package.nix b/pkgs/by-name/pi/pingtcp/package.nix
index 71b6ca9c8aa8..7b5645bb821f 100644
--- a/pkgs/by-name/pi/pingtcp/package.nix
+++ b/pkgs/by-name/pi/pingtcp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "LanetNetwork";
     repo = "pingtcp";
     sha256 = "1cv84n30y03s1b83apxxyn2jv5ss1pywsahrfrpkb6zcgzzrcqn8";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix
index 9deb33c757f4..0e55d55e9142 100644
--- a/pkgs/by-name/pi/pip-audit/package.nix
+++ b/pkgs/by-name/pi/pip-audit/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "pip-audit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw=";
   };
 
diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix
index 35a160858278..eada77a14907 100644
--- a/pkgs/by-name/pi/pipenv/package.nix
+++ b/pkgs/by-name/pi/pipenv/package.nix
@@ -37,7 +37,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "pipenv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5gq1kXVNAMH/AeovpUStcZffXN4GfXj3wJ7lW4qebRM=";
   };
 
diff --git a/pkgs/by-name/pi/piper-phonemize/package.nix b/pkgs/by-name/pi/piper-phonemize/package.nix
index ed0a1396994a..85d53ee78498 100644
--- a/pkgs/by-name/pi/piper-phonemize/package.nix
+++ b/pkgs/by-name/pi/piper-phonemize/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "piper-phonemize";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0=";
   };
 
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 17333ca11943..81c9aa0cdafe 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
-    rev = "refs/tags/pizauth-${version}";
+    tag = "pizauth-${version}";
     hash = "sha256-x3LdutVrQFrkXvbGPVzBV7Y8P9okKgv2rh2YdnDXvsc=";
   };
 
diff --git a/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix b/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix
index f8589b98edb5..347da3eea0b9 100644
--- a/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix
+++ b/pkgs/by-name/pl/plasma-applet-commandoutput/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Zren";
     repo = "plasma-applet-commandoutput";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Tjnm26EYKXtBM9JBHKI73AMvOW/rQ3qOw2JDYey7EfQ=";
   };
 
diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
index 1953ca394d1a..93e811dfb4b3 100644
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yeUicFoafKqj6suVJSaaNjmT+g+ZYb8QsguYyKNBYFA=";
   };
 
diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
index b6877859a793..57c6d2dc4f6d 100644
--- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-spacer-extended";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk=";
   };
 
diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index 87f349ac10e0..1240632b805a 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ccatterina";
     repo = "plasmusic-toolbar";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dQG6YOILsTsxbMfdrThodokixM2PrXPd5nB7+NWxFXg=";
   };
 
diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix
index 5d026704cdb5..ca0fc9497734 100644
--- a/pkgs/by-name/pl/plattenalbum/package.nix
+++ b/pkgs/by-name/pl/plattenalbum/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SoongNoonien";
     repo = "plattenalbum";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tbgSgbj77GvTgnI5eGu4cxYDie1gNa+5z053c0Nnu+Y=";
   };
 
diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix
index c3620102724a..c7e0cd711d37 100644
--- a/pkgs/by-name/pl/plow/package.nix
+++ b/pkgs/by-name/pl/plow/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "six-ddc";
     repo = "plow";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-q9k5GzhYPOP8p8VKrqpoHc3B9Qak+4DtZAZZuFlkED0=";
   };
 
diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix
index 0e37da28a939..3904bee236b5 100644
--- a/pkgs/by-name/po/pocketsphinx/package.nix
+++ b/pkgs/by-name/po/pocketsphinx/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cmusphinx";
     repo = "pocketsphinx";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-aCQpRmGHX08rA8UIt6Xf37XM34HysEzvcucLhL355k8=";
   };
 
diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix
index c759da032181..caa0147b5941 100644
--- a/pkgs/by-name/po/podlet/package.nix
+++ b/pkgs/by-name/po/podlet/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podlet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc=";
   };
 
diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix
index 5ec66c2852c8..fea3c32c1996 100644
--- a/pkgs/by-name/po/poethepoet/package.nix
+++ b/pkgs/by-name/po/poethepoet/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nat-n";
     repo = "poethepoet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-um17UHFLX7zLQXLWbYnEnaLUwMgFSxdGt85fjMBEhjQ=";
   };
 
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Task runner that works well with poetry";
     homepage = "https://github.com/nat-n/poethepoet";
-    changelog = "https://github.com/nat-n/poethepoet/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/nat-n/poethepoet/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
     mainProgram = "poe";
diff --git a/pkgs/by-name/po/pokete/package.nix b/pkgs/by-name/po/pokete/package.nix
index 8419520a6c73..20ab91317222 100644
--- a/pkgs/by-name/po/pokete/package.nix
+++ b/pkgs/by-name/po/pokete/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lxgr-linux";
     repo = "pokete";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-T18908Einsgful8hYMVHl0cL4sIYFvhpy0MbLIcVhxs=";
   };
 
diff --git a/pkgs/by-name/po/pololu-tic/package.nix b/pkgs/by-name/po/pololu-tic/package.nix
index 51b6af2c01e5..9ba193adc77c 100644
--- a/pkgs/by-name/po/pololu-tic/package.nix
+++ b/pkgs/by-name/po/pololu-tic/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "pololu-tic-software";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-C/v5oaC5zZwm+j9CbFaDW+ebzHxPVb8kZLg9c0HyPbc=";
   };
 
diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index f4f3516ae810..1f2d0f9d60ae 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mindstorm38";
     repo = "portablemc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KE1qf6aIcDjwKzrdKDUmriWfAt+vuriew6ixHKm0xs8=";
   };
 
@@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec {
       Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt.
       This launcher is compatible with the standard Minecraft directories.
     '';
-    changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/mindstorm38/portablemc/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
     mainProgram = "portablemc";
     maintainers = with lib.maintainers; [ tomasajt ];
diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix
index 25f9f6067e38..75e73aa0d19e 100644
--- a/pkgs/by-name/po/postmoogle/package.nix
+++ b/pkgs/by-name/po/postmoogle/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "postmoogle";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6KxPsg1zy8Dpo0UcgEWRmH6bI5oKJyzkZTelgk3SjoY=";
   };
 
diff --git a/pkgs/by-name/po/posy-cursors/package.nix b/pkgs/by-name/po/posy-cursors/package.nix
index 18a1e39b485e..3e1e4ce8c2c7 100644
--- a/pkgs/by-name/po/posy-cursors/package.nix
+++ b/pkgs/by-name/po/posy-cursors/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "simtrami";
     repo = "posy-improved-cursor-linux";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-i0N/QB5uzqHapMCDl6h6PWPJ4GOAyB1ds9qlqmZacLY=";
   };
 
diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix
index 543c466d43bb..1f26e7836301 100644
--- a/pkgs/by-name/po/poutine/package.nix
+++ b/pkgs/by-name/po/poutine/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "boostsecurityio";
     repo = "poutine";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YBoGsexYT2/lAWEajMVa/xNRBv1R1i0hB6pTAlk43E0=";
   };
 
diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix
index 62305f6fa07a..40fd1ab49a46 100644
--- a/pkgs/by-name/po/powerhub/package.nix
+++ b/pkgs/by-name/po/powerhub/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "AdrianVollmer";
     repo = "PowerHub";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ejdG/vMINyvToP8GAhRMdp/Jq8rZNBubDbRcg2i05lM=";
   };
 
diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix
index 06e9b50cd3a1..e74233fcf05d 100644
--- a/pkgs/by-name/po/powerpipe/package.nix
+++ b/pkgs/by-name/po/powerpipe/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "powerpipe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WCkkyPZRXQGThu/Tead/awf8Jw0275DpMF4UdB0veTc=";
   };
 
diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix
index e5bca7571a20..d65f79d70ba6 100644
--- a/pkgs/by-name/po/powertop/package.nix
+++ b/pkgs/by-name/po/powertop/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fenrus75";
     repo = "powertop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
   };
 
diff --git a/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix b/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
index 7d8570e74807..0352005f0726 100644
--- a/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
+++ b/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yuvipanda";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8sMmHNzmYwOmHYSWoZ4rKb/2lKziFmT6ux+s+chd/Do=";
   };
 
diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index a35ffa3072dd..d071d53f7218 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -27,7 +27,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pre-commit";
     repo = "pre-commit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qMNnzAxJOS7mabHmGYZ/VkDrpaZbqTJyETSCxq/OrGQ=";
   };
 
diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix
index 1cda899bd70b..055663b69ce9 100644
--- a/pkgs/by-name/pr/pre2k/package.nix
+++ b/pkgs/by-name/pr/pre2k/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "garrettfoster13";
     repo = "pre2k";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z1ttuRos7x/zdWiYYozxWzRarFExd4W5rUYAEiUMugU=";
   };
 
diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index abb37b0239b8..4778bfd3fe30 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = "presenterm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BFL0Y6v1v15WLSvA5i+l47bR9+1qDHPWSMMuEaLdhPY=";
   };
 
diff --git a/pkgs/by-name/pr/pretender/package.nix b/pkgs/by-name/pr/pretender/package.nix
index def2259c93ca..1d7bb074112d 100644
--- a/pkgs/by-name/pr/pretender/package.nix
+++ b/pkgs/by-name/pr/pretender/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "RedTeamPentesting";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-adWdUlsReRptSgRAjNH9bWy9dpwpuAWtVxlbDL2pMmk=";
   };
 
diff --git a/pkgs/by-name/pr/prettierd/package.nix b/pkgs/by-name/pr/prettierd/package.nix
index 9fcfe5c2b298..a5c546399e5e 100644
--- a/pkgs/by-name/pr/prettierd/package.nix
+++ b/pkgs/by-name/pr/prettierd/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fsouza";
     repo = "prettierd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE=";
   };
 
diff --git a/pkgs/by-name/pr/printrun/package.nix b/pkgs/by-name/pr/printrun/package.nix
index 84d3bc77ebc3..088dc789b092 100644
--- a/pkgs/by-name/pr/printrun/package.nix
+++ b/pkgs/by-name/pr/printrun/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kliment";
     repo = "Printrun";
-    rev = "refs/tags/printrun-${version}";
+    tag = "printrun-${version}";
     hash = "sha256-INJNGAmghoPIiivQp6AV1XmhyIu8SjfKqL8PTpi/tkY=";
   };
 
diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index a43ff52601c9..3a88065bca9d 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PrismLauncher";
     repo = "PrismLauncher";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-LVrWFBsI4+BOY5hlevfzqfRXQM6AFd5bMnXbBqTrxzA=";
   };
 
diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix
index aaef2f737ee8..4f71ef5cf813 100644
--- a/pkgs/by-name/pr/privatebin/package.nix
+++ b/pkgs/by-name/pr/privatebin/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PrivateBin";
     repo = "PrivateBin";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-LdTteUED/pq4Z4IOBttLPm3K9gx1xVqP24QQ48uvuyI=";
   };
 
diff --git a/pkgs/by-name/pr/project-lemonlime/package.nix b/pkgs/by-name/pr/project-lemonlime/package.nix
index f29a7c671e37..dd741cf9110b 100644
--- a/pkgs/by-name/pr/project-lemonlime/package.nix
+++ b/pkgs/by-name/pr/project-lemonlime/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Project-LemonLime";
     repo = "Project_LemonLime";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-h/aE1+ED+RkXqFcsb23rboA+Dd7kiom3XiIRqb4oYkQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
index c5fc4c0eb530..d6ff66ef375f 100644
--- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "maxim-mityutko";
     repo = "borgmatic-exporter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZZdCuIavJrIHO/ayMnirNRYyqovKQaW5jTRRrSOhofQ=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
index 9c522e558941..02f115756d51 100644
--- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BAMN2yuIW5FcHY3o9MUIMgPnTEFFRCbqhoAkcaZDxcM=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix
index 3cb89b29ffb0..44db96cc3948 100644
--- a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Tinkoff";
     repo = "libvirt-exporter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-loh7fgeF1/OuTt2MQSkl/7VnX25idoF57+HtzV9L/ns=";
   };
 
diff --git a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
index e8386356da63..7955ff2ca6f9 100644
--- a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0WppsqDl4nKa6s/dyX9zsUzoqAgStDSBWMM0eolTPdk=";
   };
 
diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix
index 62c55c8bd62f..e35fc7ad1aca 100644
--- a/pkgs/by-name/pr/protobufc/package.nix
+++ b/pkgs/by-name/pr/protobufc/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "protobuf-c";
     repo = "protobuf-c";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix
index 4d71c48dd84c..6940b01b88fd 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-es";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cB1OTolnwHOqeXrj8wL5FbFnjok6s03z1jC58ABTW3o=";
 
     postFetch = ''
diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 0e1ecdc6c1f1..99645faf4e4e 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index 0bc5b5032bd1..79aef256c7d0 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -10,7 +10,7 @@ beamPackages.mixRelease rec {
   src = fetchFromGitHub {
     owner = "elixir-protobuf";
     repo = "protobuf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TnuIlXYr36hx1sVktPHj4J4cJLCFK5F1xaX0V9/+ICQ=";
   };
 
diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix
index da7cc12d70dd..d75f34924852 100644
--- a/pkgs/by-name/pr/protoc-gen-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-es/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protobuf-es";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ECTra+uT5yEdTbi9kyrdseZQmcctPzCkDIkjX54Zc5Y=";
 
     postFetch = ''
diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix
index 1bca00e95ef6..889c576d3acf 100644
--- a/pkgs/by-name/pr/protols/package.nix
+++ b/pkgs/by-name/pr/protols/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coder3101";
     repo = "protols";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y2gmOlQO6yP/sP2z4NJGbJimlSC5Q7B9Lw8BinzOwHA=";
   };
 
diff --git a/pkgs/by-name/pr/proxify/package.nix b/pkgs/by-name/pr/proxify/package.nix
index a3cc3927aed3..28e4313bbf33 100644
--- a/pkgs/by-name/pr/proxify/package.nix
+++ b/pkgs/by-name/pr/proxify/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "proxify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vAI8LKdBmujH7zidXADc8bMLXaFMjT965hR+PVZVeNw=";
   };
 
diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
index 122a7343feb2..0a30081d05fe 100644
--- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix
+++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "13xforever";
     repo = "ps3-disc-dumper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ax2Q1VodzktXSdZBvO1fys+xigk/jzbMWHxqoLIKE7w=";
   };
 
diff --git a/pkgs/by-name/ps/psudohash/package.nix b/pkgs/by-name/ps/psudohash/package.nix
index e36f33a4a87d..461e70030746 100644
--- a/pkgs/by-name/ps/psudohash/package.nix
+++ b/pkgs/by-name/ps/psudohash/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "t3l3machus";
     repo = "psudohash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l/Rp9405Wf6vh85PFrRTtTLJE7GPODowseNqEw42J18=";
   };
 
diff --git a/pkgs/by-name/pu/pubs/package.nix b/pkgs/by-name/pu/pubs/package.nix
index fbdb529616f9..2f7eda0993e4 100644
--- a/pkgs/by-name/pu/pubs/package.nix
+++ b/pkgs/by-name/pu/pubs/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pubs";
     repo = "pubs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-U/9MLqfXrzYVGttFSafw4pYDy26WgdsJMCxciZzO1pw=";
   };
 
diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix
index 53bb59aa1ef2..b1ea4a5e23a5 100644
--- a/pkgs/by-name/pw/pwdsafety/package.nix
+++ b/pkgs/by-name/pw/pwdsafety/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = "pwdsafety";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cKxTcfNjvwcDEw0Z1b50A4u0DUYXlGMMfGWJLPaSkcw=";
   };
 
diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
index 30976363b5b0..1d83ecc86262 100644
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "pwvucontrol";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-v8xANTbaIPIAPoukP8rcVzM6NHNpS2Ej/nfdmg3Vgvg=";
   };
 
diff --git a/pkgs/by-name/py/pyamlboot/package.nix b/pkgs/by-name/py/pyamlboot/package.nix
index 82fe116dc133..08701edea6f6 100644
--- a/pkgs/by-name/py/pyamlboot/package.nix
+++ b/pkgs/by-name/py/pyamlboot/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "superna9999";
     repo = "pyamlboot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vpWq8+0ZoTkfVyx+2BbXdULFwo/Ug4U1gWArXDfnzyk=";
   };
 
diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 86fac71de875..49f2c7597698 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2khf1yGq+SXyOC7NAcjfzvscGg9Kay/8fMM7b0WMh8A=";
   };
 
diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index f91b7acfe0b7..2822e743b09f 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pyfa-org";
     repo = "Pyfa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i8NcRTn817gqwQP6j0RPUJkq09eTI4nfe3EVqYnWRpo=";
   };
 
diff --git a/pkgs/by-name/py/pylode/package.nix b/pkgs/by-name/py/pylode/package.nix
index 0652522a945d..b112dce0e903 100644
--- a/pkgs/by-name/py/pylode/package.nix
+++ b/pkgs/by-name/py/pylode/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RDFLib";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-AtqkxnpEL+580S/iKCaRcsQO6LLYhkJxyNx6fi3atbE=";
   };
 
diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 88b51e0943ea..19060a155247 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -15,7 +15,7 @@ let
     src = fetchFromGitHub {
       owner = "hauntsaninja";
       repo = "pyp";
-      rev = "refs/tags/v${finalAttrs.version}";
+      tag = "v${finalAttrs.version}";
       hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8=";
     };
 
diff --git a/pkgs/by-name/py/pypi-mirror/package.nix b/pkgs/by-name/py/pypi-mirror/package.nix
index e1c0cea0e8f8..d097803701ee 100644
--- a/pkgs/by-name/py/pypi-mirror/package.nix
+++ b/pkgs/by-name/py/pypi-mirror/package.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "montag451";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hRqQDYgOKpv4jmNvyrt/+EInPM/Xwsr3IjtrySAGRgY=";
   };
 
diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix
index 04b1737ab507..00fcd1b4b052 100644
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "pyprland";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0vI8f5XXYi7LG6wMH2Uw05pDbozO2eBzLCuaCHBY7BQ=";
   };
 
diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix
index a47aa447d1c9..eb58e774dc9c 100644
--- a/pkgs/by-name/py/pyrosimple/package.nix
+++ b/pkgs/by-name/py/pyrosimple/package.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kannibalox";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vYwdlFHfh59P62aYbaQSJJfkFC0WtX2UYmww3k30j08=";
   };
 
diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix
index 664c6b7c88e8..3a5753493aeb 100644
--- a/pkgs/by-name/py/pysqlrecon/package.nix
+++ b/pkgs/by-name/py/pysqlrecon/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tw1sm";
     repo = "PySQLRecon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+pme4uOgsh6iZEL73PaR1Y55r+Z/SPEVD2QWBsnMsNs=";
   };
 
diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix
index e4fbe4052e67..b2657ae67607 100644
--- a/pkgs/by-name/py/pytr/package.nix
+++ b/pkgs/by-name/py/pytr/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pytr-org";
     repo = "pytr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OFONjJXKkfb6+bQx5fhsadjm9WG62FISznnWL9IEY7I=";
   };
 
@@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "pytr" ];
 
   meta = {
-    changelog = "https://github.com/pytr-org/pytr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/pytr-org/pytr/releases/tag/v${version}";
     description = "Use TradeRepublic in terminal and mass download all documents";
     homepage = "https://github.com/pytr-org/pytr";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index 6befd73b6823..9a3465f517f4 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "skullernet";
     repo = "q2pro";
-    rev = "refs/tags/r${version}";
+    tag = "r${version}";
     hash = "sha256-LNOrGJarXnf4QqFXDkUfUgLGrjSqbjncpIN2yttbMuk=";
   };
 
diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix
index 6a3c238692d1..d54085b04b51 100644
--- a/pkgs/by-name/qd/qdiskinfo/package.nix
+++ b/pkgs/by-name/qd/qdiskinfo/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "edisionnano";
     repo = "QDiskInfo";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-0zF3Nc5K8+K68HOSy30ieYvYP9/oSkTe0+cp0hVo9Gs=";
   };
 
diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix
index 55abdf7e15d4..2ea788f736c7 100644
--- a/pkgs/by-name/qd/qdrant-web-ui/package.nix
+++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix
@@ -10,7 +10,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "qdrant-web-ui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hLjoN0GxRKkEPRw5+ga597QNeuCxl9aZawezfQqBD7I=";
   };
 
diff --git a/pkgs/by-name/qh/qhexedit2/package.nix b/pkgs/by-name/qh/qhexedit2/package.nix
index d8fb0aff0afb..990c227be3ba 100644
--- a/pkgs/by-name/qh/qhexedit2/package.nix
+++ b/pkgs/by-name/qh/qhexedit2/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Simsys";
     repo = "qhexedit2";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qg8dyXwAsTVSx85Ad7UYhr4d1aTRG9QbvC0uyOMcY8g=";
   };
 
diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index 8a5241aa8aca..f401c7e070f8 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = "qovery-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NxrhZmRbkQNj2K4b6Em4cAdssJRdwEKbdGy8EThN4JY=";
   };
 
diff --git a/pkgs/by-name/qq/qqwing/package.nix b/pkgs/by-name/qq/qqwing/package.nix
index 8fa696de889f..9f1713bae679 100644
--- a/pkgs/by-name/qq/qqwing/package.nix
+++ b/pkgs/by-name/qq/qqwing/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stephenostermiller";
     repo = "qqwing";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MYHPANQk4aUuDqUNxWPbqw45vweZ2bBcUcMTyEjcAOM=";
   };
 
diff --git a/pkgs/by-name/qs/qspeakers/package.nix b/pkgs/by-name/qs/qspeakers/package.nix
index 3d7ea63046c0..2df3a6f42c23 100644
--- a/pkgs/by-name/qs/qspeakers/package.nix
+++ b/pkgs/by-name/qs/qspeakers/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "be1";
     repo = "qspeakers";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-ab3+lw3F0CU8OLa7V4itPZsWKCV+6DoUvmFEqhAdklw=";
   };
 
diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
index 457e6d1659c0..67315a676332 100644
--- a/pkgs/by-name/qt/qtalarm/package.nix
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "CountMurphy";
     repo = "QTalarm";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-87w5YFQ9olLnCfPF04jOnIMn1NtE2M2n5WZX4e69UGU=";
   };
 
diff --git a/pkgs/by-name/qu/quake-injector/package.nix b/pkgs/by-name/qu/quake-injector/package.nix
index c503847e8929..02db59fc26f5 100644
--- a/pkgs/by-name/qu/quake-injector/package.nix
+++ b/pkgs/by-name/qu/quake-injector/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "hrehfeld";
     repo = "QuakeInjector";
-    rev = "refs/tags/alpha${finalAttrs.version}";
+    tag = "alpha${finalAttrs.version}";
     hash = "sha256-bbvLp5/Grg+mXBuV5aJCMOSjFp1+ukZS+AivcbhBxHU=";
   };
 
diff --git a/pkgs/by-name/qu/qualisys-cpp-sdk/package.nix b/pkgs/by-name/qu/qualisys-cpp-sdk/package.nix
index 00aef2c5a698..07775e42cd2b 100644
--- a/pkgs/by-name/qu/qualisys-cpp-sdk/package.nix
+++ b/pkgs/by-name/qu/qualisys-cpp-sdk/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "qualisys";
     repo = "qualisys_cpp_sdk";
-    rev = "refs/tags/rt_protocol_1.25";
+    tag = "rt_protocol_1.25";
     hash = "sha256-BeG6LF1a8m9BSoILsD9EppywXlCSheKGm0fBoLR1cak=";
   };
 
diff --git a/pkgs/by-name/qu/quick-lookup/package.nix b/pkgs/by-name/qu/quick-lookup/package.nix
index 10dfa854059e..0a463db059b0 100644
--- a/pkgs/by-name/qu/quick-lookup/package.nix
+++ b/pkgs/by-name/qu/quick-lookup/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "johnfactotum";
     repo = "quick-lookup";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-KENHYdhB1OHIB1RKyv78QFdsq3fYRqKgBDCFPLxHZ+k=";
   };
 
diff --git a/pkgs/by-name/qw/qwerty-fr/package.nix b/pkgs/by-name/qw/qwerty-fr/package.nix
index f406f17795c3..31728c89588e 100644
--- a/pkgs/by-name/qw/qwerty-fr/package.nix
+++ b/pkgs/by-name/qw/qwerty-fr/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "qwerty-fr";
     repo = "qwerty-fr";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TD67wKdaPaXzJzjKFCfRZl3WflUfdnUSQl/fnjr9TF8=";
   };
 
diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix
index e462a8c8993b..4db22b625251 100644
--- a/pkgs/by-name/ra/rabbit/package.nix
+++ b/pkgs/by-name/ra/rabbit/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "natarajan-chidambaram";
     repo = "RABBIT";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QmP6yfVnlYoNVa4EUtKR9xbCnQW2V6deV0+hN9IGtic=";
   };
 
diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix
index cc78281df397..f0e9bd7b59af 100644
--- a/pkgs/by-name/ra/radcli/package.nix
+++ b/pkgs/by-name/ra/radcli/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "radcli";
     repo = "radcli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YnZkFYTiU2VNKxuP+JTnH64XYTB/+imeMKN1mZN9VCQ=";
   };
 
diff --git a/pkgs/by-name/ra/radiance/package.nix b/pkgs/by-name/ra/radiance/package.nix
index afbf754d9628..7cc51249f979 100644
--- a/pkgs/by-name/ra/radiance/package.nix
+++ b/pkgs/by-name/ra/radiance/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LBNL-ETA";
     repo = "radiance";
-    rev = "refs/tags/rad${lib.versions.major finalAttrs.version}R${lib.versions.minor finalAttrs.version}";
+    tag = "rad${lib.versions.major finalAttrs.version}R${lib.versions.minor finalAttrs.version}";
     hash = "sha256-21lVWqO8uJefnm/dyfrjQJYbGck0fIRr2j0A+7WlZbM=";
   };
 
diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index d06626f0d3e3..20f1bcfc31fb 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KRVByUXiTx5sX7LDgtOlVky8UH5HThaaldvOpeeHd7k=";
   };
 
diff --git a/pkgs/by-name/ra/radvd/package.nix b/pkgs/by-name/ra/radvd/package.nix
index 333bf0c0e3c8..8c66da8b4c90 100644
--- a/pkgs/by-name/ra/radvd/package.nix
+++ b/pkgs/by-name/ra/radvd/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "radvd-project";
     repo = "radvd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+cZn4pE4hBZDckfcQJzYdZxHkexWl/AmufCN5BiwWwA=";
   };
 
diff --git a/pkgs/by-name/ra/raft-canonical/package.nix b/pkgs/by-name/ra/raft-canonical/package.nix
index c109f8de7606..86c4156fafd5 100644
--- a/pkgs/by-name/ra/raft-canonical/package.nix
+++ b/pkgs/by-name/ra/raft-canonical/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "raft";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ogTw0+ZFhMRaLAxAAXzHSlLRYFuX8W/zjqglXHfvUv4=";
   };
 
diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix
index b916743e7591..2ac47e242caf 100644
--- a/pkgs/by-name/ra/raft-cowsql/package.nix
+++ b/pkgs/by-name/ra/raft-cowsql/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cowsql";
     repo = "raft";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aGw/ATu8Xdjfqa0qWg8Sld9PKCmQsMtZhuNBwagER7M=";
   };
 
diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix
index ec1d17857f97..092ed2feca5d 100644
--- a/pkgs/by-name/ra/rain-bittorrent/package.nix
+++ b/pkgs/by-name/ra/rain-bittorrent/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "cenkalti";
     repo = "rain";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bn1LblXwYqZxfCuOmnmWo4Q8Ltt7ARnDCyEI7iNuYHU=";
   };
 
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 671bda994c1a..08e9772f5aa1 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "achristmascarl";
     repo = "rainfrog";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hIhg6OeWCp27OPHg10ifjsSvPrBHQMnn4P3CmyYmdDk=";
   };
 
diff --git a/pkgs/by-name/ra/rana/package.nix b/pkgs/by-name/ra/rana/package.nix
index 080dbde68d3c..b64214298fe1 100644
--- a/pkgs/by-name/ra/rana/package.nix
+++ b/pkgs/by-name/ra/rana/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "grunch";
     repo = "rana";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gzyjOCGh45zEJvc0xFkp8gAH9Kxwfc2oPeMzbrTjnk8=";
   };
 
diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index 958601bd96e4..da57e13f89bb 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-eeprom";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6HyaEdMEBIFilZJJ9yPBHqdp0g+kLbbpr/5RsLZLI3U=";
   };
 
diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix
index 3360f3961666..2137d1a5f36a 100644
--- a/pkgs/by-name/ra/rates/package.nix
+++ b/pkgs/by-name/ra/rates/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lunush";
     repo = "rates";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
   };
 
diff --git a/pkgs/by-name/ra/raygui/package.nix b/pkgs/by-name/ra/raygui/package.nix
index e860ac71b8e3..b60693f84e92 100644
--- a/pkgs/by-name/ra/raygui/package.nix
+++ b/pkgs/by-name/ra/raygui/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raysan5";
     repo = "raygui";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1qnChZYsb0e5LnPhvs6a/R5Ammgj2HWFNe9625sBRo8=";
   };
 
diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix
index 5ba50c533e89..742460974a20 100644
--- a/pkgs/by-name/ra/raze/package.nix
+++ b/pkgs/by-name/ra/raze/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "Raze";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g=";
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix
index 9028ed6f05c5..059af0bb165e 100644
--- a/pkgs/by-name/rd/rdkafka/package.nix
+++ b/pkgs/by-name/rd/rdkafka/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = "librdkafka";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-qgy5VVB7H0FECtQR6HkTJ58vrHIU9TAFurDNuZGGgvw=";
   };
 
diff --git a/pkgs/by-name/re/readability-extractor/package.nix b/pkgs/by-name/re/readability-extractor/package.nix
index ee0a81678dd5..f884c2491388 100644
--- a/pkgs/by-name/re/readability-extractor/package.nix
+++ b/pkgs/by-name/re/readability-extractor/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "ArchiveBox";
     repo = "readability-extractor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QzxwPonPrCDdVYHZ9rEfw8ok56lVZE82VykrfkdFh5I=";
   };
 
diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index 639ce1eab515..45da067f9758 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wiedehopf";
     repo = "readsb";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-viz/oADxdduan6W0FsetEqifR6fcyeoEZvEnoO/K5/g=";
   };
 
diff --git a/pkgs/by-name/re/ready-check/package.nix b/pkgs/by-name/re/ready-check/package.nix
index 7eca87bf957a..7b95d52ba120 100644
--- a/pkgs/by-name/re/ready-check/package.nix
+++ b/pkgs/by-name/re/ready-check/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sesh";
     repo = "ready";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j0UY2Q1jYGRtjvaWMwgMJrNaQZQnEJ5ST4o4PAVYWVc=";
   };
 
diff --git a/pkgs/by-name/re/refurb/package.nix b/pkgs/by-name/re/refurb/package.nix
index f9ca563951b5..a551cd8897b8 100644
--- a/pkgs/by-name/re/refurb/package.nix
+++ b/pkgs/by-name/re/refurb/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dosisod";
     repo = "refurb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6MchaqRKJPmvwiDyhCK4kFyIYl2B+2dGL8H8X2ES+VQ=";
   };
 
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 146b685ffbc6..e6bf1c5b9d88 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o8PHtGG3Ndz6Ei9ZBoAdeNmBb70m4c+jCvHCGOjaA+w=";
   };
 
diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix
index 6dfeddad0fbd..97a39d340fcd 100644
--- a/pkgs/by-name/re/remarshal_0_17/package.nix
+++ b/pkgs/by-name/re/remarshal_0_17/package.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "remarshal";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA=";
   };
 
diff --git a/pkgs/by-name/re/remod/package.nix b/pkgs/by-name/re/remod/package.nix
index 35429a6b688f..1ec9c9cb566c 100644
--- a/pkgs/by-name/re/remod/package.nix
+++ b/pkgs/by-name/re/remod/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "samuela";
     repo = "remod";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7tLxvh/pLlt3Y+PkNF0s5f/wh/wGdeDtt0dc4eQqWlw=";
   };
 
diff --git a/pkgs/by-name/re/repak/package.nix b/pkgs/by-name/re/repak/package.nix
index dd52b9858f0c..ce51cfe574a2 100644
--- a/pkgs/by-name/re/repak/package.nix
+++ b/pkgs/by-name/re/repak/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "trumank";
     repo = "repak";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc=";
   };
 
diff --git a/pkgs/by-name/re/repocheck/package.nix b/pkgs/by-name/re/repocheck/package.nix
index 846d7770dee5..da0bd687ef75 100644
--- a/pkgs/by-name/re/repocheck/package.nix
+++ b/pkgs/by-name/re/repocheck/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kynikos";
     repo = "repocheck";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pCz+oAfDFyDeuXumfNzLTXnftM9+IG+lZzWSKtbZ9dg=";
   };
 
diff --git a/pkgs/by-name/re/resolve-march-native/package.nix b/pkgs/by-name/re/resolve-march-native/package.nix
index d8fe8f412883..0bb8d4ca4056 100644
--- a/pkgs/by-name/re/resolve-march-native/package.nix
+++ b/pkgs/by-name/re/resolve-march-native/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hartwork";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-02d7ip5E/vkOMkkeHOx1m7FdpurXT9O6HdwrygNPHdY=";
   };
 
diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix
index 9f70e2c1325a..602e9d081157 100644
--- a/pkgs/by-name/re/resources/package.nix
+++ b/pkgs/by-name/re/resources/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nokyan";
     repo = "resources";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA=";
   };
 
diff --git a/pkgs/by-name/re/responder/package.nix b/pkgs/by-name/re/responder/package.nix
index de309f97c40f..d1b2ec9cad11 100644
--- a/pkgs/by-name/re/responder/package.nix
+++ b/pkgs/by-name/re/responder/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "lgandx";
     repo = "Responder";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BVSA/ZhpGz6UGyDRJUc4nlRJZ1/Y7er1vVOI+IbIqGk=";
   };
 
diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix
index fb814cdf392c..5897f00446b4 100644
--- a/pkgs/by-name/re/resticprofile/package.nix
+++ b/pkgs/by-name/re/resticprofile/package.nix
@@ -16,7 +16,7 @@ buildGo123Module rec {
   src = fetchFromGitHub {
     owner = "creativeprojects";
     repo = "resticprofile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ab+XesAw/GkNEGwAp1ERUlfDlI9Kxmd0UnS52v+nWIs=";
   };
 
diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix
index 6fbc233c9c0f..153e083f313c 100644
--- a/pkgs/by-name/re/restish/package.nix
+++ b/pkgs/by-name/re/restish/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "danielgtaylor";
     repo = "restish";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a0ObgFgWEsLYjGmCCi/py2PADAWJ0By+AZ4wh+Yeam4=";
   };
 
diff --git a/pkgs/by-name/re/retdec/package.nix b/pkgs/by-name/re/retdec/package.nix
index c562479eb052..0403c404e15f 100644
--- a/pkgs/by-name/re/retdec/package.nix
+++ b/pkgs/by-name/re/retdec/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation (self: {
   src = fetchFromGitHub {
     owner = "avast";
     repo = "retdec";
-    rev = "refs/tags/v${self.version}";
+    tag = "v${self.version}";
     sha256 = "sha256-H4e+aSgdBBbG6X6DzHGiDEIASPwBVNVsfHyeBTQLAKI=";
   };
 
diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix
index 659784f85839..650225d97ffa 100644
--- a/pkgs/by-name/re/retool/package.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "unexpectedpanda";
     repo = "retool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KGBpGZAC0SjStp0aulxVRJMmNwlpvSG0i0rtZgvFCpc=";
   };
 
diff --git a/pkgs/by-name/rf/rfc-bibtex/package.nix b/pkgs/by-name/rf/rfc-bibtex/package.nix
index 8555ae20d8c2..38254cae5c6a 100644
--- a/pkgs/by-name/rf/rfc-bibtex/package.nix
+++ b/pkgs/by-name/rf/rfc-bibtex/package.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "iluxonchik";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bPCNQqiG50vWVFA6J2kyxftwsXunHTNBdSkoIRYkb0s=";
   };
 
diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix
index 6b5d19757189..93b4f94c37c6 100644
--- a/pkgs/by-name/ri/rich-cli/package.nix
+++ b/pkgs/by-name/ri/rich-cli/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "rich-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ=";
   };
 
diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix
index 93009c71cfb4..b65458c525e1 100644
--- a/pkgs/by-name/ri/ride/package.nix
+++ b/pkgs/by-name/ri/ride/package.nix
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "Dyalog";
     repo = "ride";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
   };
 
diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index cd7f29d108e8..15efca5ee471 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PlE94OikRabxSr+23903nveXXa0DqqQmGgUJJfSZg1M=";
   };
 
diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix
index 62d3ba3cac83..445f08998c75 100644
--- a/pkgs/by-name/ri/ripasso-cursive/package.nix
+++ b/pkgs/by-name/ri/ripasso-cursive/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cortex";
     repo = "ripasso";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY=";
   };
 
diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
index 60e32ead5b61..7cdcd6020ad3 100644
--- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix
+++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
     repo = "ripe-atlas-tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aETSDXCVteTruRKV/8Aw3R/bprB6txOsXrFvoZOxIus=";
   };
 
diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix
index 9ca01128450b..16025b2e159c 100644
--- a/pkgs/by-name/ri/rippkgs/package.nix
+++ b/pkgs/by-name/ri/rippkgs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "replit";
     repo = "rippkgs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k50q78ycjrFVFTDstTdOLF8aJjsUpQ3lFRbFD1nL8xM=";
   };
 
diff --git a/pkgs/by-name/ri/rita/package.nix b/pkgs/by-name/ri/rita/package.nix
index 2f17660f6898..d5bb24650f51 100644
--- a/pkgs/by-name/ri/rita/package.nix
+++ b/pkgs/by-name/ri/rita/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "activecm";
     repo = "rita";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-By0JvQ4LTm+NEnRMadE1x2PiiYqnJQCsF3Fy+gHulXs=";
   };
 
diff --git a/pkgs/by-name/ri/rivalcfg/package.nix b/pkgs/by-name/ri/rivalcfg/package.nix
index 8ece23daf957..cdf942f4e1d1 100644
--- a/pkgs/by-name/ri/rivalcfg/package.nix
+++ b/pkgs/by-name/ri/rivalcfg/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flozz";
     repo = "rivalcfg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-LQpEHcKXkepfsgG7tGYsmM43FkUSBgm1Cn5C1RmTggI=";
   };
 
diff --git a/pkgs/by-name/rm/rmate-sh/package.nix b/pkgs/by-name/rm/rmate-sh/package.nix
index d0e1d344601d..9467a1f58405 100644
--- a/pkgs/by-name/rm/rmate-sh/package.nix
+++ b/pkgs/by-name/rm/rmate-sh/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "aurora";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fmK6h9bqZ0zO3HWfZvPdYuZ6i/0HZ1CA3FUnkS+E9ns=";
   };
 
diff --git a/pkgs/by-name/rn/rnm/package.nix b/pkgs/by-name/rn/rnm/package.nix
index 98fa3fbb2fe3..fa07e1d68e6b 100644
--- a/pkgs/by-name/rn/rnm/package.nix
+++ b/pkgs/by-name/rn/rnm/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "neurobin";
     repo = "rnm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cMWIxRuL7UCDjGr26+mfEYBPRA/dxEt0Us5qU92TelY=";
   };
 
diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix
index 16bc34ab3680..772e636cd55f 100644
--- a/pkgs/by-name/ro/roadrunner/package.nix
+++ b/pkgs/by-name/ro/roadrunner/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     repo = "roadrunner";
     owner = "roadrunner-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S5QDooao0PJkpu85xcHLhg/s3wyJUwhg/DSD4KITHyw=";
   };
 
diff --git a/pkgs/by-name/ro/robin-map/package.nix b/pkgs/by-name/ro/robin-map/package.nix
index 2605faabea85..0951f3f76a7d 100644
--- a/pkgs/by-name/ro/robin-map/package.nix
+++ b/pkgs/by-name/ro/robin-map/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Tessil";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dspOWp/8oNR0p5XRnqO7WtPcCx54/y8m1cDho4UBYyc=";
   };
 
diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix
index 4f85dbfc159d..d5e7291376a9 100644
--- a/pkgs/by-name/ro/rofi-games/package.nix
+++ b/pkgs/by-name/ro/rofi-games/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "rofi-games";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4L3gk/RG9g5QnUW1AJkZIl0VkBiO/L0HUBC3pibN/qo=";
   };
 
diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix
index 712329751245..6ca2d660a04f 100644
--- a/pkgs/by-name/ro/rofimoji/package.nix
+++ b/pkgs/by-name/ro/rofimoji/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fdw";
     repo = "rofimoji";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CY+ddF2Rth92R22QKqOb/Us+rZhvWTaU/jKy8fljWqQ=";
   };
 
diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix
index 8c38e03d3f43..f1f61fffe0a1 100644
--- a/pkgs/by-name/ro/rogcat/package.nix
+++ b/pkgs/by-name/ro/rogcat/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "flxo";
     repo = "rogcat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nXKvepuiBDIGo8Gga5tbbT/mnC6z+HipV5XYtlrURRU=";
   };
 
diff --git a/pkgs/by-name/ro/rot8/package.nix b/pkgs/by-name/ro/rot8/package.nix
index c6bac9263d07..01ee4f820847 100644
--- a/pkgs/by-name/ro/rot8/package.nix
+++ b/pkgs/by-name/ro/rot8/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "efernau";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dHx3vFY0ztyTIlzUi22TYphPD5hvgfHrWaaeoGxnvW0=";
   };
 
diff --git a/pkgs/by-name/ro/route-detect/package.nix b/pkgs/by-name/ro/route-detect/package.nix
index ce09ce88f3cf..35c251db250f 100644
--- a/pkgs/by-name/ro/route-detect/package.nix
+++ b/pkgs/by-name/ro/route-detect/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mschwager";
     repo = "route-detect";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4WkYjAQyteHJTJvSZoSfVUnBvsDQ3TWb5Ttp3uCgvdU=";
   };
 
diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix
index 72e4113ce522..7fe1e787ccff 100644
--- a/pkgs/by-name/ro/route-graph/package.nix
+++ b/pkgs/by-name/ro/route-graph/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "audiusGmbH";
     repo = "route-graph";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HmfmUeT5vt0yWVs7GhIPVt4NZtTfe7HYPLRqfQE/tZM=";
   };
 
diff --git a/pkgs/by-name/rp/rpi-imager/package.nix b/pkgs/by-name/rp/rpi-imager/package.nix
index 39a07b53d3c3..3de04bd57cae 100644
--- a/pkgs/by-name/rp/rpi-imager/package.nix
+++ b/pkgs/by-name/rp/rpi-imager/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-imager";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-JrotKMyAgQO3Y5RsFAar9N5/wDpWiBcy8RfvBWDiJMs=";
   };
 
diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix
index 868dbc5a558b..cf4dd98ac709 100644
--- a/pkgs/by-name/rs/rstfmt/package.nix
+++ b/pkgs/by-name/rs/rstfmt/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "dzhu";
     repo = "rstfmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zvmKgNzfxyWYHoaD+q84I48r1Mpp4kU4oIGAwMSRRlA=";
   };
 
diff --git a/pkgs/by-name/rt/rtaudio_6/package.nix b/pkgs/by-name/rt/rtaudio_6/package.nix
index e1fffde9adc0..b57810ba7e15 100644
--- a/pkgs/by-name/rt/rtaudio_6/package.nix
+++ b/pkgs/by-name/rt/rtaudio_6/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "thestk";
     repo = "rtaudio";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Acsxbnl+V+Y4mKC1gD11n0m03E96HMK+oEY/YV7rlIY=";
   };
 
diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix
index 6214bb2d9332..f6ecf43c84b4 100644
--- a/pkgs/by-name/ru/ruff-lsp/package.nix
+++ b/pkgs/by-name/ru/ruff-lsp/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff-lsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fMw93EmwO0wbIcGMr7csXkMRzgyQJNQzgLDZQqNB8Zc=";
   };
 
diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix
index fe63a7307280..d68cd743aeff 100644
--- a/pkgs/by-name/ru/ruler/package.nix
+++ b/pkgs/by-name/ru/ruler/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sensepost";
     repo = "ruler";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cEYpK1LB9b65xr6MCMax1vUtSWefjJdXNs4sPgx65d0=";
   };
 
diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix
index d61e84588068..17cfb42fde5b 100644
--- a/pkgs/by-name/ru/rustcat/package.nix
+++ b/pkgs/by-name/ru/rustcat/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "robiot";
     repo = "rustcat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
   };
 
diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix
index 50710a200cd5..cc9a6a6f412b 100644
--- a/pkgs/by-name/ru/rustic/package.nix
+++ b/pkgs/by-name/ru/rustic/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rustic-rs";
     repo = "rustic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ=";
   };
 
diff --git a/pkgs/by-name/ru/rusty-bash/package.nix b/pkgs/by-name/ru/rusty-bash/package.nix
index 7db90b1fa463..834f15db9da8 100644
--- a/pkgs/by-name/ru/rusty-bash/package.nix
+++ b/pkgs/by-name/ru/rusty-bash/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "shellgei";
     repo = "rusty_bash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hUMkgsWlGSqOnYdFhDGBWbc13oAssklbuJAg8NkY398=";
   };
 
diff --git a/pkgs/by-name/s2/s2geometry/package.nix b/pkgs/by-name/s2/s2geometry/package.nix
index a037c7b68a61..32733aacccd3 100644
--- a/pkgs/by-name/s2/s2geometry/package.nix
+++ b/pkgs/by-name/s2/s2geometry/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "google";
     repo = "s2geometry";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-VjgGcGgQlKmjUq+JU0JpyhOZ9pqwPcBUFEPGV9XoHc0=";
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = with lib; {
-    changelog = "https://github.com/google/s2geometry/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/google/s2geometry/releases/tag/v${finalAttrs.version}";
     description = "Computational geometry and spatial indexing on the sphere";
     homepage = "http://s2geometry.io/";
     license = licenses.asl20;
diff --git a/pkgs/by-name/s3/s3ql/package.nix b/pkgs/by-name/s3/s3ql/package.nix
index 57f1a6aecfeb..f0181e19b9bc 100644
--- a/pkgs/by-name/s3/s3ql/package.nix
+++ b/pkgs/by-name/s3/s3ql/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "s3ql";
     repo = "s3ql";
-    rev = "refs/tags/s3ql-${version}";
+    tag = "s3ql-${version}";
     hash = "sha256-hNqKLpJd0vj96Jx4YnqYsPLq/iTbvmtvjyLrYozaxpk=";
   };
 
diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix
index eecfbe0d83ab..5353fb404828 100644
--- a/pkgs/by-name/sa/sad/package.nix
+++ b/pkgs/by-name/sa/sad/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ms-jpq";
     repo = "sad";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko=";
   };
 
diff --git a/pkgs/by-name/sa/salt-lint/package.nix b/pkgs/by-name/sa/salt-lint/package.nix
index 2f114e91d84b..712ae494afb4 100644
--- a/pkgs/by-name/sa/salt-lint/package.nix
+++ b/pkgs/by-name/sa/salt-lint/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "warpnet";
     repo = "salt-lint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q/blaqDqs9gPrMfN+e1hkCi9IPMM0osPYTDsT6UODB4=";
   };
 
diff --git a/pkgs/by-name/sa/sasutils/package.nix b/pkgs/by-name/sa/sasutils/package.nix
index 540d573bcb23..604b31630178 100644
--- a/pkgs/by-name/sa/sasutils/package.nix
+++ b/pkgs/by-name/sa/sasutils/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "stanford-rc";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-rx4IxS5q1c3z617F4DBWxuxxSPHKFrw2bTW6b6/qkds=";
   };
 
diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix
index c132ef3a9b26..90316753a265 100644
--- a/pkgs/by-name/sa/saucectl/package.nix
+++ b/pkgs/by-name/sa/saucectl/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "saucelabs";
     repo = "saucectl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I1W7hAirtyLppJfM1gdzho3VU9rgFDt6j1dexGIHkXg=";
   };
 
diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix
index 79b858eb49ed..a9b33ea9f479 100644
--- a/pkgs/by-name/sb/sbctl/package.nix
+++ b/pkgs/by-name/sb/sbctl/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "sbctl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s=";
   };
 
diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix
index d50bc6100de9..e6f4ac7a5701 100644
--- a/pkgs/by-name/sb/sbom-utility/package.nix
+++ b/pkgs/by-name/sb/sbom-utility/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "sbom-utility";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LiHCA5q9IJ67jZ2JUcbCFVCYnT36nyq9QzgH9PMr9kM=";
   };
 
diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix
index e27d9a152563..d4ce9c22f943 100644
--- a/pkgs/by-name/sc/scarab/package.nix
+++ b/pkgs/by-name/sc/scarab/package.nix
@@ -16,7 +16,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "fifty-six";
     repo = "scarab";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xnvS3FDY4hi3yauwoSzO1fO6tJJAwFCkAc0Wzfs/puQ=";
   };
 
diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index fcc30de6e844..133bb70e5740 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wlrfx";
     repo = "scenefx";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-vBmunqXwGbMNiGRd372TdMU4siWhIVYn5RVYne9C7uQ=";
   };
 
diff --git a/pkgs/by-name/sc/schemaspy/package.nix b/pkgs/by-name/sc/schemaspy/package.nix
index 4c5ac81c879a..bb5cfddfd261 100644
--- a/pkgs/by-name/sc/schemaspy/package.nix
+++ b/pkgs/by-name/sc/schemaspy/package.nix
@@ -15,7 +15,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "schemaspy";
     repo = "schemaspy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yEqhLpGrJ4hki8o+u+bigVXv+3YvEb8TvHDTYsEl8z4=";
   };
 
diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix
index 77aeeae08e5e..730c647fc2fa 100644
--- a/pkgs/by-name/sc/scilla/package.nix
+++ b/pkgs/by-name/sc/scilla/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = "scilla";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V6QJqjuVLE6jpwv4XbsdPx8kpfTRjV4QH5O6lng9+h4=";
   };
 
diff --git a/pkgs/by-name/sc/scli/package.nix b/pkgs/by-name/sc/scli/package.nix
index a57c52f421d3..73f1a164128f 100644
--- a/pkgs/by-name/sc/scli/package.nix
+++ b/pkgs/by-name/sc/scli/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "isamert";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pp3uVABsncXXL2PZvTymHPKGAFvB24tnX+3K+C0VW8g=";
   };
 
diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix
index d2315a53d150..b89b106458cc 100644
--- a/pkgs/by-name/sc/scrcpy/package.nix
+++ b/pkgs/by-name/sc/scrcpy/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Genymobile";
     repo = "scrcpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XxvlwF3vqtkew+P1yuIwBJxYetD+D+v8OKaETU3qVkk=";
   };
 
diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix
index ceb00112ecb5..e381d00f5697 100644
--- a/pkgs/by-name/sc/screenly-cli/package.nix
+++ b/pkgs/by-name/sc/screenly-cli/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "screenly";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iEz6LFPzOZCOvUMx3s6entcwyEsAKirY8CiIoId/Ie0=";
   };
 
diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix
index df4922afb922..821e71454367 100644
--- a/pkgs/by-name/sc/screentest/package.nix
+++ b/pkgs/by-name/sc/screentest/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "TobiX";
     repo = "screentest";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-dbag1EAD+6+srfu/eqSl3CWlZtSopioQjyBQRJcUggA=";
   };
 
diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix
index a86a7ac687da..5bb97c1f2002 100644
--- a/pkgs/by-name/sc/scrutiny-collector/package.nix
+++ b/pkgs/by-name/sc/scrutiny-collector/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WoU5rdsIEhZQ+kPoXcestrGXC76rFPvhxa0msXjFsNg=";
   };
 
diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix
index 336492a162f0..3a9eee34cb50 100644
--- a/pkgs/by-name/sc/scrutiny/package.nix
+++ b/pkgs/by-name/sc/scrutiny/package.nix
@@ -12,7 +12,7 @@ let
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WoU5rdsIEhZQ+kPoXcestrGXC76rFPvhxa0msXjFsNg=";
   };
 
diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix
index 1ba3eb5912b8..d35c737408bb 100644
--- a/pkgs/by-name/sc/scs/package.nix
+++ b/pkgs/by-name/sc/scs/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "cvxgrp";
     repo = "scs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y28LrYUuDaXPO8sce1pJIfG3A03rw7BumVgxCIKRn+U=";
   };
 
diff --git a/pkgs/by-name/se/secp256k1/package.nix b/pkgs/by-name/se/secp256k1/package.nix
index aacba81c732c..5af874711902 100644
--- a/pkgs/by-name/se/secp256k1/package.nix
+++ b/pkgs/by-name/se/secp256k1/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bitcoin-core";
     repo = "secp256k1";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pCSNUSrPyN/lLYZm7zK/b9LICkThXOr6JAyFvHZSPW0=";
   };
 
diff --git a/pkgs/by-name/se/secrets-extractor/package.nix b/pkgs/by-name/se/secrets-extractor/package.nix
index 3e9679020477..b2c5ac868c24 100644
--- a/pkgs/by-name/se/secrets-extractor/package.nix
+++ b/pkgs/by-name/se/secrets-extractor/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Xenios91";
     repo = "Secrets-Extractor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xtxhatxNK9bRnT1R/5BJkTcubO58sg5ssrziLYvw6mQ=";
   };
 
diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix
index 330afcda9324..356ecd9102f3 100644
--- a/pkgs/by-name/se/secretscanner/package.nix
+++ b/pkgs/by-name/se/secretscanner/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "deepfence";
     repo = "SecretScanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-lTUZLuEiC9xpHYWn3uv4ZtbvHX6ETsjxacjd/O0kU8I=";
   };
diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix
index 4c92e5642f62..b9d9298af3d5 100644
--- a/pkgs/by-name/se/send/package.nix
+++ b/pkgs/by-name/se/send/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "timvisee";
     repo = "send";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bqQEXLwUvTKX+m2yNHRnrl+eeaGmcovXpXugxd+j14A=";
   };
 
diff --git a/pkgs/by-name/se/sentencepiece/package.nix b/pkgs/by-name/se/sentencepiece/package.nix
index 335eff7d718e..67067dd955fe 100644
--- a/pkgs/by-name/se/sentencepiece/package.nix
+++ b/pkgs/by-name/se/sentencepiece/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-tMt6UBDqpdjAhxAJlVOFFlE3RC36/t8K0gBAzbesnsg=";
   };
 
diff --git a/pkgs/by-name/se/sequin/package.nix b/pkgs/by-name/se/sequin/package.nix
index d6a5c4bdda85..ce6e27be4260 100644
--- a/pkgs/by-name/se/sequin/package.nix
+++ b/pkgs/by-name/se/sequin/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "sequin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pGZ7QmmPIpXrRcfkbEbTZzHXHtqPwU8Cju9Q2xtSqvw=";
   };
 
diff --git a/pkgs/by-name/se/setools/package.nix b/pkgs/by-name/se/setools/package.nix
index fc9a6c31b6f9..47cd6fcbcc19 100644
--- a/pkgs/by-name/se/setools/package.nix
+++ b/pkgs/by-name/se/setools/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SELinuxProject";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE=";
   };
 
diff --git a/pkgs/by-name/se/setzer/package.nix b/pkgs/by-name/se/setzer/package.nix
index ee05b4cd00d1..17e3cd0fefd5 100644
--- a/pkgs/by-name/se/setzer/package.nix
+++ b/pkgs/by-name/se/setzer/package.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cvfosammmm";
     repo = "Setzer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hqwwDR9jCk2XptcqpaReZ73jqpq4JpYD3Rc2OmrEPxg=";
   };
 
diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix
index a5d0edde103c..bc106eb0bb12 100644
--- a/pkgs/by-name/sf/sftpgo/package.nix
+++ b/pkgs/by-name/sf/sftpgo/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "drakkan";
     repo = "sftpgo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4TGbOoF6cpaqZ3Jh6cAI+Jyk5R35om6NnuMoNRS/LY4=";
   };
 
diff --git a/pkgs/by-name/sh/shadowsocks-libev/package.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix
index 60d41aa39e0f..9b75597b95b0 100644
--- a/pkgs/by-name/sh/shadowsocks-libev/package.nix
+++ b/pkgs/by-name/sh/shadowsocks-libev/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shadowsocks";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1iqpmhxk354db1x08axg6wrdy9p9a4mz0h9351i3mf3pqd1v6fdw";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix
index 364e5c4009e8..30a24ea39838 100644
--- a/pkgs/by-name/sh/shairport-sync/package.nix
+++ b/pkgs/by-name/sh/shairport-sync/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "shairport-sync";
     owner = "mikebrady";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g=";
   };
 
diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix
index 05e17556ed3f..ec32bda90ddc 100644
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "shaka-project";
     repo = "shaka-packager";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-xXKgL8sUP+meFXV9S/i7dao7BIkIx+e/ujjpew7xGL0=";
   };
 
diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix
index 85f70a6dfe8b..87442def7299 100644
--- a/pkgs/by-name/sh/shell-gpt/package.nix
+++ b/pkgs/by-name/sh/shell-gpt/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "TheR1D";
     repo = "shell_gpt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4/5CLzIq+RXVTJk4chrd65GeazRp8VFKdOMt3fT+mbI=";
   };
 
diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix
index 41ea8f012c8a..0e89e371df17 100644
--- a/pkgs/by-name/sh/shellclear/package.nix
+++ b/pkgs/by-name/sh/shellclear/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rusty-ferris-club";
     repo = "shellclear";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/0pqegVxrqqxaQ2JiUfkkFK9hp+Vuq7eTap052HEcJs=";
   };
 
diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix
index 2ae32cf0ce21..cf69b0f05082 100644
--- a/pkgs/by-name/sh/shelldap/package.nix
+++ b/pkgs/by-name/sh/shelldap/package.nix
@@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "mahlonsmith";
     repo = "shelldap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-67ttAXzu9pfeqjfhMfLMb9vWCXTrE+iUDCbamqswaLg=";
   };
 
diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix
index 84f9fe58d35e..436066f9e30a 100644
--- a/pkgs/by-name/sh/sherlock/package.nix
+++ b/pkgs/by-name/sh/sherlock/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sherlock-project";
     repo = "sherlock";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+fQDvvwsLpiEvy+vC49AzlOA/KaKrhhpS97sZvFbpLA=";
   };
 
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index bdbab146d4f2..3c1511efdb52 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-bA+Bm7M6udeZLpFhGa8fCtagfYBeRxWWqFuAj62XwGQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index a33b5a6b323a..e4e29656f425 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sOBGLQYRGHcXNoKTmqbBqmheUFHe7p696BTCiwtF5JY=";
   };
 
diff --git a/pkgs/by-name/sh/shoutrrr/package.nix b/pkgs/by-name/sh/shoutrrr/package.nix
index 03ba0f9e4d3a..1b2a16b7db1a 100644
--- a/pkgs/by-name/sh/shoutrrr/package.nix
+++ b/pkgs/by-name/sh/shoutrrr/package.nix
@@ -13,7 +13,7 @@ buildGoModule {
   src = fetchFromGitHub {
     repo = "shoutrrr";
     owner = "containrrr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DGyFo2oRZ39r1awqh5AXjOL2VShABarFbOMIcEXlWq4=";
   };
 
diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix
index 56320b83d94d..f53352298371 100644
--- a/pkgs/by-name/sh/showmethekey/package.nix
+++ b/pkgs/by-name/sh/showmethekey/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "AlynxZhou";
     repo = "showmethekey";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-d+k7EbGrFWOztr/e+ugnXVP/hUZAIEgmLDvQDf18K48=";
   };
 
diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 700e0ba90793..d1685d691fd3 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bBKNKgS3V/sZ8lZMk2ZwTzOVaVecSR9GhNP2FNkWbw0=";
   };
 
diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix
index 2e11c69e54a7..58c0463e4126 100644
--- a/pkgs/by-name/si/simple64-netplay-server/package.nix
+++ b/pkgs/by-name/si/simple64-netplay-server/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "simple64";
     repo = "simple64-netplay-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B0elTjklyXGpBAoqPN1HHeC9FIXsggKNKiDVvl8xgeU=";
   };
 
diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix
index a844560167bb..f98cc8732692 100644
--- a/pkgs/by-name/si/simple64/package.nix
+++ b/pkgs/by-name/si/simple64/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "simple64";
     repo = "simple64";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rvoUyvhpbibXbAreu6twTeeVRTCbhJiJuyKaJz0uT5k=";
   };
 
diff --git a/pkgs/by-name/si/simpleini/package.nix b/pkgs/by-name/si/simpleini/package.nix
index 64f330fbdc24..8982c1f53a8d 100644
--- a/pkgs/by-name/si/simpleini/package.nix
+++ b/pkgs/by-name/si/simpleini/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     name = "simpleini-sources-${finalAttrs.version}";
     owner = "brofield";
     repo = "simpleini";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-H4J4+v/3A8ZTOp4iMeiZ0OClu68oP4vUZ8YOFZbllcM=";
   };
 
diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix
index 29bb19b4d7e5..5d25e0858e2d 100644
--- a/pkgs/by-name/si/sipvicious/package.nix
+++ b/pkgs/by-name/si/sipvicious/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EnableSecurity";
     repo = "sipvicious";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O8/9Vz/u8BoF1dfGceOJdzPPYLfkdBp2DkwA5WQ3dgo=";
   };
 
diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix
index f42c32eb336c..1228577211b7 100644
--- a/pkgs/by-name/si/sish/package.nix
+++ b/pkgs/by-name/si/sish/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "antoniomika";
     repo = "sish";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YGeUiuLT67UI5whDAKcDFvYGnCIBkX4oCtKq47Qnw1k=";
   };
 
diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index 85a6edb75686..8a2468a6b8c2 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "skim-rs";
     repo = "skim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vUKHyrvCGtRKziUqgIbgVP7YdH+UW3PFBECV/mo5RxY=";
   };
 
diff --git a/pkgs/by-name/sk/skjold/package.nix b/pkgs/by-name/sk/skjold/package.nix
index 694052b7dcbb..fc96ea7cd64c 100644
--- a/pkgs/by-name/sk/skjold/package.nix
+++ b/pkgs/by-name/sk/skjold/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "twu";
     repo = "skjold";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/ltaRs2WZXbrG3cVez+QIwupJrsV550TjOALbHX9Z0I=";
   };
 
diff --git a/pkgs/by-name/sk/skrive/package.nix b/pkgs/by-name/sk/skrive/package.nix
index 59b4094383e1..1dab0a7ff345 100644
--- a/pkgs/by-name/sk/skrive/package.nix
+++ b/pkgs/by-name/sk/skrive/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "VanuPhantom";
     repo = "skrive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-thEq9mMQl9BNlc5PKbEjOoSsVO0ENSpDy0nQ7uplPus=";
   };
 
diff --git a/pkgs/by-name/sk/skytemple/package.nix b/pkgs/by-name/sk/skytemple/package.nix
index b9832bc93a3c..918275e1e341 100644
--- a/pkgs/by-name/sk/skytemple/package.nix
+++ b/pkgs/by-name/sk/skytemple/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "skytemple";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RFLxDV/L6Qbz14KqIEcMX/EnirNUrHL0MW8v5Z8ByK0=";
   };
 
diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index 7f3fd542ed24..88b725edef61 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-szo5n1sVv9PZUW77k/1qLuU0URl0FNB4cO5vqokoZ2c=";
   };
 
diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix
index 3d3ced6d29ec..b661d1e3308d 100644
--- a/pkgs/by-name/sl/slowlorust/package.nix
+++ b/pkgs/by-name/sl/slowlorust/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MJVL";
     repo = "slowlorust";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c=";
   };
 
diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix
index 795da25133d0..2941a701cbe4 100644
--- a/pkgs/by-name/sl/slskd/package.nix
+++ b/pkgs/by-name/sl/slskd/package.nix
@@ -24,7 +24,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "slskd";
     repo = "slskd";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2IMEkNc7LqevTwsW6r6WR+2xH760wFYT5/S8dvjOz4o=";
   };
 
diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index 243aa86d184f..94a2a1e3b089 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LucasPickering";
     repo = "slumber";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kZAcNQhLlSl3eX1K+NNzkRV8JK/yH3yzYcZPgUBnSBk=";
   };
 
diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix
index 3e7bbf43005f..fed363cb0d4a 100644
--- a/pkgs/by-name/sm/smartcat/package.nix
+++ b/pkgs/by-name/sm/smartcat/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "efugier";
     repo = "smartcat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nXuMyHV5Sln3qWXIhIDdV0thSY4YbvzGqNWGIw4QLdM=";
   };
 
diff --git a/pkgs/by-name/sm/smbmap/package.nix b/pkgs/by-name/sm/smbmap/package.nix
index e0175d3e9ec0..e0d9dccc9d22 100644
--- a/pkgs/by-name/sm/smbmap/package.nix
+++ b/pkgs/by-name/sm/smbmap/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ShawnDEvans";
     repo = "smbmap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xeQ3o0Pt4eDeMnSJKdEJfHhA0oPiD7tmX9TQAb3b9I8=";
   };
 
diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix
index db53b7ac25a7..a06d57f026de 100644
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "rnwood";
     repo = "smtp4dev";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-T6ci7+xbzpOrNr8hpDCwk5qe01L2Ho5V1oM7Hhd8bgg=";
   };
   npmRoot = "Rnwood.Smtp4dev/ClientApp";
diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix
index 430bf5a65f7f..d98f21865fd3 100644
--- a/pkgs/by-name/sm/smtprelay/package.nix
+++ b/pkgs/by-name/sm/smtprelay/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "decke";
     repo = "smtprelay";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2fZA2vYJ6c5oaNImvS0KKZo1+Eu7LFO6jCRnChReMcE=";
   };
 
diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 09517d974fd4..81b7883be0be 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tiJLwlxZ9ndircgkH23ew+3QJeuuqt93JahAtFPcuG8=";
   };
 
diff --git a/pkgs/by-name/sn/snallygaster/package.nix b/pkgs/by-name/sn/snallygaster/package.nix
index c99b11bab86d..a482cfbe3806 100644
--- a/pkgs/by-name/sn/snallygaster/package.nix
+++ b/pkgs/by-name/sn/snallygaster/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hannob";
     repo = "snallygaster";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-d94Z/vLOcOa9N8WIgCkiZAciNUzdI4qbGXQOc8KNDEE=";
   };
 
diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 46a8cce77df3..77c4aaf02432 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "snapcraft";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7kIVWbVj5qse3JIdlCvRtVUfSa/rSjn4e8HJdVY3sOA=";
   };
 
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index 240fe74c1da3..0f04ca2b8823 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gyulyvgc";
     repo = "sniffnet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wepy56LOhliU6t0ZRPviEbZtsWNqrtUnpUXsEdkRDqI=";
   };
 
diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix
index 82a02bd76e62..13f87306232b 100644
--- a/pkgs/by-name/sn/snowflake-cli/package.nix
+++ b/pkgs/by-name/sn/snowflake-cli/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "snowflakedb";
     repo = "snowflake-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1AXp2bCBNuYwnyQMIQn3uLLKdWVznBRK6HcB/E7Yjo8=";
   };
 
diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix
index f17642e26b19..2f9a35906db5 100644
--- a/pkgs/by-name/sn/snpguest/package.nix
+++ b/pkgs/by-name/sn/snpguest/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "virtee";
     repo = "snpguest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NqessN2yo7H17zWsnnI1oNIRG5Z1Wxi8oTWETP9DHpk=";
   };
 
diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix
index 70911bedcc95..a62a41c45bdd 100644
--- a/pkgs/by-name/sn/snphost/package.nix
+++ b/pkgs/by-name/sn/snphost/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "virtee";
     repo = "snphost";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM=";
   };
 
diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix
index 4fb9d23972b2..b3c90d76ea1b 100644
--- a/pkgs/by-name/sn/snyk/package.nix
+++ b/pkgs/by-name/sn/snyk/package.nix
@@ -18,7 +18,7 @@ buildNpmPackage {
   src = fetchFromGitHub {
     owner = "snyk";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AO36b3VWdklfMjSEE3JMZUVS1KmBSra2xX6hqlf3OUM=";
   };
 
diff --git a/pkgs/by-name/so/softether/package.nix b/pkgs/by-name/so/softether/package.nix
index e1d8d575f99e..abd112ce5e19 100644
--- a/pkgs/by-name/so/softether/package.nix
+++ b/pkgs/by-name/so/softether/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SoftEtherVPN";
     repo = "SoftEtherVPN_Stable";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yvN5hlfAtE+gWm0s/TY/Lp53By5SDHyQIvvDutRnDNQ=";
   };
 
diff --git a/pkgs/by-name/so/solaar/package.nix b/pkgs/by-name/so/solaar/package.nix
index 803385cfe4a2..aacd8b11e439 100644
--- a/pkgs/by-name/so/solaar/package.nix
+++ b/pkgs/by-name/so/solaar/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pwr-Solaar";
     repo = "Solaar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sYJrVAeZi0a7yD0i/zIIxcu9X/c5HvgoI/n50eXD47s=";
   };
 
diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix
index 94c03ac15530..7eebc2693c9d 100644
--- a/pkgs/by-name/so/sonar-scanner-cli/package.nix
+++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix
@@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "SonarSource";
     repo = "sonar-scanner-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k1gZO3h6ZGwxJNQ5QwUH96aDPGpJuEn6HYUsYOpqo+g=";
   };
 
diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix
index bc10180a540c..77de75764956 100644
--- a/pkgs/by-name/so/sonic-server/package.nix
+++ b/pkgs/by-name/so/sonic-server/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "valeriansaliou";
     repo = "sonic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM=";
   };
 
diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix
index 68d5d4cb50ea..9c37e738853d 100644
--- a/pkgs/by-name/so/sops/package.nix
+++ b/pkgs/by-name/so/sops/package.nix
@@ -13,7 +13,7 @@ buildGo122Module rec {
   src = fetchFromGitHub {
     owner = "getsops";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v35LRFYdnWigWYlDhrOgSOcCI7SUqJbJHaZvlQ6PC4I=";
   };
 
diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix
index 18bf7955101d..16e29f88fbf0 100644
--- a/pkgs/by-name/so/sopwith/package.nix
+++ b/pkgs/by-name/so/sopwith/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fragglet";
     repo = "sdl-sopwith";
-    rev = "refs/tags/sdl-sopwith-${version}";
+    tag = "sdl-sopwith-${version}";
     hash = "sha256-Ah6Nv39HkYvtD/Go37G3tHowEVGLvtueoBRpi7i9HLY=";
   };
 
diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix
index 4ab043deb0e0..667531fe2209 100644
--- a/pkgs/by-name/so/soteria/package.nix
+++ b/pkgs/by-name/so/soteria/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "imvaskel";
     repo = "soteria";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY=";
   };
 
diff --git a/pkgs/by-name/so/soundconverter/package.nix b/pkgs/by-name/so/soundconverter/package.nix
index ef48e90b3970..450555e22120 100644
--- a/pkgs/by-name/so/soundconverter/package.nix
+++ b/pkgs/by-name/so/soundconverter/package.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "kassoulet";
     repo = "soundconverter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qa8VBPpB27hw+mYXGi6I35dxjJAOucH/SevxqKeu6o0=";
   };
 
diff --git a/pkgs/by-name/sp/speedtest-go/package.nix b/pkgs/by-name/sp/speedtest-go/package.nix
index 72b39e7e8456..f59435e1a6be 100644
--- a/pkgs/by-name/sp/speedtest-go/package.nix
+++ b/pkgs/by-name/sp/speedtest-go/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "showwin";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-w0gIyeoQP+MfA9Q2CD7+laABmSrJ9u836E+UIhJeWdk=";
   };
 
diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix
index 9087e43d3059..5cc171ff7db7 100644
--- a/pkgs/by-name/sp/speedtest-rs/package.nix
+++ b/pkgs/by-name/sp/speedtest-rs/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nelsonjchen";
     repo = "speedtest-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1FAFYiWDD/KG/7/UTv/EW6Nj2GnU0GZFFq6ouMc0URA=";
   };
 
diff --git a/pkgs/by-name/sp/speedtest/package.nix b/pkgs/by-name/sp/speedtest/package.nix
index ca69a53957b0..034b830b66bf 100644
--- a/pkgs/by-name/sp/speedtest/package.nix
+++ b/pkgs/by-name/sp/speedtest/package.nix
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Ketok4321";
     repo = "speedtest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BFPOumMuFKttw8+Jp4c2d9r9C2eIzEX52SNdASdNldw=";
   };
 
diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix
index 3b31c88902eb..8a73b5fa9f9c 100644
--- a/pkgs/by-name/sp/sploitscan/package.nix
+++ b/pkgs/by-name/sp/sploitscan/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xaitax";
     repo = "SploitScan";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-d9s0j/78arKnbDCgMJMdUVF/RPfnAl59WAiJ0UvCCUU=";
   };
 
diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
index 7b5e3ed47ab7..c89f590b2901 100644
--- a/pkgs/by-name/sp/spnavcfg/package.nix
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "spnavcfg";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchLFS = true;
     hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA=";
   };
diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix
index 579f986ea8cd..71b3bcad6d9f 100644
--- a/pkgs/by-name/sp/spotdl/package.nix
+++ b/pkgs/by-name/sp/spotdl/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F97g5AhyXXYEICb/0RcfVPype8PVfFAKFEX0Xyg1QoI=";
   };
 
diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 4e4ce8228465..f2e1c8439ebf 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "aome510";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw=";
   };
 
diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix
index 57c51760516f..0e3484e57c05 100644
--- a/pkgs/by-name/sq/sqlboiler/package.nix
+++ b/pkgs/by-name/sq/sqlboiler/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "volatiletech";
     repo = "sqlboiler";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hb8aMaK2iDDCEJXoNn9BLELP0J7LcJzsQdSYZe1tcjQ=";
   };
 
diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix
index 23208b141408..88d36b9006aa 100644
--- a/pkgs/by-name/sq/sqlfluff/package.nix
+++ b/pkgs/by-name/sq/sqlfluff/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sqlfluff";
     repo = "sqlfluff";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jYAzFqHuTpcgmnodt7vuNWTHRP3rd0B/3tp2Q04/N9o=";
   };
 
diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
index 817f0da64ee3..5ec42ba23d1d 100644
--- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
+++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "techouse";
     repo = "sqlite3-to-mysql";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2zylVnPlptPCxUFwU9j9g//T5fzPJgXc3hQc6iMoLLE=";
   };
 
diff --git a/pkgs/by-name/sq/sqlmc/package.nix b/pkgs/by-name/sq/sqlmc/package.nix
index e2defc3b2a38..9fbf1c49f11b 100644
--- a/pkgs/by-name/sq/sqlmc/package.nix
+++ b/pkgs/by-name/sq/sqlmc/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "malvads";
     repo = "sqlmc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8p+9A1j+J3WItc1u8kG7LHY086kcwMGhEMENym2p/Fo=";
   };
 
diff --git a/pkgs/by-name/sq/sqlpkg-cli/package.nix b/pkgs/by-name/sq/sqlpkg-cli/package.nix
index d084e817b6cb..78c8b3ddde15 100644
--- a/pkgs/by-name/sq/sqlpkg-cli/package.nix
+++ b/pkgs/by-name/sq/sqlpkg-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nalgeon";
     repo = "sqlpkg-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qytqTaoslBcoIn84tSiLABwRcnY/FsyWYD3sugGEYB0=";
   };
 
diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix
index e676ca7be28e..f4e4f49ff6f7 100644
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "quarylabs";
     repo = "sqruff";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM=";
   };
 
diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix
index f7aefdb968e7..d244acdfd0d2 100644
--- a/pkgs/by-name/sr/sratoolkit/package.nix
+++ b/pkgs/by-name/sr/sratoolkit/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ncbi";
     repo = "sra-tools";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-WVPiAz3EFYuhBnl7BsEjJ2BTi1wAownEunVM4sdLaj8=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-audit/package.nix b/pkgs/by-name/ss/ssh-audit/package.nix
index ffe76b156f27..da87760dcf6c 100644
--- a/pkgs/by-name/ss/ssh-audit/package.nix
+++ b/pkgs/by-name/ss/ssh-audit/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jtesta";
     repo = "ssh-audit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sjYKQpn37zH3xpuIiZAjCn0DyLqqoQDwuz7PKDfkeTM=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-import-id/package.nix b/pkgs/by-name/ss/ssh-import-id/package.nix
index 5f2c2531774d..b371c8792990 100644
--- a/pkgs/by-name/ss/ssh-import-id/package.nix
+++ b/pkgs/by-name/ss/ssh-import-id/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchgit {
     url = "https://git.launchpad.net/ssh-import-id";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI=";
   };
 
diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix
index d3bccbd8e4b1..da03f6bb30dd 100644
--- a/pkgs/by-name/ss/ssh-mitm/package.nix
+++ b/pkgs/by-name/ss/ssh-mitm/package.nix
@@ -32,7 +32,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ssh-mitm";
     repo = "ssh-mitm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jRheKLAXbbMyxdtDSJ4QSN4PoUM2YoK7nmU5xqPq7DY=";
   };
 
diff --git a/pkgs/by-name/ss/sshified/package.nix b/pkgs/by-name/ss/sshified/package.nix
index 56498841a3d6..3a1a26629563 100644
--- a/pkgs/by-name/ss/sshified/package.nix
+++ b/pkgs/by-name/ss/sshified/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hoffie";
     repo = "sshified";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oCeuQ4Do+Lyqsf8hBH9qvLxWbWQlqol481VrbnAW2ic=";
   };
 
diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix
index fe3b2eaa0a46..2405d8b40a3b 100644
--- a/pkgs/by-name/ss/sshocker/package.nix
+++ b/pkgs/by-name/ss/sshocker/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = "sshocker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q+g48Mm3JsFz9zTsFFypgp7RtQL/03EbVGAwnXLE8fA=";
   };
 
diff --git a/pkgs/by-name/ss/sslstrip/package.nix b/pkgs/by-name/ss/sslstrip/package.nix
index 66f833718028..8a75e3fdb8a5 100644
--- a/pkgs/by-name/ss/sslstrip/package.nix
+++ b/pkgs/by-name/ss/sslstrip/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "L1ghtn1ng";
     repo = "sslstrip";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iPWpbRmAUf0Yf5MDlpln1JLBxMIdmr/Ggk2ZGeQzm8s=";
   };
 
diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix
index 5cba3cb49d0c..90d77f4d2e27 100644
--- a/pkgs/by-name/st/stac-validator/package.nix
+++ b/pkgs/by-name/st/stac-validator/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stac-utils";
     repo = "stac-validator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e3v8WvVbZcxN91w+YNUmSILZ1nZ9Vy1UbEpCQkTMQpQ=";
   };
 
diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index d42d18c9c58f..5ad612ab29bd 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "mail-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BATkLgfkz94u2M+Xy6PYQi+7EIxBe86VLYTnBI8PzzY=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix
index 3a1ab7059fba..680668a6e2e0 100644
--- a/pkgs/by-name/st/stardust-xr-server/package.nix
+++ b/pkgs/by-name/st/stardust-xr-server/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "stardustxr";
     repo = "server";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sCatpWDdy7NFWOWUARjN3fZMDVviX2iV79G0HTxfYZU=";
   };
 
diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix
index 799c45e6176f..343aa4662c57 100644
--- a/pkgs/by-name/st/steampipe/package.nix
+++ b/pkgs/by-name/st/steampipe/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9Tlc6BlfSQyAmmk/G6TdWB0kWpbwzGWOPNNNgI3tYPM=";
   };
 
diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix
index b1ad82dc2b7d..c2068c32fcb9 100644
--- a/pkgs/by-name/st/step-ca/package.nix
+++ b/pkgs/by-name/st/step-ca/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "certificates";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SFiGRmi8Bd0WEitvDvybfGMEw36gAVjtLrYbBpBAItU=";
   };
 
diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix
index 8fc1395d6305..fa62dcf47220 100644
--- a/pkgs/by-name/st/step-cli/package.nix
+++ b/pkgs/by-name/st/step-cli/package.nix
@@ -15,7 +15,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-noANDVupzaoWfnESsu3ucd3ZvD3K/56YvYonyp2n0ho=";
     # this file change depending on git branch status (via .gitattributes)
     # https://github.com/NixOS/nixpkgs/issues/84312
diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 33d8b7c922ee..9d628fdc4434 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-bBQu5n/rMT8bEsBMmv3CtGUZ/ybCTuDw5E2GYZI5woU=";
   };
 
diff --git a/pkgs/by-name/st/stratis-cli/package.nix b/pkgs/by-name/st/stratis-cli/package.nix
index 59715b6af454..d38088428f79 100644
--- a/pkgs/by-name/st/stratis-cli/package.nix
+++ b/pkgs/by-name/st/stratis-cli/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F/RP/bWf2fV1IvNbrkYX3d94om1kACNe+oJI8pXM5P4=";
   };
 
diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix
index 98eee72833c4..018eb7feaf69 100644
--- a/pkgs/by-name/st/stratisd/package.nix
+++ b/pkgs/by-name/st/stratisd/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    rev = "refs/tags/stratisd-v${version}";
+    tag = "stratisd-v${version}";
     hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio=";
   };
 
diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix
index d0a19a98a6ca..4f0ac522adfe 100644
--- a/pkgs/by-name/st/stressapptest/package.nix
+++ b/pkgs/by-name/st/stressapptest/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lZpF7PdUwKnV0ha6xkLvi7XYFZQ4Avy0ltlXxukuWjM=";
   };
 
diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix
index 40eaa2b9702f..3427cfc838cb 100644
--- a/pkgs/by-name/st/strictdoc/package.nix
+++ b/pkgs/by-name/st/strictdoc/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "strictdoc-project";
     repo = "strictdoc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0X74Lv25pUdOUgQzqQU6p+fjuxhC/JqfKEFI7c5t67U=";
   };
 
diff --git a/pkgs/by-name/su/subfinder/package.nix b/pkgs/by-name/su/subfinder/package.nix
index a8f16da75518..16d5a986422c 100644
--- a/pkgs/by-name/su/subfinder/package.nix
+++ b/pkgs/by-name/su/subfinder/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "subfinder";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2IO7TyMcKUB2B9agCoIdjybEjr0RLCv+vhXn9e5eL28=";
   };
 
diff --git a/pkgs/by-name/su/subprober/package.nix b/pkgs/by-name/su/subprober/package.nix
index 6b2cc439439e..394510650de1 100644
--- a/pkgs/by-name/su/subprober/package.nix
+++ b/pkgs/by-name/su/subprober/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RevoltSecurities";
     repo = "SubProber";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CxmePd1dw9H/XLQZ16JMF1pdFFOI59Qa2knTnKKzFvM=";
   };
 
diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix
index 195bc1be61d3..bfca2d6c176a 100644
--- a/pkgs/by-name/su/sudachi-rs/package.nix
+++ b/pkgs/by-name/su/sudachi-rs/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "WorksApplications";
     repo = "sudachi.rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-G+lJzOYxrR/Le2lgfZMXbbjCqPYmCKMy1pIomTP5NIg=";
   };
 
diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix
index a3961d96d50c..8844a03e9416 100644
--- a/pkgs/by-name/su/superhtml/package.nix
+++ b/pkgs/by-name/su/superhtml/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kristoff-it";
     repo = "superhtml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rO7HS07nSqwOq6345q/SOL2imoD0cKV16QJcVVr6mHw=";
   };
 
diff --git a/pkgs/by-name/su/superlu/package.nix b/pkgs/by-name/su/superlu/package.nix
index 4487dedf7e08..9492db86891a 100644
--- a/pkgs/by-name/su/superlu/package.nix
+++ b/pkgs/by-name/su/superlu/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xiaoyeli";
     repo = "superlu";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     # Remove non‐free files.
     #
     # See:
diff --git a/pkgs/by-name/sv/svt-av1-psy/package.nix b/pkgs/by-name/sv/svt-av1-psy/package.nix
index 0b23ad2bb364..83e6254110ba 100644
--- a/pkgs/by-name/sv/svt-av1-psy/package.nix
+++ b/pkgs/by-name/sv/svt-av1-psy/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "gianni-rosato";
     repo = "svt-av1-psy";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-qySrYZDwmoKf7oAQJlBSWInXeOceGSeL2Kc09SJ5Zs0=";
   };
 
diff --git a/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix
index 67c3f4862667..31479315cd0d 100644
--- a/pkgs/by-name/sw/sway-assign-cgroups/package.nix
+++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix
@@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "alebastr";
     repo = "sway-systemd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AJ87/sPy8IVJgb5YehfUfNTOFEDithLfiTxgZfZf238=";
   };
   format = "other";
diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index bdd11a3d7763..f771a0101e24 100644
--- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "WillPower3309";
     repo = "swayfx";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-VT+JjQPqCIdtaLeSnRiZ3rES0KgDJR7j5Byxr+d6oRg=";
   };
 
diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix
index df0e23cefe3d..95eacdfec9a6 100644
--- a/pkgs/by-name/sw/swayimg/package.nix
+++ b/pkgs/by-name/sw/swayimg/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "artemsen";
     repo = "swayimg";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DboalwPhQYcqptdQvLHN+zrrdU3Swzb6z3vO+GJY2JY=";
   };
 
diff --git a/pkgs/by-name/sw/swego/package.nix b/pkgs/by-name/sw/swego/package.nix
index f26b33856d11..94318d062cdc 100644
--- a/pkgs/by-name/sw/swego/package.nix
+++ b/pkgs/by-name/sw/swego/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nodauf";
     repo = "Swego";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-roaAzh6Mncu4qtaxEoXk41Mrmz/l7X1+n+Yh5skA65A=";
   };
 
diff --git a/pkgs/by-name/sw/switchres/package.nix b/pkgs/by-name/sw/switchres/package.nix
index 1c1818bc51c5..9457b0f2a069 100644
--- a/pkgs/by-name/sw/switchres/package.nix
+++ b/pkgs/by-name/sw/switchres/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "antonioginer";
     repo = "switchres";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/21RcpumWYNBPck7gpH6krwC3Thz/rKDPgeJblN2BDA=";
   };
 
diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix
index de6889f5b1f2..e2a07e705fc0 100644
--- a/pkgs/by-name/sw/swww/package.nix
+++ b/pkgs/by-name/sw/swww/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "LGFae";
     repo = "swww";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc=";
   };
 
diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index e1ee3a24f9e4..18bc905d6f74 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ot4qdCxF9Kg657IFzUIxGsmRCDag1a4Ipq1qj2RPW0E=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index f7befa64064f..31175ddf655c 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YIj9yoZrVRMcWFczyy5RR2Djwhu1/CyQuumzPoApp3I=";
   };
 
diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix
index d12b38004320..0765c78a7335 100644
--- a/pkgs/by-name/sy/syncyomi/package.nix
+++ b/pkgs/by-name/sy/syncyomi/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "SyncYomi";
     repo = "SyncYomi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PPE6UXHo2ZlN0A0VkUH+8pkdfm6WEvpofusk6c3RBHk=";
   };
 
diff --git a/pkgs/by-name/sy/sysstat/package.nix b/pkgs/by-name/sy/sysstat/package.nix
index caf571e6b4b7..a2f59f04fe4a 100644
--- a/pkgs/by-name/sy/sysstat/package.nix
+++ b/pkgs/by-name/sy/sysstat/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ELmSzWnJ8vGwGPwY/5MFp/2gQhMXMjNG4bHtCplfQSc=";
   };
 
diff --git a/pkgs/by-name/sy/systemd-netlogd/package.nix b/pkgs/by-name/sy/systemd-netlogd/package.nix
index 8f5d5d18f890..65853d5cfddf 100644
--- a/pkgs/by-name/sy/systemd-netlogd/package.nix
+++ b/pkgs/by-name/sy/systemd-netlogd/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "systemd-netlogd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-NwDmNrq2rLing5BQrSXoNDErcLK0Q8go9TN9zLSW5rE=";
   };
 
diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix
index 428d49944776..67c871966907 100644
--- a/pkgs/by-name/ta/tabby-agent/package.nix
+++ b/pkgs/by-name/ta/tabby-agent/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "TabbyML";
     repo = "tabby";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TP0KEGH8w9kdTj5yxCsAn4LRS1gj3Dnz96GA8DDSJJU=";
   };
 
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index cc90c9be65dc..ffca3e6975dd 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "TabbyML";
     repo = "tabby";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fzbJjoBJ6zOw1ABN9PitbW2usm4NgqVfMWSAvRAVHj0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix
index 3bcf7c106de5..c133cdcf49a7 100644
--- a/pkgs/by-name/ta/tartufo/package.nix
+++ b/pkgs/by-name/ta/tartufo/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "godaddy";
     repo = "tartufo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-s7gqGvOnie7lGlpW3wfd8igWfowxwg9mftRjiHnvedc=";
   };
 
diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix
index 0e9d3916e07a..9867a558e5f8 100644
--- a/pkgs/by-name/ta/task-keeper/package.nix
+++ b/pkgs/by-name/ta/task-keeper/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "linux-china";
     repo = "task-keeper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lcwWl1ycMSmHgYT4m+CofwefqnjxjvuJkcv1Pe0OtEo=";
   };
 
diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix
index b027aaedc192..068eb2c2ba93 100644
--- a/pkgs/by-name/ta/tasks/package.nix
+++ b/pkgs/by-name/ta/tasks/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "edfloreshz";
     repo = "tasks";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0bXzeKnJ5MIl7vCo+7kyXm3L6QrCdm5sPreca1SPi8U=";
   };
 
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index abe38207bf90..6dfc5655cc00 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sjrc6";
     repo = "taterclient-ddnet";
-    rev = "refs/tags/V${finalAttrs.version}";
+    tag = "V${finalAttrs.version}";
     hash = "sha256-hGbeIhtAZcgaPCsDUmZqq8mLGi1yVvauha4wGMBbmBc=";
   };
 
diff --git a/pkgs/by-name/ta/tatl/package.nix b/pkgs/by-name/ta/tatl/package.nix
index c4e1baa0c3f7..712d1085a7d9 100644
--- a/pkgs/by-name/ta/tatl/package.nix
+++ b/pkgs/by-name/ta/tatl/package.nix
@@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "theoremprover-museum";
     repo = "TATL";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-leP02141kZSUmCDXOfV0TsEn+OQ6WoyM7+9NutLX1qk=";
   };
 
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index f6536a185ed5..938d56a4086e 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -20,7 +20,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-w2JcNynsbkk29Lx3XiEGSRzSfrA1NbD0NiTDAYvpl+o=";
   };
 
diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix
index db9e9d685cec..5645de4321b5 100644
--- a/pkgs/by-name/te/technitium-dns-server-library/package.nix
+++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "TechnitiumSoftware";
     repo = "TechnitiumLibrary";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-stfxYe0flE1daPuXw/GAgY52ZD7pkqnBIBvmSVPWWjI=";
     name = "${pname}-${version}";
   };
diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix
index 6614d95acb53..60b6090621e4 100644
--- a/pkgs/by-name/te/technitium-dns-server/package.nix
+++ b/pkgs/by-name/te/technitium-dns-server/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "TechnitiumSoftware";
     repo = "DnsServer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8=";
     name = "${pname}-${version}";
   };
diff --git a/pkgs/by-name/te/teler/package.nix b/pkgs/by-name/te/teler/package.nix
index 30e4815b1e57..8b2604818705 100644
--- a/pkgs/by-name/te/teler/package.nix
+++ b/pkgs/by-name/te/teler/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kitabisa";
     repo = "teler";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3+A1QloZQlH31snWfwYa6rprpKUf3fQc/HQgmKQgV9c=";
   };
 
diff --git a/pkgs/by-name/te/tell-me-your-secrets/package.nix b/pkgs/by-name/te/tell-me-your-secrets/package.nix
index 8e38138d8a0c..c281a779c226 100644
--- a/pkgs/by-name/te/tell-me-your-secrets/package.nix
+++ b/pkgs/by-name/te/tell-me-your-secrets/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "valayDave";
     repo = "tell-me-your-secrets";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3ZJyL/V1dsW6F+PiEhnWpv/Pz2H9/UKSJWDgw68M/Z8=";
   };
 
diff --git a/pkgs/by-name/te/tennix/package.nix b/pkgs/by-name/te/tennix/package.nix
index 5868950e7471..4d3b2ece3f22 100644
--- a/pkgs/by-name/te/tennix/package.nix
+++ b/pkgs/by-name/te/tennix/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://repo.or.cz/tennix.git";
-    rev = "refs/tags/tennix-${version}";
+    tag = "tennix-${version}";
     hash = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk=";
   };
 
diff --git a/pkgs/by-name/te/terminator/package.nix b/pkgs/by-name/te/terminator/package.nix
index e37ceaf8b5ef..56aba34e433c 100644
--- a/pkgs/by-name/te/terminator/package.nix
+++ b/pkgs/by-name/te/terminator/package.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "gnome-terminator";
     repo = "terminator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0468d/sAM/UOiaSspwWaOGogoE8/Idth0G4CMCXWFFo=";
   };
 
diff --git a/pkgs/by-name/te/termineter/package.nix b/pkgs/by-name/te/termineter/package.nix
index 6de9c903cd36..0014fd54fe36 100644
--- a/pkgs/by-name/te/termineter/package.nix
+++ b/pkgs/by-name/te/termineter/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rsmusllp";
     repo = "termineter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sJN1FNUCpQUMJNM6F2+v0NmGqu4LVYcsffwzl3Hr1CU=";
   };
 
diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix
index a0ee8fcd7d91..25304d78771d 100644
--- a/pkgs/by-name/te/termscp/package.nix
+++ b/pkgs/by-name/te/termscp/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "veeso";
     repo = "termscp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tR+jfFdCSsf+WR8VUX60/mdfsp7cX9jUDI+CKIZkgEE=";
   };
 
diff --git a/pkgs/by-name/te/terraform-compliance/package.nix b/pkgs/by-name/te/terraform-compliance/package.nix
index bb1258ad8a6e..31929ef65555 100644
--- a/pkgs/by-name/te/terraform-compliance/package.nix
+++ b/pkgs/by-name/te/terraform-compliance/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "terraform-compliance";
     repo = "cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wg9n7x7KDqFecZZVmJwpE1kP0eKt1Gmld6XEcavcyU0=";
   };
 
diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix
index 357042bec43e..1884f9aa7119 100644
--- a/pkgs/by-name/te/terraform-plugin-docs/package.nix
+++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-plugin-docs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i5J0dBXqfm5YvELU8q5jLTtfgo8r1u/x/VW55TPmJLQ=";
   };
 
diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index e1ec30c30a16..f1dcf8a4136f 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-146fSTiDzISvtE8tu/pKiXwfoVu2UOgdBQxw0mWyHmY=";
   };
 
diff --git a/pkgs/by-name/te/terrapin-scanner/package.nix b/pkgs/by-name/te/terrapin-scanner/package.nix
index 407bab022e7e..ab4e3cf6d4cd 100644
--- a/pkgs/by-name/te/terrapin-scanner/package.nix
+++ b/pkgs/by-name/te/terrapin-scanner/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "RUB-NDS";
     repo = "Terrapin-Scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PmKfHvad+YAwLcdoiDSOBMQFgOKzJ6NbGbt4v570gyI=";
   };
 
diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix
index 049138676f44..28d18447028f 100644
--- a/pkgs/by-name/te/terrascan/package.nix
+++ b/pkgs/by-name/te/terrascan/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "accurics";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4XIhmUUOSROwEPSB+DcMOfG5+q/pmWkVUwKGrWVcNtM=";
   };
 
diff --git a/pkgs/by-name/te/testlib/package.nix b/pkgs/by-name/te/testlib/package.nix
index 9adb20ca208c..87106d90e51a 100644
--- a/pkgs/by-name/te/testlib/package.nix
+++ b/pkgs/by-name/te/testlib/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "MikeMirzayanov";
     repo = "testlib";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-AttzDYLDlpfL3Zvds6yBR/m6W/3UZKR+1LVylqOTQcw=";
   };
 
diff --git a/pkgs/by-name/te/tetragon/package.nix b/pkgs/by-name/te/tetragon/package.nix
index 018c8c4f3fcd..b59f3310ad10 100644
--- a/pkgs/by-name/te/tetragon/package.nix
+++ b/pkgs/by-name/te/tetragon/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "tetragon";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-KOR5MMRnhrlcMPqRjzjSJXvitiZQ8/tlxEnBiQG2x/Q=";
   };
 
diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix
index 8a48ffb6f6f3..49fb1e3952ec 100644
--- a/pkgs/by-name/te/tex-fmt/package.nix
+++ b/pkgs/by-name/te/tex-fmt/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "WGUNDERWOOD";
     repo = "tex-fmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LeoV500tnvnvl869NXi4b4LpBvX1FclYJzYAcC0QVRo=";
   };
 
diff --git a/pkgs/by-name/te/textlint-plugin-org/package.nix b/pkgs/by-name/te/textlint-plugin-org/package.nix
index 71e32af51537..237f3477a596 100644
--- a/pkgs/by-name/te/textlint-plugin-org/package.nix
+++ b/pkgs/by-name/te/textlint-plugin-org/package.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kijimaD";
     repo = "textlint-plugin-org";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BW+b09nv9Mzl3cUcOOpHoRz8tGLxuGGo4UCY6kdUlXA=";
   };
 
diff --git a/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix b/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix
index cb49f5e20312..f7063a67fa68 100644
--- a/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix
+++ b/pkgs/by-name/te/textlint-rule-abbr-within-parentheses/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "azu";
     repo = "textlint-rule-abbr-within-parentheses";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-CBrf7WtvywDmtuSyxkDtAyjmrj7KS3TQLSsNfMxeWXw=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Textlint rule check if write abbreviations within parentheses";
     homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses";
-    changelog = "https://github.com/azu/textlint-rule-abbr-within-parentheses/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/azu/textlint-rule-abbr-within-parentheses/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = textlint.meta.platforms;
diff --git a/pkgs/by-name/te/textlint-rule-alex/package.nix b/pkgs/by-name/te/textlint-rule-alex/package.nix
index 7f86de215625..0dd0bf53371e 100644
--- a/pkgs/by-name/te/textlint-rule-alex/package.nix
+++ b/pkgs/by-name/te/textlint-rule-alex/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-alex";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1JoiUhiRXZWIyLAJXp5ZzFAa/NBCN79jYh5kMNbO0jI=";
   };
 
@@ -27,7 +27,7 @@ buildNpmPackage rec {
   meta = {
     description = "Textlint rule for alex";
     homepage = "https://github.com/textlint-rule/textlint-rule-alex";
-    changelog = "https://github.com/textlint-rule/textlint-rule-alex/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/textlint-rule/textlint-rule-alex/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix b/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix
index 8482667f8fce..d7f9e37526d5 100644
--- a/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix
+++ b/pkgs/by-name/te/textlint-rule-en-max-word-count/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-en-max-word-count";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ZZWN0PVHQBHcvJ53jDtD/6wLxBYmSHO7OXb5UQQAmyc=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Textlint rule that specify the maximum word count of a sentence";
     homepage = "https://github.com/textlint-rule/textlint-rule-en-max-word-count";
-    changelog = "https://github.com/textlint-rule/textlint-rule-en-max-word-count/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/textlint-rule/textlint-rule-en-max-word-count/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = textlint.meta.platforms;
diff --git a/pkgs/by-name/te/textlint-rule-max-comma/package.nix b/pkgs/by-name/te/textlint-rule-max-comma/package.nix
index 46c9f21c19c2..7c6ca92edcbb 100644
--- a/pkgs/by-name/te/textlint-rule-max-comma/package.nix
+++ b/pkgs/by-name/te/textlint-rule-max-comma/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-max-comma";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Sf7ehhEOcy1HdgnIra8darkucF6RebQQV/NfJtft/DA=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Textlint rule is that limit maximum comma(,) count of sentence";
     homepage = "https://github.com/textlint-rule/textlint-rule-max-comma";
-    changelog = "https://github.com/textlint-rule/textlint-rule-max-comma/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/textlint-rule/textlint-rule-max-comma/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = textlint.meta.platforms;
diff --git a/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix b/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix
index e6771f8879fb..e4523265771c 100644
--- a/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix
+++ b/pkgs/by-name/te/textlint-rule-no-start-duplicated-conjunction/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-no-start-duplicated-conjunction";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-DtuCkHy440j2VI/JDJGrW2M8alQ8pxllfIZfB4+9z3U=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Textlint rule that check no start with duplicated conjunction";
     homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction";
-    changelog = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = textlint.meta.platforms;
diff --git a/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix b/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix
index 1e8c0436e5ea..4955c41b99cb 100644
--- a/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix
+++ b/pkgs/by-name/te/textlint-rule-period-in-list-item/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-period-in-list-item";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-hAkueH5q5s0kmvKZiOrCxtfmoHtHH0U8cVLhQ7eoqT0=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Textlint rule that check with or without period in list item";
     homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item";
-    changelog = "https://github.com/textlint-rule/textlint-rule-period-in-list-item/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/textlint-rule/textlint-rule-period-in-list-item/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = textlint.meta.platforms;
diff --git a/pkgs/by-name/te/textlint-rule-preset-ja-technical-writing/package.nix b/pkgs/by-name/te/textlint-rule-preset-ja-technical-writing/package.nix
index 2123a088feb6..02ee69ee02da 100644
--- a/pkgs/by-name/te/textlint-rule-preset-ja-technical-writing/package.nix
+++ b/pkgs/by-name/te/textlint-rule-preset-ja-technical-writing/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-ja";
     repo = "textlint-rule-preset-ja-technical-writing";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8KoP/JagMf2kFxz8hr9e0hJH7yPukRURb48v0nPkC/8=";
   };
 
diff --git a/pkgs/by-name/te/textlint-rule-prh/package.nix b/pkgs/by-name/te/textlint-rule-prh/package.nix
index 349946cbcc84..260b43990985 100644
--- a/pkgs/by-name/te/textlint-rule-prh/package.nix
+++ b/pkgs/by-name/te/textlint-rule-prh/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-prh";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-K2WkHh7sLnhObM2ThvdXVbZymLInjSB6XTshxALotKU=";
   };
 
diff --git a/pkgs/by-name/te/textlint-rule-stop-words/package.nix b/pkgs/by-name/te/textlint-rule-stop-words/package.nix
index 425aa5cf45f4..1b61f6c97ef4 100644
--- a/pkgs/by-name/te/textlint-rule-stop-words/package.nix
+++ b/pkgs/by-name/te/textlint-rule-stop-words/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sapegin";
     repo = "textlint-rule-stop-words";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e9jTbDULOs0DwtT9UZp7k5+RR5Ab/x/sizIvs1MrmZs=";
   };
 
@@ -29,7 +29,7 @@ buildNpmPackage rec {
   meta = {
     description = "Textlint rule to find filler words, buzzwords and clichés";
     homepage = "https://github.com/sapegin/textlint-rule-stop-words";
-    changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/by-name/te/textlint-rule-terminology/package.nix b/pkgs/by-name/te/textlint-rule-terminology/package.nix
index 4352569b5325..824f7b962e4e 100644
--- a/pkgs/by-name/te/textlint-rule-terminology/package.nix
+++ b/pkgs/by-name/te/textlint-rule-terminology/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "sapegin";
     repo = "textlint-rule-terminology";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/NuKZSugizP4b2LFNqPrTvoXNE4D1sytU2B7T40ZASQ=";
   };
 
@@ -29,7 +29,7 @@ buildNpmPackage rec {
   meta = {
     description = "Textlint rule to check correct terms spelling";
     homepage = "https://github.com/sapegin/textlint-rule-terminology";
-    changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix b/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix
index aebf8bdae0a5..6ee14b2b0d24 100644
--- a/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix
+++ b/pkgs/by-name/te/textlint-rule-unexpanded-acronym/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "textlint-rule";
     repo = "textlint-rule-unexpanded-acronym";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-oUOofYfdENRQnwmBDADQgA1uGtRirqqGg8T+QA0LCXY=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Textlint rule that check unexpanded acronym";
     homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym";
-    changelog = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     platforms = textlint.meta.platforms;
diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix
index f415f3dbceda..64602e0ad462 100644
--- a/pkgs/by-name/te/textlint/package.nix
+++ b/pkgs/by-name/te/textlint/package.nix
@@ -33,7 +33,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "textlint";
     repo = "textlint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FbPJr7oTsU7WC5RTXyG7X5d0KPJJqRbjGwM/F023Cx8=";
   };
 
diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index c5b85870226c..081b18511645 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -19,7 +19,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/eome0jF0l7Hb5c96c2S80I7DQGmyF09IgOEudpXMuE=";
   };
 
diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix
index 85679357520b..f4f866e0b4e2 100644
--- a/pkgs/by-name/tf/tfsec/package.nix
+++ b/pkgs/by-name/tf/tfsec/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "tfsec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7e75VdqwjzP+GyTtXqOf1pN+5wEbxNYoUcpsTjwB+0Y=";
   };
 
diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix
index 6b1d765fd053..6246b24b89fe 100644
--- a/pkgs/by-name/tg/tg-archive/package.nix
+++ b/pkgs/by-name/tg/tg-archive/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "knadh";
     repo = "tg-archive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mcobB/z+e4LzEbqELWlUzhbdV5RIM2iImeg9JdVQQZc=";
   };
 
diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix
index 59ac6f59c12b..6abb1dd1401d 100644
--- a/pkgs/by-name/tg/tgpt/package.nix
+++ b/pkgs/by-name/tg/tgpt/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aandrew-me";
     repo = "tgpt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Nk+iLsTXnw6RAc1VztW8ZqeUVsywFjMCOBY2yuWbUXQ=";
   };
 
diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index b923cfe5f1f0..de8f9c4ffd72 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "thanos-io";
     repo = "thanos";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IbQsUanLCDZ1Ku2Xu6ValR4iGM+cxxyEGxDFjJzsEcg=";
   };
 
diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 771965b4068a..6f71e976eeff 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "The-Powder-Toy";
     repo = "The-Powder-Toy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S2aUa25EnUfX6ShW6D+wHrsTLxTcCFcZ/uLE9EWGu4Q=";
   };
 
diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix
index baf3252e4399..7b10fd304fe3 100644
--- a/pkgs/by-name/th/theattyr/package.nix
+++ b/pkgs/by-name/th/theattyr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "theattyr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gqgoG5JwGecm8MEqH36BvJyLuh6nDao1d9ydX1AlbgU=";
   };
 
diff --git a/pkgs/by-name/th/thefuck/package.nix b/pkgs/by-name/th/thefuck/package.nix
index e0cd1b7b5d0c..69214db315cc 100644
--- a/pkgs/by-name/th/thefuck/package.nix
+++ b/pkgs/by-name/th/thefuck/package.nix
@@ -13,7 +13,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nvbn";
     repo = "thefuck";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bRCy95owBJaxoyCNQF6gEENoxCkmorhyKzZgU1dQN6I=";
   };
 
diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix
index e5978667fd0e..e60b8612c417 100644
--- a/pkgs/by-name/th/theharvester/package.nix
+++ b/pkgs/by-name/th/theharvester/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "laramies";
     repo = "theharvester";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-B2pZBrWZqbtvcO0pnM57GFhrryYilLCBTMEmsKvyU/I=";
   };
 
diff --git a/pkgs/by-name/th/threatest/package.nix b/pkgs/by-name/th/threatest/package.nix
index 59f1d45d19c2..7c13e8453101 100644
--- a/pkgs/by-name/th/threatest/package.nix
+++ b/pkgs/by-name/th/threatest/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rVRBrf/RTcHvKOLHNASzvij3fV+uQEuIVKb07CZ/cT0=";
   };
 
diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix
index 823f3b13022e..ee943eb33522 100644
--- a/pkgs/by-name/ti/ticker/package.nix
+++ b/pkgs/by-name/ti/ticker/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "achannarasappa";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7yAmwyKIO0bMqNgTcdWcgBXPV/T7753z/x2KAB8W070=";
   };
 
diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix
index b5f0b3eadf09..7e2e0e69d453 100644
--- a/pkgs/by-name/ti/tickrs/package.nix
+++ b/pkgs/by-name/ti/tickrs/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tarkah";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I=";
   };
 
diff --git a/pkgs/by-name/ti/tiddit/package.nix b/pkgs/by-name/ti/tiddit/package.nix
index 4ec1b496360e..18dd004dd0c8 100644
--- a/pkgs/by-name/ti/tiddit/package.nix
+++ b/pkgs/by-name/ti/tiddit/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SciLifeLab";
     repo = "TIDDIT";
-    rev = "refs/tags/TIDDIT-${version}";
+    tag = "TIDDIT-${version}";
     hash = "sha256-OeqVQJDw0fmSDWIGab2qtTJCzZxqLY2XzRqaTRuPIdI=";
   };
 
diff --git a/pkgs/by-name/ti/time-decode/package.nix b/pkgs/by-name/ti/time-decode/package.nix
index 213ad4fc3ff5..eeaa7ba5bebb 100644
--- a/pkgs/by-name/ti/time-decode/package.nix
+++ b/pkgs/by-name/ti/time-decode/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "digitalsleuth";
     repo = "time_decode";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-K60xIQ6TWPYlsR6YjIquey5Ioaw4oAId59CPlQNK4yk=";
   };
 
diff --git a/pkgs/by-name/ti/timetagger_cli/package.nix b/pkgs/by-name/ti/timetagger_cli/package.nix
index 17da60ad15e8..a00326bacda2 100644
--- a/pkgs/by-name/ti/timetagger_cli/package.nix
+++ b/pkgs/by-name/ti/timetagger_cli/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "almarklein";
     repo = "timetagger_cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PEuSFDkBqDegZD0Nh8jRJ/zm/6vT2lq7/llbXBvojkc=";
   };
 
diff --git a/pkgs/by-name/ti/tinyfetch/package.nix b/pkgs/by-name/ti/tinyfetch/package.nix
index 728d85a7afb4..06b54e128383 100644
--- a/pkgs/by-name/ti/tinyfetch/package.nix
+++ b/pkgs/by-name/ti/tinyfetch/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "abrik1";
     repo = "tinyfetch";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I0OurcPKKZntZn7Bk9AnWdpSrU9olGp7kghdOajPDeQ=";
   };
 
diff --git a/pkgs/by-name/ti/tinyssh/package.nix b/pkgs/by-name/ti/tinyssh/package.nix
index af92e28cbb99..c0c36934616f 100644
--- a/pkgs/by-name/ti/tinyssh/package.nix
+++ b/pkgs/by-name/ti/tinyssh/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "janmojzis";
     repo = "tinyssh";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bcQDKDpd7HFnmJAyqcO+BQMGV1pCHuS+OhFPJSOMInI=";
   };
 
diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix
index 197367dd3a21..920f8e633166 100644
--- a/pkgs/by-name/tl/tlsinfo/package.nix
+++ b/pkgs/by-name/tl/tlsinfo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "tlsinfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-II5/UDWVeEoupM1Ijty2A9M/qwWA2/b4Y68lTkxnJ9o=";
   };
 
diff --git a/pkgs/by-name/tl/tlsx/package.nix b/pkgs/by-name/tl/tlsx/package.nix
index d56b8a5bdc10..7c8ecbf072a1 100644
--- a/pkgs/by-name/tl/tlsx/package.nix
+++ b/pkgs/by-name/tl/tlsx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "tlsx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AQiwHNHfwOJYIEsFm2YiksdTUxp5vkCL80rpvxHY2rA=";
   };
 
diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index 8faf54d4222d..3d5cdc5774be 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pimutils";
     repo = "todoman";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sk5LgFNo5Dc+oHCLu464Q1g0bk1QGsA7xMtMiits/8c=";
   };
 
diff --git a/pkgs/by-name/to/tomb/package.nix b/pkgs/by-name/to/tomb/package.nix
index 94d7cf2b34a6..aed30e3d4524 100644
--- a/pkgs/by-name/to/tomb/package.nix
+++ b/pkgs/by-name/to/tomb/package.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "Tomb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H9etbodTKxROJAITbViQQ6tkEr9rKNITTHfsGGQbyR0=";
   };
 
diff --git a/pkgs/by-name/to/toml-sort/package.nix b/pkgs/by-name/to/toml-sort/package.nix
index 538fb0975130..291a5c942e18 100644
--- a/pkgs/by-name/to/toml-sort/package.nix
+++ b/pkgs/by-name/to/toml-sort/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "pappasam";
     repo = "toml-sort";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PuTXG8RIN8Mui5J8DV0yxe94y6FNs4TgPyHjEhpcKqM=";
   };
 
diff --git a/pkgs/by-name/to/tomlplusplus/package.nix b/pkgs/by-name/to/tomlplusplus/package.nix
index 38e213eff28c..713eab450d1a 100644
--- a/pkgs/by-name/to/tomlplusplus/package.nix
+++ b/pkgs/by-name/to/tomlplusplus/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "marzer";
     repo = "tomlplusplus";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M=";
   };
 
diff --git a/pkgs/by-name/to/tomlq/package.nix b/pkgs/by-name/to/tomlq/package.nix
index 67dd3a2db966..1b526c1844c2 100644
--- a/pkgs/by-name/to/tomlq/package.nix
+++ b/pkgs/by-name/to/tomlq/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cryptaliagy";
     repo = "tomlq";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-g8xjz8qCTiulTwcEbLTHYldw4PI+4ZfCOMJs+J6L1C4=";
   };
 
diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix
index 4d8c7771dd6b..64b737ad6c0d 100644
--- a/pkgs/by-name/to/tone/package.nix
+++ b/pkgs/by-name/to/tone/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "sandreas";
     repo = "tone";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NBFAPEeUKZgyfNlvcOBS1IpktEnI+fOd9WLj0ByzpLY=";
   };
 
diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix
index 264aa4f7dfaf..fe120fbead87 100644
--- a/pkgs/by-name/to/toolong/package.nix
+++ b/pkgs/by-name/to/toolong/package.nix
@@ -14,7 +14,7 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "toolong";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Zd6j1BIrsLJqptg7BXb67qY3DaeHRHieWJoYYCDHaoc=";
   };
 
diff --git a/pkgs/by-name/to/totp-cli/package.nix b/pkgs/by-name/to/totp-cli/package.nix
index 398e7adde4e9..be1de60008ca 100644
--- a/pkgs/by-name/to/totp-cli/package.nix
+++ b/pkgs/by-name/to/totp-cli/package.nix
@@ -14,7 +14,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "yitsushi";
     repo = "totp-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aYTOtel7ZPDNF8/3mpk/dchBHzoA3ZDnViidQ/N9+As=";
   };
 
diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix
index 47330b682508..0164664ace17 100644
--- a/pkgs/by-name/tp/tproxy/package.nix
+++ b/pkgs/by-name/tp/tproxy/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "kevwan";
     repo = "tproxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LX3ciC3cMYuQPm6ekEkJPrSdTXH+WZ4flXyrsvJZgn8=";
   };
 
diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix
index 372098fe880f..fde7d0b8d5ab 100644
--- a/pkgs/by-name/tr/tracexec/package.nix
+++ b/pkgs/by-name/tr/tracexec/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "kxxt";
     repo = "tracexec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZoYqmjqY9eAHGDIbFX9FY1yGF210C60UWcHi0lxzL7g=";
   };
 
diff --git a/pkgs/by-name/tr/transmission-remote-gtk/package.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
index 4b22b1bf7f26..2a806346c698 100644
--- a/pkgs/by-name/tr/transmission-remote-gtk/package.nix
+++ b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "transmission-remote-gtk";
     repo = "transmission-remote-gtk";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/syZI/5LhuYLvXrNknnpbGHEH0z5iHeye2YRNJFWZJ0=";
   };
 
diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix
index 3b6f2c4c7046..3a0f09739ef2 100644
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trickest";
     repo = "trickest-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9RZmLs95dHZw5hgob5+iogxb6DV0FqVaY+PavGFpXj4=";
   };
 
diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index d3eebe6f6a25..587ee3b3db0f 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "trivy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YKeNIi6PBIfzd/Kuv5cgxeAEbqfFXWwmK9JTOBsRLsw=";
   };
 
diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix
index f032691e3455..34423bbbfefa 100644
--- a/pkgs/by-name/tr/trustymail/package.nix
+++ b/pkgs/by-name/tr/trustymail/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cisagov";
     repo = "trustymail";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Zkw+NfeVtIArrBxR1qR9bAQe5yd7mAtNiT0x5Mqr3Ic=";
   };
 
diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix
index 308561f0ab68..26ad68675736 100644
--- a/pkgs/by-name/tt/tts/package.nix
+++ b/pkgs/by-name/tt/tts/package.nix
@@ -24,7 +24,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "idiap";
     repo = "coqui-ai-TTS";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5w1Y9wdoJ+EV/WBwK3nqyY60NEsMjQsfE4g+sJB7VwQ=";
   };
 
diff --git a/pkgs/by-name/tt/ttyd/package.nix b/pkgs/by-name/tt/ttyd/package.nix
index 58e33437a120..9a35f4b1f5b4 100644
--- a/pkgs/by-name/tt/ttyd/package.nix
+++ b/pkgs/by-name/tt/ttyd/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tsl0922";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-7e08oBKU7BMZ8328qCfNynCSe7LVZ88+iQZRRKl2YkY=";
   };
 
diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix
index 47a21d97cf98..c613142db582 100644
--- a/pkgs/by-name/tt/ttysvr/package.nix
+++ b/pkgs/by-name/tt/ttysvr/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cxreiff";
     repo = "ttysvr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W8IglZVvhFqn0TH1ZBGWERizCxCQ+C4SckYFLCzB3yc=";
   };
   cargoHash = "sha256-gHrsdlmA8QxahrWIy6+5knLydVcSbEfS7+02fF1sSsA=";
diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix
index b20fd69b137b..d0831d00b8cc 100644
--- a/pkgs/by-name/tu/tuisky/package.nix
+++ b/pkgs/by-name/tu/tuisky/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "sugyan";
     repo = "tuisky";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-phadkJgSvizSNPvrVaYu/+y1uAj6fmb9JQLdj0dEQIg=";
   };
 
diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix
index 984cafc2d9fa..5acc3bd75f37 100644
--- a/pkgs/by-name/tu/tun2proxy/package.nix
+++ b/pkgs/by-name/tu/tun2proxy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tun2proxy";
     repo = "tun2proxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LY7vVD85GVFqARYOBDeb4fS6rL2PwPXYXIAJtwm2goo=";
   };
 
diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix
index 08086fc91807..93ddcde792af 100644
--- a/pkgs/by-name/tu/tunnelgraf/package.nix
+++ b/pkgs/by-name/tu/tunnelgraf/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "denniswalker";
     repo = "tunnelgraf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pwHP9eAf2S08ucUawxrQvzMBJNITxbddoLzEoSNUdao=";
   };
 
diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix
index 2d2d42bf3087..d49e94757f00 100644
--- a/pkgs/by-name/tu/turbo-unwrapped/package.nix
+++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vercel";
     repo = "turbo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L51RgXUlA9hnVt232qdLo6t0kqXl7b01jotUk1r8wO0=";
   };
 
diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index 77acaaa5fcf0..9e43f62cc310 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mycrl";
     repo = "turn-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8=";
   };
 
diff --git a/pkgs/by-name/tw/twig-language-server/package.nix b/pkgs/by-name/tw/twig-language-server/package.nix
index f86616bbc60b..86bde934f12d 100644
--- a/pkgs/by-name/tw/twig-language-server/package.nix
+++ b/pkgs/by-name/tw/twig-language-server/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kaermorchen";
     repo = "twig-language-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Jwi1+s2+TC656rXOukjLS4w1Y9VxwEdAe0y5Q3Iz0LA=";
   };
 
diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix
index 877683f51fba..5f3a2306794b 100644
--- a/pkgs/by-name/tw/twitch-dl/package.nix
+++ b/pkgs/by-name/tw/twitch-dl/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ihabunek";
     repo = "twitch-dl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BIE3+SDmc5ggF9P+qeloI1JYYrEtOJQ/8oDR76i0t6c=";
   };
 
diff --git a/pkgs/by-name/tw/twm/package.nix b/pkgs/by-name/tw/twm/package.nix
index 273185e90bd8..c6c39529f732 100644
--- a/pkgs/by-name/tw/twm/package.nix
+++ b/pkgs/by-name/tw/twm/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vinnymeller";
     repo = "twm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SiwLqUq/gC8Tr31jjblLc9YP4yBi9HL38W83kgh7eJI=";
   };
 
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Customizable workspace manager for tmux";
     homepage = "https://github.com/vinnymeller/twm";
-    changelog = "https://github.com/vinnymeller/twm/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/vinnymeller/twm/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vinnymeller ];
     mainProgram = "twm";
diff --git a/pkgs/by-name/tx/txt2tags/package.nix b/pkgs/by-name/tx/txt2tags/package.nix
index e978451b350b..7f8a028cbd7d 100644
--- a/pkgs/by-name/tx/txt2tags/package.nix
+++ b/pkgs/by-name/tx/txt2tags/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "txt2tags";
     repo = "txt2tags";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PwPGJJg79ny13gEb1WmgIVHcXQppI/j5mhIyOZjR19k=";
   };
 
diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index aada09f1e366..db9eb9b42e0f 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ezRyitmdcOki/thQGJ11+UYMIG2fYJ9HMcvD++s/ewM=";
   };
 
diff --git a/pkgs/by-name/ty/typst-lsp/package.nix b/pkgs/by-name/ty/typst-lsp/package.nix
index 047be6e535f0..d5b9693428da 100644
--- a/pkgs/by-name/ty/typst-lsp/package.nix
+++ b/pkgs/by-name/ty/typst-lsp/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "nvarner";
     repo = "typst-lsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OubKtSHw9L4GzVzZY0AVdHY7LzKg/XQIhUfUc2OYAG0=";
   };
 
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
     description = "Brand-new language server for Typst";
     homepage = "https://github.com/nvarner/typst-lsp";
     mainProgram = "typst-lsp";
-    changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/nvarner/typst-lsp/releases/tag/v${version}";
     license = with lib.licenses; [
       asl20
       mit
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index d77e889a5ea6..37abf902a5b6 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "typst";
     repo = "typst";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OfTMJ7ylVOJjL295W3Flj2upTiUQXmfkyDFSE1v8+a4=";
   };
 
diff --git a/pkgs/by-name/tz/tzupdate/package.nix b/pkgs/by-name/tz/tzupdate/package.nix
index adfb93fb0246..64efcc84ac7c 100644
--- a/pkgs/by-name/tz/tzupdate/package.nix
+++ b/pkgs/by-name/tz/tzupdate/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cdown";
     repo = "tzupdate";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI=";
   };
 
diff --git a/pkgs/by-name/u-/u-config/package.nix b/pkgs/by-name/u-/u-config/package.nix
index deeba46483b5..578c2990cda2 100644
--- a/pkgs/by-name/u-/u-config/package.nix
+++ b/pkgs/by-name/u-/u-config/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "skeeto";
     repo = "u-config";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-r1zcXKLqw/gK+9k3SX7OCBaZhvV2ya5VC9O3h+WdkyY=";
   };
 
diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix
index c5f467ad6a3b..d28cff1b1799 100644
--- a/pkgs/by-name/ub/ubridge/package.nix
+++ b/pkgs/by-name/ub/ubridge/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "ubridge";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-utzXLPF0VszMZORoik5/0lKhiyKO9heKuNO4KPsPVsI=";
   };
 
diff --git a/pkgs/by-name/uc/uchecker/package.nix b/pkgs/by-name/uc/uchecker/package.nix
index 19a627d6b962..883979bd9319 100644
--- a/pkgs/by-name/uc/uchecker/package.nix
+++ b/pkgs/by-name/uc/uchecker/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "cloudlinux";
     repo = "kcare-uchecker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SST143oi0O9PcJbw4nxHwHNY6HkIGi1WMBzveUYVhJs=";
   };
 
diff --git a/pkgs/by-name/ud/udev-block-notify/package.nix b/pkgs/by-name/ud/udev-block-notify/package.nix
index 028d4742c19f..9578fa83402d 100644
--- a/pkgs/by-name/ud/udev-block-notify/package.nix
+++ b/pkgs/by-name/ud/udev-block-notify/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "eworm-de";
     repo = "udev-block-notify";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-A0uhfb2mEAAJgxRkv+MWTk/9oFiz3r7deAlu1Kpk+CI=";
   };
 
diff --git a/pkgs/by-name/ud/udocker/package.nix b/pkgs/by-name/ud/udocker/package.nix
index d0c6b6c2a23f..59dda65f70e6 100644
--- a/pkgs/by-name/ud/udocker/package.nix
+++ b/pkgs/by-name/ud/udocker/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = "udocker";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P49fkLvdCm/Eco+nD3SGM04PRQatBzq9CHlayueQetk=";
   };
 
diff --git a/pkgs/by-name/ud/udpx/package.nix b/pkgs/by-name/ud/udpx/package.nix
index 6ae7e7d90f95..eca62eced932 100644
--- a/pkgs/by-name/ud/udpx/package.nix
+++ b/pkgs/by-name/ud/udpx/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "nullt3r";
     repo = "udpx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IRnGi3TmCyxmJKAd8ZVRoSHDao+3Xt4F5QfHvNahvGo=";
   };
 
diff --git a/pkgs/by-name/ug/ugit/package.nix b/pkgs/by-name/ug/ugit/package.nix
index 067a70cbf8d9..b34d6a767f55 100644
--- a/pkgs/by-name/ug/ugit/package.nix
+++ b/pkgs/by-name/ug/ugit/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Bhupesh-V";
     repo = "ugit";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-WnEyS2JKH6rrsYOeGEwughWq2LKrHPSjio3TOI0Xm4g=";
   };
 
diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix
index 5e7e68af8795..b6b69f3cd4e8 100644
--- a/pkgs/by-name/uk/ukmm/package.nix
+++ b/pkgs/by-name/uk/ukmm/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "NiceneNerd";
     repo = "ukmm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NZN+T2N+N+oxrjBRvVbRWbB2KY5im9SN7gPHzfvovl8=";
   };
 
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index f91012fbe915..1dc14e412297 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "unbound";
-    rev = "refs/tags/release-${finalAttrs.version}";
+    tag = "release-${finalAttrs.version}";
     hash = "sha256-CFsd8tdFL+JbxmDZoWdStvWcs9azSaLtMG8Ih5oXE/A=";
   };
 
diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix
index b89418639f28..1b16fc3c8334 100644
--- a/pkgs/by-name/un/uncover/package.nix
+++ b/pkgs/by-name/un/uncover/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "uncover";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-avGbawIeh7ZUtacRLo/tLz4D6U7JAlu9BXDYu/xvoa0=";
   };
 
diff --git a/pkgs/by-name/un/uni/package.nix b/pkgs/by-name/un/uni/package.nix
index 11ce3795e754..9b6b291a724e 100644
--- a/pkgs/by-name/un/uni/package.nix
+++ b/pkgs/by-name/un/uni/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "arp242";
     repo = "uni";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LSmQtndWBc7wCYBnyaeDb4Le4PQPcSO8lTp+CSC2jbc=";
   };
 
diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix
index 1ffdeca5b38d..56005a974034 100644
--- a/pkgs/by-name/un/unifi-protect-backup/package.nix
+++ b/pkgs/by-name/un/unifi-protect-backup/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ep1cman";
     repo = "unifi-protect-backup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t4AgPFqKS6u9yITIkUUB19/SxVwR7X8Cc01oPx3M+E0=";
   };
 
diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
index b91ab1ea5298..5324043fb5d1 100644
--- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
+++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Drewol";
     repo = "unnamed-sdvx-clone";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-wuf7xZztoxzNQJzlJOfH/Dc25/717NevBx7E0RDybho=";
   };
diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix
index 035423dbbdb7..3c6dda83a42f 100644
--- a/pkgs/by-name/up/upiano/package.nix
+++ b/pkgs/by-name/up/upiano/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "eliasdorneles";
     repo = "upiano";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5WhflvUCjzW4ZJ+PLUTMbKcUnQa3ChkDjl0R5YvjBWk=";
     forceFetchGit = true;
     fetchLFS = true;
diff --git a/pkgs/by-name/up/upscayl-ncnn/package.nix b/pkgs/by-name/up/upscayl-ncnn/package.nix
index 82db79463543..167c84f06288 100644
--- a/pkgs/by-name/up/upscayl-ncnn/package.nix
+++ b/pkgs/by-name/up/upscayl-ncnn/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "upscayl";
     repo = "upscayl-ncnn";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-rGnjL+sU5x3VXHnvuYXVdxGmHdj9eBkIZK3CwL89lN0=";
   };
 
diff --git a/pkgs/by-name/ur/urh/package.nix b/pkgs/by-name/ur/urh/package.nix
index 047abf6f7596..99276583d755 100644
--- a/pkgs/by-name/ur/urh/package.nix
+++ b/pkgs/by-name/ur/urh/package.nix
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r3d80dzGwgf5Tuwt1IWGcmNbblwBNKTKKm+GGx1r2HE=";
   };
 
diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix
index 639bd38dc104..413af8fba1b1 100644
--- a/pkgs/by-name/ur/url-parser/package.nix
+++ b/pkgs/by-name/ur/url-parser/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "url-parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IGA+T0Qv3l32UmWciCH2J5G+YGWu0plqSG7yfEtuswM=";
   };
 
diff --git a/pkgs/by-name/ur/urlscan/package.nix b/pkgs/by-name/ur/urlscan/package.nix
index 67efc7ad64e0..0b7336b23305 100644
--- a/pkgs/by-name/ur/urlscan/package.nix
+++ b/pkgs/by-name/ur/urlscan/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "urlscan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VbpKMaEjchfpLECCt1YtmiVynYgSLgAVP1iuHL7t8FQ=";
   };
 
diff --git a/pkgs/by-name/uw/uwc/package.nix b/pkgs/by-name/uw/uwc/package.nix
index 5a6fe1960b89..fea7e9cd0107 100644
--- a/pkgs/by-name/uw/uwc/package.nix
+++ b/pkgs/by-name/uw/uwc/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dead10ck";
     repo = "uwc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qv8vMjCMhpVxkJyH1uTsFXu2waO8oaLPuoBETaWOUqI=";
   };
 
diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index aaab50c54dff..93de75b52f6a 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-RHxA0X3cqHtp4NZl7qlqBYkqOJay8IPoaj12bdouVkc=";
   };
 
diff --git a/pkgs/by-name/v4/v4l2-relayd/package.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix
index f836590afc5a..8d056f3a00e2 100644
--- a/pkgs/by-name/v4/v4l2-relayd/package.nix
+++ b/pkgs/by-name/v4/v4l2-relayd/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.launchpad.net/v4l2-relayd";
-    rev = "refs/tags/upstream/${version}";
+    tag = "upstream/${version}";
     hash = "sha256-oU6naDFZ0PQVHZ3brANfMULDqYMYxeJN+MCUCvN/DpU=";
   };
 
diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 5eaf9e47a396..ee6bc108de2f 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OsujmYu0QNyfyj6W8+aPcV4xsjpwZDWSJC7WjIw+rOc=";
   };
 
diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix
index f0775366e02e..e5d69ccf4a72 100644
--- a/pkgs/by-name/va/vale-ls/package.nix
+++ b/pkgs/by-name/va/vale-ls/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "errata-ai";
     repo = "vale-ls";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+2peLqj3/ny0hDwJVKEp2XS68VO50IvpCB2fvZoEdJo=";
   };
 
diff --git a/pkgs/by-name/va/vapoursynth-bestsource/package.nix b/pkgs/by-name/va/vapoursynth-bestsource/package.nix
index 92c5d560e92e..843baf11eaa2 100644
--- a/pkgs/by-name/va/vapoursynth-bestsource/package.nix
+++ b/pkgs/by-name/va/vapoursynth-bestsource/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
     owner = "vapoursynth";
     repo = "bestsource";
-    rev = "refs/tags/R${finalAttrs.version}";
+    tag = "R${finalAttrs.version}";
     hash = "sha256-ICkdIomlkHUdK6kMeui45fvUn4OMxSrP8svB2IN+GCg=";
   };
 
diff --git a/pkgs/by-name/va/vapoursynth-nnedi3/package.nix b/pkgs/by-name/va/vapoursynth-nnedi3/package.nix
index a40d9742ba67..3bbe4056766c 100644
--- a/pkgs/by-name/va/vapoursynth-nnedi3/package.nix
+++ b/pkgs/by-name/va/vapoursynth-nnedi3/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "dubhater";
     repo = "vapoursynth-nnedi3";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jd/PCXhbCZGMsoXjekbeqMSRVBJAy4INdpkTbZFjVO0=";
   };
 
diff --git a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
index 14fb147ecc70..e64ae74b9d70 100644
--- a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
+++ b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "HomeOfVapourSynthEvolution";
     repo = "VapourSynth-NNEDI3CL";
-    rev = "refs/tags/r${finalAttrs.version}";
+    tag = "r${finalAttrs.version}";
     hash = "sha256-zW/qEtZTDJOTarXbXhv+nks25eePutLDpLck4TuMKUk=";
   };
 
diff --git a/pkgs/by-name/va/varia/package.nix b/pkgs/by-name/va/varia/package.nix
index fd331c451800..c5c6ee6230f6 100644
--- a/pkgs/by-name/va/varia/package.nix
+++ b/pkgs/by-name/va/varia/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "giantpinkrobots";
     repo = "varia";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Xx3rd+FwelE7yjW4dXTAEzCMVa25ojXuhOLjqc6H57c=";
   };
 
diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix
index 81ec12631f1e..db3b729433f6 100644
--- a/pkgs/by-name/va/variety/package.nix
+++ b/pkgs/by-name/va/variety/package.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "varietywalls";
     repo = "variety";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FjnhV7vzRPVDCgUNK8CHo3arKXuwe+3xH/5AxCVgeIY=";
   };
 
diff --git a/pkgs/by-name/va/vatprism/package.nix b/pkgs/by-name/va/vatprism/package.nix
index bdc406091d00..ab750965c4c2 100644
--- a/pkgs/by-name/va/vatprism/package.nix
+++ b/pkgs/by-name/va/vatprism/package.nix
@@ -38,7 +38,7 @@ maven.buildMavenPackage rec {
   src = fetchFromGitHub {
     owner = "marvk";
     repo = "vatprism";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ofEwHUCm79roHe2bawmKFw2QHhIonnlkFG5nhE6uN+g=";
   };
 
diff --git a/pkgs/by-name/ve/verdict/package.nix b/pkgs/by-name/ve/verdict/package.nix
index 34d895e88054..ff61066fbea2 100644
--- a/pkgs/by-name/ve/verdict/package.nix
+++ b/pkgs/by-name/ve/verdict/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sandialabs";
     repo = "verdict";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-VrjyAMou5BajOIb13RjEqVgOsDcllfzI/OJ81fyILjs=";
   };
 
diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index b4ea6cb67381..7c05fdf77ed5 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
-    rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version
+    tag = "v${version}"; # When updating: Replace with long commit hash of new version
     hash = "sha256-ejMqTMGLbVr/Aaqw8U0ojV43N6t0GeWdYIcP0guAsO0="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index d94b5d5efd40..03d4dbc00331 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "versity";
     repo = "versitygw";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-giPk0037zMqrqG6L1b9M7Us9d9YpGNjlJXWaNCIx3vc=";
   };
 
diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index c810d8e416e3..d322f6371f30 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vgmstream";
     repo = "vgmstream";
-    rev = "refs/tags/r${version}";
+    tag = "r${version}";
     hash = "sha256-TmaWC04XbtFfBYhmTO4ouh3NoByio1BCpDJGJy3r0NY=";
   };
 
diff --git a/pkgs/by-name/vg/vgmtrans/package.nix b/pkgs/by-name/vg/vgmtrans/package.nix
index 8feb722e116f..33fb25677e7e 100644
--- a/pkgs/by-name/vg/vgmtrans/package.nix
+++ b/pkgs/by-name/vg/vgmtrans/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vgmtrans";
     repo = "vgmtrans";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-HVC45B1DFThZRkPVrroiay+9ufkOrTMUZoNIuC1CjjM=";
   };
 
diff --git a/pkgs/by-name/vi/vidcutter/package.nix b/pkgs/by-name/vi/vidcutter/package.nix
index 1d0c112b7858..f35658fb5e2d 100644
--- a/pkgs/by-name/vi/vidcutter/package.nix
+++ b/pkgs/by-name/vi/vidcutter/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "ozmartian";
     repo = "vidcutter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MCltdvXgsZgPh0ezGvWFEa5vZVDBc6r0WxvXSLf4x2Y=";
   };
 
diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix
index 9345a5f7023c..6bf8494bdc2f 100644
--- a/pkgs/by-name/vi/villain/package.nix
+++ b/pkgs/by-name/vi/villain/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "t3l3machus";
     repo = "Villain";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-eIPxidBBVmjt/E1F8G3zPwteB1qsk3a5LD69CiNVApY=";
   };
 
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index 141fd14b00d4..61ac85da0971 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "libvips";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Cx657BEZecPeB9rCeVym3C/d+/u+YLJn9vwxfe8b0dM=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix
index f25562d4ba2a..35ffac76f144 100644
--- a/pkgs/by-name/vi/visp/package.nix
+++ b/pkgs/by-name/vi/visp/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lagadic";
     repo = "visp";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-m5Tmr+cZab7eSjmbXb8HpJpFHb0UYFTyimY+CkfBIAo=";
   };
 
diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix
index 5471c64543d6..f111fcdd31e2 100644
--- a/pkgs/by-name/vo/vokoscreen-ng/package.nix
+++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vkohaupt";
     repo = "vokoscreenNG";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-efgvq/jl/ecjtINy5BdqtYRp2gxEvOsMzQVyCZ3ig+Q=";
   };
 
diff --git a/pkgs/by-name/vo/volatility3/package.nix b/pkgs/by-name/vo/volatility3/package.nix
index c2a067334a61..286c54fae023 100644
--- a/pkgs/by-name/vo/volatility3/package.nix
+++ b/pkgs/by-name/vo/volatility3/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "volatilityfoundation";
     repo = "volatility3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XMoVfT1Wd8r684y4crTOjW9GklSTkivOGv1Ii10KzII=";
   };
 
diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix
index 2784cad08379..1104b041708e 100644
--- a/pkgs/by-name/vo/vouch-proxy/package.nix
+++ b/pkgs/by-name/vo/vouch-proxy/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "vouch";
     repo = "vouch-proxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HQ1NaAHY1YRbNUThW983V8x3ptzTc/zNP6yIMyDiq1s=";
   };
 
diff --git a/pkgs/by-name/vp/vpcs/package.nix b/pkgs/by-name/vp/vpcs/package.nix
index 0b8582c54a47..fc2930c2c928 100644
--- a/pkgs/by-name/vp/vpcs/package.nix
+++ b/pkgs/by-name/vp/vpcs/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "vpcs";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY=";
   };
 
diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix
index 5d90e944541e..95b9ac8b99d6 100644
--- a/pkgs/by-name/vr/vrcadvert/package.nix
+++ b/pkgs/by-name/vr/vrcadvert/package.nix
@@ -13,7 +13,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "galister";
     repo = "VrcAdvert";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ=";
   };
 
diff --git a/pkgs/by-name/vt/vt-cli/package.nix b/pkgs/by-name/vt/vt-cli/package.nix
index 7a377bbfb74b..3469cb63dc1f 100644
--- a/pkgs/by-name/vt/vt-cli/package.nix
+++ b/pkgs/by-name/vt/vt-cli/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NB5eo+6IwIxhQX1lwJzPOZ0pSeFVo7LYIEEmDqE4A7Y=";
   };
 
diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix
index c811f6c6d69e..f36d5cfed168 100644
--- a/pkgs/by-name/vu/vuls/package.nix
+++ b/pkgs/by-name/vu/vuls/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "future-architect";
     repo = "vuls";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mrptQSTxTdste6UgbkAm3aqgpYfaoOykHX0eYOTojgA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 70ae55a56075..4c692036f60d 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oHK855EQglFZrjW30n/z0vgf/NtaXVOcntEWQMcAbDw=";
   };
 
diff --git a/pkgs/by-name/vw/vwsfriend/package.nix b/pkgs/by-name/vw/vwsfriend/package.nix
index 60a4995a1305..ddeb89ca6e05 100644
--- a/pkgs/by-name/vw/vwsfriend/package.nix
+++ b/pkgs/by-name/vw/vwsfriend/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tillsteinbach";
     repo = "VWsFriend";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZGH7rcGSAYDBSjv1jZjT/uGJIrFL71RYK6vX71RHz8E=";
   };
 
diff --git a/pkgs/by-name/vx/vxl/package.nix b/pkgs/by-name/vx/vxl/package.nix
index f652dc421c20..66b394e582b5 100644
--- a/pkgs/by-name/vx/vxl/package.nix
+++ b/pkgs/by-name/vx/vxl/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vxl";
     repo = "vxl";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E=";
   };
 
diff --git a/pkgs/by-name/vy/vyxal/package.nix b/pkgs/by-name/vy/vyxal/package.nix
index 66b6d0a97b58..617b44209a95 100644
--- a/pkgs/by-name/vy/vyxal/package.nix
+++ b/pkgs/by-name/vy/vyxal/package.nix
@@ -25,7 +25,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Vyxal";
     repo = "Vyxal";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8hA4u9zz8jm+tlSZ88z69/PUFNYk7+i3jtgUntgDgPE=";
   };
 
diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix
index ab490373aaa5..9b21d6a53a8f 100644
--- a/pkgs/by-name/wa/waagent/package.nix
+++ b/pkgs/by-name/wa/waagent/package.nix
@@ -18,7 +18,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "WALinuxAgent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L8W/ijBHkNukM2G9HBRVx2wFXzgkR8gbFBljNVPs6xA=";
   };
   patches = [
diff --git a/pkgs/by-name/wa/waf-tester/package.nix b/pkgs/by-name/wa/waf-tester/package.nix
index c74f0af8b151..abc02cc1465e 100644
--- a/pkgs/by-name/wa/waf-tester/package.nix
+++ b/pkgs/by-name/wa/waf-tester/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UPviooQNGRVwf/bTz9ApedJDAGeCvh9iD1HXFOQXPcw=";
   };
 
diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix
index 9e325bad1495..1065c0f4f508 100644
--- a/pkgs/by-name/wa/wafw00f/package.nix
+++ b/pkgs/by-name/wa/wafw00f/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "EnableSecurity";
     repo = "wafw00f";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-47lzFPMyAJTtreGGazFWUYiu9e9Q1D3QYsrQbwyaQME=";
   };
 
diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix
index 46b5c3b04015..d5d83869bfab 100644
--- a/pkgs/by-name/wa/wangle/package.nix
+++ b/pkgs/by-name/wa/wangle/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "wangle";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-4mqE9GgJP2f7QAykwdhMFoReE9wmPKOXqSHJ2MHP2G0=";
   };
 
diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix
index 023884838d2d..9955e422423d 100644
--- a/pkgs/by-name/wa/wapiti/package.nix
+++ b/pkgs/by-name/wa/wapiti/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "wapiti-scanner";
     repo = "wapiti";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sa4bXZiY5yd0wynUjdLnuuX7Ee0w4APd1G/oGy5AUDk=";
   };
 
diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix
index b398f25f9ad4..5b36e1d8ede5 100644
--- a/pkgs/by-name/wa/wasabibackend/package.nix
+++ b/pkgs/by-name/wa/wasabibackend/package.nix
@@ -15,7 +15,7 @@ buildDotnetModule rec {
   src = fetchFromGitHub {
     owner = "zkSNACKs";
     repo = "WalletWasabi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha512-JuCl3SyejzwUd2n8Fy7EdxUuO4bIcGb8yMWZQOhZzsY4fvg9prFOnVZEquxahD0a41MLKHRNA1R2N3NMapcc0A==";
   };
 
diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix
index 818274a35a54..d030c4ee388c 100644
--- a/pkgs/by-name/wa/wasm-pack/package.nix
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rustwasm";
     repo = "wasm-pack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc=";
   };
 
diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix
index c020c76e83bb..b4a1902f0310 100644
--- a/pkgs/by-name/wa/watchman/package.nix
+++ b/pkgs/by-name/wa/watchman/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-deOSeExhwn8wrtP2Y0BDaHdmaeiUaDBok6W7N1rH/24=";
   };
 
diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index e6d004a801bd..1d8bd84bd2c1 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
   };
 
diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix
index 6be599fbd96d..3e17b1483289 100644
--- a/pkgs/by-name/wa/waycorner/package.nix
+++ b/pkgs/by-name/wa/waycorner/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "AndreasBackx";
     repo = "waycorner";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y=";
   };
 
diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 435412e25ec8..63a9a0343518 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "waydroid";
     repo = "waydroid";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk=";
   };
 
diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix
index cae8f1f7c5b5..cb404a37b28e 100644
--- a/pkgs/by-name/wa/waypaper/package.nix
+++ b/pkgs/by-name/wa/waypaper/package.nix
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "anufrievroman";
     repo = "waypaper";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ty3KiKkIyv6aqTua3YUB2smYJv7dXGPP5k3lXoxDzI0=";
   };
 
diff --git a/pkgs/by-name/wc/wcurl/package.nix b/pkgs/by-name/wc/wcurl/package.nix
index d855a029e378..8f4b81325a8e 100644
--- a/pkgs/by-name/wc/wcurl/package.nix
+++ b/pkgs/by-name/wc/wcurl/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "curl";
     repo = "wcurl";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-X6v03oYb/n9ALJXpx5HQojths7tv1rEftGUiQElv7aY=";
   };
 
diff --git a/pkgs/by-name/we/webanalyze/package.nix b/pkgs/by-name/we/webanalyze/package.nix
index 59582a061e3d..02081bcb69a0 100644
--- a/pkgs/by-name/we/webanalyze/package.nix
+++ b/pkgs/by-name/we/webanalyze/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "rverton";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rnNbEPlbye0gjUamwq1xjFM/4g0eEHsGOAZWziEqxwM=";
   };
 
diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix
index 2066f697c248..7bed5b44961e 100644
--- a/pkgs/by-name/we/webcord/package.nix
+++ b/pkgs/by-name/we/webcord/package.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "SpacingBat3";
     repo = "WebCord";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vzTT8tHpbJSt1PosgKTg3pT4a9UfPabtJppLLD9znhU=";
   };
 
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 1d2f3aad8103..9b88239b287c 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -40,7 +40,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "WeblateOrg";
     repo = "weblate";
-    rev = "refs/tags/weblate-${version}";
+    tag = "weblate-${version}";
     hash = "sha256-Kmna23jhhFRJ0ExplYNPFEaIAJxmwHU2azivfKHHnjs=";
   };
 
diff --git a/pkgs/by-name/we/webpack-cli/package.nix b/pkgs/by-name/we/webpack-cli/package.nix
index 68b8a8ae80f9..134f939b495d 100644
--- a/pkgs/by-name/we/webpack-cli/package.nix
+++ b/pkgs/by-name/we/webpack-cli/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "webpack";
     repo = "webpack-cli";
-    rev = "refs/tags/webpack-cli@${finalAttrs.version}";
+    tag = "webpack-cli@${finalAttrs.version}";
     hash = "sha256-OjehyUw54n7/CKbDTVFCtcUp88tJCLUlBCJBQRXoyZM=";
   };
 
diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix
index a0e14ac56c06..cfbc6b725c62 100644
--- a/pkgs/by-name/we/websocat/package.nix
+++ b/pkgs/by-name/we/websocat/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vi";
     repo = "websocat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A=";
   };
 
diff --git a/pkgs/by-name/we/websploit/package.nix b/pkgs/by-name/we/websploit/package.nix
index a868762e58e8..aafccf28a69e 100644
--- a/pkgs/by-name/we/websploit/package.nix
+++ b/pkgs/by-name/we/websploit/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "f4rih";
     repo = "websploit";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw=";
   };
 
diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index 6e412c0b2020..936cbb19aac8 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "neon-mmd";
     repo = "websurfx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NuhSpUe1PzJTBsX91LSOIh4N20eTs7MLl4ueIoGoC6o=";
   };
 
diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix
index 58aefaed241f..2c0b81cf65dd 100644
--- a/pkgs/by-name/wg/wgcf/package.nix
+++ b/pkgs/by-name/wg/wgcf/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ViRb3";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BtZvR+dZzauByQR5+VWzh6tOgAQV1sXfr0ThOy05uRo=";
   };
 
diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix
index f9705f15ea13..09f99cbb2fa1 100644
--- a/pkgs/by-name/wg/wgpu-native/package.nix
+++ b/pkgs/by-name/wg/wgpu-native/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu-native";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lEUHRU7+sFWtEYTOB2F+SmMNG8nrjro3IL7BgYuIGgM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix
index f432e31bdd9f..85d324c3effb 100644
--- a/pkgs/by-name/wg/wgsl-analyzer/package.nix
+++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wgsl-analyzer";
     repo = "wgsl-analyzer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bhosTihbW89vkqp1ua0C1HGLJJdCNfRde98z4+IjkOc=";
   };
 
diff --git a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
index 2e2662d80a35..339ce42f2be5 100644
--- a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
+++ b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "KnugiHK";
     repo = "Whatsapp-Chat-Exporter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TPXQaWnUy+blTS+Tz84K6cxJu4+dLbT2Dl9SKqlhDHY=";
   };
 
diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
index 711d03d51516..38ea43b16e06 100644
--- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
+++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   version = "2.24.8.85-1";
 
   src = fetchFromGitHub {
-    rev = "refs/tags/${version}";
+    tag = version;
     owner = "dmlls";
     repo = "whatsapp-emoji-linux";
     hash = "sha256-6bei+kR+5UF4GQ140sUXy8TDXZKNFmM+XgvMKf+8s2Y=";
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index e7c45012278c..7c1b5cd6c95d 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "keshavbhatt";
     repo = "whatsie";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-F6hQY3Br0iFDYkghBgRAyzLW6QhhG8UHOgkEgDjeQLg=";
   };
 
diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 86ce1076ec61..10887e1e6cb2 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -39,7 +39,7 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
     src = fetchFromGitHub {
       owner = "stepanzubkov";
       repo = "where-is-my-sddm-theme";
-      rev = "refs/tags/v${finalAttrs.version}";
+      tag = "v${finalAttrs.version}";
       hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
     };
 
diff --git a/pkgs/by-name/wi/wideriver/package.nix b/pkgs/by-name/wi/wideriver/package.nix
index 7608260856c8..496aa561e8ca 100644
--- a/pkgs/by-name/wi/wideriver/package.nix
+++ b/pkgs/by-name/wi/wideriver/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "wideriver";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-D1JHfMnq6u057FrBqgZ4UlfeOlkTWKkKzFYM29+vIJo=";
   };
 
diff --git a/pkgs/by-name/wi/wikiman/package.nix b/pkgs/by-name/wi/wikiman/package.nix
index 4af6d99f5ca4..4d93ca8ee1c0 100644
--- a/pkgs/by-name/wi/wikiman/package.nix
+++ b/pkgs/by-name/wi/wikiman/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "filiparag";
     repo = "wikiman";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-gk/9PVIRw9OQrdCSS+LcniXDYNcHUQUxZ2XGQCwpHaI=";
   };
 
diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix
index 1540bbda4bc4..95cd355c69c1 100644
--- a/pkgs/by-name/wi/wiper/package.nix
+++ b/pkgs/by-name/wi/wiper/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "ikebastuz";
     repo = "wiper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IheSAPk1l6wJ2v4RLPIPvY/5XMfh+vJLyQ/Lc7RrCJQ=";
   };
 
diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix
index c18c4462b16a..c89c875a7e26 100644
--- a/pkgs/by-name/wi/wired/package.nix
+++ b/pkgs/by-name/wi/wired/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Toqozz";
     repo = "wired-notify";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc=";
   };
 
diff --git a/pkgs/by-name/wi/wireguard-ui/package.nix b/pkgs/by-name/wi/wireguard-ui/package.nix
index b046bdc5a302..ada680b121fb 100644
--- a/pkgs/by-name/wi/wireguard-ui/package.nix
+++ b/pkgs/by-name/wi/wireguard-ui/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ngoduykhanh";
     repo = "wireguard-ui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fK7l9I2s0zSxG1g1oQ1KjJZUcypwS9DxnNN7lhVI+1s=";
   };
 
diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix
index aff80e1cb0b5..424547aa8d04 100644
--- a/pkgs/by-name/wi/wizer/package.nix
+++ b/pkgs/by-name/wi/wizer/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wizer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bx8V/jaKDpJdWRwYm6GrjsdXQpDyTulRMKVnQZlqLNE=";
   };
 
diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix
index 947fe055ce76..10c1719b1c3e 100644
--- a/pkgs/by-name/wl/wl-kbptr/package.nix
+++ b/pkgs/by-name/wl/wl-kbptr/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "moverest";
     repo = "wl-kbptr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4OWy5Q+NSKgzDn12aflZ+YAfacLeOTIhOojiJ2WiqQg=";
   };
 
diff --git a/pkgs/by-name/wl/wl-restart/package.nix b/pkgs/by-name/wl/wl-restart/package.nix
index df3ff21ae674..d9895eee7a96 100644
--- a/pkgs/by-name/wl/wl-restart/package.nix
+++ b/pkgs/by-name/wl/wl-restart/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "wl-restart";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wLaZBqw/Yx0Oc7s3ffAmx3zakjhEBHM09uJcfsVHbnQ=";
   };
 
diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix
index 084c316b7bf9..56b122383ac2 100644
--- a/pkgs/by-name/wl/wlr-layout-ui/package.nix
+++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fdev31";
     repo = "wlr-layout-ui";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Qgg4fdxOVkADDOxmQgQFSF/wgrEQihoRNC9oXeQvaoI=";
   };
 
diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 1643f4b15ca1..65e2cca150e2 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ffP4CmvoxmXdwrWWOG2HIoz1pgmxTUdG5rPsgJ1+3do=";
   };
 
diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix
index 520fddb96e7c..530c9ec206e0 100644
--- a/pkgs/by-name/wo/woomer/package.nix
+++ b/pkgs/by-name/wo/woomer/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "coffeeispower";
     repo = "woomer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-puALhN54ma2KToXUF8ipaYysyayjaSp+ISZ3AgQvniw=";
   };
 
diff --git a/pkgs/by-name/wo/wordbook/package.nix b/pkgs/by-name/wo/wordbook/package.nix
index 870a3d762986..479ec385e70f 100644
--- a/pkgs/by-name/wo/wordbook/package.nix
+++ b/pkgs/by-name/wo/wordbook/package.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fushinari";
     repo = "Wordbook";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oiAXSDJJtlV6EIHzi+jFv+Ym1XHCMLx9DN1YRiXZNzc=";
   };
 
diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix
index 51b68e65a280..f1482b28540f 100644
--- a/pkgs/by-name/wo/workout-tracker/package.nix
+++ b/pkgs/by-name/wo/workout-tracker/package.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "jovandeginste";
     repo = "workout-tracker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Sn6SOHrsp1ZgsPntc2+cmlAEPVBUrYv1vKLKAQvT9m4=";
   };
 
diff --git a/pkgs/by-name/wo/world-serpant-search/package.nix b/pkgs/by-name/wo/world-serpant-search/package.nix
index 91dcb00d9e14..50d37cb9f653 100644
--- a/pkgs/by-name/wo/world-serpant-search/package.nix
+++ b/pkgs/by-name/wo/world-serpant-search/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Latrodect";
     repo = "wss-repo-vulnerability-search-manager";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jXTivaXHHt63u9N7w40jyLUU2kg5LxAn50PVpqwUc0M=";
   };
 
diff --git a/pkgs/by-name/ws/wsrepl/package.nix b/pkgs/by-name/ws/wsrepl/package.nix
index 6198287b18fc..7ceb84628f59 100644
--- a/pkgs/by-name/ws/wsrepl/package.nix
+++ b/pkgs/by-name/ws/wsrepl/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "doyensec";
     repo = "wsrepl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Y96p39TjpErGsR5vFS0NxEF/2Tnr2Zk7ULDgNXaXx9o=";
   };
 
diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix
index b92f2f01960b..d12b44ed2792 100644
--- a/pkgs/by-name/wt/wtfis/package.nix
+++ b/pkgs/by-name/wt/wtfis/package.nix
@@ -10,7 +10,7 @@ let
   src = fetchFromGitHub {
     owner = "pirxthepilot";
     repo = "wtfis";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+BJmAFjmj3z/sKJ/L/y6hTClesulpQTpDL9cUNRi6e8=";
   };
 in
diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix
index 7d1589e99ee4..d0083f748fe9 100644
--- a/pkgs/by-name/wy/wyoming-satellite/package.nix
+++ b/pkgs/by-name/wy/wyoming-satellite/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-satellite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KIWhWE9Qaxs72fJ1LRTkvk6QtpBJOFlmZv2od69O15g=";
   };
 
diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix
index cfaeef7b1315..0a686691caa3 100644
--- a/pkgs/by-name/xa/xandikos/package.nix
+++ b/pkgs/by-name/xa/xandikos/package.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "xandikos";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wdEwIVN9dkLVj8oe+2eh5n258pZRfKgLgzVCmwafCis=";
   };
 
diff --git a/pkgs/by-name/xa/xautocfg/package.nix b/pkgs/by-name/xa/xautocfg/package.nix
index 3267374cb50b..c03ac7c28ac2 100644
--- a/pkgs/by-name/xa/xautocfg/package.nix
+++ b/pkgs/by-name/xa/xautocfg/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SFTtech";
     repo = "xautocfg";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-NxfuBknNRicmEAPBeMaNb57gpM0y0t+JmNMKpSNzlQM=";
   };
 
diff --git a/pkgs/by-name/xc/xcrawl3r/package.nix b/pkgs/by-name/xc/xcrawl3r/package.nix
index af65667f7660..27b652b41bd6 100644
--- a/pkgs/by-name/xc/xcrawl3r/package.nix
+++ b/pkgs/by-name/xc/xcrawl3r/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hueristiq";
     repo = "xcrawl3r";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-W1cvSvRnDGFp4br8s/nL+owIGWTJ1bVX6kvmeTLUuuI=";
   };
 
diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix
index bf718efa9f6d..884bcfcecea1 100644
--- a/pkgs/by-name/xe/xeol/package.nix
+++ b/pkgs/by-name/xe/xeol/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xeol-io";
     repo = "xeol";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4fMH07XKMnpX54mS9pAuTBiHcP6nXj8vpuk3f/3ik+k=";
   };
 
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index 3b84f88682cf..f1152d912ad8 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Zirias";
     repo = "xmoji";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-uYynbzexj1MDHcU8tryJLCGmqTfYOmY0vXrHZ3MlZa0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/xn/xnlinkfinder/package.nix b/pkgs/by-name/xn/xnlinkfinder/package.nix
index 85429a64ec70..663f659aadd3 100644
--- a/pkgs/by-name/xn/xnlinkfinder/package.nix
+++ b/pkgs/by-name/xn/xnlinkfinder/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "xnl-h4ck3r";
     repo = "xnLinkFinder";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UMHMWHLJOhEeR+vO4YE3aNzdsvMAXPpQHQgdFf1QeMY=";
   };
 
diff --git a/pkgs/by-name/xo/xortool/package.nix b/pkgs/by-name/xo/xortool/package.nix
index a59eb77d8cf2..bd1caf0e4185 100644
--- a/pkgs/by-name/xo/xortool/package.nix
+++ b/pkgs/by-name/xo/xortool/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "hellman";
     repo = "xortool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xxaWhGUh/r34eS2TJt8c3Q795OsZOoQLXQllJGJTjqY=";
   };
 
diff --git a/pkgs/by-name/xp/xpaste/package.nix b/pkgs/by-name/xp/xpaste/package.nix
index cbee2675b2ce..cec48ddd9d2b 100644
--- a/pkgs/by-name/xp/xpaste/package.nix
+++ b/pkgs/by-name/xp/xpaste/package.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "ossobv";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eVnoLG+06UTOkvGhzL/XS4JBrEwbXYZ1fuNTIW7YAfE=";
   };
 
diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix
index 2860c1198538..80ebf42778d5 100644
--- a/pkgs/by-name/xr/xrootd/package.nix
+++ b/pkgs/by-name/xr/xrootd/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "xrootd";
     repo = "xrootd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-ZU31nsQgs+Gz9mV8LVv4utJ7g8TXN5OxHjNDfQlt38M=";
   };
diff --git a/pkgs/by-name/xs/xsct/package.nix b/pkgs/by-name/xs/xsct/package.nix
index ea1e793b692a..87ca5f91e987 100644
--- a/pkgs/by-name/xs/xsct/package.nix
+++ b/pkgs/by-name/xs/xsct/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "faf0";
     repo = "sct";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-L93Gk7/jcRoUWogWhrOiBvWCCj+EbyGKxBR5oOVjPPU=";
   };
 
diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
index 6bfc252145ad..d1cce330f43d 100644
--- a/pkgs/by-name/xs/xsubfind3r/package.nix
+++ b/pkgs/by-name/xs/xsubfind3r/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "hueristiq";
     repo = "xsubfind3r";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vmcuIa/ebCggLIALbfljJr92GE6veYEl3glm5gH9IZM=";
   };
 
diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index c39830d8bf73..829a4452de76 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xwayland-satellite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=";
   };
 
diff --git a/pkgs/by-name/xw/xwinmosaic/package.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
index ac9b5e741e0d..e833fcb82efc 100644
--- a/pkgs/by-name/xw/xwinmosaic/package.nix
+++ b/pkgs/by-name/xw/xwinmosaic/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "soulthreads";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
   };
 
diff --git a/pkgs/by-name/xx/xxh/package.nix b/pkgs/by-name/xx/xxh/package.nix
index 1bd9b9d36e00..aefc852f97f4 100644
--- a/pkgs/by-name/xx/xxh/package.nix
+++ b/pkgs/by-name/xx/xxh/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3/AU2o72X7FE11NSXC6m9fFhmjzEDZ+OpTXg8yvv62A=";
   };
 
diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index 039e54c1b130..b169667fbbe1 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "yamlfmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI=";
   };
 
diff --git a/pkgs/by-name/ya/yamlpath/package.nix b/pkgs/by-name/ya/yamlpath/package.nix
index 3d3c047bb228..a40cfbaa7318 100644
--- a/pkgs/by-name/ya/yamlpath/package.nix
+++ b/pkgs/by-name/ya/yamlpath/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "wwkimball";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-6N2s/LWFa3mgMQ88rt3IaWk+b2PTWfT7z1mi+ioQEyU=";
   };
 
diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 49b067bcd1e3..050c331e002d 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gIYqWRJI/IZwEyc1Fke/CD8PPoSZvwtvOT0rnK+LFIo=";
   };
 
diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix
index 44b1544ab935..547a88162d31 100644
--- a/pkgs/by-name/ya/yara/package.nix
+++ b/pkgs/by-name/ya/yara/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AecHsUBtBleUkWuYMQ4Tx/PY8cs9j7JwqncBziJD0hA=";
   };
 
diff --git a/pkgs/by-name/ya/yatas/package.nix b/pkgs/by-name/ya/yatas/package.nix
index 987fac48d0a7..bd3e776c0cec 100644
--- a/pkgs/by-name/ya/yatas/package.nix
+++ b/pkgs/by-name/ya/yatas/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "padok-team";
     repo = "YATAS";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gw4aZ7SLUz5WLUb1z4zDtI6Ca0tEWhE5wobp5NRvjkg=";
   };
 
diff --git a/pkgs/by-name/ye/yewtube/package.nix b/pkgs/by-name/ye/yewtube/package.nix
index e457699cb7ec..0509cdaec948 100644
--- a/pkgs/by-name/ye/yewtube/package.nix
+++ b/pkgs/by-name/ye/yewtube/package.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "mps-youtube";
     repo = "yewtube";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I=";
   };
 
diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix
index 5494c8369d24..ecd4c9976ff0 100644
--- a/pkgs/by-name/yo/yofi/package.nix
+++ b/pkgs/by-name/yo/yofi/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "l4l";
     repo = "yofi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg=";
   };
 
diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix
index 78c1b96700f9..df08fa497883 100644
--- a/pkgs/by-name/yo/your_spotify/package.nix
+++ b/pkgs/by-name/yo/your_spotify/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Yooooomi";
     repo = "your_spotify";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-BytHkvm0gfMnsKe2gDTARWYIHBpfAfIisf2p4bmrpMA=";
   };
 
diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix
index 75c4062cc8dc..0d831a9b011a 100644
--- a/pkgs/by-name/yt/ytdownloader/package.nix
+++ b/pkgs/by-name/yt/ytdownloader/package.nix
@@ -17,7 +17,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "aandrew-me";
     repo = "ytDownloader";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-914sEFUVwiHMXwnwZjdeSQmeSPRREeoihLKYYTTKAcs=";
   };
 
diff --git a/pkgs/by-name/yu/yubico-piv-tool/package.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix
index 5e5c6aa07fbc..ed8ef956b590 100644
--- a/pkgs/by-name/yu/yubico-piv-tool/package.nix
+++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubico-piv-tool";
-    rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}";
+    tag = "yubico-piv-tool-${finalAttrs.version}";
     hash = "sha256-ow9SS7YGCZzSxds3WKsHx9/Vxloy9RqvDjpIBJUBSb0=";
   };
 
diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix
index 2efb925d0ca3..b3d262c09ef1 100644
--- a/pkgs/by-name/yu/yutto/package.nix
+++ b/pkgs/by-name/yu/yutto/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "yutto-dev";
     repo = "yutto";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h7ziP3+qHUFs16MuUaUPZ7qspIFCIzExDyUEo12DJIE=";
   };
 
diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index 2cb3a0a97626..50935d6caa40 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "usit-gd";
     repo = "zabbix-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hvLtc6owEOD29Y1oC7EmOOFp9P8hWOuj9N7qhtqkpks=";
   };
 
diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index 15e48676997f..9de0012d1a75 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rpm9v/7twsrImeipz3I7fHUrk98qzkLQ2b4Kz3Rc+GI=";
   };
 
diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 5a749f3b7eab..f977e94be852 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xdWfaXWmqFJuquE7n3moUjGuFqKB90OE6lqPuC3onOg=";
   };
 
diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix
index 865f0bcd8d11..0abf85d292aa 100644
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zenn-dev";
     repo = "zenn-editor";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1+5UaSYtY00F+1oJfovLIBPnmfRnKpIkQHpxb93rO2k=";
     # turborepo requires .git directory
     leaveDotGit = true;
diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix
index 8f03620b48ec..a00562a3f938 100644
--- a/pkgs/by-name/zf/zf/package.nix
+++ b/pkgs/by-name/zf/zf/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "natecraddock";
     repo = "zf";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Rsl8gAfVMeF5CLyPSrtzdgSCvEwPnBwHT4BOF9JQYYo=";
   };
 
diff --git a/pkgs/by-name/zi/zigpy-cli/package.nix b/pkgs/by-name/zi/zigpy-cli/package.nix
index dcca95a3df59..b22cccece337 100644
--- a/pkgs/by-name/zi/zigpy-cli/package.nix
+++ b/pkgs/by-name/zi/zigpy-cli/package.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-69E6PkrCE5S498pO33uEz7g2dV41H0vNfFinUHDATTQ=";
   };
 
diff --git a/pkgs/by-name/zi/zircolite/package.nix b/pkgs/by-name/zi/zircolite/package.nix
index d70c664061c5..ba0623617869 100644
--- a/pkgs/by-name/zi/zircolite/package.nix
+++ b/pkgs/by-name/zi/zircolite/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "wagga40";
     repo = "Zircolite";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9stQa0EMNA/qEN+bU7qBOdcwUR1vMGk70Br6wxRK8cs=";
   };
 
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index dc58437a49f6..e84c1fac2fb1 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "zizmor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fq+J1+CrxFSbCimM8SIshwQciEjRjPcjAmdVKbVV13s=";
   };
 
diff --git a/pkgs/by-name/zk/zkar/package.nix b/pkgs/by-name/zk/zkar/package.nix
index 65b846afa961..0642a4e938dc 100644
--- a/pkgs/by-name/zk/zkar/package.nix
+++ b/pkgs/by-name/zk/zkar/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "phith0n";
     repo = "zkar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F4bGGOZ6ftaSDbsPh3ML9qJoXmdSD6TGc7mt4HOuPkU=";
   };
 
diff --git a/pkgs/by-name/zl/zlint/package.nix b/pkgs/by-name/zl/zlint/package.nix
index f80f752b3d56..3268ecc734c2 100644
--- a/pkgs/by-name/zl/zlint/package.nix
+++ b/pkgs/by-name/zl/zlint/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "zmap";
     repo = "zlint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FFgBRuNvm4Cnjls9y+L256vMGGNu10x7Vh+V9HBon70=";
   };
 
@@ -49,7 +49,7 @@ buildGoModule rec {
       requirements (e.g. CA/Browser Forum Baseline Requirements).
     '';
     homepage = "https://github.com/zmap/zlint";
-    changelog = "https://github.com/zmap/zlint/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/zmap/zlint/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ baloo ];
   };
diff --git a/pkgs/by-name/zn/znapzend/package.nix b/pkgs/by-name/zn/znapzend/package.nix
index 4480b2ceaba4..3c8d4c8566f9 100644
--- a/pkgs/by-name/zn/znapzend/package.nix
+++ b/pkgs/by-name/zn/znapzend/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Sometimes there's a branch with the same name as the tag,
     # confusing fetchFromGitHub. Working around this by prefixing
     # with `refs/tags/`.
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UvaYzzV+5mZAAwSSMzq4fjCu/mzjeSyQdwQRTZGNktM=";
   };
 
diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix
index 46afd4e170b1..0b92a4188293 100644
--- a/pkgs/by-name/zo/zoraxy/package.nix
+++ b/pkgs/by-name/zo/zoraxy/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "tobychui";
     repo = "zoraxy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZjsBGtY6M5jIXylzg4k8U4krwqx5d5VuMiVHAeUIbXY=";
   };
 
diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index c4573028ddec..786a7f1848a8 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0=";
   };
 
diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
index 4eb6f8eb889c..be67560f4c62 100644
--- a/pkgs/by-name/zs/zsh-forgit/package.nix
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-8BMFL3WktkkB8m6asbNeb9swnLWi3jHo012fBXGa8ls=";
   };
 
diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix
index aa96fad5c4c0..e9c1922175a0 100644
--- a/pkgs/desktops/gnome/extensions/impatience/default.nix
+++ b/pkgs/desktops/gnome/extensions/impatience/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
-    rev = "refs/tags/version-${version}";
+    tag = "version-${version}";
     hash = "sha256-Z+tpmmGbC1rgV4U1w6qM3g85FwpRvzHbBCmFCfcmc60=";
   };
 
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index c94fcc29bc6f..c63ecc5b0250 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "libmatekbd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6s8JiuXbBWOHxbNSuO8rglzOCRKlQ9fx/GsYYc08GmI=";
   };
 
diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
index 5ff6d4117b10..e655fdcdbf04 100644
--- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mpizenberg";
     repo = "elm-test-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l3RV+j3wAQ88QGNXLILp7YiUpdk7bkN25Y723pDZw48=";
   };
 
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index db2855be7ae4..a02a0c8c587e 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bGXSlbyV+0RjNtG/6u11xqjcvL7/FhhqdXanv2JlVII=";
   };
 
diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index f0cbb2e8b8e8..1386ef7ab25b 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "teyjus";
     repo = "teyjus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N4XKDd0NFr501PYUdb7PM2sWh0uD1/SUFXoMr10f064=";
   };
 
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 3e9597a6ed29..93de98015198 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "yosys";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LzBx1bxpiPOiRTPgBcjNnuQemZG5xfvtA/NgqUib/6g=";
     fetchSubmodules = true;
     leaveDotGit = true;
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 101ad21ad60f..8c593d09cf35 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rP0qvSb9PxsTMAq0hpB+zdSTHvridyCVdukLUYxdao8=";
   };
 
diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/development/libraries/cassandra-cpp-driver/default.nix
index ff9e0dd77e4d..c0aa85bcf50c 100644
--- a/pkgs/development/libraries/cassandra-cpp-driver/default.nix
+++ b/pkgs/development/libraries/cassandra-cpp-driver/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "datastax";
     repo = "cpp-driver";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q=";
   };
 
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 94a24f21ac9b..6b60966ce713 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (versions) hash;
     owner = "duckdb";
     repo = "duckdb";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
   };
 
   outputs = [ "out" "lib" "dev" ];
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index a98b9ff03baa..c840950140c3 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "malaterre";
     repo = "GDCM";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE=";
   };
 
diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
index d92d5b1a903d..a3b36672295c 100644
--- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
+++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "icamerasrc";
-    rev = "refs/tags/20240926_1446";
+    tag = "20240926_1446";
     hash = "sha256-BpIZxkPmSVKqPntwBJjGmCaMSYFCEZHJa4soaMAJRWE=";
   };
 
diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix
index 562fdd1dbd57..8619f3db1261 100644
--- a/pkgs/development/libraries/imgui/default.nix
+++ b/pkgs/development/libraries/imgui/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ocornut";
     repo = "imgui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM=";
   };
 
diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix
index ae5e06151d3a..142cbd8d2a34 100644
--- a/pkgs/development/libraries/mapbox-gl-qml/default.nix
+++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rinigus";
     repo = "mapbox-gl-qml";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-csk3Uo+AdP1R/T/9gWyWmYFIKuen2jy8wYN3GJznyRE=";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapQtApps = true; # library only
 
   meta = {
-    changelog = "https://github.com/rinigus/mapbox-gl-qml/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
+    changelog = "https://github.com/rinigus/mapbox-gl-qml/releases/tag/${finalAttrs.version}";
     description = "Unofficial Mapbox GL Native bindings for Qt QML";
     homepage = "https://github.com/rinigus/mapbox-gl-qml";
     license = lib.licenses.lgpl3Only;
diff --git a/pkgs/development/libraries/maplibre-native-qt/default.nix b/pkgs/development/libraries/maplibre-native-qt/default.nix
index 26bc312d1338..89230500a68f 100644
--- a/pkgs/development/libraries/maplibre-native-qt/default.nix
+++ b/pkgs/development/libraries/maplibre-native-qt/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "maplibre";
     repo = "maplibre-native-qt";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-h7PFoGJ5P+k5AEv+y0XReYnPdP/bD4nr/uW9jZ5DCy4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix
index 4a5658fa2658..640efea0ec95 100644
--- a/pkgs/development/libraries/maui-core/default.nix
+++ b/pkgs/development/libraries/maui-core/default.nix
@@ -17,7 +17,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nitrux";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-o0Xwh9w0cClMw85FwpQB9CNWoSnzARxs6aGfvCA4BhA=";
   };
 
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 50caf125fcd7..538e5201fd13 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-c-driver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-81UgJ5GboznaK9omhr3ZMOeOQbIru33Ic42tQAazSzw=";
   };
 
diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix
index 5c27f3275cfb..d8536a7395a8 100644
--- a/pkgs/development/libraries/mongocxx/default.nix
+++ b/pkgs/development/libraries/mongocxx/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-cxx-driver";
-    rev = "refs/tags/r${finalAttrs.version}";
+    tag = "r${finalAttrs.version}";
     hash = "sha256-fAOOQyXJ6H4Rt8gRGJnvb5I7E505MOAjNDcFqXUdY+U=";
   };
 
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index 46b297722feb..b10f8097e9b3 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SuperElastix";
     repo = "elastix";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-edUMj8sjku8EVYaktteIDS+ouaN3kg+CXQCeSWKlLDI=";
   };
 
diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix
index 750735ba6786..2f635fa7bd53 100644
--- a/pkgs/development/libraries/science/math/faiss/default.nix
+++ b/pkgs/development/libraries/science/math/faiss/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "faiss";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ=";
   };
 
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index a0bf151938b8..9a1569e7c068 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SimpleITK";
     repo = "SimpleITK";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/FV5NAM9DJ54Vg6/5yn9DCybry+a8lS3fQ3HWLOeOTA=";
   };
 
diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix
index 6cee83f9bce4..77947d5756b7 100644
--- a/pkgs/development/libraries/unicorn/default.nix
+++ b/pkgs/development/libraries/unicorn/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "unicorn-engine";
     repo = "unicorn";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZlQ2WVTToT0OMxK6brsHnchxDwAR5n1wdtZtkTTgWV4=";
   };
 
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 549231806144..db808f96f1ed 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
-    rev = "refs/tags/v${finalAttrs.version}-stable";
+    tag = "v${finalAttrs.version}-stable";
     hash = "sha256-/dtW1E1wYfQEuotclUEOK5+Vg4S7vt1xWhr1lEtu60w=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocolor/default.nix b/pkgs/development/ocaml-modules/ocolor/default.nix
index ebd34a84e684..cd98527fe90e 100644
--- a/pkgs/development/ocaml-modules/ocolor/default.nix
+++ b/pkgs/development/ocaml-modules/ocolor/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "marc-chevalier";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "osQTZGJp9yDoKNa6WoyhViNbRg1ukcD0Jxiu4VxqeUc=";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 4e4a09e22d87..e55fd1c05088 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -60,7 +60,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "ocsigenserver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI=";
   };
 
diff --git a/pkgs/development/ocaml-modules/shine/default.nix b/pkgs/development/ocaml-modules/shine/default.nix
index cea921d91323..97fea591020c 100644
--- a/pkgs/development/ocaml-modules/shine/default.nix
+++ b/pkgs/development/ocaml-modules/shine/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-shine";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-x/ubqPXT89GWYV9KIyzny0rJDB3TBurLX71i0DlvHLU=";
   };
 
diff --git a/pkgs/development/ocaml-modules/xxhash/default.nix b/pkgs/development/ocaml-modules/xxhash/default.nix
index 0b16c4d8c03a..941d01208657 100644
--- a/pkgs/development/ocaml-modules/xxhash/default.nix
+++ b/pkgs/development/ocaml-modules/xxhash/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "314eter";
     repo = "ocaml-xxhash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0+ac5EWV9DCVMT4wOcXC95GVEwsUIZzFn2laSzmK6jE=";
   };
 
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index 64d8aaca2026..1f6ba3bb7fd5 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -15,7 +15,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "pkg-control";
-    rev = "refs/tags/control-${version}";
+    tag = "control-${version}";
     sha256 = "sha256-7beEsdrne50NY4lGCotxGXwwWnMzUR2CKCc20OCjd0g=";
   };
 
diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
index 11f6551375e9..7d368072a1ab 100644
--- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
+++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
@@ -11,7 +11,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "lmarkowsky";
     repo = "fuzzy-logic-toolkit";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-lnYzX4rq3j7rrbD8m0EnrWpbMJD6tqtMVCYu4mlLFCM=";
   };
 
diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index 16e8f3c7caf6..25008d186138 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -12,7 +12,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "statistics";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-k1YJtFrm71Th42IceX7roWaFCxU3284Abl8JAKLG9So=";
   };
 
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix
index 38bd1753ce2c..db6b106165c8 100644
--- a/pkgs/development/octave-modules/symbolic/default.nix
+++ b/pkgs/development/octave-modules/symbolic/default.nix
@@ -20,7 +20,7 @@ buildOctavePackage rec {
   src = fetchFromGitHub {
     owner = "cbm755";
     repo = "octsympy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H2242+1zlke4aLoS3gsHpDfopM5oSZ4IpVR3+xxQ0Dc=";
   };
 
diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix
index 91138974222e..52714c2d6968 100644
--- a/pkgs/development/perl-modules/Tirex/default.nix
+++ b/pkgs/development/perl-modules/Tirex/default.nix
@@ -19,7 +19,7 @@ buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "tirex";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p2P19tifA/AvJatTzboyhtt7W1SwKJQzqpU4oDalfhU=";
   };
 
diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix
index d5eb0b099ed1..52d15818d943 100644
--- a/pkgs/development/php-packages/phing/default.nix
+++ b/pkgs/development/php-packages/phing/default.nix
@@ -12,7 +12,7 @@
     # Upstream no longer provides the composer.lock in their release artifact
     src = fetchgit {
       url = "https://github.com/phingofficial/phing";
-      rev = "refs/tags/${finalAttrs.version}";
+      tag = finalAttrs.version;
       hash = "sha256-eVDHwG8UPvQPrhD3KuO4ZONsnGGbclVs4kNVG+Ac1/E=";
     };
 
diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index fbabd5d5151c..f47ba4528981 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-hKNwAZCK7dS/iBTrigEHSBXnCJQ2btSUDMUrfetiL0s=";
   };
 
diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index 6dfce2f60b93..8c30f36d3e44 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "vimeo";
     repo = "psalm";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-ecORCwTnTKzy/pgfODu9W9I/5xL+8Fo4OgZ5LsYDYLQ=";
   };
 
diff --git a/pkgs/development/php-packages/uuid/default.nix b/pkgs/development/php-packages/uuid/default.nix
index f9093a32c500..f3efc0e8792c 100644
--- a/pkgs/development/php-packages/uuid/default.nix
+++ b/pkgs/development/php-packages/uuid/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php";
     repo = "pecl-networking-uuid";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C4SoSKkCTQOLKM1h47vbBgiHTG+ChocDB9tzhWfKUsw=";
   };
 
diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix
index c4807df9a90c..c9c7c8b5bd5c 100644
--- a/pkgs/development/python-modules/aardwolf/default.nix
+++ b/pkgs/development/python-modules/aardwolf/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skelsec";
     repo = "aardwolf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI=";
   };
 
diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix
index aca3f8e522cc..17f226ddfb97 100644
--- a/pkgs/development/python-modules/accuweather/default.nix
+++ b/pkgs/development/python-modules/accuweather/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "accuweather";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7k5aA9Pm9DWjPXwsmHP6jMhnobVJpsLGPgs3YCvnzco=";
   };
 
diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix
index a9e1528fdbe2..382dcc5b0aaf 100644
--- a/pkgs/development/python-modules/acquire/default.nix
+++ b/pkgs/development/python-modules/acquire/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "acquire";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ii19VnLLq+UGH0bkyUbLzHqZpJOXffIGeP4VZ9QG7D0=";
   };
 
diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix
index 84fe61584547..b813310b808e 100644
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blockdiag";
     repo = "actdiag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o=";
   };
 
diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix
index e0f1122a464e..bc505deef55a 100644
--- a/pkgs/development/python-modules/adafruit-io/default.nix
+++ b/pkgs/development/python-modules/adafruit-io/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "Adafruit_IO_Python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OwTHMyc2ePSdYVuY1h3PY+uDBl6/7fTMXiZC3sZm8fU=";
   };
 
diff --git a/pkgs/development/python-modules/adax-local/default.nix b/pkgs/development/python-modules/adax-local/default.nix
index 0f8cfb62a357..8db965d1da77 100644
--- a/pkgs/development/python-modules/adax-local/default.nix
+++ b/pkgs/development/python-modules/adax-local/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyAdaxLocal";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V3jSBdYDo32oTAGNTvHJi+GSwlL3keSDhXpNpMoCkWs=";
   };
 
diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix
index 173fe1ce76b7..925364817871 100644
--- a/pkgs/development/python-modules/adax/default.nix
+++ b/pkgs/development/python-modules/adax/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyadax";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wmcZtiML02i1XfqpFzni2WDrxutTvP5laVvTAGtNg0Y=";
   };
 
diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix
index ad33e08ef8a9..0b2130a1d180 100644
--- a/pkgs/development/python-modules/adb-enhanced/default.nix
+++ b/pkgs/development/python-modules/adb-enhanced/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ashishb";
     repo = "adb-enhanced";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0HxeL6VGM+HTiAxs3NFRcEFbmH9q+0/pJdGyF1hl4hU=";
   };
 
diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix
index 67170159f348..9ad1bd40b79b 100644
--- a/pkgs/development/python-modules/adblock/default.nix
+++ b/pkgs/development/python-modules/adblock/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ArniDagur";
     repo = "python-adblock";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5g5xdUzH/RTVwu4Vfb5Cb1t0ruG0EXgiXjrogD/+JCU=";
   };
 
diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix
index 8a7345613de7..6b9326076b07 100644
--- a/pkgs/development/python-modules/adext/default.nix
+++ b/pkgs/development/python-modules/adext/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ajschmidt8";
     repo = "adext";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y8BvcSc3vD0FEWiyzW2Oh6PBS2Itjs2sz+9Dzh5yqSg=";
   };
 
diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix
index f7b9d512a34e..55d050b6ecaa 100644
--- a/pkgs/development/python-modules/adguardhome/default.nix
+++ b/pkgs/development/python-modules/adguardhome/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-n55G6ulKcgSSrgPk70D52OO9fp3WURlcRhJQUKrZ1Nk=";
   };
 
diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix
index 550fd5f9db30..0608cc3cac6b 100644
--- a/pkgs/development/python-modules/adjusttext/default.nix
+++ b/pkgs/development/python-modules/adjusttext/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Phlya";
     repo = "adjusttext";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WMWT2os3ADQOc1ogoCFKBEWnb6/CxgtiWmY45bYomks=";
   };
 
diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix
index 78b55e46c0eb..5f82f52dd7da 100644
--- a/pkgs/development/python-modules/adlfs/default.nix
+++ b/pkgs/development/python-modules/adlfs/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "adlfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V0Uzfj9xuPfLgfILwVbtId+B81w/25cO+G1Y/KOEOyI=";
   };
 
diff --git a/pkgs/development/python-modules/aeidon/default.nix b/pkgs/development/python-modules/aeidon/default.nix
index 7438d3a74fe6..99b321358264 100644
--- a/pkgs/development/python-modules/aeidon/default.nix
+++ b/pkgs/development/python-modules/aeidon/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "otsaloma";
     repo = "gaupol";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lhNyeieeiBBm3rNDEU0BuWKeM6XYlOtv1voW8tR8cUM=";
   };
 
diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix
index e4c377895e43..784f27641135 100644
--- a/pkgs/development/python-modules/aesedb/default.nix
+++ b/pkgs/development/python-modules/aesedb/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skelsec";
     repo = "aesedb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nYuMWE03Rsw1XuD/bxccpu8rddeXgS/EKJcO1VBLTLU=";
   };
 
diff --git a/pkgs/development/python-modules/aetcd/default.nix b/pkgs/development/python-modules/aetcd/default.nix
index bc8fc1ce325e..4f6888990e39 100644
--- a/pkgs/development/python-modules/aetcd/default.nix
+++ b/pkgs/development/python-modules/aetcd/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "martyanov";
     repo = "aetcd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g49ppfh8dyGpZeu/HdTDX8RAk5VTcZmqENRpNY12qkg=";
   };
 
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 3181ecda7639..1dd65e73ab4b 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adobe-type-tools";
     repo = "afdko";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I5GKPkbyQX8QNSZgNB3wPKdWwpx8Xkklesu1M7nhgp8=";
   };
 
diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix
index 604452336ffe..fbc2cffabb3d 100644
--- a/pkgs/development/python-modules/afsapi/default.nix
+++ b/pkgs/development/python-modules/afsapi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wlcrs";
     repo = "python-afsapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eE5BsXNtSU6YUhRn4/SKpMrqaYf8tyfLKdxxGOmNJ9I=";
   };
 
diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
index 00bbf90ffbe6..629bf40b52b2 100644
--- a/pkgs/development/python-modules/agate/default.nix
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wireservice";
     repo = "agate";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JVBf21as4DNmGT84dSG+54RIU6PbRBoLPSsWj2FGXxc=";
   };
 
diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix
index 8c9ef8be3c58..915b80077d9e 100644
--- a/pkgs/development/python-modules/agent-py/default.nix
+++ b/pkgs/development/python-modules/agent-py/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ispysoftware";
     repo = "agent-py";
-    rev = "refs/tags/agent-py.${version}";
+    tag = "agent-py.${version}";
     hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE=";
   };
 
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 3f4be1f73200..cb69f73019dc 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "angr";
     repo = "ailment";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uc8iNWrAESDXVpM0TuXYbvQm95CXWLOooUFQ49O3YTg=";
   };
 
diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix
index 0f1a069056f8..43f97d1834b8 100644
--- a/pkgs/development/python-modules/aio-geojson-client/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-client/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zHgqsl278XBr2X8oQOsnIQxfyYuB5G8NLcTNy4oerUI=";
   };
 
diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
index 6ca27df746f6..6a8bbe0c8952 100644
--- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-generic-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/I/n/XXRvm7G16WqVmU+KkyP5DeadqhEpy2EAtDFlCk=";
   };
 
diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
index be94149d8263..87ae9650ab3c 100644
--- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-geonetnz-quakes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RZ+wgLYMl7y3CdmlipsfZGcew1pYSMEhkyyeLqIwVwI=";
   };
 
diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix
index 2726a9493576..1d100f885543 100644
--- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-geonetnz-volcano";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B+jULYeel7efk7fB26zXQyS1ZCsmFVKlOkfnKWFQFJ4=";
   };
 
diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix
index 2e4903ab4910..1c330d99442d 100644
--- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-nsw-rfs-incidents";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JOvmUWrmYQt2hJ9u08Aliv9ImI3AOTk4uBx3Pv8/7/c=";
   };
 
diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix
index b2386179b9bc..538f76925af0 100644
--- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix
+++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-usgs-earthquakes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UzLnctft/D38bqClqyyJ4b5GvVXM4CFSd6TypuLo0Y4=";
   };
 
diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix
index 7bdf88b7654a..25bb352c7976 100644
--- a/pkgs/development/python-modules/aio-georss-client/default.nix
+++ b/pkgs/development/python-modules/aio-georss-client/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-georss-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2qo5G/L2yh/6IXswkOyrCYnBNLDLx3EOpR53lnnpNOo=";
   };
 
diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix
index c0741c8ff67c..24b0823106a3 100644
--- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix
+++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-georss-gdacs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PhOI0v3dKTNGZLk1/5wIgvQkm4Cwfr1UYilr5rW7e3g=";
   };
 
diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix
index 95759d541fb8..be413b5dae74 100644
--- a/pkgs/development/python-modules/aio-pika/default.nix
+++ b/pkgs/development/python-modules/aio-pika/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = "aio-pika";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4MweCuZbo/XDur9iwM3MT/P75HjEQvMlPI82bDxuol8=";
   };
 
diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix
index cb16f0513039..a0cb33f61d23 100644
--- a/pkgs/development/python-modules/aioacaia/default.nix
+++ b/pkgs/development/python-modules/aioacaia/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "aioacaia";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XtHze2EYLSGm3u8aG6vbogqki83k1mBKy/bC8gCCoWQ=";
   };
 
diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix
index 99fddd49b095..2b72cbe81adf 100644
--- a/pkgs/development/python-modules/aioairq/default.nix
+++ b/pkgs/development/python-modules/aioairq/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CorantGmbH";
     repo = "aioairq";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Bgzwu/9Eu3Miw0eFb0b9jbD8yuPcBlJFnVyom+CsZBE=";
   };
 
diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix
index 685e50650602..fdc89dc5b927 100644
--- a/pkgs/development/python-modules/aioairzone-cloud/default.nix
+++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "aioairzone-cloud";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-H78vlCGJhIE1/utX4Dh1vssOwYnQxCytsEs+hpOPVtM=";
   };
 
diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index 6614f076706e..53049d5ba648 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "aioairzone";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZD/lJwYiggE7fUVGjimgGQ+H8zCtOZrZRElc0crrKhw=";
   };
 
diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix
index a41e251ac99f..f6e6bb6e0213 100644
--- a/pkgs/development/python-modules/aioambient/default.nix
+++ b/pkgs/development/python-modules/aioambient/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aioambient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GedGwG4Lm28BvfSBOGcspUQ3LCmdb2IC2rLifuKGOes=";
   };
 
diff --git a/pkgs/development/python-modules/aioapcaccess/default.nix b/pkgs/development/python-modules/aioapcaccess/default.nix
index 104e09fac8ba..0b08769534ee 100644
--- a/pkgs/development/python-modules/aioapcaccess/default.nix
+++ b/pkgs/development/python-modules/aioapcaccess/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yuxincs";
     repo = "aioapcaccess";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nI8hfHfSLMOKPcG5idYqqa/msJuR/Xt+JmgzdftlN28=";
   };
 
diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix
index 15822fe46e53..f1f306deac3a 100644
--- a/pkgs/development/python-modules/aioaseko/default.nix
+++ b/pkgs/development/python-modules/aioaseko/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milanmeu";
     repo = "aioaseko";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jUvpu/lOFKRUwEuYD1zRp0oODjf4AgH84fnGngtv9jw=";
   };
 
diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix
index 5847da65b28b..d9e9492cbec2 100644
--- a/pkgs/development/python-modules/aioasuswrt/default.nix
+++ b/pkgs/development/python-modules/aioasuswrt/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kennedyshead";
     repo = "aioasuswrt";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-RQxIgAU9KsTbcTKc/Zl+aP77lbDSeiYzR48MtIVwacc=";
   };
 
diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 9caf6af5bbbf..9c05c265f905 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Thomas55555";
     repo = "aioautomower";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk=";
   };
 
diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix
index 70be2375adf9..db244468ca8c 100644
--- a/pkgs/development/python-modules/aioazuredevops/default.nix
+++ b/pkgs/development/python-modules/aioazuredevops/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "aioazuredevops";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RZBiFPzYtEoc51T3irVHL9xVlZgACyM2lu1TkMoatqU=";
   };
 
diff --git a/pkgs/development/python-modules/aiobafi6/default.nix b/pkgs/development/python-modules/aiobafi6/default.nix
index 632b3d7d5b19..17f5df7a0941 100644
--- a/pkgs/development/python-modules/aiobafi6/default.nix
+++ b/pkgs/development/python-modules/aiobafi6/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jfroy";
     repo = "aiobafi6";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QxjrspvNrcMcGChjj1B4QF/SnWCsGmPxnI2bWAL6BiI=";
   };
 
diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix
index 6b92ffd909ef..52dbad4fedc0 100644
--- a/pkgs/development/python-modules/aiobiketrax/default.nix
+++ b/pkgs/development/python-modules/aiobiketrax/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "basilfx";
     repo = "aiobiketrax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N0v5SCTf3NkW/TCSTQL9VkrDj7/GXEejJGFCvJY4pIc=";
   };
 
diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix
index 24e17c54edda..a98074369074 100644
--- a/pkgs/development/python-modules/aioblescan/default.nix
+++ b/pkgs/development/python-modules/aioblescan/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frawau";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc=";
   };
 
diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index ce5194a937eb..469573ab4da8 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "terrycain";
     repo = "aioboto3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g86RKQxTcfG1CIH3gfgn9Vl9JxUkeC1ztmLk4q/MVn0=";
   };
 
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index c21b2e2ad4dc..e6a996ae712a 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiobotocore";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kPSkvvXBBwnWrdf0jmDNiTG6T1qpm5pNcPDHpnMFdmc=";
   };
 
diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix
index d1e87d08deaa..3fd703919c2d 100644
--- a/pkgs/development/python-modules/aiocache/default.nix
+++ b/pkgs/development/python-modules/aiocache/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiocache";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4QYCRXMWlt9fsiWgUTc2pKzXG7AG/zGmd4HT5ggIZNM=";
   };
 
diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix
index 4cc00dd93d2b..59d4912c64d1 100644
--- a/pkgs/development/python-modules/aiocoap/default.nix
+++ b/pkgs/development/python-modules/aiocoap/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrysn";
     repo = "aiocoap";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-a2qhMDFkRbMK4+xvPc140i0lPaWbTWeFlpvdLaNtOxA=";
   };
 
diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix
index 6a5cda68ee0a..fe285194d4b5 100644
--- a/pkgs/development/python-modules/aiocomelit/default.nix
+++ b/pkgs/development/python-modules/aiocomelit/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aiocomelit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1XH2RwdnXDi57FUf1R7HLiFFNxyT3A6MroZ+kk1xIGo=";
   };
 
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 7b8bc059e731..fd057e035489 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vxgmichel";
     repo = "aioconsole";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs=";
   };
 
diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix
index f4697daee6c8..468a45e2146c 100644
--- a/pkgs/development/python-modules/aiocsv/default.nix
+++ b/pkgs/development/python-modules/aiocsv/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MKuranowski";
     repo = "aiocsv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NnRLBXvQj25dSHc8ZnUaPT8Oiy2EyHLIb8IJPQliyPg=";
   };
 
diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix
index 944904ae2cae..e1c86d9588b6 100644
--- a/pkgs/development/python-modules/aiocurrencylayer/default.nix
+++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "aiocurrencylayer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VOzgWN+dDPaGEcahFPSWjBR989b9eNkx4zcnI9o2Xiw=";
   };
 
diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index d81acb340b7f..4c2e2d5f47eb 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodiscover";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A12YeNIm9Pv4zpzaejTk8VvLzKLHxZV2EzVpchLX1k8=";
   };
 
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 95b17ac6a25a..dcced039f800 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "saghul";
     repo = "aiodns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aXae9/x0HVp4KqydCf5/+p5PlSKUQ5cE3iVeD08rtf0=";
   };
 
diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix
index 01e0fa7cae1a..4a724b5ab183 100644
--- a/pkgs/development/python-modules/aiodukeenergy/default.nix
+++ b/pkgs/development/python-modules/aiodukeenergy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hunterjm";
     repo = "aiodukeenergy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aDBleEp3ZlY1IfFCbsUEU+wzYgjNaJeip8crHlh5qHE=";
   };
 
diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix
index 170ff6308f40..056e9bd6b8eb 100644
--- a/pkgs/development/python-modules/aioeafm/default.nix
+++ b/pkgs/development/python-modules/aioeafm/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Jc2k";
     repo = "aioeafm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bL59EPvFd5vjay2sqBPGx+iL5sE/0n/EtR4K7obtDBE=";
   };
 
diff --git a/pkgs/development/python-modules/aioeagle/default.nix b/pkgs/development/python-modules/aioeagle/default.nix
index 3c931fe69ef8..802090bfef69 100644
--- a/pkgs/development/python-modules/aioeagle/default.nix
+++ b/pkgs/development/python-modules/aioeagle/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioeagle";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZO5uODCGebggItsEVKtis0uwU67dmSxc7DHzzkBZ9oQ=";
   };
 
diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix
index b871411b0163..c8e73355bc3c 100644
--- a/pkgs/development/python-modules/aioecowitt/default.nix
+++ b/pkgs/development/python-modules/aioecowitt/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QfUawUtkNl2molropV8NSU7Kfm/D5/xuaPCjgm2TVOs=";
   };
 
diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix
index 4d75deb11315..322867677dda 100644
--- a/pkgs/development/python-modules/aioelectricitymaps/default.nix
+++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "aioelectricitymaps";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l6D5Cr2d89n+Ac5V5geBUY0sOiEO3sci9244K0MI+dc=";
   };
 
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index c682fde87681..f4b8f6b7f5ad 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vMqDxg2BV9/g5FquejnT/Rsvwjhdh01K2LxiT355p1U=";
   };
 
diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix
index 0f9b5966805e..2a7f28b35151 100644
--- a/pkgs/development/python-modules/aiofile/default.nix
+++ b/pkgs/development/python-modules/aiofile/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = "aiofile";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KBly/aeHHZh7mL8MJ9gmxbqS7PmR4sedtBY/2HCXt54=";
   };
 
diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
index 8334a339d2eb..8aafdcf4587c 100644
--- a/pkgs/development/python-modules/aiofiles/default.nix
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tinche";
     repo = "aiofiles";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uDKDMSNbMIlAaifpEBh1+q2bdZNUia8pPb30IOIgOAE=";
   };
 
diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix
index a67453821a8d..5e3056b755e0 100644
--- a/pkgs/development/python-modules/aioflo/default.nix
+++ b/pkgs/development/python-modules/aioflo/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aioflo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ=";
   };
 
diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix
index 5f4a3c28d154..7104ef0bbbdd 100644
--- a/pkgs/development/python-modules/aiogithubapi/default.nix
+++ b/pkgs/development/python-modules/aiogithubapi/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "aiogithubapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z7l7Qx9Kg1FZ9nM0V2NzTyi3gbE2hakbc/GZ1CzDmKw=";
   };
 
diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index afd3fd33190a..db71a552bdc2 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aioguardian";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7fY8+aAxlDtOBLu8SadY5qiH6+RvxnFpOw1RXTonP2o=";
   };
 
diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index c8e1d431eeef..d20af3ace4d3 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiohappyeyeballs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zf1EkS+cdCkttce2jCjRf1693AlBYkmAuLX5IysWeUs=";
   };
 
diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index ea40af561d4d..09c40c51ed93 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-E+2IQy3O+ccvZfjlORo+eTd+l41FSXk1dIE2Adrn3Ok=";
   };
 
diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index ffeb8fcbf3c9..07905fe16a14 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Jc2k";
     repo = "aiohomekit";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-E7N/FFUFsur0y9H5Pp7ol/9bytwUU5EG8E68TMF5tJ8=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/pkgs/development/python-modules/aiohttp-basicauth/default.nix
index eede039d4854..0c6d0b622ab6 100644
--- a/pkgs/development/python-modules/aiohttp-basicauth/default.nix
+++ b/pkgs/development/python-modules/aiohttp-basicauth/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "romis2012";
     repo = "aiohttp-basicauth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DjwrMlkVVceA5kDzm0c/on0VMOxyMMA3Hu4Y2Tiu0lI=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
index 2abb85df7706..5063e4313224 100644
--- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
+++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiohttp-fast-zlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fvZVviKN/CL42Zmmm6k/JNdeAljRoqN63rlduNJVr98=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-middlewares/default.nix b/pkgs/development/python-modules/aiohttp-middlewares/default.nix
index b772542fa52c..f762840561a2 100644
--- a/pkgs/development/python-modules/aiohttp-middlewares/default.nix
+++ b/pkgs/development/python-modules/aiohttp-middlewares/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "playpauseandstop";
     repo = "aiohttp-middlewares";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jUH1XhkytRwR76wUTsGQGu6m8s+SZ/GO114Lz9atwE8=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix
index 43ffc4d3c249..b9377de4daf1 100644
--- a/pkgs/development/python-modules/aiohttp-remotes/default.nix
+++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp-remotes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/bcYrpZfO/sXc0Tcpr67GBqCu4ZSAVmUj9kzupIHHnM=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix
index c00c668ad1e1..86d44c375b35 100644
--- a/pkgs/development/python-modules/aiohttp-retry/default.nix
+++ b/pkgs/development/python-modules/aiohttp-retry/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inyutin";
     repo = "aiohttp_retry";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9riIGQDxC+Ee16itSWJWobPkmuy7Mkn2eyTkevIGse8=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-session/default.nix b/pkgs/development/python-modules/aiohttp-session/default.nix
index 78d044573bcd..938cd1294860 100644
--- a/pkgs/development/python-modules/aiohttp-session/default.nix
+++ b/pkgs/development/python-modules/aiohttp-session/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp-session";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mGWtHo/+jdCmv3TmUUv42hWSiLzPiP5ytB25pVyvZig=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp-sse-client2/default.nix b/pkgs/development/python-modules/aiohttp-sse-client2/default.nix
index f4d3709a3d91..134f23974c54 100644
--- a/pkgs/development/python-modules/aiohttp-sse-client2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-sse-client2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "compat-fork";
     repo = "aiohttp-sse-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uF39gpOYzNotVVYQShUoiuvYAhSRex2T1NfuhgwSCR4=";
   };
 
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 3d681d212dfc..5d8ae4defe57 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3pZPiDnAlsKX5kXH9OQzhmkBZ0vD2qiy2lpKdvV2vW8=";
   };
 
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index e681b6026a28..0cf7dcaa5b65 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aiohue";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uS6pyJOntjbGa9UU1g53nuzgfP6AKAzN4meHrZY6Uic=";
   };
 
diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix
index 737a0a3d8e97..3946992eb8fd 100644
--- a/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/pkgs/development/python-modules/aioimaplib/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bamthomas";
     repo = "aioimaplib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TjCPGZGsSb+04kQNzHU3kWBo2vY34ujEqh1GIMIehJc=";
   };
 
diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix
index 5bf409ed276e..d60948f05940 100644
--- a/pkgs/development/python-modules/aiojellyfin/default.nix
+++ b/pkgs/development/python-modules/aiojellyfin/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Jc2k";
     repo = "aiojellyfin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A+uvM1/7HntRMIdknfHr0TMGIjHk7BCwsZopXdVoEO8=";
   };
 
diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix
index 469d724e54a7..1cc7d77c0bb0 100644
--- a/pkgs/development/python-modules/aiojobs/default.nix
+++ b/pkgs/development/python-modules/aiojobs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiojobs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FNc71YyAjtR+hd0UOqFAy6XW0PwHSlM76C3ecPM5vsU=";
   };
 
diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix
index 131f0c041323..b971ef3f3946 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/pkgs/development/python-modules/aiokafka/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiokafka";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OU/Kept3TvMfGvVCjSthfZnfTX6/T0Fy3PS/ynrV3Cg=";
   };
 
diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix
index 70641f450e75..d448d3482463 100644
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Djelibeybi";
     repo = "aiolifx-themes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MeGhtjdvtL0armoLrlqPsV4SUCTWbkBvRTj6ReuKQpQ=";
   };
 
diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix
index ab251f3f820d..25f843ddb5b3 100644
--- a/pkgs/development/python-modules/aiolookin/default.nix
+++ b/pkgs/development/python-modules/aiolookin/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ANMalko";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI=";
   };
 
diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix
index 9119e2e3b536..40a6d72f4e5a 100644
--- a/pkgs/development/python-modules/aiolyric/default.nix
+++ b/pkgs/development/python-modules/aiolyric/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "aiolyric";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pN/F4Rdov06sm1yfJQEzmWyujWVeVU+bNGGkgnN4jYw=";
   };
 
diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index af7b7643fbc3..7ed0e7fb239e 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-mealie";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hcHXX95d9T/jJMqHkikWN8ZdM5MRxJxhH575U3KDXxY=";
   };
 
diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix
index 69963a465060..e985b6281c9f 100644
--- a/pkgs/development/python-modules/aiomqtt/default.nix
+++ b/pkgs/development/python-modules/aiomqtt/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sbtinstruments";
     repo = "aiomqtt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8=";
   };
 
diff --git a/pkgs/development/python-modules/aiomultiprocess/default.nix b/pkgs/development/python-modules/aiomultiprocess/default.nix
index b1fc1479b7f3..ac27948df982 100644
--- a/pkgs/development/python-modules/aiomultiprocess/default.nix
+++ b/pkgs/development/python-modules/aiomultiprocess/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "aiomultiprocess";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LWrAr3i2CgOMZFxWi9B3kiou0UtaHdDbpkr6f9pReRA=";
   };
 
diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix
index 32245aec5a01..3ec1903f0228 100644
--- a/pkgs/development/python-modules/aiomusiccast/default.nix
+++ b/pkgs/development/python-modules/aiomusiccast/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vigonotion";
     repo = "aiomusiccast";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V4xl2QY+pPEnJtx7dxSNj/aXqHvV9Z6uuWgbVHNyLjA=";
   };
 
diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix
index 62abc53330da..09f69113a75b 100644
--- a/pkgs/development/python-modules/aiomysql/default.nix
+++ b/pkgs/development/python-modules/aiomysql/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiomysql";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m/EgoBU3e+s3soXyYtACMDSjJfMLBOk/00qPtgawwQ8=";
   };
 
diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix
index 18b77947fbdd..0c0894ae1dfe 100644
--- a/pkgs/development/python-modules/aionanoleaf/default.nix
+++ b/pkgs/development/python-modules/aionanoleaf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milanmeu";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0=";
   };
 
diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
index 50336dddb687..fb7ab4d6bad1 100644
--- a/pkgs/development/python-modules/aionotion/default.nix
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aionotion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BsbfLb5wCVxR8v2U2Zzt7LMl7XJcZWfVjZN47VDkhFc=";
   };
 
diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix
index cfcefeb33028..42eccd0b8181 100644
--- a/pkgs/development/python-modules/aionut/default.nix
+++ b/pkgs/development/python-modules/aionut/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aionut";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DCWfa5YfrB7MTf78AeSHDgiZzLNXoiNLnty9a+Sr9tQ=";
   };
 
diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix
index 4925d8d34448..b0500a529925 100644
--- a/pkgs/development/python-modules/aiooncue/default.nix
+++ b/pkgs/development/python-modules/aiooncue/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TKOpx+twnG9zj7RcwOn53ebT7eyLOFKyxChp9lCdoU8=";
   };
 
diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index e9d79583dc07..0d07d93cc213 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aioopenexchangerates";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Rb5oCheiTZ737nKDwSpoRZcgpWPt5YMzplD6Wb6kZxY=";
   };
 
diff --git a/pkgs/development/python-modules/aioopenssl/default.nix b/pkgs/development/python-modules/aioopenssl/default.nix
index e51b023a3072..1268a44732bb 100644
--- a/pkgs/development/python-modules/aioopenssl/default.nix
+++ b/pkgs/development/python-modules/aioopenssl/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "horazont";
     repo = "aioopenssl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7Q+4/DlP+kUnC3YNk7woJaxLEEiuVmolUOajepM003Q=";
   };
 
diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix
index 6f646429f35a..66cbbd0555a1 100644
--- a/pkgs/development/python-modules/aiooss2/default.nix
+++ b/pkgs/development/python-modules/aiooss2/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "karajan1001";
     repo = "aiooss2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6tkJG6Jjvo2OaN9cRbs/7ApcrKiZ5tGSPUfugAx7iJU=";
   };
 
diff --git a/pkgs/development/python-modules/aiooui/default.nix b/pkgs/development/python-modules/aiooui/default.nix
index ec2dfb2f035c..5e62b5dadb4a 100644
--- a/pkgs/development/python-modules/aiooui/default.nix
+++ b/pkgs/development/python-modules/aiooui/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "aiooui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vnO3Lh+d/8mES2i4jKTH4RviURUFqb3Vj6u5sxUGf1o=";
   };
 
diff --git a/pkgs/development/python-modules/aiopegelonline/default.nix b/pkgs/development/python-modules/aiopegelonline/default.nix
index f5d48b63b40d..c7d67b67b184 100644
--- a/pkgs/development/python-modules/aiopegelonline/default.nix
+++ b/pkgs/development/python-modules/aiopegelonline/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "aiopegelonline";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kDz+q4Y6ImgXbY7OSC/PKXPtKdktixW+ee51xHMX9o4=";
   };
 
diff --git a/pkgs/development/python-modules/aiopinboard/default.nix b/pkgs/development/python-modules/aiopinboard/default.nix
index f6785c7facb2..fe245a6ddd1a 100644
--- a/pkgs/development/python-modules/aiopinboard/default.nix
+++ b/pkgs/development/python-modules/aiopinboard/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "aiopinboard";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/N9r17e0ZvPmcqW/XtRyAENKCGRzWqeOSKPpWHHYomg=";
   };
 
diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix
index bc6ec70a0753..df687d46b61a 100644
--- a/pkgs/development/python-modules/aiopurpleair/default.nix
+++ b/pkgs/development/python-modules/aiopurpleair/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4=";
   };
 
diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix
index c12db2b0bb83..b7582d18d38a 100644
--- a/pkgs/development/python-modules/aiopvapi/default.nix
+++ b/pkgs/development/python-modules/aiopvapi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sander76";
     repo = "aio-powerview-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WtTqtVr1oL86dpsAIK55pbXWU4X/cajVLlggd6hfM4c=";
   };
 
diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix
index 2bfae84e1e76..ae8d7c7c72d8 100644
--- a/pkgs/development/python-modules/aiopvpc/default.nix
+++ b/pkgs/development/python-modules/aiopvpc/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "azogue";
     repo = "aiopvpc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1xeXfhoXRfJ7vrpRPeYmwcAGjL09iNCOm/f4pPvuZLU=";
   };
 
diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix
index a957998de354..8bf48eb20ee2 100644
--- a/pkgs/development/python-modules/aiopyarr/default.nix
+++ b/pkgs/development/python-modules/aiopyarr/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkdrob";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CzNB6ymvDTktiOGdcdCvWLVQ3mKmbdMpc/vezSXCpG4=";
   };
 
diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix
index 10fb274215f4..b2eecc0768c2 100644
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-h/rTwMF3lc/hWwpzCvK6UMq0rjq3xkw/tEY3BqOPS2s=";
   };
 
diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix
index 1d48f37e930c..ce0a052bd47c 100644
--- a/pkgs/development/python-modules/aioraven/default.nix
+++ b/pkgs/development/python-modules/aioraven/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cottsay";
     repo = "aioraven";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ux2jeXkh8YsJ6mItXOx40pp0Tc+aJXMV7ZqyZg+iy2c=";
   };
 
diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix
index 57a59497bbc6..6153b430b065 100644
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Rj0+r7eERLY5VzmuDQH/TeVLfmvmKwPqcvd1b/To0Ts=";
   };
 
diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix
index da7c4322b7be..0d152d1de607 100644
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-B5k8uXDHq0U6fJVW8oy2sWUj5OIVGUfe9EtCjnIr3OE=";
   };
 
diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix
index 0c80e4354264..1565f4814b6b 100644
--- a/pkgs/development/python-modules/aiormq/default.nix
+++ b/pkgs/development/python-modules/aiormq/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = "aiormq";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3+PoDB5Owy8BWBUisX0i1mV8rqs5K9pBFQwup8vKxlg=";
   };
 
diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index 14039f9b36a6..c23aea20ddae 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MartinHjelmare";
     repo = "aiortm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m62VEmrmczNxBLBEmLKP3vEi14BuwLA2WwtLOU436hY=";
   };
 
diff --git a/pkgs/development/python-modules/aiortsp/default.nix b/pkgs/development/python-modules/aiortsp/default.nix
index 0e3920cfd6a8..b55813c468b4 100644
--- a/pkgs/development/python-modules/aiortsp/default.nix
+++ b/pkgs/development/python-modules/aiortsp/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marss";
     repo = "aiortsp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/ydsu+53WOocdWk3AW0/cXBEx1qAlhIC0LUDy459pbQ=";
   };
 
diff --git a/pkgs/development/python-modules/aioruckus/default.nix b/pkgs/development/python-modules/aioruckus/default.nix
index 554c38b3f210..86eb1b659cdc 100644
--- a/pkgs/development/python-modules/aioruckus/default.nix
+++ b/pkgs/development/python-modules/aioruckus/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ms264556";
     repo = "aioruckus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UfyB3qGEDOQ39YA1AueCBXeoJhGH+XDCLZSFA+kpT2k=";
   };
 
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index 53cfadb2118a..57f8f5acdc91 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cjrh";
     repo = "aiorun";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7wgsj44sX2Be/QyvG7KgQ/xSgsr+WPh7eeROeICSHGw=";
   };
 
diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index 67c18c76f2fb..88b55ddd91f4 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "noahhusby";
     repo = "aiorussound";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-y1ArQ4o9RRngJFT3uk3wO/EVZu3kWYXUx2pnTSFUruc=";
   };
 
diff --git a/pkgs/development/python-modules/aioruuvigateway/default.nix b/pkgs/development/python-modules/aioruuvigateway/default.nix
index ac167e943bc5..55e27ec05fbd 100644
--- a/pkgs/development/python-modules/aioruuvigateway/default.nix
+++ b/pkgs/development/python-modules/aioruuvigateway/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "akx";
     repo = "aioruuvigateway";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Etv+kPFYEK79hpDeNmDfuyNj1vJ6udry1u+TRO5gLV4=";
   };
 
diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix
index 91a492542718..8fbdebeb9838 100644
--- a/pkgs/development/python-modules/aiorwlock/default.nix
+++ b/pkgs/development/python-modules/aiorwlock/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiorwlock";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QwjwuXjaxE1Y+Jzn8hJXY4wKltAT8mdOM7jJ9MF+DhA=";
   };
 
diff --git a/pkgs/development/python-modules/aiosasl/default.nix b/pkgs/development/python-modules/aiosasl/default.nix
index fe977cc1bbec..484d24e7d862 100644
--- a/pkgs/development/python-modules/aiosasl/default.nix
+++ b/pkgs/development/python-modules/aiosasl/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "horazont";
     repo = "aiosasl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JIuNPb/l4QURMQc905H2iNGCfMz+zM/QJhDQOR8LPdc=";
   };
 
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index 18402b604388..551073c5fd99 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioshelly";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QcVyWabELa1bB2MOwQNPItXLgeOXlFpRh69dS+m1FLI=";
   };
 
diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix
index aae881ce671d..44058048114f 100644
--- a/pkgs/development/python-modules/aioshutil/default.nix
+++ b/pkgs/development/python-modules/aioshutil/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kumaraditya303";
     repo = "aioshutil";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hSUNx43sIUPs4YfQ+H39FXTpj3oCMUqRzDdHX2OdRdE=";
   };
 
diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix
index d67a770f18fd..ad4e4c883c36 100644
--- a/pkgs/development/python-modules/aioskybell/default.nix
+++ b/pkgs/development/python-modules/aioskybell/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkdrob";
     repo = "aioskybell";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5F0B5z0pJLKJPzKIowE07vEgmNXnDVEeGFbPGnJ6H9I=";
   };
 
diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index f7d183bb1d61..747b6b7a05ba 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioslimproto";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3soqvZld92ohCEwTFaMIOC+cvOjBQyVQOoLmKr53aMA=";
   };
 
diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix
index ff9cb38cd6ba..28d13a1f6dcb 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/pkgs/development/python-modules/aiosmtpd/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiosmtpd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ih/xbWM9O/fFQiZezydlPlIr36fLRc2lLgdfxD5Jviw=";
   };
 
diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix
index 59e0fc5bd597..12c49c681005 100644
--- a/pkgs/development/python-modules/aiosmtplib/default.nix
+++ b/pkgs/development/python-modules/aiosmtplib/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cole";
     repo = "aiosmtplib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1GuxlgNvzVv6hEQY1Mkv7NxAoOik9gpIS90a6flfC+k=";
   };
 
diff --git a/pkgs/development/python-modules/aiosolaredge/default.nix b/pkgs/development/python-modules/aiosolaredge/default.nix
index b05f1b84cc6e..5fd9bc08a973 100644
--- a/pkgs/development/python-modules/aiosolaredge/default.nix
+++ b/pkgs/development/python-modules/aiosolaredge/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiosolaredge";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1C74U5HWDTJum1XES21t1uIJwm0YW3l041mwvqY/dA4=";
   };
 
diff --git a/pkgs/development/python-modules/aiosonic/default.nix b/pkgs/development/python-modules/aiosonic/default.nix
index ec52ae7cbea4..739daea01132 100644
--- a/pkgs/development/python-modules/aiosonic/default.nix
+++ b/pkgs/development/python-modules/aiosonic/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sonic182";
     repo = "aiosonic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wBYGiSTSRhi11uqTyGgF1YpnBVoDraCr2GKC8VkQEWc=";
   };
 
diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index f70c95060269..99f55bb586ae 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nackjicholson";
     repo = "aiosql";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WvYCMImLrQjaTrMgDrkF1fOUv/pxbwFHT+SwOZkTMl0=";
   };
 
diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix
index 4fdd1c6a67b7..e96151d4df66 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/pkgs/development/python-modules/aiosqlite/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4=";
   };
 
diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix
index 31e9ff403b7f..161042ababec 100644
--- a/pkgs/development/python-modules/aiosteamist/default.nix
+++ b/pkgs/development/python-modules/aiosteamist/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiosteamist";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vqCcQDUMFFhIOoiER5TMOxJPY7HYFS4K1fuu/1IqP44=";
   };
 
diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix
index 184f889bd209..3d4bbd2dc63b 100644
--- a/pkgs/development/python-modules/aiostream/default.nix
+++ b/pkgs/development/python-modules/aiostream/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vxgmichel";
     repo = "aiostream";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hRbPK1JsB/JQuSjj81YMUAI8eDUyXCOFhdW22ZJ47xU=";
   };
 
diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix
index 3e5ebb220eac..e694ac41240e 100644
--- a/pkgs/development/python-modules/aiostreammagic/default.nix
+++ b/pkgs/development/python-modules/aiostreammagic/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "noahhusby";
     repo = "aiostreammagic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CFd8/nyE3hLbmzO/MJEnllIe2MvfD/jkGIpNdYxI8N0=";
   };
 
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index f2f3ec34aebf..60d8ef96bbf1 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TomerFi";
     repo = "aioswitcher";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cKHH1yXVm/kZigO1Ub0XZEv+yq4lROc4SGFLqFuwQto=";
   };
 
diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix
index 7a613b0705ba..f432c6b5fd86 100644
--- a/pkgs/development/python-modules/aiotankerkoenig/default.nix
+++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "aiotankerkoenig";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WRR4CLVkHN1JR4rwNu0ULoiu0zO0M2YdvCHYp0Tt9VU=";
   };
 
diff --git a/pkgs/development/python-modules/aiotarfile/default.nix b/pkgs/development/python-modules/aiotarfile/default.nix
index cdbbe5aa95bb..0aacdea54241 100644
--- a/pkgs/development/python-modules/aiotarfile/default.nix
+++ b/pkgs/development/python-modules/aiotarfile/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhelmot";
     repo = "aiotarfile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DslG+XxIYb04I3B7m0fmRmE3hFCczF039QhSVdHGPL8=";
   };
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix
index a0eb4b1b1f79..b5c297904331 100644
--- a/pkgs/development/python-modules/aiotractive/default.nix
+++ b/pkgs/development/python-modules/aiotractive/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zhulik";
     repo = "aiotractive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QwwW/UxRgd4rco80SqQUGt0ArDNT9MXa/U/W2/dHZT0=";
   };
 
diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix
index e8e4bf09195c..36484f7b2047 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kane610";
     repo = "aiounifi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QuECmv/xWTNsC42JmPlYwN710Pu6L9jNbtOPJsUdM9k=";
   };
 
diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix
index e715d99833f8..ca5fbc50dc47 100644
--- a/pkgs/development/python-modules/aiounittest/default.nix
+++ b/pkgs/development/python-modules/aiounittest/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kwarunek";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7lDOI1SHPpRZLTHRTmfbKlZH18T73poJdFyVmb+HKms=";
   };
 
diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix
index 370b28cb6f76..17f9744bfb08 100644
--- a/pkgs/development/python-modules/aiowaqi/default.nix
+++ b/pkgs/development/python-modules/aiowaqi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-waqi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YWTGEOSSkZ0XbZUE3k+Dn9qg8Pmwip9wCp8e/j1D9io=";
   };
 
diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix
index 9932f9f82220..59ce8c177a84 100644
--- a/pkgs/development/python-modules/aiowatttime/default.nix
+++ b/pkgs/development/python-modules/aiowatttime/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c5L+Nx+CoWEc6Bs61GOHPBelExe5I7EOlMQ+QV6nktI=";
   };
 
diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix
index a9a4d6bca847..f0ebbc4cefbd 100644
--- a/pkgs/development/python-modules/aiowebostv/default.nix
+++ b/pkgs/development/python-modules/aiowebostv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aiowebostv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RrSEl/U6UzPoE2151opDe0QRmj6M6wAtsQyF4/dd8ek=";
   };
 
diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix
index 73913cd7d4ba..efa213604ee4 100644
--- a/pkgs/development/python-modules/aioweenect/default.nix
+++ b/pkgs/development/python-modules/aioweenect/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "aioweenect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2qTjRXQdTExqY5/ckB6UrkmavzjZK/agfL9+o6fXS0M=";
   };
 
diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix
index bb6837c3f06f..6be789ed2cd2 100644
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skelsec";
     repo = "aiowinreg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XQDBvBfocz5loUg9eZQz4FKGiCGCaczwhYE/vhy7mC0=";
   };
 
diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix
index ffb401eef649..54d6e4d50aef 100644
--- a/pkgs/development/python-modules/aiowithings/default.nix
+++ b/pkgs/development/python-modules/aiowithings/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-withings";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0UWwiLSTXcNDS30NWsKI1f/kTczdYXwRZr+JREU0NCM=";
   };
 
diff --git a/pkgs/development/python-modules/aiowmi/default.nix b/pkgs/development/python-modules/aiowmi/default.nix
index e1506a4fd6da..c3ba37bf6a96 100644
--- a/pkgs/development/python-modules/aiowmi/default.nix
+++ b/pkgs/development/python-modules/aiowmi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cesbit";
     repo = "aiowmi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bKxGIUxGAW1GDa5xlv9NNWr5xLTdpK5dSsym/5y9nGQ=";
   };
 
diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix
index ce69f3037422..ce4c4970dc66 100644
--- a/pkgs/development/python-modules/aioxmpp/default.nix
+++ b/pkgs/development/python-modules/aioxmpp/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "horazont";
     repo = "aioxmpp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo=";
   };
 
diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix
index 86f624c9da85..778fe976cae9 100644
--- a/pkgs/development/python-modules/aiozoneinfo/default.nix
+++ b/pkgs/development/python-modules/aiozoneinfo/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "aiozoneinfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u7yQiy5xKK1A19cmpXjA4MMK4q7RvtuvwkUECnddzG8=";
   };
 
diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix
index d737d48a23c8..654a5363c843 100644
--- a/pkgs/development/python-modules/airgradient/default.nix
+++ b/pkgs/development/python-modules/airgradient/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "airgradienthq";
     repo = "python-airgradient";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-al0DLsub3xLU1BWLNn0cMI87O0mcQJ0Y4Boj2Xwk1r0=";
   };
 
diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix
index 68249000984c..82d92c635eb7 100644
--- a/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/pkgs/development/python-modules/airthings-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vincegio";
     repo = "airthings-ble";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m2jsXLrj2yS2Wi2dSwyxBv/nXmU738gd5iJ1JVfakUg=";
   };
 
diff --git a/pkgs/development/python-modules/airthings-cloud/default.nix b/pkgs/development/python-modules/airthings-cloud/default.nix
index 6016d1921cc6..730587850b87 100644
--- a/pkgs/development/python-modules/airthings-cloud/default.nix
+++ b/pkgs/development/python-modules/airthings-cloud/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyAirthings";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HdH/z5xsumOXU0ZYOUc8LHpjKGkfp5e5yGER+Nm8xB4=";
   };
 
diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix
index 4fd3df8885b9..47bed7a289f5 100644
--- a/pkgs/development/python-modules/airtouch4pyapi/default.nix
+++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LonePurpleWolf";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA=";
   };
 
diff --git a/pkgs/development/python-modules/airtouch5py/default.nix b/pkgs/development/python-modules/airtouch5py/default.nix
index 45995df9260b..56085fbac789 100644
--- a/pkgs/development/python-modules/airtouch5py/default.nix
+++ b/pkgs/development/python-modules/airtouch5py/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danzel";
     repo = "airtouch5py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qJSqgdT1G26JOEjmsQv07IdWvApFvtHIdRGi9TFaKZ8=";
   };
 
diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix
index ebf54ec2abc4..3c1361f8bdfd 100644
--- a/pkgs/development/python-modules/aladdin-connect/default.nix
+++ b/pkgs/development/python-modules/aladdin-connect/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shoejosh";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw=";
   };
 
diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 9953bdaa5c5e..c4ee32b65bb9 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albumentations-team";
     repo = "albucore";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bIsJ9o1gPCGJZXrzZbRXzS3ZQURcRaWmGBQZsAdX0eg=";
   };
 
diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix
index 852a94ed3ada..8eebc721928e 100644
--- a/pkgs/development/python-modules/ale-py/default.nix
+++ b/pkgs/development/python-modules/ale-py/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "Arcade-Learning-Environment";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MDMCYnyLZYbQXwyr5VuPeVEop825nD++yQ7hhsW4BX8=";
   };
 
diff --git a/pkgs/development/python-modules/alive-progress/default.nix b/pkgs/development/python-modules/alive-progress/default.nix
index 8f24c6c86dd4..d024f5c40467 100644
--- a/pkgs/development/python-modules/alive-progress/default.nix
+++ b/pkgs/development/python-modules/alive-progress/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rsalmei";
     repo = "alive-progress";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yJhl0QrMHET9ISDc/D5AEQ7dTJkmcV2SWqy/xmG18uY=";
   };
 
diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix
index 4ee847df38f6..0ed7368949a5 100644
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI=";
   };
 
diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix
index 7830701eabee..72f1085a5007 100644
--- a/pkgs/development/python-modules/alpha-vantage/default.nix
+++ b/pkgs/development/python-modules/alpha-vantage/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RomelTorres";
     repo = "alpha_vantage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ae9WqEsAjJcD62NZOPh6a49g1wY4KMswzixDAZEtWkw=";
   };
 
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index e34910b67aca..e8efade4fda9 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "altair-viz";
     repo = "altair";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7C51ACaBuNtOSXqLpuCI5bnLyE9U64vNXlD4/msPq2k=";
   };
 
diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix
index daa474e25ecf..7ce6ea9378ac 100644
--- a/pkgs/development/python-modules/amarna/default.nix
+++ b/pkgs/development/python-modules/amarna/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crytic";
     repo = "amarna";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I=";
   };
 
diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix
index d10b9f4ff049..38ab7513074e 100644
--- a/pkgs/development/python-modules/amazon-ion/default.nix
+++ b/pkgs/development/python-modules/amazon-ion/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amazon-ion";
     repo = "ion-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     # Test vectors require git submodule
     fetchSubmodules = true;
     hash = "sha256-L21FYl4Q+nhB3CU1maOxBHSLU+ox1POHtMio8SSZ/r0=";
diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix
index 1ade5e23e240..5040c6d0371a 100644
--- a/pkgs/development/python-modules/amazon-kclpy/default.nix
+++ b/pkgs/development/python-modules/amazon-kclpy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-kinesis-client-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kSboeg/fdg7hbiWyPzAAsYo+0vbQDfRoeJYHlrrFNrA=";
   };
 
diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix
index 0a217c6f7832..29fe6af659f1 100644
--- a/pkgs/development/python-modules/amcrest/default.nix
+++ b/pkgs/development/python-modules/amcrest/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tchellomello";
     repo = "python-amcrest";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-v0jWEZo06vltEq//suGrvJ/AeeDxUG5CCFhbf03q34w=";
   };
 
diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix
index f094205e739a..e9801d973ccf 100644
--- a/pkgs/development/python-modules/androidtv/default.nix
+++ b/pkgs/development/python-modules/androidtv/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JeffLIrion";
     repo = "python-androidtv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2WFfGGEZkM3fWyTo5P6H3ha04Qyx2OiYetlGWv0jXac=";
   };
 
diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix
index 3c01a2f28135..de94696c0a3f 100644
--- a/pkgs/development/python-modules/androidtvremote2/default.nix
+++ b/pkgs/development/python-modules/androidtvremote2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "androidtvremote2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4iVM7BCqOFHrW2BvPakXxp3MfZa+WlB7g/ix239NldE=";
   };
 
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 01165f93e3ea..21497a0c61a2 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "angr";
     repo = "angr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jxCcftc9sVuEp7VoUTNiGGhLR9HBYmjQqHBn/UXIlNY=";
   };
 
diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix
index 0e3fa66f2486..85f6716354a3 100644
--- a/pkgs/development/python-modules/angrcli/default.nix
+++ b/pkgs/development/python-modules/angrcli/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fmagin";
     repo = "angr-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
   };
 
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index 02cb4798f5e3..58c5efab8d76 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "angr";
     repo = "angrop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wL6H4UqBqOHMQU91q0uJrgeS/wVvIbinpF9IBtli3Ig=";
   };
 
diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix
index 3cc5eaf4b693..a015142c9b4f 100644
--- a/pkgs/development/python-modules/annexremote/default.nix
+++ b/pkgs/development/python-modules/annexremote/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lykos153";
     repo = "AnnexRemote";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RShDcqAjG+ujGzWu5S9za24WSsIWctqi3nWQ8EU4DTo=";
   };
 
diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix
index a69159a7a173..b72c6404071c 100644
--- a/pkgs/development/python-modules/annotated-types/default.nix
+++ b/pkgs/development/python-modules/annotated-types/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "annotated-types";
     repo = "annotated-types";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I1SPUKq2WIwEX5JmS3HrJvrpNrKDu30RWkBRDFE+k9A=";
   };
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Reusable constraint types to use with typing.Annotated";
     homepage = "https://github.com/annotated-types/annotated-types";
-    changelog = "https://github.com/annotated-types/annotated-types/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/annotated-types/annotated-types/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ blaggacao ];
   };
diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix
index f871df2fbced..2a3175eaf890 100644
--- a/pkgs/development/python-modules/annoy/default.nix
+++ b/pkgs/development/python-modules/annoy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spotify";
     repo = "annoy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oJHW4lULRun2in35pBGOKg44s5kgLH2BKiMOzVu4rf4=";
   };
 
diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix
index 85b0e1081857..07f9bcf2dfe5 100644
--- a/pkgs/development/python-modules/anova-wifi/default.nix
+++ b/pkgs/development/python-modules/anova-wifi/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lash-L";
     repo = "anova_wifi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TRiv5ljdVqc4qeX+fSH+aTDf5UyNII8/twlNx3KC6oI=";
   };
 
diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
index 282fcd04e0a5..17318c7dd5f8 100644
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tehmaze";
     repo = pname;
-    rev = "refs/tags/ansi-${version}";
+    tag = "ansi-${version}";
     hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM=";
   };
 
diff --git a/pkgs/development/python-modules/ansi2image/default.nix b/pkgs/development/python-modules/ansi2image/default.nix
index 2f3373b1c50a..a772c77cddd7 100644
--- a/pkgs/development/python-modules/ansi2image/default.nix
+++ b/pkgs/development/python-modules/ansi2image/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "helviojunior";
     repo = "ansi2image";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1sPEEWcOzesLQXSeMsUra8ZRSMAKzH6iisOgdhpxhKM=";
   };
 
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
index 83f3b3207e71..3f0532d0d70c 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "numerodix";
     repo = "ansicolor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-a/BAU42AfMR8C94GwmrLkvSvolFEjV0LbDypvS9UuOA=";
   };
 
diff --git a/pkgs/development/python-modules/ansimarkup/default.nix b/pkgs/development/python-modules/ansimarkup/default.nix
index 8be72615a24a..fedb0b060e07 100644
--- a/pkgs/development/python-modules/ansimarkup/default.nix
+++ b/pkgs/development/python-modules/ansimarkup/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gvalkov";
     repo = "python-ansimarkup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+kZt8tv09RHrMRZtvJPBBiFaeCksXyrlHqIabPrXYDY=";
   };
 
diff --git a/pkgs/development/python-modules/anthemav/default.nix b/pkgs/development/python-modules/anthemav/default.nix
index 095cd790b8c4..9f4b5908056d 100644
--- a/pkgs/development/python-modules/anthemav/default.nix
+++ b/pkgs/development/python-modules/anthemav/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nugget";
     repo = "python-anthemav";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZjAt4oODx09Qij0PwBvLCplSjwdBx2fReiwjmKhdPa0=";
   };
 
diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index dc5f11c6ad71..b7e834205fcd 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lpW+waHvwgbhK7EnPZy/XI8gK3a8JjFflPqUFbDN1z8=";
   };
 
diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix
index 8bb9f80cfd3a..1cbf3449b49e 100644
--- a/pkgs/development/python-modules/anybadge/default.nix
+++ b/pkgs/development/python-modules/anybadge/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jongracecox";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A=";
   };
 
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index c5e13ea20f1c..ada31a6d616c 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "agronholm";
     repo = "anyio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8QLOAjQpiNtbd+YSHfqcBVdtMSGJFRevOcacZErKuso=";
   };
 
diff --git a/pkgs/development/python-modules/anysqlite/default.nix b/pkgs/development/python-modules/anysqlite/default.nix
index 26e5b43a8371..9f1ddb4fd898 100644
--- a/pkgs/development/python-modules/anysqlite/default.nix
+++ b/pkgs/development/python-modules/anysqlite/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "karpetrosyan";
     repo = "anysqlite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6kNN6kjkMHVNneMq/8zQxqMIXUxH/+eWLX8XhoHqFRU=";
   };
 
diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix
index 5be671d31e2b..88a3ab54abdf 100644
--- a/pkgs/development/python-modules/anytree/default.nix
+++ b/pkgs/development/python-modules/anytree/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "c0fec0de";
     repo = "anytree";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5HU8kR3B2RHiGBraQ2FTgVtGHJi+Lha9U/7rpNsYCCI=";
   };
 
diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix
index b9fe52c10b85..cd2344c3db8b 100644
--- a/pkgs/development/python-modules/aocd/default.nix
+++ b/pkgs/development/python-modules/aocd/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wimglenn";
     repo = "advent-of-code-data";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0=";
   };
 
diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index f41771016676..8c0d4f5e3251 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JeVYfXAx/GBGXQKAt6pSpnxH83oyeDylEY12EDzMxnw=";
   };
 
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index 60a34a3e0395..234f016346ad 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "apipkg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs=";
   };
 
diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix
index 59ba920c1577..7ae1dcacd131 100644
--- a/pkgs/development/python-modules/apischema/default.nix
+++ b/pkgs/development/python-modules/apischema/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wyfo";
     repo = "apischema";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YFJbNxCwDrJb603Bf8PDrvhVt4T53PNWOYs716c0f1I=";
   };
 
diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix
index a89d12ea0d50..650ca09f5ddb 100644
--- a/pkgs/development/python-modules/apispec-webframeworks/default.nix
+++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "apispec-webframeworks";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V4tdqcHfYRh9VoXUTPXM3SIOogJDJB14SLj5dSd7LzU=";
   };
 
diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix
index e6ebec3b320d..eb03f304f101 100644
--- a/pkgs/development/python-modules/apkinspector/default.nix
+++ b/pkgs/development/python-modules/apkinspector/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "erev0s";
     repo = "apkInspector";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ=";
   };
 
diff --git a/pkgs/development/python-modules/apollo-fpga/default.nix b/pkgs/development/python-modules/apollo-fpga/default.nix
index 1e2a719f2ea1..2eda2f95c4a2 100644
--- a/pkgs/development/python-modules/apollo-fpga/default.nix
+++ b/pkgs/development/python-modules/apollo-fpga/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "apollo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EDI+bRDePEbkxfQKuDgRsJtlAE0jqcIoQHjpgW0jIoY=";
   };
 
diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix
index aeb0c66f8642..707990d470fc 100644
--- a/pkgs/development/python-modules/app-model/default.nix
+++ b/pkgs/development/python-modules/app-model/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyapp-kit";
     repo = "app-model";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bIqcbKjAj5TMZD9mZ+7G4q+sR0aRqn6E4hf99srgRIE=";
   };
 
diff --git a/pkgs/development/python-modules/appimage/default.nix b/pkgs/development/python-modules/appimage/default.nix
index c8de232e73c4..ba159061cd9b 100644
--- a/pkgs/development/python-modules/appimage/default.nix
+++ b/pkgs/development/python-modules/appimage/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ssh-mitm";
     repo = "appimage";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-d8LwZ4iZ+fwFaBP/IFoKImI/TsYtVD0rllbYN9XP/es=";
   };
 
diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix
index d7d21ad746fc..b934c5bb7b9a 100644
--- a/pkgs/development/python-modules/apple-weatherkit/default.nix
+++ b/pkgs/development/python-modules/apple-weatherkit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tjhorner";
     repo = "python-weatherkit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JvN8GmlTxz9VGttIFVG6q//c+BhP2pt1tBOhnJhNwJg=";
   };
 
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index 9f175dbd1a60..d9dcf72644ea 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "ApprovalTests.Python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HcF4SjAdAPxINB0+kI1RWtKQ3VBhMNpFk6BECup7E+w=";
   };
 
diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 521f6b931267..abd1f5b5cc43 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "enthought";
     repo = "apptools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qNtDHmvl5HbtdbjnugVM7CKVCW+ysAwRB9e2Ounh808=";
   };
 
diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix
index f6210fb426ef..c136607ac178 100644
--- a/pkgs/development/python-modules/apricot-select/default.nix
+++ b/pkgs/development/python-modules/apricot-select/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmschrei";
     repo = "apricot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-v9BHFxmlbwXVipPze/nV35YijdFBuka3gAl85AlsffQ=";
   };
 
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index d2effb1ae435..ba376163a7e8 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rogerbinns";
     repo = "apsw";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/MMCwdd2juFbv/lrYwuO2mdWm0+v+YFn6h9CwdQMTpg=";
   };
 
diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix
index 265526e5e7b0..fe90d1d9db6f 100644
--- a/pkgs/development/python-modules/apsystems-ez1/default.nix
+++ b/pkgs/development/python-modules/apsystems-ez1/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SonnenladenGmbH";
     repo = "APsystems-EZ1-API";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-H4vhF4CgZmKmBF+v6SpnpIOlPBkFLL50W+Ua+gDr/7I=";
   };
 
diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix
index 6e1610e6f0cd..ae0ce3cb5519 100644
--- a/pkgs/development/python-modules/arabic-reshaper/default.nix
+++ b/pkgs/development/python-modules/arabic-reshaper/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mpcabd";
     repo = "python-arabic-reshaper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM=";
   };
 
diff --git a/pkgs/development/python-modules/aranet4/default.nix b/pkgs/development/python-modules/aranet4/default.nix
index 0d9e848c1475..eb77e983ee22 100644
--- a/pkgs/development/python-modules/aranet4/default.nix
+++ b/pkgs/development/python-modules/aranet4/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Anrijs";
     repo = "Aranet4-Python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PdEOEVHri9bhsRFtSqZIaTJ7perD6nZcYoF2sDrWXqg=";
   };
 
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index b6bd3fbd9592..18a9fa1f4c58 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "angr";
     repo = "archinfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eMRDuDsjUSWzlhHOG96MB1UxhAsdMpO4k1A1eFsiNEc=";
   };
 
diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix
index 3c9c0f00f7d7..dd9ec71c9ca3 100644
--- a/pkgs/development/python-modules/archspec/default.nix
+++ b/pkgs/development/python-modules/archspec/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "archspec";
     repo = "archspec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Xg1XdmKk2b6fqzOdedU3SGIgy65CjExxDByt/Xvmr24=";
   };
diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 6e20880ff841..0ff14b8ba71e 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Arelle";
     repo = "Arelle";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xzTrFie97HDIqPZ4nzCh+0p/w0bTK12cS0FSsuIi7tY=";
   };
 
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index bac7379338c9..5606662fd571 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kislyuk";
     repo = "argcomplete";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec=";
   };
 
diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix
index c767e7ca3eed..553576e479f6 100644
--- a/pkgs/development/python-modules/argilla/default.nix
+++ b/pkgs/development/python-modules/argilla/default.nix
@@ -75,7 +75,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "argilla-io";
     repo = "argilla";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ndendXlgACFdwnZ/P2W22Tr/Ji8AYw/6jtb8F3/zqSA=";
   };
 
diff --git a/pkgs/development/python-modules/argparse-dataclass/default.nix b/pkgs/development/python-modules/argparse-dataclass/default.nix
index 68ba25a94ead..5de2533fb17b 100644
--- a/pkgs/development/python-modules/argparse-dataclass/default.nix
+++ b/pkgs/development/python-modules/argparse-dataclass/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mivade";
     repo = "argparse_dataclass";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ASdP6LOEeTszyppYV6vRQX8BKOHYUimI36tMSZTQfTk=";
   };
 
diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix
index e3423a8c56e3..8900800c1bbc 100644
--- a/pkgs/development/python-modules/argparse-manpage/default.nix
+++ b/pkgs/development/python-modules/argparse-manpage/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "praiskup";
     repo = "argparse-manpage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2GJDFLCaPTb8sQCAv9qZ+pIysFE7IaKh9co3Mb8Dutc=";
   };
 
diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
index b2ac4e967398..8768cf951fe1 100644
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pawamoy";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WlbZP2+qUSyfmeFFiuarXI3VaNZvD9cnOef/WM+J0OE=";
   };
 
diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix
index c94ffd720d10..e03495a446dd 100644
--- a/pkgs/development/python-modules/ariadne/default.nix
+++ b/pkgs/development/python-modules/ariadne/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mirumee";
     repo = "ariadne";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zdM6LKtrD6m3hWn90yAgsinCvaa86BaTdhgf/VzGDLA=";
   };
 
diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix
index b373fb558972..899108228dd8 100644
--- a/pkgs/development/python-modules/array-api-compat/default.nix
+++ b/pkgs/development/python-modules/array-api-compat/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "data-apis";
     repo = "array-api-compat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-X6y6hX/HdkiLZkj9AOEYsZOlYhR7wUt9kQjHfMfWqIc=";
   };
 
diff --git a/pkgs/development/python-modules/array-api-strict/default.nix b/pkgs/development/python-modules/array-api-strict/default.nix
index c55e2140cdac..c86a1d23667b 100644
--- a/pkgs/development/python-modules/array-api-strict/default.nix
+++ b/pkgs/development/python-modules/array-api-strict/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "data-apis";
     repo = "array-api-strict";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9WIKN2mekJIOD076946xkNqMlfeTaLuuB9qqAJN8Xwc=";
   };
 
diff --git a/pkgs/development/python-modules/arris-tg2492lg/default.nix b/pkgs/development/python-modules/arris-tg2492lg/default.nix
index c966fd1ac7ce..d2f6f2076b08 100644
--- a/pkgs/development/python-modules/arris-tg2492lg/default.nix
+++ b/pkgs/development/python-modules/arris-tg2492lg/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vanbalken";
     repo = "arris-tg2492lg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MQq9jMUoJgqaY0f9YIbhME2kO+ektPqBnT9REg3qDpg=";
   };
 
diff --git a/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix
index cd5488578c62..f36d61baaaab 100644
--- a/pkgs/development/python-modules/arsenic/default.nix
+++ b/pkgs/development/python-modules/arsenic/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HENNGE";
     repo = "arsenic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE=";
   };
 
diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix
index 3a9874f037c6..10fcac6e5961 100644
--- a/pkgs/development/python-modules/art/default.nix
+++ b/pkgs/development/python-modules/art/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sepandhaghighi";
     repo = "art";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qA1fhqNJbhSOvsPSgbnuRTs40OJsn7tYHWzujN2RVK8=";
   };
 
diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix
index 563f5d786c49..5388b5abfc1a 100644
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/pkgs/development/python-modules/arviz/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "arviz-devs";
     repo = "arviz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6toqOGwk8YbatfiDCTEG4r0z3zZAA8zcNVZJqqssYrY=";
   };
 
diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix
index 87628f6d2cb6..5a8d67201460 100644
--- a/pkgs/development/python-modules/arxiv/default.nix
+++ b/pkgs/development/python-modules/arxiv/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lukasschwab";
     repo = "arxiv.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Niu3N0QTVxucboQx1FQq1757Hjj1VVWeDZn7O7YtjWY=";
   };
 
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 1dd20ac22d82..c5f1442c443b 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asana";
     repo = "python-asana";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nuBvRqrs00OIY3UzN7bF5dB15TZqeE43o1BIpBaJZcQ=";
   };
 
diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix
index adf443d35961..47e42cee8738 100644
--- a/pkgs/development/python-modules/asdf-astropy/default.nix
+++ b/pkgs/development/python-modules/asdf-astropy/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "asdf-astropy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xtDpKlAExMTYNopS9cAhLU2ZnHhtHHaV3KjWCq0yapE=";
   };
 
diff --git a/pkgs/development/python-modules/asdf-coordinates-schemas/default.nix b/pkgs/development/python-modules/asdf-coordinates-schemas/default.nix
index 9b2c103ac13f..ee9562e96624 100644
--- a/pkgs/development/python-modules/asdf-coordinates-schemas/default.nix
+++ b/pkgs/development/python-modules/asdf-coordinates-schemas/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asdf-format";
     repo = "asdf-coordinates-schemas";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LuC0m25OqQwivK/Z3OfoCtdhBV87rk16XrkJxUxG07o=";
   };
 
diff --git a/pkgs/development/python-modules/asdf-wcs-schemas/default.nix b/pkgs/development/python-modules/asdf-wcs-schemas/default.nix
index f59b2cb98803..6ee324929305 100644
--- a/pkgs/development/python-modules/asdf-wcs-schemas/default.nix
+++ b/pkgs/development/python-modules/asdf-wcs-schemas/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asdf-format";
     repo = "asdf-wcs-schemas";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4CxKLMYXdNkNwkfFRX3YKkS4e+Z3wQgmz8ogbC4Z1vI=";
   };
 
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 9d640100a1ff..66ca53fc54ea 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asdf-format";
     repo = "asdf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2ugrByX2eSac68RGc4mhPiYP8qnYoPwbhrMmvUr2FYg=";
   };
 
diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix
index e2025204fbb7..72db292342b5 100644
--- a/pkgs/development/python-modules/asf-search/default.nix
+++ b/pkgs/development/python-modules/asf-search/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asfadmin";
     repo = "Discovery-asf_search";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mOhY64Csxdc/DYS1OlbstxYEodtpXTVyPwd4B1jrDK8=";
   };
 
diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix
index 6d2692ca243e..f79ed2e27b66 100644
--- a/pkgs/development/python-modules/asgi-csrf/default.nix
+++ b/pkgs/development/python-modules/asgi-csrf/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VclgePMQh60xXofrquI3sCyPUPlkV4maZ5yybt+4HCs=";
   };
 
diff --git a/pkgs/development/python-modules/asgi-lifespan/default.nix b/pkgs/development/python-modules/asgi-lifespan/default.nix
index 97ab68297c21..6787f4a91b20 100644
--- a/pkgs/development/python-modules/asgi-lifespan/default.nix
+++ b/pkgs/development/python-modules/asgi-lifespan/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "florimondmanca";
     repo = "asgi-lifespan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Jgmd/4c1lxHM/qi3MJNN1aSSUJrI7CRNwwHrFwwcCkc=";
   };
 
diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix
index f16cb368f4b8..7e79f0de9969 100644
--- a/pkgs/development/python-modules/asgineer/default.nix
+++ b/pkgs/development/python-modules/asgineer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "almarklein";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UYnVlsdEhEAJF21zVmjAXX01K6LQR2I+Dfw5tSsmf5E=";
   };
 
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 1fdb7f50ae31..33338418a3ee 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django";
     repo = "asgiref";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xepMbxglBpHL7mnJYlnvNUgixrFwf/Tc6b1zL4Wy+to=";
   };
 
diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix
index d76bb41da69f..cb5bcc881b01 100644
--- a/pkgs/development/python-modules/asn1/default.nix
+++ b/pkgs/development/python-modules/asn1/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andrivet";
     repo = "python-asn1";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xdkSJIe7qmz0Zu5IZ3Rl/h4v2j3YFrm1gz7lsNQ0ORs=";
   };
 
diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix
index 8ca21fece147..0d1cab628056 100644
--- a/pkgs/development/python-modules/asn1tools/default.nix
+++ b/pkgs/development/python-modules/asn1tools/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eerimoq";
     repo = "asn1tools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E=";
   };
 
diff --git a/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/pkgs/development/python-modules/asteroid-filterbanks/default.nix
index f70a5bfe40f1..1cfe195c5377 100644
--- a/pkgs/development/python-modules/asteroid-filterbanks/default.nix
+++ b/pkgs/development/python-modules/asteroid-filterbanks/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asteroid-team";
     repo = "asteroid-filterbanks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z5M2Xgj83lzqov9kCw/rkjJ5KXbjuP+FHYCjhi5nYFE=";
   };
 
diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix
index 5ec7d2b59b64..dadca55023d5 100644
--- a/pkgs/development/python-modules/asteval/default.nix
+++ b/pkgs/development/python-modules/asteval/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lmfit";
     repo = "asteval";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PRmTbP3zRnkCxdeb45LBz5m/Ymoi4lq2poKuG9Esg9g=";
   };
 
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index a39b8a395b70..86e604c0ce14 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "astroid";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IFcBb0BP0FRYCztV3FscBPTDeKrGbr23nxeibSuNRno=";
   };
 
diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix
index 633ebaec21ca..4b9434153ddc 100644
--- a/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/pkgs/development/python-modules/astropy-iers-data/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "astropy-iers-data";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SN4qDBY3hi0Gj+AH3SSDi5+hKrHMNgPR/Y6HR2Vid0A=";
   };
 
diff --git a/pkgs/development/python-modules/async-interrupt/default.nix b/pkgs/development/python-modules/async-interrupt/default.nix
index 1d96a8cbd61f..1e29876f17b3 100644
--- a/pkgs/development/python-modules/async-interrupt/default.nix
+++ b/pkgs/development/python-modules/async-interrupt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "async_interrupt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-opV5h3aLDDpjlRZRZ9OnrPjUOf/i7g+B9T6msk8wtgI=";
   };
 
diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix
index 91fd5b0b9180..fcf7ef5207f4 100644
--- a/pkgs/development/python-modules/async-lru/default.nix
+++ b/pkgs/development/python-modules/async-lru/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "async-lru";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S2sOkgtS+YdMtVP7UHD3+oR8Fem8roLhhgVVfh33PcM=";
   };
 
diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix
index 5aa004243403..7e2cf669e603 100644
--- a/pkgs/development/python-modules/async-modbus/default.nix
+++ b/pkgs/development/python-modules/async-modbus/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
     repo = "async_modbus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xms2OfX5bHPXswwhLhyh6HFsm1YqDwKclUirxrgL4i0=";
   };
 
diff --git a/pkgs/development/python-modules/async-stagger/default.nix b/pkgs/development/python-modules/async-stagger/default.nix
index 27bf138c375a..3b54507ca084 100644
--- a/pkgs/development/python-modules/async-stagger/default.nix
+++ b/pkgs/development/python-modules/async-stagger/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twisteroidambassador";
     repo = "async_stagger";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uJohc3EsAKevqT0J+N0Cqop3xy0PCM5jsP6YYtx+HuQ=";
   };
 
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 2c30f18c3b19..e4019b7b5ba8 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "StevenLooman";
     repo = "async_upnp_client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xIa7QeflS7JxkPoV8KqFfuLfHPpnrBGLeOFSa17IHyk=";
   };
 
diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix
index 9e5b82197efb..54695ecc0432 100644
--- a/pkgs/development/python-modules/asyncclick/default.nix
+++ b/pkgs/development/python-modules/asyncclick/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = "asyncclick";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ahzI7yILq1OpZ6IT0qt8vjzi6I6zAoTrULOl8CqRw4A=";
   };
 
diff --git a/pkgs/development/python-modules/asynccmd/default.nix b/pkgs/development/python-modules/asynccmd/default.nix
index d9ffae1cf701..1c19098cd4dd 100644
--- a/pkgs/development/python-modules/asynccmd/default.nix
+++ b/pkgs/development/python-modules/asynccmd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "valentinmk";
     repo = "asynccmd";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0AjOKAEiwHi3AkzMGRvE/czTCfShXQAm8mDz98EESgs=";
   };
 
diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix
index a45083384bc2..1a3ab85a8050 100644
--- a/pkgs/development/python-modules/asyncinotify/default.nix
+++ b/pkgs/development/python-modules/asyncinotify/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "absperf";
     repo = "asyncinotify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RHzjUoVhDxI7kYD5HWkb0f8X6BjjTTCAvSvASPy6FGk=";
   };
 
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index e83eef581719..f31f0f7fc6d5 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jsbronder";
     repo = "asyncio-dgram";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9aO3xFmoR74uZSzxBPRVvz0QSW15TAdWEszLBX8AUR4=";
   };
 
diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix
index 33c501910019..15a2b0b7cb97 100644
--- a/pkgs/development/python-modules/asyncmy/default.nix
+++ b/pkgs/development/python-modules/asyncmy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "long2ice";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0=";
   };
 
diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix
index 398496d69518..929b39fa4848 100644
--- a/pkgs/development/python-modules/asyncstdlib/default.nix
+++ b/pkgs/development/python-modules/asyncstdlib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxfischer2781";
     repo = "asyncstdlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0VEJ26MP6gIgPvjan7LgCEtSLpg4wXhmFNPGZGntPD8=";
   };
 
diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix
index 6a9b6d278049..3ba537f7ca8e 100644
--- a/pkgs/development/python-modules/asyncua/default.nix
+++ b/pkgs/development/python-modules/asyncua/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
     repo = "opcua-asyncio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XXjzYDOEBdA4uk0VCzscHrPCY2Lgin0JBAVDdxmSOio=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index 12802c13f942..07344784ab67 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pogzyb";
     repo = "asyncwhois";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Eb7De2AMxZi0Wu8dYA5wlX84BbF62L24vIuBEnvfxBU=";
   };
 
diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix
index 1b099a8d0f41..8b8775427305 100644
--- a/pkgs/development/python-modules/atc-ble/default.nix
+++ b/pkgs/development/python-modules/atc-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "atc-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rwOFKxUlbbNIDJRdCmZpHstXwxcTnvlExgcVDdGbIVY=";
   };
 
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 20e01126b974..1ef1de36a0eb 100644
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "atlassian-api";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HhFGM8EPGCT3WqVf6WP6VvwsppvzFvHg+ys7GhUUwW0=";
   };
 
diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
index 6bb934508214..55aefcb1db0c 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nucleic";
     repo = "atom";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3Xk4CM8Cnkc0lIdjJUYs/6UTqqpPALrUa3DpKD40og8=";
   };
 
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
index 997466118258..e53f91efaa99 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "atomman";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2yxHv9fSgLM5BeUkXV9NX+xyplXtyfWodwS9sVUVzqU=";
   };
 
diff --git a/pkgs/development/python-modules/atsim-potentials/default.nix b/pkgs/development/python-modules/atsim-potentials/default.nix
index f194c251d5d3..592bf02ba91b 100644
--- a/pkgs/development/python-modules/atsim-potentials/default.nix
+++ b/pkgs/development/python-modules/atsim-potentials/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjdrushton";
     repo = "atsim-potentials";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM=";
   };
 
diff --git a/pkgs/development/python-modules/attacut/default.nix b/pkgs/development/python-modules/attacut/default.nix
index 9724ac0a2741..51f92e0abeec 100644
--- a/pkgs/development/python-modules/attacut/default.nix
+++ b/pkgs/development/python-modules/attacut/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyThaiNLP";
     repo = "attacut";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x3JJC1Xd+tsOAHJEHGzIrhIrNGSvLSanAFc7+uXb2Kk=";
   };
 
diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix
index 87a809bfe1ed..617f67aeab4b 100644
--- a/pkgs/development/python-modules/audible/default.nix
+++ b/pkgs/development/python-modules/audible/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkb79";
     repo = "Audible";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ILGhjuPIxpRxu/dVDmz531FUgMWosk4P+onPJltuPIs=";
   };
 
diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix
index 92f1dc76988c..cbee0a61aacb 100644
--- a/pkgs/development/python-modules/audio-metadata/default.nix
+++ b/pkgs/development/python-modules/audio-metadata/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thebigmunch";
     repo = "audio-metadata";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg=";
   };
 
diff --git a/pkgs/development/python-modules/audioop-lts/default.nix b/pkgs/development/python-modules/audioop-lts/default.nix
index b25454bf0671..5dfc571dfaa7 100644
--- a/pkgs/development/python-modules/audioop-lts/default.nix
+++ b/pkgs/development/python-modules/audioop-lts/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AbstractUmbra";
     repo = "audioop";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tx5/dcyEfHlYRohfYW/t0UkLiZ9LJHmI8g3sC3+DGAE=";
   };
 
diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix
index 3982a00674ea..e48e4826e2a9 100644
--- a/pkgs/development/python-modules/augmax/default.nix
+++ b/pkgs/development/python-modules/augmax/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "khdlr";
     repo = "augmax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FXgkhZEAR1Y2LvVvV+IWMSQDWrLulLDsSKKuw4ER5wg=";
   };
 
diff --git a/pkgs/development/python-modules/auroranoaa/default.nix b/pkgs/development/python-modules/auroranoaa/default.nix
index 8dcec269dced..07b162cd32d8 100644
--- a/pkgs/development/python-modules/auroranoaa/default.nix
+++ b/pkgs/development/python-modules/auroranoaa/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "djtimca";
     repo = "aurora-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bQDFSbYFsGtvPuJNMykynOpBTIeloUoCVRtIuHXR4n0=";
   };
 
diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix
index 50b7f6602fe5..509a4667a705 100644
--- a/pkgs/development/python-modules/autarco/default.nix
+++ b/pkgs/development/python-modules/autarco/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-autarco";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk=";
   };
 
diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix
index 3958abba6de3..cc66dcd155df 100644
--- a/pkgs/development/python-modules/auth0-python/default.nix
+++ b/pkgs/development/python-modules/auth0-python/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-g6sbxPglKDGbDMiB9crnua86y6TPIbLiFddeymrLAP0=";
   };
 
diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix
index 98540b643186..49b96548e9e8 100644
--- a/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/pkgs/development/python-modules/authcaptureproxy/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alandtse";
     repo = "auth_capture_proxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H5Dl1incS5+lmZaLZXMCOqEIGTcTr4A5J3r3ngpDGtY=";
   };
 
diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index ed3a469d312b..a5dae4cb897a 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ValiMail";
     repo = "authentication-headers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BFMZpSJ4qCEL42xTiM/D5dkatxohiCrOWAkNZHFUhac=";
   };
 
diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix
index d4c9a525d87f..04574c0e2fe4 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/pkgs/development/python-modules/authlib/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "authlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gaFnai5QzHhnyn73JB+QzybaolLWC9barBFdnlEMyMU=";
   };
 
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index be2e8f77d8bc..aac6c04361d5 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crossbario";
     repo = "autobahn-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84=";
   };
 
diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix
index 8df21385cf04..c5be2b7acdeb 100644
--- a/pkgs/development/python-modules/autocommand/default.nix
+++ b/pkgs/development/python-modules/autocommand/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lucretiel";
     repo = "autocommand";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9bv9Agj4RpeyNJvTLUaMwygQld2iZZkoLb81rkXOd3E=";
   };
 
diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix
index 4b38bfa7310f..1fd7b41d3e5e 100644
--- a/pkgs/development/python-modules/autofaiss/default.nix
+++ b/pkgs/development/python-modules/autofaiss/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "criteo";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pey3wrW7CDLMiPPKnmYrcSJqGuy6ecA2SE9m3Jtt6DU=";
   };
 
diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix
index 5a2dbd5d8c30..7ece75e25122 100644
--- a/pkgs/development/python-modules/automower-ble/default.nix
+++ b/pkgs/development/python-modules/automower-ble/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alistair23";
     repo = "AutoMower-BLE";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BWfRXz78e1Xq0fNOGJ2IFnjNqfH3oD5VIGMxyCPtEUw=";
   };
 
diff --git a/pkgs/development/python-modules/automx2/default.nix b/pkgs/development/python-modules/automx2/default.nix
index 298dd7fb9adc..8b3604c4e2c2 100644
--- a/pkgs/development/python-modules/automx2/default.nix
+++ b/pkgs/development/python-modules/automx2/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rseichter";
     repo = "automx2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7SbSKSjDHTppdqfPPKvuWbdoksHa6BMIOXOq0jDggTE=";
   };
 
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index 57a377ada235..3f60a9f48bfb 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hhatto";
     repo = "autopep8";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-znZw9SnnVMN8XZjko11J5GK/LAk+gmRkTgPEO9+ntJ8=";
   };
 
diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix
index 84c504bed8ca..88ba7c33a7d3 100644
--- a/pkgs/development/python-modules/autoslot/default.nix
+++ b/pkgs/development/python-modules/autoslot/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cjrh";
     repo = "autoslot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wYjsBrjvSZFHDt0HLrnS9Xwk8EHVQupfPSkQnUFmMAk=";
   };
 
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index 6c5c201ba5af..3681904179e9 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyAV-Org";
     repo = "PyAV";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
   };
 
diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 14a7e2764eb3..c0130864ea23 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "avwx-rest";
     repo = "avwx-engine";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pAeeSv9qPrIvwc9KTwMFoq/H/qRtlNKQquQux7aYxKA=";
   };
 
diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix
index f3bdfdfd2201..001ddf58a9a1 100644
--- a/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/pkgs/development/python-modules/awesomeversion/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "awesomeversion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lpG42Be0MVinWX5MyDvBPdoZFx66l6tpUxpAJRqEf88=";
   };
 
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index c2c0b859b033..ea09c20e51c0 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "venth";
     repo = "aws-adfs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZzQ92VBa8CApd0WkfPrUZsEZICK2fhwmt45P2sx2mK0=";
   };
 
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index c1ccbc754242..039ee2539680 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "serverless-application-model";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jcRpn9STkfg1xTwYzkpoYyuG0Hrv0XnbW1h6+SxzEjA=";
   };
 
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 6774d1fefcc1..afac3f4429ec 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-xray-sdk-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rWP0yQ+Ril0UByOCWJKcL3mD7TvzK8Ddq9JlFIRBFU4=";
   };
 
diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix
index 3fd9258df22c..486cfcc86d22 100644
--- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-iot-device-sdk-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM=";
   };
 
diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix
index 0c1f98c752da..d0582694e117 100644
--- a/pkgs/development/python-modules/awsiotsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotsdk/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-iot-device-sdk-python-v2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Rgae9JzoW+OA4+sP/xdkmX8fbRJCJ7MqIpv81n08uXU=";
   };
 
diff --git a/pkgs/development/python-modules/awsipranges/default.nix b/pkgs/development/python-modules/awsipranges/default.nix
index c3b74b1feca8..cc927030ce92 100644
--- a/pkgs/development/python-modules/awsipranges/default.nix
+++ b/pkgs/development/python-modules/awsipranges/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws-samples";
     repo = "awsipranges";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ve1+0zkDDUGswtQoXhfESMcBzoNgUutxEhz43HXL4H8=";
   };
 
diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix
index e72e6baa6247..667bc5ce8c99 100644
--- a/pkgs/development/python-modules/awslambdaric/default.nix
+++ b/pkgs/development/python-modules/awslambdaric/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lambda-python-runtime-interface-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-IA2Kx4+U0+8lPl9TTTZC46Y3WhSUb5HR5Hr9QZSJIDU=";
   };
 
diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix
index ec033ec962b3..513e6ec00184 100644
--- a/pkgs/development/python-modules/ax-platform/default.nix
+++ b/pkgs/development/python-modules/ax-platform/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "ax";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jmBjrtxqg4Iu3Qr0HRqjVfwURXzbJaGm+DBFNHYk/vA=";
   };
 
diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix
index 1cbd2ccc271c..c5a5cbce8c7a 100644
--- a/pkgs/development/python-modules/axis/default.nix
+++ b/pkgs/development/python-modules/axis/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kane610";
     repo = "axis";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6g4Dqk+oGlEcqlNuMiwep+NCVFmwRZjKgEZC1OzmKw0=";
   };
 
diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
index a2872bfcfa5d..4836faca61ea 100644
--- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
+++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rewardone";
     repo = "ayla-iot-unofficial";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LYHfu02FYoL2D9dEL3CM3llRXMa2M3EMU9CAsl1Cgoo=";
   };
 
diff --git a/pkgs/development/python-modules/azure-kusto-data/default.nix b/pkgs/development/python-modules/azure-kusto-data/default.nix
index 869e972a0161..77d2c06f0e8d 100644
--- a/pkgs/development/python-modules/azure-kusto-data/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-data/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-kusto-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI=";
   };
 
diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
index 9dff851fd88e..424581c59c19 100644
--- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix
+++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-kusto-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI=";
   };
 
diff --git a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
index 03dcddfe569d..5949c951216c 100644
--- a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-sdk-for-python";
-    rev = "refs/tags/azure-storage-file-datalake_${version}";
+    tag = "azure-storage-file-datalake_${version}";
     hash = "sha256-FT51a7yuSMLJSnMFK9N09Rc8p/uaoYCcj9WliSvY6UA=";
   };
 
diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix
index cfaad9242396..8b485cc6b4fe 100644
--- a/pkgs/development/python-modules/babelfont/default.nix
+++ b/pkgs/development/python-modules/babelfont/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simoncozens";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kbL6z5610A41bfbDm0nyyh1tv+7SeXx8vvXxwLcTZL0=";
   };
 
diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix
index 46e0f80bf240..ff0411795c99 100644
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/pkgs/development/python-modules/backoff/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "litl";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI=";
   };
 
diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
index 103ee2561aaa..609d519ad96a 100644
--- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
+++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "movermeyer";
     repo = "backports.datetime_fromisoformat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v9Njic7zN2bv1lQgdbJNeZLF3VXcC9A4UoE/znLF0gM=";
   };
 
diff --git a/pkgs/development/python-modules/baize/default.nix b/pkgs/development/python-modules/baize/default.nix
index b3ac8bc5e564..f26314e74440 100644
--- a/pkgs/development/python-modules/baize/default.nix
+++ b/pkgs/development/python-modules/baize/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "abersheeran";
     repo = "baize";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vsYt1q8QEDmEXjd8dlzHr85Fz3YAjPowS+oBWYGbG1o=";
   };
 
diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix
index 9deaf973f793..8e52a0aee8f2 100644
--- a/pkgs/development/python-modules/base2048/default.nix
+++ b/pkgs/development/python-modules/base2048/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ionite34";
     repo = "base2048";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OXlfycJB1IrW2Zq0xPDGjjwCdRTWtX/ixPGWcd+YjAg=";
   };
 
diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index 7e435d08fa31..0551f450c4e7 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matplotlib";
     repo = "basemap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0rTGsphwLy2yGvhO7bcmFqdgysIXXkDBmURwRVw3ZHY=";
   };
 
diff --git a/pkgs/development/python-modules/bases/default.nix b/pkgs/development/python-modules/bases/default.nix
index 062c757f8ce5..406078301061 100644
--- a/pkgs/development/python-modules/bases/default.nix
+++ b/pkgs/development/python-modules/bases/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hashberg-io";
     repo = "bases";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CRXVxT9uYud1CKRcdRAD0OX5sTAttrUO9E4BaavTe6A=";
   };
 
diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index b3320cc775f3..d53834e60b18 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "batchspawner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z7kB8b7s11wokTachLI/N+bdUV+FfCRTemL1KYQpzio=";
   };
 
diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix
index cfe0b5d35680..35b57ec922df 100644
--- a/pkgs/development/python-modules/batinfo/default.nix
+++ b/pkgs/development/python-modules/batinfo/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "batinfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GgAJJA8bzQJLAU+nxmkDa5LFTHc4NGi+nj9PfKyw8/M=";
   };
 
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index 7768dd5a8d7c..f5cfd044e850 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bayespy";
     repo = "bayespy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-X7CwJBrKHlU1jqMkt/7XEzaiwul1Yzkb/V64lXG4Aqo=";
   };
 
diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix
index 70b085245956..a2b71972dbaa 100644
--- a/pkgs/development/python-modules/bc-detect-secrets/default.nix
+++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "detect-secrets";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z/mjZcC1ZXebDWXlYvcdxDk+HoZ0gctfJSpQSkIbQmA=";
   };
 
diff --git a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
index 2fd65621f130..350b558a6129 100644
--- a/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
+++ b/pkgs/development/python-modules/bc-jsonpath-ng/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "jsonpath-ng";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FWP4tzlacAWVXG3YnPwl5MKc12geaCxZ2xyKx9PSarU=";
   };
 
diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix
index dedbba874d1f..2bfc919ecb5f 100644
--- a/pkgs/development/python-modules/beaker/default.nix
+++ b/pkgs/development/python-modules/beaker/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bbangert";
     repo = "beaker";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE=";
   };
 
diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix
index 4ee5b85f0091..c19c28624b28 100644
--- a/pkgs/development/python-modules/beancount-black/default.nix
+++ b/pkgs/development/python-modules/beancount-black/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "beancount-black";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vo11mlgDhyc8YFnULJ4AFrANWmGpAMNX5jJ6QaUNqk0=";
   };
 
diff --git a/pkgs/development/python-modules/beancount-parser/default.nix b/pkgs/development/python-modules/beancount-parser/default.nix
index 3493a7f61143..95e69d1787f3 100644
--- a/pkgs/development/python-modules/beancount-parser/default.nix
+++ b/pkgs/development/python-modules/beancount-parser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "beancount-parser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8YcrsLdSRTixKXU/IM821kNcBo0jB/8DXA1/KiedsBY=";
   };
 
diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix
index b6175e4cda4b..f2a1300a1b5c 100644
--- a/pkgs/development/python-modules/beanhub-cli/default.nix
+++ b/pkgs/development/python-modules/beanhub-cli/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "beanhub-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZPRQLdNDp/LOXmxU9H6fh9raPPiDsTiEW3j8ncgt8sY=";
   };
 
diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix
index b44a2e631c94..725444cc411a 100644
--- a/pkgs/development/python-modules/beanhub-extract/default.nix
+++ b/pkgs/development/python-modules/beanhub-extract/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "beanhub-extract";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Uw9bSVOpiIALkgA77OrqAcDWcEafVSnp4iILa4Jkykc=";
   };
 
diff --git a/pkgs/development/python-modules/beanhub-forms/default.nix b/pkgs/development/python-modules/beanhub-forms/default.nix
index 2482d0306e7c..b10021f6597f 100644
--- a/pkgs/development/python-modules/beanhub-forms/default.nix
+++ b/pkgs/development/python-modules/beanhub-forms/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "beanhub-forms";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-313c+ENmTe1LyfEiMXNB9AUoGx3Yv/1D0T3HnAbd+Zw=";
   };
 
diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix
index 9a844507f2ad..81f2c43db56e 100644
--- a/pkgs/development/python-modules/beanhub-import/default.nix
+++ b/pkgs/development/python-modules/beanhub-import/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LaunchPlatform";
     repo = "beanhub-import";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6Y1gYAi8A6H0a0vj2avWxGS7hvjrvLBUS+LsgvY4sZo=";
   };
 
diff --git a/pkgs/development/python-modules/beanquery/default.nix b/pkgs/development/python-modules/beanquery/default.nix
index 726e6e220d88..f1dad530cbc2 100644
--- a/pkgs/development/python-modules/beanquery/default.nix
+++ b/pkgs/development/python-modules/beanquery/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "beancount";
     repo = "beanquery";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1+KTUvnqPceRbzY1OZwOSQdK7f78K9kSwtQfI1SUIa8=";
   };
 
diff --git a/pkgs/development/python-modules/beautiful-date/default.nix b/pkgs/development/python-modules/beautiful-date/default.nix
index ed34ae468826..8fcc791a8fd2 100644
--- a/pkgs/development/python-modules/beautiful-date/default.nix
+++ b/pkgs/development/python-modules/beautiful-date/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kuzmoyev";
     repo = "beautiful-date";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e6YJBaDwWqVehxBPOvsIdV4FIXlIwj29H5untXGJvT0=";
   };
 
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 4a0311743316..f0a06382d88c 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "bellows";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RdNJmIhJR4Ubb4hppFkde8EeYHtFSoJp3CJPGj0463U=";
   };
 
diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix
index b0dfc690841d..845a43780cb6 100644
--- a/pkgs/development/python-modules/beniget/default.nix
+++ b/pkgs/development/python-modules/beniget/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "serge-sans-paille";
     repo = "beniget";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rNMgCEkI6p9KtLSz/2jVJ9rPeJzxv5rT+Pu6OHM8z70=";
   };
 
diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index b8a5dbb48d35..cab0aa411b92 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -127,7 +127,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "bentoml";
     repo = "BentoML";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-98SVW7f/Yn+NMfS6UIicQcoatMSm4XSJzbuJ0S/p3sg=";
   };
 
diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix
index b1ac71b6cc21..f9279d2e42b8 100644
--- a/pkgs/development/python-modules/betamax-matchers/default.nix
+++ b/pkgs/development/python-modules/betamax-matchers/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "betamaxpy";
     repo = "betamax_matchers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BV9DOfZLDAZIr2E75l988QxFWWvazBL9VttxGFIez1M=";
   };
 
diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index ab36e1dda562..48db179f7240 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danielgtaylor";
     repo = "python-betterproto";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
   };
 
diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index f333f2f3dbca..fb17c7d5f90d 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jab";
     repo = "bidict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WE0YaRT4a/byvU2pzcByuf1DfMlOpYA9i0PPrKXsS+M=";
   };
 
diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix
index 45a003269a63..db4c6571cb24 100644
--- a/pkgs/development/python-modules/biliass/default.nix
+++ b/pkgs/development/python-modules/biliass/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yutto-dev";
     repo = "yutto";
-    rev = "refs/tags/biliass@${version}";
+    tag = "biliass@${version}";
     hash = "sha256-IrzFjjMNuD5UgdccHxIxZoeZpM1PGtVQRTWHOocnmAU=";
   };
 
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index f8f93caa17f7..306bb87986d4 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "celery";
     repo = "billiard";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9LuAlIn6hNiZGvWuaaDQxx9g0aBVF6Z2krxEOrssqRs=";
   };
 
diff --git a/pkgs/development/python-modules/binary2strings/default.nix b/pkgs/development/python-modules/binary2strings/default.nix
index 3a9937e8fea8..72e20079cb1e 100644
--- a/pkgs/development/python-modules/binary2strings/default.nix
+++ b/pkgs/development/python-modules/binary2strings/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glmcdona";
     repo = "binary2strings";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3UPT0PdnPAhOu3J2vU5NxE3f4Nb1zwuX3hJiy87nLD0=";
   };
 
diff --git a/pkgs/development/python-modules/biom-format/default.nix b/pkgs/development/python-modules/biom-format/default.nix
index 8588c88e97af..e03df35b926b 100644
--- a/pkgs/development/python-modules/biom-format/default.nix
+++ b/pkgs/development/python-modules/biom-format/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "biocore";
     repo = "biom-format";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-E/6dIN8tdsu6cBVBW/BOeAQwJB9XRRL3flQZSKqIZlc=";
   };
 
diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix
index 49808c6ee686..98de452073da 100644
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BioPandas";
     repo = "biopandas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dUeGjDDz9VA1NrFLGKy0ebaa+MU4c1tHi5YYkAspLRk=";
   };
 
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Working with molecular structures in pandas DataFrames";
     homepage = "https://github.com/BioPandas/biopandas";
-    changelog = "https://github.com/BioPandas/biopandas/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/BioPandas/biopandas/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix
index 17d7eea6b1b2..39a408601e63 100644
--- a/pkgs/development/python-modules/bip-utils/default.nix
+++ b/pkgs/development/python-modules/bip-utils/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ebellocchia";
     repo = "bip_utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3G37n/mfI+3JVIkmJWzbB1qPPTE6NJJlFZWdE0fIIWA=";
   };
 
diff --git a/pkgs/development/python-modules/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix
index 1b00a055a1f2..569faddf5819 100644
--- a/pkgs/development/python-modules/bite-parser/default.nix
+++ b/pkgs/development/python-modules/bite-parser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jgosmann";
     repo = "bite-parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C508csRbjCeLgkp66TwDuxUtMITTmub5/TFv8x80HLA=";
   };
 
diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix
index af85d4b32034..83a1668cf807 100644
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scott-griffiths";
     repo = pname;
-    rev = "refs/tags/bitstring-${version}";
+    tag = "bitstring-${version}";
     hash = "sha256-m2LZdUWOMxzr/biZhD1nWagab8PohHTcr+U1di0nkrU=";
   };
 
diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index 7fd97a4c2707..69865be6e5bd 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blackjax-devs";
     repo = "blackjax";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM=";
   };
 
diff --git a/pkgs/development/python-modules/blackrenderer/default.nix b/pkgs/development/python-modules/blackrenderer/default.nix
index 98e404c2dbd6..6b36da006cd7 100644
--- a/pkgs/development/python-modules/blackrenderer/default.nix
+++ b/pkgs/development/python-modules/blackrenderer/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BlackFoundryCom";
     repo = "black-renderer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b2W0M32Y4HUyxObjvh0yMUBe5gfcSDXnw1GfhW7hoZk=";
   };
 
diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix
index 24f7afe4f963..70343bfec72a 100644
--- a/pkgs/development/python-modules/blake3/default.nix
+++ b/pkgs/development/python-modules/blake3/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "blake3-py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4fUCBragb4AQ75f1LEUvCiVOLYinjrg9cmJRz4TP4Vs=";
   };
 
diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix
index f63ccacc5088..fcfd668844bf 100644
--- a/pkgs/development/python-modules/bleak-esphome/default.nix
+++ b/pkgs/development/python-modules/bleak-esphome/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "bleak-esphome";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WFswGtPX0OpDTqT25oHGZ+gIN/fhco4orWeGVXIIfzM=";
   };
 
diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index f06a56eb9799..b651fc2bcbd5 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bleak-retry-connector";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WjowXfj9kPlMmfs3aJBHIux5/w6te7zpXXqXPaz2pks=";
   };
 
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 9fde15cf9d6a..82fb53ce2ebf 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hbldh";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kPeKQcJETZE6+btQsmCgb37yRI2Klg0lZ1ZIrm8ODow=";
   };
 
diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix
index ae3a63ac3ce8..9edb44d8873e 100644
--- a/pkgs/development/python-modules/blebox-uniapi/default.nix
+++ b/pkgs/development/python-modules/blebox-uniapi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blebox";
     repo = "blebox_uniapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-johTs1AGvC6mGasK87ijhBNbHb1m36Ep9TR8XPG35d0=";
   };
 
diff --git a/pkgs/development/python-modules/bless/default.nix b/pkgs/development/python-modules/bless/default.nix
index f4352cba1978..e1d6e144c12f 100644
--- a/pkgs/development/python-modules/bless/default.nix
+++ b/pkgs/development/python-modules/bless/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kevincar";
     repo = "bless";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dAdA+d75iE6v6t4mfgvwhRsIARLW+IqCGmaMABaDlZg=";
   };
 
diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix
index 00c36c80de63..6f42ae55fbf9 100644
--- a/pkgs/development/python-modules/blinkpy/default.nix
+++ b/pkgs/development/python-modules/blinkpy/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fronzbot";
     repo = "blinkpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MWXOxE0nxBFhkAWjy7qFPhv4AO6VjGf+fAiyaWXeiX8=";
   };
 
diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index e21b073faed9..887139f414df 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "cython-blis";
-    rev = "refs/tags/release-v${version}";
+    tag = "release-v${version}";
     hash = "sha256-J/EaJNmImcK4zScpbYPlQuoLyjoUkUgxUp6926P6rUQ=";
   };
 
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index bcdd909f092a..8740b3f213ee 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "blivet";
-    rev = "refs/tags/blivet-${version}";
+    tag = "blivet-${version}";
     hash = "sha256-X5U6XFmcsTfetpxwH0ONSnTasnwh2USukYtx+8HwVGc=";
   };
 
diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix
index 9208381cc9e4..244d7676053e 100644
--- a/pkgs/development/python-modules/blobfile/default.nix
+++ b/pkgs/development/python-modules/blobfile/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "christopher-hesse";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk=";
   };
 
diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index 149d30c1dda6..5458d033969f 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blockdiag";
     repo = "blockdiag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-j8FoNUIJJOaahaol1MRPyY2jcPCEIlaAD4bmM2QKFFI=";
   };
 
diff --git a/pkgs/development/python-modules/blockfrost-python/default.nix b/pkgs/development/python-modules/blockfrost-python/default.nix
index 7afc1b091952..0c0582290b7e 100644
--- a/pkgs/development/python-modules/blockfrost-python/default.nix
+++ b/pkgs/development/python-modules/blockfrost-python/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blockfrost";
     repo = "blockfrost-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mN26QXxizDR+o2V5C2MlqVEbRns1BTmwZdUnnHNcFzw=";
   };
 
diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index fb1856f7a245..e0ef658ada2f 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Blockstream";
     repo = "satellite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OmIQUrUH3kWgf+v+9Hl2OgDdGPwb3guNY0+H64CWkeg=";
   };
 
diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 5a37bd80e879..b8cb63f1949b 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "bloodyAD";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0BzVZ1aIjcq6D95hBjO+ahHaA48bmyaPAYHTAwQHaQg=";
   };
 
diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index 51163f0689be..8b8108c5c41e 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "python-blosc2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2aLfyd+/I8cy9OqdU4yNXY/bkf0AdXu+hZPLDdM3g5g=";
   };
 
diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix
index d153c721f7aa..a5cf37597746 100644
--- a/pkgs/development/python-modules/bluemaestro-ble/default.nix
+++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluemaestro-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mJ5JNGN4F9U3WMJQDwiZwuxE0zOirwo1sWF3/bVwXhY=";
   };
 
diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix
index 5bd7ca9b33a7..b2f9f0e3031e 100644
--- a/pkgs/development/python-modules/bluetooth-adapters/default.nix
+++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-adapters";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JeYqzwlR0zY0BGC6iFCTu9EDlYnu+wdpGeje2xKwcVI=";
   };
 
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index 861aaab2d138..f1f3ad0d8da8 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-auto-recovery";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JaFazXjbHohj4+rPkQA/SaBP0irHrre3vaCqz7T2bwE=";
   };
 
diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
index b50a20eb84bf..b6deb66fac3c 100644
--- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix
+++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-data-tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qg2QZc95DD2uTO0fTwoNaPfL+QSrcqDwJvx41lIZDRs=";
   };
 
diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
index df2038a8e96c..339f20b5a306 100644
--- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-sensor-state-data";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Gsg6Gbb+nvrKr7vn9zUuPTPtSjqFJyMk7oLt7LUUn5A=";
   };
 
diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix
index 3d1a3c0cd233..b3b54d8358d1 100644
--- a/pkgs/development/python-modules/bme680/default.nix
+++ b/pkgs/development/python-modules/bme680/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pimoroni";
     repo = "bme680-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ep0dnok/ycEoUAnOK4QmdqdO0r4ttzSoqHDl7aPengE=";
   };
 
diff --git a/pkgs/development/python-modules/boa-api/default.nix b/pkgs/development/python-modules/boa-api/default.nix
index 2d6ea217cb95..949aa652e397 100644
--- a/pkgs/development/python-modules/boa-api/default.nix
+++ b/pkgs/development/python-modules/boa-api/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boalang";
     repo = "api-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-8tt68NLi5ewSKiHdu3gDawTBPylbDmB4zlUUqa7EQuY=";
   };
 
diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix
index 79442baf25b4..c35da5090118 100644
--- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix
+++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Orange-Cyberdefense";
     repo = "bof";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-atKqHRX24UjF/9Dy0aYXAN+80nBJKCd07FmaR5Vl1q4=";
   };
 
diff --git a/pkgs/development/python-modules/boilerpy3/default.nix b/pkgs/development/python-modules/boilerpy3/default.nix
index 47afb1abe6b9..7c2e5027474c 100644
--- a/pkgs/development/python-modules/boilerpy3/default.nix
+++ b/pkgs/development/python-modules/boilerpy3/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "jmriebold";
     repo = "BoilerPy3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo=";
   };
 
diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index 76a01e135407..d0ef10d178b9 100644
--- a/pkgs/development/python-modules/boltons/default.nix
+++ b/pkgs/development/python-modules/boltons/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mahmoud";
     repo = "boltons";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rKBuqJ4EAm0OH97oeGOgcTcMWsloyU2u/PaBEKhm8dA=";
   };
 
diff --git a/pkgs/development/python-modules/bond-async/default.nix b/pkgs/development/python-modules/bond-async/default.nix
index 49e7cb351518..94a593a89d44 100644
--- a/pkgs/development/python-modules/bond-async/default.nix
+++ b/pkgs/development/python-modules/bond-async/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bondhome";
     repo = "bond-async";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YRJHUOYFLf4dtQGIFKHLdUQxWTnZzG1MPirMsGvDor8=";
   };
 
diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix
index fb656151a13b..60a826b8b44c 100644
--- a/pkgs/development/python-modules/boost-histogram/default.nix
+++ b/pkgs/development/python-modules/boost-histogram/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "boost-histogram";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GsgzJqZTrtc4KRkGn468m0e+sgX9rzJdwA9JMPSSPWk=";
   };
 
diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix
index 3246a11213b4..75f69cf4ee79 100644
--- a/pkgs/development/python-modules/borb/default.nix
+++ b/pkgs/development/python-modules/borb/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jorisschellekens";
     repo = "borb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eVxpcYL3ZgwidkSt6tUav3Bkne4lo1QCshdUFqkA0wI=";
   };
 
diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix
index 77d7b3906ea1..2ce41db7c671 100644
--- a/pkgs/development/python-modules/bork/default.nix
+++ b/pkgs/development/python-modules/bork/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "duckinator";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk=";
   };
 
diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 36585fcf29c7..17b61499c2d9 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tschamm";
     repo = "boschshcpy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5kPC6UxqysJEHNWDoXhg7oo/hQSKICuqWmOdjlljoLs=";
   };
 
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 5f57bbc0042e..eb783eff8931 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boto";
     repo = "boto3";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-b08tC8EA6iW0O/7rseD9pTkKh/cJ2fe3xJZkEqxS6VI=";
   };
 
diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index 3bf81a2c0e4d..65db0322ba9d 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "botorch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CKlerCUadObpPq4jQAiFDBOZMHZ4QccAKQz30OFe64E=";
   };
 
diff --git a/pkgs/development/python-modules/bottombar/default.nix b/pkgs/development/python-modules/bottombar/default.nix
index 227e00d66e54..b3c82bc66d5e 100644
--- a/pkgs/development/python-modules/bottombar/default.nix
+++ b/pkgs/development/python-modules/bottombar/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "evalf";
     repo = "bottombar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W+Cbcgb664nVT/nsFdDruT688JWG2NZnF5hDDezTgnw=";
   };
 
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 27fef0c6a5b9..3a39611873ce 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "breathe-doc";
     repo = "breathe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI=";
   };
 
diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix
index feb21946c0ec..9620b4e78bfc 100644
--- a/pkgs/development/python-modules/bring-api/default.nix
+++ b/pkgs/development/python-modules/bring-api/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miaucl";
     repo = "bring-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw=";
   };
 
diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix
index 7bb9fbc9a17c..eafcb2dc96a8 100644
--- a/pkgs/development/python-modules/brother/default.nix
+++ b/pkgs/development/python-modules/brother/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "brother";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ=";
   };
 
diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index f429478eca98..a3880604ea60 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM=";
     # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
     forceFetchGit = true;
diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix
index 537686eb3a88..961a1f4d94f4 100644
--- a/pkgs/development/python-modules/bson/default.nix
+++ b/pkgs/development/python-modules/bson/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-bson";
     repo = "bson";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mirRpo27RoOBlwxVOKnHaDIzJOErp7c2VxCOunUm/u4=";
   };
 
diff --git a/pkgs/development/python-modules/btest/default.nix b/pkgs/development/python-modules/btest/default.nix
index 9b7b37125d97..bf75503ca6f4 100644
--- a/pkgs/development/python-modules/btest/default.nix
+++ b/pkgs/development/python-modules/btest/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zeek";
     repo = "btest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D01hAKcE52eKJRUh1/x5DGxRQpWgA2J0nutshpKrtRU=";
   };
 
diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 93433f5e53e3..250444047289 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TlZyNGfHNKN+6tCKepLS+fbgfq3a1uzeCXl25khl6d8=";
   };
 
diff --git a/pkgs/development/python-modules/btsocket/default.nix b/pkgs/development/python-modules/btsocket/default.nix
index 6065a670f12d..a11b49bb4d96 100644
--- a/pkgs/development/python-modules/btsocket/default.nix
+++ b/pkgs/development/python-modules/btsocket/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ukBaz";
     repo = "python-btsocket";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/T89GZJth7pBGQuN1ytCf649oWv7aZcfPHjYoftbLw8=";
   };
 
diff --git a/pkgs/development/python-modules/bucketstore/default.nix b/pkgs/development/python-modules/bucketstore/default.nix
index 285fbf15451b..71b7e1ec545a 100644
--- a/pkgs/development/python-modules/bucketstore/default.nix
+++ b/pkgs/development/python-modules/bucketstore/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpetrucciani";
     repo = "bucketstore";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WjweYFnlDEoR+TYzNgjPMdCLdUUEbdPROubov6kancc=";
   };
 
diff --git a/pkgs/development/python-modules/bump2version/default.nix b/pkgs/development/python-modules/bump2version/default.nix
index c7bbb8f327f9..4c589259b91e 100644
--- a/pkgs/development/python-modules/bump2version/default.nix
+++ b/pkgs/development/python-modules/bump2version/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "c4urself";
     repo = "bump2version";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU=";
   };
 
diff --git a/pkgs/development/python-modules/bumpfontversion/default.nix b/pkgs/development/python-modules/bumpfontversion/default.nix
index 8ee90f9795a5..7c0699bdd3c7 100644
--- a/pkgs/development/python-modules/bumpfontversion/default.nix
+++ b/pkgs/development/python-modules/bumpfontversion/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simoncozens";
     repo = "bumpfontversion";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qcKZGv/KeeSRBq4SdnuZlurp0CUs40iEQjw9/1LltUg=";
   };
 
diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix
index 8cfd41add1aa..248c61d72b46 100644
--- a/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/pkgs/development/python-modules/bundlewrap/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bundlewrap";
     repo = "bundlewrap";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e9gpWLOiTUZYIybLIfcR5x/NzhJSBFsU0I8LzY9sI5k=";
   };
 
diff --git a/pkgs/development/python-modules/busypie/default.nix b/pkgs/development/python-modules/busypie/default.nix
index 77882309148c..261bfd3b4d43 100644
--- a/pkgs/development/python-modules/busypie/default.nix
+++ b/pkgs/development/python-modules/busypie/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rockem";
     repo = "busypie";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dw0Sc/a27/EYY7LVMQqDkYuxrUFYK+N6XLk6A7A/eS8=";
   };
 
diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
index 757b2d7e9f21..45ac1d45af95 100644
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boxine";
     repo = "bx_py_utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VJ4510HLTqdRfeUEe2srT8+W9AaRpi+Mm6srZOOp0fc=";
   };
 
@@ -84,7 +84,7 @@ buildPythonPackage rec {
     description = "Various Python utility functions";
     mainProgram = "publish";
     homepage = "https://github.com/boxine/bx_py_utils";
-    changelog = "https://github.com/boxine/bx_py_utils/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/boxine/bx_py_utils/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 4267e09fd538..d2ce7f9bebdc 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bxlab";
     repo = "bx-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I5yc8i9xoievaZbgwHSQQSVvs1VnNa66Q883T4dCYYw=";
   };
 
diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix
index 80fbbd0ced30..08c53bb606d5 100644
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/pkgs/development/python-modules/bytecode/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vstinner";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Nj/GKZC+zZt1M4Qd7CMXQCLwTIu64aidasH4PwBLtzw=";
   };
 
diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix
index d7fe5f9a00ec..3ce9eb0ea66c 100644
--- a/pkgs/development/python-modules/bytewax/default.nix
+++ b/pkgs/development/python-modules/bytewax/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bytewax";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BecZvBJsaTHIhJhWM9GZldSL6Irrc7fiedulTN9e76I=";
   };
 
diff --git a/pkgs/development/python-modules/cache/default.nix b/pkgs/development/python-modules/cache/default.nix
index 678b394b5a67..49625a8ba359 100644
--- a/pkgs/development/python-modules/cache/default.nix
+++ b/pkgs/development/python-modules/cache/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jneen";
     repo = "python-cache";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vfVNo2B9fnjyjgR7cGrcsi9srWcTs3s8fhmvNF8okN0=";
   };
 
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix
index e498a3ad09a2..6ec5aeb5eb94 100644
--- a/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/pkgs/development/python-modules/cachecontrol/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ionrock";
     repo = "cachecontrol";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qeTq2NfMOmNtjBItLmjxlaxqqy/Uvb6JfBpCBRvRLh4=";
   };
 
diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix
index b00a6b5df4ef..7ee7b44c66e1 100644
--- a/pkgs/development/python-modules/cached-ipaddress/default.nix
+++ b/pkgs/development/python-modules/cached-ipaddress/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "cached-ipaddress";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo=";
   };
 
diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 247d1ce50ceb..58ca83174ff9 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydanny";
     repo = "cached-property";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sOThFJs18DR9aBgIpqkORU4iRmhCVKehyM3DLYUt/Wc=";
   };
 
diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix
index 12e9c4eb1465..b6654294e69a 100644
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/pkgs/development/python-modules/cachelib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8jg+zfdIATvu/GSFvqHl4cNMu+s2IFWC22vPZ7Q3WYI=";
   };
 
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index 55a083807c79..93561a2d194e 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkem";
     repo = "cachetools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WG9PiUMVGaEXXHKbtOFEGjLiSbNnpSI2fXCogpGj1PI=";
   };
 
diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index e040c536c54e..dc6371f50c5c 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-cachier";
     repo = "cachier";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg=";
   };
 
diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix
index 936fcaf3e95e..6b9848124717 100644
--- a/pkgs/development/python-modules/caio/default.nix
+++ b/pkgs/development/python-modules/caio/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = "caio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aTJ02dCLb3CsT6KmJxkmOzwtg5nuXeBwz+mT7ZTTU9o=";
   };
 
diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index ce517c659439..76ffc259e48f 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-caldav";
     repo = "caldav";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rixhEIcl37ZIiYFOnJY0Ww75xZy3o/436JcgLmoOGi0=";
   };
 
diff --git a/pkgs/development/python-modules/callee/default.nix b/pkgs/development/python-modules/callee/default.nix
index e20a34f8cd43..bc3435861f5a 100644
--- a/pkgs/development/python-modules/callee/default.nix
+++ b/pkgs/development/python-modules/callee/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Xion";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE=";
   };
 
diff --git a/pkgs/development/python-modules/calysto-scheme/default.nix b/pkgs/development/python-modules/calysto-scheme/default.nix
index 8c857d45e4f9..c4690a7cb11a 100644
--- a/pkgs/development/python-modules/calysto-scheme/default.nix
+++ b/pkgs/development/python-modules/calysto-scheme/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Calysto";
     repo = "calysto_scheme";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gTBXdjm6Ry6DpjO9tP+acYxM+DQDh4dZQF+pyXrUCiI=";
   };
 
diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix
index aeaccaee7e21..424e6a6046be 100644
--- a/pkgs/development/python-modules/camel-converter/default.nix
+++ b/pkgs/development/python-modules/camel-converter/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanders41";
     repo = "camel-converter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cHrMaf5PyFWacoi4t+Clow9qFAxbdn71p8ckuYMt27w=";
   };
 
diff --git a/pkgs/development/python-modules/can-isotp/default.nix b/pkgs/development/python-modules/can-isotp/default.nix
index 90dba000d395..1ccbdc736416 100644
--- a/pkgs/development/python-modules/can-isotp/default.nix
+++ b/pkgs/development/python-modules/can-isotp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pylessard";
     repo = "python-can-isotp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wfZMVfLBdYkFbb0DiDWmGaraykJ/QL64Zkl2/nBu4lY=";
   };
 
diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix
index a57300a77b84..cc86fa4637a3 100644
--- a/pkgs/development/python-modules/canals/default.nix
+++ b/pkgs/development/python-modules/canals/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepset-ai";
     repo = "canals";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xoJqj/zPBPPCheBxA+8EFRJqUnlP+4aWLEh42q1X1mM=";
   };
 
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index 42f9c1757a93..372a8ed685fb 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ebroecker";
     repo = "canmatrix";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UUJnLVt+uOj8Eav162btprkUeTemItGrSnBBB9UhJJI=";
   };
 
diff --git a/pkgs/development/python-modules/captcha/default.nix b/pkgs/development/python-modules/captcha/default.nix
index b7d7e55ad4e2..00c017711f67 100644
--- a/pkgs/development/python-modules/captcha/default.nix
+++ b/pkgs/development/python-modules/captcha/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "captcha";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5d5gts+BXS5OKVziR9cLczsD2QMXZ/n31sPEq+gPlxk=";
   };
 
diff --git a/pkgs/development/python-modules/captum/default.nix b/pkgs/development/python-modules/captum/default.nix
index b8d022f89952..e85901a65905 100644
--- a/pkgs/development/python-modules/captum/default.nix
+++ b/pkgs/development/python-modules/captum/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "captum";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1VOvPqxn6CNnmv7M8fl7JrqRfJQUH2tnXRCUqKnl7i0=";
   };
 
diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix
index 54b25617a0c7..de5d51e589d9 100644
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CybercentreCanada";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0dHdXb4v92681xL21FsrIkNgNQ9R5ULV1lnSCITZzP8=";
   };
 
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index cd07b0e48165..778f9b9effd7 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "casbin";
     repo = "pycasbin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gFh8+fcunDG4kT+cJpmuVGsgWQzntbbm6AQmvS/iCo0=";
   };
 
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index f6069e3475e0..5ad23b111c49 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datastax";
     repo = "python-driver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RX9GLk2admzRasmP7LCwIfsJIt8TC/9rWhIcoTqS0qc=";
   };
 
diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix
index 7fa81bbbf987..18e753488d1b 100644
--- a/pkgs/development/python-modules/castepxbin/default.nix
+++ b/pkgs/development/python-modules/castepxbin/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zhubonan";
     repo = "castepxbin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE=";
   };
 
diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix
index 25b94db8f5ae..395dc456a572 100644
--- a/pkgs/development/python-modules/catppuccin/default.nix
+++ b/pkgs/development/python-modules/catppuccin/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0+sbf2m0vJCf6EOl6DMqgtL35RJh+rehi/p0ylTPJK8=";
   };
 
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 8772932278e8..f0f94f4674f1 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-attrs";
     repo = "cattrs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LSP8a/JduK0h9GytfbN7/CjFlnGGChaa3VbbCHQ3AFE=";
   };
 
diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix
index 0653959ed6da..c5bc418b65a4 100644
--- a/pkgs/development/python-modules/causal-conv1d/default.nix
+++ b/pkgs/development/python-modules/causal-conv1d/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Dao-AILab";
     repo = "causal-conv1d";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p5x5u3zEmEMN3mWd88o3jmcpKUnovTvn7I9jIOj/ie0=";
   };
 
diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix
index 05be12f05226..e2e420553e02 100644
--- a/pkgs/development/python-modules/cdcs/default.nix
+++ b/pkgs/development/python-modules/cdcs/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "pycdcs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HhAzULVWkKOWDJ6IZyBy0MYc/YGAFkSTLIgpdyvw1eI=";
   };
 
diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix
index 7483b6d3d91c..5248595cc660 100644
--- a/pkgs/development/python-modules/celery-redbeat/default.nix
+++ b/pkgs/development/python-modules/celery-redbeat/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sibson";
     repo = "redbeat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lAEbhRTp0jYrCgHaTvPrl+lW1NRezmmTqAnUmLdpVwY=";
   };
 
diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix
index dc8e0d851efa..85071fbb0301 100644
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datafolklabs";
     repo = "cement";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-weBqmNEjeSh5YQfHK48VVFW3UbZQmV4MiIQ3UPQKTTI=";
   };
 
diff --git a/pkgs/development/python-modules/cemm/default.nix b/pkgs/development/python-modules/cemm/default.nix
index 39159b404162..ff03a97b7c4e 100644
--- a/pkgs/development/python-modules/cemm/default.nix
+++ b/pkgs/development/python-modules/cemm/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-cemm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BorgGHxoEeIGyJKqe9mFRDpcGHhi6/8IV7ubEI8yQE4=";
   };
 
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 7a3ba89b8041..e06a37721a53 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "censys";
     repo = "censys-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OP7+jSt4xS71Kcjy5hFzeZ5rlTPtDx22rPr3UwjI5dk=";
   };
 
diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix
index 566268bc06cb..f4a9520ee869 100644
--- a/pkgs/development/python-modules/cerberus/default.nix
+++ b/pkgs/development/python-modules/cerberus/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyeve";
     repo = "cerberus";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4sVNM4zHc9nsrntmJVdE9nm47CSF0UOJPPI9z3Z2YDc=";
   };
 
diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix
index 31ed14788dd6..8d13959369fd 100644
--- a/pkgs/development/python-modules/cert-chain-resolver/default.nix
+++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rkoopmans";
     repo = "python-certificate-chain-resolver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2itpu/Ap5GNnqAiw3Cp+8rndreWlwfPd+WwM99G7U2E=";
   };
 
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 21afcffb4c0f..f4078721a324 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qee7lUjgliG5fmUWWPm3MzpGJHUF/DXZ08UA6kkWjjk=";
   };
 
diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix
index 52cbbe19cbac..f9ad9d7b3e90 100644
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ly4k";
     repo = "Certipy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Era5iNLJkZIRvN/p3BiD/eDiDQme24G65VSG97tuEOQ=";
   };
 
diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix
index 5e70f24eedda..afda68490e95 100644
--- a/pkgs/development/python-modules/certomancer/default.nix
+++ b/pkgs/development/python-modules/certomancer/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "certomancer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2BjLoGUWU0RaWVI9JA3s/Hf5aVtmv8hn+fB2jkWdQNY=";
   };
 
diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix
index 3cee465537b2..b18339a157e7 100644
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xarray-contrib";
     repo = "cf-xarray";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk=";
   };
 
diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix
index ecf28c56000d..f4692158a9d9 100644
--- a/pkgs/development/python-modules/cfgv/default.nix
+++ b/pkgs/development/python-modules/cfgv/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "cfgv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P02j53dltwdrlUBG89AI+P2GkXYKTVrQNF15rZt58jw=";
   };
 
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index dad77f086a45..89e01275a203 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = "cfn-lint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e06ytX1scIsmw/SezIVVnGn0day1l6kQ/wb05E8O7h0=";
   };
 
diff --git a/pkgs/development/python-modules/cgal/default.nix b/pkgs/development/python-modules/cgal/default.nix
index 303addccd06e..cdebc76a1827 100644
--- a/pkgs/development/python-modules/cgal/default.nix
+++ b/pkgs/development/python-modules/cgal/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "cgal-swig-bindings";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MnUsl4ozMamKcQ13TV6mtoG7VKq8BuiDSIVq1RPn2rs=";
   };
 
diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
index c51f2fe07724..d22abf8c9164 100644
--- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
+++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i6bhqfYo+gFTf3dqOBSQqGN4WPqbUR05StdwZvrVckI=";
   };
 
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index 789b0594c152..b31f869244ce 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chainer";
     repo = "chainer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ=";
   };
 
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index b91eb29a0818..9a72361a7f94 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m3pSD4fahBW6Yt/w07Co4fTZD7k6as5cPwoK5QSry6M=";
   };
 
diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
index d3f0d7a0f427..93f6d317ce98 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "malthe";
     repo = "chameleon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TbXx3reRpUqnMVDsr38FM1SLgARjqXAduO3k87U5TIg=";
   };
 
diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix
index e6743a93bf68..060c7e96d6fb 100644
--- a/pkgs/development/python-modules/channels-redis/default.nix
+++ b/pkgs/development/python-modules/channels-redis/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django";
     repo = "channels_redis";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Eid9aWlLNnqr3WAnsLe+Pz9gsugCsdDKi0+nFNF02CI=";
   };
 
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index 6611b3bae32e..d0fa6b4596c3 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django";
     repo = "channels";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JkmS+QVF1MTdLID+c686Fd8L3kA+AIr7sLCaAoABh+s=";
   };
 
diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix
index 90abf29a7df7..cef8cc71e918 100644
--- a/pkgs/development/python-modules/charset-normalizer/default.nix
+++ b/pkgs/development/python-modules/charset-normalizer/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ousret";
     repo = "charset_normalizer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-T9lnlS05Ogb2eLLHYWFnjBtRaB/OBqGWHQ/2WLunrNY=";
   };
 
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index f06bbda41389..d3ec667342fa 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mgedmin";
     repo = "check-manifest";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wZ0mx2b3QkwTOPMLQ03SFVwnbsVO5RezOSX50ZOYvw8=";
   };
 
diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix
index cbc15b287faa..9f8ff2ea696e 100644
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "domainaware";
     repo = "checkdmarc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fqSRqiakwFk1Cfb79oOEBbPF/fbtumuV7M6Mjl09Vmw=";
   };
 
diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 0352fd8714d0..acbaaf0e9bf4 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CheetahTemplate3";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI=";
   };
 
diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix
index b8d6cfcafc2e..87666e64d2bd 100644
--- a/pkgs/development/python-modules/chess/default.nix
+++ b/pkgs/development/python-modules/chess/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niklasf";
     repo = "python-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OAYQ/XtM4AHfbpA+gVa/AjB3tyMtvgykpHc39WaU2CI=";
   };
 
diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix
index 27369e9d76c7..8246d3553f8a 100644
--- a/pkgs/development/python-modules/chispa/default.nix
+++ b/pkgs/development/python-modules/chispa/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MrPowers";
     repo = "chispa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WPtn8YGlj67MEy2onxoU5SctQ7NcvTImaU0VgMoz2B4=";
   };
 
diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix
index fb8bdc1deea1..00728a35d395 100644
--- a/pkgs/development/python-modules/chroma-hnswlib/default.nix
+++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "hnswlib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pjz5SGg2drO6fkml9ojFG7/Gq3/Y7vPaOHc+3LKnjUw=";
   };
 
diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 5bb9c0cbffe6..e10e42a6d22b 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DQHkgCHtrn9xi7Kp7TZ5NP1EtFtTH5QOvne9PUvxsWc=";
   };
 
diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix
index da66b2b45108..3210a741c85c 100644
--- a/pkgs/development/python-modules/circuitbreaker/default.nix
+++ b/pkgs/development/python-modules/circuitbreaker/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fabfuel";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jaDCMGCZZu3STluYeHDNgdEPf2DNq7bXJ0LPV3JZdk0=";
   };
 
diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix
index 478591d51df3..13e7a563b64d 100644
--- a/pkgs/development/python-modules/ciscoconfparse/default.nix
+++ b/pkgs/development/python-modules/ciscoconfparse/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mpenning";
     repo = "ciscoconfparse";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vL/CQdYcOP356EyRToviWylP1EBtxmeov6qkhfQNZ2Y=";
   };
 
diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix
index e0ad1f091260..311fb99fbf05 100644
--- a/pkgs/development/python-modules/ciso8601/default.nix
+++ b/pkgs/development/python-modules/ciso8601/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "closeio";
     repo = "ciso8601";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KkMa1Rr3Z+5VnZfj25LDYpTfRyKqWA9u0vq6dZpwEy0=";
   };
 
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 01a5f6af92d5..20fcd1360cff 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "angr";
     repo = "claripy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k3jlHGkgtT/+Eo9rwUSgRCfs9PPHX+vS4LR0jH6cVdE=";
   };
 
diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix
index 3b127e61d1d7..7746a76ce146 100644
--- a/pkgs/development/python-modules/cleanlab/default.nix
+++ b/pkgs/development/python-modules/cleanlab/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cleanlab";
     repo = "cleanlab";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0kCEIHNOXIkdwDH5zCVWnR/W79ppc/1PFsJ/a4goGzk=";
   };
 
diff --git a/pkgs/development/python-modules/cleanvision/default.nix b/pkgs/development/python-modules/cleanvision/default.nix
index ff25048ab886..806a9c03060f 100644
--- a/pkgs/development/python-modules/cleanvision/default.nix
+++ b/pkgs/development/python-modules/cleanvision/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cleanlab";
     repo = "cleanvision";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QAydDqLJx/jYKXqxRUElTdM5dOFA6nZag8rNAjPZjRg=";
   };
 
diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix
index be805228302a..0bad39ef1ed2 100644
--- a/pkgs/development/python-modules/cleo/default.nix
+++ b/pkgs/development/python-modules/cleo/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-reo/7aPFU5uvZ1YPRTJDRmcMSMFru8e5ss5YmjSe3QU=";
   };
 
diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index e7308e453034..f6ce335fa83e 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-T4eYTr3+MUr1fPWE490v1m8THdZrBUP4wODftjpvnLQ=";
   };
 
diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix
index 8902c3f13fbe..be2ad84ece64 100644
--- a/pkgs/development/python-modules/click-command-tree/default.nix
+++ b/pkgs/development/python-modules/click-command-tree/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "whwright";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI=";
   };
 
diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix
index 0e6d589e20e1..061d2e3a0391 100644
--- a/pkgs/development/python-modules/click-default-group/default.nix
+++ b/pkgs/development/python-modules/click-default-group/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-default-group";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9Vk4LdgLDAWG2YCQPLKR6PIVnULmpOoe7RtS8DgWARo=";
   };
 
diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix
index a781352f39ff..6da6e6d1e4b5 100644
--- a/pkgs/development/python-modules/click-didyoumean/default.nix
+++ b/pkgs/development/python-modules/click-didyoumean/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-didyoumean";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C8OrJUfBFiDM/Jnf1iJo8pGEd0tUhar1vu4fVIfGzq8=";
   };
 
diff --git a/pkgs/development/python-modules/click-option-group/default.nix b/pkgs/development/python-modules/click-option-group/default.nix
index 6fa457d6f57b..11de4c4bc52e 100644
--- a/pkgs/development/python-modules/click-option-group/default.nix
+++ b/pkgs/development/python-modules/click-option-group/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uR5rIZPPT6pRk/jJEy2rZciOXrHWVWN6BfGroQ3znas=";
   };
 
diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix
index bd2fad9f192f..66acdd9d145d 100644
--- a/pkgs/development/python-modules/click-repl/default.nix
+++ b/pkgs/development/python-modules/click-repl/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-repl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xCT3w0DDY73dtDL5jbssXM05Zlr44OOcy4vexgHyWiE=";
   };
 
diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix
index 593b035757b4..b51163716e5f 100644
--- a/pkgs/development/python-modules/click-shell/default.nix
+++ b/pkgs/development/python-modules/click-shell/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clarkperkins";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI=";
   };
 
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 3bda7fb00e70..cf69beff0401 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8YqIKRyw5MegnRwAO7YTCZateEFQFTH2PHpE8gTPTow=";
   };
 
diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix
index a8109184f251..73f42d2cc659 100644
--- a/pkgs/development/python-modules/clickgen/default.nix
+++ b/pkgs/development/python-modules/clickgen/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ful1e5";
     repo = "clickgen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yFEkE1VyeHBuebpsumc6CTvv2kpAw7XAWlyUlXibqz0=";
   };
 
diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix
index 9b4b213be8fd..83c04b69ed8c 100644
--- a/pkgs/development/python-modules/clickhouse-connect/default.nix
+++ b/pkgs/development/python-modules/clickhouse-connect/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "clickhouse-connect";
     owner = "ClickHouse";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Jx+lbCs1zsU11D76COIiMxwqHlYKC1DOMegM4RsQkVg=";
   };
 
diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 7231d0e44e76..8117e9b5e5cc 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sdispater";
     repo = "clikit";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA=";
   };
 
diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
index 721b7cadb681..5ea19c7e7b1b 100644
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sebageek";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e7C9IDr+mhVSfU8lMywjX1BYwFo/qegPNzabak7UPcY=";
   };
 
diff --git a/pkgs/development/python-modules/clip-anytorch/default.nix b/pkgs/development/python-modules/clip-anytorch/default.nix
index 10e368985f79..6054969537e7 100644
--- a/pkgs/development/python-modules/clip-anytorch/default.nix
+++ b/pkgs/development/python-modules/clip-anytorch/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rom1504";
     repo = "CLIP";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4A8R9aEiOWC05uhMQslhVSkQ4hyjs6VsqkFi76miodY=";
   };
 
diff --git a/pkgs/development/python-modules/cloudevents/default.nix b/pkgs/development/python-modules/cloudevents/default.nix
index 04184c4a177a..24b0d9477d61 100644
--- a/pkgs/development/python-modules/cloudevents/default.nix
+++ b/pkgs/development/python-modules/cloudevents/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cloudevents";
     repo = "sdk-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YIvEAofWmnUblRd4jV3Zi3VdfocOnD05CMVm/abngyg=";
   };
 
diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index 133277a0a228..16c042d746f3 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "drivendataorg";
     repo = "cloudpathlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VjoQc9nzwcMh9kiqWXsJNE5X7e7/sVGId5jgFTLZQy4=";
   };
 
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index d8ebf82cf276..2ddebe50fbe7 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cloudpipe";
     repo = "cloudpickle";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UeKVwzT0m4fhEVnG7TvQsFR99JsmwwoXmr+rWnTCeJU=";
   };
 
diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index 25c05cdd1e8c..2d1c3c55dedb 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "salesforce";
     repo = "cloudsplaining";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZraWGOiJNqVSmxnllaTvpk9+rUQRFcxFIdp91gpAQW0=";
   };
 
diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix
index 39567ede68d2..88d0a858d387 100644
--- a/pkgs/development/python-modules/cma/default.nix
+++ b/pkgs/development/python-modules/cma/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CMA-ES";
     repo = "pycma";
-    rev = "refs/tags/r${version}";
+    tag = "r${version}";
     hash = "sha256-W4KDtX/Ho/XUrZr2cmS66Q0q90FEHRJN0VF4sMgonRw=";
   };
 
diff --git a/pkgs/development/python-modules/cmaes/default.nix b/pkgs/development/python-modules/cmaes/default.nix
index 6a0f96d469e5..41a0a886729f 100644
--- a/pkgs/development/python-modules/cmaes/default.nix
+++ b/pkgs/development/python-modules/cmaes/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CyberAgentAILab";
     repo = "cmaes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u2CgU9n8N9AMxfMBbDbnYzBMdl/IGOLTxOeh8RlnB/Y=";
   };
 
diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix
index a38a717fc252..c03c2cf8403c 100644
--- a/pkgs/development/python-modules/cmdstanpy/default.nix
+++ b/pkgs/development/python-modules/cmdstanpy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstanpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/MiWawB1Y4/eMBHXQLjd+P+Pe8EtsLbGFrzQa1RNf6g=";
   };
 
diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
index c1ce182aa6c5..40a821b80eee 100644
--- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix
+++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyocd";
     repo = "cmsis-pack-manager";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg=";
   };
 
diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix
index c63d119755b0..168ba0b0882b 100644
--- a/pkgs/development/python-modules/cnvkit/default.nix
+++ b/pkgs/development/python-modules/cnvkit/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "etal";
     repo = "cnvkit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZdE3EUNZpEXRHTRKwVhuj3BWQWczpdFbg4pVr0+AHiQ=";
   };
 
diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix
index 5a245fc58f21..543d796a7fc1 100644
--- a/pkgs/development/python-modules/coconut/default.nix
+++ b/pkgs/development/python-modules/coconut/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "evhub";
     repo = "coconut";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Vd6ZY3PlbPOy63/0/0YJ1U2PpsVdctOoInyKftj//cM=";
   };
 
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index 028cf7238e6f..f674120157ea 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cocotb";
     repo = "cocotb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7KCo7g2I1rfm8QDHRm3ZKloHwjDIICnJCF8KhaFdvqY=";
   };
 
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index d3dcee1b16e4..10ca6ea36b6a 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "coffea";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QE+la7CB2xrbbIOUL/HtKRHUOGu19IyfDvjL6oucn7g=";
   };
 
diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix
index 4720639900d9..01d8b292cbef 100644
--- a/pkgs/development/python-modules/coincurve/default.nix
+++ b/pkgs/development/python-modules/coincurve/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ofek";
     repo = "coincurve";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NKx/iLuzFEu1UBuwa14x55Ab3laVAKEtX6dtoWi0dOg=";
   };
 
diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix
index e92bcfe70b70..faca0ad788eb 100644
--- a/pkgs/development/python-modules/color-operations/default.nix
+++ b/pkgs/development/python-modules/color-operations/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vincentsarago";
     repo = "color-operations";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qqOTmVYD3VfjeVJtYvDQw+cxjcTsmqTYQNL1qMX+fL4=";
   };
 
diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix
index 4a1a340136f4..05ebb1598804 100644
--- a/pkgs/development/python-modules/colorful/default.nix
+++ b/pkgs/development/python-modules/colorful/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timofurrer";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8rHJIsHiyfjmjlGiEyrzvEwKgi1kP4Njm731mlFDMIU=";
   };
 
diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix
index 94a7ac695766..2290165e639b 100644
--- a/pkgs/development/python-modules/colorzero/default.nix
+++ b/pkgs/development/python-modules/colorzero/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "waveform80";
     repo = pname;
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14=";
   };
 
diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix
index 412f7dd307fe..904f3e1f4b02 100644
--- a/pkgs/development/python-modules/colout/default.nix
+++ b/pkgs/development/python-modules/colout/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nojhan";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI=";
   };
 
diff --git a/pkgs/development/python-modules/cometblue-lite/default.nix b/pkgs/development/python-modules/cometblue-lite/default.nix
index 0c935e9392b8..d0216307b939 100644
--- a/pkgs/development/python-modules/cometblue-lite/default.nix
+++ b/pkgs/development/python-modules/cometblue-lite/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neffs";
     repo = "python-cometblue_lite";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Cjd7PdZ2/neRr1jStDY5iJaGMJ/srnFmCea8aLNan6g=";
   };
 
diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix
index 1aaf781d3b9a..2f0ecbaafbca 100644
--- a/pkgs/development/python-modules/comicon/default.nix
+++ b/pkgs/development/python-modules/comicon/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "potatoeggy";
     repo = "comicon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FvAgcpYvUTTE24jJB2ZxSNcNjAIyUBa3BaysjWXurtg=";
   };
 
diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix
index f18517eca1e7..228381305e7a 100644
--- a/pkgs/development/python-modules/comm/default.nix
+++ b/pkgs/development/python-modules/comm/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "ipython";
     repo = "comm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-51HSSULhbKb1NdLJ//b3Vh6sOLWp0B4KW469htpduqM=";
   };
 
diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix
index 2ef03194928c..ce19e32b6561 100644
--- a/pkgs/development/python-modules/command-runner/default.nix
+++ b/pkgs/development/python-modules/command-runner/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netinvent";
     repo = "command_runner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rdbZtqNndtIxrLA90eWzR6dB8EyFrBALduBUkOVq4oE=";
   };
 
diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix
index 7dbe5f464b86..867b03e2c1b4 100644
--- a/pkgs/development/python-modules/commitizen/default.nix
+++ b/pkgs/development/python-modules/commitizen/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "commitizen-tools";
     repo = "commitizen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-f3uusTNGMK6a3Plh6FHBeM8vEXDZW31o9E0i+sWsBgE=";
   };
 
diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix
index 6ac907f78ab5..cccb852f381b 100644
--- a/pkgs/development/python-modules/commonmark/default.nix
+++ b/pkgs/development/python-modules/commonmark/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "readthedocs";
     repo = "commonmark.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ui/G/VLdjWcm7YmVjZ5Q8h0DEEFqdDByre29g3zHUq4=";
   };
 
diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix
index 15a0f77de900..a3b4e3238d79 100644
--- a/pkgs/development/python-modules/compressai/default.nix
+++ b/pkgs/development/python-modules/compressai/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "InterDigitalInc";
     repo = "CompressAI";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xvzhhLn0iBzq3h1nro8/83QWEQe9K4zRa3RSZk+hy3Y=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/conda-inject/default.nix b/pkgs/development/python-modules/conda-inject/default.nix
index 78d57f748bb1..d9de33f4489f 100644
--- a/pkgs/development/python-modules/conda-inject/default.nix
+++ b/pkgs/development/python-modules/conda-inject/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "koesterlab";
     repo = "conda-inject";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M4+bz7ZuHlcF8tF5kSCUjjkIHG75eCCW1IJxcwxNL6o=";
   };
 
diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index ba54cf93a76c..fceb265592e5 100644
--- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     inherit pname version;
     owner = "conda";
     repo = "conda-libmamba-solver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lIpMzm3wjkugMDwqmVFXDKVJyX/SdzFG5jelZRys8PQ=";
   };
 
diff --git a/pkgs/development/python-modules/conda-package-handling/default.nix b/pkgs/development/python-modules/conda-package-handling/default.nix
index 2c5563d2ea1f..3205fb9b718f 100644
--- a/pkgs/development/python-modules/conda-package-handling/default.nix
+++ b/pkgs/development/python-modules/conda-package-handling/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "conda";
     repo = "conda-package-handling";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AvuxHl3gUH7zIyMhZGeXqpMy0rJ99wj1/SrdTvlaX9A=";
   };
 
diff --git a/pkgs/development/python-modules/conda-package-streaming/default.nix b/pkgs/development/python-modules/conda-package-streaming/default.nix
index ef4b6f3fa9d2..6649fe770a07 100644
--- a/pkgs/development/python-modules/conda-package-streaming/default.nix
+++ b/pkgs/development/python-modules/conda-package-streaming/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "conda";
     repo = "conda-package-streaming";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Y0moewJROhybbyo263akbO20Q6As245ULKJikkWU4XE=";
   };
 
diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix
index 1339c7fa1a1d..b1942a35a256 100644
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     inherit pname version;
     owner = "conda";
     repo = "conda";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e+C+tSUdSGyotuZzkOuV0e0hOj+MZRuq1fHzsu3LERQ=";
   };
 
diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix
index 7f255c549ae4..6275a6963faa 100644
--- a/pkgs/development/python-modules/confection/default.nix
+++ b/pkgs/development/python-modules/confection/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1XIo9Hg4whYS1AkFeX8nVnpv+IvnpmyydHYdVYS0xZc=";
   };
 
diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix
index 9a1cdb8798d4..ff89b6a2a52c 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/pkgs/development/python-modules/configargparse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bw2";
     repo = "ConfigArgParse";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA=";
   };
 
diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index ecc629fe13a4..cf5397b27472 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DiffSK";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4=";
   };
 
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 00f6079d4b3c..2c9981db34a6 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "configparser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6B1I/kS60opMDpCzy2tnlnV65Qo500G0zPHP1I5TDWA=";
   };
 
diff --git a/pkgs/development/python-modules/connect-box/default.nix b/pkgs/development/python-modules/connect-box/default.nix
index 9a3a1519db78..be300f03c182 100644
--- a/pkgs/development/python-modules/connect-box/default.nix
+++ b/pkgs/development/python-modules/connect-box/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-connect-box";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zUvZRnxVzg9izvUbp7QVcyu6Bw3dUXHOr0kOQRWEZVc=";
   };
 
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index 595bd8ef14d0..783c0dc04754 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spec-first";
     repo = "connexion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM=";
   };
 
diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix
index 9e8fb88dbac0..ea5f7f5518fd 100644
--- a/pkgs/development/python-modules/connio/default.nix
+++ b/pkgs/development/python-modules/connio/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fPM7Ya69t0jpZhKM2MTk6BwjvoW3a8SV3k000LB9Ypo=";
   };
 
diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix
index a1a2b3ad856d..b7ecf05e72d0 100644
--- a/pkgs/development/python-modules/cons/default.nix
+++ b/pkgs/development/python-modules/cons/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "python-cons";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XssERKiv4A8x7dZhLeFSciN6RCEfGs0or3PAQiYSPII=";
   };
 
diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix
index c19fb148e56b..adf447600e10 100644
--- a/pkgs/development/python-modules/consonance/default.nix
+++ b/pkgs/development/python-modules/consonance/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "consonance";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ=";
   };
 
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 89c328325499..42d8e96b3889 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "twisted";
       repo = "constantly";
-      rev = "refs/tags/${version}";
+      tag = version;
       hash = "sha256-yXPHQP4B83PuRNvDBnRTx/MaPaQxCl1g5Xrle+N/d7I=";
     };
 
diff --git a/pkgs/development/python-modules/construct-typing/default.nix b/pkgs/development/python-modules/construct-typing/default.nix
index 73123bed0f39..2d5ecf5dde58 100644
--- a/pkgs/development/python-modules/construct-typing/default.nix
+++ b/pkgs/development/python-modules/construct-typing/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timrid";
     repo = "construct-typing";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zXpxu+VUcepEoAPLQnSlMCZkt8fDsMCLS0HBKhaYD20=";
   };
 
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index b0fdf8d7c326..780f973e8a8c 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "construct";
     repo = "construct";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5otjjIyje0+z/Y/C2ivmu08PNm0oJcSSvZkQfGxHDuQ=";
   };
 
diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix
index 6d05455ae439..eb31de01684e 100644
--- a/pkgs/development/python-modules/container-inspector/default.nix
+++ b/pkgs/development/python-modules/container-inspector/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "container-inspector";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs=";
   };
 
diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix
index de2f96a8a93d..87a630249446 100644
--- a/pkgs/development/python-modules/contourpy/default.nix
+++ b/pkgs/development/python-modules/contourpy/default.nix
@@ -35,7 +35,7 @@ let
     src = fetchFromGitHub {
       owner = "contourpy";
       repo = "contourpy";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-QvAIV2Y8H3oPZCF5yaqy2KWfs7aMyRX6aAU5t8E9Vpo=";
     };
 
diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix
index f055b52ee2b4..4d4053f2bc53 100644
--- a/pkgs/development/python-modules/coordinates/default.nix
+++ b/pkgs/development/python-modules/coordinates/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clbarnes";
     repo = "coordinates";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S/AmH5FinTpHFFcrGAUSyjfqoIgq14QlHk9CnUkqCv4=";
   };
 
diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix
index ed0b5d99bdb7..44ff920770f8 100644
--- a/pkgs/development/python-modules/coqpit/default.nix
+++ b/pkgs/development/python-modules/coqpit/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "idiap";
     repo = "coqui-ai-coqpit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3LZxoj2aFTpezakBymogkNPCaEBBaaUmyIa742cSMgU=";
   };
 
diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix
index f7e5824544d9..4d0876729d0b 100644
--- a/pkgs/development/python-modules/coredis/default.nix
+++ b/pkgs/development/python-modules/coredis/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HfGmsIi8PnYbnC2020x474gtq0eqHjF7mSmRSHb0QxY=";
   };
 
diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix
index 50ab12a81f9a..e5bc6b6e8359 100644
--- a/pkgs/development/python-modules/corner/default.nix
+++ b/pkgs/development/python-modules/corner/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dfm";
     repo = "corner.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MYos01YCSUwivymSE2hbjV7eKXfaMqG89koD2CWZjcQ=";
   };
 
diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index e3d52128ab2d..6c39407ae3c2 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cms-nanoAOD";
     repo = "correctionlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l+JjW/giGzU00z0jBN3D4KB/LjTIxeJb3CS+Ge0gbiA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix
index 59d9bdbfb129..bb0a0499d092 100644
--- a/pkgs/development/python-modules/corsair-scan/default.nix
+++ b/pkgs/development/python-modules/corsair-scan/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Santandersecurityresearch";
     repo = "corsair_scan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-s94ZiTL7tBrhUaeB/O3Eh8o8zqtfdt0z8LKep1bZWiY=";
   };
 
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index c59dd631bf08..960717ad44d0 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TheKevJames";
     repo = "coveralls-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1MjP99NykWNDyzWwZopLAzZ93vGX1mXEU+m+zvOBIZA=";
   };
 
diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix
index a608f7717b88..58b827f23eb9 100644
--- a/pkgs/development/python-modules/cpe/default.nix
+++ b/pkgs/development/python-modules/cpe/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nilp0inter";
     repo = "cpe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QI5XHy2TDSUqK6BZBoFWViBcOKfo+zg0ulzEzF4eg4w=";
   };
 
diff --git a/pkgs/development/python-modules/cpufeature/default.nix b/pkgs/development/python-modules/cpufeature/default.nix
index 13f364fb00ee..ba51f794dd06 100644
--- a/pkgs/development/python-modules/cpufeature/default.nix
+++ b/pkgs/development/python-modules/cpufeature/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robbmcleod";
     repo = "cpufeature";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dp569Tp8E5/avQpYvhPNPgS/A+q2e/ie+7BR7h2Ip+I=";
   };
 
diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index f304b114cd54..14ddeebae157 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-application";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kDujv7iVUvPfP9g3Ofm0Vso+I6qKBOq9NlFpigd6+Tc=";
   };
 
diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix
index efa3965a4128..9040407a3151 100644
--- a/pkgs/development/python-modules/craft-archives/default.nix
+++ b/pkgs/development/python-modules/craft-archives/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-archives";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1HEz4d1WLQDDHga7X+V/37n8E7JK/k0z+UDeNEiLOHs=";
   };
 
diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix
index dcd466c6877b..a11a840cca98 100644
--- a/pkgs/development/python-modules/craft-cli/default.nix
+++ b/pkgs/development/python-modules/craft-cli/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IqK+eU2z63yDMJrHAhETHWoTz5lWK1er9bwYH9Oml18=";
   };
 
diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix
index 1aeb3c32e10e..a9a73aaf0995 100644
--- a/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/pkgs/development/python-modules/craft-grammar/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-grammar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xex+7rCXqRegnws470VtVltM49fx7fSHzWDZawRmOdM=";
   };
 
diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index bececc2a50de..528c96a91f84 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-parts";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z0Om1/0Y6fDFHXB0GKFelmYwNwTH7loTtRjXtmjsjkY=";
   };
 
diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix
index 90b568600487..3219ba12b9b1 100644
--- a/pkgs/development/python-modules/craft-platforms/default.nix
+++ b/pkgs/development/python-modules/craft-platforms/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-platforms";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P7GC+t/rs49/a85Bxy6x4cRyCEaHG4b7SIb85sMj7Yk=";
   };
 
diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix
index 52ecfa0e6c23..851aba848553 100644
--- a/pkgs/development/python-modules/craft-providers/default.nix
+++ b/pkgs/development/python-modules/craft-providers/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-providers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-f+0AEoVUFL/+v4sRYirc6OD5dYH4dlLk8h7im+CLuhM=";
   };
 
diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix
index 34571f05f774..091842c392b6 100644
--- a/pkgs/development/python-modules/cramjam/default.nix
+++ b/pkgs/development/python-modules/cramjam/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milesgranger";
     repo = "pyrus-cramjam";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE=";
   };
 
diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix
index 6db82347773b..34e79fa8cb60 100644
--- a/pkgs/development/python-modules/crc/default.nix
+++ b/pkgs/development/python-modules/crc/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Nicoretti";
     repo = "crc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Oa2VSzNT+8O/rWZurIr7RnP8m3xAEVOQLs+ObT4xIa0=";
   };
 
diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix
index 96b55009bb76..705a3d0654db 100644
--- a/pkgs/development/python-modules/crc32c/default.nix
+++ b/pkgs/development/python-modules/crc32c/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ICRAR";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rWR2MtTLhqqvgdqEyevg/i8ZHM3OU1bJb27JkBx1J3w=";
   };
 
diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix
index 63f6e570d71a..0964aa45f5c5 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "MartinScharrer";
     repo = "crccheck";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k=";
   };
 
diff --git a/pkgs/development/python-modules/crcelk/default.nix b/pkgs/development/python-modules/crcelk/default.nix
index f082899cfe03..232b22362505 100644
--- a/pkgs/development/python-modules/crcelk/default.nix
+++ b/pkgs/development/python-modules/crcelk/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zeroSteiner";
     repo = "crcelk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eJt0qcG0ejTQJyjOSi6Au2jH801KOMnk7f6cLbd7ADw=";
   };
 
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 97987cda532d..c9f44efdb9d6 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fugue";
     repo = "credstash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a6OzffGt5piHgi0AWEXJED0R/+8RETh/9hYJi/lUVu0=";
   };
 
diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix
index 27d8dabd7af0..f08a30e5a26f 100644
--- a/pkgs/development/python-modules/cron-descriptor/default.nix
+++ b/pkgs/development/python-modules/cron-descriptor/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Salamek";
     repo = "cron-descriptor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ElYma6RH2u1faIgOvGpMQA26dSIibWcO4mWU6NAA5PQ=";
   };
 
diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix
index f924a13dc253..d63b04f84d52 100644
--- a/pkgs/development/python-modules/cronsim/default.nix
+++ b/pkgs/development/python-modules/cronsim/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cuu508";
     repo = "cronsim";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90=";
   };
 
diff --git a/pkgs/development/python-modules/crossandra/default.nix b/pkgs/development/python-modules/crossandra/default.nix
index 20bcb21ff6b7..58c00243aaa4 100644
--- a/pkgs/development/python-modules/crossandra/default.nix
+++ b/pkgs/development/python-modules/crossandra/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "crossandra";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/JhrjXRH7Rs2bUil9HRneBC9wlVYEyfwivjzb+eyRv8=";
   };
 
diff --git a/pkgs/development/python-modules/crossplane/default.nix b/pkgs/development/python-modules/crossplane/default.nix
index fba9c59aa326..e68ab04de4f7 100644
--- a/pkgs/development/python-modules/crossplane/default.nix
+++ b/pkgs/development/python-modules/crossplane/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nginxinc";
     repo = "crossplane";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DfIF+JvjIREi7zd5ZQ7Co/CIKC5iUeOgR/VLDPmrtTQ=";
   };
 
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 791d90f8c9ad..0a8ebbc5d9f6 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyca";
     repo = "cryptography";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-A+qYW8GksYk+FQG8ZJHNYrjcouE1CsVH0Lko2ahoYUI=";
   };
 
diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix
index 41a3d80a50ce..c9e09699160e 100644
--- a/pkgs/development/python-modules/crytic-compile/default.nix
+++ b/pkgs/development/python-modules/crytic-compile/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crytic";
     repo = "crytic-compile";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SMkFzGZg/6akclQ0XLUvjK3uoypsHfRru+B4VurjOrM=";
   };
 
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index 7e4447546446..d20dafc4cff2 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "cssutils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-U9myMfKz1HpYVJXp85izRBpm2wjLHYZj8bUVt3ROTEg=";
   };
 
diff --git a/pkgs/development/python-modules/cstruct/default.nix b/pkgs/development/python-modules/cstruct/default.nix
index cc92fa059f3c..1b0c53be80cd 100644
--- a/pkgs/development/python-modules/cstruct/default.nix
+++ b/pkgs/development/python-modules/cstruct/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andreax79";
     repo = "python-cstruct";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VDJ0k3cOuHjckujf9yD1GVE+UM/Y9rjqhiq+MqGq2eM=";
   };
 
diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix
index ff7a8f7b3253..d195d530811f 100644
--- a/pkgs/development/python-modules/ctypesgen/default.nix
+++ b/pkgs/development/python-modules/ctypesgen/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ctypesgen";
     repo = "ctypesgen";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TwIWPellmjMpTGQ+adJBLNMdAqB0kLOMl4YAubvXKqo=";
   };
 
diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
index 4d09eb485764..56719042a746 100644
--- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "tag-expressions";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-etJKAOamCq63HsUqJMPBnmn0YFO3ZHOvs3/rDHN7YPU=";
   };
 
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index e0f3e8311db1..83cde3be9a9a 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cupy";
     repo = "cupy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eQZwOGCaWZ4b0JCHZlrPHVQVXQwSkibHb02j0czAMt8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/curio-compat/default.nix b/pkgs/development/python-modules/curio-compat/default.nix
index 6ea4da8feb3f..b68b1fcba865 100644
--- a/pkgs/development/python-modules/curio-compat/default.nix
+++ b/pkgs/development/python-modules/curio-compat/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klen";
     repo = "curio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Crd9r4Icwga85wvtXaePbE56R192o+FXU9Zn+Lc7trI=";
   };
 
diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 31dad93e5e89..e5434c6247c3 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q1VppzQ1Go+ia1D1BemTf40o9wV0miWyoGy/tY+95qE==";
   };
 
diff --git a/pkgs/development/python-modules/customtkinter/default.nix b/pkgs/development/python-modules/customtkinter/default.nix
index 4cd7d2e85239..a29279816257 100644
--- a/pkgs/development/python-modules/customtkinter/default.nix
+++ b/pkgs/development/python-modules/customtkinter/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "TomSchimansky";
     repo = "CustomTkinter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1g2wdXbUv5xNnpflFLXvU39s16kmwvuegKWd91E3qm4=";
   };
 
diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix
index c4b0dce62587..0ada48e67d44 100644
--- a/pkgs/development/python-modules/cvss/default.nix
+++ b/pkgs/development/python-modules/cvss/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RedHatProductSecurity";
     repo = "cvss";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+8aKNPcHFPcDyBvOO9QCVb1OIbpQHAEeJgt8fob0+lM=";
   };
 
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 4e49046a1e23..a837e141bdc5 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k=";
   };
 
diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix
index 509c2b7eb1da..a55c5c378a59 100644
--- a/pkgs/development/python-modules/cwl-upgrader/default.nix
+++ b/pkgs/development/python-modules/cwl-upgrader/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwl-upgrader";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cfEd1XAu31u+NO27d3RNA5lhCpRpYK8NeaCxhQ/1GNU=";
   };
 
diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix
index 4cda65322da4..bc8ee3baf3e5 100644
--- a/pkgs/development/python-modules/cwl-utils/default.nix
+++ b/pkgs/development/python-modules/cwl-utils/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwl-utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZSRwkZkBZ2cM0ZBvyI628xjbiho2FuFJnCYDZl3IrHs=";
   };
 
diff --git a/pkgs/development/python-modules/cwlformat/default.nix b/pkgs/development/python-modules/cwlformat/default.nix
index 2433203eda22..f9a56ad49870 100644
--- a/pkgs/development/python-modules/cwlformat/default.nix
+++ b/pkgs/development/python-modules/cwlformat/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rabix";
     repo = "cwl-format";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FI8hUgb/KglTkubZ+StzptoSsYal71ITyyFNg7j48yk=";
   };
 
diff --git a/pkgs/development/python-modules/cybox/default.nix b/pkgs/development/python-modules/cybox/default.nix
index 24c991a05862..fec858e3f857 100644
--- a/pkgs/development/python-modules/cybox/default.nix
+++ b/pkgs/development/python-modules/cybox/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CybOXProject";
     repo = "python-cybox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Gn/gH7pvvOqLIGExgCNa5KswPazIZUZXdQe3LRAUVjw=";
   };
 
diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix
index fae2ae30b336..e2792d4a0d06 100644
--- a/pkgs/development/python-modules/cycler/default.nix
+++ b/pkgs/development/python-modules/cycler/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matplotlib";
     repo = "cycler";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5L0APSi/mJ85SuKCVz+c6Fn8zZNpRm6vCeBO0fpGKxg=";
   };
 
diff --git a/pkgs/development/python-modules/cyclonedds-python/default.nix b/pkgs/development/python-modules/cyclonedds-python/default.nix
index e23214d57dfe..22ad399498a4 100644
--- a/pkgs/development/python-modules/cyclonedds-python/default.nix
+++ b/pkgs/development/python-modules/cyclonedds-python/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eclipse-cyclonedds";
     repo = "cyclonedds-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MN3Z5gqsD+cr5Awmsia9+uCHL/a2KQP2uMS13rVc1Hw=";
   };
 
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index d6b6b5c60843..27c770e9abf1 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI=";
   };
 
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index f17dbf935164..b69818e8ada5 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N53obWs924HqxELxO1Ax4Jy+u+e4KT+FSbX4UhR+pJg=";
   };
 
diff --git a/pkgs/development/python-modules/cyipopt/default.nix b/pkgs/development/python-modules/cyipopt/default.nix
index bb20a06d77c4..da1c8b8f88a0 100644
--- a/pkgs/development/python-modules/cyipopt/default.nix
+++ b/pkgs/development/python-modules/cyipopt/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mechmotum";
     repo = "cyipopt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ddiSCVzywlCeeVbRJg2wxKIlAVlZw9Js95IbEDqhh5Q=";
   };
 
diff --git a/pkgs/development/python-modules/cymruwhois/default.nix b/pkgs/development/python-modules/cymruwhois/default.nix
index 8e399069f8f1..070dc04cb0d4 100644
--- a/pkgs/development/python-modules/cymruwhois/default.nix
+++ b/pkgs/development/python-modules/cymruwhois/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JustinAzoff";
     repo = "python-cymruwhois";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-d9m668JYI9mxUycoVWyaDCR7SOca+ebymZxWtgSPWNU=";
   };
 
diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix
index fe5874db533f..ca3623f09199 100644
--- a/pkgs/development/python-modules/cypherpunkpay/default.nix
+++ b/pkgs/development/python-modules/cypherpunkpay/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CypherpunkPay";
     repo = "CypherpunkPay";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-X0DB0PVwR0gRnt3jixFzglWAOPKBMvqTOG6pK6OJ03w=";
   };
 
diff --git a/pkgs/development/python-modules/cyrtranslit/default.nix b/pkgs/development/python-modules/cyrtranslit/default.nix
index 6d524bcf222a..6631f1a19680 100644
--- a/pkgs/development/python-modules/cyrtranslit/default.nix
+++ b/pkgs/development/python-modules/cyrtranslit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "opendatakosovo";
     repo = "cyrillic-transliteration";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t8UTOmjGqjmxU7+Po0/HmOPWAvcgZibaUC9dMlttA/0=";
   };
 
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index 5e006f8fa183..9921c3e86f9b 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cython";
     repo = "cython";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P2k21uNC6X+R6a1dWAIspGnUc6JwAzRXUleVfZG+vqY=";
   };
 
diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix
index c6c5e01df213..5041a06a8e16 100644
--- a/pkgs/development/python-modules/dacite/default.nix
+++ b/pkgs/development/python-modules/dacite/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "konradhalas";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lvObQ+jyBH2s4GOwyDXEAYmG7ZGQN9WDqL8ftNItPCQ=";
   };
 
diff --git a/pkgs/development/python-modules/dahlia/default.nix b/pkgs/development/python-modules/dahlia/default.nix
index 6762d6e666ab..c94d7658b321 100644
--- a/pkgs/development/python-modules/dahlia/default.nix
+++ b/pkgs/development/python-modules/dahlia/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dahlia-lib";
     repo = "dahlia";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-t8m/7TSzVvETvn3Jar29jCh55Ti+B0NA8Az/8GHwQAg=";
   };
 
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 7e85adb0c29d..45f910271159 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django";
     repo = "daphne";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RAK2CaKKVmVIv1MBK+9xyADOrHq664MQOry4KaGTNCw=";
   };
 
diff --git a/pkgs/development/python-modules/daqp/default.nix b/pkgs/development/python-modules/daqp/default.nix
index 0e9bdd48c3dd..bfd149f40a0e 100644
--- a/pkgs/development/python-modules/daqp/default.nix
+++ b/pkgs/development/python-modules/daqp/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darnstrom";
     repo = "daqp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9sPYyd8J78HKDxbwkogu8tW38rgYIctEWqrriqJKy0M=";
   };
 
diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 2710e90cccd1..d91ef958cf4e 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "dash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qbvsYlf3byaT/4b+/BDvCgnaBKthL/J79y0CWh5Yid4=";
   };
 
diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix
index b3f63835c3a4..7ef14974e75e 100644
--- a/pkgs/development/python-modules/dask-gateway/default.nix
+++ b/pkgs/development/python-modules/dask-gateway/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-gateway";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s=";
   };
 
diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index 2a181fa66c15..a297902bc684 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-image";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac=";
   };
 
diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index 8c43fc9f260f..db3e8a4876b3 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-jobqueue";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw=";
   };
 
diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index af0270af385f..e3949fde678b 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-ml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU=";
   };
 
diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix
index a7ba751c3b86..bcdf1e1cd844 100644
--- a/pkgs/development/python-modules/dask-yarn/default.nix
+++ b/pkgs/development/python-modules/dask-yarn/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-yarn";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/BTsxQSiVQrihrCa9DE7pueyg3aPAdjd/Dt4dpUwdtM=";
   };
 
diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix
index 55f3489a0144..9d894ee1c99f 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/pkgs/development/python-modules/databases/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "databases";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Zf9QqBgDhWAnHdNvzjXtri5rdT00BOjc4YTNzJALldM=";
   };
 
diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
index 4aeaec10aa04..0172982442af 100644
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "databricks";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dH95C2AY/B6F9BROr6rh+gVtKqxsg1gyEU5MzCd5aqs=";
   };
 
diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 22126c0643a0..21d18de7e3a4 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sdk-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g00NRo0FSHujN2mCLZCc1hKGsBFiN7ztEneUMziuQpk=";
   };
 
diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix
index bb8a949bc8ae..9b1e0aebe73b 100644
--- a/pkgs/development/python-modules/dataclasses-json/default.nix
+++ b/pkgs/development/python-modules/dataclasses-json/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lidatong";
     repo = "dataclasses-json";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM=";
   };
 
diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 9badd981aed4..c80baeef6e53 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     name = "datafusion-source";
     owner = "apache";
     repo = "arrow-datafusion-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg=";
   };
 
diff --git a/pkgs/development/python-modules/datalad-next/default.nix b/pkgs/development/python-modules/datalad-next/default.nix
index 19b651db3ac6..f74ba7b70d54 100644
--- a/pkgs/development/python-modules/datalad-next/default.nix
+++ b/pkgs/development/python-modules/datalad-next/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datalad-next";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fqP6nG2ncDRg48kvlsmPjNBOzfQp9+7wTcGvsYVrRzA=";
   };
 
diff --git a/pkgs/development/python-modules/datapoint/default.nix b/pkgs/development/python-modules/datapoint/default.nix
index aec91a0e548b..9b5bd87ec68d 100644
--- a/pkgs/development/python-modules/datapoint/default.nix
+++ b/pkgs/development/python-modules/datapoint/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ejep";
     repo = "datapoint-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zUvwfBwJe8SaB96/Jz7Qeanz1mHmLVp2JW9qkR2dRnY=";
   };
 
diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix
index f988112c533f..4b66756fa60f 100644
--- a/pkgs/development/python-modules/dataproperty/default.nix
+++ b/pkgs/development/python-modules/dataproperty/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8=";
   };
 
diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix
index 4216dd180cf2..0e0eaacbea2f 100644
--- a/pkgs/development/python-modules/datasalad/default.nix
+++ b/pkgs/development/python-modules/datasalad/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datasalad";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UIrbvFz674+HarFbv1eF++flj1hOR0cZyqKQSl+G7xY=";
   };
 
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index 20147a78fb60..10a098712546 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-b84Y7PixZUG1VXW11Q4fKxEcsWJjpXEHZIYugf2MSUU=";
   };
 
diff --git a/pkgs/development/python-modules/datasette-publish-fly/default.nix b/pkgs/development/python-modules/datasette-publish-fly/default.nix
index 9e20a5fd7849..8f07081fa624 100644
--- a/pkgs/development/python-modules/datasette-publish-fly/default.nix
+++ b/pkgs/development/python-modules/datasette-publish-fly/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk=";
   };
 
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 92959241988e..6f8eaa7e2c28 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kVtldBuDy19DmyxEQLtAjs1qiNIjaT8+rnHlFfGNHec=";
   };
 
diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix
index 4bf82cf464ca..f4d42b142e27 100644
--- a/pkgs/development/python-modules/datauri/default.nix
+++ b/pkgs/development/python-modules/datauri/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fcurella";
     repo = "python-datauri";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9BCYC8PW44pB348kkH7aB1YqXXN1VNcBHphlN503M6g=";
   };
 
diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix
index ff7ebf54c699..57bacf535706 100644
--- a/pkgs/development/python-modules/datefinder/default.nix
+++ b/pkgs/development/python-modules/datefinder/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "akoumjian";
     repo = "datefinder";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uOSwS+mHgbvEL+rTfs4Ax9NvJnhYemxFVqqDssy2i7g=";
   };
 
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index e2f6436f0cfb..2ee14891dbda 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scrapinghub";
     repo = "dateparser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mnL44hojebOwP6qtEBHs5QM4uRmLuGlVNr+sM3jZEKE=";
   };
 
diff --git a/pkgs/development/python-modules/datetime/default.nix b/pkgs/development/python-modules/datetime/default.nix
index b782b923dff2..e6a0c4597947 100644
--- a/pkgs/development/python-modules/datetime/default.nix
+++ b/pkgs/development/python-modules/datetime/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "datetime";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k4q9n3uikz+B9CUyqQTgl61OTKDWMsyhAt2gB1HWGRw=";
   };
 
diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix
index 15dad3f13588..54531bda982a 100644
--- a/pkgs/development/python-modules/db-dtypes/default.nix
+++ b/pkgs/development/python-modules/db-dtypes/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-db-dtypes-pandas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-InotzUk1lEuTD1tAojpEGfFyjrCDoGaa8JMDUdRd+Hw=";
   };
 
diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index b116a6e8f1b8..c89720c01dec 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-adapters";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I3A3rIMpT+MAq+ebid9RMr6I3W1l4ir78UmfeEr5U3U=";
   };
 
diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 83f73116195e..50f125b878c9 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BoCp3aNVR7Bvjda5YLwRAwvZub4sqNJLRoEQ+tePP5g=";
   };
 
diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
index 2fcd590324ba..b5c870af0c2a 100644
--- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
+++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-semantic-interfaces";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gY2CJqN/ohYs4Qej451PexWcsM7N9GuHt79qC+NC7T4=";
   };
 
diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix
index 7924c1c4ec87..13906e04212c 100644
--- a/pkgs/development/python-modules/dbt-snowflake/default.nix
+++ b/pkgs/development/python-modules/dbt-snowflake/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-snowflake";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XUHXyxAoIBHXmH2xXOGrCO2+WMwwJ7oVYt4+m/fT/Ko=";
   };
 
diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix
index 89358afbf5f0..54d102e4491e 100644
--- a/pkgs/development/python-modules/dbus-fast/default.nix
+++ b/pkgs/development/python-modules/dbus-fast/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "dbus-fast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk=";
   };
 
diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix
index 6e8cf203f545..b73691b3ca24 100644
--- a/pkgs/development/python-modules/dbus-next/default.nix
+++ b/pkgs/development/python-modules/dbus-next/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "altdesktop";
     repo = "python-dbus-next";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo=";
   };
 
diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
index 5b4bd5121d05..d645149b3c21 100644
--- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix
+++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stratis-storage";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4Y4cL254ZlZKF6d6cStIOya3J4ZfypuumwKOdDNzuNc=";
   };
 
diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix
index 41baa4b8f1fe..2946db32d5af 100644
--- a/pkgs/development/python-modules/deal-solver/default.nix
+++ b/pkgs/development/python-modules/deal-solver/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "life4";
     repo = "deal-solver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DAOeQLFR/JED32uJSW7W9+Xx5f1Et05W8Fp+Vm7sfZo=";
   };
 
diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix
index f37377526fdf..4b383419f301 100644
--- a/pkgs/development/python-modules/deal/default.nix
+++ b/pkgs/development/python-modules/deal/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "life4";
     repo = "deal";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4orpoYfPGSvquhg9w63uUe8QbBa2RUpxaEJ9uy28+fU=";
   };
 
diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix
index fcb0b4f1f945..83e06a5fd5e2 100644
--- a/pkgs/development/python-modules/debuglater/default.nix
+++ b/pkgs/development/python-modules/debuglater/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ploomber";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8=";
   };
 
diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix
index 0298d04cf247..d682fe826c2e 100644
--- a/pkgs/development/python-modules/decli/default.nix
+++ b/pkgs/development/python-modules/decli/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "woile";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE=";
   };
 
diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 77e9e938c8c4..f5dc398478a7 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DeebotUniverse";
     repo = "client.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hJGE9D0rsYKrd4XZIrOOnwaQlq75Qy4S8681wjr4VDs=";
   };
 
diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix
index 6565d98cdf75..cf1dee7f03cc 100644
--- a/pkgs/development/python-modules/deepface/default.nix
+++ b/pkgs/development/python-modules/deepface/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "serengil";
     repo = "deepface";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Vjm8lfpGyJ7/1CUwIvxXxHqwmv0+iKewYV3vE08gpPQ=";
   };
 
diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
index 92a88b601507..194aeac63613 100644
--- a/pkgs/development/python-modules/deepsearch-toolkit/default.nix
+++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "deepsearch-toolkit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7XiI/VtXX4lRMreqUh6hJvdIULGvsCEdrd+zV5Jrne0=";
   };
 
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index e022c30623de..698fad17cb82 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "browniebroke";
     repo = "deezer-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3TYgOa8NWGhkVIT5HkDdpHGyj7FzP8n02a36KHW6IC4=";
   };
 
diff --git a/pkgs/development/python-modules/defusedcsv/default.nix b/pkgs/development/python-modules/defusedcsv/default.nix
index bb62a9a7f997..ceebfba65114 100644
--- a/pkgs/development/python-modules/defusedcsv/default.nix
+++ b/pkgs/development/python-modules/defusedcsv/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "defusedcsv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y8qLVfdkxRrDjtrTOLK5Zvi/1Vyv8eOnCueUkaRp4sQ=";
   };
 
diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix
index 95b34a00dbdc..fc235a96192e 100644
--- a/pkgs/development/python-modules/defusedxml/default.nix
+++ b/pkgs/development/python-modules/defusedxml/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiran";
     repo = "defusedxml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-X88A5V9uXP3wJQ+olK6pZJT66LP2uCXLK8goa5bPARA=";
   };
 
diff --git a/pkgs/development/python-modules/deltachat2/default.nix b/pkgs/development/python-modules/deltachat2/default.nix
index 8025dc4ac228..a2dcc68076f0 100644
--- a/pkgs/development/python-modules/deltachat2/default.nix
+++ b/pkgs/development/python-modules/deltachat2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adbenitez";
     repo = "deltachat2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bp4bi+EeMaWP8zOaPp0eaPKn71F055QgMOOSDzIJUH4=";
   };
 
diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix
index 2a9a466c9ab0..6f75104aad5f 100644
--- a/pkgs/development/python-modules/demetriek/default.nix
+++ b/pkgs/development/python-modules/demetriek/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-demetriek";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc=";
   };
 
diff --git a/pkgs/development/python-modules/demoji/default.nix b/pkgs/development/python-modules/demoji/default.nix
index b63b2c12a1c0..5d3841c165b3 100644
--- a/pkgs/development/python-modules/demoji/default.nix
+++ b/pkgs/development/python-modules/demoji/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bsolomon1124";
     repo = "demoji";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ojy4JiM6xvP9J40Z5uFCMUZvZtLZ1le2p/2/NfAUAtk=";
   };
 
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index 37336cddb4a7..f2632e907107 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeetsukumaran";
     repo = "dendropy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OiFei/6226FDtL4w1XrXL2OVn3/hfQwnIhTzM4OneKc=";
   };
 
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 65c8a910842b..356b81bcb04e 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ol-iver";
     repo = "denonavr";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9nY1z6CX8uha/m3OOUyadrKmpbUsgL16CB2ySElOTck=";
   };
 
diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix
index ac7980462465..2afb5f4d5f7d 100644
--- a/pkgs/development/python-modules/dep-logic/default.nix
+++ b/pkgs/development/python-modules/dep-logic/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "dep-logic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5PEHkxwIgDz3Qs993qI4eaQZ5Him4i/MAnUam820AWc=";
   };
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "dep_logic" ];
 
   meta = {
-    changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/pdm-project/dep-logic/releases/tag/${version}";
     description = "Python dependency specifications supporting logical operations";
     homepage = "https://github.com/pdm-project/dep-logic";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 57280fd95468..8c75b9e5b916 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ets-labs";
     repo = "python-dependency-injector";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ryPNmiIKQzR4WSjt7hi4C+iTsYvfj5TYGy+9PJxX+10=";
   };
 
diff --git a/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix
index 1635a99d7137..90bd10c6556a 100644
--- a/pkgs/development/python-modules/deprecat/default.nix
+++ b/pkgs/development/python-modules/deprecat/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjhajharia";
     repo = "deprecat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CvW4SQ78FG8GqBs6/a0yHWfTAn64sH54GVSETooMa6A=";
   };
 
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index b8c57b379c00..173d0a25a5e7 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/pkgs/development/python-modules/deprecated/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tantale";
     repo = "deprecated";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H5Gp2F/ChMeEH4fSYXIB34syDIzDymfN949ksJnS0k4=";
   };
 
diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix
index 30c5275edbf9..be377210b9fd 100644
--- a/pkgs/development/python-modules/desktop-notifier/default.nix
+++ b/pkgs/development/python-modules/desktop-notifier/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "desktop-notifier";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HynREkiPxv/1y1/ICVwqANIe9tAkIvdpDy4oXxQarec=";
   };
 
diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix
index 820e204e118a..d7ce89ac8412 100644
--- a/pkgs/development/python-modules/detect-secrets/default.nix
+++ b/pkgs/development/python-modules/detect-secrets/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pNLAZUJhjZ3b01XaltJUJ9O7Blv6/pHQrRvURe7MJ5A=";
     leaveDotGit = true;
   };
diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix
index 42b8f0a6f43c..3f017850dfec 100644
--- a/pkgs/development/python-modules/detectron2/default.nix
+++ b/pkgs/development/python-modules/detectron2/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "detectron2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf";
   };
 
diff --git a/pkgs/development/python-modules/devialet/default.nix b/pkgs/development/python-modules/devialet/default.nix
index a9490581ce34..39c49cd3e190 100644
--- a/pkgs/development/python-modules/devialet/default.nix
+++ b/pkgs/development/python-modules/devialet/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fwestenberg";
     repo = "devialet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oGa5tRCJAWBg/877UmmXnX7fkFLoxhyuG6gpXmyhRKo=";
   };
 
diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix
index 47340bd1325c..4c9ee562011f 100644
--- a/pkgs/development/python-modules/devito/default.nix
+++ b/pkgs/development/python-modules/devito/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devitocodes";
     repo = "devito";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0=";
   };
 
diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix
index d88de025c3fe..9f3ba9a4471b 100644
--- a/pkgs/development/python-modules/devolo-plc-api/default.nix
+++ b/pkgs/development/python-modules/devolo-plc-api/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "2Fake";
     repo = "devolo_plc_api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EP99AswHmLO+8ZQAPjJyw/P9QqfDawy3AqyJR870Qms=";
   };
 
diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix
index 03cec87fef30..f12e2916ad0f 100644
--- a/pkgs/development/python-modules/devtools/default.nix
+++ b/pkgs/development/python-modules/devtools/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = "python-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo=";
   };
 
diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index 551430eebaa6..0656a8de12a5 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mingrammer";
     repo = "diagrams";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xdc8qHvLKy5QV/1c87o7H/VhitUhpH/+VgqBHn2a8lg=";
   };
 
diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix
index c532a7dfea5b..1c0b57397d21 100644
--- a/pkgs/development/python-modules/dicom-numpy/default.nix
+++ b/pkgs/development/python-modules/dicom-numpy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "innolitics";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE=";
   };
 
diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix
index a3b123f84302..b3f9e73e1134 100644
--- a/pkgs/development/python-modules/dicom2nifti/default.nix
+++ b/pkgs/development/python-modules/dicom2nifti/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "icometrix";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/JauQZcCQDl1ukcSE3YPbf1SyhVxDNJUlqnFwdlwYQY=";
   };
 
diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix
index c8e83141d4ea..8f232be99b0f 100644
--- a/pkgs/development/python-modules/dicomweb-client/default.nix
+++ b/pkgs/development/python-modules/dicomweb-client/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ImagingDataCommons";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D3j5EujrEdGTfR8/V3o2VJ/VkGdZ8IifPYMhP4ppXhw=";
   };
 
diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix
index f00a973275cd..71f05cabd66f 100644
--- a/pkgs/development/python-modules/dict2xml/default.nix
+++ b/pkgs/development/python-modules/dict2xml/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "delfick";
     repo = "python-dict2xml";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-5GnIVpG2xHKYv27sSjjmm8JsZ1YR9Mvc3SqE4SnE84o=";
   };
 
diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix
index 111cf8aa2a83..afd87a2b2434 100644
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "diffenator2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Iu6ZA8s6XnOYSOwlt8WTmYW6oUTvcm4vLhYvVATOlBA=";
   };
 
diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix
index fbfb03ca6802..4259cc5dee86 100644
--- a/pkgs/development/python-modules/diffsync/default.nix
+++ b/pkgs/development/python-modules/diffsync/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = "diffsync";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA=";
   };
 
diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix
index 7b4c38096f23..1c042fef1c92 100644
--- a/pkgs/development/python-modules/diffusers/default.nix
+++ b/pkgs/development/python-modules/diffusers/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "diffusers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/3lHJdsNblKb6xX03OluSCApMK3EXJbRLboBk8CjobE=";
   };
 
@@ -153,7 +153,7 @@ buildPythonPackage rec {
     description = "State-of-the-art diffusion models for image and audio generation in PyTorch";
     mainProgram = "diffusers-cli";
     homepage = "https://github.com/huggingface/diffusers";
-    changelog = "https://github.com/huggingface/diffusers/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/huggingface/diffusers/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index 33f0ccd2acca..ca2b5ae1742b 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uqfoundation";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-p+W0ppNMfSgplKsQjaTnTrMvQ5poF/E/xSzsiLf9h58=";
   };
 
diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix
index a59b541282be..010ab5493cb0 100644
--- a/pkgs/development/python-modules/dinghy/default.nix
+++ b/pkgs/development/python-modules/dinghy/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nedbat";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fn8SRzhFJyyr2Wr9/cp8Sm6kbVARq2LEeKSE0HU9V74=";
   };
 
diff --git a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
index 0e0230424558..216ab0210897 100644
--- a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
+++ b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cnico";
     repo = "dio-chacon-wifi-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4qE4laKQyfnAq2f/bkAqIfY/LnEmW+LTvNOCkTNFbAo=";
   };
 
diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix
index 6ef4d2494502..ef15c110c193 100644
--- a/pkgs/development/python-modules/dipy/default.nix
+++ b/pkgs/development/python-modules/dipy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dipy";
     repo = "dipy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6cpxuk2PL43kjQ+6UGiUHUXC7pC9OlW9kZvGOdEXyzw=";
   };
 
diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix
index 1df6e7ba83d6..47af32e0c67d 100644
--- a/pkgs/development/python-modules/dirigera/default.nix
+++ b/pkgs/development/python-modules/dirigera/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Leggin";
     repo = "dirigera";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-f5+9uDS8WfGjWWYf0wUEPM6ZitQpKPJIjAj1WhyyWEM=";
   };
 
diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix
index 72ecda8521c4..f44324b1a8e9 100644
--- a/pkgs/development/python-modules/dirty-equals/default.nix
+++ b/pkgs/development/python-modules/dirty-equals/default.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "samuelcolvin";
       repo = "dirty-equals";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-DZuzZ8cLYpVdivMh+zNJKpHe+0fpxM3ulKiCpN2S6co=";
     };
 
diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix
index b29a971c793a..7e8b1ab76baf 100644
--- a/pkgs/development/python-modules/discogs-client/default.nix
+++ b/pkgs/development/python-modules/discogs-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joalla";
     repo = "discogs_client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3MwGuYh4Jp/T7LNd5QjajHScdJJOa+VRXmKwFVqfURU=";
   };
 
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index 73d8cdc7abd4..6c79141e65f6 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Rapptz";
     repo = "discord.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GIwXx7bRCH2+G3zlilJ/Tb8el50SDbxGGX2/1bqL3+U=";
   };
 
diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix
index d6a8a50d93b8..15b5a1fc89b7 100644
--- a/pkgs/development/python-modules/discovery30303/default.nix
+++ b/pkgs/development/python-modules/discovery30303/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "discovery30303";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P31P5GjIrMotdIXqqZ6LCbk5MIl2Kq4MzlWDw+aOcrE=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-archive/default.nix b/pkgs/development/python-modules/dissect-archive/default.nix
index d62554e170e9..011e09350085 100644
--- a/pkgs/development/python-modules/dissect-archive/default.nix
+++ b/pkgs/development/python-modules/dissect-archive/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.archive";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DhOpNllDL10Oh4CgmwHHgkU/lJbdV2vs4wCzAyLiDGU=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix
index 6352809faca0..5dd0f284e1f2 100644
--- a/pkgs/development/python-modules/dissect-btrfs/default.nix
+++ b/pkgs/development/python-modules/dissect-btrfs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.btrfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-p7gtzZhKOovA+BcM7jYdicP301ueMS1IMGkBbmOxaIA=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix
index 9c841cbf3e15..2556d1a5f944 100644
--- a/pkgs/development/python-modules/dissect-cim/default.nix
+++ b/pkgs/development/python-modules/dissect-cim/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cim";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7Mv8yiWEs/mj/JKDrD1BxT75tQr13VgGj0yHdRltcYM=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix
index 3f3be066d2c4..5c8e5fd9a182 100644
--- a/pkgs/development/python-modules/dissect-clfs/default.nix
+++ b/pkgs/development/python-modules/dissect-clfs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.clfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VK17Q28Bqdu/NckBZNMJciWbnGkhfEbPmBeVo0etnW0=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
index ef8e70ef1305..343b9ea25a91 100644
--- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
+++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cobaltstrike";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GMpMTsI4mepaOGhw7/cSymkcxzn4mlNS1ZKYGYut+LM=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix
index 298b021ac460..da34c5f7a879 100644
--- a/pkgs/development/python-modules/dissect-cstruct/default.nix
+++ b/pkgs/development/python-modules/dissect-cstruct/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cstruct";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y6maLjugnso3cc9zyiZ/6AdrftYAAImYNBDXPJdTuWc=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix
index 5286413d55f6..64ebc1498381 100644
--- a/pkgs/development/python-modules/dissect-esedb/default.nix
+++ b/pkgs/development/python-modules/dissect-esedb/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.esedb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IDLarSiI7GHjOOLibk2s/KqKwmozgIHdSfClPQXOsXI=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix
index 598886447c5f..8bd48317dc63 100644
--- a/pkgs/development/python-modules/dissect-etl/default.nix
+++ b/pkgs/development/python-modules/dissect-etl/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.etl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c8qbh0LSTAV23J//Kx76eeIjptW1cVcxBSqO22okRkU=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix
index bdc1bb48112e..bd1d61583ba4 100644
--- a/pkgs/development/python-modules/dissect-eventlog/default.nix
+++ b/pkgs/development/python-modules/dissect-eventlog/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.eventlog";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MXjWHbw/iEzKo4cgiYAHLzt6/Y7s9o9cPNV5TD0gqW8=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix
index ba44d902b5dd..45b53d548355 100644
--- a/pkgs/development/python-modules/dissect-evidence/default.nix
+++ b/pkgs/development/python-modules/dissect-evidence/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.evidence";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VUdJkMtJkWGn79iopeZCTjAoD7mZkRxQaJ9Lem7Wkt8=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix
index 8d7cf33acb59..842ab8f28036 100644
--- a/pkgs/development/python-modules/dissect-executable/default.nix
+++ b/pkgs/development/python-modules/dissect-executable/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.executable";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qr8t+k0m9VoF2hLNilCLJ9BfATLRlZupF2C9l+6OMDo=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix
index 1323950bf905..aeec6cf5d066 100644
--- a/pkgs/development/python-modules/dissect-extfs/default.nix
+++ b/pkgs/development/python-modules/dissect-extfs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.extfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-i6lFqtDsqPyB0FQ5DKuYTuSenZFI0+GeOQdedov+2Nw=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix
index 549a55063248..25864ac92ee7 100644
--- a/pkgs/development/python-modules/dissect-fat/default.nix
+++ b/pkgs/development/python-modules/dissect-fat/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.fat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LGSIuRclytD4RHHzq2Zj1DG01RAFINj4+5ErbQ3M57E=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix
index 0c3f4b6f8192..ac930809369f 100644
--- a/pkgs/development/python-modules/dissect-ffs/default.nix
+++ b/pkgs/development/python-modules/dissect-ffs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.ffs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sOMakwJyKgeRXbc37D5j7GVldl3gO7yYMnNq217J7QM=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix
index ccd36f66c3cf..b9816645e0ab 100644
--- a/pkgs/development/python-modules/dissect-hypervisor/default.nix
+++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.hypervisor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9Ev7/W/+gfljBPCu4OGXzg2cWkUNFijcaRtKGkTck5k=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix
index aad42728587a..ad2cd28ae95e 100644
--- a/pkgs/development/python-modules/dissect-jffs/default.nix
+++ b/pkgs/development/python-modules/dissect-jffs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.jffs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hpCgo3Qj8nWvqVdKESrR6Tafgvxuc7xzhq8oiHApbwM=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix
index 8f53e47b179b..d7bdfab7a3d4 100644
--- a/pkgs/development/python-modules/dissect-ntfs/default.nix
+++ b/pkgs/development/python-modules/dissect-ntfs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.ntfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DOxyPlHBv4PEbHeGC/pj2QzbGhKFjw6QOAJmhq6Fc3k=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix
index e3a11e4e8a46..79074e7dfbfa 100644
--- a/pkgs/development/python-modules/dissect-ole/default.nix
+++ b/pkgs/development/python-modules/dissect-ole/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.ole";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MW76O7JH9hkDlIncPqoydZ8bzpmXqmvvm0i1IOF6Pnk=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix
index 8165c7ca2e3b..7f7b8edc958e 100644
--- a/pkgs/development/python-modules/dissect-regf/default.nix
+++ b/pkgs/development/python-modules/dissect-regf/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.regf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PzGA5OZ74bS25lC77pi6tG1x7BZcr9GtKbyKf9i/MwM=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix
index 5f7afb14b9d3..53d848aeefa3 100644
--- a/pkgs/development/python-modules/dissect-shellitem/default.nix
+++ b/pkgs/development/python-modules/dissect-shellitem/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.shellitem";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BS+c9QbMMsaoZHyuv6jMxbQFQNJeLt3da8Fq/wwXesQ=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix
index e2b3341dfdaa..7769a9035ff4 100644
--- a/pkgs/development/python-modules/dissect-sql/default.nix
+++ b/pkgs/development/python-modules/dissect-sql/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.sql";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mhZvvPmREBY29U31POH8OfktVdNqNpQVIICPBin5WyI=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix
index 74e038102e04..15328e611a67 100644
--- a/pkgs/development/python-modules/dissect-squashfs/default.nix
+++ b/pkgs/development/python-modules/dissect-squashfs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.squashfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C5Rp7MNuJjAk+DcjhNQfzZR47E/A2cJawhS6OFGU5xo=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix
index 189133bd0f77..3beb21a3f70d 100644
--- a/pkgs/development/python-modules/dissect-target/default.nix
+++ b/pkgs/development/python-modules/dissect-target/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.target";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/7pXOyhhFAKZJYgeW8QLriSicR1mB8pwK8EHkTz0Gko=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix
index 4fed8a55122c..002925fe31b5 100644
--- a/pkgs/development/python-modules/dissect-thumbcache/default.nix
+++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.thumbcache";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ab7Ci64eeeUcmY2opa16weuVvsWn5UgvSauE55gVH/w=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix
index 413199de8c40..47a824d3638b 100644
--- a/pkgs/development/python-modules/dissect-util/default.nix
+++ b/pkgs/development/python-modules/dissect-util/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.util";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z/dYYC3s4R7j2c5HBFlAStcur2AS57AOYndsRlj/Htw=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix
index da99ff9ffd02..5ab0ee81e5ab 100644
--- a/pkgs/development/python-modules/dissect-vmfs/default.nix
+++ b/pkgs/development/python-modules/dissect-vmfs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.vmfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/D5EaTNLxdzTMF/9S9esFXAxIwesEp0tdAMUAyeNtSI=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix
index 9c4956b4c816..031b626ce6cd 100644
--- a/pkgs/development/python-modules/dissect-volume/default.nix
+++ b/pkgs/development/python-modules/dissect-volume/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.volume";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uTbXvJ8lP4ir9rTToDGYXD837Z1fzi+Eh6cASg+jxdc=";
   };
 
diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix
index cef5f44e3311..56ebf890053e 100644
--- a/pkgs/development/python-modules/dissect-xfs/default.nix
+++ b/pkgs/development/python-modules/dissect-xfs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.xfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+dt47Wo5IMkMgd5lUWgpbB6n/tkWc+d1jnKD46Cq1Lc=";
   };
 
diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix
index 6e84591b92bc..951216bf3f09 100644
--- a/pkgs/development/python-modules/dissect/default.nix
+++ b/pkgs/development/python-modules/dissect/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0AVdihnnH3LMqHKwX5Ll4Nwt8LYfW4GktECvVCyyex8=";
   };
 
diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix
index 583e4cc85742..c170a1c8e2b7 100644
--- a/pkgs/development/python-modules/distorm3/default.nix
+++ b/pkgs/development/python-modules/distorm3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gdabah";
     repo = "distorm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Fhvxag2UN5wXEySP1n1pCahMQR/SfssywikeLmiASwQ=";
   };
 
diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix
index bae7ef5ffb93..3a84da55a64d 100644
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "distrax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A1aCL/I89Blg9sNmIWQru4QJteUTN6+bhgrEJPmCrM0=";
   };
 
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index 542950750d62..b1c785fd24d9 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "dj-database-url";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q0A9wA/k1xObw0e8+9qVTfpxBNL4W9rXisi0ge+R3DM=";
   };
 
diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix
index 9dddc459a3cc..ecb6e3575ca9 100644
--- a/pkgs/development/python-modules/dj-rest-auth/default.nix
+++ b/pkgs/development/python-modules/dj-rest-auth/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iMerica";
     repo = "dj-rest-auth";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fNy1uN3oH54Wd9+EqYpiV0ot1MbSSC7TZoAARQeR81s=";
   };
 
diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix
index 75be3283ab54..a6c32bd5f0b9 100644
--- a/pkgs/development/python-modules/django-admin-sortable2/default.nix
+++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jrief";
     repo = "django-admin-sortable2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WaDcDQF3Iq/UBE/tIlQFQiav6l5k6n+hKEsrcHwn+eY=";
   };
 
diff --git a/pkgs/development/python-modules/django-allauth-2fa/default.nix b/pkgs/development/python-modules/django-allauth-2fa/default.nix
index b04d760d39b3..4d8e51e1b782 100644
--- a/pkgs/development/python-modules/django-allauth-2fa/default.nix
+++ b/pkgs/development/python-modules/django-allauth-2fa/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "valohai";
     repo = "django-allauth-2fa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bm2RwhvX2nfhYs74MM0iZl9U2gHgm0lLlh2tuRRcGso=";
   };
 
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 4b75865cf326..0b5ce8d6154f 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pennersr";
     repo = "django-allauth";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C9SYlL1yMnSb+Zpi2opvDw1stxAHuI9/XKHyvkM36Cg=";
   };
 
diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index 2c69453d7959..ccc2ef7b9c1e 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anymail";
     repo = "django-anymail";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TuEEwxwgZVv97Ns4sRWdQjaNymE03nj8CTiU9S6ynZ8=";
   };
 
diff --git a/pkgs/development/python-modules/django-app-helper/default.nix b/pkgs/development/python-modules/django-app-helper/default.nix
index f0c829ff05b5..df44fd504147 100644
--- a/pkgs/development/python-modules/django-app-helper/default.nix
+++ b/pkgs/development/python-modules/django-app-helper/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nephila";
     repo = "django-app-helper";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4nFg8B1uxGJVY1jcGr0e2Oi14lqXcFOi0HJ+ogE2ikg=";
   };
 
diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix
index 4c9712305ea0..702ada6cdc1b 100644
--- a/pkgs/development/python-modules/django-appconf/default.nix
+++ b/pkgs/development/python-modules/django-appconf/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-compressor";
     repo = "django-appconf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H9MwX5LtHkYN6TshP7rRKlX/iOJZHbQVsZeki95yks4=";
   };
 
diff --git a/pkgs/development/python-modules/django-axes/default.nix b/pkgs/development/python-modules/django-axes/default.nix
index 1f07ef9a8a72..cc141ced8798 100644
--- a/pkgs/development/python-modules/django-axes/default.nix
+++ b/pkgs/development/python-modules/django-axes/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-axes";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ci1+xC0MQKPxev4P70QnU+TSEAxiqYwIIOlqN1Lyido=";
   };
 
diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix
index fb8a2bca0de9..0b8e0dd8aa66 100644
--- a/pkgs/development/python-modules/django-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap3/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7aHGTa98NaHg6C+fxuQsrPk/8XjHB3awp+gAWysOhAw=";
   };
 
diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix
index 7aa95c471777..4d6ff7c41adf 100644
--- a/pkgs/development/python-modules/django-bootstrap4/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap4/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zostera";
     repo = "django-bootstrap4";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9URZ+10GVX171Zht49UQEDkVOZ7LfOtUvapLydzNAlk=";
   };
 
diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix
index 44a680f4f3dc..4651937339c6 100644
--- a/pkgs/development/python-modules/django-cachalot/default.nix
+++ b/pkgs/development/python-modules/django-cachalot/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "noripyt";
     repo = "django-cachalot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw=";
   };
 
diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix
index 64127acc6923..5dd5a914aeef 100644
--- a/pkgs/development/python-modules/django-celery-beat/default.nix
+++ b/pkgs/development/python-modules/django-celery-beat/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "celery";
     repo = "django-celery-beat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XWcmKQXNw8eoGkld77E3rHpR9ofa1i2qO/JI8Hnpi9M=";
   };
 
diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix
index 1396b45d6024..5ee6e68988e3 100644
--- a/pkgs/development/python-modules/django-ckeditor/default.nix
+++ b/pkgs/development/python-modules/django-ckeditor/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-ckeditor";
     repo = "django-ckeditor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tPwWXQAKoHPpZDZ+fnEoOA29at6gUXBw6CcPdireTr8=";
   };
 
diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix
index 12082d2d5079..728585d24e54 100644
--- a/pkgs/development/python-modules/django-cms/default.nix
+++ b/pkgs/development/python-modules/django-cms/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-cms";
     repo = "django-cms";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2vA1teV6IkjtDo44uwEts1OGsBZ4dXRFGrasAHmgnRA=";
   };
 
diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix
index 761d9edc8fc7..74649ef527b1 100644
--- a/pkgs/development/python-modules/django-countries/default.nix
+++ b/pkgs/development/python-modules/django-countries/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SmileyChris";
     repo = "django-countries";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IR9cJbDVkZrcF3Ti70mV8VeXINQDK8OpwUTWVjD4Zn0=";
   };
 
diff --git a/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix
index 3fe7e0c74978..b3ccbcac96cd 100644
--- a/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "crispy-bootstrap3";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-w5CGWf14Wa8hndpk5r4hlz6gGykvRL+1AhA5Pz5Ejtk=";
   };
 
diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix
index 9ffebcdc2213..66bde938bc62 100644
--- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix
+++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "crispy-bootstrap4";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lBm48krF14WuUMX9lgx9a++UhJWHWPxOhj3R1j4QTOs=";
   };
 
diff --git a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix
index 8e14ac5c96e8..ba27f01e455e 100644
--- a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "crispy-bootstrap5";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-p2sc6rajy9A0YNnv1A0wphjm7Kc6HoNf7LM3Gu21PKI=";
   };
 
diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix
index 2406715f4f24..68513dd4beec 100644
--- a/pkgs/development/python-modules/django-crispy-forms/default.nix
+++ b/pkgs/development/python-modules/django-crispy-forms/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "django-crispy-forms";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-R2s2dUsVw5p7xn4yWeFcE7au8yHWXjFgS5jjCBveg04=";
   };
 
diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix
index ffa5efa39aa5..7f4d2804c4dd 100644
--- a/pkgs/development/python-modules/django-cryptography/default.nix
+++ b/pkgs/development/python-modules/django-cryptography/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "georgemarshall";
     repo = "django-cryptography";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk=";
   };
 
diff --git a/pkgs/development/python-modules/django-cte/default.nix b/pkgs/development/python-modules/django-cte/default.nix
index 1ccf00d9aaea..c5c5dd5a2cfd 100644
--- a/pkgs/development/python-modules/django-cte/default.nix
+++ b/pkgs/development/python-modules/django-cte/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dimagi";
     repo = "django-cte";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE=";
   };
 
diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix
index f4c3d8e27ed3..b1361eda8e19 100644
--- a/pkgs/development/python-modules/django-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eLC3GnhYuEunKkKXNMtaFCqjyf8rn5cTkjL7Ep4Qp3c=";
   };
 
diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
index 28f9368de776..1efb444ef24b 100644
--- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix
+++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "agateblue";
     repo = "django-dynamic-preferences";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-S0PAlSrMOQ68mX548pZzARfau/lytXWC4S5uVO1rUmo=";
   };
 
diff --git a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
index 55664730b5e7..18da67c49cce 100644
--- a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-es";
     repo = "django-elasticsearch-dsl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8=";
   };
 
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index bb7ea8e2a155..fdd63334164a 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-A2+5FBv0IhTJPkwgd7je+B9Ac64UHJEa3HRBbWr2FxM=";
   };
 
diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix
index 212d5318b3fd..6be1ff91a462 100644
--- a/pkgs/development/python-modules/django-filter/default.nix
+++ b/pkgs/development/python-modules/django-filter/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "carltongibson";
     repo = "django-filter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4q/x9FO9ErKnGeJDEXDMcvUKA4nlA7nkwwM2xj3WGWs=";
   };
 
diff --git a/pkgs/development/python-modules/django-formset-js-improved/default.nix b/pkgs/development/python-modules/django-formset-js-improved/default.nix
index 0f3a54b688e4..da8c2704b171 100644
--- a/pkgs/development/python-modules/django-formset-js-improved/default.nix
+++ b/pkgs/development/python-modules/django-formset-js-improved/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "django-formset-js";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bOM24ldXk9WeV0jl6LIJB3BJ5hVWLA1PJTBBnJBoprU=";
   };
 
diff --git a/pkgs/development/python-modules/django-fsm/default.nix b/pkgs/development/python-modules/django-fsm/default.nix
index 3e4c8819020a..708d92c05eb6 100644
--- a/pkgs/development/python-modules/django-fsm/default.nix
+++ b/pkgs/development/python-modules/django-fsm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "viewflow";
     repo = "django-fsm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-woN0F4hTaPk8HTGNT6zQlZDJ9SCVRut9maKSlDmalUE=";
   };
 
diff --git a/pkgs/development/python-modules/django-google-analytics-app/default.nix b/pkgs/development/python-modules/django-google-analytics-app/default.nix
index 8dd5cda3ee74..9d7f3de0f8aa 100644
--- a/pkgs/development/python-modules/django-google-analytics-app/default.nix
+++ b/pkgs/development/python-modules/django-google-analytics-app/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "praekeltfoundation";
     repo = "django-google-analytics";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0KLfGZY8qq5JGb+LJXpQRS76+qXtrf/hv6QLenm+BhQ=";
   };
 
diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix
index fa4e5bcb12ca..f4850f361aa8 100644
--- a/pkgs/development/python-modules/django-health-check/default.nix
+++ b/pkgs/development/python-modules/django-health-check/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KristianOellegaard";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+6+YxB/x4JdKUCwxxe+YIc+r1YAzngFUHiS6atupWM8=";
   };
 
diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix
index 488783094f54..86220923db7b 100644
--- a/pkgs/development/python-modules/django-hierarkey/default.nix
+++ b/pkgs/development/python-modules/django-hierarkey/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "django-hierarkey";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1LSH9GwoNF3NrDVNUIHDAVsktyKIprDgB5XlIHeM3fM=";
   };
 
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index de9b0f9f9ed2..af616c963c3a 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-hijack";
     repo = "django-hijack";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3P7SCKS+ThBRNfXpN17N1y5vhYYWRL2JGVBOUHRdhK8=";
   };
 
diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index 5cce017a0833..9f531debca89 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-import-export";
     repo = "django-import-export";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc=";
   };
 
diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix
index 69168c6e8057..0bbaf6e0699d 100644
--- a/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/pkgs/development/python-modules/django-jinja2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niwinz";
     repo = "django-jinja";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4=";
   };
 
diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix
index d9f1b3887b1f..8523ae2e3249 100644
--- a/pkgs/development/python-modules/django-js-asset/default.nix
+++ b/pkgs/development/python-modules/django-js-asset/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthiask";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WBybDzGPoPbeUnrw6O41ton0x0rLjPcHBVMg1RZceWI=";
   };
 
diff --git a/pkgs/development/python-modules/django-json-widget/default.nix b/pkgs/development/python-modules/django-json-widget/default.nix
index 8f0df1ac7219..0d9d692ab718 100644
--- a/pkgs/development/python-modules/django-json-widget/default.nix
+++ b/pkgs/development/python-modules/django-json-widget/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmrivas86";
     repo = "django-json-widget";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GY6rYY//n8kkWCJZk6OY+EOBv62ocNovNmE/ai8VCn4=";
   };
 
diff --git a/pkgs/development/python-modules/django-libsass/default.nix b/pkgs/development/python-modules/django-libsass/default.nix
index ee6631cd3a00..a3139d740936 100644
--- a/pkgs/development/python-modules/django-libsass/default.nix
+++ b/pkgs/development/python-modules/django-libsass/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "torchbox";
     repo = "django-libsass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-54AlRVmit0rtG1jx7O+XyA1vXLHCfoNPjHkHCQaaybA=";
   };
 
diff --git a/pkgs/development/python-modules/django-localflavor/default.nix b/pkgs/development/python-modules/django-localflavor/default.nix
index 0a2575d87a36..0ccadac6705d 100644
--- a/pkgs/development/python-modules/django-localflavor/default.nix
+++ b/pkgs/development/python-modules/django-localflavor/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django";
     repo = "django-localflavor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UWp3ei1VlEsEfjbJIE+MpffSzYF4X1HEQw+z+5kZoP0=";
   };
 
diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix
index 7dbbbcd9a411..858dc88b0ff8 100644
--- a/pkgs/development/python-modules/django-login-required-middleware/default.nix
+++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CleitonDeLima";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA=";
   };
 
diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix
index 8e278b607ae2..18e461e82f7a 100644
--- a/pkgs/development/python-modules/django-maintenance-mode/default.nix
+++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fabiocaccamo";
     repo = "django-maintenance-mode";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rZo0yru+y5TkdULBQDMGAVb494PSLtbnNX/7cuphKNk=";
   };
 
diff --git a/pkgs/development/python-modules/django-markdownx/default.nix b/pkgs/development/python-modules/django-markdownx/default.nix
index a40aa21c5915..36f1d022a581 100644
--- a/pkgs/development/python-modules/django-markdownx/default.nix
+++ b/pkgs/development/python-modules/django-markdownx/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neutronX";
     repo = "django-markdownx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FZPUlogVd3FMGeH1vfKHA3tXVps0ET+UCQJflpiV2lE=";
   };
 
diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix
index 36bf9d81dbd2..475abe8933ee 100644
--- a/pkgs/development/python-modules/django-markup/default.nix
+++ b/pkgs/development/python-modules/django-markup/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bartTC";
     repo = "django-markup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dj5Z36W4Stly203SKWpR/DF+Wf7+ejbZnDCmHNRb3c0=";
   };
 
diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
index 3dc2ccc3d932..7d481e3603a8 100644
--- a/pkgs/development/python-modules/django-mfa3/default.nix
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xi";
     repo = "django-mfa3";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY=";
   };
 
diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix
index 8ddb17d2b350..ef1af25115de 100644
--- a/pkgs/development/python-modules/django-model-utils/default.nix
+++ b/pkgs/development/python-modules/django-model-utils/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-model-utils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iRtTYXsgD8NYG3k9ZWAr2Nwazo3HUa6RgdbMeDxc7NI=";
   };
 
diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index aac9565e0556..b01df9bd2b40 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "deschler";
     repo = "django-modeltranslation";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J/D0rHhxJMpOSGu9LQ6tPKnjBZhqTX6I5YcSkx5+qXk=";
   };
 
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 30007c812b3c..a050155de542 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-oauth-toolkit";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY=";
   };
 
diff --git a/pkgs/development/python-modules/django-parler/default.nix b/pkgs/development/python-modules/django-parler/default.nix
index 73e52c187cca..a61e8c8a29be 100644
--- a/pkgs/development/python-modules/django-parler/default.nix
+++ b/pkgs/development/python-modules/django-parler/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-parler";
     repo = "django-parler";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tRGifFPCXF3aa3PQWKw3tl1H1TY+lgcChUP1VdwG1cE=";
   };
 
diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix
index 33824cb5b255..83ba9f7709e5 100644
--- a/pkgs/development/python-modules/django-payments/default.nix
+++ b/pkgs/development/python-modules/django-payments/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-payments";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/XsqtExnNtUGqI40XvvcO/nGq56gbC/mPdtHv1QQyGo=";
   };
 
diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix
index 39cd78b2f495..53435de1b101 100644
--- a/pkgs/development/python-modules/django-phonenumber-field/default.nix
+++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stefanfoulis";
     repo = "django-phonenumber-field";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-l+BAh7QYGN0AgDHICvlQnBYAcpEn8acu+JBmoo85kF0=";
   };
 
diff --git a/pkgs/development/python-modules/django-pwa/default.nix b/pkgs/development/python-modules/django-pwa/default.nix
index 0e8d3c9c5953..e25a1c8bdbb4 100644
--- a/pkgs/development/python-modules/django-pwa/default.nix
+++ b/pkgs/development/python-modules/django-pwa/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "silviolleite";
     repo = "django-pwa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tP1+Jm9hdvN/ZliuVHN8tqy24/tOK1LUUiJv1xUqRrY=";
   };
 
diff --git a/pkgs/development/python-modules/django-ratelimit/default.nix b/pkgs/development/python-modules/django-ratelimit/default.nix
index fd74e1e68fc7..3eee44851425 100644
--- a/pkgs/development/python-modules/django-ratelimit/default.nix
+++ b/pkgs/development/python-modules/django-ratelimit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jsocol";
     repo = "django-ratelimit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZMtZSKOIIRSqH6eyC7bBeua7YLKyWW6NOXN/MDv9fy4=";
   };
 
diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix
index 6d84ad60fe38..6f0bd8ee34d0 100644
--- a/pkgs/development/python-modules/django-redis/default.nix
+++ b/pkgs/development/python-modules/django-redis/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-redis";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc=";
   };
 
diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
index 2644da1d606f..695da5c5470c 100644
--- a/pkgs/development/python-modules/django-rest-registration/default.nix
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "apragacz";
     repo = "django-rest-registration";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EaS1qN7GpfPPeSLwwQdVWSRO2dv0DG5LD7vnXckz4Bg=";
   };
 
diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix
index 98234ebb575a..d287d79c38cf 100644
--- a/pkgs/development/python-modules/django-rosetta/default.nix
+++ b/pkgs/development/python-modules/django-rosetta/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbi";
     repo = "django-rosetta";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b+iCUA3i3Ej6S5XcGQhBIEIJFx6vOL2sq3xkkA9wqek=";
   };
 
diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index 3e37822ed5cc..7378d2fa4040 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rq";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VE4OFFpNR9txCyhs6Ye36DBWb8DNlCT1BO436KwFMY8=";
   };
 
diff --git a/pkgs/development/python-modules/django-scheduler/default.nix b/pkgs/development/python-modules/django-scheduler/default.nix
index f03dd71d0e3a..732e75dcd24e 100644
--- a/pkgs/development/python-modules/django-scheduler/default.nix
+++ b/pkgs/development/python-modules/django-scheduler/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "llazzaro";
     repo = "django-scheduler";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dY2TPo15RRWrv7LheUNJSQl4d/HeptSMM/wQirRSI5w=";
   };
 
diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix
index bb4b5d7c508c..7125394c00fe 100644
--- a/pkgs/development/python-modules/django-scim2/default.nix
+++ b/pkgs/development/python-modules/django-scim2/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "15five";
     repo = "django-scim2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig=";
   };
 
diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix
index 108d95a81534..60d410e610e9 100644
--- a/pkgs/development/python-modules/django-scopes/default.nix
+++ b/pkgs/development/python-modules/django-scopes/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "django-scopes";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CtToztLVvSb91pMpPNL8RysQJzlRkeXuQbpvbkX3jfM=";
   };
 
diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix
index 5aad0ccdc321..16a1a8844fe7 100644
--- a/pkgs/development/python-modules/django-sesame/default.nix
+++ b/pkgs/development/python-modules/django-sesame/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aaugustin";
     repo = "django-sesame";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8jbYhD/PfPnutJZonmdrqLIQdXiUHF12w0M9tuyyDz0=";
   };
 
diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix
index 45e1854de8d9..3e5d8c50bb4c 100644
--- a/pkgs/development/python-modules/django-simple-history/default.nix
+++ b/pkgs/development/python-modules/django-simple-history/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-simple-history";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bPdMdtiEDRvRD00ZBwUQkeCDKCx2SW65+FsbuMwVdK0=";
   };
 
diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix
index 88f4994c91b6..b233ad229b66 100644
--- a/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/pkgs/development/python-modules/django-statici18n/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zyegfryed";
     repo = "django-statici18n";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-n6HqHcXvz2ihwN+gJr5P+/Yt4RpuOu2yAjo9fiNZB54=";
   };
 
diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix
index b5e1aa5e2546..916fa236f771 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/pkgs/development/python-modules/django-storages/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jschneier";
     repo = "django-storages";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI=";
   };
 
diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix
index d422a683f81b..2c91b4e02a23 100644
--- a/pkgs/development/python-modules/django-tastypie/default.nix
+++ b/pkgs/development/python-modules/django-tastypie/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-tastypie";
     repo = "django-tastypie";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-StXWqwGVILXtK53fa2vSNXSIf7UGfdn7iJyOIzdnth4=";
   };
 
diff --git a/pkgs/development/python-modules/django-tenants/default.nix b/pkgs/development/python-modules/django-tenants/default.nix
index f759a1458205..c8bbf47937ef 100644
--- a/pkgs/development/python-modules/django-tenants/default.nix
+++ b/pkgs/development/python-modules/django-tenants/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-tenants";
     repo = "django-tenants";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QdEONKVFW/DWBjXWRTG+ahvirw9BP8M6PztUMZGZ33Q=";
   };
 
diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix
index 91c78393be57..0f9b2a2ec6ab 100644
--- a/pkgs/development/python-modules/django-two-factor-auth/default.nix
+++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-two-factor-auth";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE=";
   };
 
diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix
index cb3160ed814a..ece9bbc52fb3 100644
--- a/pkgs/development/python-modules/django-vite/default.nix
+++ b/pkgs/development/python-modules/django-vite/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MrBin99";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-v6jmtiQjTJegD7aeuu3HkuKnYWgMZ7TqW5onkSnc7Xs=";
   };
 
diff --git a/pkgs/development/python-modules/django-webpush/default.nix b/pkgs/development/python-modules/django-webpush/default.nix
index 803de4851118..89499d969c15 100644
--- a/pkgs/development/python-modules/django-webpush/default.nix
+++ b/pkgs/development/python-modules/django-webpush/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "safwanrahman";
     repo = "django-webpush";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Mwp53apdPpBcn7VfDbyDlvLAVAG65UUBhT0w9OKjKbU=";
   };
 
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module for integrating and sending Web Push Notification in Django Application";
     homepage = "https://github.com/safwanrahman/django-webpush/";
-    changelog = "https://github.com/safwanrahman/django-webpush/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/safwanrahman/django-webpush/releases/tag/${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ derdennisop ];
   };
diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix
index 36fff55d31ce..9409681beab6 100644
--- a/pkgs/development/python-modules/django-widget-tweaks/default.nix
+++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/3UIsg75X3R9YGv9cEcoPw3IN2vkhUb+HCy68813d2E=";
   };
 
diff --git a/pkgs/development/python-modules/djangocms-admin-style/default.nix b/pkgs/development/python-modules/djangocms-admin-style/default.nix
index 0d2233c148db..b765abdc8a4a 100644
--- a/pkgs/development/python-modules/djangocms-admin-style/default.nix
+++ b/pkgs/development/python-modules/djangocms-admin-style/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-cms";
     repo = "djangocms-admin-style";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cDbmC7IJTT3NuVXBnbUVqC7dUfusMdntDGu2tSvxIdQ=";
   };
 
diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix
index 1de43fc28cc0..d44761074055 100644
--- a/pkgs/development/python-modules/djangocms-alias/default.nix
+++ b/pkgs/development/python-modules/djangocms-alias/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "django-cms";
     repo = "djangocms-alias";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZOushwfBMjzlnuY6vHtM6Ge/VotBHaosIhFItmVkqkc=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-csv/default.nix b/pkgs/development/python-modules/djangorestframework-csv/default.nix
index a7aa1abbd6f8..2bccfb402f04 100644
--- a/pkgs/development/python-modules/djangorestframework-csv/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-csv/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjumbewu";
     repo = "django-rest-framework-csv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XtMkSucB7+foRpTaRfGF1Co0n3ONNGyzex6MXR4xM5c=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
index 3fa7cbb02490..ac8389b116df 100644
--- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oxan";
     repo = "djangorestframework-dataclasses";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-12EdSaGpsX0qDXgJ2QWYj6qAUbsrITQjWowk+gJFwwY=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
index 60991060b328..25081535d2f0 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "johnthagen";
     repo = "django-rest-framework-guardian2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk=";
   };
 
diff --git a/pkgs/development/python-modules/djangorestframework-jsonp/default.nix b/pkgs/development/python-modules/djangorestframework-jsonp/default.nix
index af0b28037d7f..3cca2e0dc79a 100644
--- a/pkgs/development/python-modules/djangorestframework-jsonp/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-jsonp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpadilla";
     repo = "django-rest-framework-jsonp";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4mIO69GhtvbQBtztHVQYIDDDSZpKg0g7BFNHEupiYTs=";
   };
 
diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix
index ff484907e69f..e8807ddd78d0 100644
--- a/pkgs/development/python-modules/djangosaml2/default.nix
+++ b/pkgs/development/python-modules/djangosaml2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IdentityPython";
     repo = "djangosaml2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rbmEJuG2mgozpCFOXZUJFxv8v52IRQeaeAKfeUDACeU=";
   };
 
diff --git a/pkgs/development/python-modules/dllogger/default.nix b/pkgs/development/python-modules/dllogger/default.nix
index df0b7cec7906..00a2b6b82a2c 100644
--- a/pkgs/development/python-modules/dllogger/default.nix
+++ b/pkgs/development/python-modules/dllogger/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "dllogger";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Hpr4yeRl+Dyaz6lRyH/5P6UQT184JEHPqgVlf4qHvOg=";
   };
 
diff --git a/pkgs/development/python-modules/dlms-cosem/default.nix b/pkgs/development/python-modules/dlms-cosem/default.nix
index 18a1031abb63..cfe444813ade 100644
--- a/pkgs/development/python-modules/dlms-cosem/default.nix
+++ b/pkgs/development/python-modules/dlms-cosem/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pwitab";
     repo = "dlms-cosem";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NeTaU8i18Zb39Y2JnYzr87Ozt7Rj074xusL4xaNe0q0=";
   };
 
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 715aa1f8c3a4..96fbd446ecb4 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -33,7 +33,7 @@ let
     src = fetchFromGitHub {
       owner = "deepmind";
       repo = "dm-haiku";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs=";
     };
 
diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix
index 909cd3aa523a..0989d978445b 100644
--- a/pkgs/development/python-modules/dm-tree/default.nix
+++ b/pkgs/development/python-modules/dm-tree/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = "tree";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc=";
   };
 
diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix
index 51784fd0bd43..e9e2dfe8fb64 100644
--- a/pkgs/development/python-modules/dnachisel/default.nix
+++ b/pkgs/development/python-modules/dnachisel/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Edinburgh-Genome-Foundry";
     repo = "DnaChisel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zoKaeK0b4EoxEQMODfrzDpI7xIKQ/w6Dmot+dw92fuw=";
   };
 
diff --git a/pkgs/development/python-modules/dncil/default.nix b/pkgs/development/python-modules/dncil/default.nix
index d57e491a7876..48de2cf7c66f 100644
--- a/pkgs/development/python-modules/dncil/default.nix
+++ b/pkgs/development/python-modules/dncil/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mandiant";
     repo = "dncil";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bndkiXkIYTd071J+mgkmJmA+9J5yJ+9/oDfAypN7wYo=";
   };
 
diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix
index edd221b57afd..dfcf0b746f73 100644
--- a/pkgs/development/python-modules/dnf-plugins-core/default.nix
+++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "dnf-plugins-core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7MPCLnclRT07m6CrGguDxSB+sIybp4tMcExU9+Sz9EM=";
   };
 
diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix
index 1802b005437f..e4577f402dbf 100644
--- a/pkgs/development/python-modules/dnfile/default.nix
+++ b/pkgs/development/python-modules/dnfile/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "malwarefrank";
     repo = "dnfile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AdGXcdoBNWZ4f8NBP50Fp3in1FTVPFDifGhjeAfp46M=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix
index 89f98539f7a4..d92fe015ea8c 100644
--- a/pkgs/development/python-modules/dns-lexicon/default.nix
+++ b/pkgs/development/python-modules/dns-lexicon/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Analogj";
     repo = "lexicon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-79/zz0TOCpx26TEo6gi9JDBQeVW2azWnxAjWr/FGRLA=";
   };
 
diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix
index d6cd2f308ec0..7a6aa0c1b0cf 100644
--- a/pkgs/development/python-modules/docformatter/default.nix
+++ b/pkgs/development/python-modules/docformatter/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QUjeG84KwI5Y3MU1wrmjHBXU2tEJ0CuiR3Y/S+dX7Gs=";
   };
 
diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index 6002ccf76949..ad7d63c84bb9 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shin-";
     repo = "dockerpy-creds";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yYsMsRW6Bb8vmwT0mPjs0pRqBbznGtHnGb3JNHjLjys=";
   };
 
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index bcc56c0259f4..64b6c50be537 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sk6TZLek+fRkKq7kG9g6cR9lvfPC8v8qUXKb7Tq4pLU=";
   };
 
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index c93f6e3cb138..9cb68ab3a0aa 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "docling-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N8rL+5bCVF4Qi5eqgkaB2r3LTYoqTVPeK4gQ6stiW/w=";
   };
 
diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix
index 5e68e388bf3d..7d0a39a5e9a8 100644
--- a/pkgs/development/python-modules/docling-ibm-models/default.nix
+++ b/pkgs/development/python-modules/docling-ibm-models/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "docling-ibm-models";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QZvkkazxgkGuSQKIYI+YghH7pLlDSEbCGhg89gZsOpk=";
   };
 
diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
index 745d010ed1b5..6273905c4207 100644
--- a/pkgs/development/python-modules/docling-parse/default.nix
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "docling-parse";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pZJ7lneg4ftAoWS5AOflkkKCwZGF4TJIuqDjq4W4VBw=";
   };
 
diff --git a/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix
index 2310ac6ffab7..538e57e9bc6a 100644
--- a/pkgs/development/python-modules/docstr-coverage/default.nix
+++ b/pkgs/development/python-modules/docstr-coverage/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "HunterMcGushion";
     repo = "docstr_coverage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k1ny4fWS+CmgLNWPlYPsscjei2UZ6h8QJrZSay5abck=";
   };
 
diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix
index bc3aad6444f9..651695963ec6 100644
--- a/pkgs/development/python-modules/docstring-parser/default.nix
+++ b/pkgs/development/python-modules/docstring-parser/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rr-";
     repo = "docstring_parser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xwV+mgCOC/MyCqGELkJVqQ3p2g2yw/Ieomc7k0HMXms=";
   };
 
diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix
index 2595c6d6d154..20d510e2cb4c 100644
--- a/pkgs/development/python-modules/docstring-to-markdown/default.nix
+++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ykqY7LFIOTuAddYkKDzIltq8FpLVz4v2ZA3Y0cZH9ms=";
   };
 
diff --git a/pkgs/development/python-modules/docx2python/default.nix b/pkgs/development/python-modules/docx2python/default.nix
index 374a840050e1..b8c005c1b74f 100644
--- a/pkgs/development/python-modules/docx2python/default.nix
+++ b/pkgs/development/python-modules/docx2python/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ShayHill";
     repo = "docx2python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ucLDdfmLAWcGunOKvh8tBQknXTPI1qOqyXgVGjQOGoQ=";
   };
 
diff --git a/pkgs/development/python-modules/dotwiz/default.nix b/pkgs/development/python-modules/dotwiz/default.nix
index 2c6b588cbb93..03376177ebd3 100644
--- a/pkgs/development/python-modules/dotwiz/default.nix
+++ b/pkgs/development/python-modules/dotwiz/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rnag";
     repo = "dotwiz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ABmkwpJ40JceNJieW5bhg0gqWNrR6Wxj84nLCjKU11A=";
   };
 
diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix
index 719d84d00888..40da7c666929 100644
--- a/pkgs/development/python-modules/downloader-cli/default.nix
+++ b/pkgs/development/python-modules/downloader-cli/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepjyoti30";
     repo = "downloader-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-E2K3n9qCQofm4gXu1l7/0iMoJsniuzhsBUplr4aZ39s=";
   };
 
diff --git a/pkgs/development/python-modules/dparse2/default.nix b/pkgs/development/python-modules/dparse2/default.nix
index 5b5848d28a75..2b1be8c8449f 100644
--- a/pkgs/development/python-modules/dparse2/default.nix
+++ b/pkgs/development/python-modules/dparse2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JUTL+SVf1RRIXQqwFR7MnExsgGseSiO0a5YzzcqdXHw=";
   };
 
diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix
index 0573af0c60a3..823b5714d201 100644
--- a/pkgs/development/python-modules/draftjs-exporter/default.nix
+++ b/pkgs/development/python-modules/draftjs-exporter/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "draftjs_exporter";
     owner = "springload";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4=";
   };
 
diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix
index 9ae5f9c4b816..9a0910b81302 100644
--- a/pkgs/development/python-modules/dragonfly/default.nix
+++ b/pkgs/development/python-modules/dragonfly/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dictation-toolbox";
     repo = "dragonfly";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM=";
   };
 
diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix
index 6e7ff2f8afc8..60055e50e3eb 100644
--- a/pkgs/development/python-modules/dramatiq/default.nix
+++ b/pkgs/development/python-modules/dramatiq/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bogdanp";
     repo = "dramatiq";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4=";
   };
 
diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix
index d6df1c87a2dc..eb9897a7c798 100644
--- a/pkgs/development/python-modules/drawsvg/default.nix
+++ b/pkgs/development/python-modules/drawsvg/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cduck";
     repo = "drawsvg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JC7u6bEB7RCJVLeYnNqACmddLI5F5PyaaBxaAZ+N/5s=";
   };
 
diff --git a/pkgs/development/python-modules/drf-nested-routers/default.nix b/pkgs/development/python-modules/drf-nested-routers/default.nix
index 0cdf185fac68..3324361ca4f8 100644
--- a/pkgs/development/python-modules/drf-nested-routers/default.nix
+++ b/pkgs/development/python-modules/drf-nested-routers/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alanjds";
     repo = "drf-nested-routers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qlXNDydoQJ9FZB6G7yV/pNmx3BEo+lvRqsfjrvlbdNY=";
   };
 
diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix
index 546e672dd938..4a0407e24d8b 100644
--- a/pkgs/development/python-modules/drf-spectacular/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tfranzel";
     repo = "drf-spectacular";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lOgFDkAY+PqSeyLSvWFT7KPVicSJZxd6yl17GAGHbRs=";
   };
 
diff --git a/pkgs/development/python-modules/drf-ujson2/default.nix b/pkgs/development/python-modules/drf-ujson2/default.nix
index bf500258a025..e0a04ac41669 100644
--- a/pkgs/development/python-modules/drf-ujson2/default.nix
+++ b/pkgs/development/python-modules/drf-ujson2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Amertz08";
     repo = "drf_ujson2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kbpZN1zOXHvRPcn+Sjbelq74cWgvCUeMXZy1eFSa6rA=";
   };
 
diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix
index 1f62492ee483..e0639a18c233 100644
--- a/pkgs/development/python-modules/drf-writable-nested/default.nix
+++ b/pkgs/development/python-modules/drf-writable-nested/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "beda-software";
     repo = "drf-writable-nested";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+I5HsqkjCrkF9MV90NGQuUhmLcDVsv20QIyDK9WxwdQ=";
   };
 
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 05ffb2f6c00d..59eb019d66a4 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "dropbox-sdk-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9Fsh06V226vIyJhrlLkh9Xr4UGoEIISnIFCtuKqI218=";
   };
 
diff --git a/pkgs/development/python-modules/dropmqttapi/default.nix b/pkgs/development/python-modules/dropmqttapi/default.nix
index 84e09ecf919c..f7d0f6bc0a0d 100644
--- a/pkgs/development/python-modules/dropmqttapi/default.nix
+++ b/pkgs/development/python-modules/dropmqttapi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ChandlerSystems";
     repo = "dropmqttapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-njReF9Mu5E9o5WcbK60CCBWaIhZ3tpQHHlY/iEyyHGg=";
   };
 
diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix
index 0e2986b3a8a6..5e22e754fb4f 100644
--- a/pkgs/development/python-modules/ds-store/default.nix
+++ b/pkgs/development/python-modules/ds-store/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "al45tair";
     repo = "ds_store";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-45lmkE61uXVCBUMyVVzowTJoALY1m9JI68s7Yb0vCks=";
   };
 
diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index 81d5e0376b58..44199f7c56dc 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ndokter";
     repo = "dsmr_parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NfleByW9MF7FS4n/cMv297382LucP6Z629CuA6chm20=";
   };
 
diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix
index 1908de7692e8..3eae904c2314 100644
--- a/pkgs/development/python-modules/dsnap/default.nix
+++ b/pkgs/development/python-modules/dsnap/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RhinoSecurityLabs";
     repo = "dsnap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yKch+tKjFhvZfzloazMH378dkERF8gnZEX1Som+d670=";
   };
 
diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix
index 2dffd2d5bc95..0550c0f481f5 100644
--- a/pkgs/development/python-modules/dtschema/default.nix
+++ b/pkgs/development/python-modules/dtschema/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devicetree-org";
     repo = "dt-schema";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UJU8b9BzuuUSHRjnA6hOd1bMPNOlk4LNtrQV5aZmGhI=";
   };
 
diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix
index 627d16b0e062..b613bb819028 100644
--- a/pkgs/development/python-modules/dtw-python/default.nix
+++ b/pkgs/development/python-modules/dtw-python/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DynamicTimeWarping";
     repo = "dtw-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q2TffroAGS6DeU5hUE/M2Luuxa5VfU+wxbGdfhcioSA=";
   };
 
diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index b18638cc9379..c5e93a7a0708 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "duckduckgo_search";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NvFoiyoXeNOrynGN+VHVfIA3+D9zfAWFeWEVU8/TkZQ=";
   };
 
diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix
index 3b0077fe1ee2..739f84709af1 100644
--- a/pkgs/development/python-modules/duet/default.nix
+++ b/pkgs/development/python-modules/duet/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "duet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P7JxUigD7ZyhtocV+YuAVxuUYVa4F7PpXuA1CCmcMvg=";
   };
 
diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix
index 7b684658d0f7..8f4e0caa7694 100644
--- a/pkgs/development/python-modules/dukpy/default.nix
+++ b/pkgs/development/python-modules/dukpy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amol-";
     repo = "dukpy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8RDMz9SfBoUe7LQ9/atsZlJ/2uwLUb0hZxeYdsUOGpU=";
   };
 
diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix
index e565ae8b85d3..24e765cfb35b 100644
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = "dunamai";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oOchPGBRHf3PT1Ynci56CF/eW4TkRVPV9inVNX2QQrk=";
   };
 
diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix
index fe5fd07044ca..4e1f3dd68606 100644
--- a/pkgs/development/python-modules/duo-client/default.nix
+++ b/pkgs/development/python-modules/duo-client/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "duosecurity";
     repo = "duo_client_python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7cifxNSBHbX7QZ52Sy1hm5xzZYcLZOkloT6q9P7TO6A=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 902e3e3428bb..6808c3279a59 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-data";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HT+IcfUA1QMkWhQKNwjKexzG04WJj+WTyHV+15DDoCI=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-gdrive/default.nix b/pkgs/development/python-modules/dvc-gdrive/default.nix
index 1cecf014856d..b54538a51821 100644
--- a/pkgs/development/python-modules/dvc-gdrive/default.nix
+++ b/pkgs/development/python-modules/dvc-gdrive/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-gdrive";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oqHSMmwfR24ydJlpXGI3cCxIlF0BwNdgje5zKa0c7FA=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-hdfs/default.nix b/pkgs/development/python-modules/dvc-hdfs/default.nix
index 7047f832c045..54b26e1b3cc7 100644
--- a/pkgs/development/python-modules/dvc-hdfs/default.nix
+++ b/pkgs/development/python-modules/dvc-hdfs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-hdfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Bo8+El5GC7iyT8SxaJquWFG29BOeilmEMDtTG+RkDGI=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix
index ddd707736ae4..e44e46c360d3 100644
--- a/pkgs/development/python-modules/dvc-http/default.nix
+++ b/pkgs/development/python-modules/dvc-http/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-http";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ru/hOFv/RcS/7SBpTJU8xFxdllmaiH4dV1ouS6GGKkY=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix
index 91e2ca8b7807..bf9f89722b42 100644
--- a/pkgs/development/python-modules/dvc-objects/default.nix
+++ b/pkgs/development/python-modules/dvc-objects/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-objects";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CXZKya22i2PhHk/CYd10AlzkiOBo5xZfR9l4rnkaV5Y=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix
index 63b83d0c1d50..ffb271eab575 100644
--- a/pkgs/development/python-modules/dvc-render/default.nix
+++ b/pkgs/development/python-modules/dvc-render/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-render";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V4QVZu4PSOW9poT6YUWbgTjJpIJ8YUtGDAE4Ijgm5Ac=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix
index ce592806ceeb..ea11566ec17d 100644
--- a/pkgs/development/python-modules/dvc-studio-client/default.nix
+++ b/pkgs/development/python-modules/dvc-studio-client/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-studio-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SCRMBZKOt8JtDi5aGgk6TCxetvG3QU1jOv6U5/6ChTE=";
   };
 
diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index 6c4ea111ce53..c7cfa2a4bd56 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc-task";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bRQJLncxCigYPEtlvKjUtKqhcBkB7erEtoJQ30yGamE=";
   };
 
diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 190f8faf2761..a226106c23dc 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ljrQV+Ca0EooCdoEU1B2mnN62bpKV0ZGnX8W1yZWyjM=";
   };
 
diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index a5598661cc57..40a4973763be 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvclive";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fLlP3kWmThQVVPEOd9KWitBIye/fhd/+zcHoVTF/pV8=";
   };
 
diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix
index e1ede4c3046b..351e1ac1bb25 100644
--- a/pkgs/development/python-modules/dynalite-devices/default.nix
+++ b/pkgs/development/python-modules/dynalite-devices/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ziv1234";
     repo = "python-dynalite-devices";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g=";
   };
 
diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix
index 9f37786ba4d6..d7375001a062 100644
--- a/pkgs/development/python-modules/e3-core/default.nix
+++ b/pkgs/development/python-modules/e3-core/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "e3-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6rClGDo8KhBbOg/Rw0nVISVtOAACf5cwSafNInlBGCw=";
   };
 
@@ -62,7 +62,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    changelog = "https://github.com/AdaCore/e3-core/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/AdaCore/e3-core/releases/tag/v${version}";
     homepage = "https://github.com/AdaCore/e3-core/";
     description = "Core framework for developing portable automated build systems";
     license = licenses.gpl3Only;
diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix
index d1b61186195e..4f2aa875f945 100644
--- a/pkgs/development/python-modules/e3-testsuite/default.nix
+++ b/pkgs/development/python-modules/e3-testsuite/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "e3-testsuite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI=";
   };
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Generic testsuite framework in Python";
-    changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/v${version}";
     homepage = "https://github.com/AdaCore/e3-testsuite/";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ heijligen ];
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index 9af1c37cbd33..b5c960c6cdb6 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SmileyChris";
     repo = "easy-thumbnails";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8JTHYQIBbu/4fknK2ZEQeDSgaxKGDfflxumcFMpaGQk=";
   };
 
diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix
index c85dba799360..9800a9a7d9d7 100644
--- a/pkgs/development/python-modules/easyenergy/default.nix
+++ b/pkgs/development/python-modules/easyenergy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-easyenergy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tWKfcGznxck8VLK3YshOIbPet2CEbUZbT8JzgaAhAso=";
   };
 
diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix
index a75434c018ae..0c8b930f7b12 100644
--- a/pkgs/development/python-modules/easyocr/default.nix
+++ b/pkgs/development/python-modules/easyocr/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JaidedAI";
     repo = "EasyOCR";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9mrAxt2lphYtLW81lGO5SYHsnMnSA/VpHiY2NffD/Js=";
   };
 
diff --git a/pkgs/development/python-modules/ebcdic/default.nix b/pkgs/development/python-modules/ebcdic/default.nix
index 8bf1308939f2..c6b373e1bcba 100644
--- a/pkgs/development/python-modules/ebcdic/default.nix
+++ b/pkgs/development/python-modules/ebcdic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roskakori";
     repo = "CodecMapper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gRyZychcF3wYocgVbdF255cSuZh/cl8X0WH/Iplkmxc=";
   };
 
diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index 376938a55cbe..c2d5f1ac4bc6 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glue-viz";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-IKd5n8+U6+0dgV4PbLcPaormXCX4srGcXmvYSrnCt60=";
   };
 
diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix
index b6be5dbc540c..521dee031479 100644
--- a/pkgs/development/python-modules/ecos/default.nix
+++ b/pkgs/development/python-modules/ecos/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "embotech";
     repo = "ecos-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nfu1FicWr233r+VHxkQf1vqh2y4DGymJRmik8RJYJkA=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix
index 9654844075f5..fa1da330915b 100644
--- a/pkgs/development/python-modules/ecs-logging/default.nix
+++ b/pkgs/development/python-modules/ecs-logging/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "ecs-logging-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-djCEutZqcyRfRme+omiwl3ofBUBli71TnfVu59i7vlE=";
   };
 
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 1f10b9be005d..78791985de12 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "warner";
     repo = "python-ed25519";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AwnhB5UGycQliNndbqd0JlI4vKSehCSy0qHv2EiB+jA=";
   };
 
diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix
index 46426ec95bff..4a77f5cf4385 100644
--- a/pkgs/development/python-modules/edalize/default.nix
+++ b/pkgs/development/python-modules/edalize/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "olofk";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TCMzvRWd2Fx2/7UtUGOwblLhRyTAqPp9s70Oyc3U3r0=";
   };
 
diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix
index acfc12fb1ff8..c56e4f1d8d80 100644
--- a/pkgs/development/python-modules/editdistance/default.nix
+++ b/pkgs/development/python-modules/editdistance/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roy-ht";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ncdg8S/UHYqJ1uFnHk9qhHMM3Lrop00woSu3PLKvuBI=";
   };
 
diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix
index e4c6fcbfdaba..e5181df69975 100644
--- a/pkgs/development/python-modules/editdistpy/default.nix
+++ b/pkgs/development/python-modules/editdistpy/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mammothb";
     repo = "editdistpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kTaJkx1fdd2Rl4uhzxdZAFP/ArsM0qTPweJ1jlUcjxQ=";
   };
 
diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index 0a1e330349b0..43df8ac5a88e 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tianocore";
     repo = "edk2-pytool-library";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N2ATC/GALKd8JUrkvlvHe9JPzwzbB5GPTBavo17DW5Y=";
   };
 
diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index cb4fcf18f263..d31743f129f3 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "eigenpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9hKYCCKgPn1IJDezX/ARJHr5+0ridmGd1b3k/ZaVRG0=";
   };
 
diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix
index 0b1fd24a3ac3..a24f75f1a8ee 100644
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "arogozhnikov";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6x9AttvSvgYrHaS5ESKOwyEnXxD2BitYTGtqqSKur+0=";
   };
 
diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix
index ff5fb07f11c0..d84153020701 100644
--- a/pkgs/development/python-modules/eiswarnung/default.nix
+++ b/pkgs/development/python-modules/eiswarnung/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-eiswarnung";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/61qrRfD7/gaEcvFot34HYXOVLWwTDi/fvcgHDTv9u0=";
   };
 
diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix
index af1505d27e6f..88f1ae00a475 100644
--- a/pkgs/development/python-modules/elastic-apm/default.nix
+++ b/pkgs/development/python-modules/elastic-apm/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "apm-agent-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c=";
   };
 
diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix
index 97ef9334cf7c..79a5aec5b159 100644
--- a/pkgs/development/python-modules/elastic-transport/default.nix
+++ b/pkgs/development/python-modules/elastic-transport/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "elastic-transport-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5bNsJd0td3aQR+PvDBHg0/f+qPyt/ckWmeDrQJzxhYY=";
   };
 
diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
index 966b8731f242..f66a80ec9908 100644
--- a/pkgs/development/python-modules/elegy/default.nix
+++ b/pkgs/development/python-modules/elegy/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "poets-ai";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
   };
 
diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 9c2532d6132c..702c8cd453f3 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "elementpath";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk=";
   };
 
diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix
index 40dc9b740c79..8da6e8bd1042 100644
--- a/pkgs/development/python-modules/elgato/default.nix
+++ b/pkgs/development/python-modules/elgato/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-elgato";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NAU4tr0oaAPPrOUZYl9WoGOM68MlrBqGewHBIiIv2XY=";
   };
 
diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index a8897a0beed9..acd7e0e368cf 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "itamarst";
     repo = "eliot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KqAXOMrRawzjpt5do2KdqpMMgpBtxeZ+X+th0WwBl+U=";
   };
 
diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix
index d97651c8e4a6..d3a4485020e1 100644
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gwww";
     repo = "elkm1";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8B3icNW1QTTjFeWllPKzVgRFz+gUzUV6o3wOBXx2Zws=";
   };
 
diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix
index a8ad21f81a7e..9265e5c9ebe1 100644
--- a/pkgs/development/python-modules/elmax-api/default.nix
+++ b/pkgs/development/python-modules/elmax-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertogeniola";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg=";
   };
 
diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix
index a65d0a07e49c..67ecc02e5429 100644
--- a/pkgs/development/python-modules/embedding-reader/default.nix
+++ b/pkgs/development/python-modules/embedding-reader/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rom1504";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-paN6rAyH3L7qCfWPr5kXo9Xl57gRMhdcDnoyLJ7II2w=";
   };
 
diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix
index fc081fb06ec2..89ca1f0cb7d2 100644
--- a/pkgs/development/python-modules/emborg/default.nix
+++ b/pkgs/development/python-modules/emborg/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "emborg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ViELR5pbGZc1vMxluHWBARuP6N031u+75WmJEYdckJo=";
   };
 
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index cefe2c87cd8a..a5cd8a86f793 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dfm";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JVZK3kvDwWENho0OxZ9OxATcm3XpGmX+e7alPclRsHY=";
   };
 
diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index 91140f18a26e..2c6224ee6faa 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "carpedm20";
     repo = "emoji";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1oFzuIA2HFoBw50HHYi8bGZTAAeC6fesSnLReuXUZcM=";
   };
 
diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix
index 4cd481da5038..27d7742fb853 100644
--- a/pkgs/development/python-modules/empty-files/default.nix
+++ b/pkgs/development/python-modules/empty-files/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "EmptyFiles.Python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P/woyAN9cYdxryX1iM36C53c9dL6lo4eoTzBWT2cd3A=";
   };
 
diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix
index 69d3a9ef910e..faf9e00b5242 100644
--- a/pkgs/development/python-modules/emv/default.nix
+++ b/pkgs/development/python-modules/emv/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "russss";
     repo = "python-emv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MnaeQZ0rA3i0CoUA6HgJQpwk5yo4rm9e+pc5XzRd1eg=";
   };
 
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index 9a7c3955d0e1..9763b60108cc 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nucleic";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XwBvPABg4DomI5JNuqaRTINsPgjn8h67rO/ZkSRQ39o=";
   };
 
diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix
index 4d181fab7032..cc1ee749e025 100644
--- a/pkgs/development/python-modules/enamlx/default.nix
+++ b/pkgs/development/python-modules/enamlx/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frmdstryr";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C3/G0bnu1EQh0elqdrpCwkFPZU4qmkUX7WRSRK9nkM4=";
   };
 
diff --git a/pkgs/development/python-modules/energyflip-client/default.nix b/pkgs/development/python-modules/energyflip-client/default.nix
index ae25755ec26d..6dc18ec4c286 100644
--- a/pkgs/development/python-modules/energyflip-client/default.nix
+++ b/pkgs/development/python-modules/energyflip-client/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dennisschroer";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU=";
   };
 
diff --git a/pkgs/development/python-modules/energyflow/default.nix b/pkgs/development/python-modules/energyflow/default.nix
index 4c6ce4df58dd..6972331e0784 100644
--- a/pkgs/development/python-modules/energyflow/default.nix
+++ b/pkgs/development/python-modules/energyflow/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pkomiske";
     repo = "EnergyFlow";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ioyk0IpyxcDdL2+3zkUa6yydavyphoh4do7GCz5nG60=";
   };
 
diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix
index 262691535d50..9bf8f24b4da3 100644
--- a/pkgs/development/python-modules/energyzero/default.nix
+++ b/pkgs/development/python-modules/energyzero/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-energyzero";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KOeYdTruD8AN/NkLEKKJDUB/JkOoQwfAMZkp/RvvUQE=";
   };
 
diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix
index eeef7703dd92..c383172fca31 100644
--- a/pkgs/development/python-modules/enocean/default.nix
+++ b/pkgs/development/python-modules/enocean/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kipe";
     repo = "enocean";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-S62YvRP1bvEzzzMd/jMjIdHAZsUImF9EQhsrPPzebDE=";
   };
 
diff --git a/pkgs/development/python-modules/enterpriseattack/default.nix b/pkgs/development/python-modules/enterpriseattack/default.nix
index 96ebfdf12f57..390c891fc533 100644
--- a/pkgs/development/python-modules/enterpriseattack/default.nix
+++ b/pkgs/development/python-modules/enterpriseattack/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xakepnz";
     repo = "enterpriseattack";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-cxbGc9iQe94Th6MSUldI17oVCclFhUM78h1w+6KXzm4=";
   };
 
diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix
index ce07ef171e1f..50698a923abb 100644
--- a/pkgs/development/python-modules/env-canada/default.nix
+++ b/pkgs/development/python-modules/env-canada/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "michaeldavie";
     repo = "env_canada";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3SVpzWii9/ViJ7mbrqzKmN5FkOOYTeYdhJll6q/IseU=";
   };
 
diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index aa325cb8e0b6..5124264df587 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sloria";
     repo = "environs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BU2D9NGNoUu3F1kx9t4j1VW0HarLVqiXTZEW67pMPV8=";
   };
 
diff --git a/pkgs/development/python-modules/epicstore-api/default.nix b/pkgs/development/python-modules/epicstore-api/default.nix
index e31ab47d0495..5c7cb927b3f3 100644
--- a/pkgs/development/python-modules/epicstore-api/default.nix
+++ b/pkgs/development/python-modules/epicstore-api/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SD4RK";
     repo = "epicstore_api";
-    rev = "refs/tags/v_${version}";
+    tag = "v_${version}";
     hash = "sha256-9Gh9bsNgZx/SinKr7t1dvqrOUP+z4Gs8BFMLYtboFmg=";
   };
 
diff --git a/pkgs/development/python-modules/epion/default.nix b/pkgs/development/python-modules/epion/default.nix
index 293917b954da..85aef48e4d52 100644
--- a/pkgs/development/python-modules/epion/default.nix
+++ b/pkgs/development/python-modules/epion/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devenzo-com";
     repo = "epion_python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9tE/SqR+GHZXeE+bOtXkLu+4jy1vO8WoiLjb6MJazxQ=";
   };
 
diff --git a/pkgs/development/python-modules/epitran/default.nix b/pkgs/development/python-modules/epitran/default.nix
index f512ff0d0ccb..f8f261a8c4e6 100644
--- a/pkgs/development/python-modules/epitran/default.nix
+++ b/pkgs/development/python-modules/epitran/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dmort27";
     repo = "epitran";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AH4q8J5oMaUVJ559qe/ZlJXlCcGdxWnxMhnZKCH5Rlk=";
   };
 
diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix
index f194e06c5131..1ed6260a8b1c 100644
--- a/pkgs/development/python-modules/eq3btsmart/default.nix
+++ b/pkgs/development/python-modules/eq3btsmart/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "EuleMitKeule";
     repo = "eq3btsmart";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FRnCnSMtsiZ1AbZOMwO/I5UoFWP0xAFqRZsnrHG9WJA=";
   };
 
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index b3586d07432d..b3189941d6ba 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wemake-services";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk=";
   };
 
diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix
index 2fab549d7369..3d7f73248b65 100644
--- a/pkgs/development/python-modules/es-client/default.nix
+++ b/pkgs/development/python-modules/es-client/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "untergeek";
     repo = "es_client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7vkpZNY333DYj9klzm1YG5ccxsu+LrP7WOWPH1KCfFA=";
   };
 
diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix
index ff25558aee93..4ecae59fbc58 100644
--- a/pkgs/development/python-modules/espeak-phonemizer/default.nix
+++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "espeak-phonemizer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-K0s24mzXUqG0Au40jjGbpKNAznBkMHQzfh2/CDBN0F8=";
   };
 
diff --git a/pkgs/development/python-modules/esper/default.nix b/pkgs/development/python-modules/esper/default.nix
index 5a284970e74f..de27eee121b2 100644
--- a/pkgs/development/python-modules/esper/default.nix
+++ b/pkgs/development/python-modules/esper/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benmoran56";
     repo = "esper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DZAF2B40ulSn2MQadklT32Svcm1j0e/hIxrxISO07TI=";
   };
 
diff --git a/pkgs/development/python-modules/esphome-dashboard-api/default.nix b/pkgs/development/python-modules/esphome-dashboard-api/default.nix
index 9f45c3460ee9..dd2f3e3c8295 100644
--- a/pkgs/development/python-modules/esphome-dashboard-api/default.nix
+++ b/pkgs/development/python-modules/esphome-dashboard-api/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "dashboard-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RFfS0xzRXoM6ETXmviiMPxffPzspjTqpkvHOlTJXN9g=";
   };
 
diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix
index 89eb9eff42e6..bdd92fa17b70 100644
--- a/pkgs/development/python-modules/essentials-openapi/default.nix
+++ b/pkgs/development/python-modules/essentials-openapi/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "essentials-openapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/NYv0NrE8+0kQg5G3Qf2DtesMHlmKQYczNT8pFlNFZE=";
   };
 
diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix
index 366306d6302c..6550edc9473c 100644
--- a/pkgs/development/python-modules/etcd3/default.nix
+++ b/pkgs/development/python-modules/etcd3/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kragniz";
     repo = "python-etcd3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo=";
   };
 
diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix
index 8227fb9536cc..40322790665b 100644
--- a/pkgs/development/python-modules/etelemetry/default.nix
+++ b/pkgs/development/python-modules/etelemetry/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sensein";
     repo = "etelemetry-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UaE5JQhv2AtzXKY7YD2/g6Kj1igKhmnY3zlf1P9B/iQ=";
   };
 
diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix
index ef6c599625c8..5945cdd4cdf6 100644
--- a/pkgs/development/python-modules/eternalegypt/default.nix
+++ b/pkgs/development/python-modules/eternalegypt/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amelchio";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0=";
   };
 
diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
index 42b4e52737be..0bc0c8f69bd6 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "eth-typing";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WFTx5u85Gp+jQPWS3BTk1Pky07C2fVAzwrG/c3hSRzM=";
   };
 
diff --git a/pkgs/development/python-modules/ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix
index 497e6cc88851..e7f87548ea05 100644
--- a/pkgs/development/python-modules/ethtool/default.nix
+++ b/pkgs/development/python-modules/ethtool/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fedora-python";
     repo = "python-ethtool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0XzGaqpkEv3mpUsbfOtRl8E62iNdS7kRoo4oYrBjMys=";
   };
 
diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix
index d1a122162d2b..e9dba494ac73 100644
--- a/pkgs/development/python-modules/etuples/default.nix
+++ b/pkgs/development/python-modules/etuples/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "etuples";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dl+exar98PnqEiCNX+Ydllp7aohsAYrFtxb2Q1Lxx6Y=";
   };
 
diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix
index b4ca54649850..9eadd3784211 100644
--- a/pkgs/development/python-modules/evaluate/default.nix
+++ b/pkgs/development/python-modules/evaluate/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "evaluate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-G/SK0nMpkpCEzX8AX/IJqpOPZWAQhP8tyr7TJ+F0NCE=";
   };
 
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index 0e25f3a12115..07e768909f2f 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyeve";
     repo = "eve";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BLDuJLAN6ieaD7vBPV6AwlpPqbAyb+LzEp9AfCHveSY=";
   };
 
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix
index e3f3bb02ade2..267347289696 100644
--- a/pkgs/development/python-modules/eventlet/default.nix
+++ b/pkgs/development/python-modules/eventlet/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eventlet";
     repo = "eventlet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-R/nRHsz4z4phG51YYDwkGqvnXssGoiJxIPexuhAf0BI=";
   };
 
diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix
index ecf7fa96bc25..2c8f52541f2c 100644
--- a/pkgs/development/python-modules/events/default.nix
+++ b/pkgs/development/python-modules/events/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyeve";
     repo = "events";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs=";
   };
 
diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix
index 0e7dbc5af6c9..5abef0b5a32c 100644
--- a/pkgs/development/python-modules/evohome-async/default.nix
+++ b/pkgs/development/python-modules/evohome-async/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zxdavb";
     repo = "evohome-async";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+tBqyg7E9wRC6oHq6Fv2vzIGtrHqZp8w/3x/xbacqWI=";
   };
 
diff --git a/pkgs/development/python-modules/evosax/default.nix b/pkgs/development/python-modules/evosax/default.nix
index 08771810c948..aff474455aa9 100644
--- a/pkgs/development/python-modules/evosax/default.nix
+++ b/pkgs/development/python-modules/evosax/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RobertTLange";
     repo = "evosax";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-v8wRiWZlJPF9pIXocQ6/caHl1W4QBNjkmuImJ6MAueo=";
   };
 
diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix
index a31b963462a3..7a8339ee3da7 100644
--- a/pkgs/development/python-modules/evtx/default.nix
+++ b/pkgs/development/python-modules/evtx/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omerbenamram";
     repo = "pyevtx-rs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8=";
   };
 
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index 4c2fcebe39a9..5094ede93be8 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "agronholm";
     repo = "exceptiongroup";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k88+9FpB/aBun73SnsN6GsBceSUekT8Ig1XBt3hO4ok=";
   };
 
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index b1898d0e917f..17bcbfd7e581 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ecederstrand";
     repo = "exchangelib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nu1uhsUc4NhVE08RtaD8h6KL6DFzA8mPcCJ/cX2UYME=";
   };
 
diff --git a/pkgs/development/python-modules/exitcode/default.nix b/pkgs/development/python-modules/exitcode/default.nix
index 1127a42abdcd..7ce60deaa335 100644
--- a/pkgs/development/python-modules/exitcode/default.nix
+++ b/pkgs/development/python-modules/exitcode/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rumpelsepp";
     repo = "exitcode";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MZeLwU1gODqH752y/nc9WkUArl48pyq9Vun7tX620No=";
   };
 
diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix
index 9529615d0b1d..0192bd465f15 100644
--- a/pkgs/development/python-modules/exiv2/default.nix
+++ b/pkgs/development/python-modules/exiv2/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jim-easterbrook";
     repo = "python-exiv2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AXBhCe7AvhQkGZaLMTGExwgUYQGdRkk14Rtceugexag=";
   };
 
diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix
index 1c8965b0c4f5..983f259c10c6 100644
--- a/pkgs/development/python-modules/experiment-utilities/default.nix
+++ b/pkgs/development/python-modules/experiment-utilities/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ChrisReinke";
     repo = "exputils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fo8kwxm5/oEuLXVKhBrvKg18S0Yh6SkkNRaHUGJfdw4=";
   };
 
diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix
index 4b5591d05525..fea17b36496c 100644
--- a/pkgs/development/python-modules/expiringdict/default.nix
+++ b/pkgs/development/python-modules/expiringdict/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mailgun";
     repo = "expiringdict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I=";
   };
 
diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix
index f4e7d21aeb33..76d92bb173c2 100644
--- a/pkgs/development/python-modules/explorerscript/default.nix
+++ b/pkgs/development/python-modules/explorerscript/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = "explorerscript";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY=";
     # Include a pinned antlr4 fork used as a C++ library
     fetchSubmodules = true;
diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix
index 01ba9fd55a2a..47db2c6620e0 100644
--- a/pkgs/development/python-modules/extension-helpers/default.nix
+++ b/pkgs/development/python-modules/extension-helpers/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "extension-helpers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qneulhSYB2gYiCdgoU7Dqg1luLWhVouFVihcKeOA37E=";
   };
 
diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix
index 5fd8e5ff6df7..dd12a392736a 100644
--- a/pkgs/development/python-modules/extract-msg/default.nix
+++ b/pkgs/development/python-modules/extract-msg/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TeamMsgExtractor";
     repo = "msg-extractor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4jvzZkGa/xI5Sl9TBIm/BD3tGl+MZvwir6m/zrvA4tQ=";
   };
 
diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix
index bc4c50ef292b..9abce5642181 100644
--- a/pkgs/development/python-modules/extruct/default.nix
+++ b/pkgs/development/python-modules/extruct/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scrapinghub";
     repo = "extruct";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CfhIqbhrZkJ232grhHxrmj4H1/Bq33ZXe8kovSOWSK0=";
   };
 
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 74e051910777..5f69dcdb4723 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozman";
     repo = "ezdxf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BzdLl2GjLh2ABJzJ6bhdbic9jlSABIVR3XGrYiLJHa0=";
   };
 
diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix
index 3ed46178f1e8..c3506c61d2ff 100644
--- a/pkgs/development/python-modules/ezyrb/default.nix
+++ b/pkgs/development/python-modules/ezyrb/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mathLab";
     repo = "EZyRB";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nu75Geyeu1nTLoGaohXB9pmbUWKgdgch9Z5OJqz9xKQ=";
   };
 
diff --git a/pkgs/development/python-modules/f5-icontrol-rest/default.nix b/pkgs/development/python-modules/f5-icontrol-rest/default.nix
index 81390efdbc8a..a6e342fb14ca 100644
--- a/pkgs/development/python-modules/f5-icontrol-rest/default.nix
+++ b/pkgs/development/python-modules/f5-icontrol-rest/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "F5Networks";
     repo = "f5-icontrol-rest-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-asAFIRoc2zll8a8gMMt4ZRQILhMAes8wf3PGwG5wF9c=";
   };
 
diff --git a/pkgs/development/python-modules/fairscale/default.nix b/pkgs/development/python-modules/fairscale/default.nix
index e870e2c934e7..8c40ab74dda5 100644
--- a/pkgs/development/python-modules/fairscale/default.nix
+++ b/pkgs/development/python-modules/fairscale/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "fairscale";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L2Rl/qL6l0OLAofygzJBGQdp/2ZrgDFarwZRjyAR3dw=";
   };
 
diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix
index 27492073c580..0401542063a7 100644
--- a/pkgs/development/python-modules/falcon/default.nix
+++ b/pkgs/development/python-modules/falcon/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "falconry";
     repo = "falcon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-umNuHyZrdDGyrhQEG9+f08D4Wwrz6bVJ6ysw8pfbHv4=";
   };
 
diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix
index 16f506f5ab0d..e12f5ceb3392 100644
--- a/pkgs/development/python-modules/faraday-plugins/default.nix
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "infobyte";
     repo = "faraday_plugins";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e1VrZf0WNUZ5gU5e4uBkW8PgfQrqGgqqDb0n56nm1Xg=";
   };
 
diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix
index 3a3ada743a4e..790100108da9 100644
--- a/pkgs/development/python-modules/fast-histogram/default.nix
+++ b/pkgs/development/python-modules/fast-histogram/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astrofrog";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-vIzDDzz6e7PXArHdZdSSgShuTjy3niVdGtXqgmyJl1w=";
   };
 
diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix
index 6b4598ad05a4..db270993d0f1 100644
--- a/pkgs/development/python-modules/fastapi-cli/default.nix
+++ b/pkgs/development/python-modules/fastapi-cli/default.nix
@@ -21,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "tiangolo";
       repo = "fastapi-cli";
-      rev = "refs/tags/${version}";
+      tag = version;
       hash = "sha256-hUS9zkDJJB51X+e31RvyxcGAP8j4oulAPFAvEMPiIn8=";
     };
 
diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix
index 9fb8d61ee0cc..d0a0ebb50366 100644
--- a/pkgs/development/python-modules/fastapi-mail/default.nix
+++ b/pkgs/development/python-modules/fastapi-mail/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sabuhish";
     repo = "fastapi-mail";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QypW7yE5jBkS1Q4XPIOktWnCmCXGoUzZF/SdWmFsPX8=";
   };
 
diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix
index 103376e4ad40..de57d71cf53b 100644
--- a/pkgs/development/python-modules/fastapi-sso/default.nix
+++ b/pkgs/development/python-modules/fastapi-sso/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomasvotava";
     repo = "fastapi-sso";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CkYAF2GmVCooyHt3Tua6ClYMbgyLosqSa8z/zkV2eIE=";
   };
 
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 20ab79f892a0..941cfe38049b 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "fastapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yNYjFD77q5x5DtcYdywmScuuVdyWhBoxbLYJhu1Fmno=";
   };
 
diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index 16ede5ab211e..614ee299cf73 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hKhwQqNJ+QvYf4x9FesNOPg36m8zC6D6dmlhANXCcsk=";
   };
 
diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix
index 78076c652709..c53d84054879 100644
--- a/pkgs/development/python-modules/fastcrc/default.nix
+++ b/pkgs/development/python-modules/fastcrc/default.nix
@@ -15,7 +15,7 @@ let
   src = fetchFromGitHub {
     owner = "overcat";
     repo = "fastcrc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yLrv/zqsjgygJAIJtztwxlm4s9o9EBVsCyx1jUXd7hA=";
   };
 in
diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix
index 7dbf9fbe7329..8e719f83c88e 100644
--- a/pkgs/development/python-modules/fastembed/default.nix
+++ b/pkgs/development/python-modules/fastembed/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "fastembed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IdIGht4RcejXoBTJ8eHi5fNw2ffxIi/chuoQBNjA98g=";
   };
 
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index 4460c71f3c31..92baedf38efe 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "harlowja";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XFa1ItFqkSYE940p/imWFp5e9gS6n+D1uM6Cj+Vzmmg=";
   };
 
diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix
index 9bdbd7dfd668..8e5d27e4dbe9 100644
--- a/pkgs/development/python-modules/fastnumbers/default.nix
+++ b/pkgs/development/python-modules/fastnumbers/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SethMMorton";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TC9+xOvskABpChlrSJcHy6O7D7EnIKL6Ekt/vaLBX2E=";
   };
 
diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix
index 79185e3a3c2f..c162a229cac2 100644
--- a/pkgs/development/python-modules/fastparquet/default.nix
+++ b/pkgs/development/python-modules/fastparquet/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "fastparquet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4=";
   };
 
diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix
index ff3cd46700c9..e133516291fb 100644
--- a/pkgs/development/python-modules/faust-cchardet/default.nix
+++ b/pkgs/development/python-modules/faust-cchardet/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "faust-streaming";
     repo = "cChardet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4=";
   };
diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix
index f4d4fb0f9094..4d34d64595c3 100644
--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ch00k";
     repo = "ffmpy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-spbyz1EyMJRXJTm7TqN9XoqR9ztBKsNZx3NURwV7N2w=";
   };
 
diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix
index d847ee08e9ed..a9de4b799875 100644
--- a/pkgs/development/python-modules/fhir-py/default.nix
+++ b/pkgs/development/python-modules/fhir-py/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "beda-software";
     repo = "fhir-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ts4BT/YVfejyemEy8B9aAJuA9h1a5F/SoIAkDVem7mQ=";
   };
 
diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
index 44bb00c6bec6..de54ce0ce751 100644
--- a/pkgs/development/python-modules/fickling/default.nix
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "fickling";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ=";
   };
 
diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix
index a42c824a92f0..f0b5e1622af3 100644
--- a/pkgs/development/python-modules/filecheck/default.nix
+++ b/pkgs/development/python-modules/filecheck/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mull-project";
     repo = "FileCheck.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VbMlCqGd3MVpj0jEKjSGC2L0s/3e/d53b+2eZcXZneo=";
   };
 
diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix
index 1b5d554045d8..b21b4590ebc3 100644
--- a/pkgs/development/python-modules/filedepot/default.nix
+++ b/pkgs/development/python-modules/filedepot/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amol-";
     repo = "depot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-693H/u+Wg2G9sdoUkC6DQo9WkmIlKnh8NKv3ufK/eyQ=";
   };
 
diff --git a/pkgs/development/python-modules/find-libpython/default.nix b/pkgs/development/python-modules/find-libpython/default.nix
index 657c051c0396..6a8ea5cd85a1 100644
--- a/pkgs/development/python-modules/find-libpython/default.nix
+++ b/pkgs/development/python-modules/find-libpython/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ktbarrett";
     repo = "find_libpython";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rYVGE9P5Xtm32kMoiqaZVMgnDbX3JBnI1uV80aNNOfw=";
   };
 
diff --git a/pkgs/development/python-modules/findimports/default.nix b/pkgs/development/python-modules/findimports/default.nix
index b7c50c85020e..14d9c4b146ce 100644
--- a/pkgs/development/python-modules/findimports/default.nix
+++ b/pkgs/development/python-modules/findimports/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mgedmin";
     repo = "findimports";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-W4GKnIYOh3bk18yviL7GfMyXoWNLFWWDhKur9id1a78=";
   };
 
diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix
index 4796f53037be..dc7688027329 100644
--- a/pkgs/development/python-modules/finvizfinance/default.nix
+++ b/pkgs/development/python-modules/finvizfinance/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lit26";
     repo = "finvizfinance";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HCxq8jCT3aHOXeYue7KP5sYzO6nJnB9Sy8gKGZpZHbc=";
   };
 
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index eabd53ac5555..cf60fd2f39ca 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Toblerity";
     repo = "Fiona";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5NN6PBh+6HS9OCc9eC2TcBvkcwtI4DV8qXnz4tlaMXc=";
   };
 
diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index aa29025c3f24..d0678daf43e1 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "python-fire";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cYlkMnZOa0J6dOiWsWZplk/MajVRiCYe8tK3641fD0w=";
   };
 
diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix
index a64bc19ea2e6..502dab1746b7 100644
--- a/pkgs/development/python-modules/firebase-messaging/default.nix
+++ b/pkgs/development/python-modules/firebase-messaging/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sdb9696";
     repo = "firebase-messaging";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-duUqDioIBo2QQP/4VGGwklDt4F8pDm/sHrvOx4wcTWQ=";
   };
 
diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix
index 96c7e0674ba6..a8ea25eec58c 100644
--- a/pkgs/development/python-modules/fireflyalgorithm/default.nix
+++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "FireflyAlgorithm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dJnjeJN9NI8G/haYeOiMtAl56cExqMk0iTWpaybl4nE=";
   };
 
diff --git a/pkgs/development/python-modules/flake8-docstrings/default.nix b/pkgs/development/python-modules/flake8-docstrings/default.nix
index 3cd84284a1c4..92176f0b000a 100644
--- a/pkgs/development/python-modules/flake8-docstrings/default.nix
+++ b/pkgs/development/python-modules/flake8-docstrings/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-EafLWySeHB81HRcXiDs56lbUZzGvnT87WVqln0PoLCk=";
   };
 
diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index 8ea9f8c7d73d..abefdde0ab47 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xZise";
     repo = "flake8-future-import";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0=";
   };
 
diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix
index 84d8a5370a09..e3026ed58e43 100644
--- a/pkgs/development/python-modules/flametree/default.nix
+++ b/pkgs/development/python-modules/flametree/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Edinburgh-Genome-Foundry";
     repo = "Flametree";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158=";
   };
 
diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix
index e9da4f44b665..567b9749db0c 100644
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flask-admin";
     repo = "flask-admin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L8Q9uPpoen6ZvuF2bithCMSgc6X5khD1EqH2FJPspZc=";
   };
 
diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix
index 7b15e047ae19..0f50244b6fc6 100644
--- a/pkgs/development/python-modules/flask-api/default.nix
+++ b/pkgs/development/python-modules/flask-api/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flask-api";
     repo = "flask-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nHgeI5FLKkDp4uWO+0eaT4YSOMkeQ0wE3ffyJF+WzTM=";
   };
 
diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index 6618e130067d..b51762a23926 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miracle2k";
     repo = "flask-assets";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-R6cFTT+r/i5j5/QQ+cCFmeuO7SNTiV1F+e0JTxwIUGY=";
   };
 
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index dfeda89807aa..d3ce9996e199 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-babel";
     repo = "flask-babel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BAT+oupy4MCSjeZ4hFtSKMkGU9xZtc7Phnz1mIsb2Kc=";
   };
 
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index 7a79bf47ba6e..6fe9d67015a6 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "colour-science";
     repo = "flask-compress";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-87fjJxaS7eJbOkSUljnhqFIeahoS4L2tAOhmv4ryVUM=";
   };
 
diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index cd788642dd5c..045f4cfefd8c 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "corydolphin";
     repo = "flask-cors";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I1iCnUT0+ZThf+c9Vm9GgH5hYL/pcBReOjKJGRNsRrg=";
   };
 
diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix
index 0f1e4e227e6b..9da74f115d46 100644
--- a/pkgs/development/python-modules/flask-mail/default.nix
+++ b/pkgs/development/python-modules/flask-mail/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets-eco";
     repo = "flask-mail";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-G2Z8dj1/IuLsZoNJVrL6LYu0XjTEHtWB9Z058aqG9Ic=";
   };
 
diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix
index e76561dc8ca1..dc7d12fcfe0b 100644
--- a/pkgs/development/python-modules/flask-mailman/default.nix
+++ b/pkgs/development/python-modules/flask-mailman/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "waynerv";
     repo = "flask-mailman";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0kD3rxFDJ7FcmBLVju75z1nf6U/7XfjiLD/oM/VP4jQ=";
   };
 
diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
index 68ce1cd451ed..ccb8b8852c18 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "flask-marshmallow";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GQLkt/CJf/QI8emvlW8xSRziGnncwfMSxBccW0Bb8I0=";
   };
 
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 2809af9a4ac7..ce86363095f1 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "Flask-Migrate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TnihrZ+JQ1XCBlFp6k8lrNpZr4P2/Z6AmFwWZbabz+8=";
   };
 
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix
index 5624141f671d..c57767df0f59 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/pkgs/development/python-modules/flask-paginate/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lixxu";
     repo = "flask-paginate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YaAgl+iuoXB0eWVzhmNq2UTOpM/tHfDISIb9CyaXiuA=";
   };
 
diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix
index 5fe11b282c0d..e812fa5b23d4 100644
--- a/pkgs/development/python-modules/flask-principal/default.nix
+++ b/pkgs/development/python-modules/flask-principal/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets-eco";
     repo = "flask-principal";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-E9urzZc7/QtzAohSNAJsQtykrplb+MC189VGZI5kmEE=";
   };
 
diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix
index 2a40ee42ea4c..c9c63350d335 100644
--- a/pkgs/development/python-modules/flask-restx/default.nix
+++ b/pkgs/development/python-modules/flask-restx/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-restx";
     repo = "flask-restx";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CBReP/u96fsr28lMV1BfLjjdBMXEvsD03wvsxkIcteI=";
   };
 
diff --git a/pkgs/development/python-modules/flask-security/default.nix b/pkgs/development/python-modules/flask-security/default.nix
index be4d066c8655..b29aaa91091e 100644
--- a/pkgs/development/python-modules/flask-security/default.nix
+++ b/pkgs/development/python-modules/flask-security/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets-eco";
     repo = "flask-security";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RGRwgrDFe+0v8NYyajMikdoi1DQf1I+B5y8KJyF+cZs=";
   };
 
diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix
index b1ef27fb3c67..3f28fb5a235a 100644
--- a/pkgs/development/python-modules/flask-session-captcha/default.nix
+++ b/pkgs/development/python-modules/flask-session-captcha/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tethik";
     repo = "flask-session-captcha";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0=";
   };
 
diff --git a/pkgs/development/python-modules/flask-session/default.nix b/pkgs/development/python-modules/flask-session/default.nix
index dcfb8bfe4a36..d4b5857eefeb 100644
--- a/pkgs/development/python-modules/flask-session/default.nix
+++ b/pkgs/development/python-modules/flask-session/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets-eco";
     repo = "flask-session";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QLtsM0MFgZbuLJPLc5/mUwyYc3bYxildNKNxOF8Z/3Y=";
   };
 
diff --git a/pkgs/development/python-modules/flask-simpleldap/default.nix b/pkgs/development/python-modules/flask-simpleldap/default.nix
index 9ba36f1b4d25..968571ac8463 100644
--- a/pkgs/development/python-modules/flask-simpleldap/default.nix
+++ b/pkgs/development/python-modules/flask-simpleldap/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexferl";
     repo = "flask-simpleldap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WcedTtEwaSc3BYFE3L0FZrtKKdbwk7r3qSPP8evtYlc=";
   };
 
diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix
index 6235c3ebac39..ea4bdf70885b 100644
--- a/pkgs/development/python-modules/flask-socketio/default.nix
+++ b/pkgs/development/python-modules/flask-socketio/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "Flask-SocketIO";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-owlgbw0QBUz2wCBxd1rjMI+4nPVTZ6JgmU2tL+vIj5g=";
   };
 
diff --git a/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix b/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix
index c17f7229ad7b..3bee854ca196 100644
--- a/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix
+++ b/pkgs/development/python-modules/flask-sqlalchemy-lite/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets-eco";
     repo = "flask-sqlalchemy-lite";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LpdPp5Gp74DSJqD1DJqwNeaMKdN5pEAUkxnKGYZcVis=";
   };
 
diff --git a/pkgs/development/python-modules/flask-themer/default.nix b/pkgs/development/python-modules/flask-themer/default.nix
index d76a9b59bd24..1667b095ac4e 100644
--- a/pkgs/development/python-modules/flask-themer/default.nix
+++ b/pkgs/development/python-modules/flask-themer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TkTech";
     repo = "flask-themer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2Zw+gKKN0kfjYuruuLQ+3dIFF0X07DTy0Ypc22Ih66w=";
   };
 
diff --git a/pkgs/development/python-modules/flask-webtest/default.nix b/pkgs/development/python-modules/flask-webtest/default.nix
index 48fad5c4ebe8..416a7684c064 100644
--- a/pkgs/development/python-modules/flask-webtest/default.nix
+++ b/pkgs/development/python-modules/flask-webtest/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "level12";
     repo = "flask-webtest";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4USNT6HYh49v+euCePYkL1gR6Ul8C0+/xanuYGxKpfM=";
   };
 
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 9ee281ed5dba..5d59008b34f2 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "flax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+URbQGnmqmSNgucEyWvI5DMnzXjpmJzLA+Pho2lX+S4=";
   };
 
diff --git a/pkgs/development/python-modules/flexit-bacnet/default.nix b/pkgs/development/python-modules/flexit-bacnet/default.nix
index 1fdad51d39b0..264bce517b8b 100644
--- a/pkgs/development/python-modules/flexit-bacnet/default.nix
+++ b/pkgs/development/python-modules/flexit-bacnet/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "piotrbulinski";
     repo = "flexit_bacnet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Cy/WHKtJoZWSFOs+9rBYSLqZTF/68WRM1HiYXDyb9KM=";
   };
 
diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix
index 8b725ccc2050..d4e61b5b9b98 100644
--- a/pkgs/development/python-modules/flipr-api/default.nix
+++ b/pkgs/development/python-modules/flipr-api/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cnico";
     repo = "flipr-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/px8NuBwukAPMxdXvHdyfO/j/a9UatKbdrjDNuT0f4k=";
   };
 
diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix
index b2e1099e2015..639f7072c1ec 100644
--- a/pkgs/development/python-modules/floret/default.nix
+++ b/pkgs/development/python-modules/floret/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "floret";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ=";
   };
 
diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix
index f15dce25869e..7d0d6cd0ba26 100644
--- a/pkgs/development/python-modules/flow-record/default.nix
+++ b/pkgs/development/python-modules/flow-record/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "flow.record";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tEKmwDZOoGIXfJqxIat6WTbEv4EkiwkJGMpNxfv2Zd0=";
   };
 
diff --git a/pkgs/development/python-modules/flowlogs-reader/default.nix b/pkgs/development/python-modules/flowlogs-reader/default.nix
index ee7d9f4cc215..fb46314afab7 100644
--- a/pkgs/development/python-modules/flowlogs-reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs-reader/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "obsrvbl";
     repo = pname;
     # https://github.com/obsrvbl/flowlogs-reader/issues/57
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9UwCRLRKuIFRTh3ntAzlXCyN175J1wobT3GSLAhl+08=";
   };
 
diff --git a/pkgs/development/python-modules/flowmc/default.nix b/pkgs/development/python-modules/flowmc/default.nix
index 27127b93b578..93e38f051ae5 100644
--- a/pkgs/development/python-modules/flowmc/default.nix
+++ b/pkgs/development/python-modules/flowmc/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kazewong";
     repo = "flowMC";
-    rev = "refs/tags/flowMC-${version}";
+    tag = "flowMC-${version}";
     hash = "sha256-unvbNs0AOzW4OI+9y6KxoBC5yEjEz+q0PZblQLXCC/Y=";
   };
 
diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix
index 320cb1343f46..0e56a17c3a73 100644
--- a/pkgs/development/python-modules/fluent-logger/default.nix
+++ b/pkgs/development/python-modules/fluent-logger/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-logger-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i6S5S2ZUwC5gQPdVjefUXrKj43iLIqxd8tdXbMBJNnA=";
   };
 
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index df81b7149df1..905c597a8459 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "flux_led";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-enYo2hZ1C8jqO+8xZhSmIOJQAyrtVUJ9S/e2Bxzhv0I=";
   };
 
diff --git a/pkgs/development/python-modules/flynt/default.nix b/pkgs/development/python-modules/flynt/default.nix
index 24112171ffe7..92e2c24ff46c 100644
--- a/pkgs/development/python-modules/flynt/default.nix
+++ b/pkgs/development/python-modules/flynt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ikamensh";
     repo = "flynt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UHY4UDBHcP3ARikktIehSUD3Dx8A0xpOnfKWWrLCsOY=";
   };
 
diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix
index 26730aa7f434..eae74526e963 100644
--- a/pkgs/development/python-modules/fnv-hash-fast/default.nix
+++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "fnv-hash-fast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kJQZnj1ja7cVZSDOuUI3rkNIvyH508wFKAvJ5XfwCNU=";
   };
 
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 555c9cb9bf7b..9a4364a7436b 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fonttools";
     repo = "fonttools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iYd3EiziaLR7zS0UQAje0QfShNfnhHPdH2+noCQ2yto=";
   };
 
diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix
index c53494a5aa2f..92ad357367f7 100644
--- a/pkgs/development/python-modules/forecast-solar/default.nix
+++ b/pkgs/development/python-modules/forecast-solar/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "forecast_solar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lWP4ZG195IuP8E9n53EkvdIs3aVTYeEc171Yh3EngOI=";
   };
 
diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix
index 57c26378761f..278a0368e7c8 100644
--- a/pkgs/development/python-modules/formulae/default.nix
+++ b/pkgs/development/python-modules/formulae/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bambinos";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo=";
   };
 
diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix
index ee149c96832c..f7c6d8fff759 100644
--- a/pkgs/development/python-modules/formulaic/default.nix
+++ b/pkgs/development/python-modules/formulaic/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthewwardrop";
     repo = "formulaic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1Ygu4o6RXXTnvve8XZi+QMhCjvUyMspYWTyUH3p6+dg=";
   };
 
diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix
index 233ebce089de..fce21f4c21f9 100644
--- a/pkgs/development/python-modules/fortiosapi/default.nix
+++ b/pkgs/development/python-modules/fortiosapi/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fortinet-solutions-cse";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg=";
   };
 
diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix
index c1fcae710db8..ce6f1a0a3290 100644
--- a/pkgs/development/python-modules/fpylll/default.nix
+++ b/pkgs/development/python-modules/fpylll/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fplll";
     repo = "fpylll";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-M3ZnDL0Ui3UAa5Jn/Wr5pAHhghP7EAaQD/sx5QZ58ZQ=";
   };
 
diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix
index 7b867da840c6..0d4f9cac7f12 100644
--- a/pkgs/development/python-modules/fpyutils/default.nix
+++ b/pkgs/development/python-modules/fpyutils/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frnmst";
     repo = "fpyutils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VVR1zsejO6kHlMjqqlftDKu3/SyDzgPov9f48HYL/Bk=";
   };
 
diff --git a/pkgs/development/python-modules/free-proxy/default.nix b/pkgs/development/python-modules/free-proxy/default.nix
index 8db5b1483af7..c315076b09c5 100644
--- a/pkgs/development/python-modules/free-proxy/default.nix
+++ b/pkgs/development/python-modules/free-proxy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jundymek";
     repo = "free-proxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8SxKGGifQTU0CUrtUQUtrmeq+Do4GIqNUWAdCt++eUA=";
   };
 
diff --git a/pkgs/development/python-modules/freenub/default.nix b/pkgs/development/python-modules/freenub/default.nix
index fec4d3180bc4..6c3702f6bbf2 100644
--- a/pkgs/development/python-modules/freenub/default.nix
+++ b/pkgs/development/python-modules/freenub/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "freenub";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UkW/7KUQ4uCu3cxDSL+kw0gjKjs4KnmxRIOLVP4hwyA=";
   };
 
diff --git a/pkgs/development/python-modules/freesasa/default.nix b/pkgs/development/python-modules/freesasa/default.nix
index 92b2359862f0..e2d6355abb13 100644
--- a/pkgs/development/python-modules/freesasa/default.nix
+++ b/pkgs/development/python-modules/freesasa/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "freesasa";
     repo = "freesasa-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/7ymItwXOemY0+IL0k6rWnJI8fAwTFjNXzTV+uf9x9A=";
   };
 
diff --git a/pkgs/development/python-modules/frelatage/default.nix b/pkgs/development/python-modules/frelatage/default.nix
index 1203cab94216..3f8d64f9e464 100644
--- a/pkgs/development/python-modules/frelatage/default.nix
+++ b/pkgs/development/python-modules/frelatage/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Rog3rSm1th";
     repo = "frelatage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eHVqp6govBV9FvSQyaZuEEImHQRs/mbLaW86RCvtDbM=";
   };
 
diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix
index 386eb8f9b012..360b15d8439c 100644
--- a/pkgs/development/python-modules/freud/default.nix
+++ b/pkgs/development/python-modules/freud/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glotzerlab";
     repo = "freud";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jlscEHQ1q4oqxE06NhVWCOlPRcjDcJVrvy4h6iYrkz0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix
index 4914314384b8..72344595685f 100644
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bm1549";
     repo = "frigidaire";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RzwTQRo5cIh6I8VQAJNcLg5TBiF6dAnZICGfvwCvx5Y=";
   };
 
diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 84afd730f495..bbe9256db345 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kbr";
     repo = "fritzconnection";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1LLfSEOKqUIhWIR/RQEG0Bp41d908hAKDlslJlWCHys=";
   };
 
diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
index 092cf21301c7..7fe6bf02311c 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Marco-Sulla";
     repo = "python-frozendict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cdKI0wIr0w6seV12cigqyJL6PSkLVzwVxASUB8n7lFY=";
   };
 
diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix
index c4c4613163ed..3ff2cb6aa3de 100644
--- a/pkgs/development/python-modules/frozenlist/default.nix
+++ b/pkgs/development/python-modules/frozenlist/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "frozenlist";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ICPJKN6P9ezTiDVoEVBQvJlXqF7aHE6aXFx0jzntdEA=";
   };
 
diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix
index d86fd4d91062..a60a61e055fc 100644
--- a/pkgs/development/python-modules/fschat/default.nix
+++ b/pkgs/development/python-modules/fschat/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "lm-sys";
     repo = "FastChat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tQuvQXzQbQjU16DfS1o55VHW6eklngEvIigzZGgrKB8=";
   };
 
diff --git a/pkgs/development/python-modules/fsspec-xrootd/default.nix b/pkgs/development/python-modules/fsspec-xrootd/default.nix
index 73799c933f80..7a6507b4ee1e 100644
--- a/pkgs/development/python-modules/fsspec-xrootd/default.nix
+++ b/pkgs/development/python-modules/fsspec-xrootd/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "fsspec-xrootd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ge7pVrcCYNp8yNV+ZkBftLeCCSUhtO+HJHsSHT58jcs=";
   };
 
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index 8f6e77800b56..a3b1e9c3461e 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "filesystem_spec";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C+47BcIELZTEARXW8fAMHMjyKUWxU1tNKWGoPPtt/fQ=";
   };
 
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index ec5aca9062a6..03184eb9e2e4 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rspeer";
     repo = "python-ftfy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TmwDJeUDcF+uOB2X5tMmnf9liCI9rP6dYJVmJoaqszo=";
   };
 
diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix
index ab617d626473..63c19f1215a3 100644
--- a/pkgs/development/python-modules/fugashi/default.nix
+++ b/pkgs/development/python-modules/fugashi/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "polm";
     repo = "fugashi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU=";
   };
 
diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix
index dda85f2c798d..c24e3c16f85e 100644
--- a/pkgs/development/python-modules/funsor/default.nix
+++ b/pkgs/development/python-modules/funsor/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyro-ppl";
     repo = "funsor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Prj1saT0yoPAP8rDE0ipBEpR3QMk4PS12VSJlxc22p8=";
   };
 
diff --git a/pkgs/development/python-modules/fuzzyfinder/default.nix b/pkgs/development/python-modules/fuzzyfinder/default.nix
index f5f23158a3d8..99ee29d91688 100644
--- a/pkgs/development/python-modules/fuzzyfinder/default.nix
+++ b/pkgs/development/python-modules/fuzzyfinder/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amjith";
     repo = "fuzzyfinder";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QWUABljgtzsZONl1klCrxEh0tPYodMOXokEb3YvWsyg=";
   };
 
diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix
index f9a675542332..edbd7f92a62f 100644
--- a/pkgs/development/python-modules/fyta-cli/default.nix
+++ b/pkgs/development/python-modules/fyta-cli/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dontinelli";
     repo = "fyta_cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OgpQh7WyZynFd308TjIGkQNoy8TFu9gynbDiLueqB/0=";
   };
 
diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix
index 4f39dd06556b..e063be70c3f0 100644
--- a/pkgs/development/python-modules/gamble/default.nix
+++ b/pkgs/development/python-modules/gamble/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpetrucciani";
     repo = "gamble";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vzaY5gJ0Ou2ArUJ0kuTWzTeLfiRDhUt/Hxpns9rFiDk=";
   };
 
diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index d5e646a89fa9..59203e1ef362 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-garminconnect";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rY3jIrCl5y2Pyw7qakUuMtdPTR7e61n5pScPavvBtbM=";
   };
 
diff --git a/pkgs/development/python-modules/gassist-text/default.nix b/pkgs/development/python-modules/gassist-text/default.nix
index bbd02fd31a54..63e3b4bcedcf 100644
--- a/pkgs/development/python-modules/gassist-text/default.nix
+++ b/pkgs/development/python-modules/gassist-text/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "gassist_text";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XFHyI48TuPBJjHA4dLSpYv62Y5zK0knrIqNKBoWnEeU=";
   };
 
diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index d62c2bc4cd41..a47a7500f4ed 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "serge-sans-paille";
     repo = "gast";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zrbxW8qWhCY6tObP+/WDReoCnlCpMEzQucX2inpRTL4=";
   };
 
diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix
index 07b255e804fc..ee0af4862666 100644
--- a/pkgs/development/python-modules/gcal-sync/default.nix
+++ b/pkgs/development/python-modules/gcal-sync/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "gcal_sync";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-424PRKjQnpb6fH+iSAqkoOhlvugW7W3wjUxCHTc/A20=";
   };
 
diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix
index 2cc70ba25e1b..e1cb3e8cc164 100644
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6O09lP2cWLzeMTBathb3O/tVGZPEHSqujfUPWZIBUJI=";
   };
 
diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix
index 50a1013bc108..798a3c9e9abf 100644
--- a/pkgs/development/python-modules/geniushub-client/default.nix
+++ b/pkgs/development/python-modules/geniushub-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "manzanotti";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Gq2scYos7E8me1a4x7NanHRq2eYWuU2uSUwM+O1TPb8=";
   };
 
diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix
index d2bb35462ead..592e0e61c26a 100644
--- a/pkgs/development/python-modules/gentools/default.nix
+++ b/pkgs/development/python-modules/gentools/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ariebovenberg";
     repo = "gentools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+6KTFxOpwvGOCqy6JU87gOZmDa6MvjR10qES5wIfrjI=";
   };
 
diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index 1c347cb3a7c6..b9d036750a95 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geoalchemy";
     repo = "geoalchemy2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LjfCPSpKwcyjmGReTC4M58890ow3hbxlwl1f7iC9i6Y=";
   };
 
diff --git a/pkgs/development/python-modules/geoarrow-c/default.nix b/pkgs/development/python-modules/geoarrow-c/default.nix
index deef6b21947a..d7b0eb34909b 100644
--- a/pkgs/development/python-modules/geoarrow-c/default.nix
+++ b/pkgs/development/python-modules/geoarrow-c/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "geoarrow-c";
     owner = "geoarrow";
-    rev = "refs/tags/geoarrow-c-python-${version}";
+    tag = "geoarrow-c-python-${version}";
     hash = "sha256-kQCD3Vptl7GtRFigr4darvdtwnaHRLZWvBBpZ0xHMgM=";
   };
 
diff --git a/pkgs/development/python-modules/geoarrow-pandas/default.nix b/pkgs/development/python-modules/geoarrow-pandas/default.nix
index cdf71922b509..5a68d34cc8dd 100644
--- a/pkgs/development/python-modules/geoarrow-pandas/default.nix
+++ b/pkgs/development/python-modules/geoarrow-pandas/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "geoarrow-python";
     owner = "geoarrow";
-    rev = "refs/tags/geoarrow-pandas-${version}";
+    tag = "geoarrow-pandas-${version}";
     hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y=";
   };
 
diff --git a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix
index 197962bf15b2..c06a2f649057 100644
--- a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix
+++ b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "geoarrow-python";
     owner = "geoarrow";
-    rev = "refs/tags/geoarrow-pyarrow-${version}";
+    tag = "geoarrow-pyarrow-${version}";
     hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y=";
   };
 
diff --git a/pkgs/development/python-modules/geoarrow-types/default.nix b/pkgs/development/python-modules/geoarrow-types/default.nix
index 366fa20eeee4..e0b2fdb36387 100644
--- a/pkgs/development/python-modules/geoarrow-types/default.nix
+++ b/pkgs/development/python-modules/geoarrow-types/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "geoarrow-python";
     owner = "geoarrow";
-    rev = "refs/tags/geoarrow-types-${version}";
+    tag = "geoarrow-types-${version}";
     hash = "sha256-LySb4AsRuSirDJ73MAPpnMwPM2WFfG6X82areR4Y4lI=";
   };
 
diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix
index c20c548f77f7..47364ccbea16 100644
--- a/pkgs/development/python-modules/geocachingapi/default.nix
+++ b/pkgs/development/python-modules/geocachingapi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Sholofly";
     repo = "geocachingapi-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zme1jqn3qtoo39zyj4dKxt9M7gypMqJu0bfgY1iYhjs=";
   };
 
diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix
index d056d10fe057..e6689439078e 100644
--- a/pkgs/development/python-modules/geodatasets/default.nix
+++ b/pkgs/development/python-modules/geodatasets/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geodatasets";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GJ7RyFlohlRz0RbQ80EewZUmIX9CJkSfUMY/uMNTtEM=";
   };
 
diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix
index 694a27dcfc11..2bd095e715ba 100644
--- a/pkgs/development/python-modules/geojson-client/default.nix
+++ b/pkgs/development/python-modules/geojson-client/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-geojson-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU=";
   };
 
diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
index eb070e8234a9..86680fc01f2e 100644
--- a/pkgs/development/python-modules/geojson/default.nix
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "geojson";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OL+7ntgzpA63ALQ8whhKRePsKxcp81PLuU1bHJvxN9U=";
   };
 
diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix
index 0172159ec6bd..e3d44a305334 100644
--- a/pkgs/development/python-modules/geomet/default.nix
+++ b/pkgs/development/python-modules/geomet/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geomet";
     repo = "geomet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YfI29925nffzRBMJb6Gm3muvlpwP3zSw2YJ2vWcf+Bo=";
   };
 
diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix
index 6abdda570d8b..891012810bf8 100644
--- a/pkgs/development/python-modules/geometric/default.nix
+++ b/pkgs/development/python-modules/geometric/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "leeping";
     repo = "geomeTRIC";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DmrKLVQrPQDzTMxqEImnvRr3Wb2R3+hxtDVCN9XUcFM=";
   };
 
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 4b8f06c50b08..6dbe76495fd8 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SZizjwkx8dsnaobDYpeQm9jeXZ4PlzYyjIScnQrH63Q=";
   };
 
diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix
index 2634edb0d856..8445794b392f 100644
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mlOXDEtYry1IUAZWrP2FuY/CGliUnCPYLULnLNN0n4Y=";
   };
 
diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix
index dfd4531c283d..1e3667d5562f 100644
--- a/pkgs/development/python-modules/georss-client/default.nix
+++ b/pkgs/development/python-modules/georss-client/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DvQifO/jirpacWZccK4WPxnm/iYs1qT5nAYQUDoleO4=";
   };
 
diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
index 133a68ba06e1..bacaacad9ff8 100644
--- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
+++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-ign-sismologia-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-geIxF4GumxRoetJ6mIZCzI3pAvWjJJoY66aQYd2Mzik=";
   };
 
diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
index 83f1e307cf26..18cffa618f73 100644
--- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
+++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-ingv-centro-nazionale-terremoti-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J72yd1D4mKCOsBRLMUXKnxmjr6g0IQApTTrWjklczN8=";
   };
 
diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
index bd356f044af4..c149aa4c7705 100644
--- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
+++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-qld-bushfire-alert-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/MyjYLu29PANe17KxJCkmHPjvjlPfswn7ZBAKFSwohc=";
   };
 
diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix
index 1954f4749566..7810c15024a5 100644
--- a/pkgs/development/python-modules/getmac/default.nix
+++ b/pkgs/development/python-modules/getmac/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GhostofGoes";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZbTCbbASs7+ChmgcDePXSbiHOst6/eCkq9SiKgYhFyM=";
   };
 
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix
index 3e9c51c7dcd1..d187eb57b4d9 100644
--- a/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geventhttpclient";
     repo = "geventhttpclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     # TODO: unvendor llhttp
     fetchSubmodules = true;
     hash = "sha256-uOGnwPbvTam14SFTUT0UrwxHfP4a5cn3a7EhLoGBUrA=";
diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix
index feb509d4d87e..94dba0ec01a6 100644
--- a/pkgs/development/python-modules/ghapi/default.nix
+++ b/pkgs/development/python-modules/ghapi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "ghapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ii19wuFAxMiGce37TNXRNSdvMcGWQjCfPukeqxySYnc=";
   };
 
diff --git a/pkgs/development/python-modules/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix
index e3532c3825a7..5ec838f59f26 100644
--- a/pkgs/development/python-modules/ghrepo-stats/default.nix
+++ b/pkgs/development/python-modules/ghrepo-stats/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mrbean-bremen";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Mr0FM2CbdgAUF8siMjUIZvypWiPNPU9OncPiBPqK3uE=";
   };
 
diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix
index 952056492c70..11f83067ee54 100644
--- a/pkgs/development/python-modules/gios/default.nix
+++ b/pkgs/development/python-modules/gios/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "gios";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI=";
   };
 
diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index aed16c67ce01..6e102fc365f6 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jgehrcke";
     repo = "gipc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y=";
   };
 
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index e84c2321aaee..cd1dc62261f9 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alpernebbi";
     repo = "git-annex-adapter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vb0vxnwAs0/yOjpyyoGWvX6Tu+cuziGNdnXbdzXexhg=";
   };
 
diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix
index 2db2f54c9094..200940c9ad9b 100644
--- a/pkgs/development/python-modules/gitignore-parser/default.nix
+++ b/pkgs/development/python-modules/gitignore-parser/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mherrmann";
     repo = "gitignore_parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y8A8OLgJccYWvKTJs7um8RwFFM0CswbwRojknBmk3TY=";
   };
 
diff --git a/pkgs/development/python-modules/gitlike-commands/default.nix b/pkgs/development/python-modules/gitlike-commands/default.nix
index 1f1b7dbe3bf2..256a2a7294c1 100644
--- a/pkgs/development/python-modules/gitlike-commands/default.nix
+++ b/pkgs/development/python-modules/gitlike-commands/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "gitlike-commands";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z0l8nCKov1iMJvI3YTHvg0ey+oPju3rgaKtmk6OX44g=";
   };
 
diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index 8b6e93e2fe80..cd9684207f1f 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gitpython-developers";
     repo = "GitPython";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HO6t5cOHyDJVz+Bma4Lkn503ZfDmiQxUfSLaSZtUrTk=";
   };
 
diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index a9f103b417ed..3a87359836e7 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-glances-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VLsNMFFt+kMxNw/81OMX4Fg/xCbQloCURmV0OxvClq8=";
   };
 
diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix
index 900441f57bee..01a52597e302 100644
--- a/pkgs/development/python-modules/glcontext/default.nix
+++ b/pkgs/development/python-modules/glcontext/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moderngl";
     repo = "glcontext";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GC2sb6xQjg99xLcXSynLOOyyqNwCHZwZqrs9RZh99pY=";
   };
 
diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix
index d021271439d5..d5bab4785d13 100644
--- a/pkgs/development/python-modules/glfw/default.nix
+++ b/pkgs/development/python-modules/glfw/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FlorianRhiem";
     repo = "pyGLFW";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3jcj4YExEtK1ANKDQsq94/NKF6GXXTFTEsXO3Jpf1uQ=";
   };
 
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 7e1cc1c7f737..7de7ccc12cec 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "globus";
     repo = "globus-sdk-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0=";
   };
 
diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix
index 4f13f73214e7..ea4fe11a18f5 100644
--- a/pkgs/development/python-modules/glueviz/default.nix
+++ b/pkgs/development/python-modules/glueviz/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glue-viz";
     repo = "glue";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/awIgfKbDFKM2WFlfpo5f/Px/N1aMXkV9eSTXts0aGo=";
   };
 
diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix
index b9a37779603c..aa8571601709 100644
--- a/pkgs/development/python-modules/glymur/default.nix
+++ b/pkgs/development/python-modules/glymur/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quintusdias";
     repo = "glymur";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RzRZuSNvlUrB+J93a1ob7dDMacZB082JwVHQ9Fce2JA=";
   };
 
diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 3f142eb84be4..47c19dbb216d 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "glyphsLib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9b4nPiGyBsTplEhfmPdhjalV0fexYXerdRqUbOUXlh0=";
   };
 
diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index 713cb42faef8..a2755f507e5e 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aleaxit";
     repo = "gmpy";
-    rev = "refs/tags/gmpy2-${version}";
+    tag = "gmpy2-${version}";
     hash = "sha256-luLEDEY1cezhzZo4fXmM/MUg2YyAaz7n0HwSpbNayP8=";
   };
 
diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix
index 5f62571343b0..e6f51c8d7fdb 100644
--- a/pkgs/development/python-modules/go2rtc-client/default.nix
+++ b/pkgs/development/python-modules/go2rtc-client/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-go2rtc-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-t4ewL4YvxdeDBBKDYapvDUK/Mt6zQ/hhOpVtW3dlmSg=";
   };
 
diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix
index 575a7a0bc2d2..b61bb0326632 100644
--- a/pkgs/development/python-modules/gocardless-pro/default.nix
+++ b/pkgs/development/python-modules/gocardless-pro/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gocardless";
     repo = "gocardless-pro-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RHvGrBIDtjnLax2x7FPu0S5vizUW7dQMaQsyGPXqEh4=";
   };
 
diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
index 2bc0b940952a..ee53c0dd7a61 100644
--- a/pkgs/development/python-modules/goodwe/default.nix
+++ b/pkgs/development/python-modules/goodwe/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marcelblijleven";
     repo = "goodwe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EsMv4hzGsAV9OTFo2b/omM4hx7XxUcdO6rrMzQ3DmNQ=";
   };
 
diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix
index c4dd1040ff64..c1760861771b 100644
--- a/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-crc32c";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uGW4gWIpTVQ+f52WBA9H+K3+sHNa4JdgO9qi1Ds7WEU=";
   };
 
diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix
index ce76f9794b03..cfb49bb8f3ce 100644
--- a/pkgs/development/python-modules/google-generativeai/default.nix
+++ b/pkgs/development/python-modules/google-generativeai/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "generative-ai-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XHYO2bH95Naoha2ZLpkP0YCq60qqiQPz+YzU6O4pInQ=";
   };
 
diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix
index 49d081c8efa6..f89e044783cb 100644
--- a/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/pkgs/development/python-modules/google-i18n-address/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mirumee";
     repo = "google-i18n-address";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7RqS/+6zInlhWydJwp4xf2uGpfmSdiSwvJugpL8Mlpk=";
   };
 
diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index 003049ab525a..1291a7d24ad4 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "python-google-nest-sdm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fIypWohefKS4X/obiPHNF4QPuGBzitcvf7fXBpUZotY=";
   };
 
diff --git a/pkgs/development/python-modules/google-photos-library-api/default.nix b/pkgs/development/python-modules/google-photos-library-api/default.nix
index 49feac0a0be2..bc2965b3eeb1 100644
--- a/pkgs/development/python-modules/google-photos-library-api/default.nix
+++ b/pkgs/development/python-modules/google-photos-library-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "python-google-photos-library-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xSwUzVwC7RPpmC9M1x/WYIaoiUlcF2h2fwiP6FYA6sw=";
   };
 
diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix
index c4396a52ae30..e9967d69813c 100644
--- a/pkgs/development/python-modules/googlemaps/default.nix
+++ b/pkgs/development/python-modules/googlemaps/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlemaps";
     repo = "google-maps-services-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8oGZEMKUGaDHKq4qIZy10cbLNMmVclJnQE/dx877pNQ=";
   };
 
diff --git a/pkgs/development/python-modules/gophish/default.nix b/pkgs/development/python-modules/gophish/default.nix
index 316244a5fa38..42d01e5a02b5 100644
--- a/pkgs/development/python-modules/gophish/default.nix
+++ b/pkgs/development/python-modules/gophish/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gophish";
     repo = "api-client-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ITwwU/Xixyi9JSWbYf606HB7S5E4jiI0lEYcOdNg3mo=";
   };
 
diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix
index 269422d61f86..72fd107555ca 100644
--- a/pkgs/development/python-modules/gotailwind/default.nix
+++ b/pkgs/development/python-modules/gotailwind/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-gotailwind";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kNyqSyJ1ha+BumYX4ruWaN0akEvUEsRxPs7Fj7LDHOw=";
   };
 
diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index 49ceb0c1d124..4cfaa592a2f8 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "govee-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-w21paR1VTV/ZFnl9SKkJmFFDZMPgA3d7P6blceVvnVk=";
   };
 
diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix
index 3c9a3684c056..e8c5d0060c1f 100644
--- a/pkgs/development/python-modules/govee-local-api/default.nix
+++ b/pkgs/development/python-modules/govee-local-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Galorhallen";
     repo = "govee-local-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qBT0Xub+eL7rfF+lQWlheBJSahEKWjREGJQD6sHjTPk=";
   };
 
diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix
index f8314696f9fa..b92c286aa261 100644
--- a/pkgs/development/python-modules/gpiozero/default.nix
+++ b/pkgs/development/python-modules/gpiozero/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gpiozero";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ifdCFcMH6SrhKQK/TJJ5lJafSfAUzd6ZT5ANUzJGwxI=";
   };
 
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index 9303ef9d1450..9a726833c0a7 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matlink";
     repo = "gplaycli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uZBrIxnDSaJDOPcD7J4SCPr9nvecDDR9h+WnIjIP7IE=";
   };
 
diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix
index e12d999dd82c..1e58dac7200c 100644
--- a/pkgs/development/python-modules/gprof2dot/default.nix
+++ b/pkgs/development/python-modules/gprof2dot/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jrfonseca";
     repo = "gprof2dot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6TTshVbfYh/2Ss1uysGW0nxmNQdIiAhe4LldMS7hpCo=";
   };
 
diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix
index 78bd67682c4f..ad36b8dbc503 100644
--- a/pkgs/development/python-modules/gptcache/default.nix
+++ b/pkgs/development/python-modules/gptcache/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zilliztech";
     repo = "GPTCache";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FRqngDyGO0ReTRtm9617TFLHVXWY9/NQlZHlBP8ukg0=";
   };
 
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index";
     mainProgram = "gptcache_server";
     homepage = "https://github.com/zilliztech/GPTCache";
-    changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix
index 32a61a655093..f8c8f1111160 100644
--- a/pkgs/development/python-modules/gpuctypes/default.nix
+++ b/pkgs/development/python-modules/gpuctypes/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "gpuctypes";
     owner = "tinygrad";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xUMvMBK1UhZaMZfik0Ia6+siyZGpCkBV+LTnQvzt/rw=";
   };
 
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 9bca05da8e5a..b08291c3c878 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SheffieldML";
     repo = "GPy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kggXePDKJcgw8qwLIBTxbwhiLw2H4dkx7082FguKP0Y=";
   };
 
diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix
index 4cdf9ccfb4e4..fd81ffcf897b 100644
--- a/pkgs/development/python-modules/gpytorch/default.nix
+++ b/pkgs/development/python-modules/gpytorch/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cornellius-gp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jdEJdUFIyM7TTKUHY8epjyZCGolH8nrr7FCyfw+x56s=";
   };
 
diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix
index f6067dab3b6d..7f623a65ef6c 100644
--- a/pkgs/development/python-modules/gql/default.nix
+++ b/pkgs/development/python-modules/gql/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = "gql";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jm0X+X8gQyQYn03gT14bdr79+Wd5KL9ryvrU/0VUtEU=";
   };
 
diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix
index b384b85e0f22..5fb7241d6431 100644
--- a/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/pkgs/development/python-modules/gradient-utils/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Paperspace";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-swnl0phdOsBSP8AX/OySI/aYI9z60Ss3SsJox/mb9KY=";
   };
 
diff --git a/pkgs/development/python-modules/grafanalib/default.nix b/pkgs/development/python-modules/grafanalib/default.nix
index 4e03786a7147..ba4a78746689 100644
--- a/pkgs/development/python-modules/grafanalib/default.nix
+++ b/pkgs/development/python-modules/grafanalib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vXnyAfC9avKz8U4+MJVnu2zoPD0nR2qarWYidhEPW5s=";
   };
 
diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix
index 2ebc4dbfe9a2..804b3d4a703d 100644
--- a/pkgs/development/python-modules/graphene-django/default.nix
+++ b/pkgs/development/python-modules/graphene-django/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-12ue7Pq7TFMSBAfaj8Si6KrpuKYp5T2EEesJpc8wRho=";
   };
 
diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index db44239de0b5..a7cf197828c2 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = "graphene";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DGxicCXZp9kW/OFkr0lAWaQ+GaECx+HD8+X4aW63vgQ=";
   };
 
diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index 1b8fa37aa5e7..03463b006e6d 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphql-python";
     repo = "graphql-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xZOiQOFWnImDXuvHP9V6BDjIZwlwHSxN/os+UYV4A0M=";
   };
 
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "graphql" ];
 
   meta = with lib; {
-    changelog = "https://github.com/graphql-python/graphql-core/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/graphql-python/graphql-core/releases/tag/v${version}";
     description = "Port of graphql-js to Python";
     homepage = "https://github.com/graphql-python/graphql-core";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix
index a0307dfa8032..cf10cb27b841 100644
--- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix
+++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "PyGraphqlWebsocketManager";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6/REvY5QxsAPV41Pvg8vrJPYbDrGUrpOPn0vzIcCu0k=";
   };
 
diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix
index 5b3f70dcc1f3..b856608ded61 100644
--- a/pkgs/development/python-modules/graphtage/default.nix
+++ b/pkgs/development/python-modules/graphtage/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "graphtage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Bz2T8tVdVOdXt23yPITkDNL46Y5LZPhY3SXZ5bF3CHw=";
   };
 
diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix
index 7ce60f9f06ff..99a78b6d7661 100644
--- a/pkgs/development/python-modules/graphviz/default.nix
+++ b/pkgs/development/python-modules/graphviz/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xflr6";
     repo = "graphviz";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IqjqcBEL4BK/VfRjdxJ9t/DkG8OMAoXJxbW5JXpALuw=";
   };
 
diff --git a/pkgs/development/python-modules/graspologic-native/default.nix b/pkgs/development/python-modules/graspologic-native/default.nix
index 3f014562f40a..c0928551c287 100644
--- a/pkgs/development/python-modules/graspologic-native/default.nix
+++ b/pkgs/development/python-modules/graspologic-native/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graspologic-org";
     repo = "graspologic-native";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fgiBUzYBerYX59uj+I0Yret94vA+FpQK+MckskCBqj4=";
   };
 
diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix
index c25ce9206f18..59bd3770c654 100644
--- a/pkgs/development/python-modules/great-expectations/default.nix
+++ b/pkgs/development/python-modules/great-expectations/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "great-expectations";
     repo = "great_expectations";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TV07vmc0XdP6ICv7Kws79zACCsahZ6FlhplJHbpDFNk=";
   };
 
diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix
index ec2a4dac5028..c3541efdd435 100644
--- a/pkgs/development/python-modules/great-tables/default.nix
+++ b/pkgs/development/python-modules/great-tables/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "great-tables";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+n8s8cmsQizEUuRGzFrOxhWL0C9OQO506msiHD58jGQ=";
   };
 
diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix
index 50aa51e82e92..5679c3145d46 100644
--- a/pkgs/development/python-modules/greeclimate/default.nix
+++ b/pkgs/development/python-modules/greeclimate/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cmroche";
     repo = "greeclimate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SO7/uheAPVFZ1C2qrzP7jB88u6EH79f1+qMZIgHZaCE=";
   };
 
diff --git a/pkgs/development/python-modules/greeneye-monitor/default.nix b/pkgs/development/python-modules/greeneye-monitor/default.nix
index 77c65d207030..4c50379952c1 100644
--- a/pkgs/development/python-modules/greeneye-monitor/default.nix
+++ b/pkgs/development/python-modules/greeneye-monitor/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jkeljo";
     repo = "greeneye-monitor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7EDuQ+wECcTzxkEufMpg3WSzosWeiwfxcVIVtQi+0BI=";
   };
 
diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix
index 78b823296725..dce3effc7cb1 100644
--- a/pkgs/development/python-modules/gremlinpython/default.nix
+++ b/pkgs/development/python-modules/gremlinpython/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "tinkerpop";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Yc0l3kE+6dM9v4QUZPFpm/yjDCrqVO35Vy5srEjAExE=";
   };
 
diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix
index eb3e4f3c1178..716e0fc1b498 100644
--- a/pkgs/development/python-modules/greynoise/default.nix
+++ b/pkgs/development/python-modules/greynoise/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GreyNoise-Intelligence";
     repo = "pygreynoise";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-17NieDQ57qVT2i4S26vLS9N6zALZ+eTtCCcBbhQ8fhQ=";
   };
 
diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix
index 8b8be88367d8..6763a42291a6 100644
--- a/pkgs/development/python-modules/gridnet/default.nix
+++ b/pkgs/development/python-modules/gridnet/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-gridnet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HVBUAasK7lFsj/tT0j70x/2w4RJtnHWfX/1XbfKKLf8=";
   };
 
diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 8828f79a8c04..7e11da049211 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "groq";
     repo = "groq-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EkEXXHca4DJtY1joM1E4IXzaQzJL+QC+aYaTe46EWlE=";
   };
 
diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix
index ad142b6c6cae..2a6f25d3d972 100644
--- a/pkgs/development/python-modules/growattserver/default.nix
+++ b/pkgs/development/python-modules/growattserver/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "indykoning";
     repo = "PyPi_GrowattServer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P7HZPmDUQM3DuaGSkAHc0jQBGeurS+KgtdwT7ZJ/8q8=";
   };
 
diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
index 0f0062f4a344..baf0ca566747 100644
--- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
+++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-grpc-google-iam-v1";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FLDx2zbM0qqLa+k/7xexyv5/YHlSOdikrbU2eYbxDM0=";
   };
 
diff --git a/pkgs/development/python-modules/grpc-interceptor/default.nix b/pkgs/development/python-modules/grpc-interceptor/default.nix
index 8c54fd33fdb6..59863d735d78 100644
--- a/pkgs/development/python-modules/grpc-interceptor/default.nix
+++ b/pkgs/development/python-modules/grpc-interceptor/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "d5h-foss";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GJkVCslPXShJNDrqhFtCsAK5+VaG8qFJo0RQTsiMIFY=";
   };
 
diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index d88500f6a296..c9553e5c81b1 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vmagamedov";
     repo = "grpclib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5221hVjD0TynCsTdruiUZkTsb7uOi49tZ8M/YqdWreE=";
   };
 
diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix
index e5ad36e1b19b..ce857f574982 100644
--- a/pkgs/development/python-modules/gruut/default.nix
+++ b/pkgs/development/python-modules/gruut/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "gruut";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iwde6elsAbICZ+Rc7CPgcZTOux1hweVZc/gf4K+hP9M=";
   };
 
diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index daaca34ca082..d1ab25b7fb07 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "glotzerlab";
     repo = "gsd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sBO5tt85BVLUrqSVWUT/tYzeLWyvyyI9ZXjNLt9/uAE=";
   };
 
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index b6c427894587..5c74d8f94730 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "burnash";
     repo = "gspread";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw=";
   };
 
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 525cfa3208a6..56744993471d 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pythongssapi";
     repo = "python-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H1JfdvxJvX5dmC9aTqIOkjAqFEL44KoUXEhoYj2uRY8=";
   };
 
diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix
index 136c79b2d67e..6c0f24eb2385 100644
--- a/pkgs/development/python-modules/gstools/default.nix
+++ b/pkgs/development/python-modules/gstools/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GeoStat-Framework";
     repo = "GSTools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QpdOARzcSRVFl/DbnE2JLBFZmTSh/fBOmzweuf+zfEs=";
   };
 
diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix
index 1ad9a8fbc4c6..6664570ef150 100644
--- a/pkgs/development/python-modules/gto/default.nix
+++ b/pkgs/development/python-modules/gto/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "gto";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8ht22RqiGWqDoBrZnX5p3KKOLVPRm1a54962qKlTK4Q=";
   };
 
diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
index 74e24d1c8470..36b3f6835d75 100644
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pndurette";
     repo = "gTTS";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ryTR7cESDO9pH5r2FBz+6JuNMEQr39hil/FSklgaIGg=";
   };
 
diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix
index cb153aab3b64..676e2f3a5299 100644
--- a/pkgs/development/python-modules/guidance/default.nix
+++ b/pkgs/development/python-modules/guidance/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "guidance";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dPakdT97cuLv4OwdaUFncopD5X6uXGyUjwzqn9fxnhU=";
   };
 
@@ -100,7 +100,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Guidance language for controlling large language models";
     homepage = "https://github.com/guidance-ai/guidance";
-    changelog = "https://github.com/guidance-ai/guidance/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/guidance-ai/guidance/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index 3026e968846f..b5fbea838afa 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "guidata";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qao10NyqFLysx/9AvORX+EIrQlnQJQhSYkVHeTwIutQ=";
   };
 
diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index d6130ef31287..eaa37aafa6bf 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benoitc";
     repo = "gunicorn";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Dq/mrQwo3II6DBvYfD1FHsKHaIlyHlJCZ+ZyrM4Efe0=";
   };
 
diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix
index 2609a0bf8eab..e5df11502afd 100644
--- a/pkgs/development/python-modules/guppy3/default.nix
+++ b/pkgs/development/python-modules/guppy3/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zhuyifei1999";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HHy57P6WEHZKygAbdjEh6XAApFlQueiYGr02eSQMWfc=";
   };
 
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index a9502d39ee53..e344f1af9c03 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "gvm-tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0YIWfeHd0Z50xschRHrVijhKQdDxvwR+gowEuAIc+OU=";
   };
 
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index fa8394411a95..69165286ba00 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openai";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uJgm8l1SxIRC5PV6BIH/ht/1ucGT5UaUhkFMdusejgA=";
   };
 
diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix
index b730ef5c5a9d..28037b9a6e66 100644
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "gymnasium";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qchuz08yJ0giVrtKLC9vBgr28JrHQyAOCuoS239ivVw=";
   };
 
diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index 828bcc1b1ea9..b7063384d0b1 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uber";
     repo = "h3-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wXQaSMXQI0f7zfyj37mubxdqGFv7vhHQd6rH08H57d4=";
   };
 
diff --git a/pkgs/development/python-modules/h5io/default.nix b/pkgs/development/python-modules/h5io/default.nix
index f41e815a6f21..5d27c615d4f4 100644
--- a/pkgs/development/python-modules/h5io/default.nix
+++ b/pkgs/development/python-modules/h5io/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "h5io";
     repo = "h5io";
-    rev = "refs/tags/h5io-${version}";
+    tag = "h5io-${version}";
     hash = "sha256-3mrHIkfaXq06mMzUwudRO81DWTk0TO/e15IQA5fxxNc=";
   };
 
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Read and write simple Python objects using HDF5";
     homepage = "https://github.com/h5io/h5io";
-    changelog = "https://github.com/h5io/h5io/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/h5io/h5io/releases/tag/h5io-${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ mbalatsko ];
   };
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index c765c22428ff..fcd92317adcb 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "ha-ffmpeg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU=";
   };
 
diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix
index c9e535b3fae9..454481ebfae8 100644
--- a/pkgs/development/python-modules/ha-philipsjs/default.nix
+++ b/pkgs/development/python-modules/ha-philipsjs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danielperna84";
     repo = "ha-philipsjs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CQfT+jCICHjnldM7sjJN47dTD4WVkxfXmW5g80mnoTU=";
   };
 
diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix
index c08ffcd12132..0de8a80f978e 100644
--- a/pkgs/development/python-modules/habanero/default.nix
+++ b/pkgs/development/python-modules/habanero/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sckott";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4=";
   };
 
diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix
index 44548561b349..4362bffcf575 100644
--- a/pkgs/development/python-modules/habitipy/default.nix
+++ b/pkgs/development/python-modules/habitipy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ASMfreaK";
     repo = "habitipy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AEeTCrxLXkokRRnNUfW4y23Qdh8ek1F88GmCPLGb84A=";
   };
 
diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix
index fb5757ae114f..50e6aef3fb94 100644
--- a/pkgs/development/python-modules/habluetooth/default.nix
+++ b/pkgs/development/python-modules/habluetooth/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "habluetooth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M=";
   };
 
diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix
index e6c3b64f8e62..ff83aaa546e6 100644
--- a/pkgs/development/python-modules/hachoir/default.nix
+++ b/pkgs/development/python-modules/hachoir/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vstinner";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8=";
   };
 
diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix
index 6aab63e498fa..6176641ed96e 100644
--- a/pkgs/development/python-modules/hakuin/default.nix
+++ b/pkgs/development/python-modules/hakuin/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pruzko";
     repo = "hakuin";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-l5YnGRPUZUQqOaRvQd4l4eowWGpuPBignjkDDT9q7fg=";
   };
 
diff --git a/pkgs/development/python-modules/halohome/default.nix b/pkgs/development/python-modules/halohome/default.nix
index 1308fe4658d4..967b0b08a39f 100644
--- a/pkgs/development/python-modules/halohome/default.nix
+++ b/pkgs/development/python-modules/halohome/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nayaverdier";
     repo = "halohome";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JOQ2q5lbdVTerXPt6QHBiTG9PzN9LiuLcN+XnOoyYjA=";
   };
 
diff --git a/pkgs/development/python-modules/hankel/default.nix b/pkgs/development/python-modules/hankel/default.nix
index ae04ed26f3c9..fce947a64141 100644
--- a/pkgs/development/python-modules/hankel/default.nix
+++ b/pkgs/development/python-modules/hankel/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "steven-murray";
     repo = "hankel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/5PvbH8zz2siLS1YJYRSrl/Cpi0WToBu1TJhlek8VEE=";
   };
 
diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix
index 533a6d040a8b..dec814e0d632 100644
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ikalchev";
     repo = "HAP-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA=";
   };
 
diff --git a/pkgs/development/python-modules/hass-client/default.nix b/pkgs/development/python-modules/hass-client/default.nix
index b11a877583f2..d5e0f34fdef0 100644
--- a/pkgs/development/python-modules/hass-client/default.nix
+++ b/pkgs/development/python-modules/hass-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "python-hass-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FA3acaXLWcBMDsabLPxVk6EArSxcTAnmFeO1ixTXB1Q=";
   };
 
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index cda1aa486143..715a08c9f028 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = "hass-nabucasa";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ySo0G/Zh+KQMocMxrvUua704gt2tWQMlArqxBS/C9hs=";
   };
 
diff --git a/pkgs/development/python-modules/hass-splunk/default.nix b/pkgs/development/python-modules/hass-splunk/default.nix
index b5183c52b145..a336bac3a42a 100644
--- a/pkgs/development/python-modules/hass-splunk/default.nix
+++ b/pkgs/development/python-modules/hass-splunk/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bre77";
     repo = "hass_splunk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bgF6gHAA57MiWdmpwilGa+l05/ETKdpyi2naVagkRlc=";
   };
 
diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix
index 8b7c477c8494..50adb88f9156 100644
--- a/pkgs/development/python-modules/hatasmota/default.nix
+++ b/pkgs/development/python-modules/hatasmota/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emontnemery";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-m40ZK1+cfWgrwWftFqExUZidCrbDMC1Sfshugqrp5QM=";
   };
 
diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix
index 2c0a724d939b..376f3f1390a2 100644
--- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix
+++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "agoose77";
     repo = "hatch-nodejs-version";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hknlb11DCe+b55CfF3Pr62ccWPxVrjQ197ZagSiH/zU=";
   };
 
diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix
index eebb52bee81b..6e4d0c500b45 100644
--- a/pkgs/development/python-modules/hatch-odoo/default.nix
+++ b/pkgs/development/python-modules/hatch-odoo/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "acsone";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-I3jaiG0Xu8B34q30p7zTs+FeBXUQiPKTAJLSVxE9gYE=";
   };
 
diff --git a/pkgs/development/python-modules/hatch-regex-commit/default.nix b/pkgs/development/python-modules/hatch-regex-commit/default.nix
index 5c8afe46301c..451455b6d4c2 100644
--- a/pkgs/development/python-modules/hatch-regex-commit/default.nix
+++ b/pkgs/development/python-modules/hatch-regex-commit/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frankie567";
     repo = "hatch-regex-commit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-E0DIBBaDmTCsZQ41NcjcbzgJ16BwhdexlrGWBdf77oA=";
   };
 
diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix
index 3d4c69fec005..e324c50c82bd 100644
--- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix
+++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "repo-helper";
     repo = "hatch-requirements-txt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Kd3rDfTBn/t/NiSJMPkHRWD5solUF7MAN8EiZokxHrk=";
   };
 
diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix
index a406988c52f1..dbfc2346df2e 100644
--- a/pkgs/development/python-modules/haversine/default.nix
+++ b/pkgs/development/python-modules/haversine/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mapado";
     repo = "haversine";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KqcDDQdAOnrmiq+kf8rLHy85rNnhatZTOzCCU91lOrU=";
   };
 
diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix
index ae7933207c3c..757ee10a22f5 100644
--- a/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "hawkauthlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UW++gLQX1U4jFwccL+O5wl2r/d2OZ5Ug0wcnSfqtIVc=";
   };
 
diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix
index f1ac68d9374a..0df6d95efcd0 100644
--- a/pkgs/development/python-modules/haystack-ai/default.nix
+++ b/pkgs/development/python-modules/haystack-ai/default.nix
@@ -97,7 +97,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepset-ai";
     repo = "haystack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9lhAiM9uqa6CLb8A59mPVffA1Bnfs4A37/+kKA94cCQ=";
   };
 
@@ -262,7 +262,7 @@ buildPythonPackage rec {
     longDescription = ''
       LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots
     '';
-    changelog = "https://github.com/deepset-ai/haystack/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/deepset-ai/haystack/releases/tag/v${version}";
     homepage = "https://github.com/deepset-ai/haystack";
     license = licenses.asl20;
     maintainers = with maintainers; [ happysalada ];
diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix
index ae3cd23b3426..689f0c586686 100644
--- a/pkgs/development/python-modules/hdate/default.nix
+++ b/pkgs/development/python-modules/hdate/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-libhdate";
     repo = "py-libhdate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Il20aKOPQi4J4hWQEMEQOnLdBSHCOu214YE6pxeYbfI=";
   };
 
diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix
index 5e139ab76cce..a5d53bd09420 100644
--- a/pkgs/development/python-modules/hdf5plugin/default.nix
+++ b/pkgs/development/python-modules/hdf5plugin/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "silx-kit";
     repo = "hdf5plugin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6lEU8ZGJKazDqloel5QcaXAbNGzV1fAbAjYC/hFUOdI=";
   };
 
diff --git a/pkgs/development/python-modules/hdfs/default.nix b/pkgs/development/python-modules/hdfs/default.nix
index c887d8717890..bc114e568571 100644
--- a/pkgs/development/python-modules/hdfs/default.nix
+++ b/pkgs/development/python-modules/hdfs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mtth";
     repo = "hdfs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Pm2E8hB0wbu7npi/sLt9D8jQsH69qNOHLji9CYqST/8=";
   };
 
diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix
index d0322c1a1acb..9407b48e0700 100644
--- a/pkgs/development/python-modules/headerparser/default.nix
+++ b/pkgs/development/python-modules/headerparser/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jwodder";
     repo = "headerparser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fn9Nlazte6r5JMmp9ynq0qmkLEoJGv8witgZlD7zJNM=";
   };
 
diff --git a/pkgs/development/python-modules/heatmiserv3/default.nix b/pkgs/development/python-modules/heatmiserv3/default.nix
index 5d7ed86f225b..ee926a0bebbc 100644
--- a/pkgs/development/python-modules/heatmiserv3/default.nix
+++ b/pkgs/development/python-modules/heatmiserv3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andylockran";
     repo = "heatmiserV3";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ia0QUMDvuvn2af52lW7ObSQ9MSPNOgWyBuFBnqfYrpM=";
   };
 
diff --git a/pkgs/development/python-modules/heatshrink2/default.nix b/pkgs/development/python-modules/heatshrink2/default.nix
index 24182bc73bd3..02ffbeb7183a 100644
--- a/pkgs/development/python-modules/heatshrink2/default.nix
+++ b/pkgs/development/python-modules/heatshrink2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eerimoq";
     repo = "pyheatshrink";
-    rev = "refs/tags/${version}";
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-gspMd3Fyxe2/GhZYdKjVcZXRlslay3jO4jZuVG79G44=";
   };
diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix
index a8fdd8a0de70..b734951c15c0 100644
--- a/pkgs/development/python-modules/heatzypy/default.nix
+++ b/pkgs/development/python-modules/heatzypy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Cyr-ius";
     repo = "heatzypy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+iT3lE54xt7usz9v9JZqwQa0Xf1eLlN5VuQrjzmWo6Y=";
   };
 
diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix
index f934de881cbe..5cd34b16a855 100644
--- a/pkgs/development/python-modules/herepy/default.nix
+++ b/pkgs/development/python-modules/herepy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "abdullahselek";
     repo = "HerePy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8DwzzC0sTrGnMpuADc55HCIeH/KyWacv8X+Ubh+n7ZM=";
   };
 
diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix
index 5d0845c9725b..0e36d028b6fa 100644
--- a/pkgs/development/python-modules/hexbytes/default.nix
+++ b/pkgs/development/python-modules/hexbytes/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "hexbytes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8st1nQiGApt+aNl8/cftYk0ZzA+MxbLyGi53UWUlAjM=";
   };
 
diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix
index 8007552ef405..e448bf020085 100644
--- a/pkgs/development/python-modules/hf-transfer/default.nix
+++ b/pkgs/development/python-modules/hf-transfer/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "hf_transfer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Uh8q14OeN0fYsywYyNrH8C3wq/qRjQKEAIufi/a5RXA=";
   };
 
diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix
index 646ba22abda5..40320035f53e 100644
--- a/pkgs/development/python-modules/highdicom/default.nix
+++ b/pkgs/development/python-modules/highdicom/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MGHComputationalPathology";
     repo = "highdicom";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KHSJWEnm8u0xHkeeLF/U7MY4FfiWb6Q0GQQy2w1mnKw=";
   };
 
diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix
index 7b8b39994cc9..1528576f4a65 100644
--- a/pkgs/development/python-modules/hikari-crescent/default.nix
+++ b/pkgs/development/python-modules/hikari-crescent/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hikari-crescent";
     repo = "hikari-crescent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0eDPdN+3lalgHiBNXuZUEJllAKFxdKK6paTFNHU5jIM=";
   };
 
diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix
index 9b3cb4002750..f9af95b70147 100644
--- a/pkgs/development/python-modules/hikari-lightbulb/default.nix
+++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tandemdude";
     repo = "hikari-lightbulb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sxBrOgMgUcPjqtNuuq5+NfyxR5V812dfHnGoO9DhdXU=";
   };
 
diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix
index 915c77e1e156..882652fd6ac7 100644
--- a/pkgs/development/python-modules/hikari/default.nix
+++ b/pkgs/development/python-modules/hikari/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hikari-py";
     repo = "hikari";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/A3D3nG1lSCQU92dM+6YroxWlGKrv47ntkZaJZTAJUA=";
     # The git commit is part of the `hikari.__git_sha1__` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
diff --git a/pkgs/development/python-modules/hikvision/default.nix b/pkgs/development/python-modules/hikvision/default.nix
index 354edc5d7798..da15a3523899 100644
--- a/pkgs/development/python-modules/hikvision/default.nix
+++ b/pkgs/development/python-modules/hikvision/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fbradyirl";
     repo = "hikvision";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tiJUqr5WtRvnKll1OymJ9Uva1tUT5so4Zzc4SHLcH9A=";
   };
 
diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index 4125f1c19817..9056129a4103 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-PnCSf7ZEPNtweQEnWTHCCVCvg5QGxGeBSAZCFHOziDQ=";
   };
diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix
index a2e079169e1e..bda79ee5f34d 100644
--- a/pkgs/development/python-modules/hishel/default.nix
+++ b/pkgs/development/python-modules/hishel/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "karpetrosyan";
     repo = "hishel";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V8QiBnOz5l/vjTFf9gKjxth4YsGCYuADlbwiWc7VFds=";
   };
 
diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix
index e65e8e87f4eb..20a2ea207a36 100644
--- a/pkgs/development/python-modules/hiyapyco/default.nix
+++ b/pkgs/development/python-modules/hiyapyco/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zerwes";
     repo = pname;
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-uF5DblAg4q8L1tZKopcjJ14NIQVQF5flNHdZ/jnw71M=";
   };
 
diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix
index a5caa19be358..c997be940b04 100644
--- a/pkgs/development/python-modules/hjson/default.nix
+++ b/pkgs/development/python-modules/hjson/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hjson";
     repo = "hjson-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VrCLHfXShF45IEhGVQpryBzjxreQEunyghazDNKRh8k=";
   };
 
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 5aac7d79b2fe..110efb4f5f4a 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XA6XvxWHttt+ic5027Q/3VGqrFYznYCiExSFBHU7qcY=";
   };
 
diff --git a/pkgs/development/python-modules/hologram/default.nix b/pkgs/development/python-modules/hologram/default.nix
index bedeb1f17dfb..c78b85deeb4e 100644
--- a/pkgs/development/python-modules/hologram/default.nix
+++ b/pkgs/development/python-modules/hologram/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc=";
   };
 
diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
index c289b781a598..881ffeec97a6 100644
--- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
+++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "home-assistant-bluetooth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+2bw4im09TyjJ5/7ct42ZCFwU7yKWQnbSo7b+44VtpE=";
   };
 
diff --git a/pkgs/development/python-modules/homf/default.nix b/pkgs/development/python-modules/homf/default.nix
index cd58234c2349..c5289c6d1359 100644
--- a/pkgs/development/python-modules/homf/default.nix
+++ b/pkgs/development/python-modules/homf/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "duckinator";
     repo = "homf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fDH6uJ2d/Jsnuudv+Qlv1tr3slxOJWh7b4smGS32n9A=";
   };
 
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index 4a716b8b037b..abc35782cbc7 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gleitz";
     repo = "howdoi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0=";
   };
 
diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix
index 1ab5e163a0bc..3e51d6e57573 100644
--- a/pkgs/development/python-modules/hpccm/default.nix
+++ b/pkgs/development/python-modules/hpccm/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "hpc-container-maker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uB2+1Nc+SgPzB5hJI1L6yD8gn0hGOkIZF6rejq4rYg8=";
   };
 
diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index b1364c887bc5..6d4111eb616d 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = "hstspreload";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2KtQZroKhRzqFg0xL/gXMA3jP0FgYSPYy1eP3x78rQo=";
   };
 
diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix
index 5a3ff0947db8..aec0c2039155 100644
--- a/pkgs/development/python-modules/html-sanitizer/default.nix
+++ b/pkgs/development/python-modules/html-sanitizer/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthiask";
     repo = "html-sanitizer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6OWFLsuefeDzQ1uHnLmboKDgrbY/xJCwqsSQlDaJlRs=";
   };
 
diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix
index 43d7ca228bb0..041614c8a439 100644
--- a/pkgs/development/python-modules/html-text/default.nix
+++ b/pkgs/development/python-modules/html-text/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zytedata";
     repo = "html-text";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U=";
   };
 
diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix
index bcf78da3db8f..4e5d1d50dbd6 100644
--- a/pkgs/development/python-modules/html2image/default.nix
+++ b/pkgs/development/python-modules/html2image/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vgalin";
     repo = "html2image";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k5y89nUF+fhUj9uzTAPkkAdOb2TsTL2jm/ZXwHlxu/A=";
   };
 
diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix
index b114029aadac..656370931ca4 100644
--- a/pkgs/development/python-modules/html2text/default.nix
+++ b/pkgs/development/python-modules/html2text/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Alir3z4";
     repo = "html2text";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I=";
   };
 
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index 2a3e0dfb42c3..81fb7a5199a0 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0Qn+To/d3+HMx+KhhgJBEHVYPOfIeBnngBraY7r4uSs=";
   };
 
diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix
index ca648b7790d7..a8cf00e51e60 100644
--- a/pkgs/development/python-modules/htmldate/default.nix
+++ b/pkgs/development/python-modules/htmldate/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adbar";
     repo = "htmldate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VjOqttpbHp1wQARyHieAZie/yO74+S2mDbBXx00PKWM=";
   };
 
diff --git a/pkgs/development/python-modules/htmltools/default.nix b/pkgs/development/python-modules/htmltools/default.nix
index a5bcf561cab0..1c02802b7b52 100644
--- a/pkgs/development/python-modules/htmltools/default.nix
+++ b/pkgs/development/python-modules/htmltools/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "py-htmltools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ugtDYs5YaVo7Yy9EodyRrypHQUjmOIPpsyhwNnZkiko=";
   };
 
diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix
index 7e53465939f2..ba4151fb9f52 100644
--- a/pkgs/development/python-modules/http-parser/default.nix
+++ b/pkgs/development/python-modules/http-parser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benoitc";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU=";
   };
 
diff --git a/pkgs/development/python-modules/http-sf/default.nix b/pkgs/development/python-modules/http-sf/default.nix
index d5695b9699f5..235d75bb8b0f 100644
--- a/pkgs/development/python-modules/http-sf/default.nix
+++ b/pkgs/development/python-modules/http-sf/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mnot";
     repo = "http-sf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p2GTCvuRhQVchFiLzoDYop9TUz/DT7eVY6Zioh+/rE8=";
   };
 
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 9883280006ed..1fcae4c32c18 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "httpcore";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sF/ymIoEnqWRX9b8knojIw+ySci/obXSttaNJLb+/nE=";
   };
 
diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index 3f6acefbe5b7..c91cf8d08ce9 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "httpie";
     repo = "httpie";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uZKkUUrPPnLHPHL8YrZgfsyCsSOR0oZ2eFytiV0PIUY=";
   };
 
diff --git a/pkgs/development/python-modules/httpx-auth/default.nix b/pkgs/development/python-modules/httpx-auth/default.nix
index b811a2c1c082..bcb5677218e2 100644
--- a/pkgs/development/python-modules/httpx-auth/default.nix
+++ b/pkgs/development/python-modules/httpx-auth/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Colin-b";
     repo = "httpx_auth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7azPyep+R55CdRwbdo20y4YNV47c8CwXgOj4q4t25oc=";
   };
 
diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix
index 4d46ed9b4588..b1659cc92e6c 100644
--- a/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/pkgs/development/python-modules/httpx-socks/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "romis2012";
     repo = "httpx-socks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI=";
   };
 
diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix
index ff0a4069090b..313667f7d4a0 100644
--- a/pkgs/development/python-modules/httpx-sse/default.nix
+++ b/pkgs/development/python-modules/httpx-sse/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "florimondmanca";
     repo = "httpx-sse";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nU8vkmV/WynzQrSrq9+FQXtfAJPVLpMsRSuntU0HWrE=";
   };
 
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 8ce19e3c1e0a..e2dde7e6b9a1 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck=";
   };
 
diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix
index 232add95bf75..68448485f73a 100644
--- a/pkgs/development/python-modules/huawei-lte-api/default.nix
+++ b/pkgs/development/python-modules/huawei-lte-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Salamek";
     repo = "huawei-lte-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-L6xCX+NHASunB876N1R++xMOx55Z8zc77j5QwKqHsNY=";
   };
 
diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix
index 5b50ba6b2566..e4368a49d191 100644
--- a/pkgs/development/python-modules/huey/default.nix
+++ b/pkgs/development/python-modules/huey/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0X4gUIFqkE4GLW5Eqbolpk7KZdsvjkRxD20YmLPG11A=";
   };
 
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index e8fba82004d1..e516d11cac01 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-humanize";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C6u7t7RedInHJtN4yHli22Wc7llnrxn4YeKssyQ+hS4=";
   };
 
diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix
index d7bd6d32a6f6..096683c45f0b 100644
--- a/pkgs/development/python-modules/huum/default.nix
+++ b/pkgs/development/python-modules/huum/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frwickst";
     repo = "pyhuum";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IyPsRtVaxsI9Y0BpzKCSsc2oAqdGQI92UqxaRGpGmak=";
   };
 
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index 70f8b48fce92..d371ea85ee7c 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bitcoin-core";
     repo = "HWI";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sQqft+5M+X+91bFqpUrbDRrFzpe/l1+w+pnIHwqezR8=";
   };
 
diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix
index c49c8d6ca5e4..a8c25ff8ce33 100644
--- a/pkgs/development/python-modules/hy/default.nix
+++ b/pkgs/development/python-modules/hy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hylang";
     repo = "hy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-o6txdC8TOdaILAJP9LDAhJ587p+mw0bUEGLneQQYW9c=";
   };
 
diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix
index ea72eddf4749..0518e523d3d9 100644
--- a/pkgs/development/python-modules/hydra-core/default.nix
+++ b/pkgs/development/python-modules/hydra-core/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "hydra";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kD4BStnstr5hwyAOxdpPzLAJ9MZqU/CPiHkaD2HnUPI=";
   };
 
diff --git a/pkgs/development/python-modules/hydrogram/default.nix b/pkgs/development/python-modules/hydrogram/default.nix
index 86ba002ab61c..0e50d59eec39 100644
--- a/pkgs/development/python-modules/hydrogram/default.nix
+++ b/pkgs/development/python-modules/hydrogram/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hydrogram";
     repo = "hydrogram";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kKzXR8ared2+mHBABxtX+glJ3PMuxA1Pek3DuUkTT40=";
   };
 
diff --git a/pkgs/development/python-modules/hyperpyyaml/default.nix b/pkgs/development/python-modules/hyperpyyaml/default.nix
index 46c27720e74b..9fef53418e3f 100644
--- a/pkgs/development/python-modules/hyperpyyaml/default.nix
+++ b/pkgs/development/python-modules/hyperpyyaml/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "speechbrain";
     repo = "hyperpyyaml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eA4/wXmqlqomfRbJNi7dkBRoxneCbCbURSPvASF2sgA=";
   };
 
diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 338ad67b966a..16be8837bc55 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darvid";
     repo = "python-hyperscan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TNiGh89SnGi0WAqfYudsj7GaVhOifi8ZcmTrMtVbk+c=";
   };
 
diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix
index 5288be1c30a3..dee9a7124c34 100644
--- a/pkgs/development/python-modules/hyppo/default.nix
+++ b/pkgs/development/python-modules/hyppo/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neurodata";
     repo = "hyppo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bYxqYSOOifQE3gbw8vNk/A13D5TPx7ERSgFvRHMXKGM=";
   };
 
diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix
index 68b07d5c30ee..5cb46020ff4b 100644
--- a/pkgs/development/python-modules/hyrule/default.nix
+++ b/pkgs/development/python-modules/hyrule/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hylang";
     repo = "hyrule";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-w1Q2w/P1bDt/F1+zTkUFi5PxycXXE3p0qadfBcyWElg=";
   };
 
diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 2ad38a1ea4ac..62f6bf6a91b1 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "i-pi";
     repo = "i-pi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g=";
   };
 
diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix
index 732fe41c4efa..68f2f22ff245 100644
--- a/pkgs/development/python-modules/ibeacon-ble/default.nix
+++ b/pkgs/development/python-modules/ibeacon-ble/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "ibeacon-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1liSWxduYpjIMu7226EH4bsc7gca5g/fyL79W4ZMdU4=";
   };
 
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index b7a1c3ca33a8..2492811b8ce7 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -80,7 +80,7 @@ buildPythonPackage rec {
     name = "ibis-source";
     repo = "ibis";
     owner = "ibis-project";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6ebw/E3jZFMHKqC5ZY//2Ke0NrklyoGp5JGKBfDxy40=";
   };
 
diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 66d5f8f3fa2c..37b9fd69df5a 100644
--- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IBM";
     repo = "python-sdk-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gNEd79kOtDlFJg3Ji9kO6VGGsy/VGxd6GzC/cuen9M0=";
   };
 
diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix
index 74ce5e988452..f642aaff0277 100644
--- a/pkgs/development/python-modules/ibm-watson/default.nix
+++ b/pkgs/development/python-modules/ibm-watson/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "watson-developer-cloud";
     repo = "python-sdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r7A5i17KIy1pBrj01yeknfrOFjb5yZco8ZOc7tlFM7k=";
   };
 
diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index e021c6574a85..f065711d53d1 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "ical";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9mnyhDKcZTZAGRxojQN9I9ZAgBmsSSsBPzCMZO6Rl5k=";
   };
 
diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index 51dd8271dd1a..9344b51c76e4 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "collective";
     repo = "icalendar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P+cUwNFSBjyTzqdBnIricoM3rUWUXQc8k1912jil79Q=";
   };
 
diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix
index b5303060948c..32e4972e1add 100644
--- a/pkgs/development/python-modules/icalevents/default.nix
+++ b/pkgs/development/python-modules/icalevents/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "icalevents";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4=";
   };
 
diff --git a/pkgs/development/python-modules/iceportal/default.nix b/pkgs/development/python-modules/iceportal/default.nix
index 0ec332e10dfd..cc5c82f0e647 100644
--- a/pkgs/development/python-modules/iceportal/default.nix
+++ b/pkgs/development/python-modules/iceportal/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-iceportal";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kpAUgGi2fAHzQYuZAaQW9wdrYjwbduRsoTwSuzcjJa8=";
   };
 
diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix
index 6952aa33397f..4385c636d17e 100644
--- a/pkgs/development/python-modules/icnsutil/default.nix
+++ b/pkgs/development/python-modules/icnsutil/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "relikd";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s=";
   };
 
diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix
index 090886d2ddda..9ae20a1943d2 100644
--- a/pkgs/development/python-modules/icontract/default.nix
+++ b/pkgs/development/python-modules/icontract/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Parquery";
     repo = "icontract";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7mRQ1g2mllHIaZh0jEd/iCgaDja1KJXuRnamhDo/Pbo=";
   };
 
diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix
index b1d4dd9a1f05..8c950e04d384 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/pkgs/development/python-modules/ics/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ics-py";
     repo = "ics-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8=";
   };
 
diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix
index 85e9742c98db..697bb14a328c 100644
--- a/pkgs/development/python-modules/id/default.nix
+++ b/pkgs/development/python-modules/id/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "di";
     repo = "id";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6Vkbs/i1roAtPGwLxdM+XKDrMTo0+NfVpAUpw6GPg9U=";
   };
 
diff --git a/pkgs/development/python-modules/idasen-ha/default.nix b/pkgs/development/python-modules/idasen-ha/default.nix
index 2c93133cf6ad..d84fb04fffda 100644
--- a/pkgs/development/python-modules/idasen-ha/default.nix
+++ b/pkgs/development/python-modules/idasen-ha/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "abmantis";
     repo = "idasen-ha";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lqqSx4jxQVq2pjVv9lvaX6nNK6OqtMjPqOtLMLpVMUU=";
   };
 
diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix
index 8f1c36006f93..929294d88934 100644
--- a/pkgs/development/python-modules/idasen/default.nix
+++ b/pkgs/development/python-modules/idasen/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "newAM";
     repo = "idasen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TQ+DBFpG+IeZ4/dN+YKMw3AM4Dl1rpqA1kRcb3Tb3jA=";
   };
 
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 2de402aef215..7add2e609b0a 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pre-commit";
     repo = "identify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6sKnHsVLkwHy2udd8znqiFFMfWnmWTxTU949X4bqLNU=";
   };
 
diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index 8f373abdbaff..6ba4165a4835 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IfcOpenShell";
     repo = "IfcOpenShell";
-    rev = "refs/tags/ifcopenshell-python-${version}";
+    tag = "ifcopenshell-python-${version}";
     fetchSubmodules = true;
     hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
   };
diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
index 26009c97d47e..a34e5c5d6c24 100644
--- a/pkgs/development/python-modules/ignite/default.nix
+++ b/pkgs/development/python-modules/ignite/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J0xrqAGwH0bAs59T7zA8irMWOGbE2+Zd9kwqxYUYYMA=";
   };
 
diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index 23fee7d17099..30e3e28d29df 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "igraph";
     repo = "python-igraph";
-    rev = "refs/tags/${version}";
+    tag = version;
     postFetch = ''
       # export-subst prevents reproducability
       rm $out/.git_archival.json
diff --git a/pkgs/development/python-modules/ihcsdk/default.nix b/pkgs/development/python-modules/ihcsdk/default.nix
index 5f0402071b9a..f9ff1090c99b 100644
--- a/pkgs/development/python-modules/ihcsdk/default.nix
+++ b/pkgs/development/python-modules/ihcsdk/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dingusdk";
     repo = "PythonIhcSdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WI9RjVR2KdLaqklGtIUJErV4pBfffXx3odu3hdoyLWc=";
   };
 
diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix
index 29cb68253625..01d6bc77234f 100644
--- a/pkgs/development/python-modules/ihm/default.nix
+++ b/pkgs/development/python-modules/ihm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ihmwg";
     repo = "python-ihm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Uz/4Egd7swY4kDl6FR564eiaYEdY9IUoz2Lv5pJ1C30=";
   };
 
diff --git a/pkgs/development/python-modules/image-go-nord/default.nix b/pkgs/development/python-modules/image-go-nord/default.nix
index 2e3b5cf39312..17eb9f0f3ddf 100644
--- a/pkgs/development/python-modules/image-go-nord/default.nix
+++ b/pkgs/development/python-modules/image-go-nord/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Schrodinger-Hat";
     repo = "ImageGoNord-pip";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rPp4QrkbDhrdpfynRUYgxpNgUNxU+3h54Ea7s/+u1kI=";
   };
 
diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix
index e6152a3d586a..4ecc2f693c78 100644
--- a/pkgs/development/python-modules/imagededup/default.nix
+++ b/pkgs/development/python-modules/imagededup/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "idealo";
     repo = "imagededup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B2IuNMTZnzBi6IxrHBoMDsmIcqGQpznd/2f1XKo1Oa4=";
   };
 
@@ -88,7 +88,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://idealo.github.io/imagededup/";
-    changelog = "https://github.com/idealo/imagededup/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/idealo/imagededup/releases/tag/v${version}";
     description = "Finding duplicate images made easy";
     license = licenses.asl20;
     maintainers = with maintainers; [ stunkymonkey ];
diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix
index c53243e48f00..a774ba3b4de4 100644
--- a/pkgs/development/python-modules/imagehash/default.nix
+++ b/pkgs/development/python-modules/imagehash/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JohannesBuchner";
     repo = "imagehash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec=";
   };
 
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index b000d560a56f..ac94fcef313f 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "imageio";
     repo = "imageio-ffmpeg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i9DBEhRyW5shgnhpaqpPLTI50q+SATJnxur8PAauYX4=";
   };
 
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 5a65a0741a6c..d002c31507b9 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ikvk";
     repo = "imap_tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6Vhzwpb5DiSuF1LPUgkE+EfKMkAR4/Ld26zzj2r1/Ic=";
   };
 
diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix
index 5a231c13a3ee..ca2dd7174cff 100644
--- a/pkgs/development/python-modules/imapclient/default.nix
+++ b/pkgs/development/python-modules/imapclient/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjs";
     repo = "imapclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WY3OLPUwixrL2NSLfNBSSNMXJEoYBL+O6KoglU3Cz9g=";
   };
 
diff --git a/pkgs/development/python-modules/imgcat/default.nix b/pkgs/development/python-modules/imgcat/default.nix
index 0f190463c444..ed2b8292f7a3 100644
--- a/pkgs/development/python-modules/imgcat/default.nix
+++ b/pkgs/development/python-modules/imgcat/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wookayin";
     repo = "python-imgcat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FsLa8Z4aKuj3E5twC2LTXZDM0apmyYfgeyZQu/wLdAo=";
   };
 
diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix
index 3a98de5f1032..d341e26d1e3d 100644
--- a/pkgs/development/python-modules/immutabledict/default.nix
+++ b/pkgs/development/python-modules/immutabledict/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "corenting";
     repo = "immutabledict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v2oOzvAa8KONZDQuxouai2B9d1RY4kZG/px2wl0KAyM=";
   };
 
diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index e2be3e56c744..bf758df6f5e3 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MagicStack";
     repo = "immutables";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wZuCZEVXzycqA/h27RIe59e2QQALem8mfb3EdjwQr9w=";
   };
 
diff --git a/pkgs/development/python-modules/in-place/default.nix b/pkgs/development/python-modules/in-place/default.nix
index 69bdc2a16c7f..82fa9fd3fae9 100644
--- a/pkgs/development/python-modules/in-place/default.nix
+++ b/pkgs/development/python-modules/in-place/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jwodder";
     repo = "inplace";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TfWfSb1GslzcT30/xvBg5Xui7ptp7+g89Fq/giLCoQ8=";
   };
 
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index e64c5275d5d6..dd15dca3079d 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -18,7 +18,7 @@ let
     src = fetchFromGitHub {
       owner = "twisted";
       repo = "incremental";
-      rev = "refs/tags/incremental-${version}";
+      tag = "incremental-${version}";
       hash = "sha256-5MlIKUaBUwLTet23Rjd2Opf5e54LcHuZDowcGon0lOE=";
     };
 
diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index bfff7bcd5cb7..5d89a3798bee 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "inflect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3I5AdMuxwKtztnrF0lbvBIUxfqn0WlY2Pv6GYitFrA8=";
   };
 
diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 7c47b11985b4..f9054acb542d 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influxdb-client-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MKTfRsqizZDXPMqJAypUDQBm+a2s6FaEG3TM30wucrI=";
   };
 
diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix
index b34777add45b..b3494b68d023 100644
--- a/pkgs/development/python-modules/influxdb3-python/default.nix
+++ b/pkgs/development/python-modules/influxdb3-python/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "InfluxCommunity";
     repo = "influxdb3-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b+AxR6TFHrejSeU6el5beCFscKIsyaonMDC8jZWShRM=";
   };
 
diff --git a/pkgs/development/python-modules/inject/default.nix b/pkgs/development/python-modules/inject/default.nix
index 20c1a2d3395c..bcf2bf0301ce 100644
--- a/pkgs/development/python-modules/inject/default.nix
+++ b/pkgs/development/python-modules/inject/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ivankorobkov";
     repo = "python-inject";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ws296ESjb+a322imiRRWTS43w32rJc/7Y//OBQXOwnw=";
   };
 
diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix
index 734b3b3f6d33..6bc01c5188ff 100644
--- a/pkgs/development/python-modules/injector/default.nix
+++ b/pkgs/development/python-modules/injector/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-injector";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5O4vJSXfYNTrUzmv5XuT9pSUndNSvTZTxfVwiAd+0ck=";
   };
 
diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix
index 9d2979024029..493d153f8ccf 100644
--- a/pkgs/development/python-modules/inkbird-ble/default.nix
+++ b/pkgs/development/python-modules/inkbird-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "inkbird-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cUqU4XaY7CORhzy0AGjXI5c5ka+PnF4cHdyopyEBcLo=";
   };
 
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index bf9f8fe408dd..65770daafdcb 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "15r10nk";
     repo = "inline-snapshot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hwt/EFYedrml0x58Rd1AjqrIlELAXp1ku8v7glhCebE=";
   };
 
diff --git a/pkgs/development/python-modules/inlinestyler/default.nix b/pkgs/development/python-modules/inlinestyler/default.nix
index 2fd63571eb28..bf0262aac439 100644
--- a/pkgs/development/python-modules/inlinestyler/default.nix
+++ b/pkgs/development/python-modules/inlinestyler/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dlanger";
     repo = "inlinestyler";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9TKXqW+5SiiNXnHW2lOVh3zhFhodM7a1UB2yXsEuX3I=";
   };
 
diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix
index 331b98809bef..0bf8b97d9740 100644
--- a/pkgs/development/python-modules/inquirer/default.nix
+++ b/pkgs/development/python-modules/inquirer/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "magmax";
     repo = "python-inquirer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vIW/rD22PFND9EPjS0YPbIauKgh9KHh1gXf1L8g/f10=";
   };
 
diff --git a/pkgs/development/python-modules/inquirerpy/default.nix b/pkgs/development/python-modules/inquirerpy/default.nix
index 315670df3f75..43fa1fa7cb05 100644
--- a/pkgs/development/python-modules/inquirerpy/default.nix
+++ b/pkgs/development/python-modules/inquirerpy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kazhala";
     repo = "InquirerPy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ap0xZHEU458tjm6oEN5EtDoSRlnpZ7jvDq1L7fTlQQc=";
   };
 
diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix
index b98b7fdfa07b..bebe4ee0d608 100644
--- a/pkgs/development/python-modules/inscriptis/default.nix
+++ b/pkgs/development/python-modules/inscriptis/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "weblyzard";
     repo = "inscriptis";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9KEkXcdZ7USXfyIXGDrp4p4kJTzF2q30fvOccxF1hBU=";
   };
 
diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index a82c88bf0d7a..e2427cec22a3 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jxnl";
     repo = "instructor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iPTZFXypcpO+PkcJHTdpkpiIU589XPcy+aNO/JqASCQ=";
   };
 
@@ -94,7 +94,7 @@ buildPythonPackage rec {
     broken = lib.versionOlder pydantic.version "2"; # ImportError: cannot import name 'TypeAdapter' from 'pydantic'
     description = "Structured outputs for llm";
     homepage = "https://github.com/jxnl/instructor";
-    changelog = "https://github.com/jxnl/instructor/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/jxnl/instructor/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mic92 ];
     mainProgram = "instructor";
diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix
index fe6fa3b2a656..57559af6d9a1 100644
--- a/pkgs/development/python-modules/intake-parquet/default.nix
+++ b/pkgs/development/python-modules/intake-parquet/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "intake";
     repo = "intake-parquet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8=";
   };
 
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index 1422752b3230..f87cfb013e0b 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "intake";
     repo = "intake";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-F13jbAQP3G3cKeAegM1w/t32xyC0BgL9/67aIlzA4SE=";
   };
 
diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix
index 5984654c7be3..49f9bcc6d20e 100644
--- a/pkgs/development/python-modules/intellifire4py/default.nix
+++ b/pkgs/development/python-modules/intellifire4py/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeeftor";
     repo = "intellifire4py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dMhm2gntLV7ev6UIfHFMATytZo5blTlALuh9sBirkqI=";
   };
 
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index 3bb9031c48b4..be1fb0bc2320 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jjjake";
     repo = "internetarchive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x4EzVm22iZhGysg2iMtuil2tNJn4/8cWYyULLowODGc=";
   };
 
diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix
index 68160afc5435..85b09a100aec 100644
--- a/pkgs/development/python-modules/invocations/default.nix
+++ b/pkgs/development/python-modules/invocations/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyinvoke";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0=";
   };
 
diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix
index 97d587195ab0..2627076a9ca9 100644
--- a/pkgs/development/python-modules/iocextract/default.nix
+++ b/pkgs/development/python-modules/iocextract/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "InQuest";
     repo = "python-iocextract";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cCp9ug/TuVY1zL+kiDlFGBmfFJyAmVwxLD36WT0oRAE=";
   };
 
diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix
index e412d4fcbd89..84b6dfd0a56b 100644
--- a/pkgs/development/python-modules/iodata/default.nix
+++ b/pkgs/development/python-modules/iodata/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theochem";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ld6V+/8lg4Du6+mHU5XuXXyMpWwyepXurerScg/bf2Q=";
   };
 
diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix
index 66ea7ae87f2e..ffc33c52f882 100644
--- a/pkgs/development/python-modules/iopath/default.nix
+++ b/pkgs/development/python-modules/iopath/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "iopath";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qubf/mWKMgYz9IVoptMZrwy4lQKsNGgdqpJB1j/u5s8=";
   };
 
diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix
index 449784de27ed..079093f6fef4 100644
--- a/pkgs/development/python-modules/iottycloud/default.nix
+++ b/pkgs/development/python-modules/iottycloud/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pburgio";
     repo = "iottyCloud";
-    rev = "refs/tags/${version}";
+    tag = "v${version}";
     hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo=";
   };
 
diff --git a/pkgs/development/python-modules/ipadic/default.nix b/pkgs/development/python-modules/ipadic/default.nix
index 2702f6888c40..cb2bed955849 100644
--- a/pkgs/development/python-modules/ipadic/default.nix
+++ b/pkgs/development/python-modules/ipadic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "polm";
     repo = "ipadic-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ybC8G1AOIZWkS3uQSErXctIJKq9Y7xBjRbBrO8/yAj4=";
   };
 
diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix
index c3d14b161c02..3ccf42e6f5dc 100644
--- a/pkgs/development/python-modules/iptools/default.nix
+++ b/pkgs/development/python-modules/iptools/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bd808";
     repo = "python-iptools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-340Wc4QGwUqEEANM5EQzFaXxIWVf2fDr4qfCuxNEVBQ=";
   };
 
diff --git a/pkgs/development/python-modules/ipwhois/default.nix b/pkgs/development/python-modules/ipwhois/default.nix
index abdcb10e9eb2..6d7173bf10d8 100644
--- a/pkgs/development/python-modules/ipwhois/default.nix
+++ b/pkgs/development/python-modules/ipwhois/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "secynic";
     repo = "ipwhois";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PY3SUPELcCvS/o5kfko4OD1BlTc9DnyqfkSFuzcAOSY=";
   };
 
diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix
index 5cded1ba84a5..08554808eb75 100644
--- a/pkgs/development/python-modules/islpy/default.nix
+++ b/pkgs/development/python-modules/islpy/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inducer";
     repo = "islpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ixw9U4WqcXBW6KGBOsUImjsxmvG5XKCv4jCbTjJ4pjg=";
   };
 
diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix
index 6764e3c6c3ee..3f0c266773d3 100644
--- a/pkgs/development/python-modules/ismartgate/default.nix
+++ b/pkgs/development/python-modules/ismartgate/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mfiHoli0ldw/E1SrtOBpDO8ZTC0wTeaoSZ2nPnx5EaQ=";
   };
 
diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix
index bec420de051f..30dee04e8ced 100644
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deactivated";
     repo = "python-iso3166";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0=";
   };
 
diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix
index b9dd6d2f9f7b..b9d6e59ac103 100644
--- a/pkgs/development/python-modules/iso4217/default.nix
+++ b/pkgs/development/python-modules/iso4217/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dahlia";
     repo = "iso4217";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xOKfdk8Bn9f5oszS0IHUD6HgzL9VSa5GBZ28n4fvAck=";
   };
 
diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
index 32ff65a39144..79a5a1a002dd 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "isort";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/1iKYmtNRw9u59zzJDwV7b9+EPxFJDHvhjTioGt5LLU=";
   };
 
diff --git a/pkgs/development/python-modules/israel-rail-api/default.nix b/pkgs/development/python-modules/israel-rail-api/default.nix
index b90306fa07e8..2510658c3376 100644
--- a/pkgs/development/python-modules/israel-rail-api/default.nix
+++ b/pkgs/development/python-modules/israel-rail-api/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sh0oki";
     repo = "israel-rail-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OiWK3gi7dQ7SF4fvusKtSFzdhrsvePlscX0EYQ/hlYk=";
   };
 
diff --git a/pkgs/development/python-modules/itanium-demangler/default.nix b/pkgs/development/python-modules/itanium-demangler/default.nix
index 37073b5a0bb5..7d00cfbaebf9 100644
--- a/pkgs/development/python-modules/itanium-demangler/default.nix
+++ b/pkgs/development/python-modules/itanium-demangler/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "python-itanium_demangler";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I6NUfckt2cocQt5dZSFadpshTCuA/6bVNauNXypWh+A=";
   };
 
diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix
index 8af1e84a972b..d2d508b5a8f7 100644
--- a/pkgs/development/python-modules/itemdb/default.nix
+++ b/pkgs/development/python-modules/itemdb/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "almarklein";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-egxQ1tGC6R5p1stYm4r05+b2HkuT+nBySTZPGqeAbSE=";
   };
 
diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix
index de2b1e902702..5dc7f4fb8d67 100644
--- a/pkgs/development/python-modules/itemloaders/default.nix
+++ b/pkgs/development/python-modules/itemloaders/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scrapy";
     repo = "itemloaders";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Hs3FodJAWZGeo+kMmcto5WW433RekwVuucaJl8TKc+0=";
   };
 
diff --git a/pkgs/development/python-modules/iterable-io/default.nix b/pkgs/development/python-modules/iterable-io/default.nix
index 81799c7aec4f..4c5dd6fd9dcd 100644
--- a/pkgs/development/python-modules/iterable-io/default.nix
+++ b/pkgs/development/python-modules/iterable-io/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pR0Ps";
     repo = "iterable-io";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA=";
   };
 
diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix
index 1194c38e2486..a0c048f8ba67 100644
--- a/pkgs/development/python-modules/iteration-utilities/default.nix
+++ b/pkgs/development/python-modules/iteration-utilities/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MSeifert04";
     repo = "iteration_utilities";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SiqNUyuvsD5m5qz5ByYyVln3SSa4/D4EHpmM+pf8ngM=";
   };
 
diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix
index a3c57d4e0798..18f1a865dbf3 100644
--- a/pkgs/development/python-modules/iterative-telemetry/default.nix
+++ b/pkgs/development/python-modules/iterative-telemetry/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "telemetry-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bcGniytjlN3JFPeMQYjyIP8Ruty9/dnzp9neclbdsfU=";
   };
 
diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix
index 07710e18466b..21176f203f9e 100644
--- a/pkgs/development/python-modules/iterfzf/default.nix
+++ b/pkgs/development/python-modules/iterfzf/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dahlia";
     repo = "iterfzf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DvEFCHK+1TA/TTXG//hvXXbRclBkelonA3QsB4h7eRM=";
   };
 
diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix
index 12b647499c73..5a9b5edd6fa9 100644
--- a/pkgs/development/python-modules/itunespy/default.nix
+++ b/pkgs/development/python-modules/itunespy/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sleepyfran";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QvSKJAZa8v0tGURXwo4Dwo73JqsYs1xsBHW0lcaM7bk=";
   };
 
diff --git a/pkgs/development/python-modules/ixia/default.nix b/pkgs/development/python-modules/ixia/default.nix
index cf9001cb7edb..00a289727c27 100644
--- a/pkgs/development/python-modules/ixia/default.nix
+++ b/pkgs/development/python-modules/ixia/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "ixia";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lsov5AIT5uRf9nmS8ZsFmInKUFAxUATTbpfhV1fabhA=";
   };
 
diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix
index d56e02f9d674..2ec947be0268 100644
--- a/pkgs/development/python-modules/jaconv/default.nix
+++ b/pkgs/development/python-modules/jaconv/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ikegami-yukino";
     repo = "jaconv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0=";
   };
 
diff --git a/pkgs/development/python-modules/jamo/default.nix b/pkgs/development/python-modules/jamo/default.nix
index cccd9fe6c346..d61e56e1c50d 100644
--- a/pkgs/development/python-modules/jamo/default.nix
+++ b/pkgs/development/python-modules/jamo/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JDongian";
     repo = "python-jamo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QHI3Rqf1aQOsW49A/qnIwRnPuerbtyerf+eWIiEvyho=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix
index 0b96700f267d..3154651d486c 100644
--- a/pkgs/development/python-modules/jaraco-abode/default.nix
+++ b/pkgs/development/python-modules/jaraco-abode/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.abode";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t5AI2wpSM6xMzULEZYkUgGvcODM8PVxdd2Vy/PV0Ga4=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix
index e80c2add69f2..669fa12f96d5 100644
--- a/pkgs/development/python-modules/jaraco-classes/default.nix
+++ b/pkgs/development/python-modules/jaraco-classes/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.classes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-pXDsLKiEru+UXcEBT4/cP1u8s9vSn1Zhf7Qnwy9Zr0I=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix
index 6021e74f4c69..6bf235513e27 100644
--- a/pkgs/development/python-modules/jaraco-context/default.nix
+++ b/pkgs/development/python-modules/jaraco-context/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.context";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WXZX2s9Qehp0F3bSv2c5lGxhhn6HKFkABbtYKizG1/8=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix
index ef5e99a93fd1..13a51537c50f 100644
--- a/pkgs/development/python-modules/jaraco-email/default.nix
+++ b/pkgs/development/python-modules/jaraco-email/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.email";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2dU+tbrP86Oy8ej1Xa0+fNRB83tGBTUsOWbZyQsMKu8=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-envs/default.nix b/pkgs/development/python-modules/jaraco-envs/default.nix
index c2485c7fe7e3..891ccac0f005 100644
--- a/pkgs/development/python-modules/jaraco-envs/default.nix
+++ b/pkgs/development/python-modules/jaraco-envs/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.envs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yRMX0H6yWN8TiO/LGAr4HyrVS8ZhBjuR885/+UQscP0=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix
index de22f3eda857..2d02e245b4ac 100644
--- a/pkgs/development/python-modules/jaraco-net/default.nix
+++ b/pkgs/development/python-modules/jaraco-net/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.net";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z9+gz6Sos0uluU5icXJN9OMmWFErVrJXBvoBcKv6Wwg=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-path/default.nix b/pkgs/development/python-modules/jaraco-path/default.nix
index 48ee8b4fdd2b..1caac746f998 100644
--- a/pkgs/development/python-modules/jaraco-path/default.nix
+++ b/pkgs/development/python-modules/jaraco-path/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.path";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i6FPM4aPfpwLdde1COXZNoKel3sRK8PXnkzy50XvVdw=";
   };
 
diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix
index 47510c9c4a6e..f97cbf0ade2f 100644
--- a/pkgs/development/python-modules/jaraco-test/default.nix
+++ b/pkgs/development/python-modules/jaraco-test/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "jaraco.test";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jbnU6PFVUd/eD9CWHyJvaTFkcZaIIwztkN9UbQZH1RU=";
   };
 
diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix
index a14d2341dad5..d9c86afb8f08 100644
--- a/pkgs/development/python-modules/jarowinkler/default.nix
+++ b/pkgs/development/python-modules/jarowinkler/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "JaroWinkler";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B3upTBNqMyi+CH7Zx04wceEXjGJnr6S3BIl87AQkfbo=";
   };
 
diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix
index ca4eb06034a0..6d4c4a427444 100644
--- a/pkgs/development/python-modules/jaxopt/default.nix
+++ b/pkgs/development/python-modules/jaxopt/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "jaxopt";
-    rev = "refs/tags/jaxopt-v${version}";
+    tag = "jaxopt-v${version}";
     hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U=";
   };
 
diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix
index 22d5e9ba244c..01d06d31eb12 100644
--- a/pkgs/development/python-modules/jaxtyping/default.nix
+++ b/pkgs/development/python-modules/jaxtyping/default.nix
@@ -26,7 +26,7 @@ let
     src = fetchFromGitHub {
       owner = "google";
       repo = "jaxtyping";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-TXhHh6Nka9TOnfFPaNyHmLdTkhzyFEY0mLSfoDf9KQc=";
     };
 
diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index bbc4f3c1a917..508f6772c70c 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kellyjonbrazil";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9006FoIGUpmb+tC2d6jLsYpKUPM5OEXxK1ztAREwZ1E=";
   };
 
diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index 235c6291275a..eda916914344 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pappasam";
     repo = "jedi-language-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s=";
   };
 
diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
index 9fb7c6ccbd3b..2aa8ecb0cde5 100644
--- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-apiclient-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H1FqypNuVIZ17cFdNDEmmKICswxJkUGq2LhlingbCVk=";
   };
 
diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix
index 8da07d9294d6..7eefcb2dfa5d 100644
--- a/pkgs/development/python-modules/jh2/default.nix
+++ b/pkgs/development/python-modules/jh2/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "h2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-la1tZ+t6HeGqaua1f858mT1IRyqS0hnoOiKr656vthQ=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/jinja2-git/default.nix b/pkgs/development/python-modules/jinja2-git/default.nix
index df9ca0585d3b..e6fdd006f5ca 100644
--- a/pkgs/development/python-modules/jinja2-git/default.nix
+++ b/pkgs/development/python-modules/jinja2-git/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wemake-services";
     repo = "jinja2-git";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZcKRLHcZ/rpiUyYK4ifDJaZriN+YyRF1RKCjIKum98U=";
   };
 
diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index dae3210280e3..16a7950a401a 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycontribs";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zE0fceCnyv0qKak8sRCXPCauC0KeOmczY/ZkVoHNcS8=";
   };
 
diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix
index 32a560a1a1f2..18da77981ece 100644
--- a/pkgs/development/python-modules/jishaku/default.nix
+++ b/pkgs/development/python-modules/jishaku/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Gorialis";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BWnuk6h80cKwRECyTuRvnYnTC78219oraeTNoqWDd1c=";
   };
 
diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix
index 5aed4511b50c..99198fa120a7 100644
--- a/pkgs/development/python-modules/jiter/default.nix
+++ b/pkgs/development/python-modules/jiter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "jiter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XYOdy7jduPak8XBL2hdAQfBxrmPq/nyzNlA4RygCtK0=";
   };
 
diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix
index 0d200572a7e2..5f0ab0b1b73d 100644
--- a/pkgs/development/python-modules/jiwer/default.nix
+++ b/pkgs/development/python-modules/jiwer/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jitsi";
     repo = "jiwer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2LzAOgABK00Pz3v5WWYUAcZOYcTbRKfgw7U5DOohB/Q=";
   };
 
diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix
index b0ec259f0723..8ca03df1fe0f 100644
--- a/pkgs/development/python-modules/jmp/default.nix
+++ b/pkgs/development/python-modules/jmp/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+PefZU1209vvf1SfF8DXiTvKYEnZ4y8iiIr8yKikx9Y=";
   };
 
diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix
index 1704fc6b9a61..da1b52bdd224 100644
--- a/pkgs/development/python-modules/johnnycanencrypt/default.nix
+++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kushaldas";
     repo = "johnnycanencrypt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tbHW3x+vwFz0nqFGWvgxjhw8XH6/YKz1uagU339SZyk=";
   };
 
diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix
index a54844be9213..3a18b85c821e 100644
--- a/pkgs/development/python-modules/joserfc/default.nix
+++ b/pkgs/development/python-modules/joserfc/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "authlib";
     repo = "joserfc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mnJzhkdX0+5Y/XwGlHgxLP0me8Cs/Cl3p46KgTKw2ug=";
   };
 
diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix
index 21a272996cf9..c76c4ec6ecb7 100644
--- a/pkgs/development/python-modules/jq/default.nix
+++ b/pkgs/development/python-modules/jq/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwilliamson";
     repo = "jq.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c6tJI/mPlBGIYTk5ObIQ1CUTq73HouQ2quMZVWG8FFg=";
   };
 
diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix
index 90f5d7b8a045..c9819c2487e9 100644
--- a/pkgs/development/python-modules/json-logging/default.nix
+++ b/pkgs/development/python-modules/json-logging/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bobbui";
     repo = "json-logging-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE=";
   };
 
diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index 3ddc6fce10c3..a8dd15796ee2 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coveooss";
     repo = "json-schema-for-humans";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0nen6oJOWdihm/EWKSGQLlD70pRxezhCHykBJxlSFHo=";
   };
 
diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
index ece42ed20b3e..847527335521 100644
--- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
+++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "smheidrich";
     repo = "py-json-stream-rs-tokenizer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ogX0KsfHRQW7+exRMKGwJiNINrOKPiTKxAqiTZyEWrg=";
   };
 
diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix
index f7345149bfc3..ff77b545414c 100644
--- a/pkgs/development/python-modules/json-tricks/default.nix
+++ b/pkgs/development/python-modules/json-tricks/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mverleg";
     repo = "pyjson_tricks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xddMc4PvVI+mqB3eeVqECZmdeSKAURsdbOnUAXahqM0=";
   };
 
diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix
index b5ac94fb0009..221c554ac6cc 100644
--- a/pkgs/development/python-modules/json5/default.nix
+++ b/pkgs/development/python-modules/json5/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dpranke";
     repo = "pyjson5";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2JAZHayPyi2RI4apODQ9QDXSUI8n54SwQAxZiBhuJrE=";
   };
 
diff --git a/pkgs/development/python-modules/jsonable/default.nix b/pkgs/development/python-modules/jsonable/default.nix
index 705ff95a2d77..951678e9edc2 100644
--- a/pkgs/development/python-modules/jsonable/default.nix
+++ b/pkgs/development/python-modules/jsonable/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "halfak";
     repo = "python-jsonable";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA=";
   };
 
diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix
index df20262b9d90..cfb405845743 100644
--- a/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/pkgs/development/python-modules/jsonargparse/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omni-us";
     repo = "jsonargparse";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+gxwajChbdcsIa8Jp0iva3ik5vZeMRa38KuoQwIGNoU=";
   };
 
diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix
index ac068b224edc..3dc4df890e42 100644
--- a/pkgs/development/python-modules/jsonconversion/default.nix
+++ b/pkgs/development/python-modules/jsonconversion/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DLR-RM";
     repo = "python-jsonconversion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XmAQXu9YkkMUvpf/QVk4u1p8UyNfRb0NeoLxC1evCT4=";
   };
 
diff --git a/pkgs/development/python-modules/jsondate/default.nix b/pkgs/development/python-modules/jsondate/default.nix
index 91190c8528fa..4ba91069df49 100644
--- a/pkgs/development/python-modules/jsondate/default.nix
+++ b/pkgs/development/python-modules/jsondate/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ilya-kolpakov";
     repo = "jsondate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0nhvi48nc0bmad5ncyn6c9yc338krs3xf10bvv55xgz25c5gdgwy";
     fetchSubmodules = true; # Fetching by tag does not work otherwise
   };
diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix
index 2ddfd381f64d..930a6c8783d6 100644
--- a/pkgs/development/python-modules/jsondiff/default.nix
+++ b/pkgs/development/python-modules/jsondiff/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xlwings";
     repo = "jsondiff";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0EnI7f5t7Ftl/8UcsRdA4iVQ78mxvPucCJjFJ8TMwww=";
   };
 
diff --git a/pkgs/development/python-modules/jsonformatter/default.nix b/pkgs/development/python-modules/jsonformatter/default.nix
index 9520d08100ca..5351a490835b 100644
--- a/pkgs/development/python-modules/jsonformatter/default.nix
+++ b/pkgs/development/python-modules/jsonformatter/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MyColorfulDays";
     repo = "jsonformatter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A+lsSBrm/64w7yMabmuAbRCLwUUdulGH3jB/DbYJ2QY=";
   };
 
diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix
index 42712f4e54e9..9609f9b44be5 100644
--- a/pkgs/development/python-modules/jsonpatch/default.nix
+++ b/pkgs/development/python-modules/jsonpatch/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stefankoegl";
     repo = "python-json-patch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JHBB64LExzHQVoFF2xcsqGlNWX/YeEBa1M/TmfeQLWI=";
   };
 
diff --git a/pkgs/development/python-modules/jsonpath-ng/default.nix b/pkgs/development/python-modules/jsonpath-ng/default.nix
index 5e000c6c4131..0b45f92ccdc3 100644
--- a/pkgs/development/python-modules/jsonpath-ng/default.nix
+++ b/pkgs/development/python-modules/jsonpath-ng/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "h2non";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0ErTGxGlMn/k2KMwRV26WJpx85yJUfn6Hgp5pU4RZA4=";
   };
 
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index fbae39f1b548..8774e9e271bb 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gazpachoking";
     repo = "jsonref";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tOhabmqCkktJUZjCrzjOjUGgA/X6EVz0KqehyLtigfc=";
   };
 
diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix
index 2b4f81d0706c..239a3e9246ef 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = "jsonrpc-base";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AbpuAW+wuGc+Vj4FDFlyB2YbiwDxPLuyAGiNcmGU+Ss=";
   };
 
diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index 1ec395bc5a50..6a906ed55167 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = "jsonrpc-websocket";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CdYa4gcbG3EM1glxLU1hyqbNse87KJKjwSRQSFfDMM0=";
   };
 
diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix
index dc23f8817320..750655338d45 100644
--- a/pkgs/development/python-modules/jsons/default.nix
+++ b/pkgs/development/python-modules/jsons/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramonhagenaars";
     repo = "jsons";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7OIByHvsqhKFOkb1q2kuxmbkkleryavYgp/T4U5hvGk=";
   };
 
diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix
index 9add473d07cd..9e1da404ec02 100644
--- a/pkgs/development/python-modules/jsonschema-path/default.nix
+++ b/pkgs/development/python-modules/jsonschema-path/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "jsonschema-path";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4=";
   };
 
diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix
index 4f8246df728f..8ed87aca939a 100644
--- a/pkgs/development/python-modules/jsonschema-spec/default.nix
+++ b/pkgs/development/python-modules/jsonschema-spec/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4=";
   };
 
diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix
index a7f79e849be3..73250a986437 100644
--- a/pkgs/development/python-modules/jsonslicer/default.nix
+++ b/pkgs/development/python-modules/jsonslicer/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AMDmi3";
     repo = "jsonslicer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nPifyqr+MaFqoCYFbFSSBDjvifpX0CFnHCdMCvhwYTA=";
   };
 
diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix
index 55e34c9e30aa..4c73e0f379e8 100644
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Juniper";
     repo = "py-junos-eznc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aoi+in5A8qSdQNY3V4S4wBBfPchR1an7G6GQHDhgxpQ=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix
index c787e16c5cdf..33ea4a9e1553 100644
--- a/pkgs/development/python-modules/jupyter-book/default.nix
+++ b/pkgs/development/python-modules/jupyter-book/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter-book";
     repo = "jupyter-book";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MBSf2/+4+efWHJ530jdezeh5OLTtUZlAEOl5SqoWOuE=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix
index e699d4d25187..adf00a9ef12e 100644
--- a/pkgs/development/python-modules/jupyter-console/default.nix
+++ b/pkgs/development/python-modules/jupyter-console/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "jupyter_console";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jdSeZCspcjEQVBpJyxVnwJ5SAq+SS1bW9kqp/F/zwCQ=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-contrib-core/default.nix b/pkgs/development/python-modules/jupyter-contrib-core/default.nix
index a4e77af78b71..73d4d1a3b143 100644
--- a/pkgs/development/python-modules/jupyter-contrib-core/default.nix
+++ b/pkgs/development/python-modules/jupyter-contrib-core/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter-contrib";
     repo = "jupyter_contrib_core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UTtK+aKxBFkqKuHrt1ox8vdHyFz/9HiKFl7U4UQcG88=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix
index 22453d078491..8c60fbb03edf 100644
--- a/pkgs/development/python-modules/jupyter-core/default.nix
+++ b/pkgs/development/python-modules/jupyter-core/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "jupyter_core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qu25ryZreRPHoubFJTFusGdkTPHbl/yl94g+XU5A5Mc=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix
index 6a5431fd1abf..93b6129e384b 100644
--- a/pkgs/development/python-modules/jupyter-events/default.nix
+++ b/pkgs/development/python-modules/jupyter-events/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "jupyter_events";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix b/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix
index c9d84b130fdd..c819c33de103 100644
--- a/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix
+++ b/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcb91";
     repo = "jupyter_highlight_selected_word";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KgM//SIfES46uZySwNR4ZOcolnJORltvThsmEvxXoIs=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
index a1e54450fbcb..b4449e0bc65b 100644
--- a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
+++ b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter-contrib";
     repo = "jupyter_nbextensions_configurator";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-U4M6pGV/DdE+DOVMVaoBXOhfRERt+yUa+gADgqRRLn4=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index 059de94c6982..e88befd0acd1 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "repo2docker";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZzZBuJBPDG4to1fSYn2xysupXbPS9Q6wqWr3Iq/Vds8=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix
index 01355ab24c23..7e39775da161 100644
--- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter-server";
     repo = "jupyter_server_fileid";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ob7hnqU7GdaDHEPF7+gwkmsboKZgiiLzzwxbBUwYHYo=";
   };
 
diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
index 1d216f7b8805..30c3e0e2bea5 100644
--- a/pkgs/development/python-modules/jupyter-server-terminals/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
@@ -24,7 +24,7 @@ let
     src = fetchFromGitHub {
       owner = "jupyter-server";
       repo = "jupyter_server_terminals";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-af7jBscGkbekXgfDxwAfrJSY1uEuIGfzzSsjaPdlYcY=";
     };
 
diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix
index 89fc4fe88bf5..6f51f78a2902 100644
--- a/pkgs/development/python-modules/jupyter-sphinx/default.nix
+++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "jupyter-sphinx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o/i3WravKZPf7uw2H4SVYfAyaZGf19ZJlkmeHCWcGtE=";
   };
 
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Jupyter Sphinx Extensions";
     homepage = "https://github.com/jupyter/jupyter-sphinx/";
-    changelog = "https://github.com/jupyter/jupyter-sphinx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/jupyter/jupyter-sphinx/releases/tag/v${version}";
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-ui-poll/default.nix b/pkgs/development/python-modules/jupyter-ui-poll/default.nix
index 4a3c69c55304..8652abf3d35e 100644
--- a/pkgs/development/python-modules/jupyter-ui-poll/default.nix
+++ b/pkgs/development/python-modules/jupyter-ui-poll/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kirill888";
     repo = "jupyter-ui-poll";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mlgLd6uFDSxRBj4+Eidea2CE7FuG6NzJLWGec4KPd9k=";
   };
 
diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
index 79c5c99ff99e..0121e2e6c2d3 100644
--- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "ldapauthenticator";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k=";
   };
 
diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
index ebcbfb71d7c5..9504c80437a0 100644
--- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "systemdspawner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-obM8HGCHsisRV1+kHMWdA7d6eb6awwPMBuDUAf3k0uI=";
   };
 
diff --git a/pkgs/development/python-modules/justbases/default.nix b/pkgs/development/python-modules/justbases/default.nix
index c3fc8dcd5ac0..98225e212d5d 100644
--- a/pkgs/development/python-modules/justbases/default.nix
+++ b/pkgs/development/python-modules/justbases/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mulkieran";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XraUh3beI2JqKPRHYN5W3Tn3gg0GJCwhnhHIOFdzh6U=";
   };
 
diff --git a/pkgs/development/python-modules/justbytes/default.nix b/pkgs/development/python-modules/justbytes/default.nix
index db5c79de25dd..cc662510a4a2 100644
--- a/pkgs/development/python-modules/justbytes/default.nix
+++ b/pkgs/development/python-modules/justbytes/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mulkieran";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+jwIK1ZU+j58VoOfZAm7GdFy7KHU28khwzxhYhcws74=";
   };
 
diff --git a/pkgs/development/python-modules/justext/default.nix b/pkgs/development/python-modules/justext/default.nix
index 299894cae220..a505a2b018b2 100644
--- a/pkgs/development/python-modules/justext/default.nix
+++ b/pkgs/development/python-modules/justext/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miso-belica";
     repo = "jusText";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9i7hzCK/ijh8xw9l2ZbVhVj5IBf0WD/49/R1tSWgqrQ=";
   };
 
diff --git a/pkgs/development/python-modules/justnimbus/default.nix b/pkgs/development/python-modules/justnimbus/default.nix
index 5bc543a92976..5a05cc259ee1 100644
--- a/pkgs/development/python-modules/justnimbus/default.nix
+++ b/pkgs/development/python-modules/justnimbus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kvanzuijlen";
     repo = "justnimbus";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FsuvpmMWBYI1LheO3NFfCeaW4m3YQ41Tc81TP3gdNqo=";
   };
 
diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix
index 9b8aa8d17a02..d8d0aa0c7d1a 100644
--- a/pkgs/development/python-modules/k-diffusion/default.nix
+++ b/pkgs/development/python-modules/k-diffusion/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crowsonkb";
     repo = "k-diffusion";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x/UHzobQv5ov0luUHqC8OA5YbtF+aWL39/SQtzTm0RM=";
   };
 
diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix
index 88fa65416800..aec5ffe216f7 100644
--- a/pkgs/development/python-modules/kafka-python-ng/default.nix
+++ b/pkgs/development/python-modules/kafka-python-ng/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wbarnha";
     repo = "kafka-python-ng";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a2RFiBRh3S2YQBekpwEK74ow8bGlgWCGqSf2vcgYPYk=";
   };
 
diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index 4b9e78c77b86..ea26abeba91e 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jackrosenthal";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg=";
   };
 
diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix
index 59ec94d592a4..03abd44841fd 100644
--- a/pkgs/development/python-modules/karton-asciimagic/default.nix
+++ b/pkgs/development/python-modules/karton-asciimagic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k=";
   };
 
diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix
index b71bd366ad41..e56415fe7e78 100644
--- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix
+++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "karton-autoit-ripper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M=";
   };
 
diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix
index 8e98ab9d1d2b..49e42ff66cfc 100644
--- a/pkgs/development/python-modules/karton-classifier/default.nix
+++ b/pkgs/development/python-modules/karton-classifier/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "karton-classifier";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DH8I4Lbbs2TVMvYlvh/P2I/7O4+VechP2JDDVHNsTSg=";
   };
 
diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix
index 55b0e4f5f0a4..465e909dd629 100644
--- a/pkgs/development/python-modules/karton-config-extractor/default.nix
+++ b/pkgs/development/python-modules/karton-config-extractor/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-X2g/wgWLIY2ZIwH1l83EApyoeYQU5/MWq5S0qmYz+CA=";
   };
 
diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix
index 8d78b4fab0ef..bb8ccf8ba533 100644
--- a/pkgs/development/python-modules/karton-core/default.nix
+++ b/pkgs/development/python-modules/karton-core/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "karton";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KaEXBNGcJN88gIv7suKcr1pK4ih/QbByxEy3nZFlIgk=";
   };
 
diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix
index 90d02be4f461..7ea83ea1381b 100644
--- a/pkgs/development/python-modules/karton-dashboard/default.nix
+++ b/pkgs/development/python-modules/karton-dashboard/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VzBC7IATF8QBtTXMv4vmorAzBlImEsayjenQ2Uz5jIo=";
   };
 
diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
index d67ff1a31ae2..3fbfc306e6f4 100644
--- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
+++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KJh9uJzVGYEEk1ed56ynKA/+dK9ouDB7L06xERjfjdc=";
   };
 
diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix
index c64a248c474f..cd98c09815b6 100644
--- a/pkgs/development/python-modules/karton-yaramatcher/default.nix
+++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U=";
   };
 
diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix
index 2622f3d3bb9a..fec36603df72 100644
--- a/pkgs/development/python-modules/kasa-crypt/default.nix
+++ b/pkgs/development/python-modules/kasa-crypt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "kasa-crypt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9uDloaf9w75O+7r27PK/xOf0TrK43ndxnTUcm4CmOXo=";
   };
 
diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix
index 90daccfbffae..13c534e8edf7 100644
--- a/pkgs/development/python-modules/kbcstorage/default.nix
+++ b/pkgs/development/python-modules/kbcstorage/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "keboola";
     repo = "sapi-python-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-30bAw5pYEUj0jeZWiJxzZ7lDs/+63tlcoLaHrUmYCs8=";
   };
 
diff --git a/pkgs/development/python-modules/kde-material-you-colors/default.nix b/pkgs/development/python-modules/kde-material-you-colors/default.nix
index 5101b7830edb..b760e52c2a0d 100644
--- a/pkgs/development/python-modules/kde-material-you-colors/default.nix
+++ b/pkgs/development/python-modules/kde-material-you-colors/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "kde-material-you-colors";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hew+aWbfWmqTsxsNx/0Ow0WZAVl0e6OyzDxcKm+nlzQ=";
   };
 
diff --git a/pkgs/development/python-modules/keba-kecontact/default.nix b/pkgs/development/python-modules/keba-kecontact/default.nix
index 8f95da8d2bb2..6fabe34185ae 100644
--- a/pkgs/development/python-modules/keba-kecontact/default.nix
+++ b/pkgs/development/python-modules/keba-kecontact/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dannerph";
     repo = "keba-kecontact";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2XWZt9H+1m4TX0C3cjEIlkrXp6BSArUsbLi+VKGDqhE=";
   };
 
diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix
index add192df0ade..875b65cb1ef3 100644
--- a/pkgs/development/python-modules/kegtron-ble/default.nix
+++ b/pkgs/development/python-modules/kegtron-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "kegtron-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O5I5shW8nL2RAQptS2Bp/GI/4L6o0xXXmwYvRq0MM8o=";
   };
 
diff --git a/pkgs/development/python-modules/keyring-pass/default.nix b/pkgs/development/python-modules/keyring-pass/default.nix
index 0409bd995c99..c52d51478e5f 100644
--- a/pkgs/development/python-modules/keyring-pass/default.nix
+++ b/pkgs/development/python-modules/keyring-pass/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nazarewk";
     repo = "keyring_pass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EsM+RUhYtelslRpxR5NQbqpOt8KaeCsFqkqZ1ZFx0I0=";
   };
 
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index b18c84866227..9a21434fc48d 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "keyring";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5MK7f6/e8ZJ7azm5WX8T2+/6R3P3Y8XaN7jze2MgiJA=";
   };
 
diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 61d360020497..d4bae3184163 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "keyrings.alt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m/hIXjri3FZ3rPIymiIBy8cKNOwJoj14WjsOyDtcWmU=";
   };
 
diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix
index 528d4becda6b..a6631f6d963f 100644
--- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix
+++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frispete";
     repo = "keyrings.cryptfile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cDXx0s3o8hNqgzX4oNkjGhNcaUX5vi1uN2d9sdbiZwk=";
   };
 
diff --git a/pkgs/development/python-modules/khanaa/default.nix b/pkgs/development/python-modules/khanaa/default.nix
index d129cf291fe1..81f76091c593 100644
--- a/pkgs/development/python-modules/khanaa/default.nix
+++ b/pkgs/development/python-modules/khanaa/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cakimpei";
     repo = "khanaa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QFvvahVEld3BooINeUYJDahZyfh5xmQNtWRLAOdr6lw=";
   };
 
diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix
index e7e52dacd187..47b98e771175 100644
--- a/pkgs/development/python-modules/kiss-headers/default.nix
+++ b/pkgs/development/python-modules/kiss-headers/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ousret";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk=";
   };
 
diff --git a/pkgs/development/python-modules/kiwiki-client/default.nix b/pkgs/development/python-modules/kiwiki-client/default.nix
index 45f328d08fb6..dbc1d53d90ef 100644
--- a/pkgs/development/python-modules/kiwiki-client/default.nix
+++ b/pkgs/development/python-modules/kiwiki-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "c7h";
     repo = "kiwiki_client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CIBed8HzbUqUIzNy1lHxIgjneA6R8uKtmd43LU92M0Q=";
   };
 
diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix
index 03580725752d..f51145fe718c 100644
--- a/pkgs/development/python-modules/klein/default.nix
+++ b/pkgs/development/python-modules/klein/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twisted";
     repo = "klein";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2/zl4fS9ZP73quPmGnz2+brEt84ODgVS89Om/cUsj0M=";
   };
 
diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix
index 2732efae80fd..d0a1d730bbce 100644
--- a/pkgs/development/python-modules/kmapper/default.nix
+++ b/pkgs/development/python-modules/kmapper/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-tda";
     repo = "kepler-mapper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i909J0yI8v8BqGbCkcjBAdA02Io+qpILdDkojZj0wv4=";
   };
 
diff --git a/pkgs/development/python-modules/kneaddata/default.nix b/pkgs/development/python-modules/kneaddata/default.nix
index 84e05e1e6b6b..f63218afaa42 100644
--- a/pkgs/development/python-modules/kneaddata/default.nix
+++ b/pkgs/development/python-modules/kneaddata/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "biobakery";
     repo = "kneaddata";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8pXabwMGNZETEXP0A31SInj37pvogyKpJAaAY7aTyns=";
   };
 
diff --git a/pkgs/development/python-modules/kneed/default.nix b/pkgs/development/python-modules/kneed/default.nix
index 1148522ab5a8..f94f9fe64cc7 100644
--- a/pkgs/development/python-modules/kneed/default.nix
+++ b/pkgs/development/python-modules/kneed/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "arvkevi";
     repo = "kneed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oakP6NkdvTzMZcoXS6cKNsRo//K+CoPLlhvbQLGij00=";
   };
 
diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix
index c1337f87f7fa..b5311998abf9 100644
--- a/pkgs/development/python-modules/kornia-rs/default.nix
+++ b/pkgs/development/python-modules/kornia-rs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kornia";
     repo = "kornia-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7toCMaHzFAzm6gThVLBxKLgQVgFJatdJseDlfdeS8RE=";
   };
 
diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix
index 93a783bdba7c..b383727a03bf 100644
--- a/pkgs/development/python-modules/kornia/default.nix
+++ b/pkgs/development/python-modules/kornia/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ecps1KniiL1WOGk+i/UAVuXJ2W7cgHSzAKCkZokyWIM=";
   };
 
diff --git a/pkgs/development/python-modules/kubernetes-asyncio/default.nix b/pkgs/development/python-modules/kubernetes-asyncio/default.nix
index 56d3e58b7a46..308d7dd8bb7b 100644
--- a/pkgs/development/python-modules/kubernetes-asyncio/default.nix
+++ b/pkgs/development/python-modules/kubernetes-asyncio/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomplus";
     repo = "kubernetes_asyncio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YKBqhUeLqLiQ6bK235zTm4salnSLUxl4DUiFLQSjWqw=";
   };
 
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 66a295dcc5a7..d6eda9175ef2 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kubernetes-client";
     repo = "python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zOooibXkk0iA6IYJViz+SIMgHwG0fr4WR3ZjhgIeUjE=";
   };
 
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index b81962cd7d9d..5c7718d6ad24 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Labelbox";
     repo = "labelbox-python";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-vfhlzkCTm1fhvCpzwAaXWPyXE8/2Yx63fTVHl5CWon4=";
   };
 
diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix
index 0902bbd60a8d..1ae59e870c67 100644
--- a/pkgs/development/python-modules/labgrid/default.nix
+++ b/pkgs/development/python-modules/labgrid/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "labgrid-project";
     repo = "labgrid";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rW9peT4zoPzVR6Kl/E8G4qBig/x/lvxpCtvNtwIIL+U=";
   };
 
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 7b1c27e4c9ff..089de94fbe67 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "LacusCore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KiYpPgwMsIuIDUjQfw83ATiE5VI2XMaxGsnP5xEypqc=";
   };
 
diff --git a/pkgs/development/python-modules/lakeside/default.nix b/pkgs/development/python-modules/lakeside/default.nix
index 37e0444bd66c..4d889e90d25b 100644
--- a/pkgs/development/python-modules/lakeside/default.nix
+++ b/pkgs/development/python-modules/lakeside/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nkgilley";
     repo = "python-lakeside";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y5g78trkwOF3jsbgTv0uVkvfB1HZN+w1T6xIorxGAhg=";
   };
 
diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix
index 950a67d1d334..d11626512d98 100644
--- a/pkgs/development/python-modules/lancedb/default.nix
+++ b/pkgs/development/python-modules/lancedb/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lancedb";
-    rev = "refs/tags/python-v${version}";
+    tag = "python-v${version}";
     hash = "sha256-lw2tZ26Py6JUxuetaokJKnxOv/WoLK4spxssLKxvxJA=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 0ec1aec1d3d2..640cf8884099 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LHhyEkgu1sjOk4E4WMy4vYGyikqdVD3WvRPjoAP1CfA=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
index 84e899b288f1..c66ac3e257ad 100644
--- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
+++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-azure-dynamic-sessions==${version}";
+    tag = "langchain-azure-dynamic-sessions==${version}";
     hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index 939759afb2b4..21ba3040692f 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-chroma==${version}";
+    tag = "langchain-chroma==${version}";
     hash = "sha256-pU7H8OYXa+JjdkSO36xESPI6r3xA+9cFXxeJnfpYuHc=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index 50b3992a9b61..76027e60bdb9 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-core==${version}";
+    tag = "langchain-core==${version}";
     hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 7717b67d06a0..fa5282d2079f 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-core==${version}";
+    tag = "langchain-core==${version}";
     hash = "sha256-lSXAqjjnihuucTZOSwQJk8gtrtFbUOTHN4J587iLKy0=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index 074f87ee135e..f191347cbcbf 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-huggingface==${version}";
+    tag = "langchain-huggingface==${version}";
     hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 78a3a9b06431..2a1b2354276c 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-mongodb==${version}";
+    tag = "langchain-mongodb==${version}";
     hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index 72bcf180d414..4210b4cebed0 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-ollama==${version}";
+    tag = "langchain-ollama==${version}";
     hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index ee733d90523c..7ed9579a7bc5 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-openai==${version}";
+    tag = "langchain-openai==${version}";
     hash = "sha256-Gm7MAOuG+kYQ3TRTRdQXJ+HcoUz+iL9j+pTXz+zAySg=";
   };
 
diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index aed23439349e..a3b00041ee53 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain-text-splitters==${version}";
+    tag = "langchain-text-splitters==${version}";
     hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
   };
 
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index c9788da19f19..e40ac70506df 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    rev = "refs/tags/langchain==${version}";
+    tag = "langchain==${version}";
     hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY=";
   };
 
diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index 8319c140be52..69ce3133d42f 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uhbCLDjOU13KAJcCXz03IPNICG5ZI16KIShY2sXPkp4=";
   };
 
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   meta = {
     description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability";
     homepage = "https://github.com/langfuse/langfuse-python";
-    changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/langfuse/langfuse-python/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 12a731af5f30..1c0676a114b3 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-d0PJaC1MhVS3i4AtXUjSkkq/Yj2Pi42H/cW/XML/94o=";
   };
 
diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix
index b83ba0168248..171e355ace08 100644
--- a/pkgs/development/python-modules/language-data/default.nix
+++ b/pkgs/development/python-modules/language-data/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "georgkrause";
     repo = "language_data";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qHPie07GtVPKP/PFlP72XVVrl6j+5A8fIO729aPRsrc=";
   };
 
diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix
index a4397834df3a..7bbd3f9a65ab 100644
--- a/pkgs/development/python-modules/language-tags/default.nix
+++ b/pkgs/development/python-modules/language-tags/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OnroerendErfgoed";
     repo = "language-tags";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-T9K290seKhQLqW36EfA9kn3WveKCmyjN4Mx2j50qIEk=";
   };
 
diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix
index 152cdd92598e..d6baab279b19 100644
--- a/pkgs/development/python-modules/lark/default.nix
+++ b/pkgs/development/python-modules/lark/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-02NX/2bHTYSVTDLLudJmEU2DcQNn0Ke+5ayilKLlwqA=";
   };
 
diff --git a/pkgs/development/python-modules/laundrify-aio/default.nix b/pkgs/development/python-modules/laundrify-aio/default.nix
index e6ccf3531af2..b5b8b5cdbc26 100644
--- a/pkgs/development/python-modules/laundrify-aio/default.nix
+++ b/pkgs/development/python-modules/laundrify-aio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "laundrify";
     repo = "laundrify-pypi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iFQ0396BkGWM7Ma/I0gbXucd2/yPmEVF4IC3/bMK2SA=";
   };
 
diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix
index e6c5fcda855c..cf4187decb6c 100644
--- a/pkgs/development/python-modules/layoutparser/default.nix
+++ b/pkgs/development/python-modules/layoutparser/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Layout-Parser";
     repo = "layout-parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA=";
   };
 
diff --git a/pkgs/development/python-modules/lazy-imports/default.nix b/pkgs/development/python-modules/lazy-imports/default.nix
index f52db38bf30d..7edb6f883228 100644
--- a/pkgs/development/python-modules/lazy-imports/default.nix
+++ b/pkgs/development/python-modules/lazy-imports/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "telekom";
     repo = "lazy-imports";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-i+VPlBoxNqk56U4oiEgS1Ayhi1t2O8PtLZ/bzEurUY8=";
   };
 
diff --git a/pkgs/development/python-modules/lazy-loader/default.nix b/pkgs/development/python-modules/lazy-loader/default.nix
index ad51358ccb78..de49729634cb 100644
--- a/pkgs/development/python-modules/lazy-loader/default.nix
+++ b/pkgs/development/python-modules/lazy-loader/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scientific-python";
     repo = "lazy_loader";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4Kid6yhm9C2liPoW+NlCsOiBZvv6iYt7hDunARc4PRY=";
   };
 
diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix
index 91258c86a08b..c1fe8c82de4f 100644
--- a/pkgs/development/python-modules/lcgit/default.nix
+++ b/pkgs/development/python-modules/lcgit/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cisagov";
     repo = "lcgit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aMwjgN9//jAnTYnbJJvQyfE/f+5QosKxF1l4vF+3myc=";
   };
 
diff --git a/pkgs/development/python-modules/ld2410-ble/default.nix b/pkgs/development/python-modules/ld2410-ble/default.nix
index a811cdb3171a..7836c5fdffd0 100644
--- a/pkgs/development/python-modules/ld2410-ble/default.nix
+++ b/pkgs/development/python-modules/ld2410-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "930913";
     repo = "ld2410-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wQnE2hNT0UOnPJbHq1eayIO8g0XRZvEH6V19DL6RqoA=";
   };
 
diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix
index c6c83aa64ba6..42abf5cfd9a9 100644
--- a/pkgs/development/python-modules/ldfparser/default.nix
+++ b/pkgs/development/python-modules/ldfparser/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "c4deszes";
     repo = "ldfparser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4=";
   };
 
diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix
index 5df616e5f8d6..fa8246f35f45 100644
--- a/pkgs/development/python-modules/leaone-ble/default.nix
+++ b/pkgs/development/python-modules/leaone-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "leaone-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg=";
   };
 
diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix
index 4840c3cc678a..5cafea606a0e 100644
--- a/pkgs/development/python-modules/leb128/default.nix
+++ b/pkgs/development/python-modules/leb128/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mohanson";
     repo = "leb128";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7ZjDqxGUANk3FfB3HPTc5CB5YcIi2ee0igXWAYXaZ88=";
   };
 
diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix
index 75816e7ab42c..9b4c088b2b16 100644
--- a/pkgs/development/python-modules/led-ble/default.nix
+++ b/pkgs/development/python-modules/led-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "led-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FPF/jPsXVk16UDpfglmVy01sOpv/XAwx+dCYCbJnFZQ=";
   };
 
diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix
index e7c3e0a198d3..a6c4c6ee4bca 100644
--- a/pkgs/development/python-modules/legacy-cgi/default.nix
+++ b/pkgs/development/python-modules/legacy-cgi/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jackrosenthal";
     repo = "legacy-cgi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hhWZoRswkuwvgkcKthNhMkPPhhoRH4TjdNp+orluQTQ=";
   };
 
diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix
index 947b968e0def..ce95c5bd7f26 100644
--- a/pkgs/development/python-modules/leidenalg/default.nix
+++ b/pkgs/development/python-modules/leidenalg/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "leidenalg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oaTV+BIB/YQBWKrVXuiIEMH/1MxPxeHhjUzbmxt6hlw=";
   };
 
diff --git a/pkgs/development/python-modules/lektricowifi/default.nix b/pkgs/development/python-modules/lektricowifi/default.nix
index b6b4a5142c3c..39e2f0d62c47 100644
--- a/pkgs/development/python-modules/lektricowifi/default.nix
+++ b/pkgs/development/python-modules/lektricowifi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lektrico";
     repo = "lektricowifi";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-NwM1WpH6tS0iAVpG2gSFJpDPPn9nECHAzpOnWzeYPH4=";
   };
 
diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index 09e7f36d7f86..367c6f0eb1ec 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "Levenshtein";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uLOOAmJ8Y0z+tuIIOSnI8qZoZ+IA2+tNBX1lDCvc8+A=";
     fetchSubmodules = true; # # for vendored `rapidfuzz-cpp`
   };
diff --git a/pkgs/development/python-modules/lexilang/default.nix b/pkgs/development/python-modules/lexilang/default.nix
index e586eba5a3e2..b84122e76abe 100644
--- a/pkgs/development/python-modules/lexilang/default.nix
+++ b/pkgs/development/python-modules/lexilang/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LibreTranslate";
     repo = "LexiLang";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/uSoEz/5HJnFVkXZndIlM+K0OJLJaorFQ6+kWYELjrs=";
   };
 
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 15d3cefb88ca..f46da3435892 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "romanz";
     repo = "trezor-agent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NmpFyLjLdR9r1tc06iDNH8Tc7isUelTg13mWPrQvxSc=";
   };
 
diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix
index 6859fa08574f..4eb83031c885 100644
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/pkgs/development/python-modules/libarchive-c/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Changaco";
     repo = "python-${pname}";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk=";
   };
 
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index 94d18746a5b6..af3621b4e18b 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Instagram";
     repo = "LibCST";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fveY4ah94pv9ImI36MNrrxTpZv/DtLb45pXm67L8/GA=";
   };
 
diff --git a/pkgs/development/python-modules/libgravatar/default.nix b/pkgs/development/python-modules/libgravatar/default.nix
index 57b799854854..0464efc2cebc 100644
--- a/pkgs/development/python-modules/libgravatar/default.nix
+++ b/pkgs/development/python-modules/libgravatar/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pabluk";
     repo = "libgravatar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rJv/jfdT+JldxR0kKtXQLOI5wXQYSQRWJnqwExwWjTA=";
   };
 
diff --git a/pkgs/development/python-modules/libpysal/default.nix b/pkgs/development/python-modules/libpysal/default.nix
index c81bab3c1512..346612dac3ca 100644
--- a/pkgs/development/python-modules/libpysal/default.nix
+++ b/pkgs/development/python-modules/libpysal/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysal";
     repo = "libpysal";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-snhCEKeGKKj/bTDYi6ZVv5F4b/2rz/JHIFG2IoINQ+Q=";
   };
 
diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix
index 642b67cdac31..4e08a9a5e1e3 100644
--- a/pkgs/development/python-modules/librespot/default.nix
+++ b/pkgs/development/python-modules/librespot/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kokarare1212";
     repo = "librespot-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM=";
   };
 
diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix
index dc02429a68f6..11ba515da2e9 100644
--- a/pkgs/development/python-modules/libretranslate/default.nix
+++ b/pkgs/development/python-modules/libretranslate/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LibreTranslate";
     repo = "LibreTranslate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u0m9dTxwSGU50YplV24daSO+WY/At648OpIEZYMmqqo=";
   };
 
diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix
index c7e6c331c836..2dc53cc0c7d4 100644
--- a/pkgs/development/python-modules/librouteros/default.nix
+++ b/pkgs/development/python-modules/librouteros/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "luqasz";
     repo = "librouteros";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vN12LYqFOU7flD6bTFtGw5VhPJ238pZ0MStM3ljwDU4=";
   };
 
diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix
index acb94983dcf6..8446d0905aa5 100644
--- a/pkgs/development/python-modules/libsass/default.nix
+++ b/pkgs/development/python-modules/libsass/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sass";
     repo = "libsass-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CiSr9/3EDwpDEzu6VcMBAlm3CtKTmGYbZMnMEjyZVxI=";
   };
 
diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix
index fc26b3248404..3f9112e59139 100644
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CharlesBlonde";
     repo = "libsoundtouch";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-am8nHPdtKMh8ZA/jKgz2jnltpvgEga8/BjvP5nrhgvI=";
   };
 
diff --git a/pkgs/development/python-modules/liccheck/default.nix b/pkgs/development/python-modules/liccheck/default.nix
index 62d5b428c71c..0571d96588af 100644
--- a/pkgs/development/python-modules/liccheck/default.nix
+++ b/pkgs/development/python-modules/liccheck/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dhatim";
     repo = "python-license-check";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2WJw5TVMjOr+GX4YV0nssOtQeYvDHBLnlWquJQWPL9I=";
   };
 
diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index c94dbe57e0fa..d1f82fc8588f 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aboutcode-org";
     repo = "license-expression";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RAgGg0Xekcw5H13YHmkgfL7eybK+4tA8EAvVTuWFRck=";
   };
 
diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix
index 1825350631d3..9c01495c6c0b 100644
--- a/pkgs/development/python-modules/life360/default.nix
+++ b/pkgs/development/python-modules/life360/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pnbruckner";
     repo = "life360";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GkCs479lXcnCvb5guxyc+ZuZdiH4n8uD2VbkC+yijgg=";
   };
 
diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix
index 1543ce87a885..c8e2a07bf5b1 100644
--- a/pkgs/development/python-modules/lifelines/default.nix
+++ b/pkgs/development/python-modules/lifelines/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CamDavidsonPilon";
     repo = "lifelines";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rbt0eON8Az5jDvj97RDn3ppWyjbrSa/xumbwhq21g6g=";
   };
 
diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix
index c6a161b34ef6..7b96e00577b0 100644
--- a/pkgs/development/python-modules/lightning-utilities/default.nix
+++ b/pkgs/development/python-modules/lightning-utilities/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "utilities";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7fRn7KvB7CEq8keVR8nrf6IY2G8omAQqNX+DPEf+7nc=";
   };
 
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index d1f78b740643..4c792674a9d2 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alisaifee";
     repo = "limits";
-    rev = "refs/tags/${version}";
+    tag = version;
     # Upstream uses versioneer, which relies on git attributes substitution.
     # This leads to non-reproducible archives on github. Remove the substituted
     # file here, and recreate it later based on our version info.
diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix
index f3ea213b038b..d24583f86ca8 100644
--- a/pkgs/development/python-modules/linear-garage-door/default.nix
+++ b/pkgs/development/python-modules/linear-garage-door/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IceBotYT";
     repo = "linear-garage-door";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4=";
   };
 
diff --git a/pkgs/development/python-modules/linear-operator/default.nix b/pkgs/development/python-modules/linear-operator/default.nix
index e32b3f2c8f7b..ffeb1d8f25de 100644
--- a/pkgs/development/python-modules/linear-operator/default.nix
+++ b/pkgs/development/python-modules/linear-operator/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cornellius-gp";
     repo = "linear_operator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fKDVaHyaneV6MafJd/RT2InZO5cuYoC36YgzQhfIH8g=";
   };
 
diff --git a/pkgs/development/python-modules/linetable/default.nix b/pkgs/development/python-modules/linetable/default.nix
index bd9c16783fc0..515535872fcf 100644
--- a/pkgs/development/python-modules/linetable/default.nix
+++ b/pkgs/development/python-modules/linetable/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amol-";
     repo = "linetable";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nVZVxK6uB5TP0pReaEya3/lFXFkiqpnnaWqYzxzO6bM=";
   };
 
diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix
index 3f6002284a5c..5deff1a94709 100644
--- a/pkgs/development/python-modules/lingva/default.nix
+++ b/pkgs/development/python-modules/lingva/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "lingva";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2h3J+pvXRmjD7noMA7Cyu5Tf/9R8Akv08A7xJMLVD08=";
   };
 
diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix
index c2dfa51bbf2a..18b2160d98a6 100644
--- a/pkgs/development/python-modules/linien-common/default.nix
+++ b/pkgs/development/python-modules/linien-common/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "linien-org";
     repo = "linien";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j6oiP/usLfV5HZtKLcXQ5pHhhxRG05kP2FMwingiWm0=";
   };
 
diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix
index 81296c611ca1..6ca3fd64c917 100644
--- a/pkgs/development/python-modules/linkify-it-py/default.nix
+++ b/pkgs/development/python-modules/linkify-it-py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tsutsu3";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BLwIityUZDVdSbvTpLf6QUlZUavWzG/45Nfffn18/vU=";
   };
 
diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix
index 2fd6c15d6b00..973ee6de1346 100644
--- a/pkgs/development/python-modules/linknlink/default.nix
+++ b/pkgs/development/python-modules/linknlink/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xuanxuan000";
     repo = "python-linknlink";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ObPEcdDHi+SPFjuVKBtu7/5/IgHcam+IWblxxS3+mmI=";
   };
 
diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix
index 8a19dd65e6e2..bee0580e27e8 100644
--- a/pkgs/development/python-modules/liquidctl/default.nix
+++ b/pkgs/development/python-modules/liquidctl/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI=";
   };
 
diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index d15f042a7ad2..f08e092e2b21 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BerriAI";
     repo = "litellm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xSILlbZhu6GgFFg5+f20x2Hxy4KnHMbSV18VFnjUrMQ=";
   };
 
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index a110a8082c14..205abfc7b384 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-llfuse";
     repo = "python-llfuse";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-wni/b1hEn6/G0RszCJi+wmBHx6F0Ov1cZ/sRf8PLmps=";
   };
 
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 19941cd4b4a3..1a114af52c7c 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "numba";
     repo = "llvmlite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o=";
   };
 
diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix
index 3abbc92bcc5c..95cc641fbee0 100644
--- a/pkgs/development/python-modules/lm-format-enforcer/default.nix
+++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "noamgat";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8+hve/6YezM07+4BmmBEAPZ0B2d8xDguXoHf7FuQWP8=";
   };
 
diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix
index 70d541fe52d8..4c12750e82f3 100644
--- a/pkgs/development/python-modules/lnkparse3/default.nix
+++ b/pkgs/development/python-modules/lnkparse3/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Matmaus";
     repo = "LnkParse3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4=";
   };
 
diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix
index 08f03e1856f8..9eeab158ca10 100644
--- a/pkgs/development/python-modules/localstack/default.nix
+++ b/pkgs/development/python-modules/localstack/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA=";
   };
 
diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix
index 3e7d91fe841f..4ce88e0a71c3 100644
--- a/pkgs/development/python-modules/localzone/default.nix
+++ b/pkgs/development/python-modules/localzone/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ags-slc";
     repo = "localzone";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-quAo5w4Oxu9Hu96inu3vuiQ9GZMLpq0M8Vj67IPYcbE=";
   };
 
diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix
index ba7a193318e9..ed9ddb19fb9f 100644
--- a/pkgs/development/python-modules/locust/default.nix
+++ b/pkgs/development/python-modules/locust/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "locustio";
     repo = "locust";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xDquVQjkWVER9h0a6DHWRZH6KtRf0jsThycSojDEdh4=";
   };
 
diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix
index 51ba2cce6ea1..14b1ac2ce6fc 100644
--- a/pkgs/development/python-modules/logging-journald/default.nix
+++ b/pkgs/development/python-modules/logging-journald/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RQ9opkAOZfhYuqOXJ2Mtnig8soL+lCveYH2YdXL1AGM=";
   };
 
diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix
index 9c47c3b6a466..ef0bf25cc8ff 100644
--- a/pkgs/development/python-modules/logical-unification/default.nix
+++ b/pkgs/development/python-modules/logical-unification/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pythological";
     repo = "unification";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uznmlkREFONU1YoI/+mcfb+Yg30NinWvsMxTfHCXzOU=";
   };
 
diff --git a/pkgs/development/python-modules/logmatic-python/default.nix b/pkgs/development/python-modules/logmatic-python/default.nix
index 1dc8ce7d024c..d129a16f7f9b 100644
--- a/pkgs/development/python-modules/logmatic-python/default.nix
+++ b/pkgs/development/python-modules/logmatic-python/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "logmatic";
     repo = "logmatic-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UYKm00KhXnPQDkKJVm7s0gOwZ3GNY07O0oKbzPhAdVE=";
   };
 
diff --git a/pkgs/development/python-modules/loopy/default.nix b/pkgs/development/python-modules/loopy/default.nix
index 72268b19e6f1..f8833a60ddfb 100644
--- a/pkgs/development/python-modules/loopy/default.nix
+++ b/pkgs/development/python-modules/loopy/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inducer";
     repo = "loopy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mU8vXEPR88QpJpzXZlZdDhMtlwIx5YpeYhXU8Vw2T9g=";
     fetchSubmodules = true; # submodule at `loopy/target/c/compyte`
   };
diff --git a/pkgs/development/python-modules/loqedapi/default.nix b/pkgs/development/python-modules/loqedapi/default.nix
index 5aabc6791057..2f3c1fdc405a 100644
--- a/pkgs/development/python-modules/loqedapi/default.nix
+++ b/pkgs/development/python-modules/loqedapi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cpolhout";
     repo = "loqedAPI";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IYzrGqql6mmm+FmasxFJvKgHvg7n81WOu+GGAEQ1+Os=";
   };
 
diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix
index 067d8b06c969..385e5832d218 100644
--- a/pkgs/development/python-modules/losant-rest/default.nix
+++ b/pkgs/development/python-modules/losant-rest/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Losant";
     repo = "losant-rest-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1CxcA9/FvKP3P0Q02by0hBHQTAcbfLCp3AualHhZyvY=";
   };
 
diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix
index c22162404997..5cea402143a5 100644
--- a/pkgs/development/python-modules/lox/default.nix
+++ b/pkgs/development/python-modules/lox/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "lox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Iv3ZdfsvFLU6lhlH1n+eQ+KIrXESsnC1S2lVFnKFV08=";
   };
 
diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index 52c2e211ade4..12e1e6f8352d 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Hackndo";
     repo = "lsassy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DdIEDseGLI+hUIaUNPBqpkGGe+F+Z+jZ0g/JzXB8pf8=";
   };
 
diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
index b4bba5724077..9b8b0cf874cc 100644
--- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix
+++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "lsp-tree-sitter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nRzyVZFgb08M0I+xmhuX1LDwPsghlBLdZ2Ou8stKzk0=";
   };
 
diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix
index 8e23e7b92fda..06e85fae1e73 100644
--- a/pkgs/development/python-modules/lsprotocol/default.nix
+++ b/pkgs/development/python-modules/lsprotocol/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "lsprotocol";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PHjLKazMaT6W4Lve1xNxm6hEwqE3Lr2m5L7Q03fqb68=";
   };
 
diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix
index c7db0497e0cc..435db8725cd0 100644
--- a/pkgs/development/python-modules/luddite/default.nix
+++ b/pkgs/development/python-modules/luddite/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jumptrading";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iJ3h1XRBzLd4cBKFPNOlIV5Z5XJ/miscfIdkpPIpbJ8=";
   };
 
diff --git a/pkgs/development/python-modules/luna-soc/default.nix b/pkgs/development/python-modules/luna-soc/default.nix
index 277dabe0e89e..70a388bdb1e1 100644
--- a/pkgs/development/python-modules/luna-soc/default.nix
+++ b/pkgs/development/python-modules/luna-soc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna-soc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P8P32hM1cVXENcDpCrmPe8BvkMCWdeEgHwbIU94uLe8=";
   };
 
diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix
index e5a7b44cd275..14b3c2e561e2 100644
--- a/pkgs/development/python-modules/luna-usb/default.nix
+++ b/pkgs/development/python-modules/luna-usb/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-T9V0rI6vcEpM3kN/duRni6v2plCU4B379Zx07dBGKjk=";
   };
 
diff --git a/pkgs/development/python-modules/luqum/default.nix b/pkgs/development/python-modules/luqum/default.nix
index 9280ebef736f..21765e76d0ea 100644
--- a/pkgs/development/python-modules/luqum/default.nix
+++ b/pkgs/development/python-modules/luqum/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jurismarches";
     repo = "luqum";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lcJCLl0crCl3Y5UlWBMZJR2UtVP96gaJNRxwY9Xn7TM=";
   };
 
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index c5ddfe44736a..03c1316f4d6f 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "lxmf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-68c4KrXudjs6YGi282pa31XwbvjsXgKVQ2e+zPBYHf4=";
   };
 
diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix
index 74d672978b6a..2ace7889c047 100644
--- a/pkgs/development/python-modules/lxml-html-clean/default.nix
+++ b/pkgs/development/python-modules/lxml-html-clean/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fedora-python";
     repo = "lxml_html_clean";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tZDFpJg7YySJ6CrSesD9+WWZS/guQFNmpSVsMzfzbpU=";
   };
 
diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix
index 60d2baf7c685..7562874daaa0 100644
--- a/pkgs/development/python-modules/lxml-stubs/default.nix
+++ b/pkgs/development/python-modules/lxml-stubs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lxml";
     repo = "lxml-stubs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I=";
   };
 
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 0a0bef5219ca..87a225095f66 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lxml";
     repo = "lxml";
-    rev = "refs/tags/lxml-${version}";
+    tag = "lxml-${version}";
     hash = "sha256-xhKtqsh5FfgXt1fKUhN/Aib/004P7epArv3/XxDSBtw=";
   };
 
diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix
index 0a19c22ddf8e..a465014b5951 100644
--- a/pkgs/development/python-modules/lyricwikia/default.nix
+++ b/pkgs/development/python-modules/lyricwikia/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "enricobacis";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P88DrRAa2zptt8JLy0/PLi0oZ/BghF/XGSP0kOObi7E=";
   };
 
diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index 627aa8a446a8..b4b593c69157 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lz4";
     repo = "python-lz4";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZvGUkb9DoheYY2/sejUhxgh2lS5eoBrFCXR4E0IcFcs=";
   };
 
diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix
index b4a28dce2809..896ccb51d19c 100644
--- a/pkgs/development/python-modules/m3u8/default.nix
+++ b/pkgs/development/python-modules/m3u8/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "globocom";
     repo = "m3u8";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1SOuKKNBg67Yc0a6Iqb1goTE7sraptzpFIB2lvrbMQg=";
   };
 
diff --git a/pkgs/development/python-modules/maec/default.nix b/pkgs/development/python-modules/maec/default.nix
index 2c29be54289f..6a8eeee3a008 100644
--- a/pkgs/development/python-modules/maec/default.nix
+++ b/pkgs/development/python-modules/maec/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MAECProject";
     repo = "python-maec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I2Ov2AQiC9D8ivHqn7owcTsNS7Kw+CWVyijK3VO52Og=";
   };
 
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 52ebece15314..97b67651e19b 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-akh0COltpUU4Z4kfubg6A7k6W8ICoqVYkmFpMkTC8H8=";
   };
 
diff --git a/pkgs/development/python-modules/magic-filter/default.nix b/pkgs/development/python-modules/magic-filter/default.nix
index fa963525c6b8..1d0589d50ad7 100644
--- a/pkgs/development/python-modules/magic-filter/default.nix
+++ b/pkgs/development/python-modules/magic-filter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aiogram";
     repo = "magic-filter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MSYIZ/bzngRu6mG3EGblUotSCA+6bi+l3EymFA8NRZA=";
   };
 
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 0f01a6d2fd9a..ee326cc004ab 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4=";
   };
 
diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
index 307ed168acdb..ed17db74b4f0 100644
--- a/pkgs/development/python-modules/mahotas/default.nix
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "luispedro";
     repo = "mahotas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9tjk3rhcfAYROZKwmwHzHAN7Ui0EgmxPErQyF//K0r8=";
   };
 
diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
index 807c97f6adde..cd495877b92f 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SpamScope";
     repo = "mail-parser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AXMfb+9POEaosCc+dv1xenhvBbpVkllMjftMoADUPXE=";
   };
 
diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix
index 4b94862ce332..2d7fee7df227 100644
--- a/pkgs/development/python-modules/maison/default.nix
+++ b/pkgs/development/python-modules/maison/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbatten5";
     repo = "maison";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw=";
   };
 
diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix
index 204003bdddbc..43a915f16a0b 100644
--- a/pkgs/development/python-modules/malduck/default.nix
+++ b/pkgs/development/python-modules/malduck/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = "malduck";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Btx0HxiZWrb0TDpBokQGtBE2EDK0htONe/DwqlPgAd4=";
   };
 
diff --git a/pkgs/development/python-modules/mamba-ssm/default.nix b/pkgs/development/python-modules/mamba-ssm/default.nix
index 11ac68c1e19d..759947cea2b9 100644
--- a/pkgs/development/python-modules/mamba-ssm/default.nix
+++ b/pkgs/development/python-modules/mamba-ssm/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "state-spaces";
     repo = "mamba";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R702JjM3AGk7upN7GkNK8u1q4ekMK9fYQkpO6Re45Ng=";
   };
 
diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix
index 17c8b691b4a8..bcd93f338523 100644
--- a/pkgs/development/python-modules/mandown/default.nix
+++ b/pkgs/development/python-modules/mandown/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "potatoeggy";
     repo = "mandown";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eMZXXOGe9jKf9bXEinIIu6w3i4SOkLnDWnxmT5G0RWA=";
   };
 
diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix
index 3c8ea272b7a5..5c6c54975353 100644
--- a/pkgs/development/python-modules/manga-ocr/default.nix
+++ b/pkgs/development/python-modules/manga-ocr/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kha-white";
     repo = "manga-ocr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0EwXDMnA9SCmSsMVXnMenSFSzs74lorFNNym9y/NNsI=";
   };
 
diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix
index 80d80d51f934..f5a4eb315d52 100644
--- a/pkgs/development/python-modules/manifest-ml/default.nix
+++ b/pkgs/development/python-modules/manifest-ml/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HazyResearch";
     repo = "manifest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6m1XZOXzflBYyq9+PinbrW+zqvNGFN/aRDHH1b2Me5E=";
   };
 
diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix
index d9585ee525b7..f2394afc9631 100644
--- a/pkgs/development/python-modules/manifold3d/default.nix
+++ b/pkgs/development/python-modules/manifold3d/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wbeWxAeKyqjEPemc2e5n357gwq83pQlASOvMd0ZCE7g=";
   };
 
diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix
index 71c1d1fb66e3..c3b35754f432 100644
--- a/pkgs/development/python-modules/manim-slides/default.nix
+++ b/pkgs/development/python-modules/manim-slides/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeertmans";
     repo = "manim-slides";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M500u7x0jQqcqCd3RbS0CpI1nuwNs9URFlHPeGkiT7E=";
   };
 
diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index 1cf47a981770..14bc1ad76be9 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -181,7 +181,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ManimCommunity";
     repo = "manim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ=";
   };
 
diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix
index 9197d44043e8..a70c1930fc20 100644
--- a/pkgs/development/python-modules/manimpango/default.nix
+++ b/pkgs/development/python-modules/manimpango/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ManimCommunity";
     repo = "manimpango";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w=";
   };
 
diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix
index c7359364b2fb..d6283b00add7 100644
--- a/pkgs/development/python-modules/mapbox-earcut/default.nix
+++ b/pkgs/development/python-modules/mapbox-earcut/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skogler";
     repo = "mapbox_earcut_python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xR+nO5xdoDUhWZM19DOid3lsEXBood5NofQ0SezJ9OE=";
   };
 
diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix
index 9a01fd479016..572cae4cdae9 100644
--- a/pkgs/development/python-modules/mapclassify/default.nix
+++ b/pkgs/development/python-modules/mapclassify/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysal";
     repo = "mapclassify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VClkMOR8P9sX3slVjJ2xYYLVnvZuOgVYZiCGrBxoZEc=";
   };
 
diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix
index d166277a459a..e437a9cc0f76 100644
--- a/pkgs/development/python-modules/mariadb/default.nix
+++ b/pkgs/development/python-modules/mariadb/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YpA65J8ozKJfpOc4hZLdgCcT3j/lqRiNeX7k8U/aYkE=";
   };
 
diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix
index dbc7a43d30f9..69da5c6ae1c6 100644
--- a/pkgs/development/python-modules/markdown-include/default.nix
+++ b/pkgs/development/python-modules/markdown-include/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cmacmackin";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1MEk0U00a5cpVhqnDZkwBIk4NYgsRXTVsI/ANNQ/OH0=";
   };
 
diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix
index 3f0af08d192a..8aa6678241f2 100644
--- a/pkgs/development/python-modules/markdown-it-py/default.nix
+++ b/pkgs/development/python-modules/markdown-it-py/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cmjLElJA61EysTUFMVY++Kw0pI4wOIXOyCY3To9fpQc=";
   };
 
diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix
index f99269fb3608..cf1170242375 100644
--- a/pkgs/development/python-modules/markdown/default.nix
+++ b/pkgs/development/python-modules/markdown/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Python-Markdown";
     repo = "markdown";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bIBen693MC56k4LZ+8vhbvP+E3myFXoaXpNHOlnIdG8=";
   };
 
diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix
index aa69e9835c95..51f81b9525f1 100644
--- a/pkgs/development/python-modules/markdownify/default.nix
+++ b/pkgs/development/python-modules/markdownify/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthewwithanm";
     repo = "python-markdownify";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YJdR1wV72f9/tWQhuhGwScuRcE243fCP+wnYAzBOoV8=";
   };
 
diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix
index d8471107f928..5e99fca5a400 100644
--- a/pkgs/development/python-modules/marko/default.nix
+++ b/pkgs/development/python-modules/marko/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frostming";
     repo = "marko";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KqdBYmlVs00atXy7MSsriRBnL7w13io2oFZ0IyJ2Om4=";
   };
 
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 6e69ea0488c4..8eed9be71ce7 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "markupsafe";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BqCkQqPhjEx3qB/k3d3fSirR/HDBa7e4kpx3/VSwXJM=";
   };
 
diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
index a06997a09e40..7a2ebe81d97b 100644
--- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix
+++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "marshmallow_dataclass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0=";
   };
 
diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix
index 10690ad42657..e1f06b4747f8 100644
--- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix
+++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "marshmallow-oneofschema";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HXuyUxU8bT5arpUzmgv7m+X2fNT0qHY8S8Rz6klOGiA=";
   };
 
diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
index 28fea8cedaf6..c4e5ad21e819 100644
--- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix
+++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bachmann1234";
     repo = "marshmallow-polyfield";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs=";
   };
 
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 71766217fe63..f062aafee9e9 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "marshmallow";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KhXasYKooZRokRoFlWKOaQzSUe6tXDtUlrf65eGGUi8=";
   };
 
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index 67cf71886726..ab3050a643e7 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Fatal1ty";
     repo = "mashumaro";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Zv2FijxYOLGflJ3bc3udkM3SXgHHzHIeCGHlfybyLGE=";
   };
 
diff --git a/pkgs/development/python-modules/masky/default.nix b/pkgs/development/python-modules/masky/default.nix
index 557a02dfcc9a..0a19b4a18da9 100644
--- a/pkgs/development/python-modules/masky/default.nix
+++ b/pkgs/development/python-modules/masky/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Z4kSec";
     repo = "Masky";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-npRuszHkxwjJ+B+q8eQywXPd0OX0zS+AfCro4TM83Uc=";
   };
 
diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix
index e8c80177cbf5..cb2caaf45922 100644
--- a/pkgs/development/python-modules/mastodon-py/default.nix
+++ b/pkgs/development/python-modules/mastodon-py/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "halcy";
     repo = "Mastodon.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-r0AAUjd2MBfZANEpyztMNyaQTlGWvWoUVjJNO1eL218=";
   };
 
diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix
index e12969a95c14..424a4510ae2a 100644
--- a/pkgs/development/python-modules/matplotlib-inline/default.nix
+++ b/pkgs/development/python-modules/matplotlib-inline/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ipython";
     repo = "matplotlib-inline";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-y7T8BshNa8NVWzH8oLS4dTAyhG+YmkkYQJFAyMXsJFA=";
   };
 
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 9375c81a32a5..a219fa49c817 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "matrix-nio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZNYK5D4aDKE+N62A/hPmTphir+UsWvj3BW2EPG1z+R4=";
   };
 
diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 1746fa01dbe9..444ea101c050 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE=";
   };
 
diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix
index 05b5367517d7..64bb26167322 100644
--- a/pkgs/development/python-modules/maya/default.nix
+++ b/pkgs/development/python-modules/maya/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timofurrer";
     repo = "maya";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY=";
   };
 
diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix
index 44630b5121e4..91ef5b7b6d3c 100644
--- a/pkgs/development/python-modules/mayim/default.nix
+++ b/pkgs/development/python-modules/mayim/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ahopkins";
     repo = "mayim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nb0E9kMEJUihaCp8RnqGh0nSyDQo50eL1C4K5lBPlPQ=";
   };
 
diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix
index c7e3681d010d..a568f00fd2e9 100644
--- a/pkgs/development/python-modules/mbstrdecoder/default.nix
+++ b/pkgs/development/python-modules/mbstrdecoder/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GcAxXcCYC2XAE8xu/jdDxjPxkLJzbmvWZ3OgmcvQcmk=";
   };
 
diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index d4c3059e9290..a58c2aad44b7 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-mine";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P8Su5P/ztyoXZBVvm5uCMDn4ezeg11oRSQ0QCyIJbVw=";
   };
 
diff --git a/pkgs/development/python-modules/mcuuid/default.nix b/pkgs/development/python-modules/mcuuid/default.nix
index 0f0a1d922d15..c26cad00155c 100644
--- a/pkgs/development/python-modules/mcuuid/default.nix
+++ b/pkgs/development/python-modules/mcuuid/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "clerie";
     repo = "mcuuid";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YwM7CdZVXpUXKXUzFL3AtoDhekLDIvZ/q8taLsHihNk=";
   };
 
diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix
index 2ee15c4c3003..5287a97e2d39 100644
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frnmst";
     repo = "md-toc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nKkKtLEW0pohXiMtjWl2Kzh7SRwZJ/yzhXpDyluLodc=";
   };
 
diff --git a/pkgs/development/python-modules/md2pdf/default.nix b/pkgs/development/python-modules/md2pdf/default.nix
index abcb118aa818..cb866fe9eedb 100644
--- a/pkgs/development/python-modules/md2pdf/default.nix
+++ b/pkgs/development/python-modules/md2pdf/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmaupetit";
     repo = "md2pdf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9B1vVfcBHk+xdE2Xouu95j3Hp4xm9d5DgPv2zKwCvHY=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix
index efc9e7b2dbb1..e6b872417d3f 100644
--- a/pkgs/development/python-modules/mdformat-admon/default.nix
+++ b/pkgs/development/python-modules/mdformat-admon/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KyleKing";
     repo = "mdformat-admon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YyEiqry1dAm/2EEuQjPFEfdpLI+NiLhVcyx4jAyXs4E=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-beautysh/default.nix b/pkgs/development/python-modules/mdformat-beautysh/default.nix
index 8c71b83aa264..b0015e740382 100644
--- a/pkgs/development/python-modules/mdformat-beautysh/default.nix
+++ b/pkgs/development/python-modules/mdformat-beautysh/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix
index 9b0e35c2eed2..a5cdee5cfcea 100644
--- a/pkgs/development/python-modules/mdformat-footnote/default.nix
+++ b/pkgs/development/python-modules/mdformat-footnote/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix
index 85c054258d76..99de3b541ab9 100644
--- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix
+++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "butler54";
     repo = "mdformat-frontmatter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2heQw8LL/ILY36oItBeQq33qjVBGT51qGG4CcCEDutA=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix
index 097e2b912cf8..611adff811a9 100644
--- a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix
+++ b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KyleKing";
     repo = "mdformat-gfm-alerts";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2EYdNCyS1LxcEnCXkOugAAGx5XLWV4cWTNkXjR8RVQo=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-gfm/default.nix b/pkgs/development/python-modules/mdformat-gfm/default.nix
index dc057d9a82e0..75bed656fa06 100644
--- a/pkgs/development/python-modules/mdformat-gfm/default.nix
+++ b/pkgs/development/python-modules/mdformat-gfm/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = "mdformat-gfm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-c1jJwyTL8IgQnIAJFoPSuJ8VEYgnQ4slZyV0bHlUHLQ=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix b/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix
index a5e55044d4c0..6224f2ad3372 100644
--- a/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix
+++ b/pkgs/development/python-modules/mdformat-nix-alejandra/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aldoborrero";
     repo = "mdformat-nix-alejandra";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jUXApGsxCA+pRm4m4ZiHWlxmVkqCPx3A46oQdtyKz5g=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
index caeb23a214f3..9da3ed6de832 100644
--- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
+++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "csala";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat-toc/default.nix b/pkgs/development/python-modules/mdformat-toc/default.nix
index c97e29248c0e..3d4c3fe42d0f 100644
--- a/pkgs/development/python-modules/mdformat-toc/default.nix
+++ b/pkgs/development/python-modules/mdformat-toc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3EX6kGez408tEYiR9VSvi3GTrb4ds+HJwpFflv77nkg=";
   };
 
diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix
index 3998c6e7de4c..9d67bc59c6a9 100644
--- a/pkgs/development/python-modules/mdformat/default.nix
+++ b/pkgs/development/python-modules/mdformat/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "mdformat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-t2yx8cIq8es3XOc2nbHPKjUUium5+RPZuD8oNWZxVV0=";
   };
 
diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix
index 7287175c665b..92362d5e02fc 100644
--- a/pkgs/development/python-modules/mdit-py-plugins/default.nix
+++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aY2DMLh1OkWVcN6A29FLba1ETerf/EOqSjHVpsdE21M=";
   };
 
diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix
index e4a2dc8587e8..f655aa08bf29 100644
--- a/pkgs/development/python-modules/mdtraj/default.nix
+++ b/pkgs/development/python-modules/mdtraj/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mdtraj";
     repo = "mdtraj";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hNv/humEZOX4W7cOlJSAodk9pIi18//YJNSWNiEFiVg=";
   };
 
@@ -107,7 +107,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Open library for the analysis of molecular dynamics trajectories";
     homepage = "https://github.com/mdtraj/mdtraj";
-    changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${version}";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix
index 5e39efda428b..49334a6e54a7 100644
--- a/pkgs/development/python-modules/mdutils/default.nix
+++ b/pkgs/development/python-modules/mdutils/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "didix21";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xF6z63CjL/qSBQsm/fSTQhwpg9yJU4qrY06cjn1PbCk=";
   };
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
       this way, mdutils will make things easy for creating Markdown files.
     '';
     homepage = "https://github.com/didix21/mdutils";
-    changelog = "https://github.com/didix21/mdutils/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/didix21/mdutils/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ azahi ];
   };
diff --git a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix
index 7787892efdaa..2976abbf6c6f 100644
--- a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix
+++ b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "radude";
     repo = "mdx_truly_sane_lists";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hPnqF1UA4peW8hzeFiMlsBPfodC1qJXETGoq2yUm7d4=";
   };
 
diff --git a/pkgs/development/python-modules/mean-average-precision/default.nix b/pkgs/development/python-modules/mean-average-precision/default.nix
index 24a4d65aaf67..7ab591ebd9e2 100644
--- a/pkgs/development/python-modules/mean-average-precision/default.nix
+++ b/pkgs/development/python-modules/mean-average-precision/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bes-dev";
     repo = "mean_average_precision";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qo160L+oJsHERVOV0qdiRIZPMjvSlUmMTrAzThfrQSs=";
   };
 
diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix
index 67a7d1b10761..ea4d1bf315b7 100644
--- a/pkgs/development/python-modules/measurement/default.nix
+++ b/pkgs/development/python-modules/measurement/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coddingtonbear";
     repo = "python-measurement";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QxXxx9Jbx7ykQFaw/3S6ANPUmw3mhvSa4np6crsfVtE=";
   };
 
diff --git a/pkgs/development/python-modules/mechanicalsoup/default.nix b/pkgs/development/python-modules/mechanicalsoup/default.nix
index 587d54c8004d..5671f85df582 100644
--- a/pkgs/development/python-modules/mechanicalsoup/default.nix
+++ b/pkgs/development/python-modules/mechanicalsoup/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MechanicalSoup";
     repo = "MechanicalSoup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iZ2nwBxikf0cTTlxzcGvHJim4N6ZEqIhlK7t1WAYdms=";
   };
 
diff --git a/pkgs/development/python-modules/medallion/default.nix b/pkgs/development/python-modules/medallion/default.nix
index 04972dc1eb06..a39bbe4bdda7 100644
--- a/pkgs/development/python-modules/medallion/default.nix
+++ b/pkgs/development/python-modules/medallion/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oasis-open";
     repo = "cti-taxii-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk=";
   };
 
diff --git a/pkgs/development/python-modules/medpy/default.nix b/pkgs/development/python-modules/medpy/default.nix
index 239919e4eb35..8a3891bef272 100644
--- a/pkgs/development/python-modules/medpy/default.nix
+++ b/pkgs/development/python-modules/medpy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "loli";
     repo = "medpy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-M46d8qiR3+ioiuRhzIaU5bV1dnfDm819pjn78RYlcG0=";
   };
 
diff --git a/pkgs/development/python-modules/meeko/default.nix b/pkgs/development/python-modules/meeko/default.nix
index 1d2afdbe1097..f949051d7199 100644
--- a/pkgs/development/python-modules/meeko/default.nix
+++ b/pkgs/development/python-modules/meeko/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "forlilab";
     repo = "Meeko";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-I/kAO0a6DbDqmzjS36ETuoH/Z1gR2eNpyE3herHDKMs=";
   };
 
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python package for preparing small molecule for docking";
     homepage = "https://github.com/forlilab/Meeko";
-    changelog = "https://github.com/forlilab/Meeko/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/forlilab/Meeko/releases/tag/v${version}";
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 167a151245a3..e9810167d395 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TB85obdk8pSWRaz3+3I6P6+dQtCHosWHRnKGck/wG9Q=";
   };
 
diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index 4b8802d9ecb1..acd07a2e2795 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Eo1KBpSek1FnSp21vpsJEwISvUYEqOaodwrbarVcu7c=";
   };
 
diff --git a/pkgs/development/python-modules/melnor-bluetooth/default.nix b/pkgs/development/python-modules/melnor-bluetooth/default.nix
index 649433f99795..d95b80ec99b3 100644
--- a/pkgs/development/python-modules/melnor-bluetooth/default.nix
+++ b/pkgs/development/python-modules/melnor-bluetooth/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vanstinator";
     repo = "melnor-bluetooth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BQKXQrPT/+qm9cRO7pfScPwW0iwdhliTfX4XJ/kRQG0=";
   };
 
diff --git a/pkgs/development/python-modules/mercadopago/default.nix b/pkgs/development/python-modules/mercadopago/default.nix
index 930c067086a3..dcbb22d6f0c4 100644
--- a/pkgs/development/python-modules/mercadopago/default.nix
+++ b/pkgs/development/python-modules/mercadopago/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mercadopago";
     repo = "sdk-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-u4/e/shfTyrucf+uj5nqAkeugX9JZjXBrNtoOkpff8c=";
   };
 
diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix
index 4a50b73c5a81..71e8a51b4e03 100644
--- a/pkgs/development/python-modules/merkletools/default.nix
+++ b/pkgs/development/python-modules/merkletools/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tierion";
     repo = "pymerkletools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pd7Wxi7Sk95RcrFOTOtl725nIXidva3ftdKSGxHYPTA=";
   };
 
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index c704714e9a45..5f037426b477 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertogeniola";
     repo = "MerossIot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CEBZVbUkRMWw95imL1k3q7Z3Nkyzwleh5C/s0XxfhfQ=";
   };
 
diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix
index 6adcc91bda99..2377ec39d48b 100644
--- a/pkgs/development/python-modules/metar/default.nix
+++ b/pkgs/development/python-modules/metar/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-metar";
     repo = "python-metar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZDjlXcSTUcSP7oRdhzLpXf/fLUA7Nkc6nj2I6vovbHg=";
   };
 
diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix
index 7f453255f46c..a2f84a590fd5 100644
--- a/pkgs/development/python-modules/meteoalertapi/default.nix
+++ b/pkgs/development/python-modules/meteoalertapi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rolfberkenbosch";
     repo = "meteoalert-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Imb4DVcNB3QiVSCLCI+eKpfl73aMn4NIItQVf7p0H+E=";
   };
 
diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix
index 89cdc0735ea5..9894770ae392 100644
--- a/pkgs/development/python-modules/meteofrance-api/default.nix
+++ b/pkgs/development/python-modules/meteofrance-api/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hacf-fr";
     repo = "meteofrance-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uSrVK6LwCDyvsjzGl4xQd8585Hl6sp2Ua9ly0wqnC1Y=";
   };
 
diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix
index 482340b0ed78..f52736c52568 100644
--- a/pkgs/development/python-modules/meteoswiss-async/default.nix
+++ b/pkgs/development/python-modules/meteoswiss-async/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertomontesg";
     repo = "meteoswiss-async";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4=";
   };
 
diff --git a/pkgs/development/python-modules/mf2py/default.nix b/pkgs/development/python-modules/mf2py/default.nix
index 8d0ecc7d9937..10926deaeb77 100644
--- a/pkgs/development/python-modules/mf2py/default.nix
+++ b/pkgs/development/python-modules/mf2py/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microformats";
     repo = "mf2py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mhJ+s1rtXEJ6DqVmiyWNEK+3cdDLpR63Q4QGmD9wVio=";
   };
 
diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix
index 3cd0331e7fb3..7ab37fa8678f 100644
--- a/pkgs/development/python-modules/mhcflurry/default.nix
+++ b/pkgs/development/python-modules/mhcflurry/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openvax";
     repo = "mhcflurry";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dxCGCPnk1IFKg8ZVqMJsojQL0KlNirKlHJoaaOYIzMU=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
index dfe65b63c454..b08c4ce1b629 100644
--- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-abstractions-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TgHj5Ga6Aw/sN2Hobn0OocFB/iGRHTKEeOa2j2aqnRY=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
index 766a036ed76c..02802c58954d 100644
--- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-authentication-azure-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JoR7qjAPNqtcV35AGwbyjhIro6AnFUZXXLHLOj7InY8=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
index cc5af52c241d..5d2cda9ae63a 100644
--- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-http-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0hntB9GSDE05l/ghWTzMrX1MAPdWNHJVIQFpskraDV8=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
index 7f1a24b29e41..15e824afca07 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-serialization-form-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yOdrqj8QPz497VWS4427zDRRFc/S5654JeYkO1ZcUcQ=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
index 864b6c8cc5a6..d6ae7067e684 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-serialization-json-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J+wX2vF1LZHq88RDhda6NDeYioZzAz2BxovVFz2xxfw=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
index 543a306d1403..e9e1ac000471 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-serialization-multipart-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OGX6vX02928F1uCP8bF/q1Z5aDrdj29iQNOITzF2LQI=";
   };
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
index 8c7e2d79ea64..58eae68d75b8 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-serialization-text-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o=";
   };
 
diff --git a/pkgs/development/python-modules/midea-beautiful-air/default.nix b/pkgs/development/python-modules/midea-beautiful-air/default.nix
index 6b589b334369..628675325a23 100644
--- a/pkgs/development/python-modules/midea-beautiful-air/default.nix
+++ b/pkgs/development/python-modules/midea-beautiful-air/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nbogojevic";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-786Q085bv8Zsm0c55I4XalRhEfwElRTJds5qnb0cWhk=";
   };
 
diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix
index 3f6a236c40d5..6954e6311aaf 100644
--- a/pkgs/development/python-modules/mill-local/default.nix
+++ b/pkgs/development/python-modules/mill-local/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyMillLocal";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kFBzasS7/5AM/ZW5z1ncZ9Xwuy/bh2LTVXPxNTLQnV0=";
   };
 
diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
index 20a2eba687d2..84dc6e01501f 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thp";
     repo = "minidb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e7wVR+xr+5phNoRnGIxnmrjB1QU9JmyfQiu88PYapA8=";
   };
 
diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix
index 58c74cd3cad1..b8739779aa77 100644
--- a/pkgs/development/python-modules/mirakuru/default.nix
+++ b/pkgs/development/python-modules/mirakuru/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ClearcodeHQ";
     repo = "mirakuru";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ=";
   };
 
diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix
index ec33d7bec839..5a63e64af4db 100644
--- a/pkgs/development/python-modules/mistletoe/default.nix
+++ b/pkgs/development/python-modules/mistletoe/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miyuchina";
     repo = "mistletoe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jFU16vdASGVSPq+TJ/6cN7IGkE/61SL9BWCOPsVqNaU=";
   };
 
diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix
index a3ed1114cb13..4cca52b9daac 100644
--- a/pkgs/development/python-modules/mistune/default.nix
+++ b/pkgs/development/python-modules/mistune/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "mistune";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OoTiqJ7hsFP1Yx+7xW3rL+Yc/O2lCMdhBBbaZucyZXM=";
   };
 
diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 7a771fb6b138..7fd348bdd6e3 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mitogen-hq";
     repo = "mitogen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oWrPpQdfhn3gaaCqkwDabUZRLMEyVyXjRZdu+B9D4CI=";
   };
 
diff --git a/pkgs/development/python-modules/mixbox/default.nix b/pkgs/development/python-modules/mixbox/default.nix
index 7e348f8bc676..c1a2c05caf16 100644
--- a/pkgs/development/python-modules/mixbox/default.nix
+++ b/pkgs/development/python-modules/mixbox/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CybOXProject";
     repo = "mixbox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qK3cKOf0s345M1pVFro5NFhDj4lch12UegOY1ZUEOBQ=";
   };
 
diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix
index 12f3cf9dd13b..d93d9cb3fc9f 100644
--- a/pkgs/development/python-modules/mixpanel/default.nix
+++ b/pkgs/development/python-modules/mixpanel/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mixpanel";
     repo = "mixpanel-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i5vT5FTnw+BanHHrlRsPJ3EooZjQcaosbaHoh/uPRmQ=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix b/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix
index c837ff25ceb6..202fe31ff0f2 100644
--- a/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "zachhannum";
     repo = "mkdocs-autolinks-plugin";
     # The commit messages mention version 0.7.1, but the tag is v_071.
-    rev = "refs/tags/v_${version}";
+    tag = "v_${version}";
     hash = "sha256-mEbuB9VwK7po1TqtJfBSkItOVlI3/W3nD2LYRHgPpTA=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
index a13ab343e6e7..0b48312c4aa1 100644
--- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix
+++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "autorefs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C1ca7tx9s88U7Xp/bd3KhlWeb32a612RyCVBQz0vJ1g=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
index 0f489b4c14c5..fa66e145e778 100644
--- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timvink";
     repo = "mkdocs-git-revision-date-localized-plugin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1SuENREPkU9W5ldMIXDCALLMx0AiTs4dNYJYjrkaegc=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index 4eafbac1307e..69539954c2c6 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "squidfunk";
     repo = "mkdocs-material";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uhUatalHcObQbar1xbdR44FnQs/+qS4ad0sdB2jH/OU=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index 0056beaa9222..bdc996bbe79f 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fralau";
     repo = "mkdocs-mermaid2-plugin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9vYLkGUnL+rnmZntcgFzOvXQdf6angb9DRsmrBjnPUY=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-minify-plugin/default.nix b/pkgs/development/python-modules/mkdocs-minify-plugin/default.nix
index cf52a5b436bd..7269a69b5be6 100644
--- a/pkgs/development/python-modules/mkdocs-minify-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-minify-plugin/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "byrnereese";
     repo = "mkdocs-minify-plugin";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LDCAWKVbFsa6Y/tmY2Zne4nOtxe4KvNplZuWxg4e4L8=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix
index 72fced65d1e9..6bc7fa2a33a8 100644
--- a/pkgs/development/python-modules/mkdocs-redirects/default.nix
+++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocs";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zv/tCsC2wrD0iH7Kvlq4nXJMPMGQ7+l68Y/q/x66LBg=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix b/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
index 9196077644e9..e3a6eac418f0 100644
--- a/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Blueswen";
     repo = "mkdocs-redoc-tag";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TOGFch+Uto3qeVMaHqK8SEy0v0cKtHofoGE8T1mnBOk=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
index c71d16a7b238..3134a26096b6 100644
--- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Guts";
     repo = "mkdocs-rss-plugin";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6FTOJQqK9lKYt6cVpKvMcNUrhSwX26032Vr4JyZ6sI8=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index bc00f655059a..095300fa5846 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Blueswen";
     repo = "mkdocs-swagger-ui-tag";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hxf7onjH26QsdB19r71NSC/67u+pEYdJo3e4OvWGgtI=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix
index da196135439b..58b92815d1c7 100644
--- a/pkgs/development/python-modules/mkdocs/default.nix
+++ b/pkgs/development/python-modules/mkdocs/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JQSOgV12iYE6FubxdoJpWy9EHKFxyKoxrm/7arCn9Ak=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index efb5e612e0a7..445867512658 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dc9RXbrwZS/7eAF0BrGS2kJxG62rB5RLxf3yNZ6+g4Q=";
   };
 
diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix
index ab62bf68b14f..fe5471f0f9bf 100644
--- a/pkgs/development/python-modules/mkdocstrings/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "mkdocstrings";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-L86aFq1S7Hfp+1MHwliCSz0mfgAFD/5AHbeqL1aZ5XM=";
   };
 
diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix
index f4e52431ed4b..a437f066f4b0 100644
--- a/pkgs/development/python-modules/mkl-service/default.nix
+++ b/pkgs/development/python-modules/mkl-service/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IntelPython";
     repo = "mkl-service";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o5mjZhqQc7tu44EjrScuGzv6pZNlnZnndMIAhl8pY5o=";
   };
 
diff --git a/pkgs/development/python-modules/mktestdocs/default.nix b/pkgs/development/python-modules/mktestdocs/default.nix
index f1a1b654bf12..58c81b5074a2 100644
--- a/pkgs/development/python-modules/mktestdocs/default.nix
+++ b/pkgs/development/python-modules/mktestdocs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "koaning";
     repo = "mktestdocs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-egLlgq0lQOk0cPBly01zQ0rkl7D7Rf/bZ4en5oG+wlE=";
   };
 
diff --git a/pkgs/development/python-modules/ml-collections/default.nix b/pkgs/development/python-modules/ml-collections/default.nix
index 48b044eb27ad..4d899689a763 100644
--- a/pkgs/development/python-modules/ml-collections/default.nix
+++ b/pkgs/development/python-modules/ml-collections/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "ml_collections";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QUhwkfffjA6gKd6lTmEgnnoUeJOu82mfFPBta9/iebg=";
   };
 
diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix
index 1b8b581267c3..83100c471fd9 100644
--- a/pkgs/development/python-modules/ml-dtypes/default.nix
+++ b/pkgs/development/python-modules/ml-dtypes/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jax-ml";
     repo = "ml_dtypes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+6job9fEHVguh9JBE/NUv+QezwQohuKPO8DlhbaawZ4=";
     # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521),
     # the attempts to use the nixpkgs packaged eigen dependency have failed.
diff --git a/pkgs/development/python-modules/mmcif-pdbx/default.nix b/pkgs/development/python-modules/mmcif-pdbx/default.nix
index 43427810c523..e343faaa20dc 100644
--- a/pkgs/development/python-modules/mmcif-pdbx/default.nix
+++ b/pkgs/development/python-modules/mmcif-pdbx/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Electrostatics";
     repo = "mmcif_pdbx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ymMQ/q4IMoq+B8RvIdL0aqolKxyE/4rnVfd4bUV5OUY=";
   };
 
diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index 78d3198e4155..e00be7f18f76 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "open-mmlab";
     repo = "mmengine";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k=";
   };
 
diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix
index 3493806d5fe4..c74a4e63261e 100644
--- a/pkgs/development/python-modules/mne-python/default.nix
+++ b/pkgs/development/python-modules/mne-python/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mne-tools";
     repo = "mne-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WPRTX8yB4oP/L5DjSq9M6WOmHJDpQv0sAbuosp7ZGVw=";
   };
 
diff --git a/pkgs/development/python-modules/moat-ble/default.nix b/pkgs/development/python-modules/moat-ble/default.nix
index fe8dbd54ca2a..ef9d3f53f148 100644
--- a/pkgs/development/python-modules/moat-ble/default.nix
+++ b/pkgs/development/python-modules/moat-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "moat-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dy1Fm0Z1PUsPY8QTiXUcWSi+csFnTUsobSkA92m06QI=";
   };
 
diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix
index cfa7d4e698c8..16a17e91fa9c 100644
--- a/pkgs/development/python-modules/mobi/default.nix
+++ b/pkgs/development/python-modules/mobi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iscc";
     repo = "mobi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g1L72MkJdrKQRsEdew+Qsn8LfCn8+cmj2pmY6s4nv2U=";
   };
 
diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix
index c4d400cae107..6868bac6fd8c 100644
--- a/pkgs/development/python-modules/mobly/default.nix
+++ b/pkgs/development/python-modules/mobly/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "mobly";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-77wZK5dqxXUkOgWE7NBpGJBbbtYYxRCJwPbtwLIX09I=";
   };
 
diff --git a/pkgs/development/python-modules/mock-ssh-server/default.nix b/pkgs/development/python-modules/mock-ssh-server/default.nix
index 72fef03db247..91e5bd573920 100644
--- a/pkgs/development/python-modules/mock-ssh-server/default.nix
+++ b/pkgs/development/python-modules/mock-ssh-server/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "carletes";
     repo = "mock-ssh-server";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yJd+WDidW5ouofytAKTlSiZhIQg2cLs8BvEp15qwtjo=";
   };
 
diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix
index 2a3a02e483da..7f0ae4281eb8 100644
--- a/pkgs/development/python-modules/model-bakery/default.nix
+++ b/pkgs/development/python-modules/model-bakery/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "model-bakers";
     repo = "model_bakery";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs=";
   };
 
diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix
index 04f94f5810cf..21573c1c65a1 100644
--- a/pkgs/development/python-modules/modelcif/default.nix
+++ b/pkgs/development/python-modules/modelcif/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ihmwg";
     repo = "python-modelcif";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sduhRLtuJ/0BNsqmrhCr0lSrLMaOfE+TCWN4zj62aCQ=";
   };
 
diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix
index ef838c9196e7..ff982ca0f070 100644
--- a/pkgs/development/python-modules/moderngl-window/default.nix
+++ b/pkgs/development/python-modules/moderngl-window/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moderngl";
     repo = "moderngl_window";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WXHQVJJCE+7FQJjRgjnmpoGGnF20OQ6/X6Fnrzsp2fA=";
   };
 
diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix
index f719b47cf8b3..fc5982711dfa 100644
--- a/pkgs/development/python-modules/monai-deploy/default.nix
+++ b/pkgs/development/python-modules/monai-deploy/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Project-MONAI";
     repo = "monai-deploy-app-sdk";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-a5WtU+1XjsYsXB/uZS8ufE0fOOWDf+Wy7mOX2xPEQEg=";
   };
 
diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix
index 1119f0b7993c..08d71db21190 100644
--- a/pkgs/development/python-modules/monai/default.nix
+++ b/pkgs/development/python-modules/monai/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Project-MONAI";
     repo = "MONAI";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PovYyRLgoYwxqGeCBpWxX/kdClYtYK1bgy8yRa9eue8=";
     # note: upstream consistently seems to modify the tag shortly after release,
     # so best to wait a few days before updating
diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix
index c548add2b7ce..1d273556bc06 100644
--- a/pkgs/development/python-modules/mongoengine/default.nix
+++ b/pkgs/development/python-modules/mongoengine/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MongoEngine";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-trWCKmCa+q+qtzF0HKCZMnko1cvvpwJvczLFuKtB83E=";
   };
 
diff --git a/pkgs/development/python-modules/monitorcontrol/default.nix b/pkgs/development/python-modules/monitorcontrol/default.nix
index 142c35f1e0d3..0d1f27489291 100644
--- a/pkgs/development/python-modules/monitorcontrol/default.nix
+++ b/pkgs/development/python-modules/monitorcontrol/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "newAM";
     repo = "monitorcontrol";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fu0Lm7Tcw7TCCBDXTTY20JBAM7oeesyeHQFFILeZxX0=";
   };
 
diff --git a/pkgs/development/python-modules/monkeytype/default.nix b/pkgs/development/python-modules/monkeytype/default.nix
index 1f24608c8d17..ce7e46d999e3 100644
--- a/pkgs/development/python-modules/monkeytype/default.nix
+++ b/pkgs/development/python-modules/monkeytype/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Instagram";
     repo = "MonkeyType";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DQ/3go53+0PQkhZcL2dX8MI/z4Iq7kTYd5EbacMNxT4=";
   };
 
diff --git a/pkgs/development/python-modules/monotonic-alignment-search/default.nix b/pkgs/development/python-modules/monotonic-alignment-search/default.nix
index 7ca496c13d21..36b675c5e62e 100644
--- a/pkgs/development/python-modules/monotonic-alignment-search/default.nix
+++ b/pkgs/development/python-modules/monotonic-alignment-search/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eginhard";
     repo = "monotonic_alignment_search";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qBkJKED0KVArhzmhZo8UuWQ55XMMBgvKM3xOwiPVwKU=";
   };
 
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index 4cf2f42fa31b..cfed76a86767 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "materialsvirtuallab";
     repo = "monty";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ydt1T2agKUCBiMZ4uvQ3qshEiAQ0PP9EjPiWDXgH3Wo=";
   };
 
diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix
index 8a305a1861eb..3b2bc75cc091 100644
--- a/pkgs/development/python-modules/monzopy/default.nix
+++ b/pkgs/development/python-modules/monzopy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JakeMartin-ICL";
     repo = "monzopy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bWuWc2+80Og9mjzgqatGeR028CD3oqwKrw/BRTz3KXg=";
   };
 
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index 8e6ffa019cb7..a733f70a824c 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cmroche";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AwSHF9BbxKBXIQdG4OX1vYYP/ST4jSz3uMMDUx0MSEg=";
   };
 
diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix
index 9f8432f5689b..77ef5219bde2 100644
--- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix
+++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "mopeka-iot-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CKLC0p66JapE9qNePE11ttoGMVd4kA7g28kA+pYLXCE=";
   };
 
diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix
index 98adafc7d241..e0faed09af0a 100644
--- a/pkgs/development/python-modules/moreorless/default.nix
+++ b/pkgs/development/python-modules/moreorless/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thatch";
     repo = "moreorless";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N11iqsxMGgzwW2QYeOoHQaR/aDEuoUnnd/2Mc5culN0=";
   };
 
diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix
index ec5e39c6b8ab..218dcc1577a4 100644
--- a/pkgs/development/python-modules/mortgage/default.nix
+++ b/pkgs/development/python-modules/mortgage/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jlumbroso";
     repo = "mortgage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UwSEKfMQqxpcF+7TF/+qD6l8gEO/qDCUklpZz1Nt/Ok=";
   };
 
diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix
index b791f9483ead..2171e8273a6b 100644
--- a/pkgs/development/python-modules/motionblinds/default.nix
+++ b/pkgs/development/python-modules/motionblinds/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "motion-blinds";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MU+zMka8d8wocc90vdS56BMHg6Z/LAAdRetiysh9Ssc=";
   };
 
diff --git a/pkgs/development/python-modules/motionblindsble/default.nix b/pkgs/development/python-modules/motionblindsble/default.nix
index bda8327c20ae..fa33b39fb6bb 100644
--- a/pkgs/development/python-modules/motionblindsble/default.nix
+++ b/pkgs/development/python-modules/motionblindsble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LennP";
     repo = "motionblindsble";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1dA3YTjoAhe+p5vk6Xb42a+rE63m2mn5iHhVV/6tlQ0=";
   };
 
diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix
index 1d003b77fa3a..bc4598c17d52 100644
--- a/pkgs/development/python-modules/motor/default.nix
+++ b/pkgs/development/python-modules/motor/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "motor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fSHb39C4WaQVt7jT714kxwkpUw3mV9jNgkdUyVnD+S4=";
   };
 
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 74fadd5d2e49..f32a5e7662f9 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Zulko";
     repo = "moviepy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l7AwzAKSaEV+pPbltKgwllK6X54oruU2w0AvoCsrESE=";
   };
 
diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix
index 832140a31397..bc4ad421714a 100644
--- a/pkgs/development/python-modules/mpl-scatter-density/default.nix
+++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astrofrog";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MMxM+iv5p9ZLcBpqa3tBBPbsMM/PTg6BXaDpGgSw+DE=";
   };
 
diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index 36480a05393e..2dab782088a0 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "mplhep";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fcc/DG4irTvAOjCGAW7hW96z0yJNSvcpanfDGN9H9XI=";
   };
 
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
index 308b57376dce..53e6dc8250b9 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mpmath";
     repo = "mpmath";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9BGcaC3TyolGeO65/H42T/WQY6z5vc1h+MA+8MGFChU=";
   };
 
diff --git a/pkgs/development/python-modules/mqtt2influxdb/default.nix b/pkgs/development/python-modules/mqtt2influxdb/default.nix
index fde57c49be0c..26b4ebb1197d 100644
--- a/pkgs/development/python-modules/mqtt2influxdb/default.nix
+++ b/pkgs/development/python-modules/mqtt2influxdb/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardwario";
     repo = "bch-mqtt2influxdb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YDgMoxnH4vCCa7b857U6iVBhYLxk8ZjytGziryn24bg=";
   };
 
diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix
index 7e84de8bc866..eff03dc9e076 100644
--- a/pkgs/development/python-modules/mrjob/default.nix
+++ b/pkgs/development/python-modules/mrjob/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "mrjob";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Yp4yUx6tkyGB622I9y+AWK2AkIDVGKQPMM+LtB/M3uo=";
   };
 
diff --git a/pkgs/development/python-modules/ms-active-directory/default.nix b/pkgs/development/python-modules/ms-active-directory/default.nix
index 7844373918f5..4509eb0a4e0e 100644
--- a/pkgs/development/python-modules/ms-active-directory/default.nix
+++ b/pkgs/development/python-modules/ms-active-directory/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zorn96";
     repo = "ms_active_directory";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZFIeG95+G9ofk54bYZpqu8uVfzjqsOrwWlIZvQgIWRI=";
   };
 
diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix
index 3efc69addf32..2d996e77ffd2 100644
--- a/pkgs/development/python-modules/msal-extensions/default.nix
+++ b/pkgs/development/python-modules/msal-extensions/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AzureAD";
     repo = "microsoft-authentication-extensions-for-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-javYE1XDW1yrMZ/BLqIu/pUXChlBZlACctbD2RfWuis=";
   };
 
diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix
index b607444fc27f..af4d1499e488 100644
--- a/pkgs/development/python-modules/mscerts/default.nix
+++ b/pkgs/development/python-modules/mscerts/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ralphje";
     repo = "mscerts";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1k0k5BSEyiJ1Brx7P+sgUQI63k1eT59edghnPVuCuZE=";
   };
 
diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index a6c4893007b0..ea30f58d8109 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yKQcQi0oSJ33gzsx1Q6ME3GbuSaHR091n7maU6F5QlU=";
   };
 
diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index 5707a8906251..8c2d64421a3e 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ADeUlxaDoekKMCE+CJL8biuhijdDqQn0s52yvGi3XCE=";
   };
 
diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index 30f821da7385..5ddf2c46a659 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcrist";
     repo = "msgspec";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xqtV60saQNINPMpOnZRSDnicedPSPBUQwPSE5zJGrTo=";
   };
 
diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
index fe5d79ece2d3..4fe26195ad9e 100644
--- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix
+++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nolze";
     repo = "msoffcrypto-tool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nwCjgcZqD0hptHC0WqIodHC5m/JHYyUdfEngIoXzNqA=";
   };
 
diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix
index 9a18be120a60..be3f9961f403 100644
--- a/pkgs/development/python-modules/msrestazure/default.nix
+++ b/pkgs/development/python-modules/msrestazure/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "msrestazure-for-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZZVZi0v1ucD2g5FpLaNhfNBf6Ab10fUEcEdkY4ELaEY=";
   };
 
diff --git a/pkgs/development/python-modules/msticpy/default.nix b/pkgs/development/python-modules/msticpy/default.nix
index 16edae320a26..1c2e0f469ac4 100644
--- a/pkgs/development/python-modules/msticpy/default.nix
+++ b/pkgs/development/python-modules/msticpy/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msticpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jYLAF+6yhZo74LYDaoA/+JTd05s6VCheYpHk6ilufBM=";
   };
 
diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index beec1bb17ee5..fbc655387c89 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wolph";
     repo = "mt940";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t6FOMu+KcEib+TZAv5uVAzvrUSt/k/RQn28jpdAY5Y0=";
   };
 
diff --git a/pkgs/development/python-modules/mtcnn/default.nix b/pkgs/development/python-modules/mtcnn/default.nix
index 1aa067411c6f..4150634f2288 100644
--- a/pkgs/development/python-modules/mtcnn/default.nix
+++ b/pkgs/development/python-modules/mtcnn/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ipazc";
     repo = "mtcnn";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gp+jfa1arD3PpJpuRFKIUznV0Lyjt3DPn/HHUviDXhk=";
   };
 
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 416df76262f4..a5901889fd61 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "multidict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rvL1XzMNBVBlElE5wznecL3Ku9h4tG9VeqGRd04iPXw=";
   };
 
diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix
index defec98badfc..613967471228 100644
--- a/pkgs/development/python-modules/multimethod/default.nix
+++ b/pkgs/development/python-modules/multimethod/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coady";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KfO+6bZOZOv9SWTV4eqJTWb3/PeCpnXknSF47ddZR5o=";
   };
 
diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix
index ff4aa63698db..587c2e3aa109 100644
--- a/pkgs/development/python-modules/multipart/default.nix
+++ b/pkgs/development/python-modules/multipart/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "defnull";
     repo = "multipart";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mQMv5atWrWpwyY9YYjaRYNDm5AfW54drPSKL7qiae+I=";
   };
 
diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix
index 98a3ad4c563b..9a7d698e5077 100644
--- a/pkgs/development/python-modules/multiprocess/default.nix
+++ b/pkgs/development/python-modules/multiprocess/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uqfoundation";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-77F5fkZbljq/tuBTkquKEYVubfghUrMZsAdhp1QpH2k=";
   };
 
diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix
index db4cfa8b35b6..aa7c359cdf2e 100644
--- a/pkgs/development/python-modules/munch/default.nix
+++ b/pkgs/development/python-modules/munch/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Infinidat";
     repo = "munch";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-p7DvOGRhkCmtJ32EfttyKXGGmO5kfb2bQGqok/RJtU8=";
   };
 
diff --git a/pkgs/development/python-modules/mung/default.nix b/pkgs/development/python-modules/mung/default.nix
index 236ab3aba46c..81d90a301257 100644
--- a/pkgs/development/python-modules/mung/default.nix
+++ b/pkgs/development/python-modules/mung/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "OMR-Research";
     repo = "mung";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QljGoZdUJRClQ/QzUsCKD0/ooWaFrKXI+93WFPvmIjE=";
   };
 
diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix
index 58e4348622b0..1831f5e163c2 100644
--- a/pkgs/development/python-modules/music-assistant-models/default.nix
+++ b/pkgs/development/python-modules/music-assistant-models/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "models";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FbnwUfAwCwwBKqEUtb2ZBxHehFwJdr9YkuWKox018BY=";
   };
 
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 4a81bbe55954..719bc45eb8bb 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwclient";
     repo = "mwclient";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-qnWVQEG1Ri0z4RYmmG/fxYrlIFFf/6PnP5Dnv0cZb5I=";
   };
 
diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix
index d6e1e60cb39a..a987296aaf89 100644
--- a/pkgs/development/python-modules/mwdblib/default.nix
+++ b/pkgs/development/python-modules/mwdblib/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CERT-Polska";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag=";
   };
 
diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix
index 094065310854..1b791667b90e 100644
--- a/pkgs/development/python-modules/myjwt/default.nix
+++ b/pkgs/development/python-modules/myjwt/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mBouamama";
     repo = "MyJWT";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jqBnxo7Omn5gLMCQ7SNbjo54nyFK7pn94796z2Qc9lg=";
   };
 
diff --git a/pkgs/development/python-modules/mypermobil/default.nix b/pkgs/development/python-modules/mypermobil/default.nix
index 052a9838ead7..55c47e6e0691 100644
--- a/pkgs/development/python-modules/mypermobil/default.nix
+++ b/pkgs/development/python-modules/mypermobil/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Permobil-Software";
     repo = "mypermobil";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-linnaRyA45EzqeSeNmvIE5gXkHA2F504U1++QBeRa90=";
   };
 
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 022f29733f83..9acbfe21acc5 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python";
     repo = "mypy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P2Ozmj7/7QBmjlveHLsNdYgUAerg0qOoa8pO0iQc5os=";
   };
 
diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix
index 14e1bfc51cc3..4f2ca35bded5 100644
--- a/pkgs/development/python-modules/myst-docutils/default.nix
+++ b/pkgs/development/python-modules/myst-docutils/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "MyST-Parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978=";
   };
 
diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index ceec033bb047..ae155a03acc0 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978=";
   };
 
diff --git a/pkgs/development/python-modules/myuplink/default.nix b/pkgs/development/python-modules/myuplink/default.nix
index 3b4dee861369..fff9867a2109 100644
--- a/pkgs/development/python-modules/myuplink/default.nix
+++ b/pkgs/development/python-modules/myuplink/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pajzo";
     repo = "myuplink";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QIFTM4RQR3C67q+sBUCPhUyXylzplNAppHjzvU7i2YU=";
   };
 
diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix
index cc31702c94aa..c9f31d7e615d 100644
--- a/pkgs/development/python-modules/nampa/default.nix
+++ b/pkgs/development/python-modules/nampa/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thebabush";
     repo = "nampa";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ylDthh6fO0jKiYib0bed31Dxt4afiD0Jd5mfRKrsZpE=";
   };
 
diff --git a/pkgs/development/python-modules/nanoemoji/default.nix b/pkgs/development/python-modules/nanoemoji/default.nix
index 9d2dfffcaf9f..231183bfcfe0 100644
--- a/pkgs/development/python-modules/nanoemoji/default.nix
+++ b/pkgs/development/python-modules/nanoemoji/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "nanoemoji";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM=";
   };
 
diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix
index c6eeef191ac4..caffb2ac19ee 100644
--- a/pkgs/development/python-modules/napalm/default.nix
+++ b/pkgs/development/python-modules/napalm/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "napalm-automation";
     repo = "napalm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Abw3h69qTFwOOFeAfivqAIWLozErJ1yZZfx7CbMy1AI=";
   };
 
diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix
index 1d7e9c596650..de39909b2b93 100644
--- a/pkgs/development/python-modules/napari-console/default.nix
+++ b/pkgs/development/python-modules/napari-console/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "napari";
     repo = "napari-console";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3gOfiPx06G5c4eaLQ5kP45hUr6yw91esznJFacpO66Q=";
   };
 
diff --git a/pkgs/development/python-modules/napari-nifti/default.nix b/pkgs/development/python-modules/napari-nifti/default.nix
index c6f2f67abb10..a0340e765ff5 100644
--- a/pkgs/development/python-modules/napari-nifti/default.nix
+++ b/pkgs/development/python-modules/napari-nifti/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MIC-DKFZ";
     repo = "napari-nifti";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JDyJMg6rsGkfEHBwqKc2L6oRO5Y1MJJlEjUuuqp7URQ=";
   };
 
diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix
index e4f97dcd58dd..96ae0f11afc9 100644
--- a/pkgs/development/python-modules/napari-npe2/default.nix
+++ b/pkgs/development/python-modules/napari-npe2/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "napari";
     repo = "npe2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HjMf5J1n5NKqtunRQ7cqZiTZMTNmcq5j++O03Sxwvqw=";
   };
 
diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix
index 63ad78e96617..6fcabe6ffd2c 100644
--- a/pkgs/development/python-modules/napari-plugin-engine/default.nix
+++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "napari";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE=";
   };
 
diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix
index 635d0063f917..af15f509cc93 100644
--- a/pkgs/development/python-modules/napari-svg/default.nix
+++ b/pkgs/development/python-modules/napari-svg/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "napari";
     repo = "napari-svg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ywN9lUwBFW8zP7ivP7MNTYFbTCcmaZxAuKr056uY68Q=";
   };
 
diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix
index 8d3a0bf5b824..d3ad919a501f 100644
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@@ -48,7 +48,7 @@ mkDerivationWith buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "napari";
     repo = "napari";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wJifLRrHlDzPgBU7OOPqjdzYpr9M+Klc+yAc/IpyZN8=";
   };
 
diff --git a/pkgs/development/python-modules/nasdaq-data-link/default.nix b/pkgs/development/python-modules/nasdaq-data-link/default.nix
index e560d7033ce5..484c0f08d2d3 100644
--- a/pkgs/development/python-modules/nasdaq-data-link/default.nix
+++ b/pkgs/development/python-modules/nasdaq-data-link/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Nasdaq";
     repo = "data-link-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Q3Ay9FpJsvSVu0WU2bxFyo3ODKP/ZUo3SqsBtOGrIIE=";
   };
 
diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index ffd604f6daec..bcec5336bdb3 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r94dDXPpkLS1PsB9L4qlDw15tPa2vpxOS52eqJk2dNU=";
   };
 
diff --git a/pkgs/development/python-modules/nats-python/default.nix b/pkgs/development/python-modules/nats-python/default.nix
index f93b2feab69c..b9fc85216a53 100644
--- a/pkgs/development/python-modules/nats-python/default.nix
+++ b/pkgs/development/python-modules/nats-python/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Gr1N";
     repo = "nats-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7/AGQfPEuSeoRGUXeyDZNbLhapfQa7vhrSPHRruf+sg=";
   };
 
diff --git a/pkgs/development/python-modules/natural/default.nix b/pkgs/development/python-modules/natural/default.nix
index 8e8b32fc8409..fbe575c7c244 100644
--- a/pkgs/development/python-modules/natural/default.nix
+++ b/pkgs/development/python-modules/natural/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tehmaze";
     repo = "natural";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DERFKDGVUPcjYAxiTYWgWkPp+Myd/9CNytQWgRya570=";
   };
 
diff --git a/pkgs/development/python-modules/naturalsort/default.nix b/pkgs/development/python-modules/naturalsort/default.nix
index 8be9da8328f2..7c82eb5de9c7 100644
--- a/pkgs/development/python-modules/naturalsort/default.nix
+++ b/pkgs/development/python-modules/naturalsort/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xolox";
     repo = "python-naturalsort";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MBb8yCIs9DW77TKiV3qOHidt8/zi9m2dgyfB3xrdg3A=";
   };
 
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index 105108d3ab6b..809b5af89c17 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -29,7 +29,7 @@ let
     src = fetchFromGitHub {
       owner = "jupyter";
       repo = pname;
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-8OLkpwX4Gpam9VSFUtNS41Ypxe4+2yN3ng6iVY9DSqY=";
     };
 
diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix
index f935b934b3cc..0802f5066314 100644
--- a/pkgs/development/python-modules/nbconflux/default.nix
+++ b/pkgs/development/python-modules/nbconflux/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vericast";
     repo = "nbconflux";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw=";
   };
 
diff --git a/pkgs/development/python-modules/nbexec/default.nix b/pkgs/development/python-modules/nbexec/default.nix
index 370de0db428c..f39ad10df7e7 100644
--- a/pkgs/development/python-modules/nbexec/default.nix
+++ b/pkgs/development/python-modules/nbexec/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "jsvine";
     repo = "nbexec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Vv6EHX6WlnSmzQAYlO1mHnz5t078z3RQfVfte1+X2pw=";
   };
 
diff --git a/pkgs/development/python-modules/nbmake/default.nix b/pkgs/development/python-modules/nbmake/default.nix
index 46ffe613f695..c6cbdd69a33a 100644
--- a/pkgs/development/python-modules/nbmake/default.nix
+++ b/pkgs/development/python-modules/nbmake/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "treebeardtech";
     repo = "nbmake";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OzjqpipFb5COhqc//Sg6OU65ShPrYe/KtxifToEXveg=";
   };
 
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 3a8812b5426c..3f1d8462e7fd 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IMCMlGt5/G4PRz525ZomsovU55vBnGhHndBtC7ym6lc=";
   };
 
diff --git a/pkgs/development/python-modules/ndeflib/default.nix b/pkgs/development/python-modules/ndeflib/default.nix
index 9c410e4d24f9..883467b19fa8 100644
--- a/pkgs/development/python-modules/ndeflib/default.nix
+++ b/pkgs/development/python-modules/ndeflib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nfcpy";
     repo = "ndeflib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM=";
   };
 
diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix
index 9c4ce4387e20..ad222111112d 100644
--- a/pkgs/development/python-modules/ndindex/default.nix
+++ b/pkgs/development/python-modules/ndindex/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "ndindex";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5S4HN5MFLgURImwFsyyTOxDhrZJ5Oe+Ln/TA/bsCsek=";
   };
 
diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix
index e6539d7caecb..ea749eda1e9d 100644
--- a/pkgs/development/python-modules/ndspy/default.nix
+++ b/pkgs/development/python-modules/ndspy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RoadrunnerWMC";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PQONVEuh5Fg2LHr4gq0XTGcOpps/s9FSgoyDn4BCcik=";
   };
 
diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix
index 3f208bd9f359..0746dc19fc93 100644
--- a/pkgs/development/python-modules/nebula3-python/default.nix
+++ b/pkgs/development/python-modules/nebula3-python/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vesoft-inc";
     repo = "nebula-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p2dXpcOwVKbdfRKKTAc4LhaNuTjvPd8BBBI8aUivaZ4=";
   };
 
diff --git a/pkgs/development/python-modules/nemosis/default.nix b/pkgs/development/python-modules/nemosis/default.nix
index 1d7252b12a91..c3d3ab142091 100644
--- a/pkgs/development/python-modules/nemosis/default.nix
+++ b/pkgs/development/python-modules/nemosis/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "UNSW-CEEM";
     repo = "NEMOSIS";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7jIPBTvL7Y3945GEpa1/DQVdbPsSxVdYoOFTIaIgPag=";
   };
 
diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix
index 6ada695cbc0d..2b0b65637704 100644
--- a/pkgs/development/python-modules/nengo/default.nix
+++ b/pkgs/development/python-modules/nengo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nengo";
     repo = "nengo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-b9mPjKdewIqIeRrddV1/M3bghSyox7Lz6VbfSLCHZjA=";
   };
 
diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix
index 66cf09a95508..e3a831a45c4f 100644
--- a/pkgs/development/python-modules/neo/default.nix
+++ b/pkgs/development/python-modules/neo/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NeuralEnsemble";
     repo = "python-neo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7Q80vbQInVWxPCr6VvmI9tFfTIAzo9FPJ19q51Xd2KM=";
   };
 
diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index 958df3c078b1..6dbd20402910 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neo4j";
     repo = "neo4j-python-driver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tocgH2LuZ56Yej0lRWYHUkR6aqviQwJqG5P2g4P1+uk=";
   };
 
diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
index 009123ed1b6b..76b62a721fce 100644
--- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Neoteroi";
     repo = "mkdocs-plugins";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qizF1Y3BUyr0ekoATJVa62q7gvpbMW3fIKViov2tFTI=";
   };
 
diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix
index f14122123355..fb182877ed64 100644
--- a/pkgs/development/python-modules/nessclient/default.nix
+++ b/pkgs/development/python-modules/nessclient/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nickw444";
     repo = "nessclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-STDEIY7D02MlH+R6uLAKl6ghSQjhG1OEQWj71DrZP30=";
   };
 
diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index f73c569fddac..16e8fbddc63c 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "erdewit";
     repo = "nest_asyncio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4=";
   };
 
diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix
index 39fa93e4a2cf..5ef27b3c99de 100644
--- a/pkgs/development/python-modules/nestedtext/default.nix
+++ b/pkgs/development/python-modules/nestedtext/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "nestedtext";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lNqSmEmzuRGdXs/4mwKSh7yDGHnAykpIDIR+abbLCns=";
   };
 
diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
index 27d63df398a2..56e8f2ab6969 100644
--- a/pkgs/development/python-modules/netbox-reorder-rack/default.nix
+++ b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox-reorder-rack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-G1WGmEsKfz9HT6D6cCWJADm7pFaIV/jKYkYudEmUWJk=";
   };
 
diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix
index f8a689f01012..6aef6c9f75e1 100644
--- a/pkgs/development/python-modules/netdata/default.nix
+++ b/pkgs/development/python-modules/netdata/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-netdata";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Et9T/+xonHSXjGQabgizW4pVBIYpTz0flud+vlfBNQE=";
   };
 
diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix
index 379e1efc14dd..d6dfdd941442 100644
--- a/pkgs/development/python-modules/netifaces2/default.nix
+++ b/pkgs/development/python-modules/netifaces2/default.nix
@@ -13,7 +13,7 @@ let
   src = fetchFromGitHub {
     owner = "SamuelYvon";
     repo = "netifaces-2";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-XO3HWq8FOVzvpbK8mIBOup6hFMnhDpqOK/5bPziPZQ8=";
   };
 in
diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix
index 305b177b8245..5b1e5d47889b 100644
--- a/pkgs/development/python-modules/netio/default.nix
+++ b/pkgs/development/python-modules/netio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netioproducts";
     repo = "PyNetio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-s/X2WGhQXYsbo+ZPpkVSF/vclaThYYNHu0UY0yCnfPA=";
   };
 
diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index bfde33e30aa7..9f2760721063 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "nettigo-air-monitor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aYlnaFim4ezZ/nOAf1m6iIfE4NGswtEmPsslfrTd5tI=";
   };
 
diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index f1c1a4f383a0..aa04df459d6b 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = "netutils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VhX0KDlGf0J6fiO1RzOoqJ4WMDM8Bb2+lYYMlgQ9nkc=";
   };
 
diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix
index c3baffd2d2cc..3cb87173d135 100644
--- a/pkgs/development/python-modules/newversion/default.nix
+++ b/pkgs/development/python-modules/newversion/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vemel";
     repo = "newversion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-R26yZQnQN/+e8XD3YKl+3bJKGnZaVzOVoTlGHOyratg=";
   };
 
diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index 48fa24155c7c..5af0cf1351d8 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "nexia";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dWFARVmGGQxyRhaOrDoAjwXTQNKBFHY2/swFVdEOsmo=";
   };
 
diff --git a/pkgs/development/python-modules/nextcloudmonitor/default.nix b/pkgs/development/python-modules/nextcloudmonitor/default.nix
index 57efaa937ff7..c87758cd38ad 100644
--- a/pkgs/development/python-modules/nextcloudmonitor/default.nix
+++ b/pkgs/development/python-modules/nextcloudmonitor/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "meichthys";
     repo = "nextcloud_monitor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HQLaHuvXWtHkG1dzD7ldvYKepTB4qQqzpKLYMR+lor4=";
   };
 
diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix
index d9c1fcc82742..930f2e83216c 100644
--- a/pkgs/development/python-modules/nextcord/default.nix
+++ b/pkgs/development/python-modules/nextcord/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nextcord";
     repo = "nextcord";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bv4I+Ol/N4kbp/Ch7utaUpo0GmF+Mpx4zWmHL7uIveM=";
   };
 
diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix
index 96f315eb3a5e..81304c6d9d4e 100644
--- a/pkgs/development/python-modules/nextdns/default.nix
+++ b/pkgs/development/python-modules/nextdns/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "nextdns";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2BT47Dg+1TLDUccdb0Q/r3QzpRURTwFlUORbQpmIJzc=";
   };
 
diff --git a/pkgs/development/python-modules/nfcpy/default.nix b/pkgs/development/python-modules/nfcpy/default.nix
index 35500ccd6a11..35f32269f625 100644
--- a/pkgs/development/python-modules/nfcpy/default.nix
+++ b/pkgs/development/python-modules/nfcpy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nfcpy";
     repo = "nfcpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HFWOCiz6ISfxEeC6KPKNKGZoHvFjFGUn7QJWnwvJKYw=";
   };
 
diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix
index e457b9c79b4c..a74b1ccef1ff 100644
--- a/pkgs/development/python-modules/niaaml/default.nix
+++ b/pkgs/development/python-modules/niaaml/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "NiaAML";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE=";
   };
 
diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix
index 9295c45cd23c..2baf8ed356cc 100644
--- a/pkgs/development/python-modules/niaarm/default.nix
+++ b/pkgs/development/python-modules/niaarm/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "NiaARM";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y=";
   };
 
diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix
index 84b83900d40a..5a9ca788238e 100644
--- a/pkgs/development/python-modules/nianet/default.nix
+++ b/pkgs/development/python-modules/nianet/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SasoPavlic";
     repo = "nianet";
-    rev = "refs/tags/version_${version}";
+    tag = "version_${version}";
     sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY=";
   };
 
diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix
index ca443b5526be..67a1937bd016 100644
--- a/pkgs/development/python-modules/niapy/default.nix
+++ b/pkgs/development/python-modules/niapy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NiaOrg";
     repo = "NiaPy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo=";
   };
 
diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix
index 18c0afefda90..44b40f8cc6f3 100644
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yozik04";
     repo = "nibe";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qk2RUGutzxpoEriTa08W2aDQ1c4y2DzNHMx4K1IW5RQ=";
   };
 
diff --git a/pkgs/development/python-modules/nicegui-highcharts/default.nix b/pkgs/development/python-modules/nicegui-highcharts/default.nix
index a46750ff0876..fb575e9d65cc 100644
--- a/pkgs/development/python-modules/nicegui-highcharts/default.nix
+++ b/pkgs/development/python-modules/nicegui-highcharts/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui-highcharts";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r4X4faU7Nlq/FDbIYbTpvnC1w14XskpsNGtkEXtGrFo=";
   };
 
diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index 0951e8b5189d..a58408890b56 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oT191QVpvE5xszgBFt3o4A2hU50zmzPUywmAQuKZ5OE=";
   };
 
diff --git a/pkgs/development/python-modules/ninebot-ble/default.nix b/pkgs/development/python-modules/ninebot-ble/default.nix
index fc57a8c7de3f..905acd753c85 100644
--- a/pkgs/development/python-modules/ninebot-ble/default.nix
+++ b/pkgs/development/python-modules/ninebot-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ownbee";
     repo = "ninebot-ble";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gA3VTs45vVpO0Iy8MbvvDf9j99vsFzrkADaJEslx6y0=";
   };
 
diff --git a/pkgs/development/python-modules/nipreps-versions/default.nix b/pkgs/development/python-modules/nipreps-versions/default.nix
index ab824cdda0c2..6771ef5fce05 100644
--- a/pkgs/development/python-modules/nipreps-versions/default.nix
+++ b/pkgs/development/python-modules/nipreps-versions/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nipreps";
     repo = "version-schemes";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-B2wtLurzgk59kTooH51a2dewK7aEyA0dAm64Wp+tqhM=";
   };
 
diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix
index 1816cdbd20a3..01330e74597c 100644
--- a/pkgs/development/python-modules/niworkflows/default.nix
+++ b/pkgs/development/python-modules/niworkflows/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nipreps";
     repo = "niworkflows";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw=";
   };
 
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 72ca86fc28c1..dd7169083f84 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "podhmo";
     repo = "python-node-semver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ncl+RUvy9G9lF3EzLz2HfiDB02tEgAlZ34Wbn4mlF6Y=";
   };
 
diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix
index 45c8ed59fabd..81e6d7b7a329 100644
--- a/pkgs/development/python-modules/nodeenv/default.nix
+++ b/pkgs/development/python-modules/nodeenv/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ekalinin";
     repo = "nodeenv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nud8HSfx1ri0UZf25VPCy7swfaSM13u5+HzozK+ikeY=";
   };
 
diff --git a/pkgs/development/python-modules/noiseprotocol/default.nix b/pkgs/development/python-modules/noiseprotocol/default.nix
index 7e42d2eb2515..1117b961e218 100644
--- a/pkgs/development/python-modules/noiseprotocol/default.nix
+++ b/pkgs/development/python-modules/noiseprotocol/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plizonczyk";
     repo = "noiseprotocol";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VZkKNxeSxLhRDhrj4VKV/1eXl7RtcsnCHru5KC/OYNY=";
   };
 
diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index e954188e69c8..650780b58555 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "NomadNet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dwymJIsMDeVsG7eF45CgUPlZf3sEdwnxZ8OxT+gEQCs=";
   };
 
diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
index b61ef87c8873..34b74dd1c2b1 100644
--- a/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "notebook_shim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CWnXOKE1xvr+a/qWNY6XCTB5+G/fg2O/glgeLzYD+Zc=";
   };
 
diff --git a/pkgs/development/python-modules/notifications-android-tv/default.nix b/pkgs/development/python-modules/notifications-android-tv/default.nix
index 319c81c13d08..ae5e5417d76c 100644
--- a/pkgs/development/python-modules/notifications-android-tv/default.nix
+++ b/pkgs/development/python-modules/notifications-android-tv/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "engrbm87";
     repo = "notifications_android_tv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JUvxxVCiQtywAWU5AYnPm4SueIWIXkzLxPYveVXpc2E=";
   };
 
diff --git a/pkgs/development/python-modules/notifications-python-client/default.nix b/pkgs/development/python-modules/notifications-python-client/default.nix
index eb39ae09e0a5..c0e2f8f9fabf 100644
--- a/pkgs/development/python-modules/notifications-python-client/default.nix
+++ b/pkgs/development/python-modules/notifications-python-client/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alphagov";
     repo = "notifications-python-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k4q6FS3wjolt4+qtDQlunBLmCCPgLgrhr8zgOMEX4QU=";
   };
 
diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
index cc46dbe77fdf..45893825139b 100644
--- a/pkgs/development/python-modules/notify-py/default.nix
+++ b/pkgs/development/python-modules/notify-py/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ms7m";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4PJ/0dLG3bWDuF1G/qUmvNaIUFXgPP2S/0uhZz86WRA=";
   };
 
diff --git a/pkgs/development/python-modules/nototools/default.nix b/pkgs/development/python-modules/nototools/default.nix
index 8dc075e2b47c..3f8c679d2a4b 100644
--- a/pkgs/development/python-modules/nototools/default.nix
+++ b/pkgs/development/python-modules/nototools/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "nototools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-id4UhyWOFHrtmBZHhnaY2jHDIK0s7rcGBpg4QsBTLKs=";
   };
 
diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index 83b710fdbb11..8fe4c5e02728 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "notus-scanner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PPwQjZIKSQ1OmyYJ8ErkqdbHZfH4iHPMiDdKZ3imBwo=";
   };
 
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index b9bdd21ad382..b4d602a8c1fb 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wntrblm";
     repo = "nox";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
   };
 
diff --git a/pkgs/development/python-modules/nptyping/default.nix b/pkgs/development/python-modules/nptyping/default.nix
index ac53dc38d35b..7e96a38d8b30 100644
--- a/pkgs/development/python-modules/nptyping/default.nix
+++ b/pkgs/development/python-modules/nptyping/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramonhagenaars";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hz4YrcvARCAA7TXapmneIwle/F4pzcIYLPSmiFHC0VQ=";
   };
 
diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix
index 4184a743751c..92a669e7571c 100644
--- a/pkgs/development/python-modules/nsapi/default.nix
+++ b/pkgs/development/python-modules/nsapi/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aquatix";
     repo = "ns-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w=";
   };
 
diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix
index 64fb82e1ea06..9f1a3089fc60 100644
--- a/pkgs/development/python-modules/nsz/default.nix
+++ b/pkgs/development/python-modules/nsz/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nicoboss";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ch4HzQFa95o3HMsi7R0LpPWmhN/Z9EYfrmCdUZLwPSE=";
   };
 
diff --git a/pkgs/development/python-modules/nuheat/default.nix b/pkgs/development/python-modules/nuheat/default.nix
index b05f151f797a..ae8efe13a995 100644
--- a/pkgs/development/python-modules/nuheat/default.nix
+++ b/pkgs/development/python-modules/nuheat/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "broox";
     repo = "python-nuheat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-EsPuwILfKc1Bpvu0Qos7yooC3dBaqf46lWhiSZdu3sc=";
   };
 
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index b9a3e734a580..e5ad4a7fa03b 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "numba";
     repo = "numba";
-    rev = "refs/tags/${version}";
+    tag = version;
     # Upstream uses .gitattributes to inject information about the revision
     # hash and the refname into `numba/_version.py`, see:
     #
diff --git a/pkgs/development/python-modules/numpy-groupies/default.nix b/pkgs/development/python-modules/numpy-groupies/default.nix
index 52feff514904..92f93774817c 100644
--- a/pkgs/development/python-modules/numpy-groupies/default.nix
+++ b/pkgs/development/python-modules/numpy-groupies/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ml31415";
     repo = "numpy-groupies";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Eu+5SR28jIasKe1p7rvbq2yo3PGZRQWWdG3A5vGhnyM=";
   };
 
diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix
index e15b2fcd2a27..adbe9a34ed6f 100644
--- a/pkgs/development/python-modules/nutils-poly/default.nix
+++ b/pkgs/development/python-modules/nutils-poly/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nutils";
     repo = "poly-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dxFv4Az3uz6Du5dk5KZJ+unVbt3aZjxXliAQZhmBWDM=";
   };
 
diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index f8ac839989fa..77a13f70659a 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/pkgs/development/python-modules/nutils/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "evalf";
     repo = "nutils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-E/y1YXW+0+LfntRQsdIU9rMOmN8mlFwXktD/sViJo3I=";
   };
 
diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix
index 6c31d823c625..9155ca59753e 100644
--- a/pkgs/development/python-modules/nutpie/default.nix
+++ b/pkgs/development/python-modules/nutpie/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pymc-devs";
     repo = "nutpie";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s=";
   };
 
diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix
index 1d3a7b4a3e3c..27f2da32b39f 100644
--- a/pkgs/development/python-modules/nvdlib/default.nix
+++ b/pkgs/development/python-modules/nvdlib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Vehemont";
     repo = "nvdlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/UmBNdch9yM6yCVcJbzsCx6om4XlqQa40X/fgEYgRuI=";
   };
 
diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
index 6196910595cb..bd8363cf32ad 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blockdiag";
     repo = "nwdiag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU=";
   };
 
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
index e7d9de8e1c7a..821952a01208 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "schodet";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-v65KEP5DuJsZAifd1Rh46x9lSAgBZgyo+e8PKSDKnhw=";
   };
 
diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix
index 63d9c1d03846..2d1244619d2a 100644
--- a/pkgs/development/python-modules/objax/default.nix
+++ b/pkgs/development/python-modules/objax/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "objax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WD+pmR8cEay4iziRXqF3sHUzCMBjmLJ3wZ3iYOD+hzk=";
   };
 
diff --git a/pkgs/development/python-modules/objprint/default.nix b/pkgs/development/python-modules/objprint/default.nix
index f7721b6afac8..9dc78482d4cb 100644
--- a/pkgs/development/python-modules/objprint/default.nix
+++ b/pkgs/development/python-modules/objprint/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gaogaotiantian";
     repo = "objprint";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+OS034bikrKy4F27b6ic97fHTW6rSMxQ0dx4caF6cUM=";
   };
 
diff --git a/pkgs/development/python-modules/objsize/default.nix b/pkgs/development/python-modules/objsize/default.nix
index d5e93d99e24b..f1c9b9c6676b 100644
--- a/pkgs/development/python-modules/objsize/default.nix
+++ b/pkgs/development/python-modules/objsize/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "liran-funaro";
     repo = "objsize";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wy4Tj+Q+4zymRdoN8Z7wcazJTb2lQ+XHY1Kta02R3R0=";
   };
 
diff --git a/pkgs/development/python-modules/obspy/default.nix b/pkgs/development/python-modules/obspy/default.nix
index 8133d63c6f2e..2d5e26cc8790 100644
--- a/pkgs/development/python-modules/obspy/default.nix
+++ b/pkgs/development/python-modules/obspy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "obspy";
     repo = "obspy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y833OWWBDYduyky0+MRbPoBtATTytak87hgh68QAgfw=";
   };
 
diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix
index d613106bc718..af0194f2f0c8 100644
--- a/pkgs/development/python-modules/ocifs/default.nix
+++ b/pkgs/development/python-modules/ocifs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "ocifs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IGl9G4NyzhcqrfYfgeZin+wt1OwHmh6780MPfZBwsXA=";
   };
 
diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix
index d4a9704f1dae..d967ab167391 100644
--- a/pkgs/development/python-modules/oddsprout/default.nix
+++ b/pkgs/development/python-modules/oddsprout/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "oddsprout";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BOUYq4yny3ScgzCzx2cpeK4e7nxxwTj8mJ42nr59mFA=";
   };
 
diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix
index abe1e5d1cba3..83bd4ae8ee53 100644
--- a/pkgs/development/python-modules/odp-amsterdam/default.nix
+++ b/pkgs/development/python-modules/odp-amsterdam/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-odp-amsterdam";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-veBccNxqhqBYKUC5pdjZ1IOWUYUqiNK5pJq1L+8UCxA=";
   };
 
diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index fbef31e9f50a..5b08bf5547ce 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0cCcbnipijQgWH+08eZbE6Cqcx5cenrb+bQlf3h04tw=";
   };
 
diff --git a/pkgs/development/python-modules/oemthermostat/default.nix b/pkgs/development/python-modules/oemthermostat/default.nix
index 154a3f7f1e6b..0a3d0c18939e 100644
--- a/pkgs/development/python-modules/oemthermostat/default.nix
+++ b/pkgs/development/python-modules/oemthermostat/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Cadair";
     repo = "openenergymonitor_thermostat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4=";
   };
 
diff --git a/pkgs/development/python-modules/ohmepy/default.nix b/pkgs/development/python-modules/ohmepy/default.nix
index c02b87574931..4f2cc535ddeb 100644
--- a/pkgs/development/python-modules/ohmepy/default.nix
+++ b/pkgs/development/python-modules/ohmepy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dan-r";
     repo = "ohmepy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hCwaB6YXtNHCNOyjRxDSonBdTpKqX9GmLwFMvrY9UpI=";
   };
 
diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix
index bdcddc59c7a7..3c7ed859e6c4 100644
--- a/pkgs/development/python-modules/okonomiyaki/default.nix
+++ b/pkgs/development/python-modules/okonomiyaki/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "enthought";
     repo = "okonomiyaki";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JQZhw0H4iSdxoyS6ODICJz1vAZsOISQitX7wTgSS1xc=";
   };
 
diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index cd0c6c5c66d4..58793332d967 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8Y3CRd+VXABuMpaqfJ5mYQhQ+U4Qk7EcjSnPd/hsebY=";
   };
 
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 4386f2170c2f..4f772dccddff 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omry";
     repo = "omegaconf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI=";
   };
 
diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix
index 3c4ba18ba995..190f8d700500 100644
--- a/pkgs/development/python-modules/omnikinverter/default.nix
+++ b/pkgs/development/python-modules/omnikinverter/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-omnikinverter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W9VeRhsCXLLgOgvJcNNCGNmPvakPtKHAtwQAGtYJbcY=";
   };
 
diff --git a/pkgs/development/python-modules/omnilogic/default.nix b/pkgs/development/python-modules/omnilogic/default.nix
index 4e8f8234f4d1..472115a6d0fe 100644
--- a/pkgs/development/python-modules/omnilogic/default.nix
+++ b/pkgs/development/python-modules/omnilogic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "djtimca";
     repo = "omnilogic-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ySK2T5T+Qdq8nVQqluIARR89KmM1N3oD44oLydwcs7E=";
   };
 
diff --git a/pkgs/development/python-modules/oncalendar/default.nix b/pkgs/development/python-modules/oncalendar/default.nix
index 85d163a77eef..f06888ff566f 100644
--- a/pkgs/development/python-modules/oncalendar/default.nix
+++ b/pkgs/development/python-modules/oncalendar/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cuu508";
     repo = "oncalendar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MPKzC2QYA3tWxg19URKheAbPaiS0jXP96xR0Hyl58V0=";
   };
 
diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix
index ea863658e991..8ad584bbb62c 100644
--- a/pkgs/development/python-modules/ondilo/default.nix
+++ b/pkgs/development/python-modules/ondilo/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JeromeHXP";
     repo = "ondilo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-l9pmamJbB/FAqB49S4vQAan9Wgj3qu1J2pboQO1Hg/Q=";
   };
 
diff --git a/pkgs/development/python-modules/onecache/default.nix b/pkgs/development/python-modules/onecache/default.nix
index fb1aa5c65484..3b1e0b7feb7e 100644
--- a/pkgs/development/python-modules/onecache/default.nix
+++ b/pkgs/development/python-modules/onecache/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sonic182";
     repo = "onecache";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-go/3HntSLzzTmHS9CxGPHT6mwXl+6LuWFmkGygGIjqU=";
   };
 
diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix
index dde4983c2afe..d43fdbc99bdf 100644
--- a/pkgs/development/python-modules/onetimepass/default.nix
+++ b/pkgs/development/python-modules/onetimepass/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tadeck";
     repo = "onetimepass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cHJg3vdUpWp5+HACIeTGrqkHKUDS//aQICSjPKgwu3I=";
   };
 
diff --git a/pkgs/development/python-modules/online-judge-api-client/default.nix b/pkgs/development/python-modules/online-judge-api-client/default.nix
index cc346e19231d..48bed76e8f03 100644
--- a/pkgs/development/python-modules/online-judge-api-client/default.nix
+++ b/pkgs/development/python-modules/online-judge-api-client/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "online-judge-tools";
     repo = "api-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P0pIjd/YS155dSDpY/ekMp8HnJcM35waV7aoTQiEWHo=";
   };
 
diff --git a/pkgs/development/python-modules/online-judge-tools/default.nix b/pkgs/development/python-modules/online-judge-tools/default.nix
index 3b24ba31d356..a4276bfd568d 100644
--- a/pkgs/development/python-modules/online-judge-tools/default.nix
+++ b/pkgs/development/python-modules/online-judge-tools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "online-judge-tools";
     repo = "oj";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m6V4Sq3yU/KPnbpA0oCLI/qaSrAPA6TutcBL5Crb/Cc=";
   };
 
diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix
index 0af451607af3..f0fa2543f0b8 100644
--- a/pkgs/development/python-modules/onnx/default.nix
+++ b/pkgs/development/python-modules/onnx/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "onnx";
     repo = "onnx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q=";
   };
 
@@ -116,7 +116,7 @@ buildPythonPackage rec {
   meta = {
     description = "Open Neural Network Exchange";
     homepage = "https://onnx.ai";
-    changelog = "https://github.com/onnx/onnx/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/onnx/onnx/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ acairncross ];
   };
diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix
index 87d83797fbfd..075f2bb29ef4 100644
--- a/pkgs/development/python-modules/onnxconverter-common/default.nix
+++ b/pkgs/development/python-modules/onnxconverter-common/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxconverter-common";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o=";
   };
 
diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index 58f02971c949..892b558f92d3 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openvideolibs";
     repo = "python-onvif-zeep-async";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z9LtKcgyebmdrChRz0QwiQdnrtcIVeCtKQAvL9gBMY4=";
   };
 
diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index 3299a577305c..590ce2bfe8ed 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mlfoundations";
     repo = "open_clip";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-X5nOWdGhIv+HiiauIezIkPh3G1Odtxr0HPygRp/D184=";
   };
 
diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix
index 871182550d2a..10b4f06d27e1 100644
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openai";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6wfHJM2pg+y1qUfVF1VRG86G3CtQ+UNIwMXR8pPi2k4=";
   };
 
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index e86812f1ee10..c51b32f1e2c7 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openai";
     repo = "openai-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QK0NNMJM4sj4u8nlNPBBQpqV0pBYUMcSwKqhna5q10c=";
   };
 
diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix
index 34ccb51cd7d0..c97bee218322 100644
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Tigge";
     repo = "openant";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wDtHlkVyD7mMDXZ4LGMgatr9sSlQKVbgkYsKvHGr9Pc=";
   };
 
diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index bb9f310497c3..4d20420e3da9 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "openapi-core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JvWusDokov8G0UO9oOkGicAI7wYZTnNywbvKMZKQWiQ=";
   };
 
diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix
index b64311ac4e67..9315c122d801 100644
--- a/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CfSlF6DWkYxxVNTNBkr0+KVeKpqxEEqkz4VBenqo+l0=";
   };
 
diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 54c7d5fc19b9..0086d6098141 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-openapi";
     repo = "openapi-spec-validator";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-X0ePdHQeBSWjsCFQgCoNloQZRhKbvPBE43aavBppvmg=";
   };
 
diff --git a/pkgs/development/python-modules/openerz-api/default.nix b/pkgs/development/python-modules/openerz-api/default.nix
index 500aa9ca3af2..e78b44531b40 100644
--- a/pkgs/development/python-modules/openerz-api/default.nix
+++ b/pkgs/development/python-modules/openerz-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "misialq";
     repo = "openerz-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CwK61StspZJt0TALv76zfibUzlriwp9HRoYOtX9bU+c=";
   };
 
diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix
index b5f60e565262..da453a6f6f64 100644
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bazwilliams";
     repo = "openhomedevice";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-u05aciRFCnqMJRClUMApAPDLpXOKn4wUTLgvR7BVZTA=";
   };
 
diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix
index 4034286edacc..0b50d63397e4 100644
--- a/pkgs/development/python-modules/opensearch-py/default.nix
+++ b/pkgs/development/python-modules/opensearch-py/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "opensearch-project";
     repo = "opensearch-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rPHpGKEIINAEUu2UkJwAM60i0hTzXd1ec6WD50RrgL8=";
   };
 
diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix
index ab9b93fc6f38..6cdc335f5fc6 100644
--- a/pkgs/development/python-modules/opensensemap-api/default.nix
+++ b/pkgs/development/python-modules/opensensemap-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-opensensemap-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iUSdjU41JOT7k044EI2XEvJiSo6V4mO6S51EcIughEM=";
   };
 
diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix
index 1e257094a18d..f1ea8488995b 100644
--- a/pkgs/development/python-modules/openshift/default.nix
+++ b/pkgs/development/python-modules/openshift/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "openshift-restclient-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uLfewj7M8KNs3oL1AM18sR/WhAR2mvBfqadyhR73FP0=";
   };
 
diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix
index 9878366a7250..2a912d49d909 100644
--- a/pkgs/development/python-modules/openslide/default.nix
+++ b/pkgs/development/python-modules/openslide/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openslide";
     repo = "openslide-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GokWpRuon8lnxNzxsYGYrQBQDhGPxl8HDaO7fR+2Ldo=";
   };
 
diff --git a/pkgs/development/python-modules/openstep-parser/default.nix b/pkgs/development/python-modules/openstep-parser/default.nix
index c7ba29f9a227..dbdbcc081e59 100644
--- a/pkgs/development/python-modules/openstep-parser/default.nix
+++ b/pkgs/development/python-modules/openstep-parser/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kronenthaler";
     repo = "openstep-parser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gvfzBLLaal0Vad3C4m4wIKwJpmlhewsK4A5yeN8l6qU=";
   };
 
diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix
index 85e4520ec61d..14b0f79475a6 100644
--- a/pkgs/development/python-modules/opentelemetry-api/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-api/default.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "open-telemetry";
       repo = "opentelemetry-python";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-5m6VGdt90Aw6ODUWG7A7b0kV8FsDtg+oPkNUKRbzDX4=";
     };
 
@@ -63,7 +63,7 @@ let
     meta = with lib; {
       homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api";
       description = "OpenTelemetry Python API";
-      changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${lib.removePrefix "refs/tags/" self.src.rev}";
+      changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/v${version}";
       license = licenses.asl20;
       maintainers = teams.deshaw.members ++ [ maintainers.natsukium ];
     };
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
index 29246bb6f35a..865f2bdc0e86 100644
--- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-python-contrib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RsOOCDbxT0e0WGfI8Ibv6E51ei+sTg07F8d+30+JrVU=";
   };
 
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python";
     homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
-    changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = teams.deshaw.members ++ [ maintainers.natsukium ];
   };
diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix
index 492d6ee00946..b6f10139f160 100644
--- a/pkgs/development/python-modules/opentsne/default.nix
+++ b/pkgs/development/python-modules/opentsne/default.nix
@@ -22,7 +22,7 @@ let
     src = fetchFromGitHub {
       owner = "pavlin-policar";
       repo = "openTSNE";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-e1YXF9cdguzcEW0KanIHYlZQiUc+FH8IVOaPshAswco=";
     };
 
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 10a166ba5877..50b9fb4c5ab4 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE=";
   };
 
diff --git a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
index efafabe29d61..4465dba11587 100644
--- a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
+++ b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "python-ubus-rpc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-M4hbnGrAjBjohwgMf6qw5NQnpyKCZ0/4HVklHhizTKc=";
   };
 
diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index b07f2ed396e6..eb23d5df9707 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TUR3+UqsV04YLoLWiAp24viteKDkUsJ3MPCzirKBP8A=";
   };
 
diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix
index 6ea9be4467b6..e8b265fe8512 100644
--- a/pkgs/development/python-modules/optax/default.nix
+++ b/pkgs/development/python-modules/optax/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = "optax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7UPWeo/Q9/tjewaM7HN8/e7U1U1QzAliuk95+9GOi0E=";
   };
 
diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix
index 2bdef53e1ff6..02aa89ae20af 100644
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "optimum";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GJp1ukrYxEEwmkge31b02ROWZW5V23TtoEUjhycHpSg=";
   };
 
@@ -120,7 +120,7 @@ buildPythonPackage rec {
     description = "Accelerate training and inference of 🤗 Transformers and 🤗 Diffusers with easy to use hardware optimization tools";
     mainProgram = "optimum-cli";
     homepage = "https://github.com/huggingface/optimum";
-    changelog = "https://github.com/huggingface/optimum/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/huggingface/optimum/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix
index b20edf0023c6..16e879514887 100644
--- a/pkgs/development/python-modules/optree/default.nix
+++ b/pkgs/development/python-modules/optree/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "metaopt";
     repo = "optree";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/Y2pMpVPz4EXyWoW++K3FFf67Ym6yUs0ZQI4y0GVwmo=";
   };
 
diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 9df86d3458d8..0c9b03f4a0e9 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "optuna";
     repo = "optuna";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wIgYExxJEWFxEadBuCsxEIcW2/J6EVybW1jp83gIMjY=";
   };
 
diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix
index 22498f872d6d..08953a65f8ca 100644
--- a/pkgs/development/python-modules/oralb-ble/default.nix
+++ b/pkgs/development/python-modules/oralb-ble/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "oralb-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e6L8HXpqOAHnEktIJ1N1atC5QXno669W3c/S7cISa48=";
   };
 
diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix
index 98f3d09e441f..55c19112088d 100644
--- a/pkgs/development/python-modules/oras/default.nix
+++ b/pkgs/development/python-modules/oras/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oras-project";
     repo = "oras-py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-o9PSd5vZ5qllL73WPSlSaLA5QmKKLshGgfidiM4h+5g=";
   };
 
diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix
index 93f164a5b603..ca588ecacc47 100644
--- a/pkgs/development/python-modules/orderly-set/default.nix
+++ b/pkgs/development/python-modules/orderly-set/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "orderly-set";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZDo5fSHD0lCn9CRQtWK10QeZoOhuXG3LR3KA/to9gpE=";
   };
   patches = [
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 5476d86dab19..2469de129b32 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ijl";
     repo = "orjson";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RJcTyLf2pLb1kHd7+5K9dGMWja4KFdKIwdRAp6Ud+Ps=";
   };
 
diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix
index 6c2634bb56c1..d230025f6f93 100644
--- a/pkgs/development/python-modules/ormar/default.nix
+++ b/pkgs/development/python-modules/ormar/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "collerek";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DzvmJpWJANIoc5lvWAD0b2bhbKdDEpNL2l3TqXSZSnc=";
   };
 
diff --git a/pkgs/development/python-modules/oryx/default.nix b/pkgs/development/python-modules/oryx/default.nix
index fdf4780a801d..db61db9ca36d 100644
--- a/pkgs/development/python-modules/oryx/default.nix
+++ b/pkgs/development/python-modules/oryx/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jax-ml";
     repo = "oryx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1n7ogGuFNAeOyXWe0/pAouhg2+aA3MXxlCcsrfqRTdU=";
   };
 
diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix
index 8165e098ddd3..f353710c95dc 100644
--- a/pkgs/development/python-modules/osc-placement/default.nix
+++ b/pkgs/development/python-modules/osc-placement/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "osc-placement";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI=";
   };
 
diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix
index f296d8307106..d2fec09a8232 100644
--- a/pkgs/development/python-modules/osc-sdk-python/default.nix
+++ b/pkgs/development/python-modules/osc-sdk-python/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "outscale";
     repo = "osc-sdk-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HOYIt4kLKAR8zYmIhjLQoibL3qp9uruFKgkgfnmZOfc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 342cf229365e..55984a5bfe46 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "oslo.log";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IEhIhGE95zZiWp602rFc+NLco/Oyx9XEL5e2RExNBMs=";
   };
 
diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix
index 8673a0e91afd..bcca8914ca2d 100644
--- a/pkgs/development/python-modules/osmnx/default.nix
+++ b/pkgs/development/python-modules/osmnx/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gboeing";
     repo = "osmnx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5IvohqEYYvFqAKOYreEsEKjzfJaqShYck2xCSQXXfyQ=";
   };
 
diff --git a/pkgs/development/python-modules/ospd/default.nix b/pkgs/development/python-modules/ospd/default.nix
index ad9bb84c747e..3c89a0bec398 100644
--- a/pkgs/development/python-modules/ospd/default.nix
+++ b/pkgs/development/python-modules/ospd/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M=";
   };
 
diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix
index c44c7c276e6b..d20e494c990e 100644
--- a/pkgs/development/python-modules/oss2/default.nix
+++ b/pkgs/development/python-modules/oss2/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-oss-python-sdk";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jDSXPVyy8XvPgsGZXsdfavFPptq28pCwr9C63OZvNrY=";
   };
 
diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix
index 940f5a20b342..89aea5f39c7c 100644
--- a/pkgs/development/python-modules/ossfs/default.nix
+++ b/pkgs/development/python-modules/ossfs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-N1NkpI8inGJCf0xuc+FFmVX85CS7vqzoNddxZ9kqEk0=";
   };
 
diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix
index f22e7e34d9aa..30a773718d11 100644
--- a/pkgs/development/python-modules/osxphotos/default.nix
+++ b/pkgs/development/python-modules/osxphotos/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "osxphotos";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5cKxlfm4i743bJlS2HVPBO1Fbvz1c6wgkkG8Vle8Ajo=";
   };
 
diff --git a/pkgs/development/python-modules/outdated/default.nix b/pkgs/development/python-modules/outdated/default.nix
index 3331966bb31f..de9273915ab2 100644
--- a/pkgs/development/python-modules/outdated/default.nix
+++ b/pkgs/development/python-modules/outdated/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = "outdated";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5VpPmgIcVtY97F0Hb0m9MuSW0zjaUJ18ATA4GBRw+jc=";
   };
 
diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix
index 52ba16676fd0..82128f2383cb 100644
--- a/pkgs/development/python-modules/outlines/default.nix
+++ b/pkgs/development/python-modules/outlines/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "outlines-dev";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6VH9BcMRVRf2xvLcK3GNA1pGgAOs95UOlFQ6KxHXwKo=";
   };
 
diff --git a/pkgs/development/python-modules/outspin/default.nix b/pkgs/development/python-modules/outspin/default.nix
index 3d0d8e34ad81..6785689cc7ed 100644
--- a/pkgs/development/python-modules/outspin/default.nix
+++ b/pkgs/development/python-modules/outspin/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "outspin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j+J3n/p+DcfnhGfC4/NDBDl5bF39L5kIPeGJW0Zm7ls=";
   };
 
diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix
index a19db6995ee8..058ab327c4d5 100644
--- a/pkgs/development/python-modules/overrides/default.nix
+++ b/pkgs/development/python-modules/overrides/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkorpela";
     repo = "overrides";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gQDw5/RpAFNYWFOuxIAArPkCOoBYWUnsDtv1FEFteHo=";
   };
 
diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix
index 6afc39dd8270..2779c92b0533 100644
--- a/pkgs/development/python-modules/ovoenergy/default.nix
+++ b/pkgs/development/python-modules/ovoenergy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "ovoenergy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZcTSf7UejEUqQo0qEXP3fWjZYRx0a3ZBNVkwS2dL3Yk=";
   };
 
diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 4d2d4f24071e..0f0ea8c546e1 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geopython";
     repo = "OWSLib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk=";
   };
 
diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix
index a5ef8d16bb7f..894ae80ff73e 100644
--- a/pkgs/development/python-modules/p1monitor/default.nix
+++ b/pkgs/development/python-modules/p1monitor/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klaasnicolaas";
     repo = "python-p1monitor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vr/JLvn593cgZ2KEsfDW1lS4QlGiymr0qZ8130zo6Ec=";
   };
 
diff --git a/pkgs/development/python-modules/packaging-legacy/default.nix b/pkgs/development/python-modules/packaging-legacy/default.nix
index 1f6b2f314c00..216ca3eb630d 100644
--- a/pkgs/development/python-modules/packaging-legacy/default.nix
+++ b/pkgs/development/python-modules/packaging-legacy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "di";
     repo = "packaging_legacy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2TnJjxasC8+c+qHY60e6Jyqhf1nQJfj/tmIA/LvUsT8=";
   };
 
diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix
index 4f7cc686d9e6..55caf191b467 100644
--- a/pkgs/development/python-modules/packvers/default.nix
+++ b/pkgs/development/python-modules/packvers/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "packvers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE=";
   };
 
diff --git a/pkgs/development/python-modules/pandantic/default.nix b/pkgs/development/python-modules/pandantic/default.nix
index a33f2ee706ce..19bfb3896721 100644
--- a/pkgs/development/python-modules/pandantic/default.nix
+++ b/pkgs/development/python-modules/pandantic/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wesselhuising";
     repo = "pandantic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JRhnDVRYX0OV/dZkfqNoS2qFcoHOZHm9QZphF/JhgxM=";
   };
 
diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix
index f216673fc7f0..2b66e0c64039 100644
--- a/pkgs/development/python-modules/pandas-stubs/default.nix
+++ b/pkgs/development/python-modules/pandas-stubs/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pandas-dev";
     repo = "pandas-stubs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Dt2a4l5WAOizUeaDa80CRuvyPT9mWfFz+zGZMm3vQP4=";
   };
 
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index a20a723b92c6..241f60fa75fe 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -72,7 +72,7 @@ let
     src = fetchFromGitHub {
       owner = "pandas-dev";
       repo = "pandas";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME=";
     };
 
diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix
index 5548785e5fa9..e055a5566d31 100644
--- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix
+++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chdemko";
     repo = "pandoc-latex-environment";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iKzveVTScqF8dAGPx7JU66Z5oyoZ82t101z5xeiHYqw=";
   };
 
diff --git a/pkgs/development/python-modules/paperbush/default.nix b/pkgs/development/python-modules/paperbush/default.nix
index 26f30a88908b..6a1fc911a5b6 100644
--- a/pkgs/development/python-modules/paperbush/default.nix
+++ b/pkgs/development/python-modules/paperbush/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "paperbush";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wJV+2aGK9eSw2iToiHh0I7vYAuND2pRYGhnf7CB1a+0=";
   };
 
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 6291f0139414..bbafe4f048a4 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nteract";
     repo = "papermill";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NxC5+hRDdMCl/7ZIho5ml4hdENrgO+wzi87GRPeMv8Q=";
   };
 
diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index c2f4b8f21d6d..3b99c37be970 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "papis";
     repo = "papis";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UpZoMYk4URN8tSFGIynVzWMk+9S0izROAgbx6uI2cN8=";
   };
 
diff --git a/pkgs/development/python-modules/paragraphs/default.nix b/pkgs/development/python-modules/paragraphs/default.nix
index d9f79769cdee..1f37646f81da 100644
--- a/pkgs/development/python-modules/paragraphs/default.nix
+++ b/pkgs/development/python-modules/paragraphs/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ShayHill";
     repo = "paragraphs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-u5/oNOCLdvfQVEIEpraeNLjTUoh3eJQ6qSExnkzTmNw=";
   };
 
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 8f5975a9517d..63d94f4b7fe6 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "holoviz";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rGfFLDl5Y8D0OiO/1G05w2l3hAHZC368LuNADDzfBFs=";
   };
 
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 8b5149011112..7ca9f927008a 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sods";
     repo = "paramz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SWmx70G5mm3eUmH2UIEmg5C7u9VDHiFw5aYCIr8UjPs=";
   };
 
diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix
index 92e5e7764794..5c01bd16752e 100644
--- a/pkgs/development/python-modules/parquet/default.nix
+++ b/pkgs/development/python-modules/parquet/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcrobak";
     repo = "parquet-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WVDffYKGsyepK4w1d4KUUMmxB6a6ylTbJvG79Bt5G6o=";
   };
 
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index 2e2a8dcba79c..03c0e9e44a4e 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jenisys";
     repo = "parse_type";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oKPyzEKrP9umnDzPC3HwSgWmWkCg/h0ChYVrpseklf8=";
   };
 
diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
index 76c6fdc51a5d..4cc83d5879f0 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "r1chardj0n3s";
     repo = "parse";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-i/H3E/Z8vqt2jLS8BaVHJuD2Fbi7TP7EeOjXAJ16bWg=";
   };
 
diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix
index 3c60ec41fcec..d8fea45dd13a 100644
--- a/pkgs/development/python-modules/parsy/default.nix
+++ b/pkgs/development/python-modules/parsy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "parsy";
     owner = "python-parsy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/Bu3xZUpXI4WiYJKKWTJTdSFq8pwC1PFDw0Kr8s3Fe8=";
   };
 
diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix
index ac75974739b2..9c05061b671f 100644
--- a/pkgs/development/python-modules/partd/default.nix
+++ b/pkgs/development/python-modules/partd/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dask";
     repo = "partd";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-EK+HNSPh2b7jwpc6jwH/n+6HDgHhRfBeaRuiDIWVG28=";
   };
 
diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index 40a921726a67..ae7eb8b7a79e 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pasteorg";
     repo = "paste";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o=";
   };
 
diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix
index 7d1eacb847e0..8b25b8f4aab5 100644
--- a/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/pkgs/development/python-modules/pastedeploy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Pylons";
     repo = "pastedeploy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q=";
   };
 
diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix
index c0bd7ccb8ced..2cb4b5c6b566 100644
--- a/pkgs/development/python-modules/pathable/default.nix
+++ b/pkgs/development/python-modules/pathable/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew=";
   };
 
diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index b82f3319426c..04cc2ef55dcd 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uqfoundation";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-J3rwnsn/3DXmChydwNC5yvsdSk1mzvPSnSo21BwkhSE=";
   };
 
diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix
index 075259be8124..1ef4585798ef 100644
--- a/pkgs/development/python-modules/patiencediff/default.nix
+++ b/pkgs/development/python-modules/patiencediff/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "breezy-team";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SFu1oN1yE9tKeBgWhgWjDpR31AptGrls0D5kKQed+HI=";
   };
 
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
index 3259bee2721b..b42c95661b57 100644
--- a/pkgs/development/python-modules/patool/default.nix
+++ b/pkgs/development/python-modules/patool/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wummel";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mt/GUIRJHB2/Rritc+uNkolZzguYy2G/NKnSKNxKsLk=";
   };
 
diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix
index 5db6c74916f1..c269b4a6ae38 100644
--- a/pkgs/development/python-modules/patsy/default.nix
+++ b/pkgs/development/python-modules/patsy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydata";
     repo = "patsy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gtkvFxNzMFiBBiuKhelSSsTilA/fLJSC5QHqDLiRrWE=";
   };
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "patsy" ];
 
   meta = {
-    changelog = "https://github.com/pydata/patsy/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/pydata/patsy/releases/tag/v${version}";
     description = "Python package for describing statistical models";
     homepage = "https://github.com/pydata/patsy";
     license = lib.licenses.bsd2;
diff --git a/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix b/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix
index d2792aaacd01..a4d15de4bf17 100644
--- a/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix
+++ b/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "paypal";
     repo = "Checkout-Python-SDK";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-04ojNJeqVMdhnGpeCD+wzgKGLI22tVvrMW3gF/SH7KU=";
   };
 
diff --git a/pkgs/development/python-modules/paypalhttp/default.nix b/pkgs/development/python-modules/paypalhttp/default.nix
index 4a0c7115c74e..3563bb7454ee 100644
--- a/pkgs/development/python-modules/paypalhttp/default.nix
+++ b/pkgs/development/python-modules/paypalhttp/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "paypal";
     repo = "paypalhttp_python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3ihcpYtpcejPkiyf4g4jveyNU6flQB2sv9EZ5Pd7tUc=";
   };
 
diff --git a/pkgs/development/python-modules/pbar/default.nix b/pkgs/development/python-modules/pbar/default.nix
index 3ae769d74e82..91c194ceb9e4 100644
--- a/pkgs/development/python-modules/pbar/default.nix
+++ b/pkgs/development/python-modules/pbar/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darvil82";
     repo = "PBar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FsEjfusk8isOD52xkjndGQdVC8Vc7N3spLLWQTi3Svc=";
   };
 
diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index caecd0c76e3d..2458d1f9206c 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frostming";
     repo = "pbs-installer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rMj0zKqfYvOvKZVNoZxOULaXyzjiMfBN49M+Z3+SAaM=";
   };
 
diff --git a/pkgs/development/python-modules/pbxproj/default.nix b/pkgs/development/python-modules/pbxproj/default.nix
index a9635b873729..729149ad1260 100644
--- a/pkgs/development/python-modules/pbxproj/default.nix
+++ b/pkgs/development/python-modules/pbxproj/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kronenthaler";
     repo = "mod-pbxproj";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-srtS6ggVnpffEa57LL2OzfC2mVd9uLxUL6LzxqPVLdo=";
   };
 
diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix
index 0fb4547ffd01..60dba3332b9c 100644
--- a/pkgs/development/python-modules/pcpp/default.nix
+++ b/pkgs/development/python-modules/pcpp/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ned14";
     repo = "pcpp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix
index b54cde4adde3..8a14613443b9 100644
--- a/pkgs/development/python-modules/pdf2docx/default.nix
+++ b/pkgs/development/python-modules/pdf2docx/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "ArtifexSoftware";
     repo = "pdf2docx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tMITDm2NkxWS+H/hhd2LlaPbyuI86ZKaALqqHJqb8V0=";
   };
 
diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix
index 56ff16b94fe8..be653431e2a5 100644
--- a/pkgs/development/python-modules/pdfminer-six/default.nix
+++ b/pkgs/development/python-modules/pdfminer-six/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pdfminer";
     repo = "pdfminer.six";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0=";
   };
 
diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix
index 47e0dd303d46..caf163ba1d08 100644
--- a/pkgs/development/python-modules/pdfplumber/default.nix
+++ b/pkgs/development/python-modules/pdfplumber/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jsvine";
     repo = "pdfplumber";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-62S5DMQwSgehl0BcjeRaTocko8xg72pQQ5YLoL3+QbU=";
   };
 
diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix
index b7a7f87a4fd0..578d1fb96449 100644
--- a/pkgs/development/python-modules/pdm-backend/default.nix
+++ b/pkgs/development/python-modules/pdm-backend/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-backend";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XbHlzt00R0kB8I6nRvteAgpFlUTAvBcF5iaQD5V30ok=";
   };
 
diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix
index 72604e5af492..4aa77c4f2f1f 100644
--- a/pkgs/development/python-modules/pdoc3/default.nix
+++ b/pkgs/development/python-modules/pdoc3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pdoc3";
     repo = "pdoc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Opj1fU1eZvqsYJGCBliVwugxFV4H1hzOOTkjs4fOEWA=";
   };
 
diff --git a/pkgs/development/python-modules/pdunehd/default.nix b/pkgs/development/python-modules/pdunehd/default.nix
index 009c811601cb..cfcb37d7c3c1 100644
--- a/pkgs/development/python-modules/pdunehd/default.nix
+++ b/pkgs/development/python-modules/pdunehd/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "valentinalexeev";
     repo = "pdunehd";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-8CL7ZQ+tV0CKdqWWiPDbo6Q5d1iIj/vNbYshdjUpYSw=";
   };
 
diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix
index cca95fd385c0..f07be16744b1 100644
--- a/pkgs/development/python-modules/peewee-migrate/default.nix
+++ b/pkgs/development/python-modules/peewee-migrate/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klen";
     repo = "peewee_migrate";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sC63WH/4EmoQYfvl3HyBHDzT/jMZW/G7mTC138+ZHHU=";
   };
 
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 9f1d47939b22..04488bd6fe00 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = "peewee";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2mViwo39adzzhpFS056C1JU5fXr3zKorzkVyJrKKRhI=";
   };
 
diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix
index 55628d53983d..e1ab538993ed 100644
--- a/pkgs/development/python-modules/pegen/default.nix
+++ b/pkgs/development/python-modules/pegen/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "we-like-parsers";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg=";
   };
 
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index b6b03a7714ea..70455f9734d7 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getpelican";
     repo = "pelican";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RWzOMp3H0QbZyGsXd8cakeRqZhVH7d6ftxZHBA4cPSA=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
diff --git a/pkgs/development/python-modules/pem/default.nix b/pkgs/development/python-modules/pem/default.nix
index cc2572c8ebc5..61b1ef39a0c7 100644
--- a/pkgs/development/python-modules/pem/default.nix
+++ b/pkgs/development/python-modules/pem/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hynek";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rVYlnvISGugh9qvf3mdrIyELmeOUU4g6291HeoMkoQc=";
   };
 
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index 0a22016c926f..718377eefd6f 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sdispater";
     repo = "pendulum";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-v0kp8dklvDeC7zdTDOpIbpuj13aGub+oCaYz2ytkEpI=";
   };
 
diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix
index 9ab07cfd7678..3999c6ded295 100644
--- a/pkgs/development/python-modules/pep8-naming/default.nix
+++ b/pkgs/development/python-modules/pep8-naming/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uIVk8+5rVEIBZLz70WUi0O6/Q9ERptJ3b7314gLPeHk=";
   };
 
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix
index e71358857354..23ebc341503a 100644
--- a/pkgs/development/python-modules/perfplot/default.nix
+++ b/pkgs/development/python-modules/perfplot/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nschloe";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bu6eYQukhLE8sLkS3PbqTgXOqJFXJYXTcXAhmjaq48g=";
   };
 
diff --git a/pkgs/development/python-modules/pesq/default.nix b/pkgs/development/python-modules/pesq/default.nix
index d8111f3a4531..ccb8de7939b3 100644
--- a/pkgs/development/python-modules/pesq/default.nix
+++ b/pkgs/development/python-modules/pesq/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludlows";
     repo = "PESQ";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JuwZ+trFKGMetS3cC3pEQsV+wbj6+klFnC3THOd8bPE=";
   };
 
diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix
index f388de21a026..c302e34a9306 100644
--- a/pkgs/development/python-modules/pettingzoo/default.nix
+++ b/pkgs/development/python-modules/pettingzoo/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "PettingZoo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TVM4MrA4W6AIWEdBIecI85ahJAAc21f27OzCxSpOoZU=";
   };
 
diff --git a/pkgs/development/python-modules/pfzy/default.nix b/pkgs/development/python-modules/pfzy/default.nix
index 7b1ef211aad6..dfd3f4ec2f04 100644
--- a/pkgs/development/python-modules/pfzy/default.nix
+++ b/pkgs/development/python-modules/pfzy/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kazhala";
     repo = "pfzy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+Ba/yLUfT0SPPAJd+pKyjSvNrVpEwxW3xEKFx4JzpYk=";
   };
 
diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix
index 810f1aa26859..6e9f962c60bd 100644
--- a/pkgs/development/python-modules/pgmpy/default.nix
+++ b/pkgs/development/python-modules/pgmpy/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pgmpy";
     repo = "pgmpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RusVREhEXYaJuQXTaCQ7EJgbo4+wLB3wXXCAc3sBGtU=";
   };
 
diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix
index bb55a3dd5b06..48381cea69c0 100644
--- a/pkgs/development/python-modules/pgvector/default.nix
+++ b/pkgs/development/python-modules/pgvector/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ho0UgamZxsN+pv7QkpsDnN7f+I+SrexA2gVtmJF8/3Q=";
   };
 
diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix
index 0e9fa4b5be98..c48e4a8ab41a 100644
--- a/pkgs/development/python-modules/phe/default.nix
+++ b/pkgs/development/python-modules/phe/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "data61";
     repo = "python-paillier";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P//4ZL4+2zcB5sWvujs2N0CHFz+EBLERWrPGLLHj6CY=";
   };
 
diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix
index af3c33f908be..90c5eebb2721 100644
--- a/pkgs/development/python-modules/phik/default.nix
+++ b/pkgs/development/python-modules/phik/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KaveIO";
     repo = "PhiK";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk=";
   };
 
diff --git a/pkgs/development/python-modules/philipstv/default.nix b/pkgs/development/python-modules/philipstv/default.nix
index 4becffc7f750..d482554a755d 100644
--- a/pkgs/development/python-modules/philipstv/default.nix
+++ b/pkgs/development/python-modules/philipstv/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bcyran";
     repo = "philipstv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BvQurZls9NjtHhTXLQ9t8fHkAF/QU/c6mmRvNmE0v90=";
   };
 
diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix
index bfe057b3796f..cf17a0d479ef 100644
--- a/pkgs/development/python-modules/photutils/default.nix
+++ b/pkgs/development/python-modules/photutils/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "photutils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4=";
   };
 
diff --git a/pkgs/development/python-modules/phunspell/default.nix b/pkgs/development/python-modules/phunspell/default.nix
index c4d8cf4ddc16..2070a98df3e5 100644
--- a/pkgs/development/python-modules/phunspell/default.nix
+++ b/pkgs/development/python-modules/phunspell/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dvwright";
     repo = "phunspell";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TlO9Ccr2iRN+s3JV+3P36RF9oFY32fj+24sKslZZCVk=";
   };
 
diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix
index 29255f6bfd50..d3097872fe38 100644
--- a/pkgs/development/python-modules/phx-class-registry/default.nix
+++ b/pkgs/development/python-modules/phx-class-registry/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "todofixthis";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kJbyUzyklVSvW6bBxTTTrY+WhfcV0GUf/+Pzyv+7sEA=";
   };
 
diff --git a/pkgs/development/python-modules/pi1wire/default.nix b/pkgs/development/python-modules/pi1wire/default.nix
index ca57c6fd8b35..5ba5ef0aa870 100644
--- a/pkgs/development/python-modules/pi1wire/default.nix
+++ b/pkgs/development/python-modules/pi1wire/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ushiboy";
     repo = "pi1wire";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l/5w71QsAW4BvILOaLdUVvQ8xxUm1ZTzUESRFzUgtic=";
   };
 
diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix
index 847bd778a885..edbc5c1e0dfa 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA=";
   };
 
diff --git a/pkgs/development/python-modules/pick/default.nix b/pkgs/development/python-modules/pick/default.nix
index 5d26864fac79..6508e79b4f33 100644
--- a/pkgs/development/python-modules/pick/default.nix
+++ b/pkgs/development/python-modules/pick/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wong2";
     repo = "pick";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SnH37n0MCjO60IU6kUPxJkIC5vBCVGZXBhFfwvRI/tQ=";
   };
 
diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix
index b180c5618dac..157a1325858d 100644
--- a/pkgs/development/python-modules/picobox/default.nix
+++ b/pkgs/development/python-modules/picobox/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ikalnytskyi";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JtrwUVo3b4G34OUShX4eJS2IVubl4vBmEtB/Jhk4eJI=";
   };
 
diff --git a/pkgs/development/python-modules/picologging/default.nix b/pkgs/development/python-modules/picologging/default.nix
index 9484abee82fe..c5a3ac178273 100644
--- a/pkgs/development/python-modules/picologging/default.nix
+++ b/pkgs/development/python-modules/picologging/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     # 0.9.4 only release on github
     owner = "microsoft";
     repo = "picologging";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-t75D7aNKAifzeCPwtyKp8LoiXtbbXspRFYnsI0gx+V4=";
   };
 
diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix
index f147b22ad97e..5037f306ac53 100644
--- a/pkgs/development/python-modules/picosvg/default.nix
+++ b/pkgs/development/python-modules/picosvg/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jG1rfamegnX8GXDwqkGFBFzUeycRLDObJvGbxNk6OpM=";
   };
 
diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index d520087a17d0..57800a6a7b75 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pika";
     repo = "pika";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-60Z+y3YXazUghfnOy4e7HzM18iju5m5OEt4I3Wg6ty4=";
   };
 
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 6c1cea184fd7..5ca5643eb91a 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pikepdf";
     repo = "pikepdf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     # The content of .git_archival.txt is substituted upon tarball creation,
     # which creates indeterminism if master no longer points to the tag.
     # See https://github.com/jbarlow83/OCRmyPDF/issues/841
diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix
index f8638d93578b..6866c568c09d 100644
--- a/pkgs/development/python-modules/pilkit/default.nix
+++ b/pkgs/development/python-modules/pilkit/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matthewwithanm";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk=";
   };
 
diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix
index e82da56c95b4..7c3a051c7b43 100644
--- a/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/pkgs/development/python-modules/pillow-heif/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bigcat88";
     repo = "pillow_heif";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a1qCxI+mMuEYsCk2CUYGNKCe+SONuvVizqUvmQKy3sE=";
   };
 
diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix
index a55d6d6740e6..0d54ab62d574 100644
--- a/pkgs/development/python-modules/pillow-jpls/default.nix
+++ b/pkgs/development/python-modules/pillow-jpls/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "planetmarshall";
     repo = "pillow-jpls";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Rc4/S8BrYoLdn7eHDBaoUt1Qy+h0TMAN5ixCAuRmfPU=";
   };
 
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 16594fc13d1e..944dbabbe2ee 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-pillow";
     repo = "pillow";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vWNqzA2ZfJcWexXw790RgyYtP8WDtahoQIX16otCRnk=";
   };
 
diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix
index c016d45ffae5..5c62e7f222b9 100644
--- a/pkgs/development/python-modules/pims/default.nix
+++ b/pkgs/development/python-modules/pims/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "soft-matter";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3SBZk11w6eTZFmETMRJaYncxY38CYne1KzoF5oRgzuY=";
   };
 
diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix
index 1db545017f95..06bcf0f4ff16 100644
--- a/pkgs/development/python-modules/pins/default.nix
+++ b/pkgs/development/python-modules/pins/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rstudio";
     repo = "pins-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-79TVAfr872Twc7D2iej51jiKNwZ9ESOa66ItNDmyfFM=";
   };
 
diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix
index 67e1f109c8e0..6bd27a237e7f 100644
--- a/pkgs/development/python-modules/pint-pandas/default.nix
+++ b/pkgs/development/python-modules/pint-pandas/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "pint-pandas";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5/Qk6HZlfeKkfSqnVA8aADjJ99SUiurYCqSIUBPFIzc=";
   };
 
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index e480d1657875..7127ebe3f798 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "pint";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Pr+BRLj6BjEDwKJ24qxmfiJswpgQJDumAx3rT6tQHSY=";
   };
 
diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix
index 562f701dece7..398440a91833 100644
--- a/pkgs/development/python-modules/pip-api/default.nix
+++ b/pkgs/development/python-modules/pip-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "di";
     repo = "pip-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nmCP4hp+BsD80OBjerOu+QTBBExGHvn/v19od4V3ncI=";
   };
 
diff --git a/pkgs/development/python-modules/pip-chill/default.nix b/pkgs/development/python-modules/pip-chill/default.nix
index 7a32efc1c013..18aae37a9e29 100644
--- a/pkgs/development/python-modules/pip-chill/default.nix
+++ b/pkgs/development/python-modules/pip-chill/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rbanffy";
     repo = "pip-chill";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oWq3UWBL5nsCBUkaElashZKvm7pN3StJNubgU++8YFs=";
   };
 
diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix
index e72824c804a4..fb52b8f3da04 100644
--- a/pkgs/development/python-modules/pip-requirements-parser/default.nix
+++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UMrwDXxk+sD3P2jk7s95y4OX6DRBjWWZZ8IhkR6tnZ4=";
   };
 
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 97043d7ca8d3..eb946a955c67 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -36,7 +36,7 @@ let
     src = fetchFromGitHub {
       owner = "pypa";
       repo = pname;
-      rev = "refs/tags/${version}";
+      tag = version;
       hash = "sha256-yojk2T5wuPkS1OKusilj253AT+xyKwXCWKBNUEH2Mgo=";
     };
 
diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index f69a6ef6ac41..ad4fba28c5bd 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "pipdeptree";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Tg41ZH91yyE3N2ndmQ9VsK/0t7g9cBNZd4A6XcqBZdo=";
   };
 
diff --git a/pkgs/development/python-modules/pipe/default.nix b/pkgs/development/python-modules/pipe/default.nix
index b59ea62f924f..2038828e8cc4 100644
--- a/pkgs/development/python-modules/pipe/default.nix
+++ b/pkgs/development/python-modules/pipe/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JulienPalard";
     repo = "Pipe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/xMhh70g2KPOOivTjpAuyfu+Z44tBE5zAwpSIEKhK6M=";
   };
 
diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
index 105848b93d82..8c6acd153f17 100644
--- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
+++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yhino";
     repo = "pipenv-poetry-migrate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-E93A3EfbCb+oOYB61CGhBLwB5m6pvZaSXt9wdnUBSFQ=";
   };
 
diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index 052ef15fc373..1188b6a2ce3c 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "pipx";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-diHWzrSpXWbNosXKN5nj2FM09HicDhHWKxQDXc+AZ4o=";
   };
 
diff --git a/pkgs/development/python-modules/piqp/default.nix b/pkgs/development/python-modules/piqp/default.nix
index 0820a856ba81..22ab19aa442c 100644
--- a/pkgs/development/python-modules/piqp/default.nix
+++ b/pkgs/development/python-modules/piqp/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PREDICT-EPFL";
     repo = "piqp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/lADjg4NyDdV9yeYBW2gbPydY8TfV247B/dI/ViRVlI=";
   };
 
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 471aa322d1bf..57c813b3c415 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "pivy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wWM8eKTehWCIbRxxWkZ4YrYyeIJuzQaBOUMrW9a5MVo=";
   };
 
diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index d234636bb2ce..a70a39c709fd 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ialbert";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EWwDtS2cRLBe4aZuH72hgg2BQnVJQ39GmPx05NxTNjE=";
   };
 
diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix
index c24cd66e2fac..6bfbdb8665fe 100644
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mikitex70";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5K8NSxMCdAsOtV0egY8gMbHnHifvYNRHzafR0LAcm+Q=";
   };
 
diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 89ec53073e43..e8171d376747 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "platformdirs";
     repo = "platformdirs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Zo1fEqiUbrI3pbVp3ndjV8gd+sbcGgUm1PJhQudmiMQ=";
   };
 
diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix
index 08462f56a616..d230e237cec6 100644
--- a/pkgs/development/python-modules/playwright/default.nix
+++ b/pkgs/development/python-modules/playwright/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "playwright-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM=";
   };
 
diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 02f2035d9c02..87466acbb22b 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TnK7CeW4mJGS77tzYkBQJbLn+niZEMWScpLLaWLmQAA=";
   };
 
diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix
index 929b9e118608..5fe343a4a570 100644
--- a/pkgs/development/python-modules/plexapi/default.nix
+++ b/pkgs/development/python-modules/plexapi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pkkid";
     repo = "python-plexapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4dWtSj6OwD4c18yDKtlqXyPc37JQhbsAuj9OmcIHe0I=";
   };
 
diff --git a/pkgs/development/python-modules/plexwebsocket/default.nix b/pkgs/development/python-modules/plexwebsocket/default.nix
index 829239c00e5b..c07bac70ccc9 100644
--- a/pkgs/development/python-modules/plexwebsocket/default.nix
+++ b/pkgs/development/python-modules/plexwebsocket/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jjlawren";
     repo = "python-plexwebsocket";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gT9RWpaR33ROs6ttjH2joNPi99Ng94Tp/R9eZY1eGZk=";
   };
 
diff --git a/pkgs/development/python-modules/ploomber-core/default.nix b/pkgs/development/python-modules/ploomber-core/default.nix
index e05f4d9f9246..73a1090a9270 100644
--- a/pkgs/development/python-modules/ploomber-core/default.nix
+++ b/pkgs/development/python-modules/ploomber-core/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ploomber";
     repo = "core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QUEnWFhf42ppoXoz3H/2SHtoPZOi6lbopsrbmEAk+1U=";
   };
 
diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix
index 94ba9f6c5d21..614a09e78bed 100644
--- a/pkgs/development/python-modules/plotext/default.nix
+++ b/pkgs/development/python-modules/plotext/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "piccolomo";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs=";
   };
 
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 9823c41c4fec..5652f9458b86 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ONuX5/GlirPF8+7bZtib1Xsv5llcXcSelFfGyeTc5L8=";
   };
 
diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix
index 081a9bc25f95..1b81c999a374 100644
--- a/pkgs/development/python-modules/plotpy/default.nix
+++ b/pkgs/development/python-modules/plotpy/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "PlotPy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kMVq8X6XP18B5x35BTuC7Q5uFFwds1JxCaxlDuD/UfE=";
   };
 
diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix
index f2951a245e31..0db2939c705d 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/pkgs/development/python-modules/pluggy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pluggy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-f0DxyZZk6RoYtOEXLACcsOn2B+Hot4U4g5Ogr/hKmOE=";
   };
 
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 191f26a59db7..172415230716 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plugwise";
     repo = "python-plugwise";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-REWU3ngf93HUVDnyiErML41E+nPoqphfhBKmAYvV2+U=";
   };
 
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index 4f2227563068..be81d3e3d5dc 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = "plumbum";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU=";
   };
 
diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix
index 0ca2084fd8c4..3c726b7d3b36 100644
--- a/pkgs/development/python-modules/plux/default.nix
+++ b/pkgs/development/python-modules/plux/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "plux";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M4N3Ccuw95OcLsWQVtITv4QShBJKliTh5QIoqji8x9o=";
   };
 
diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix
index f0398ac86235..b0d20de57400 100644
--- a/pkgs/development/python-modules/plyer/default.nix
+++ b/pkgs/development/python-modules/plyer/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kivy";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE=";
   };
 
diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix
index 419d58964639..d8379c5654ca 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/pkgs/development/python-modules/plyfile/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dranjan";
     repo = "python-plyfile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HlyqljfjuaZoG5f2cfDQj+7KS0en7pW2PPEnpvH8U+E=";
   };
 
diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix
index f2f458a2ee01..83facbf20fc1 100644
--- a/pkgs/development/python-modules/podcastparser/default.nix
+++ b/pkgs/development/python-modules/podcastparser/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "podcastparser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-P9wVyxTO0nz/DfuBhCE+VjhH1uYx4jBd30Ca26yBzbo=";
   };
 
diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix
index 24b026b2fe79..58abbbb9c0dc 100644
--- a/pkgs/development/python-modules/podman/default.nix
+++ b/pkgs/development/python-modules/podman/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YER+qTC5+eF3PWtDBPq2WNOm5RzqXy30+1JdPzwyfrk=";
   };
 
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index e3a0ffe1e75c..62dfdcb3918c 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry-core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8=";
   };
 
diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
index 7071303df807..e6c2a8d4f619 100644
--- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2iC665bOCr5JEcuypgr57bHSRYc3PuetJ9uPvFLsgZM=";
   };
 
diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix
index 48e4f60ca5b8..1ed4764badd4 100644
--- a/pkgs/development/python-modules/policy-sentry/default.nix
+++ b/pkgs/development/python-modules/policy-sentry/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "salesforce";
     repo = "policy_sentry";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-J6dLKmfZJSU9k64PzOAOTgYvRf9NCpWtYuFEUxrfT5M=";
   };
 
diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix
index 713b235f0f8f..0352bea3d031 100644
--- a/pkgs/development/python-modules/polyline/default.nix
+++ b/pkgs/development/python-modules/polyline/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frederickjansen";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fbGGfZdme4OiIGNlXG1uVl1xP+rPVI9l5hjHM0gwAsE=";
   };
 
diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix
index f2acda4a0af7..48024e2ab46d 100644
--- a/pkgs/development/python-modules/polyswarm-api/default.nix
+++ b/pkgs/development/python-modules/polyswarm-api/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "polyswarm";
     repo = "polyswarm-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7hmuJr+1ghVsp8EfykhVLCHwJYrO2m6cBREUFRov5Mo=";
   };
 
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index ddaffc745928..071c15c7e100 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     repo = pname;
     owner = "jmschrei";
     # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PoDAtNm/snq4isotkoCTVYUuwr9AKKwiXIojUFMH/YE=";
   };
 
diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix
index 790c162e6fb6..13a941558c82 100644
--- a/pkgs/development/python-modules/pony/default.nix
+++ b/pkgs/development/python-modules/pony/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ponyorm";
     repo = "pony";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fYzwdHRB9QrIJPEk8dqtPggSnJeugDyC9zQSM6u3rN0=";
   };
 
diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix
index 285e66f89a98..9b704e6b2e77 100644
--- a/pkgs/development/python-modules/pook/default.nix
+++ b/pkgs/development/python-modules/pook/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "h2non";
     repo = "pook";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sdfkMvPSlVK7EoDUEuJbiuocOjGJygqiCiftrsjnDhU=";
   };
 
diff --git a/pkgs/development/python-modules/port-for/default.nix b/pkgs/development/python-modules/port-for/default.nix
index 535cfbd5baf8..b4b2d9cfff1e 100644
--- a/pkgs/development/python-modules/port-for/default.nix
+++ b/pkgs/development/python-modules/port-for/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kmike";
     repo = "port-for";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/45TQ2crmTupRgL9hgZGw5IvFKywezSIHqHFbeAkMoo=";
   };
 
diff --git a/pkgs/development/python-modules/portion/default.nix b/pkgs/development/python-modules/portion/default.nix
index f609b6040ea3..af38121d0119 100644
--- a/pkgs/development/python-modules/portion/default.nix
+++ b/pkgs/development/python-modules/portion/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AlexandreDecan";
     repo = "portion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TBCnlkGZZ/3tWEojxDGNYcXtYHhrooJkaWBsRkadXEE=";
   };
 
diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix
index dd2a257ca9ae..351c93782ccb 100644
--- a/pkgs/development/python-modules/posthog/default.nix
+++ b/pkgs/development/python-modules/posthog/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PostHog";
     repo = "posthog-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-43ySHV2Idssd5YonzhyIpet98vinpQ4O2AKUiAlYahY=";
   };
 
diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix
index 196b93dc224a..0f144a661457 100644
--- a/pkgs/development/python-modules/pot/default.nix
+++ b/pkgs/development/python-modules/pot/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PythonOT";
     repo = "POT";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Yx9hjniXebn7ZZeqou0JEsn2Yf9hyJSu/acDlM4kCCI=";
   };
 
diff --git a/pkgs/development/python-modules/powerapi/default.nix b/pkgs/development/python-modules/powerapi/default.nix
index cdda78ab7e3c..69aa219c68ae 100644
--- a/pkgs/development/python-modules/powerapi/default.nix
+++ b/pkgs/development/python-modules/powerapi/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "powerapi-ng";
     repo = "powerapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iFWCrO9frMK68kefmKQrXra1g5efDCj2ZOlVwxDNvXw=";
   };
 
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index 76bab717715f..a1c5a27fe9e2 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-snJrfUvP11lBIy6F0WtqJt9fiYm5jxMwm9u3u5XFO84=";
   };
 
diff --git a/pkgs/development/python-modules/ppk2-api/default.nix b/pkgs/development/python-modules/ppk2-api/default.nix
index 066cf56c557b..a7a5f2dce191 100644
--- a/pkgs/development/python-modules/ppk2-api/default.nix
+++ b/pkgs/development/python-modules/ppk2-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IRNAS";
     repo = "ppk2-api-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fubDFtOXiv2YFYUCOUbuyXs1sHgs0/6ZVK9sAwxQ+Pk=";
   };
 
diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix
index 544681c2c704..2dcafee09403 100644
--- a/pkgs/development/python-modules/ppscore/default.nix
+++ b/pkgs/development/python-modules/ppscore/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "8080labs";
     repo = "ppscore";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU=";
   };
 
diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix
index 131928baba25..5e52815c9d8f 100644
--- a/pkgs/development/python-modules/prance/default.nix
+++ b/pkgs/development/python-modules/prance/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RonnyPfannschmidt";
     repo = "prance";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-p+LZbQal4DPeMp+eJ2O83rCaL+QIUDcU34pZhYdN4bE=";
   };
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index cab8bc38092f..2f46c5b50044 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jxF7rlMwKIKwyYv35vYWAdtClsVhnIkywoyMQeggGBc=";
   };
 
diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix
index 0300ae150da9..83df3edfe4e5 100644
--- a/pkgs/development/python-modules/prawcore/default.nix
+++ b/pkgs/development/python-modules/prawcore/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "prawcore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tECZRx6VgyiJDKHvj4Rf1sknFqUhz3sDFEsAMOeB7/g=";
   };
 
diff --git a/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix b/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix
index dfaf77528d26..af6a7c15b928 100644
--- a/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix
+++ b/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cpfair";
     repo = "prayer-times-calculator-offline";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sVEdjtwxwGa354YimeaNqjqZ9yEecNXg8kk6Pafvvd4=";
   };
 
diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index 291f236c3c9b..a4aae5331b56 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pre-commit";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BYNi/xtdichqsn55hqr1MSFwWpH+7cCbLfqmpn9cxto=";
   };
 
diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix
index 32e2b0dfb79a..0f86be974e55 100644
--- a/pkgs/development/python-modules/precis-i18n/default.nix
+++ b/pkgs/development/python-modules/precis-i18n/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "byllyfish";
     repo = "precis_i18n";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rtg3u8lnnmQFPsNC52LNVoEVu6CeHzAWvOjWBlzLKC4=";
   };
 
diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix
index 443c115b0201..58c381d04740 100644
--- a/pkgs/development/python-modules/preprocess-cancellation/default.nix
+++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kageurufu";
     repo = "cancelobject-preprocessor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MJ4mwOFswLYHhg2LNZ+/ZwDvSjoxElVxlaWjArHV2NY=";
   };
 
diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix
index 83f57c4a70e3..bb4a9cf5d306 100644
--- a/pkgs/development/python-modules/primer3/default.nix
+++ b/pkgs/development/python-modules/primer3/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libnano";
     repo = "primer3-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O8BFjkjG9SfknSrK34s9EJnqTrtCf4zW9A+N+/MHl2w=";
   };
 
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index f9fcb26d64d9..4b5f55fefd80 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "primp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dexJdeNGpRsPLk8b/gNeQc1dsQLOiXNL5zgDEN9qHfQ=";
   };
 
diff --git a/pkgs/development/python-modules/print-color/default.nix b/pkgs/development/python-modules/print-color/default.nix
index 605f89e51bcd..4ae3d43fd123 100644
--- a/pkgs/development/python-modules/print-color/default.nix
+++ b/pkgs/development/python-modules/print-color/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xy3";
     repo = "print-color";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PHPbzzWG7smEsoTFYFT2tgXfCxUYjevpB9rxG2bZVy4=";
   };
 
diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix
index db89649a6a63..e08cbd3c6d7c 100644
--- a/pkgs/development/python-modules/prisma/default.nix
+++ b/pkgs/development/python-modules/prisma/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RobertCraigie";
     repo = "prisma-client-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F+Up1HHslralt3NvZZ/wT+CKvzKOjhEEuMEeT0L6NZM=";
   };
 
diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix
index 3ed427b468ea..827c02e36797 100644
--- a/pkgs/development/python-modules/private-gpt/default.nix
+++ b/pkgs/development/python-modules/private-gpt/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zylon-ai";
     repo = "private-gpt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IYTysU3W/NrtBuLe3ZJkztVSK+gzjkGIg0qcBYzB3bs=";
   };
 
diff --git a/pkgs/development/python-modules/procmon-parser/default.nix b/pkgs/development/python-modules/procmon-parser/default.nix
index 963f7ff9d358..6a0bba9c3bb6 100644
--- a/pkgs/development/python-modules/procmon-parser/default.nix
+++ b/pkgs/development/python-modules/procmon-parser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eronnen";
     repo = "procmon-parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XkMf3MQK4WFRLl60XHDG/j2gRHAiz7XL9MmC6SRg9RE=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix
index 27b3df9700a4..affb5a2971fc 100644
--- a/pkgs/development/python-modules/prometheus-api-client/default.nix
+++ b/pkgs/development/python-modules/prometheus-api-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "4n4nd";
     repo = "prometheus-api-client-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tUu0+ZUOFxBCj//lHhNm88rhFbS01j1x508+nqIkCfQ=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix
index 3c465a430a29..19477b659b56 100644
--- a/pkgs/development/python-modules/prometheus-client/default.nix
+++ b/pkgs/development/python-modules/prometheus-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "client_python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LrCBCfIcpxNjy/yjwCG4J34eJO4AdUr21kp9FBwSeAY=";
   };
 
diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
index 62168d3d745c..03c1268201c1 100644
--- a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
+++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trallnag";
     repo = "prometheus-fastapi-instrumentator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yvKdhQdbY0+jEc8TEHNNgtdnqE0abnd4MN/JZFQwQ2E=";
   };
 
diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix
index 95abec75b974..ee6df45657a9 100644
--- a/pkgs/development/python-modules/promise/default.nix
+++ b/pkgs/development/python-modules/promise/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "syrusakbary";
     repo = "promise";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5s6GMANSO4UpLOP/HAQxuNFSBSjPgvJCB9R1dOoKuJ4=";
   };
 
diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix
index 143b27953077..00a03b737ed4 100644
--- a/pkgs/development/python-modules/propcache/default.nix
+++ b/pkgs/development/python-modules/propcache/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "propcache";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j2PjSaOx0IKijoMjhtYVNrpqEwRjVFsON5OU/Fv5idc=";
   };
 
diff --git a/pkgs/development/python-modules/propka/default.nix b/pkgs/development/python-modules/propka/default.nix
index e9b93b390467..d63c5e6f2c4d 100644
--- a/pkgs/development/python-modules/propka/default.nix
+++ b/pkgs/development/python-modules/propka/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jensengroup";
     repo = "propka";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EJQqCe4WPOpqsSxxfbTjF0qETpSPYqpixpylweTCjko=";
   };
 
diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix
index c4cfc5fcf15c..b0f67a37c87d 100644
--- a/pkgs/development/python-modules/proton-core/default.nix
+++ b/pkgs/development/python-modules/proton-core/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EZsPw2kPgY42MQxrXt7yAtCNSmSNN5AYxx7SllwsbvA=";
   };
 
diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix
index 40a354ec31f4..7566f1e087cb 100644
--- a/pkgs/development/python-modules/proton-keyring-linux/default.nix
+++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-keyring-linux";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wT+0S3dGanLwqRrpCooAwy/RDyZDn1aEdJ7eWvwVfiY=";
   };
 
diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
index 70a773c0a265..3fdd597bd6cc 100644
--- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-network-manager";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zS/H7efEJlvDlcoxil6pd6lFLdLRAV7Bmr/ngtZ8Nuc";
   };
 
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
index 1f35c5aba5b6..ff647a2582bd 100644
--- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA=";
   };
 
diff --git a/pkgs/development/python-modules/proxy-db/default.nix b/pkgs/development/python-modules/proxy-db/default.nix
index 7ccfe3bb890a..9eca7c975861 100644
--- a/pkgs/development/python-modules/proxy-db/default.nix
+++ b/pkgs/development/python-modules/proxy-db/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Nekmo";
     repo = "proxy-db";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NdbvK2sJKKoWNYsuBaCMWtKEvuMhgyKXcKZXQgTC4bY=";
   };
 
diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index df174a125588..2960926ef497 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "abhinavsingh";
     repo = "proxy.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VQjK4wNOuUk3KhlvSlDbyclC+RUjeEIVvPN+bKq0fFc=";
   };
 
diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix
index 59afdd5ea567..dd847a486085 100644
--- a/pkgs/development/python-modules/pscript/default.nix
+++ b/pkgs/development/python-modules/pscript/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flexxui";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o=";
   };
 
diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix
index 12d951f5a480..11e8be6d92a1 100644
--- a/pkgs/development/python-modules/psrpcore/default.nix
+++ b/pkgs/development/python-modules/psrpcore/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "psrpcore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-svfqTOKKFKMphIPnvXfAbPZrp1GTV2D+33I0Rajfv1Y=";
   };
 
diff --git a/pkgs/development/python-modules/psutil-home-assistant/default.nix b/pkgs/development/python-modules/psutil-home-assistant/default.nix
index 40edb0b5270f..447283def468 100644
--- a/pkgs/development/python-modules/psutil-home-assistant/default.nix
+++ b/pkgs/development/python-modules/psutil-home-assistant/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "psutil-home-assistant";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6bj1aaa/JYZFVwUAJfxISRoldgTmumCG8WrlKhkb6kM=";
   };
 
diff --git a/pkgs/development/python-modules/psychrolib/default.nix b/pkgs/development/python-modules/psychrolib/default.nix
index ec8544ff2f6f..273f35ac2d5f 100644
--- a/pkgs/development/python-modules/psychrolib/default.nix
+++ b/pkgs/development/python-modules/psychrolib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "psychrometrics";
     repo = "psychrolib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OkjoYIakF7NXluNTaJnUHk5cI5t8GnpqrbqHYwnLOts=";
   };
 
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 33cc96524f56..fcfa87b1a9b2 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -39,7 +39,7 @@ let
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vcUZvQeD5MnEM02phk73I9dpf0Eug95V7Rspi0s6S2M=";
   };
 
diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix
index 4201bd154071..f2954a44d301 100644
--- a/pkgs/development/python-modules/psycopg2cffi/default.nix
+++ b/pkgs/development/python-modules/psycopg2cffi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chtd";
     repo = "psycopg2cffi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9r5MYxw9cvdbLVj8StmMmn0AKQepOpCc7TIBGXZGWe4=";
   };
 
diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix
index 24ce03dad657..af3315eb45bf 100644
--- a/pkgs/development/python-modules/psygnal/default.nix
+++ b/pkgs/development/python-modules/psygnal/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyapp-kit";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eGJWtmw2Ps3jII4T8E6s3djzxfqcSdyPemvejal0cn4=";
   };
 
diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix
index d7cde9159563..1c091899062d 100644
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pubnub";
     repo = "python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aVnhCRTm6lqwec4TRbvHFF4l/XvbBTbclJLxf7oyUak=";
   };
 
diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix
index c0955bc96aa6..4eccba1a6a6a 100644
--- a/pkgs/development/python-modules/pulp/default.nix
+++ b/pkgs/development/python-modules/pulp/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coin-or";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lpbk1GeC8F/iLGV8G5RPHghnaM9eL82YekUYEt9+mvc=";
   };
 
diff --git a/pkgs/development/python-modules/pulsar/default.nix b/pkgs/development/python-modules/pulsar/default.nix
index 516a718b758d..2ff2f2a7b4ac 100644
--- a/pkgs/development/python-modules/pulsar/default.nix
+++ b/pkgs/development/python-modules/pulsar/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "pulsar-client-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2Ahv0lfeHuBhGIYhiTjKegEKsJqHkpK3Qu6xBnjsanI=";
   };
 
diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix
index ce5216428dd7..b89dad1023a2 100644
--- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix
+++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mhthies";
     repo = "pulsectl-asyncio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU=";
   };
 
diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix
index 888ffca9a13d..c50bf049d622 100644
--- a/pkgs/development/python-modules/pulumi-aws/default.nix
+++ b/pkgs/development/python-modules/pulumi-aws/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumi-aws";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OFkXLH8r4BSvALv8kd7vm8k5TDJPBJSuJ04FzNdsrF8=";
   };
 
diff --git a/pkgs/development/python-modules/pulumi-hcloud/default.nix b/pkgs/development/python-modules/pulumi-hcloud/default.nix
index 315bc20c8873..1a40fec0e985 100644
--- a/pkgs/development/python-modules/pulumi-hcloud/default.nix
+++ b/pkgs/development/python-modules/pulumi-hcloud/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumi-hcloud";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m9MRXDTSC0K1raoH9gKPuxdwvUEnZ/ulp32xlY1Hsdo=";
   };
 
diff --git a/pkgs/development/python-modules/pure-cdb/default.nix b/pkgs/development/python-modules/pure-cdb/default.nix
index 175841ed2534..2f9c57ce994a 100644
--- a/pkgs/development/python-modules/pure-cdb/default.nix
+++ b/pkgs/development/python-modules/pure-cdb/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bbayles";
     repo = "python-pure-cdb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7zxQO+oTZJhXfM2yijGXchLixiQRuFTOSESVlEc+T0s=";
   };
 
diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix
index 87dcc8812f85..5b481b09f7d9 100644
--- a/pkgs/development/python-modules/pure-protobuf/default.nix
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eigenein";
     repo = "protobuf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AsiJDi3SF3nlWKFvZujUsoHY8AJ21JKzEuTdR9FtFQI=";
   };
 
diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix
index 9881df2a4c43..accf500a91fa 100644
--- a/pkgs/development/python-modules/puremagic/default.nix
+++ b/pkgs/development/python-modules/puremagic/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cdgriffith";
     repo = "puremagic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-a7jRQUSbH3E6eJiXNKr4ikdSXRZ6+/csl/EMiKXMzmk=";
   };
 
diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix
index a176ae73ee69..d060de77bf2f 100644
--- a/pkgs/development/python-modules/pvextractor/default.nix
+++ b/pkgs/development/python-modules/pvextractor/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "radio-astro-tools";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-TjwoTtoGWU6C6HdFuS+gJj69PUnfchPHs7UjFqwftVQ=";
   };
 
diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix
index 259b46962637..073d591c4e48 100644
--- a/pkgs/development/python-modules/pvo/default.nix
+++ b/pkgs/development/python-modules/pvo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-pvoutput";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EQdOPAYh7D9jHtuOuDtokxXnFKKtC0HybSwX77jj6+c=";
   };
 
diff --git a/pkgs/development/python-modules/pwkit/default.nix b/pkgs/development/python-modules/pwkit/default.nix
index 99e6378a5d00..af74fcaf30c2 100644
--- a/pkgs/development/python-modules/pwkit/default.nix
+++ b/pkgs/development/python-modules/pwkit/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pkgw";
     repo = "pwkit";
-    rev = "refs/tags/pwkit@${version}";
+    tag = "pwkit@${version}";
     hash = "sha256-FEMPHdXj2XCV5fCcdJsVpDMsJntP6zp1yFkjv1ov478=";
   };
 
diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index c5341cd1cd75..51de118a3d3a 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cjekel";
     repo = "piecewise_linear_fit_py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FAH38mSaABdNR8lpxxA/YVo5ec2WYOMEsAQqravbM9k=";
   };
 
diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix
index b745acf98d62..fa36ca8d681b 100644
--- a/pkgs/development/python-modules/py-aosmith/default.nix
+++ b/pkgs/development/python-modules/py-aosmith/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdr99";
     repo = "py-aosmith";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FhrAL1Iybi4LW4o8IvCAfEcrwbzJ+dnh+9W9HEd7c+M=";
   };
 
diff --git a/pkgs/development/python-modules/py-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix
index 72ea11e58522..248ac605e801 100644
--- a/pkgs/development/python-modules/py-bip39-bindings/default.nix
+++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "polkascan";
     repo = "py-bip39-bindings";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3/KBPUFVFkJifunGWJeAHLnY08KVTb8BHCFzDqKWH18=";
   };
 
diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix
index ecfb6a8d072a..9ed05ea205bd 100644
--- a/pkgs/development/python-modules/py-canary/default.nix
+++ b/pkgs/development/python-modules/py-canary/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snjoetw";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zylWkssU85eSfR+Di7vQGTr6hOQkqXCObv/PCDHoKHA=";
   };
 
diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix
index dd4837ed3cb9..4f1c74b9f20a 100644
--- a/pkgs/development/python-modules/py-desmume/default.nix
+++ b/pkgs/development/python-modules/py-desmume/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aH7f/BI89VLUGqwA8Y7ThSpmKxWffYRETT/+EjPVTg8=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix
index ea0896225a00..1b64a9e888ed 100644
--- a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix
+++ b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emontnemery";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kS99du9EZwki6J2q+nI44rx/AWIPtq7wXR/61ZcyUSM=";
   };
 
diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix
index 7f983cf534c5..c878698e0bea 100644
--- a/pkgs/development/python-modules/py-improv-ble-client/default.nix
+++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "py-improv-ble-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo=";
   };
 
diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix
index 32eb2a7c6667..c207e58f6fe0 100644
--- a/pkgs/development/python-modules/py-madvr2/default.nix
+++ b/pkgs/development/python-modules/py-madvr2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iloveicedgreentea";
     repo = "py-madvr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z+PVLz9eApGJ94I/Jp0MyqNpKQwIemk8j+OyqFmIbgI=";
   };
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/v${version}";
     description = "Control MadVR Envy over IP";
     homepage = "https://github.com/iloveicedgreentea/py-madvr";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/py-multicodec/default.nix b/pkgs/development/python-modules/py-multicodec/default.nix
index a657d8eb459d..5f8ce30adda3 100644
--- a/pkgs/development/python-modules/py-multicodec/default.nix
+++ b/pkgs/development/python-modules/py-multicodec/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "multiformats";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4=";
   };
 
diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix
index 9ad80769e954..396fd68d6696 100644
--- a/pkgs/development/python-modules/py-multihash/default.nix
+++ b/pkgs/development/python-modules/py-multihash/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "multiformats";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA=";
   };
 
diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix
index 2eea298d8bf3..1dfc3ec4644b 100644
--- a/pkgs/development/python-modules/py-nextbusnext/default.nix
+++ b/pkgs/development/python-modules/py-nextbusnext/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ViViDboarder";
     repo = "py_nextbus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/pzlxYGXqWix11G7DsHgwkCrSQFT/N1boKcBJ1YpE0A=";
   };
 
diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix
index 03fbc02e3687..9a1192f397d5 100644
--- a/pkgs/development/python-modules/py-ocsf-models/default.nix
+++ b/pkgs/development/python-modules/py-ocsf-models/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "py-ocsf-models";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cFtWPO78KRh7IY+ePTzXpLPbZm+EtNvuJkhZZzKKjaA=";
   };
 
diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix
index 00d06bf5576f..ea7fe3d23712 100644
--- a/pkgs/development/python-modules/py-opensonic/default.nix
+++ b/pkgs/development/python-modules/py-opensonic/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "khers";
     repo = "py-opensonic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lVErs5f2LoCrMNr+f8Bm2Q6xQRNuisloqyRHchYTukk=";
   };
 
diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix
index a240fbcd8085..454565c76417 100644
--- a/pkgs/development/python-modules/py-partiql-parser/default.nix
+++ b/pkgs/development/python-modules/py-partiql-parser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getmoto";
     repo = "py-partiql-parser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uEpgcY2bBaeFaK/0gWg1ef81FmKJy7m5G21aETW9QXU=";
   };
 
diff --git a/pkgs/development/python-modules/py-radix-sr/default.nix b/pkgs/development/python-modules/py-radix-sr/default.nix
index 7c37f77378b0..307abcc9bd67 100644
--- a/pkgs/development/python-modules/py-radix-sr/default.nix
+++ b/pkgs/development/python-modules/py-radix-sr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SEKOIA-IO";
     repo = "py-radix";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HeXWHdPeW3m0FMtqyHhZGhgCc706Y2xiN8hn9MFt/RM=";
   };
 
diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix
index a9d4988c6fe9..6cbf0a63200d 100644
--- a/pkgs/development/python-modules/py-serializable/default.nix
+++ b/pkgs/development/python-modules/py-serializable/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "madpah";
     repo = "serializable";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2A+QjokZ7gtgstclZ7PFSPymYjQYKsLVXy9xbFOfxLo=";
   };
 
diff --git a/pkgs/development/python-modules/py-sucks/default.nix b/pkgs/development/python-modules/py-sucks/default.nix
index b7d8cf5208da..281228398f7e 100644
--- a/pkgs/development/python-modules/py-sucks/default.nix
+++ b/pkgs/development/python-modules/py-sucks/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "py-sucks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MjlE5HdxChAgV/O7cD3foqkmKie7FgRRxvOcW+NAtfA=";
   };
 
diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index 8361171fc261..e158bd909dad 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "py-synologydsm-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3DpgJqL8pSiAK/t/Qe2CxntQStTqDumkivhnPKHVlnE=";
   };
 
diff --git a/pkgs/development/python-modules/py-tes/default.nix b/pkgs/development/python-modules/py-tes/default.nix
index ef7f7a47fb9a..eaa25960948e 100644
--- a/pkgs/development/python-modules/py-tes/default.nix
+++ b/pkgs/development/python-modules/py-tes/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ohsu-comp-bio";
     repo = "py-tes";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PP6l9HITC8JDOUVwf+S5tDOZDIFST9Uz+ttG0xJwrB0=";
   };
 
diff --git a/pkgs/development/python-modules/py-zabbix/default.nix b/pkgs/development/python-modules/py-zabbix/default.nix
index e9251892bd07..353b1710eca0 100644
--- a/pkgs/development/python-modules/py-zabbix/default.nix
+++ b/pkgs/development/python-modules/py-zabbix/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adubkov";
     repo = "py-zabbix";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aPQc188pszfDQvNtsGYlRLHS5CG5VyqptSoe4/GJVvE=";
   };
 
diff --git a/pkgs/development/python-modules/py65/default.nix b/pkgs/development/python-modules/py65/default.nix
index 9f73ed1eb686..fe54602a33c4 100644
--- a/pkgs/development/python-modules/py65/default.nix
+++ b/pkgs/development/python-modules/py65/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mnaberez";
     repo = "py65";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BMX+sMPx/YBFA4NFkaY0rl0EPicGHgb6xXVvLEIdllA=";
   };
 
diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix
index 1d6a7cb0387e..0adfa7f6e61f 100644
--- a/pkgs/development/python-modules/pyads/default.nix
+++ b/pkgs/development/python-modules/pyads/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stlehmann";
     repo = "pyads";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OvDh92fwHW+UzEO5iqVOY7d5H0Es6CJK/f/HCyLO9J4=";
   };
 
diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix
index 372b22b6505f..853e33a471f3 100644
--- a/pkgs/development/python-modules/pyaftership/default.nix
+++ b/pkgs/development/python-modules/pyaftership/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE=";
   };
 
diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix
index 51ec19016c77..e3879501572b 100644
--- a/pkgs/development/python-modules/pyahocorasick/default.nix
+++ b/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "WojciechMula";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SCIgu0uEjiSUiIP0WesJG+y+3ZqFBfI5PdgUzviOVrs=";
   };
 
diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix
index 5a59c39d62b2..eef69a9c2fae 100644
--- a/pkgs/development/python-modules/pyairnow/default.nix
+++ b/pkgs/development/python-modules/pyairnow/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asymworks";
     repo = "pyairnow";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KjOu9V92n2rq8iOkgutlK7EMRvirFAEK8oxseI+dr2s=";
   };
 
diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix
index f8a731582e1d..cb8b3ada0d64 100644
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "pyairvisual";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uN31LeHYmg4V6Ln3EQp765nOsN5v56TxjYSS/g6TUCY=";
   };
 
diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index c40e92771a58..59a29dec4f31 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "M0r13n";
     repo = "pyais";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LSIytiWqHEczPPGoE3/EX3nCsLOq8zIx4Y2+PGwYgRs=";
   };
 
diff --git a/pkgs/development/python-modules/pyaml-env/default.nix b/pkgs/development/python-modules/pyaml-env/default.nix
index dfbeb55112cd..1b962fad67d3 100644
--- a/pkgs/development/python-modules/pyaml-env/default.nix
+++ b/pkgs/development/python-modules/pyaml-env/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkaranasou";
     repo = "pyaml_env";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xSu+dksSVugShJwOqedXBrXIKaH0G5JAsynauOuP3OA=";
   };
 
diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index bc9181ab54f0..80998ea1f1d7 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-audio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-85whRoc3JoDSE4DqivY/3hfvLHcvgsubR/DLCPtLEP0=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix
index d9ce9b18db99..b0fe33e5acc8 100644
--- a/pkgs/development/python-modules/pyannote-core/default.nix
+++ b/pkgs/development/python-modules/pyannote-core/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XQVEMy60LkfFr2TKXTeg6cGHRx5BUZ5qDgzIdKy/19Y=";
   };
 
diff --git a/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix
index 8cb35b26061d..ddd3ec0ac1d1 100644
--- a/pkgs/development/python-modules/pyannote-database/default.nix
+++ b/pkgs/development/python-modules/pyannote-database/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-database";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-A7Xr24O8OvVAlURrR+SDCh8Uv9Yz3AUJSFDyDShVVjA=";
   };
 
diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix
index e8455f4d19b6..7c8ade1342b0 100644
--- a/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/pkgs/development/python-modules/pyannote-metrics/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-metrics";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V4qyaCaFsoikfFILm2sccf6m7lqJSDTdLxS1sr/LXAY=";
   };
 
diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix
index a92c56758e2f..0a0f67b765f7 100644
--- a/pkgs/development/python-modules/pyannote-pipeline/default.nix
+++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-pipeline";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0wSgy6kbKi9Wa5dimOz34IV5/8fSwaHDMUpaBW7tm2Y=";
   };
 
diff --git a/pkgs/development/python-modules/pyarr/default.nix b/pkgs/development/python-modules/pyarr/default.nix
index 13d97943cb5c..1a5d5eb9eef1 100644
--- a/pkgs/development/python-modules/pyarr/default.nix
+++ b/pkgs/development/python-modules/pyarr/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "totaldebug";
     repo = "pyarr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yvlDnAjmwDNdU1SWHGVrmoD3WHwrNt7hXoNNPo1hm1w=";
   };
 
diff --git a/pkgs/development/python-modules/pyarrow-hotfix/default.nix b/pkgs/development/python-modules/pyarrow-hotfix/default.nix
index ec0cf110311b..ae3b00fc1c05 100644
--- a/pkgs/development/python-modules/pyarrow-hotfix/default.nix
+++ b/pkgs/development/python-modules/pyarrow-hotfix/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pitrou";
     repo = "pyarrow-hotfix";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LlSbxIxvouzvlP6PB8J8fJaxWoRbxz4wTs7Gb5LbM4A=";
   };
 
diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix
index 32f1a6b9736c..32214d54a1a4 100644
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyasn1";
     repo = "pyasn1-modules";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7tCmhADC8LuswonL4QQ01/DD0RzeRLFJrsU49On4fqY=";
   };
 
diff --git a/pkgs/development/python-modules/pyasuswrt/default.nix b/pkgs/development/python-modules/pyasuswrt/default.nix
index 33bcc5ef39a1..5f03675030d3 100644
--- a/pkgs/development/python-modules/pyasuswrt/default.nix
+++ b/pkgs/development/python-modules/pyasuswrt/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ollo69";
     repo = "pyasuswrt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kg475AWmc0i/W4dBg8jFmNyz3V67xjvzPkSlS09/9Oc=";
   };
 
diff --git a/pkgs/development/python-modules/pyasyncore/default.nix b/pkgs/development/python-modules/pyasyncore/default.nix
index 602b90ae4126..23e09fe01400 100644
--- a/pkgs/development/python-modules/pyasyncore/default.nix
+++ b/pkgs/development/python-modules/pyasyncore/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonrob";
     repo = "pyasyncore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ptqOsbkY7XYZT5sh6vctfxZ7BZPX2eLjo6XwZfcmtgk=";
   };
 
diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix
index a65888221d86..6e427cabe802 100644
--- a/pkgs/development/python-modules/pyatag/default.nix
+++ b/pkgs/development/python-modules/pyatag/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatsNl";
     repo = "pyatag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3h9mpopTbEULCx7rcEt/I/ZnUA0L/fJ7Y3L5h/6EuC4=";
   };
 
diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index 56deb7369327..849ce582b805 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jabesq";
     repo = "pyatmo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SRuBV7XWt4Myks7kbUzGAscggspUbRoLOvYNiorF8To=";
   };
 
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 649b751bea4a..8bb069700b9a 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "postlund";
     repo = "pyatv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yjPbSTmHoKnVwNArZw5mGf3Eh4Ei1+DkY9y2XRRy4YA=";
   };
 
diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix
index 57e758d25f9f..bb2f8265efd3 100644
--- a/pkgs/development/python-modules/pyaussiebb/default.nix
+++ b/pkgs/development/python-modules/pyaussiebb/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yaleman";
     repo = "aussiebb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IW2HraJbgvf0G1eRXNpnsPMWlLXi2P9DTyk+tG5Hc2U=";
   };
 
diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix
index b013c9b715a1..ce28b27dc7c5 100644
--- a/pkgs/development/python-modules/pybalboa/default.nix
+++ b/pkgs/development/python-modules/pybalboa/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "garbled1";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rSY6kU7F9ybpPXcmTM2WBazjb9tI2+8dG56pjrRXcKg=";
   };
 
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 5af9c6561a0d..743f68bdb996 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mayeut";
     repo = "pybase64";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I=";
   };
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     description = "Fast Base64 encoding/decoding";
     mainProgram = "pybase64";
     homepage = "https://github.com/mayeut/pybase64";
-    changelog = "https://github.com/mayeut/pybase64/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}";
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix
index b82126e5862e..38d35319a7d7 100644
--- a/pkgs/development/python-modules/pybigwig/default.nix
+++ b/pkgs/development/python-modules/pybigwig/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deeptools";
     repo = "pyBigWig";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ch9nZrQAnzFQQ62/NF4J51pV4DQAbVq4/f/6LaXf5hM=";
   };
 
diff --git a/pkgs/development/python-modules/pybind11-stubgen/default.nix b/pkgs/development/python-modules/pybind11-stubgen/default.nix
index 09af1cb1b301..dadb50a8bf3f 100644
--- a/pkgs/development/python-modules/pybind11-stubgen/default.nix
+++ b/pkgs/development/python-modules/pybind11-stubgen/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sizmailov";
     repo = "pybind11-stubgen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PJiiRSQ92vP5LKWCgBuowkuDdTmC22xyuax2wsH0wOM=";
   };
 
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 8c09e3ff61c6..d5cbf75a5c69 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU=";
   };
 
diff --git a/pkgs/development/python-modules/pyblackbird/default.nix b/pkgs/development/python-modules/pyblackbird/default.nix
index 9219d9ede21a..97a1d09b6b19 100644
--- a/pkgs/development/python-modules/pyblackbird/default.nix
+++ b/pkgs/development/python-modules/pyblackbird/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "koolsb";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+ehzrr+RrwFKOOuxBq3+mwnuMPxZFV4QTZG1IRgsbLc=";
   };
 
diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix
index c149661969ea..1fd0acec7288 100644
--- a/pkgs/development/python-modules/pyblu/default.nix
+++ b/pkgs/development/python-modules/pyblu/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LouisChrist";
     repo = "pyblu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BDuptBC72XG+q/5MlbPMjYDIhWKg4gfEo2pLOflwQaM=";
   };
 
diff --git a/pkgs/development/python-modules/pybox2d/default.nix b/pkgs/development/python-modules/pybox2d/default.nix
index 0d7069c736ca..ae1fd153c766 100644
--- a/pkgs/development/python-modules/pybox2d/default.nix
+++ b/pkgs/development/python-modules/pybox2d/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pybox2d";
     repo = "pybox2d";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yjLFvsg8GQLxjN1vtZM9zl+kAmD4+eS/vzRkpj0SCjY=";
   };
 
diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix
index fdb66df306af..52685473473c 100644
--- a/pkgs/development/python-modules/pybravia/default.nix
+++ b/pkgs/development/python-modules/pybravia/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Drafteed";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1LfYEVclRneU3eD52kvzjLYyGdzYSWVDQ5EADOviglw=";
   };
 
diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix
index 76e427fef92f..652bd01a91c5 100644
--- a/pkgs/development/python-modules/pybrowsers/default.nix
+++ b/pkgs/development/python-modules/pybrowsers/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = "browsers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hjaQUfH7pNwC6+6liOUQQZU6NdhxLmtabvDD7JnQ3GU=";
   };
 
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 6eac9f1b72d3..fe5b332d9132 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pygobject";
     repo = "pycairo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P9AC8+WlokAxoy6KTJqAz7kOYK/FQVjIKWuj8jQw2OA=";
   };
 
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index 7eee56d744f1..d8a29fa08fb7 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pbs";
     repo = "pycaption";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-07Llsp2Cvvo9WueeTBJnAos3uynhYL0gT5U21EI9dHY=";
   };
 
diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix
index dd18f56d9826..5f6ef9f37c7c 100644
--- a/pkgs/development/python-modules/pycec/default.nix
+++ b/pkgs/development/python-modules/pycec/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "konikvranik";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5KQyHjAvHWeHFqcFHFJxDOPwWuVcFAN2wVdz9a77dzU=";
   };
 
diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix
index e54034e6dbd7..f8e86b22add3 100644
--- a/pkgs/development/python-modules/pycfdns/default.nix
+++ b/pkgs/development/python-modules/pycfdns/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bLzDakxKq8fcjEKSxc6D5VN9gfAu1M3/zaAU2UYnwSs=";
   };
 
diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix
index 0390fedf1760..a92578c6ea0b 100644
--- a/pkgs/development/python-modules/pycfmodel/default.nix
+++ b/pkgs/development/python-modules/pycfmodel/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = "pycfmodel";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iCjOSwW6rdG3H4e/B/um+QioP45nOr9OcPAwXxZs3mU=";
   };
 
diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix
index 78dc831ccc65..d786032e1410 100644
--- a/pkgs/development/python-modules/pyclip/default.nix
+++ b/pkgs/development/python-modules/pyclip/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spyoungtech";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM=";
   };
 
diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix
index d016c8bd7003..56c5a7b7a926 100644
--- a/pkgs/development/python-modules/pyclipper/default.nix
+++ b/pkgs/development/python-modules/pyclipper/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fonttools";
     repo = "pyclipper";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-s2D0ipDatAaF7A1RYOKyI31nkfc/WL3vHWsAMbo+WcY=";
   };
 
diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index 0c22e1ac607d..b560b9705cca 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sepandhaghighi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GyH06G7bArFBTzV/Sx/KmoJvcoed0sswW7qGqsSULHo=";
   };
 
diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
index fc601fca868d..e49b0e3cc066 100644
--- a/pkgs/development/python-modules/pycognito/default.nix
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = "pycognito";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-U23fFLru4j6GnWMcYtsCW9BVJkVcCoefPH6oMijYGew=";
   };
 
diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix
index f80e6318bc9e..605f4676b453 100644
--- a/pkgs/development/python-modules/pycomfoconnect/default.nix
+++ b/pkgs/development/python-modules/pycomfoconnect/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "michaelarnauts";
     repo = "comfoconnect";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I/0vCgSEi6mgYg1fMH4Ha7PoonewtqYYsvXZT8y4rJE=";
   };
 
diff --git a/pkgs/development/python-modules/pycomm3/default.nix b/pkgs/development/python-modules/pycomm3/default.nix
index 08c428115193..c6dc04bf7be0 100644
--- a/pkgs/development/python-modules/pycomm3/default.nix
+++ b/pkgs/development/python-modules/pycomm3/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ottowayi";
     repo = "pycomm3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KdvmISMH2HHU8N665QevVw7q9Qs5CwjXxcWpLoziY/Y=";
   };
 
diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix
index 4276c1dde748..6b85f6ba3f18 100644
--- a/pkgs/development/python-modules/pycontrol4/default.nix
+++ b/pkgs/development/python-modules/pycontrol4/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lawtancool";
     repo = "pyControl4";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0ZuztqHbrd+kMDGv3xyUYoTF/Ho+oHkycjSrKz8JABM=";
   };
 
diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix
index bc51c78bf551..97f3c9a407ad 100644
--- a/pkgs/development/python-modules/pycookiecheat/default.nix
+++ b/pkgs/development/python-modules/pycookiecheat/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "n8henrie";
     repo = "pycookiecheat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jOyTfh2ZhKW/pMU7T5tfxaM0l/g59N+mirnbc0FLPbQ=";
   };
 
diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix
index cfed7b75d450..cf237b8bd824 100644
--- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix
+++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OnFreund";
     repo = "pycoolmasternet-async";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MfWWy4C/G2w0Zb4C6iYbcfKciFtWctZ63K8lWaHuSnQ=";
   };
 
diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index 2f5d52d9dacb..66b05fa709d3 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycountry";
     repo = "pycountry";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4YVPh6OGWguqO9Ortv+vAejxx7WLs4u0SVLv8JlKSWM=";
   };
 
diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix
index 008c72dd209f..cbf35e5c574d 100644
--- a/pkgs/development/python-modules/pycrdt-websocket/default.nix
+++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter-server";
     repo = "pycrdt-websocket";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O0GRk81at8bgv+/4au8A55dZK2A28+ghy3sitAAZQBI=";
   };
 
diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix
index e885e0895a28..c8640cec9d75 100644
--- a/pkgs/development/python-modules/pycron/default.nix
+++ b/pkgs/development/python-modules/pycron/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kipe";
     repo = "pycron";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-t53u18lCk6tF4Hr/BrEM2gWG+QOFIEkjyEKNXIr3ibs=";
   };
 
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index e9d1254ede32..b753e3efa104 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Legrandin";
     repo = "pycryptodome";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RPaBUj/BJCO+10maGDmugeEXxaIrlk2UHIvkbrQVM8c=";
   };
 
diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 5dc9dec21247..28cda484050c 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpenCyphal";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XkH0wss8ueh/Wwz0lhvQShOp3a4X9lNdosT/sMe7p4Q=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index b94d55236f82..b5a163b87915 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fredrike";
     repo = "pydaikin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-folK2uZN2HtSXpRuhuHV42r1KrNWZX0ai/XO2OE8UFs=";
   };
 
diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix
index 00c600d305cf..d1f8ef9d645f 100644
--- a/pkgs/development/python-modules/pydanfossair/default.nix
+++ b/pkgs/development/python-modules/pydanfossair/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JonasPed";
     repo = "pydanfoss-air";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZTairxQbvijNiSomDoeZtmL/Hn3ce1Z5TEOf+0C8cYg=";
   };
 
diff --git a/pkgs/development/python-modules/pydantic-compat/default.nix b/pkgs/development/python-modules/pydantic-compat/default.nix
index a9a9e781269b..7878fa03ba12 100644
--- a/pkgs/development/python-modules/pydantic-compat/default.nix
+++ b/pkgs/development/python-modules/pydantic-compat/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyapp-kit";
     repo = "pydantic-compat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YJUfWu+nyGlwpJpxYghCKzj3CasdAaqYoNVCcfo/7YE=";
     leaveDotGit = true;
   };
diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index 9e71bbec8a87..a9e059a7c8e3 100644
--- a/pkgs/development/python-modules/pydantic-core/default.nix
+++ b/pkgs/development/python-modules/pydantic-core/default.nix
@@ -24,7 +24,7 @@ let
     src = fetchFromGitHub {
       owner = "pydantic";
       repo = "pydantic-core";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-ikdQAT1y0g+V2gPU0Ohn+UktJrEObnixCW56/J1UsSk=";
     };
 
diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix
index d89e11fd1d5a..891066991547 100644
--- a/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-extra-types";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PgytBSue3disJifnpTl1DGNMZkp93cJEIDm8wgKMHFo=";
   };
 
diff --git a/pkgs/development/python-modules/pydantic-scim/default.nix b/pkgs/development/python-modules/pydantic-scim/default.nix
index a8ba4155bf97..16282517f874 100644
--- a/pkgs/development/python-modules/pydantic-scim/default.nix
+++ b/pkgs/development/python-modules/pydantic-scim/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chalk-ai";
     repo = "pydantic-scim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Hbc94v/+slXRGDKKbMui8WPwn28/1XcKvHkbLebWtj0=";
   };
 
diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix
index 6c17b126a805..8b2c48c1fb09 100644
--- a/pkgs/development/python-modules/pydantic-settings/default.nix
+++ b/pkgs/development/python-modules/pydantic-settings/default.nix
@@ -22,7 +22,7 @@ let
     src = fetchFromGitHub {
       owner = "pydantic";
       repo = "pydantic-settings";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-VkvkF7tJfFknYCXz7tq1578ebW79Ovx1tOFO8o8wK/I=";
     };
 
diff --git a/pkgs/development/python-modules/pydantic-yaml/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix
index bb7f1726a69e..d9e2eeaff85d 100644
--- a/pkgs/development/python-modules/pydantic-yaml/default.nix
+++ b/pkgs/development/python-modules/pydantic-yaml/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NowanIlfideme";
     repo = "pydantic-yaml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xlFSczMCEkSDhtzSl8qzZwwZd0IelPmjTEV+Jk9G0fI=";
   };
 
diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index bb5ba289d5f5..3aa0d0aa2bad 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/QxWgViqVmPnX/sO+qkvGl+WQX3OPXpS44CdP2HHOis=";
   };
 
diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix
index a385b6f43130..356ce206b1de 100644
--- a/pkgs/development/python-modules/pydash/default.nix
+++ b/pkgs/development/python-modules/pydash/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dgilland";
     repo = "pydash";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4zNljz0U/iQd2DMC43qkdOY/mwtPlizgLmoaB7BVmxw=";
   };
 
diff --git a/pkgs/development/python-modules/pydata-google-auth/default.nix b/pkgs/development/python-modules/pydata-google-auth/default.nix
index 37a1fdae1ee0..2aa3c872f349 100644
--- a/pkgs/development/python-modules/pydata-google-auth/default.nix
+++ b/pkgs/development/python-modules/pydata-google-auth/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "pydata-google-auth";
     owner = "pydata";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Vel8xSDX0djNwlICXE/ON3G4m0dWmynl8fHfDhaZhbI=";
   };
 
diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix
index 780f01cec123..b5926666bd46 100644
--- a/pkgs/development/python-modules/pydbus/default.nix
+++ b/pkgs/development/python-modules/pydbus/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LEW21";
     repo = "pydbus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F1KKXG+7dWlEbToqtF3G7wU0Sco7zH5NqzlL58jyDGw=";
   };
 
diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
index c386ed1a567e..b272f1c7c7e1 100644
--- a/pkgs/development/python-modules/pydeako/default.nix
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DeakoLights";
     repo = "pydeako";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GEYuVKE3DOXJzCqTW2Ngoi6l0e4JvE9lUnZtjrNXTVk=";
   };
 
diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix
index e6ad70f617e8..4970ecb06806 100644
--- a/pkgs/development/python-modules/pydeconz/default.nix
+++ b/pkgs/development/python-modules/pydeconz/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kane610";
     repo = "deconz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5138YzxutjyFsYyLGLTzeyCISuY8kV4WA0FLML+VeZQ=";
   };
 
diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix
index f2633d060b14..ab56391a36f3 100644
--- a/pkgs/development/python-modules/pydeps/default.nix
+++ b/pkgs/development/python-modules/pydeps/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thebjorn";
     repo = "pydeps";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZLFcaWzu8iYBnbSh1Ua4fvFyYD5q71R/iIqzRUKRn1E=";
   };
 
diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix
index 29a250160add..8ddb9716849f 100644
--- a/pkgs/development/python-modules/pydexcom/default.nix
+++ b/pkgs/development/python-modules/pydexcom/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gagebenne";
     repo = "pydexcom";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cf3AhqaA5aij2NCeFqruoeE0ovJSgZgEnVHcE3iXJ1s=";
   };
 
diff --git a/pkgs/development/python-modules/pydicom-seg/default.nix b/pkgs/development/python-modules/pydicom-seg/default.nix
index 35dd22e94538..420c4505e706 100644
--- a/pkgs/development/python-modules/pydicom-seg/default.nix
+++ b/pkgs/development/python-modules/pydicom-seg/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "razorx89";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2Y3fZHKfZqdp5EU8HfVsmJ5JFfVGZuAR7+Kj7qaTiPM=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix
index 6b0aa9131b66..4f4aa417c97e 100644
--- a/pkgs/development/python-modules/pydiscourse/default.nix
+++ b/pkgs/development/python-modules/pydiscourse/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydiscourse";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KqJ6ag4owG7US5Q4Ygjq263ds1o/JhEJ3bNa8YecYtE=";
   };
 
diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix
index 97990dbe0858..168199c2e4cc 100644
--- a/pkgs/development/python-modules/pydiscovergy/default.nix
+++ b/pkgs/development/python-modules/pydiscovergy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpbede";
     repo = "pydiscovergy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g6KWX7APdqB0dNe7p6WGualxSj5fiw+jRq+0qfqTs4w=";
   };
 
diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix
index 577c25f8ec81..8e961995a1c8 100644
--- a/pkgs/development/python-modules/pydmd/default.nix
+++ b/pkgs/development/python-modules/pydmd/default.nix
@@ -25,7 +25,7 @@ let
     src = fetchFromGitHub {
       owner = "PyDMD";
       repo = "PyDMD";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-vprvq3sl/eNtu4cqg0A4XV96dzUt0nOtPmfwEv0h+PI=";
     };
 
diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix
index 47abe284a867..5fddd80b55e1 100644
--- a/pkgs/development/python-modules/pydocstyle/default.nix
+++ b/pkgs/development/python-modules/pydocstyle/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pydocstyle";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MjRrnWu18f75OjsYIlOLJK437X3eXnlW8WkkX7vdS6k=";
   };
 
diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix
index afbe9feecadb..06e95445a8de 100644
--- a/pkgs/development/python-modules/pydrawise/default.nix
+++ b/pkgs/development/python-modules/pydrawise/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dknowles2";
     repo = "pydrawise";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5mHMlPN4v5Awy8PKRBt5FCPlDYCRyFCgGLWE7btEmfU=";
   };
 
diff --git a/pkgs/development/python-modules/pydroid-ipcam/default.nix b/pkgs/development/python-modules/pydroid-ipcam/default.nix
index 661081d1940b..31ec5abd39ce 100644
--- a/pkgs/development/python-modules/pydroid-ipcam/default.nix
+++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-toY3eVJdB5rbRuwkXMizpQUxUTo4Y1tWKFCZZuiYaGI=";
   };
 
diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix
index 37838c6fed9d..a8e1462aec29 100644
--- a/pkgs/development/python-modules/pydruid/default.nix
+++ b/pkgs/development/python-modules/pydruid/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "druid-io";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9+xomjSwWDVHkret/mqAZKWOPFRMvVB3CWtFPzrT81k=";
   };
 
diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix
index c7351b52fb52..f9e09eb5cebc 100644
--- a/pkgs/development/python-modules/pydsdl/default.nix
+++ b/pkgs/development/python-modules/pydsdl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpenCyphal";
     repo = "pydsdl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Q6Zt7qiFZvTK2pF4nWfHbjwQHZffzKOad6X/HQ94EUo=";
   };
 
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 2678412b2344..868173a6c4bd 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jiaaro";
     repo = "pydub";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c=";
   };
 
diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix
index 4f668b9e79ae..c65acc773e2d 100644
--- a/pkgs/development/python-modules/pyduke-energy/default.nix
+++ b/pkgs/development/python-modules/pyduke-energy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjmeli";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7KkUpsHg3P2cF0bVl3FzyAQwzeaCmg+vzRHlM/TIcNA=";
   };
 
diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix
index 283cb30f8ab1..fb0d34beeb13 100644
--- a/pkgs/development/python-modules/pyduotecno/default.nix
+++ b/pkgs/development/python-modules/pyduotecno/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Cereal2nd";
     repo = "pyDuotecno";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I/ZA2ooa6nunUr/4K+FWAGMOdcJDfGzE99jJ8zTe2Po=";
   };
 
diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix
index bdc03df20b59..a87de6b3900f 100644
--- a/pkgs/development/python-modules/pyeapi/default.nix
+++ b/pkgs/development/python-modules/pyeapi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "arista-eosplus";
     repo = "pyeapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eGNBQSnYMC9YVCw5mBRH6XRq139AcqFm6HnO2FUzLEE=";
   };
 
diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix
index 9cad362d2243..d025e5426f4f 100644
--- a/pkgs/development/python-modules/pyeclib/default.nix
+++ b/pkgs/development/python-modules/pyeclib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "pyeclib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LZQNJU7QEoHo+RWvHnQkNxBg6t322u/c3PyBhy1eVZc=";
   };
 
diff --git a/pkgs/development/python-modules/pyecoforest/default.nix b/pkgs/development/python-modules/pyecoforest/default.nix
index b0c69a520ade..b0634ee82a1c 100644
--- a/pkgs/development/python-modules/pyecoforest/default.nix
+++ b/pkgs/development/python-modules/pyecoforest/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pjanuario";
     repo = "pyecoforest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C8sFq0vsVsq6irWbRd0eq18tfKu0qRRBZHt23CiDTGU=";
   };
 
diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix
index fd68e98504c7..af569c81fec3 100644
--- a/pkgs/development/python-modules/pyeconet/default.nix
+++ b/pkgs/development/python-modules/pyeconet/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "w1ll1am23";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zpaKUEg78vzvuTtVauCUUt0U92NXVyNhEfgKVrRzdnM=";
   };
 
diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix
index 23edfcbcc00a..a52dfbc75863 100644
--- a/pkgs/development/python-modules/pyecotrend-ista/default.nix
+++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Ludy87";
     repo = "pyecotrend-ista";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TZDHEaDc7UACIAHNX1fStJH74qLKf+krWbTDtemXahA=";
   };
 
diff --git a/pkgs/development/python-modules/pyecowitt/default.nix b/pkgs/development/python-modules/pyecowitt/default.nix
index 0786f87c7e29..23265992097b 100644
--- a/pkgs/development/python-modules/pyecowitt/default.nix
+++ b/pkgs/development/python-modules/pyecowitt/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "garbled1";
     repo = "pyecowitt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5VdVo6j2HZXSCWU4NvfWzyS/KJfVb7N1KSMeu8TvWaQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix
index 47e4e41e624f..f9348b7f9427 100644
--- a/pkgs/development/python-modules/pyefergy/default.nix
+++ b/pkgs/development/python-modules/pyefergy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tkdrob";
     repo = "pyefergy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4M3r/+C42X95/7BGZAJbkXKKFEkGzLlvX0Ynv+eL8qc=";
   };
 
diff --git a/pkgs/development/python-modules/pyegps/default.nix b/pkgs/development/python-modules/pyegps/default.nix
index c89fd46ec23a..8146f8291542 100644
--- a/pkgs/development/python-modules/pyegps/default.nix
+++ b/pkgs/development/python-modules/pyegps/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gnumpi";
     repo = "pyegps";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iixk2sFa4KAayKFmQKtPjvoIYgxCMXnfkliKhyO2ba4=";
   };
 
diff --git a/pkgs/development/python-modules/pyelectra/default.nix b/pkgs/development/python-modules/pyelectra/default.nix
index 749556926b07..21f143be02a0 100644
--- a/pkgs/development/python-modules/pyelectra/default.nix
+++ b/pkgs/development/python-modules/pyelectra/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jafar-atili";
     repo = "pyelectra";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3g+6AXbHMStk77k+1Qh5kgDswUZ8I627YiA/PguUGBg=";
   };
 
diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix
index b9976b5d9102..783951abde8b 100644
--- a/pkgs/development/python-modules/pyelftools/default.nix
+++ b/pkgs/development/python-modules/pyelftools/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eliben";
     repo = "pyelftools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kX89fMXqrEvhMAAjqKHzHmrYizKBt1uCWMOJtFNNhy4=";
   };
 
diff --git a/pkgs/development/python-modules/pyemby/default.nix b/pkgs/development/python-modules/pyemby/default.nix
index 5f73af3f9b25..75edc0952049 100644
--- a/pkgs/development/python-modules/pyemby/default.nix
+++ b/pkgs/development/python-modules/pyemby/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mezz64";
     repo = "pyemby";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+A/SNMCUqo9TwWsQXwOKJCqmYhbilIdHYazLNQY+NkU=";
   };
 
diff --git a/pkgs/development/python-modules/pyemoncms/default.nix b/pkgs/development/python-modules/pyemoncms/default.nix
index 651b31bd7a7f..9916a440c04e 100644
--- a/pkgs/development/python-modules/pyemoncms/default.nix
+++ b/pkgs/development/python-modules/pyemoncms/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Open-Building-Management";
     repo = "pyemoncms";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IBrYys0i9pTAw9ul8bqni0H3KNSvKQYNU6D4OSfR6ZE=";
   };
 
diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index 7278ff2efc81..5226c10f6754 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyenphase";
     repo = "pyenphase";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nGOxGZxPTlU5/nI2m+MXzzcVA+twxfNL1Jf51xT0XLc=";
   };
 
diff --git a/pkgs/development/python-modules/pyexiftool/default.nix b/pkgs/development/python-modules/pyexiftool/default.nix
index 36ed807a17bb..7ca78cee7225 100644
--- a/pkgs/development/python-modules/pyexiftool/default.nix
+++ b/pkgs/development/python-modules/pyexiftool/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sylikc";
     repo = "pyexiftool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dgQkbpCbdq2JbupY0DyQbHPR9Bg+bwDo7yN03o3sX+A=";
   };
 
diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix
index bd2d487e6b51..54f5190f64cd 100644
--- a/pkgs/development/python-modules/pyezviz/default.nix
+++ b/pkgs/development/python-modules/pyezviz/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "baqs";
     repo = "pyEzviz";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OgDplQ6TrK2CZbNgJpoYC8TkK1sG73HdpUyHE+2ZTLk=";
   };
 
diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix
index eca3180a6176..86c847bf2ade 100644
--- a/pkgs/development/python-modules/pyfaidx/default.nix
+++ b/pkgs/development/python-modules/pyfaidx/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mdshw5";
     repo = "pyfaidx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PKcopIu/0ko4Jl2+G0ZivZXvMwACeIFFFlPt5dlDDfQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix
index c65ead3e790b..3ab2ea6f350d 100644
--- a/pkgs/development/python-modules/pyfcm/default.nix
+++ b/pkgs/development/python-modules/pyfcm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "olucurious";
     repo = "pyfcm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lpSbb0DDXLHne062s7g27zRpvTuOHiqQkqGOtWvuWdI=";
   };
 
diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix
index ec974f24f6e9..2c4fa10691e4 100644
--- a/pkgs/development/python-modules/pyfibaro/default.nix
+++ b/pkgs/development/python-modules/pyfibaro/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rappenze";
     repo = "pyfibaro";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7hn5iFuN86sdqLi5MIEwBYLYbPg7J1BbADHYdjYBCNA=";
   };
 
diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix
index e838e7c2159e..e3c1bfe56882 100644
--- a/pkgs/development/python-modules/pyflume/default.nix
+++ b/pkgs/development/python-modules/pyflume/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ChrisMandich";
     repo = "PyFlume";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/8gLKe+6GaPQe0J3YBmOVcAcAcqfrWM7UQCoX+qOEmw=";
   };
 
diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix
index 865bf8832fa9..0c9c919d7ca9 100644
--- a/pkgs/development/python-modules/pyfritzhome/default.nix
+++ b/pkgs/development/python-modules/pyfritzhome/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hthiery";
     repo = "python-fritzhome";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-L+9CjSXJrPmlLif1SYfJr6C76IufUzj9FHSGQO78Vsw=";
   };
 
diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix
index c5cf2f3512b1..b9d1d7ffb3c3 100644
--- a/pkgs/development/python-modules/pyfronius/default.nix
+++ b/pkgs/development/python-modules/pyfronius/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nielstron";
     repo = "pyfronius";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-7GtY/6uuLe7K9T7xMVt2ytpA6MKVWnyEoLtA5dSMiH4=";
   };
 
diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index 8a3e83929132..b775d1b21ead 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eblot";
     repo = "pyftdi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/MwgBqwN7xmZepdJzyRhZflbCUpGdWEbEGGKkBnKTFI=";
   };
 
diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index 93bfb7a8ec36..579513a9e9ca 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "pyftgl";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-mbzXpIPMNe6wfwaAAw/Ri8xaW6Z6kuNUhFFyzsiW7Is=";
   };
 
diff --git a/pkgs/development/python-modules/pyfunctional/default.nix b/pkgs/development/python-modules/pyfunctional/default.nix
index 1e4039cc5452..df00801b1d47 100644
--- a/pkgs/development/python-modules/pyfunctional/default.nix
+++ b/pkgs/development/python-modules/pyfunctional/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "EntilZha";
     repo = "PyFunctional";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-utUmHQw7Y5pQJkwuy8CbPnCrAd/esaf0n1Exr/trcRg=";
   };
 
diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix
index 27cc23a31774..80788cbc2ac5 100644
--- a/pkgs/development/python-modules/pyfuse3/default.nix
+++ b/pkgs/development/python-modules/pyfuse3/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "pyfuse3";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-J4xHiaV8GCtUQ9GJS8YRXpMsuzuwbtnzspvuIonHT24=";
   };
 
diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix
index ae3bb2ca109b..fd331ec98183 100644
--- a/pkgs/development/python-modules/pyfwup/default.nix
+++ b/pkgs/development/python-modules/pyfwup/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "pyfwup";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44=";
   };
 
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 0c7ef2cebbb9..134aec2cb952 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pygame-community";
     repo = "pygame-ce";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY=";
     # Unicode file cause different checksums on HFS+ vs. other filesystems
     postFetch = "rm -rf $out/docs/reST";
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 5808904d0634..c9ca90d1ca0f 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MyreMylar";
     repo = "pygame_gui";
-    rev = "refs/tags/v_${version}";
+    tag = "v_${version}";
     hash = "sha256-6Ps3pmQ8tYwQyv0TliOvUNLy3GjSJ2jdDQTTxfYej0o=";
   };
 
diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix
index f5f5f4e0831d..7233c5b4153c 100644
--- a/pkgs/development/python-modules/pygatt/default.nix
+++ b/pkgs/development/python-modules/pygatt/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peplin";
     repo = "pygatt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TMIqC+JvNOLU38a9jkacRAbdmAAd4UekFUDRoAWhHFo=";
   };
 
diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix
index 429222e76a2e..66fb880be525 100644
--- a/pkgs/development/python-modules/pygdbmi/default.nix
+++ b/pkgs/development/python-modules/pygdbmi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cs01";
     repo = "pygdbmi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JqEDN8Pg/JttyYQbwkxKkLYuxVnvV45VlClD23eaYyc=";
   };
 
diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index d3b014a3f81f..554b42ce3d9b 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GitGuardian";
     repo = "py-gitguardian";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4qMcBtelLiqLXKV8YIw9M6e97Nbo/K8UpsKoR0W7uKM=";
   };
 
diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix
index 41f902b1cf23..79da899a96c5 100644
--- a/pkgs/development/python-modules/pygithub/default.nix
+++ b/pkgs/development/python-modules/pygithub/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyGithub";
     repo = "PyGithub";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rKa441hiO4M/sC6wxU9yeCu6IQJMZroyi7bad/j6brw=";
   };
 
diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix
index 48831497a082..6d358f879134 100644
--- a/pkgs/development/python-modules/pyglm/default.nix
+++ b/pkgs/development/python-modules/pyglm/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Zuzu-Typ";
     repo = "PyGLM";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vQ4g2bBr6xV36DYrszcJnaJ8lj1uD1KyUblSL4u+U/E=";
     fetchSubmodules = true;
   };
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/Zuzu-Typ/PyGLM";
     description = "OpenGL Mathematics (GLM) library for Python written in C++";
-    changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${version}";
     license = licenses.zlib;
     maintainers = with maintainers; [ sund3RRR ];
   };
diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix
index 48791db6a275..1fe85fb172f9 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openlawlibrary";
     repo = "pygls";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AvrGoQ0Be1xKZhFn9XXYJpt5w+ITbDbj6NFZpaDPKao=";
   };
 
diff --git a/pkgs/development/python-modules/pygltflib/default.nix b/pkgs/development/python-modules/pygltflib/default.nix
index bbfb1d08745d..6e6aefe3bdf8 100644
--- a/pkgs/development/python-modules/pygltflib/default.nix
+++ b/pkgs/development/python-modules/pygltflib/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "dodgyville";
     repo = "pygltflib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rUAg05M5biVsdG2yEH0Olng/0jH1R/Jo5/+j4ToKkTI=";
   };
 
diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix
index 634788bdf9a1..7c1d8c9175d0 100644
--- a/pkgs/development/python-modules/pygmars/default.nix
+++ b/pkgs/development/python-modules/pygmars/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = "pygmars";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU=";
   };
 
diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix
index 4f75a53e0545..ab25b1093e99 100644
--- a/pkgs/development/python-modules/pygmo/default.nix
+++ b/pkgs/development/python-modules/pygmo/default.nix
@@ -25,7 +25,7 @@ toPythonModule (
     src = fetchFromGitHub {
       owner = "esa";
       repo = "pygmo2";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-279KNnP11f5ob2senIVmbnlmhRp2p3RoZLsQRE6yJ5Q=";
     };
 
diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index 7bba01e4e44e..c48234d706ca 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GenericMappingTools";
     repo = "pygmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DO9KUlmt5EV+ioOSQ/BOcx4pP409f94dzmFwqK2MwMY=";
   };
 
diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix
index 117d6a7b03bb..cedae6dd3efb 100644
--- a/pkgs/development/python-modules/pygnmi/default.nix
+++ b/pkgs/development/python-modules/pygnmi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "akarneliuk";
     repo = "pygnmi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ncp/OwELy/QOvGhLUZW2qTQZsckWI4CGrlEAZ20RtQI=";
   };
 
diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix
index 90e0bb9ba185..a0314bc51b1c 100644
--- a/pkgs/development/python-modules/pygobject-stubs/default.nix
+++ b/pkgs/development/python-modules/pygobject-stubs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pygobject";
     repo = "pygobject-stubs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Y9tqfv2DP2daxxafcQAtxH33pR3FHE8av0PkzEcs0RU=";
   };
 
diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix
index 19e733c6f544..c6c01e6988d5 100644
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "roskakori";
     repo = "pygount";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PFqcSnJoGL4bXFy3hu3Iurbb8QK1NqCDs8aJmMxP4Hc=";
   };
 
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 028f69488777..f6cf8b1a1595 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pygraphviz";
     repo = "pygraphviz";
-    rev = "refs/tags/pygraphviz-${version}";
+    tag = "pygraphviz-${version}";
     hash = "sha256-RyUmT2djj2GnVG82xO9HULMAJZb2LYMUGDRvCwaYBg8=";
   };
 
diff --git a/pkgs/development/python-modules/pygti/default.nix b/pkgs/development/python-modules/pygti/default.nix
index 3f9239bd8458..a26792696f27 100644
--- a/pkgs/development/python-modules/pygti/default.nix
+++ b/pkgs/development/python-modules/pygti/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vigonotion";
     repo = "pygti";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2T4Yw4XEOkv+IWyB4Xa2dPu929VH0tLeUjQ5S8EVXz0=";
   };
 
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index 791e843f0869..698906b19fc5 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hamcrest";
     repo = "PyHamcrest";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-VkfHRo4k8g9/QYG4r79fXf1NXorVdpUKUgVrbV2ELMU=";
   };
 
diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
index 4d8fa08d8e0c..bf459b29718f 100644
--- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
+++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "certvalidator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+/3n+v/8Tpqt7UoOrBi4S84N6Jioay7e2j+SvKJeoLA=";
   };
 
diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix
index c4c5417ae47b..30f9f71a453f 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/pkgs/development/python-modules/pyhaversion/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pyhaversion";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UZ9236mERoz3WG9MfeN1ALKc8OjqpcbbIhiEsRYzn4I=";
   };
 
diff --git a/pkgs/development/python-modules/pyheck/default.nix b/pkgs/development/python-modules/pyheck/default.nix
index fca55ff984b5..42a6c024ab8f 100644
--- a/pkgs/development/python-modules/pyheck/default.nix
+++ b/pkgs/development/python-modules/pyheck/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kevinheavey";
     repo = "pyheck";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mfXkrCbBaJ0da+taKJvfyU5NS43tYJWqtTUXiCLVoGQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix
index 1771bf1ea7f9..55e649722d18 100644
--- a/pkgs/development/python-modules/pyheif/default.nix
+++ b/pkgs/development/python-modules/pyheif/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "carsales";
     repo = "pyheif";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-7De8ekDceSkUcOgK7ppKad5W5qE0yxdS4kbgYVjxTGg=";
   };
 
diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix
index 15f1f30a1fa3..f13abd858ca8 100644
--- a/pkgs/development/python-modules/pyheos/default.nix
+++ b/pkgs/development/python-modules/pyheos/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "andrewsayre";
     repo = "pyheos";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vz81FepXWcCdlY1v7ozp+/l+XpYb91mNmRiLKwjrC4A=";
   };
 
diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
index 1186d443a0a1..427d9ecabeba 100644
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yh02Z1nPGjghZYHkPBlClDEztq4VQsW3H+kuco/lBpk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix
index 4b782f86c080..48a7b7492ebd 100644
--- a/pkgs/development/python-modules/pyhiveapi/default.nix
+++ b/pkgs/development/python-modules/pyhiveapi/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Pyhass";
     repo = "Pyhiveapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gPou5KGLFEFP29qSpRg+6sCiXOwfoF1gyhBVERYJ1LI=";
   };
 
diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix
index ce479ce4c2da..2becc21c26ce 100644
--- a/pkgs/development/python-modules/pyhocon/default.nix
+++ b/pkgs/development/python-modules/pyhocon/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chimpler";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xXx30uxJ8+KPVdYC6yRzEDJbwYSzIO/Gy1xrehvI5ZE=";
   };
 
diff --git a/pkgs/development/python-modules/pyindego/default.nix b/pkgs/development/python-modules/pyindego/default.nix
index 606ced675121..6f01b4391935 100644
--- a/pkgs/development/python-modules/pyindego/default.nix
+++ b/pkgs/development/python-modules/pyindego/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sander1988";
     repo = "pyIndego";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-x8/MSbn+urmArQCyxZU1JEUyATJsPzp7bflymE+1rkk=";
   };
 
diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index 9492aa948478..d74e056ffadf 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Fizzadar";
     repo = "pyinfra";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NHQpYOXlqFU4BtiwiESGV8pM0O8kqCz2TpXOGz8T4zQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index fe3c2dc444d7..0f8d7b89614c 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyinsteon";
     repo = "pyinsteon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SyhPM3NS7iJX8jwTJ4YWZ72eYLn9JT6eESekPf5eCKI=";
   };
 
diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix
index 4cda737f82e7..38cec05b049a 100644
--- a/pkgs/development/python-modules/pyinstrument/default.nix
+++ b/pkgs/development/python-modules/pyinstrument/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joerick";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Dvpx6Bf4obHL3inzIHhOrM3u/7X+0NRfEAyynDjtEwE=";
   };
 
diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix
index fa4b02f85e15..83053ad7fff6 100644
--- a/pkgs/development/python-modules/pyintesishome/default.nix
+++ b/pkgs/development/python-modules/pyintesishome/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jnimmo";
     repo = "pyIntesisHome";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QgIvIn8I5EtJSNj1FdOI+DPgG7/y2ToQ62dhk7flieo=";
   };
 
diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix
index 15ac5795c117..7d15c93d5ab8 100644
--- a/pkgs/development/python-modules/pyipma/default.nix
+++ b/pkgs/development/python-modules/pyipma/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dgomes";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iz47BeBiSXIN/rZNOjuZYTFTIm0WAUg8cy0xV20gdwk=";
   };
 
diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix
index e3d051ab07d9..a3fb5eca2281 100644
--- a/pkgs/development/python-modules/pyipp/default.nix
+++ b/pkgs/development/python-modules/pyipp/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ctalkington";
     repo = "python-ipp";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-B3x6WkTSTGlZWMAK2BTA2EVVz+IvB3QL+arZGBAkZsE=";
   };
 
diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix
index dbc41c1c7851..e10b0e5e3491 100644
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "pyiqvia";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qq6UQUz60WkmWqdmExlSQT3wapaHJr8DeH1eVrTOnpQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyisemail/default.nix b/pkgs/development/python-modules/pyisemail/default.nix
index df26b5a3602e..5c0b37f06a77 100644
--- a/pkgs/development/python-modules/pyisemail/default.nix
+++ b/pkgs/development/python-modules/pyisemail/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "michaelherold";
     repo = "pyIsEmail";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bJCaVUhvEAoQ8zMsbcb1Et728XHt+shEPhhBzPzY/vo=";
   };
 
diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix
index 844299d01bc6..0c12f0612792 100644
--- a/pkgs/development/python-modules/pyiskra/default.nix
+++ b/pkgs/development/python-modules/pyiskra/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Iskramis";
     repo = "pyiskra";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc=";
   };
 
diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix
index 1409c6525a6b..30d2b6faa50f 100644
--- a/pkgs/development/python-modules/pyisy/default.nix
+++ b/pkgs/development/python-modules/pyisy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "automicus";
     repo = "PyISY";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OvWdKr8RlXRnAUMHSPhJDacvKeRa8QGPmGPQWLG2ouk=";
   };
 
diff --git a/pkgs/development/python-modules/pyituran/default.nix b/pkgs/development/python-modules/pyituran/default.nix
index ce46b1daceb6..30230ea5d6af 100644
--- a/pkgs/development/python-modules/pyituran/default.nix
+++ b/pkgs/development/python-modules/pyituran/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shmuelzon";
     repo = "pyituran";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rgPW+z70Z9wRzPbPtWUHb80vCccWJlEs18Y6llIeipo=";
   };
 
diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix
index 50c825dcc959..faa5b4854581 100644
--- a/pkgs/development/python-modules/pyixapi/default.nix
+++ b/pkgs/development/python-modules/pyixapi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "peering-manager";
     repo = "pyixapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IiLjxOtyxGSaItxgEbsF8AER/j4Qe7SP9ZAEPjTiYI4=";
   };
 
diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix
index b1145f872496..796517433e18 100644
--- a/pkgs/development/python-modules/pyjson5/default.nix
+++ b/pkgs/development/python-modules/pyjson5/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kijewski";
     repo = "pyjson5";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QggO1go9iQIy235I9CYOeC6JCoOT2sfDsrbSySN3mMw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index 7488891a717e..d4628b4466bb 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jpadilla";
     repo = "pyjwt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BPVythRLpglYtpLEoaC7+Q4l9izYXH2M9JEbxdyQZqU=";
   };
 
diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix
index 7f9ac2ec8582..db1a56249789 100644
--- a/pkgs/development/python-modules/pykaleidescape/default.nix
+++ b/pkgs/development/python-modules/pykaleidescape/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SteveEasley";
     repo = "pykaleidescape";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g=";
   };
 
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
index b6bac1517114..7b287f1ef22b 100644
--- a/pkgs/development/python-modules/pykeepass/default.nix
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libkeepass";
     repo = "pykeepass";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-64is/XoRF/kojqd4jQIAQi1od8TRhiv9uR+WNIGvP2A=";
   };
 
diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix
index 70b52f3c009b..5b7a1b888da7 100644
--- a/pkgs/development/python-modules/pykeyatome/default.nix
+++ b/pkgs/development/python-modules/pykeyatome/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jugla";
     repo = "pyKeyAtome";
-    rev = "refs/tags/V${version}";
+    tag = "V${version}";
     hash = "sha256-zRXUjekawf2/zTSlXqHVB02dDkb6HbU4NN6UBgl2rtg=";
   };
 
diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index 1768d0489151..cae7b5b2c515 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jodal";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2baFwZPNuVU39Kt5B8QvGKu7jMbg+GZ3ROoTxzPOXac=";
   };
 
diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix
index 3325d730aa64..dfea12e0d346 100644
--- a/pkgs/development/python-modules/pykoplenti/default.nix
+++ b/pkgs/development/python-modules/pykoplenti/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stegm";
     repo = "pykoplenti";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6edlcjQvV+6q3/ytn9KR/IovduVREEQt8foE2lfsBko=";
   };
 
diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix
index 0bd6c7f0b977..46d3bb8bee03 100644
--- a/pkgs/development/python-modules/pylacrosse/default.nix
+++ b/pkgs/development/python-modules/pylacrosse/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hthiery";
     repo = "python-lacrosse";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw=";
   };
 
diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix
index 7e00237e2e9c..994b77a92266 100644
--- a/pkgs/development/python-modules/pylacus/default.nix
+++ b/pkgs/development/python-modules/pylacus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "PyLacus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M7xPJKM/8fY8RBU2ESzaYOfENICCRNexORJGkerD4FM=";
   };
 
diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 11810895c8a6..bddb781a64ba 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "pylamarzocco";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ntss7erVbpeW6EEeKrkR/anzvTUQhzggNhHi6rOIsFQ=";
   };
 
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 1fba795132bf..eeba63f6a917 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CIIZbeRrraTqWronkspDpBVP/Z4JVoaiS5iBIXfsZGg=";
   };
 
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index 19e1be9892f3..fe289bbd9154 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pylast";
     repo = "pylast";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dgqTNISeyBkZ2m68pqw5rsoyPxLW4wWkv6iqq9bD5Ek=";
   };
 
diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix
index 106ea7a99888..869c4410c8a6 100644
--- a/pkgs/development/python-modules/pylaunches/default.nix
+++ b/pkgs/development/python-modules/pylaunches/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pylaunches";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NewzzZuiXwaWU59bu+M2QcSfydL1khvw/YJkbZ58W2Q=";
   };
 
diff --git a/pkgs/development/python-modules/pyleri/default.nix b/pkgs/development/python-modules/pyleri/default.nix
index 2fdb2a0077c3..75e798a8ed4e 100644
--- a/pkgs/development/python-modules/pyleri/default.nix
+++ b/pkgs/development/python-modules/pyleri/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cesbit";
     repo = "pyleri";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4t+6wtYzJbmL0TB/OXr89uZ2s8DeGlUdWwHd4YPsCW0=";
   };
 
diff --git a/pkgs/development/python-modules/pylgnetcast/default.nix b/pkgs/development/python-modules/pylgnetcast/default.nix
index a017c49d574b..0a7bb8dab9fa 100644
--- a/pkgs/development/python-modules/pylgnetcast/default.nix
+++ b/pkgs/development/python-modules/pylgnetcast/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Drafteed";
     repo = "python-lgnetcast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5lzLknuGLQryLCc4YQJn8AGuWTiSM90+8UTQ/WYfASM=";
   };
 
diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
index 62a5f7e81318..bdf67cce6f7c 100644
--- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g4dGIGHo0J+F0KTVA6yjgfwiYVn6iU69jgHhvEQGwOc=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
index e7b1fa52a871..14cfc411fb40 100644
--- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = "pylibjpeg-openjpeg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cCDnARElNn+uY+HQ39OnGJRz2vTz0I8s0Oe+qGvqM1o=";
   };
 
diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix
index 2e253d8d63b3..f557efcff292 100644
--- a/pkgs/development/python-modules/pylibjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = "pylibjpeg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MA1A/hTIx95MYZ2LGOifnHn77wbv0ydAgQSzNZRykVg=";
   };
 
diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix
index 8f25327bc060..04eebea98bb6 100644
--- a/pkgs/development/python-modules/pylink-square/default.nix
+++ b/pkgs/development/python-modules/pylink-square/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "square";
     repo = "pylink";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4tdtyb0AjsAmFOPdkxbbro8PH3akC5uihN59lgijhkc=";
   };
 
diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix
index 9b080c52e730..01aa04f0817a 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/pkgs/development/python-modules/pylint-django/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pylint-django";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9b0Sbo6E036UmUmP/CVPrS9cxxKtkMMZtqJsI53g4sU=";
   };
 
diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix
index d6ddceb94cc9..815ea7189813 100644
--- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix
+++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "pylint-plugin-utils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xuPU1txfB+6+zJjtlfvNA950S5n7/PWPPFn1F3RtvCc=";
   };
 
diff --git a/pkgs/development/python-modules/pylint-venv/default.nix b/pkgs/development/python-modules/pylint-venv/default.nix
index de5daa466fdf..dae8550ad418 100644
--- a/pkgs/development/python-modules/pylint-venv/default.nix
+++ b/pkgs/development/python-modules/pylint-venv/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jgosmann";
     repo = "pylint-venv";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dJWVfltze4zT0CowBZSn3alqR2Y8obKUCmO8Nfw+ahs=";
   };
 
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 9b98543b3004..3f587808a0e9 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pylint-dev";
     repo = "pylint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cnMYHHtIRxIySfZV0jTn+OFji+72cOReyNNDiJ9pbAg=";
   };
 
diff --git a/pkgs/development/python-modules/pylitejet/default.nix b/pkgs/development/python-modules/pylitejet/default.nix
index b55bf38bd513..6f8dec74b0ec 100644
--- a/pkgs/development/python-modules/pylitejet/default.nix
+++ b/pkgs/development/python-modules/pylitejet/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joncar";
     repo = "pylitejet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LHNMKU7aMDtSi4K+pZqRF9vAL3EKOFRFFNXKsQJVP2Y=";
   };
 
diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index ecd60bb6907f..13be3544495d 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Mpqa7pMxnFdSL1KGTUbgjh1zd8bAcoyzgxRZZ4SGfYc=";
   };
 
diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix
index bf5876cb1211..934a5f06401f 100644
--- a/pkgs/development/python-modules/pyloadapi/default.nix
+++ b/pkgs/development/python-modules/pyloadapi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tr4nt0r";
     repo = "pyloadapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-USSTXHHhtUc8QF9U3t3rARXn5Iqo6KOGBa3VAfRMbiQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix
index cc2048cc0450..c68d188f47dd 100644
--- a/pkgs/development/python-modules/pyls-isort/default.nix
+++ b/pkgs/development/python-modules/pyls-isort/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "pyls-isort";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "0xba0aiyjfdi9swjzxk26l94dwlwvn17kkfjfscxl8gvspzsn057";
   };
 
diff --git a/pkgs/development/python-modules/pyls-memestra/default.nix b/pkgs/development/python-modules/pyls-memestra/default.nix
index 6a61f39ca4d6..5baf644630c4 100644
--- a/pkgs/development/python-modules/pyls-memestra/default.nix
+++ b/pkgs/development/python-modules/pyls-memestra/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "QuantStack";
     repo = "pyls-memestra";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-C1d2BibjpoZCPSy39PkdcLiLIwZZG+XTDWXVjTT1Bws=";
   };
 
diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index 42baae0b0659..df38ba4fa538 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = "pylsp-mypy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MP9a8dI5ggM+XEJYB6O4nYDYIXbtxi2TK5b+JQgViZQ=";
   };
 
diff --git a/pkgs/development/python-modules/pylsp-rope/default.nix b/pkgs/development/python-modules/pylsp-rope/default.nix
index 43d53049ddde..f76acf729f09 100644
--- a/pkgs/development/python-modules/pylsp-rope/default.nix
+++ b/pkgs/development/python-modules/pylsp-rope/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-rope";
     repo = "pylsp-rope";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gEmSZQZ2rtSljN8USsUiqsP2cr54k6kwvsz8cjam9dU=";
   };
 
diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index 960f1e9afcba..3d2f1f2e8658 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gurumitts";
     repo = "pylutron-caseta";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8NO1IAm16b5jxjVPSQqOSx5hJjAOAXyOknqwkgPT5Zo=";
   };
 
diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix
index 78c3cba291c4..f6edde15a919 100644
--- a/pkgs/development/python-modules/pylxd/default.nix
+++ b/pkgs/development/python-modules/pylxd/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "canonica";
     repo = "pylxd";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Q4GMz7HFpJNPYlYgLhE0a7mVCwNpdbw4XVcUGQ2gUJ0=";
   };
 
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 6074b06b0bdc..a1cdeb35b871 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "materialsproject";
     repo = "pymatgen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o76bGItldcLfgZ5KDw2uL0GJvyljQJEwISR0topVR44=";
   };
 
diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix
index 46c2ee9bd2df..a5b22b29744b 100644
--- a/pkgs/development/python-modules/pymatting/default.nix
+++ b/pkgs/development/python-modules/pymatting/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pymatting";
     repo = "pymatting";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wHCTqcBvVN/pTXH3iW57DPpMEsnehutRQB5NaugS6Zs=";
   };
 
diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix
index 29ca1baddc06..aec5c57768b0 100644
--- a/pkgs/development/python-modules/pymedio/default.nix
+++ b/pkgs/development/python-modules/pymedio/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jcreinhold";
     repo = "pymedio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x3CHoWASDrUoCXfj73NF+0Y/3Mb31dK2Lh+o4OD9ryk=";
   };
 
diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix
index 4c77f1e14221..c32db9a2ddfb 100644
--- a/pkgs/development/python-modules/pymee/default.nix
+++ b/pkgs/development/python-modules/pymee/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FreshlyBrewedCode";
     repo = "pymee";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VNKIA/1juhkn11nkW52htvE4daXJoySeEyevWbboUek=";
   };
 
diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix
index 22eba34cb4a1..444582f52405 100644
--- a/pkgs/development/python-modules/pymeteireann/default.nix
+++ b/pkgs/development/python-modules/pymeteireann/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DylanGore";
     repo = "PyMetEireann";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-b59I2h9A3QoXEBUYhbR0vsGGpQpOvFrqhHZnVCS8fLo=";
   };
 
diff --git a/pkgs/development/python-modules/pymeteoclimatic/default.nix b/pkgs/development/python-modules/pymeteoclimatic/default.nix
index 6ecba40d2144..15b9d5c23529 100644
--- a/pkgs/development/python-modules/pymeteoclimatic/default.nix
+++ b/pkgs/development/python-modules/pymeteoclimatic/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adrianmo";
     repo = "pymeteoclimatic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rP0+OYDnQ4GuoV7DzR6jtgH6ilTMLjdaEFJcz3L0GYQ=";
   };
 
diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
index 0c0279099b33..eaf8dfe40540 100644
--- a/pkgs/development/python-modules/pymetno/default.nix
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "PyMetno";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0QODCJmGxgSKsTbsq4jsoP3cTy/0y6hq63j36bj7Dvo=";
   };
 
diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix
index 5f4a95431f0c..54a8e690574a 100644
--- a/pkgs/development/python-modules/pymfy/default.nix
+++ b/pkgs/development/python-modules/pymfy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tetienne";
     repo = "somfy-open-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-G/4aBtsN20QtQnMiBBQWg0mqrmR8FuU2f9g77qvk8nI=";
   };
 
diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix
index 00c2d546fedc..1e59d53b6e9c 100644
--- a/pkgs/development/python-modules/pymicro-vad/default.nix
+++ b/pkgs/development/python-modules/pymicro-vad/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "pymicro-vad";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wpsUy+f4eSGlq6L2FOtnA0qJgMh5ZdfiH31aaU61cVw=";
   };
 
diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix
index 634f437b810f..60f00f40464f 100644
--- a/pkgs/development/python-modules/pymilter/default.nix
+++ b/pkgs/development/python-modules/pymilter/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sdgathman";
     repo = "pymilter";
-    rev = "refs/tags/pymilter-${version}";
+    tag = "pymilter-${version}";
     hash = "sha256-plaWXwDAIsVzEtrabZuZj7T4WNfz2ntQHgcMCVf5S70=";
   };
 
diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix
index c9f706ca4a95..2bea0cf7305f 100644
--- a/pkgs/development/python-modules/pymilvus/default.nix
+++ b/pkgs/development/python-modules/pymilvus/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "milvus-io";
     repo = "pymilvus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-K7k3MTOEm9+HDwMps9C8Al0Jmp1ptJw3pN1LEBOUz0U=";
   };
 
diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index 013a577200cd..e578acdeb8a7 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pymodbus-dev";
     repo = "pymodbus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WuQddane7NPqGo6EHBPlFAZDmkcksDdWmHKdVSsSf+o=";
   };
 
diff --git a/pkgs/development/python-modules/pymodes/default.nix b/pkgs/development/python-modules/pymodes/default.nix
index 3cc7a9ac8690..6576479e12eb 100644
--- a/pkgs/development/python-modules/pymodes/default.nix
+++ b/pkgs/development/python-modules/pymodes/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "junzis";
     repo = "pyModeS";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rVxqtT/sBFQM2Y+GPR2Tc5J2skavvjxwPB7paDBqYRQ=";
   };
 
diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix
index 431b08d76af2..b17502b730db 100644
--- a/pkgs/development/python-modules/pymongo-inmemory/default.nix
+++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kaizendorks";
     repo = "pymongo_inmemory";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FDHHf9x62EqNcHjDF2vH8w8WG/15efEe+fDqGiiOe4A=";
   };
 
diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix
index 4456319b4349..7f9b6c6908b6 100644
--- a/pkgs/development/python-modules/pymoo/default.nix
+++ b/pkgs/development/python-modules/pymoo/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anyoptimization";
     repo = "pymoo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CbeJwv51lu4cABgGieqy/8DCDJCb8wOPPVqUHk8Jb7E=";
   };
 
diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix
index 1616ccd8574b..3e7a31f6989b 100644
--- a/pkgs/development/python-modules/pymorphy3/default.nix
+++ b/pkgs/development/python-modules/pymorphy3/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "no-plagiarism";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qYZm88wNOyZBb2Qhdpw83Oh679/dkWmrL/hQYsgEsaM=";
   };
 
diff --git a/pkgs/development/python-modules/pymsteams/default.nix b/pkgs/development/python-modules/pymsteams/default.nix
index 11f818c2b5e6..3731449a86cc 100644
--- a/pkgs/development/python-modules/pymsteams/default.nix
+++ b/pkgs/development/python-modules/pymsteams/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rveachkc";
     repo = "pymsteams";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-suPCAzjQp46+kKFiCtm65lxBbsn78Owq4dVmWCdhIpA=";
   };
 
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 80bcf8c6117b..626f444db883 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pymupdf";
     repo = "PyMuPDF";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-M7Ca3nqnqeClp4MGJqTAVGZhAGRniregjRrjtAhRkBc=";
   };
 
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index 781fa2bd24e8..dfccf2bad32e 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pynamodb";
     repo = "PynamoDB";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OcrES+1F95KjhRXpEukzbuDfTXU4hyJqxGjD1xMcdKE=";
   };
 
diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix
index 3e4ba20a1634..c517192abc67 100644
--- a/pkgs/development/python-modules/pynecil/default.nix
+++ b/pkgs/development/python-modules/pynecil/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tr4nt0r";
     repo = "pynecil";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z4QuX562LKDtNbl1rWcnJbB3Qw0ZaQcJskPPy7DWvQs=";
   };
 
diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix
index e7ff03c15a49..6679f980729c 100644
--- a/pkgs/development/python-modules/pynetbox/default.nix
+++ b/pkgs/development/python-modules/pynetbox/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "pynetbox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pP4DEHf4Dj3sQ7qx7tU0B0PaMCuzUM9R2pIYRI1Fpso=";
   };
 
diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix
index 301a957e861f..08f200f65f1d 100644
--- a/pkgs/development/python-modules/pynetgear/default.nix
+++ b/pkgs/development/python-modules/pynetgear/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatMaul";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5Lj2cK/SOGgaPu8dI9X3Leg4dPAY7tdIHCzFnNaube8=";
   };
 
diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix
index 51687d178331..a0ce87284521 100644
--- a/pkgs/development/python-modules/pyngo/default.nix
+++ b/pkgs/development/python-modules/pyngo/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yezz123";
     repo = "pyngo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qAq5e/B/gOBt9Wj8Kfhg+uTe/Sa/Qslk2g/o0+ttIag=";
   };
 
diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix
index 417b80b29779..83aeedff822b 100644
--- a/pkgs/development/python-modules/pynmeagps/default.nix
+++ b/pkgs/development/python-modules/pynmeagps/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "semuconsulting";
     repo = "pynmeagps";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-U5AI6iQiMvlCfL0SMAl0PkwC/orCr57royWvHKvWpAI=";
   };
 
diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix
index 462d5c6cf71c..142d8b44d59c 100644
--- a/pkgs/development/python-modules/pynobo/default.nix
+++ b/pkgs/development/python-modules/pynobo/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "echoromeo";
     repo = "pynobo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OSgpT9CLkfnv1BLAJApZUs3vMc1WE2eG7ZrinCLy/0U=";
   };
 
diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix
index 38246ac14072..e715530f9ba3 100644
--- a/pkgs/development/python-modules/pynordpool/default.nix
+++ b/pkgs/development/python-modules/pynordpool/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pynordpool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OGCVNVFbJfhjNKKpLRUvZIj7ZIYz/IVlt9xEPJb5W8E=";
   };
 
diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix
index 1abc215fd412..75bf1c748fba 100644
--- a/pkgs/development/python-modules/pynput/default.nix
+++ b/pkgs/development/python-modules/pynput/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moses-palmer";
     repo = "pynput";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6PwfFU1f/osEamSX9kxpOl2wDnrQk5qq1kHi2BgSHes=";
   };
   passthru.updateScript = gitUpdater {
diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix
index 2416e3175478..0d7c617614d4 100644
--- a/pkgs/development/python-modules/pynrrd/default.nix
+++ b/pkgs/development/python-modules/pynrrd/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mhe";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B/G46/9Xf1LRu02p0X4/UeW1RYotSXKXRO9VZDPhkNU=";
   };
 
diff --git a/pkgs/development/python-modules/pynslookup/default.nix b/pkgs/development/python-modules/pynslookup/default.nix
index 42591c750ca7..381000f97d09 100644
--- a/pkgs/development/python-modules/pynslookup/default.nix
+++ b/pkgs/development/python-modules/pynslookup/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wesinator";
     repo = "pynslookup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cb8oyI8D8SzBP+tm1jGPPshJYhPegYOH0RwIH03/K/A=";
   };
 
diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix
index 42de5c5bdc02..a71a1a6b7c2a 100644
--- a/pkgs/development/python-modules/pynuki/default.nix
+++ b/pkgs/development/python-modules/pynuki/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pschmitt";
     repo = "pynuki";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PF5FmAuPcJXq8gQ8HyzdtL2HiiUjueT+LAS1lYRvrwM=";
   };
 
diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
index 9b110f8f2e83..7501c0313358 100644
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "pynvim";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/frugwYPS4rS4L6BRsmNb5pJI8xfLJvbr+PyOLx25a4=";
   };
 
diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix
index d7a554205e43..ea8c12ad5528 100644
--- a/pkgs/development/python-modules/pynvml/default.nix
+++ b/pkgs/development/python-modules/pynvml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gpuopenanalytics";
     repo = "pynvml";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8NkYBRpcW3dvxVc6z17TMRPqA0YK/J/CdjuqgdcTdy8=";
   };
 
diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix
index a923be9c4a33..537a4944ba1c 100644
--- a/pkgs/development/python-modules/pynws/default.nix
+++ b/pkgs/development/python-modules/pynws/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MatthewFlamm";
     repo = "pynws";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eAXIlX/K7Cpq+aiPHiRGqhtSHQDtbHONYP0AjRW8JjY=";
   };
 
diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix
index 759798439767..524ddcc430d5 100644
--- a/pkgs/development/python-modules/pynx584/default.nix
+++ b/pkgs/development/python-modules/pynx584/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "pynx584";
-    rev = "refs/tags/0.8.2";
+    tag = "0.8.2";
     hash = "sha256-q5ra7tH4kaBrw0VAiyMsmWOkVhA7Y6bRuFP8dlxQjsE=";
   };
 
diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix
index 5a899e698795..6b8e6c448f0d 100644
--- a/pkgs/development/python-modules/pyobihai/default.nix
+++ b/pkgs/development/python-modules/pyobihai/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ejpenney";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tDPu/ceH7+7AnxokADDfl+G56B0+ri8RxXxXEyWa61Q=";
   };
 
diff --git a/pkgs/development/python-modules/pyocd-pemicro/default.nix b/pkgs/development/python-modules/pyocd-pemicro/default.nix
index 174ec65e2f73..d542f681dcf8 100644
--- a/pkgs/development/python-modules/pyocd-pemicro/default.nix
+++ b/pkgs/development/python-modules/pyocd-pemicro/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyocd";
     repo = "pyocd-pemicro";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qi803s8fkrLizcCLeDRz7CTQ56NGLQ4PPwCbxiRigwc=";
   };
 
diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix
index 4fecaf44b439..2da43c3f76cb 100644
--- a/pkgs/development/python-modules/pyoctoprintapi/default.nix
+++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "rfleming71";
     repo = "pyoctoprintapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DKqkT0Wyxf4grXBqei9IYBGMOgPxjzuo955M/nHDLo8=";
   };
 
diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix
index 64c692a2d945..559a4e0af835 100644
--- a/pkgs/development/python-modules/pyogrio/default.nix
+++ b/pkgs/development/python-modules/pyogrio/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "pyogrio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c=";
   };
 
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 3af43a63a73c..1ca5e1bfca12 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "inducer";
     repo = "pyopencl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-HE7dARgKnZxqjAXX4iI1ml0N2BalyTo+ZAzjC2ThEN8=";
   };
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index ecb51cbebdda..44a525bcb695 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyca";
     repo = "pyopenssl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
   };
 
diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix
index 03354190a107..96c03698efaa 100644
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "pyopenuv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-r+StbiU77/1dz41tCseleIWjiIvuvRveVgPNr3n4CEY=";
   };
 
diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix
index 4076913dc9e5..fcdda39f9fd3 100644
--- a/pkgs/development/python-modules/pyopenweathermap/default.nix
+++ b/pkgs/development/python-modules/pyopenweathermap/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "freekode";
     repo = "pyopenweathermap";
     # https://github.com/freekode/pyopenweathermap/issues/2
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w=";
   };
 
diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix
index a65d8d6b983b..a3699ac65c85 100644
--- a/pkgs/development/python-modules/pyorthanc/default.nix
+++ b/pkgs/development/python-modules/pyorthanc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gacou54";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE=";
   };
 
diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix
index be9f9d10153b..e3b4257da4e8 100644
--- a/pkgs/development/python-modules/pyosf/default.nix
+++ b/pkgs/development/python-modules/pyosf/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "psychopy";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Yhb6HSnLdFzWouse/RKZ8SIbMia/hhD8TAovdqmvd7o=";
   };
 
diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix
index 68b7d44064ed..2928d134a2c3 100644
--- a/pkgs/development/python-modules/pyosmium/default.nix
+++ b/pkgs/development/python-modules/pyosmium/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "pyosmium";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pW2w/M4P4DtGhnTy72w0wjMtpLtSgvYGaemme/rRrwM=";
   };
 
diff --git a/pkgs/development/python-modules/pyosohotwaterapi/default.nix b/pkgs/development/python-modules/pyosohotwaterapi/default.nix
index f2af54a279bc..8646817f7a8d 100644
--- a/pkgs/development/python-modules/pyosohotwaterapi/default.nix
+++ b/pkgs/development/python-modules/pyosohotwaterapi/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "osohotwateriot";
     repo = "apyosohotwaterapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7FLGmmndrFqSl4oC8QFIYNlFJPr+xbiZG5ZRt4vx8+s=";
   };
 
diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix
index b3d9b6702207..9d62bffa7e50 100644
--- a/pkgs/development/python-modules/pyotgw/default.nix
+++ b/pkgs/development/python-modules/pyotgw/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mvn23";
     repo = "pyotgw";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BQgRWXBSmB9AzpPeTJP7motJeKF2G0tyqJpbwIwnxwk=";
   };
 
diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
index 45b6c10ace18..62168cc25313 100644
--- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
+++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "pyoutbreaksnearme";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oR/DApOxNSSczrBeH4sytd/vasbD4rA1poW4zNoeAnU=";
   };
 
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index afc3fc3ba0b2..7b119babb750 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "csparpa";
     repo = "pyowm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME=";
   };
 
diff --git a/pkgs/development/python-modules/pypalazzetti/default.nix b/pkgs/development/python-modules/pypalazzetti/default.nix
index 5c022324c187..335e1a0bc9ce 100644
--- a/pkgs/development/python-modules/pypalazzetti/default.nix
+++ b/pkgs/development/python-modules/pypalazzetti/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dotvav";
     repo = "py-palazzetti-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gqJZVlX060BMbTbkbpK6UMnM71Mr06sNHX++ObI3Y5Y=";
   };
 
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index 727545b7148d..0aad26e59cb6 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JessicaTegner";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9fpits8O/50maM/e1lVVqBoTwUmcI+/IAYhVX1Pt6ZE=";
   };
 
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index 171bf42ab203..ed8bcb5e93c4 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyparsing";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-caHkwMFL1IFCQ+yZTp9o4yXfemoPx1xL4Nvb85oJzEI=";
   };
 
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index 24acecdaf8c2..a5f681ac167d 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "dcantrell";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU=";
   };
 
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 9666821f8692..24456e08cea4 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-pdf";
     repo = "pypdf";
-    rev = "refs/tags/${version}";
+    tag = version;
     # fetch sample files used in tests
     fetchSubmodules = true;
     hash = "sha256-ziJTYl7MQUCE8US0yeiq6BPDVbBsxWhti0NyiDnKtfE=";
diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix
index 48f4d8d79811..103deb656dc9 100644
--- a/pkgs/development/python-modules/pypinyin/default.nix
+++ b/pkgs/development/python-modules/pypinyin/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozillazg";
     repo = "python-pinyin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NGW94Labk3vAv4bfq/+ba2lnL/uebg0ODZWEi2yNIjg=";
   };
 
diff --git a/pkgs/development/python-modules/pypitoken/default.nix b/pkgs/development/python-modules/pypitoken/default.nix
index 3b11f7a44277..670d97149e04 100644
--- a/pkgs/development/python-modules/pypitoken/default.nix
+++ b/pkgs/development/python-modules/pypitoken/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ewjoachim";
     repo = "pypitoken";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1SUR6reZywgFpSdD49E5PjEDNrlvsHH4TK6SkXStUws=";
   };
 
diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix
index c144811f9a03..e15cfecdd72b 100644
--- a/pkgs/development/python-modules/pypoint/default.nix
+++ b/pkgs/development/python-modules/pypoint/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fredrike";
     repo = "pypoint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9z9VcY42uHIksIvDU1Vz+kvXNmrCu08fGB/waQahmyg=";
   };
 
diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix
index 396fb5712e50..f7a754b8a1f0 100644
--- a/pkgs/development/python-modules/pyppeteer/default.nix
+++ b/pkgs/development/python-modules/pyppeteer/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyppeteer";
     repo = "pyppeteer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4=";
   };
 
diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index d3f663f08172..c005eaaa23d3 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "precice";
     repo = "python-bindings";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y=";
   };
 
diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix
index ae05c1c17fc7..accb2be4ea0a 100644
--- a/pkgs/development/python-modules/pyprobables/default.nix
+++ b/pkgs/development/python-modules/pyprobables/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "barrust";
     repo = "pyprobables";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yJUYGfy+d+Xfk1DUDvBeWk0EcNPuW4DcUHx3G3jzEdc=";
   };
 
diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix
index 7623c2f8a247..bcc3f5e82dfb 100644
--- a/pkgs/development/python-modules/pyprof2calltree/default.nix
+++ b/pkgs/development/python-modules/pyprof2calltree/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pwaller";
     repo = "pyprof2calltree";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PrIYpvcoD+zVIoOdcON41JmqzpA5FyRKhI7rqDV8cSo=";
   };
 
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 56cbbf37bc7b..c30042f1dd6c 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyproj4";
     repo = "pyproj";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM=";
   };
 
diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix
index 2ec956f7da40..023a61e6137a 100644
--- a/pkgs/development/python-modules/pyproject-api/default.nix
+++ b/pkgs/development/python-modules/pyproject-api/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "pyproject-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zFV44xqbwe1QsIVurvsjqY+zxC+X2hCljZ5u70kNTSU=";
   };
 
diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix
index 6e79fae9dde8..f1f9585147f6 100644
--- a/pkgs/development/python-modules/pyprosegur/default.nix
+++ b/pkgs/development/python-modules/pyprosegur/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dgomes";
     repo = "pyprosegur";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-A223aafa0eXNBVd2cVVV7p2wXg4Z2rcoggM3czmRsOE=";
   };
 
diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix
index 61b482ee5846..d92ba9f738b2 100644
--- a/pkgs/development/python-modules/pyprusalink/default.nix
+++ b/pkgs/development/python-modules/pyprusalink/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Opip696hXV1gqFC1cWfrSCkrsldl7M7XZAqUaVkDy7M=";
   };
 
diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix
index 286b8a2ad902..996e562e1315 100644
--- a/pkgs/development/python-modules/pypsrp/default.nix
+++ b/pkgs/development/python-modules/pypsrp/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU=";
   };
 
diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index 0ad48f55d931..455677a38166 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kakulukia";
     repo = "pypugjs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W+EVNxT2OimNENHe4lJDn6Wm1EbBysGuCD3/Wkdew/U=";
   };
 
diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix
index 892d43038bb7..484e2d564c4f 100644
--- a/pkgs/development/python-modules/pyqldb/default.nix
+++ b/pkgs/development/python-modules/pyqldb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-qldb-driver-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u8wI8ThD/BA+WI62OvNFmYvcqr018wgrh+5J+p2A6hM=";
   };
 
diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 45cbada84b37..7de9344125b7 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyqtgraph";
     repo = "pyqtgraph";
-    rev = "refs/tags/pyqtgraph-${version}";
+    tag = "pyqtgraph-${version}";
     hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA=";
   };
 
diff --git a/pkgs/development/python-modules/pyradiomics/default.nix b/pkgs/development/python-modules/pyradiomics/default.nix
index 183f41044d31..d52270f7d470 100644
--- a/pkgs/development/python-modules/pyradiomics/default.nix
+++ b/pkgs/development/python-modules/pyradiomics/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AIM-Harvard";
     repo = "pyradiomics";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/qFNN63Bbq4DUZDPmwUGj1z5pY3ujsbqFJpVXbO+b8E=";
     name = "pyradiomics";
   };
diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix
index 1444533bb28c..51e09fae5138 100644
--- a/pkgs/development/python-modules/pyrainbird/default.nix
+++ b/pkgs/development/python-modules/pyrainbird/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "pyrainbird";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CcoZZ60PItqy0bCc36WfyNF9Fc28aHwQ6hhnY41lBNg=";
   };
 
diff --git a/pkgs/development/python-modules/pyramid-multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix
index 3311f87cd4b8..69e5e41d427e 100644
--- a/pkgs/development/python-modules/pyramid-multiauth/default.nix
+++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "pyramid_multiauth";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Bz53iCGsl6WZASIvBQ1pFfcGLra82vA2OLWjhLVdkrw=";
   };
 
diff --git a/pkgs/development/python-modules/pyreaderwriterlock/default.nix b/pkgs/development/python-modules/pyreaderwriterlock/default.nix
index 91a5d2934916..793b3ab382fb 100644
--- a/pkgs/development/python-modules/pyreaderwriterlock/default.nix
+++ b/pkgs/development/python-modules/pyreaderwriterlock/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "elarivie";
     repo = "pyReaderWriterLock";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8FC+4aDgGpF1BmOdlkFtMy7OfWdSmvn9fjKXSmmeJlg=";
   };
 
diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix
index e59530c63a88..fcf1d720c49a 100644
--- a/pkgs/development/python-modules/pyreadstat/default.nix
+++ b/pkgs/development/python-modules/pyreadstat/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Roche";
     repo = "pyreadstat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9uDmkEp9CXUCcM09CaVaaG856Q1rY3sKYOkQkGRzakE=";
   };
 
diff --git a/pkgs/development/python-modules/pyrender/default.nix b/pkgs/development/python-modules/pyrender/default.nix
index 1ea817934509..5d78f9acd34f 100644
--- a/pkgs/development/python-modules/pyrender/default.nix
+++ b/pkgs/development/python-modules/pyrender/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mmatl";
     repo = "pyrender";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-V2G8QWXMxFDQpT4XDOJhIFI2V9VhDQCaXYBb/QVLxgM=";
   };
 
diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix
index 83a89a679310..1b9b336c11e9 100644
--- a/pkgs/development/python-modules/pyrfxtrx/default.nix
+++ b/pkgs/development/python-modules/pyrfxtrx/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyRFXtrx";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y9UVJZxm5G5ywNLW8nm162cZTs3/mFeI+ZEUGoc9eAs=";
   };
 
diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix
index f8d85bc28614..bc2fa44446bb 100644
--- a/pkgs/development/python-modules/pyrisco/default.nix
+++ b/pkgs/development/python-modules/pyrisco/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OnFreund";
     repo = "pyrisco";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V+Wez9r/AoyNkR77yJTV3/9Kl0PHGw9kbQbzGauWEfc=";
   };
 
diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
index 94d2c640d97e..d126bd4a66a8 100644
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyro-ppl";
     repo = "pyro";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Dvbl/80EGoGWGhWYVIf/xjovUJG1+3WtpMH+lx1oB2E=";
   };
 
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 4860c6e0d264..61bbf1913150 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "svinota";
     repo = "pyroute2";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zB792ZwDWd74YBYvQ5au0t2RWTIAqrWvNtQ/e+ZEk50=";
   };
 
diff --git a/pkgs/development/python-modules/pyrympro/default.nix b/pkgs/development/python-modules/pyrympro/default.nix
index 70ed0c42a0e6..a53c74cee613 100644
--- a/pkgs/development/python-modules/pyrympro/default.nix
+++ b/pkgs/development/python-modules/pyrympro/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OnFreund";
     repo = "pyrympro";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mRvKLPgtBgmFDTHqra7GslxsgsJpQ2w/DE0Zgz5jujk=";
   };
 
diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 05efd63de69f..b13d9746dd38 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysam-developers";
     repo = "pysam";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1sivEf8xN4SJPtJiAcBZG1bbgy66yWXzQis1mPeU+sA=";
   };
 
diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 621f70399296..f25c9c2a7f25 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IdentityPython";
     repo = "pysaml2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M/tdKGu6K38TeBZc8/dt376bHhPB0svHB3iis/se0DY=";
   };
 
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index a5b4d28b4a7d..7f8e0575e96f 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pyscard";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
   };
 
diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index e7a85d773080..100ed9fa27ae 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyscf";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lXOREy0BABcjpAkxIMy245SAX8HfJKj/QSHGob14GgI=";
   };
 
diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix
index 3f50fc92fae4..f88ce75e525e 100644
--- a/pkgs/development/python-modules/pyschlage/default.nix
+++ b/pkgs/development/python-modules/pyschlage/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dknowles2";
     repo = "pyschlage";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ftoBchKK3I0kzw70MPaAlo/M2YLUx8OFwMNkJQ3itbo=";
   };
 
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index af8307218eaf..11445c064c06 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "pyScss";
     owner = "Kronuz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4=";
   };
 
diff --git a/pkgs/development/python-modules/pyseventeentrack/default.nix b/pkgs/development/python-modules/pyseventeentrack/default.nix
index 1029c1f50e53..55fba001214c 100644
--- a/pkgs/development/python-modules/pyseventeentrack/default.nix
+++ b/pkgs/development/python-modules/pyseventeentrack/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "shaiu";
     repo = "pyseventeentrack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AHFJu2z3UWBR6BzwdxAKl3wpqBnsyj8pn16z1rgFVpw=";
   };
 
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 9dfa464a4139..3710af7db272 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KimiNewt";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kzJDzUK6zknUyXPdKc4zMvWim4C5NQCSJSS45HI6hKM=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
index 33edb0c8114e..02f8969bd400 100644
--- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-elasticsearch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qIP+TP6lzviEAunYge/SIZQ6PI0EFnJo64FVpPmkdLY=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
index 9ecc23541ce6..469366fdd4e9 100644
--- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-insightidr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dc25zDYQeU9W9qwrRz7zsM2wOl8kMapDvwFhB6VOwhY=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
index ea7ea7449897..2baa1ec2071a 100644
--- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-opensearch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-whAvUgjPdZ0ePt0LkREJxJnLacNyQDWupdAinK3kJww=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
index c88fb3e2befd..e1af46b003b8 100644
--- a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nNipsx-Sec";
     repo = "pySigma-backend-qradar";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VymaxX+iqrRlf+WEt4xqEvNt5kg8xI5O/MoYahayu0o=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
index 3fd051e53b59..444ae878febe 100644
--- a/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-sqlite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PQByKARf0OOMC9LRTz3XVrFZp6ODSggMJeA6PNK/AuA=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
index a49466bea784..7e14b4879907 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-pipeline-crowdstrike";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WYgT0tRXdSR4qJA7UHotPn9qfnpaIJaqASBXVDG1kOU=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
index 4249731ec664..81ca140ebd90 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-pipeline-sysmon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/WBHu1pFEiVPJQ97xEwjJJ92h9kHzTBPgmfQrR+RZjA=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
index d40ceff1c792..839ccc4ffdf6 100644
--- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
+++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-pipeline-windows";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ss0OMd8urCYQUlvsm/m8Kz0jY4pVSEoZuLxs1JLWxQA=";
   };
 
diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index 77c6ad1daedb..ecdd45dc5800 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AbGmDDJUBvGwZixNKY+iLTKUENSAXHOAdztmbIQIEKs=";
   };
 
diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix
index c2357f4f9544..6024f726d75f 100644
--- a/pkgs/development/python-modules/pysignalclirestapi/default.nix
+++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bbernhard";
     repo = "pysignalclirestapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LGP/Oo4FCvOq3LuUZRYFkK2JV1kEu3MeCDgnYo+91o4=";
   };
 
diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix
index 020677f05e6a..69810c710e26 100644
--- a/pkgs/development/python-modules/pysilero-vad/default.nix
+++ b/pkgs/development/python-modules/pysilero-vad/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "pysilero-vad";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-p0pPhQo/raZhlHettmoc7FwnlZH9n2NI4tYHvikJ8i4=";
   };
 
diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix
index 64be0f25f39b..ec3975bd03a9 100644
--- a/pkgs/development/python-modules/pyskyqremote/default.nix
+++ b/pkgs/development/python-modules/pyskyqremote/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RogerSelwyn";
     repo = "skyq_remote";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aMgUwgKHgR+NQvRxiUV7GaXehjDIlJJJHwSmHDmzK08=";
   };
 
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 0bc7753ce6a0..09ae520334eb 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EJTzaoHBidnaHxFLw8FrjJITUxioRGEhl1yvm/QDpXc=";
   };
 
diff --git a/pkgs/development/python-modules/pysmartdl/default.nix b/pkgs/development/python-modules/pysmartdl/default.nix
index b131b2e3e196..b4ce005ff063 100644
--- a/pkgs/development/python-modules/pysmartdl/default.nix
+++ b/pkgs/development/python-modules/pysmartdl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iTaybb";
     repo = "pySmartDL";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM=";
   };
 
diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix
index d58336d0019c..3a4bd48c49b9 100644
--- a/pkgs/development/python-modules/pysmb/default.nix
+++ b/pkgs/development/python-modules/pysmb/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miketeo";
     repo = "pysmb";
-    rev = "refs/tags/pysmb-${version}";
+    tag = "pysmb-${version}";
     hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE=";
   };
 
diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix
index c9758295a5b4..1f2d73a22adb 100644
--- a/pkgs/development/python-modules/pysmi/default.nix
+++ b/pkgs/development/python-modules/pysmi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysmi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cAeLoDwAf56aWWKKUjOB0fpy7C3gBJchJJtQ6986thc=";
   };
 
diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix
index d4d5f9f87eef..bc1a3d841cd5 100644
--- a/pkgs/development/python-modules/pysml/default.nix
+++ b/pkgs/development/python-modules/pysml/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mtdcr";
     repo = "pysml";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-G4t0cHbJWMmDODeldj064SlKGagOfUnnRiGRwLu1bF0=";
   };
 
diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 3aa1290a5707..6ec4276d6fe2 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qqvjLSGZx4F1U80jc0z42D7PuBw3D7EEbL4+GoTJgoE=";
   };
 
diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix
index 2d81f0c4189f..a4600c955456 100644
--- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix
+++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysnmp";
     repo = "pyasn1";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI=";
   };
 
diff --git a/pkgs/development/python-modules/pysnmp-pysmi/default.nix b/pkgs/development/python-modules/pysnmp-pysmi/default.nix
index 4dbf57dcc640..eb5288f7769c 100644
--- a/pkgs/development/python-modules/pysnmp-pysmi/default.nix
+++ b/pkgs/development/python-modules/pysnmp-pysmi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysnmp";
     repo = "pysmi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dK02y8HXhwq1W6NOYsycjTpIMxoQY4qNT4n8TEycmWM=";
   };
 
diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index 540d1fbff830..cab481abdf47 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysnmp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+FfXvsfn8XzliaGUKZlzqbozoo6vDxUkgC87JOoVasY=";
   };
 
diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix
index ccb5320a67ac..a99da545455f 100644
--- a/pkgs/development/python-modules/pysnmplib/default.nix
+++ b/pkgs/development/python-modules/pysnmplib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pysnmp";
     repo = "pysnmp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AtQqXiy943cYhHDsyz9Yk5uA4xK7Q4p21CT3X3zYzrQ=";
   };
 
diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix
index 4adef044fc7a..4117952337fe 100644
--- a/pkgs/development/python-modules/pysnooz/default.nix
+++ b/pkgs/development/python-modules/pysnooz/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AustinBrunkhorst";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0=";
   };
 
diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix
index 7b13e0cb81e3..c6765f1a7c59 100644
--- a/pkgs/development/python-modules/pysolcast/default.nix
+++ b/pkgs/development/python-modules/pysolcast/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mcaulifn";
     repo = "solcast";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-x91QVCDPjfC8rCVam/mrc8HP84ONa2/mJtSV64hrilc=";
   };
 
diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix
index 7b3a60721799..c8dc5e12d2e1 100644
--- a/pkgs/development/python-modules/pyspcwebgw/default.nix
+++ b/pkgs/development/python-modules/pyspcwebgw/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbrrg";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI=";
   };
 
diff --git a/pkgs/development/python-modules/pyspeex-noise/default.nix b/pkgs/development/python-modules/pyspeex-noise/default.nix
index 4db2a5f2855c..493ba3b44375 100644
--- a/pkgs/development/python-modules/pyspeex-noise/default.nix
+++ b/pkgs/development/python-modules/pyspeex-noise/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "pyspeex-noise";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XtLA5yVVCZdpALPu3fx+U+aaA729Vs1UeOJsIm6/S+k=";
   };
 
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index e1b716245a5d..7e7102987e42 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8u4gAIM2HZiDooUoIM0zAUq6IJkJHMzr16p42v6ekBQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyspx/default.nix b/pkgs/development/python-modules/pyspx/default.nix
index 56f3ffcffa34..d1b5daba2ac1 100644
--- a/pkgs/development/python-modules/pyspx/default.nix
+++ b/pkgs/development/python-modules/pyspx/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sphincs";
     repo = "pyspx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hMZ7JZoo5RdUwQYpGjtZznH/O6rBUXv+svfOAI0cjqs=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
index 6c7e68e44217..c61e5aa324f9 100644
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rajlaud";
     repo = "pysqueezebox";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8eCf0y8xbnSP+c+QP8fRkamUj5kN4EUQVZpotdo7hbs=";
   };
 
diff --git a/pkgs/development/python-modules/pystac-client/default.nix b/pkgs/development/python-modules/pystac-client/default.nix
index 19633be8e032..52fed979a8fc 100644
--- a/pkgs/development/python-modules/pystac-client/default.nix
+++ b/pkgs/development/python-modules/pystac-client/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stac-utils";
     repo = "pystac-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bryJCg0JqjxQi5tAvd5Y2f/hXmHoIGEFiHuSPCjqfYk=";
   };
 
diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix
index 3f118b581a5c..e63f79533bc2 100644
--- a/pkgs/development/python-modules/pystac/default.nix
+++ b/pkgs/development/python-modules/pystac/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stac-utils";
     repo = "pystac";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yuAam/sXaGMFp1Kwxd28v3nOV05GC3sUY+gKJ4nLwTs=";
   };
 
diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix
index bddc42a816b0..568f0bf2c80e 100644
--- a/pkgs/development/python-modules/pystemmer/default.nix
+++ b/pkgs/development/python-modules/pystemmer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snowballstem";
     repo = "pystemmer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ngPx95ybgJmndpNPBwCa3BCNsozRg+dlEw+nhlIwI58=";
   };
 
diff --git a/pkgs/development/python-modules/pysuezv2/default.nix b/pkgs/development/python-modules/pysuezv2/default.nix
index b0eac1447d32..20e8ca6901e2 100644
--- a/pkgs/development/python-modules/pysuezv2/default.nix
+++ b/pkgs/development/python-modules/pysuezv2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jb101010-2";
     repo = "pySuez";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8=";
   };
 
diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix
index 3d81a5b01ce6..65fb6ba5d9a6 100644
--- a/pkgs/development/python-modules/pyswitchbee/default.nix
+++ b/pkgs/development/python-modules/pyswitchbee/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jafar-atili";
     repo = "pySwitchbee";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-at/HCY6htUz1ej09XPrb2QEyoiOWhIEpgSwJange1cU=";
   };
 
diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index d2e0c76338c7..161c85a1f833 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-On/FKfdiqx28MCx1kCcstb90iT1e20c84hHxdQSIark=";
   };
 
diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix
index f12ac02bdb92..a8c1e3dbbe20 100644
--- a/pkgs/development/python-modules/pysyncobj/default.nix
+++ b/pkgs/development/python-modules/pysyncobj/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bakwc";
     repo = "PySyncObj";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZWzvvv13g/iypm+MIl5q0Y8ekqzZEY5upSTPk3MFTPI=";
   };
 
diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix
index 879c4f3388bd..097071b98e51 100644
--- a/pkgs/development/python-modules/pysyncthru/default.nix
+++ b/pkgs/development/python-modules/pysyncthru/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nielstron";
     repo = "pysyncthru";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Zije1WzfgIU9pT0H7T/Mx+5gEBCsRgMLkfsa/KB0YtI=";
   };
 
diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix
index d7996053a7b4..30eacdbeac51 100644
--- a/pkgs/development/python-modules/pytablewriter/default.nix
+++ b/pkgs/development/python-modules/pytablewriter/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b3YzDqNATaT/FFG4/x9EGlYlhXKPvgNB2xnm0bzvLJQ=";
   };
 
diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
index 87bb086a7211..545d2cd16a18 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "supermihi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b3ODsG5rdSJ1Tq/0DARf99gHgWWGaArBFAjqeK3mvsY=";
   };
 
diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix
index 7fa18fb19491..213ccd4825e2 100644
--- a/pkgs/development/python-modules/pytautulli/default.nix
+++ b/pkgs/development/python-modules/pytautulli/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY=";
   };
 
diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix
index ccf6fd94f7db..1229179337e3 100644
--- a/pkgs/development/python-modules/pytedee-async/default.nix
+++ b/pkgs/development/python-modules/pytedee-async/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "pytedee_async";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mBE5h6oGEJ2Wzb/PCD4vwFs52tWy+YmQVA06BPVW1Kg=";
   };
 
diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix
index 0e347d9ef887..67fcce798720 100644
--- a/pkgs/development/python-modules/pytenable/default.nix
+++ b/pkgs/development/python-modules/pytenable/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tenable";
     repo = "pyTenable";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I6GlYPQI8qF9eyq8p4Wtkz8UEGth51ZALwA+Mu3TqhQ=";
   };
 
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index a12730c9f584..e64c3e28a2b6 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "madmaze";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gQMeck6ojlIwyiOCBBhzHHrjQfBMelVksVGd+fyxWZk=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix
index b76cd96230d2..9185a4b94b82 100644
--- a/pkgs/development/python-modules/pytest-aio/default.nix
+++ b/pkgs/development/python-modules/pytest-aio/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "klen";
     repo = "pytest-aio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6RxYn8/HAvXv1AEgSIEOLiaBkGgTcqQhWK+xbtxgj/o=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix
index d1eb23db0d9a..c38ff23b6543 100644
--- a/pkgs/development/python-modules/pytest-aiohttp/default.nix
+++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "pytest-aiohttp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UACf0frMTOAgSsXQ0oqROHKR1zn4OfLPhd9MwBK002Y=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 78baca8da38a..2ba74c6f4314 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix
index d7afa906d75b..a1f56e07cf6e 100644
--- a/pkgs/development/python-modules/pytest-base-url/default.nix
+++ b/pkgs/development/python-modules/pytest-base-url/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-base-url";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3P3Uk3QoznAtNODLjXFbeNn3AOfp9owWU2jqkxTEAa4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
index 025938b94264..0bd4ae71d8b0 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-bdd";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PC4VSsUU5qEFp/C/7OTgHINo8wmOo0w2d1Hpe0EnFzE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix
index 35f14ad921c9..fc4fbef0c72c 100644
--- a/pkgs/development/python-modules/pytest-benchmark/default.nix
+++ b/pkgs/development/python-modules/pytest-benchmark/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ionelmc";
     repo = "pytest-benchmark";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4fD9UfZ6jtY7Gx/PVzd1JNWeQNz+DJ2kQmCku2TgxzI=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 327bd997fad5..9c3555f1012d 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "celery";
     repo = "pytest-celery";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TUtKfGOxvVkiMhsUqyNDK08OTuzzKHrBiPU4JCKsIKM=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix
index ae5b5e848855..b49313a63f79 100644
--- a/pkgs/development/python-modules/pytest-cid/default.nix
+++ b/pkgs/development/python-modules/pytest-cid/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ntninja";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dcL/i5+scmdXh7lfE8+32w9PdHWf+mkunJL1vpJ5+Co=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix
index f28ddddbf831..fa51231c2f37 100644
--- a/pkgs/development/python-modules/pytest-codspeed/default.nix
+++ b/pkgs/development/python-modules/pytest-codspeed/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "pytest-codspeed";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A8H8gx+g2Fcf+aapahnAiVBt5vUzPc1SW4scOmSjI0g=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix
index 3c241457449f..f7f098449e6b 100644
--- a/pkgs/development/python-modules/pytest-datadir/default.nix
+++ b/pkgs/development/python-modules/pytest-datadir/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gabrielcnr";
     repo = "pytest-datadir";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
index 2d98d9cfb280..006a352318e0 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omarkohl";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YFD8M5TG6VtLRX04R3u0jtYDDlaK32D4ArWxS6x2b/E=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-docker-tools/default.nix b/pkgs/development/python-modules/pytest-docker-tools/default.nix
index 59a98ad27152..309db021c297 100644
--- a/pkgs/development/python-modules/pytest-docker-tools/default.nix
+++ b/pkgs/development/python-modules/pytest-docker-tools/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Jc2k";
     repo = "pytest-docker-tools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6F3aSUyDlBBYG1kwOQvey7rujDdK83uJ3Q1dr8Uo1pw=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-emoji/default.nix b/pkgs/development/python-modules/pytest-emoji/default.nix
index ef490315240c..d29fe9eee0e0 100644
--- a/pkgs/development/python-modules/pytest-emoji/default.nix
+++ b/pkgs/development/python-modules/pytest-emoji/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hackebrot";
     repo = "pytest-emoji";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GuKBbIIODDnMi9YMX3zR4Jc3cbK+Zibj1ZeWvYkUY24=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index 16d75ace33c2..b4ccddb390d3 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coherent-oss";
     repo = "pytest-flake8";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uc5DOqqdoLfhzI2ogDOqhbJOHzdu+uqSOojIH+S1LZI=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
index 6a508417e2e1..81f3fdfeb994 100644
--- a/pkgs/development/python-modules/pytest-forked/default.nix
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-forked";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-owkGwF5WQ17/CXwTsIYJ2AgktekRB4qhtsDxR0LCI/k=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-freezer/default.nix b/pkgs/development/python-modules/pytest-freezer/default.nix
index 521def7dfda0..b49e0371f08b 100644
--- a/pkgs/development/python-modules/pytest-freezer/default.nix
+++ b/pkgs/development/python-modules/pytest-freezer/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Eak6LNoyu2wvZbPaBBUO0UkyB9vni8YbsADGK0as7Cg=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix
index 1d2879049e45..bf2de36a148e 100644
--- a/pkgs/development/python-modules/pytest-golden/default.nix
+++ b/pkgs/development/python-modules/pytest-golden/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oprypin";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-harvest/default.nix b/pkgs/development/python-modules/pytest-harvest/default.nix
index 35e5945c1a62..0f87a6cf7697 100644
--- a/pkgs/development/python-modules/pytest-harvest/default.nix
+++ b/pkgs/development/python-modules/pytest-harvest/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "smarie";
     repo = "python-pytest-harvest";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-s8QiuUFRTTRhSpLa0DHScKFC9xdu+w2rssWCg8sIjsg=";
   };
 
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Store data created during your `pytest` tests execution, and retrieve it at the end of the session, e.g. for applicative benchmarking purposes";
     homepage = "https://github.com/smarie/python-pytest-harvest";
-    changelog = "https://github.com/smarie/python-pytest-harvest/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/smarie/python-pytest-harvest/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ mbalatsko ];
   };
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 891b8ed2cb75..e8971271a397 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kevin1024";
     repo = "pytest-httpbin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix
index 3bed5314cfb9..8f64b14c6d71 100644
--- a/pkgs/development/python-modules/pytest-httpserver/default.nix
+++ b/pkgs/development/python-modules/pytest-httpserver/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "csernazs";
     repo = "pytest-httpserver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BkdbCrpZKjHYikZk1mL4iSGe5gRjWUVN/w222QkmFLQ=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index 032631ca3bde..034929682e5f 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Colin-b";
     repo = "pytest_httpx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YwpNwtSTyCd78Q4zjvdCoXxpFd1XItcV5dq/O9z1dMw=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix
index e4d5d98c406e..0e8b8c18de37 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/pkgs/development/python-modules/pytest-isort/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stephrdev";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1oCVIi0sXwac4AufScJJRsfvBwaBAwlMBRNqLcUXEh4=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix
index dce8df48a430..61cd4114abea 100644
--- a/pkgs/development/python-modules/pytest-json-report/default.nix
+++ b/pkgs/development/python-modules/pytest-json-report/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "numirias";
     repo = "pytest-json-report";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix
index 560f17f02592..8f3f0ddcb30f 100644
--- a/pkgs/development/python-modules/pytest-jupyter/default.nix
+++ b/pkgs/development/python-modules/pytest-jupyter/default.nix
@@ -30,7 +30,7 @@ let
     src = fetchFromGitHub {
       owner = "jupyter-server";
       repo = "pytest-jupyter";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-RTpXBbVCRj0oyZ1TXXDv3M7sAI4kA6f3ouzTr0rXjwY=";
     };
 
diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
index 96f167d8f165..f99219251297 100644
--- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dev-petrov";
     repo = "pytest-lazy-fixtures";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2gaGIv4vfMdhLXQeYMbbx9B6tIsCGw4rytaO8bfRuEI=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-markdown-docs/default.nix b/pkgs/development/python-modules/pytest-markdown-docs/default.nix
index d09187cafa59..d1352941ba7d 100644
--- a/pkgs/development/python-modules/pytest-markdown-docs/default.nix
+++ b/pkgs/development/python-modules/pytest-markdown-docs/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "modal-com";
     repo = "pytest-markdown-docs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mclN28tfPcoFxswECjbrkeOI51XXSqUXfbvuSHrd7Sw=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix
index f66f42081c58..69529207feac 100644
--- a/pkgs/development/python-modules/pytest-notebook/default.nix
+++ b/pkgs/development/python-modules/pytest-notebook/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrisjsewell";
     repo = "pytest-notebook";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LoK0wb7rAbVbgyURCbSfckWvJDef3tPY+7V4YU1IBRU=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix
index 86db6d272fe6..04059a7e45fe 100644
--- a/pkgs/development/python-modules/pytest-order/default.nix
+++ b/pkgs/development/python-modules/pytest-order/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-order";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V1qJGkXn+HhuK5wiwkkJBEbfnv23R4x9Cv0J6ZTj5xE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-parallel/default.nix b/pkgs/development/python-modules/pytest-parallel/default.nix
index e3324bd91d8c..5aee33dd53d1 100644
--- a/pkgs/development/python-modules/pytest-parallel/default.nix
+++ b/pkgs/development/python-modules/pytest-parallel/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "kevlened";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ddpoWBTf7Zor569p6uOMjHSTx3Qa551f4mSwyTLDdBU=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix
index aebd6ccb85e5..793747e18248 100644
--- a/pkgs/development/python-modules/pytest-param-files/default.nix
+++ b/pkgs/development/python-modules/pytest-param-files/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrisjsewell";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix
index 31f75b538f32..cb4dbd72907b 100644
--- a/pkgs/development/python-modules/pytest-playwright/default.nix
+++ b/pkgs/development/python-modules/pytest-playwright/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "playwright-pytest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F5tbqm1k4SdTHIUgwSunLIL2W5mhJoMI4x4UZBLidlA=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix
index 811b3928b894..8aaab0f13a69 100644
--- a/pkgs/development/python-modules/pytest-postgresql/default.nix
+++ b/pkgs/development/python-modules/pytest-postgresql/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ClearcodeHQ";
     repo = "pytest-postgresql";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6D9QNcfq518ORQDYCH5G+LLJ7tVWPFwB6ylZR3LOZ5g=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-raises/default.nix b/pkgs/development/python-modules/pytest-raises/default.nix
index 16d4c681f21c..a2d818f07004 100644
--- a/pkgs/development/python-modules/pytest-raises/default.nix
+++ b/pkgs/development/python-modules/pytest-raises/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lemmons";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wmtWPWwe1sFbWSYxs5ZXDUZM1qvjRGMudWdjQeskaz0=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix
index dd9e84b3517e..01f8ef05d85b 100644
--- a/pkgs/development/python-modules/pytest-recording/default.nix
+++ b/pkgs/development/python-modules/pytest-recording/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kiwicom";
     repo = "pytest-recording";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C6uNp3knKKY0AX7fQYU85N82L6kyyO4HcExTz1bBtpE=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-responses/default.nix b/pkgs/development/python-modules/pytest-responses/default.nix
index 911fd0debdd2..cef884d564a1 100644
--- a/pkgs/development/python-modules/pytest-responses/default.nix
+++ b/pkgs/development/python-modules/pytest-responses/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "pytest-responses";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6QAiNWCJbo4rmaByrc8VNw39/eF3uqFOss3GJuCvpZg=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-ruff/default.nix b/pkgs/development/python-modules/pytest-ruff/default.nix
index 0d9239e7114f..e200d446385b 100644
--- a/pkgs/development/python-modules/pytest-ruff/default.nix
+++ b/pkgs/development/python-modules/pytest-ruff/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "businho";
     repo = "pytest-ruff";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ol+W5mDGMCwptuBa0b+Plkm64UUBf9bmr9YBo8g93Ok=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-selenium/default.nix b/pkgs/development/python-modules/pytest-selenium/default.nix
index 1cfb07705b9f..f83bea9c6144 100644
--- a/pkgs/development/python-modules/pytest-selenium/default.nix
+++ b/pkgs/development/python-modules/pytest-selenium/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-selenium";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-fIyos73haqTAgp5WVvMwJswQAtXnsnUeXKjPweXLGRM=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix
index e413501affd8..a8a0b69f363b 100644
--- a/pkgs/development/python-modules/pytest-services/default.nix
+++ b/pkgs/development/python-modules/pytest-services/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-services";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-E/VcKcAb1ekypm5jP4lsSz1LYJTcTSed6i5OY5ihP30=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-smtpd/default.nix b/pkgs/development/python-modules/pytest-smtpd/default.nix
index 9563441880b9..af40cceaa320 100644
--- a/pkgs/development/python-modules/pytest-smtpd/default.nix
+++ b/pkgs/development/python-modules/pytest-smtpd/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bebleo";
     repo = "pytest-smtpd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Vu2D2hfxBYxgXQ4Gjr+jFpac9fjpLL2FftBhnqrcQaA=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix
index 8d1f70fc8070..e8cfd7dc9b62 100644
--- a/pkgs/development/python-modules/pytest-snapshot/default.nix
+++ b/pkgs/development/python-modules/pytest-snapshot/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joseph-roitman";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix
index c4350d412a3b..160130486374 100644
--- a/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/pkgs/development/python-modules/pytest-socket/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miketheman";
     repo = "pytest-socket";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-19YF3q85maCVdVg2HOOPbN45RNjBf6kiFAhLut8B2tQ=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix
index 73aa1b558a1c..e1cc01003aa5 100644
--- a/pkgs/development/python-modules/pytest-spec/default.nix
+++ b/pkgs/development/python-modules/pytest-spec/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pchomik";
     repo = "pytest-spec";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SOu4ucRcLQSk1YOfNifFDezsB+ZeLXTwbJJ93/3EASk=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix
index e4eec03171ba..ea0cc589f222 100644
--- a/pkgs/development/python-modules/pytest-subprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-subprocess/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aklajnert";
     repo = "pytest-subprocess";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wEPIRWEwAiHSpcu9FMtkpAxqz64csT9AO27NDax3zNY=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix
index 3d2c0ecc3587..a8ce3413c9bf 100644
--- a/pkgs/development/python-modules/pytest-test-utils/default.nix
+++ b/pkgs/development/python-modules/pytest-test-utils/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "pytest-test-utils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-19oNAFff++7ntMdlnMXYc2w5I+EzGwWJh+rB1IjNZGk=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix
index 911cdd5d0def..a670bd842bb6 100644
--- a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix
+++ b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "pytest-textual-snapshot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-C8vL2kLOvVcDlTtNiG/pf7PwHzb/F0sWdkEcLvdGrd8=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix
index a430b889b53f..3d6856c41725 100644
--- a/pkgs/development/python-modules/pytest-twisted/default.nix
+++ b/pkgs/development/python-modules/pytest-twisted/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-twisted";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1dAfCa6hON0Vh9StI1Xw69IAwBzUkR6DdjQ0HNyoyME=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix
index 990586f28112..4057319ff1e8 100644
--- a/pkgs/development/python-modules/pytest-unordered/default.nix
+++ b/pkgs/development/python-modules/pytest-unordered/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "utapyngo";
     repo = "pytest-unordered";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-variables/default.nix b/pkgs/development/python-modules/pytest-variables/default.nix
index 39cc09643e15..84e628e00a5f 100644
--- a/pkgs/development/python-modules/pytest-variables/default.nix
+++ b/pkgs/development/python-modules/pytest-variables/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-variables";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-adKoE3td12JtF2f6/1/+TlSIy4i6gRDmeeWalsE6B/w=";
   };
 
diff --git a/pkgs/development/python-modules/pytest-voluptuous/default.nix b/pkgs/development/python-modules/pytest-voluptuous/default.nix
index 398e04ac64cf..0d04598eb782 100644
--- a/pkgs/development/python-modules/pytest-voluptuous/default.nix
+++ b/pkgs/development/python-modules/pytest-voluptuous/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "F-Secure";
     repo = "pytest-voluptuous";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xdj4qCSSJQI9Rb1WyUYrAg1I5wQ5o6IJyIjJAafP/LY=";
   };
 
diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix
index 9c3b015a5374..342816f73bfd 100644
--- a/pkgs/development/python-modules/python-aodhclient/default.nix
+++ b/pkgs/development/python-modules/python-aodhclient/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-aodhclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8=";
   };
 
diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix
index 5f488ef1741e..8955938a3bc5 100644
--- a/pkgs/development/python-modules/python-benedict/default.nix
+++ b/pkgs/development/python-modules/python-benedict/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fabiocaccamo";
     repo = "python-benedict";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HQ9VVgRfF5qA36yOyKT63gXuKNLLjouqYKz5EuqGA2E=";
   };
 
diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix
index f2b52b1cbc70..6dca1f802885 100644
--- a/pkgs/development/python-modules/python-bidi/default.nix
+++ b/pkgs/development/python-modules/python-bidi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MeirKriheli";
     repo = "python-bidi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LrXt9qaXfy8Rn9HjU4YSTFT4WsqzwCgh0flcxXOTF6E=";
   };
 
diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
index 4f626ae2e78c..c8f153e07ff7 100644
--- a/pkgs/development/python-modules/python-binance/default.nix
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sammchardy";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e88INUEkjOSVOD0KSs9LmstuQ7dQZdJk8K6VqFEusww=";
   };
 
diff --git a/pkgs/development/python-modules/python-bitcoinlib/default.nix b/pkgs/development/python-modules/python-bitcoinlib/default.nix
index 745ba8e25bc5..ec57a6ee23ee 100644
--- a/pkgs/development/python-modules/python-bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/python-bitcoinlib/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "petertodd";
     repo = "python-bitcoinlib";
-    rev = "refs/tags/python-bitcoinlib-v${version}";
+    tag = "python-bitcoinlib-v${version}";
     hash = "sha256-jfd2Buy6GSCH0ZeccRREC1NmlS6Mq1qtNv/NLNJOsX0=";
   };
 
diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 8c0e521ed18d..db03b2ee2118 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-b+/Cy8F2xUsYOr8PGQxkdXD07pAECNmbeWbuysSAT2I=";
   };
 
diff --git a/pkgs/development/python-modules/python-calamine/default.nix b/pkgs/development/python-modules/python-calamine/default.nix
index ba4eb23badbd..b3d9b06d28d0 100644
--- a/pkgs/development/python-modules/python-calamine/default.nix
+++ b/pkgs/development/python-modules/python-calamine/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dimastbk";
     repo = "python-calamine";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zZqhvfpkkbWLhPJIthDgxqvPUMpaXkyptuzY2fcecHU=";
   };
 
diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix
index 4272950862f3..1a30ade31cb8 100644
--- a/pkgs/development/python-modules/python-can/default.nix
+++ b/pkgs/development/python-modules/python-can/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hardbyte";
     repo = "python-can";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XCv2oOkGq8c2gTo+8UcZbuBYXyhhQstWLyddk3db38s=";
   };
 
diff --git a/pkgs/development/python-modules/python-creole/default.nix b/pkgs/development/python-modules/python-creole/default.nix
index 53f77d388f5f..afc735192b4c 100644
--- a/pkgs/development/python-modules/python-creole/default.nix
+++ b/pkgs/development/python-modules/python-creole/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jedie";
     repo = "python-creole";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8pXOnLNjhIv0d+BqjW8wlb6BT6CmFHSsxn5wLOv3LBQ=";
   };
 
diff --git a/pkgs/development/python-modules/python-datemath/default.nix b/pkgs/development/python-modules/python-datemath/default.nix
index efa1e5aed576..ebad9cb12481 100644
--- a/pkgs/development/python-modules/python-datemath/default.nix
+++ b/pkgs/development/python-modules/python-datemath/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nickmaccarthy";
     repo = "python-datemath";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VwdY6Gmbmoy7EKZjUlWj56uSiE0OdegPiQv+rmigkq8=";
   };
 
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index 96f48d0ebd01..b10815d4a991 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TOs6wAZDcSD1eP+Hbj78YXoAtKbReC5di5QSpQdwp8E=";
   };
 
diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix
index 41173ce42486..47a2629b2bb9 100644
--- a/pkgs/development/python-modules/python-decouple/default.nix
+++ b/pkgs/development/python-modules/python-decouple/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "HBNetwork";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q=";
   };
 
diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix
index f2266419d74c..9a22ab1fc41d 100644
--- a/pkgs/development/python-modules/python-didl-lite/default.nix
+++ b/pkgs/development/python-modules/python-didl-lite/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "StevenLooman";
     repo = "python-didl-lite";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-YSP24GiSngwwvpwfOoKkm/i0qCtpryjcshxZCskf5BM=";
   };
 
diff --git a/pkgs/development/python-modules/python-digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix
index 4597db497fb9..4877960c7b5d 100644
--- a/pkgs/development/python-modules/python-digitalocean/default.nix
+++ b/pkgs/development/python-modules/python-digitalocean/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "koalalorenzo";
     repo = "python-digitalocean";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CIYW6vl+IOO94VyfgTjJ3T13uGtz4BdKyVmE44maoLA=";
   };
 
diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix
index 28c4d4c3c115..ef8677a99085 100644
--- a/pkgs/development/python-modules/python-docx/default.nix
+++ b/pkgs/development/python-modules/python-docx/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-openxml";
     repo = "python-docx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-isxMtq5j5J02GcHMzOJdJw+ZokLoxA6fG1xsN21Irbc=";
   };
 
diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix
index 079aa23b8ad7..21014c67d5ee 100644
--- a/pkgs/development/python-modules/python-ecobee-api/default.nix
+++ b/pkgs/development/python-modules/python-ecobee-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nkgilley";
     repo = "python-ecobee-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE=";
   };
 
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index 60f1fa2895d2..dcd70d716eab 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-engineio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qfFMpE0aW8/TUBaKcaD/qV+JaBEqNR3WZ+mhQQsXkdU=";
   };
 
diff --git a/pkgs/development/python-modules/python-escpos/default.nix b/pkgs/development/python-modules/python-escpos/default.nix
index 79db35734714..894d07bc0044 100644
--- a/pkgs/development/python-modules/python-escpos/default.nix
+++ b/pkgs/development/python-modules/python-escpos/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-escpos";
     repo = "python-escpos";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-f7qA1+8PwnXS526jjULEoyn0ejnvsneuWDt863p4J2g=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix
index 7f630a0705a8..d21202daac65 100644
--- a/pkgs/development/python-modules/python-frontmatter/default.nix
+++ b/pkgs/development/python-modules/python-frontmatter/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eyeseast";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Sr0RbNVk87Zu01U7nkuPUSnl1bm6G72EZDP/eDn099s=";
   };
 
diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix
index 5bf32af28757..ecc7cbd02df8 100644
--- a/pkgs/development/python-modules/python-fsutil/default.nix
+++ b/pkgs/development/python-modules/python-fsutil/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fabiocaccamo";
     repo = "python-fsutil";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Cs78zpf3W5UZJkkUBEP6l6fi2J4OtJXGvqqQ8PWKx+8=";
   };
 
diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix
index 66b6cb4528c4..14839d135b0c 100644
--- a/pkgs/development/python-modules/python-fullykiosk/default.nix
+++ b/pkgs/development/python-modules/python-fullykiosk/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgarwood";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+JBgBi05zNgIt2cXlHjFPI6nBFR7SpMCWIQHKtnZeX4=";
   };
 
diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix
index 40b09992d749..571405cce6ff 100644
--- a/pkgs/development/python-modules/python-fx/default.nix
+++ b/pkgs/development/python-modules/python-fx/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cielong";
     repo = "pyfx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Q5ihWnoa7nf4EkrY4SgrwjaNvTva4RdW9GRbnbsPXPc=";
   };
 
diff --git a/pkgs/development/python-modules/python-hcl2/default.nix b/pkgs/development/python-modules/python-hcl2/default.nix
index fe9e7ed6ac14..1cc511c29697 100644
--- a/pkgs/development/python-modules/python-hcl2/default.nix
+++ b/pkgs/development/python-modules/python-hcl2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amplify-education";
     repo = "python-hcl2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-SS0v1H91aTkJtGo9sICOF+/umIq5e01BR0/xNvIXkUU=";
   };
 
diff --git a/pkgs/development/python-modules/python-hl7/default.nix b/pkgs/development/python-modules/python-hl7/default.nix
index b194bd7ca38b..63e7efac3f17 100644
--- a/pkgs/development/python-modules/python-hl7/default.nix
+++ b/pkgs/development/python-modules/python-hl7/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "johnpaulett";
     repo = "python-hl7";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9uFdyL4+9KSWXflyOMOeUudZTv4NwYPa0ADNTmuVbqo=";
   };
 
diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
index 0a30076c9e9b..8547016c2025 100644
--- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
+++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-homeassistant-analytics";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TfD1N4KoeIVoDp1YoOhBw8E7adow1nU1N6vj2j3W2No=";
   };
 
diff --git a/pkgs/development/python-modules/python-idzip/default.nix b/pkgs/development/python-modules/python-idzip/default.nix
index 07ea6116f782..8053d053e9ea 100644
--- a/pkgs/development/python-modules/python-idzip/default.nix
+++ b/pkgs/development/python-modules/python-idzip/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bauman";
     repo = "python-idzip";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ChzwC/Afn0qeo5anq4anIu2eI9i6XDnSvB7jAwY7rSw=";
   };
 
diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix
index af7cd125befb..05d37544e30b 100644
--- a/pkgs/development/python-modules/python-ipmi/default.nix
+++ b/pkgs/development/python-modules/python-ipmi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kontron";
     repo = "python-ipmi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vwjVUkTeVC1On1I1BtM0kBbne6CbX/6Os1+HA8WN9jU=";
   };
 
diff --git a/pkgs/development/python-modules/python-ipware/default.nix b/pkgs/development/python-modules/python-ipware/default.nix
index 394f114b095f..fca4653e9002 100644
--- a/pkgs/development/python-modules/python-ipware/default.nix
+++ b/pkgs/development/python-modules/python-ipware/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "un33k";
     repo = "python-ipware";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S8/HbRztYGzrpLQRTHcvO7Zv3mNn/0+y5PNBYLpd++E=";
   };
 
diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix
index 2eba0d6b1bb4..5a52d2d58a8a 100644
--- a/pkgs/development/python-modules/python-izone/default.nix
+++ b/pkgs/development/python-modules/python-izone/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Swamp-Ig";
     repo = "pizone";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg=";
   };
 
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 729d98a9e0ce..5e28423202c1 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-jsonrpc-server";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hlMw+eL1g+oe5EG7mwK8jSX0UcOQo7La+BZ3tjEojl0=";
   };
 
diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix
index e4e964d52749..ce8bb180c156 100644
--- a/pkgs/development/python-modules/python-keycloak/default.nix
+++ b/pkgs/development/python-modules/python-keycloak/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "marcospereirampj";
     repo = "python-keycloak";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZXS29bND4GsJNhTGiUsLo+4FYd8Tubvg/+PJ33tqovY=";
   };
 
diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix
index 97e8967e8fd6..0178f620c1d3 100644
--- a/pkgs/development/python-modules/python-ldap/default.nix
+++ b/pkgs/development/python-modules/python-ldap/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-ldap";
     repo = "python-ldap";
-    rev = "refs/tags/python-ldap-${version}";
+    tag = "python-ldap-${version}";
     hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU=";
   };
 
diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix
index 464716040693..8d94a1e30d67 100644
--- a/pkgs/development/python-modules/python-libnmap/default.nix
+++ b/pkgs/development/python-modules/python-libnmap/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "savon-noir";
     repo = "python-libnmap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cI8wdOvTmRy2cxLBkJn7vXRBRvewDMNl/tkIiRGhZJ8=";
   };
 
diff --git a/pkgs/development/python-modules/python-logging-loki/default.nix b/pkgs/development/python-modules/python-logging-loki/default.nix
index fe22ed58b7c6..265fdf21e2c3 100644
--- a/pkgs/development/python-modules/python-logging-loki/default.nix
+++ b/pkgs/development/python-modules/python-logging-loki/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GreyZmeem";
     repo = "python-logging-loki";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1qHuv+xzATo11au+QAhD1lHcLJtnVKZDdQDGohHUhiI=";
   };
 
diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index 2a963148439a..8286298f5308 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = "python-lsp-black";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY=";
   };
 
diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
index 948eba8e6e57..9856742f48b4 100644
--- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
+++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64=";
   };
 
diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix
index a23cf5c03130..7fbd8706b1a8 100644
--- a/pkgs/development/python-modules/python-lsp-ruff/default.nix
+++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = "python-lsp-ruff";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-czGA/gl7uoWG9UqYUaY9zER79IKfv7ClqgimgyNCAa4=";
   };
 
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 3e64e48a5926..41b0ed328669 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = "python-lsp-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oFqa7DtFpJmDZrw+GJqrFH3QqnMAu9159q3IWT9vRko=";
   };
 
diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix
index c2592f956253..4b4ca0a50b8a 100644
--- a/pkgs/development/python-modules/python-lzf/default.nix
+++ b/pkgs/development/python-modules/python-lzf/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "teepark";
     repo = "python-lzf";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-n5E75kRqe0dDbyFicoyLBAVi/SuoUU7qJka3viipQk8=";
   };
 
diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix
index ec0d6ff58a8b..df2a26e46361 100644
--- a/pkgs/development/python-modules/python-lzo/default.nix
+++ b/pkgs/development/python-modules/python-lzo/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jd-boyd";
     repo = "python-lzo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iXAvOCzHPvNERMkE5y4QTHi4ZieW1wrYWYScs7zyb2c=";
   };
 
diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix
index 06866a59ce84..3c010d2b12cc 100644
--- a/pkgs/development/python-modules/python-magnumclient/default.nix
+++ b/pkgs/development/python-modules/python-magnumclient/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-magnumclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2JHI3CB/DSZZ4LXzL3PCUSmubTciUXtZkc5jpeEc4kk=";
   };
 
diff --git a/pkgs/development/python-modules/python-motionmount/default.nix b/pkgs/development/python-modules/python-motionmount/default.nix
index a97d7be87769..be922822f69c 100644
--- a/pkgs/development/python-modules/python-motionmount/default.nix
+++ b/pkgs/development/python-modules/python-motionmount/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vogelsproducts";
     repo = "python-MotionMount";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-07wTlyfUSt44dBwOXjkXADA+HDy8531KYxJAKqBWKeQ=";
   };
 
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index a35996b7dc6f..324cf58dc0af 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kludex";
     repo = "python-multipart";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6RV1BKf7/OihbUiH+nqrnAWW/eWppUb+Nn44Y+QQLX4=";
   };
 
diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix
index 2484537aabf9..06b81b1be637 100644
--- a/pkgs/development/python-modules/python-ndn/default.nix
+++ b/pkgs/development/python-modules/python-ndn/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "named-data";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ArTP4LQu7VNjI/N13gMTc1SDiNmW5l4GdLYOk8JEfKg=";
   };
 
diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix
index 6f8d8785cbcb..78c854d3ec47 100644
--- a/pkgs/development/python-modules/python-on-whales/default.nix
+++ b/pkgs/development/python-modules/python-on-whales/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gabrieldemarmiesse";
     repo = "python-on-whales";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i2lctR5V4hF/cS46d+TW73iKZ+2G/UwiHMNbtP/Z7xo=";
   };
 
diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix
index bef8dadf3186..ab4b8fdcd678 100644
--- a/pkgs/development/python-modules/python-opensky/default.nix
+++ b/pkgs/development/python-modules/python-opensky/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-opensky";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V6iRwWzCnPCvu8eks2sHPYrX3OmaFnNj+i57kQJKYm0=";
   };
 
diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix
index 6df0b0c8f36f..c312fe60eefd 100644
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-otbr-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RMj4NdEbMIxh2PDzbhUWgmcdzRXY8RxcQNN/bbGOW5Q=";
   };
 
diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix
index 3a2d011ab0c5..8f126bca5a8d 100644
--- a/pkgs/development/python-modules/python-pam/default.nix
+++ b/pkgs/development/python-modules/python-pam/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FirefighterBlu3";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU=";
   };
 
diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index 6a631e49875e..32153ca9f8c3 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-rapidjson";
     repo = "python-rapidjson";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xIswmHQMl5pAqvcTNqeuO3P6MynKt3ahzUgGQroaqmw=";
   };
 
diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix
index b08d82bb3e48..15b631010bc9 100644
--- a/pkgs/development/python-modules/python-registry/default.nix
+++ b/pkgs/development/python-modules/python-registry/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "python-registry";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-OgRPcyx+NJnbtETMakUT0p8Pb0Qfzgj+qvWtmJksnT8=";
   };
 
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index 142e5883cf8a..1e87a6fb6477 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "un33k";
     repo = "python-slugify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zReUMIkItnDot3XyYCoPUNHrrAllbClWFYcxdTy3A30=";
   };
 
diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix
index a79b3d75b38b..9dc2e362fd10 100644
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mdz";
     repo = "python-smarttub";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ErGBOO5aes4Avmt2M6rkZPmjwsCMZdNnLhMDYhlULzU=";
   };
 
diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix
index 80422b7cf258..22bc349448c7 100644
--- a/pkgs/development/python-modules/python-snap7/default.nix
+++ b/pkgs/development/python-modules/python-snap7/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gijzelaerr";
     repo = "python-snap7";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CqLG5/U2k7WdZL5LfcFAnV1Q8HcIU7l36gi51lgB39s=";
   };
 
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index 0d05971cd2bb..7f6a7ba31797 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-socketio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iWe9IwUR+nq9SAmHzFZYUJpVOOEbc1ZdiMAjaBjQrVs=";
   };
 
diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index 5091b4b45207..6641455efb78 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "romis2012";
     repo = "python-socks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KpL3MAPbeKQh/NZyXlAAB6O7ljx1bVMBRO8fGJT2Zvo=";
   };
 
diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix
index 84bb6e27f012..2d24fcace959 100644
--- a/pkgs/development/python-modules/python-songpal/default.nix
+++ b/pkgs/development/python-modules/python-songpal/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rytilahti";
     repo = "python-songpal";
-    rev = "refs/tags/release/${version}";
+    tag = "release/${version}";
     hash = "sha256-PYw6xlUtBrxl+YeVO/2Njt5LYWEprzGPVNk1Mlr83HM=";
   };
 
diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix
index f9f4eb6e6684..41d151802ec6 100644
--- a/pkgs/development/python-modules/python-tado/default.nix
+++ b/pkgs/development/python-modules/python-tado/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wmalgadey";
     repo = "PyTado";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk=";
   };
 
diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix
index 66413bc3f259..8addb71d5b8d 100644
--- a/pkgs/development/python-modules/python-technove/default.nix
+++ b/pkgs/development/python-modules/python-technove/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Moustachauve";
     repo = "pytechnove";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-umtM2fIyEiimt/X2SvgqjaTYGutvJHkSJ3pRfwSbOfQ=";
   };
 
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 3b15ed6fd8f7..4f70e6122ab1 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-telegram-bot";
     repo = "python-telegram-bot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eJC8oH5iAMdCN546LzoRwlNq0gQqu8fZGscQlOzb/aY=";
   };
 
diff --git a/pkgs/development/python-modules/python-telegram/default.nix b/pkgs/development/python-modules/python-telegram/default.nix
index cfe1dbd671bf..fc0040b2d36d 100644
--- a/pkgs/development/python-modules/python-telegram/default.nix
+++ b/pkgs/development/python-modules/python-telegram/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexander-akhmetov";
     repo = "python-telegram";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JnU59DZXpnaZXIY/apXQ2gBgiwT12rJIeVqzaP0l7Zk=";
   };
 
diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix
index 230ff86d7fc0..f4a6e1ba8edf 100644
--- a/pkgs/development/python-modules/python-toolbox/default.nix
+++ b/pkgs/development/python-modules/python-toolbox/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cool-RR";
     repo = "python_toolbox";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y9RmVndgsBESrUCEORUwAdaFYBiunY3kWArhB9d7bw4=";
   };
 
diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix
index 05d5ce033cea..44297b38f372 100644
--- a/pkgs/development/python-modules/python-troveclient/default.nix
+++ b/pkgs/development/python-modules/python-troveclient/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-troveclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6JviPG2ikKRqvW/eqPIHMvpV6GjqbaXYHhcOOpaIS4U=";
   };
 
diff --git a/pkgs/development/python-modules/python-twitch-client/default.nix b/pkgs/development/python-modules/python-twitch-client/default.nix
index 2128314b0d88..a47ec56941fb 100644
--- a/pkgs/development/python-modules/python-twitch-client/default.nix
+++ b/pkgs/development/python-modules/python-twitch-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tsifrer";
     repo = "python-twitch-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-gxBpltwExb9bg3HLkz/MNlP5Q3/x97RHxhbwNqqanIM=";
   };
 
diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix
index 9dc439fde706..98dfbfce39f4 100644
--- a/pkgs/development/python-modules/python-ulid/default.nix
+++ b/pkgs/development/python-modules/python-ulid/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mdomke";
     repo = "python-ulid";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Z9rYqekhrYa8ab17AVmKyObvq4HTOij7+LMlvRSqUQM=";
   };
 
diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix
index 3527defa41da..a280824a8613 100644
--- a/pkgs/development/python-modules/python-vagrant/default.nix
+++ b/pkgs/development/python-modules/python-vagrant/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycontribs";
     repo = "python-vagrant";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww=";
   };
 
diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix
index 05b2d315d2af..cd0cba731c73 100644
--- a/pkgs/development/python-modules/python-watcherclient/default.nix
+++ b/pkgs/development/python-modules/python-watcherclient/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-watcherclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lDdiZKaeteKZEyfjpBx8KY+0FLFOYAnQXl0pTbqq0Ss=";
   };
 
diff --git a/pkgs/development/python-modules/python-yate/default.nix b/pkgs/development/python-modules/python-yate/default.nix
index 6207b13381e8..6d6381b80dd5 100644
--- a/pkgs/development/python-modules/python-yate/default.nix
+++ b/pkgs/development/python-modules/python-yate/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eventphone";
     repo = "python-yate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AdnlNsEOFuzuGTBmfV9zKyv2iFHEJ4eLMrC6SHHf7m0=";
   };
 
diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix
index 84c70240cc7d..083fa6298046 100644
--- a/pkgs/development/python-modules/python-zaqarclient/default.nix
+++ b/pkgs/development/python-modules/python-zaqarclient/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-zaqarclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vfu1GYd9eoVpmBtlnRTiqpiqlgxqPnwpFC9YC1UuvLM=";
   };
 
diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix
index 64dba8c8d350..a7e8c64146fb 100644
--- a/pkgs/development/python-modules/python-zbar/default.nix
+++ b/pkgs/development/python-modules/python-zbar/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mchehab";
     repo = "zbar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6gOqMsmlYy6TK+iYPIBsCPAk8tYDliZYMYeTOidl4XQ=";
   };
 
diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix
index a9f62457090d..9785016ac9a2 100644
--- a/pkgs/development/python-modules/python-zunclient/default.nix
+++ b/pkgs/development/python-modules/python-zunclient/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "python-zunclient";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2gC2aMaMI//QKIpbDNT9cii17680g4X1c0rgrgPbAsg=";
   };
 
diff --git a/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix
index 48b3b6d54463..60bf464cb510 100644
--- a/pkgs/development/python-modules/python3-gnutls/default.nix
+++ b/pkgs/development/python-modules/python3-gnutls/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AGProjects";
     repo = "python3-gnutls";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-AdFRF3ZlkkAoSm5rvf/09FSYIo7SsZ38sD2joOLyukA=";
   };
 
diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix
index fa5a004ff99d..4e456405cad8 100644
--- a/pkgs/development/python-modules/python3-saml/default.nix
+++ b/pkgs/development/python-modules/python3-saml/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "onelogin";
     repo = "python3-saml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KyDGmqhg/c29FaXPKK8rWKSBP6BOCpKKpOujCavXUcc=";
   };
 
diff --git a/pkgs/development/python-modules/pythonegardia/default.nix b/pkgs/development/python-modules/pythonegardia/default.nix
index 4b3d6ce8f0e4..b72cbf86b7fd 100644
--- a/pkgs/development/python-modules/pythonegardia/default.nix
+++ b/pkgs/development/python-modules/pythonegardia/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeroenterheerdt";
     repo = "python-egardia";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-lQ/7tH74MllwFe2kF5OcYSb4rQd+yJU1W6ztG4Z6Y0U=";
   };
 
diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
index 3af465ba2de1..cb36ba8f2dba 100644
--- a/pkgs/development/python-modules/pythonfinder/default.nix
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = "pythonfinder";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CbaKXD7Sde8euRqvc/IHoXoSMF+dNd7vT9LkLWq4/IU=";
   };
 
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index 755834eecd32..a3707047c56f 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tpaviot";
     repo = "pythonocc-core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU=";
   };
 
diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix
index 8888d8d1e1e3..77cd6bd9f6ba 100644
--- a/pkgs/development/python-modules/pythonqwt/default.nix
+++ b/pkgs/development/python-modules/pythonqwt/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "PythonQwt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-apvUilKx6Xl2PluvmQVW5Lkoub2He/75EdYv10jMR+k=";
   };
 
diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix
index 2146c8c02245..711c160d1195 100644
--- a/pkgs/development/python-modules/pythran/default.nix
+++ b/pkgs/development/python-modules/pythran/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "serge-sans-paille";
     repo = "pythran";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wiQmShniYZmB8hk/MC5FWFf1s5vqEHiYBkXTo4OeZ+E=";
   };
 
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 79ee8cb72776..ef4eeecbb3eb 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyTibber";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lUxID4D9wxKvDF3epEznTof9lHYKFniTDYv7/gvW7Z4=";
   };
 
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index b97c36358dd1..0a765117e0bc 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "pytile";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6vcFGMj7E1xw01yHOq/WDpqMxd7OIiRBCmw5LForAR0=";
   };
 
diff --git a/pkgs/development/python-modules/pytimeparse2/default.nix b/pkgs/development/python-modules/pytimeparse2/default.nix
index 75d1ff0f53fe..d7ffec6a9b7d 100644
--- a/pkgs/development/python-modules/pytimeparse2/default.nix
+++ b/pkgs/development/python-modules/pytimeparse2/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "onegreyonewhite";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48=";
   };
 
diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix
index dd22bbf5b88e..292283dca1bf 100644
--- a/pkgs/development/python-modules/pytm/default.nix
+++ b/pkgs/development/python-modules/pytm/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "izar";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-MseV1ucDCzSM36zx04g9v5euDX0t74KqUSB4+brHzt8=";
   };
 
diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix
index 563d1e4d2ecd..93ae991ed989 100644
--- a/pkgs/development/python-modules/pytoolconfig/default.nix
+++ b/pkgs/development/python-modules/pytoolconfig/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bagel897";
     repo = "pytoolconfig";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h21SDgVsnCDZQf5GS7sFE19L/p+OlAFZGEYKc0RHn30=";
   };
 
diff --git a/pkgs/development/python-modules/pytorch-msssim/default.nix b/pkgs/development/python-modules/pytorch-msssim/default.nix
index a75aa6eb5b18..325450ab7ba7 100644
--- a/pkgs/development/python-modules/pytorch-msssim/default.nix
+++ b/pkgs/development/python-modules/pytorch-msssim/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "VainF";
     repo = "pytorch-msssim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bghglwQhgByC7BqbDvImSvt6edKF55NLYEPjqmmSFH8=";
   };
 
diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
index a7f6dd539b65..33a4db6a81b1 100644
--- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
+++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pfnet";
     repo = "pytorch-pfn-extras";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6KHVsUHN2KDKAaMdhBpZgTq0XILWUsHJPgeRD0m9m20=";
   };
 
diff --git a/pkgs/development/python-modules/pytouchlinesl/default.nix b/pkgs/development/python-modules/pytouchlinesl/default.nix
index 53480557ab99..aa9f6ad97cdb 100644
--- a/pkgs/development/python-modules/pytouchlinesl/default.nix
+++ b/pkgs/development/python-modules/pytouchlinesl/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jnsgruk";
     repo = "pytouchlinesl";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hrC5cBtAU9P9VaRIoUKDx5x4KwUN6mO/JwEZrsnYB0s=";
   };
 
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   meta = {
     description = "A Python API client for Roth's TouchlineSL API";
     homepage = "https://github.com/jnsgruk/pytouchlinesl";
-    changelog = "https://github.com/jnsgruk/pytouchlinesl/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/jnsgruk/pytouchlinesl/releases/tag/${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jnsgruk ];
   };
diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix
index c26ee031b887..effdc94a8ec7 100644
--- a/pkgs/development/python-modules/pytraccar/default.nix
+++ b/pkgs/development/python-modules/pytraccar/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pytraccar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE=";
   };
 
diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix
index 8227ac484641..cfbcc21fc6cb 100644
--- a/pkgs/development/python-modules/pytradfri/default.nix
+++ b/pkgs/development/python-modules/pytradfri/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "pytradfri";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0=";
   };
 
diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix
index 90de83155562..c788b46487b7 100644
--- a/pkgs/development/python-modules/pytrydan/default.nix
+++ b/pkgs/development/python-modules/pytrydan/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dgomes";
     repo = "pytrydan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OHC+Ul64BYCsgoFDxI1hPjBGkd/pQ0j0c9Pt5lWg1E0=";
   };
 
diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index 343bcca0a965..40f2b6163b79 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JuanBindez";
     repo = "pytubefix";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FbmVQ+nt/WEwE5vRMo2610TO463CT8nCseqB30uXjSM=";
   };
 
diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix
index eb08b2e9873e..d91e446e5d7a 100644
--- a/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lilohuang";
     repo = "PyTurboJPEG";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JPjGZGVMZH6sDNRdV6kWsCpEjLT2aMrTy+bI4mRbdpw=";
   };
 
diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix
index fd63b2bf10ed..a3cf57ca2ebb 100644
--- a/pkgs/development/python-modules/pyu2f/default.nix
+++ b/pkgs/development/python-modules/pyu2f/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v";
   };
 
diff --git a/pkgs/development/python-modules/pyunpack/default.nix b/pkgs/development/python-modules/pyunpack/default.nix
index 4c3c56c7ed53..81319bbfb33b 100644
--- a/pkgs/development/python-modules/pyunpack/default.nix
+++ b/pkgs/development/python-modules/pyunpack/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ponty";
     repo = "pyunpack";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1MAdiX6+u35f6S8a0ZcIIebZE8bbxTy+0TnMohJ7J6s=";
   };
 
diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix
index 918be59eaddf..ad4a805bf90d 100644
--- a/pkgs/development/python-modules/pyuptimerobot/default.nix
+++ b/pkgs/development/python-modules/pyuptimerobot/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hy/hmXxxEb44X8JUszoA1YF/41y7GkQqC4uS+Pax6WA=";
   };
 
diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 8a428bce2e09..dbcdadc33f2e 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "pyvips";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U=";
   };
 
diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix
index ae152c2286ac..79b82c9cb040 100644
--- a/pkgs/development/python-modules/pyvis/default.nix
+++ b/pkgs/development/python-modules/pyvis/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "WestHealth";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E=";
   };
 
diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix
index aec66ed08f4a..f432fa6c1112 100644
--- a/pkgs/development/python-modules/pyvisa-py/default.nix
+++ b/pkgs/development/python-modules/pyvisa-py/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyvisa";
     repo = "pyvisa-py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-UFAKLrZ1ZrTmFXwVuyTCPVo3Y1YIDOvkx5krpsz71BM=";
   };
 
diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix
index c70ec5302ff1..3a7fea7b051f 100644
--- a/pkgs/development/python-modules/pyvisa/default.nix
+++ b/pkgs/development/python-modules/pyvisa/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyvisa";
     repo = "pyvisa";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GKrgUK2nSZi+8oJoS45MjpU9+INEgcla9Kaw6ceNVp0=";
   };
 
diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index 43e506c62dfc..7075dff34b69 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZQfI0lmh/cwE224yk6a2G3gLUCsBjCQqPI1y4zYj0FI=";
   };
 
diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix
index 4b863cedb242..9a746bb96d1e 100644
--- a/pkgs/development/python-modules/pyvlx/default.nix
+++ b/pkgs/development/python-modules/pyvlx/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Julius2342";
     repo = "pyvlx";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JwgElt0FFSGs3v+04AKPwTTpxvn8YzihJeD/+llbSMI=";
   };
 
diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index 80a8f5832a10..ffc1402bc366 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vmware";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0=";
   };
 
diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix
index 04b7ebbe06f4..36ab393c2f6d 100644
--- a/pkgs/development/python-modules/pywaterkotte/default.nix
+++ b/pkgs/development/python-modules/pywaterkotte/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chboland";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zK0x6LyXPPNPA20Zq+S1B1q7ZWGxQmWf4JxEfjNkPQw=";
   };
 
diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
index ba81da659d5a..14a0a2dc6032 100644
--- a/pkgs/development/python-modules/pywavelets/default.nix
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PyWavelets";
     repo = "pywt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oWAF8YDvb0SdlRzSjG2BNEekBkvR3U6KQ+e2FoIs+tw=";
   };
 
diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix
index 081db245b8c2..298244f84777 100644
--- a/pkgs/development/python-modules/pywaze/default.nix
+++ b/pkgs/development/python-modules/pywaze/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "pywaze";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XE+VdxUjq8KBSIU6rUlBweKEkZD3gqJuy9J4u9JVy7Q=";
   };
 
diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix
index 44d0ab267280..bec42ef78367 100644
--- a/pkgs/development/python-modules/pyweatherflowrest/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "briis";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-l1V3HgzqnnoY6sWHwfgBtcIR782RwKhekY2qOLrUMNY=";
   };
 
diff --git a/pkgs/development/python-modules/pyweatherflowudp/default.nix b/pkgs/development/python-modules/pyweatherflowudp/default.nix
index a39c1d356294..a085cfeec314 100644
--- a/pkgs/development/python-modules/pyweatherflowudp/default.nix
+++ b/pkgs/development/python-modules/pyweatherflowudp/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "briis";
     repo = "pyweatherflowudp";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aTwGFYTtd07BsWFaFc7ns+8oh2AxTUfRFSu81Zv5OoA=";
   };
 
diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index 4734e9522925..c7de9936a248 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pywemo";
     repo = "pywemo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XpCRrCJYHv1so5/aHoGrtkgp3RX1NUKPUawJqK/FaG0=";
   };
 
diff --git a/pkgs/development/python-modules/pywfa/default.nix b/pkgs/development/python-modules/pywfa/default.nix
index e782071aadbd..92d2d45a9aa3 100644
--- a/pkgs/development/python-modules/pywfa/default.nix
+++ b/pkgs/development/python-modules/pywfa/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kcleal";
     repo = "pywfa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TeJ7Jq4LR+I1+zeMeBtHZa9dR+CRJJG5sT99tB227P8=";
   };
 
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python wrapper for wavefront alignment using WFA2-lib";
     homepage = "https://github.com/kcleal/pywfa";
-    changelog = "https://github.com/kcleal/pywfa/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/kcleal/pywfa/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix
index 7fc137cdaf1d..744b5f02b3ea 100644
--- a/pkgs/development/python-modules/pyxbe/default.nix
+++ b/pkgs/development/python-modules/pyxbe/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mborgerson";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iLzGGgizUbaEG1xrNq4WDaWrGtcaLwAYgn4NGYiSDBo=";
   };
 
diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix
index b6f0944cfa5a..1668987bb258 100644
--- a/pkgs/development/python-modules/pyxnat/default.nix
+++ b/pkgs/development/python-modules/pyxnat/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyxnat";
     repo = "pyxnat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-21nTIYbIYlFWNJTxqsuijamqRunpdc7/VBawvrWadWI=";
   };
 
diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix
index 5e14b6cd8482..80b81f6dc9c2 100644
--- a/pkgs/development/python-modules/pyyaml-include/default.nix
+++ b/pkgs/development/python-modules/pyyaml-include/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tanbro";
     repo = "pyyaml-include";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xsNMIEBYqMVQp+H8R7XpFCwROXA8I6bFvAuHrRvC+DI=";
   };
 
diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index f9aafffd0905..141fe5570f5b 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yaml";
     repo = "pyyaml";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IQoZd9Lp0ZHLAQN3PFwMsZVTsIVJyIaT9D6fpkzA8IA=";
   };
 
diff --git a/pkgs/development/python-modules/pyyardian/default.nix b/pkgs/development/python-modules/pyyardian/default.nix
index f0c76c798bc0..3dde9c9798d7 100644
--- a/pkgs/development/python-modules/pyyardian/default.nix
+++ b/pkgs/development/python-modules/pyyardian/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "h3l1o5";
     repo = "pyyardian";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JBb62pFDuVcXIGRc6UOp5/ciUtbGm4XnKZjt1icF/jQ=";
   };
 
diff --git a/pkgs/development/python-modules/pyzabbix/default.nix b/pkgs/development/python-modules/pyzabbix/default.nix
index 1dd570d0660f..aa994c661363 100644
--- a/pkgs/development/python-modules/pyzabbix/default.nix
+++ b/pkgs/development/python-modules/pyzabbix/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lukecyca";
     repo = "pyzabbix";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2yCbxPUlbTrtjD9eKmkw0fKnjiwPzmjIo5vKGv4aerU=";
   };
 
diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix
index 5245b0205f37..b6ae8556f82a 100644
--- a/pkgs/development/python-modules/pyzerproc/default.nix
+++ b/pkgs/development/python-modules/pyzerproc/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "emlove";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vS0sk/KjDhWispZvCuGlmVLLfeFymHqxwNzNqNRhg6k=";
   };
 
diff --git a/pkgs/development/python-modules/pyzipper/default.nix b/pkgs/development/python-modules/pyzipper/default.nix
index e292972d26d4..187fefec61f1 100644
--- a/pkgs/development/python-modules/pyzipper/default.nix
+++ b/pkgs/development/python-modules/pyzipper/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danifus";
     repo = "pyzipper";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+fZXoAUeB/bUI3LrIFlMTktJgn+GNFBiDHvH2Jgo0pg=";
   };
 
diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix
index 27371dc2bbd6..b3b52c8fbb5a 100644
--- a/pkgs/development/python-modules/pyzx/default.nix
+++ b/pkgs/development/python-modules/pyzx/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zxcalc";
     repo = "pyzx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4yc4P2v2L/F/A1A9z41ow2KA0aUA+3SJyC+wyMWzhwM=";
   };
 
diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix
index 58451552bd3f..6b5cc55dc2e3 100644
--- a/pkgs/development/python-modules/qasync/default.nix
+++ b/pkgs/development/python-modules/qasync/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CabbageDevelopment";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oXzwilhJ1PhodQpOZjnV9gFuoDy/zXWva9LhhK3T00g=";
   };
 
diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
index d6bd8c809582..ce0328f6f2e0 100644
--- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
+++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "QCoDeS";
     repo = "Qcodes_contrib_drivers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY=";
   };
 
diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index 864fce11cb15..f2528a213b08 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "Qcodes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oNJVOz2FMMhUkYIajeWwRmHzLcXu5qTSQzjk0gciOnE=";
   };
 
diff --git a/pkgs/development/python-modules/qcs-api-client-common/default.nix b/pkgs/development/python-modules/qcs-api-client-common/default.nix
index fc0a04a74ba0..b1ee9d8dc960 100644
--- a/pkgs/development/python-modules/qcs-api-client-common/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client-common/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rigetti";
     repo = "qcs-api-client-rust";
-    rev = "refs/tags/common/v${version}";
+    tag = "common/v${version}";
     hash = "sha256-WXTqzdbBZmBj/+mVK/watOuaq/WqKtaMVhp+ogjmhqM=";
   };
 
diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index e4e658dd2800..69a37b8b0471 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rigetti";
     repo = "qcs-api-client-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fVUvAXtZcMWBBK0wdGJA0oIneCNKI4GI2qNIc30HU9M=";
   };
 
diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix
index abab537c6d4c..ada8ef51f709 100644
--- a/pkgs/development/python-modules/qdrant-client/default.nix
+++ b/pkgs/development/python-modules/qdrant-client/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "qdrant-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rElbGIXnhkHaAvtneEMhyyhySFlT4UT/vhhIlRD3xT0=";
   };
 
diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix
index 6ee88b655f6f..d12bd8a332c1 100644
--- a/pkgs/development/python-modules/qingping-ble/default.nix
+++ b/pkgs/development/python-modules/qingping-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "qingping-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5w3KGJLdHFv6kURKTz3YImZNjaETiVqbbJTJpBSLSo8=";
   };
 
diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix
index 16fe955ef838..b5399d896844 100644
--- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix
+++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pawelzny";
     repo = "dotty_dict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc=";
   };
 
diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix
index 88f892c42e36..2cfa9edc6593 100644
--- a/pkgs/development/python-modules/qnapstats/default.nix
+++ b/pkgs/development/python-modules/qnapstats/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "colinodell";
     repo = "python-qnapstats";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dpxl6a61h8zB7eS/2lxG+2//bOTzV6s4T1W+DVj0fnI=";
   };
 
diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix
index 66d3ebb0da7c..f1b7a77e6367 100644
--- a/pkgs/development/python-modules/qpsolvers/default.nix
+++ b/pkgs/development/python-modules/qpsolvers/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "qpsolvers";
     repo = "qpsolvers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/yIFLxy2gjEFg/J9A5pcbrVmq4A3Tz2efEAntH0Twk8=";
   };
 
diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix
index ab9c3032d047..9ebd77a7e62c 100644
--- a/pkgs/development/python-modules/qstylizer/default.nix
+++ b/pkgs/development/python-modules/qstylizer/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blambright";
     repo = "qstylizer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eZVBUGQxa2cr0O48iKWNTqM9E5ZAsiT1WfXjdYdxIdg=";
   };
 
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 0b7c60d3f414..f0f83f8b3291 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spyder-ide";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dF77vkrEl671fQvsHAX+JY9OmLA29kgAVswY2b3UyTg=";
   };
 
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index fcda25cc9ff2..e42dc5102698 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jupyter";
     repo = "qtconsole";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-esCt7UQ0va/FJ0gdSrcc/k/FgyBVqKy7ttrN6E6mx+E=";
   };
 
diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix
index 6157a058dee9..a7ac00187a39 100644
--- a/pkgs/development/python-modules/qtile-extras/default.nix
+++ b/pkgs/development/python-modules/qtile-extras/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "elParaguayo";
     repo = "qtile-extras";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QkcLts2cqhA49/L9nuekf0n+ZRBxKdGL9Ql1sgtyTiw=";
   };
 
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index dc437906d953..160109e18238 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EqrvBXigMjevPERTcz3EXSRaZP2xSEsOxjuiJ/5QOz0=";
   };
 
diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix
index e8ada185d51a..0fa7aad7a920 100644
--- a/pkgs/development/python-modules/qualysclient/default.nix
+++ b/pkgs/development/python-modules/qualysclient/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "woodtechie1428";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0=";
   };
 
diff --git a/pkgs/development/python-modules/quantile-forest/default.nix b/pkgs/development/python-modules/quantile-forest/default.nix
index 78c90591e595..8861ac8de900 100644
--- a/pkgs/development/python-modules/quantile-forest/default.nix
+++ b/pkgs/development/python-modules/quantile-forest/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zillow";
     repo = "quantile-forest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0gdXjr+mRInZtvmgH1vRjLCkXZmTn1zWmD3E1ass9hQ=";
   };
 
diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix
index 66026ad8eafb..fe34f20abef6 100644
--- a/pkgs/development/python-modules/quantiphy/default.nix
+++ b/pkgs/development/python-modules/quantiphy/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "quantiphy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QXCs93plNSVNiCLEoXx2raH6EbH1rXyjvpBfl+8eXjc=";
   };
 
diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index c1c1b8f8e303..05b97478adf7 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-quantities";
     repo = "python-quantities";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gXxUmuhFAqHVj8jqWt8Ed2M6UvnPxku6hr/yJoa3nXE=";
   };
 
diff --git a/pkgs/development/python-modules/quart-cors/default.nix b/pkgs/development/python-modules/quart-cors/default.nix
index 9299487aa732..296a2baaf30f 100644
--- a/pkgs/development/python-modules/quart-cors/default.nix
+++ b/pkgs/development/python-modules/quart-cors/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pgjones";
     repo = "quart-cors";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k=";
   };
 
diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix
index 1d589c177400..9d52e15fbb2c 100644
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "quart";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jekbrHpB+7d3IagVUtDYA1VFlWtnE7kPqIm19NB2scA=";
   };
 
diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix
index 0a109427b8ed..c1fdad59ee1d 100644
--- a/pkgs/development/python-modules/quaternion/default.nix
+++ b/pkgs/development/python-modules/quaternion/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moble";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-i+UPi+DrhItplfc6EvDhmr3CEH2/cHODoHVBElM7jY8=";
   };
 
diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix
index 9663e8e1fdd1..e2e5d6495794 100644
--- a/pkgs/development/python-modules/questionary/default.nix
+++ b/pkgs/development/python-modules/questionary/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tmbo";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JY0kXomgiGtOrsXfRf0756dTPVgud91teh+jW+kFNdk=";
   };
 
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 4907fd550759..14fbd3a853d8 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KT5Mk0w6EKTUZzGRnQ6XQPZfH5ZXVuiD+EwSflNqHNo=";
   };
 
diff --git a/pkgs/development/python-modules/rachiopy/default.nix b/pkgs/development/python-modules/rachiopy/default.nix
index 5aa28e517370..7e0761d79e39 100644
--- a/pkgs/development/python-modules/rachiopy/default.nix
+++ b/pkgs/development/python-modules/rachiopy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rfverbruggen";
     repo = "rachiopy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PsdEXNy8vUxba/C00ARhLTQU9gMlChy9XdU20r+Maus=";
   };
 
diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index e42e16f307c2..e47fd1f14b35 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
   };
 
diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix
index ee5d92533524..e4da41a6f6b9 100644
--- a/pkgs/development/python-modules/radios/default.nix
+++ b/pkgs/development/python-modules/radios/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-radios";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GXiLwwjZ/pN3HquzLLWq/2EfhmrJyCXq0sovIGRB3uQ=";
   };
 
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index d32ca821346e..b6d71da5fdc7 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "radish";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VCxqhTr0vHJ14tm/0zw/v9bCOQ2q4rzHv40NVYwI254=";
   };
 
diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix
index 9317045da4de..d9c4512090fd 100644
--- a/pkgs/development/python-modules/rangehttpserver/default.nix
+++ b/pkgs/development/python-modules/rangehttpserver/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danvk";
     repo = "RangeHTTPServer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wvGJ5wHYLb7wJUGgurkdRTABV6kTH7/GXzXgpd0Ypbc=";
   };
 
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 495eff4e4670..e4c8abe035ea 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "RapidFuzz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g=";
   };
 
diff --git a/pkgs/development/python-modules/rapt-ble/default.nix b/pkgs/development/python-modules/rapt-ble/default.nix
index 488d4318278b..5569bbb88003 100644
--- a/pkgs/development/python-modules/rapt-ble/default.nix
+++ b/pkgs/development/python-modules/rapt-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sairon";
     repo = "rapt-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ozZwVgTV/xYl1nXLiybcPs6DQKocNdbxTEYDfYyQuvY=";
   };
 
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index ec0ebf0302ca..1795311b9fbc 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "markokr";
     repo = "rarfile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZiwD2LG25fMd4Z+QWsh/x3ceG5QRBH4s/TZDwMnfpNI=";
   };
 
diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix
index dbeb62305b59..17656e1ea518 100644
--- a/pkgs/development/python-modules/ratarmountcore/default.nix
+++ b/pkgs/development/python-modules/ratarmountcore/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mxmlnkn";
     repo = "ratarmount";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2LPGKdofx2ID8BU0dZhGiZ3tUkd+niEVGvTSBFX4InU=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix
index eaaa13c96cb3..3a6c4d1d9ff2 100644
--- a/pkgs/development/python-modules/raylib-python-cffi/default.nix
+++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "electronstudio";
     repo = "raylib-python-cffi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R/w39zYkoOF5JqHDyqVIdON9yXFo2PeosyEQZOd4aYo=";
   };
 
diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index 785b0218d9f2..2d992abd827a 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y=";
   };
 
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 88c63343203a..e6db799deb10 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RDFLib";
     repo = "rdflib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/jRUV7H6JBWBv/gphjLjjifbEwMSxWke5STqkeSzwoE=";
   };
 
diff --git a/pkgs/development/python-modules/reactivex/default.nix b/pkgs/development/python-modules/reactivex/default.nix
index ab38b8a968b4..ce3fc948ad7c 100644
--- a/pkgs/development/python-modules/reactivex/default.nix
+++ b/pkgs/development/python-modules/reactivex/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ReactiveX";
     repo = "RxPY";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W1qYNbYV6Roz1GJtP/vpoPD6KigWaaQOWe1R5DZHlUw=";
   };
 
diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix
index 862a6428546c..142d7c4bf846 100644
--- a/pkgs/development/python-modules/readabilipy/default.nix
+++ b/pkgs/development/python-modules/readabilipy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "ReadabiliPy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XrmdQjLFYdadWeO5DoKAQeEdta+6T6BqfvGlDkzLMyM=";
   };
 
diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix
index ada2890edd82..5c93e4d13e0d 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/pkgs/development/python-modules/readchar/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "magmax";
     repo = "python-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r+dKGv0a7AU+Ef94AGCCJLQolLqTTxaNmqRQYkxk15s=";
   };
 
diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix
index b60e2b6ebc19..253a44f618ef 100644
--- a/pkgs/development/python-modules/recline/default.nix
+++ b/pkgs/development/python-modules/recline/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NetApp";
     repo = "recline";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";
   };
 
diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix
index 0881bc5c3c05..35fd59c920a1 100644
--- a/pkgs/development/python-modules/reconplogger/default.nix
+++ b/pkgs/development/python-modules/reconplogger/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omni-us";
     repo = "reconplogger";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F/6vT3jLxpteUFtYNtGyiO/JxeRtwJKpdGXTFJ6IDCE=";
   };
 
diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix
index e1224411885e..6646a6fff78f 100644
--- a/pkgs/development/python-modules/recurring-ical-events/default.nix
+++ b/pkgs/development/python-modules/recurring-ical-events/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niccokunzmann";
     repo = "python-recurring-ical-events";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3KlmJJmak3X9adUlcmclnCv9D1Ddr+woFokrinZBYoE=";
   };
 
diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix
index 089e3c72ec16..c5c9c5a238d6 100644
--- a/pkgs/development/python-modules/redis-om/default.nix
+++ b/pkgs/development/python-modules/redis-om/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis-om-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Pp404HaFpYEPie9xknoabotFrqcI2ibDlPTM+MmnMbg=";
   };
 
@@ -85,7 +85,7 @@ buildPythonPackage rec {
     description = "Object mapping, and more, for Redis and Python";
     mainProgram = "migrate";
     homepage = "https://github.com/redis/redis-om-python";
-    changelog = "https://github.com/redis/redis-om-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/redis/redis-om-python/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ natsukium ];
   };
diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix
index 491c60d71306..f04427072774 100644
--- a/pkgs/development/python-modules/reedsolo/default.nix
+++ b/pkgs/development/python-modules/reedsolo/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = "reedsolomon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nzdD1oGXHSeGDD/3PpQQEZYGAwn9ahD2KNYGqpgADh0=";
   };
 
diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix
index 89159a4f80c1..4a879cef4ab5 100644
--- a/pkgs/development/python-modules/referencing/default.nix
+++ b/pkgs/development/python-modules/referencing/default.nix
@@ -23,7 +23,7 @@ let
     src = fetchFromGitHub {
       owner = "python-jsonschema";
       repo = "referencing";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       fetchSubmodules = true;
       hash = "sha256-Ix0cpdOs7CtersdfW9daF/+BEJaV/na1WRTlYywUJV8=";
     };
diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index 866aa775b7f5..1ef521441ed6 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex-chakra";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VMFCaJh7HA/bsOV1ONuPJCzhzpQrcppOnPIcIIpeaSs=";
   };
 
diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index a0b7767fd1bb..3e490de15cb2 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JW1hebcoBMMEirJkJ5Cquh23p9Gv3RU5AxPbXUcwPK4=";
   };
 
@@ -145,7 +145,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Web apps in pure Python";
     homepage = "https://github.com/reflex-dev/reflex";
-    changelog = "https://github.com/reflex-dev/reflex/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/reflex-dev/reflex/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ pbsds ];
     mainProgram = "reflex";
diff --git a/pkgs/development/python-modules/refoss-ha/default.nix b/pkgs/development/python-modules/refoss-ha/default.nix
index 4d6714c14337..3f02a1951a0e 100644
--- a/pkgs/development/python-modules/refoss-ha/default.nix
+++ b/pkgs/development/python-modules/refoss-ha/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ashionky";
     repo = "refoss_ha";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HLPTXE16PizldeURVmoxcRVci12lc1PsCKH+gA1hr8Y=";
   };
 
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 9b24dc91f92f..8a15cd56eba3 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "regenmaschine";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RdmK6oK92j4xqLoAjjqlONYu3IfNNWudo4v7jcc+VGU=";
   };
 
diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index 6f978a397a3a..58b3b2f8034f 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "remarshal";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Fy+K0fM+vjZp8u7C0ElFa1xQM/CIMqFALe42gZRBNOs=";
   };
 
diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix
index a362f99324aa..e33a0276a4b9 100644
--- a/pkgs/development/python-modules/remotezip/default.nix
+++ b/pkgs/development/python-modules/remotezip/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gtsystem";
     repo = "python-remotezip";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TNEM7Dm4iH4Z/P/PAqjJppbn1CKmyi9Xpq/sU9O8uxg=";
   };
 
diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 68d50ce9f33c..f2efb92394c2 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hacf-fr";
     repo = "renault-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j9KF2vqDZqQ35mDW/Qx6uy8H9hwuwBYfdcDXD1Cs7rQ=";
   };
 
diff --git a/pkgs/development/python-modules/reno/default.nix b/pkgs/development/python-modules/reno/default.nix
index 556374be3251..a4a701de9975 100644
--- a/pkgs/development/python-modules/reno/default.nix
+++ b/pkgs/development/python-modules/reno/default.nix
@@ -23,7 +23,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "reno";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-le9JtE0XODlYhTFsrjxFXG/Weshr+FyN4M4S3BMBLUE=";
   };
 
diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix
index 0e1a5d7fb9e6..00f104055187 100644
--- a/pkgs/development/python-modules/renson-endura-delta/default.nix
+++ b/pkgs/development/python-modules/renson-endura-delta/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jimmyd-be";
     repo = "Renson-endura-delta-library";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ndk0qcRUWxUimNHg62UgeYK/MRKQd3e4JQDh9x8vFj8=";
   };
 
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 8453f639d58d..c6bbb2f910c9 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "reolink_aio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QZPv3bdmk3RVLfINegSbSl8SLrjTKYkdJBiK2jRmYlU=";
   };
 
diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix
index c05b83b06dea..ac9ddd35aabd 100644
--- a/pkgs/development/python-modules/reolink/default.nix
+++ b/pkgs/development/python-modules/reolink/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fwestenberg";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I=";
   };
 
diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix
index 06201690ea5e..edb7175db01a 100644
--- a/pkgs/development/python-modules/reorder-python-imports/default.nix
+++ b/pkgs/development/python-modules/reorder-python-imports/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "reorder_python_imports";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N0hWrrUeojlUDZx2Azs/y2kCaknQ62hHdp0J2ZXPElY=";
   };
 
diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix
index 4a5614afe4b8..492de6662f8b 100644
--- a/pkgs/development/python-modules/replicate/default.nix
+++ b/pkgs/development/python-modules/replicate/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "replicate";
     repo = "replicate-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48=";
   };
 
diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix
index 7548fb3c6f84..aa3ab6303cc6 100644
--- a/pkgs/development/python-modules/reqif/default.nix
+++ b/pkgs/development/python-modules/reqif/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "strictdoc-project";
     repo = "reqif";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cQhis7jrcly3cw2LRv7hpPBFAB0Uag69czf+wJvbh/Q=";
   };
 
diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix
index 8e5218dc7dbd..53726bc4423f 100644
--- a/pkgs/development/python-modules/requests-aws4auth/default.nix
+++ b/pkgs/development/python-modules/requests-aws4auth/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tedder";
     repo = "requests-aws4auth";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tRo38fdWqZmutGhWv8Hks+oFaLv770RlAHYgS3S6xJA=";
   };
 
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index c1e5f1fd6c1b..0c95519aab62 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "requests-cache";
     repo = "requests-cache";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-juRCcBUr+Ko6kVPpUapwRbUGqWLKaRiCqppOc3S5FMU=";
   };
 
diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix
index 80c72a0b4614..ce95150ae8f4 100644
--- a/pkgs/development/python-modules/requests-file/default.nix
+++ b/pkgs/development/python-modules/requests-file/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dashea";
     repo = "requests-file";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-JtdtE44yiw2mLMZ0bJv0QiGWb7f8ywPLF7+BUufh/g4=";
   };
 
diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix
index 8c95037aef9a..a7814d9a0126 100644
--- a/pkgs/development/python-modules/requests-ratelimiter/default.nix
+++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JWCook";
     repo = "requests-ratelimiter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DS4BzS8AD4axniyV6jVYXWZ6cQLvMPp8tdGoBhYu51o=";
   };
 
diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix
index 4106b7cbf01f..3a002b62f6cc 100644
--- a/pkgs/development/python-modules/requirements-detector/default.nix
+++ b/pkgs/development/python-modules/requirements-detector/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "landscapeio";
     repo = "requirements-detector";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc=";
   };
 
diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix
index f8658fed6a0b..c58ff3f0f085 100644
--- a/pkgs/development/python-modules/requirements-parser/default.nix
+++ b/pkgs/development/python-modules/requirements-parser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "madpah";
     repo = "requirements-parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-o9IriQXa2Pd7s16IENqcWgi73XZQoXsbXU471V1CFaI=";
   };
 
diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index eb93492e7594..7a4c3cf0dacd 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bmcfee";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LOWpOPAEK+ga7c3bR15QvnHmON6ARS1Qee/7U/VMlTY=";
   };
 
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index c5b24010d3de..0043ad6881a4 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+iRrmRAe8RWcts2LMFvykroQ5sL7+hW6Wrs7Kd1mzBM=";
   };
 
diff --git a/pkgs/development/python-modules/restfly/default.nix b/pkgs/development/python-modules/restfly/default.nix
index 3cdb15c0044d..49be6f87851b 100644
--- a/pkgs/development/python-modules/restfly/default.nix
+++ b/pkgs/development/python-modules/restfly/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stevemcgrath";
     repo = "restfly";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Zdn/hUvAZ9TaAWyDpNiEiA9mYDbWmiXBUa+IV/g8n2M=";
   };
 
diff --git a/pkgs/development/python-modules/retinaface/default.nix b/pkgs/development/python-modules/retinaface/default.nix
index 457ea634d3c5..ba90167166d9 100644
--- a/pkgs/development/python-modules/retinaface/default.nix
+++ b/pkgs/development/python-modules/retinaface/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "serengil";
     repo = "retinaface";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0s1CSGlK2bF1F2V/IuG2ZqD7CkNfHGvp1M5C3zDnuKs=";
   };
 
diff --git a/pkgs/development/python-modules/retry-decorator/default.nix b/pkgs/development/python-modules/retry-decorator/default.nix
index 7d63966c08a0..4482a7b25fac 100644
--- a/pkgs/development/python-modules/retry-decorator/default.nix
+++ b/pkgs/development/python-modules/retry-decorator/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pnpnpn";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M=";
   };
 
diff --git a/pkgs/development/python-modules/retry2/default.nix b/pkgs/development/python-modules/retry2/default.nix
index f0724f472a3c..34494122c1ad 100644
--- a/pkgs/development/python-modules/retry2/default.nix
+++ b/pkgs/development/python-modules/retry2/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eSAMTrade";
     repo = "retry";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RxOEekkmMRl2OQW2scFWbMQiFXcH0sbd+k9R8uul0uY=";
   };
 
diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix
index 2048406fd23f..954fca4a4e2b 100644
--- a/pkgs/development/python-modules/reuse/default.nix
+++ b/pkgs/development/python-modules/reuse/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsfe";
     repo = "reuse-tool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MzI3AY5WLNyCLJZM7Q5wUH3ttx+FHPlSgAfngzOgzec=";
   };
 
diff --git a/pkgs/development/python-modules/rfc8785/default.nix b/pkgs/development/python-modules/rfc8785/default.nix
index 7d3195ee3801..44e6e4176cee 100644
--- a/pkgs/development/python-modules/rfc8785/default.nix
+++ b/pkgs/development/python-modules/rfc8785/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "rfc8785.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0Gze3voFXEhf13DuTuBWDbYPmqHXs0FSRn2NprFWoB8=";
   };
 
diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix
index 4112e826f7e4..728d365e8c98 100644
--- a/pkgs/development/python-modules/rfcat/default.nix
+++ b/pkgs/development/python-modules/rfcat/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "atlas0fd00m";
     repo = "rfcat";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hdRsVbDXRC1EOhBoFJ9T5ZE6hwOgDWSdN5sIpxJ0x3E=";
   };
 
diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix
index e5959e3a9b86..9a99a22adaa8 100644
--- a/pkgs/development/python-modules/rflink/default.nix
+++ b/pkgs/development/python-modules/rflink/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aequitas";
     repo = "python-rflink";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-n6VLa0xX1qewMS7Kv+kiitezWRbRvDJRNuOmA7IV6u0=";
   };
 
diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix
index 061394e5fc3f..fd30096010af 100644
--- a/pkgs/development/python-modules/rich-argparse/default.nix
+++ b/pkgs/development/python-modules/rich-argparse/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hamdanal";
     repo = "rich-argparse";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0=";
   };
 
diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix
index a5b94f5a9504..12c85e474af0 100644
--- a/pkgs/development/python-modules/rich-pixels/default.nix
+++ b/pkgs/development/python-modules/rich-pixels/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darrenburns";
     repo = "rich-pixels";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Sqs0DOyxJBfZmm/SVSTMSmaaeRlusiSp6VBnJjKYjgQ=";
   };
 
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Rich-compatible library for writing pixel images and ASCII art to the terminal";
     homepage = "https://github.com/darrenburns/rich-pixels";
-    changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
   };
diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix
index 277ba67562e8..7291c6f7d82e 100644
--- a/pkgs/development/python-modules/rich-rst/default.nix
+++ b/pkgs/development/python-modules/rich-rst/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wasi-master";
     repo = "rich-rst";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jbzGTEth5Qoc0ORFCS3sZMrGUpoQQOVsd+l3/zMWy20=";
   };
 
diff --git a/pkgs/development/python-modules/rich-theme-manager/default.nix b/pkgs/development/python-modules/rich-theme-manager/default.nix
index f465b77b6ef6..b296713afb19 100644
--- a/pkgs/development/python-modules/rich-theme-manager/default.nix
+++ b/pkgs/development/python-modules/rich-theme-manager/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "rich_theme_manager";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nSNG+lWOPmh66I9EmPvWqbeceY/cu+zBpgVlDTNuHc0=";
   };
 
diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix
index 7ba12b6311d9..0e88baed1a4c 100644
--- a/pkgs/development/python-modules/rich/default.nix
+++ b/pkgs/development/python-modules/rich/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "rich";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Zaop9zR+Sz9lMQjQP1ddJSid5jEmf0tQYuTeLuWNGA8=";
   };
 
diff --git a/pkgs/development/python-modules/riden/default.nix b/pkgs/development/python-modules/riden/default.nix
index 30c89f4e68e4..1574494ba830 100644
--- a/pkgs/development/python-modules/riden/default.nix
+++ b/pkgs/development/python-modules/riden/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geeksville";
     repo = "riden";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uR1CsVsGn/QC4krHaxl6GqRnTPbFdRaqyMEl2RVMHPU=";
   };
 
diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index 22fdd998b8c5..9ee3f8d1acca 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cogeotiff";
     repo = "rio-tiler";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uVLizNkUL7wGF0vFjPXb2iW9ILVkJcbDssXtp3E8ubE=";
   };
 
diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix
index 2346f966e4b8..79130dea6410 100644
--- a/pkgs/development/python-modules/rioxarray/default.nix
+++ b/pkgs/development/python-modules/rioxarray/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "corteva";
     repo = "rioxarray";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0YsGu8JuYrb6lWuC3RQ4jCkulxxFpnd0eaRajCwtFHo=";
   };
 
diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
index 8507883ff81e..ff8a9acd45d4 100644
--- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RIPE-NCC";
     repo = "ripe-atlas-cousteau";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z8ZXOiCVYughrbmXfnwtks7NPmYpII2BA0+8mr1cdSQ=";
   };
 
diff --git a/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix
index 8debd6ea4657..a47cc8172b69 100644
--- a/pkgs/development/python-modules/riscof/default.nix
+++ b/pkgs/development/python-modules/riscof/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "riscv-software-src";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY=";
   };
 
diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix
index a159476538bb..d3c134b4f45c 100644
--- a/pkgs/development/python-modules/riscv-config/default.nix
+++ b/pkgs/development/python-modules/riscv-config/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "riscv-software-src";
     repo = "riscv-config";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-eaHi6ezgU8gQYH97gCS2TzEzIP3F4zfn7uiA/To2Gmc=";
   };
 
diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix
index 5c6e305715ee..0353b0d59870 100644
--- a/pkgs/development/python-modules/riscv-isac/default.nix
+++ b/pkgs/development/python-modules/riscv-isac/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "riscv-software-src";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7CWUyYwzynFq/Qk5SzQB+ljsVVI98kPPDT63Emhqihw=";
   };
 
diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix
index 49b38e2e3426..204e71ace948 100644
--- a/pkgs/development/python-modules/rising/default.nix
+++ b/pkgs/development/python-modules/rising/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PhoenixDL";
     repo = "rising";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sBzVTst5Tp2oZZ+Xsg3M7uAMbucL6idlpYwHvib3EaY=";
   };
 
diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix
index f7e91699b9b2..beeeb3c4c5f7 100644
--- a/pkgs/development/python-modules/rki-covid-parser/default.nix
+++ b/pkgs/development/python-modules/rki-covid-parser/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thebino";
     repo = "rki-covid-parser";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc=";
   };
 
diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix
index 9fa267fa4b7d..7e06e06bc3b7 100644
--- a/pkgs/development/python-modules/rkm-codes/default.nix
+++ b/pkgs/development/python-modules/rkm-codes/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "rkm_codes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CkLLZuWcNL8sqAupc7lHXu0DXUXrX3qwd1g/ekyHdw4=";
   };
 
diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix
index 977db6b748ec..9cd994e00d47 100644
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "rlax";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v2Lbzya+E9d7tlUVlQQa4fuPp2q3E309Qvyt70mcdb0=";
   };
 
diff --git a/pkgs/development/python-modules/rlcard/default.nix b/pkgs/development/python-modules/rlcard/default.nix
index e80a46e301a0..f6333964b3de 100644
--- a/pkgs/development/python-modules/rlcard/default.nix
+++ b/pkgs/development/python-modules/rlcard/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "datamllab";
     repo = "rlcard";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SWj6DBItQzSM+nioV54a350Li7tbBaVXsQxNAqVgB0k=";
   };
 
diff --git a/pkgs/development/python-modules/rmscene/default.nix b/pkgs/development/python-modules/rmscene/default.nix
index 4a5bc6dee858..10a6a6293a20 100644
--- a/pkgs/development/python-modules/rmscene/default.nix
+++ b/pkgs/development/python-modules/rmscene/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ricklupton";
     repo = "rmscene";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mgEjGfoQW73DcwMEXflR3/Ole4c5uXZJVJ699KNSqKg=";
   };
 
diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 7648edf522a0..abc7c4284a8f 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Vsh5C0IlOz8/Jw0ya1bOGsNiBQTXJwTWUBcDFs5Zp+0=";
   };
 
diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
index fa0b02658d20..34a0e3c0a3ab 100644
--- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MarketSquare";
     repo = "Robotframework-Database-Library";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WTcB1jEfBm8tOuQgsGUhYD4FDqpEEKA4UOmbHS/hac0=";
   };
 
diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix
index 0a24bb1ca9df..88216d9c67f1 100644
--- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix
+++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotframework";
     repo = "PythonLibCore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5RUi65+DljCqWoB8vZxc0hyIefEFOWuKluplXrD0SkI=";
   };
 
diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix
index 38080bd66615..acdca91e53aa 100644
--- a/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MarketSquare";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NRhf3delcqUw9vWRPL6pJzpcmRMDou2pHmUHMstF8hw=";
   };
 
diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index c32adc8dc309..e131a561fd29 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotframework";
     repo = "SeleniumLibrary";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-ULY0FH1RFQIlhS45LU3vUKi6urZJHiDgi6NdqU5tV2g=";
   };
 
diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
index a20d602ebbd2..618499682282 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotframework";
     repo = "robotframework";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AJMJb8FN+KynxJXI7s7PwyM/+UpXCtWTcRK/fhCg+io=";
   };
 
diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix
index 927dcf59c216..95efb791fe19 100644
--- a/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robotframework";
     repo = "statuschecker";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yW6353gDwo/IzoWOB8oelaS6IUbvTtwwDT05yD7w6UA=";
   };
 
diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix
index f8cec672c27a..2578ea13531c 100644
--- a/pkgs/development/python-modules/rokuecp/default.nix
+++ b/pkgs/development/python-modules/rokuecp/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ctalkington";
     repo = "python-rokuecp";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GotVSRSMdbAtDmVEXNizf5Pf/02sva1R/6ULL6h7ciY=";
   };
 
diff --git a/pkgs/development/python-modules/roma/default.nix b/pkgs/development/python-modules/roma/default.nix
index f1890cfe8624..f728bb872c39 100644
--- a/pkgs/development/python-modules/roma/default.nix
+++ b/pkgs/development/python-modules/roma/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "naver";
     repo = "roma";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DuQjnHoZKQF/xnFMYb0OXhycsRcK4oHoocq6o+NoGRs=";
   };
 
diff --git a/pkgs/development/python-modules/romy/default.nix b/pkgs/development/python-modules/romy/default.nix
index 32b8e9fbebc4..c5f44188ce17 100644
--- a/pkgs/development/python-modules/romy/default.nix
+++ b/pkgs/development/python-modules/romy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xeniter";
     repo = "romy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pQI+/1xt1YE+L5CHsurkBr2dKMGR/dV5vrGHYM8wNGs=";
   };
 
diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix
index 192880df1051..9c102089cd6b 100644
--- a/pkgs/development/python-modules/roombapy/default.nix
+++ b/pkgs/development/python-modules/roombapy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pschmitt";
     repo = "roombapy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-plmdGVfrkdz7pyyAztzZKlDpUjKxBIRtDVeBXoqaB5s=";
   };
 
diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index d3a1408149f7..3fab182d75f3 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-rope";
     repo = "rope";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-g/fta5gW/xPs3VaVuLtikfLhqCKyy1AKRnOcOXjQ8bA=";
   };
 
diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix
index eba60378a796..cc07ee0c04ef 100644
--- a/pkgs/development/python-modules/ropgadget/default.nix
+++ b/pkgs/development/python-modules/ropgadget/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JonathanSalwan";
     repo = "ROPgadget";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-n7nVtR2HMAZeeSX/hNtDzmpEsnHbgDNO5gdzmPrgSuk=";
   };
 
diff --git a/pkgs/development/python-modules/routeros-api/default.nix b/pkgs/development/python-modules/routeros-api/default.nix
index 2d6208ce27b1..99bc0d1e4e0b 100644
--- a/pkgs/development/python-modules/routeros-api/default.nix
+++ b/pkgs/development/python-modules/routeros-api/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "socialwifi";
     repo = "routeros-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6IpoByG3YhHh2dPS18ufaoI1vzTZBsZa9WNHS/fImrg=";
   };
 
diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix
index a127bfffaef4..59dc3882943c 100644
--- a/pkgs/development/python-modules/rova/default.nix
+++ b/pkgs/development/python-modules/rova/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GidoHakvoort";
     repo = "rova";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y73Vf/E2xDy+2vnvZEllRUgsDfX33Q7AsL/UY2pR1sI=";
   };
 
diff --git a/pkgs/development/python-modules/rpcq/default.nix b/pkgs/development/python-modules/rpcq/default.nix
index 63b90d423dd0..19bd05550ca5 100644
--- a/pkgs/development/python-modules/rpcq/default.nix
+++ b/pkgs/development/python-modules/rpcq/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rigetti";
     repo = "rpcq";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J7jtGXJIF3jp0a0IQZmSR4TWf9D02Luau+Bupmi/d68=";
   };
 
diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index 4035fd5e9e1c..f01e406a2357 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = "rpyc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZYGOwg2IJtVVxHV2hC3inliTLP4BBFOnOz7VPhRpcgg=";
   };
 
diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 313680149247..0774d4e05925 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8uhCV4aJNbY273jOa9D5OlgEG1w3hXVncClKQTO9Pyk=";
   };
 
diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix
index 971e0b12cfd1..574fee0b5ed1 100644
--- a/pkgs/development/python-modules/rstcheck-core/default.nix
+++ b/pkgs/development/python-modules/rstcheck-core/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rstcheck";
     repo = "rstcheck-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PiQMk0lIv24S6qXMYIQR+SkSji+WA30ivWs2uPQwf2A=";
   };
 
diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix
index 206f9192d92a..96c5bcea3ecc 100644
--- a/pkgs/development/python-modules/rstcheck/default.nix
+++ b/pkgs/development/python-modules/rstcheck/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rstcheck";
     repo = "rstcheck";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CB8UtYAJpPrUOGgHOIp9Ts0GaID6GdtKHWD/ihxRoNg=";
   };
 
diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix
index 6c8be8f8f5b7..f4562b0f3581 100644
--- a/pkgs/development/python-modules/rtfde/default.nix
+++ b/pkgs/development/python-modules/rtfde/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "seamustuohy";
     repo = "RTFDE";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zmcf9wqlKz55dOIchUC9sgW0PcTCPc52IkbIonOFlmU=";
   };
 
diff --git a/pkgs/development/python-modules/rtfunicode/default.nix b/pkgs/development/python-modules/rtfunicode/default.nix
index 07d7ecc2ea8c..30a64107ed90 100644
--- a/pkgs/development/python-modules/rtfunicode/default.nix
+++ b/pkgs/development/python-modules/rtfunicode/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mjpieters";
     repo = "rtfunicode";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5lmiazxiEENpdqzVgoKQoG2OW/w5nGmC8odulo2XaLo=";
   };
 
diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix
index a93caf9aab83..d2a83c7260ec 100644
--- a/pkgs/development/python-modules/rtmixer/default.nix
+++ b/pkgs/development/python-modules/rtmixer/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spatialaudio";
     repo = "python-rtmixer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-K5w6XWnDdA5HrzDOMhqinlxrg/09AF6c5CWZEsfVHb4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix
index 382998464285..87f14d64a84c 100644
--- a/pkgs/development/python-modules/rtree/default.nix
+++ b/pkgs/development/python-modules/rtree/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Toblerity";
     repo = "rtree";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yuSPRb8SRz+FRmwFCKDx+gtp9IWaneQ84jDuZP7TX0A=";
   };
 
diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix
index d4643c8839c1..9e7378d1ed8e 100644
--- a/pkgs/development/python-modules/rtslib/default.nix
+++ b/pkgs/development/python-modules/rtslib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "${pname}-fb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z9fpSVyv96ZoJaP0ch2A3bX/o/K23ooEpxa/OAhY6Z4=";
   };
 
diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix
index 5686b12f4492..b889b4826a16 100644
--- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix
+++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "rtsp-to-webrtc-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs=";
   };
 
diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix
index eb4e1234a57b..c21db1e63863 100644
--- a/pkgs/development/python-modules/ruff-api/default.nix
+++ b/pkgs/development/python-modules/ruff-api/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amyreese";
     repo = "ruff-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1XULyxu3XujhAcFnvqI5zMiXOc0axx1LS4EevjhoGDc=";
   };
 
diff --git a/pkgs/development/python-modules/rules/default.nix b/pkgs/development/python-modules/rules/default.nix
index 81af412a75d6..9e9235c3a6e9 100644
--- a/pkgs/development/python-modules/rules/default.nix
+++ b/pkgs/development/python-modules/rules/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dfunckt";
     repo = "django-rules";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8Kay2b2uwaI/ml/cPpcj9svoDQI0ptV8tyGeZ76SgZw=";
   };
 
diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix
index 3727519c563f..990d4df699ac 100644
--- a/pkgs/development/python-modules/ruuvitag-ble/default.nix
+++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "ruuvitag-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-J+807p2mE+VZ0oqldFtjdcNGsRTkAU54s6byQSGrng4=";
   };
 
diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix
index 0bcd0dd7a71d..3e7edbb6e8a1 100644
--- a/pkgs/development/python-modules/ruyaml/default.nix
+++ b/pkgs/development/python-modules/ruyaml/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycontribs";
     repo = "ruyaml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A37L/voBrn2aZ7xT8+bWdZJxbWRjnxbstQtSyUeN1sA=";
   };
 
diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix
index 4d7755894aa6..8a3fccd1e1d8 100644
--- a/pkgs/development/python-modules/s3-credentials/default.nix
+++ b/pkgs/development/python-modules/s3-credentials/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "s3-credentials";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TuGrKSfnn0CSMpRxdCM6C446z+y9d2ZLB7+wSCxSqP4=";
   };
 
diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix
index 3ac85beed894..97aac3a17bfe 100644
--- a/pkgs/development/python-modules/s3transfer/default.nix
+++ b/pkgs/development/python-modules/s3transfer/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "boto";
     repo = "s3transfer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-EHNkYviafnuU8AADp9oyaDuAnoPOdOVNSLCcoONnHPY=";
   };
 
diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix
index 50a3a5d998b7..602d635a2fe6 100644
--- a/pkgs/development/python-modules/sacrebleu/default.nix
+++ b/pkgs/development/python-modules/sacrebleu/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "mjpost";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-evSBHvDFOJlE2f9uM+NNCQeABY5lCc3Rs9dq11n7v5c=";
   };
 
diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index b3acfb3834bd..092c22518158 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyupio";
     repo = "safety";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pE1J2hoV4glB1PisDrhCE/4m0J1gEHz/Tp/GJE83lBc=";
   };
 
diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 262f1ff3673f..720afdbec844 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6r8roHMJ4s/+mGiPeMVZ9wagdXNJQ3+tUFZ/7T+NQBc=";
   };
 
diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
index 152ef3b78eb3..dd9cb7efebcd 100644
--- a/pkgs/development/python-modules/sagemaker-mlflow/default.nix
+++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-mlflow";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1bonIqZ+cFxCOxoFWn1MLBOIiB1wUX69/lUTPPupJaw=";
   };
 
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 6f437dd9f219..97213af88545 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6kGxmgkR/1ih2V49C9aEUBBCJS6s1Jbev80FDnJtHFg=";
   };
 
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index 72df3f89e3b9..4cf32f46c4d4 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "moggers87";
     repo = "salmon";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ysBO/ridfy7YPoTsVwAxar9UvfM/qxrx2dp0EtDNLvE=";
   };
 
diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix
index fc91e1480bda..c939ea938d2c 100644
--- a/pkgs/development/python-modules/samarium/default.nix
+++ b/pkgs/development/python-modules/samarium/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samarium-lang";
     repo = "samarium";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk=";
   };
 
diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix
index cfeface653ca..976c7c292b62 100644
--- a/pkgs/development/python-modules/samplerate/default.nix
+++ b/pkgs/development/python-modules/samplerate/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tuxu";
     repo = "python-samplerate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/9NFJcn8R0DFjVhFAIYOtzZM90hjVIfsVXFlS0nHNhA=";
   };
 
diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index ee6bdbf1ef50..aac1c72487b5 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xchwarze";
     repo = "samsung-tv-ws-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CU59Kg8kSEE71x6wifCKCaVFdaMftodtkrAOpD+qvWY=";
   };
 
diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix
index c542076886d5..ad8ee48f3861 100644
--- a/pkgs/development/python-modules/sanic-routing/default.nix
+++ b/pkgs/development/python-modules/sanic-routing/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanic-org";
     repo = "sanic-routing";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IUubPd6mqtCfY4ruI/8wkFcAcS0xXHWbe9RzDac5kRc=";
   };
 
diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix
index c326c76e0f5b..9a34d37db049 100644
--- a/pkgs/development/python-modules/sanic-testing/default.nix
+++ b/pkgs/development/python-modules/sanic-testing/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanic-org";
     repo = "sanic-testing";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-biUgxa0sINHAYzyKimVD8+/mPUq2dlnCl2BN+UeUaEo=";
   };
 
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 05cdff616166..07c269ee2b97 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanic-org";
     repo = "sanic";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-AviYqdr+r5ya4mFJKGUatBsaMMmCQGqE3YtDJwTuaY0=";
   };
 
diff --git a/pkgs/development/python-modules/sanix/default.nix b/pkgs/development/python-modules/sanix/default.nix
index 8f807fdd4ae2..fd5636e28e73 100644
--- a/pkgs/development/python-modules/sanix/default.nix
+++ b/pkgs/development/python-modules/sanix/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomaszsluszniak";
     repo = "sanix_py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D2w3hmL8ym63liWOYdZS4ry3lJ0utbbYGagWoOTT1TQ=";
   };
 
diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index 5443545d5af5..80f3509009f3 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SasView";
     repo = "sasmodels";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fa6/13z11AuTRItZOEmTbjpU1aT6Ur7evi6UvVvXQck=";
   };
 
diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 5ab37196fcd6..f1d41aa69c71 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "secdev";
     repo = "scapy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m2L30aEpPp9cfW652yd+0wFkNlMij6FF1RzWZbwJ79A=";
   };
 
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index c3242812ac00..736c77f9c133 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "schema_salad";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DUBrKBFphOa5hbEtsLVSI186TrhCkiNPtqlA61MENx0=";
   };
 
diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index afba3e93ddbd..2b5057e47e0d 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-bio";
     repo = "scikit-bio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1L3AemXVqfgBDlRZorG7+8qt3f1Bm8L+Se+OwqEWwI4=";
   };
 
diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
index 64dc8a69aa37..75537af44715 100644
--- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix
+++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "scikit-hep-testdata";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FIv3yC5Q3H1RXl0n32YH1UqaZiMuWHNcMPTSKLN+IkA=";
   };
 
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 0a65e71c39e0..6c43b5380b92 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -43,7 +43,7 @@ let
     src = fetchFromGitHub {
       owner = "scikit-image";
       repo = "scikit-image";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-zhW7P2ss7n9LXRXiBMsifxCGGKXgZFbGLl3K4u4xzfE=";
     };
 
@@ -160,7 +160,7 @@ let
     meta = {
       description = "Image processing routines for SciPy";
       homepage = "https://scikit-image.org";
-      changelog = "https://github.com/scikit-image/scikit-image/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+      changelog = "https://github.com/scikit-image/scikit-image/releases/tag/v${version}";
       license = lib.licenses.bsd3;
       maintainers = with lib.maintainers; [ yl3dy ];
     };
diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix
index a7472648fd17..3c37f61c0b53 100644
--- a/pkgs/development/python-modules/scikit-learn-extra/default.nix
+++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-learn-contrib";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-dHOwo6NIuhcvIehpuJQ621JEg5O3mnXycAhpTZKaxns=";
   };
 
diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix
index cf6ff0ad5474..4fd972b25995 100644
--- a/pkgs/development/python-modules/scikit-misc/default.nix
+++ b/pkgs/development/python-modules/scikit-misc/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "scikit-misc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-w6RHmVxJjLx9ov2LxXvicxmY8jixfkIRfbfVnV2yhOU=";
   };
 
diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index eb7035189644..4e391874a85d 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sebp";
     repo = "scikit-survival";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6902chXALa73/kTJ5UwV4CrB7/7wn+QXKpp2ej/Dnk8=";
   };
 
diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix
index fcdb7a495bc5..ea4be734701c 100644
--- a/pkgs/development/python-modules/scikit-tda/default.nix
+++ b/pkgs/development/python-modules/scikit-tda/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-tda";
     repo = "scikit-tda";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-sf7UxCFJZlIMGOgNFwoh/30U7xsBCZuJ3eumsjEelMc=";
   };
 
diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix
index 0929e65510b2..fd3f8418f48f 100644
--- a/pkgs/development/python-modules/scim2-filter-parser/default.nix
+++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "15five";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KmtOtI/5HT0lVwvXQFTlEwMeptoa4cA5hTSgSULxhIc=";
   };
 
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 31a9010c3b29..ad7b85eb7170 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -78,7 +78,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "scipy";
     repo = "scipy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = srcHash;
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index cb8bab773c45..94a41d93c613 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "scmrepo";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HrJraiETYC7U2IB9ykjGUOg3khA4lBIH18r7btvXRH8=";
   };
 
diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index 90be3a653872..3ef6b0bb6fb5 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "banesullivan";
     repo = "scooby";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KXhLN8KPz61l+4v88+kVSvodT6OXDJ3Pw9A9aFWSqYE=";
   };
 
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 010481da31e8..72d80fe80c23 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scrapy";
     repo = "scrapy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ=";
   };
 
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index 9f1a6c3a6e24..b90be59b6d66 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rr-";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA=";
   };
 
diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix
index 1b2a68910955..9db0602eec8e 100644
--- a/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dieselrabbit";
     repo = "screenlogicpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-z6cM0sihZvOHCA3v1DYQEev0axf4AcqEW13WA1EMhQM=";
   };
 
diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
index e311b2f2f25f..0a738bd584ea 100644
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bodono";
     repo = "scs-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZhY4h0C8aF3IjD9NMtevcNTSqX+tIUao9bC+WlP+uDk=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix
index a69a2b6b27c9..ec1aa7461196 100644
--- a/pkgs/development/python-modules/sdds/default.nix
+++ b/pkgs/development/python-modules/sdds/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pylhc";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h1gEqzmKCUr8+w3Fv8lv35/0itZwela//AQsD3u0UJA=";
   };
 
diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index bfb17ca01015..5e6b137c3d50 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwaskom";
     repo = "seaborn";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY=";
   };
 
diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index 8ea5a67932fe..50d6846a902b 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ap--";
     repo = "python-seabreeze";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NzZ+ZRfJ97Ufp6hmqN6ziBFfdvJXpmWwh9A66od/8Hc=";
     leaveDotGit = true;
   };
diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix
index a1a8bc36b311..1b685f8078a8 100644
--- a/pkgs/development/python-modules/seatconnect/default.nix
+++ b/pkgs/development/python-modules/seatconnect/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "farfar";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ=";
   };
 
diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix
index 9607ad4ab5ba..9571731418ea 100644
--- a/pkgs/development/python-modules/sectools/default.nix
+++ b/pkgs/development/python-modules/sectools/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p0dalirius";
     repo = "sectools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-k3k1/DFmv0resnsNht/C+2Xh6qbSQmk83eN/3vtDU00=";
   };
 
diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix
index d4b29be0ffb4..bff47b927649 100644
--- a/pkgs/development/python-modules/securesystemslib/default.nix
+++ b/pkgs/development/python-modules/securesystemslib/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "secure-systems-lab";
     repo = "securesystemslib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HAYsmsW5GKLmfq9FVVsME+tE7Qg0jx9YIWw1UQWwV2c=";
   };
 
diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix
index ea944a5bbe71..4ead74fdbf87 100644
--- a/pkgs/development/python-modules/securetar/default.nix
+++ b/pkgs/development/python-modules/securetar/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pvizeli";
     repo = "securetar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-h0GubDuwINDNfDxBVJv74yu/OnzMasq5f0lPoIrNNCA=";
   };
 
diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix
index 5297d28fb81a..6397909880a1 100644
--- a/pkgs/development/python-modules/securityreporter/default.nix
+++ b/pkgs/development/python-modules/securityreporter/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dongit-org";
     repo = "python-reporter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM=";
   };
 
diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix
index f0c1f25d1340..5a2891df8e07 100644
--- a/pkgs/development/python-modules/seedir/default.nix
+++ b/pkgs/development/python-modules/seedir/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "earnestt1234";
     repo = "seedir";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ilL2KKN5sJclVcStO/kZoacsPoMgcFW1/8M/PQjxw/U=";
   };
 
diff --git a/pkgs/development/python-modules/segno/default.nix b/pkgs/development/python-modules/segno/default.nix
index d87b902458fe..208672eef9a2 100644
--- a/pkgs/development/python-modules/segno/default.nix
+++ b/pkgs/development/python-modules/segno/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "heuer";
     repo = "segno";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5CDrQhbgUydz1ORp4ktZwhcgbJxQq1snKIAA0v4mZ00=";
   };
 
diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix
index 574354ea44a0..6e516d2d92d4 100644
--- a/pkgs/development/python-modules/segyio/default.nix
+++ b/pkgs/development/python-modules/segyio/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "equinor";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+N2JvHBxpdbysn4noY/9LZ4npoQ9143iFEzaxoafnms=";
   };
 
diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix
index b301c953bb71..5c4fb3102940 100644
--- a/pkgs/development/python-modules/selenium-wire/default.nix
+++ b/pkgs/development/python-modules/selenium-wire/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wkeeling";
     repo = "selenium-wire";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KgaDxHS0dAK6CT53L1qqx1aORMmkeaiXAUtGC82hiIQ=";
   };
 
diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index 05e32bef804b..dc5b0433fa52 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "SeleniumHQ";
     repo = "selenium";
     # check if there is a newer tag with or without -python suffix
-    rev = "refs/tags/selenium-${version}";
+    tag = "selenium-${version}";
     hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY=";
   };
 
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index cb2ed61307b3..abc07f74c167 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-semver";
     repo = "python-semver";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-772PSUq1dqtn9aOol+Bo0S0OItBmoiCNP8q/YCBvKU4=";
   };
 
diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix
index fe777922e226..ef0cef56e59d 100644
--- a/pkgs/development/python-modules/send2trash/default.nix
+++ b/pkgs/development/python-modules/send2trash/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hsoft";
     repo = "send2trash";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3RbKfluKOvl+sGJldtAt2bVfcasVKjCqVxmF6hVwh+Y=";
   };
 
diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix
index e8ce7251b5a2..bed2259662e4 100644
--- a/pkgs/development/python-modules/sendgrid/default.nix
+++ b/pkgs/development/python-modules/sendgrid/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = "sendgrid-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE=";
   };
 
diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix
index f412e8486074..f851a547c16e 100644
--- a/pkgs/development/python-modules/sense-energy/default.nix
+++ b/pkgs/development/python-modules/sense-energy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scottbonline";
     repo = "sense";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WzhLHFOL0DY6DfDxRZlhcXXfiHWAg1jzXHtXBmmbAbQ=";
   };
 
diff --git a/pkgs/development/python-modules/sensirion-ble/default.nix b/pkgs/development/python-modules/sensirion-ble/default.nix
index 17e583d6b0f0..19159e7d734f 100644
--- a/pkgs/development/python-modules/sensirion-ble/default.nix
+++ b/pkgs/development/python-modules/sensirion-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "akx";
     repo = "sensirion-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VeUfrQ/1Hqs9yueUKcv/ZpCDEEy84VDcZpuTT4fXSGw=";
   };
 
diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index 5f76694f3cbe..73454cec0101 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9GdBKUhueis8pnQP5ZNxvEyRXVGINTueVzLOR4xx5mU=";
   };
 
diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix
index edf61cf40ef8..e86fdec69a34 100644
--- a/pkgs/development/python-modules/sensorpro-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpro-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "sensorpro-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY=";
   };
 
diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix
index 2281fdcd60fd..8c5226654a2d 100644
--- a/pkgs/development/python-modules/sensorpush-ble/default.nix
+++ b/pkgs/development/python-modules/sensorpush-ble/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "sensorpush-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-T2sjzQoWWRGAKiMDN29jZ7jZ5/i75qpNCiuVB7VEhJw=";
   };
 
diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 9e604845830d..8abff87c2328 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "UKPLab";
     repo = "sentence-transformers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D8LHzEVHRuayod084B05cL3OvZiO1ByDZLxROGxTD0I=";
   };
 
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index ed57437d22be..820a809ac8d4 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -70,7 +70,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jrApaDZ+R/bMOqOuQZguP9ySt6nKJeJYNpJTNTxq3no=";
   };
 
diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 754ef870f865..a702ab5589c0 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "blockdiag";
     repo = "seqdiag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg=";
   };
 
diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix
index e5cfb9bc6d8c..3ef9e2798b06 100644
--- a/pkgs/development/python-modules/serialio/default.nix
+++ b/pkgs/development/python-modules/serialio/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9TRGT0wpoRRcHqnH1XzlMBh0IcVzdEcOzN7hkeYnoW4=";
   };
 
diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix
index 147c9953bc47..82451b5d8716 100644
--- a/pkgs/development/python-modules/servefile/default.nix
+++ b/pkgs/development/python-modules/servefile/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sebageek";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU=";
   };
 
diff --git a/pkgs/development/python-modules/service-identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix
index 2a6e22a9a4cf..f620568e1fa1 100644
--- a/pkgs/development/python-modules/service-identity/default.nix
+++ b/pkgs/development/python-modules/service-identity/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyca";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ibi9hls/VnVePv4fF2CyxI22P1RX6QpCwyeENWVPkx4=";
   };
 
diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix
index 458d65e9c034..8857565f461b 100644
--- a/pkgs/development/python-modules/setupmeta/default.nix
+++ b/pkgs/development/python-modules/setupmeta/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "codrsquad";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OI7PU5LQ6w0iAbK7nsP+6RizsEWjKP9nec2J6n0xUhI=";
   };
 
diff --git a/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix b/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix
index 59fe9fd4b52c..fbabcd25700a 100644
--- a/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix
+++ b/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fschulze";
     repo = "setuptools-changelog-shortener";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-K8oVcX40K5j2CwQnulK55HykkEXAmOiUg4mZPg5T+YI=";
   };
 
diff --git a/pkgs/development/python-modules/setuptools-generate/default.nix b/pkgs/development/python-modules/setuptools-generate/default.nix
index 261fefab1ea1..db8aa16751e2 100644
--- a/pkgs/development/python-modules/setuptools-generate/default.nix
+++ b/pkgs/development/python-modules/setuptools-generate/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Freed-Wu";
     repo = "setuptools-generate";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xDjxkWy/n0jStI9eLcM6WduyU9vGjtBOmJ86dpXjceQ=";
   };
 
diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix
index 31440a40e5a3..5e93e1b46448 100644
--- a/pkgs/development/python-modules/setuptools-gettext/default.nix
+++ b/pkgs/development/python-modules/setuptools-gettext/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "breezy-team";
     repo = "setuptools-gettext";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-05xKWRxmoI8tnRENuiK3Z3WNMyjgXIX5p3vhzSUeytQ=";
   };
 
diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix
index edc6a72c015f..2173f63bdcfe 100644
--- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix
+++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dolfinus";
     repo = "setuptools-git-versioning";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xugK/JOVA53nCK8bB0gPkhIREmy0+/OthsydfYRCYno=";
   };
 
diff --git a/pkgs/development/python-modules/setuptools-odoo/default.nix b/pkgs/development/python-modules/setuptools-odoo/default.nix
index 9f59ac71afce..7d1152294fec 100644
--- a/pkgs/development/python-modules/setuptools-odoo/default.nix
+++ b/pkgs/development/python-modules/setuptools-odoo/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "acsone";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-38YlkDH/PuJ1yvQ43OYmdnRd1SGJULv6fC/+fitLDJ8=";
   };
 
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 961220f9260f..2105ebaf418f 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "setuptools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kmuKHHzTXZrJyfkFm1EIvH1tv/MF9/p/HQoqHXcJew0=";
   };
 
diff --git a/pkgs/development/python-modules/sev-snp-measure/default.nix b/pkgs/development/python-modules/sev-snp-measure/default.nix
index 886bdf993632..21c0f5f84d79 100644
--- a/pkgs/development/python-modules/sev-snp-measure/default.nix
+++ b/pkgs/development/python-modules/sev-snp-measure/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "virtee";
     repo = "sev-snp-measure";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M+d9uIAQvEmEsdhhjlwHbhB2RhlaGjphN4ov2ipzCFY=";
   };
 
diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix
index d68d4485a095..6059c12209db 100644
--- a/pkgs/development/python-modules/sfrbox-api/default.nix
+++ b/pkgs/development/python-modules/sfrbox-api/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hacf-fr";
     repo = "sfrbox-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ec3UOserFijBK6goyM6AMOekfLgjBq8l/9sMKYnj240=";
   };
 
diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
index 06ae4cd49b4d..bafc4dc661f4 100644
--- a/pkgs/development/python-modules/sh/default.nix
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "amoffat";
     repo = "sh";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-O0jS/hO31ou9h0xsMSKAy76vEELjryaHKbvdfzYevJc=";
   };
 
diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix
index 14d7ca023884..3c4a217fb2b3 100644
--- a/pkgs/development/python-modules/shap/default.nix
+++ b/pkgs/development/python-modules/shap/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "slundberg";
     repo = "shap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qW36/Xw5oaYKmaMfE5euzkED9CKkjl2O55aO0OpCkfI=";
   };
 
diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/development/python-modules/shaperglot/default.nix
index 9a5d761acf71..5b4adb20c0f4 100644
--- a/pkgs/development/python-modules/shaperglot/default.nix
+++ b/pkgs/development/python-modules/shaperglot/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "shaperglot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O6z7TJpC54QkqX5/G1HKSvaDYty7B9BnCQ4FpsLsEMs=";
   };
 
diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix
index afff1db73d9a..210820060ab8 100644
--- a/pkgs/development/python-modules/sharkiq/default.nix
+++ b/pkgs/development/python-modules/sharkiq/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JeffResc";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UG460uEv1U/KTuVEcXMZlVbK/7REFpotkUk4U7z7KpA=";
   };
 
diff --git a/pkgs/development/python-modules/sharp-aquos-rc/default.nix b/pkgs/development/python-modules/sharp-aquos-rc/default.nix
index 11af74710b24..4219d99938b3 100644
--- a/pkgs/development/python-modules/sharp-aquos-rc/default.nix
+++ b/pkgs/development/python-modules/sharp-aquos-rc/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmoore987";
     repo = "sharp_aquos_rc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-w/XA58iT/pmNCy9up5fayjxBsevzgr8ImKgPiNtYHAM=";
   };
 
diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix
index a23ddc53b33e..f086ecf4e6eb 100644
--- a/pkgs/development/python-modules/shazamio/default.nix
+++ b/pkgs/development/python-modules/shazamio/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dotX12";
     repo = "ShazamIO";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PYA7HUm++4r4kwezyPi3mWRRGF47qHjz2nHUZmVYk/I=";
   };
 
@@ -70,7 +70,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Free asynchronous library from reverse engineered Shazam API";
     homepage = "https://github.com/dotX12/ShazamIO";
-    changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
     # https://github.com/shazamio/ShazamIO/issues/80
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
index 75b61530b909..f457ea4c3146 100644
--- a/pkgs/development/python-modules/shellingham/default.nix
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xeBo3Ok+XPrHN4nQd7M8/11leSV/8z1f7Sj33+HFVtQ=";
   };
 
diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix
index eb19b4e16398..79df5decf66e 100644
--- a/pkgs/development/python-modules/shimmy/default.nix
+++ b/pkgs/development/python-modules/shimmy/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "Shimmy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/wIXjOGb3UeMQdeifYagd7OcxbBcdGPS09mjvkFsWmk=";
   };
 
diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix
index d22649c725ef..048eca1185f9 100644
--- a/pkgs/development/python-modules/shiny/default.nix
+++ b/pkgs/development/python-modules/shiny/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "py-shiny";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-s1j9bMAapO0iRXsuNxiwlNaVv2EoWcl9U7WnHwQe9n8=";
   };
 
diff --git a/pkgs/development/python-modules/shlib/default.nix b/pkgs/development/python-modules/shlib/default.nix
index 8bc4ba90d3e1..26e252233054 100644
--- a/pkgs/development/python-modules/shlib/default.nix
+++ b/pkgs/development/python-modules/shlib/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "shlib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-f2jJgpjybutCpYnIT+RihtoA1YlXdhTs+MvV8bViSMQ=";
   };
 
diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix
index 2b1b13840848..f966690fff9b 100644
--- a/pkgs/development/python-modules/shtab/default.nix
+++ b/pkgs/development/python-modules/shtab/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "shtab";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8bAwLSdJCzFw5Vf9CKBrH5zOoojeXds7aIRncl+sLBI=";
   };
 
diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix
index 22ff48935942..d848c9b77581 100644
--- a/pkgs/development/python-modules/signxml/default.nix
+++ b/pkgs/development/python-modules/signxml/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "XML-Security";
     repo = "signxml";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TZqYNYVzGEhftP/RXiBtThK38AOPLi2DRAwnFh2Za5U=";
   };
 
diff --git a/pkgs/development/python-modules/sigparse/default.nix b/pkgs/development/python-modules/sigparse/default.nix
index 3335b0e7755d..26c6e1f438dc 100644
--- a/pkgs/development/python-modules/sigparse/default.nix
+++ b/pkgs/development/python-modules/sigparse/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lunarmagpie";
     repo = "sigparse";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VzWDqplYgwrJXXd5IUzEIp0YRuofybqmGrNKPaGqQFM=";
   };
 
diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
index e8eaa852017e..ba523fe259a1 100644
--- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix
+++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "sigstore-rekor-types";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vOGKDWhOg8dsgxyxOtM+czR+NOM26v0T0ctkFPUAYEo=";
   };
 
diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 99b9674dbb7e..f4983e93590c 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = "sigstore-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pAzS/LU5me3qoJo6EmuSFPDO/lqRDKIl5hjFiysWTdM=";
   };
 
diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index 651f97e2048a..65c8e9e4692d 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deepjyoti30";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
 
diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix
index 731d9299fc2c..fd5f5b4a652d 100644
--- a/pkgs/development/python-modules/simpful/default.nix
+++ b/pkgs/development/python-modules/simpful/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aresio";
     repo = "simpful";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NtTw7sF1WfVebUk1wHrM8FHAe3/FXDcMApPkDbw0WXo=";
   };
 
diff --git a/pkgs/development/python-modules/simple-parsing/default.nix b/pkgs/development/python-modules/simple-parsing/default.nix
index b263f24ba1d6..01725b2997e7 100644
--- a/pkgs/development/python-modules/simple-parsing/default.nix
+++ b/pkgs/development/python-modules/simple-parsing/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lebrice";
     repo = "SimpleParsing";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RDS1sWzaQqXp/0a7dXlUHnd6z+GTIpUN1MnUCTI9LGw=";
   };
 
diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix
index b876c0e48701..05edcf1b35cd 100644
--- a/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/pkgs/development/python-modules/simple-salesforce/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simple-salesforce";
     repo = "simple-salesforce";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nrfIyXftS2X2HuuLFRZpWLz/IbRasqUzv+r/HvhxfAw=";
   };
 
diff --git a/pkgs/development/python-modules/simple-websocket/default.nix b/pkgs/development/python-modules/simple-websocket/default.nix
index 3c2e78338f2a..6f066fc8132a 100644
--- a/pkgs/development/python-modules/simple-websocket/default.nix
+++ b/pkgs/development/python-modules/simple-websocket/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "simple-websocket";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dwL6GUyygNGBXqkkTnsHwFFpa1JAaeWc9ycQNRgTN4I=";
   };
 
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index df1765637a5e..81e9e7441570 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "danthedeckie";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ryi3ZzIPQ0x/rCQFfoXDOjLuE110n/vUbpvt2IX4GyA=";
   };
 
diff --git a/pkgs/development/python-modules/simplefin4py/default.nix b/pkgs/development/python-modules/simplefin4py/default.nix
index 485079e15b75..b1e3f8f162df 100644
--- a/pkgs/development/python-modules/simplefin4py/default.nix
+++ b/pkgs/development/python-modules/simplefin4py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeeftor";
     repo = "SimpleFin4py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S+E2zwvrXN0YDY6IxplG0D15zSoeUPMyQt2oyM3QB2Q=";
   };
 
diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix
index 85ab1f40cc90..9184391af91b 100644
--- a/pkgs/development/python-modules/simplefix/default.nix
+++ b/pkgs/development/python-modules/simplefix/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "simplefix";
     owner = "da4089";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D85JW3JRQ1xErw6krMbAg94WYjPi76Xqjv/MGNMY5ZU=";
   };
 
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 644ae86eb5d8..7eb59d7abf70 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M6ohYhw7xvZiNVm9uhotvPHeVsBOwYjDpj2sfXAzf0U=";
   };
 
diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix
index 24598ed8bf03..55daa60befe2 100644
--- a/pkgs/development/python-modules/simplekv/default.nix
+++ b/pkgs/development/python-modules/simplekv/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbr";
     repo = "simplekv";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-seUGDj2q84+AjDFM1pxMLlHbe9uBgEhmqA96UHjnCmo=";
   };
 
diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix
index 197642db2dcd..98ea2cf4c823 100644
--- a/pkgs/development/python-modules/simplemma/default.nix
+++ b/pkgs/development/python-modules/simplemma/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adbar";
     repo = "simplemma";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aFN/cOSqsrTJ5GMw0/SM7uoC+T1RhDTQFf8AF00Tz/o=";
   };
 
diff --git a/pkgs/development/python-modules/simplepush/default.nix b/pkgs/development/python-modules/simplepush/default.nix
index 8df3016adc1f..66a54f722b3d 100644
--- a/pkgs/development/python-modules/simplepush/default.nix
+++ b/pkgs/development/python-modules/simplepush/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simplepush";
     repo = "simplepush-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DvDPihhx1rzJN6iQP5rHluplJ1AaN0b/glcd+tZCues=";
   };
 
diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix
index 35359c29396d..8cb89a0d4966 100644
--- a/pkgs/development/python-modules/simplesat/default.nix
+++ b/pkgs/development/python-modules/simplesat/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "enthought";
     repo = "sat-solver";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/fBnpf1DtaF+wQYZztcB8Y20/ZMYxrF3fH5qRsMucL0=";
   };
 
diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix
index bd912e113ebd..5d82c65a9608 100644
--- a/pkgs/development/python-modules/simplisafe-python/default.nix
+++ b/pkgs/development/python-modules/simplisafe-python/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bachya";
     repo = "simplisafe-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ewbR2FI0t2F8HF0ZL5omsclB9OPAjHygGLPtSkVlvgM=";
   };
 
diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix
index 809493dc0a30..02d6fbf33333 100644
--- a/pkgs/development/python-modules/single-source/default.nix
+++ b/pkgs/development/python-modules/single-source/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rabbit72";
     repo = "single-source";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4l9ochlscQoWJVkYN8Iq2DsiU7qoOf7nUFYgBOebK/g=";
   };
 
diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix
index 869ef6a38309..960efdb9a218 100644
--- a/pkgs/development/python-modules/single-version/default.nix
+++ b/pkgs/development/python-modules/single-version/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hongquan";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc=";
   };
 
diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix
index 4bdb5917ecbe..feac0fa01fa8 100644
--- a/pkgs/development/python-modules/siobrultech-protocols/default.nix
+++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sdwilsh";
     repo = "siobrultech-protocols";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8tls2wlLA3wQ78gK4JvvhSWZS5oHRzzsKE73M4i1eyg=";
   };
 
diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix
index 277aa4961f3d..f86a1556e196 100644
--- a/pkgs/development/python-modules/sipyco/default.nix
+++ b/pkgs/development/python-modules/sipyco/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "sipyco";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w=";
   };
 
diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix
index 2453723727b1..82c76e43eba9 100644
--- a/pkgs/development/python-modules/sismic/default.nix
+++ b/pkgs/development/python-modules/sismic/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "AlexandreDecan";
     repo = "sismic";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0g39jJI3UIniJY/oHQMZ53GCOJIbqdVeOED9PWxlw6E=";
   };
 
diff --git a/pkgs/development/python-modules/sisyphus-control/default.nix b/pkgs/development/python-modules/sisyphus-control/default.nix
index 617c22257811..21daa7c7c4dc 100644
--- a/pkgs/development/python-modules/sisyphus-control/default.nix
+++ b/pkgs/development/python-modules/sisyphus-control/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jkeljo";
     repo = "sisyphus-control";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1/trJ/mfiXljNt7ZIBwQ45mIBbqg68e29lvVsPDPzoU=";
   };
 
diff --git a/pkgs/development/python-modules/siuba/default.nix b/pkgs/development/python-modules/siuba/default.nix
index 4dbeb677987a..8b506f5aed7a 100644
--- a/pkgs/development/python-modules/siuba/default.nix
+++ b/pkgs/development/python-modules/siuba/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "machow";
     repo = "siuba";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rd/yQH3sbZqQAQ1AN44vChe30GMJuIlZj3Ccfv1m3lU=";
   };
 
diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix
index 4eeb2129738e..93ff330ef7a7 100644
--- a/pkgs/development/python-modules/six/default.nix
+++ b/pkgs/development/python-modules/six/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benjaminp";
     repo = "six";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tz99C+dz5xJhunoC45bl0NdSdV9NXWya9ti48Z/KaHY=";
   };
 
diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index 0ffb5bbf4222..c671d0fe2a55 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lendy007";
     repo = "skodaconnect";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Cy2sXj8+t8lIqrKmI9Aa7tNEIvRArynU/02ajJ+tYHg=";
   };
 
diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index 47dfe464fbcd..8cee781bcc40 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skops-dev";
     repo = "skops";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-2uX5sGVdTnZEbl0VXI8E7h1pQYQVbpQeUKUchCZpgg4=";
   };
 
diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix
index 921cbf4b2089..930af0fdc277 100644
--- a/pkgs/development/python-modules/skrl/default.nix
+++ b/pkgs/development/python-modules/skrl/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Toni-SM";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-kKkAdQymmgJ9V+73nYi4MhOSJvrO2jwJ2BUYhUGPHe0=";
   };
 
diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix
index fe71e07bd36a..f9171318a0f1 100644
--- a/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/pkgs/development/python-modules/slack-bolt/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "slackapi";
     repo = "bolt-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4zEg60f3wtLnzrZU4mZMJmF6hO0EiHDTx6iw4WDsx0U=";
   };
 
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index f116779a6a08..27c265bef36e 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "slackapi";
     repo = "python-slack-sdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aL8XOlvnAxT9cgPf8EvJT80FmlgL2Vhu7JxDRHkUoSM=";
   };
 
diff --git a/pkgs/development/python-modules/slapd/default.nix b/pkgs/development/python-modules/slapd/default.nix
index c8e8a3707b37..2e466bec45af 100644
--- a/pkgs/development/python-modules/slapd/default.nix
+++ b/pkgs/development/python-modules/slapd/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-ldap";
     repo = "python-slapd";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AiJvhgJ62vCj75m6l5kuIEb7k2qCh/QJybS0uqw2vBY=";
   };
 
diff --git a/pkgs/development/python-modules/sleekxmppfs/default.nix b/pkgs/development/python-modules/sleekxmppfs/default.nix
index d24fe4b40d27..08d9cb8e96bd 100644
--- a/pkgs/development/python-modules/sleekxmppfs/default.nix
+++ b/pkgs/development/python-modules/sleekxmppfs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aszymanik";
     repo = "SleekXMPP";
-    rev = "refs/tags/sleek-${version}";
+    tag = "sleek-${version}";
     hash = "sha256-E2S4fMk5dRr8g42iOYmKOknHX7NS6EZ/LAZKc1v3dPg=";
   };
 
diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index 87cc7f7cf77c..770e6d837350 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "crytic";
     repo = "slither";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KWLv0tpd1FHZ9apipVPWw6VjtfYpngsH7XDQQ3luBZA=";
   };
 
diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix
index 2e42fc17271f..efc53987d0c2 100644
--- a/pkgs/development/python-modules/slowapi/default.nix
+++ b/pkgs/development/python-modules/slowapi/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "laurentS";
     repo = "slowapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R/Mr+Qv22AN7HCDGmAUVh4efU8z4gMIyhC0AuKmxgdE=";
   };
 
diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix
index f373faeb278b..85e94d6c6244 100644
--- a/pkgs/development/python-modules/smart-meter-texas/default.nix
+++ b/pkgs/development/python-modules/smart-meter-texas/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "grahamwetzler";
     repo = "smart-meter-texas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dHWcYrBtmKdEIU45rMy4KvoPX88hnRpd4KBlbJaNvgI=";
   };
 
diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index 4e8412d2cb90..2de499d3083a 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RaRe-Technologies";
     repo = "smart_open";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4HOTaF6AKXGlVCvSGKnnaH73aa4IO0aRxz03XQ4gSd8=";
   };
 
diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix
index fb0ec8e4da24..bba548d81860 100644
--- a/pkgs/development/python-modules/smartypants/default.nix
+++ b/pkgs/development/python-modules/smartypants/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "leohemsted";
     repo = "smartypants.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V1rV1B8jVADkS0NhnDkoVz8xxkqrsIHb1mP9m5Z94QI=";
   };
 
diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix
index f33a64fcaa8d..f4818fe2ef6a 100644
--- a/pkgs/development/python-modules/smbprotocol/default.nix
+++ b/pkgs/development/python-modules/smbprotocol/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "smbprotocol";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9J6p3rJeD6ZTOiumUQ7XX7nHI4mC3Sf+Gc+Fw2vwVk4=";
   };
 
diff --git a/pkgs/development/python-modules/smbus2/default.nix b/pkgs/development/python-modules/smbus2/default.nix
index e1a87118ab81..de050f1f5220 100644
--- a/pkgs/development/python-modules/smbus2/default.nix
+++ b/pkgs/development/python-modules/smbus2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kplindegaard";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3ZAjviVLO/c27NzrPcWf6RlZYclYkmUmOskTP9TVbNM=";
   };
 
diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix
index da71e6b5b7b7..4cc8be07879d 100644
--- a/pkgs/development/python-modules/smhi-pkg/default.nix
+++ b/pkgs/development/python-modules/smhi-pkg/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joysoftware";
     repo = "pypi_smhi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ygjlUEQpyHjIO1QLB+MrijWQr84v3v+RdlcRwi9H/cs=";
   };
 
diff --git a/pkgs/development/python-modules/smoke-zephyr/default.nix b/pkgs/development/python-modules/smoke-zephyr/default.nix
index 0f85fae942de..f8f9200fc737 100644
--- a/pkgs/development/python-modules/smoke-zephyr/default.nix
+++ b/pkgs/development/python-modules/smoke-zephyr/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zeroSteiner";
     repo = "smoke-zephyr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XZj8sxEWYv5z1x7LKb0T3L7MWSZbWr7lAIyjWekN+WY=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
index 67ae31e9ff34..e52b88742253 100644
--- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
+++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix
index e2df0cedfc65..d6ecd04ce4f9 100644
--- a/pkgs/development/python-modules/snakemake-interface-common/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-common";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PMEs7yeVfSnZKbabLrbXfIKCIPteNV1wzbt9RIDG3qU=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
index e6411e3abdf2..f432966a9367 100644
--- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-executor-plugins";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3XdsEnL+kuYhNOeAxkAsjTJ2R6NOtq97zPhQg9kdFkI=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
index 5d5518de96db..137aa8ae88a8 100644
--- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
index e1a4d580b68f..a50fec725053 100644
--- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qjQZc7DIXIPmqXq+Fjslgrq2LbjbdRS/twGsp/jrxRY=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
index 18925b034c05..e3da29ae9b04 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9A2W+V0d9K1Ei4WXqIZfIcOYsWgpGVP7P/ANy8jOGu0=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
index 358aca0d82ab..e4e19b2e2f29 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TKv/7b3+uhY18v7p1ZSya5KJEMUv4M1NkObP9vPzMxU=";
   };
 
diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
index 405020619195..9c88ce9f45a4 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1plBss9jRzIIGQE7rXDEnAomFxNzSUKsw0VyhYA2mIc=";
   };
 
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index c2fd38466ff6..3be2c89c5ac9 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jiffyclub";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tW1zUfCgOGQ8TjrKo2lBzGb0MSe25dP0/P9Q6x3736E=";
   };
 
diff --git a/pkgs/development/python-modules/snap-helpers/default.nix b/pkgs/development/python-modules/snap-helpers/default.nix
index a1a9ef70c188..c7b2f951ce13 100644
--- a/pkgs/development/python-modules/snap-helpers/default.nix
+++ b/pkgs/development/python-modules/snap-helpers/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "albertodonato";
     repo = "snap-helpers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7JBvrD4WNOcFSVx3xauk4JgiVGKWuUEdUMRlH7mudE4=";
   };
 
diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix
index bd46684d4208..f7d6f387a1ef 100644
--- a/pkgs/development/python-modules/snapcast/default.nix
+++ b/pkgs/development/python-modules/snapcast/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "happyleavesaoc";
     repo = "python-snapcast";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gn+X0DZnox4mkJwDVgwNXae63iGbiqPIO15UV5pDwuY=";
   };
 
diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix
index 13a86fb63e9d..8909ef30fd4b 100644
--- a/pkgs/development/python-modules/snitun/default.nix
+++ b/pkgs/development/python-modules/snitun/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "snitun";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jewDQqvLUh/066BSEADXkCvjLFRnodKtUPKfvi0KUpI=";
   };
 
diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix
index 91c650aa657c..836e04d0875d 100644
--- a/pkgs/development/python-modules/snorkel/default.nix
+++ b/pkgs/development/python-modules/snorkel/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "snorkel-team";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1DgkMHYToiI3266yCND1bXiui80x8AaBttxM83kJImw=";
   };
 
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index f913ee43a2ff..10cac80341fa 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "snowflakedb";
     repo = "snowflake-connector-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6poMWKQB/NR40W39KDJwBgYGeAHsr4f1GJhPxYiTc1k=";
   };
 
diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix
index f9e12d45e0c2..4af0d060b735 100644
--- a/pkgs/development/python-modules/snscrape/default.nix
+++ b/pkgs/development/python-modules/snscrape/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JustAnotherArchivist";
     repo = "snscrape";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9xAUMr1SWFePEvIz6DFEexk9Txex3u8wPNfMAdxEUCA=";
   };
 
diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix
index 49c001503cc1..bec09abd2fe5 100644
--- a/pkgs/development/python-modules/social-auth-app-django/default.nix
+++ b/pkgs/development/python-modules/social-auth-app-django/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-social-auth";
     repo = "social-app-django";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-W9boogixZ7X6qysfh2YEat+TOBy1VNreGr27y8hno+0=";
   };
 
diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix
index c3610115a473..1a25c1e82bfc 100644
--- a/pkgs/development/python-modules/social-auth-core/default.nix
+++ b/pkgs/development/python-modules/social-auth-core/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-social-auth";
     repo = "social-core";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tFaRvNoO5K7ytqMhL//Ntasc7jb4PYXB1yyjFvFqQH8=";
   };
 
diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix
index c0b4541e7373..a91e7867c503 100644
--- a/pkgs/development/python-modules/socialscan/default.nix
+++ b/pkgs/development/python-modules/socialscan/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iojw";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4JJVhB6x1NGagtfzE03Jae2GOr25hh+4l7gQ23zc7Ck=";
   };
 
diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix
index eedd12e0dc32..a71ca5817974 100644
--- a/pkgs/development/python-modules/sockio/default.nix
+++ b/pkgs/development/python-modules/sockio/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NSGd7/k1Yr408dipMNBSPRSwQ+wId7VLxgqMM/UmN/Q=";
   };
 
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index 66eadefb449a..45f49fe817c0 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SoCo";
     repo = "SoCo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3/BDqCYNgICb8NGYR1VJM9MsMRmdvJVruqFXuyG6tIY=";
   };
 
diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix
index 4a9a81aca263..4b5d16a74e9e 100644
--- a/pkgs/development/python-modules/solarlog-cli/default.nix
+++ b/pkgs/development/python-modules/solarlog-cli/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dontinelli";
     repo = "solarlog_cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-G7DZHFg0NH3rY/tbWpXDchYHkrvG8dUvINNxBIUKnzk=";
   };
 
diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index bcf489a45330..c3d9ff6916d5 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tsproisl";
     repo = "SoMaJo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fq891LX6PukUEfrXplulhnisuPX/RqLAQ/5ty/Fvm9k=";
   };
 
diff --git a/pkgs/development/python-modules/sonos-websocket/default.nix b/pkgs/development/python-modules/sonos-websocket/default.nix
index 1239043c26a2..7d1bcb6d488f 100644
--- a/pkgs/development/python-modules/sonos-websocket/default.nix
+++ b/pkgs/development/python-modules/sonos-websocket/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jjlawren";
     repo = "sonos-websocket";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1sgYLwIW7VWnHJGsfIQ95AGZ5j/DPMKQr5n7F+/MsuY=";
   };
 
diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix
index 99c0d234a3e1..dfd38d2a22eb 100644
--- a/pkgs/development/python-modules/soxr/default.nix
+++ b/pkgs/development/python-modules/soxr/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dofuuz";
     repo = "python-soxr";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-Fpayc+MOpDUCdpoyJaIqSbMzuO0jYb6UN5ARFaxxOHk=";
   };
diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
index 7a35b89573d9..4f8f4b016896 100644
--- a/pkgs/development/python-modules/spacy-transformers/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "spacy-transformers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+KCRbjY4P52SWawU1NoMoe+HOV7iujFkwqVe87fWVTE=";
   };
 
diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix
index 98602e7d521b..1546c7572e07 100644
--- a/pkgs/development/python-modules/spake2/default.nix
+++ b/pkgs/development/python-modules/spake2/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "warner";
     repo = "python-spake2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WPMGH1OzG+5O+2lNl2sv06/dNardY+BHYDS290Z36vQ=";
   };
 
diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix
index 9b7c002e40fc..664127865129 100644
--- a/pkgs/development/python-modules/sparklines/default.nix
+++ b/pkgs/development/python-modules/sparklines/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deeplook";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-oit1bDqP96wwfTRCV8V0N9P/+pkdW2WYOWT6u3lb4Xs=";
   };
 
diff --git a/pkgs/development/python-modules/sparsezoo/default.nix b/pkgs/development/python-modules/sparsezoo/default.nix
index fa28c365cad4..e0b6ea54f89e 100644
--- a/pkgs/development/python-modules/sparsezoo/default.nix
+++ b/pkgs/development/python-modules/sparsezoo/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neuralmagic";
     repo = "sparsezoo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-c4F95eVvj673eFO/rbmv4LY3pGmqo+arbsYqElznwdA=";
   };
 
diff --git a/pkgs/development/python-modules/spatial-image/default.nix b/pkgs/development/python-modules/spatial-image/default.nix
index 6209ebc4de5c..b826246f8148 100644
--- a/pkgs/development/python-modules/spatial-image/default.nix
+++ b/pkgs/development/python-modules/spatial-image/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spatial-image";
     repo = "spatial-image";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yIAqHhq2naTA8PdLOdrNSrhEOhRwlFD6x9dH4xDVt9Y=";
   };
 
diff --git a/pkgs/development/python-modules/spdx-lookup/default.nix b/pkgs/development/python-modules/spdx-lookup/default.nix
index 420ce4c68976..1aa939d55223 100644
--- a/pkgs/development/python-modules/spdx-lookup/default.nix
+++ b/pkgs/development/python-modules/spdx-lookup/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bbqsrc";
     repo = "spdx-lookup-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jtzhqRAj1BWdU8AuR7Gr343mL5alLXhi+SyCkCI5AAU=";
   };
 
diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix
index c50145cac6b2..dac04709b101 100644
--- a/pkgs/development/python-modules/spdx-tools/default.nix
+++ b/pkgs/development/python-modules/spdx-tools/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "tools-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw=";
   };
 
diff --git a/pkgs/development/python-modules/spdx/default.nix b/pkgs/development/python-modules/spdx/default.nix
index a99ee507936b..93ecc69f7c63 100644
--- a/pkgs/development/python-modules/spdx/default.nix
+++ b/pkgs/development/python-modules/spdx/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bbqsrc";
     repo = "spdx-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lfTgAX4Wl01xrvLA12ZUqjah7ZiLafMAU+yNNdVkRk0=";
   };
 
diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix
index 309d7a6af048..34dc9f7b9dec 100644
--- a/pkgs/development/python-modules/speechbrain/default.nix
+++ b/pkgs/development/python-modules/speechbrain/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "speechbrain";
     repo = "speechbrain";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Un7RPxMq1sD7uD3jcw3Bjp+Oo8ld+XC5g2I89gF6jxs=";
   };
 
diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index bc8375c80807..0e22d72e9799 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Uberi";
     repo = "speech_recognition";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2yc5hztPBOysHxUQcS76ioCXmqNqjid6QUF4qPlIt24=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-autodoc2/default.nix b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
index 9442a660bc38..8b8c8a71e6a0 100644
--- a/pkgs/development/python-modules/sphinx-autodoc2/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc2/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sphinx-extensions2";
     repo = "sphinx-autodoc2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Wu079THK1mHVilD2Fx9dIzuIOOYOXpo/EMxVczNutCI=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix
index 2c3b0820b552..4cc944113d71 100644
--- a/pkgs/development/python-modules/sphinx-automodapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "astropy";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YTaoGBYQvuUbMYe4FKmtgxcAxeesU/ruVXPOjZXGLGU=";
     leaveDotGit = true;
   };
diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix
index f41f3b38c722..4947d86ce0bb 100644
--- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix
+++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "felix-hilden";
     repo = "sphinx-codeautolink";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-h1lteF5a3ga1VlhXCz2biydli3sg3ktPbz0O5n0eeFI=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
index 0df375058c15..454dccbcadac 100644
--- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
+++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "sphinx-jupyterbook-latex";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZTR+s6a/++xXrLMtfFRmSmAeMWa/1de12ukxfsx85g4=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix
index 93e7662214ef..a8ab992c8478 100644
--- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix
+++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "readthedocs";
     repo = "sphinx-notfound-page";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix
index 57fa112da926..e549417bbacc 100644
--- a/pkgs/development/python-modules/sphinx-prompt/default.nix
+++ b/pkgs/development/python-modules/sphinx-prompt/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sbrunner";
     repo = "sphinx-prompt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/XxUSsW8Bowks7P+d6iTlklyMIfTb2otXva/VtRVAkM=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix
index 9cc950fcad95..55c61ac7f7bb 100644
--- a/pkgs/development/python-modules/sphinx-pytest/default.nix
+++ b/pkgs/development/python-modules/sphinx-pytest/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrisjsewell";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
index 863f93848846..be6b4698f1b5 100644
--- a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
+++ b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "MrDogeBro";
     repo = "sphinx_rtd_dark_mode";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N5KG2Wqn9wfGNY3VH4FnBce1aZUbnvVmwD10Loe0Qn4=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix
index f2ad32e67a43..84155186c163 100644
--- a/pkgs/development/python-modules/sphinx-sitemap/default.nix
+++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "jdillard";
     repo = "sphinx-sitemap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RERa+/MVug2OQ/FAXS4LOQHB4eEuIW2rwcdZUOrr6g8=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix
index 8d30e14bfc36..f2ba6a6019e3 100644
--- a/pkgs/development/python-modules/sphinx-tabs/default.nix
+++ b/pkgs/development/python-modules/sphinx-tabs/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "sphinx-tabs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bJXm3qMT1y7NqUA0iiEUA+USTWHxdV8tbEEiDrQKk1U=";
   };
 
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index f39899a2c5b6..8a77c74e8c4b 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sphinx-doc";
     repo = "sphinx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     postFetch = ''
       # Change ä to æ in file names, since ä can be encoded multiple ways on different
       # filesystems, leading to different hashes on different platforms.
diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index 6e88e523b901..377682ae2529 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mcmtroffaes";
     repo = "sphinxcontrib-bibtex";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cqz5Jamtlflo5rFhWPCPlYoymApUtXPG4oTRjfDI+WY=";
   };
 
diff --git a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix
index afc005af66ef..9377bd19254c 100644
--- a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sphinx-contrib";
     repo = "jquery";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZQGQcVmhWREFa2KyaOKdTz5W2AS2ur7pFp8qZ2IkxSE=";
   };
 
diff --git a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix
index b9dfabb9fd81..e74829520279 100644
--- a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "davidism";
     repo = "sphinxcontrib-log-cabinet";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "03cxspgqsap9q74sqkdx6r6b4gs4hq6dpvx4j58hm50yfhs06wn1";
   };
 
diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix
index 2321bc467f5e..51375672c6c6 100644
--- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sphinx-contrib";
     repo = "youtube";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XuOfZ77tg9akmgTuMQN20OhgkFbn/6YzT46vpTsXxC8=";
   };
 
diff --git a/pkgs/development/python-modules/sphinxemoji/default.nix b/pkgs/development/python-modules/sphinxemoji/default.nix
index b563388ab1a9..169515df63f4 100644
--- a/pkgs/development/python-modules/sphinxemoji/default.nix
+++ b/pkgs/development/python-modules/sphinxemoji/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sphinx-contrib";
     repo = "emojicodes";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A=";
   };
 
diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
index 7cfc6b174a3a..ab3fea4eb8fa 100644
--- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix
+++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wpilibsuite";
     repo = "sphinxext-opengraph";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-B+bJ1tKqTTlbNeJLxk56o2a21n3Yg6OHwJiFfCx46aw=";
   };
 
diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix
index c8ce42bc7351..8ceac913de9e 100644
--- a/pkgs/development/python-modules/splinter/default.nix
+++ b/pkgs/development/python-modules/splinter/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cobrateam";
     repo = "splinter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PGGql8yI1YosoUBAyDoI/8k7s4sVYnXEV7eow3GHH88=";
   };
 
diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix
index d0cd62791c83..b08260bf1494 100644
--- a/pkgs/development/python-modules/spotifyaio/default.nix
+++ b/pkgs/development/python-modules/spotifyaio/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-spotify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mRv/bsMER+rn4JOSe2EK0ykP5oEydl8QNhtn7yN+ykE=";
   };
 
diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix
index 81109c3cb811..9f11e06fa648 100644
--- a/pkgs/development/python-modules/spsdk/default.nix
+++ b/pkgs/development/python-modules/spsdk/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nxp-mcuxpresso";
     repo = "spsdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-WRR4YyA4HaYoyOZSt/RYivhH2E/20DKLXExWg2yOL48=";
   };
 
diff --git a/pkgs/development/python-modules/spur/default.nix b/pkgs/development/python-modules/spur/default.nix
index 6762556268fd..ee72cb91612f 100644
--- a/pkgs/development/python-modules/spur/default.nix
+++ b/pkgs/development/python-modules/spur/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwilliamson";
     repo = "spur.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LTkZ1p2P9fsD+gZEQZaCS68Q6nGc4qFGMNtH75gQmXQ=";
   };
 
diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix
index fc96952be47a..0782537359ad 100644
--- a/pkgs/development/python-modules/spyse-python/default.nix
+++ b/pkgs/development/python-modules/spyse-python/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "spyse-com";
     repo = "spyse-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-c7BAJOplWNcd9v7FrEZuMHHdMpqtHljF7YpbdQYAMxA=";
   };
 
diff --git a/pkgs/development/python-modules/spython/default.nix b/pkgs/development/python-modules/spython/default.nix
index aeddaa35e788..66a1c768ee68 100644
--- a/pkgs/development/python-modules/spython/default.nix
+++ b/pkgs/development/python-modules/spython/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "singularityhub";
     repo = "singularity-cli";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PNMzqnKb691wcd8aGSleqHOcsUrahl8e0r5s5ek5GmQ=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-json/default.nix b/pkgs/development/python-modules/sqlalchemy-json/default.nix
index 57b45fdb096e..95719fac909d 100644
--- a/pkgs/development/python-modules/sqlalchemy-json/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-json/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "edelooff";
     repo = "sqlalchemy-json";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Is3DznojvpWYFSDutzCxRLceQMIiS3ZIg0c//MIOF+s=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
index e03c86a80a59..78143049ff62 100644
--- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "penguinolog";
     repo = "sqlalchemy_jsonfield";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4zLXB3UQh6pgQ80KrxkLeC5yiv1R8t2+JmSukmGXr7I=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
index 66a1e659b5a1..37a0c41ba3f7 100644
--- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "absent1706";
     repo = "sqlalchemy-mixins";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0uB3x7RQSNEq3DyTSiOIGajwPQQEBjXK8HOyuXCNa/E=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index e0cd899e3877..4e0370f9c44b 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kvesteri";
     repo = "sqlalchemy-utils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jC8onlCiuzpMlJ3EzpzCnQ128xpkLzrZEuGWQv7pvVE=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy-views/default.nix b/pkgs/development/python-modules/sqlalchemy-views/default.nix
index 596ff985290f..5f9bdfce9b35 100644
--- a/pkgs/development/python-modules/sqlalchemy-views/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-views/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "jklukas";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MJgikWXo3lpMsSYbb5sOSOTbJPOx5gEghW1V9jKvHKU=";
   };
 
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 0aec8225933f..39ef2c069326 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
-    rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
     hash = "sha256-i1yyAVBXz0efAdpFvUPvdzS+4IRU94akmePoprb8Is0=";
   };
 
diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 3d191ea49208..157f66b1bd66 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "sqlfmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kbluj29P1HwTaCYv1Myslak9s8FFm2e/eHdGgi3H4i0=";
   };
 
diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix
index d03bccf6b66d..6945e853adc3 100644
--- a/pkgs/development/python-modules/sqlglot/default.nix
+++ b/pkgs/development/python-modules/sqlglot/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "sqlglot";
     owner = "tobymao";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RE9Hbb3g6j4j5X2ksjcBZ610RcV7Zd3YaKaBIUyD2vU=";
   };
 
diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix
index 811e70487945..e65ea1cc46f5 100644
--- a/pkgs/development/python-modules/sqlite-anyio/default.nix
+++ b/pkgs/development/python-modules/sqlite-anyio/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "davidbrochart";
     repo = "sqlite-anyio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cZyTpFmYD0l20Cmxl+Hwfh3oVkWvtXD45dMpcSwA2QE=";
   };
 
diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix
index 1d7af05a78e3..0ea1f02bbff3 100644
--- a/pkgs/development/python-modules/sqlite-fts4/default.nix
+++ b/pkgs/development/python-modules/sqlite-fts4/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU=";
   };
 
diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix
index 8dbe9d93b452..481f45860068 100644
--- a/pkgs/development/python-modules/sqlitedict/default.nix
+++ b/pkgs/development/python-modules/sqlitedict/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "RaRe-Technologies";
     repo = "sqlitedict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic=";
   };
 
diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix
index e7b521228147..3445145cbb88 100644
--- a/pkgs/development/python-modules/sqlmodel/default.nix
+++ b/pkgs/development/python-modules/sqlmodel/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "sqlmodel";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-y6lY6DlfdCF5dliRkiU6r+ny/a9ssDtqRmF+/rcKFkg=";
   };
 
diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix
index 8b229ed9ef39..2c753beeed30 100644
--- a/pkgs/development/python-modules/sqltrie/default.nix
+++ b/pkgs/development/python-modules/sqltrie/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "iterative";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-elW1hCB0sXc+GyIO0358EwcIn8J1qJZE2pOLAxqxhwA=";
   };
 
diff --git a/pkgs/development/python-modules/squarify/default.nix b/pkgs/development/python-modules/squarify/default.nix
index b37df470acaa..496e922a59d1 100644
--- a/pkgs/development/python-modules/squarify/default.nix
+++ b/pkgs/development/python-modules/squarify/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "laserson";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zSv+6xT9H4WyShRnwjjcNMjY19AFlQ6bw9Mh9p2rL08=";
   };
 
diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix
index 7eb66f05d544..45a5be9b2ad4 100644
--- a/pkgs/development/python-modules/srpenergy/default.nix
+++ b/pkgs/development/python-modules/srpenergy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lamoreauxlab";
     repo = "srpenergy-api-client-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bdBF5y9hRj4rceUD5qjHOM9TIaHGElJ36YjWCJgCzX8=";
   };
 
diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix
index c13860e68db9..3ffba90e953b 100644
--- a/pkgs/development/python-modules/srvlookup/default.nix
+++ b/pkgs/development/python-modules/srvlookup/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY=";
   };
 
diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix
index 83c720de8e83..f679b8806a82 100644
--- a/pkgs/development/python-modules/ssdeep/default.nix
+++ b/pkgs/development/python-modules/ssdeep/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DinoTools";
     repo = "python-ssdeep";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-I5ci5BS+B3OE0xdLSahu3HCh99jjhnRHJFz830SvFpg=";
   };
 
diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index b354b35a01c1..c34c46c7c08c 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "codingjoe";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mORjMEg7Q/2CKZBLICSGF8dcdl98S6mBgJ4jujPGs6M=";
   };
 
diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix
index b6526f96e239..28412c71bc49 100644
--- a/pkgs/development/python-modules/sse-starlette/default.nix
+++ b/pkgs/development/python-modules/sse-starlette/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sysid";
     repo = "sse-starlette";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cnUx3wYawyqt/m/FB6abxknMbc64k09a1kAJoA4yN6w=";
   };
 
diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix
index 6bd8a7a91666..6e056ad9b569 100644
--- a/pkgs/development/python-modules/sshfs/default.nix
+++ b/pkgs/development/python-modules/sshfs/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "sshfs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rRcXimthyFLBqt0nMEv7bisL+JNLLZuRH7BopSLM7QQ=";
   };
 
diff --git a/pkgs/development/python-modules/ssort/default.nix b/pkgs/development/python-modules/ssort/default.nix
index 6a60f6ab1e53..64cb1078da40 100644
--- a/pkgs/development/python-modules/ssort/default.nix
+++ b/pkgs/development/python-modules/ssort/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bwhmather";
     repo = "ssort";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TINktjuTdyRYkqIs3Jyv6vobSBqV1iPoHrG36sBHah8=";
   };
 
diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix
index ceb8ff03ca87..9900e7e008bd 100644
--- a/pkgs/development/python-modules/stable-baselines3/default.nix
+++ b/pkgs/development/python-modules/stable-baselines3/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DLR-RM";
     repo = "stable-baselines3";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OFmjAkUS0wrns5CkWjqR7zTjKLVPI/NrpVIKJhLAwYM=";
   };
 
diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix
index 5e27b9805af6..407d54b23be1 100644
--- a/pkgs/development/python-modules/stack-data/default.nix
+++ b/pkgs/development/python-modules/stack-data/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alexmojaki";
     repo = "stack_data";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dmBhfCg60KX3gWp3k1CGRxW14z3BLlair0PjLW9HFYo=";
   };
 
diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix
index 281b8e03c3ab..e1eda7924fcd 100644
--- a/pkgs/development/python-modules/stamina/default.nix
+++ b/pkgs/development/python-modules/stamina/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "stamina";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DasubVqKRhX4CRyKyJ3fIA9Rxmy+kGxkW0pDdu8OPPo=";
   };
 
diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix
index 543ab64e63bf..bad026db5ca5 100644
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stanfordnlp";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hrRn6ITsN7kFL1T6VjSXPDytANEeJYKwMaSdCG+YJyM=";
   };
 
diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
index f0158e4a0d42..cb8d939006e2 100644
--- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix
+++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "starkbank";
     repo = "ecdsa-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HarlCDE2qOLbyhMLOE++bTC+7srJqwmohM6vrJkJ/gc=";
   };
 
diff --git a/pkgs/development/python-modules/starlette-context/default.nix b/pkgs/development/python-modules/starlette-context/default.nix
index 1fbe852147d7..887761474238 100644
--- a/pkgs/development/python-modules/starlette-context/default.nix
+++ b/pkgs/development/python-modules/starlette-context/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomwojcik";
     repo = "starlette-context";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZKwE2M86clYKdptd0o/j8VYUOj/Y/72uUnpxFbJ65vw=";
   };
 
diff --git a/pkgs/development/python-modules/starlette-wtf/default.nix b/pkgs/development/python-modules/starlette-wtf/default.nix
index 9396dba186d7..c1d3e83dd920 100644
--- a/pkgs/development/python-modules/starlette-wtf/default.nix
+++ b/pkgs/development/python-modules/starlette-wtf/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "muicss";
     repo = "starlette-wtf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-88zU2NAsdty2OhHauwQ5+6LazuRDYPoqN9IIipI1t2Q=";
   };
 
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index ce0f83687b43..bb698b04b5b4 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "starlette";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZNB4OxzJHlsOie3URbUnZywJbqOZIvzxS/aq7YImdQ0=";
   };
 
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index 2e92efe1e5bd..e9f0bd3b8ac5 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "daltonmaag";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3BZ71JVvj7GCojM8ycu160viPj8BLJ1SiW86Df2fzsw=";
   };
 
diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix
index 21127c85adf8..b524a0f2d7c0 100644
--- a/pkgs/development/python-modules/statsd/default.nix
+++ b/pkgs/development/python-modules/statsd/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jsocol";
     repo = "pystatsd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-g830TjFERKUguFKlZeaOhCTlaUs0wcDg4bMdRDr3smw=";
   };
 
diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix
index fb9c0f54479f..0f6717aa0de9 100644
--- a/pkgs/development/python-modules/stdlibs/default.nix
+++ b/pkgs/development/python-modules/stdlibs/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "stdlibs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-DthHvL5x3HVwACLnxeyuoC0hb8OokabODircEY9eEhE=";
   };
 
diff --git a/pkgs/development/python-modules/steamodd/default.nix b/pkgs/development/python-modules/steamodd/default.nix
index dd1be22acb1a..0d327a5cea1a 100644
--- a/pkgs/development/python-modules/steamodd/default.nix
+++ b/pkgs/development/python-modules/steamodd/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Lagg";
     repo = "steamodd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ySAyCOI1ISuBQ/5+UHSQVji76ZDRGjdVwlBAY9tnSmE=";
   };
 
diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix
index 405d7202a16d..9a788d6a2ac1 100644
--- a/pkgs/development/python-modules/stickytape/default.nix
+++ b/pkgs/development/python-modules/stickytape/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mwilliamson";
     repo = "stickytape";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8=";
   };
 
diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix
index 743f6163cbe5..01357b047645 100644
--- a/pkgs/development/python-modules/stim/default.nix
+++ b/pkgs/development/python-modules/stim/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "Stim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Tx+4FfkMShzTP1QEQVwHEz3FZ5pz3uXK2mlJFLNlTas=";
   };
 
diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix
index 16898cb624d4..e80cb12df7a3 100644
--- a/pkgs/development/python-modules/stix2-patterns/default.nix
+++ b/pkgs/development/python-modules/stix2-patterns/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oasis-open";
     repo = "cti-pattern-validator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y=";
   };
 
diff --git a/pkgs/development/python-modules/stix2-validator/default.nix b/pkgs/development/python-modules/stix2-validator/default.nix
index 105e11713d0e..f12773a0e56f 100644
--- a/pkgs/development/python-modules/stix2-validator/default.nix
+++ b/pkgs/development/python-modules/stix2-validator/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oasis-open";
     repo = "cti-stix-validator";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OI1SXILyCRGl1ZsoyYDl+/RsBhTP24eqECtW3uazS2k=";
   };
 
diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix
index 26622eea45b5..4219388f7f46 100644
--- a/pkgs/development/python-modules/stix2/default.nix
+++ b/pkgs/development/python-modules/stix2/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oasis-open";
     repo = "cti-python-stix2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI=";
   };
 
diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index fea218cbc29d..e58b1870a6d5 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dropbox";
     repo = "stone";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-W+wRVWPaAzhdHMVE54GEJC/YJqYZVJhwFDWWSMKUPdw=";
   };
 
diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix
index d3db00682923..9d4be55a2875 100644
--- a/pkgs/development/python-modules/stookwijzer/default.nix
+++ b/pkgs/development/python-modules/stookwijzer/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fwestenberg";
     repo = "stookwijzer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zAlHB4ZAgbUBDBQbnoSXwB+iOKeWKtkwBbA4AAyNv00=";
   };
 
diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix
index bcf10fe99a2a..d7939a45b415 100644
--- a/pkgs/development/python-modules/stravalib/default.nix
+++ b/pkgs/development/python-modules/stravalib/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "stravalib";
     repo = "stravalib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VEVy9BAAoLsBCwMNFpsCjhacFbsgNswYoJ5tTcOQccw=";
   };
 
diff --git a/pkgs/development/python-modules/stravaweblib/default.nix b/pkgs/development/python-modules/stravaweblib/default.nix
index b1bae6f28b01..d3c11d917fcc 100644
--- a/pkgs/development/python-modules/stravaweblib/default.nix
+++ b/pkgs/development/python-modules/stravaweblib/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pR0Ps";
     repo = "stravaweblib";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-v54UeRjhoH0GN2AVFKRjqKJ6BYUXVATe2qoDk9P48oU=";
   };
 
diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix
index 68e6a93e76c2..95d80dc77c6b 100644
--- a/pkgs/development/python-modules/strenum/default.nix
+++ b/pkgs/development/python-modules/strenum/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "irgeek";
     repo = "StrEnum";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA=";
   };
 
diff --git a/pkgs/development/python-modules/stringparser/default.nix b/pkgs/development/python-modules/stringparser/default.nix
index 63f163d5f899..c77b225c56bf 100644
--- a/pkgs/development/python-modules/stringparser/default.nix
+++ b/pkgs/development/python-modules/stringparser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hgrecco";
     repo = "stringparser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gj0ooeb869JhlB9Mf5nBydiV2thTes8ys+BLJ516iSA=";
   };
 
diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 4b241aa47439..9b215d73db33 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8HcX0P/PCaJAV333oSYZJ6xVKwYet/CF8vnEe9/dMo4=";
   };
 
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   pytestFlagsArray = [ "scripts/test.py" ];
 
   meta = {
-    changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/v${version}";
     description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances";
     homepage = "https://github.com/ashvardanian/stringzilla";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 0831fd99bbb6..39de0afbf169 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "structlog";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-z3ecgsep/BQJ+Fv78rV4XiFU4+1aaUEfNEtIqy44KV4=";
   };
 
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index 03d5e87e8e4c..9e6c11b17283 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TDAmeritrade";
     repo = "stumpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8=";
   };
 
diff --git a/pkgs/development/python-modules/stupidartnet/default.nix b/pkgs/development/python-modules/stupidartnet/default.nix
index 8c97d3cb5e6e..281601164f7b 100644
--- a/pkgs/development/python-modules/stupidartnet/default.nix
+++ b/pkgs/development/python-modules/stupidartnet/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cpvalente";
     repo = "stupidArtnet";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6vEzInt1ofVVjTZAOH0Zw3BdwpX//1ZWwJqWPP5fIC8=";
   };
 
diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index cc58d60cc55a..c0c4fd0c244f 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "G-Two";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R6d9BaQDFSobiIsbI1I/eUaJt0VUU2ELdWU9xDyhuFc=";
   };
 
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index bf06b126c668..1bee4c4ab691 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Diaoul";
     repo = "subliminal";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-g7gg2qdLKl7bg/nNXRWN9wZaNShOOc38sVASZrIycMU=";
   };
 
diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index eb39da57d935..2b8578c5bf44 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "submitit";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PDQLzqQjoBAZM9FKsoRby26Pbh4nik3SltIHUw/xWcY=";
   };
 
diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix
index d7e572746520..a5de7760ee5a 100644
--- a/pkgs/development/python-modules/subprocess-tee/default.nix
+++ b/pkgs/development/python-modules/subprocess-tee/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycontribs";
     repo = "subprocess-tee";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rfI4UZdENfSQ9EbQeldv6DDGIQe5yMjboGTCOwed1AU=";
   };
 
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/pycontribs/subprocess-tee";
     description = "Subprocess.run drop-in replacement that supports a tee mode";
-    changelog = "https://github.com/pycontribs/subprocess-tee/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/pycontribs/subprocess-tee/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ putchar ];
   };
diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix
index 87d63c8c1b68..176d16318531 100644
--- a/pkgs/development/python-modules/succulent/default.nix
+++ b/pkgs/development/python-modules/succulent/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "succulent";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rD0qKYmWTu0LMRdWgul8OGp1FcczSY2/OxT8+oXO78E=";
   };
 
diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix
index 35dc2eeaa5bc..e59ba28bde18 100644
--- a/pkgs/development/python-modules/suds/default.nix
+++ b/pkgs/development/python-modules/suds/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "suds-community";
     repo = "suds";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-YdL+zDelRspQ6VMqa45vK1DDS3HjFvKE1P02USVBrEo=";
   };
 
diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix
index 0880a5b11d75..997e73978bc7 100644
--- a/pkgs/development/python-modules/sunweg/default.nix
+++ b/pkgs/development/python-modules/sunweg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rokam";
     repo = "sunweg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-T67eH5WjS7J2pcNjq9psNmD4MwMfH+HRvk9llqI3FoQ=";
   };
 
diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index 14ffe80ccae8..62d616a6e2e7 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "benleb";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ETgpXSUUsV1xoZjdnL2bzn4HwDjKC2t13yXwf28OBqI=";
   };
 
diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix
index 093970206927..29214f575714 100644
--- a/pkgs/development/python-modules/svg-path/default.nix
+++ b/pkgs/development/python-modules/svg-path/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "regebro";
     repo = "svg.path";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qes6cKw/Ok0WgcPO/NPuREVNUbnlhm82jF90dK7Ay8U=";
   };
 
diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix
index 30396791e876..a9589db0e9b6 100644
--- a/pkgs/development/python-modules/svg-py/default.nix
+++ b/pkgs/development/python-modules/svg-py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "orsinium-labs";
     repo = "svg.py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Lxzk3IVCD4PG36Pozz2crccwxCAAAM2QfS4rgwbjs6g=";
   };
 
diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix
index 5ef700eadc17..36422d5596dd 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/pkgs/development/python-modules/svg2tikz/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xyz2tex";
     repo = "svg2tikz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5SOUvrK83ff1x4MTVoJy68OaDmZUfrEwraEWmPMJKTA=";
   };
 
diff --git a/pkgs/development/python-modules/svgelements/default.nix b/pkgs/development/python-modules/svgelements/default.nix
index 7e4709ff5a08..ab107fbecad8 100644
--- a/pkgs/development/python-modules/svgelements/default.nix
+++ b/pkgs/development/python-modules/svgelements/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "meerk40t";
     repo = "svgelements";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nx2sGXeeh8S17TfRDFifQbdSxc4YGsDNnrPSSbxv7S4=";
   };
 
diff --git a/pkgs/development/python-modules/svgutils/default.nix b/pkgs/development/python-modules/svgutils/default.nix
index 40e50d9b9a0f..b628b4ea5baf 100644
--- a/pkgs/development/python-modules/svgutils/default.nix
+++ b/pkgs/development/python-modules/svgutils/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "btel";
     repo = "svg_utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ITvZx+3HMbTyaRmCb7tR0LKqCxGjqDdV9/2taziUD0c=";
   };
 
diff --git a/pkgs/development/python-modules/swifter/default.nix b/pkgs/development/python-modules/swifter/default.nix
index 53c5ea5c508a..c31b30be192b 100644
--- a/pkgs/development/python-modules/swifter/default.nix
+++ b/pkgs/development/python-modules/swifter/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jmcarpenter2";
     repo = "swifter";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lgdf8E9GGjeLY4ERzxqtjQuYVtdtIZt2HFLSiNBbtX4=";
   };
 
diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix
index c1c9bb698d47..ea4baa93a311 100644
--- a/pkgs/development/python-modules/swisshydrodata/default.nix
+++ b/pkgs/development/python-modules/swisshydrodata/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bouni";
     repo = "swisshydrodata";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-RcVwo61HZ02JEOHsSY/W8j2OTBN25oR2JunLZ5i6yVI=";
   };
 
diff --git a/pkgs/development/python-modules/switchbot-api/default.nix b/pkgs/development/python-modules/switchbot-api/default.nix
index ee048637b435..c628a5b8094c 100644
--- a/pkgs/development/python-modules/switchbot-api/default.nix
+++ b/pkgs/development/python-modules/switchbot-api/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SeraphicCorp";
     repo = "py-switchbot-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jpm01wDVLgGr5SMaevxiYGfv8tVa1ibRtcHkEK3yb58=";
   };
 
diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index 57e3c394843d..af88f29ce5f9 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "simplistix";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SqAP+hj+pivsuGxx9/TvmfVrfrLSWQRYIjKh0ui0AVc=";
   };
 
diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix
index abea3479d15b..19c8984f06c4 100644
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "symengine";
     repo = "symengine.py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PJUzA86SGCnDpqU9j/dr3PlM9inyi8SQX0HGqPQ9wQw=";
   };
 
diff --git a/pkgs/development/python-modules/symspellpy/default.nix b/pkgs/development/python-modules/symspellpy/default.nix
index b0a9bc7b58ca..814ad9f7ecfe 100644
--- a/pkgs/development/python-modules/symspellpy/default.nix
+++ b/pkgs/development/python-modules/symspellpy/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mammothb";
     repo = "symspellpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZnkZE7v4o0o6iPdkjCycDgVdLhsE3Vn1uuGT7o0F86I=";
   };
 
diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix
index 40a69fc50322..81b05a72600d 100644
--- a/pkgs/development/python-modules/syncedlyrics/default.nix
+++ b/pkgs/development/python-modules/syncedlyrics/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rtcq";
     repo = "syncedlyrics";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rKYze8Z7F6cEkpex6UCFUW9+mf2UWT+T86C5COhYQHY=";
   };
 
diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index 0fdd193213c4..1a599911b5d6 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "syrupy-project";
     repo = "syrupy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IifGufCUhjbl8Tqvcjm8XF4QPvOsRacPWxI1yT79eNs=";
   };
 
diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
index 61c9a489b738..411f43337fe2 100644
--- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
+++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "easypost";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dvRSOMXRmZf0vEEyX6H7OBSfo/PgyOLKuDS8X6g4qe0=";
   };
 
diff --git a/pkgs/development/python-modules/sysrsync/default.nix b/pkgs/development/python-modules/sysrsync/default.nix
index 809ca324cce1..cc833dd4ae8b 100644
--- a/pkgs/development/python-modules/sysrsync/default.nix
+++ b/pkgs/development/python-modules/sysrsync/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gchamon";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2Sz3JrNmIGOnad+qjRzbAgsFEzDtwBT0KLEFyQKZra4=";
   };
 
diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix
index 221cca321e04..f5254d90c75d 100644
--- a/pkgs/development/python-modules/systembridgeconnector/default.nix
+++ b/pkgs/development/python-modules/systembridgeconnector/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "system-bridge-connector";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AzAN7reBAI4atEFutgFrdQHFy/Qc90PQxwSaHaftn5Q=";
   };
 
diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix
index ebb8dcea57ad..aabc71b724a3 100644
--- a/pkgs/development/python-modules/systembridgemodels/default.nix
+++ b/pkgs/development/python-modules/systembridgemodels/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "timmo001";
     repo = "system-bridge-models";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-FjHDd7nI30ChaClL0b1ME9Zv+DV0BiMsfgGOKQF/qBk=";
   };
 
diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix
index 49769b3f0e51..84dcccfdec0e 100644
--- a/pkgs/development/python-modules/tabledata/default.nix
+++ b/pkgs/development/python-modules/tabledata/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-84KrXnks76mvIjcEeQPpwd8rPO5SMbH/jfqERaFTrWo=";
   };
 
diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix
index f923942c99be..b6950378734d 100644
--- a/pkgs/development/python-modules/tabula-py/default.nix
+++ b/pkgs/development/python-modules/tabula-py/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chezou";
     repo = "tabula-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-PQbwm9ho3XtpmZ7N7ASkrV8gk9Jom+yQKlt2fUa948s=";
   };
 
diff --git a/pkgs/development/python-modules/tago/default.nix b/pkgs/development/python-modules/tago/default.nix
index d2899ec1a214..bfc64cf7f289 100644
--- a/pkgs/development/python-modules/tago/default.nix
+++ b/pkgs/development/python-modules/tago/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tago-io";
     repo = "tago-sdk-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-q1xcPF+oeQsCAZjeYTVY2aaKFmb8rCTWVikGxdpPQ28=";
   };
 
diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix
index 4e2984a98721..8a7687a66602 100644
--- a/pkgs/development/python-modules/tagoio-sdk/default.nix
+++ b/pkgs/development/python-modules/tagoio-sdk/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tago-io";
     repo = "sdk-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-37/fg2vbwYPhYPvSJ2YxWAPrfspqTE3thIL/VR1+AkI=";
   };
 
diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix
index 4df1e2b70932..b2976220eed6 100644
--- a/pkgs/development/python-modules/tailscale/default.nix
+++ b/pkgs/development/python-modules/tailscale/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-tailscale";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-47n/BjTHkw0rT8xTHGZOMNwZTy0nDuoHsTJrRyr8qjc=";
   };
 
diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix
index 9d195004e984..2eb958b33bc6 100644
--- a/pkgs/development/python-modules/tank-utility/default.nix
+++ b/pkgs/development/python-modules/tank-utility/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "krismolendyke";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-h9y3X+FSzSFt+bd/chz+x0nocHaKZ8DvreMxAYMs8/E=";
   };
 
diff --git a/pkgs/development/python-modules/taskw-ng/default.nix b/pkgs/development/python-modules/taskw-ng/default.nix
index dee865bd833a..5dfb9110735c 100644
--- a/pkgs/development/python-modules/taskw-ng/default.nix
+++ b/pkgs/development/python-modules/taskw-ng/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "taskw-ng";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tlidTt0TzWnvfajYiIfvRv7OfakHY6zWAicmAwq/Z8w=";
   };
 
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 40de44127087..9dcf4d4c8dc5 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "neogeny";
     repo = "TatSu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FRNQz3JtsFw1nch+ffGMzZF1+gq7XifPok9qsUiRPs8=";
   };
 
diff --git a/pkgs/development/python-modules/taxii2-client/default.nix b/pkgs/development/python-modules/taxii2-client/default.nix
index 49ad9b891630..321694e212cb 100644
--- a/pkgs/development/python-modules/taxii2-client/default.nix
+++ b/pkgs/development/python-modules/taxii2-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "oasis-open";
     repo = "cti-taxii-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-e22bJdLAlm30vv/xIgLSjcwmzfN0Pwt2JydLgEbA+Is=";
   };
 
diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix
index a11a8dfef6b2..5f0771129d6c 100644
--- a/pkgs/development/python-modules/tbm-utils/default.nix
+++ b/pkgs/development/python-modules/tbm-utils/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thebigmunch";
     repo = "tbm-utils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA=";
   };
 
diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix
index f807ca1bf08a..bfbf2305841c 100644
--- a/pkgs/development/python-modules/tcolorpy/default.nix
+++ b/pkgs/development/python-modules/tcolorpy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w=";
   };
 
diff --git a/pkgs/development/python-modules/tcxreader/default.nix b/pkgs/development/python-modules/tcxreader/default.nix
index 9bcab11b5882..89ef04806d63 100644
--- a/pkgs/development/python-modules/tcxreader/default.nix
+++ b/pkgs/development/python-modules/tcxreader/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alenrajsp";
     repo = "tcxreader";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qTAqRzrHFj0nEujlkBohLaprIvvkSYhcDoRfqWIJMjo=";
   };
 
diff --git a/pkgs/development/python-modules/telegram-text/default.nix b/pkgs/development/python-modules/telegram-text/default.nix
index f14ed0d939b7..5d82175d2242 100644
--- a/pkgs/development/python-modules/telegram-text/default.nix
+++ b/pkgs/development/python-modules/telegram-text/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SKY-ALIN";
     repo = "telegram-text";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-eUy4kyCmM/5Ag/0s9hYW2IIg+OTX2L7EsoOYivhd0pU=";
   };
 
diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix
index 3dd1ce594efb..836ff7ff3879 100644
--- a/pkgs/development/python-modules/telegraph/default.nix
+++ b/pkgs/development/python-modules/telegraph/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = "telegraph";
     owner = "python273";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xARX8lSOftNVYY4InR5vU4OiguCJJJZv/W76G9eLgNY=";
   };
 
diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
index ab0a973a86e1..71cabb331870 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "LonamiWebs";
     repo = "Telethon";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P7FP+Wqi3dqbBCFpI9aCDvK4k3mWv8076RO6MXg+jFQ=";
   };
 
diff --git a/pkgs/development/python-modules/tellduslive/default.nix b/pkgs/development/python-modules/tellduslive/default.nix
index 32382d635c7d..67d20a25250a 100644
--- a/pkgs/development/python-modules/tellduslive/default.nix
+++ b/pkgs/development/python-modules/tellduslive/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "molobrakos";
     repo = "tellduslive";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-fWL+VSvoT+dT0jzD8DZEMxzTlqj4TYGCJPLpeui5q64=";
   };
 
diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix
index 32f922065e56..100d8a4c8518 100644
--- a/pkgs/development/python-modules/templateflow/default.nix
+++ b/pkgs/development/python-modules/templateflow/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "templateflow";
     repo = "python-client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs=";
   };
 
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 8ac06879c105..53adcdff522f 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "tempora";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-M6nWKYvgn4tk2diiTDAYb1uQdP8H1M8yqhsFLJ9H7HU=";
   };
 
diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
index 3f85d86e7f7e..d08e47ef284a 100644
--- a/pkgs/development/python-modules/tenant-schemas-celery/default.nix
+++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maciej-gol";
     repo = "tenant-schemas-celery";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg=";
   };
 
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 7b2d029eab50..ce40dc26b26f 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6Xuih0E+i5dxTlkYzYa0J3T0aNpCoGnnBo1tpfuzWQM=";
   };
 
diff --git a/pkgs/development/python-modules/tendo/default.nix b/pkgs/development/python-modules/tendo/default.nix
index 3c8dae032c69..89d826a9dfe2 100644
--- a/pkgs/development/python-modules/tendo/default.nix
+++ b/pkgs/development/python-modules/tendo/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pycontribs";
     repo = "tendo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZOozMGxAKcEtmUEzHCFSojKc+9Ha+T2MOTmMvdMqNuQ=";
   };
 
diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix
index aab6bc7e9df6..f5f658e2accf 100644
--- a/pkgs/development/python-modules/tensorboardx/default.nix
+++ b/pkgs/development/python-modules/tensorboardx/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lanpa";
     repo = "tensorboardX";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-m7RLDOMuRNLacnIudptBGjhcTlMk8+v/onz6Amqxb90=";
   };
 
diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix
index 338711d80f97..759c3ccd89ed 100644
--- a/pkgs/development/python-modules/tensordict/default.nix
+++ b/pkgs/development/python-modules/tensordict/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "tensordict";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jnRlN9gefR77pioIXf0qM1CP6EtpeQkBvVIecGkb/pw=";
   };
 
diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
index c2fb4e44e34a..19c5eefa5d0a 100644
--- a/pkgs/development/python-modules/tensorflow-metadata/default.nix
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "metadata";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MP5P4kFACT1guZVU3f9YrnKeQaUK0Tnu7edKRy4yvlM=";
   };
 
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 69df6b23d50a..be0c33711cea 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -294,7 +294,7 @@ let
     src = fetchFromGitHub {
       owner = "tensorflow";
       repo = "tensorflow";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0=";
     };
 
diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix
index c36c540d5b3b..1b46e61869d1 100644
--- a/pkgs/development/python-modules/tensorly/default.nix
+++ b/pkgs/development/python-modules/tensorly/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-A6Zlp8fa7XFgf4qpg7SEtNLlYSNtDGLuRUEfzD+crQc=";
   };
 
diff --git a/pkgs/development/python-modules/term-image/default.nix b/pkgs/development/python-modules/term-image/default.nix
index be9ebe87996d..71d257b77985 100644
--- a/pkgs/development/python-modules/term-image/default.nix
+++ b/pkgs/development/python-modules/term-image/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AnonymouX47";
     repo = "term-image";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uA04KHKLXW0lx1y5brpCDARLac4/C8VmVinVMkEtTdM=";
   };
 
diff --git a/pkgs/development/python-modules/termgraph/default.nix b/pkgs/development/python-modules/termgraph/default.nix
index b2ae6ae1f979..f0b6dcf9310e 100644
--- a/pkgs/development/python-modules/termgraph/default.nix
+++ b/pkgs/development/python-modules/termgraph/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mkaz";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0J9mEpDIdNEYwO+A+HBOaSw+Ct+HsbSPwGQYuYH6NN8=";
   };
 
diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix
index b5ce22702ae0..d4b6a15b86ae 100644
--- a/pkgs/development/python-modules/tesla-powerwall/default.nix
+++ b/pkgs/development/python-modules/tesla-powerwall/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jrester";
     repo = "tesla_powerwall";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cAsJKFM0i0e7w2T4HP4a5ybJGuDvBAGCGmPEKFzNFAY=";
   };
 
diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 33c304847a93..0d597aa998d2 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zabuldon";
     repo = "teslajsonpy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LvkStE5iIDfJ6U939JkVWqNsPLojGBXM/TFiJZpZ8tA=";
   };
 
diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix
index d4292ef2c370..fdedcc5feb41 100644
--- a/pkgs/development/python-modules/testrail-api/default.nix
+++ b/pkgs/development/python-modules/testrail-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tolstislon";
     repo = "testrail-api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GR1yhky33XZZFcPEO2WRvVUkmekG9HoM00doVgTCD+0=";
   };
 
diff --git a/pkgs/development/python-modules/texsoup/default.nix b/pkgs/development/python-modules/texsoup/default.nix
index 86519f929c7e..14f1c9cfbd2e 100644
--- a/pkgs/development/python-modules/texsoup/default.nix
+++ b/pkgs/development/python-modules/texsoup/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alvinwan";
     repo = "TexSoup";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XKYJycYivtrszU46B3Bd4JLrvckBpQu9gKDMdr6MyZU=";
   };
 
diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix
index 09e83fa1caeb..c05a399e83cc 100644
--- a/pkgs/development/python-modules/textile/default.nix
+++ b/pkgs/development/python-modules/textile/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "textile";
     repo = "python-textile";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KVDppsvX48loV9OJ70yqmQ5ZSypzcxrjH1j31DcyfM8=";
   };
 
diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix
index 0e2b1c4884be..694612a3dee6 100644
--- a/pkgs/development/python-modules/textual-dev/default.nix
+++ b/pkgs/development/python-modules/textual-dev/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual-dev";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug=";
   };
 
diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix
index 54f830cc85d3..d9827de19bdb 100644
--- a/pkgs/development/python-modules/textual-fastdatatable/default.nix
+++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "textual-fastdatatable";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-r1evN69etFn21TkXPLuAh1OxIsurDDyPyYOKQR5uUos=";
   };
 
diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index fb8639a84302..44ea52170e23 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "textual-textarea";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-tmbSCU1VgxR9aXG22UVpweD71dVmhKSRBTDm1Gf33jM=";
   };
 
diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
index 9da4e1e82ee7..3fa8943466b1 100644
--- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix
+++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "juftin";
     repo = "textual-universal-directorytree";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hUig0aJWSS0FsgRIrs74/uVaQgH6tczJWO5rj6TVOvQ=";
   };
 
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Textual plugin for a DirectoryTree compatible with remote filesystems";
     homepage = "https://github.com/juftin/textual-universal-directorytree";
-    changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
   };
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index ad3ae1d1b8de..919bd6fbf682 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-5msCFv79nAmoaP9gZxV3DXMLTyVlSFb+qyA5jHWwc50=";
   };
 
diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix
index 5049d5043775..cd904628903a 100644
--- a/pkgs/development/python-modules/tf2onnx/default.nix
+++ b/pkgs/development/python-modules/tf2onnx/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "onnx";
     repo = "tensorflow-onnx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qtRzckw/KHWm3gjFwF+cPuBhGbfktjhYIwImwHn2CFk=";
   };
 
diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix
index 2eb68c4f59d4..7e64bdf01990 100644
--- a/pkgs/development/python-modules/tgcrypto/default.nix
+++ b/pkgs/development/python-modules/tgcrypto/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyrogram";
     repo = "tgcrypto";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-u+mXzkmM79NBi4oHnb32RbN9WPnba/cm1q2Ko0uNEZg=";
   };
 
diff --git a/pkgs/development/python-modules/thelogrus/default.nix b/pkgs/development/python-modules/thelogrus/default.nix
index 2ba9c5c1fd9b..bed2a590a153 100644
--- a/pkgs/development/python-modules/thelogrus/default.nix
+++ b/pkgs/development/python-modules/thelogrus/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "thelogrus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-96/EjDh5XcTsfUcTnsltsT6LMYbyKuM/eNyeq2Pukfo=";
   };
 
diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix
index e3ea50474612..13346e2a821a 100644
--- a/pkgs/development/python-modules/thermobeacon-ble/default.nix
+++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "thermobeacon-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XeLTY78zg+5HR+GH9bHl2t86ifcWm7AA4zSwJOknsdc=";
   };
 
diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix
index ff83d59a08a3..54abab3cd808 100644
--- a/pkgs/development/python-modules/thermopro-ble/default.nix
+++ b/pkgs/development/python-modules/thermopro-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "thermopro-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xaRbp9XLCDGJ0NE0TzJygn2OzqvSFszs97vGHawCkzU=";
   };
 
diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix
index 263c48522220..a83a92e75d75 100644
--- a/pkgs/development/python-modules/thinqconnect/default.nix
+++ b/pkgs/development/python-modules/thinqconnect/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thinq-connect";
     repo = "pythinqconnect";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y/L/PhTBTUF8INqLgIi1llRrticlGPb8F/sPq3XWxN4=";
   };
 
diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix
index ae97c9a34732..d70d027dd91b 100644
--- a/pkgs/development/python-modules/threadpoolctl/default.nix
+++ b/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joblib";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XFgiCfcHwzjsjPDKask1X4JHTx1xeHfIFeSJWtbgJmU=";
   };
 
diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix
index c9e962a3acb0..db5292a9f5d6 100644
--- a/pkgs/development/python-modules/thriftpy2/default.nix
+++ b/pkgs/development/python-modules/thriftpy2/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Thriftpy";
     repo = "thriftpy2";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GBJL+IqZpT1/msJLiwiS5YDyB4hIe/e3pYPWx0A+lWY=";
   };
 
diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix
index 629ec3784559..42e006f77b45 100644
--- a/pkgs/development/python-modules/throttler/default.nix
+++ b/pkgs/development/python-modules/throttler/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uburuntu";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fE35zPjBUn4e1VRkkIUMtYJ/+LbnUxnxyfnU+UEPwr4=";
   };
 
diff --git a/pkgs/development/python-modules/thttp/default.nix b/pkgs/development/python-modules/thttp/default.nix
index afda125c5d4e..9954ef1b8c03 100644
--- a/pkgs/development/python-modules/thttp/default.nix
+++ b/pkgs/development/python-modules/thttp/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sesh";
     repo = "thttp";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-e15QMRMpTcWo8TfH3tk23ybSlXFb8F4B/eqAp9oyK8g=";
   };
 
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index e76ff173317c..29d8bb27c3f8 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB-Py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-9UgT09KnCqQ7ip7sSp64Yy8Pstf1GCOVYOG0WM2P840=";
   };
 
diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix
index 4f9813e806e9..f870643f01b6 100644
--- a/pkgs/development/python-modules/tilt-ble/default.nix
+++ b/pkgs/development/python-modules/tilt-ble/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "tilt-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg=";
   };
 
diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix
index c519c457df47..6794870e32d1 100644
--- a/pkgs/development/python-modules/time-machine/default.nix
+++ b/pkgs/development/python-modules/time-machine/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "time-machine";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0WYmkrMMeCkBYxy2qGovdxftzrYW9x/3tdeBcYC47Z0=";
   };
 
diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix
index e869dc7ddc85..3ea1c54cd49c 100644
--- a/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/pkgs/development/python-modules/timezonefinder/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jannikmi";
     repo = "timezonefinder";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8fDKgM6LVe7aJgD4UfTpg0EjKGuudzYsmqniocozmAE=";
   };
 
diff --git a/pkgs/development/python-modules/timing-asgi/default.nix b/pkgs/development/python-modules/timing-asgi/default.nix
index c67885f69260..e08bea2534fa 100644
--- a/pkgs/development/python-modules/timing-asgi/default.nix
+++ b/pkgs/development/python-modules/timing-asgi/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "steinnes";
     repo = "timing-asgi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oEDesmy9t2m51Zd6Zg87qoYbfbDnejfrbjyBkZ3hF58=";
   };
 
diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index 0601406e21fc..865960b475b3 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "pytorch-image-models";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Csw9Al9AHZbqfadch6JXSsjKfEj0KcLKxFbteDkcyng=";
   };
 
diff --git a/pkgs/development/python-modules/tiny-proxy/default.nix b/pkgs/development/python-modules/tiny-proxy/default.nix
index 48c2bb04f664..cc2ece83fc9e 100644
--- a/pkgs/development/python-modules/tiny-proxy/default.nix
+++ b/pkgs/development/python-modules/tiny-proxy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "romis2012";
     repo = "tiny-proxy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-59T09qcOstl/yfzQmNlTNxGerQethZntwDAHwz/5FFM=";
   };
 
diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix
index 5702722a4c9c..2631f4d0149e 100644
--- a/pkgs/development/python-modules/tinycss2/default.nix
+++ b/pkgs/development/python-modules/tinycss2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kozea";
     repo = "tinycss2";
-    rev = "refs/tags/${version}";
+    tag = version;
     # for tests
     fetchSubmodules = true;
     hash = "sha256-Exjxdm0VnnjHUKjquXsC/zDmwA7bELHdX1f55IGBjYk=";
diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix
index f62cefdbbd9f..347662b41722 100644
--- a/pkgs/development/python-modules/tinydb/default.nix
+++ b/pkgs/development/python-modules/tinydb/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "msiemens";
     repo = "tinydb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-N/45XB7ZuZiq25v6DQx4K9NRVnBbUHPeiKKbxQ9YB3E=";
   };
 
diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix
index c9bc6325b48d..b7826c8c01f2 100644
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tinygrad";
     repo = "tinygrad";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IIyTb3jDUSEP2IXK6DLsI15E5N34Utt7xv86aTHpXf8=";
   };
 
diff --git a/pkgs/development/python-modules/tinyrecord/default.nix b/pkgs/development/python-modules/tinyrecord/default.nix
index 137d386a652f..6b883f6721d7 100644
--- a/pkgs/development/python-modules/tinyrecord/default.nix
+++ b/pkgs/development/python-modules/tinyrecord/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "eugene-eeo";
     repo = "tinyrecord";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mF4hpHuNyiQ5DurRnyLck5e/Vp26GCLkhD8eeSB4NYs=";
   };
 
diff --git a/pkgs/development/python-modules/tinytag/default.nix b/pkgs/development/python-modules/tinytag/default.nix
index 935c7e4d0686..5f0a7a602588 100644
--- a/pkgs/development/python-modules/tinytag/default.nix
+++ b/pkgs/development/python-modules/tinytag/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tinytag";
     repo = "tinytag";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HSDEsyM9jGmS0o/EQj0GS/Ur4aepFgv8VpVNoJTyZGA=";
   };
 
diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix
index 20398ec3584d..f1668be64e25 100644
--- a/pkgs/development/python-modules/tinytuya/default.nix
+++ b/pkgs/development/python-modules/tinytuya/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jasonacox";
     repo = "tinytuya";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-T7bT4be/h67iPIH/7hjNCYsUDP+4o4HLV523sBIjGVs=";
   };
 
diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix
index b6bd8b10719c..4fd97242ccd3 100644
--- a/pkgs/development/python-modules/titlecase/default.nix
+++ b/pkgs/development/python-modules/titlecase/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ppannuto";
     repo = "python-titlecase";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-aJbbfNnQvmmYPXVOO+xx7ADetsxE+jnVQOVDzV5jUp8=";
   };
 
diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix
index 8859822716dd..8c2ade0628f9 100644
--- a/pkgs/development/python-modules/tldextract/default.nix
+++ b/pkgs/development/python-modules/tldextract/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "john-kurkowski";
     repo = "tldextract";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gcgQGZS/dsTTC4Szpjreb2fAsVZxxOCE1erVvU1q4xM=";
   };
 
diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index 3d58e0c755b3..dd6b0ed1c825 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ybqC0FUrTyTO2UfS/bCAUdzKtcK06wTeLv1Mv/R8RS0=";
   };
 
diff --git a/pkgs/development/python-modules/tls-client/default.nix b/pkgs/development/python-modules/tls-client/default.nix
index aea819eaca8e..d2a0c522c53c 100644
--- a/pkgs/development/python-modules/tls-client/default.nix
+++ b/pkgs/development/python-modules/tls-client/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FlorianREGAZ";
     repo = "Python-Tls-Client";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0eH9fA/oQzrgXcQilUdg4AaTqezj1Q9hP9olhZEDeBc=";
   };
 
diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix
index ceaea06ebd74..92ba131d7a05 100644
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "trendmicro";
     repo = "tlsh";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ht4LkcNmxPEvzFHXeS/XhPt/xo+0sE4RBcLCn9N/zwE=";
   };
 
diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix
index 1c4ff4eafcd8..c5d55d14daeb 100644
--- a/pkgs/development/python-modules/todoist-api-python/default.nix
+++ b/pkgs/development/python-modules/todoist-api-python/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Doist";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Xi3B/Nl5bMbW0lYwrkEbBgFTEl07YkFyN18kN0WyGyw=";
   };
 
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 2798c8544e0f..fc356f308356 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AuHau";
     repo = "toggl-cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RYOnlZxg3TZQO5JpmWlnUdL2hNFu4bjkdGU4c2ysqpA=";
   };
 
diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix
index 1af40f588f57..8faffa98b28f 100644
--- a/pkgs/development/python-modules/token-bucket/default.nix
+++ b/pkgs/development/python-modules/token-bucket/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "falconry";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg=";
   };
 
diff --git a/pkgs/development/python-modules/tokentrim/default.nix b/pkgs/development/python-modules/tokentrim/default.nix
index 0482ba5e110e..6aa7f9bd3113 100644
--- a/pkgs/development/python-modules/tokentrim/default.nix
+++ b/pkgs/development/python-modules/tokentrim/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KillianLucas";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zr2SLT3MBuMD98g9fdS0mLuijcssRQ/S3+tCq2Cw1/4=";
   };
 
diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix
index 8d6184cbc573..7fa28d92e00b 100644
--- a/pkgs/development/python-modules/toml-adapt/default.nix
+++ b/pkgs/development/python-modules/toml-adapt/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "toml-adapt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-KD5dTr/wxFbDg3AbfE0jUbgNjvxqDmbHwjY5Dmp6JFI=";
   };
 
diff --git a/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix
index 97cfb696c7b5..d2dcaa4897cb 100644
--- a/pkgs/development/python-modules/toonapi/default.nix
+++ b/pkgs/development/python-modules/toonapi/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-toonapi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RaN9ppqJbTik1/vNX0/YLoBawrqjyQWU6+FLTspIxug=";
   };
 
diff --git a/pkgs/development/python-modules/torch-audiomentations/default.nix b/pkgs/development/python-modules/torch-audiomentations/default.nix
index 7a4205268e3e..45bd654c6f6c 100644
--- a/pkgs/development/python-modules/torch-audiomentations/default.nix
+++ b/pkgs/development/python-modules/torch-audiomentations/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asteroid-team";
     repo = "torch-audiomentations";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0+5wc+mP4c221q6mdaqPalfumTOtdnkjnIPtLErOp9E=";
   };
 
diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix
index d1342510d7af..3c8d06334daa 100644
--- a/pkgs/development/python-modules/torch-geometric/default.nix
+++ b/pkgs/development/python-modules/torch-geometric/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pyg-team";
     repo = "pytorch_geometric";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Zw9YqPQw2N0ZKn5i5Kl4Cjk9JDTmvZmyO/VvIVr6fTU=";
   };
 
diff --git a/pkgs/development/python-modules/torch-pitch-shift/default.nix b/pkgs/development/python-modules/torch-pitch-shift/default.nix
index 754cd282a015..409e24a1f1a4 100644
--- a/pkgs/development/python-modules/torch-pitch-shift/default.nix
+++ b/pkgs/development/python-modules/torch-pitch-shift/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KentoNishi";
     repo = "torch-pitch-shift";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QuDz9IpmBdzfMjwAuG2Ln0x2OL/w3RVd/EfO4Ws78dw=";
   };
 
diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index ea07d68df4b7..a56d4df7d0cc 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -82,7 +82,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "audio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BRn4EZ7bIujGA6b/tdMu9yDqJNEaf/f1Kj45aLHC/JI=";
   };
 
diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix
index a10dad4b10c0..f86da623e86c 100644
--- a/pkgs/development/python-modules/torchinfo/default.nix
+++ b/pkgs/development/python-modules/torchinfo/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "TylerYep";
     repo = "torchinfo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pPjg498aT8y4b4tqIzNxxKyobZX01u+66ScS/mee51Q=";
   };
 
diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index 1be64b66d1d2..7f611e839326 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fepegar";
     repo = "torchio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Soew23+Skpc2IpVBMuOnC5LBW0vFL/9LszLijkJgQoQ=";
   };
 
diff --git a/pkgs/development/python-modules/torchprofile/default.nix b/pkgs/development/python-modules/torchprofile/default.nix
index a040283e9b14..2326d76c69c4 100644
--- a/pkgs/development/python-modules/torchprofile/default.nix
+++ b/pkgs/development/python-modules/torchprofile/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zhijian-liu";
     repo = "torchprofile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6vxZHQwBjKpy288wcANdJ9gmvIOZloLv+iN76TtqYAI=";
   };
 
diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index a1555b29357e..d84e66034801 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "rl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uDpOdOuHTqKFKspHOpl84kD9adEKZjvO2GnYuL27H5c=";
   };
 
diff --git a/pkgs/development/python-modules/torchsde/default.nix b/pkgs/development/python-modules/torchsde/default.nix
index 32ad7a3931f1..4f44bda9859b 100644
--- a/pkgs/development/python-modules/torchsde/default.nix
+++ b/pkgs/development/python-modules/torchsde/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "google-research";
     repo = "torchsde";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D0p2tL/VvkouXrXfRhMuCq8wMtzeoBTppWEG5vM1qCo=";
   };
 
diff --git a/pkgs/development/python-modules/torchsnapshot/default.nix b/pkgs/development/python-modules/torchsnapshot/default.nix
index 0c055f1089c1..37c882c9fd75 100644
--- a/pkgs/development/python-modules/torchsnapshot/default.nix
+++ b/pkgs/development/python-modules/torchsnapshot/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "torchsnapshot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-F8OaxLH8BL6MPNLFv1hBuVmeEdnEQ5w2Qny6by1wP6k=";
   };
 
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 2c81797f2e91..99aa4418cc42 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "vision";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BXvi4LoO2LZtNSE8lvFzcN4H2nN2fRg5/s7KRci7rMM=";
   };
 
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 47122a67d7ef..a4cbb09bf553 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tornadoweb";
     repo = "tornado";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qgJh8pnC1ALF8KxhAYkZFAc0DE6jHVB8R/ERJFL4OFc=";
   };
 
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 0d9997af8b3b..59e9ec764d56 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "tox";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-p3pghGQwCBIvkFI6pYuzoGSwAwfaz4vKpteh8nhXOhE=";
   };
 
diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix
index dd51ff779e2b..4f1a67923279 100644
--- a/pkgs/development/python-modules/tracerite/default.nix
+++ b/pkgs/development/python-modules/tracerite/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sanic-org";
     repo = "tracerite";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rI1MNdYl/P64tUHyB3qV9gfLbGbCVOXnEFoqFTkaqgg=";
   };
 
diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 91945de8dc89..115cbdc2fbdb 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "soft-matter";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6i1IfdxgV6bpf//mXATpnsQ0zN26S8rlL0/1ql68sd8=";
   };
 
diff --git a/pkgs/development/python-modules/trailrunner/default.nix b/pkgs/development/python-modules/trailrunner/default.nix
index 1e7a13cdaefd..a52ae2ccbcf2 100644
--- a/pkgs/development/python-modules/trailrunner/default.nix
+++ b/pkgs/development/python-modules/trailrunner/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "trailrunner";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-qtEBr22yyj6WcSfyYr/4r0IuuMJ6chFFqnmb+uMfQPA=";
   };
 
diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix
index 1f5662feba3f..e81a974a0e1a 100644
--- a/pkgs/development/python-modules/trainer/default.nix
+++ b/pkgs/development/python-modules/trainer/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "idiap";
     repo = "coqui-ai-Trainer";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-zm8BTfXvfwuWpmHFcSxuu+/V4bKanSBU2dniQboVdLY=";
   };
 
diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
index 35c19daedc08..4ffd5a149c0f 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "transaction";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8yvA2dvB69+EqsAa+hc93rgg6D64lcajl6JgFabhjwY=";
   };
 
diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix
index 499a47c2b999..b4857a4893b9 100644
--- a/pkgs/development/python-modules/translatepy/default.nix
+++ b/pkgs/development/python-modules/translatepy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Animenosekai";
     repo = "translate";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cx5OeBrB8il8KrcyOmQbQ7VCXoaA5RP++oTTxCs/PcM=";
   };
 
diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix
index cc2db015a14b..acb36edf7bdd 100644
--- a/pkgs/development/python-modules/transmission-rpc/default.nix
+++ b/pkgs/development/python-modules/transmission-rpc/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Trim21";
     repo = "transmission-rpc";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-t07TuLLHfbxvWh+7854OMigfGC8jHzvpd4QO3v0M15I=";
   };
 
diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index 88c7a1996e3a..fd41f06f7c65 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "py-tree-sitter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RWnt1g7WN5CDbgWY5YSTuPFZomoxtRgDaSLkG9y2B6w=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
index bca135f92a17..694ac20116db 100644
--- a/pkgs/development/python-modules/treeo/default.nix
+++ b/pkgs/development/python-modules/treeo/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgarciae";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw=";
   };
 
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index cc98867484a6..6f0de8163934 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cgarciae";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ=";
   };
 
diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix
index b76dba2b7692..df51c72de0e6 100644
--- a/pkgs/development/python-modules/trino-python-client/default.nix
+++ b/pkgs/development/python-modules/trino-python-client/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "trinodb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Hl88Keavyp1QBw67AFbevy/btzNs7UlsKQ93K02YgLM=";
   };
 
diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix
index 980ba19ace82..42464ef43cf0 100644
--- a/pkgs/development/python-modules/trio-asyncio/default.nix
+++ b/pkgs/development/python-modules/trio-asyncio/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = "trio-asyncio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6c+4sGEpCVC8wxBg+dYgkOwRAUOi/DTITrDx3M2koyE=";
   };
 
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index f9cc2f20e19c..ac07699d1cf4 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-trio";
     repo = "trio";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VJVGMhoLISCtNh56E7ssKXBPh4/WvUbFyKUbnWvqd0s=";
   };
 
diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix
index fee2015a8ab0..0cfca3c4d45a 100644
--- a/pkgs/development/python-modules/troposphere/default.nix
+++ b/pkgs/development/python-modules/troposphere/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cloudtools";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Mz6n7QjNvK2HEQeWCySdxioA1dD5CLUh7jCQb1Q6mdc=";
   };
 
diff --git a/pkgs/development/python-modules/truncnorm/default.nix b/pkgs/development/python-modules/truncnorm/default.nix
index b9b9d77b22f6..aa11cc342550 100644
--- a/pkgs/development/python-modules/truncnorm/default.nix
+++ b/pkgs/development/python-modules/truncnorm/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jluttine";
     repo = "truncnorm";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-F+RBXN/pjxmHf26/Vxptz1NbF58eqU018l3zmepSoJk=";
   };
 
diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix
index a4a6830d83d0..eaa8968ad23d 100644
--- a/pkgs/development/python-modules/truststore/default.nix
+++ b/pkgs/development/python-modules/truststore/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = "truststore";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc=";
   };
 
diff --git a/pkgs/development/python-modules/trx-python/default.nix b/pkgs/development/python-modules/trx-python/default.nix
index 556cf6118ec9..d3cefddc8e83 100644
--- a/pkgs/development/python-modules/trx-python/default.nix
+++ b/pkgs/development/python-modules/trx-python/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tee-ar-ex";
     repo = "trx-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gKPgP3GJ7QY0Piylk5L0HxnscRCREP1Hm5HZufL2h5g=";
   };
 
diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix
index dc0ef4e251aa..d8430b7922a3 100644
--- a/pkgs/development/python-modules/ttach/default.nix
+++ b/pkgs/development/python-modules/ttach/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "qubvel";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-R6QO+9hv0eI7dZW5iJf096+LU1q+vnmOpveurgZemPc=";
   };
 
diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix
index 062caa9996aa..d6ae488bb342 100644
--- a/pkgs/development/python-modules/ttfautohint-py/default.nix
+++ b/pkgs/development/python-modules/ttfautohint-py/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "fonttools";
     repo = "ttfautohint-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NTog461RpyHKo/Qpicj3tflehaKj9LlZEN9qeCMM6JQ=";
   };
 
diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix
index 53a0566eaaf2..331804ccd1b4 100644
--- a/pkgs/development/python-modules/ttls/default.nix
+++ b/pkgs/development/python-modules/ttls/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jschlyter";
     repo = "ttls";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-itGXZbQZ+HYpiwySLeGN3mPy3fgsxx0A9byOxIVpRBc=";
   };
 
diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix
index bba8ef790e7c..a6aecc553194 100644
--- a/pkgs/development/python-modules/ttn-client/default.nix
+++ b/pkgs/development/python-modules/ttn-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "angelnu";
     repo = "thethingsnetwork_python_client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dWEXoqW4JyYeLFLS3J4CaRJ45wjdVf8wrtMGCKgBds8=";
   };
 
diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix
index b4297f30fb97..90767ab2e25e 100644
--- a/pkgs/development/python-modules/ttp-templates/default.nix
+++ b/pkgs/development/python-modules/ttp-templates/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dmulyalin";
     repo = "ttp_templates";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Pntm/wUv/K0ci8U/+nBUVszuX8KT95gyp+i2N6NshKo=";
   };
 
diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index 653ba4ad7171..75300b1c514a 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dmulyalin";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w=";
   };
 
diff --git a/pkgs/development/python-modules/tuf/default.nix b/pkgs/development/python-modules/tuf/default.nix
index 320e9e240be2..2e36e0b3b56e 100644
--- a/pkgs/development/python-modules/tuf/default.nix
+++ b/pkgs/development/python-modules/tuf/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "theupdateframework";
     repo = "python-tuf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Qv9SH4ObC7bgPLd2Wu5XynBddlW6pycwLwaKhZ+l61k=";
   };
 
diff --git a/pkgs/development/python-modules/turrishw/default.nix b/pkgs/development/python-modules/turrishw/default.nix
index 56711ab866e6..014c7b83f851 100644
--- a/pkgs/development/python-modules/turrishw/default.nix
+++ b/pkgs/development/python-modules/turrishw/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "turris-cz";
     repo = "turrishw";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-elu2f54asdzdn7wQT2CKo8kVYnc1KTakRyr8Nxu+XNw=";
   };
 
diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index 4d368b403a1e..2bf18dcda4f1 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ugqa85l0eWVtMUl5d+BjEWvTyH8c5NVtsnPflkHTWh8=";
   };
 
diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix
index c89089104c66..abef5723d242 100644
--- a/pkgs/development/python-modules/twentemilieu/default.nix
+++ b/pkgs/development/python-modules/twentemilieu/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-twentemilieu";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-8tYa/fnc8km0Tl0N/OMP8GUUlIjzB8XP1Ivy9jDmY3s=";
   };
 
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 5befc37ddac4..bda6fe4c7014 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-sZhKFnCmARocnOqM1NE6eGU/6UtfJSQTK+bv5HHHU1U=";
   };
 
diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix
index 6b0d6db6ceed..cc93e28132cd 100644
--- a/pkgs/development/python-modules/twitchapi/default.nix
+++ b/pkgs/development/python-modules/twitchapi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Teekeks";
     repo = "pyTwitchAPI";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yN7KsiPnhGSm8wj44zn1TzGhRDIMflkKiRnBlVT5i2o=";
   };
 
diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix
index c9ee6a5af064..57eec9b4d78a 100644
--- a/pkgs/development/python-modules/twitterapi/default.nix
+++ b/pkgs/development/python-modules/twitterapi/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "geduldig";
     repo = "TwitterAPI";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4Z8XfgRhQXawCvaXM+kyMO3fejvXIF2LgVdmfXDDqIA=";
   };
 
diff --git a/pkgs/development/python-modules/txi2p-tahoe/default.nix b/pkgs/development/python-modules/txi2p-tahoe/default.nix
index 751facddfd1a..77e6cb77a5b0 100644
--- a/pkgs/development/python-modules/txi2p-tahoe/default.nix
+++ b/pkgs/development/python-modules/txi2p-tahoe/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
     repo = "txi2p";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-u/IOhxK9jWC/tTKKLsc4PexbCuki+yEtMNw7LuQKmuk=";
   };
 
diff --git a/pkgs/development/python-modules/txredisapi/default.nix b/pkgs/development/python-modules/txredisapi/default.nix
index d73b87b28621..27443da459bb 100644
--- a/pkgs/development/python-modules/txredisapi/default.nix
+++ b/pkgs/development/python-modules/txredisapi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "IlyaSkriblovsky";
     repo = "txredisapi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6Z2vurTAw9YHxvEiixtdxBH0YHj+Y9aTdsSkafPMZus=";
   };
 
diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix
index 0de0eea1ca8e..dab92fc79dc9 100644
--- a/pkgs/development/python-modules/typepy/default.nix
+++ b/pkgs/development/python-modules/typepy/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thombashi";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oIDVjJwapHun0Rk04zOZ4IjAh7qZ2k0BXK6zqFmtVds=";
   };
 
diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix
index 79c5468ebdf8..61052dcd5eb7 100644
--- a/pkgs/development/python-modules/typer-shell/default.nix
+++ b/pkgs/development/python-modules/typer-shell/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "FergusFettes";
     repo = "typer-shell";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fnqI+nKMaQocBWd9i/lqq8OzKwFdxJ8+7aYG5sNQ55E=";
   };
 
diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix
index 85b8b5c331e9..ed2cb82db7e8 100644
--- a/pkgs/development/python-modules/types-lxml/default.nix
+++ b/pkgs/development/python-modules/types-lxml/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "abelcheung";
     repo = "types-lxml";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-LQqs9wg6kgubY4SygTNQt5YTtF3LsFj7+RkAlcp4SSo=";
   };
 
diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix
index 3ed7693ce887..0eae662561a1 100644
--- a/pkgs/development/python-modules/typeshed-client/default.nix
+++ b/pkgs/development/python-modules/typeshed-client/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JelleZijlstra";
     repo = "typeshed_client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dEfKZ930Jxa84HUqKpsL2JWQLeeWx6gIMtFHTbiw3Es=";
   };
 
diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix
index 2d8928d2455f..6c59fb927ef5 100644
--- a/pkgs/development/python-modules/typical/default.nix
+++ b/pkgs/development/python-modules/typical/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "seandstewart";
     repo = "typical";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RS4hJ7NufClroRPRO3EyHwDaMgg0s0F7D/mqcBr8O18=";
   };
 
diff --git a/pkgs/development/python-modules/typing-validation/default.nix b/pkgs/development/python-modules/typing-validation/default.nix
index 01f9b43b4ba5..172a23f459ba 100644
--- a/pkgs/development/python-modules/typing-validation/default.nix
+++ b/pkgs/development/python-modules/typing-validation/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hashberg-io";
     repo = "typing-validation";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0scXoAPkx/VBIbNRMtFoRRbmGpC2RzNRmQG4mRXSxrs=";
   };
 
diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix
index 8e9677c0d3bc..24ed70098a0b 100644
--- a/pkgs/development/python-modules/typish/default.nix
+++ b/pkgs/development/python-modules/typish/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ramonhagenaars";
     repo = "typish";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LnOg1dVs6lXgPTwRYg7uJ3LCdExYrCxS47UEJxKHhVU=";
   };
 
diff --git a/pkgs/development/python-modules/ua-parser-rs/default.nix b/pkgs/development/python-modules/ua-parser-rs/default.nix
index 3bcf626be55c..551c2154ec3e 100644
--- a/pkgs/development/python-modules/ua-parser-rs/default.nix
+++ b/pkgs/development/python-modules/ua-parser-rs/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ua-parser";
     repo = "uap-rust";
-    rev = "refs/tags/ua-parser-rs-${version}";
+    tag = "ua-parser-rs-${version}";
     hash = "sha256-+qAYNGZFOkQyHhzqZZGrxgKHrPTWolO/4KKuppIMSRE=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix
index 89cb811fbbab..9544dbe3f688 100644
--- a/pkgs/development/python-modules/ua-parser/default.nix
+++ b/pkgs/development/python-modules/ua-parser/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ua-parser";
     repo = "uap-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-byKtxmuYIsEYyuUmfnbLhfe7EKj0k7QGkK5HewiTiy4=";
   };
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "ua_parser" ];
 
   meta = {
-    changelog = "https://github.com/ua-parser/uap-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+    changelog = "https://github.com/ua-parser/uap-python/releases/tag/${version}";
     description = "Python implementation of the UA Parser";
     homepage = "https://github.com/ua-parser/uap-python";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 122ecccb046b..46decc51d931 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-uamqp-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-HTIOHheCrvyI7DwA/UcUXk/fbesd29lvUvJ9TAeG3CE=";
   };
 
diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
index 97a3d0a403ea..ed7968ebd9f2 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6dOi7+quWvASl2RHetULK5zixHFJlj/D6667o99ceSs=";
   };
 
diff --git a/pkgs/development/python-modules/uart-devices/default.nix b/pkgs/development/python-modules/uart-devices/default.nix
index 790bee28b635..a8ae51c93c63 100644
--- a/pkgs/development/python-modules/uart-devices/default.nix
+++ b/pkgs/development/python-modules/uart-devices/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "uart-devices";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rmOWyTdOwnlr8Rwsvd2oeZq79LuGVJDAkIW2/9gGrKQ=";
   };
 
diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix
index 11491426bd09..9c501d0e5594 100644
--- a/pkgs/development/python-modules/ubelt/default.nix
+++ b/pkgs/development/python-modules/ubelt/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Erotemic";
     repo = "ubelt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ygoJqyTscfuZVDGVbrZobZFvlcuF4HavTU65tmhyU+w=";
   };
 
diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix
index 42d4f11a2e71..40f6db04b0a0 100644
--- a/pkgs/development/python-modules/uc-micro-py/default.nix
+++ b/pkgs/development/python-modules/uc-micro-py/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tsutsu3";
     repo = "uc.micro-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z7XHWeV5I/y19EKg4lzcl9pwRexWnSQ7d8CpQu5xdnI=";
   };
 
diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix
index 1c506a92b6da..a55cab3aec9d 100644
--- a/pkgs/development/python-modules/ucsmsdk/default.nix
+++ b/pkgs/development/python-modules/ucsmsdk/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CiscoUcs";
     repo = "ucsmsdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iqwU42Im4/YyxefkJZ8Zn5CddjUzuZk/7zjLD/0pHm4=";
   };
 
diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 97e4106c804b..13237ffd853b 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "ufmt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
   };
 
diff --git a/pkgs/development/python-modules/ufomerge/default.nix b/pkgs/development/python-modules/ufomerge/default.nix
index 99e7666584e1..8f59f650ccc9 100644
--- a/pkgs/development/python-modules/ufomerge/default.nix
+++ b/pkgs/development/python-modules/ufomerge/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "ufomerge";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-D+BhKCKWgprQn+eXFgwnSN/06+JF5CiUS0VAS1Kvedw=";
   };
 
diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix
index b4d7fa157605..06144b135944 100644
--- a/pkgs/development/python-modules/uharfbuzz/default.nix
+++ b/pkgs/development/python-modules/uharfbuzz/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "harfbuzz";
     repo = "uharfbuzz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-N/Vprr1lJmDLUzf+aX374YbJhDuHOpPzNeYXpLOANeI=";
   };
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index c20c2b2a624a..311686a205c5 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "uilibs";
     repo = "uiprotect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZohQTXOLc2E0vfD21IUh6ECTfbAd2SZOg/73lk/UMO0=";
   };
 
diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix
index 58a84849c5d9..0db9799f68c6 100644
--- a/pkgs/development/python-modules/ulid-transform/default.nix
+++ b/pkgs/development/python-modules/ulid-transform/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "ulid-transform";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-99hq329jUpok+rP8WzxN1yTOp15Zfy7tIGRpQMecrc0=";
   };
 
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 9d91c6d94ffa..a429e0e4fde2 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lmcinnes";
     repo = "umap";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
     hash = "sha256-hPYmRDSeDa4JWGekUVq3CWf5NthHTpMpyuUQ1yIkVAE=";
   };
 
diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix
index d45aebe8d062..b1a33f1a1d9b 100644
--- a/pkgs/development/python-modules/umodbus/default.nix
+++ b/pkgs/development/python-modules/umodbus/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AdvancedClimateSystems";
     repo = "uModbus";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-5IXadb5mjrMwr+L9S1iMN5kba5VGrzYt1p8nBvvLCh4=";
   };
 
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index 37998350b269..e7bfba65d81d 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lmfit";
     repo = "uncertainties";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cm0FeJCxyBLN0GCKPnscBCx9p9qCDQdwRfhBRgQIhAo=";
   };
 
diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix
index ce34f9e32791..550ac9319a0a 100644
--- a/pkgs/development/python-modules/unicode-rbnf/default.nix
+++ b/pkgs/development/python-modules/unicode-rbnf/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "unicode-rbnf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1kq8qTzFYYRRjlxBdvIiBuXbprA0bF4zMFOVbpgCR3c=";
   };
 
diff --git a/pkgs/development/python-modules/unicodeit/default.nix b/pkgs/development/python-modules/unicodeit/default.nix
index 30372a2c8e83..31fce854c35f 100644
--- a/pkgs/development/python-modules/unicodeit/default.nix
+++ b/pkgs/development/python-modules/unicodeit/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "svenkreiss";
     repo = "unicodeit";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NeR3fGDbOzwyq85Sep9KuUiARCvefN6l5xcb8D/ntHE=";
   };
 
diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix
index 9c992870f669..39d7c6b532f4 100644
--- a/pkgs/development/python-modules/unicrypto/default.nix
+++ b/pkgs/development/python-modules/unicrypto/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skelsec";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-mZEnYVM5r4utiGwM7bp2SwaDjYsH8AR/Qm5UdPNke0w=";
   };
 
diff --git a/pkgs/development/python-modules/unidic/default.nix b/pkgs/development/python-modules/unidic/default.nix
index 69e38dafef06..02f6d4d6bd80 100644
--- a/pkgs/development/python-modules/unidic/default.nix
+++ b/pkgs/development/python-modules/unidic/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "polm";
     repo = "unidic-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-srhQDXGgoIMhYuCbyQB3kF4LrODnoOqLbjBQMvhPieY=";
   };
 
diff --git a/pkgs/development/python-modules/unifi-ap/default.nix b/pkgs/development/python-modules/unifi-ap/default.nix
index 44f6eda6dba6..ffca152adf94 100644
--- a/pkgs/development/python-modules/unifi-ap/default.nix
+++ b/pkgs/development/python-modules/unifi-ap/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tofuSCHNITZEL";
     repo = "unifi_ap";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LQqeXFtrOc1h3yJuDrFRt3mqVcDIJb/23rcu/l6YpUQ=";
   };
 
diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix
index 198b17949891..327d75c33ff0 100644
--- a/pkgs/development/python-modules/unifi-discovery/default.nix
+++ b/pkgs/development/python-modules/unifi-discovery/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "unifi-discovery";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Ea+zxV2GUAaG/BxO103NhOLzzr/TNJaOsynDad2/2VA=";
   };
 
diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix
index 061129e80725..95393e5d0c6d 100644
--- a/pkgs/development/python-modules/unify/default.nix
+++ b/pkgs/development/python-modules/unify/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "myint";
     repo = "unify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cWV/Q+LbeIxnQNqyatRWQUF8X+HHlQdc10y9qJ7v3dA=";
   };
 
diff --git a/pkgs/development/python-modules/unique-log-filter/default.nix b/pkgs/development/python-modules/unique-log-filter/default.nix
index 45e86a083dad..4800df2fc361 100644
--- a/pkgs/development/python-modules/unique-log-filter/default.nix
+++ b/pkgs/development/python-modules/unique-log-filter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "twizmwazin";
     repo = "unique_log_filter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-av1pVPDsO2dto5fhBK74jKfVsVY2ChyUE5NNja2B1Qw=";
   };
 
diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix
index 030ab4337ec7..e3b7f3ea8e9f 100644
--- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix
+++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xmlrunner";
     repo = "unittest-xml-reporting";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-lOJ/+8CVJUXdIaZLLF5PpPkG0DzlNgo46kRZ1Xy7Ju0=";
   };
 
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index 97aeed521d3e..b2177f6638b9 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "universal-silabs-flasher";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM=";
   };
 
diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix
index f21eff8ec6f9..786392e556db 100644
--- a/pkgs/development/python-modules/unpaddedbase64/default.nix
+++ b/pkgs/development/python-modules/unpaddedbase64/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "python-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1n6har8pxv0mqb96lanzihp1xf76aa17jw3977drb1fgz947pnmz";
   };
 
diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix
index 656fa897e8d2..6413392c7163 100644
--- a/pkgs/development/python-modules/unstructured-api-tools/default.nix
+++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-api-tools";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-t1fK40ayR2bxc1iMIwvn/OHuyVlR98Gq+NpIhOmaP+4=";
   };
 
diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix
index 28991d89734a..047d38464e5b 100644
--- a/pkgs/development/python-modules/unstructured-inference/default.nix
+++ b/pkgs/development/python-modules/unstructured-inference/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-inference";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2k7gFlBUevVnz2A5pvUE4eIGmXwEr5s4F8BbX6j5lzc=";
   };
 
diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index ee50e19cea93..cd250b7fe42c 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -123,7 +123,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+I5eXG/ICmYPDTavDnyLlopIvoABjdDwOyfotrNs6qs=";
   };
 
diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix
index 097ad96a7c91..59b8ba763c8e 100644
--- a/pkgs/development/python-modules/untangle/default.nix
+++ b/pkgs/development/python-modules/untangle/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "stchris";
     repo = "untangle";
     # 1.1.1 is not tagged on GitHub
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cJkN8vT5hW5hRuLxr/6udwMO4GVH1pJhAc6qmPO2EEI=";
   };
 
diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix
index 0dde8e7401e5..6bcdb0953fb6 100644
--- a/pkgs/development/python-modules/upb-lib/default.nix
+++ b/pkgs/development/python-modules/upb-lib/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gwww";
     repo = "upb-lib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-GnNzKU4mqBu2pUOju+4+HMLsTupd8s+nAAieixkBCDk=";
   };
 
diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix
index 3ed1ec0028a6..e4b35381fbd7 100644
--- a/pkgs/development/python-modules/upcloud-api/default.nix
+++ b/pkgs/development/python-modules/upcloud-api/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-python-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RDGRue9hejNPKIP61GtJHMG5rG3CKvJdsYxVrp6I5W0=";
   };
 
diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix
index 6d7affece0c6..dd8e8cbea634 100644
--- a/pkgs/development/python-modules/uplc/default.nix
+++ b/pkgs/development/python-modules/uplc/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "OpShin";
     repo = "uplc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-xK2k0XLybWqyP5Qa2Oby8YBgiiswR++yVK7NPgpdSa0=";
   };
 
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 196879d2e17e..fb49f9b6e9cc 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a5gCsv8iBUUASHCJIpxFbgBXTSm/KJOTt6fvSvP/Lio=";
   };
 
diff --git a/pkgs/development/python-modules/uri-template/default.nix b/pkgs/development/python-modules/uri-template/default.nix
index 27f91bad92c9..c96b60c1baf2 100644
--- a/pkgs/development/python-modules/uri-template/default.nix
+++ b/pkgs/development/python-modules/uri-template/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "plinss";
     repo = "uri_template";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-38HFFqM6yfpsPrhIpE639ePy/NbLqKw7gbnE3y8sL3w=";
   };
 
diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix
index 32e2ad88014e..bac278b2b3be 100644
--- a/pkgs/development/python-modules/urwid-readline/default.nix
+++ b/pkgs/development/python-modules/urwid-readline/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rr-";
     repo = "urwid_readline";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HiMMLzVE/Qw/PR7LXACyfzblxrGYrbMoi3/e/QzqF34=";
   };
 
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 0094bb972a91..bde14cb87407 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "urwid";
     repo = "urwid";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE=";
   };
 
diff --git a/pkgs/development/python-modules/urwidgets/default.nix b/pkgs/development/python-modules/urwidgets/default.nix
index 3f528c40a533..12dfa6b23d62 100644
--- a/pkgs/development/python-modules/urwidgets/default.nix
+++ b/pkgs/development/python-modules/urwidgets/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AnonymouX47";
     repo = "urwidgets";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RgY7m0smcdUspGkCdzepxruEMDq/mAsVFNjHMLoWAyc=";
   };
 
diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index c50502c3df54..3928a034a08c 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pazz";
     repo = "urwidtrees";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g=";
   };
 
diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix
index bf86e943e2c7..9b3ab579de1a 100644
--- a/pkgs/development/python-modules/usb-devices/default.nix
+++ b/pkgs/development/python-modules/usb-devices/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c=";
   };
 
diff --git a/pkgs/development/python-modules/usb-protocol/default.nix b/pkgs/development/python-modules/usb-protocol/default.nix
index fa21782fc1cc..e75884ffa4b3 100644
--- a/pkgs/development/python-modules/usb-protocol/default.nix
+++ b/pkgs/development/python-modules/usb-protocol/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "python-usb-protocol";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CYbXs/SRC1FAVEzfw0gwf6U0qQ9Q34nyuj5yfjHfDn8=";
   };
 
diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix
index bfb650c91c0b..3c522d4f7f8f 100644
--- a/pkgs/development/python-modules/usort/default.nix
+++ b/pkgs/development/python-modules/usort/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "usort";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-iezq2K+Rw0djyOoFm7tguw/vkkDSyrPZIfZPmaZvFpM=";
   };
 
diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix
index 8bcf22c0806c..afaab0bce2a5 100644
--- a/pkgs/development/python-modules/uvcclient/default.nix
+++ b/pkgs/development/python-modules/uvcclient/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-V7xIvZ9vIXHPpkEeJZ6QedWk+4ZVNwCzj5ffLyixFz4=";
   };
 
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index aded817044b3..28f2a7b4c3e0 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "encode";
     repo = "uvicorn";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Kx5OwIMqstiFCkqE2wunKSkttd9C8gM+a2KWJuhBN1c=";
   };
 
diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index c8270aa16700..5742d48e31bc 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lN9kcpNVSPNRWwF9rltweqHJpzqsYrKeP0KEQRwiltk=";
   };
 
diff --git a/pkgs/development/python-modules/vaa/default.nix b/pkgs/development/python-modules/vaa/default.nix
index a94ca49b9131..2c5f79f51e30 100644
--- a/pkgs/development/python-modules/vaa/default.nix
+++ b/pkgs/development/python-modules/vaa/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "life4";
     repo = pname;
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-24GTTJSZ55ejyHoWP1/S3DLTKvOolAJr9UhWoOm84CU=";
   };
 
diff --git a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix
index 0eb545df0b2a..10b2af6260e8 100644
--- a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix
+++ b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PiotrMachowski";
     repo = "Python-package-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wX7RsJKSNZmi6uIDqsKxWe8VaYJPg4I3pwHHckMUOw4=";
   };
 
diff --git a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix
index 7346d779c4c2..ef579255e1db 100644
--- a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix
+++ b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "PiotrMachowski";
     repo = "Python-package-${pname}";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-y7Q8C7ZvOn/KSUMJ7A/oH+HZMVBpuPitsXqsqHvvYHE=";
   };
 
diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix
index 341739ff6e5a..19ed6d8df010 100644
--- a/pkgs/development/python-modules/validator-collection/default.nix
+++ b/pkgs/development/python-modules/validator-collection/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "insightindustry";
     repo = "validator-collection";
-    rev = "refs/tags/v.${version}";
+    tag = "v.${version}";
     hash = "sha256-CDPfIkZZRpl1rAzNpLKJfaBEGWUl71coic2jOHIgi6o=";
   };
 
diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix
index 180296b11374..3ba415dbd317 100644
--- a/pkgs/development/python-modules/validators/default.nix
+++ b/pkgs/development/python-modules/validators/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-validators";
     repo = "validators";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-1QKo6nidaHeKCbti/xALbgylHYbtBUJlWrjhNtdx8kU=";
   };
 
diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix
index 9d0d63e1ca7c..eb1146e7cf46 100644
--- a/pkgs/development/python-modules/vallox-websocket-api/default.nix
+++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yozik04";
     repo = "vallox_websocket_api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jJ+FFDU4w1vdCqErz6ksJDvjFcalSAwaH+G77BNI5/E=";
   };
 
diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix
index 28f08948fce1..1eaa92a65ef3 100644
--- a/pkgs/development/python-modules/vdf/default.nix
+++ b/pkgs/development/python-modules/vdf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ValvePython";
     repo = "vdf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU=";
   };
 
diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index df2cffc98b4a..99c5e9316436 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "vector";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lj6ZloBGZqHW0g7lCD7m9zvszJceB9TQ3r6B3Xuj5KE=";
   };
 
diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix
index d75c24a61759..2e06c02de5c7 100644
--- a/pkgs/development/python-modules/vehicle/default.nix
+++ b/pkgs/development/python-modules/vehicle/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-vehicle";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MPK5Aim/kGXLMOapttkp5ygl8gIlHv0675sBBf6kyAA=";
   };
 
diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix
index f43ff25f6555..cbbe9107c87b 100644
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Cereal2nd";
     repo = "velbus-aio";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hYtZgr5HJj1zjiCXBK63086ke/oWhO9CyIvnN/JUPm4=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix
index 613859ff61e0..26efcbda2dc4 100644
--- a/pkgs/development/python-modules/versioneer/default.nix
+++ b/pkgs/development/python-modules/versioneer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-versioneer";
     repo = "python-versioneer";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-3b7Wfhd24Vym5XCeN/M1832Q1VzvlWi3quTRaZrID2s=";
   };
 
diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix
index 69c55a42035e..820b8759bfbd 100644
--- a/pkgs/development/python-modules/vg/default.nix
+++ b/pkgs/development/python-modules/vg/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lace";
     repo = "vg";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZNUAfkhjmsxD8cH0fR8Htjs+/F/3R9xfe1XgRyndids=";
   };
 
diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix
index 523480b3a4a4..d48059332148 100644
--- a/pkgs/development/python-modules/viewstate/default.nix
+++ b/pkgs/development/python-modules/viewstate/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "yuvadm";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cXT5niE3rNdqmNqnITWy9c9/MF0gZ6LU2i1uzfOzkUI=";
   };
 
diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix
index d8d93c6fa390..763445cc9ad0 100644
--- a/pkgs/development/python-modules/vilfo-api-client/default.nix
+++ b/pkgs/development/python-modules/vilfo-api-client/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ManneW";
     repo = "vilfo-api-client-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ZlmriBd+M+54ux/UNYa355mkz808/NxSz7IzmWouA0c=";
   };
 
diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix
index f9435e61a32e..8b378674a128 100644
--- a/pkgs/development/python-modules/viv-utils/default.nix
+++ b/pkgs/development/python-modules/viv-utils/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "williballenthin";
     repo = "viv-utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NiXLNsRQ/ah+fB2r91A1oqf/8Yt95Vdt2JQFJE73HXo=";
   };
 
diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix
index 76fb2fc98ef5..6e69f57b9af5 100644
--- a/pkgs/development/python-modules/vncdo/default.nix
+++ b/pkgs/development/python-modules/vncdo/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sibson";
     repo = "vncdotool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QrD6z/g85FwaZCJ1PRn8CBKCOQcbVjQ9g0NpPIxguqk=";
   };
 
diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix
index 6efe98de158c..8ce6eab7d732 100644
--- a/pkgs/development/python-modules/voip-utils/default.nix
+++ b/pkgs/development/python-modules/voip-utils/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "voip-utils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OlvZSVuoGQi0QEusl01nbw3oD75NfMsbpNOPQgWYu+c=";
   };
 
diff --git a/pkgs/development/python-modules/volatile/default.nix b/pkgs/development/python-modules/volatile/default.nix
index 931980ebc356..3ad6ca654247 100644
--- a/pkgs/development/python-modules/volatile/default.nix
+++ b/pkgs/development/python-modules/volatile/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mbr";
     repo = "volatile";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TYUvr0bscM/FaPk9oiF4Ob7HdKa2HlbpEFmaPfh4ir0=";
   };
 
diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix
index 9335402ea3f9..c6375bfb24b6 100644
--- a/pkgs/development/python-modules/volkswagencarnet/default.nix
+++ b/pkgs/development/python-modules/volkswagencarnet/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "robinostlund";
     repo = "volkswagencarnet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NpfkhFGxd3VjLjQ8pPpamYgwc5zqWt5CojONe4L1s4s=";
   };
 
diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix
index 6b14f37d9e08..1ff7a7739fbd 100644
--- a/pkgs/development/python-modules/volkszaehler/default.nix
+++ b/pkgs/development/python-modules/volkszaehler/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-volkszaehler";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7SB0x0BO9SMeMG1M/hH4fX7oDbtwPgCzyRrrUq1/WPo=";
   };
 
diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix
index f23b771e8306..9f97c89961d6 100644
--- a/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "voluptuous-serialize";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vvreXSQDkA3JkZpOKZqJgMRyObJX/cSR8r+A26h9fNE=";
   };
 
diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix
index 75293125764f..df56f903e01e 100644
--- a/pkgs/development/python-modules/voluptuous/default.nix
+++ b/pkgs/development/python-modules/voluptuous/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alecthomas";
     repo = "voluptuous";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-TGTdYme3ZRM51YFNX/ESFc6+3QpeO/gAXYW6MT73/Ss=";
   };
 
diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix
index c61971b587f4..0e4deae81b5a 100644
--- a/pkgs/development/python-modules/volvooncall/default.nix
+++ b/pkgs/development/python-modules/volvooncall/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "molobrakos";
     repo = "volvooncall";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xr3g93rt3jvxVZrZY7cFh5eBP3k0arsejsgvx8p5EV4=";
   };
 
diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index 6a340fbeeb12..cb1440b51602 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "vt-py";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-r6pEtq/GQzVY+gRzY2KZfSQEyp4ZoFRLBd8tlXp/aM8=";
   };
 
diff --git a/pkgs/development/python-modules/vtjp/default.nix b/pkgs/development/python-modules/vtjp/default.nix
index 76661675f681..e1c39a0a668a 100644
--- a/pkgs/development/python-modules/vtjp/default.nix
+++ b/pkgs/development/python-modules/vtjp/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Miicroo";
     repo = "python-vasttrafik";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3/toHY2PkG87J5bIMNJZHF/4mUvWaeHamMzPa1St7Xo=";
   };
 
diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix
index 5d0ec713cffe..2baaa546ce5f 100644
--- a/pkgs/development/python-modules/vulcan-api/default.nix
+++ b/pkgs/development/python-modules/vulcan-api/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kapi2289";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FEWm5DvnrEIelRnu/IgWU7h1CTvPQcZ3DbFS2swy/wQ=";
   };
 
diff --git a/pkgs/development/python-modules/vulkan/default.nix b/pkgs/development/python-modules/vulkan/default.nix
index a0479a50f7ab..0ca9dbdd8d27 100644
--- a/pkgs/development/python-modules/vulkan/default.nix
+++ b/pkgs/development/python-modules/vulkan/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "realitix";
     repo = "vulkan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-b1jHNKdHF7pIC6H4O2yxy36Ppb60J0uN2P0WaCw51Gc=";
   };
 
diff --git a/pkgs/development/python-modules/wagtail-factories/default.nix b/pkgs/development/python-modules/wagtail-factories/default.nix
index 03c2c09a2318..c464466d65ae 100644
--- a/pkgs/development/python-modules/wagtail-factories/default.nix
+++ b/pkgs/development/python-modules/wagtail-factories/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "wagtail";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-jo8VwrmxHBJnORmuR6eTLrf/eupNL2vhXcw81EzfTxM=";
   };
 
diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix
index 2f3988e0af41..5aa55a5405c1 100644
--- a/pkgs/development/python-modules/wagtail-modeladmin/default.nix
+++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     repo = pname;
     owner = "wagtail-nest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IG7e7YomMM7K2IlJ1Dr1zo+blDPHnu/JeS5csos8ncc=";
   };
 
diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix
index 6d2125c8e735..b14ec720ea41 100644
--- a/pkgs/development/python-modules/wakeonlan/default.nix
+++ b/pkgs/development/python-modules/wakeonlan/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "remcohaszing";
     repo = "pywakeonlan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io=";
   };
 
diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
index e5513ff4ac9a..92b58509c7d6 100644
--- a/pkgs/development/python-modules/walrus/default.nix
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = "walrus";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-cvoRiaGGTpZWfSE6DDT6GwDmc/TC/Z/E76Qy9Zzkpsw=";
   };
 
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index eb0d02f8af11..0872f5283e6f 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -79,7 +79,7 @@ let
   src = fetchFromGitHub {
     owner = "wandb";
     repo = "wandb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nx50baneYSSIWPAIOkUk4cGCNpWAhv7IwFDQJ4vUMiw=";
   };
 
diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix
index 6c4327549bb5..a8584b32598b 100644
--- a/pkgs/development/python-modules/ward/default.nix
+++ b/pkgs/development/python-modules/ward/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "darrenburns";
     repo = "ward";
-    rev = "refs/tags/release%2F${version}";
+    tag = "release%2F${version}";
     hash = "sha256-4dEMEEPySezgw3dIcYMl56HrhyaYlql9JvtamOn7Y8g=";
   };
 
diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
index 5445631c4d15..0725368b171b 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bcwaldon";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HOCLzFYmOL/tCXT+NO/tCZuVXVowNEPP3g33ZYg4+6Q=";
   };
 
diff --git a/pkgs/development/python-modules/watchdog-gevent/default.nix b/pkgs/development/python-modules/watchdog-gevent/default.nix
index 743a523a5865..610ad9cb4d22 100644
--- a/pkgs/development/python-modules/watchdog-gevent/default.nix
+++ b/pkgs/development/python-modules/watchdog-gevent/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bogdanp";
     repo = "watchdog_gevent";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY=";
   };
 
diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix
index 705be5e6c047..f6710e1523a9 100644
--- a/pkgs/development/python-modules/watchfiles/default.nix
+++ b/pkgs/development/python-modules/watchfiles/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "samuelcolvin";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uc4CfczpNkS4NMevtRxhUOj9zTt59cxoC0BXnuHFzys=";
   };
 
diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix
index 2eb9b2cbd8be..266138ddd71a 100644
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sdague";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf";
   };
 
diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix
index 5eefa67895c5..b44ca8eda645 100644
--- a/pkgs/development/python-modules/watermark/default.nix
+++ b/pkgs/development/python-modules/watermark/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rasbt";
     repo = "watermark";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UR4kV6UoZ/JLO19on+qEH+M05QIsT0SXvXJtTMCKuZM=";
   };
 
diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix
index c0e67979e89b..9711e2684038 100644
--- a/pkgs/development/python-modules/wavefile/default.nix
+++ b/pkgs/development/python-modules/wavefile/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vokimon";
     repo = "python-wavefile";
-    rev = "refs/tags/python-wavefile-${version}";
+    tag = "python-wavefile-${version}";
     hash = "sha256-TLSWhLARY+3sHkl2p3d3LDGzLu6DggjTJWFpyrwRXSI=";
   };
 
diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix
index 16987cee2cd1..06a2db7b0795 100644
--- a/pkgs/development/python-modules/weasel/default.nix
+++ b/pkgs/development/python-modules/weasel/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "weasel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-gXPHEoEY0qKcpAtqHlUw5c43/6hKseCx+vBNzEXFF2A=";
   };
 
diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix
index d4417374d491..a54c38724650 100644
--- a/pkgs/development/python-modules/weatherflow4py/default.nix
+++ b/pkgs/development/python-modules/weatherflow4py/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jeeftor";
     repo = "weatherflow4py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NOruMysLm0Pu2fsaA/qCNdeCTacomvJ51oqI8V2WFWI=";
   };
 
diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix
index 476445e0d462..351f1c6ff8e2 100644
--- a/pkgs/development/python-modules/webauthn/default.nix
+++ b/pkgs/development/python-modules/webauthn/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "duo-labs";
     repo = "py_webauthn";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NBCR5GwmXA6COP9NOYnoD3l1vuOpym/kyNawd8FstLc=";
   };
 
diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix
index 07c43828b2ab..9a3a3cf63d07 100644
--- a/pkgs/development/python-modules/webdataset/default.nix
+++ b/pkgs/development/python-modules/webdataset/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "webdataset";
     repo = "webdataset";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L9RUQItmW/7O/eTst2Sl/415EP4Jo662bKWbYA6p5bk=";
   };
 
diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix
index ce0d6d58b61f..4f40d993758b 100644
--- a/pkgs/development/python-modules/webdav4/default.nix
+++ b/pkgs/development/python-modules/webdav4/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "skshetry";
     repo = "webdav4";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LgWYgERRuUODFzUnC08kDJTVRx9vanJ+OU8sREEMVwM=";
   };
 
diff --git a/pkgs/development/python-modules/webdriver-manager/default.nix b/pkgs/development/python-modules/webdriver-manager/default.nix
index 7d6616f1538d..beee52645bb8 100644
--- a/pkgs/development/python-modules/webdriver-manager/default.nix
+++ b/pkgs/development/python-modules/webdriver-manager/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "SergeyPirogov";
     repo = "webdriver_manager";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ZmrQa/2vPwYgSvY3ZUvilg4RizVXpu5hvJJBQVXkK8E=";
   };
 
diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix
index 30eeb64d83a1..87c07b5e5396 100644
--- a/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/pkgs/development/python-modules/webexteamssdk/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CiscoDevNet";
     repo = "webexteamssdk";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo=";
   };
 
diff --git a/pkgs/development/python-modules/webmin-xmlrpc/default.nix b/pkgs/development/python-modules/webmin-xmlrpc/default.nix
index 4735007ab722..e59a8e45a25b 100644
--- a/pkgs/development/python-modules/webmin-xmlrpc/default.nix
+++ b/pkgs/development/python-modules/webmin-xmlrpc/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "autinerd";
     repo = "webmin-xmlrpc";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-qCS5YV3o7ozO7fDaJucQvU0dEyTbxTivtTDKQVY4pkM=";
   };
 
diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 1f1ca8587380..07b5a76e75d0 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Pylons";
     repo = "webob";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-QN0UMLzO0g8Oalnn5GlOulXUxtXOx89jeeEvJV53rVs=";
   };
 
diff --git a/pkgs/development/python-modules/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix
index 1dcb4066deb5..31f3e63f45f5 100644
--- a/pkgs/development/python-modules/webrtc-models/default.nix
+++ b/pkgs/development/python-modules/webrtc-models/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-webrtc-models";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-WZPI7vYlfsihskRtrh4XJGx0JSDwn7JIJ8CL3jlryrA=";
   };
 
diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix
index 45f2d805aa40..adf82573edd9 100644
--- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix
+++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "webrtc-noise-gain";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GbdG2XM11zgPk2VZ0mu7qMv256jaMyJDHdBCBUnynMY=";
   };
 
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 063fa1a43e75..d2ba63827282 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aaugustin";
     repo = "websockets";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Y0HDZw+H7l8+ywLLzFk66GNDCI0uWOZYypG86ozLo7c=";
   };
 
diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index 2aaa1078200b..834aa9d43425 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "novnc";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+qjWmCkXJj8J5OImMSjTwXWyApmJ883NMr0157iqPS4=";
   };
 
diff --git a/pkgs/development/python-modules/webthing-ws/default.nix b/pkgs/development/python-modules/webthing-ws/default.nix
index 3df7d1861813..cdf6f7a7edb7 100644
--- a/pkgs/development/python-modules/webthing-ws/default.nix
+++ b/pkgs/development/python-modules/webthing-ws/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-j7nc4yJczDs28RVFDHeQ2ZIG9mIW2m25AAeErVKi4E4=";
   };
 
diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index b7bbebd84189..910009e6a233 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-jTScDPTj7aIQcGuL2g8MvuYln6iaj6abEyCfd8vvT2I=";
   };
 
diff --git a/pkgs/development/python-modules/weheat/default.nix b/pkgs/development/python-modules/weheat/default.nix
index d83deaf3ba08..ec798a079ebf 100644
--- a/pkgs/development/python-modules/weheat/default.nix
+++ b/pkgs/development/python-modules/weheat/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wefabricate";
     repo = "wh-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-hd0mqdcj+rvrYCvxhK3ewuiDekWUgTD7JypjL/EMqv8=";
   };
 
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix
index 71577257d228..2b30eea9343d 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/pkgs/development/python-modules/wfuzz/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xmendez";
     repo = "wfuzz";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RM6QM/iR00ymg0FBUtaWAtxPHIX4u9U/t5N/UT/T6sc=";
   };
 
diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix
index b836811f2d70..1776fa488cf0 100644
--- a/pkgs/development/python-modules/whatthepatch/default.nix
+++ b/pkgs/development/python-modules/whatthepatch/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cscorley";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-0pkkwVo9yaFEZyitfpKMC8EVr8HgPLUkrGWmyYOdZNE=";
   };
 
diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix
index 45e1cd6db59b..977f96b16f38 100644
--- a/pkgs/development/python-modules/wheel-inspect/default.nix
+++ b/pkgs/development/python-modules/wheel-inspect/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jwodder";
     repo = "wheel-inspect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Mdw9IlY/2qDlb5FumNH+VHmg7vrUzo3vn+03QsUGgo8=";
   };
 
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 34dc95153170..1b46410e6eb8 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "wheel";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tgueGEWByS5owdA5rhXGn3qh1Vtf0HGYC6+BHfrnGAs=";
     postFetch = ''
       cd $out
diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix
index 3d7bff25a381..e76cd05cffab 100644
--- a/pkgs/development/python-modules/whenever/default.nix
+++ b/pkgs/development/python-modules/whenever/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "ariebovenberg";
     repo = "whenever";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aTFbO3mBcX+a9Zqp7SXjEx2+ix+J8g4n8V3KEyatAXY=";
   };
 
diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
index 1a8782fdc4a2..20efe25f5911 100644
--- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
+++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "abmantis";
     repo = "whirlpool-sixth-sense";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-aDvUV83o/yKx15kenDGng5xh3LECLVlLWJlVe/y+1Co=";
   };
 
diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix
index c25ed5598992..db71448bb53b 100644
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "graphite-project";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CnCbRmI2jc67mTtfupoE1uHtobrAiWoUXbfX8YeEV6A=";
   };
 
diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix
index ad550eafe520..fba9a13a4551 100644
--- a/pkgs/development/python-modules/whispers/default.nix
+++ b/pkgs/development/python-modules/whispers/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adeptex";
     repo = "whispers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-tjDog8+oWTNuK1eK5qUEFspiilB0riUSTX5ugTIiP3M=";
   };
 
diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
index 88b7df53a52d..b1553b1e409d 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "evansd";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-4SrTiTqBrfFuQ/8mqQL+YiehFWW+ZzKiAF0h2XyYuSs=";
   };
 
diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix
index b73b2045a937..dcd2235a941e 100644
--- a/pkgs/development/python-modules/whodap/default.nix
+++ b/pkgs/development/python-modules/whodap/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pogzyb";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE=";
   };
 
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index 9c31e43a59f5..ca6f8daf3112 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DannyCork";
     repo = "python-whois";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-uKAqpxb72fo0DiaChuJvDizq0z/oFSDHWJuK4vuYIzo=";
   };
 
diff --git a/pkgs/development/python-modules/whoisdomain/default.nix b/pkgs/development/python-modules/whoisdomain/default.nix
index f096e6dcf354..8ef31ccd149e 100644
--- a/pkgs/development/python-modules/whoisdomain/default.nix
+++ b/pkgs/development/python-modules/whoisdomain/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mboot-github";
     repo = "WhoisDomain";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nRj/WkYjMZuQoYF+QFIHABlek4DxvvEnOTeFYLHYvZc=";
   };
 
diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix
index 1697e319a171..fc015b584b7b 100644
--- a/pkgs/development/python-modules/whool/default.nix
+++ b/pkgs/development/python-modules/whool/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sbidoul";
     repo = "whool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uIHtygDeFbtIZLn0YwGzAHD7B+EZQ3JAovuNMZ5YMxc=";
   };
 
diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix
index 60e2e667f7e1..82cac0cc61d2 100644
--- a/pkgs/development/python-modules/wiffi/default.nix
+++ b/pkgs/development/python-modules/wiffi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mampfes";
     repo = "python-wiffi";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-pnbzJxq8K947Yg54LysPPho6IRKf0cc+szTETgyzFao=";
   };
 
diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix
index 73b170cca4bc..3b65e4cedbbb 100644
--- a/pkgs/development/python-modules/wikipedia-api/default.nix
+++ b/pkgs/development/python-modules/wikipedia-api/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "martin-majlis";
     repo = "Wikipedia-API";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bjmvUZpwDJJrB2k13NMSMHNyiJFXCvo007PPHwBVeq8=";
   };
 
diff --git a/pkgs/development/python-modules/wikipedia2vec/default.nix b/pkgs/development/python-modules/wikipedia2vec/default.nix
index c682ea2a1c74..b025edcb1620 100644
--- a/pkgs/development/python-modules/wikipedia2vec/default.nix
+++ b/pkgs/development/python-modules/wikipedia2vec/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wikipedia2vec";
     repo = "wikipedia2vec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vrBLlNm0bVIStSBWDHRCtuRpazu8JMCtBl4qJPtHGvU=";
   };
 
diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix
index 367a615f9c27..c8855befe48e 100644
--- a/pkgs/development/python-modules/willow/default.nix
+++ b/pkgs/development/python-modules/willow/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wagtail";
     repo = "Willow";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk=";
   };
 
diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix
index 0120ac1bc45f..8f35b3798f7e 100644
--- a/pkgs/development/python-modules/withings-api/default.nix
+++ b/pkgs/development/python-modules/withings-api/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vangorra";
     repo = "python_withings_api";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8cOLHYnodPGk1b1n6xbVyW2iju3cG6MgnzYTKDsP/nw=";
   };
 
diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix
index 66278db6c2e4..e6efbd9c84a5 100644
--- a/pkgs/development/python-modules/withings-sync/default.nix
+++ b/pkgs/development/python-modules/withings-sync/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jaroslawhartman";
     repo = "withings-sync";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ySl2nRR8t7c3NhjgjSzLQ+hcJuh+kx5aoaVPJF56HR0=";
   };
 
diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix
index de011db9a56d..8ed582230dbe 100644
--- a/pkgs/development/python-modules/wktutils/default.nix
+++ b/pkgs/development/python-modules/wktutils/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "asfadmin";
     repo = "Discovery-WKTUtils";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho=";
   };
 
diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index d266f2ab7634..2b81d25d30a8 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "frenck";
     repo = "python-wled";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-yJ7tiJWSOpkkLwKXo4lYlDrp1FEJ/cGoDaXJamY4ARg=";
   };
 
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 75c00bfea5fa..d11d3562af6a 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rspeer";
     repo = "wordfreq";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE=";
   };
 
diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
index 59af6a58b8ab..59c93a616376 100644
--- a/pkgs/development/python-modules/wrapt/default.nix
+++ b/pkgs/development/python-modules/wrapt/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GrahamDumpleton";
     repo = "wrapt";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-q2DYCzTWxGpuIa5v6cyDCTekXfDlFML4eo8J60YdCsc=";
   };
 
diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix
index b9460e33278a..0bac9b4da09e 100644
--- a/pkgs/development/python-modules/wrf-python/default.nix
+++ b/pkgs/development/python-modules/wrf-python/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "NCAR";
     repo = "wrf-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4iIs/M9fzGJsnKCDSl09OTUoh7j6REBXuutE5uXFe3k=";
   };
 
diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix
index e99c8a6d0f46..91a442a22ff5 100644
--- a/pkgs/development/python-modules/wsgi-intercept/default.nix
+++ b/pkgs/development/python-modules/wsgi-intercept/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cdent";
     repo = "wsgi-intercept";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hs5yB0+eDlh/pNPaqYIU9C+RBpyrdPOAscQGIoqzmvU=";
   };
 
diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix
index 5717b1779da7..a630bbd852fa 100644
--- a/pkgs/development/python-modules/wsgidav/default.nix
+++ b/pkgs/development/python-modules/wsgidav/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mar10";
     repo = "wsgidav";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vUqNC7ixpta0s7wRC5ROSKMa/MsgEBu5rr0XNu69FRw=";
   };
 
diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix
index fc509b20132b..1ee5fac732b8 100644
--- a/pkgs/development/python-modules/wtforms/default.nix
+++ b/pkgs/development/python-modules/wtforms/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wtforms";
     repo = "wtforms";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jwjP/wkk8MdNJbPE8MlkrH4DyR304Ju41nN4lMo3jFs=";
   };
 
diff --git a/pkgs/development/python-modules/wunsen/default.nix b/pkgs/development/python-modules/wunsen/default.nix
index 9f6d12c9f3d4..10cd539ac00f 100644
--- a/pkgs/development/python-modules/wunsen/default.nix
+++ b/pkgs/development/python-modules/wunsen/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cakimpei";
     repo = "wunsen";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lMEhtcWG+S3vAz+Y/qDxhaZslsO0pbs5xUn5QgZNs2U=";
   };
 
diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix
index 3c63c6a73916..5b13cfff8bb3 100644
--- a/pkgs/development/python-modules/wyoming/default.nix
+++ b/pkgs/development/python-modules/wyoming/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gx9IbFkwR5fiFFAZTiQKzBbVBJ/RYz29sztgbvAEeRQ=";
   };
 
diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix
index 90a25e98ee74..497ab9d2cd2a 100644
--- a/pkgs/development/python-modules/x-wr-timezone/default.nix
+++ b/pkgs/development/python-modules/x-wr-timezone/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "niccokunzmann";
     repo = "x-wr-timezone";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-F/bNETgscbhEkpG/D1eSJaBNdpi0+xEYuNL4RURGST0=";
   };
 
diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix
index db1b1c5504b1..d769bb080fe7 100644
--- a/pkgs/development/python-modules/xarray-einstats/default.nix
+++ b/pkgs/development/python-modules/xarray-einstats/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "arviz-devs";
     repo = "xarray-einstats";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XvxsyH8cwsA9B36uhM1Pr5XaNd0d0/nEamA4axdJe24=";
   };
 
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 382bad08e98f..6ca0bf15cc4f 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pydata";
     repo = "xarray";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-s5MvHp2OkomD3xNYzj9oKlVLMgHZDQRBJM6vgOAv1jQ=";
   };
   patches = [
diff --git a/pkgs/development/python-modules/xboxapi/default.nix b/pkgs/development/python-modules/xboxapi/default.nix
index 3441760693ab..49ea1ec581b5 100644
--- a/pkgs/development/python-modules/xboxapi/default.nix
+++ b/pkgs/development/python-modules/xboxapi/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mKeRix";
     repo = "xboxapi-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-rX3lrXzUYqyRyI89fbCEEMevTdi5SBgSp8XxSanasII=";
   };
 
diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix
index 5c376c3db440..c467361a643a 100644
--- a/pkgs/development/python-modules/xdg-base-dirs/default.nix
+++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "srstevenson";
     repo = "xdg-base-dirs";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iXK9WURTfmpl5vd7RsT0ptwfrb5UQQFqMMCu3+vL+EY=";
   };
 
diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index ce66720f17d0..4ca42efbc0fe 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rocky";
     repo = "python-xdis";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Fn1cyUPMrn1SEXl4sdQwJiNHaY+BbxBDz3nKZY965/0=";
   };
 
diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix
index db4865f48e29..4c22f44105a4 100644
--- a/pkgs/development/python-modules/xdoctest/default.nix
+++ b/pkgs/development/python-modules/xdoctest/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Erotemic";
     repo = "xdoctest";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1c3wnQ30J2OfnBffzGfPPt9St8VpLGmFGbifzbw+cOc=";
   };
 
diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 8790b380b769..7b8e9a35f4d1 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage {
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "xformers";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index 76db9d97263a..1e2726e9dcc9 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xhtml2pdf";
     repo = "xhtml2pdf";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-sva1Oqz4FsLz/www8IPVxol3D0hx5F5hQ0I/rSRP9sE=";
   };
 
diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix
index 2cf0a8de509d..bf39bf05ae66 100644
--- a/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "xiaomi-ble";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7/4Ea8IiRPxhgMiazSylYZAmznqIula2yCEUAyIHBBg=";
   };
 
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 9eb8b9330bf4..870f3e48bf25 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "XKNX";
     repo = "xknx";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nCFIP4ZeO4pRmyh2BdE86Dg/0zKYR3izcc2MOzVC4/g=";
   };
 
diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix
index 3244c7d0c622..1430a701141b 100644
--- a/pkgs/development/python-modules/xknxproject/default.nix
+++ b/pkgs/development/python-modules/xknxproject/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "XKNX";
     repo = "xknxproject";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iuW83gKDJTgFkfSW32OPOuwyGLyFoZGKQGUDJkVUGAM=";
   };
 
diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix
index fb5685de6adf..bdb7685f08f4 100644
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/pkgs/development/python-modules/xlib/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-xlib";
     repo = "python-xlib";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-u06OWlMIOUzHOVS4hvm72jGgTSXWUqMvEQd8bTpFog0=";
   };
 
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 6f10a4962c31..5258a3c38052 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "xmlschema";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-7RA9lQwuty8aZghwTKNbU+oL+BATH2FVIRQBe9fIpHI=";
   };
 
diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix
index 44e30abe4ff3..e5cbf9fc8932 100644
--- a/pkgs/development/python-modules/xmodem/default.nix
+++ b/pkgs/development/python-modules/xmodem/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tehmaze";
     repo = "xmodem";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-kwPA/lYiv6IJSKGRuH13tBofZwp19vebwQniHK7A/i8=";
   };
 
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 648508d35414..652eb92f2c00 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "xmpppy";
     repo = "xmpppy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-SnzIjEWSCdiCtD8bmPTH02JprmZhrABB4HCqtt2RBuk=";
   };
 
diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix
index b42851b6daf1..97d0d64a3b4b 100644
--- a/pkgs/development/python-modules/xsdata/default.nix
+++ b/pkgs/development/python-modules/xsdata/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tefra";
     repo = "xsdata";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-ARq7QNwEtnXo0Q04CNWf3bAwyjl92YnFUp/Y51sgsLU=";
   };
 
diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix
index 7d5eb445d58d..4e748ac1c800 100644
--- a/pkgs/development/python-modules/yabadaba/default.nix
+++ b/pkgs/development/python-modules/yabadaba/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "yabadaba";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI=";
   };
 
diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
index 7846303b562f..d39b1f20e4ce 100644
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "domwillcode";
     repo = "yale-smart-alarm-client";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-a0rzPEixJXLBfN+kJRPYiJiHY1BKxg/mM14RO3RiVdA=";
   };
 
diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index f55c4b98416b..560e7211228e 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "yalexs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-0fC12QsCOgFc6GJk5T7kCjVHe9W4Fhwmtv3dwJVh9mM=";
   };
 
diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix
index 87f27046f8aa..e1c2816985b8 100644
--- a/pkgs/development/python-modules/yamale/default.nix
+++ b/pkgs/development/python-modules/yamale/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "23andMe";
     repo = "yamale";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iiiQAZ050FintRSV3l2zfikTNmphhJgrn+4tUHORiSk=";
   };
 
diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index b8747bc3f0fc..432592060be3 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lyz-code";
     repo = "yamlfix";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-nadyBIzXHbWm0QvympRaYU38tuPJ3TPJg8EbvVv+4L0=";
   };
 
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index b645cd8b56e6..f1d80867a9b2 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "adrienverge";
     repo = "yamllint";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+7Q2cPl4XElI2IfLAkteifFVTrGkj2IjZk7nPuc6eYM=";
   };
 
diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix
index 3883e3fa54f4..4a5b520eddf7 100644
--- a/pkgs/development/python-modules/yangson/default.nix
+++ b/pkgs/development/python-modules/yangson/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CZ-NIC";
     repo = "yangson";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/9MxCkcPGRNZkuwAAvlr7gtGcyxXtliski7bNtFhVBE=";
   };
 
diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix
index fb894f05c22a..b16f783fab55 100644
--- a/pkgs/development/python-modules/yara-python/default.nix
+++ b/pkgs/development/python-modules/yara-python/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-P+OQljzp+ZwVOXAgJqK7GNrqBep40MyVtMKDtT4ZUr8=";
   };
 
diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix
index b54cc0d22db0..a40ce157c785 100644
--- a/pkgs/development/python-modules/yaramod/default.nix
+++ b/pkgs/development/python-modules/yaramod/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "avast";
     repo = "yaramod";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-npEg6eJpxX4ZTS7KFRIBoVVk+JnA6vTqU7aD3zmnxk0=";
   };
 
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 2bbc77852c8e..9bc858c84636 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "yarl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j2z6YAFbQe26YUQGLBwLr9ztUoxMDJJGS9qYeVqSob0=";
   };
 
diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix
index 40ad8de8ef30..826c64475f06 100644
--- a/pkgs/development/python-modules/yaspin/default.nix
+++ b/pkgs/development/python-modules/yaspin/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pavdmyt";
     repo = "yaspin";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4IWaAPqzGri7V8X2gL607F5GlWfIFDlBBpDwSe4sz9I=";
   };
 
diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix
index 97d37c7a7942..80834f03b2e6 100644
--- a/pkgs/development/python-modules/yolink-api/default.nix
+++ b/pkgs/development/python-modules/yolink-api/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "YoSmart-Inc";
     repo = "yolink-api";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VJqKORyAlTBIRsHaeUrLDuvVAU/EX/Zzh8u7xxmD2IE=";
   };
 
diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix
index d4be6d3a9b78..9dad2aef7dcd 100644
--- a/pkgs/development/python-modules/youless-api/default.nix
+++ b/pkgs/development/python-modules/youless-api/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gjong";
     repo = "youless-python-bridge";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MvGLIhkBbcGThKeqtlzVZct2o9PBLwcAELmn5pW3R6I=";
   };
 
diff --git a/pkgs/development/python-modules/youtokentome/default.nix b/pkgs/development/python-modules/youtokentome/default.nix
index 0d6328f13a78..f6e15c2dba44 100644
--- a/pkgs/development/python-modules/youtokentome/default.nix
+++ b/pkgs/development/python-modules/youtokentome/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "VKCOM";
     repo = "YouTokenToMe";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IFZS4jSi4yMzI7VbOPHI3KFZu5tjPjfQDPY7e1qbKAM=";
   };
 
diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix
index cd3fcea8540a..b1e7e7bf0916 100644
--- a/pkgs/development/python-modules/youtube-transcript-api/default.nix
+++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jdepoix";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xCB1XhXRq4jxyfst/n2wXj2k4dERm+/bVUJwP8b70gQ=";
   };
 
diff --git a/pkgs/development/python-modules/youtubeaio/default.nix b/pkgs/development/python-modules/youtubeaio/default.nix
index 82123108880f..c98246dfb1c2 100644
--- a/pkgs/development/python-modules/youtubeaio/default.nix
+++ b/pkgs/development/python-modules/youtubeaio/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-youtube";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-utkf5t6yrf0f9QBIaDH6MxKduNZOsjfEWfQnuVyUoRM=";
   };
 
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index 75b05e352d0e..77fe1f9733da 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "yowsup";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
   };
 
diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix
index d50c231a574b..c75ca5256a5c 100644
--- a/pkgs/development/python-modules/ypy-websocket/default.nix
+++ b/pkgs/development/python-modules/ypy-websocket/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "ypy-websocket";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-48x+MUhev9dErC003XOP3oGKd5uOghlBFgcR8Nm/0xs=";
   };
 
diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix
index 3afdf2d243c5..b92d0610bc06 100644
--- a/pkgs/development/python-modules/yte/default.nix
+++ b/pkgs/development/python-modules/yte/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "koesterlab";
     repo = "yte";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-vHrYWdyWBqonCBWg1X+lTVlOHS30/yYqZ9sVK3/2n5o=";
   };
 
diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix
index b93f86d56950..2235d7c56931 100644
--- a/pkgs/development/python-modules/zadnegoale/default.nix
+++ b/pkgs/development/python-modules/zadnegoale/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-ij8xou8LXC4/BUTApIV6xSgb7ethwLyrHNJvBgxSBYM=";
   };
 
diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix
index 1d87e72268f8..f69c27f8f072 100644
--- a/pkgs/development/python-modules/zamg/default.nix
+++ b/pkgs/development/python-modules/zamg/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "killer0071234";
     repo = "python-zamg";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0=";
   };
 
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 139d4ba8ea54..5af2e4e7813c 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mvantellingen";
     repo = "python-zeep";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Bt0QqzJMKPXV91hZYETy9DKoQAELUWlYIh8w/IFTE8E=";
   };
 
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 41319b09a348..71ce1727d077 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jstasiak";
     repo = "python-zeroconf";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-gSoxrG+5LCI0DCEGqrQvzFfnKhlJV5kyqLH6IrN7Zjs=";
   };
 
diff --git a/pkgs/development/python-modules/zeversolar/default.nix b/pkgs/development/python-modules/zeversolar/default.nix
index 5a28927a3ec3..2e990d4b528d 100644
--- a/pkgs/development/python-modules/zeversolar/default.nix
+++ b/pkgs/development/python-modules/zeversolar/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kvanzuijlen";
     repo = "zeversolar";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-HnF21B7k2MmugMjGIF2EKwwXJWD/WdDvPdz1oaPSS5Y=";
   };
 
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 0faa301aaf5c..9f38282e8a07 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zha-device-handlers";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Tqt+ydp7Vr3pWBQ0T5B0CV+bfX+0yRXynEhD01afY/w=";
   };
 
diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 4ac2dac1f230..72ff96ce950f 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zha";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-iju/WjndlwEZjforoVyoIb6oTJNlvkEnsoQH2d6tFlQ=";
   };
 
diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix
index c25177dc23c1..98a46812f7ee 100644
--- a/pkgs/development/python-modules/ziafont/default.nix
+++ b/pkgs/development/python-modules/ziafont/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cdelker";
     repo = "ziafont";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-S7IDL3ItP14/GrCUtSTT+JWuqRAY/Po0Kerq8mggDdg=";
   };
 
diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix
index 7505d578ba52..a74411d8afd5 100644
--- a/pkgs/development/python-modules/ziamath/default.nix
+++ b/pkgs/development/python-modules/ziamath/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cdelker";
     repo = "ziamath";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DLpbidQEeQVKxGCbS2jeeCvmVK9ElDIDQMj5bh/x7/Q=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index edbba6c73050..6ceb60d7ba51 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-CSXJcERqrPnCdlwyNSqSkxoiVhjNuL2GL4J6h2DMZY4=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 449632991f89..409a9fa1bd11 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-xbee";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix
index 8f3ca45b5c83..9e8cc36ba40b 100644
--- a/pkgs/development/python-modules/zigpy-zboss/default.nix
+++ b/pkgs/development/python-modules/zigpy-zboss/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kardia-as";
     repo = "zigpy-zboss";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-T2R291GeFIsnDRI1tAydTlLamA3LF5tKxKFhPtcEUus=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index a48feefb0730..589178993688 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-MlAX7dcRZziMYCpG64OemZ8czwvDXpdoRaDVo1sUCno=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 628a688f0875..1831638ec1d8 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I=";
   };
 
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 018074851fc4..dbdb5e3930c8 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Fb5rZhxd93QY0TYJTTLXEaqlxk3JdlIOun5FB7wJbSE=";
   };
 
diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix
index fbc7038a49de..28c423f3c235 100644
--- a/pkgs/development/python-modules/zipstream-ng/default.nix
+++ b/pkgs/development/python-modules/zipstream-ng/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "pR0Ps";
     repo = "zipstream-ng";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw=";
   };
 
diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix
index f7cba1ed5d77..ae33b13ccd7e 100644
--- a/pkgs/development/python-modules/zm-py/default.nix
+++ b/pkgs/development/python-modules/zm-py/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rohankapoorcom";
     repo = "zm-py";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-n9FRX2Pnn96H0HVT4SHLJgONc0XzQ005itMNpvl9IYg=";
   };
 
diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix
index e95bf9d05aea..8141e1a90165 100644
--- a/pkgs/development/python-modules/zope-exceptions/default.nix
+++ b/pkgs/development/python-modules/zope-exceptions/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.exceptions";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-jbzUUB6ifTfxiGEiyAmsDoDLyRVuZPgIsN8mCNJkv4Q=";
   };
 
diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix
index 5e08e973a1ae..058001e148e3 100644
--- a/pkgs/development/python-modules/zope-testbrowser/default.nix
+++ b/pkgs/development/python-modules/zope-testbrowser/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zopefoundation";
     repo = "zope.testbrowser";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vGx2ObHgt4hSQe/JKZkD2/GhdtbJEAfggkM209maen4=";
   };
 
diff --git a/pkgs/development/python-modules/zpp/default.nix b/pkgs/development/python-modules/zpp/default.nix
index c30a60fa6466..e9135bb58eaf 100644
--- a/pkgs/development/python-modules/zpp/default.nix
+++ b/pkgs/development/python-modules/zpp/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jbigot";
     repo = "zpp";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Jvh80TfOonZ57lb+4PulVOUKi9Y74nplIcrPzlUPw3M=";
   };
 
diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix
index b49774b14de1..73b8ea454aa8 100644
--- a/pkgs/development/python-modules/zwave-js-server-python/default.nix
+++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "zwave-js-server-python";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7TbGRPGIpS8T0bmEIiRHChvdiKqTKccnkl0YVoQHfdE=";
   };
 
diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix
index db7803c4ed16..29d3998e52ac 100644
--- a/pkgs/development/python-modules/zwave-me-ws/default.nix
+++ b/pkgs/development/python-modules/zwave-me-ws/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Z-Wave-Me";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-bTchtgr+UbHCpcXMaQA3bTrhasJ79TguvAqLNlpD/2c=";
   };
 
diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix
index 7ce1af48a906..1c4708846e13 100644
--- a/pkgs/development/python-modules/zxcvbn/default.nix
+++ b/pkgs/development/python-modules/zxcvbn/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dwolfhub";
     repo = "zxcvbn-python";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc=";
   };
 
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
index 9e967de825bc..a843734b69b6 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
@@ -12,7 +12,7 @@ mkTclDerivation rec {
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclcurl-fa";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XQuP+SiqvGX3ckBShUxsGBADjV3QdvYpU4hW6LMbMMQ=";
   };
 
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index e0cad1489f0c..af1d4e07db6f 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-wmQJSqoFOrWi5ihGFd0PA+hSW/H4si+N6wprFHWDYbM=";
   };
 
diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index 9dd2c688830a..e5fda9a59274 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = "hotspot";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI=";
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 558b0dcf85ce..de036be79393 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-t/BMsYqNLMAlBBYm6JCDkFYL5YwJBwmEaaIY4KFYxY4=";
   };
 
diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
index 892e78717eb0..c50b5c0f3f54 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "rtts";
     repo = "djhtml";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo=";
   };
 
diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 7adc26e81ad5..85c58a9d77bb 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "geckodriver";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-3EJP+y+Egz0kj5e+1FRHPGWfneB/tCCVggmgmylMyDE=";
   };
 
diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix
index 273a0179863b..7f43ffe95f5d 100644
--- a/pkgs/development/tools/language-servers/fortls/default.nix
+++ b/pkgs/development/tools/language-servers/fortls/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fortran-lang";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mOYPtysPj+JczRPTeM1DUckAH0XC9cO1ssP8pviYa0E=";
   };
 
diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix
index db14eb249dfc..8d286af488c4 100644
--- a/pkgs/development/tools/misc/cmake-language-server/default.nix
+++ b/pkgs/development/tools/misc/cmake-language-server/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "regen100";
     repo = "cmake-language-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-9fnyDJm8rUl+7g4FrdMykPpQOcww2M6IPWH/3qVeJX4=";
   };
 
diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix
index 7dc6d534eaaa..36804494f921 100644
--- a/pkgs/development/tools/misc/cvise/default.nix
+++ b/pkgs/development/tools/misc/cvise/default.nix
@@ -23,7 +23,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "marxin";
     repo = "cvise";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-xaX3QMnTKXTXPuLzui0e0WgaQNvbz8u1JNRBkfe4QWg=";
   };
 
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index a958648220b8..acf7043b5d65 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Lx7vENYuBXaMvGDOZxAPqivGZVaCXYrihaTnBn9eTm4=";
   };
 
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index aa876a4d29dd..857cad5eabce 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -33,7 +33,7 @@ let
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     inherit hash;
     fetchSubmodules = true;
   };
diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix
index a989d85fd6b7..37ca9667833b 100644
--- a/pkgs/development/tools/rbspy/default.nix
+++ b/pkgs/development/tools/rbspy/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-K5zDM7HhSNklCMoj3yh5lf0HTITOl2UYXW0QCxDF2GU=";
   };
 
diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix
index 653c4c0f0649..d3dd38fcb2a2 100644
--- a/pkgs/development/web/netlify-cli/default.nix
+++ b/pkgs/development/web/netlify-cli/default.nix
@@ -16,7 +16,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "netlify";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1UaIPCzyHMKNJfDFILPYIrjHwzHAmlYNk+aHZM1Bp6Q=";
   };
 
diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix
index 4df7d3cd69d7..d3d74c09a34b 100644
--- a/pkgs/games/rare/default.nix
+++ b/pkgs/games/rare/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "RareDevs";
     repo = "Rare";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-2DtI5iaK4bYdGfIEhPy52WaEqh+IJMZ6qo/348lMnLY=";
   };
 
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 68ec57b17651..8e03d34c8d2b 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kaa-ching";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj";
   };
 
diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix
index 2de325afb97b..ddf7c3b2f121 100644
--- a/pkgs/kde/third-party/krohnkite/default.nix
+++ b/pkgs/kde/third-party/krohnkite/default.nix
@@ -14,7 +14,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "anametologin";
     repo = "krohnkite";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VVHusFuQ/awfFV4izId7VPYCrS8riTavhpB2KpJ9084=";
   };
 
diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix
index fda86494b7ff..ff7f4b147d6c 100644
--- a/pkgs/misc/autotiling/default.nix
+++ b/pkgs/misc/autotiling/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk=";
   };
 
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index 2694d9147402..49d54543a5a8 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -28,7 +28,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "C0rn3j";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-XakbCuwjIAXYFZxvJsAlDIJEl09pwFPT12h04onXd34=";
   };
 
diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix
index 58e3d859a8fd..7c0eb92e33a7 100644
--- a/pkgs/misc/drivers/spacenavd/default.nix
+++ b/pkgs/misc/drivers/spacenavd/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "spacenavd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-26geQYOXjMZZ/FpPpav7zfql0davTBwB4Ir+X1oep9Q=";
   };
 
diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix
index 87f34b85356c..43a3cf721426 100644
--- a/pkgs/misc/fastly/default.nix
+++ b/pkgs/misc/fastly/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-GN66AC/afsSTonx7en2cUDQMAAgROJ392LzglVJsx+o=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
diff --git a/pkgs/os-specific/linux/amneziawg/default.nix b/pkgs/os-specific/linux/amneziawg/default.nix
index 9137bf18de9e..f0e76f7f58b0 100644
--- a/pkgs/os-specific/linux/amneziawg/default.nix
+++ b/pkgs/os-specific/linux/amneziawg/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-linux-kernel-module";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-WOcBTxetVz2Sr62c+2aGNyohG2ydi+R+az+4qHbKprI=";
   };
 
diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix
index 80482cd1b211..5d440bc5dab9 100644
--- a/pkgs/os-specific/linux/dddvb/default.nix
+++ b/pkgs/os-specific/linux/dddvb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "DigitalDevices";
     repo = "dddvb";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-bt/vMnqRWDDChZ6R4JbCr77cz3nlSPkx6siC9KLSEqs=";
   };
 
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 9e5ead326420..25634b4f78d0 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-57DP8kKsPEK1C5A6QfoZZDmm76pn4SaUKEKu9cicyKI=";
   };
 
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix
index 8cbfa053bc21..6f4f279750c6 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/os-specific/linux/sinit/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://git.suckless.org/sinit/";
     sha256 = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
   };
   buildInputs = [
     (lib.getOutput "static" stdenv.cc.libc)
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index ae9eb0d16c08..c6287084d57f 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "SSSD";
     repo = "sssd";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-wr6qFgM5XN3aizYVquj0xF+mVRgrkLWWhA3/gQOK8hQ=";
   };
 
diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix
index b714ac6cc67a..01ac035282b5 100644
--- a/pkgs/os-specific/linux/universal-pidff/default.nix
+++ b/pkgs/os-specific/linux/universal-pidff/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "JacKeTUs";
     repo = "universal-pidff";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BViobWl+9ypTcQJWtZ9pbeU4cmHcFNZWlsmQUOO64Vc=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix
index 15d3b19da7f4..99bbbae0d089 100644
--- a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "basnijholt";
     repo = "adaptive-lighting";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Yq8mKk2j2CHyHvwyej0GeFQhuy1MFXwt0o+lDOGwrBU=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
index 9e882f22b6dc..5364fe270ebf 100644
--- a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "nielsfaber";
     repo = "alarmo";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-EFR8GveMNpwhrIA0nP+Ny3YUTHAOFw+IF72hH1+wMSM=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix
index 473f54e5324f..9212db7482fe 100644
--- a/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "KartoffelToby";
     repo = "better_thermostat";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-zXO2UDLhSTOemzsO9G5ZUzr50Zg8kDW/aObn6Y3j70k=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/climate_group/package.nix b/pkgs/servers/home-assistant/custom-components/climate_group/package.nix
index 9255fe7a3cb7..b57ddb13f21d 100644
--- a/pkgs/servers/home-assistant/custom-components/climate_group/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/climate_group/package.nix
@@ -11,7 +11,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "climate_group";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-f/VQUNzRSxmKGNgijaafQ5NbngUUKmcdkafYC3Ol9qM=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix
index 11b95d1d284c..dd1f43813b81 100644
--- a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "carleeno";
     repo = "elevenlabs_tts";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-/hszK5J1iGB46WfmCCK9/F0JOR405gplMwVC4niAqig=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix
index ffa29f9a87c2..3f961bfed586 100644
--- a/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "mampfes";
     repo = "ha_epex_spot";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-PY3udPgvsaXdDRh4+NQmVlqhERswcMpaJTq5azaUFf4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/indego/package.nix b/pkgs/servers/home-assistant/custom-components/indego/package.nix
index 5e30d6f763a6..ff0df6e511b7 100644
--- a/pkgs/servers/home-assistant/custom-components/indego/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/indego/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "sander1988";
     repo = "Indego";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-7PQUsSPS+o5Vt4Do4/TXyGXAqyHJg96w8n7UMpZ0uFo=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/miele/package.nix b/pkgs/servers/home-assistant/custom-components/miele/package.nix
index fa39e514ff5b..e524818d2e1b 100644
--- a/pkgs/servers/home-assistant/custom-components/miele/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/miele/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-fM/ARQ4wJt2/vIVsdWpAur/YWPvBH5fOPYqiaz4DxzU=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
index 6da582239dad..9a44e6a420a2 100644
--- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "marcolivierarsenault";
     repo = "moonraker-home-assistant";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-vBsNpCCYLxL5T9LPRitR3a6mBRQwxoDtUDXzN0hCSTQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix
index b19ee4f99fb5..838fd05a1e36 100644
--- a/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix
@@ -11,7 +11,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-nest-protect";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IiHndx+mQVfpMLisiRwSEhrFJ3mJ4qaWTxZrubowkQs=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix
index e25ceef4f0ab..0342372aa2ce 100644
--- a/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "robbinjanssen";
     repo = "home-assistant-omnik-inverter";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-O1NxT7u27xLydPqEqH72laU0tlYVrMPo0TwWIVNJ+0Q=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix
index 1c1fb34742f7..b92f43f4a5da 100644
--- a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "mweinelt";
     repo = "ha-prometheus-sensor";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-+28mMvzNKVInknnDh++YolXR+/b1wsve1VEn4olR7Fs=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix
index fea99dce2ef6..e88ce9ac0d0c 100644
--- a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix
@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "ollo69";
     repo = "ha-samsungtv-smart";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-12wx8HaTEFQZOnxfcuAKFOXPdDpfAl608N1E6gmWqBI=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/sensi/package.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix
index a2a81aab477c..da69974b409c 100644
--- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kskffpfxpUjNUgsGc/sSkCbGdjt47KfPpH6KBFDLsHw=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 5a9ad1370ed4..69556f845e66 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Hy4LHEDp+WPpmWKQQqqLjQ0xSnShQg3a68g8NMJ9o2k=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/somweb/package.nix b/pkgs/servers/home-assistant/custom-components/somweb/package.nix
index 90b166138914..ed259b5d1abb 100644
--- a/pkgs/servers/home-assistant/custom-components/somweb/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/somweb/package.nix
@@ -13,7 +13,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "home-assistant-component-somweb";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-anOcpaGeblFVaP2EFVuxx1EuXnNgxy/QoYqvYJMv1Fo=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/spook/package.nix b/pkgs/servers/home-assistant/custom-components/spook/package.nix
index 3b6db52cb4d7..5848508d29e3 100644
--- a/pkgs/servers/home-assistant/custom-components/spook/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/spook/package.nix
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IV3n++uFSOvQANPfbCeBj3GP0CCL+w9icKp/k5VO3Qg=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index 83cc9199a20d..e55bb645fa56 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -12,7 +12,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-lzFnKPkBOt2fkVGWCj1M/skSr8V39GgDHS+0HD4ACAw=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
index 776ff1b423d1..a6e80230b47b 100644
--- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
@@ -16,7 +16,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "tuya-local";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Mmcq0GBWiE6IWUVL6q9lw29wKEymAQn439/pOSqWgdQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix
index 90d8879a294a..a1799d864e24 100644
--- a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix
@@ -14,7 +14,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "volkswagen_we_connect_id";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-hok1ICAHMfvfMucBYkgWD68Tsn9E33Z/ouoRwFqHHF4=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix
index d39c5f3481dc..d3971cddc9bc 100644
--- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix
@@ -15,7 +15,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     owner = "robinostlund";
     repo = "homeassistant-volkswagencarnet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3wykS2TYjr9hoQSPc1F3m5aDiLW1tzvQfjfjnr4N2Y0=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 782143835849..7345dcd2fc61 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -18,7 +18,7 @@ buildHomeAssistantComponent rec {
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-8AUaVcVCZ+WCLrmEQhIEohEWmeG6g7t3EjVdF9FUyJQ=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
index 82a46f40e5ba..0f467b690166 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "ljmerza";
     repo = "light-entity-card";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-DtpNKcnxMWbKwfIwo9R2g2Vux9oAjTI0URixGC41qeA=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix
index 8acd2f29809d..d09df4dc9fe8 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "kalkih";
     repo = "mini-graph-card";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-cDgfAfS4U3ihN808KPcG+jEQR+S2Q1M5SPqOkkYwYkI=";
   };
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix
index 63bc63e29a93..1ae70654dea4 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bramkragten";
     repo = "weather-card";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-pod5cayaHP+4vgdBgBRMQ7szkyz9HLaKVJWQX36XdTY=";
   };
   dontBuild = true;
diff --git a/pkgs/servers/http/apache-modules/mod_jk/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix
index b1134f7d3f3c..041ed93c506f 100644
--- a/pkgs/servers/http/apache-modules/mod_jk/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "apache";
     repo = "tomcat-connectors";
-    rev = "refs/tags/JK_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "JK_${lib.replaceStrings [ "." ] [ "_" ] version}";
     hash = "sha256-hlwlx7Sb4oeZIzHQYOC3e9xEZK9u6ZG8Q2U/XdKMe3U=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index c45da6cdd48f..cc40b75bbad1 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "grisha";
     repo = "mod_python";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-++yHNKVe1u3w47DaB0zvYyuTrBcQdmuDm22areAeejs=";
   };
 
diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix
index 971441bf5a90..5f375343ba69 100644
--- a/pkgs/servers/http/apache-modules/mod_tile/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "mod_tile";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-JC275LKsCeEo5DcIX0X7kcLoijQJqfJvBvw8xi2gwpk=";
   };
 
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index 7613cd0f0caa..7428d2d6cbba 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "posativ";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
   };
 
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index e09c4a4be022..140289ae418d 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -30,7 +30,7 @@ python.pkgs.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "telegram";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-uR0vhp7ONyjwMKbgM1iObpFRoQzyQzJLbw4i9P58jTs=";
   };
 
diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix
index d982d5339c4c..30791e412af1 100644
--- a/pkgs/servers/monitoring/laurel/default.nix
+++ b/pkgs/servers/monitoring/laurel/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "threathunters-io";
     repo = "laurel";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-mp1XTFD6mvH3RzvzvnJ58iJ6/EjENKYSzOavC2rVixs=";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_smartmon/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_smartmon/default.nix
index 6d658b00803c..b55c6a2d681c 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_smartmon/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_smartmon/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "driehuis";
     repo = "Nagios_check_smartmon";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "tiIeFiHdDgqoeznk9XdCE7owIMnnsQ0fmtj8foFoUD8=";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
index 9ad31b8efaa0..e8a9632b1ac1 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-4/vrJ3G45kEg77IbLlWqQYpYYnqMxW3lr9tPGbv5Qno=";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix
index 40a7fb7a2f5c..f1d8425d9dbf 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Josef-Friedrich";
     repo = "check_systemd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-1e1WtWRTmOxozuOP2ndfsozuiy9LCT/Lsvb+yKH+8eY=";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix
index f43df1b85650..53840bcfc454 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_wmi_plus/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "speartail";
     repo = "checkwmiplus";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "1as0iyhy4flpm37mb7lvah7rnd6ax88appjm1icwhy7iq03wi8pl";
   };
 
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_zfs/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_zfs/default.nix
index bb0187543fc2..1984fea3ab98 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_zfs/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_zfs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "zlacelle";
     repo = "nagios_check_zfs_linux";
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "gPLCNt6hp4E94s9/PRgsnBN5XXQQ+s2MGcgRFeknXg4=";
   };
 
diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix
index 2dc3918825c6..3b52900577af 100644
--- a/pkgs/servers/peertube/default.nix
+++ b/pkgs/servers/peertube/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-kPZcCJtnoqE1g0fAuM98IhuDy1E9QBDkFNWrWIpFIDA=";
   };
 
diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix
index 67ccc2eff5e1..2b19dedb1093 100644
--- a/pkgs/servers/pinnwand/default.nix
+++ b/pkgs/servers/pinnwand/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "supakeen";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-oB7Dd1iVzGqr+5nG7BfZuwOQUgUnmg6ptQDZPGH7P5E=";
   };
 
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index 109d3f24c63a..7b18d64e1a73 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meiliSearch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U=";
   };
 
diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix
index fb434246323e..ac614b413099 100644
--- a/pkgs/servers/search/qdrant/default.nix
+++ b/pkgs/servers/search/qdrant/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "qdrant";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-q99roKqeC8lra29gyJertJLnVNFvKRFZ2agREvHZx6k=";
   };
 
diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix
index 851269ed8557..76b95aa942e8 100644
--- a/pkgs/servers/tang/default.nix
+++ b/pkgs/servers/tang/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "tang";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nlC2hdNzQZrfirjS2gX4oFp2OD1OdxmLsN03hfxD3ug=";
   };
 
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index d9d3bffc5596..af9c015bf94a 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tautulli";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-QhJc4Jwxlp3yB0jWa7sRDnIOWLW8CQUupnzbUscJH+c=";
   };
 
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 1d3e9c26a610..dd453cd8bdd1 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nushell";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Ptctp2ECypmSd0BHa6l09/U7wEjtLsvRSQV/ISz9+3w=";
   };
 
diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix
index 336c05cb35ea..deb718b916ae 100644
--- a/pkgs/tools/audio/piper/default.nix
+++ b/pkgs/tools/audio/piper/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "piper";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-3ynWyNcdf1ffU3VoDqrEMrm5Jo5Zc5YJcVqwLreRCsI=";
   };
 
diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix
index fac1ba01dc9a..c9bd76310e0a 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/pkgs/tools/audio/video2midi/default.nix
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "svsdval";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     sha256 = "sha256-mjqlNUCEiP5dQS0a8HAejOJyEvY6jGFJFpVcnzU2Vds=";
   };
 
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix
index 94c7eb532aef..c953e880cd01 100644
--- a/pkgs/tools/filesystems/catcli/default.nix
+++ b/pkgs/tools/filesystems/catcli/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "deadc0de6";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-+/kd7oPT6msojPj25bzG9HwVqPj47gIUg9LngbDc3y8=";
   };
 
diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix
index 0156033f1d39..6c4ff49bdc25 100644
--- a/pkgs/tools/games/gamemode/default.nix
+++ b/pkgs/tools/games/gamemode/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "FeralInteractive";
     repo = "gamemode";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-JkDFhFLUHlgD6RKxlxMjrSF2zQ4AWmRUQMLbWYwIZmg=";
   };
 
diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/tools/graphics/vkbasalt/default.nix
index d8aaece387ad..075846b697ba 100644
--- a/pkgs/tools/graphics/vkbasalt/default.nix
+++ b/pkgs/tools/graphics/vkbasalt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "DadSchoorse";
     repo = "vkBasalt";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GC6JKYnsfcUBg+CX6v7MyE4FeLmjadFwighaiyureDg=";
   };
 
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 8d2e388b0688..3eca45c43409 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -28,7 +28,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-VW9p3VNVJOw5vkjCU4fujG0ie4N2D2QLidBANPV512U=";
   };
 
diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix
index 94d760c13d0d..f2cd306ecced 100644
--- a/pkgs/tools/misc/jsonwatch/default.nix
+++ b/pkgs/tools/misc/jsonwatch/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dbohdan";
     repo = "jsonwatch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-/DYKjhHjfXPWpU1RFmRUbartSxIBgVP59nbgwKMd0jg=";
   };
 
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 6bd3afdcbfda..e4b6f639a055 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.joeyh.name/moreutils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-71ACHzzk258U4q2L7GJ59mrMZG99M7nQkcH4gHafGP0=";
   };
 
diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix
index ce2673428a5a..20a4954a718e 100644
--- a/pkgs/tools/misc/mpremote/default.nix
+++ b/pkgs/tools/misc/mpremote/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "micropython";
     repo = "micropython";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Dc40uLyLQBfs8Elku8g+sTz/OETsFNqLqp/xnbF/rn4=";
   };
   sourceRoot = "${src.name}/tools/mpremote";
diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix
index 64c84451e08f..c1136925e759 100644
--- a/pkgs/tools/misc/opentimestamps-client/default.nix
+++ b/pkgs/tools/misc/opentimestamps-client/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "opentimestamps";
     repo = "opentimestamps-client";
-    rev = "refs/tags/opentimestamps-client-v${version}";
+    tag = "opentimestamps-client-v${version}";
     hash = "sha256-0dWaXetRlF1MveBdJ0sAdqJ5HCdn08gkbX+nen/ygsQ=";
   };
 
diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix
index 1717e09ae0b8..f35f88fa9e30 100644
--- a/pkgs/tools/misc/pandoc-include/default.nix
+++ b/pkgs/tools/misc/pandoc-include/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "DCsunset";
     repo = "pandoc-include";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-UUjQA2QYz9QqMek29vGGBMLMahZx2sJ4RfXcxz+b194=";
   };
 
diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix
index 6c11afa5815f..6946aa3728a4 100644
--- a/pkgs/tools/misc/pdd/default.nix
+++ b/pkgs/tools/misc/pdd/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "pdd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-Z+jUFu4VvrgWUtkXMkjspcRJ/JG81X9gc2tnDoCdrsk=";
   };
 
diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix
index d25b4db9068f..0e56d70ac8f8 100644
--- a/pkgs/tools/misc/pgbadger/default.nix
+++ b/pkgs/tools/misc/pgbadger/default.nix
@@ -21,7 +21,7 @@ buildPerlPackage rec {
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgbadger";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-an/BOkQsMkTXS0HywV1JWerS16HRbO1MHVleYhVqmBM=";
   };
 
diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/tools/misc/remote-exec/default.nix
index e7ec8e5b4988..1abd7ab6bbb8 100644
--- a/pkgs/tools/misc/remote-exec/default.nix
+++ b/pkgs/tools/misc/remote-exec/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "remote-cli";
     repo = "remote";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-rsboHJLOHXnpXtsVsvsfKsav8mSbloaq2lzZnU2pw6c=";
   };
 
diff --git a/pkgs/tools/misc/sshx/default.nix b/pkgs/tools/misc/sshx/default.nix
index a3686bb958e7..4eeab6e68588 100644
--- a/pkgs/tools/misc/sshx/default.nix
+++ b/pkgs/tools/misc/sshx/default.nix
@@ -14,7 +14,7 @@ let
   src = fetchFromGitHub {
     owner = "ekzhang";
     repo = "sshx";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RIQRX4sXlMl73Opi6hK2WD/erdAMNrm40IasHasikuw=";
   };
 
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
index 5be503769b5d..52db40563014 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-aws";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-KJsZZLjZj+p18HRXY+rQ9ooonxxTavmXi1ISA4mR26s=";
   };
 
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
index f0152f61b8f6..819c6e01522a 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-azure";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-MVLOAD/Ukvg0ox/aFdm1sx/BkS8gmKhexjt0CnUO+s4=";
   };
 
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
index e766f2e8920f..a5d37bab6dcd 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-github";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-FEoDpiLlHwIRtrugaiVUrQzURFIB58iRQlQ6fuJatAg=";
   };
 
diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index 6d08d31d78e2..3c0c6aa8738a 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "coreutils";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-Gwks+xTkwK5dgV9AkSthIrhBNwq/WvM9SNr0wR/SBSM=";
   };
 
diff --git a/pkgs/tools/misc/valeronoi/default.nix b/pkgs/tools/misc/valeronoi/default.nix
index d030107c9f54..9b43a8387dd7 100644
--- a/pkgs/tools/misc/valeronoi/default.nix
+++ b/pkgs/tools/misc/valeronoi/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ccoors";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-5KXVSIqWDkXnpO+qgBzFtbJb444RW8dIVXp8Y/aAOrk=";
   };
 
diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix
index e0b8d8775c10..2da8a048d6f4 100644
--- a/pkgs/tools/networking/fast-ssh/default.nix
+++ b/pkgs/tools/networking/fast-ssh/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "julien-r44";
     repo = "fast-ssh";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE=";
   };
 
diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix
index 8f1e74b12b8c..44cab1b4ca91 100644
--- a/pkgs/tools/networking/innernet/default.nix
+++ b/pkgs/tools/networking/innernet/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "tonarino";
     repo = "innernet";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-dFMAzLvPO5xAfJqUXdiLf13uh5H5ay+CI9aop7Fhprk=";
   };
 
diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix
index f505ae838a9b..80c977d3d970 100644
--- a/pkgs/tools/networking/ivpn/default.nix
+++ b/pkgs/tools/networking/ivpn/default.nix
@@ -30,7 +30,7 @@ builtins.mapAttrs
         src = fetchFromGitHub {
           owner = "ivpn";
           repo = "desktop-app";
-          rev = "refs/tags/v${version}";
+          tag = "v${version}";
           hash = "sha256-8JScty/sGyxzC2ojRpatHpCqEXZw9ksMortIhZnukoU=";
         };
 
diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix
index da33abb56736..935b9e884057 100644
--- a/pkgs/tools/networking/octodns/default.nix
+++ b/pkgs/tools/networking/octodns/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L3c4lYt/fgMctJFArc1XlR+hvpz10kcBcYYXajnNQr0=";
   };
 
diff --git a/pkgs/tools/networking/octodns/providers/gandi/default.nix b/pkgs/tools/networking/octodns/providers/gandi/default.nix
index bfb0924cd4ab..1c5fb133443d 100644
--- a/pkgs/tools/networking/octodns/providers/gandi/default.nix
+++ b/pkgs/tools/networking/octodns/providers/gandi/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-gandi";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-L7kDkqTVmU8OqjMS3GkML1xBxEuwb9iyYi/YZBB4NSU=";
   };
 
diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix
index af1d5b2c81b5..844b902bfd0a 100644
--- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix
+++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-powerdns";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-wa/SHyTfj+iHnTq8t+3yzyGn+YULOdI88Aii16qPwPM=";
   };
 
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index 02a2c9053dd6..767fc3011fd8 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "s3tools";
     repo = "s3cmd";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     sha256 = "sha256-cxwf6+9WFt3U7+JdKRgZxFElD+Dgf2P2VyejHVoiDJk=";
   };
 
diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix
index 86bfa86ba422..078cea92949a 100644
--- a/pkgs/tools/package-management/libdnf/default.nix
+++ b/pkgs/tools/package-management/libdnf/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = pname;
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-O8pN2WFHWxZpr2JEPsQOmkc+7qnMVnptmGJCVxMmSLo=";
   };
 
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 700c4bd21d40..084e873d63f4 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Matoking";
     repo = "protontricks";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-dCb8mcwXoxD4abJjLEwk5tGp65XkvepmOX+Kc9Dl7fQ=";
   };
 
diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index c6ca1a21ef60..5b4e2e87293d 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -42,7 +42,7 @@ let
     src = fetchFromGitHub {
       owner = "AFLplusplus";
       repo = "AFLplusplus";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
       hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg=";
     };
 
diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix
index 0cc6cd5c46e6..21e68a841913 100644
--- a/pkgs/tools/security/cnspec/default.nix
+++ b/pkgs/tools/security/cnspec/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Of/59QwHIbKYnUUJ66mWVWu1wuKyzo/4DzttYCBcW4Y=";
   };
 
diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index 65d38a29d1f6..444b5e435fec 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -40,7 +40,7 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "cve-bin-tool";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-A5w4U5EDX+UZWNMuz8GTOcubo8N2KfDlVV0aRNsO8/E=";
   };
 
diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix
index a8f75da90f54..0f0ffed94e84 100644
--- a/pkgs/tools/security/cyclonedx-gomod/default.nix
+++ b/pkgs/tools/security/cyclonedx-gomod/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-gomod";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-s5kzyQPf29RZPnPtgFf4IVHnOtVZOtGSQqy1BNVVykQ=";
   };
 
diff --git a/pkgs/tools/security/deepsecrets/default.nix b/pkgs/tools/security/deepsecrets/default.nix
index 0eabf689cea0..21e68a970a7d 100644
--- a/pkgs/tools/security/deepsecrets/default.nix
+++ b/pkgs/tools/security/deepsecrets/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "avito-tech";
     repo = "deepsecrets";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-VfIsPgStHcIYGbfrOs1mvgoq0ZoVSZwILFVBeMt/5Jc=";
   };
 
diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix
index 844501a162be..7892e73e0144 100644
--- a/pkgs/tools/security/feroxbuster/default.nix
+++ b/pkgs/tools/security/feroxbuster/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "epi052";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-3cznGVpZISLD2TbsHYyYYUTD55NmgBdNJ44V4XfZ40k=";
   };
 
diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix
index 7e62c0741662..bbf3a63ebde7 100644
--- a/pkgs/tools/security/ggshield/default.nix
+++ b/pkgs/tools/security/ggshield/default.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "GitGuardian";
     repo = "ggshield";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-RNQD862m1p8ooFbV8k7yDW9GzP5vPQ8hgerMpvDdXAs=";
   };
 
diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix
index 1719a6f272d5..58e369c78a25 100644
--- a/pkgs/tools/security/gowitness/default.nix
+++ b/pkgs/tools/security/gowitness/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "sensepost";
     repo = "gowitness";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-oEEq4f5G0kOpaj4KORbVhZqW4RPkBXC33PXYUHhoMxo=";
   };
 
diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix
index 87f8e9828f4c..ec4f2103295b 100644
--- a/pkgs/tools/security/maigret/default.nix
+++ b/pkgs/tools/security/maigret/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Z8SnA7Z5+oKW0AOaNf+c/zR30lrPFmXaxxKkbnDXNNs=";
   };
 
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 7981c286a4cc..1db68949861a 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-PsYA29tEhb++Uo0Mh2sAeAUfy51+x7NGNWrMYkj2rrE=";
   };
 
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 5739ffd33ab0..7ec4a4577ebb 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-c6EC5uuMna07xVHDRFq0UDwuSeopZTmZGZ9ZD5zaq8Y=";
   };
 
diff --git a/pkgs/tools/security/pcsc-tools/default.nix b/pkgs/tools/security/pcsc-tools/default.nix
index 87578be82223..ec034341db82 100644
--- a/pkgs/tools/security/pcsc-tools/default.nix
+++ b/pkgs/tools/security/pcsc-tools/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pcsc-tools";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-5a3sVcFEFzBkbRKUqlCPV7sL3O17G7hDVpxLpAWofdE=";
   };
 
diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix
index 6af9b974ac09..f61507f15e94 100644
--- a/pkgs/tools/security/rustscan/default.nix
+++ b/pkgs/tools/security/rustscan/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "RustScan";
     repo = "RustScan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-6heC/bHo4IqKNvPjch7AiyWTCZDCv4MZHC7DTEX3U5c=";
   };
 
diff --git a/pkgs/tools/security/sbomnix/default.nix b/pkgs/tools/security/sbomnix/default.nix
index 5b42de44b8a8..11fe22a01e17 100644
--- a/pkgs/tools/security/sbomnix/default.nix
+++ b/pkgs/tools/security/sbomnix/default.nix
@@ -34,7 +34,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tiiuae";
     repo = "sbomnix";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-LMrsJnJXmn+rneIslAaoIpwOyPVIVjOyu49O+7J/nIs=";
 
     # Remove documentation as it contains references to nix store
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 643167e5a3a5..3796d0bd86b5 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rbsec";
     repo = "sslscan";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-XFoTwBtufkT/Ja0a3MEytPHx37eg3ZZ7x15EXHjZey4=";
   };
 
diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/tools/security/tracee/default.nix
index fb0504f56ee3..854f49823e43 100644
--- a/pkgs/tools/security/tracee/default.nix
+++ b/pkgs/tools/security/tracee/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
     owner = "aquasecurity";
     repo = pname;
     # project has branches and tags of the same name
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-OnOayDxisvDd802kDKGctaQc5LyoyFfdfvC+2JpRjHY=";
   };
   vendorHash = "sha256-26sAKTJQ7Rf5KRlu7j5XiZVr6CkAC6fm60Pam7KH0uA=";
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 0a9f52ae6ef2..fdf099a215f2 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-IAvVdq59epg/zQ8lLHlewIDBxZD5FmAYCt1xrJlghzM=";
   };
 
diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix
index 097fbcf4c320..5d4ac5ec58a2 100644
--- a/pkgs/tools/text/mdbook-mermaid/default.nix
+++ b/pkgs/tools/text/mdbook-mermaid/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "badboy";
     repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-elDKxtGMLka9Ss5CNnzw32ndxTUliNUgPXp7e4KUmBo=";
   };
 
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 6dcc40973711..ffc5143cc55b 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "cloud-init";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-BhTcOeSKZ1XRIx+xJQkqkSw9M8ilr+BRKXDy5MUXB6E=";
   };
 

From 4f069582ad4d7d4c46ec6660377a5f2de9d7f147 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jan 2025 15:05:23 +0100
Subject: [PATCH 1441/1504] python312Packages.sagemaker-core: 1.0.11 -> 1.0.17

Diff: https://github.com/aws/sagemaker-core/compare/refs/tags/v1.0.11...v1.0.17

Changelog: https://github.com/aws/sagemaker-core/blob/refs/tags/v1.0.17/CHANGELOG.md
---
 pkgs/development/python-modules/sagemaker-core/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 720afdbec844..4b5eb9dd9487 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.11";
+  version = "1.0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${version}";
-    hash = "sha256-6r8roHMJ4s/+mGiPeMVZ9wagdXNJQ3+tUFZ/7T+NQBc=";
+    hash = "sha256-zRdY0LWIOMY6fBqLje6WFYci46WlcxliI8PFAipiIuw=";
   };
 
   build-system = [
@@ -40,6 +40,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "boto3"
     "importlib-metadata"
     "mock"
   ];
@@ -75,7 +76,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python SDK designed to provide an object-oriented interface for interacting with Amazon SageMaker resources";
     homepage = "https://github.com/aws/sagemaker-core";
-    changelog = "https://github.com/aws/sagemaker-core/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/aws/sagemaker-core/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 8146305d0f7c2fbb2cf5523592ccfa7646be9084 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jan 2025 15:05:42 +0100
Subject: [PATCH 1442/1504] python312Packages.sagemaker: 2.232.3 -> 2.237.2

Diff: https://github.com/aws/sagemaker-python-sdk/compare/refs/tags/v2.232.3...v2.237.2

Changelog: https://github.com/aws/sagemaker-python-sdk/blob/v2.237.2/CHANGELOG.md
---
 .../python-modules/sagemaker/default.nix           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 97213af88545..774e4e5b4a40 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -11,10 +11,12 @@
   boto3,
   cloudpickle,
   docker,
+  fastapi,
   google-pasta,
   importlib-metadata,
   jsonschema,
   numpy,
+  omegaconf,
   packaging,
   pandas,
   pathos,
@@ -24,12 +26,12 @@
   pyyaml,
   requests,
   sagemaker-core,
-  sagemaker-mlflow,
   schema,
   smdebug-rulesconfig,
   tblib,
   tqdm,
   urllib3,
+  uvicorn,
 
   # optional-dependencies
   scipy,
@@ -38,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.232.3";
+  version = "2.237.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-6kGxmgkR/1ih2V49C9aEUBBCJS6s1Jbev80FDnJtHFg=";
+    hash = "sha256-cNBPuXoViHy03ZMBrF3+xeMSUpovi1lloXizBvgNJmw=";
   };
 
   build-system = [
@@ -57,6 +59,8 @@ buildPythonPackage rec {
     "boto3"
     "cloudpickle"
     "importlib-metadata"
+    "numpy"
+    "omegaconf"
     "protobuf"
   ];
 
@@ -65,10 +69,12 @@ buildPythonPackage rec {
     boto3
     cloudpickle
     docker
+    fastapi
     google-pasta
     importlib-metadata
     jsonschema
     numpy
+    omegaconf
     packaging
     pandas
     pathos
@@ -78,12 +84,12 @@ buildPythonPackage rec {
     pyyaml
     requests
     sagemaker-core
-    sagemaker-mlflow
     schema
     smdebug-rulesconfig
     tblib
     tqdm
     urllib3
+    uvicorn
   ];
 
   doCheck = false; # many test dependencies are not available in nixpkgs

From caff44bab5901c1a1770e55f85806e3455ba54ed Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 3 Jan 2025 00:47:09 +0100
Subject: [PATCH 1443/1504] python312Packages.databricks-sdk: 0.38.0 -> 0.40.0

Diff: https://github.com/databricks/databricks-sdk-py/compare/refs/tags/v0.38.0...v0.40.0

Changelog: https://github.com/databricks/databricks-sdk-py/blob/refs/tags/v0.40.0/CHANGELOG.md
---
 pkgs/development/python-modules/databricks-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 21d18de7e3a4..1db7d3e429dc 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "databricks-sdk";
-  version = "0.38.0";
+  version = "0.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${version}";
-    hash = "sha256-g00NRo0FSHujN2mCLZCc1hKGsBFiN7ztEneUMziuQpk=";
+    hash = "sha256-x8CbjWdholuIGVr3TxbFjEszu0owjSIm7+G3Sh+cHEk=";
   };
 
   build-system = [
@@ -82,7 +82,7 @@ buildPythonPackage rec {
   meta = {
     description = "Databricks SDK for Python";
     homepage = "https://github.com/databricks/databricks-sdk-py";
-    changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/databricks/databricks-sdk-py/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 5462056d7e360d6e5456aece92642615a484cc8a Mon Sep 17 00:00:00 2001
From: Pascal Dietrich <pascal.1.dietrich@hotmail.com>
Date: Fri, 3 Jan 2025 19:06:02 +0100
Subject: [PATCH 1444/1504] empty-epsilon: 2024.08.09 -> 2024.12.08

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
---
 pkgs/by-name/em/empty-epsilon/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix
index c61e1bce9702..d4009323fb73 100644
--- a/pkgs/by-name/em/empty-epsilon/package.nix
+++ b/pkgs/by-name/em/empty-epsilon/package.nix
@@ -15,16 +15,16 @@
 
 let
   version = {
-    seriousproton = "2024.08.09";
-    emptyepsilon = "2024.08.09";
-    basis-universal = "v1_15_update2";
+    seriousproton = "2024.12.08";
+    emptyepsilon = "2024.12.08";
+    basis-universal = "1.15_final";
   };
 
   basis-universal = fetchFromGitHub {
     owner = "BinomialLLC";
     repo = "basis_universal";
-    rev = version.basis-universal;
-    hash = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4=";
+    tag = version.basis-universal;
+    hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY=";
   };
 
   serious-proton = stdenv.mkDerivation {
@@ -34,8 +34,8 @@ let
     src = fetchFromGitHub {
       owner = "daid";
       repo = "SeriousProton";
-      rev = "EE-${version.seriousproton}";
-      hash = "sha256-B7BUe5rtN/eABJwkuSyn+h1lIHuV/tZUNcGXTyaWIr4=";
+      tag = "EE-${version.seriousproton}";
+      hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90=";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -69,8 +69,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "daid";
     repo = "EmptyEpsilon";
-    rev = "EE-${version.emptyepsilon}";
-    hash = "sha256-DxaasUyJa8n0ha8RqAfEnqCVELs5Or0zvIOgcK75TnU=";
+    tag = "EE-${version.emptyepsilon}";
+    hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48=";
   };
 
   nativeBuildInputs = [ cmake ];

From b6d859feaee1d1900458a3eea848c7933e78ef94 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Mon, 4 Nov 2024 10:24:39 +0530
Subject: [PATCH 1445/1504] git-absorb: 0.6.15 -> 0.6.16

Diff: https://github.com/tummychow/git-absorb/compare/refs/tags/0.6.15...0.6.16
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/applications/version-management/git-absorb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index 7f598867b602..3c112daea5a1 100644
--- a/pkgs/applications/version-management/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-absorb";
-  version = "0.6.15";
+  version = "0.6.16";
 
   src = fetchFromGitHub {
     owner = "tummychow";
     repo = "git-absorb";
     tag = version;
-    hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU=";
+    hash = "sha256-5ZCCrq/mc9FAjl7AMbuQyRak5sL1dG3qWnrdNzUu4Ss=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0=";
+  cargoHash = "sha256-CzZgAjAIJryhFEJve3E62rg4QGRPSvBMuFZJzHGf09w=";
 
   postInstall =
     ''

From 76771755b5a2396263a99cf4ed829b3b2e21af1e Mon Sep 17 00:00:00 2001
From: westpain <homicide@disroot.org>
Date: Tue, 24 Dec 2024 15:36:50 +0200
Subject: [PATCH 1446/1504] maintainers: add stellessia

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e55b7c07349f..e3359f8c5678 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21572,6 +21572,13 @@
     githubId = 22163194;
     name = "Stel Abrego";
   };
+  stellessia = {
+    name = "Rachel Podya";
+    email = "homicide@disroot.org";
+    github = "stellessia";
+    githubId = 81514356;
+    keys = [ { fingerprint = "38E8 7F79 AE86 CA98 F8BC  45F8 1060 00A0 5E5B DB90"; } ];
+  };
   stepbrobd = {
     name = "Yifei Sun";
     email = "ysun@hey.com";

From ab4d78146739112d161b1e8fab7086d2e93bb920 Mon Sep 17 00:00:00 2001
From: westpain <homicide@disroot.org>
Date: Tue, 24 Dec 2024 14:42:16 +0200
Subject: [PATCH 1447/1504] materialgram: 5.7.0.1 -> 5.9.0.1

---
 pkgs/by-name/ma/materialgram/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix
index 651a60bb4b00..419b635f6832 100644
--- a/pkgs/by-name/ma/materialgram/package.nix
+++ b/pkgs/by-name/ma/materialgram/package.nix
@@ -11,13 +11,13 @@ telegram-desktop.override {
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (
     finalAttrs: previousAttrs: {
       pname = "materialgram-unwrapped";
-      version = "5.7.0.1";
+      version = "5.9.0.1";
 
       src = fetchFromGitHub {
         owner = "kukuruzka165";
         repo = "materialgram";
         rev = "refs/tags/v${finalAttrs.version}";
-        hash = "sha256-YdLUwXMATla64KSYnXLXwLl0KktNoB/IuHIIY44R1VY=";
+        hash = "sha256-QmXwO8Dn+ATWGwN5smxOB2kxmJZETSMbqwFoR0t3luc=";
         fetchSubmodules = true;
       };
 
@@ -32,6 +32,7 @@ telegram-desktop.override {
         maintainers = with lib.maintainers; [
           oluceps
           aleksana
+          stellessia
         ];
         mainProgram = "materialgram";
       };

From b16a62cd6010999a77f2e9ee290397278030f41f Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <mail@pablo.tools>
Date: Sat, 4 Jan 2025 01:12:58 +0100
Subject: [PATCH 1448/1504] kicadAddons.kikit, kicadAddons.kikit-library: add
 pname (#359681)

* kicadAddons.kikit, kicadAddons.kikit-library: add pname

Co-authored-by: jopejoe1 <jopejoe1@missing.ninja>
---
 .../electronics/kicad/addons/kikit.nix        | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/addons/kikit.nix b/pkgs/applications/science/electronics/kicad/addons/kikit.nix
index b6d3cf3e7205..9dbf40c26f5b 100644
--- a/pkgs/applications/science/electronics/kicad/addons/kikit.nix
+++ b/pkgs/applications/science/electronics/kicad/addons/kikit.nix
@@ -1,11 +1,12 @@
 # For building the multiple addons that are in the kikit repo.
-{ stdenv
-, bc
-, kikit
-, zip
-, python3
-, addonName
-, addonPath
+{
+  stdenv,
+  bc,
+  kikit,
+  zip,
+  python3,
+  addonName,
+  addonPath,
 }:
 let
   # This python is only used when building the package, it's not the python
@@ -30,10 +31,14 @@ let
   targetSpec = targetSpecs.${addonName};
 in
 stdenv.mkDerivation {
-  name = "kicadaddon-${addonName}";
+  pname = "kicadaddon-${addonName}";
   inherit (kikit-module) src version;
 
-  nativeBuildInputs = [ python bc zip ];
+  nativeBuildInputs = [
+    python
+    bc
+    zip
+  ];
   propagatedBuildInputs = [ kikit-module ];
 
   buildPhase = ''

From f93800ab5ba323dd978eb31f1faff747b8c87c29 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 21:49:14 -0300
Subject: [PATCH 1449/1504] am2rlauncher: upgrade to .NET 8

---
 pkgs/by-name/am/am2rlauncher/deps.json        | 102 ++++++------------
 .../am/am2rlauncher/dotnet-8-upgrade.patch    |  52 +++++++++
 pkgs/by-name/am/am2rlauncher/package.nix      |  81 +++++++++-----
 3 files changed, 135 insertions(+), 100 deletions(-)
 create mode 100644 pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch

diff --git a/pkgs/by-name/am/am2rlauncher/deps.json b/pkgs/by-name/am/am2rlauncher/deps.json
index 5f81582e1b87..af9c725d3fc7 100644
--- a/pkgs/by-name/am/am2rlauncher/deps.json
+++ b/pkgs/by-name/am/am2rlauncher/deps.json
@@ -2,191 +2,151 @@
   {
     "pname": "AtkSharp",
     "version": "3.24.24.34",
-    "sha256": "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"
+    "hash": "sha256-GrOzO4YDMKJNHAnqLF+c44iGYlvazGTOuRLUnuLbwco="
   },
   {
     "pname": "CairoSharp",
     "version": "3.24.24.34",
-    "sha256": "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"
+    "hash": "sha256-/80xbYSPU8+6twoXRjES8PtV7dKB6fQoe6EqBmawzV8="
   },
   {
     "pname": "Eto.Forms",
     "version": "2.7.1",
-    "sha256": "1hzbdnmn5znycfi0mvqa5k5mz9gasy58qzwa7fjmlkwj8ab87l9r"
+    "hash": "sha256-OdGDlkKST1qlO4p/jIrX6qVfyywK7wqiY97+Yqtt68M="
   },
   {
     "pname": "Eto.Platform.Gtk",
     "version": "2.7.1",
-    "sha256": "09iz85s728jy5qg7y30qvqw5rpsr3yxffrchk1avryk87ky1ysys"
+    "hash": "sha256-2msf/Dxo+rxVmJBl57ofWd9cON4YDH8eLl4icXRBPyY="
   },
   {
     "pname": "GdkSharp",
     "version": "3.24.24.34",
-    "sha256": "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"
+    "hash": "sha256-pQOp2jft19vVN+gSjD0tHfNGucss7ruy1xyys6IHHWQ="
   },
   {
     "pname": "GioSharp",
     "version": "3.24.24.34",
-    "sha256": "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"
+    "hash": "sha256-/fZBfaKXlrdBuNh1/h0s1++5Ek4OnznXvzJx0uTbHQo="
   },
   {
     "pname": "GLibSharp",
     "version": "3.24.24.34",
-    "sha256": "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"
+    "hash": "sha256-eAYUYNHF37nIJnk7aRffzBj8b/rluqXERYy358YAd08="
   },
   {
     "pname": "GtkSharp",
     "version": "3.24.24.34",
-    "sha256": "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"
+    "hash": "sha256-i0XZfzUt9GNaZD1uXNd8x+pb1mPJqYrxQd15XOuHSAA="
   },
   {
     "pname": "LibGit2Sharp",
     "version": "0.27.0",
-    "sha256": "0n8crafpp4jq74km45wlm3jm0h96ggvqxy26wrz55azgjpk6p1gz"
+    "hash": "sha256-/4Vr5pXvq1J+5kb4jvd7JkFQ5aiUF1InOViSe53KDFk="
   },
   {
     "pname": "LibGit2Sharp.NativeBinaries",
     "version": "2.0.319",
-    "sha256": "0xm6np8y182v5246imnkw1fj2sx8x2nl3568kkm3razcgb0y5xlf"
+    "hash": "sha256-jvbiwXrsqzzqnMiUQa3oqGshXeDT1miIKFug4NG1pnY="
   },
   {
     "pname": "log4net",
     "version": "2.0.15",
-    "sha256": "1iq1rd0z0m15ln247jjrimj3avq50vh6njvw4x158r5v6nz093nb"
+    "hash": "sha256-y44EvjW7ZFRCJ3xLa+AGBW81ZI1ZykOEpSVU8EHLAcc="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
+    "version": "2.0.0",
+    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
-    "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
   },
   {
     "pname": "Microsoft.Win32.Registry",
     "version": "5.0.0",
-    "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
     "version": "6.0.0",
-    "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"
-  },
-  {
-    "pname": "NETStandard.Library",
-    "version": "2.0.3",
-    "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
   },
   {
     "pname": "PangoSharp",
     "version": "3.24.24.34",
-    "sha256": "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.4.0",
-    "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.5.1",
-    "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
+    "hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ="
   },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "5.0.0",
-    "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
     "pname": "System.Configuration.ConfigurationManager",
     "version": "4.5.0",
-    "sha256": "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"
+    "hash": "sha256-TICO+mteKMC+kUTF2ooLBv2E+pwoSa/4gwcbW4nwN7s="
   },
   {
     "pname": "System.Configuration.ConfigurationManager",
     "version": "6.0.0",
-    "sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"
+    "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
   },
   {
     "pname": "System.Drawing.Common",
     "version": "6.0.0",
-    "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.0",
-    "sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
-  },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.0",
-    "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.3",
-    "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
   },
   {
     "pname": "System.Security.AccessControl",
     "version": "4.5.0",
-    "sha256": "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"
+    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
   },
   {
     "pname": "System.Security.AccessControl",
     "version": "5.0.0",
-    "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
   },
   {
     "pname": "System.Security.AccessControl",
     "version": "6.0.0",
-    "sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"
+    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
     "version": "4.5.0",
-    "sha256": "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"
+    "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
     "version": "6.0.0",
-    "sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"
+    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
   },
   {
     "pname": "System.Security.Permissions",
     "version": "4.5.0",
-    "sha256": "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"
+    "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ="
   },
   {
     "pname": "System.Security.Permissions",
     "version": "6.0.0",
-    "sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"
+    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
   },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "4.5.0",
-    "sha256": "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"
+    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
   },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "5.0.0",
-    "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
   },
   {
     "pname": "System.Windows.Extensions",
     "version": "6.0.0",
-    "sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"
+    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
   }
 ]
diff --git a/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch
new file mode 100644
index 000000000000..aa57704e697a
--- /dev/null
+++ b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch
@@ -0,0 +1,52 @@
+diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
+index e5e6191..ab9f228 100644
+--- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
++++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
+@@ -2,7 +2,7 @@
+ 	
+   <PropertyGroup>
+     <OutputType>WinExe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ApplicationIcon>icon64.ico</ApplicationIcon>
+     <RollForward>LatestMajor</RollForward>
+     <LangVersion>latest</LangVersion>
+diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
+index 2af5688..a91bb25 100644
+--- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
++++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
+@@ -2,7 +2,7 @@
+ 	
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0-macos</TargetFramework>
++    <TargetFramework>net8.0-macos</TargetFramework>
+     <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
+     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
+     <RollForward>LatestMajor</RollForward>
+diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
+index be49446..34a842f 100644
+--- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
++++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 	
+   <PropertyGroup>
+-    <TargetFramework>netstandard2.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+ 	<LangVersion>latest</LangVersion>
+     <ApplicationIcon>Resources\LauncherIcon.ico</ApplicationIcon>
+     <Authors>Lojemiru, Miepee</Authors>
+diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
+index 673ab7a..da3a019 100644
+--- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
++++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>netstandard2.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <LangVersion>default</LangVersion>
+     <Configurations>Debug;Release</Configurations>
+     <Platforms>AnyCPU</Platforms>
diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix
index fb8d60d225f8..5e3b02984760 100644
--- a/pkgs/by-name/am/am2rlauncher/package.nix
+++ b/pkgs/by-name/am/am2rlauncher/package.nix
@@ -1,24 +1,25 @@
-{ lib
-, buildDotnetModule
-, writeShellScript
-, glibc
-, gtk3
-, libappindicator
-, webkitgtk_4_0
-, e2fsprogs
-, libnotify
-, libgit2
-, openssl
-, xdelta
-, file
-, openjdk
-, patchelf
-, fetchFromGitHub
-, buildFHSEnv
-, glib-networking
-, wrapGAppsHook3
-, gsettings-desktop-schemas
-, dotnetCorePackages
+{
+  lib,
+  buildDotnetModule,
+  writeShellScript,
+  glibc,
+  gtk3,
+  libappindicator,
+  webkitgtk_4_0,
+  e2fsprogs,
+  libnotify,
+  libgit2,
+  openssl,
+  xdelta,
+  file,
+  openjdk,
+  patchelf,
+  fetchFromGitHub,
+  buildFHSEnv,
+  glib-networking,
+  wrapGAppsHook3,
+  gsettings-desktop-schemas,
+  dotnetCorePackages,
 }:
 let
   am2r-run = buildFHSEnv {
@@ -26,7 +27,8 @@ let
 
     multiArch = true;
 
-    multiPkgs = pkgs: with pkgs; [
+    multiPkgs =
+      pkgs: with pkgs; [
         (lib.getLib stdenv.cc.cc)
         xorg.libX11
         xorg.libXext
@@ -55,7 +57,7 @@ buildDotnetModule {
     hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg=";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj";
 
   nugetDeps = ./deps.json;
@@ -74,16 +76,37 @@ buildDotnetModule {
 
   nativeBuildInputs = [ wrapGAppsHook3 ];
 
-  buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ];
+  buildInputs = [
+    gtk3
+    gsettings-desktop-schemas
+    glib-networking
+  ];
 
-  patches = [ ./am2r-run-binary.patch ];
+  patches = [
+    ./am2r-run-binary.patch
+    ./dotnet-8-upgrade.patch
+  ];
 
-  dotnetFlags = [ ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' ];
+  dotnetFlags = [
+    ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"''
+  ];
+
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.escapeShellArg (
+      lib.makeBinPath [
+        am2r-run
+        xdelta
+        file
+        openjdk
+        patchelf
+      ]
+    ))
+  ];
 
   postFixup = ''
-    wrapProgram $out/bin/AM2RLauncher.Gtk \
-      --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \
-
     mkdir -p $out/share/icons
     install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png
     install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.desktop $out/share/applications/AM2RLauncher.desktop

From aa268be09ae057fffc4a6cbcada68c6865ede8f0 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 21:53:13 -0300
Subject: [PATCH 1450/1504] avalonia-ilspy: format file

---
 .../misc/avalonia-ilspy/default.nix           | 95 +++++++++++--------
 1 file changed, 56 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index 4413f853b011..72b558fe4d9a 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -1,23 +1,24 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, buildDotnetModule
-, dotnetCorePackages
-, libX11
-, libICE
-, libSM
-, libXi
-, libXcursor
-, libXext
-, libXrandr
-, fontconfig
-, glew
-, makeDesktopItem
-, copyDesktopItems
-, icoutils
-, bintools
-, fixDarwinDylibNames
-, autoSignDarwinBinariesHook
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  libX11,
+  libICE,
+  libSM,
+  libXi,
+  libXcursor,
+  libXext,
+  libXrandr,
+  fontconfig,
+  glew,
+  makeDesktopItem,
+  copyDesktopItems,
+  icoutils,
+  bintools,
+  fixDarwinDylibNames,
+  autoSignDarwinBinariesHook,
 }:
 
 buildDotnetModule rec {
@@ -36,11 +37,18 @@ buildDotnetModule rec {
     ./remove-broken-sources.patch
   ];
 
-  nativeBuildInputs = [
-    copyDesktopItems
-    icoutils
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];
+  nativeBuildInputs =
+    [
+      copyDesktopItems
+      icoutils
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      bintools
+      fixDarwinDylibNames
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
   buildInputs = [
     # Dependencies of nuget packages w/ native binaries
@@ -61,18 +69,20 @@ buildDotnetModule rec {
     glew
   ];
 
-  postInstall = ''
-    icotool --icon -x ILSpy/ILSpy.ico
-    for i in 16 32 48 256; do
-      size=''${i}x''${i}
-      install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png
-    done
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist
-    install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns
-    mkdir -p $out/Applications/ILSpy.app/Contents/MacOS
-    ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
-  '';
+  postInstall =
+    ''
+      icotool --icon -x ILSpy/ILSpy.ico
+      for i in 16 32 48 256; do
+        size=''${i}x''${i}
+        install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png
+      done
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist
+      install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns
+      mkdir -p $out/Applications/ILSpy.app/Contents/MacOS
+      ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
+    '';
 
   dotnet-sdk = dotnetCorePackages.sdk_6_0;
   dotnet-runtime = dotnetCorePackages.runtime_6_0;
@@ -108,8 +118,15 @@ buildDotnetModule rec {
       lgpl21Only
       mspl
     ];
-    sourceProvenance = with sourceTypes; [ fromSource binaryBytecode binaryNativeCode ];
-    maintainers = with maintainers; [ AngryAnt emilytrau ];
+    sourceProvenance = with sourceTypes; [
+      fromSource
+      binaryBytecode
+      binaryNativeCode
+    ];
+    maintainers = with maintainers; [
+      AngryAnt
+      emilytrau
+    ];
     mainProgram = "ILSpy";
   };
 }

From 0506ebefc19364bbc1501ea688d300859dfd1147 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 22:02:52 -0300
Subject: [PATCH 1451/1504] avalonia-ilspy: upgrade to .NET 8

---
 .../misc/avalonia-ilspy/default.nix           |   7 +-
 .../misc/avalonia-ilspy/deps.json             | 713 ++++++++++++------
 .../avalonia-ilspy/dotnet-8-upgrade.patch     |  64 ++
 3 files changed, 542 insertions(+), 242 deletions(-)
 create mode 100644 pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch

diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index 72b558fe4d9a..69aeb11e2bbd 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -29,12 +29,14 @@ buildDotnetModule rec {
     owner = "icsharpcode";
     repo = "AvaloniaILSpy";
     rev = "v${version}";
-    sha256 = "cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";
+    hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ=";
   };
 
   patches = [
     # Remove dead nuget package source
     ./remove-broken-sources.patch
+    # Upgrade project to .NET 8.0
+    ./dotnet-8-upgrade.patch
   ];
 
   nativeBuildInputs =
@@ -84,8 +86,7 @@ buildDotnetModule rec {
       ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy
     '';
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
 
   projectFile = "ILSpy/ILSpy.csproj";
   nugetDeps = ./deps.json;
diff --git a/pkgs/applications/misc/avalonia-ilspy/deps.json b/pkgs/applications/misc/avalonia-ilspy/deps.json
index 7259717dcfc1..c37cf06f99ab 100644
--- a/pkgs/applications/misc/avalonia-ilspy/deps.json
+++ b/pkgs/applications/misc/avalonia-ilspy/deps.json
@@ -2,1068 +2,1303 @@
   {
     "pname": "Avalonia",
     "version": "0.10.13",
-    "sha256": "1df46dvjyax8jjdcvdavpzq5bwxacrw71j557mcm1401vv3r1vn3"
+    "hash": "sha256-w+6Qx94BkFBZPaXIcHhmqvNV8L9btc2alKgrL3czxLU="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
     "version": "2.1.0.2020091801",
-    "sha256": "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"
+    "hash": "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI="
   },
   {
     "pname": "Avalonia.AvaloniaEdit",
     "version": "0.10.12.2",
-    "sha256": "1sn8k71xcfnjxgxfqzdrv1hy7h7pvdk820nyzkmrf02gi77mx7nw"
+    "hash": "sha256-3J5ez4lPAJfr/N4CgWbb98DjYdi5fez669I61sOZyOo="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
     "version": "0.10.13",
-    "sha256": "1yl402l5cwbv6gwy3p8r702ypp3p8w5wi8im25c2bjnv31889l8r"
+    "hash": "sha256-GdGEUBjbyiVYETWiyAtHd9zrBTgZ3eH5M3txVqgAhPo="
   },
   {
     "pname": "Avalonia.Desktop",
     "version": "0.10.13",
-    "sha256": "1y206hrfwyg8023z0m7dik1hlir1r18h8q0f0zqz3sabyy5k276w"
+    "hash": "sha256-3Bwxi/dL6fHxBw5gBFHIIUcKw4ztVPCHAOh57jI0QPg="
   },
   {
     "pname": "Avalonia.Diagnostics",
     "version": "0.10.13",
-    "sha256": "11khr3w7gwlm1bajfh5zhrsfcfd9kbw5mbgwnbjq7i5lq9glriid"
+    "hash": "sha256-LcZMX8K0xIPlsvytWviaqTnmdIa/QCfVCpXyd/jIcIY="
   },
   {
     "pname": "Avalonia.FreeDesktop",
     "version": "0.10.13",
-    "sha256": "18gygzg12facawvzmfgpja4rsagy670dv1dcrx4shfl7w8l998jp"
+    "hash": "sha256-V6KUKOKHOqhJz6yF3cAx/imdiZL3ufo3V0w5Ed5//qE="
   },
   {
     "pname": "Avalonia.Markup.Xaml.Loader",
     "version": "0.10.13",
-    "sha256": "187r64xpidliqbp9c3qar0grhn97ffvc0mp0gyrxxszrff9vf69k"
+    "hash": "sha256-Mxm3k3P5696zf+BWwLZzJ1mYH8gKD5buwpG2eDsx+aA="
   },
   {
     "pname": "Avalonia.Native",
     "version": "0.10.13",
-    "sha256": "18b2pykfcgw9pyjmdqq7i1n8j330n7xrwyldl9bpkvahswinvhza"
+    "hash": "sha256-6sNtI9dQ7XlXoo16nvuxYAyJbIgH41alv4k/5qa/YqE="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
     "version": "0.10.13",
-    "sha256": "0j0kdh6dbii59v972azhwq69rmak63lp5f5jqz3pi94mifx4bayy"
+    "hash": "sha256-3qtFuouVpHjHx7K4cukwU9WcDObwK3HSTiXG1QxsE0g="
   },
   {
     "pname": "Avalonia.Skia",
     "version": "0.10.13",
-    "sha256": "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml"
+    "hash": "sha256-tB7FeQ/27phvrTtVBZZN2O3h/j+Zk4qOwANUYgIHvkw="
   },
   {
     "pname": "Avalonia.Win32",
     "version": "0.10.13",
-    "sha256": "0jyl1rrn1n07dnqn76ijwhxgkc45dmsfh2d811n4695ndaz85nkl"
+    "hash": "sha256-dNqCvmq2JENsCKgJ6HRthbD5OuQymmOxbQfYYHMO1Es="
   },
   {
     "pname": "Avalonia.X11",
     "version": "0.10.13",
-    "sha256": "1y8x9hjdlxg4q8q958i364cbak8xjh4nldp38cnxwjir814p0xwh"
+    "hash": "sha256-kHdwSUA5St4tQ+M2agmUHU21GDEjopIwwuR12iRMHfk="
   },
   {
     "pname": "HarfBuzzSharp",
     "version": "2.8.2-preview.178",
-    "sha256": "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"
+    "hash": "sha256-dtvXNjVSU1WZ4kFsT6VV56R8iGMPHtdM09dfeejnttw="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
     "version": "2.8.2-preview.178",
-    "sha256": "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"
+    "hash": "sha256-Vyy8zgtqw1uLJTbWNTS+wt/7yNuO4qzYU5a91Sf1ApA="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
     "version": "2.8.2-preview.178",
-    "sha256": "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"
+    "hash": "sha256-YqGYQttBmNRCmkSS+JRfqTsPnuMdKxkYU9ctS5mKFV0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
     "version": "2.8.2-preview.178",
-    "sha256": "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"
+    "hash": "sha256-QAwWpNc03Vh2RSqIW0xE/rmQCvl/IWs87QREqZNXMtk="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
     "version": "2.8.2-preview.178",
-    "sha256": "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"
+    "hash": "sha256-J9exQ3FxRHMF8tHTc4zhjYGQ6eBYb4ZKwWhzk2L0uuQ="
   },
   {
     "pname": "ICSharpCode.Decompiler",
     "version": "7.1.0.6543",
-    "sha256": "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46"
+    "hash": "sha256-huQuhcbu2AOSw3XaOc84qGWfhmcNrpiexuo01oqWKvc="
   },
   {
     "pname": "ICSharpCode.Decompiler",
     "version": "7.2.1.6856",
-    "sha256": "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"
+    "hash": "sha256-ap3Uq6AwYjO7FbhAm/JjG9YUAv9vWYVggHQk+l9G5qc="
   },
   {
     "pname": "JetBrains.Annotations",
     "version": "10.3.0",
-    "sha256": "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"
+    "hash": "sha256-6I/8HtwvEK0JLgRcSrCzCtUfMylj88s5JNcl9ZDoLb8="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
     "version": "2.9.6",
-    "sha256": "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"
+    "hash": "sha256-ioxUTmJndOyBc0vpk+my94PyL1IAW7lRjg7gy4ELuaI="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
     "version": "3.4.0",
-    "sha256": "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"
+    "hash": "sha256-XNcdi5TmIOBG5tNCotb+xrxhXCsXln/H5MzHTegzNos="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
     "version": "3.4.0",
-    "sha256": "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"
+    "hash": "sha256-PkUV5IZo2vlGr0sx2abP/dyz7SRm9vgYV32VpDijHmY="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
     "version": "3.4.0",
-    "sha256": "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"
+    "hash": "sha256-jxDRlGE4+Ltf2KbVcVKXWEZBmg5qNr9QPyhx29MHTsA="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
     "version": "3.4.0",
-    "sha256": "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"
+    "hash": "sha256-wlXyB2/afWocrB2IOFfCrme/Tv3edDQ35eJNzK/Fr6Q="
   },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.0.1",
-    "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"
+    "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
   },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.3.0",
-    "sha256": "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"
+    "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
   },
   {
     "pname": "Microsoft.DiaSymReader",
     "version": "1.4.0",
-    "sha256": "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"
+    "hash": "sha256-TaTOMcE3uoRVHTDFbUvJuZ6j/VrT4QmI+jKQVC3UKVI="
   },
   {
     "pname": "Microsoft.DiaSymReader.Converter.Xml",
     "version": "1.1.0-beta2-22164-02",
-    "sha256": "1f8ha43xp0zy7kn1n98aaaapv6fdxl3a2qabg29fq74jzb16j9fp",
+    "hash": "sha256-1yVpwvqSHOySeEthoQbtzZl9lVIKJRvsPP6D2wdRELk=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.diasymreader.converter.xml/1.1.0-beta2-22164-02/microsoft.diasymreader.converter.xml.1.1.0-beta2-22164-02.nupkg"
   },
   {
     "pname": "Microsoft.DiaSymReader.Native",
     "version": "17.0.0-beta1.21524.1",
-    "sha256": "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s"
+    "hash": "sha256-ejgD24wlL/7UkpZGd39KoVEG6ABg4y44Oovt//qAWj0="
   },
   {
     "pname": "Microsoft.DiaSymReader.PortablePdb",
     "version": "1.7.0-beta-21525-03",
-    "sha256": "0jb70rjgdif61jjc93pysfrr52hi5jlfmjdaqic7s0a3rfg0ahyk",
+    "hash": "sha256-00MFnstDAX1YxKrJ6qgsEYqSs9P+jsSkDMbF9mQGZ0k=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.diasymreader.portablepdb/1.7.0-beta-21525-03/microsoft.diasymreader.portablepdb.1.7.0-beta-21525-03.nupkg"
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.0.1",
-    "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"
+    "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.1",
-    "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"
+    "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "2.0.0",
-    "sha256": "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"
+    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "2.1.2",
-    "sha256": "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"
+    "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
-    "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.0.1",
-    "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"
+    "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.0",
-    "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.3",
-    "sha256": "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"
+    "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
   },
   {
     "pname": "Microsoft.VisualStudio.Composition",
     "version": "17.1.20",
-    "sha256": "028bcxrzqc0nng2l7fqqaa0z1k4wc541jfhcdwjvw9f45q6nf3fs"
+    "hash": "sha256-2g1nDS7EJb4lbww6GUhhnMzwgVIYu0PFsxYw/HNnCwk="
   },
   {
     "pname": "Microsoft.VisualStudio.Composition.Analyzers",
     "version": "17.1.20",
-    "sha256": "14fm8j1bvqh0bpfg3x814c1m747q99i4q3xplqb8db7l2xkn3v7a"
+    "hash": "sha256-6uxhZxf0rIYWprcPTGJK+JBTAyMB9fHcXQDivYJE1ZE="
   },
   {
     "pname": "Microsoft.VisualStudio.Validation",
     "version": "17.0.34",
-    "sha256": "09la67gw6xdss3as3ph0ql3b3zhblni2qmkma9gz53kx1hav9ygp"
+    "hash": "sha256-9/m0FQx9jvJfUnVWLKKlC/6xBsUA3qHV0Lp1w98xiiY="
   },
   {
     "pname": "Microsoft.Win32.Primitives",
     "version": "4.0.1",
-    "sha256": "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"
+    "hash": "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="
+  },
+  {
+    "pname": "Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
   },
   {
     "pname": "Microsoft.Win32.Registry",
     "version": "4.0.0",
-    "sha256": "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"
+    "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo="
   },
   {
     "pname": "Microsoft.Win32.Registry",
     "version": "5.0.0",
-    "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
     "version": "4.5.0",
-    "sha256": "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"
+    "hash": "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo="
   },
   {
     "pname": "Mono.Cecil",
     "version": "0.11.3",
-    "sha256": "0xcx7pk9y2n1hr15c0l1balzi69kw5gy8dk7sb8jwqyyvm35q4j3"
+    "hash": "sha256-QxJcRt3eYy7R0mc25F/hM5n4qVqBAlZChsEKn+Y9nXU="
   },
   {
     "pname": "NETStandard.Library",
-    "version": "2.0.3",
-    "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
+    "version": "1.6.0",
+    "hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "1.6.1",
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
   },
   {
     "pname": "Newtonsoft.Json",
     "version": "9.0.1",
-    "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"
+    "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
   },
   {
     "pname": "NuGet.Client",
     "version": "4.2.0",
-    "sha256": "1s34w7yi0xcm0hi9g32xx9njy52hjkh4gbizldvpp48mkki6bfrl"
+    "hash": "sha256-NLtl4pwVkXt3oz+uR+CUUBQvbepdjJciBJV1EP3hZOg="
   },
   {
     "pname": "NuGet.Common",
     "version": "4.2.0",
-    "sha256": "0j8bk9nkaxcf52az2rxhx27rqn7hs9mmw0p48i0x7g8i9b40wvwc"
+    "hash": "sha256-jG8OyEoRvdNBROQCXmvS8Ficj+iwZ/GVKI51NW2aC0k="
   },
   {
     "pname": "NuGet.ContentModel",
     "version": "4.2.0",
-    "sha256": "1989zmdgwh13zwg9kafapdka6p46i50iw434fb8k22jp6amnwnvm"
+    "hash": "sha256-dVtuqzJXCjHRcmQQHkGJhlyjZrvKqZke/yNA/lr9CaU="
   },
   {
     "pname": "NuGet.Frameworks",
     "version": "4.2.0",
-    "sha256": "0dwzg8kq0fwdjzl00ag969sxakj3brppr4y7k37yx5w1slj7wsb3"
+    "hash": "sha256-Y2l+JNWBl+7PmMeTfG9eQ07VdTLpKQDol407gCd6nzc="
   },
   {
     "pname": "NuGet.Packaging",
     "version": "4.2.0",
-    "sha256": "1g83ry4x0zlcdcgwd7c8daxig4cx77jics6rlfasy223hyvss8p3"
+    "hash": "sha256-4yKtt4dDCK+Vo9loFuU5nZEXu2qIncYfa4x+0InPA70="
   },
   {
     "pname": "NuGet.Packaging.Core",
     "version": "4.2.0",
-    "sha256": "11dpszywsxb12ybx176z2703181xixzhxg3w3rc8ivw699ivsdfk"
+    "hash": "sha256-0zW9Y0qG74hYHny8Dn+PPaAwwBHfnNCXF2F1zf3Xt4U="
   },
   {
     "pname": "NuGet.Packaging.Core.Types",
     "version": "4.2.0",
-    "sha256": "031gzbs5sqb46c2rbqpybc9bw0i7ilidbbv2k7rdas3300cjp5kj"
+    "hash": "sha256-cpYrGQBjaNXymWKv1SKNJwK+Elv+4pUFM2RhXfT6Lww="
   },
   {
     "pname": "NuGet.Repositories",
     "version": "4.2.0",
-    "sha256": "0w18lj7q85grdd563p429cg0pg8hi9xmsrr4pzskha139vhfq0lp"
+    "hash": "sha256-lwLs4E4jKDj1vyRnXXuKEL0LHkuC3GFKa/kVhI+kKHA="
   },
   {
     "pname": "NuGet.RuntimeModel",
     "version": "4.2.0",
-    "sha256": "0k59ww2zk56bsqici62zn59h19wp4ai9v395hy5mq6wl6mz6qaax"
+    "hash": "sha256-XSlsfjWUG1yLhyWNnaIil6cAU7FfmMgi1suU+QXnqUw="
   },
   {
     "pname": "NuGet.Versioning",
     "version": "4.2.0",
-    "sha256": "1mx7b4hgdhl6g7yzp3lknmkxkyfjw372nxpsmvdznwhg214iz2d3"
+    "hash": "sha256-o4kfSRAPcvvbrvp2K87g0vnZZ7WTjvv9eYbC9iBZp9c="
   },
   {
     "pname": "runtime.any.System.Collections",
     "version": "4.3.0",
-    "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"
+    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
   },
   {
     "pname": "runtime.any.System.Diagnostics.Tools",
     "version": "4.3.0",
-    "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"
+    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
   },
   {
     "pname": "runtime.any.System.Diagnostics.Tracing",
     "version": "4.3.0",
-    "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"
+    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
   },
   {
     "pname": "runtime.any.System.Globalization",
     "version": "4.3.0",
-    "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"
+    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
+  },
+  {
+    "pname": "runtime.any.System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
   },
   {
     "pname": "runtime.any.System.IO",
     "version": "4.3.0",
-    "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"
+    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
   },
   {
     "pname": "runtime.any.System.Reflection",
     "version": "4.3.0",
-    "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"
+    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
   },
   {
     "pname": "runtime.any.System.Reflection.Extensions",
     "version": "4.3.0",
-    "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"
+    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
   },
   {
     "pname": "runtime.any.System.Reflection.Primitives",
     "version": "4.3.0",
-    "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"
+    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
   },
   {
     "pname": "runtime.any.System.Resources.ResourceManager",
     "version": "4.3.0",
-    "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"
+    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
   },
   {
     "pname": "runtime.any.System.Runtime",
     "version": "4.3.0",
-    "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
   },
   {
     "pname": "runtime.any.System.Runtime.Handles",
     "version": "4.3.0",
-    "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"
+    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
   },
   {
     "pname": "runtime.any.System.Runtime.InteropServices",
     "version": "4.3.0",
-    "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"
+    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
   },
   {
     "pname": "runtime.any.System.Text.Encoding",
     "version": "4.3.0",
-    "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
   },
   {
     "pname": "runtime.any.System.Text.Encoding.Extensions",
     "version": "4.3.0",
-    "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"
+    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
   },
   {
     "pname": "runtime.any.System.Threading.Tasks",
     "version": "4.3.0",
-    "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"
+    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
+  },
+  {
+    "pname": "runtime.any.System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
   },
   {
     "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
   },
   {
     "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
   },
   {
     "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
   {
     "pname": "runtime.native.System",
     "version": "4.0.0",
-    "sha256": "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"
+    "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="
   },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
-    "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
   },
   {
     "pname": "runtime.native.System.IO.Compression",
     "version": "4.3.0",
-    "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
+  },
+  {
+    "pname": "runtime.native.System.Net.Http",
+    "version": "4.0.1",
+    "hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="
+  },
+  {
+    "pname": "runtime.native.System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
   },
   {
     "pname": "runtime.native.System.Security.Cryptography",
     "version": "4.0.0",
-    "sha256": "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"
+    "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
   },
   {
     "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
   },
   {
     "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
   },
   {
     "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
   },
   {
     "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
   },
   {
     "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
   },
   {
     "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
   },
   {
     "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
   },
   {
     "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
+    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
   },
   {
     "pname": "runtime.unix.Microsoft.Win32.Primitives",
     "version": "4.3.0",
-    "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"
+    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
+  },
+  {
+    "pname": "runtime.unix.System.Console",
+    "version": "4.3.1",
+    "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
   },
   {
     "pname": "runtime.unix.System.Diagnostics.Debug",
     "version": "4.3.0",
-    "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"
+    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
   },
   {
     "pname": "runtime.unix.System.IO.FileSystem",
     "version": "4.3.0",
-    "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"
+    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
+  },
+  {
+    "pname": "runtime.unix.System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
+  },
+  {
+    "pname": "runtime.unix.System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
   },
   {
     "pname": "runtime.unix.System.Private.Uri",
     "version": "4.3.0",
-    "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
   },
   {
     "pname": "runtime.unix.System.Runtime.Extensions",
     "version": "4.3.0",
-    "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"
+    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
   },
   {
     "pname": "SkiaSharp",
     "version": "2.88.0-preview.178",
-    "sha256": "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"
+    "hash": "sha256-05L+H81OBZDMxn/DWgJ3m8tRtRoSRn6t6nGJZTQJTxg="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
     "version": "2.88.0-preview.178",
-    "sha256": "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"
+    "hash": "sha256-XM/h5oWVGRBN68BLG6nLxlFW3j+juG0FGHTQUGRQbx4="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
     "version": "2.88.0-preview.178",
-    "sha256": "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"
+    "hash": "sha256-8bGU2DPZMRmGv+0nMswUQ4AJzFo/QWEzwd5oxrot6ZI="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
     "version": "2.88.0-preview.178",
-    "sha256": "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"
+    "hash": "sha256-VRMWi3Vum53PaZDAgXnxwukINq8gaScRVfruMMtjVSY="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
     "version": "2.88.0-preview.178",
-    "sha256": "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"
+    "hash": "sha256-1KJmFxYZ6p+vJNB/p2ShBcSCaIF4PXv5dmNTAQ6NLDo="
+  },
+  {
+    "pname": "System.AppContext",
+    "version": "4.1.0",
+    "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="
+  },
+  {
+    "pname": "System.AppContext",
+    "version": "4.3.0",
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.0.0",
+    "hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="
   },
   {
     "pname": "System.Buffers",
     "version": "4.3.0",
-    "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.4.0",
-    "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.5.1",
-    "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
   },
   {
     "pname": "System.Collections",
     "version": "4.0.11",
-    "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"
+    "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
   },
   {
     "pname": "System.Collections",
     "version": "4.3.0",
-    "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
   },
   {
     "pname": "System.Collections.Concurrent",
     "version": "4.0.12",
-    "sha256": "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"
+    "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="
+  },
+  {
+    "pname": "System.Collections.Concurrent",
+    "version": "4.3.0",
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
   {
     "pname": "System.Collections.Immutable",
     "version": "1.5.0",
-    "sha256": "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"
+    "hash": "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q="
   },
   {
     "pname": "System.Collections.Immutable",
     "version": "1.6.0",
-    "sha256": "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"
+    "hash": "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="
   },
   {
     "pname": "System.Collections.Immutable",
     "version": "5.0.0",
-    "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"
+    "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
   },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "4.5.0",
-    "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"
+    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
   {
     "pname": "System.ComponentModel.Composition",
     "version": "6.0.0",
-    "sha256": "16zfx5mivkkykp76krw8x68izmjf79ldfmn26k9x3m55lmp9i77c"
+    "hash": "sha256-7JyYbqWl1NHTNMJW12g6TtYfkemI52nOnX7OHWvp7ps="
   },
   {
     "pname": "System.Composition",
     "version": "6.0.0",
-    "sha256": "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"
+    "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="
   },
   {
     "pname": "System.Composition.AttributedModel",
     "version": "6.0.0",
-    "sha256": "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"
+    "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="
   },
   {
     "pname": "System.Composition.Convention",
     "version": "6.0.0",
-    "sha256": "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"
+    "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="
   },
   {
     "pname": "System.Composition.Hosting",
     "version": "6.0.0",
-    "sha256": "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"
+    "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="
   },
   {
     "pname": "System.Composition.Runtime",
     "version": "6.0.0",
-    "sha256": "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"
+    "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="
   },
   {
     "pname": "System.Composition.TypedParts",
     "version": "6.0.0",
-    "sha256": "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"
+    "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="
+  },
+  {
+    "pname": "System.Console",
+    "version": "4.0.0",
+    "hash": "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="
+  },
+  {
+    "pname": "System.Console",
+    "version": "4.3.0",
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
   },
   {
     "pname": "System.Diagnostics.Debug",
     "version": "4.0.11",
-    "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"
+    "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
   },
   {
     "pname": "System.Diagnostics.Debug",
     "version": "4.3.0",
-    "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.0.0",
+    "hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.3.0",
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
   {
     "pname": "System.Diagnostics.Process",
     "version": "4.1.0",
-    "sha256": "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"
+    "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg="
   },
   {
     "pname": "System.Diagnostics.Tools",
     "version": "4.0.1",
-    "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"
+    "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
+  },
+  {
+    "pname": "System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
   },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.1.0",
-    "sha256": "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"
+    "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="
   },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.3.0",
-    "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
   },
   {
     "pname": "System.Drawing.Common",
     "version": "4.5.0",
-    "sha256": "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"
+    "hash": "sha256-DLYGJraIfSj0Zmpi2H5Am2AsZ+kP5UVGdjakqj9Q2E4="
   },
   {
     "pname": "System.Dynamic.Runtime",
     "version": "4.0.11",
-    "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"
+    "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
   },
   {
     "pname": "System.Dynamic.Runtime",
     "version": "4.3.0",
-    "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"
+    "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
   },
   {
     "pname": "System.Globalization",
     "version": "4.0.11",
-    "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"
+    "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
   },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
-    "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
+  },
+  {
+    "pname": "System.Globalization.Calendars",
+    "version": "4.0.1",
+    "hash": "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8="
+  },
+  {
+    "pname": "System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
+  },
+  {
+    "pname": "System.Globalization.Extensions",
+    "version": "4.0.1",
+    "hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI="
+  },
+  {
+    "pname": "System.Globalization.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
   },
   {
     "pname": "System.IO",
     "version": "4.1.0",
-    "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"
+    "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
   },
   {
     "pname": "System.IO",
     "version": "4.3.0",
-    "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
   },
   {
     "pname": "System.IO.Compression",
     "version": "4.3.0",
-    "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
+  },
+  {
+    "pname": "System.IO.Compression.ZipFile",
+    "version": "4.0.1",
+    "hash": "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA="
+  },
+  {
+    "pname": "System.IO.Compression.ZipFile",
+    "version": "4.3.0",
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.0.1",
-    "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"
+    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
   },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
-    "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
   },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.0.1",
-    "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"
+    "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
   },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
-    "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
   },
   {
     "pname": "System.Linq",
     "version": "4.1.0",
-    "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"
+    "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
   },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
-    "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.1.0",
-    "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"
+    "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
   },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.3.0",
-    "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
   },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
-    "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"
+    "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
   {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
+    "pname": "System.Net.Http",
+    "version": "4.1.0",
+    "hash": "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ="
   },
   {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"
+    "pname": "System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
+  },
+  {
+    "pname": "System.Net.NameResolution",
+    "version": "4.3.0",
+    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
+  },
+  {
+    "pname": "System.Net.Primitives",
+    "version": "4.0.11",
+    "hash": "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="
+  },
+  {
+    "pname": "System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
+  },
+  {
+    "pname": "System.Net.Sockets",
+    "version": "4.1.0",
+    "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="
+  },
+  {
+    "pname": "System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
-    "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
   },
   {
     "pname": "System.ObjectModel",
     "version": "4.0.12",
-    "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"
+    "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
   },
   {
     "pname": "System.ObjectModel",
     "version": "4.3.0",
-    "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
   },
   {
     "pname": "System.Private.Uri",
     "version": "4.3.0",
-    "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
   {
     "pname": "System.Reactive",
     "version": "5.0.0",
-    "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"
+    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
   },
   {
     "pname": "System.Reflection",
     "version": "4.1.0",
-    "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"
+    "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
   },
   {
     "pname": "System.Reflection",
     "version": "4.3.0",
-    "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.0.1",
-    "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"
+    "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
   },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.3.0",
-    "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
   },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.7.0",
-    "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
   },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.0.1",
-    "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"
+    "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
   },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.3.0",
-    "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.7.0",
-    "sha256": "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
   },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.0.1",
-    "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"
+    "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
   },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.3.0",
-    "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.0.1",
-    "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"
+    "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
   },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
-    "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
   },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
-    "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"
+    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
   {
     "pname": "System.Reflection.Metadata",
     "version": "5.0.0",
-    "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"
+    "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
   },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.0.1",
-    "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"
+    "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
   },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
-    "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.1.0",
-    "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"
+    "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
   },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
-    "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
   },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.7.0",
-    "sha256": "04qw9km34pmzr2alckb3mqdb4fpqwlvzk59lg8c7jfidghcl4jqq"
+    "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="
   },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.0.1",
-    "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"
+    "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
   },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
-    "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
   },
   {
     "pname": "System.Runtime",
     "version": "4.1.0",
-    "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"
+    "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
   },
   {
     "pname": "System.Runtime",
     "version": "4.3.0",
-    "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
   {
     "pname": "System.Runtime",
     "version": "4.3.1",
-    "sha256": "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"
+    "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="
   },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.5.2",
-    "sha256": "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.3",
-    "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"
+    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
   },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.6.0",
-    "sha256": "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"
+    "hash": "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y="
   },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.1.0",
-    "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"
+    "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
   },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
-    "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.1",
-    "sha256": "1bzkwqm1yhvm70yq2bx2s3mqfx2lr01sqsay8cl5n5xcbq07ynf6"
+    "hash": "sha256-xll/AF6sF1soQ15prAPIVHSH69CiL4E9OHVDHyrm868="
   },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.0.1",
-    "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"
+    "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
   },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
-    "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.1.0",
-    "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"
+    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
   },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
-    "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
   {
-    "pname": "System.Runtime.InteropServices.WindowsRuntime",
+    "pname": "System.Runtime.InteropServices.RuntimeInformation",
+    "version": "4.0.0",
+    "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="
+  },
+  {
+    "pname": "System.Runtime.InteropServices.RuntimeInformation",
     "version": "4.3.0",
-    "sha256": "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
   },
   {
     "pname": "System.Runtime.Numerics",
     "version": "4.0.1",
-    "sha256": "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"
+    "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="
+  },
+  {
+    "pname": "System.Runtime.Numerics",
+    "version": "4.3.0",
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
   {
     "pname": "System.Runtime.Serialization.Primitives",
     "version": "4.1.1",
-    "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"
+    "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
   },
   {
     "pname": "System.Security.AccessControl",
     "version": "5.0.0",
-    "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
+  },
+  {
+    "pname": "System.Security.Claims",
+    "version": "4.3.0",
+    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
   },
   {
     "pname": "System.Security.Cryptography.Algorithms",
     "version": "4.2.0",
-    "sha256": "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"
+    "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE="
+  },
+  {
+    "pname": "System.Security.Cryptography.Algorithms",
+    "version": "4.3.0",
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.2.0",
+    "hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.3.0",
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
+  },
+  {
+    "pname": "System.Security.Cryptography.Csp",
+    "version": "4.0.0",
+    "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="
+  },
+  {
+    "pname": "System.Security.Cryptography.Csp",
+    "version": "4.3.0",
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
   },
   {
     "pname": "System.Security.Cryptography.Encoding",
     "version": "4.0.0",
-    "sha256": "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"
+    "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="
+  },
+  {
+    "pname": "System.Security.Cryptography.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
+  },
+  {
+    "pname": "System.Security.Cryptography.OpenSsl",
+    "version": "4.0.0",
+    "hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="
+  },
+  {
+    "pname": "System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
     "version": "4.0.0",
-    "sha256": "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"
+    "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="
+  },
+  {
+    "pname": "System.Security.Cryptography.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
+  },
+  {
+    "pname": "System.Security.Cryptography.X509Certificates",
+    "version": "4.1.0",
+    "hash": "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="
+  },
+  {
+    "pname": "System.Security.Cryptography.X509Certificates",
+    "version": "4.3.0",
+    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
+  },
+  {
+    "pname": "System.Security.Principal",
+    "version": "4.3.0",
+    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.3.0",
+    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
   },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "4.7.0",
-    "sha256": "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"
+    "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
   },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "5.0.0",
-    "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
   },
   {
     "pname": "System.Text.Encoding",
     "version": "4.0.11",
-    "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"
+    "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
   },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
-    "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
   },
   {
     "pname": "System.Text.Encoding.CodePages",
     "version": "4.5.1",
-    "sha256": "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"
+    "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
   },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
-    "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.1.0",
-    "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"
+    "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.3.0",
-    "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
   },
   {
     "pname": "System.Threading",
     "version": "4.0.11",
-    "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"
+    "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
   },
   {
     "pname": "System.Threading",
     "version": "4.3.0",
-    "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
   },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.0.11",
-    "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"
+    "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
   },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
-    "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
   {
     "pname": "System.Threading.Tasks.Dataflow",
     "version": "5.0.0",
-    "sha256": "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"
+    "hash": "sha256-Hi7MpNVXe5lZmQkty3BqIC2kyknskFLNdkkWy1+NDgk="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.0.0",
-    "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"
+    "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.3.0",
-    "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.5.3",
-    "sha256": "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.5.4",
-    "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"
+    "hash": "sha256-8TglbC6KBHlDeSfgr6d5dGn7wu8td4XERl2JUyo0+Tw="
   },
   {
     "pname": "System.Threading.Thread",
     "version": "4.0.0",
-    "sha256": "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"
+    "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8="
   },
   {
     "pname": "System.Threading.ThreadPool",
     "version": "4.0.10",
-    "sha256": "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"
+    "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk="
+  },
+  {
+    "pname": "System.Threading.ThreadPool",
+    "version": "4.3.0",
+    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
+  },
+  {
+    "pname": "System.Threading.Timer",
+    "version": "4.0.1",
+    "hash": "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="
+  },
+  {
+    "pname": "System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
   },
   {
     "pname": "System.ValueTuple",
     "version": "4.5.0",
-    "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
   },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.0.11",
-    "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"
+    "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
+  },
+  {
+    "pname": "System.Xml.ReaderWriter",
+    "version": "4.3.0",
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
   },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.1",
-    "sha256": "15f9vd7r0bxmyv754238bdckfg6sxaa3d4yx71hdzkz9k0mhjcky"
+    "hash": "sha256-fjIJK5jpz99gON2TNpTq2jw3WVtoCFLO9rUvkE/byZU="
   },
   {
     "pname": "System.Xml.XDocument",
     "version": "4.0.11",
-    "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"
+    "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
+  },
+  {
+    "pname": "System.Xml.XDocument",
+    "version": "4.3.0",
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
   },
   {
     "pname": "Tmds.DBus",
     "version": "0.9.0",
-    "sha256": "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"
+    "hash": "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8="
   }
 ]
diff --git a/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch b/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch
new file mode 100644
index 000000000000..60aa5abcb46f
--- /dev/null
+++ b/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch
@@ -0,0 +1,64 @@
+diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
+index 397e0e5..dfa385c 100644
+--- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
++++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>netstandard2.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <LangVersion>7.2</LangVersion>
+     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+   </PropertyGroup>
+diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj
+index cd6d5e2..d725817 100644
+--- a/ILSpy.Core/ILSpy.Core.csproj
++++ b/ILSpy.Core/ILSpy.Core.csproj
+@@ -2,7 +2,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>netstandard2.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+     <EnableDefaultItems>false</EnableDefaultItems>
+     <SignAssembly>True</SignAssembly>
+diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
+index 4deb56f..b9813ba 100644
+--- a/ILSpy/ILSpy.csproj
++++ b/ILSpy/ILSpy.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <OutputType>WinExe</OutputType>
+ 
+     <TieredCompilation>true</TieredCompilation>
+diff --git a/SharpTreeView/SharpTreeView.csproj b/SharpTreeView/SharpTreeView.csproj
+index d6f46c5..4183ffd 100644
+--- a/SharpTreeView/SharpTreeView.csproj
++++ b/SharpTreeView/SharpTreeView.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFramework>netstandard2.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+     <EnableDefaultItems>false</EnableDefaultItems>
+     <SignAssembly>True</SignAssembly>
+diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj
+index 453a3ef..806f375 100644
+--- a/TestPlugin/TestPlugin.csproj
++++ b/TestPlugin/TestPlugin.csproj
+@@ -2,7 +2,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>netstandard2.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <AssemblyName>Test.Plugin</AssemblyName>
+ 
+     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>

From 9255bc2d41bcde82eac88d866fd3d4a504422955 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 22:36:30 -0300
Subject: [PATCH 1452/1504] clr-loader: upgrade to .NET 8

---
 .../python-modules/clr-loader/default.nix     | 21 ++++++++++---
 .../python-modules/clr-loader/deps.json       | 12 +++----
 .../clr-loader/dotnet-8-upgrade.patch         | 31 +++++++++++++++++++
 3 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch

diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix
index 87316f6deeaa..9b34590b5909 100644
--- a/pkgs/development/python-modules/clr-loader/default.nix
+++ b/pkgs/development/python-modules/clr-loader/default.nix
@@ -19,31 +19,42 @@ let
     inherit version;
     hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4=";
   };
+  patches = [ ./dotnet-8-upgrade.patch ];
 
   # This buildDotnetModule is used only to get nuget sources, the actual
   # build is done in `buildPythonPackage` below.
   dotnet-build = buildDotnetModule {
-    inherit pname version src;
+    inherit
+      pname
+      version
+      src
+      patches
+      ;
     projectFile = [
       "netfx_loader/ClrLoader.csproj"
       "example/example.csproj"
     ];
     nugetDeps = ./deps.json;
-    dotnet-sdk = dotnetCorePackages.sdk_6_0;
+    dotnet-sdk = dotnetCorePackages.sdk_8_0;
   };
 in
 buildPythonPackage {
-  inherit pname version src;
+  inherit
+    pname
+    version
+    src
+    patches
+    ;
 
   format = "pyproject";
 
-  buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps;
+  buildInputs = dotnetCorePackages.sdk_8_0.packages ++ dotnet-build.nugetDeps;
 
   nativeBuildInputs = [
     setuptools
     setuptools-scm
     wheel
-    dotnetCorePackages.sdk_6_0
+    dotnetCorePackages.sdk_8_0
   ];
 
   propagatedBuildInputs = [ cffi ];
diff --git a/pkgs/development/python-modules/clr-loader/deps.json b/pkgs/development/python-modules/clr-loader/deps.json
index ba094f13d934..f787d633257a 100644
--- a/pkgs/development/python-modules/clr-loader/deps.json
+++ b/pkgs/development/python-modules/clr-loader/deps.json
@@ -2,31 +2,31 @@
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies",
     "version": "1.0.0",
-    "sha256": "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"
+    "hash": "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k="
   },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461",
     "version": "1.0.0",
-    "sha256": "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"
+    "hash": "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM="
   },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies.net47",
     "version": "1.0.0",
-    "sha256": "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6"
+    "hash": "sha256-Jh40dua+AQpSUGTOCQG493sJzbfqH+yIgyoA6+A1ZQM="
   },
   {
     "pname": "NETStandard.Library",
     "version": "2.0.3",
-    "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
   },
   {
     "pname": "NXPorts",
     "version": "1.0.0",
-    "sha256": "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj"
+    "hash": "sha256-kpqQDljgsCBRDqbuJkgwClG3dkgjrBAhtXoPZlJR+ws="
   }
 ]
diff --git a/pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch b/pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch
new file mode 100644
index 000000000000..d261dfc9e3cc
--- /dev/null
+++ b/pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch
@@ -0,0 +1,31 @@
+diff --git a/example/example.csproj b/example/example.csproj
+index fd6d566..ed76d15 100644
+--- a/example/example.csproj
++++ b/example/example.csproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFrameworks>net60;netstandard20</TargetFrameworks>
++    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
+     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+   </PropertyGroup>
+   <ItemGroup>
+diff --git a/tests/test_common.py b/tests/test_common.py
+index 8a9e36d..8370024 100644
+--- a/tests/test_common.py
++++ b/tests/test_common.py
+@@ -8,12 +8,12 @@ from pathlib import Path
+ 
+ @pytest.fixture(scope="session")
+ def example_netstandard(tmpdir_factory):
+-    return build_example(tmpdir_factory, "netstandard20")
++    return build_example(tmpdir_factory, "netstandard2.0")
+ 
+ 
+ @pytest.fixture(scope="session")
+ def example_netcore(tmpdir_factory):
+-    return build_example(tmpdir_factory, "net60")
++    return build_example(tmpdir_factory, "net8.0")
+ 
+ 
+ def build_example(tmpdir_factory, framework):

From 4d1c3d85347cc703cf4e21fa5238f86114684842 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 22:59:38 -0300
Subject: [PATCH 1453/1504] dafny: upgrade to .NET 8

---
 pkgs/by-name/da/dafny/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix
index 54f88b7b36c6..6ff063fdc4b5 100644
--- a/pkgs/by-name/da/dafny/package.nix
+++ b/pkgs/by-name/da/dafny/package.nix
@@ -65,11 +65,18 @@ buildDotnetModule rec {
       # frameworks, you must specify the framework for the published
       # application."
       substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
-        --replace-warn TargetFrameworks TargetFramework \
-        --replace-warn "netstandard2.0;net452" net6.0
+        --replace-fail TargetFrameworks TargetFramework \
+        --replace-fail "netstandard2.0;net452" net8.0
+
+      for f in Source/**/*.csproj ; do
+        [[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue;
+
+        substituteInPlace $f \
+          --replace-fail net6.0 net8.0
+      done
     '';
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   nativeBuildInputs = [ jdk11 ];
   nugetDeps = ./deps.json;
 

From 59d969cf96b389c2e97c4894836590d8042ace6a Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 23:19:17 -0300
Subject: [PATCH 1454/1504] formula: format file

---
 pkgs/by-name/fo/formula/package.nix | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix
index df3141e0184e..441724118885 100644
--- a/pkgs/by-name/fo/formula/package.nix
+++ b/pkgs/by-name/fo/formula/package.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, unstableGitUpdater }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  unstableGitUpdater,
+}:
 
 buildDotnetModule rec {
   pname = "formula-dotnet";
@@ -15,13 +22,17 @@ buildDotnetModule rec {
   nugetDeps = ./nuget.json;
   projectFile = "Src/CommandLine/CommandLine.csproj";
 
-  postFixup = if stdenv.hostPlatform.isLinux then ''
-    mv $out/bin/CommandLine $out/bin/formula
-  '' else lib.optionalString stdenv.hostPlatform.isDarwin ''
-    makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \
-      --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
-      --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
-  '';
+  postFixup =
+    if stdenv.hostPlatform.isLinux then
+      ''
+        mv $out/bin/CommandLine $out/bin/formula
+      ''
+    else
+      lib.optionalString stdenv.hostPlatform.isDarwin ''
+        makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \
+          --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
+          --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
+      '';
 
   passthru.updateScript = unstableGitUpdater { url = meta.homepage; };
 

From 9429734a01f51a590db7fd90e615d551540956a9 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 23:40:55 -0300
Subject: [PATCH 1455/1504] formula: upgrade to .NET 8

---
 .../by-name/fo/formula/dotnet-8-upgrade.patch |  65 ++++++
 pkgs/by-name/fo/formula/nuget.json            | 212 +++++++++---------
 pkgs/by-name/fo/formula/package.nix           |  14 +-
 3 files changed, 179 insertions(+), 112 deletions(-)
 create mode 100644 pkgs/by-name/fo/formula/dotnet-8-upgrade.patch

diff --git a/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch b/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch
new file mode 100644
index 000000000000..45c654635a89
--- /dev/null
+++ b/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch
@@ -0,0 +1,65 @@
+diff --git a/Src/CommandLine/CommandLine.csproj b/Src/CommandLine/CommandLine.csproj
+index 2b6a4fe..5eee8c7 100644
+--- a/Src/CommandLine/CommandLine.csproj
++++ b/Src/CommandLine/CommandLine.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <Platforms>AnyCPU;x64</Platforms>
+   </PropertyGroup>
+ 
+diff --git a/Src/Core/Core.csproj b/Src/Core/Core.csproj
+index 8e79a00..db64e3a 100644
+--- a/Src/Core/Core.csproj
++++ b/Src/Core/Core.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ApplicationIcon />
+     <StartupObject />
+     <Platforms>AnyCPU;x64</Platforms>
+diff --git a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj
+index daa042d..9290c12 100644
+--- a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj
++++ b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <Platforms>AnyCPU;x64</Platforms>
+   </PropertyGroup>
+ 
+diff --git a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj
+index ed3cde5..6c669cd 100644
+--- a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj
++++ b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj
+@@ -17,7 +17,7 @@
+     </ItemGroup>
+     <PropertyGroup>
+         <OutputType>Exe</OutputType>
+-        <TargetFramework>net6.0</TargetFramework>
++        <TargetFramework>net8.0</TargetFramework>
+         <Nullable>enable</Nullable>
+         <ToolCommandName>dotnet-formula</ToolCommandName>
+         <AssemblyName>Microsoft.Jupyter.VUISIS.Formula</AssemblyName>
+diff --git a/Src/Tests/Tests.csproj b/Src/Tests/Tests.csproj
+index 8828a49..eebe401 100644
+--- a/Src/Tests/Tests.csproj
++++ b/Src/Tests/Tests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+     <PropertyGroup>
+-        <TargetFramework>net6.0</TargetFramework>
++        <TargetFramework>net8.0</TargetFramework>
+ 
+         <IsPackable>false</IsPackable>
+     </PropertyGroup>
diff --git a/pkgs/by-name/fo/formula/nuget.json b/pkgs/by-name/fo/formula/nuget.json
index 007951a96833..30605ef4480f 100644
--- a/pkgs/by-name/fo/formula/nuget.json
+++ b/pkgs/by-name/fo/formula/nuget.json
@@ -2,531 +2,531 @@
   {
     "pname": "Antlr4.Runtime.Standard",
     "version": "4.7.2",
-    "sha256": "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586"
+    "hash": "sha256-BhWgy5MeAc43bANzOi1p1oPqRA3z4x/yt0A6iZ++ud4="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.0",
-    "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
   {
     "pname": "Microsoft.Win32.Primitives",
     "version": "4.3.0",
-    "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
   },
   {
     "pname": "Microsoft.Z3.x64",
     "version": "4.8.7",
-    "sha256": "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz"
+    "hash": "sha256-v1XK4bsYAvySTtScd9dsCC2exuTvaBEl36iX2pPgtPM="
   },
   {
     "pname": "NETStandard.Library",
     "version": "1.6.1",
-    "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
   },
   {
     "pname": "runtime.any.System.Collections",
     "version": "4.3.0",
-    "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"
+    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
   },
   {
     "pname": "runtime.any.System.Diagnostics.Tools",
     "version": "4.3.0",
-    "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"
+    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
   },
   {
     "pname": "runtime.any.System.Diagnostics.Tracing",
     "version": "4.3.0",
-    "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"
+    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
   },
   {
     "pname": "runtime.any.System.Globalization",
     "version": "4.3.0",
-    "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"
+    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
   },
   {
     "pname": "runtime.any.System.Globalization.Calendars",
     "version": "4.3.0",
-    "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"
+    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
   },
   {
     "pname": "runtime.any.System.IO",
     "version": "4.3.0",
-    "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"
+    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
   },
   {
     "pname": "runtime.any.System.Reflection",
     "version": "4.3.0",
-    "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"
+    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
   },
   {
     "pname": "runtime.any.System.Reflection.Extensions",
     "version": "4.3.0",
-    "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"
+    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
   },
   {
     "pname": "runtime.any.System.Reflection.Primitives",
     "version": "4.3.0",
-    "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"
+    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
   },
   {
     "pname": "runtime.any.System.Resources.ResourceManager",
     "version": "4.3.0",
-    "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"
+    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
   },
   {
     "pname": "runtime.any.System.Runtime",
     "version": "4.3.0",
-    "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
   },
   {
     "pname": "runtime.any.System.Runtime.Handles",
     "version": "4.3.0",
-    "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"
+    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
   },
   {
     "pname": "runtime.any.System.Runtime.InteropServices",
     "version": "4.3.0",
-    "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"
+    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
   },
   {
     "pname": "runtime.any.System.Text.Encoding",
     "version": "4.3.0",
-    "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
   },
   {
     "pname": "runtime.any.System.Text.Encoding.Extensions",
     "version": "4.3.0",
-    "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"
+    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
   },
   {
     "pname": "runtime.any.System.Threading.Tasks",
     "version": "4.3.0",
-    "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"
+    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
   },
   {
     "pname": "runtime.any.System.Threading.Timer",
     "version": "4.3.0",
-    "sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"
+    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
   },
   {
     "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
   },
   {
     "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
   },
   {
     "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
-    "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
   },
   {
     "pname": "runtime.native.System.IO.Compression",
     "version": "4.3.0",
-    "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
   },
   {
     "pname": "runtime.native.System.Net.Http",
     "version": "4.3.0",
-    "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
   },
   {
     "pname": "runtime.native.System.Security.Cryptography.Apple",
     "version": "4.3.0",
-    "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"
+    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
   },
   {
     "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
   },
   {
     "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
   },
   {
     "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
   },
   {
     "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
     "version": "4.3.0",
-    "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"
+    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
   },
   {
     "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
   },
   {
     "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
   },
   {
     "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
   },
   {
     "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
   },
   {
     "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
+    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
   },
   {
     "pname": "runtime.unix.Microsoft.Win32.Primitives",
     "version": "4.3.0",
-    "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"
+    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
   },
   {
     "pname": "runtime.unix.System.Console",
     "version": "4.3.0",
-    "sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"
+    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
   },
   {
     "pname": "runtime.unix.System.Diagnostics.Debug",
     "version": "4.3.0",
-    "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"
+    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
   },
   {
     "pname": "runtime.unix.System.IO.FileSystem",
     "version": "4.3.0",
-    "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"
+    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
   },
   {
     "pname": "runtime.unix.System.Net.Primitives",
     "version": "4.3.0",
-    "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"
+    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
   },
   {
     "pname": "runtime.unix.System.Net.Sockets",
     "version": "4.3.0",
-    "sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"
+    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
   },
   {
     "pname": "runtime.unix.System.Private.Uri",
     "version": "4.3.0",
-    "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
   },
   {
     "pname": "runtime.unix.System.Runtime.Extensions",
     "version": "4.3.0",
-    "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"
+    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
   },
   {
     "pname": "System.AppContext",
     "version": "4.3.0",
-    "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
   },
   {
     "pname": "System.Buffers",
     "version": "4.3.0",
-    "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
   },
   {
     "pname": "System.Collections",
     "version": "4.3.0",
-    "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
   },
   {
     "pname": "System.Collections.Concurrent",
     "version": "4.3.0",
-    "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
   {
     "pname": "System.Console",
     "version": "4.3.0",
-    "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
   },
   {
     "pname": "System.Diagnostics.Debug",
     "version": "4.3.0",
-    "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "4.3.0",
-    "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
   {
     "pname": "System.Diagnostics.Tools",
     "version": "4.3.0",
-    "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
   },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.3.0",
-    "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
   },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
-    "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
   },
   {
     "pname": "System.Globalization.Calendars",
     "version": "4.3.0",
-    "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
   },
   {
     "pname": "System.Globalization.Extensions",
     "version": "4.3.0",
-    "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
   },
   {
     "pname": "System.IO",
     "version": "4.3.0",
-    "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
   },
   {
     "pname": "System.IO.Compression",
     "version": "4.3.0",
-    "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
   },
   {
     "pname": "System.IO.Compression.ZipFile",
     "version": "4.3.0",
-    "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
-    "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
   },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
-    "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
   },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
-    "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.3.0",
-    "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
   },
   {
     "pname": "System.Net.Http",
     "version": "4.3.0",
-    "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"
+    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
   },
   {
     "pname": "System.Net.NameResolution",
     "version": "4.3.0",
-    "sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"
+    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
   },
   {
     "pname": "System.Net.Primitives",
     "version": "4.3.0",
-    "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
   },
   {
     "pname": "System.Net.Sockets",
     "version": "4.3.0",
-    "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
   {
     "pname": "System.ObjectModel",
     "version": "4.3.0",
-    "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
   },
   {
     "pname": "System.Private.Uri",
     "version": "4.3.0",
-    "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
   {
     "pname": "System.Reflection",
     "version": "4.3.0",
-    "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.3.0",
-    "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
   },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.3.0",
-    "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
   },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.3.0",
-    "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
-    "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
   },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
-    "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
-    "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
   },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
-    "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
   },
   {
     "pname": "System.Runtime",
     "version": "4.3.0",
-    "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
-    "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
-    "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
-    "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
   {
     "pname": "System.Runtime.InteropServices.RuntimeInformation",
     "version": "4.3.0",
-    "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
   },
   {
     "pname": "System.Runtime.Numerics",
     "version": "4.3.0",
-    "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
   {
     "pname": "System.Security.Claims",
     "version": "4.3.0",
-    "sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"
+    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
   },
   {
     "pname": "System.Security.Cryptography.Algorithms",
     "version": "4.3.0",
-    "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
   },
   {
     "pname": "System.Security.Cryptography.Cng",
     "version": "4.3.0",
-    "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
   },
   {
     "pname": "System.Security.Cryptography.Csp",
     "version": "4.3.0",
-    "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
   },
   {
     "pname": "System.Security.Cryptography.Encoding",
     "version": "4.3.0",
-    "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
   },
   {
     "pname": "System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
     "version": "4.3.0",
-    "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
   },
   {
     "pname": "System.Security.Cryptography.X509Certificates",
     "version": "4.3.0",
-    "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"
+    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
   },
   {
     "pname": "System.Security.Principal",
     "version": "4.3.0",
-    "sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"
+    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
   },
   {
     "pname": "System.Security.Principal.Windows",
     "version": "4.3.0",
-    "sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"
+    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
   },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
-    "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
   },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
-    "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.3.0",
-    "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
   },
   {
     "pname": "System.Threading",
     "version": "4.3.0",
-    "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
   },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
-    "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.3.0",
-    "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
   },
   {
     "pname": "System.Threading.ThreadPool",
     "version": "4.3.0",
-    "sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"
+    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
   },
   {
     "pname": "System.Threading.Timer",
     "version": "4.3.0",
-    "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
   },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.0",
-    "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
   },
   {
     "pname": "System.Xml.XDocument",
     "version": "4.3.0",
-    "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
   }
 ]
diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix
index 441724118885..08fde7877db4 100644
--- a/pkgs/by-name/fo/formula/package.nix
+++ b/pkgs/by-name/fo/formula/package.nix
@@ -7,7 +7,7 @@
   unstableGitUpdater,
 }:
 
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: {
   pname = "formula-dotnet";
   version = "2.0";
 
@@ -15,10 +15,12 @@ buildDotnetModule rec {
     owner = "VUISIS";
     repo = "formula-dotnet";
     rev = "8ee2e6abfd4ce038e1d9cb9c8602dec1ed6c0163";
-    sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8=";
+    hash = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8=";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  patches = [ ./dotnet-8-upgrade.patch ];
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   nugetDeps = ./nuget.json;
   projectFile = "Src/CommandLine/CommandLine.csproj";
 
@@ -29,12 +31,12 @@ buildDotnetModule rec {
       ''
     else
       lib.optionalString stdenv.hostPlatform.isDarwin ''
-        makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \
+        makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \
           --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
           --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
       '';
 
-  passthru.updateScript = unstableGitUpdater { url = meta.homepage; };
+  passthru.updateScript = unstableGitUpdater { url = finalAttrs.meta.homepage; };
 
   meta = with lib; {
     description = "Formal Specifications for Verification and Synthesis";
@@ -44,4 +46,4 @@ buildDotnetModule rec {
     platforms = platforms.unix;
     mainProgram = "formula";
   };
-}
+})

From 1d9621816f3b921de17eb0f4de3a29e9832133b7 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 23:52:34 -0300
Subject: [PATCH 1456/1504] ilspycmd: format file and switch to finalAttrs

---
 pkgs/development/tools/ilspycmd/default.nix | 44 ++++++++++++---------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index 8527fb7dfdfc..c25155dbdfda 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, buildDotnetModule
-, dotnetCorePackages
-, powershell
-, autoSignDarwinBinariesHook
-, glibcLocales
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  powershell,
+  autoSignDarwinBinariesHook,
+  glibcLocales,
 }:
-buildDotnetModule rec {
+buildDotnetModule (finalAttrs: rec {
   pname = "ilspycmd";
   version = "8.0";
 
@@ -18,9 +19,13 @@ buildDotnetModule rec {
     hash = "sha256-ERBYXgpBRXISfqBSBEydEQuD/5T1dvJ+wNg2U5pKip4=";
   };
 
-  nativeBuildInputs = [
-    powershell
-  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];
+  nativeBuildInputs =
+    [
+      powershell
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
   # https://github.com/NixOS/nixpkgs/issues/38991
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
@@ -35,18 +40,21 @@ buildDotnetModule rec {
   # see: https://github.com/tunnelvisionlabs/ReferenceAssemblyAnnotator/issues/94
   linkNugetPackages = true;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for decompiling .NET assemblies and generating portable PDBs";
     mainProgram = "ilspycmd";
     homepage = "https://github.com/icsharpcode/ILSpy";
-    changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${src.rev}";
-    license = with licenses; [
+    changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${finalAttrs.src.rev}";
+    license = with lib.licenses; [
       mit
       # third party dependencies
       mspl
       asl20
     ];
-    sourceProvenance = with sourceTypes; [ fromSource binaryBytecode ];
-    maintainers = with maintainers; [ emilytrau ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+    maintainers = with lib.maintainers; [ emilytrau ];
   };
-}
+})

From 2a05f934fcdd6b0269ccfea0efda55e59c4ca634 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 17 Dec 2024 23:56:29 -0300
Subject: [PATCH 1457/1504] ilspycmd: 8.0 -> 9.0-preview3

---
 pkgs/development/tools/ilspycmd/default.nix |   7 +-
 pkgs/development/tools/ilspycmd/deps.json   | 514 +++++++++-----------
 2 files changed, 240 insertions(+), 281 deletions(-)

diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index c25155dbdfda..099345427f3e 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -10,13 +10,13 @@
 }:
 buildDotnetModule (finalAttrs: rec {
   pname = "ilspycmd";
-  version = "8.0";
+  version = "9.0-preview3";
 
   src = fetchFromGitHub {
     owner = "icsharpcode";
     repo = "ILSpy";
     rev = "v${version}";
-    hash = "sha256-ERBYXgpBRXISfqBSBEydEQuD/5T1dvJ+wNg2U5pKip4=";
+    hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M=";
   };
 
   nativeBuildInputs =
@@ -31,8 +31,7 @@ buildDotnetModule (finalAttrs: rec {
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
   env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive";
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
 
   projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj";
   nugetDeps = ./deps.json;
diff --git a/pkgs/development/tools/ilspycmd/deps.json b/pkgs/development/tools/ilspycmd/deps.json
index 2a26f262857a..53cc16e082dd 100644
--- a/pkgs/development/tools/ilspycmd/deps.json
+++ b/pkgs/development/tools/ilspycmd/deps.json
@@ -1,367 +1,327 @@
 [
   {
     "pname": "K4os.Compression.LZ4",
-    "version": "1.3.5",
-    "sha256": "1nv9inhz0n25lhkw9xgp6g5xbqmcdccdhx6mwrli0pdp6hjmlh9k"
+    "version": "1.3.8",
+    "hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA="
   },
   {
     "pname": "McMaster.Extensions.CommandLineUtils",
-    "version": "3.1.0",
-    "sha256": "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"
+    "version": "4.1.1",
+    "hash": "sha256-K10ukfRqcRIKJT7PFxc7NFpKWRT+FIDg8IJAR8HA5Eo="
+  },
+  {
+    "pname": "McMaster.Extensions.Hosting.CommandLine",
+    "version": "4.1.1",
+    "hash": "sha256-Qz4rSwi0vE5CmwGolmASB92/XZsKlz/QC+pdRITVKHA="
   },
   {
     "pname": "Microsoft.Build.Tasks.Git",
-    "version": "1.1.1",
-    "sha256": "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"
+    "version": "8.0.0",
+    "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "8.0.0",
+    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "6.0.0",
+    "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.2",
+    "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.CommandLine",
+    "version": "8.0.0",
+    "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
+    "version": "8.0.0",
+    "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.FileExtensions",
+    "version": "8.0.1",
+    "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Json",
+    "version": "8.0.1",
+    "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.UserSecrets",
+    "version": "8.0.1",
+    "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "8.0.1",
+    "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "6.0.0",
+    "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "8.0.1",
+    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "6.0.0",
+    "hash": "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Physical",
+    "version": "8.0.0",
+    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileSystemGlobbing",
+    "version": "8.0.0",
+    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting",
+    "version": "8.0.1",
+    "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "6.0.0",
+    "hash": "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "8.0.1",
+    "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "6.0.0",
+    "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "8.0.1",
+    "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Console",
+    "version": "8.0.1",
+    "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Debug",
+    "version": "8.0.1",
+    "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.EventLog",
+    "version": "8.0.1",
+    "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.EventSource",
+    "version": "8.0.1",
+    "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.2",
+    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "8.0.0",
+    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "6.0.0",
+    "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
   },
   {
     "pname": "Microsoft.NETCore.App.Ref",
-    "version": "6.0.0",
-    "sha256": "1skgkralqkg2srvgvrmbsmya67f37gzk40lg28j8nz5mg8k8g0ia"
+    "version": "8.0.0",
+    "hash": "sha256-yTkWSH0P4IsKl+fAX9tapyug3omJQ4wxMWcMYhBc20M="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.SourceLink.Common",
-    "version": "1.1.1",
-    "sha256": "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"
+    "version": "8.0.0",
+    "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
   },
   {
     "pname": "Microsoft.SourceLink.GitHub",
-    "version": "1.1.1",
-    "sha256": "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"
+    "version": "8.0.0",
+    "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
   },
   {
     "pname": "Mono.Cecil",
-    "version": "0.11.4",
-    "sha256": "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"
+    "version": "0.11.6",
+    "hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU="
   },
   {
     "pname": "NETStandard.Library",
     "version": "2.0.3",
-    "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
   },
   {
-    "pname": "runtime.any.System.Collections",
-    "version": "4.3.0",
-    "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
   },
   {
-    "pname": "runtime.any.System.Globalization",
-    "version": "4.3.0",
-    "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"
+    "pname": "NuGet.Common",
+    "version": "6.11.1",
+    "hash": "sha256-UyZtDyTuymC+sKSX+ripOI6MmJZn11loVapVs4uzaGo="
   },
   {
-    "pname": "runtime.any.System.IO",
-    "version": "4.3.0",
-    "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"
+    "pname": "NuGet.Configuration",
+    "version": "6.11.1",
+    "hash": "sha256-JH2UCpjYg8pkqxQ4j4BrWiTKhGzgfn55NMr32wf6+FQ="
   },
   {
-    "pname": "runtime.any.System.Reflection",
-    "version": "4.3.0",
-    "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"
+    "pname": "NuGet.Frameworks",
+    "version": "6.11.1",
+    "hash": "sha256-p25Oa7wJjwF+2puIhBkZZkKSuk4jGq7xikYSCdfp9Vc="
   },
   {
-    "pname": "runtime.any.System.Reflection.Primitives",
-    "version": "4.3.0",
-    "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"
+    "pname": "NuGet.Packaging",
+    "version": "6.11.1",
+    "hash": "sha256-1yY3p5hQwbUgYCyHnBcuGWiiIib1ppPYt2ntxwXSJW0="
   },
   {
-    "pname": "runtime.any.System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"
+    "pname": "NuGet.Protocol",
+    "version": "6.11.1",
+    "hash": "sha256-/zFvBV83Q5oMNu68BjmrHtZMAxf/YkDJV8HSsl5GjsY="
   },
   {
-    "pname": "runtime.any.System.Runtime",
-    "version": "4.3.0",
-    "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"
-  },
-  {
-    "pname": "runtime.any.System.Runtime.Handles",
-    "version": "4.3.0",
-    "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"
-  },
-  {
-    "pname": "runtime.any.System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding",
-    "version": "4.3.0",
-    "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"
-  },
-  {
-    "pname": "runtime.any.System.Threading.Tasks",
-    "version": "4.3.0",
-    "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
-  },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.3.0",
-    "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
-  },
-  {
-    "pname": "runtime.native.System.IO.Compression",
-    "version": "4.3.0",
-    "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
-  },
-  {
-    "pname": "runtime.unix.System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"
-  },
-  {
-    "pname": "runtime.unix.System.Private.Uri",
-    "version": "4.3.0",
-    "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"
-  },
-  {
-    "pname": "runtime.unix.System.Runtime.Extensions",
-    "version": "4.3.0",
-    "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"
+    "pname": "NuGet.Versioning",
+    "version": "6.11.1",
+    "hash": "sha256-fl8lyChMjV7Sp8keAP7CdXZh7ARN/mU39T3gG74jDWY="
   },
   {
     "pname": "System.Buffers",
     "version": "4.5.1",
-    "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.3.0",
-    "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
   {
     "pname": "System.Collections.Immutable",
     "version": "6.0.0",
-    "sha256": "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"
-  },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "7.0.0",
-    "sha256": "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"
+    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
   },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "5.0.0",
-    "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"
-  },
-  {
-    "pname": "System.Composition",
-    "version": "6.0.0",
-    "sha256": "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
     "pname": "System.Composition.AttributedModel",
+    "version": "8.0.0",
+    "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "8.0.1",
+    "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
+  },
+  {
+    "pname": "System.Formats.Asn1",
     "version": "6.0.0",
-    "sha256": "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"
-  },
-  {
-    "pname": "System.Composition.Convention",
-    "version": "6.0.0",
-    "sha256": "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"
-  },
-  {
-    "pname": "System.Composition.Hosting",
-    "version": "6.0.0",
-    "sha256": "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"
-  },
-  {
-    "pname": "System.Composition.Runtime",
-    "version": "6.0.0",
-    "sha256": "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"
-  },
-  {
-    "pname": "System.Composition.TypedParts",
-    "version": "6.0.0",
-    "sha256": "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.3.0",
-    "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.3.0",
-    "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
-  },
-  {
-    "pname": "System.IO.Compression",
-    "version": "4.3.0",
-    "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
-  },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.3.0",
-    "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
+    "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
   },
   {
     "pname": "System.Memory",
     "version": "4.5.4",
-    "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
+    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
   },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.4.0",
-    "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"
-  },
-  {
-    "pname": "System.Private.Uri",
-    "version": "4.3.0",
-    "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.3.0",
-    "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
   },
   {
     "pname": "System.Reflection.Metadata",
     "version": "6.0.0",
-    "sha256": "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"
+    "hash": "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "7.0.0",
-    "sha256": "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.3.0",
-    "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.0",
-    "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
+    "version": "8.0.1",
+    "hash": "sha256-Swip1XuTs/r2m4RKuG5BXXxcaNGRh+jbMnjFRNdL87U="
   },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
-    "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
   },
   {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.3.0",
-    "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
+    "pname": "System.Security.Cryptography.Pkcs",
+    "version": "6.0.4",
+    "hash": "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="
   },
   {
-    "pname": "System.Runtime.Handles",
-    "version": "4.3.0",
-    "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "4.4.0",
+    "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="
   },
   {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
-  },
-  {
-    "pname": "System.Runtime.Loader",
-    "version": "4.3.0",
-    "sha256": "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.3.0",
-    "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
-  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.3.0",
-    "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.3.0",
-    "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
+    "pname": "TomsToolbox.Composition.Analyzer",
+    "version": "2.20.0",
+    "hash": "sha256-xjWXdkXF8X9nDdzLNA2H1WcpPZV4NDiKf//TeQbLUtc="
   },
   {
     "pname": "TunnelVisionLabs.ReferenceAssemblyAnnotator",
     "version": "1.0.0-alpha.160",
-    "sha256": "1wvfa3098a984kydjgjvx43gncnr89fw20if2gqvz8kqn9pxqjbq"
+    "hash": "sha256-eEncb7J4or/xEy4CwV1C2TL7BulbPtn8JCgplMBQbvM="
   }
 ]

From c9e58193d87d9a5a3571febc30f53689f4f69940 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Wed, 18 Dec 2024 00:05:07 -0300
Subject: [PATCH 1458/1504] inklecate: upgrade to .NET 8

---
 .../in/inklecate/dotnet-8-upgrade.patch       | 65 +++++++++++++++++++
 pkgs/by-name/in/inklecate/package.nix         | 16 +++--
 2 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch

diff --git a/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
new file mode 100644
index 000000000000..c16d94d476e6
--- /dev/null
+++ b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
@@ -0,0 +1,65 @@
+diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj
+index d729fee..ea3e9e6 100644
+--- a/InkTestBed/InkTestBed.csproj
++++ b/InkTestBed/InkTestBed.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <TieredCompilation>true</TieredCompilation>
+     <RootNamespace>InkTestBed</RootNamespace>
+     <AssemblyName>InkTestBed</AssemblyName>
+diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj
+index a6dd06b..c4708cc 100644
+--- a/compiler/ink_compiler.csproj
++++ b/compiler/ink_compiler.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <RootNamespace>Ink</RootNamespace>
+     <AssemblyName>ink_compiler</AssemblyName>
+   </PropertyGroup>
+diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj
+index caba6df..777c109 100644
+--- a/ink-engine-runtime/ink-engine-runtime.csproj
++++ b/ink-engine-runtime/ink-engine-runtime.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net6.0</TargetFrameworks>
++    <TargetFramework>net8.0</TargetFramework>
+     <RootNamespace>Ink.Runtime</RootNamespace>
+     <AssemblyName>ink-engine-runtime</AssemblyName>
+   </PropertyGroup>
+diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj
+index 0a02264..cf7b254 100644
+--- a/inklecate/inklecate.csproj
++++ b/inklecate/inklecate.csproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <RootNamespace>Ink</RootNamespace>
+     <AssemblyName>inklecate</AssemblyName>
+   </PropertyGroup>
+diff --git a/tests/tests.csproj b/tests/tests.csproj
+index 8d3bd6b..a9731c5 100644
+--- a/tests/tests.csproj
++++ b/tests/tests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <RootNamespace>tests</RootNamespace>
+     <AssemblyName>ink-tests</AssemblyName>
+ 
diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix
index 26f3c153e113..3c635a6060c1 100644
--- a/pkgs/by-name/in/inklecate/package.nix
+++ b/pkgs/by-name/in/inklecate/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, buildDotnetModule
-, dotnetCorePackages
-, fetchFromGitHub
+{
+  lib,
+  stdenv,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
 }:
 
 buildDotnetModule rec {
@@ -16,14 +17,15 @@ buildDotnetModule rec {
     hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
   };
 
+  patches = [ ./dotnet-8-upgrade.patch ];
+
   buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
   projectFile = "inklecate/inklecate.csproj";
   nugetDeps = ./deps.json;
   executables = [ "inklecate" ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
 
   meta = with lib; {
     description = "Compiler for ink, inkle's scripting language";

From 6cd4d4a971ef131d1a436b858eb12fee25c04b67 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Wed, 18 Dec 2024 00:29:13 -0300
Subject: [PATCH 1459/1504] knossosnet: upgrade to .NET 8

---
 pkgs/by-name/kn/knossosnet/deps.json          |  5 ---
 .../kn/knossosnet/dotnet-8-upgrade.patch      | 39 +++++++++++++++++++
 pkgs/by-name/kn/knossosnet/package.nix        |  4 +-
 .../kn/knossosnet/targetframework.patch       | 12 ------
 4 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch
 delete mode 100644 pkgs/by-name/kn/knossosnet/targetframework.patch

diff --git a/pkgs/by-name/kn/knossosnet/deps.json b/pkgs/by-name/kn/knossosnet/deps.json
index cdcba8706613..a5b62c2eb37b 100644
--- a/pkgs/by-name/kn/knossosnet/deps.json
+++ b/pkgs/by-name/kn/knossosnet/deps.json
@@ -504,11 +504,6 @@
     "version": "4.7.1",
     "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.0.0",
-    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
-  },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
diff --git a/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch b/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch
new file mode 100644
index 000000000000..5ed204921613
--- /dev/null
+++ b/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch
@@ -0,0 +1,39 @@
+diff --git a/IonKiwi.lz4/IonKiwi.lz4.csproj b/IonKiwi.lz4/IonKiwi.lz4.csproj
+index 312984f..804be5c 100644
+--- a/IonKiwi.lz4/IonKiwi.lz4.csproj
++++ b/IonKiwi.lz4/IonKiwi.lz4.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+ 	<PropertyGroup>
+-		<TargetFrameworks>net60</TargetFrameworks>
++		<TargetFramework>net8.0</TargetFramework>
+ 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ 		<PackageId>IonKiwi.lz4.managed</PackageId>
+ 		<Version>1.0.7</Version>
+diff --git a/Knossos.NET/Knossos.NET.csproj b/Knossos.NET/Knossos.NET.csproj
+index 501faaa..4b563f1 100644
+--- a/Knossos.NET/Knossos.NET.csproj
++++ b/Knossos.NET/Knossos.NET.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <OutputType>WinExe</OutputType>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <Nullable>enable</Nullable>
+     <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+     <TrimMode>copyused</TrimMode>
+diff --git a/VP.NET/VP.NET.csproj b/VP.NET/VP.NET.csproj
+index 11fa155..2eef420 100644
+--- a/VP.NET/VP.NET.csproj
++++ b/VP.NET/VP.NET.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net6.0</TargetFramework>
++    <TargetFramework>net8.0</TargetFramework>
+     <ImplicitUsings>enable</ImplicitUsings>
+     <Nullable>enable</Nullable>
+   </PropertyGroup>
diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix
index 90667c645c27..a29b3135c981 100644
--- a/pkgs/by-name/kn/knossosnet/package.nix
+++ b/pkgs/by-name/kn/knossosnet/package.nix
@@ -17,9 +17,9 @@ buildDotnetModule rec {
     hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U=";
   };
 
-  patches = [ ./targetframework.patch ];
+  patches = [ ./dotnet-8-upgrade.patch ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   nugetDeps = ./deps.json;
   executables = [ "Knossos.NET" ];
 
diff --git a/pkgs/by-name/kn/knossosnet/targetframework.patch b/pkgs/by-name/kn/knossosnet/targetframework.patch
deleted file mode 100644
index 2802a18053c4..000000000000
--- a/pkgs/by-name/kn/knossosnet/targetframework.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj
---- Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj	2023-10-18 15:17:20.000000000 -0400
-+++ Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj	2024-01-03 17:39:56.809971086 -0500
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
- 	<PropertyGroup>
--		<TargetFrameworks>net60</TargetFrameworks>
-+		<TargetFramework>net6.0</TargetFramework>
- 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- 		<PackageId>IonKiwi.lz4.managed</PackageId>
- 		<Version>1.0.7</Version>

From 38a5cfb2fbeca92a7ad46e7f7d119f1ed58440b7 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Thu, 19 Dec 2024 14:42:55 -0300
Subject: [PATCH 1460/1504] formula: simplify postFixup

---
 pkgs/by-name/fo/formula/package.nix         | 20 +++++++++-----------
 pkgs/development/tools/ilspycmd/default.nix |  6 +++---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix
index 08fde7877db4..951ae976f468 100644
--- a/pkgs/by-name/fo/formula/package.nix
+++ b/pkgs/by-name/fo/formula/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchFromGitHub,
   buildDotnetModule,
   dotnetCorePackages,
@@ -25,16 +25,14 @@ buildDotnetModule (finalAttrs: {
   projectFile = "Src/CommandLine/CommandLine.csproj";
 
   postFixup =
-    if stdenv.hostPlatform.isLinux then
-      ''
-        mv $out/bin/CommandLine $out/bin/formula
-      ''
-    else
-      lib.optionalString stdenv.hostPlatform.isDarwin ''
-        makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \
-          --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
-          --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
-      '';
+    lib.optionalString stdenvNoCC.isLinux ''
+      mv $out/bin/CommandLine $out/bin/formula
+    ''
+    + lib.optionalString stdenvNoCC.isDarwin ''
+      makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \
+        --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
+        --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native
+    '';
 
   passthru.updateScript = unstableGitUpdater { url = finalAttrs.meta.homepage; };
 
diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index 099345427f3e..61918c6b7a95 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchFromGitHub,
   buildDotnetModule,
   dotnetCorePackages,
@@ -23,13 +23,13 @@ buildDotnetModule (finalAttrs: rec {
     [
       powershell
     ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    ++ lib.optionals (stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isAarch64) [
       autoSignDarwinBinariesHook
     ];
 
   # https://github.com/NixOS/nixpkgs/issues/38991
   # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
-  env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive";
+  env.LOCALE_ARCHIVE = lib.optionalString stdenvNoCC.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive";
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
 

From 7bf295f2f8446944d8cb92f7ac41d343113e1523 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Thu, 19 Dec 2024 14:45:23 -0300
Subject: [PATCH 1461/1504] ilspycmd: simplify hostPlatform checks

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

diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix
index 951ae976f468..7913d9ec8a7e 100644
--- a/pkgs/by-name/fo/formula/package.nix
+++ b/pkgs/by-name/fo/formula/package.nix
@@ -25,10 +25,10 @@ buildDotnetModule (finalAttrs: {
   projectFile = "Src/CommandLine/CommandLine.csproj";
 
   postFixup =
-    lib.optionalString stdenvNoCC.isLinux ''
+    lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
       mv $out/bin/CommandLine $out/bin/formula
     ''
-    + lib.optionalString stdenvNoCC.isDarwin ''
+    + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
       makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \
         --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \
         --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native

From ea961ad641d1e11147628359b2971faf9311d1df Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 24 Dec 2024 01:00:46 -0300
Subject: [PATCH 1462/1504] alttpr-opentracker: 1.8.5 -> 1.8.6

---
 pkgs/by-name/al/alttpr-opentracker/deps.json  | 902 +++++++++---------
 .../by-name/al/alttpr-opentracker/package.nix |  22 +-
 .../alttpr-opentracker/remove-project.patch   |  14 -
 3 files changed, 443 insertions(+), 495 deletions(-)
 delete mode 100644 pkgs/by-name/al/alttpr-opentracker/remove-project.patch

diff --git a/pkgs/by-name/al/alttpr-opentracker/deps.json b/pkgs/by-name/al/alttpr-opentracker/deps.json
index f9dbc7f4f0fa..b488799ce141 100644
--- a/pkgs/by-name/al/alttpr-opentracker/deps.json
+++ b/pkgs/by-name/al/alttpr-opentracker/deps.json
@@ -1,1052 +1,1022 @@
 [
   {
     "pname": "Autofac",
-    "version": "6.3.0",
-    "sha256": "0zg0lsqzb8hh7l97mfd2z3fxdab86sbmxkaprzi41v0hs1x3jd9b"
+    "version": "7.1.0",
+    "hash": "sha256-9UJoNg/6AV0I2xieMevylwfPu8A0qcpIWPJZFgzT6wA="
   },
   {
     "pname": "Avalonia",
-    "version": "0.10.12",
-    "sha256": "1hb6v8sm7gd8aswdv0slnk8cvvxs5ac82knc3pzvxj0js2n4lnv2"
+    "version": "0.10.22",
+    "hash": "sha256-5EY2FMhtry/RJGXuHzMvdiGEnnDN5OP+M3cEdxR/n7c="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
     "version": "2.1.0.2020091801",
-    "sha256": "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"
+    "hash": "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "0.10.12",
-    "sha256": "1r8qi0kgd9rqbacnriy5sa684d12vxi45a6n2a4w7ydxr97zv5nm"
+    "version": "0.10.22",
+    "hash": "sha256-8p4qWuy8BeXaUVM6H8hWJ2ajl7tgbBAWN3EoiKPmphM="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "0.10.12",
-    "sha256": "17ng7vvmynnmll7fb8zkjlhcn0ksg7p4v6kw207yq72acgvyn96g"
+    "version": "0.10.22",
+    "hash": "sha256-p4fEyykjYwaOgTSBNtK0+v+VvIypg818R4mBWnGzmHI="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "0.10.12",
-    "sha256": "17skzs05iv5ljgnqm36zrbhrh3x20xf5hgni543i02zffj2015ki"
+    "version": "0.10.22",
+    "hash": "sha256-CIS6A47DmbNt/AQGoDWfBs/+7/0busUFCdvX0Su+m9Y="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "0.10.12",
-    "sha256": "00920pdiv8wlpym0s80nz8lfmw515ikrr5f2a6sr4kmjwfd9cffj"
+    "version": "0.10.22",
+    "hash": "sha256-IAyKCqAUMLpm1r39AI7KzeC36dNe87oJwkk7gxJj5Y0="
   },
   {
     "pname": "Avalonia.Markup.Xaml.Loader",
-    "version": "0.10.12",
-    "sha256": "18glwqn4a8p3rz5zsp1xyrm5xwv853056nykf7mdcv1lglh74fsm"
+    "version": "0.10.22",
+    "hash": "sha256-XRl10uLLt57zNxXL9CXWWTlcXEtX2znOVg5VqfyngZc="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "0.10.12",
-    "sha256": "1j6gxg0n55923rbw2p7z6yh27i81xrzpqarb268d3hd6hgjycwc1"
+    "version": "0.10.22",
+    "hash": "sha256-I+4YCsFXcXOYccSWwO9nxFsk4wITafkSkj/55uO5rSo="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "0.10.12",
-    "sha256": "04ga7f8bmz3bqp4dsc4fzrphfq61zf62hlz4nbazf1igx0jzdygy"
+    "version": "0.10.22",
+    "hash": "sha256-czEyKZml1wJSLWULT124pPOKkJr5gCMT9eu4qaCJl9A="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "0.10.12",
-    "sha256": "0ghrb8yf4qahwlpa2appk7q0m0n01q0s65nx1xj1plpi4jr6vvw2"
+    "version": "0.10.22",
+    "hash": "sha256-dEZCLrgO5ogFJ+yAu030NDAWLs98KrLpMcMx2AX8+ig="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "0.10.12",
-    "sha256": "1qj0sw4780za3p6hbwvx1p3b6px3s5vp3ml3vvyak1bajvifz969"
+    "version": "0.10.22",
+    "hash": "sha256-4ty55BXtpeytJtGCnCyD4PBXk/fQPVmwXvr1S3MBseI="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "0.10.12",
-    "sha256": "1af174qca95gxf04zhxm716mi1dazfz7k3995i1nyaz7hygs3p04"
+    "version": "0.10.22",
+    "hash": "sha256-AHUqjeqvJkHKuRSvHma+MbfgnNs1/YmVZkyFHoU7SQQ="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "0.10.12",
-    "sha256": "1jjg4lhg0a95laffwm7imgs92q06whrfkaszm7svgfv1ryazv71q"
+    "version": "0.10.22",
+    "hash": "sha256-PIvSUg01ggYr8w8IONoYo0cgnqwze2v+t0WvVMOEe8o="
   },
   {
     "pname": "Avalonia.Xaml.Behaviors",
-    "version": "0.10.12",
-    "sha256": "0j897knwxpl6sss8v2wrhy4bw4nw4jqc04n8b8d4s76jaqcr3z2h"
+    "version": "0.10.19",
+    "hash": "sha256-I4qs8Rl9pyRVGvsh5n0V+H+CTdg/sqOSomFL5z7BoXY="
   },
   {
     "pname": "Avalonia.Xaml.Interactions",
-    "version": "0.10.12",
-    "sha256": "0nyqg66sg7garc2k729k3dqixbb3asvsjd2kxympfx9q6xyz6vrh"
+    "version": "0.10.19",
+    "hash": "sha256-XLM3Ov0f3S78K1RIZv6tNPpl/ai5yi34Z78zwgGNzgE="
   },
   {
     "pname": "Avalonia.Xaml.Interactivity",
-    "version": "0.10.12",
-    "sha256": "13qbmz39bf29wvq82b1irci8y50fjhhj563cdwd235nm633sixqb"
+    "version": "0.10.19",
+    "hash": "sha256-ZxX8FIGg2+H70c/81hnILW2RVhSNSUXIZhZcWpQE3FE="
   },
   {
     "pname": "Castle.Core",
-    "version": "4.4.1",
-    "sha256": "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7"
-  },
-  {
-    "pname": "Citrus.Avalonia",
-    "version": "1.6.1",
-    "sha256": "1hl98dmgmm6ml5gl70v7vg577n7vn6bjxaq82sgnql5g623pg18x"
+    "version": "5.1.1",
+    "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="
   },
   {
     "pname": "DotNet.Bundle",
     "version": "0.9.13",
-    "sha256": "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"
+    "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="
   },
   {
     "pname": "DynamicData",
-    "version": "7.4.11",
-    "sha256": "1vrrwkmqrdzr4ncjihfzik5ykmy1234iyp2q5qk8spz6y0gwq2h8"
+    "version": "7.1.1",
+    "hash": "sha256-cFskEA5n9Q6wS+nt4nR1jaiC+TzirBu8pHL9g/jErJM="
   },
   {
     "pname": "DynamicData",
-    "version": "7.4.9",
-    "sha256": "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw"
+    "version": "7.14.2",
+    "hash": "sha256-UyCC3hPCEm8RoK+d66vqagY4Yi0GzRwO1qoKcAhPZx4="
   },
   {
     "pname": "ExpectedObjects",
     "version": "3.5.4",
-    "sha256": "1mklg6dx8biaaf9jxp09rddsw66l42r4fpsgnmm6szn6fj2n888k"
+    "hash": "sha256-EyFkhXTGfm1qtU9fR7Ig1BiuW8sJ3C6TUyou1Jt5dNY="
+  },
+  {
+    "pname": "FluentAssertions",
+    "version": "6.12.0",
+    "hash": "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="
+  },
+  {
+    "pname": "Fody",
+    "version": "6.8.0",
+    "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "2.8.2-preview.178",
-    "sha256": "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"
+    "version": "2.8.2.1-preview.108",
+    "hash": "sha256-H2C71GTwKMoTNq2GrNbusLUS7+ca53MYfWYV70i/RHc="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "2.8.2-preview.178",
-    "sha256": "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"
+    "version": "2.8.2.1-preview.108",
+    "hash": "sha256-ROYaZH1MZVKZ+6ToHq+GCf3FC5rz9Z7RWOEJlf1+m5s="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "2.8.2-preview.178",
-    "sha256": "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"
+    "version": "2.8.2.1-preview.108",
+    "hash": "sha256-WgIgnHLOJw52XKccDwmsptTBjTcWgT7dL064yHmmZ5s="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "2.8.2-preview.178",
-    "sha256": "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"
+    "version": "2.8.2.1-preview.108",
+    "hash": "sha256-pXSDS81Y185RZVqA5ALPGsuOcB1GSTn+VpdbPcpYeJY="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "2.8.2-preview.178",
-    "sha256": "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"
+    "version": "2.8.2.1-preview.108",
+    "hash": "sha256-YZaC40YqLKiOrVECbKivJsEqkydZgQfLrENXLJOt3lg="
   },
   {
     "pname": "JetBrains.Annotations",
-    "version": "2021.3.0",
-    "sha256": "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"
+    "version": "2023.2.0",
+    "hash": "sha256-Um10fSmO+21I7f+lbzzVq5e8GBijJ9amTvOlt362p1s="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.3",
-    "sha256": "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.0.1",
-    "sha256": "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"
+    "version": "4.7.0",
+    "hash": "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.0.1",
-    "sha256": "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"
+    "version": "4.7.0",
+    "hash": "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
-    "version": "4.0.1",
-    "sha256": "0ncbld51ja7hp6p2cabw0dx4km2syiz0z58al62h21cpbjfnls5p"
+    "version": "4.7.0",
+    "hash": "sha256-528s2qnDVHswC9DvE1+Rp9Jx83n3Y5RJvtA20x3pZgA="
   },
   {
     "pname": "Microsoft.CodeAnalysis.NetAnalyzers",
-    "version": "6.0.0",
-    "sha256": "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"
+    "version": "8.0.0",
+    "hash": "sha256-Z6MIb9lJskYOEiBZR36pwFI5wWekajx5WJvVA2a/f9Y="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "4.0.1",
-    "sha256": "0zhrlk30js7dp6i76zd7zilaxq26gwsl3pk85p919039786sqs9p"
+    "version": "4.7.0",
+    "hash": "sha256-eESDYyoGmGB6fbgDJvCaFPbwB2Cq9SFpP5nhYxK9bEw="
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "17.0.0",
-    "sha256": "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"
-  },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.0.1",
-    "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"
+    "version": "17.7.2",
+    "hash": "sha256-FfKMhyVEAiRd3VDkotnFHnSmlYGQTh4ZqkEF2+8sriY="
   },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.7.0",
-    "sha256": "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.0.0",
-    "sha256": "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"
+    "version": "17.7.2",
+    "hash": "sha256-EMtV5zcucAcJMGIb/KSqIQnK7PA6aJCgZSobc+5t6SE="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
-    "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "6.0.1",
-    "sha256": "13v33cm88px9wymlxidzgy2ljaq33h1xna3lgdggmy7w4bbdkddh"
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.0",
-    "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "5.0.0",
-    "sha256": "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.0.0",
-    "sha256": "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"
+    "version": "17.7.2",
+    "hash": "sha256-uOe3ELE7iAusTBgxhsx78d4lBw28eDTew13ZnW2bsnU="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.0.0",
-    "sha256": "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"
+    "version": "17.7.2",
+    "hash": "sha256-pox8kez5tgXX4mAiu9qybrlI7oURzPm7YsCd42N4+us="
   },
   {
     "pname": "Microsoft.Win32.Primitives",
     "version": "4.3.0",
-    "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "6.0.0",
-    "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"
+    "version": "7.0.0",
+    "hash": "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64="
   },
   {
     "pname": "NETStandard.Library",
     "version": "1.6.1",
-    "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
   },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.1",
-    "sha256": "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"
+    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
   },
   {
     "pname": "Newtonsoft.Json",
-    "version": "9.0.1",
-    "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
   },
   {
     "pname": "NSubstitute",
-    "version": "4.3.0",
-    "sha256": "026kx6fab9r1a0m8p9hlznp73qhh44k4i0352szvchsis6vlj9gm"
+    "version": "5.1.0",
+    "hash": "sha256-ORpubFd6VoRjA9ZeyZdJPY/xnQXM90O6McMswt8VVG4="
   },
   {
     "pname": "NuGet.Frameworks",
-    "version": "5.0.0",
-    "sha256": "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"
+    "version": "6.5.0",
+    "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="
   },
   {
     "pname": "Packaging.Targets",
     "version": "0.1.220",
-    "sha256": "0ci4jkkqk70vwzf2sgc44a8dap70afp6yhvj967shy7anffxb511"
+    "hash": "sha256-IZTVnbPqeKiPSXJDb65T4FzVkCKEPS3c5xucieeUJDI="
+  },
+  {
+    "pname": "ReactiveMarbles.ObservableEvents.SourceGenerator",
+    "version": "1.2.3",
+    "hash": "sha256-tR/LT14DaLrNsTxSX+9XwH572cigRV22+uB6JSmdt7M="
+  },
+  {
+    "pname": "ReactiveProperty",
+    "version": "9.3.1",
+    "hash": "sha256-2gCpFE9rMDbDlyNi1Fncbr5Bb3u5GDM8VUECrX4PId4="
+  },
+  {
+    "pname": "ReactiveProperty.Core",
+    "version": "9.3.1",
+    "hash": "sha256-dYZ1daWZVVKWHpprLtiJo6n8DRCsORgNHswFy2D39SU="
   },
   {
     "pname": "ReactiveUI",
     "version": "13.2.10",
-    "sha256": "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg"
+    "hash": "sha256-75mjibDiA4Z6VI8AkmgxRremAUVaDbHnl/rfyAuZl3Q="
   },
   {
     "pname": "ReactiveUI",
-    "version": "17.1.17",
-    "sha256": "1v0w88mk8bh68lcj968q61zyx6l07himild605c2xi5lb6a42z71"
+    "version": "19.4.1",
+    "hash": "sha256-cN00n2bjSc8p1mpYxF3S9KopdU0XrLVI0g8pAjehHfw="
+  },
+  {
+    "pname": "ReactiveUI.Fody",
+    "version": "19.4.1",
+    "hash": "sha256-SYqDw5ghH0wddNJOa1Dc/haE0NSOMa8I4d1EKjoVgsg="
+  },
+  {
+    "pname": "runtime.any.System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
+  },
+  {
+    "pname": "runtime.any.System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
+  },
+  {
+    "pname": "runtime.any.System.Diagnostics.Tracing",
+    "version": "4.3.0",
+    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
+  },
+  {
+    "pname": "runtime.any.System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
+  },
+  {
+    "pname": "runtime.any.System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
+  },
+  {
+    "pname": "runtime.any.System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
+  },
+  {
+    "pname": "runtime.any.System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
+  },
+  {
+    "pname": "runtime.any.System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
+  },
+  {
+    "pname": "runtime.any.System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
+  },
+  {
+    "pname": "runtime.any.System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
+  },
+  {
+    "pname": "runtime.any.System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
+  },
+  {
+    "pname": "runtime.any.System.Runtime.Handles",
+    "version": "4.3.0",
+    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
+  },
+  {
+    "pname": "runtime.any.System.Runtime.InteropServices",
+    "version": "4.3.0",
+    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
+  },
+  {
+    "pname": "runtime.any.System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
+  },
+  {
+    "pname": "runtime.any.System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
   },
   {
     "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
   },
   {
     "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
   },
   {
     "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
-    "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
   },
   {
     "pname": "runtime.native.System.IO.Compression",
     "version": "4.3.0",
-    "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
   },
   {
     "pname": "runtime.native.System.Net.Http",
     "version": "4.3.0",
-    "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
   },
   {
     "pname": "runtime.native.System.Security.Cryptography.Apple",
     "version": "4.3.0",
-    "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"
+    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
   },
   {
     "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
   },
   {
     "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
   },
   {
     "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
   },
   {
     "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
     "version": "4.3.0",
-    "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"
+    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
   },
   {
     "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
   },
   {
     "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
   },
   {
     "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
   },
   {
     "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
   },
   {
     "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"
+    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
+  },
+  {
+    "pname": "runtime.unix.Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
+  },
+  {
+    "pname": "runtime.unix.System.Console",
+    "version": "4.3.0",
+    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
+  },
+  {
+    "pname": "runtime.unix.System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
+  },
+  {
+    "pname": "runtime.unix.System.IO.FileSystem",
+    "version": "4.3.0",
+    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
+  },
+  {
+    "pname": "runtime.unix.System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
+  },
+  {
+    "pname": "runtime.unix.System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
+  },
+  {
+    "pname": "runtime.unix.System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
+  },
+  {
+    "pname": "runtime.unix.System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
   },
   {
     "pname": "Serilog",
     "version": "2.10.0",
-    "sha256": "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"
+    "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.0.1",
+    "hash": "sha256-cfcZXT2eQ4K6RQ0twDYPN5jkDpG9dYqpmHJX4zWrL+o="
   },
   {
     "pname": "Serilog.Sinks.Debug",
     "version": "2.0.0",
-    "sha256": "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"
+    "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="
   },
   {
     "pname": "Serilog.Sinks.File",
     "version": "5.0.0",
-    "sha256": "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"
+    "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.0-preview.178",
-    "sha256": "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"
+    "version": "2.88.1-preview.108",
+    "hash": "sha256-5r0MDLe804yedcgOgCDsZ6PvsLA9gZqimo/V16AZVQc="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.0-preview.178",
-    "sha256": "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"
+    "version": "2.88.1-preview.108",
+    "hash": "sha256-10t3pmhdfwRnpabAXIBAnjhZkhKxOTb6XfxqgZkUTqY="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.0-preview.178",
-    "sha256": "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"
+    "version": "2.88.1-preview.108",
+    "hash": "sha256-JTiKU3h2UMjQBEOYOq3rIRsjwqynXab0S0tAqk/Dl+0="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.0-preview.178",
-    "sha256": "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"
+    "version": "2.88.1-preview.108",
+    "hash": "sha256-rZ1Snmz+0daTtt4uPavCYRriRnWg+QlyVidNxCV+CSk="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.0-preview.178",
-    "sha256": "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"
+    "version": "2.88.1-preview.108",
+    "hash": "sha256-9noqwRicVwd920EvHzGVcDvgU5j6Zaj54LoWnC9d6RU="
   },
   {
     "pname": "Splat",
     "version": "10.0.1",
-    "sha256": "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9"
+    "hash": "sha256-aemLZZk/KMdt28gmW7BdJDg/mmxI5zY2kf1L3o/N36E="
   },
   {
     "pname": "Splat",
-    "version": "14.1.17",
-    "sha256": "1akhj04sbxhhfj6zdlr5c0sh696747b0x46g3ayv4yl15kwq6pz5"
+    "version": "14.6.37",
+    "hash": "sha256-UPRwJetwHR31Z7sw7c0dojnvlFAmDNQEF7RXssiMQuY="
+  },
+  {
+    "pname": "Splat",
+    "version": "14.7.1",
+    "hash": "sha256-RzNQU8tTstC1MBZL6D11Ivq69pmPvl+A9eT9zXhdSOc="
+  },
+  {
+    "pname": "Splat.Autofac",
+    "version": "14.7.1",
+    "hash": "sha256-6Lg4C24wDMddJn5HrC9uyFuWrE12gPzayrcxyqvvI0w="
   },
   {
     "pname": "System.AppContext",
     "version": "4.3.0",
-    "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
   },
   {
     "pname": "System.Buffers",
     "version": "4.3.0",
-    "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
   },
   {
     "pname": "System.Buffers",
     "version": "4.5.1",
-    "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.0.11",
-    "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
   {
     "pname": "System.Collections",
     "version": "4.3.0",
-    "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
   },
   {
     "pname": "System.Collections.Concurrent",
     "version": "4.3.0",
-    "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "5.0.0",
-    "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"
-  },
-  {
-    "pname": "System.Collections.NonGeneric",
-    "version": "4.3.0",
-    "sha256": "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"
-  },
-  {
-    "pname": "System.Collections.Specialized",
-    "version": "4.3.0",
-    "sha256": "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"
-  },
-  {
-    "pname": "System.ComponentModel",
-    "version": "4.3.0",
-    "sha256": "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
   },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "4.5.0",
-    "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"
+    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "5.0.0",
-    "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
-    "pname": "System.ComponentModel.Primitives",
-    "version": "4.3.0",
-    "sha256": "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"
-  },
-  {
-    "pname": "System.ComponentModel.TypeConverter",
-    "version": "4.3.0",
-    "sha256": "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "4.4.0",
+    "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="
   },
   {
     "pname": "System.Console",
     "version": "4.3.0",
-    "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.0.11",
-    "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
   },
   {
     "pname": "System.Diagnostics.Debug",
     "version": "4.3.0",
-    "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "4.3.0",
-    "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.7.1",
+    "hash": "sha256-l2TM1pfyRF70Xmzoz1dAqWkB8+/K6b8t5Tj7aF1UO9Y="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
     "version": "6.0.0",
-    "sha256": "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"
-  },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.0.1",
-    "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"
+    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
   },
   {
     "pname": "System.Diagnostics.Tools",
     "version": "4.3.0",
-    "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"
-  },
-  {
-    "pname": "System.Diagnostics.TraceSource",
-    "version": "4.3.0",
-    "sha256": "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
   },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.3.0",
-    "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "6.0.0",
-    "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.0.11",
-    "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.3.0",
-    "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.0.11",
-    "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"
+    "version": "7.0.0",
+    "hash": "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks="
   },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
-    "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
   },
   {
     "pname": "System.Globalization.Calendars",
     "version": "4.3.0",
-    "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
   },
   {
     "pname": "System.Globalization.Extensions",
     "version": "4.3.0",
-    "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
   },
   {
     "pname": "System.IO",
     "version": "4.3.0",
-    "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
   },
   {
     "pname": "System.IO.Compression",
     "version": "4.3.0",
-    "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
   },
   {
     "pname": "System.IO.Compression.ZipFile",
     "version": "4.3.0",
-    "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"
-  },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
-    "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"
-  },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.0.1",
-    "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
   },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
-    "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.1.0",
-    "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
   },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
-    "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"
-  },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.1.0",
-    "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.3.0",
-    "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
   },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
-    "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"
+    "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
   {
     "pname": "System.Net.Http",
     "version": "4.3.0",
-    "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"
+    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
+  },
+  {
+    "pname": "System.Net.NameResolution",
+    "version": "4.3.0",
+    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
   },
   {
     "pname": "System.Net.Primitives",
     "version": "4.3.0",
-    "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
   },
   {
     "pname": "System.Net.Sockets",
     "version": "4.3.0",
-    "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
-    "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.0.12",
-    "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
   },
   {
     "pname": "System.ObjectModel",
     "version": "4.3.0",
-    "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
+  },
+  {
+    "pname": "System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
   {
     "pname": "System.Reactive",
     "version": "5.0.0",
-    "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"
+    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
   },
   {
-    "pname": "System.Reflection",
-    "version": "4.1.0",
-    "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
   },
   {
     "pname": "System.Reflection",
     "version": "4.3.0",
-    "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.0.1",
-    "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.3.0",
-    "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
   },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.7.0",
-    "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.0.1",
-    "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
   },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.3.0",
-    "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.0.1",
-    "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
   },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.3.0",
-    "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"
-  },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.0.1",
-    "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
-    "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
   },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
-    "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"
+    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "5.0.0",
-    "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"
+    "version": "7.0.0",
+    "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
   },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
-    "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
-    "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.0.1",
-    "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
   },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
-    "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.1.0",
-    "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
   },
   {
     "pname": "System.Runtime",
     "version": "4.3.0",
-    "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.1",
-    "sha256": "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.6.0",
-    "sha256": "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "5.0.0",
-    "sha256": "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"
+    "hash": "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y="
   },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
-    "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"
-  },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.1.0",
-    "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
   },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
-    "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"
-  },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
-    "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
-    "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
   {
     "pname": "System.Runtime.InteropServices.RuntimeInformation",
     "version": "4.3.0",
-    "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
   },
   {
     "pname": "System.Runtime.Numerics",
     "version": "4.3.0",
-    "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"
-  },
-  {
-    "pname": "System.Runtime.Serialization.Primitives",
-    "version": "4.1.1",
-    "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
   {
     "pname": "System.Runtime.Serialization.Primitives",
     "version": "4.3.0",
-    "sha256": "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"
+    "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="
+  },
+  {
+    "pname": "System.Security.Claims",
+    "version": "4.3.0",
+    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
   },
   {
     "pname": "System.Security.Cryptography.Algorithms",
     "version": "4.3.0",
-    "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
   },
   {
     "pname": "System.Security.Cryptography.Cng",
     "version": "4.3.0",
-    "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
   },
   {
     "pname": "System.Security.Cryptography.Csp",
     "version": "4.3.0",
-    "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
   },
   {
     "pname": "System.Security.Cryptography.Encoding",
     "version": "4.3.0",
-    "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
   },
   {
     "pname": "System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
-    "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
     "version": "4.3.0",
-    "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "4.4.0",
+    "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="
   },
   {
     "pname": "System.Security.Cryptography.X509Certificates",
     "version": "4.3.0",
-    "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"
+    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
+  },
+  {
+    "pname": "System.Security.Principal",
+    "version": "4.3.0",
+    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
   },
   {
     "pname": "System.Security.Principal.Windows",
-    "version": "5.0.0",
-    "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"
+    "version": "4.3.0",
+    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
   },
   {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.7.0",
+    "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
   },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
-    "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "sha256": "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"
-  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.0.11",
-    "sha256": "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
   },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
-    "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"
-  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.1.0",
-    "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.3.0",
-    "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.0.11",
-    "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
   },
   {
     "pname": "System.Threading",
     "version": "4.3.0",
-    "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.0.11",
-    "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
   },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
-    "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.0.0",
-    "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.3.0",
-    "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
   },
   {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.5.4",
-    "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"
+    "pname": "System.Threading.ThreadPool",
+    "version": "4.3.0",
+    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
   },
   {
     "pname": "System.Threading.Timer",
     "version": "4.3.0",
-    "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
   },
   {
     "pname": "System.ValueTuple",
     "version": "4.5.0",
-    "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"
-  },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.0.11",
-    "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
   },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.0",
-    "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"
-  },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.0.11",
-    "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
   },
   {
     "pname": "System.Xml.XDocument",
     "version": "4.3.0",
-    "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"
-  },
-  {
-    "pname": "System.Xml.XmlDocument",
-    "version": "4.3.0",
-    "sha256": "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
   },
   {
     "pname": "ThemeEditor.Controls.ColorPicker",
-    "version": "0.10.12",
-    "sha256": "17kh28fkywqmz5yams8wzr50ihkv52y24gk8bz9fxl6kfzmgk0ky"
+    "version": "0.10.17",
+    "hash": "sha256-SoamofgQCfZFGJjTyD7KL8a+cIFzTmaDCIbHlfbz/qw="
   },
   {
     "pname": "Tmds.DBus",
-    "version": "0.10.1",
-    "sha256": "1wafa009cjj1rziias2n00ap0g8kdg2iig5sjlrxj2kld24lgbli"
+    "version": "0.9.0",
+    "hash": "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8="
   },
   {
     "pname": "WebSocketSharp-netstandard",
     "version": "1.0.1",
-    "sha256": "0q89wiqpli72333zsa04d1vzq9xj0583hn5mih9sdd84myksz5b0"
+    "hash": "sha256-YJWvp68EtaYTjLVYOFABsif8d2gEKP3HGOJEenHkCWE="
   },
   {
     "pname": "xunit",
-    "version": "2.4.1",
-    "sha256": "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"
+    "version": "2.5.1",
+    "hash": "sha256-SxDG/dFHk+7F4x4PYXRyw8PwuqcmH7Mhz9PHA2sVuYg="
   },
   {
     "pname": "xunit.abstractions",
     "version": "2.0.3",
-    "sha256": "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"
+    "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="
   },
   {
     "pname": "xunit.analyzers",
-    "version": "0.10.0",
-    "sha256": "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"
+    "version": "1.3.0",
+    "hash": "sha256-+l50DUYCEdnrHg6cKUfsNx8m0BRwAVdqURCQb0aZLLQ="
   },
   {
     "pname": "xunit.assert",
-    "version": "2.4.1",
-    "sha256": "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"
+    "version": "2.5.1",
+    "hash": "sha256-2U83B5QOaEgVUXBQ5/juqEqrKxeyo5LKTKQ/JCFUy/E="
   },
   {
     "pname": "xunit.core",
-    "version": "2.4.1",
-    "sha256": "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"
+    "version": "2.5.1",
+    "hash": "sha256-igzHINMd6V01nEg6Hc3YpXdL4MT0ZlCY1RwlxQEO5Xg="
   },
   {
     "pname": "xunit.extensibility.core",
-    "version": "2.4.1",
-    "sha256": "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"
+    "version": "2.5.1",
+    "hash": "sha256-1wAQJZljPyQhhvaKuE0XV6OyFGxxyFtTWMCQd57mctw="
   },
   {
     "pname": "xunit.extensibility.execution",
-    "version": "2.4.1",
-    "sha256": "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"
+    "version": "2.5.1",
+    "hash": "sha256-sgje8DfOxpdV4xXcGB5llrzr9rTlPPIQIr/PjP2A0p8="
   },
   {
     "pname": "xunit.runner.console",
-    "version": "2.4.1",
-    "sha256": "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13"
+    "version": "2.5.1",
+    "hash": "sha256-CLf7tVyeslvtAqlFlp7Mr/lHq+C3p1duLzXGiHdZigM="
   },
   {
     "pname": "xunit.runner.visualstudio",
-    "version": "2.4.3",
-    "sha256": "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"
+    "version": "2.5.1",
+    "hash": "sha256-HbQNZB/4Kjv7UxP5cWAteiNiRErsqnWhCemcBiQ95Hg="
   }
 ]
diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix
index ed54af5d83bb..3b8406650896 100644
--- a/pkgs/by-name/al/alttpr-opentracker/package.nix
+++ b/pkgs/by-name/al/alttpr-opentracker/package.nix
@@ -17,29 +17,21 @@
 }:
 buildDotnetModule rec {
   pname = "opentracker";
-  version = "1.8.5";
+  version = "1.8.6";
 
   src = fetchFromGitHub {
     owner = "trippsc2";
-    repo = pname;
+    repo = "opentracker";
     tag = version;
-    hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg==";
+    hash = "sha256-4EBn3BX5tX+yPUjoNFQSls9CwTCd6MpvcBoUKwRndRo=";
   };
 
-  patches = [./remove-project.patch];
-
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
 
   nugetDeps = ./deps.json;
 
-  projectFile = "OpenTracker.sln";
-  executables = ["OpenTracker"];
-
-  doCheck = true;
-  disabledTests = [
-    "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue"
-    "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected"
-  ];
+  projectFile = "src/OpenTracker/OpenTracker.csproj";
+  executables = [ "OpenTracker" ];
 
   nativeBuildInputs = [
     autoPatchelfHook
@@ -86,6 +78,6 @@ buildDotnetModule rec {
     license = licenses.mit;
     maintainers = [ ];
     mainProgram = "OpenTracker";
-    platforms = ["x86_64-linux"];
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/al/alttpr-opentracker/remove-project.patch b/pkgs/by-name/al/alttpr-opentracker/remove-project.patch
deleted file mode 100644
index 22a2068512e0..000000000000
--- a/pkgs/by-name/al/alttpr-opentracker/remove-project.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/OpenTracker.sln b/OpenTracker.sln
-index 0a8c438..77124e1 100644
---- a/OpenTracker.sln
-+++ b/OpenTracker.sln
-@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
- VisualStudioVersion = 16.0.29806.167
- MinimumVisualStudioVersion = 10.0.40219.1
- Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker", "OpenTracker\OpenTracker.csproj", "{9D32A24F-7FF0-4632-B663-5AD2D64A6C87}"
--	ProjectSection(ProjectDependencies) = postProject
--		{732A9A56-32B4-4149-B3A5-F2A4F48293D3} = {732A9A56-32B4-4149-B3A5-F2A4F48293D3}
--	EndProjectSection
- EndProject
- Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker.Models", "OpenTracker.Models\OpenTracker.Models.csproj", "{5DB05A1F-56E3-4035-8898-5CFB22DB3568}"
- EndProject

From a88130c925c3fe135842b4b7de8cb696c8ee1605 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 1 Jan 2025 12:22:28 -0800
Subject: [PATCH 1463/1504] firebase-tools: fixes for node 22

---
 .../fi/firebase-tools/001-override-nan.patch  | 54 +++++++++++++++++++
 pkgs/by-name/fi/firebase-tools/package.nix    | 15 +++++-
 2 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/fi/firebase-tools/001-override-nan.patch

diff --git a/pkgs/by-name/fi/firebase-tools/001-override-nan.patch b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch
new file mode 100644
index 000000000000..5da013133fb1
--- /dev/null
+++ b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch
@@ -0,0 +1,54 @@
+diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
+index da429c128..9c69ec8cb 100644
+--- a/npm-shrinkwrap.json
++++ b/npm-shrinkwrap.json
+@@ -14637,9 +14637,10 @@
+       }
+     },
+     "node_modules/nan": {
+-      "version": "2.17.0",
+-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
++      "version": "2.22.0",
++      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
++      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
++      "license": "MIT",
+       "optional": true
+     },
+     "node_modules/nanoid": {
+@@ -31852,9 +31853,9 @@
+       }
+     },
+     "nan": {
+-      "version": "2.17.0",
+-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
++      "version": "2.22.0",
++      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
++      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+       "optional": true
+     },
+     "nanoid": {
+@@ -33672,7 +33673,7 @@
+       "optional": true,
+       "requires": {
+         "install-artifact-from-github": "^1.3.1",
+-        "nan": "^2.17.0",
++        "nan": "^2.22.0",
+         "node-gyp": "^9.3.0"
+       }
+     },
+diff --git a/package.json b/package.json
+index a4284d841..90a0524f2 100644
+--- a/package.json
++++ b/package.json
+@@ -98,6 +98,9 @@
+       "src/test/**/*"
+     ]
+   },
++  "overrides" : {
++    "nan": "^2.22.0"
++  },
+   "dependencies": {
+     "@electric-sql/pglite": "^0.2.0",
+     "@google-cloud/cloud-sql-connector": "^1.3.3",
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index c76310cec6d3..3193cfb77260 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   python3,
   xcbuild,
+  fetchpatch,
 }:
-
 let
   version = "13.29.1";
   src = fetchFromGitHub {
@@ -20,7 +20,18 @@ buildNpmPackage {
   pname = "firebase-tools";
   inherit version src;
 
-  npmDepsHash = "sha256-3+XeXK3VGIs4Foi9iW9Kho/Y0JsTQZ7p+582MPgdH1A=";
+  npmDepsHash = "sha256-lQmoemIxzy2biu80UTR2eA+KJBeXWPh0xZRs/1of0eo=";
+
+  patches = [
+    # Use modern version of `ajv` instead of the four year old default in 13.29.1
+    (fetchpatch {
+      name = "bump-ajv.patch";
+      url = "https://github.com/firebase/firebase-tools/commit/b684155d827e7d1e8390e22511c0e1b5c46812ef.patch";
+      hash = "sha256-yv2AknT85Eyurc1ZFbbF5S9Sj/VEaVnHXBcXI10OWpw=";
+    })
+    # Fix embedded nan version to support node 22
+    ./001-override-nan.patch
+  ];
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 4789876b3b0eac0b0c7b117292d3bdb3647cefda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 14:17:31 +0000
Subject: [PATCH 1464/1504] tone: 0.2.3 -> 0.2.4

---
 pkgs/by-name/to/tone/deps.json   | 8 ++++----
 pkgs/by-name/to/tone/package.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/to/tone/deps.json b/pkgs/by-name/to/tone/deps.json
index af126d75bdd0..586dfac16f49 100644
--- a/pkgs/by-name/to/tone/deps.json
+++ b/pkgs/by-name/to/tone/deps.json
@@ -141,8 +141,8 @@
   },
   {
     "pname": "Sandreas.AudioMetadata",
-    "version": "0.2.5",
-    "hash": "sha256-4FrW1QV4okSEswTpgj/dhFurR/2AHyTgqDgMBjRproI="
+    "version": "0.2.7",
+    "hash": "sha256-GYD+nAURuU99/3JH/4QTthhzAVsau/qpcvih4eiJxtk="
   },
   {
     "pname": "Sandreas.Files",
@@ -241,7 +241,7 @@
   },
   {
     "pname": "z440.atl.core",
-    "version": "6.9.0",
-    "hash": "sha256-lme55hhVwZ9Y/wVmekA0gVIsw3RUoyYuL9gMEHXuWMU="
+    "version": "6.11.0",
+    "hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg="
   }
 ]
diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix
index 64b737ad6c0d..a85045ebb079 100644
--- a/pkgs/by-name/to/tone/package.nix
+++ b/pkgs/by-name/to/tone/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "tone";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "sandreas";
     repo = "tone";
     tag = "v${version}";
-    hash = "sha256-NBFAPEeUKZgyfNlvcOBS1IpktEnI+fOd9WLj0ByzpLY=";
+    hash = "sha256-DX54NSlqAZzVQObm9qjUsYatjxjHKGcSLHH1kVD4Row=";
   };
 
   projectFile = "tone/tone.csproj";

From 3a209347c2920bcbf11a5a37c69ed6d365f1438d Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 3 Jan 2025 08:11:04 +0800
Subject: [PATCH 1465/1504] fritzing: 1.0.2 -> 1.0.4

---
 .../science/electronics/fritzing/default.nix  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 1821ac63a4eb..f0d98e7a823c 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -21,33 +21,33 @@
 let
   # SHA256 of the fritzing-parts HEAD on the master branch,
   # which contains the latest stable parts definitions
-  partsSha = "015626e6cafb1fc7831c2e536d97ca2275a83d32";
+  partsSha = "76235099ed556e52003de63522fdd74e61d53a36";
 
   parts = fetchFromGitHub {
     owner = "fritzing";
     repo = "fritzing-parts";
     rev = partsSha;
-    hash = "sha256-5jw56cqxpT/8bf1q551WG53J6Lw5pH0HEtRUoNNMc+A=";
+    hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y=";
   };
 
   # Header-only library
   svgpp = fetchFromGitHub {
     owner = "svgpp";
     repo = "svgpp";
-    rev = "v1.3.0";
-    hash = "sha256-kJEVnMYnDF7bThDB60bGXalYgpn9c5/JCZkRSK5GoE4=";
+    tag = "v1.3.1";
+    hash = "sha256-nW0ns06XWfUi22nOKZzFKgAOHVIlQqChW8HxUDOFMh4=";
   };
 in
 
 stdenv.mkDerivation {
   pname = "fritzing";
-  version = "1.0.2";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "fritzing";
     repo = "fritzing-app";
-    rev = "dbdbe34c843677df721c7b3fc3e32c0f737e7e95";
-    hash = "sha256-Xi5sPU2RGkqh7T+EOvwxJJKKYDhJfccyEZ8LBBTb2s4=";
+    rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25";
+    hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0=";
   };
 
   nativeBuildInputs = [
@@ -56,6 +56,7 @@ stdenv.mkDerivation {
     qttools
     wrapQtAppsHook
   ];
+
   buildInputs =
     [
       qtbase
@@ -90,12 +91,14 @@ stdenv.mkDerivation {
     cp -a ${parts}/* parts/
   '';
 
-  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
-    "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
-    "-I${svgpp}/include"
-    "-I${clipper}/include/polyclipping"
-  ];
-  env.NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
+  env = {
+    NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
+      "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
+      "-I${svgpp}/include"
+      "-I${clipper}/include/polyclipping"
+    ];
+    NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
+  };
 
   qmakeFlags = [
     "phoenix.pro"
@@ -116,18 +119,18 @@ stdenv.mkDerivation {
       -folder "$out/share/fritzing"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open source prototyping tool for Arduino-based projects";
-    homepage = "https://fritzing.org/";
-    license = with licenses; [
+    homepage = "https://fritzing.org";
+    license = with lib.licenses; [
       gpl3
       cc-by-sa-30
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       robberer
       muscaln
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "Fritzing";
   };
 }

From 01cd8f28a7939d44061b37abee4680ec2ec59c06 Mon Sep 17 00:00:00 2001
From: Fede Barcelona <fede_rico_94@hotmail.com>
Date: Fri, 3 Jan 2025 12:32:23 +0100
Subject: [PATCH 1466/1504] terraform-providers.sysdig: init at 1.42.0

---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b9d78d1fb230..f7e5b4f206b0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1236,6 +1236,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
   },
+  "sysdig": {
+    "hash": "sha256-TvZ7x4dWOERkqTWtjmbILdcWy12kqsV+OzLJ4siQ7mA=",
+    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
+    "owner": "sysdiglabs",
+    "repo": "terraform-provider-sysdig",
+    "rev": "v1.42.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0="
+  },
   "tailscale": {
     "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=",
     "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",

From 9f2d119bb1016d62a1ae4c3c97120b67436e3673 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 4 Jan 2025 02:32:55 +0000
Subject: [PATCH 1467/1504] qt6Packages.stdenv: lift out of scope

This of course caused warnings for every package using
`qt6Package.callPackage`. I trusted eval to flag up warnings but the
new CI apparently currently swallows them.

Fixes: 2b969610d645c8a38865aade14daedbdb824f1cd
---
 pkgs/top-level/qt6-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 9181e9b53edb..51e303ca3857 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -27,7 +27,6 @@ makeScopeWithSplicing' {
     inherit (self) callPackage;
     noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ];
   in (noExtraAttrs qt6) // {
-  stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv;
 
   # LIBRARIES
   accounts-qt = callPackage ../development/libraries/accounts-qt { };
@@ -125,4 +124,6 @@ makeScopeWithSplicing' {
 
   xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
   });
+} // {
+  stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
 }

From f54ce21a530cf2c50ed7a1a0447ede64f85e6b65 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 4 Jan 2025 02:54:38 +0000
Subject: [PATCH 1468/1504] qt6Packages.stdenv: condition on
 `config.allowAliases`

Should fix the warnings for good.

Fixes: 9f2d119bb1016d62a1ae4c3c97120b67436e3673
---
 pkgs/top-level/all-packages.nix | 2 +-
 pkgs/top-level/qt6-packages.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2044c4005557..c1246415e951 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10482,7 +10482,7 @@ with pkgs;
   qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
 
   qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
-    inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
+    inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
     inherit stdenv;
   });
 
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 51e303ca3857..0834419e13bd 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -5,6 +5,7 @@
 # this file.
 
 { lib
+, config
 , __splicedPackages
 , makeScopeWithSplicing'
 , generateSplicesForMkScope
@@ -124,6 +125,6 @@ makeScopeWithSplicing' {
 
   xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
   });
-} // {
+} // lib.optionalAttrs config.allowAliases {
   stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
 }

From 4e971d82e24b4016920deeaed9f9f1e8a4025795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jan 2025 03:03:31 +0000
Subject: [PATCH 1469/1504] sqlboiler: 4.17.1 -> 4.18.0

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

diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix
index 0e3484e57c05..2c5e2f87ffaf 100644
--- a/pkgs/by-name/sq/sqlboiler/package.nix
+++ b/pkgs/by-name/sq/sqlboiler/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "sqlboiler";
-  version = "4.17.1";
+  version = "4.18.0";
 
   src = fetchFromGitHub {
     owner = "volatiletech";
     repo = "sqlboiler";
     tag = "v${version}";
-    hash = "sha256-hb8aMaK2iDDCEJXoNn9BLELP0J7LcJzsQdSYZe1tcjQ=";
+    hash = "sha256-gpRegyW6LrKj45MDl+eOKrTqTo1wn7JOd4zPDexOB6M=";
   };
 
-  vendorHash = "sha256-ZGGoTWSbGtsmrEQcZI40z6QF6qh4t3LN17Sox4KHQMA=";
+  vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA=";
 
   tags = [
     "mysql"

From 1f2553f6caf0c0792f4a9b23f233a8702e9fb8d0 Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Sat, 4 Jan 2025 11:35:59 +0800
Subject: [PATCH 1470/1504] rclip: fix build

---
 pkgs/by-name/rc/rclip/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix
index df91b877f63c..79158113b421 100644
--- a/pkgs/by-name/rc/rclip/package.nix
+++ b/pkgs/by-name/rc/rclip/package.nix
@@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
+    "numpy"
     "pillow"
     "rawpy"
     "torch"

From ad93f8dfe35b3dc6468974e05878d3d44a1c6777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 15:05:32 +0000
Subject: [PATCH 1471/1504] cargo-lambda: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index 564cc3cf3ae6..3c4ad5f0a714 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-lambda";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-O4yJ+6Uk4dHjCDp28JbUtL/B+v9JJEGkinZ4MsIpjUk=";
+    hash = "sha256-21p9bo+kfqVrRAxVSuZ24XaHDU7XkIIhGXjHLUsGQOg=";
   };
 
-  cargoHash = "sha256-vK37S5hLuHYimTljo0i6iRq2kt/r0kZ6Uqw2wQMhSGc=";
+  cargoHash = "sha256-5AzeqJjs8Ee6ltXnXMZU47fXt1THsSERxCaT22zjK6g=";
 
   nativeCheckInputs = [ cacert ];
 

From 3c989f13bbd086d5f2310b62a2d0a91333027592 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 4 Jan 2025 00:17:47 -0500
Subject: [PATCH 1472/1504] nix-forecast: add updateScript

---
 pkgs/by-name/ni/nix-forecast/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix
index 06900abcab1e..6e2169b70e04 100644
--- a/pkgs/by-name/ni/nix-forecast/package.nix
+++ b/pkgs/by-name/ni/nix-forecast/package.nix
@@ -4,6 +4,7 @@
   installShellFiles,
   makeBinaryWrapper,
   nix,
+  nix-update-script,
   rustPlatform,
   versionCheckHook,
 }:
@@ -44,6 +45,10 @@ rustPlatform.buildRustPackage rec {
     COMPLETION_DIR = "completions";
   };
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Check the forecast for today's Nix builds";
     homepage = "https://github.com/getchoo/nix-forecast";

From af240f2fd5a2b0aa2398da4618b1515ff46d4ab6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 4 Jan 2025 00:18:26 -0500
Subject: [PATCH 1473/1504] nix-forecast: 0.1.0 -> 0.2.0

Diff: https://github.com/getchoo/nix-forecast/compare/refs/tags/v0.1.0...v0.2.0

Changelog: https://github.com/getchoo/nix-forecast/releases/tag/0.2.0
---
 pkgs/by-name/ni/nix-forecast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix
index 6e2169b70e04..8171e0f6a2eb 100644
--- a/pkgs/by-name/ni/nix-forecast/package.nix
+++ b/pkgs/by-name/ni/nix-forecast/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-forecast";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "getchoo";
     repo = "nix-forecast";
     tag = "v${version}";
-    hash = "sha256-jfS7DXEIVHihC0/kH9W8ZJDOjoWuxdRvLMfzknElvrg=";
+    hash = "sha256-kNSH2QbryNAfZXILQzMk9MHDzX4420KyQJOKW0Xrl7c=";
   };
 
-  cargoHash = "sha256-EHqHdcMI1K7DqhmFfr0ipfAsyM7cP9/22bMs4uIV2To=";
+  cargoHash = "sha256-C5KPOwGD8jFqRuN6h1G6yO4lkl7t+RMzAE45r5d5lI0=";
 
   nativeBuildInputs = [
     installShellFiles

From 5d3993b95de59a146cd406bf8d58a60d6eac3c07 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 4 Jan 2025 00:25:40 -0500
Subject: [PATCH 1474/1504] nix-forecast: fix meta.changelog

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

diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix
index 8171e0f6a2eb..dd509a5de072 100644
--- a/pkgs/by-name/ni/nix-forecast/package.nix
+++ b/pkgs/by-name/ni/nix-forecast/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Check the forecast for today's Nix builds";
     homepage = "https://github.com/getchoo/nix-forecast";
-    changelog = "https://github.com/getchoo/nix-forecast/releases/tag/${version}";
+    changelog = "https://github.com/getchoo/nix-forecast/releases/tag/v${version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "nix-forecast";

From 351126875500889be8f2d2064b9a305a7f849c4f Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 13 Dec 2024 14:28:50 +0800
Subject: [PATCH 1475/1504] nezha-theme-nazhua: init at 0.4.19

---
 .../by-name/ne/nezha-theme-nazhua/package.nix | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ne/nezha-theme-nazhua/package.nix

diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
new file mode 100644
index 000000000000..19497aaf5d1d
--- /dev/null
+++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  fetchYarnDeps,
+  nodejs,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "nezha-theme-nazhua";
+  version = "0.4.19";
+
+  src = fetchFromGitHub {
+    owner = "hi2shark";
+    repo = "nazhua";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0104g2HldjMDvd4F9krhx7h6qLiYmzQ2cRprvFJcZeU=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = finalAttrs.src + "/yarn.lock";
+    hash = "sha256-Wy4xtLjDNkBLeESJCbfq9GhT0mSTAfGBN0A3oHX5BuE=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    # Needed for executing package.json scripts
+    nodejs
+  ];
+
+  # Copied from .github/workflows/release.yml
+  env = {
+    VITE_NEZHA_VERSION = "v1";
+    VITE_SARASA_TERM_SC_USE_CDN = "1";
+    VITE_USE_CDN = "1";
+    VITE_CDN_LIB_TYPE = "jsdelivr";
+  };
+
+  dontNpmInstall = true;
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Nezha monitoring theme called Nazhua";
+    changelog = "https://github.com/hi2shark/nazhua/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/hi2shark/nazhua";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ moraxyc ];
+  };
+})

From cbb8f5b919d1ff0ed10cabb99b0e60feb8a50572 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 15 Dec 2024 21:07:12 +0800
Subject: [PATCH 1476/1504] nezha-theme-nazhua: 0.4.19 -> 0.4.20

---
 pkgs/by-name/ne/nezha-theme-nazhua/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
index 19497aaf5d1d..f76d5385c69b 100644
--- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nezha-theme-nazhua";
-  version = "0.4.19";
+  version = "0.4.20";
 
   src = fetchFromGitHub {
     owner = "hi2shark";
     repo = "nazhua";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0104g2HldjMDvd4F9krhx7h6qLiYmzQ2cRprvFJcZeU=";
+    hash = "sha256-lVDvA7BaFZ4bS3RqxD6iUj1D4NYTgG5nEbYXYV925oc=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From a322d5a664c8d2fb53ecbac4b50c9639216d0346 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 4 Jan 2025 13:52:54 +0800
Subject: [PATCH 1477/1504] nezha-theme-nazhua: 0.4.20 -> 0.5.1

Diff: https://github.com/hi2shark/nazhua/compare/None...v0.5.1

Changelog: https://github.com/hi2shark/nazhua/releases/tag/v0.5.1
---
 pkgs/by-name/ne/nezha-theme-nazhua/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
index f76d5385c69b..93341c30479d 100644
--- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nezha-theme-nazhua";
-  version = "0.4.20";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "hi2shark";
     repo = "nazhua";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lVDvA7BaFZ4bS3RqxD6iUj1D4NYTgG5nEbYXYV925oc=";
+    hash = "sha256-5XEdfUCwQSa+PWu4SHJCg3rCtblyD5x41lKe0SvFrU8=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 4784bc20c8a1a88bdeae6e0a866575a468da1c87 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 4 Jan 2025 06:22:41 +0000
Subject: [PATCH 1478/1504] diffoscope: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. diffoscope
    error:
       … while evaluating the attribute 'drvPath'
         at lib/customisation.nix:416:7:
          415|     // {
          416|       drvPath =
             |       ^
          417|         assert condition;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both).
---
 pkgs/tools/misc/diffoscope/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index bf315e178845..55666e349a0d 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -94,7 +94,7 @@ let
         {
           inherit version;
           src = src.override {
-            rev = version;
+            tag = version;
             hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U=";
           };
         }

From 5a902436c0daff1d40a41cc1c811754d57e87c11 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Wed, 11 Dec 2024 15:15:51 +0800
Subject: [PATCH 1479/1504] nezha-theme-user: init at 1.12.1

Diff: https://github.com/hamster1963/nezha-dash-v1/compare/None...v1.12.1

Changelog: https://github.com/hamster1963/nezha-dash-v1/releases/tag/v1.12.1
---
 .../ne/nezha-theme-user/package-lock.json     | 5969 +++++++++++++++++
 pkgs/by-name/ne/nezha-theme-user/package.nix  |   51 +
 2 files changed, 6020 insertions(+)
 create mode 100644 pkgs/by-name/ne/nezha-theme-user/package-lock.json
 create mode 100644 pkgs/by-name/ne/nezha-theme-user/package.nix

diff --git a/pkgs/by-name/ne/nezha-theme-user/package-lock.json b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
new file mode 100644
index 000000000000..a64513c2e940
--- /dev/null
+++ b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
@@ -0,0 +1,5969 @@
+{
+  "name": "nazha-dashboard-vite",
+  "version": "1.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "nazha-dashboard-vite",
+      "version": "1.0.1",
+      "dependencies": {
+        "@fontsource/inter": "^5.1.1",
+        "@heroicons/react": "^2.2.0",
+        "@radix-ui/react-accordion": "^1.2.2",
+        "@radix-ui/react-checkbox": "^1.1.3",
+        "@radix-ui/react-dialog": "^1.1.4",
+        "@radix-ui/react-dropdown-menu": "^2.1.4",
+        "@radix-ui/react-label": "^2.1.1",
+        "@radix-ui/react-popover": "^1.1.4",
+        "@radix-ui/react-progress": "^1.1.1",
+        "@radix-ui/react-separator": "^1.1.1",
+        "@radix-ui/react-slot": "^1.1.1",
+        "@radix-ui/react-switch": "^1.1.2",
+        "@tanstack/react-query": "^5.62.11",
+        "@tanstack/react-query-devtools": "^5.62.11",
+        "@tanstack/react-table": "^8.20.6",
+        "@trivago/prettier-plugin-sort-imports": "^5.2.1",
+        "@types/d3-geo": "^3.1.0",
+        "@types/luxon": "^3.4.2",
+        "class-variance-authority": "^0.7.1",
+        "clsx": "^2.1.1",
+        "country-flag-icons": "^1.5.13",
+        "d3-geo": "^3.1.1",
+        "dayjs": "^1.11.13",
+        "framer-motion": "^12.0.0-alpha.2",
+        "i18next": "^24.2.0",
+        "lucide-react": "^0.460.0",
+        "luxon": "^3.5.0",
+        "prettier-plugin-tailwindcss": "^0.6.9",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
+        "react-i18next": "^15.4.0",
+        "react-router-dom": "^7.1.1",
+        "recharts": "^2.15.0",
+        "sonner": "^1.7.1",
+        "tailwind-merge": "^2.6.0",
+        "tailwindcss-animate": "^1.0.7"
+      },
+      "devDependencies": {
+        "@eslint/js": "^9.17.0",
+        "@types/node": "^22.10.4",
+        "@types/react": "^19.0.2",
+        "@types/react-dom": "^19.0.2",
+        "@vitejs/plugin-react-swc": "^3.7.2",
+        "autoprefixer": "^10.4.20",
+        "eslint": "^9.17.0",
+        "eslint-plugin-react-hooks": "^5.1.0",
+        "eslint-plugin-react-refresh": "^0.4.16",
+        "globals": "^15.14.0",
+        "postcss": "^8.4.49",
+        "tailwindcss": "^3.4.17",
+        "typescript": "~5.6.3",
+        "typescript-eslint": "^8.19.0",
+        "vite": "^6.0.7"
+      }
+    },
+    "node_modules/@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+      "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.26.3",
+        "@babel/types": "^7.26.3",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.26.3"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.26.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+      "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.3",
+        "@babel/parser": "^7.26.3",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.3",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+      "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
+      "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.5",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
+      "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
+      "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
+      "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
+      "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
+      "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.8"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.12",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz",
+      "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.8"
+      }
+    },
+    "node_modules/@floating-ui/react-dom": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
+      "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
+      "license": "MIT"
+    },
+    "node_modules/@fontsource/inter": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.1.tgz",
+      "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw==",
+      "license": "OFL-1.1"
+    },
+    "node_modules/@heroicons/react": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz",
+      "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">= 16 || ^19.0.0-rc"
+      }
+    },
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz",
+      "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-accordion": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.2.tgz",
+      "integrity": "sha512-b1oh54x4DMCdGsB4/7ahiSrViXxaBwRPotiZNnYXjLha9vfuURSAZErki6qjDoSIV0eXx5v57XnTGVtGwnfp2g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-collapsible": "1.1.2",
+        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-direction": "1.1.0",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-arrow": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz",
+      "integrity": "sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-checkbox": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.3.tgz",
+      "integrity": "sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-use-previous": "1.1.0",
+        "@radix-ui/react-use-size": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collapsible": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.2.tgz",
+      "integrity": "sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collection": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.1.tgz",
+      "integrity": "sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-slot": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz",
+      "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
+      "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.4.tgz",
+      "integrity": "sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-focus-guards": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "aria-hidden": "^1.1.1",
+        "react-remove-scroll": "^2.6.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-direction": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
+      "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.3.tgz",
+      "integrity": "sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-escape-keydown": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dropdown-menu": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.4.tgz",
+      "integrity": "sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-menu": "2.1.4",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-guards": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz",
+      "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.1.tgz",
+      "integrity": "sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-id": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",
+      "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-label": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.1.tgz",
+      "integrity": "sha512-UUw5E4e/2+4kFMH7+YxORXGWggtY6sM8WIwh5RZchhLuUg2H1hc98Py+pr8HMz6rdaYrK2t296ZEjYLOCO5uUw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-menu": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.4.tgz",
+      "integrity": "sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-direction": "1.1.0",
+        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-focus-guards": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-popper": "1.2.1",
+        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-roving-focus": "1.1.1",
+        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "aria-hidden": "^1.1.1",
+        "react-remove-scroll": "^2.6.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popover": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.4.tgz",
+      "integrity": "sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-focus-guards": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-popper": "1.2.1",
+        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "aria-hidden": "^1.1.1",
+        "react-remove-scroll": "^2.6.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popper": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.1.tgz",
+      "integrity": "sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.0.0",
+        "@radix-ui/react-arrow": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.0",
+        "@radix-ui/react-use-rect": "1.1.0",
+        "@radix-ui/react-use-size": "1.1.0",
+        "@radix-ui/rect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-portal": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.3.tgz",
+      "integrity": "sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-presence": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz",
+      "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz",
+      "integrity": "sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-progress": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.1.tgz",
+      "integrity": "sha512-6diOawA84f/eMxFHcWut0aE1C2kyE9dOyCTQOMRR2C/qPiXz/X0SaiA/RLbapQaXUCmy0/hLMf9meSccD1N0pA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-roving-focus": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.1.tgz",
+      "integrity": "sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-direction": "1.1.0",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-controllable-state": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-separator": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.1.tgz",
+      "integrity": "sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz",
+      "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-switch": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.2.tgz",
+      "integrity": "sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-use-previous": "1.1.0",
+        "@radix-ui/react-use-size": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
+      "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",
+      "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-escape-keydown": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",
+      "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",
+      "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-previous": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz",
+      "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-rect": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz",
+      "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/rect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-size": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz",
+      "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/rect": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
+      "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==",
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz",
+      "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz",
+      "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz",
+      "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz",
+      "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz",
+      "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz",
+      "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz",
+      "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz",
+      "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz",
+      "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz",
+      "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz",
+      "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz",
+      "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz",
+      "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz",
+      "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz",
+      "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz",
+      "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz",
+      "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz",
+      "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz",
+      "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@swc/core": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.4.tgz",
+      "integrity": "sha512-ut3zfiTLORMxhr6y/GBxkHmzcGuVpwJYX4qyXWuBKkpw/0g0S5iO1/wW7RnLnZbAi8wS/n0atRZoaZlXWBkeJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.17"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.10.4",
+        "@swc/core-darwin-x64": "1.10.4",
+        "@swc/core-linux-arm-gnueabihf": "1.10.4",
+        "@swc/core-linux-arm64-gnu": "1.10.4",
+        "@swc/core-linux-arm64-musl": "1.10.4",
+        "@swc/core-linux-x64-gnu": "1.10.4",
+        "@swc/core-linux-x64-musl": "1.10.4",
+        "@swc/core-win32-arm64-msvc": "1.10.4",
+        "@swc/core-win32-ia32-msvc": "1.10.4",
+        "@swc/core-win32-x64-msvc": "1.10.4"
+      },
+      "peerDependencies": {
+        "@swc/helpers": "*"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.4.tgz",
+      "integrity": "sha512-sV/eurLhkjn/197y48bxKP19oqcLydSel42Qsy2zepBltqUx+/zZ8+/IS0Bi7kaWVFxerbW1IPB09uq8Zuvm3g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.4.tgz",
+      "integrity": "sha512-gjYNU6vrAUO4+FuovEo9ofnVosTFXkF0VDuo1MKPItz6e2pxc2ale4FGzLw0Nf7JB1sX4a8h06CN16/pLJ8Q2w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.4.tgz",
+      "integrity": "sha512-zd7fXH5w8s+Sfvn2oO464KDWl+ZX1MJiVmE4Pdk46N3PEaNwE0koTfgx2vQRqRG4vBBobzVvzICC3618WcefOA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.4.tgz",
+      "integrity": "sha512-+UGfoHDxsMZgFD3tABKLeEZHqLNOkxStu+qCG7atGBhS4Slri6h6zijVvf4yI5X3kbXdvc44XV/hrP/Klnui2A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.4.tgz",
+      "integrity": "sha512-cDDj2/uYsOH0pgAnDkovLZvKJpFmBMyXkxEG6Q4yw99HbzO6QzZ5HDGWGWVq/6dLgYKlnnmpjZCPPQIu01mXEg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.4.tgz",
+      "integrity": "sha512-qJXh9D6Kf5xSdGWPINpLGixAbB5JX8JcbEJpRamhlDBoOcQC79dYfOMEIxWPhTS1DGLyFakAx2FX/b2VmQmj0g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.4.tgz",
+      "integrity": "sha512-A76lIAeyQnHCVt0RL/pG+0er8Qk9+acGJqSZOZm67Ve3B0oqMd871kPtaHBM0BW3OZAhoILgfHW3Op9Q3mx3Cw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.4.tgz",
+      "integrity": "sha512-e6j5kBu4fIY7fFxFxnZI0MlEovRvp50Lg59Fw+DVbtqHk3C85dckcy5xKP+UoXeuEmFceauQDczUcGs19SRGSQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.4.tgz",
+      "integrity": "sha512-RSYHfdKgNXV/amY5Tqk1EWVsyQnhlsM//jeqMLw5Fy9rfxP592W9UTumNikNRPdjI8wKKzNMXDb1U29tQjN0dg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.4.tgz",
+      "integrity": "sha512-1ujYpaqfqNPYdwKBlvJnOqcl+Syn3UrQ4XE0Txz6zMYgyh6cdU6a3pxqLqIUSJ12MtXRA9ZUhEz1ekU3LfLWXw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@swc/types": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz",
+      "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3"
+      }
+    },
+    "node_modules/@tanstack/query-core": {
+      "version": "5.62.12",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.62.12.tgz",
+      "integrity": "sha512-6igFeBgymHkCxVgaEk+yiLwkMf9haui/EQLmI3o9CatOyDThEoFKe8toLWvWliZC/Jf+h7NwHi/zjfyLArr1ow==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/query-devtools": {
+      "version": "5.62.9",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.62.9.tgz",
+      "integrity": "sha512-b1NZzDLVf6laJsB1Cfm3ieuYzM+WqoO8qpm9v+3Etwd+Ph4zkhUMiT+wcWj5AhEPsXiRodKYiiW048VDNdBxNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/react-query": {
+      "version": "5.62.14",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.62.14.tgz",
+      "integrity": "sha512-ev/6eVdJvX9vpomKmFuXsrQb6TwqqBn/7OeB0KZkHjEYk/Bo1XBMj8wRmobn8pqdU8lK271tUjt+0B0UQ9MZ6A==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/query-core": "5.62.12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19"
+      }
+    },
+    "node_modules/@tanstack/react-query-devtools": {
+      "version": "5.62.14",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.62.14.tgz",
+      "integrity": "sha512-5OEOWzO9gLovbKozIaSRHXXPd30dooa+MZTG0gfMMTKXhH5lct6SLozQ5ngRvzrbYpfL4c9i2+6bX8Hwu8sT0w==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/query-devtools": "5.62.9"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "@tanstack/react-query": "^5.62.14",
+        "react": "^18 || ^19"
+      }
+    },
+    "node_modules/@tanstack/react-table": {
+      "version": "8.20.6",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.6.tgz",
+      "integrity": "sha512-w0jluT718MrOKthRcr2xsjqzx+oEM7B7s/XXyfs19ll++hlId3fjTm+B2zrR3ijpANpkzBAr15j1XGVOMxpggQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/table-core": "8.20.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
+    "node_modules/@tanstack/table-core": {
+      "version": "8.20.5",
+      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz",
+      "integrity": "sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@trivago/prettier-plugin-sort-imports": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.1.tgz",
+      "integrity": "sha512-NDZndt0fmVThIx/8cExuJHLZagUVzfGCoVrwH9x6aZvwfBdkrDFTYujecek6X2WpG4uUFsVaPg5+aNQPSyjcmw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/generator": "^7.26.2",
+        "@babel/parser": "^7.26.2",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
+        "javascript-natural-sort": "^0.7.1",
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">18.12"
+      },
+      "peerDependencies": {
+        "@vue/compiler-sfc": "3.x",
+        "prettier": "2.x - 3.x",
+        "prettier-plugin-svelte": "3.x",
+        "svelte": "4.x || 5.x"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        },
+        "svelte": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-array": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
+      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.15",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz",
+      "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/luxon": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
+      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@types/react": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.2.tgz",
+      "integrity": "sha512-USU8ZI/xyKJwFTpjSVIrSeHBVAGagkHQKPNbxeWwql/vDmnTIBgx+TJnhFnj1NXgz8XfprU0egV2dROLGpsBEg==",
+      "devOptional": true,
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@types/react-dom": {
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.2.tgz",
+      "integrity": "sha512-c1s+7TKFaDRRxr1TxccIX2u7sfCnc3RxkVyBIUA2lCpyqCF+QoAwQ/CBg7bsMdVwP120HEH143VQezKtef5nCg==",
+      "devOptional": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^19.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz",
+      "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/type-utils": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz",
+      "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/typescript-estree": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz",
+      "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz",
+      "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz",
+      "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz",
+      "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/visitor-keys": "8.19.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz",
+      "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "8.19.0",
+        "@typescript-eslint/types": "8.19.0",
+        "@typescript-eslint/typescript-estree": "8.19.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz",
+      "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.19.0",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@vitejs/plugin-react-swc": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.7.2.tgz",
+      "integrity": "sha512-y0byko2b2tSVVf5Gpng1eEhX1OvPC7x8yns1Fx8jDzlJp4LS6CMkCPfLw47cjyoMrshQDoQw4qcgjsU9VvlCew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@swc/core": "^1.7.26"
+      },
+      "peerDependencies": {
+        "vite": "^4 || ^5 || ^6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "license": "MIT"
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+      "license": "MIT"
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/aria-hidden": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
+      "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+      "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-css": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001690",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+      "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/class-variance-authority": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
+      "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "clsx": "^2.1.1"
+      },
+      "funding": {
+        "url": "https://polar.sh/cva"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
+    "node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/country-flag-icons": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.13.tgz",
+      "integrity": "sha512-4JwHNqaKZ19doQoNcBjsoYA+I7NqCH/mC/6f5cBWvdKzcK5TMmzLpq3Z/syVHMHJuDGFwJ+rPpGizvrqJybJow==",
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
+    },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decimal.js-light": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
+      "license": "MIT"
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/detect-node-es": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "license": "MIT"
+    },
+    "node_modules/didyoumean": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "license": "MIT"
+    },
+    "node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.76",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
+      "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+      "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.24.2",
+        "@esbuild/android-arm": "0.24.2",
+        "@esbuild/android-arm64": "0.24.2",
+        "@esbuild/android-x64": "0.24.2",
+        "@esbuild/darwin-arm64": "0.24.2",
+        "@esbuild/darwin-x64": "0.24.2",
+        "@esbuild/freebsd-arm64": "0.24.2",
+        "@esbuild/freebsd-x64": "0.24.2",
+        "@esbuild/linux-arm": "0.24.2",
+        "@esbuild/linux-arm64": "0.24.2",
+        "@esbuild/linux-ia32": "0.24.2",
+        "@esbuild/linux-loong64": "0.24.2",
+        "@esbuild/linux-mips64el": "0.24.2",
+        "@esbuild/linux-ppc64": "0.24.2",
+        "@esbuild/linux-riscv64": "0.24.2",
+        "@esbuild/linux-s390x": "0.24.2",
+        "@esbuild/linux-x64": "0.24.2",
+        "@esbuild/netbsd-arm64": "0.24.2",
+        "@esbuild/netbsd-x64": "0.24.2",
+        "@esbuild/openbsd-arm64": "0.24.2",
+        "@esbuild/openbsd-x64": "0.24.2",
+        "@esbuild/sunos-x64": "0.24.2",
+        "@esbuild/win32-arm64": "0.24.2",
+        "@esbuild/win32-ia32": "0.24.2",
+        "@esbuild/win32-x64": "0.24.2"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
+      "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.0",
+        "@eslint/core": "^0.9.0",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "9.17.0",
+        "@eslint/plugin-kit": "^0.2.3",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.1",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz",
+      "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-react-refresh": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.16.tgz",
+      "integrity": "sha512-slterMlxAhov/DZO8NScf6mEeMBBXodFUolijDvrtTxyezyLoTQaa73FyYus/VbTdftd8wBgBxPMRk3poleXNQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "eslint": ">=8.40"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "license": "MIT"
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-equals": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.1.3.tgz",
+      "integrity": "sha512-6117/nJPFyrTjoCBQI7lpRFf+Oda4mH8HtlNMi28os+URb7MQU/dXUTrKhA2KR4G0O1MCfdi/KExIVEmzEh3qA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fastq": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
+      "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
+      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/framer-motion": {
+      "version": "12.0.0-alpha.2",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.0.0-alpha.2.tgz",
+      "integrity": "sha512-s603YLhCoX3GKaPDZnywwoFdd1T6gDFCfevVRek+TCpbvazUkITh+YZ3a6kqTvn4Aj7qQWT3vAmzWIjl/LsCFA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      },
+      "peerDependencies": {
+        "@emotion/is-prop-valid": "*",
+        "react": "^19.0.0-rc.1",
+        "react-dom": "^19.0.0-rc.1"
+      },
+      "peerDependenciesMeta": {
+        "@emotion/is-prop-valid": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-nonce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+      "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/globals": {
+      "version": "15.14.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz",
+      "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "license": "MIT",
+      "dependencies": {
+        "void-elements": "3.1.0"
+      }
+    },
+    "node_modules/i18next": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.0.tgz",
+      "integrity": "sha512-ArJJTS1lV6lgKH7yEf4EpgNZ7+THl7bsGxxougPYiXRTJ/Fe1j08/TBpV9QsXCIYVfdE/HWG/xLezJ5DOlfBOA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://locize.com"
+        },
+        {
+          "type": "individual",
+          "url": "https://locize.com/i18next.html"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.23.2"
+      },
+      "peerDependencies": {
+        "typescript": "^5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
+      "license": "MIT"
+    },
+    "node_modules/jiti": {
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "license": "MIT",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "license": "MIT"
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
+    },
+    "node_modules/lucide-react": {
+      "version": "0.460.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.460.0.tgz",
+      "integrity": "sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==",
+      "license": "ISC",
+      "peerDependencies": {
+        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
+      }
+    },
+    "node_modules/luxon": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-js": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "license": "MIT",
+      "dependencies": {
+        "camelcase-css": "^2.0.1"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.21"
+      }
+    },
+    "node_modules/postcss-load-config": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "lilconfig": "^3.0.0",
+        "yaml": "^2.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/postcss-nested": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.1.1"
+      },
+      "engines": {
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.14"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "license": "MIT"
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-plugin-tailwindcss": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.9.tgz",
+      "integrity": "sha512-r0i3uhaZAXYP0At5xGfJH876W3HHGHDp+LCRUJrs57PBeQ6mYHMwr25KH8NPX44F2yGTvdnH7OqCshlQx183Eg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.21.3"
+      },
+      "peerDependencies": {
+        "@ianvs/prettier-plugin-sort-imports": "*",
+        "@prettier/plugin-pug": "*",
+        "@shopify/prettier-plugin-liquid": "*",
+        "@trivago/prettier-plugin-sort-imports": "*",
+        "@zackad/prettier-plugin-twig-melody": "*",
+        "prettier": "^3.0",
+        "prettier-plugin-astro": "*",
+        "prettier-plugin-css-order": "*",
+        "prettier-plugin-import-sort": "*",
+        "prettier-plugin-jsdoc": "*",
+        "prettier-plugin-marko": "*",
+        "prettier-plugin-multiline-arrays": "*",
+        "prettier-plugin-organize-attributes": "*",
+        "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-sort-imports": "*",
+        "prettier-plugin-style-order": "*",
+        "prettier-plugin-svelte": "*"
+      },
+      "peerDependenciesMeta": {
+        "@ianvs/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@prettier/plugin-pug": {
+          "optional": true
+        },
+        "@shopify/prettier-plugin-liquid": {
+          "optional": true
+        },
+        "@trivago/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@zackad/prettier-plugin-twig-melody": {
+          "optional": true
+        },
+        "prettier-plugin-astro": {
+          "optional": true
+        },
+        "prettier-plugin-css-order": {
+          "optional": true
+        },
+        "prettier-plugin-import-sort": {
+          "optional": true
+        },
+        "prettier-plugin-jsdoc": {
+          "optional": true
+        },
+        "prettier-plugin-marko": {
+          "optional": true
+        },
+        "prettier-plugin-multiline-arrays": {
+          "optional": true
+        },
+        "prettier-plugin-organize-attributes": {
+          "optional": true
+        },
+        "prettier-plugin-organize-imports": {
+          "optional": true
+        },
+        "prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "prettier-plugin-style-order": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/react": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
+      "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
+      "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "scheduler": "^0.25.0"
+      },
+      "peerDependencies": {
+        "react": "^19.0.0"
+      }
+    },
+    "node_modules/react-i18next": {
+      "version": "15.4.0",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.0.tgz",
+      "integrity": "sha512-Py6UkX3zV08RTvL6ZANRoBh9sL/ne6rQq79XlkHEdd82cZr2H9usbWpUNVadJntIZP2pu3M2rL1CN+5rQYfYFw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.25.0",
+        "html-parse-stringify": "^3.0.1"
+      },
+      "peerDependencies": {
+        "i18next": ">= 23.2.3",
+        "react": ">= 16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "license": "MIT"
+    },
+    "node_modules/react-remove-scroll": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz",
+      "integrity": "sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==",
+      "license": "MIT",
+      "dependencies": {
+        "react-remove-scroll-bar": "^2.3.7",
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.3",
+        "use-sidecar": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-remove-scroll-bar": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
+      "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "license": "MIT",
+      "dependencies": {
+        "react-style-singleton": "^2.2.2",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-router": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.1.tgz",
+      "integrity": "sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "react-dom": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-router-dom": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.1.tgz",
+      "integrity": "sha512-vSrQHWlJ5DCfyrhgo0k6zViOe9ToK8uT5XGSmnuC2R3/g261IdIMpZVqfjD6vWSXdnf5Czs4VA/V60oVR6/jnA==",
+      "license": "MIT",
+      "dependencies": {
+        "react-router": "7.1.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "react-dom": ">=18"
+      }
+    },
+    "node_modules/react-smooth": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz",
+      "integrity": "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-equals": "^5.0.1",
+        "prop-types": "^15.8.1",
+        "react-transition-group": "^4.4.5"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/react-style-singleton": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
+      "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "get-nonce": "^1.0.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/recharts": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.0.tgz",
+      "integrity": "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw==",
+      "license": "MIT",
+      "dependencies": {
+        "clsx": "^2.0.0",
+        "eventemitter3": "^4.0.1",
+        "lodash": "^4.17.21",
+        "react-is": "^18.3.1",
+        "react-smooth": "^4.0.0",
+        "recharts-scale": "^0.4.4",
+        "tiny-invariant": "^1.3.1",
+        "victory-vendor": "^36.6.8"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/recharts-scale": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz",
+      "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==",
+      "license": "MIT",
+      "dependencies": {
+        "decimal.js-light": "^2.4.1"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz",
+      "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.6"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.29.1",
+        "@rollup/rollup-android-arm64": "4.29.1",
+        "@rollup/rollup-darwin-arm64": "4.29.1",
+        "@rollup/rollup-darwin-x64": "4.29.1",
+        "@rollup/rollup-freebsd-arm64": "4.29.1",
+        "@rollup/rollup-freebsd-x64": "4.29.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.29.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.29.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.29.1",
+        "@rollup/rollup-linux-arm64-musl": "4.29.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.29.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.29.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.29.1",
+        "@rollup/rollup-linux-x64-gnu": "4.29.1",
+        "@rollup/rollup-linux-x64-musl": "4.29.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.29.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.29.1",
+        "@rollup/rollup-win32-x64-msvc": "4.29.1",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
+      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==",
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+      "license": "MIT"
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/sonner": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.1.tgz",
+      "integrity": "sha512-b6LHBfH32SoVasRFECrdY8p8s7hXPDn3OHUFbZZbiB1ctLS9Gdh6rpX2dVrpQA0kiL5jcRzDDldwwLkSKk3+QQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
+        "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/sucrase": {
+      "version": "3.35.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
+      "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "^10.3.10",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tailwind-merge": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
+      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/dcastil"
+      }
+    },
+    "node_modules/tailwindcss": {
+      "version": "3.4.17",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
+      "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+      "license": "MIT",
+      "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
+        "arg": "^5.0.2",
+        "chokidar": "^3.6.0",
+        "didyoumean": "^1.2.2",
+        "dlv": "^1.1.3",
+        "fast-glob": "^3.3.2",
+        "glob-parent": "^6.0.2",
+        "is-glob": "^4.0.3",
+        "jiti": "^1.21.6",
+        "lilconfig": "^3.1.3",
+        "micromatch": "^4.0.8",
+        "normalize-path": "^3.0.0",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.47",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.2",
+        "postcss-nested": "^6.2.0",
+        "postcss-selector-parser": "^6.1.2",
+        "resolve": "^1.22.8",
+        "sucrase": "^3.35.0"
+      },
+      "bin": {
+        "tailwind": "lib/cli.js",
+        "tailwindcss": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tailwindcss-animate": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz",
+      "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0 || insiders"
+      }
+    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "license": "MIT",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/tiny-invariant": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
+      "license": "MIT"
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/ts-api-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
+      "license": "ISC"
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+      "devOptional": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/typescript-eslint": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.19.0.tgz",
+      "integrity": "sha512-Ni8sUkVWYK4KAcTtPjQ/UTiRk6jcsuDhPpxULapUDi8A/l8TSBk+t1GtJA1RsCzIJg0q6+J7bf35AwQigENWRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.19.0",
+        "@typescript-eslint/parser": "8.19.0",
+        "@typescript-eslint/utils": "8.19.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/use-callback-ref": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
+      "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-sidecar": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
+      "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/victory-vendor": {
+      "version": "36.9.2",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz",
+      "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==",
+      "license": "MIT AND ISC",
+      "dependencies": {
+        "@types/d3-array": "^3.0.3",
+        "@types/d3-ease": "^3.0.0",
+        "@types/d3-interpolate": "^3.0.1",
+        "@types/d3-scale": "^4.0.2",
+        "@types/d3-shape": "^3.1.0",
+        "@types/d3-time": "^3.0.0",
+        "@types/d3-timer": "^3.0.0",
+        "d3-array": "^3.1.6",
+        "d3-ease": "^3.0.1",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-shape": "^3.1.0",
+        "d3-time": "^3.0.0",
+        "d3-timer": "^3.0.1"
+      }
+    },
+    "node_modules/vite": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz",
+      "integrity": "sha512-RDt8r/7qx9940f8FcOIAH9PTViRrghKaK2K1jY3RaAURrEUbm9Du1mJ72G+jlhtG3WwodnfzY8ORQZbBavZEAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.24.2",
+        "postcss": "^8.4.49",
+        "rollup": "^4.23.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/yaml": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
+      "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix
new file mode 100644
index 000000000000..3ca261781af7
--- /dev/null
+++ b/pkgs/by-name/ne/nezha-theme-user/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "nezha-theme-user";
+  version = "1.12.1";
+
+  src = fetchFromGitHub {
+    owner = "hamster1963";
+    repo = "nezha-dash-v1";
+    tag = "v${version}";
+    hash = "sha256-vd242bYWT7AgpKDyYEb+Kc+8o1qtuTusmxqLnWGo5pE=";
+  };
+
+  # TODO: Switch to the bun build function once available in nixpkgs
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+
+    # We cannot directly get the git commit hash from the tarball
+    substituteInPlace vite.config.ts \
+      --replace-fail 'git rev-parse --short HEAD' 'echo refs/tags/v${version}'
+    substituteInPlace src/components/Footer.tsx \
+      --replace-fail '/commit/' '/tree/'
+  '';
+
+  npmDepsHash = "sha256-jWCgeT3IvTZZTh/kKq+mRc0tAVoptl3rrlwcbUSs5uc=";
+
+  npmPackFlags = [ "--ignore-scripts" ];
+
+  npmFlags = [ "--legacy-peer-deps" ];
+
+  dontNpmInstall = true;
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Nezha monitoring user frontend based on next.js";
+    changelog = "https://github.com/hamster1963/nezha-dash-v1/releases/tag/v${version}";
+    homepage = "https://github.com/hamster1963/nezha-dash-v1";
+    license = lib.licenses.apsl20;
+    maintainers = with lib.maintainers; [ moraxyc ];
+  };
+}

From ef222a8ea60a4c7e4f3857266f0b6b718e457597 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 2 Jan 2025 07:04:01 +0000
Subject: [PATCH 1480/1504] radvd: 2.20_rc1 -> 2.20

Changes: https://github.com/radvd-project/radvd/releases/tag/v2.20
---
 pkgs/by-name/ra/radvd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radvd/package.nix b/pkgs/by-name/ra/radvd/package.nix
index 8c66da8b4c90..c65f95b634a2 100644
--- a/pkgs/by-name/ra/radvd/package.nix
+++ b/pkgs/by-name/ra/radvd/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "radvd";
-  version = "2.20_rc1";
+  version = "2.20";
 
   src = fetchFromGitHub {
     owner = "radvd-project";
     repo = "radvd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+cZn4pE4hBZDckfcQJzYdZxHkexWl/AmufCN5BiwWwA=";
+    hash = "sha256-s9KP6F6rSumuNDOV4rtE7I+o742al4hc3/dgNkpCCyQ=";
   };
 
   nativeBuildInputs = [

From a3df9206e2a000f915c7a658e4c6d4d76d979845 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 23 Nov 2024 02:48:31 +0800
Subject: [PATCH 1481/1504] zinit: refactor and modernize

---
 pkgs/by-name/zi/zinit/package.nix | 66 +++++++++++++++++--------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index 0cdd61536bc1..8592b7cca946 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -1,48 +1,56 @@
-{ stdenvNoCC, lib, fetchFromGitHub, installShellFiles }:
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  installShellFiles,
+}:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zinit";
   version = "3.13.1";
+
   src = fetchFromGitHub {
     owner = "zdharma-continuum";
-    repo = pname;
-    rev = "v${version}";
+    repo = finalAttrs.pname;
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-fnBV0LmC/wJm0pOITJ1mhiBqsg2F8AQJWvn0p/Bgo5Q=";
   };
-  # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git
-  dontBuild = true;
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
   strictDeps = true;
+
   nativeBuildInputs = [ installShellFiles ];
+
   installPhase = ''
-    outdir="$out/share/$pname"
+    runHook preInstall
 
-    cd "$src"
+    # Source files
+    mkdir -p $out/share/zinit
+    install -m0644 zinit{,-side,-install,-autoload}.zsh $out/share/zinit
+    install -m0755 share/git-process-output.zsh $out/share/zinit
 
-    # Zplugin's source files
-    install -dm0755 "$outdir"
-    # Installing backward compatibility layer
-    install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir"
-    install -m0755 share/git-process-output.zsh "$outdir"
-
-    installManPage doc/zinit.1
-
-    # Zplugin autocompletion
+    # Autocompletion
     installShellCompletion --zsh _zinit
 
-    #TODO:Zplugin-module files
-    # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \;
-    # find zmodules/ -type f -exec install -m 744 "{}" "$outdir/{}" \;
-
-  '';
-  postInstall = ''
+    # Manpage
     installManPage doc/zinit.1
-  '';
-  #TODO:doc output
 
-  meta = with lib; {
+    runHook postInstall
+  '';
+
+  #TODO: output doc through zshelldoc
+
+  meta = {
     homepage = "https://github.com/zdharma-continuum/zinit";
     description = "Flexible zsh plugin manager";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pasqui23 sei40kr ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      pasqui23
+      sei40kr
+    ];
   };
-}
+})

From 9713c984c757c27b43f3bc5b278c1c2a2618a10d Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 23 Nov 2024 03:24:34 +0800
Subject: [PATCH 1482/1504] zinit: fix manpage not found

---
 pkgs/by-name/zi/zinit/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index 8592b7cca946..bc3ad40d9b97 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -37,11 +37,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     installShellCompletion --zsh _zinit
 
     # Manpage
+    mkdir -p ${placeholder "man"}/share/man/man{1..9}
     installManPage doc/zinit.1
 
     runHook postInstall
   '';
 
+  postFixup = ''
+    substituteInPlace $out/share/zinit/zinit.zsh \
+      --replace-fail zinit.1 zinit.1.gz \
+      --replace-fail "\''${ZINIT[BIN_DIR]}/doc" ${placeholder "man"}/share/man/man1 \
+      --replace-fail "ZINIT[MAN_DIR]:=\''${ZPFX}/man" "ZINIT[MAN_DIR]:=${placeholder "man"}/share/man"
+  '';
+
   #TODO: output doc through zshelldoc
 
   meta = {

From e3036e0e1be1050d5d31e1ec937d1578479dc440 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 23 Nov 2024 02:50:06 +0800
Subject: [PATCH 1483/1504] zinit: add maintainer moraxyc

---
 pkgs/by-name/zi/zinit/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index bc3ad40d9b97..3e808e4efbe7 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -59,6 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pasqui23
       sei40kr
+      moraxyc
     ];
   };
 })

From 62e22cdfc722bdc7ad050ff3f1b854079e3fc2b0 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 23 Nov 2024 02:52:25 +0800
Subject: [PATCH 1484/1504] zinit: add nix-update-script

---
 pkgs/by-name/zi/zinit/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index 3e808e4efbe7..295419ac4126 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -3,6 +3,7 @@
   lib,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -52,6 +53,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   #TODO: output doc through zshelldoc
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://github.com/zdharma-continuum/zinit";
     description = "Flexible zsh plugin manager";

From a2792016c89329d4f46991693bd45200fc91fb22 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 23 Nov 2024 03:41:26 +0800
Subject: [PATCH 1485/1504] zinit: fix _zinit not found

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

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index 295419ac4126..ecbc967f0fea 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     # Source files
     mkdir -p $out/share/zinit
-    install -m0644 zinit{,-side,-install,-autoload}.zsh $out/share/zinit
+    install -m0644 zinit{,-side,-install,-autoload}.zsh _zinit $out/share/zinit
     install -m0755 share/git-process-output.zsh $out/share/zinit
 
     # Autocompletion

From d8401b9b18e33c636f479f2eaab92e973d0963c8 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 4 Jan 2025 14:56:25 +0800
Subject: [PATCH 1486/1504] zinit: use tag instead of refs/tags

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

diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index ecbc967f0fea..dc0eccdfad25 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "zdharma-continuum";
     repo = finalAttrs.pname;
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fnBV0LmC/wJm0pOITJ1mhiBqsg2F8AQJWvn0p/Bgo5Q=";
   };
 

From 1fa77f64fc55894f2d5c74695a1f6dddf8fd9ed8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 20:40:39 +0000
Subject: [PATCH 1487/1504] godns: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix
index f2583e8e26b3..98e3409cb5ad 100644
--- a/pkgs/by-name/go/godns/package.nix
+++ b/pkgs/by-name/go/godns/package.nix
@@ -10,19 +10,19 @@
 
 buildGoModule rec {
   pname = "godns";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "godns";
     tag = "v${version}";
-    hash = "sha256-qkyEQs96E5l1R5JTGefnTeiThr4P7PtUjpNmiylQj4c=";
+    hash = "sha256-E5xJiODTOaBGojFd7W+id59tKLPpHpkAFHiETOYqCSg=";
   };
 
-  vendorHash = "sha256-zz33xHIZ2jhD2s3v2vum0ELG7GTqe5SsADUrO5yqumw=";
+  vendorHash = "sha256-cR+hlIGRPffP21lqDZmqBF4unS6ZyEvEvRlTrswg+js=";
   npmDeps = fetchNpmDeps {
     src = "${src}/web";
-    hash = "sha256-Y35CcUubO3QmbEwWBFXoWKLgvE8dp/mFE/szRigJvLo=";
+    hash = "sha256-lchAfi97a97TPs22ML3sMrlSZdvWMMC+wBrGbvke5rg=";
   };
 
   npmRoot = "web";

From 34ba1df71353de1307acb50a8364571d92d3275f Mon Sep 17 00:00:00 2001
From: pcboy <david.hagege@gmail.com>
Date: Thu, 2 Jan 2025 11:11:18 +0900
Subject: [PATCH 1488/1504] textual: 0.86.1 -> 1.0.0

---
 .../textual-fastdatatable/default.nix         |  4 +--
 .../textual-textarea/default.nix              |  4 +--
 .../python-modules/textual/default.nix        | 29 +++++++++++++------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix
index d9827de19bdb..a063f5dbe665 100644
--- a/pkgs/development/python-modules/textual-fastdatatable/default.nix
+++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "textual-fastdatatable";
-  version = "0.10.0";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "tconbeer";
     repo = "textual-fastdatatable";
     tag = "v${version}";
-    hash = "sha256-r1evN69etFn21TkXPLuAh1OxIsurDDyPyYOKQR5uUos=";
+    hash = "sha256-Jz0ujO/nAnn15t8/OFOzZTpVBXNYsfVhxmYdGC39PpM=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index 44ea52170e23..7415cf0588ec 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "textual-textarea";
-  version = "0.14.4";
+  version = "0.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tconbeer";
     repo = "textual-textarea";
     tag = "v${version}";
-    hash = "sha256-tmbSCU1VgxR9aXG22UVpweD71dVmhKSRBTDm1Gf33jM=";
+    hash = "sha256-aaeXgD6RMQ3tlK5H/2lk3ueTyA3yYjHrYL51w/1tvSI=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 919bd6fbf682..0bcc0d1f5a08 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -9,6 +9,7 @@
   pytest-aiohttp,
   pytest-xdist,
   pytestCheckHook,
+  pythonAtLeast,
   pythonOlder,
   rich,
   syrupy,
@@ -20,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "0.86.1";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +30,7 @@ buildPythonPackage rec {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-5msCFv79nAmoaP9gZxV3DXMLTyVlSFb+qyA5jHWwc50=";
+    hash = "sha256-3pNUDkkq9X3W9DdWp4M4h4ddHN+GzUxLCFNJJdAtRJM=";
   };
 
   build-system = [ poetry-core ];
@@ -65,14 +66,24 @@ buildPythonPackage rec {
     "tests/snapshot_tests/test_snapshots.py"
   ];
 
-  disabledTests = [
-    # Assertion issues
-    "test_textual_env_var"
+  disabledTests =
+    [
+      # Assertion issues
+      "test_textual_env_var"
 
-    # Requirements for tests are not quite ready
-    "test_register_language"
-    "test_language_binary_missing"
-  ];
+      # Requirements for tests are not quite ready
+      "test_register_language"
+
+      # Requires python bindings for tree-sitter languages
+      # https://github.com/Textualize/textual/issues/5449
+      "test_setting_unknown_language"
+      "test_update_highlight_query"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # https://github.com/Textualize/textual/issues/5327
+      "test_cursor_page_up"
+      "test_cursor_page_down"
+    ];
 
   # Some tests in groups require state from previous tests
   # See https://github.com/Textualize/textual/issues/4924#issuecomment-2304889067

From a5d01f718eaf9ca738581b4a3c780fb5046dd02f Mon Sep 17 00:00:00 2001
From: pcboy <david.hagege@gmail.com>
Date: Thu, 2 Jan 2025 17:22:55 +0900
Subject: [PATCH 1489/1504] memray: 1.14.0 -> 1.15.0

---
 pkgs/by-name/me/memray/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix
index cfbf7609c0f9..332b1e268477 100644
--- a/pkgs/by-name/me/memray/package.nix
+++ b/pkgs/by-name/me/memray/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "memray";
-  version = "1.14.0";
+  version = "1.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bloomberg";
     repo = "memray";
     tag = "v${version}";
-    hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E=";
+    hash = "sha256-SgkJm+vtIid8RR1Qy98PkpvIQX4LxyAPlS+4UlYlZws=";
   };
 
   build-system = with python3Packages; [
@@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
       pytest-textual-snapshot
       pytestCheckHook
     ]
-    ++ lib.optionals (pythonOlder "3.12") [ greenlet ];
+    ++ lib.optionals (pythonOlder "3.14") [ greenlet ];
 
   pythonImportsCheck = [ "memray" ];
 
@@ -58,15 +58,6 @@ python3Packages.buildPythonApplication rec {
     # Import issue
     "test_header_allocator"
     "test_hybrid_stack_of_allocations_inside_ceval"
-
-    # snapshot-based tests are too fragile
-    # see https://github.com/bloomberg/memray/issues/654
-    "TestTUILooks"
-    "test_tui_basic"
-    "test_tui_pause"
-    "test_tui_gradient"
-    "test_merge_threads"
-    "test_unmerge_threads"
   ];
 
   disabledTestPaths = [

From 26dce2b5383cc0a499356361aa8016fcf3a65591 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jan 2025 08:50:20 +0000
Subject: [PATCH 1490/1504] comrak: 0.32.0 -> 0.33.0

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

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index b0fbf044e631..1da4f0558eb7 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-sRYyInQ2jvtipmGkTL8P7ed0YHLnAQObaMX6N87bFHU=";
+    sha256 = "sha256-VN8f5r25kfUqekt9q28oMmkzQUE+Ko8DYhRZjpbbDfM=";
   };
 
-  cargoHash = "sha256-4Tl9MEZn8RAklqc32bLeWg+muVcjqMKRWSrt8BIq9n4=";
+  cargoHash = "sha256-Hdjit5dpZXT7ENamUX0ygTy+XAyCkcqq94wAJUPd8DY=";
 
   meta = with lib; {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

From 43aaf362cf972777562cb0e8878b5fddc967a2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <65870+suhr@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:01:28 +0300
Subject: [PATCH 1491/1504] python3Packages.mariadb: 1.1.10 -> 1.1.11

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

diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix
index e437a9cc0f76..7b68f6fb62d7 100644
--- a/pkgs/development/python-modules/mariadb/default.nix
+++ b/pkgs/development/python-modules/mariadb/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "mariadb";
-  version = "1.1.10";
+  version = "1.1.11";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "mariadb-corporation";
     repo = "mariadb-connector-python";
     tag = "v${version}";
-    hash = "sha256-YpA65J8ozKJfpOc4hZLdgCcT3j/lqRiNeX7k8U/aYkE=";
+    hash = "sha256-f3WeVtsjxm/HVPv0cbpPkmklcNFWJaFqI2LxDElcCFw=";
   };
 
   build-system = [ setuptools ];

From 8defe4cd76245340e279332d7d8370dda567b3f3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 4 Jan 2025 12:52:12 +0300
Subject: [PATCH 1492/1504] paperless-ngx: fix eval

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index bb43fbf8cb24..210de21f32e5 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -54,7 +54,7 @@ let
         {
           inherit version;
           src = src.override {
-            rev = "refs/tags/${version}";
+            tag = version;
             hash = "sha256-GvYdExkNuySrg8ERnWOJxucFe5HVdPAcHfRNeqiVS7M=";
           };
 

From 942ea8c7af8dcc8e5dc5184ddeaecb0a1d60b761 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 4 Jan 2025 19:54:13 +1000
Subject: [PATCH 1493/1504] Revert "buildbot: add patch for compatibility with
 twisted 24.11.0"

This reverts commit 0dd7250c735247a9c6365e6624b37da2a826dbf9.

fixed in 4.2.0 edb59b6d8e0b1d3595887d29863140b429e51b85
---
 .../tools/continuous-integration/buildbot/master.nix        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix
index 386540681c3a..1d624c3fc17e 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/master.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix
@@ -43,7 +43,6 @@
   unidiff,
   glibcLocales,
   nixosTests,
-  fetchpatch,
 }:
 
 let
@@ -141,11 +140,6 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    (fetchpatch {
-      name = "remove-uses-of-twisted-python-constants.patch";
-      url = "https://github.com/buildbot/buildbot/commit/ac46c0aa77be46eaa64e09bef03da6f8dbaacfa7.patch";
-      hash = "sha256-XoODSKY0GzFh2H5gWxiXm/QxngGN2MM0yId5D1RQflQ=";
-    })
     # This patch disables the test that tries to read /etc/os-release which
     # is not accessible in sandboxed builds.
     ./skip_test_linux_distro.patch

From 9e6475352d53475fbe344e869c36ee59f43108c1 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 17:02:10 -0800
Subject: [PATCH 1494/1504] sage.lib: ignore narrowing error on clang-19

`https://github.com/sagemath/sage/pull/39249`

The v_index type is an integer and in the code there are lots of places where
the significant bytes of an 8 byte type are lost in assignment. However, this
is the only one which causes an error. A workaround is to ignore the error or
to preform the assignment outside of the initializer list.
---
 pkgs/by-name/sa/sage/sagelib.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix
index 98096eadb669..408a015a2a9a 100644
--- a/pkgs/by-name/sa/sage/sagelib.nix
+++ b/pkgs/by-name/sa/sage/sagelib.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   sage-src,
   env-locations,
   python,
@@ -118,6 +120,13 @@ buildPythonPackage rec {
     readline
   ];
 
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    # code tries to assign a unsigned long to an int in an initialized list
+    # leading to this error.
+    # https://github.com/sagemath/sage/pull/39249
+    NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing-const-reference";
+  };
+
   propagatedBuildInputs = [
     # native dependencies (TODO: determine which ones need to be propagated)
     blas

From 7978ab2557a45715b503b87d58859b61a7a66f1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jan 2025 10:14:17 +0000
Subject: [PATCH 1495/1504] kazumi: 1.4.8 -> 1.5.0

---
 pkgs/by-name/ka/kazumi/package.nix       |  4 ++--
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 37a1adeea323..8d9f76b797b8 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -14,13 +14,13 @@
 }:
 flutter327.buildFlutterApplication rec {
   pname = "kazumi";
-  version = "1.4.8";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-E1JOBdOfb2WyTDU0nOu1SCFSfv5O4VKj+9Go8wcMips=";
+    hash = "sha256-YYg8DpW/O517R9YZ9jpikNIy2MfLQdiLsdhO3uhCusc=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index fa5df857d3cf..b5578972a100 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -226,6 +226,16 @@
       "source": "hosted",
       "version": "0.2.5"
     },
+    "card_settings_ui": {
+      "dependency": "direct main",
+      "description": {
+        "name": "card_settings_ui",
+        "sha256": "36bd1bb8e3d18612e2654e722da0f1ed9bc7a412339b906205107ece72b8e14b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "characters": {
       "dependency": "transitive",
       "description": {

From f0b18d819b7c292184207ed64a3926b41e7c2ce0 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 31 Dec 2024 20:06:13 +0100
Subject: [PATCH 1496/1504] shadps4: 0.4.0-unstable-2024-12-23 >
 0.5.0-unstable-2025-01-02

---
 pkgs/by-name/sh/shadps4/package.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index de4c17532b39..5bab6c0641e2 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -17,7 +17,7 @@
   libunwind,
   libusb1,
   magic-enum,
-  libgbm,
+  mesa,
   pkg-config,
   pugixml,
   qt6,
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shadps4";
-  version = "0.4.0-unstable-2024-12-23";
+  version = "0.5.0-unstable-2025-01-02";
 
   src = fetchFromGitHub {
     owner = "shadps4-emu";
     repo = "shadPS4";
-    rev = "c2e9c877dd82e9bf79c8ede7bc8cffb591a31c76";
-    hash = "sha256-6LmNLH5Fy+9AYDXLh/YFThs3EUgA6gnmUEvBltkUQig=";
+    rev = "596f4cdf0e66a97c9d2d4272091d8c0167a5b8e1";
+    hash = "sha256-apwAl8TCzSKchqYGHV0UsMSGErF4GgiwhlwmOPWpeLs=";
     fetchSubmodules = true;
   };
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     xorg.libX11
     xorg.libXext
     magic-enum
-    libgbm
+    mesa
     pugixml
     qt6.qtbase
     qt6.qtdeclarative
@@ -113,15 +113,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  fixupPhase = ''
-    patchelf --add-rpath ${
-      lib.makeLibraryPath [
-        vulkan-loader
-        xorg.libXi
-      ]
-    } \
-      $out/bin/shadps4
-  '';
+  runtimeDependencies = [
+    vulkan-loader
+    xorg.libXi
+  ];
 
   passthru = {
     tests.openorbis-example = nixosTests.shadps4;

From f7d6e4ae13868e7faaa3d5c197062162e3b522b8 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Fri, 3 Jan 2025 21:26:58 +0800
Subject: [PATCH 1497/1504] slackdump: 2.6.1 -> 3.0.0

---
 pkgs/by-name/sl/slackdump/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index 88b725edef61..59c4ba6466e7 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -3,18 +3,19 @@
   lib,
   fetchFromGitHub,
   stdenv,
+  nix-update-script,
   darwin,
 }:
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "2.6.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${version}";
-    hash = "sha256-szo5n1sVv9PZUW77k/1qLuU0URl0FNB4cO5vqokoZ2c=";
+    hash = "sha256-gnZbBY1XMYSGgsVG5MqR2y3o574hOwapcLZf5F21AJg=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -24,13 +25,18 @@ buildGoModule rec {
       skippedTests = [
         "TestSession_saveUserCache"
         "TestSession_GetUsers"
+        "Test_exportV3" # This was skipped on upstream's CI. It is seemed that some file are missed
       ];
     in
     [
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-aDLeYi4nsMKxtE59au6I3mSEY0/6Vo0ujWFbLca+0wQ=";
+  vendorHash = "sha256-GUPBrSgwxVXA3vEVbY36IZQfd2jEhvgk0OlFdP/2DU0=";
+
+  __darwinAllowLocalNetworking = true;
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     homepage = "https://github.com/rusq/slackdump";

From 01299c081f87c6f5c7c42c6c41f4511e7732b7b5 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 2 Jan 2025 17:02:36 -0800
Subject: [PATCH 1498/1504] sage.tests: darwin sandbox fixes

---
 pkgs/by-name/sa/sage/sage-tests.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/sa/sage/sage-tests.nix b/pkgs/by-name/sa/sage/sage-tests.nix
index 6080d8204fc1..669730f46c82 100644
--- a/pkgs/by-name/sa/sage/sage-tests.nix
+++ b/pkgs/by-name/sa/sage/sage-tests.nix
@@ -49,6 +49,14 @@ stdenv.mkDerivation {
     makeWrapper "${sage-with-env}/bin/sage" "$out/bin/sage"
   '';
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # prevent warnings about assigning LC_* to "C" resulting in broken tests
+    # when run in darwin sandbox
+    LC_ALL = "en_US.UTF-8";
+  };
+
+  # allow singular tests to pass in darwin sandbox
+  __darwinAllowLocalNetworking = true;
   doInstallCheck = true;
   installCheckPhase = ''
     export HOME="$TMPDIR/sage-home"

From 676d6e036432d10b9e9870be02a4335197d297fa Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 4 Jan 2025 11:22:17 +0100
Subject: [PATCH 1499/1504] shadps4: add liberodark to maintainers

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

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 5bab6c0641e2..6c5fc826bcfc 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -130,7 +130,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Early in development PS4 emulator";
     homepage = "https://github.com/shadps4-emu/shadPS4";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ryand56 ];
+    maintainers = with lib.maintainers; [
+      ryand56
+      liberodark
+    ];
     mainProgram = "shadps4";
     platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64;
   };

From dc208d29520965349de61f434cf67719772d80d2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 4 Jan 2025 11:35:13 +0100
Subject: [PATCH 1500/1504] nixpkgs-review: 3.0.0 -> 3.0.1

Diff: https://github.com/Mic92/nixpkgs-review/compare/refs/tags/3.0.0...3.0.1

Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/3.0.1
---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 88e11eccb51e..5b20425a25e1 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "3.0.0";
+  version = "3.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     tag = version;
-    hash = "sha256-C2JAlCgH5OCMAZr/Rvi0H7xAwesnkVCJ3kZyyVYaLg4=";
+    hash = "sha256-G47bfu3IVsKx5Yhfe6H6w5qRcxF2sjd48xVGSeljv/I=";
   };
 
   build-system = [
@@ -76,7 +76,7 @@ python3Packages.buildPythonApplication rec {
   versionCheckProgramArg = [ "--version" ];
 
   meta = {
-    changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${src.tag}";
+    changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
     description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
     homepage = "https://github.com/Mic92/nixpkgs-review";
     license = lib.licenses.mit;

From 02728a7701902878a1b171844321349e37546499 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Sat, 4 Jan 2025 11:42:02 +0100
Subject: [PATCH 1501/1504] lcalc: use libc++-compatible way of extending
 namespace std

---
 pkgs/by-name/lc/lcalc/libcxx-compat.patch | 30 +++++++++++++++++++++++
 pkgs/by-name/lc/lcalc/package.nix         |  8 ++----
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/lc/lcalc/libcxx-compat.patch

diff --git a/pkgs/by-name/lc/lcalc/libcxx-compat.patch b/pkgs/by-name/lc/lcalc/libcxx-compat.patch
new file mode 100644
index 000000000000..882dc2549475
--- /dev/null
+++ b/pkgs/by-name/lc/lcalc/libcxx-compat.patch
@@ -0,0 +1,30 @@
+diff --git a/src/libLfunction/Lcomplex.h b/src/libLfunction/Lcomplex.h
+index 363bbf4..ffecd70 100644
+--- a/src/libLfunction/Lcomplex.h
++++ b/src/libLfunction/Lcomplex.h
+@@ -56,8 +56,11 @@
+ #include <cmath>
+ #include <sstream>
+ 
+-namespace std
+-{
++#ifdef _LIBCPP_VERSION
++_LIBCPP_BEGIN_NAMESPACE_STD
++#else
++namespace std {
++#endif
+   // Forward declarations
+   template<typename _Tp> class complex;
+   template<> class complex<float>;
+@@ -1193,6 +1196,10 @@ namespace std
+   inline
+   complex<long double>::complex(const complex<double>& __z)
+   : _M_value(_ComplexT(__z._M_value)) { }
+-} // namespace std
++#ifdef _LIBCPP_VERSION
++_LIBCPP_END_NAMESPACE_STD
++#else
++}
++#endif
+ 
+ #endif	/* _CPP_COMPLEX */
diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix
index 22f326219a47..f8fbf97b7483 100644
--- a/pkgs/by-name/lc/lcalc/package.nix
+++ b/pkgs/by-name/lc/lcalc/package.nix
@@ -19,13 +19,9 @@ stdenv.mkDerivation rec {
     hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc=";
   };
 
-  # workaround for vendored GCC 3.5 <complex>
+  # workaround for vendored GCC <complex> on libc++
   # https://gitlab.com/sagemath/lcalc/-/issues/16
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-D_GLIBCXX_COMPLEX"
-    "-D_LIBCPP_COMPLEX"
-    "-D_LIBCPP___FWD_COMPLEX_H"
-  ];
+  patches = [ ./libcxx-compat.patch ];
 
   nativeBuildInputs = [
     autoreconfHook

From 8f1da4b3ae926634a7e98ae1d09596f2dd6b4312 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 4 Jan 2025 11:50:54 +0100
Subject: [PATCH 1502/1504] nix-update: 1.7.0 -> 1.9.0

Diff: https://github.com/Mic92/nix-update/compare/refs/tags/1.7.0...1.9.0

Changelog: https://github.com/Mic92/nix-update/releases/tag/1.9.0
---
 pkgs/by-name/ni/nix-update/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index fb17ef753981..cba250a2114b 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -11,14 +11,14 @@
 let
   self = python3Packages.buildPythonApplication {
     pname = "nix-update";
-    version = "1.7.0";
+    version = "1.9.0";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "Mic92";
       repo = "nix-update";
       tag = self.version;
-      hash = "sha256-5KhS3RxeVDHKjsxT3hHtl0hHcwlSHl2fYFYLonobpLg=";
+      hash = "sha256-I9p2CLvzu9DMUCQynQAYski6kwo/NZHdIxCXLpgzOac=";
     };
 
     build-system = [ python3Packages.setuptools ];
@@ -47,8 +47,8 @@ let
     };
 
     meta = {
-      homepage = "https://github.com/Mic92/nix-update/";
       description = "Swiss-knife for updating nix packages";
+      homepage = "https://github.com/Mic92/nix-update/";
       changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 213dbf17746f910121b609bcb1a7db35478236d2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 4 Jan 2025 12:07:49 +0100
Subject: [PATCH 1503/1504] ci/request-reviews: lowercase handles consistently

This script assumed to get lowercased input before, but with the
addition of pinging maintainers that's not necessarily true anymore.

Since the checks for prAuthor and already-reviewed-by already lowercase,
make sure to lowercase the handles in the users array, too.
---
 ci/request-reviews/process-reviewers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/request-reviews/process-reviewers.sh b/ci/request-reviews/process-reviewers.sh
index 52c0dca0b559..de969c5c9e4f 100755
--- a/ci/request-reviews/process-reviewers.sh
+++ b/ci/request-reviews/process-reviewers.sh
@@ -24,7 +24,7 @@ trap 'rm -rf "$tmp"' exit
 
 declare -A users=()
 while read -r handle && [[ -n "$handle" ]]; do
-    users[$handle]=
+    users[${handle,,}]=
 done
 
 # Cannot request a review from the author

From a8f36e39dcd9ac6f76c9ca5a9856401fd322d464 Mon Sep 17 00:00:00 2001
From: Jared Baur <45740526+jmbaur@users.noreply.github.com>
Date: Sat, 4 Jan 2025 04:39:17 -0800
Subject: [PATCH 1504/1504] unbound: fix cross-compilation (#370087)

Due to a check in make-derivation.nix (https://github.com/nixos/nixpkgs/blob/e4f449ab51a283676d3b520c3dbaa3eafa5025b4/pkgs/stdenv/generic/make-derivation.nix#L288),
`nativeCheckInputs` is not used. This causes cross-compilation for
unbound to fail due to the programs in `bison` not being available.
---
 pkgs/by-name/un/unbound/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 1dc14e412297..f96caa1428da 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     lib.optionals withMakeWrapper [ makeWrapper ]
     ++ lib.optionals withDNSTAP [ protobufc ]
-    ++ [ pkg-config flex ]
+    ++ [ pkg-config flex bison ]
     ++ lib.optionals withPythonModule [ swig ];
 
   buildInputs = [ openssl nettle expat libevent ]
@@ -121,8 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
     sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h
   '';
 
-  nativeCheckInputs = [ bison ];
-
   doCheck = true;
 
   postPatch = lib.optionalString withPythonModule ''